lizard 1.18.0__py2.py3-none-any.whl → 1.20.0__py2.py3-none-any.whl

{lizard-1.18.0.dist-info → lizard-1.20.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.18.0
+Version: 1.20.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/
 Author: Terry Yin
 Author-email: terry@odd-e.com
 License: MIT
+Download-URL: https://pypi.python.org/lizard/
 Project-URL: Source, https://github.com/terryyin/lizard
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
@@ -50,31 +50,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
@@ -162,7 +163,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
@@ -197,7 +198,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.
@@ -415,5 +416,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.20.0.dist-info/RECORD

@@ -0,0 +1,70 @@
+lizard.py,sha256=B0g5lEp5me31bQpjfMKVayF0iUfH0PalVecOKeUX3-A,41365
+lizard_ext/__init__.py,sha256=UQ2oZ4ej1CCekgiY2Qj8sGx8HheoYyxjcOxvrwF70kc,871
+lizard_ext/auto_open.py,sha256=byD_RbeVhvSUhR2bJMRitvA3zcKEapFwv0-XaDJ6GFo,1096
+lizard_ext/checkstyleoutput.py,sha256=UzDHg837ErEZepXkR8I8YCoz2r1lkmzGctMA7dpyB-M,1245
+lizard_ext/csvoutput.py,sha256=43fhmo8kB85qcdujCwySGNuTC4FkKUPLqIApPeljPnA,2663
+lizard_ext/default_ordered_dict.py,sha256=YbVz6nPlQ6DjWc_EOFBz6AJN2XLo9dpnUdeyejQvUDE,831
+lizard_ext/extension_base.py,sha256=rnjUL2mqSGToUVYydju7fa8ZwynLPY8S1F17gIJP55I,346
+lizard_ext/htmloutput.py,sha256=G7MdLD7AwuR0LLCAkEpyHx4N_ssCcFQdXd7Xg5jZWX0,6537
+lizard_ext/keywords.py,sha256=VxsxoATtKV-8egMKd7I8sd2qbZMtEFEpsszk__6rmjQ,893
+lizard_ext/lizardboolcount.py,sha256=abmMA9X3VFRO5mziicUxWKmHldHNC0jBEe7NKAKA5fs,1062
+lizard_ext/lizardcomplextags.py,sha256=z4Jsz8HNxbZXhDRuUeVnNfgt5Zv4FYEW2kRPO4G3F3E,1027
+lizard_ext/lizardcpre.py,sha256=bVrMXffGUZlydv_zwIVtp-Ij9XyXMFEcap2R4DmLXPU,1277
+lizard_ext/lizarddependencycount.py,sha256=6Nt2z69cyG8P3pceTUCTU6yh4h73lezL2awRFh7K77Y,2423
+lizard_ext/lizarddumpcomments.py,sha256=-c46U3CP_beDfBuB9QhObpiB6wK7xq1u9jeRjgAyU90,683
+lizard_ext/lizardduplicate.py,sha256=tlU-UTB_d_qjekiO4MSaXPBT1FSX8uTaOcfeXnjBzU8,9762
+lizard_ext/lizardduplicated_param_list.py,sha256=_ApeSbjA-NU_rmICsivyfGEEg0-O94wWgWpeeE8F3Zc,1811
+lizard_ext/lizardexitcount.py,sha256=ziAVFi5RgjxJOwAQy6LzdZZflkvvxTiXOIp0FAL0wKQ,692
+lizard_ext/lizardgotocount.py,sha256=w2GWWwqVh4j7Fum41Wvg172b70JvtCm5BCzZUmmTlcM,514
+lizard_ext/lizardignoreassert.py,sha256=sqLwcnJQ06SYqIk901ib4NQ8ECwjIe_qL4T6z1wLXAk,644
+lizard_ext/lizardio.py,sha256=xQN-AgLGLKJarJkgfaqX_TKyupbb7GTcwPxrL2B1J1w,3357
+lizard_ext/lizardmccabe.py,sha256=nLwfYjnAWn1DSoDc-k3iPvltiSX_YmAEdAfM3rOdLSQ,1538
+lizard_ext/lizardmodified.py,sha256=51EY-HM840k_-jFiJugp_fOPBKvovX2Wu0s4ghLM3us,1002
+lizard_ext/lizardnd.py,sha256=h4MaSsFAY5rK8kOSr61LkWntwJWV1KnhaEOWZgp3-c0,7496
+lizard_ext/lizardnonstrict.py,sha256=DWdE2kTn39Gf8UkaRwIO9ogWTDuqA4lXNlQIBT3uLRM,457
+lizard_ext/lizardns.py,sha256=3PYJrXZeFjzFnbotINZBm-MHeS8MQxVNtkQJd_S5fYA,5161
+lizard_ext/lizardoutside.py,sha256=FGm2tbBZ17-2OCgmQlD-vobUCfQKb0FAygf86eM3xuM,336
+lizard_ext/lizardstatementcount.py,sha256=xYk6ixSIItSE1BWQXzrWmduFgGhA3VR817SNKLffyVQ,1182
+lizard_ext/lizardwordcount.py,sha256=2QYXD7-AtkkgAbi9VSidunMbSsGQ7MKYb6IT-bS-cok,7575
+lizard_ext/version.py,sha256=-BXaaeyLOLQJRgob-W_0qvVq5YJw_YJGMzo50rFVFAc,181
+lizard_ext/xmloutput.py,sha256=-cbh0he4O_X-wX56gkv9AnSPNN0qvR7FACqlBeezUS4,5609
+lizard_languages/__init__.py,sha256=DniggHM3SOFlwkP8Tm4csEcisbf7_i1EvfoAkG9Atg0,1611
+lizard_languages/clike.py,sha256=msdvIm5WAlczPUEtl8tK7xobWxxwow1gxgxjr3qURPo,13834
+lizard_languages/code_reader.py,sha256=a5JxBQ_4HAeXiWHfLb6o6aCGJCCIAESRLjJcl3Zx-SY,7875
+lizard_languages/csharp.py,sha256=UDuiG20Ydbb4KMD_mgb82shD37URq3ZvqNLpI77VBPE,3015
+lizard_languages/erlang.py,sha256=tbVPDqi90jV2X1-luDYS32H1zK_2KHwssbJ-tCCOvzg,4249
+lizard_languages/fortran.py,sha256=vwKz1VdwyUtWoECURXuR6e8E2kTR71HtpdbOsmDoyDw,8993
+lizard_languages/gdscript.py,sha256=3mHeCarDq_ilDK_OZ2LOvwfWJqLTzK2lquprLDUnX08,737
+lizard_languages/go.py,sha256=sntz0jOEuj4klPipoTFd16UDK1fAUQfwK7YX_cLMZAc,1346
+lizard_languages/golike.py,sha256=vRIfjTVvc0VmJf27lTOLht55ZF1AQ9wn0Fvu-9WabWk,2858
+lizard_languages/java.py,sha256=HQBTZjUKbUJwgmtLYIzJrWtPpFP3ZdBP_NJK7YOXZC0,6424
+lizard_languages/javascript.py,sha256=vniCNMW-ea9Jpv6c8qCcjLVDYjT8VztjXigp5XRWt0E,317
+lizard_languages/js_style_regex_expression.py,sha256=Xgyogch4xElYtCG4EnBKvalHTl3tjRPcIIcIQRRd61I,1970
+lizard_languages/kotlin.py,sha256=1ao-VOHUrrSluxgGjMcMPIDt_-dqVfT1JOz15PJLJH8,3024
+lizard_languages/lua.py,sha256=3nqBcunBzJrhv4Iqaf8xvbyqxZy3aSxJ-IiHimHFlac,1573
+lizard_languages/objc.py,sha256=2a1teLdaXZBtCeFiIZer1j_sVx9LZ1CbF2XfnqlvLmk,2319
+lizard_languages/perl.py,sha256=lxxdC0KJsr3tmNLMATO7vx3O7yWGgICxHxVTfmu7db8,12111
+lizard_languages/php.py,sha256=BIIxdKd-yeaqIjxw3yoq2ZFlhqQ-F1NNK26BOfRbO5U,10093
+lizard_languages/plsql.py,sha256=Wtny6-YW4Jc6G4EhCgoSuw8D86x6JVREprzaUEyKffw,17261
+lizard_languages/python.py,sha256=-sI7ZzJ1erdmqo1MnCcg5cqn1krUhCHlR_phlhnmd_M,5978
+lizard_languages/r.py,sha256=NHNPDGnWXcl8hMi1VL8OM6nw8F9pP6xZX7EgUIocOec,12930
+lizard_languages/ruby.py,sha256=HL1ZckeuUUJU3QSVAOPsG_Zsl0C6X2PX5_VaWqclzkM,2277
+lizard_languages/rubylike.py,sha256=vnfY2lSeIYEgfjJWrfNL6fg1ISHGiwo32H7bf7Stwos,3604
+lizard_languages/rust.py,sha256=7ioyo-kpy5zSQ6Fwua6GcYopkLUdfyExg6kLP0Br3p0,1027
+lizard_languages/scala.py,sha256=onEuS8IsT7aCB-HV0arVDjmgpezXWndk1RCOgoySUes,1436
+lizard_languages/script_language.py,sha256=SKe45AbO6Z-axbN8KW_g7jf9g7YTXZ6dWzJj4ubDsM8,1172
+lizard_languages/solidity.py,sha256=eg7HQ7cuV1d0Awwj4lTySu9f63F1vrK8czsPt_W5Kqw,680
+lizard_languages/st.py,sha256=QiiGNYE8CzmfmZAF_wLQKovXk1Fyqa8QFGTXM1meNNk,4385
+lizard_languages/swift.py,sha256=JcHmBV-p916K2o2XrTKf98U6Bt9-jAEOS9JqA1W5tkA,2570
+lizard_languages/tnsdl.py,sha256=y2dcZI_PmriNd7UTP1Db9QEpWBzKeoH8odRzkiN-P1k,3009
+lizard_languages/tsx.py,sha256=fY9qzPcSvhHSs-62ZFh0mMGyKVaSCEfsYZxBS_uHzww,17161
+lizard_languages/ttcn.py,sha256=tSkPmtifsuUI5aUKBG-uHvwcmZTWcbtMWoUMF3Cw4cI,2199
+lizard_languages/typescript.py,sha256=SOef4ja2GE-Idt9fSF7d0gZTW6bwCNl8K2IT67nIMyA,14805
+lizard_languages/vue.py,sha256=KXUBUo2R1zNF8Pffrz_KsQEN44m5XFRMoGXylxKUeT0,1038
+lizard_languages/zig.py,sha256=RiDZyjnCn97jqFmcl5EQl7pbuH0G1oI2Qo72EXvdtDU,813
+lizard-1.20.0.dist-info/LICENSE.txt,sha256=05ZjgQ8Cl1dD9p0BhW-Txzkc5rhCogGJVEuf1GT2Y_M,1303
+lizard-1.20.0.dist-info/METADATA,sha256=36pI9t3KO-tvapXxKTbrX1Gc465zs1zQqubteXPS4fY,16697
+lizard-1.20.0.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+lizard-1.20.0.dist-info/entry_points.txt,sha256=pPMMwoHAltzGHqR2WeJQItLeeyR7pbX5R2S_POC-xoo,40
+lizard-1.20.0.dist-info/top_level.txt,sha256=5NTrTaOLhHuTzXaGcZPKfuaOgUv7WafNGe0Zl5aycpg,35
+lizard-1.20.0.dist-info/RECORD,,

lizard_ext/__init__.py

@@ -21,7 +21,6 @@ def print_csv(results, options, _, total_factory):
 
 def print_checkstyle(results, options, _, total_factory, file=None):
     import sys
-    print("DEBUG: print_checkstyle called", file=sys.stderr)
     output = checkstyle_output(total_factory(list(results)), options.verbose)
     if file is None:
         file = sys.stdout

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_ext/lizardcomplextags.py

@@ -5,10 +5,16 @@ that adding the complexity and the line numbers of the keywords appear.
 
 
 class LizardExtension(object):  # pylint: disable=R0903
+    """
+    Complex tags extension: records all complexity-adding keywords and their line numbers.
+    Uses reader.conditions (combined set of all condition types) to track all
+    complexity contributors: control flow, logical operators, case labels, and ternary.
+    """
 
     # pylint: disable=W0221
     def __call__(self, tokens, reader):
         context = reader.context
+        # Use combined conditions set - intentionally includes all types
         conditions = reader.conditions
         for token in tokens:
             yield token

lizard_ext/lizardmccabe.py

@@ -14,9 +14,14 @@ from .extension_base import ExtensionBase
 
 
 class LizardExtension(ExtensionBase):  # pylint: disable=R0903
+    """
+    McCabe extension: only counts the first 'case' in a switch statement.
+    Consecutive cases without code between them don't add to complexity.
+    Works by detecting case tokens (conceptually from reader.case_keywords).
+    """
 
     def _state_global(self, token):
-        if token == "case":
+        if token == "case":  # Detect case keywords
             self._state = self._in_case
 
     def _in_case(self, token):

lizard_ext/lizardmodified.py

@@ -6,14 +6,19 @@ where the whole switch/case will be counted as 1.
 
 
 class LizardExtension(object):  # pylint: disable=R0903
+    """
+    Modified CCN extension: counts entire switch/case as 1 complexity.
+    Adds +1 for 'switch', subtracts -1 for each 'case'.
+    Works with switch/case keywords (conceptually from reader.case_keywords).
+    """
 
     def __call__(self, tokens, reader):
         for token in tokens:
-            if token == 'switch':
+            if token == 'switch':  # Add complexity for switch statement
                 reader.context.add_condition()
                 if hasattr(reader.context, "add_nd_condition"):
                     reader.context.add_nd_condition()
-            elif token == 'case':
+            elif token == 'case':  # Subtract complexity for each case
                 reader.context.add_condition(-1)
                 if hasattr(reader.context, "add_nd_condition"):
                     reader.context.add_nd_condition(-1)

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_ext/lizardnonstrict.py

@@ -9,5 +9,6 @@ class LizardExtension(object):  # pylint: disable=R0903
 
     # pylint: disable=W0221
     def __call__(self, tokens, reader):
-        reader.conditions -= set(['&&', '||', 'and', 'or'])
+        # Remove logical operators from conditions (non-strict mode)
+        reader.conditions -= reader.logical_operators
         return tokens

lizard_ext/lizardns.py

@@ -67,10 +67,35 @@ class LizardExtension(ExtensionBase):  # pylint: disable=R0903
 
     def __init__(self):
         super(LizardExtension, self).__init__(None)
-        self.structure_piles = [0]
+        self.structure_piles = [0]  # Invariant: must always have at least one element
 
-    def pile_up_within_block(self):
+    def _push_scope(self):
+        """Push a new scope level. Safe to call anytime."""
+        self.structure_piles.append(0)
+
+    def _pop_scope(self):
+        """Pop a scope level. Maintains invariant of at least one element."""
+        if len(self.structure_piles) > 1:
+            self.structure_piles.pop()
+
+    def _increment_current_scope(self):
+        """Increment structure count in current scope. Safe even if piles corrupted."""
+        if not self.structure_piles:
+            self.structure_piles = [0]  # Restore invariant
         self.structure_piles[-1] += 1
+
+    def _reset_or_decrement_current_scope(self, decrement=False):
+        """Reset or decrement current scope counter. Safe even if piles corrupted."""
+        if not self.structure_piles:
+            self.structure_piles = [0]  # Restore invariant
+            return
+        if decrement:
+            self.structure_piles[-1] -= 1
+        else:
+            self.structure_piles[-1] = 0
+
+    def pile_up_within_block(self):
+        self._increment_current_scope()
         cur_level = sum(self.structure_piles)
         # Is there a path around _state_global?
         if not hasattr(self.context.current_function, "max_nested_structures"):
@@ -83,10 +108,10 @@ class LizardExtension(ExtensionBase):  # pylint: disable=R0903
         if not hasattr(self.context.current_function, "max_nested_structures"):
             self.context.current_function.max_nested_structures = 0
         if token == '{':
-            self.structure_piles.append(0)
+            self._push_scope()
         elif token in ';}':
             if token == '}':
-                self.structure_piles.pop()
+                self._pop_scope()
             self._state = self._block_ending
         elif token in self.structures:
             self._state = self._in_structure_head
@@ -98,10 +123,8 @@ class LizardExtension(ExtensionBase):  # pylint: disable=R0903
         self._state(token)
 
     def _block_ending(self, token):
-        if token in self.matching_structures:
-            self.structure_piles[-1] -= 1
-        else:
-            self.structure_piles[-1] = 0
+        decrement = token in self.matching_structures
+        self._reset_or_decrement_current_scope(decrement=decrement)
         self._state = self._state_global
         self._state(token)
 

lizard_ext/version.py

@@ -3,4 +3,4 @@
 #
 # pylint: disable=missing-docstring,invalid-name
 
-version = "1.18.0"
+version = "1.20.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_languages/clike.py

@@ -32,8 +32,11 @@ class CLikeReader(CodeReader, CCppCommentsMixin):
 
     @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+)?)" + \
+        # Add pattern for C++ raw string literals R"delimiter(content)delimiter"
+        # The delimiter can be empty or up to 16 chars (excluding parentheses, backslash, whitespace)
+        # Using a simplified pattern that handles most cases
+        addition = r"|R\"[^(\\]*\((?:[^)]|\)[^\"])*\)[^(\\]*\"" + \
+                  r"|(?:\d*\.\d+(?:[eE][-+]?\d+)?)" + \
                   r"|(?:\d+\.(?:\d+)?(?:[eE][-+]?\d+)?)" + \
                   addition
         return CodeReader.generate_tokens(source_code, addition, token_class)
@@ -54,7 +57,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_languages/code_reader.py

@@ -94,12 +94,36 @@ class CodeReader:
     ext = []
     languages = None
     extra_subclasses = set()
-    _conditions = {'if', 'for', 'while', '&&', '||', '?', 'catch', 'case'}
+    
+    # Condition categories - separate types that contribute to cyclomatic complexity
+    _control_flow_keywords = {'if', 'for', 'while', 'catch'}
+    _logical_operators = {'&&', '||'}
+    _case_keywords = {'case'}
+    _ternary_operators = {'?'}
+
+    @classmethod
+    def _build_conditions(cls):
+        """Build combined conditions set from separated categories.
+        
+        Returns combined set of all condition types for CCN calculation.
+        """
+        return (cls._control_flow_keywords | 
+                cls._logical_operators | 
+                cls._case_keywords | 
+                cls._ternary_operators)
 
     def __init__(self, context):
         self.parallel_states = []
         self.context = context
-        self.conditions = copy(self._conditions)
+        
+        # Build combined conditions set from separated categories
+        self.conditions = copy(self.__class__._build_conditions())
+        
+        # Expose individual categories for extensions
+        self.control_flow_keywords = copy(self.__class__._control_flow_keywords)
+        self.logical_operators = copy(self.__class__._logical_operators)
+        self.case_keywords = copy(self.__class__._case_keywords)
+        self.ternary_operators = copy(self.__class__._ternary_operators)
 
     @classmethod
     def match_filename(cls, filename):
@@ -138,7 +162,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" +