Changeset 315 for libyaml/branches/stable/src/emitter.c

Timestamp:

12/27/08 14:14:00 (4 years ago)

Author:

xi

Message:

Fixed emitting folded scalars with trailing breaks; Forced emitting of a document end indicator when there is a possibility of ambiguous parsing.

File:

• libyaml/branches/stable/src/emitter.c (modified) (8 diffs)

libyaml/branches/stable/src/emitter.c

@@ -586 +586 @@
         if (!first || emitter->canonical) {
             implicit = 0;
+        }
+
+        if ((event->data.document_start.version_directive ||
+                    (event->data.document_start.tag_directives.start
+                     != event->data.document_start.tag_directives.end)) &&
+                emitter->open_ended)
+        {
+            if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
         }
 
@@ -639 +650 @@
     else if (event->type == YAML_STREAM_END_EVENT)
     {
+        if (emitter->open_ended)
+        {
+            if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
+
         if (!yaml_emitter_flush(emitter))
             return 0;
@@ -1766 +1785 @@
     emitter->whitespace = is_whitespace;
     emitter->indention = (emitter->indention && is_indention);
+    emitter->open_ended = 0;
 
     return 1;
@@ -1903 +1923 @@
     emitter->whitespace = 0;
     emitter->indention = 0;
+    if (emitter->root_context)
+    {
+        emitter->open_ended = 1;
+    }
 
     return 1;
@@ -2137 +2161 @@
     }
 
+    emitter->open_ended = 0;
+
     string.pointer = string.end;
     if (string.start == string.pointer)
@@ -2154 +2180 @@
         {
             chomp_hint = "+";
+            emitter->open_ended = 1;
         }
         else
@@ -2163 +2190 @@
             {
                 chomp_hint = "+";
+                emitter->open_ended = 1;
             }
         }
@@ -2238 +2266 @@
                     k += WIDTH_AT(string, k);
                 }
-                if (!IS_BLANK_AT(string, k)) {
+                if (!IS_BLANKZ_AT(string, k)) {
                     if (!PUT_BREAK(emitter)) return 0;
                 }