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

Timestamp:

04/03/06 14:20:25 (7 years ago)

Author:

xi

Message:

Add style information to events generated by Parser.

File:

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

pyyaml/trunk/lib/yaml/scanner.py

@@ -380 +380 @@
         mark = self.reader.get_mark()
         
-        # Add STREAM-END.
-        self.tokens.append(StreamStartToken(mark, mark))
+        # Add STREAM-START.
+        self.tokens.append(StreamStartToken(mark, mark,
+            encoding=self.reader.encoding))
         
 
@@ -639 +640 @@
 
     def fetch_literal(self):
-        self.fetch_block_scalar(folded=False)
+        self.fetch_block_scalar(style='|')
 
     def fetch_folded(self):
-        self.fetch_block_scalar(folded=True)
-
-    def fetch_block_scalar(self, folded):
+        self.fetch_block_scalar(style='>')
+
+    def fetch_block_scalar(self, style):
 
         # A simple key may follow a block scalar.
@@ -653 +654 @@
 
         # Scan and add SCALAR.
-        self.tokens.append(self.scan_block_scalar(folded))
+        self.tokens.append(self.scan_block_scalar(style))
 
     def fetch_single(self):
-        self.fetch_flow_scalar(double=False)
+        self.fetch_flow_scalar(style='\'')
 
     def fetch_double(self):
-        self.fetch_flow_scalar(double=True)
-
-    def fetch_flow_scalar(self, double):
+        self.fetch_flow_scalar(style='"')
+
+    def fetch_flow_scalar(self, style):
 
         # A flow scalar could be a simple key.
@@ -670 +671 @@
 
         # Scan and add SCALAR.
-        self.tokens.append(self.scan_flow_scalar(double))
+        self.tokens.append(self.scan_flow_scalar(style))
 
     def fetch_plain(self):
@@ -987 +988 @@
         return TagToken(value, start_mark, end_mark)
 
-    def scan_block_scalar(self, folded):
-        # See the specification for details.
+    def scan_block_scalar(self, style):
+        # See the specification for details.
+
+        if style == '>':
+            folded = True
+        else:
+            folded = False
 
         chunks = []
@@ -1022 +1028 @@
             breaks, end_mark = self.scan_block_scalar_breaks(indent)
             if self.reader.column == indent and self.reader.peek() != u'\0':
+
                 # Unfortunately, folding rules are ambiguous.
                 #
@@ -1054 +1061 @@
 
         # We are done.
-        return ScalarToken(u''.join(chunks), False, start_mark, end_mark)
+        return ScalarToken(u''.join(chunks), False, start_mark, end_mark,
+                style)
 
     def scan_block_scalar_indicators(self, start_mark):
@@ -1138 +1146 @@
         return chunks, end_mark
 
-    def scan_flow_scalar(self, double):
+    def scan_flow_scalar(self, style):
         # See the specification for details.
         # Note that we loose indentation rules for quoted scalars. Quoted
@@ -1145 +1153 @@
         # restrictive then the specification requires. We only need to check
         # that document separators are not included in scalars.
+        if style == '"':
+            double = True
+        else:
+            double = False
         chunks = []
         start_mark = self.reader.get_mark()
@@ -1155 +1167 @@
         self.reader.forward()
         end_mark = self.reader.get_mark()
-        return ScalarToken(u''.join(chunks), False, start_mark, end_mark)
+        return ScalarToken(u''.join(chunks), False, start_mark, end_mark,
+                style)
 
     ESCAPE_REPLACEMENTS = {