Eliminate interfaces which lead one to believe that streams are random access

rubys · rubys · commit b1bf2ebc768e · 2007-06-07T19:47:12.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40678
diff --git a/src/inputstream.py b/src/inputstream.py
@@ -64,7 +64,7 @@ def __init__(self, source, encoding=None, parseMeta=True, chardet=True):
         self.queue = []
 
         # Reset position in the list to read from
-        self.reset()
+        self.tell = 0
 
     def openStream(self, source):
         """Produces a file object from source.
@@ -122,7 +122,6 @@ def detectBOM(self):
         }
 
         # Go to beginning of file and read in 4 bytes
-        self.rawStream.seek(0)
         string = self.rawStream.read(4)
 
         # Try detecting the BOM using bytes from the string
@@ -163,10 +162,6 @@ def position(self):
         col = tell - self.newLines[line-1] - 1
         return (line, col)
 
-    def reset(self):
-        """Resets the position in the stream back to the start."""
-        self.tell = 0
-
     def char(self):
         """ Read one character from the stream or queue if available. Return
             EOF when EOF is reached.
diff --git a/src/tokenizer.py b/src/tokenizer.py
@@ -77,7 +77,6 @@ def __iter__(self):
         to return we yield the token which pauses processing until the next token
         is requested.
         """
-        self.stream.reset()
         self.tokenQueue = []
         # Start processing. When EOF is reached self.state will return False
         # instead of True and the loop will terminate.
