Changeset 53

Timestamp:

02/20/06 15:30:09 (7 years ago)

Author:

xi

Message:

Implement Composer and BaseResolver?.

Location:

branches/pyyaml3000

Files:

• lib/yaml/__init__.py (modified) (2 diffs)
• lib/yaml/composer.py (added)
• lib/yaml/error.py (modified) (1 diff)
• lib/yaml/events.py (modified) (2 diffs)
• lib/yaml/nodes.py (added)
• lib/yaml/parser.py (modified) (1 diff)
• lib/yaml/resolver.py (added)
• tests/data/duplicate-anchor-1.error-message (added)
• tests/data/duplicate-anchor-2.error-message (added)
• tests/data/recursive-anchor.error-message (added)
• tests/data/undefined-anchor.error-message (added)
• tests/test_errors.py (modified) (3 diffs)
• tests/test_structure.py (modified) (1 diff)

branches/pyyaml3000/lib/yaml/__init__.py

@@ -1 +1 @@
 
+from error import YAMLError
 from reader import Reader
 from scanner import Scanner
 from parser import Parser
+from composer import Composer
+from resolver import Resolver
 
 from tokens import *
@@ -18 +21 @@
     return iter(parser)
 
+def compose(data, Reader=Reader, Scanner=Scanner, Parser=Parser,
+        Composer=Composer):
+    reader = Reader(data)
+    scanner = Scanner(reader)
+    parser = Parser(scanner)
+    composer = Composer(parser)
+    return iter(composer)
+
+def compose_document(*args, **kwds):
+    try:
+        return compose(*args, **kwds).next()
+    except StopIteration:
+        return None
+
+def resolve(data, Reader=Reader, Scanner=Scanner, Parser=Parser,
+        Composer=Composer, Resolver=Resolver):
+    reader = Reader(data)
+    scanner = Scanner(reader)
+    parser = Parser(scanner)
+    composer = Composer(parser)
+    resolver = Resolver(composer)
+    return iter(resolver)
+
+def resolve_document(*args, **kwds):
+    try:
+        return resolve(*args, **kwds).next()
+    except StopIteration:
+        return None
+

branches/pyyaml3000/lib/yaml/error.py

@@ -64 +64 @@
         if self.context is not None:
             lines.append(self.context)
-            if self.context_marker is not None  \
-                and (self.problem is None or self.problem_marker is None
-                        or self.context_marker.name != self.problem_marker.name
-                        or self.context_marker.line != self.problem_marker.line
-                        or self.context_marker.column != self.problem_marker.column):
-                lines.append(str(self.context_marker))
+        if self.context_marker is not None  \
+            and (self.problem is None or self.problem_marker is None
+                    or self.context_marker.name != self.problem_marker.name
+                    or self.context_marker.line != self.problem_marker.line
+                    or self.context_marker.column != self.problem_marker.column):
+            lines.append(str(self.context_marker))
         if self.problem is not None:
             lines.append(self.problem)
-            if self.problem_marker is not None:
-                lines.append(str(self.problem_marker))
+        if self.problem_marker is not None:
+            lines.append(str(self.problem_marker))
         return '\n'.join(lines)
 

branches/pyyaml3000/lib/yaml/events.py

@@ -13 +13 @@
 
 class NodeEvent(Event):
-    def __init__(self, anchor, tag, start_marker, end_marker):
+    def __init__(self, anchor, start_marker, end_marker):
         self.anchor = anchor
-        self.tag = tag
         self.start_marker = start_marker
         self.end_marker = end_marker
 
 class AliasEvent(NodeEvent):
-    def __init__(self, name, start_marker, end_marker):
-        self.name = name
-        self.start_marker = start_marker
-        self.end_marker = end_marker
+    pass
 
 class ScalarEvent(NodeEvent):
@@ -34 +30 @@
 
 class CollectionEvent(NodeEvent):
-    pass
+    def __init__(self, anchor, tag, start_marker, end_marker):
+        self.anchor = anchor
+        self.tag = tag
+        self.start_marker = start_marker
+        self.end_marker = end_marker
 
 class SequenceEvent(CollectionEvent):

branches/pyyaml3000/lib/yaml/parser.py

@@ -99 +99 @@
                     return True
         return False
+
+    def peek(self):
+        # Get the next event.
+        if self.current_event is None:
+            try:
+                self.current_event = self.event_generator.next()
+            except StopIteration:
+                pass
+        return self.current_event
 
     def get(self):

branches/pyyaml3000/tests/test_errors.py

@@ -6 +6 @@
 from yaml.scanner import *
 from yaml.parser import *
+from yaml.composer import *
+from yaml.resolver import *
 
 class TestErrors(test_appliance.TestAppliance):
@@ -22 +24 @@
             scanner = Scanner(reader)
             parser = Parser(scanner)
-            return list(parser)
+            composer = Composer(parser)
+            resolver = Resolver(composer)
+            return list(composer)
         except YAMLError, exc:
         #except ScannerError, exc:
         #except ParserError, exc:
+        #except ComposerError, exc:
             #print '.'*70
             #print "%s:" % exc.__class__.__name__, exc
@@ -35 +40 @@
             scanner = Scanner(reader)
             parser = Parser(scanner)
-            return list(parser)
+            composer = Composer(parser)
+            resolver = Resolver(composer)
+            return list(composer)
         except YAMLError, exc:
         #except ScannerError, exc:
         #except ParserError, exc:
+        #except ComposerError, exc:
             #print '.'*70
             #print "%s:" % filename

branches/pyyaml3000/tests/test_structure.py

@@ -124 +124 @@
             self.failUnlessEqual(event1.__class__, event2.__class__)
             if isinstance(event1, AliasEvent):
-                self.failUnlessEqual(event1.name, event2.name)
+                self.failUnlessEqual(event1.anchor, event2.anchor)
             elif isinstance(event1, ScalarEvent):
                 self.failUnlessEqual(event1.anchor, event2.anchor)