chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly format constructor initializer lists in struct wrappers.

Browse Source 
PiperOrigin-RevId: 830887996
Change-Id: Ibe663fcc17571ad1fd62d70249687c917653618e
This commit is contained in:
Matias Manevi
2025-11-11 06:37:16 -08:00
committed by Copybara-Service
parent 75774b2a35
commit 3e167e0f0b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wasm/codegen/generators/structs.py
+5 -5
View File
@@ -39,7 +39,7 @@ class WrappedFieldData:
# Used for constructor fields that are class types and need to be initialized # Used for constructor fields that are class types and need to be initialized
# with a pointer to the corresponding member in the native struct # with a pointer to the corresponding member in the native struct
# (e.g., ", alt(&ptr_->alt)"). # (e.g., "alt(&ptr_->alt)").
ptr_initialization: str = "" ptr_initialization: str = ""
# Statement to reset the inner pointer when copying the field # Statement to reset the inner pointer when copying the field
@@ -134,7 +134,7 @@ def _generate_field_data(
definition=f"{common.uppercase_first_letter(f.type.name)} {f.name};", definition=f"{common.uppercase_first_letter(f.type.name)} {f.name};",
typename=_get_field_struct_type(f.type), typename=_get_field_struct_type(f.type),
binding=_simple_property_binding(f, w, setter=False, reference=True), binding=_simple_property_binding(f, w, setter=False, reference=True),
ptr_initialization=f", {f.name}(&ptr_->{f.name})", ptr_initialization=f"{f.name}(&ptr_->{f.name})",
ptr_copy_reset=f"{f.name}.set(&ptr_->{f.name});", ptr_copy_reset=f"{f.name}.set(&ptr_->{f.name});",
is_primitive_or_fixed_size=True, is_primitive_or_fixed_size=True,
) )
@@ -151,7 +151,7 @@ def _generate_field_data(
return WrappedFieldData( return WrappedFieldData(
binding=_simple_property_binding(f, w, setter=False, reference=True), binding=_simple_property_binding(f, w, setter=False, reference=True),
typename=_get_field_struct_type(f.type), typename=_get_field_struct_type(f.type),
ptr_initialization=f", {f.name}(&ptr_->{f.name})", ptr_initialization=f"{f.name}(&ptr_->{f.name})",
ptr_copy_reset=f"{f.name}.set(&ptr_->{f.name});", ptr_copy_reset=f"{f.name}.set(&ptr_->{f.name});",
is_primitive_or_fixed_size=True, is_primitive_or_fixed_size=True,
) )
@@ -256,7 +256,7 @@ def _generate_field_data(
definition=f"{wrapper_field_name} {f.name};", definition=f"{wrapper_field_name} {f.name};",
typename=_get_field_struct_type(f.type), typename=_get_field_struct_type(f.type),
binding=_simple_property_binding(f, w, setter=False, reference=True), binding=_simple_property_binding(f, w, setter=False, reference=True),
ptr_initialization=f", {f.name}(ptr_->{f.name})", ptr_initialization=f"{f.name}(ptr_->{f.name})",
) )
builder = code_builder.CodeBuilder() builder = code_builder.CodeBuilder()
@@ -410,7 +410,7 @@ def build_struct_source(
fields_init = "" fields_init = ""
if member_inits: if member_inits:
fields_init = "".join( fields_init = ", " + ", ".join(
mjs_field.ptr_initialization for mjs_field in member_inits mjs_field.ptr_initialization for mjs_field in member_inits
) )
wasm/codegen/tests/generators_test.py
+1 -1
View File
@@ -783,7 +783,7 @@ emscripten::val buffer() const {
) )
self.assertEqual( self.assertEqual(
wrapped_field_data.ptr_initialization, wrapped_field_data.ptr_initialization,
", element(ptr_->element)", "element(ptr_->element)",
) )
def test_array_type_field(self): def test_array_type_field(self):