Add -h and --flow (on|off|keep) to run-parser-test-suite

with `--keepflow (keep|on)` it will output:

    +MAP {}
    +SEQ []

run-emitter-test-suite will then emit flow style collections.

    echo 'foo: [bar, {x: y}]' | ./tests/run-parser-test-suite  | ./tests/run-emitter-test-suite

tests/run-emitter-test-suite.c

@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
         char anchor[256];
         char tag[256];
         int implicit;
+        int style;
 
         if (strncmp(line, "+STR", 4) == 0) {
             ok = yaml_stream_start_event_initialize(&event, YAML_UTF8_ENCODING);
@@ -77,25 +78,31 @@ int main(int argc, char *argv[])
             ok = yaml_stream_end_event_initialize(&event);
         }
         else if (strncmp(line, "+DOC", 4) == 0) {
-            implicit = strncmp(line, "+DOC ---", 8) != 0;
+            implicit = strncmp(line+4, " ---", 4) != 0;
             ok = yaml_document_start_event_initialize(&event, version_directive, NULL, NULL, implicit);
         }
         else if (strncmp(line, "-DOC", 4) == 0) {
-            implicit = strncmp(line, "-DOC ...", 8) != 0;
+            implicit = strncmp(line+4, " ...", 4) != 0;
             ok = yaml_document_end_event_initialize(&event, implicit);
         }
         else if (strncmp(line, "+MAP", 4) == 0) {
+            style = YAML_BLOCK_MAPPING_STYLE;
+            if (strncmp(line+5, "{}", 2) == 0)
+                style = YAML_FLOW_MAPPING_STYLE;
             ok = yaml_mapping_start_event_initialize(&event, (yaml_char_t *)
                                                      get_anchor('&', line, anchor), (yaml_char_t *)
-                                                     get_tag(line, tag), 0, YAML_BLOCK_MAPPING_STYLE);
+                                                     get_tag(line, tag), 0, style);
         }
         else if (strncmp(line, "-MAP", 4) == 0) {
             ok = yaml_mapping_end_event_initialize(&event);
         }
         else if (strncmp(line, "+SEQ", 4) == 0) {
+            style = YAML_BLOCK_SEQUENCE_STYLE;
+            if (strncmp(line+5, "[]", 2) == 0)
+                style = YAML_FLOW_SEQUENCE_STYLE;
             ok = yaml_sequence_start_event_initialize(&event, (yaml_char_t *)
                                                       get_anchor('&', line, anchor), (yaml_char_t *)
-                                                      get_tag(line, tag), 0, YAML_BLOCK_SEQUENCE_STYLE);
+                                                      get_tag(line, tag), 0, style);
         }
         else if (strncmp(line, "-SEQ", 4) == 0) {
             ok = yaml_sequence_end_event_initialize(&event);

tests/run-parser-test-suite.c

@@ -4,20 +4,44 @@
 #include <assert.h>
 
 void print_escaped(yaml_char_t * str, size_t length);
+int usage(int ret);
 
 int main(int argc, char *argv[])
 {
     FILE *input;
     yaml_parser_t parser;
     yaml_event_t event;
+    int flow = -1; // default no flow style collections
+    int i = 0;
+    int foundfile = 0;
 
-    if (argc == 1)
+    for (i = 1; i < argc; i++) {
+        if (strncmp(argv[i], "--flow", 6) == 0) {
+            if (i == argc)
+                return usage(1);
+            i++;
+            if (strncmp(argv[i], "keep", 4) == 0)
+                flow = 0;
+            else if (strncmp(argv[i], "on", 2) == 0)
+                flow = 1;
+            else if (strncmp(argv[i], "off", 3) == 0)
+                flow = -1;
+            else
+                return usage(1);
+        }
+        else if (strncmp(argv[i], "--help", 6) == 0)
+            return usage(0);
+        else if (strncmp(argv[i], "-h", 2) == 0)
+            return usage(0);
+        else if (!foundfile) {
+            input = fopen(argv[i], "rb");
+            foundfile = 1;
+        }
+        else
+            return usage(1);
+    }
+    if (!foundfile) {
         input = stdin;
-    else if (argc == 2)
-        input = fopen(argv[1], "rb");
-    else {
-        fprintf(stderr, "Usage: libyaml-parser [<input-file>]\n");
-        return 1;
     }
     assert(input);
 
@@ -63,6 +87,10 @@ int main(int argc, char *argv[])
         }
         else if (type == YAML_MAPPING_START_EVENT) {
             printf("+MAP");
+            if (flow == 0 && event.data.mapping_start.style == YAML_FLOW_MAPPING_STYLE)
+                printf(" {}");
+            else if (flow == 1)
+                printf(" {}");
             if (event.data.mapping_start.anchor)
                 printf(" &%s", event.data.mapping_start.anchor);
             if (event.data.mapping_start.tag)
@@ -73,6 +101,10 @@ int main(int argc, char *argv[])
             printf("-MAP\n");
         else if (type == YAML_SEQUENCE_START_EVENT) {
             printf("+SEQ");
+            if (flow == 0 && event.data.sequence_start.style == YAML_FLOW_SEQUENCE_STYLE)
+                printf(" []");
+            else if (flow == 1)
+                printf(" []");
             if (event.data.sequence_start.anchor)
                 printf(" &%s", event.data.sequence_start.anchor);
             if (event.data.sequence_start.tag)
@@ -150,3 +182,8 @@ void print_escaped(yaml_char_t * str, size_t length)
             printf("%c", c);
     }
 }
+
+int usage(int ret) {
+    fprintf(stderr, "Usage: libyaml-parser [--flow (on|off|keep)] [<input-file>]\n");
+    return ret;
+}