Changeset 173 for pyyaml/trunk/lib/yaml

Timestamp:

05/22/06 15:49:54 (6 years ago)

Author:

xi

Message:

Revamp the inf/nan handling again.

Location:

pyyaml/trunk/lib/yaml

Files:

• constructor.py (modified) (1 diff)
• reader.py (modified) (3 diffs)
• representer.py (modified) (1 diff)

pyyaml/trunk/lib/yaml/constructor.py

@@ -233 +233 @@
 
     inf_value = 1e300
-    while repr(inf_value) != repr(inf_value*inf_value):
+    while inf_value != inf_value*inf_value:
         inf_value *= inf_value
-    nan_value = inf_value/inf_value
+    nan_value = -inf_value/inf_value   # Trying to make a quiet NaN (like C99).
 
     def construct_yaml_float(self, node):

pyyaml/trunk/lib/yaml/reader.py

@@ -121 +121 @@
 
     def peek(self, index=0):
-        if self.pointer+index+1 >= len(self.buffer):
+        try:
+            return self.buffer[self.pointer+index]
+        except IndexError:
             self.update(index+1)
-        return self.buffer[self.pointer+index]
+            return self.buffer[self.pointer+index]
 
     def prefix(self, length=1):
@@ -133 +135 @@
         if self.pointer+length+1 >= len(self.buffer):
             self.update(length+1)
-        for k in range(length):
+        while length:
             ch = self.buffer[self.pointer]
             self.pointer += 1
@@ -143 +145 @@
             elif ch != u'\uFEFF':
                 self.column += 1
+            length -= 1
 
     def get_mark(self):

pyyaml/trunk/lib/yaml/representer.py

@@ -196 +196 @@
     while repr(inf_value) != repr(inf_value*inf_value):
         inf_value *= inf_value
-    nan_value = inf_value/inf_value
-
-    repr_pos_inf = repr(inf_value)
-    repr_neg_inf = repr(-inf_value)
-    repr_nan = repr(inf_value/inf_value)
 
     def represent_float(self, data):
-        repr_data = repr(data)
-        if repr_data == self.repr_pos_inf:
+        if data != data or (data == 0.0 and data == 1.0):
+            value = u'.nan'
+        elif data == self.inf_value:
             value = u'.inf'
-        elif repr_data == self.repr_neg_inf:
+        elif data == -self.inf_value:
             value = u'-.inf'
-        elif repr_data == self.repr_nan:
-            value = u'.nan'
-        else:
-            value = unicode(repr_data)
+        else:
+            value = unicode(repr(data))
         return self.represent_scalar(u'tag:yaml.org,2002:float', value)