Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix auto bindings for using lambda ''std::function<.*(std::map<std::s… #245

Open
wants to merge 2 commits into
base: v3
Choose a base branch
from
Open

fix auto bindings for using lambda ''std::function<.*(std::map<std::s… #245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7bed64
fix auto bindings for using lambda ''std::function<.*(std::map<std::s…
May 2, 2018
05e74df
fix auto bindings for using 'std::vector<std::map<std::string, std::…
May 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ def split_container_name(name):
comma = name.find(',', left + 1, right)
if comma == -1:
results.append(name[left+1:right].strip())
last_char = name[len(name)-1];
if (last_char == '*' or last_char == '&'):
results.append(last_char)
return results


Expand Down Expand Up @@ -183,7 +186,7 @@ def normalize_std_function_by_sections(sections):
normalized_name = 'std::function<' + sections[1] + ' ' + sections[2] + '>'
else:
assert(False)
return normalized_name
return normalized_name.replace('>>', '> >');


def normalize_type_str(s, depth=1):
Expand Down Expand Up @@ -487,9 +490,21 @@ def from_type(ntype):
(ret_type, params) = r.groups()
params = filter(None, params.split(", "))

newParams = []
argTmp = ''
for ntstr in (params):
if 0 < len(re.compile(r'std::map<').findall(ntstr)):
argTmp = "%s, " % (ntstr)
else:
if (0 < len(argTmp)):
argTmp = argTmp + ntstr
newParams.append(argTmp)
else:
newParams.append(ntstr)
argTmp = ''
nt.is_function = True
nt.ret_type = NativeType.from_string(ret_type)
nt.param_types = [NativeType.from_string(string) for string in params]
nt.param_types = [NativeType.from_string(string) for string in newParams]

# mark argument as not supported
if nt.name == INVALID_NATIVE_TYPE:
Expand All @@ -503,9 +518,13 @@ def from_type(ntype):
@staticmethod
def from_string(displayname):
displayname = displayname.replace(" *", "*")
displayname = displayname.replace(">>", "> >")

nt = NativeType()
nt.name = displayname.split("::")[-1]
if 0 < len(re.compile(r'std::map<').findall(displayname)):
nt.name = displayname.replace('std::map', 'map', 1)
else:
nt.name = displayname.split("::")[-1]
nt.namespaced_name = displayname
nt.whole_name = nt.namespaced_name
nt.is_object = True
Expand Down