Skip to content

Commit 659a884

Browse files
authored
Fix java & dotnet code generator emitting unknown None symbol (#858)
Fix java & dotnet code generator emitting unknown None symbol Quite similar to 6d85020 and fixing building the java code for gxformat2.
1 parent 71398c9 commit 659a884

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

schema_salad/dotnet_codegen.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,9 @@ def type_loader(
442442
init="new MapLoader<{}>({}, {}, {})".format(
443443
i.instance_type,
444444
i.name,
445-
f"'{container}'" if container is not None else None, # noqa: B907
445+
(
446+
f"'{container}'" if container is not None else self.to_dotnet(None)
447+
), # noqa: B907
446448
self.to_dotnet(no_link_check),
447449
),
448450
)
@@ -459,7 +461,9 @@ def type_loader(
459461
name=self.safe_name(type_declaration["name"]) + "Loader",
460462
init="new RecordLoader<{}>({}, {})".format(
461463
self.safe_name(type_declaration["name"]),
462-
f"'{container}'" if container is not None else None, # noqa: B907
464+
(
465+
f"'{container}'" if container is not None else self.to_dotnet(None)
466+
), # noqa: B907
463467
self.to_dotnet(no_link_check),
464468
),
465469
loader_type="ILoader<{}>".format(self.safe_name(type_declaration["name"])),

schema_salad/java_codegen.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,9 @@ def type_loader(
471471
name=f"map_of_{i.name}",
472472
init="new MapLoader({}, {}, {})".format(
473473
i.name,
474-
f"'{container}'" if container is not None else None, # noqa: B907
474+
(
475+
f"'{container}'" if container is not None else self.to_java(None)
476+
), # noqa: B907
475477
self.to_java(no_link_check),
476478
),
477479
loader_type=f"Loader<java.util.Map<String, {i.instance_type}>>",
@@ -494,7 +496,9 @@ def type_loader(
494496
clazz=fqclass,
495497
ext="Impl" if not is_abstract else "",
496498
container=(
497-
f"'{container}'" if container is not None else None # noqa: B907
499+
f"'{container}'"
500+
if container is not None
501+
else self.to_java(None) # noqa: B907
498502
),
499503
no_link_check=self.to_java(no_link_check),
500504
),

0 commit comments

Comments
 (0)