refactoring

Author: terryyin

.travis.yml

@@ -4,8 +4,8 @@ python:
   - "3.3"
 install: 
 install:
-  - pip install -e . --use-mirrors
-  - pip install -r dev_requirements.txt --use-mirrors
+  - pip install -e .
+  - pip install -r dev_requirements.txt
   - python setup.py install
 
 script:

Makefile

@@ -1,3 +1,5 @@
+.PHONY: all tests pep8 pylint deps test-deps publish
+
 all: extensive pylint
 extensive: tests pep8
 
@@ -9,3 +11,10 @@ pep8:
 
 pylint:
 	pylint --rcfile pylintrc lizard.py lizard_ext
+
+deps:
+	pip install -r dev_requirements.txt
+
+publish:
+	python setup.py sdist bdist_wheel register upload
+

dev_requirements.txt

@@ -1,2 +1,3 @@
 pep8
 pylint
+nose

lizard.py

@@ -30,7 +30,7 @@
 from fnmatch import fnmatch
 import hashlib
 
-VERSION = "1.8.1"
+VERSION = "1.8.2"
 
 DEFAULT_CCN_THRESHOLD = 15
 
@@ -330,8 +330,8 @@ def generate_tokens(source_code, addition=''):
                             '*=', '/=', '^=', '&=', '|=']
         token_pattern = re.compile(
             r"(?:\w+" +
-            addition +
             r"|/\*.*?\*/" +
+            addition +
             r"|\"(?:\\.|[^\"])*\"" +
             r"|\'(?:\\.|[^\'])*?\'" +
             r"|//" + _until_end +

test/testJavaScript.py

@@ -11,6 +11,8 @@ class Test_tokenizing_JavaScript(unittest.TestCase):
 
     def check_tokens(self, expect, source):
         tokens = list(JavaScriptReader.generate_tokens(source))
+        if expect != tokens:
+            print tokens
         self.assertEqual(expect, tokens)
 
     def test_tokenizing_javascript_regular_expression(self):
@@ -25,6 +27,8 @@ def test_should_not_confuse_division_as_regx(self):
     def test_tokenizing_javascript_regular_expression(self):
         self.check_tokens(['a', '=', '/ab/'], 'a=/ab/')
 
+    def test_tokenizing_javascript_comments(self):
+        self.check_tokens(['/**a/*/'], '''/**a/*/''')
 
 class Test_parser_for_JavaScript(unittest.TestCase):
 

test/testTokenizer.py

@@ -103,3 +103,8 @@ def test_with_c_comments(self):
         tokens = generate_tokens('/*abc\n*/ t')
         self.assertTrue('t' in tokens)
 
+    def test_with_c_comments_with_backslash_in_it(self):
+        comment = '/**a/*/'
+        tokens = generate_tokens(comment)
+        self.assertListEqual([comment], tokens)
+