Fix test_newlines

rubys · rubys · commit c69c7264ad74 · 2007-06-19T14:55:32.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40769
diff --git a/src/inputstream.py b/src/inputstream.py
@@ -204,17 +204,11 @@ def charsUntil(self, characters, opposite = False):
         # Put the character stopped on back to the front of the queue
         # from where it came.
         c = charStack.pop()
-        self.queue.insert(0, c)
-        
-        # XXX the following is need for correct line number reporting apparently
-        # but it causes to break other tests with the fixes in tokenizer. I have
-        # no idea why...
-        #
-        #if c != EOF and self.tell <= len(self.dataStream) and \
-        #  self.dataStream[self.tell - 1] == c[0]:
-        #    self.tell -= 1
-        #else:
-        #    self.queue.insert(0, c)
+        if c != EOF and self.tell > 0 and not self.queue and \
+          self.dataStream[self.tell - 1] == c[0]:
+            self.tell -= 1
+        else:
+            self.queue.insert(0, c)
         return "".join(charStack)
 
 class EncodingBytes(str):
