mcpp 1.3.2__tar.gz → 1.3.3__tar.gz

{mcpp-1.3.2/src/mcpp.egg-info → mcpp-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpp
-Version: 1.3.2
+Version: 1.3.3
 Summary: McCabe++ (mcpp): cyclomatic complexity and other vulnerability-related code metrics
 Author-email: Lukas Pirch <lukas.pirch@tu-berlin.de>
 License: MIT License

{mcpp-1.3.2 → mcpp-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcpp"
-version = "1.3.2"
+version = "1.3.3"
 description = "McCabe++ (mcpp): cyclomatic complexity and other vulnerability-related code metrics"
 readme = "README.md"
 authors = [{name = "Lukas Pirch", email="lukas.pirch@tu-berlin.de"}]

{mcpp-1.3.2 → mcpp-1.3.3}/src/mcpp/complexity.py

@@ -43,10 +43,12 @@ def c2(root, sitter, lang, calls=None):
     """number of for, while and do-while loops"""
     loops = {
         "Q_FOR_STMT": Q_FOR_STMT,
-        "Q_FOR_RANGE_STMT": Q_FOR_RANGE_STMT,
         "Q_WHILE_STMT": Q_WHILE_STMT,
         "Q_DO_STMT": Q_DO_STMT,
-    } 
+    }
+    if lang == "cpp":
+        loops.update({"Q_FOR_RANGE_STMT": Q_FOR_RANGE_STMT})
+        
     sitter.add_queries(loops)
     complexity = 0
     for query in loops.keys():
@@ -66,10 +68,12 @@ def c3_c4(root, sitter, lang, calls=None):
     """
     loops = {
         "Q_FOR_STMT": Q_FOR_STMT,
-        "Q_FOR_RANGE_STMT": Q_FOR_RANGE_STMT,
         "Q_DO_STMT": Q_DO_STMT,
         "Q_WHILE_STMT": Q_WHILE_STMT
     }
+    if lang == "cpp":
+        loops.update({"Q_FOR_RANGE_STMT": Q_FOR_RANGE_STMT})
+        
     sitter.add_queries(loops)
     c3_val = 0
     c4_val = 0

{mcpp-1.3.2 → mcpp-1.3.3}/src/mcpp/parse.py

@@ -14,7 +14,7 @@ LANGS = {
 
 
 class Sitter(object):
-    def __init__(self, lib_path: Path, *languages):
+    def __init__(self, *languages):
         self.langs = {k:v for k, v in LANGS.items() if k in languages}
         self.parser = {lang: self._init_parser(lang) for lang in languages}
         self.queries = {}

{mcpp-1.3.2 → mcpp-1.3.3}/src/mcpp/vulnerability.py

@@ -197,15 +197,17 @@ def v6_v7(root, sitter, lang, calls=None):
         "Q_DO_STMT": Q_DO_STMT,
         "Q_WHILE_STMT": Q_WHILE_STMT,
         "Q_FOR_STMT": Q_FOR_STMT,
-        "Q_FOR_RANGE_STMT": Q_FOR_RANGE_STMT,
     }
+    if lang == "cpp":
+        queries.update({"Q_FOR_RANGE_STMT": Q_FOR_RANGE_STMT})
+        
     sitter.add_queries(queries)
 
     nested_controls = []
     max_nesting_level = 0
     for q in queries.keys():
         for node in sitter.captures(q, root, lang).get("stmt", []):
-            nesting_level = _control_nesting_level(node)
+            nesting_level = _control_nesting_level(node, lang)
             if nesting_level > 0:
                 nested_controls.append(node)
             max_nesting_level = max(max_nesting_level, nesting_level)
@@ -216,15 +218,17 @@ def v6_v7(root, sitter, lang, calls=None):
     }
 
 
-def _control_nesting_level(node):
+def _control_nesting_level(node, lang):
     control_types = [
         "if_statement",
         "switch_statement",
         "do_statement",
         "while_statement",
         "for_statement",
-        "for_range_loop",
     ]
+    if lang == "cpp":
+        control_types.append("for_range_loop")
+        
     parent = node.parent
     num_control_ancestors = 0
     while parent is not None:
@@ -244,9 +248,11 @@ def v8(root, sitter, lang, calls=None):
         "Q_DO_STMT": Q_DO_STMT,
         "Q_WHILE_STMT": Q_WHILE_STMT,
         "Q_FOR_STMT": Q_FOR_STMT,
-        "Q_FOR_RANGE_STMT": Q_FOR_RANGE_STMT,
         #"Q_CONDITION": Q_CONDITION,
     }
+    if lang == "cpp":
+        queries.update({"Q_FOR_RANGE_STMT": Q_FOR_RANGE_STMT})
+        
     sitter.add_queries(queries)
 
     # count dependent controls under another control: key = start_byte of parent in function
@@ -272,13 +278,13 @@ def v8(root, sitter, lang, calls=None):
 def _v8_single_query(root, sitter, lang, calls, query, control_dependent_controls, thread_lock):
     tag = "condition" if "Q_CONDITION" in query else "stmt"
     for node in sitter.captures(query, root, lang).get(tag, []):
-        parents = _traverse_parent_controls(node)
+        parents = _traverse_parent_controls(node, lang)
         if len(parents) > 0:
             with thread_lock:
                 control_dependent_controls[parents[-1].start_byte] += 1
 
 
-def _traverse_parent_controls(node):
+def _traverse_parent_controls(node, lang):
     """ Climb up the AST and emit all control nodes. """
     control_types = [
         "if_statement",
@@ -286,8 +292,10 @@ def _traverse_parent_controls(node):
         "do_statement",
         "while_statement",
         "for_statement",
-        "for_range_loop",
     ]
+    if lang == "cpp":
+        control_types.append("for_range_loop")
+        
     parent_controls = []
     parent = node.parent
     while parent is not None:

{mcpp-1.3.2 → mcpp-1.3.3/src/mcpp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpp
-Version: 1.3.2
+Version: 1.3.3
 Summary: McCabe++ (mcpp): cyclomatic complexity and other vulnerability-related code metrics
 Author-email: Lukas Pirch <lukas.pirch@tu-berlin.de>
 License: MIT License