Changeset 313

Timestamp:

12/27/08 14:10:31 (4 years ago)

Author:

xi

Message:

Emit an explicit document end indicator when there is a possibility of ambiguous parsing.

File:

• pyyaml/trunk/lib/yaml/emitter.py (modified) (7 diffs)

pyyaml/trunk/lib/yaml/emitter.py

@@ -77 +77 @@
         self.indention = True
 
+        # Whether the document requires an explicit document indicator
+        self.open_ended = False
+
         # Formatting details.
         self.canonical = canonical
@@ -170 +173 @@
     def expect_document_start(self, first=False):
         if isinstance(self.event, DocumentStartEvent):
+            if (self.event.version or self.event.tags) and self.open_ended:
+                self.write_indicator(u'...', True)
+                self.write_indent()
             if self.event.version:
                 version_text = self.prepare_version(self.event.version)
@@ -193 +199 @@
             self.state = self.expect_document_root
         elif isinstance(self.event, StreamEndEvent):
+            if self.open_ended:
+                self.write_indicator(u'...', True)
+                self.write_indent()
             self.write_stream_end()
             self.state = self.expect_nothing
@@ -793 +802 @@
         self.indention = self.indention and indention
         self.column += len(data)
+        self.open_ended = False
         if self.encoding:
             data = data.encode(self.encoding)
@@ -977 +987 @@
         hints = self.determine_block_hints(text)
         self.write_indicator(u'>'+hints, True)
+        if hints[-1:] == u'+':
+            self.open_ended = True
         self.write_line_break()
         leading_space = True
@@ -1026 +1038 @@
 
     def write_literal(self, text):
-        chomp = self.determine_block_hints(text)
-        self.write_indicator(u'|'+chomp, True)
+        hints = self.determine_block_hints(text)
+        self.write_indicator(u'|'+hints, True)
+        if hints[-1:] == u'+':
+            self.open_ended = True
         self.write_line_break()
         breaks = True
@@ -1059 +1073 @@
 
     def write_plain(self, text, split=True):
+        if self.root_context:
+            self.open_ended = True
         if not text:
             return