Changeset 198

Timestamp:

07/03/06 07:29:45 (2 years ago)

Author:

xi

Message:

To make porting easier, rewrite Parser not using generators.

Fix handling of unexpected block mapping values, like

: foo

Remove obsolete and unused __iter__ functions.

Files:

• pyyaml/trunk/lib/yaml/composer.py (modified) (1 diff)
• pyyaml/trunk/lib/yaml/constructor.py (modified) (1 diff)
• pyyaml/trunk/lib/yaml/parser.py (modified) (11 diffs)
• pyyaml/trunk/lib/yaml/scanner.py (modified) (1 diff)
• pyyaml/trunk/tests/data/no-block-mapping-end-2.loader-error (added)

pyyaml/trunk/lib/yaml/composer.py

@@ -22 +22 @@
-        if not self.check_event(StreamEndEvent):
-            return self.compose_document()
-
-    def __iter__(self):
-        # Iterator protocol.
-        while not self.check_event(StreamEndEvent):
-            yield self.compose_document()
-
-    def compose_document(self):

pyyaml/trunk/lib/yaml/constructor.py

@@ -39 +39 @@
-        if self.check_node():
-            return self.construct_document(self.get_node())
-
-    def __iter__(self):
-        # Iterator protocol.
-        while self.check_node():
-            yield self.construct_document(self.get_node())
-
-    def construct_document(self, node):

pyyaml/trunk/lib/yaml/parser.py

@@ -1 +1 @@
-
-
+
+
-#
-# We use the following production rules:
-# stream            ::= STREAM-START implicit_document? explicit_document* STREAM-END
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# block_content     ::= block_collection | flow_collection | SCALAR
-# flow_content      ::= flow_collection | SCALAR
-# block_collection  ::= block_sequence | block_mapping
+# flow_collection   ::= flow_sequence | flow_mapping
-# block_sequence    ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-# flow_sequence_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+# flow_mapping      ::= FLOW-MAPPING-START
+#                       (flow_mapping_entry FLOW-ENTRY)*
+#                       flow_mapping_entry?
+#                       FLOW-MAPPING-END
-# flow_mapping_entry    ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-
-
-
-
+
-# FIRST sets:
+#
-# stream: { STREAM-START }
-# explicit_document: { DIRECTIVE DOCUMENT-START }
@@ -70 +85 @@
-        self.yaml_version = None
-        self.tag_handles = {}
-
+
+
+
-
-    def check_event(self, *choices):
-        # Check the type of the next event.
-        if self.current_event is None:
-
-
-
-
+
+
-        if self.current_event is not None:
-            if not choices:
@@ -90 +105 @@
-        # Get the next event.
-        if self.current_event is None:
-
-
-
-
+
+
-        return self.current_event
-
-    def get_event(self):
-
+ and proceed further
-        if self.current_event is None:
-
-
-
-
+
+
-        value = self.current_event
-        self.current_event = None
-        return value
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                encoding=token.encoding)
-
-
+
+
+
+
+
+
+
+
-        if not self.check_token(DirectiveToken, DocumentStartToken,
-                StreamEndToken):
@@ -125 +142 @@
-            token = self.peek_token()
-            start_mark = end_mark = token.start_mark
-yield
+event =
-                    explicit=False)
-
-    yield event
-token = self.peek_token(
-tart_mark = end_mark = token.start_mark
-
-while self.check_token(DocumentEndToken):
-
-        end_mark = token.end_mark
-    explicit = True
-
-                explicit=explicit)
-
-explicit documents
-while
+
+# Prepare the next state.
+self.states.append(self.parse_document_end
+elf.state = self.parse_block_node
+
+return event
+
+else:
+return self.parse_document_start()
+
+def parse_document_start(self):
+
+an explicit document
+if
-            token = self.peek_token()
-            start_mark = token.start_mark
@@ -151 +168 @@
-            token = self.get_token()
-            end_mark = token.end_mark
-yield
+event =
-                    explicit=True, version=version, tags=tags)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def process_directives(self):
-        # DIRECTIVE*
-        self.yaml_version = None
-        self.tag_handles = {}
@@ -205 +239 @@
-        return value
-
+    # block_node_or_indentless_sequence ::= ALIAS
+    #               | properties (block_content | indentless_block_sequence)?
+    #               | block_content
+    #               | indentless_block_sequence
+    # block_node    ::= ALIAS
+    #                   | properties block_content?
+    #                   | block_content
+    # flow_node     ::= ALIAS
+    #                   | properties flow_content?
+    #                   | flow_content
+    # properties    ::= TAG ANCHOR? | ANCHOR TAG?
+    # block_content     ::= block_collection | flow_collection | SCALAR
+    # flow_content      ::= flow_collection | SCALAR
+    # block_collection  ::= block_sequence | block_mapping
+    # flow_collection   ::= flow_sequence | flow_mapping
+
-    def parse_block_node(self):
-        return self.parse_node(block=True)
@@ -215 +265 @@
-
-    def parse_node(self, block=False, indentless_sequence=False):
-        # block_node    ::= ALIAS | properties? block_content
-        # flow_node     ::= ALIAS | properties? flow_content
-        # properties    ::= TAG ANCHOR? | ANCHOR TAG?
-        # block_content     ::= block_collection | flow_collection | SCALAR
-        # flow_content      ::= flow_collection | SCALAR
-        # block_collection  ::= block_sequence | block_mapping
-        # block_node_or_indentless_sequence ::= ALIAS | properties?
-        #                                       (block_content | indentless_block_sequence)
-        if self.check_token(AliasToken):
-            token = self.get_token()
-
+
+
-        else:
-            anchor = None
@@ -272 +315 @@
-                event = SequenceStartEvent(anchor, tag, implicit,
-                        start_mark, end_mark)
-collection_events = self.parse_indentless_sequence()
+self.state = self.parse_indentless_sequence_entry
-            else:
-                if self.check_token(ScalarToken):
@@ -285 +328 @@
-                    event = ScalarEvent(anchor, tag, implicit, token.value,
-                            start_mark, end_mark, style=token.style)
+                    self.state = self.states.pop()
-                elif self.check_token(FlowSequenceStartToken):
-                    end_mark = self.peek_token().end_mark
-                    event = SequenceStartEvent(anchor, tag, implicit,
-                            start_mark, end_mark, flow_style=True)
-collection_events = self.parse_flow_sequence()
+self.state = self.parse_flow_sequence_first_entry
-                elif self.check_token(FlowMappingStartToken):
-                    end_mark = self.peek_token().end_mark
-                    event = MappingStartEvent(anchor, tag, implicit,
-                            start_mark, end_mark, flow_style=True)
-collection_events = self.parse_flow_mapping()
+self.state = self.parse_flow_mapping_first_key
-                elif block and self.check_token(BlockSequenceStartToken):
-                    end_mark = self.peek_token().start_mark
-                    event = SequenceStartEvent(anchor, tag, implicit,
-                            start_mark, end_mark, flow_style=False)
-collection_events = self.parse_block_sequence()
+self.state = self.parse_block_sequence_first_entry
-                elif block and self.check_token(BlockMappingStartToken):
-                    end_mark = self.peek_token().start_mark
-                    event = MappingStartEvent(anchor, tag, implicit,
-                            start_mark, end_mark, flow_style=False)
-collection_events = self.parse_block_mapping()
+self.state = self.parse_block_mapping_first_key
-                elif anchor is not None or tag is not None:
-                    # Empty scalars are allowed even if a tag or an anchor is
@@ -310 +354 @@
-                    event = ScalarEvent(anchor, tag, (implicit, False), u'',
-                            start_mark, end_mark)
+                    self.state = self.states.pop()
-                else:
-                    if block:
@@ -319 +364 @@
-                            "expected the node content, but found %r" % token.id,
-                            token.start_mark)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            token = self.get_token()
-            if not self.check_token(BlockEntryToken, BlockEndToken):
-
-
-
-
+
+
+
+
+
-        if not self.check_token(BlockEndToken):
-            token = self.peek_token()
-tart_mark
+elf.marks[-1]
-                    "expected <block end>, but found %r" % token.id, token.start_mark)
-        token = self.get_token()
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            token = self.get_token()
-            if not self.check_token(BlockEntryToken,
-                    KeyToken, ValueToken, BlockEndToken):
-
-
-
-
+
+
+
+
+
-        token = self.peek_token()
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if self.check_token(KeyToken):
-                token = self.get_token()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        token.start_mark, token.end_mark,
-                        flow_style=True)
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                else:
-                    token = self.peek_token()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            if self.check_token(KeyToken):
-                token = self.get_token()
-                if not self.check_token(ValueToken,
-                        FlowEntryToken, FlowMappingEndToken):
-for event in self.parse_flow_node():
-    yield event
+self.states.append(self.parse_flow_mapping_value)
+return self.parse_flow_node()
-                else:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if not self.check_token(FlowEntryToken, FlowMappingEndToken):
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def process_empty_scalar(self, mark):

pyyaml/trunk/lib/yaml/scanner.py

@@ -137 +137 @@
-            self.tokens_taken += 1
-            return self.tokens.pop(0)
-
-    def __iter__(self):
-        # Iterator protocol.
-        while self.need_more_tokens():
-            self.fetch_more_tokens()
-        while self.tokens:
-            self.tokens_taken += 1
-            yield self.tokens.pop(0)
-            while self.need_more_tokens():
-                self.fetch_more_tokens()
-
-    # Private methods.