Skip to content

Refactor: Defaulted members must be optional #60

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
pingelit merged 2 commits into from
Sep 11, 2025
Merged

Refactor: Defaulted members must be optional #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
814523f
Refactor: defaulted members must be optional
pingelit Sep 10, 2025
6522782
Refactor: adapt tests to optional change
pingelit Sep 10, 2025
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
2 changes: 1 addition & 1 deletion code-gen/src/poly_scribe_code_gen/cpp_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def _transform_types(parsed_idl: ParsedIDL) -> ParsedIDL:
for struct_data in parsed_idl["structs"].values():
for member_data in struct_data["members"].values():
member_data["type"] = _transformer(member_data["type"], parsed_idl["inheritance_data"])
if not member_data["required"] and member_data["default"] is None:
if not member_data["required"]:
member_data["type"] = f"std::optional<{member_data['type']}>"

if "std::string" in member_data["type"] and member_data["default"]:
Expand Down
2 changes: 1 addition & 1 deletion code-gen/src/poly_scribe_code_gen/py_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def _transform_types(parsed_idl: ParsedIDL) -> ParsedIDL:
type_str = type_str[1:-1]
member_data["default"] = f"{type_str}()"

if not member_data["required"] and member_data["default"] is None:
if not member_data["required"]:
member_data["type"] = f"Optional[{member_data['type']}]"

if "str" in member_data["type"] and member_data["default"] is not None:
Expand Down
10 changes: 5 additions & 5 deletions code-gen/tests/cpp_gen_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ def test_render_template_default_member_values() -> None:

result = cpp_gen._render_template(parsed_idl, {"package": "test"})

assert "int foo = 42;".replace(" ", "") in result.replace(" ", "")
assert "std::optional<int> foo = 42;".replace(" ", "") in result.replace(" ", "")
assert "std::optional<int> bar;".replace(" ", "") in result.replace(" ", "")
assert "namespace test" in result

Expand Down Expand Up @@ -549,7 +549,7 @@ def test__render_template_string_default_value() -> None:
for match in matches:
struct_body = match[1]
if match[0] == "Foo":
assert 'std::string foo = "bar";'.replace(" ", "") in struct_body.replace(" ", "")
assert 'std::optional<std::string> foo = "bar";'.replace(" ", "") in struct_body.replace(" ", "")


def test__render_template_boolean_default_value() -> None:
Expand All @@ -572,8 +572,8 @@ def test__render_template_boolean_default_value() -> None:
for match in matches:
struct_body = match[1]
if match[0] == "Foo":
assert "bool foo = true;".replace(" ", "") in struct_body.replace(" ", "")
assert "bool bar = false;".replace(" ", "") in struct_body.replace(" ", "")
assert "std::optional<bool> foo = true;".replace(" ", "") in struct_body.replace(" ", "")
assert "std::optional<bool> bar = false;".replace(" ", "") in struct_body.replace(" ", "")


def test_render_template_struct_with_multi_inheritance() -> None:
Expand Down Expand Up @@ -673,4 +673,4 @@ def test_render_template_struct_with_empty_type_default() -> None:
for match in matches:
struct_body = match[1]
if match[0] == "Data":
assert "Base_t base = Foo{};".replace(" ", "") in struct_body.replace(" ", "")
assert "std::optional<Base_t> base = Foo{};".replace(" ", "") in struct_body.replace(" ", "")
12 changes: 6 additions & 6 deletions code-gen/tests/py_gen_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def test_render_template_default_member_values() -> None:

result = py_gen._render_template(parsed_idl, {"package": "test"})

assert "foo: int = 42".replace(" ", "") in result.replace(" ", "")
assert "foo: Optional[int] = 42".replace(" ", "") in result.replace(" ", "")
assert "bar: Optional[int] = None".replace(" ", "") in result.replace(" ", "")


Expand Down Expand Up @@ -564,7 +564,7 @@ def test__render_template_string_default_value() -> None:
for match in matches:
struct_body = match[2]
if match[0] == "Foo":
assert 'foo: str = "bar"'.replace(" ", "") in struct_body.replace(" ", "")
assert 'foo: Optional[str] = "bar"'.replace(" ", "") in struct_body.replace(" ", "")


def test_render_template_struct_with_empty_type_default() -> None:
Expand Down Expand Up @@ -600,7 +600,7 @@ def test_render_template_struct_with_empty_type_default() -> None:
for match in matches:
struct_body = match[2]
if match[0] == "Data":
assert 'base: Annotated[Union["Foo", "Bar", "Base"],Field(discriminator="type")] = Foo()'.replace(
assert 'base: Optional[Annotated[Union["Foo", "Bar", "Base"],Field(discriminator="type")]] = Foo()'.replace(
" ", ""
) in struct_body.replace(" ", "")
elif match[0] == "Base":
Expand All @@ -609,7 +609,7 @@ def test_render_template_struct_with_empty_type_default() -> None:
assert 'type: Literal["Foo"] = "Foo"'.replace(" ", "") in struct_body.replace(" ", "")
elif match[0] == "Bar":
assert 'type: Literal["Bar"] = "Bar"'.replace(" ", "") in struct_body.replace(" ", "")
assert "value: int = int()".replace(" ", "") in struct_body.replace(" ", "")
assert "value: Optional[int] = int()".replace(" ", "") in struct_body.replace(" ", "")


def test__render_template_boolean_default_value() -> None:
Expand All @@ -630,5 +630,5 @@ def test__render_template_boolean_default_value() -> None:
for match in matches:
struct_body = match[2]
if match[0] == "Foo":
assert "foo: bool = True".replace(" ", "") in struct_body.replace(" ", "")
assert "bar: bool = False".replace(" ", "") in struct_body.replace(" ", "")
assert "foo: Optional[bool] = True".replace(" ", "") in struct_body.replace(" ", "")
assert "bar: Optional[bool] = False".replace(" ", "") in struct_body.replace(" ", "")
Loading