mcpp 1.1.0__tar.gz → 1.2.0__tar.gz

{mcpp-1.1.0/src/mcpp.egg-info → mcpp-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mcpp
-Version: 1.1.0
+Version: 1.2.0
 Summary: McCabe++ (mcpp): cyclomatic complexity and other vulnerability-related code metrics
 Author-email: Lukas Pirch <lukas.pirch@tu-berlin.de>
 License: MIT License
@@ -33,9 +33,9 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hydra-core>=1.3.2
-Requires-Dist: tree-sitter>=0.22.3
-Requires-Dist: tree-sitter-c>=0.21.4
-Requires-Dist: tree-sitter-cpp>=0.22.3
+Requires-Dist: tree-sitter>=0.23.0
+Requires-Dist: tree-sitter-c>=0.23.0
+Requires-Dist: tree-sitter-cpp>=0.23.0
 Requires-Dist: tqdm>=4.66.4
 Requires-Dist: loguru>=0.7.2
 

{mcpp-1.1.0 → mcpp-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcpp"
-version = "1.1.0"
+version = "1.2.0"
 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.2.0/requirements.txt

@@ -0,0 +1,6 @@
+hydra-core>=1.3.2
+tree-sitter>=0.23.0
+tree-sitter-c>=0.23.0
+tree-sitter-cpp>=0.23.0
+tqdm>=4.66.4
+loguru>=0.7.2

{mcpp-1.1.0 → mcpp-1.2.0}/src/mcpp/__init__.py

@@ -1,7 +1,7 @@
 import os
 from importlib import resources
 
-from mcpp.__main__ import extract, extract_single, METRICS
+from mcpp.__main__ import extract, extract_single, extract_code, METRICS
 
 
 with resources.path("mcpp", "__init__.py") as root_path:

{mcpp-1.1.0 → mcpp-1.2.0}/src/mcpp/complexity.py

@@ -20,16 +20,13 @@ def c1(root, sitter, lang, calls=None):
     ]
 
     complexity = c2(root, sitter, lang, calls)["C2"]
-    conditions = sitter.captures("Q_CONDITION", root, lang)
-    for condition, tag in conditions:
-        if tag == "condition":
-            bin_expr = sitter.captures("Q_BINARY_EXPR", condition, lang)
-            for expr, _ in bin_expr:
-                if len(expr.children) != 3:
-                    continue
-                left, op, right = expr.children
-                if op.text.decode() in logical_ops:
-                    complexity += 1
+    for condition in sitter.captures("Q_CONDITION", root, lang).get("condition", []):
+        for expr in sitter.captures("Q_BINARY_EXPR", condition, lang).get("expr", []):
+            if len(expr.children) != 3:
+                continue
+            left, op, right = expr.children
+            if op.text.decode() in logical_ops:
+                complexity += 1
     complexity += 1
     return {
         "C1": complexity
@@ -44,7 +41,7 @@ def c2(root, sitter, lang, calls=None):
     })
     complexity = 0
     for query in ("Q_FOR_STMT", "Q_WHILE_STMT"):
-        complexity += len(sitter.captures(query, root, lang))
+        complexity += len(sitter.captures(query, root, lang).get("stmt", []))
     return {
         "C2": complexity
     }
@@ -66,7 +63,7 @@ def c3_c4(root, sitter, lang, calls=None):
     c3_val = 0
     c4_val = 0
     for query in ("Q_FOR_STMT", "Q_DO_STMT", "Q_WHILE_STMT"):
-        for loop_node, _ in sitter.captures(query, root, lang):
+        for loop_node in sitter.captures(query, root, lang).get("stmt", []):
             nesting_level = _loop_nesting_level(loop_node)
             if nesting_level > 0:
                 c3_val += 1

{mcpp-1.1.0 → mcpp-1.2.0}/src/mcpp/parse.py

@@ -23,8 +23,7 @@ class Sitter(object):
         self.queries = {"Q_ERROR_NODE": Q_ERROR_NODE}
 
     def _init_parser(self, language: str):
-        parser = Parser()
-        parser.set_language(self.langs[language])
+        parser = Parser(self.langs[language])
         return parser
 
     def parse_lang(self, source: str, lang: str):
@@ -63,9 +62,8 @@ def get_call_names(sitter, root, lang):
     """ Return all function call names. """
     call_names = []
     sitter.add_queries({"Q_CALL_NAME": Q_CALL_NAME})
-    for node, tag in sitter.captures("Q_CALL_NAME", root, lang):
-        if tag == "name":
-            call_names.append(node.text.decode())
+    for node in sitter.captures("Q_CALL_NAME", root, lang).get("name", []):
+        call_names.append(node.text.decode())
     return call_names
 
 
@@ -73,7 +71,7 @@ def get_identifiers(sitter, root, lang, filter=None):
     """ Return all identifier names, optionally filtered by list of known function names. """
     identifiers = []
     sitter.add_queries({"Q_IDENTIFIER": Q_IDENTIFIER})
-    for node, _ in sitter.captures("Q_IDENTIFIER", root, lang):
+    for node in sitter.captures("Q_IDENTIFIER", root, lang).get("variable", []):
         identifier = node.text.decode()
         if filter is None or identifier not in filter:
             identifiers.append(identifier)

{mcpp-1.1.0 → mcpp-1.2.0}/src/mcpp/queries.py

@@ -3,15 +3,15 @@ Q_ERROR_NODE = """
 """
 
 Q_FOR_STMT = """
-(for_statement) @for_stmt
+(for_statement) @stmt
 """
 
 Q_DO_STMT = """
-(do_statement) @do_stmt
+(do_statement) @stmt
 """
 
 Q_WHILE_STMT = """
-(while_statement) @while_stmt
+(while_statement) @stmt
 """
 
 Q_IF_STMT = """
@@ -19,7 +19,7 @@ Q_IF_STMT = """
 """
 
 Q_SWITCH_STMT = """
-(switch_statement) @switch_stmt
+(switch_statement) @stmt
 """
 
 
@@ -30,7 +30,7 @@ Q_CONDITION = """
 """
 
 Q_BINARY_EXPR = """
-(binary_expression) @binary_expression
+(binary_expression) @expr
 """
 
 Q_CALL_NAME = """
@@ -58,7 +58,7 @@ Q_POINTER_EXPR = """
 """
 
 Q_ASSIGNMENT_EXPR = """
-(assignment_expression) @assignment
+(assignment_expression) @expr
 """
 
 Q_IF_WITHOUT_ELSE = """
@@ -66,5 +66,5 @@ Q_IF_WITHOUT_ELSE = """
     condition: ((_) @if)
     consequence: ((_) @then)
     !alternative
-) @if_stmt
+) @stmt
 """

{mcpp-1.1.0 → mcpp-1.2.0}/src/mcpp/vulnerability.py

@@ -17,8 +17,7 @@ def v1(root, sitter, lang, calls=None):
     })
 
     vars_in_calls = []
-    arg_lists = [m for m, tag in sitter.captures("Q_ARGLIST", root, lang) if tag == "args"]
-    for arg_list in arg_lists:
+    for arg_list in sitter.captures("Q_ARGLIST", root, lang).get("args", []):
         variables = get_identifiers(sitter, arg_list, lang, filter=calls)
         vars_in_calls.extend(variables)
 
@@ -34,8 +33,7 @@ def v2(root, sitter, lang, calls=None):
     sitter.add_queries({
         "Q_FUNCTION_PARAMETER": Q_FUNCTION_PARAMETER
     })
-
-    params = sitter.captures("Q_FUNCTION_PARAMETER", root, lang)
+    params = sitter.captures("Q_FUNCTION_PARAMETER", root, lang).get("param", [])
     return {
         "V2": len(params)
     }
@@ -61,7 +59,7 @@ def v3_v4(root, sitter, lang, calls=None):
 
     pointer_arith = []
     pointer_arith_vars = []
-    for pointer, _ in sitter.captures("Q_POINTER_EXPR", root, lang):
+    for pointer in sitter.captures("Q_POINTER_EXPR", root, lang).get("pointer", []):
         if any(arith in pointer.parent.text.decode() for arith in arith_ops):
             pointer_arith.append(pointer)
             variables = get_identifiers(sitter, pointer.parent, lang, filter=calls)
@@ -90,8 +88,8 @@ def v5(root, sitter, lang, calls=None):
     ]
 
     var_count = Counter()
-    candidates = sitter.captures("Q_BINARY_EXPR", root, lang) + sitter.captures("Q_ASSIGNMENT_EXPR", root, lang)
-    for node, _ in candidates:
+    candidates = sitter.captures("Q_BINARY_EXPR", root, lang).get("expr", []) + sitter.captures("Q_ASSIGNMENT_EXPR", root, lang).get("expr", [])
+    for node in candidates:
         if len(node.children) != 3:
             continue
         op_text = node.children[1].text.decode()
@@ -124,11 +122,11 @@ def v6_v7(root, sitter, lang, calls=None):
     nested_controls = []
     max_nesting_level = 0
     for q in queries.keys():
-        for node, _ in sitter.captures(q, root, lang):
+        for node in sitter.captures(q, root, lang).get("stmt", []):
             nesting_level = _control_nesting_level(node)
             if nesting_level > 0:
                 nested_controls.append(node)
-                max_nesting_level = max(max_nesting_level, nesting_level)
+            max_nesting_level = max(max_nesting_level, nesting_level)
 
     return {
         "V6": len(nested_controls),
@@ -186,7 +184,8 @@ def v8(root, sitter, lang, calls=None):
 
 
 def _v8_single_query(root, sitter, lang, calls, query, control_dependent_controls, thread_lock):
-    for node, _ in sitter.captures(query, root, lang):
+    tag = "condition" if "Q_CONDITION" in query else "stmt"
+    for node in sitter.captures(query, root, lang).get(tag, []):
         parents = _traverse_parent_controls(node)
         if len(parents) > 0:
             with thread_lock:
@@ -224,17 +223,16 @@ def v9(root, sitter, lang, calls=None):
         "|", "||"
     ]
 
-    conditions = sitter.captures("Q_CONDITION", root, lang)
+    conditions = sitter.captures("Q_CONDITION", root, lang).get("condition", [])
     var_count = Counter()
-    for condition, tag in conditions:
-        if tag == "condition":
-            bin_expr = sitter.captures("Q_BINARY_EXPR", condition, lang)
-            for expr, _ in bin_expr:
-                if len(expr.children) != 3:
-                    continue
-                left, op, right = expr.children
-                if op.text.decode() in logical_ops:
-                    var_count.update(get_identifiers(sitter, expr, lang, filter=calls))
+    for condition in conditions:
+        bin_expr = sitter.captures("Q_BINARY_EXPR", condition, lang).get("expr", [])
+        for expr in bin_expr:
+            if len(expr.children) != 3:
+                continue
+            left, op, right = expr.children
+            if op.text.decode() in logical_ops:
+                var_count.update(get_identifiers(sitter, expr, lang, filter=calls))
 
     return {
         "V9": max([0] + list(var_count.values()))
@@ -249,7 +247,7 @@ def v10(root, sitter, lang, calls=None):
         "Q_IF_WITHOUT_ELSE": Q_IF_WITHOUT_ELSE
     })
 
-    if_without_else = sitter.captures("Q_IF_WITHOUT_ELSE", root, lang)
+    if_without_else = sitter.captures("Q_IF_WITHOUT_ELSE", root, lang).get("stmt", [])
     return {
         "V10": len(if_without_else)
     }
@@ -264,8 +262,8 @@ def v11(root, sitter, lang, calls=None):
     })
 
     num_controlled_vars = 0
-    conditions = sitter.captures("Q_CONDITION", root, lang)
-    for condition, _ in conditions:
+    conditions = sitter.captures("Q_CONDITION", root, lang).get("condition", [])
+    for condition in conditions:
         num_controlled_vars += len(get_identifiers(sitter, condition, lang, filter=calls))
     return {
         "V11": num_controlled_vars

{mcpp-1.1.0 → mcpp-1.2.0/src/mcpp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mcpp
-Version: 1.1.0
+Version: 1.2.0
 Summary: McCabe++ (mcpp): cyclomatic complexity and other vulnerability-related code metrics
 Author-email: Lukas Pirch <lukas.pirch@tu-berlin.de>
 License: MIT License
@@ -33,9 +33,9 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hydra-core>=1.3.2
-Requires-Dist: tree-sitter>=0.22.3
-Requires-Dist: tree-sitter-c>=0.21.4
-Requires-Dist: tree-sitter-cpp>=0.22.3
+Requires-Dist: tree-sitter>=0.23.0
+Requires-Dist: tree-sitter-c>=0.23.0
+Requires-Dist: tree-sitter-cpp>=0.23.0
 Requires-Dist: tqdm>=4.66.4
 Requires-Dist: loguru>=0.7.2
 

mcpp-1.2.0/src/mcpp.egg-info/requires.txt

@@ -0,0 +1,6 @@
+hydra-core>=1.3.2
+tree-sitter>=0.23.0
+tree-sitter-c>=0.23.0
+tree-sitter-cpp>=0.23.0
+tqdm>=4.66.4
+loguru>=0.7.2

mcpp-1.1.0/requirements.txt

@@ -1,6 +0,0 @@
-hydra-core>=1.3.2
-tree-sitter>=0.22.3
-tree-sitter-c>=0.21.4
-tree-sitter-cpp>=0.22.3
-tqdm>=4.66.4
-loguru>=0.7.2

mcpp-1.1.0/src/mcpp.egg-info/requires.txt

@@ -1,6 +0,0 @@
-hydra-core>=1.3.2
-tree-sitter>=0.22.3
-tree-sitter-c>=0.21.4
-tree-sitter-cpp>=0.22.3
-tqdm>=4.66.4
-loguru>=0.7.2