better empty tests

fildesh · May 21, 2024 · 846dc00 · 846dc00
1 parent 5125ea1
commit 846dc00
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 30 deletions.
diff --git a/src/sxproto/json.c b/src/sxproto/json.c
@@ -97,12 +97,16 @@ 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);
-        putstrlit_FildeshO(out, ": {");
-        write_json_FildeshO(out, sxpb, sub_it, indent_level+2);
-        NEWLINE_INDENT(indent_level+1);
-        putc_FildeshO(out, '}');
+        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, '}');
+        }
       }
       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,12 +82,16 @@ 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);
-        putstrlit_FildeshO(out, " {");
-        write_txtpb_FildeshO(out, sxpb, sub_it, indent_level+2);
-        NEWLINE_INDENT(indent_level+1);
-        putc_FildeshO(out, '}');
+        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, '}');
+        }
       }
       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,9 +89,13 @@ 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);
-        write_yaml_FildeshO(out, sxpb, sub_it, indent_level+1, false);
+        if (fildesh_nullid(e->elem)) {
+          putstrlit_FildeshO(out, " {}");
+        }
+        else {
+          write_yaml_FildeshO(out, sxpb, sub_it, indent_level+1, false);
+        }
       }
       else if (e->field_kind == FildeshSxprotoFieldKind_ARRAY ||
                e->field_kind == FildeshSxprotoFieldKind_MANYOF)

diff --git a/test/sxproto/content/array.json b/test/sxproto/content/array.json
@@ -10,5 +10,5 @@
     "i": 5,
     "s": "hello"
   }],
-  "maybe_elements": []
+  "my_empty_array": []
 }
diff --git a/test/sxproto/content/array.sxpb b/test/sxproto/content/array.sxpb
@@ -14,4 +14,4 @@
  (() (i 5) (f 5.5) (s "hello")))
 
 ; An empty array.
-((maybe_elements))
+((my_empty_array))
diff --git a/test/sxproto/content/array.txtpb b/test/sxproto/content/array.txtpb
@@ -9,4 +9,4 @@ my_messages: [{
   i: 5
   s: "hello"
 }]
-maybe_elements: []
+my_empty_array: []
diff --git a/test/sxproto/content/array.yaml b/test/sxproto/content/array.yaml
@@ -17,4 +17,4 @@ my_messages:
   - f: 5.5e+0
     i: 5
     s: "hello"
-maybe_elements: []
+my_empty_array: []
diff --git a/test/sxproto/content/manyof.json b/test/sxproto/content/manyof.json
@@ -41,11 +41,13 @@
         "value": true
       }]
     }]
+  }],
+  "maybe_manyof": [],
+  "maybe_manyof_elements": [{
+    "maybe_array": []
   }, {
-    "or": [{
-      "or": []
-    }, {
-      "and": []
-    }]
+    "maybe_manyof": []
+  }, {
+    "maybe_message": {}
   }]
 }
diff --git a/test/sxproto/content/manyof.sxpb b/test/sxproto/content/manyof.sxpb
@@ -12,6 +12,14 @@
   false
   (((and)) true false)
   (((or)) false false true))
+)
+
+; An empty manyof.
+(((maybe_manyof)))
 
- ((or) ((or)) ((and)))
+; A manyof with empty elements.
+((maybe_manyof_elements)
+ ((maybe_array))
+ (((maybe_manyof)))
+ (maybe_message)
 )
diff --git a/test/sxproto/content/manyof.txtpb b/test/sxproto/content/manyof.txtpb
@@ -40,10 +40,12 @@ expressions: [{
       value: true
     }]
   }]
+}]
+maybe_manyof: []
+maybe_manyof_elements: [{
+  maybe_array: []
 }, {
-  or: [{
-    or: []
-  }, {
-    and: []
-  }]
+  maybe_manyof: []
+}, {
+  maybe_message {}
 }]
diff --git a/test/sxproto/content/manyof.yaml b/test/sxproto/content/manyof.yaml
@@ -21,6 +21,8 @@ expressions:
       - value: false
       - value: false
       - value: true
-  - or:
-    - or: []
-    - and: []
+maybe_manyof: []
+maybe_manyof_elements:
+  - maybe_array: []
+  - maybe_manyof: []
+  - maybe_message: {}