assert against nameless messages

fildesh · May 21, 2024 · 5125ea1 · 5125ea1
1 parent 2882b29
commit 5125ea1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/src/sxproto/json.c b/src/sxproto/json.c
@@ -97,16 +97,12 @@ write_json_FildeshO(
       putc_FildeshO(out, '{');
       NEWLINE_INDENT(indent_level+1);
       if (e->field_kind == FildeshSxprotoFieldKind_MESSAGE) {
+        assert(!fildesh_nullid(e->elem) && "Manyof cannot hold nameless message values.");
         print_quoted_sxpb_str_FildeshO(out, e->text);
-        if (fildesh_nullid(e->elem)) {
-          putstrlit_FildeshO(out, ": {}");
-        }
-        else {
-          putstrlit_FildeshO(out, ": {");
-          write_json_FildeshO(out, sxpb, sub_it, indent_level+2);
-          NEWLINE_INDENT(indent_level+1);
-          putc_FildeshO(out, '}');
-        }
+        putstrlit_FildeshO(out, ": {");
+        write_json_FildeshO(out, sxpb, sub_it, indent_level+2);
+        NEWLINE_INDENT(indent_level+1);
+        putc_FildeshO(out, '}');
       }
       else if (e->field_kind == FildeshSxprotoFieldKind_ARRAY ||
                e->field_kind == FildeshSxprotoFieldKind_MANYOF)

diff --git a/src/sxproto/txtpb.c b/src/sxproto/txtpb.c
@@ -82,16 +82,12 @@ write_txtpb_FildeshO(
       if (e->field_kind == FildeshSxprotoFieldKind_MESSAGE ||
           e->field_kind == FildeshSxprotoFieldKind_LONEOF)
       {
+        assert(!fildesh_nullid(e->elem) && "Manyof cannot hold nameless message values.");
         putstr_FildeshO(out, e->text);
-        if (fildesh_nullid(e->elem)) {
-          putstrlit_FildeshO(out, " {}");
-        }
-        else {
-          putstrlit_FildeshO(out, " {");
-          write_txtpb_FildeshO(out, sxpb, sub_it, indent_level+2);
-          NEWLINE_INDENT(indent_level+1);
-          putc_FildeshO(out, '}');
-        }
+        putstrlit_FildeshO(out, " {");
+        write_txtpb_FildeshO(out, sxpb, sub_it, indent_level+2);
+        NEWLINE_INDENT(indent_level+1);
+        putc_FildeshO(out, '}');
       }
       else if (e->field_kind == FildeshSxprotoFieldKind_ARRAY ||
                e->field_kind == FildeshSxprotoFieldKind_MANYOF)

diff --git a/src/sxproto/yaml.c b/src/sxproto/yaml.c
@@ -89,13 +89,9 @@ write_yaml_FildeshO(
       NEWLINE_INDENT(indent_level, on_indented_line);
       putstrlit_FildeshO(out, "- ");
       if (e->field_kind == FildeshSxprotoFieldKind_MESSAGE) {
+        assert(!fildesh_nullid(e->elem) && "Manyof cannot hold nameless message values.");
         print_yaml_key_FildeshO(out, e);
-        if (fildesh_nullid(e->elem)) {
-          putstrlit_FildeshO(out, " {}");
-        }
-        else {
-          write_yaml_FildeshO(out, sxpb, sub_it, indent_level+1, false);
-        }
+        write_yaml_FildeshO(out, sxpb, sub_it, indent_level+1, false);
       }
       else if (e->field_kind == FildeshSxprotoFieldKind_ARRAY ||
                e->field_kind == FildeshSxprotoFieldKind_MANYOF)