lizard 1.18.0__tar.gz → 1.19.0__tar.gz

{lizard-1.18.0 → lizard-1.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.18.0
+Version: 1.19.0
 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/
@@ -48,31 +48,32 @@ code analysis.
 
 A list of supported languages:
 
+-  C# (C Sharp)
 -  C/C++ (works with C++14)
+-  Erlang
+-  Fortran
+-  GDScript
+-  Golang
 -  Java
--  C# (C Sharp)
 -  JavaScript (With ES6 and JSX)
--  TypeScript (With TSX)
--  VueJS
+-  Kotlin
+-  Lua
 -  Objective-C
--  Swift
+-  Perl
+-  PHP
+-  PL/SQL
 -  Python
+-  R
 -  Ruby
--  TTCN-3
--  PHP
--  Scala
--  GDScript
--  Golang
--  Lua
 -  Rust
--  Fortran
--  Kotlin
+-  Scala
 -  Solidity
--  Erlang
--  Zig
--  Perl
 -  Structured Text (St)
--  R
+-  Swift
+-  TTCN-3
+-  TypeScript (With TSX)
+-  VueJS
+-  Zig
 
 By default lizard will search for any source code that it knows and mix
 all the results together. This might not be what you want. You can use
@@ -160,7 +161,7 @@ Options
                         search for all languages it knows. `lizard -l cpp -l java`searches for
                         C++ and Java code. The available languages are: cpp, java, csharp,
                         javascript, python, objectivec, ttcn, ruby, php, swift, scala, GDScript,
-                        go, lua, rust, typescript
+                        go, lua, rust, typescript, plsql
   -V, --verbose         Output in verbose mode (long function name)
   -C CCN, --CCN CCN     Threshold for cyclomatic complexity number warning. The default value is
                         15. Functions with CCN bigger than it will generate warning
@@ -195,7 +196,7 @@ Options
   -X, --xml             Generate XML in cppncss style instead of the tabular output. Useful to
                         generate report in Jenkins server
   --csv                 Generate CSV output as a transform of the default output
-  -H, --html            Output HTML report
+  -H, --html            Output HTML report with interactive DataTables (sortable, searchable, filterable)
   --checkstyle          Generate Checkstyle XML output for integration with Jenkins and other tools
   -m, --modified        Calculate modified cyclomatic complexity number , which count a
                         switch/case with multiple cases as one CCN.
@@ -413,5 +414,14 @@ Lizard is also used as a plugin for fastlane to help check code complexity and s
 - `European research project FASTEN (Fine-grained Analysis of SofTware Ecosystems as Networks, <http://fasten-project.eu/)>`_
   - `for a quality analyzer <https://github.com/fasten-project/quality-analyzer>`_
 
+How To Contribute
+-----------------
+
+Contributions are welcome. Please refer to the rules and development workflow in:
+
+- https://github.com/terryyin/lizard/tree/master/.cursor/rules
+
+These guidelines are usable by both AI assistants and human contributors — what works for AI works for "I" as well — to keep changes cohesive, simple, and well-tested.
+
 
 

{lizard-1.18.0 → lizard-1.19.0}/README.rst

@@ -17,31 +17,32 @@ code analysis.
 
 A list of supported languages:
 
+-  C# (C Sharp)
 -  C/C++ (works with C++14)
+-  Erlang
+-  Fortran
+-  GDScript
+-  Golang
 -  Java
--  C# (C Sharp)
 -  JavaScript (With ES6 and JSX)
--  TypeScript (With TSX)
--  VueJS
+-  Kotlin
+-  Lua
 -  Objective-C
--  Swift
+-  Perl
+-  PHP
+-  PL/SQL
 -  Python
+-  R
 -  Ruby
--  TTCN-3
--  PHP
--  Scala
--  GDScript
--  Golang
--  Lua
 -  Rust
--  Fortran
--  Kotlin
+-  Scala
 -  Solidity
--  Erlang
--  Zig
--  Perl
 -  Structured Text (St)
--  R
+-  Swift
+-  TTCN-3
+-  TypeScript (With TSX)
+-  VueJS
+-  Zig
 
 By default lizard will search for any source code that it knows and mix
 all the results together. This might not be what you want. You can use
@@ -129,7 +130,7 @@ Options
                         search for all languages it knows. `lizard -l cpp -l java`searches for
                         C++ and Java code. The available languages are: cpp, java, csharp,
                         javascript, python, objectivec, ttcn, ruby, php, swift, scala, GDScript,
-                        go, lua, rust, typescript
+                        go, lua, rust, typescript, plsql
   -V, --verbose         Output in verbose mode (long function name)
   -C CCN, --CCN CCN     Threshold for cyclomatic complexity number warning. The default value is
                         15. Functions with CCN bigger than it will generate warning
@@ -164,7 +165,7 @@ Options
   -X, --xml             Generate XML in cppncss style instead of the tabular output. Useful to
                         generate report in Jenkins server
   --csv                 Generate CSV output as a transform of the default output
-  -H, --html            Output HTML report
+  -H, --html            Output HTML report with interactive DataTables (sortable, searchable, filterable)
   --checkstyle          Generate Checkstyle XML output for integration with Jenkins and other tools
   -m, --modified        Calculate modified cyclomatic complexity number , which count a
                         switch/case with multiple cases as one CCN.
@@ -382,3 +383,12 @@ Lizard is also used as a plugin for fastlane to help check code complexity and s
 - `European research project FASTEN (Fine-grained Analysis of SofTware Ecosystems as Networks, <http://fasten-project.eu/)>`_
   - `for a quality analyzer <https://github.com/fasten-project/quality-analyzer>`_
 
+How To Contribute
+-----------------
+
+Contributions are welcome. Please refer to the rules and development workflow in:
+
+- https://github.com/terryyin/lizard/tree/master/.cursor/rules
+
+These guidelines are usable by both AI assistants and human contributors — what works for AI works for "I" as well — to keep changes cohesive, simple, and well-tested.
+

{lizard-1.18.0 → lizard-1.19.0}/lizard.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.18.0
+Version: 1.19.0
 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/
@@ -48,31 +48,32 @@ code analysis.
 
 A list of supported languages:
 
+-  C# (C Sharp)
 -  C/C++ (works with C++14)
+-  Erlang
+-  Fortran
+-  GDScript
+-  Golang
 -  Java
--  C# (C Sharp)
 -  JavaScript (With ES6 and JSX)
--  TypeScript (With TSX)
--  VueJS
+-  Kotlin
+-  Lua
 -  Objective-C
--  Swift
+-  Perl
+-  PHP
+-  PL/SQL
 -  Python
+-  R
 -  Ruby
--  TTCN-3
--  PHP
--  Scala
--  GDScript
--  Golang
--  Lua
 -  Rust
--  Fortran
--  Kotlin
+-  Scala
 -  Solidity
--  Erlang
--  Zig
--  Perl
 -  Structured Text (St)
--  R
+-  Swift
+-  TTCN-3
+-  TypeScript (With TSX)
+-  VueJS
+-  Zig
 
 By default lizard will search for any source code that it knows and mix
 all the results together. This might not be what you want. You can use
@@ -160,7 +161,7 @@ Options
                         search for all languages it knows. `lizard -l cpp -l java`searches for
                         C++ and Java code. The available languages are: cpp, java, csharp,
                         javascript, python, objectivec, ttcn, ruby, php, swift, scala, GDScript,
-                        go, lua, rust, typescript
+                        go, lua, rust, typescript, plsql
   -V, --verbose         Output in verbose mode (long function name)
   -C CCN, --CCN CCN     Threshold for cyclomatic complexity number warning. The default value is
                         15. Functions with CCN bigger than it will generate warning
@@ -195,7 +196,7 @@ Options
   -X, --xml             Generate XML in cppncss style instead of the tabular output. Useful to
                         generate report in Jenkins server
   --csv                 Generate CSV output as a transform of the default output
-  -H, --html            Output HTML report
+  -H, --html            Output HTML report with interactive DataTables (sortable, searchable, filterable)
   --checkstyle          Generate Checkstyle XML output for integration with Jenkins and other tools
   -m, --modified        Calculate modified cyclomatic complexity number , which count a
                         switch/case with multiple cases as one CCN.
@@ -413,5 +414,14 @@ Lizard is also used as a plugin for fastlane to help check code complexity and s
 - `European research project FASTEN (Fine-grained Analysis of SofTware Ecosystems as Networks, <http://fasten-project.eu/)>`_
   - `for a quality analyzer <https://github.com/fasten-project/quality-analyzer>`_
 
+How To Contribute
+-----------------
+
+Contributions are welcome. Please refer to the rules and development workflow in:
+
+- https://github.com/terryyin/lizard/tree/master/.cursor/rules
+
+These guidelines are usable by both AI assistants and human contributors — what works for AI works for "I" as well — to keep changes cohesive, simple, and well-tested.
+
 
 

{lizard-1.18.0 → lizard-1.19.0}/lizard.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ lizard_languages/lua.py
 lizard_languages/objc.py
 lizard_languages/perl.py
 lizard_languages/php.py
+lizard_languages/plsql.py
 lizard_languages/python.py
 lizard_languages/r.py
 lizard_languages/ruby.py

{lizard-1.18.0 → lizard-1.19.0}/lizard_ext/htmloutput.py

@@ -48,6 +48,12 @@ TEMPLATE = '''<!DOCTYPE HTML PUBLIC
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>Code complexity report</title>
+  <!-- DataTables CSS -->
+  <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
+  <!-- jQuery -->
+  <script src="https://code.jquery.com/jquery-3.7.0.min.js"></script>
+  <!-- DataTables JS -->
+  <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
   <style>
     h2
     {
@@ -88,6 +94,42 @@ TEMPLATE = '''<!DOCTYPE HTML PUBLIC
           font-family: sans-serif;
           white-space: nowrap;
         }
+    td.file-header
+        {
+          background-color: LightBlue;
+          font-weight: bold;
+        }
+    td.function-name
+        {
+          background-color: LightSteelBlue;
+        }
+    /* DataTables wrapper styling */
+    .dataTables_wrapper {
+          margin: 0 auto;
+          width: 95%;
+        }
+    /* Fallback styling if DataTables CSS doesn't load */
+    table#complexityTable {
+          border-collapse: collapse;
+          width: 95%;
+          margin: 0 auto;
+        }
+    table#complexityTable th {
+          background-color: #4CAF50;
+          color: white;
+          padding: 10px;
+          text-align: left;
+          border: 1px solid #ddd;
+        }
+    table#complexityTable td {
+          border: 1px solid #ddd;
+        }
+    table#complexityTable tr:nth-child(even) {
+          background-color: #f2f2f2;
+        }
+    table#complexityTable tr:hover {
+          background-color: #ddd;
+        }
   </style>
  </head>
  <body>
@@ -95,26 +137,29 @@ TEMPLATE = '''<!DOCTYPE HTML PUBLIC
 
 <center>
 
-<table>
+<table id="complexityTable" class="display" style="width:100%">
+  <thead>
+    <tr>
+      <th>File</th>
+      <th>Function name</th>
+      <th>Cyclomatic complexity ({{ thresholds["cyclomatic_complexity"] }})</th>
+      <th>LOC ({{ thresholds["nloc"] }})</th>
+      <th>
+        {% if thresholds["token_count"] %}
+           Token count ({{ thresholds["token_count"] }})
+        {% else %}
+           Token count
+        {% endif %}
+      </th>
+      <th>Parameter count ({{ thresholds["parameter_count"] }})</th>
+    </tr>
+  </thead>
+  <tbody>
 {% for file in files %}
-  <tr><td colspan="7" style="background-color:LightBlue;">
-  Source file: <b>{{ file.filename }}</b></td></tr>
-{% if file.functions|length > 0 %}
-<tr><th>Function name</th><th></th><th>
-Cyclomatic complexity
-({{ thresholds["cyclomatic_complexity"] }})
-</th><th>LOC ({{ thresholds["nloc"] }})</th><th>
-    {% if thresholds["token_count"] %}
-       Token count ({{ thresholds["token_count"] }})
-    {% else %}
-       Token count
-    {% endif %}
-</th><th>Parameter count ({{ thresholds["parameter_count"] }})</th></tr>
-{% endif %}
   {% for func in file.functions %}
   <tr>
-    <td style="background-color:LightSteelBlue">{{ func.name }}</td>
-    <td></td>
+    <td>{{ file.filename }}</td>
+    <td class="function-name">{{ func.name }}</td>
     {% if func.cyclomatic_complexity > thresholds["cyclomatic_complexity"] %}
        <td class="greater-value">{{ func.cyclomatic_complexity }}</td>
     {% else %}
@@ -145,6 +190,7 @@ Cyclomatic complexity
   </tr>
   {% endfor %}
 {% endfor %}
+  </tbody>
 </table>
 <center>
 
@@ -154,6 +200,29 @@ Cyclomatic complexity
     <a href="http://www.lizard.ws/">Lizard</a> on {{ date }}
     </td></tr>
 </table>
+
+<script>
+// Gracefully degrade if CDN is unavailable
+if (typeof jQuery !== 'undefined' && typeof jQuery.fn.dataTable !== 'undefined') {
+    $(document).ready(function() {
+        try {
+            $('#complexityTable').DataTable({
+                "pageLength": 25,
+                "order": [[2, "desc"]],  // Sort by cyclomatic complexity descending by default
+                "columnDefs": [
+                    { "type": "num", "targets": [2, 3, 4, 5] }  // Ensure numeric sorting for metric columns
+                ]
+            });
+        } catch (e) {
+            console.warn('DataTables initialization failed. Displaying static table.', e);
+        }
+    });
+} else {
+    // Fallback: Table will display as static HTML
+    console.info('DataTables not available. Displaying static HTML table.');
+}
+</script>
+
  </body>
 </html>
 

{lizard-1.18.0 → lizard-1.19.0}/lizard_ext/lizardnd.py

@@ -45,11 +45,43 @@ class LizardExtension(object):  # pylint: disable=R0903
         else:
             indent_indicator = ';'
         for token in tokens:
-            if token in loops:
+            # Handle opening parenthesis - start of condition
+            if token == '(':
+                reader.context.set_in_condition(True)
+                reader.context.increment_condition_depth()
+                reader.context.set_logical_operator_added(False)  # Reset for new condition
+            # Handle closing parenthesis - end of condition
+            elif token == ')':
+                reader.context.decrement_condition_depth()
+                if reader.context.get_condition_depth() == 0:
+                    reader.context.set_in_condition(False)
+                    reader.context.set_logical_operator_added(False)
+            
+            # Handle logical operators && and || within conditions
+            elif token in ('&&', '||'):
+                if reader.context.get_in_condition():
+                    # Only add nesting depth for the first logical operator in a condition
+                    # Subsequent && or || operators in the same condition don't add depth
+                    if not reader.context.get_logical_operator_added():
+                        l_depth = reader.context.add_nd_condition()
+                        if not reader.context.get_loop_status():
+                            reader.context.add_hidden_bracket_condition()
+                            reader.context.loop_bracket_status()
+                        reader.context.set_logical_operator_added(True)
+                else:
+                    # Not in a condition, treat as regular nesting
+                    l_depth = reader.context.add_nd_condition()
+                    if not reader.context.get_loop_status():
+                        reader.context.add_hidden_bracket_condition()
+                        reader.context.loop_bracket_status()
+            
+            # Handle other loop keywords (if, for, while, etc.)
+            elif token in loops and token not in ('&&', '||'):
                 l_depth = reader.context.add_nd_condition()
                 if not reader.context.get_loop_status():
                     reader.context.add_hidden_bracket_condition()
                     reader.context.loop_bracket_status()
+            
             if token == loop_indicator:
                 reader.context.loop_bracket_status()
             if token == bracket:
@@ -82,6 +114,7 @@ class NDFileInfoAddition(FileInfoBuilder):
         self.current_function.nesting_depth = 0
         self.current_function.hidden_bracket = 0
         self.current_function.bracket_loop = False
+        self.reset_condition_tracking()
 
     def add_hidden_bracket_condition(self, inc=1):
         self.current_function.hidden_bracket += inc
@@ -96,6 +129,33 @@ class NDFileInfoAddition(FileInfoBuilder):
     def get_loop_status(self):
         return self.current_function.bracket_loop
 
+    def set_in_condition(self, in_condition):
+        self.current_function.in_condition = in_condition
+
+    def get_in_condition(self):
+        return self.current_function.in_condition
+
+    def increment_condition_depth(self):
+        self.current_function.condition_depth += 1
+
+    def decrement_condition_depth(self):
+        if self.current_function.condition_depth > 0:
+            self.current_function.condition_depth -= 1
+
+    def get_condition_depth(self):
+        return self.current_function.condition_depth
+
+    def reset_condition_tracking(self):
+        self.current_function.in_condition = False
+        self.current_function.condition_depth = 0
+        self.current_function.logical_operator_added = False
+
+    def set_logical_operator_added(self, added):
+        self.current_function.logical_operator_added = added
+
+    def get_logical_operator_added(self):
+        return self.current_function.logical_operator_added
+
 
 def get_method(cls, name):
     """ python3 doesn't need the __func__ to get the func of the
@@ -127,6 +187,9 @@ def _init_nesting_depth_data(self, *_):
     self.max_nesting_depth = 0
     self.hidden_bracket = 0
     self.bracket_loop = False
+    self.in_condition = False  # Track if we're inside a condition
+    self.condition_depth = 0   # Track nesting depth within conditions
+    self.logical_operator_added = False  # Track if we've added nesting for logical operators in current condition
 
 
 patch(NDFileInfoAddition, FileInfoBuilder)

{lizard-1.18.0 → lizard-1.19.0}/lizard_ext/version.py

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

{lizard-1.18.0 → lizard-1.19.0}/lizard_languages/__init__.py

@@ -26,6 +26,7 @@ from .vue import VueReader
 from .perl import PerlReader
 from .st import StReader
 from .r import RReader
+from .plsql import PLSQLReader
 
 
 def languages():
@@ -56,6 +57,7 @@ def languages():
         PerlReader,
         StReader,
         RReader,
+        PLSQLReader,
     ]
 
 

{lizard-1.18.0 → lizard-1.19.0}/lizard_languages/clike.py

@@ -54,7 +54,7 @@ class CLikeReader(CodeReader, CCppCommentsMixin):
                     elif macro.group(1) == 'include':
                         yield "#include"
                         yield macro.group(2) or "\"\""
-                    for _ in macro.group(2).splitlines()[1:]:
+                    for _ in macro.group(2).split('\n')[1:]:
                         yield '\n'
                 else:
                     yield token

{lizard-1.18.0 → lizard-1.19.0}/lizard_languages/code_reader.py

@@ -138,7 +138,7 @@ class CodeReader:
                 r"|\/\/" + _until_end +
                 r"|\#" +
                 r"|:=|::|\*\*" +
-                r"|\<\s*\?(?:\s*extends\s+\w+)?\s*\>" +
+                r"|\<(?=(?:[^<>]*\?)+[^<>]*\>)(?:[\w\s,.?]|(?:extends))+\>" +
                 r"|" + r"|".join(re.escape(s) for s in combined_symbols) +
                 r"|\\\n" +
                 r"|\n" +