[javascriptlint-commit] SF.net SVN: javascriptlint:[350] trunk

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

Revision: 350
          http://sourceforge.net/p/javascriptlint/code/350
Author:   matthiasmiller
Date:     2014-02-10 23:48:14 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Fix traceback on expected_tok error.

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

Added Paths:
-----------
    trunk/tests/errors/expected_tok.js

Modified: trunk/javascriptlint/warnings.py
===================================================================
--- trunk/javascriptlint/warnings.py	2014-02-10 15:09:21 UTC (rev 349)
+++ trunk/javascriptlint/warnings.py	2014-02-10 23:48:14 UTC (rev 350)
@@ -124,9 +124,10 @@
        errdesc = warnings[errname]
 
     try:
-        errdesc = re.sub(r"{(\w+)}", lambda match: errargs[match.group(1)], errdesc)
+        keyword = re.compile(r"{(\w+)}")
+        errdesc = keyword.sub(lambda match: errargs[match.group(1)], errdesc)
     except (TypeError, KeyError):
-        raise KeyError('Invalid keyword in error: ' + errdesc)
+        raise KeyError('Invalid keyword in error %s: %s' % (errname, errdesc))
     return errdesc
 
 _visitors = []

Modified: trunk/jsengine/tokenizer/__init__.py
===================================================================
--- trunk/jsengine/tokenizer/__init__.py	2014-02-10 15:09:21 UTC (rev 349)
+++ trunk/jsengine/tokenizer/__init__.py	2014-02-10 23:48:14 UTC (rev 350)
@@ -170,7 +170,7 @@
         encountered = self.advance()
         if encountered.tok != tok:
             raise JSSyntaxError(encountered.start_offset, 'expected_tok',
-                                { 'token': tok })
+                                { 'token': tok.getliteral() })
         return encountered
 
     def expect_identifiername(self):

Added: trunk/tests/errors/expected_tok.js
===================================================================
--- trunk/tests/errors/expected_tok.js	                        (rev 0)
+++ trunk/tests/errors/expected_tok.js	2014-02-10 23:48:14 UTC (rev 350)
@@ -0,0 +1,4 @@
+function expected_tok() {
+    return { a, }; /*warning:expected_tok*/
+}
+

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