Changeset 204

Timestamp:

07/07/06 15:38:53 (7 years ago)

Author:

xi

Message:

Fix some minor issues with the new Parser.

File:

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

pyyaml/trunk/lib/yaml/parser.py

@@ -309 +309 @@
                 start_mark = end_mark = self.peek_token().start_mark
             event = None
-            collection_events = None
             implicit = (tag is None or tag == u'!')
             if indentless_sequence and self.check_token(BlockEntryToken):
@@ -361 +360 @@
                         node = 'flow'
                     token = self.peek_token()
-                    raise ParserError("while scanning a %s node" % node, start_mark,
+                    raise ParserError("while parsing a %s node" % node, start_mark,
                             "expected the node content, but found %r" % token.id,
                             token.start_mark)
@@ -384 +383 @@
         if not self.check_token(BlockEndToken):
             token = self.peek_token()
-            raise ParserError("while scanning a block collection", self.marks[-1],
+            raise ParserError("while parsing a block collection", self.marks[-1],
                     "expected <block end>, but found %r" % token.id, token.start_mark)
         token = self.get_token()
@@ -430 +429 @@
         if not self.check_token(BlockEndToken):
             token = self.peek_token()
-            raise ParserError("while scanning a block mapping", self.marks[-1],
+            raise ParserError("while parsing a block mapping", self.marks[-1],
                     "expected <block end>, but found %r" % token.id, token.start_mark)
         token = self.get_token()
@@ -475 +474 @@
                 else:
                     token = self.peek_token()
-                    raise ParserError("while scanning a flow sequence", self.marks[-1],
+                    raise ParserError("while parsing a flow sequence", self.marks[-1],
                             "expected ',' or ']', but got %r" % token.id, token.start_mark)
             
             if self.check_token(KeyToken):
-                token = self.get_token()
+                token = self.peek_token()
                 event = MappingStartEvent(None, None, True,
                         token.start_mark, token.end_mark,
@@ -495 +494 @@
 
     def parse_flow_sequence_entry_mapping_key(self):
+        token = self.get_token()
         if not self.check_token(ValueToken,
                 FlowEntryToken, FlowSequenceEndToken):
@@ -540 +540 @@
                 else:
                     token = self.peek_token()
-                    raise ParserError("while scanning a flow mapping", self.marks[-1],
+                    raise ParserError("while parsing a flow mapping", self.marks[-1],
                             "expected ',' or '}', but got %r" % token.id, token.start_mark)
             if self.check_token(KeyToken):