lizard 1.17.17__tar.gz → 1.17.19__tar.gz

{lizard-1.17.17 → lizard-1.17.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.17.17
+Version: 1.17.19
 Summary: A code analyzer without caring the C/C++ header files. It works with Java, C/C++, JavaScript, Python, Ruby, Swift, Objective C. Metrics includes cyclomatic complexity number etc.
 Home-page: http://www.lizard.ws
 Download-URL: https://pypi.python.org/lizard/

{lizard-1.17.17 → lizard-1.17.19}/lizard.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.17.17
+Version: 1.17.19
 Summary: A code analyzer without caring the C/C++ header files. It works with Java, C/C++, JavaScript, Python, Ruby, Swift, Objective C. Metrics includes cyclomatic complexity number etc.
 Home-page: http://www.lizard.ws
 Download-URL: https://pypi.python.org/lizard/

{lizard-1.17.17 → lizard-1.17.19}/lizard.py

@@ -284,6 +284,7 @@ class FunctionInfo(Nesting):  # pylint: disable=R0902
         self.fan_in = 0
         self.fan_out = 0
         self.general_fan_out = 0
+        self.max_nesting_depth = 0  # Initialize max_nesting_depth to 0
 
     @property
     def name_in_space(self):

{lizard-1.17.17 → lizard-1.17.19}/lizard_ext/version.py

@@ -3,4 +3,4 @@
 #
 # pylint: disable=missing-docstring,invalid-name
 
-version = "1.17.17"
+version = "1.17.19"

{lizard-1.17.17 → lizard-1.17.19}/lizard_languages/clike.py

@@ -30,6 +30,14 @@ class CLikeReader(CodeReader, CCppCommentsMixin):
                 CLikeNestingStackStates(context),
                 CppRValueRefStates(context))
 
+    @staticmethod
+    def generate_tokens(source_code, addition='', token_class=None):
+        # Add pattern for floating point literals to the token generation
+        addition = r"|(?:\d*\.\d+(?:[eE][-+]?\d+)?)" + \
+                  r"|(?:\d+\.(?:\d+)?(?:[eE][-+]?\d+)?)" + \
+                  addition
+        return CodeReader.generate_tokens(source_code, addition, token_class)
+
     def preprocess(self, tokens):
         tilde = False
         for token in tokens:

lizard-1.17.19/lizard_languages/go.py

@@ -0,0 +1,45 @@
+'''
+Language parser for Go lang
+'''
+
+from .code_reader import CodeReader
+from .clike import CCppCommentsMixin
+from .golike import GoLikeStates
+
+
+class GoReader(CodeReader, CCppCommentsMixin):
+    # pylint: disable=R0903
+
+    ext = ['go']
+    language_names = ['go']
+
+    def __init__(self, context):
+        super(GoReader, self).__init__(context)
+        self.parallel_states = [GoStates(context)]
+
+    @staticmethod
+    def generate_tokens(source_code, addition='', token_class=None):
+        addition = addition + r"|`[^`]*`"  # Add support for backtick-quoted strings
+        return CodeReader.generate_tokens(source_code, addition, token_class)
+
+    def __call__(self, tokens, reader):
+        self.context = reader.context
+        for token in tokens:
+            # Skip counting ? in backtick-quoted strings
+            if token.startswith('`') and token.endswith('`'):
+                for state in self.parallel_states:
+                    state(token)
+                yield token
+                continue
+            
+            # For non-backtick tokens, process normally
+            for state in self.parallel_states:
+                state(token)
+            yield token
+        for state in self.parallel_states:
+            state.statemachine_before_return()
+        self.eof()
+
+
+class GoStates(GoLikeStates):  # pylint: disable=R0903
+    pass

{lizard-1.17.17 → lizard-1.17.19}/lizard_languages/java.py

@@ -123,12 +123,13 @@ class JavaFunctionBodyStates(JavaStates):
         if token == "(":
             self.sub_state(JavaFunctionBodyStates(self.context), None, token)
             return
+        print(token)
         if token == "{":
             def callback():
                 self.next(self._state_global)
             self.sub_state(JavaClassBodyStates("(anonymous)", False, self.context), callback, token)
             return
-        self.next(self._state_global)
+        self.next(self._state_global, token)
 
 class JavaClassBodyStates(JavaStates):
     def __init__(self, class_name, is_record, context):

{lizard-1.17.17 → lizard-1.17.19}/lizard_languages/python.py

@@ -42,7 +42,8 @@ class PythonReader(CodeReader, ScriptLanguageMixIn):
     def generate_tokens(source_code, addition='', token_class=None):
         return ScriptLanguageMixIn.generate_common_tokens(
             source_code,
-            r"|\'\'\'.*?\'\'\'" + r'|\"\"\".*?\"\"\"',
+            r"|(?:\"\"\"(?:\\.|[^\"]|\"(?!\"\")|\"\"(?!\"))*\"\"\")" + 
+            r"|(?:\'\'\'(?:\\.|[^\']|\'(?!\'\')|\'\'(?!\'))*\'\'\')",
             token_class)
 
     def preprocess(self, tokens):

{lizard-1.17.17 → lizard-1.17.19}/test/testOutput.py

@@ -86,6 +86,15 @@ class TestWarningOutput(StreamStdoutTestCase):
         self.option.sorting = ['cyclomatic_complexity']
         print_warnings(self.option, self.scheme, (x for x in []))
 
+    def test_warning_when_max_nesting_depth_missing(self):
+        self.foo.cyclomatic_complexity = 30
+        # Intentionally not setting max_nesting_depth
+        fileSummary = FileInformation("FILENAME", 123, [self.foo])
+        scheme = OutputScheme([Ext()])
+        count = print_clang_style_warning([fileSummary], self.option, scheme, None)
+        self.assertIn("FILENAME:100: warning: foo has 1 NLOC, 30 CCN, 1 token, 0 PARAM, 1 length", sys.stdout.stream)
+        self.assertEqual(1, count)
+
 
 class TestFileInformationOutput(StreamStdoutTestCase):
 

lizard-1.17.17/lizard_languages/go.py

@@ -1,22 +0,0 @@
-'''
-Language parser for Go lang
-'''
-
-from .code_reader import CodeReader
-from .clike import CCppCommentsMixin
-from .golike import GoLikeStates
-
-
-class GoReader(CodeReader, CCppCommentsMixin):
-    # pylint: disable=R0903
-
-    ext = ['go']
-    language_names = ['go']
-
-    def __init__(self, context):
-        super(GoReader, self).__init__(context)
-        self.parallel_states = [GoStates(context)]
-
-
-class GoStates(GoLikeStates):  # pylint: disable=R0903
-    pass