Skip to content

[StubGen] Fix optional vectors (#323) #324

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

Merged
sebaszm merged 1 commit into from
Aug 25, 2026
Merged

[StubGen] Fix optional vectors (#323) #324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 29 additions & 11 deletions ProxyStubGenerator/StubGenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1557,24 +1557,22 @@ def _EmitAssignment(p):
elif p.is_dynamic_array:
obj_name = p.name

if not p.suppress_type:
if p.optional:
obj_name = Normalize(obj_name + "Object__")
emit.Line("%s %s{};" % (p.optional.type_name, obj_name))
else:
emit.Line("%s %s{};" % (p.type_name, obj_name))
if p.optional:
obj_name = Normalize(p.name + "Object__")
emit.Line("%s %s{};" % (p.optional.type_name, obj_name))
elif not p.suppress_type:
emit.Line("%s %s{};" % (p.type_name, obj_name))

length = EmitParam(interface, p.length, Normalize("%sSize" % obj_name))
ReadParameter(length)
CheckRange(p, ("%s" % length.as_rvalue))
emit.Line("%s.reserve(%s);" % (p.as_rvalue, length.as_rvalue))

emit.Line("%s.reserve(%s);" % (obj_name, length.as_rvalue))
index = chr(ord('i') + p.name.count('Item'))
element = EmitParam(interface, p.element, Normalize(obj_name + "Item"), parent=p)
emit.Line("for (%s %s = 0; %s < %s; %s++) {" % (p.length.type_name, index, index, length.as_rvalue, index))
emit.IndentInc()
ReadParameter(element)
emit.Line("%s.push_back(std::move(%s));" % (p.as_rvalue, element.as_rvalue))
emit.Line("%s.push_back(std::move(%s));" % (obj_name, element.as_rvalue))
emit.IndentDec()
emit.Line("}")

Expand Down Expand Up @@ -2132,18 +2130,33 @@ def ReadParameter(p, no_array=False, suppress_type=True):
elif p.is_dynamic_array:
length = EmitLength(interface, p.length, Normalize(p.name + "Size"))
element = EmitParam(interface, p.element, Normalize(p.name + "Item"), parent=p)

obj_name = p.as_rvalue

if p.optional:
obj_name = Normalize(p.name + "Object__")
emit.Line("%s %s{};" % (p.optional.type_name, obj_name))

emit.Line("%s{};" % (length.temporary_no_cv))
ReadParameter(length)
emit.Line("%s.reserve(%s);" % (p.as_rvalue, length.as_rvalue))

if not p.optional:
emit.Line("%s.clear();" % (p.as_rvalue))

emit.Line("%s.reserve(%s);" % (obj_name, length.as_rvalue))

index = chr(ord('i') + p.name.count('Item'))
emit.Line("for (%s %s = 0; %s < %s; %s++) {" % (p.length.type_name, index, index, length.as_rvalue, index))
emit.IndentInc()
emit.Line("%s{};" % (element.temporary_no_cv))
ReadParameter(element)
emit.Line("%s.push_back(std::move(%s));" % (p.as_rvalue, element.as_rvalue))
emit.Line("%s.push_back(std::move(%s));" % (obj_name, element.as_rvalue))
emit.IndentDec()
emit.Line("}")

if p.optional:
emit.Line("%s = std::move(%s);" % (p.name, obj_name))

elif p.is_buffer:
CheckFrame(p)
CheckSize(p)
Expand Down Expand Up @@ -2194,6 +2207,11 @@ def _EmitAssignment(p):
if p.optional and (not p.is_array or no_array):
emit.IndentDec()
emit.Line("}")
emit.Line("else {")
emit.IndentInc()
emit.Line("%s = %s();" % (p.name, p.type_name))
emit.IndentDec()
emit.Line("}")

if EMIT_TRACES:
emit.Line('fprintf(stderr, "*** [%s proxy] ENTER: %s()\\n");' % (interface_name, method.name))
Expand Down
Loading