[javascriptlint-commit] SF.net SVN: javascriptlint:[339] trunk/jsengine/tokenizer/__init__.py

[<mat...@us...>]

Revision: 339
          http://sourceforge.net/p/javascriptlint/code/339
Author:   matthiasmiller
Date:     2013-10-09 20:33:12 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
Simplify TokenStream.get_offset

Modified Paths:
--------------
    trunk/jsengine/tokenizer/__init__.py

Modified: trunk/jsengine/tokenizer/__init__.py
===================================================================
--- trunk/jsengine/tokenizer/__init__.py	2013-10-09 20:30:33 UTC (rev 338)
+++ trunk/jsengine/tokenizer/__init__.py	2013-10-09 20:33:12 UTC (rev 339)
@@ -156,8 +156,8 @@
         self._offset = 0
         self._watched_offset = None
 
-    def get_offset(self, offset=0):
-        return self._start_offset + self._offset + offset
+    def get_offset(self):
+        return self._start_offset + self._offset
 
     def watch_reads(self):
         self._watched_offset = self._offset
@@ -175,7 +175,7 @@
         if self._offset < len(self._content):
             self._offset += 1
             return self._content[self._offset - 1]
-        raise JSSyntaxError(self.get_offset(-1), 'unexpected_eof')
+        raise JSSyntaxError(self.get_offset()-1, 'unexpected_eof')
 
     def readchrif(self, seq):
         s = self.peekchrif(seq)
@@ -240,7 +240,7 @@
         self._readahead()
         if self._peeked[-1].tok == tok.DIV:
             token = self._parse_rest_of_regexp()
-            token.set_offset(self._peeked[-1].start_offset, self._stream.get_offset(-1))
+            token.set_offset(self._peeked[-1].start_offset, self._stream.get_offset()-1)
             self._peeked = []
             if token.tok == tok.ERROR:
                 self._error = True
@@ -275,7 +275,7 @@
         while True:
             start_offset = self._stream.get_offset()
             peek = self._next()
-            end_offset = self._stream.get_offset(-1)
+            end_offset = self._stream.get_offset()-1
             if peek.tok == tok.ERROR:
                 peek.set_offset(end_offset, end_offset)
             else:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.