Changeset 188 for pyyaml/trunk/lib/yaml/scanner.py

Timestamp:

06/16/06 03:23:05 (7 years ago)

Author:

xi

Message:

Fix several problems caused by ill-formed documents.

The line number is not calculated correctly for DOS-style line breaks.

Fix error reporting in remove_possible_simple_key. The problem is caused by the document:

+foo: &A bar
+*A ]

Raise an error for a complex key which is not indented correctly, for instance:

? "foo"
 : "bar"

File:

• pyyaml/trunk/lib/yaml/scanner.py (modified) (3 diffs)

pyyaml/trunk/lib/yaml/scanner.py

@@ -215 +215 @@
 
         # Is it the flow entry indicator?
-        if ch in u',':
+        if ch == u',':
             return self.fetch_flow_entry()
 
         # Is it the block entry indicator?
-        if ch in u'-' and self.check_block_entry():
+        if ch == u'-' and self.check_block_entry():
             return self.fetch_block_entry()
 
@@ -326 +326 @@
             key = self.possible_simple_keys[self.flow_level]
             
-            # I don't think it's possible, but I could be wrong.
-            assert not key.required
-            #if key.required:
-            #    raise ScannerError("while scanning a simple key", key.mark,
-            #            "could not found expected ':'", self.get_mark())
+            if key.required:
+                raise ScannerError("while scanning a simple key", key.mark,
+                        "could not found expected ':'", self.get_mark())
+
+            del self.possible_simple_keys[self.flow_level]
 
     # Indentation functions.
@@ -588 +588 @@
                             "mapping values are not allowed here",
                             self.get_mark())
+
+            # If this value starts a new block mapping, we need to add
+            # BLOCK-MAPPING-START.  It will be detected as an error later by
+            # the parser.
+            if not self.flow_level:
+                if self.add_indent(self.column):
+                    mark = self.get_mark()
+                    self.tokens.append(BlockMappingStartToken(mark, mark))
 
             # Simple keys are allowed after ':' in the block context.