codeclone 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

codeclone/normalize.py

@@ -9,6 +9,8 @@ Licensed under the MIT License.
 from __future__ import annotations
 
 import ast
+import copy
+from ast import AST
 from collections.abc import Sequence
 from dataclasses import dataclass
 
@@ -83,12 +85,33 @@ class AstNormalizer(ast.NodeTransformer):
             node.value = "_CONST_"
         return node
 
+    def visit_AugAssign(self, node: ast.AugAssign) -> AST:
+        # Normalize x += 1 to x = x + 1
+        # This allows detecting clones where one uses += and another uses = +
+        # We transform AugAssign(target, op, value) to Assign([target], BinOp(target, op, value))
+
+        # Deepcopy target to avoid reuse issues in the AST
+        target_load = copy.deepcopy(node.target)
+        # Ensure context is Load() for the right-hand side usage
+        if hasattr(target_load, "ctx"):
+            target_load.ctx = ast.Load()
+
+        new_node = ast.Assign(
+            targets=[node.target],
+            value=ast.BinOp(left=target_load, op=node.op, right=node.value),
+            lineno=node.lineno,
+            col_offset=node.col_offset,
+            end_lineno=getattr(node, "end_lineno", None),
+            end_col_offset=getattr(node, "end_col_offset", None),
+        )
+        return self.generic_visit(new_node)
+
 
 def normalized_ast_dump(func_node: ast.AST, cfg: NormalizationConfig) -> str:
     normalizer = AstNormalizer(cfg)
-    new_node = ast.fix_missing_locations(
-        normalizer.visit(ast.copy_location(func_node, func_node))
-    )
+    # Deepcopy to prevent side effects on the original AST
+    node_copy = copy.deepcopy(func_node)
+    new_node = ast.fix_missing_locations(normalizer.visit(node_copy))
     return ast.dump(new_node, annotate_fields=True, include_attributes=False)
 
 
@@ -99,9 +122,9 @@ def normalized_ast_dump_from_list(
     dumps: list[str] = []
 
     for node in nodes:
-        new_node = ast.fix_missing_locations(
-            normalizer.visit(ast.copy_location(node, node))
-        )
+        # Deepcopy to prevent side effects
+        node_copy = copy.deepcopy(node)
+        new_node = ast.fix_missing_locations(normalizer.visit(node_copy))
         dumps.append(ast.dump(new_node, annotate_fields=True, include_attributes=False))
 
     return ";".join(dumps)

codeclone/report.py

@@ -12,8 +12,8 @@ import json
 from typing import Any
 
 
-def build_groups(units: list[dict[str, Any]]) -> dict[str, list[dict]]:
-    groups: dict[str, list[dict]] = {}
+def build_groups(units: list[dict[str, Any]]) -> dict[str, list[dict[str, Any]]]:
+    groups: dict[str, list[dict[str, Any]]] = {}
     for u in units:
         key = f"{u['fingerprint']}|{u['loc_bucket']}"
         groups.setdefault(key, []).append(u)
@@ -21,13 +21,13 @@ def build_groups(units: list[dict[str, Any]]) -> dict[str, list[dict]]:
 
 
 def build_block_groups(
-    blocks: list[dict], min_functions: int = 2
-) -> dict[str, list[dict]]:
-    groups: dict[str, list[dict]] = {}
+    blocks: list[dict[str, Any]], min_functions: int = 2
+) -> dict[str, list[dict[str, Any]]]:
+    groups: dict[str, list[dict[str, Any]]] = {}
     for b in blocks:
         groups.setdefault(b["block_hash"], []).append(b)
 
-    filtered: dict[str, list[dict]] = {}
+    filtered: dict[str, list[dict[str, Any]]] = {}
     for h, items in groups.items():
         functions = {i["qualname"] for i in items}
         if len(functions) >= min_functions:

{codeclone-1.1.0.dist-info → codeclone-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeclone
-Version: 1.1.0
+Version: 1.2.0
 Summary: AST and CFG-based code clone detector for Python focused on architectural duplication
 Author-email: Den Rozhnovskiy <pytelemonbot@mail.ru>
 Maintainer-email: Den Rozhnovskiy <pytelemonbot@mail.ru>
@@ -23,11 +23,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pygments>=2.19.2
+Requires-Dist: rich>=14.3.2
 Provides-Extra: dev
 Requires-Dist: pytest>=9.0.0; extra == "dev"
 Requires-Dist: build>=1.2.0; extra == "dev"
@@ -102,7 +104,12 @@ Typical use cases:
 
 - Each function is converted into a **Control Flow Graph**.
 - CFG nodes contain normalized AST statements.
-- CFG edges represent structural control flow (`if`, `for`, `while`).
+- CFG edges represent structural control flow:
+  - `if` / `else`
+  - `for` / `async for` / `while`
+  - `try` / `except` / `finally`
+  - `with` / `async with`
+  - `match` / `case` (Python 3.10+)
 - Current CFG semantics (v1):
   - `break` and `continue` are treated as statements (no jump targets),
   - after-blocks are explicit and always present,
@@ -154,14 +161,14 @@ Generate reports:
 
 ```bash
 codeclone . \
-  --json-out .cache/codeclone/report.json \
-  --text-out .cache/codeclone/report.txt
+  --json .cache/codeclone/report.json \
+  --text .cache/codeclone/report.txt
 ```
 
 Generate an HTML report:
 
 ```bash
-codeclone . --html-out .cache/codeclone/report.html
+codeclone . --html .cache/codeclone/report.html
 ```
 
 ---
@@ -235,6 +242,9 @@ repos:
 5. Detect function-level and block-level clones.
 6. Apply conservative filters to suppress noise.
 
+See the architectural overview:
+- [docs/architecture.md](docs/architecture.md)
+
 ---
 
 ## Control Flow Graph (CFG)

codeclone-1.2.0.dist-info/RECORD

@@ -0,0 +1,19 @@
+codeclone/__init__.py,sha256=_MZuqgioYGn49qw6_OluedgcRvuu8IhAwVgHkM4Kj7s,364
+codeclone/baseline.py,sha256=tV-vgCpyQi-g1AlWJwuUFDeQwUZuhj4tX-BxFDv-LWo,1719
+codeclone/blockhash.py,sha256=jOswW9jqe9ww3y4r-gLTUZjMmn0CHXpU5qTtFndKQ10,594
+codeclone/blocks.py,sha256=Y75BSpzf-zyyeD9-vKnQfJ3QwIjYxMwiN9DbEqnbONg,1735
+codeclone/cache.py,sha256=DexslhZfxj79fnoPna8r_oBCqmsstN2ICRA_o6ZVpGo,1559
+codeclone/cfg.py,sha256=op503zRnew2ZIz5coK_HUaKt1VG1ucJBacXAZ1rBJYQ,11587
+codeclone/cli.py,sha256=c_61l3wSF2nbTZgd6LmvoUvejXatydPAPmJyRknHx78,13229
+codeclone/extractor.py,sha256=crCxgkK1n2fl5FUz6HtbaEZUH5CO8S0zqM0Xj0RSE6E,4558
+codeclone/fingerprint.py,sha256=H0YY209sfGf02VeLlxHNDp7n6es0vLiMmq3TBWDm3SE,545
+codeclone/html_report.py,sha256=e7gYxEHk5ezJtGUYIYsQlcxu_0fP3hmd9jj-zMWMfJY,25574
+codeclone/normalize.py,sha256=bvMoY3VDiZsnFiD50h5XUgwnMUKOyUEx6lJXCBiembg,4290
+codeclone/report.py,sha256=IwblTgZe4liTq3gHagnw6O4ZUkRqJ448XqzhLhJZoWM,1972
+codeclone/scanner.py,sha256=BdJFyaLv1xvimVkJyvvTN0FcG2RQZzRlTlHWi2fRQnU,1050
+codeclone-1.2.0.dist-info/licenses/LICENSE,sha256=ndXAbunvN-jCQjgCaoBOF5AN4FcRlAa0R7hK1lWDuBU,1073
+codeclone-1.2.0.dist-info/METADATA,sha256=RekVw29wHrLX0fHNLBYS9Ky6Ee6oFnntQxeCOcRbMTM,7255
+codeclone-1.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+codeclone-1.2.0.dist-info/entry_points.txt,sha256=_MI9DVTLOmv3OlxpyogdOmMAduiLVIdHeOlZ_KBsrIY,49
+codeclone-1.2.0.dist-info/top_level.txt,sha256=4tQa_d-4Zle-qV9KmNDkWq0WHYgZsW9vdaeF30rNntg,10
+codeclone-1.2.0.dist-info/RECORD,,

{codeclone-1.1.0.dist-info → codeclone-1.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

codeclone-1.1.0.dist-info/RECORD

@@ -1,19 +0,0 @@
-codeclone/__init__.py,sha256=_MZuqgioYGn49qw6_OluedgcRvuu8IhAwVgHkM4Kj7s,364
-codeclone/baseline.py,sha256=VdIh5AeWeAod6MZ1EV2UWMlvlhwHwlbyUJM_RXbhf24,1545
-codeclone/blockhash.py,sha256=jOswW9jqe9ww3y4r-gLTUZjMmn0CHXpU5qTtFndKQ10,594
-codeclone/blocks.py,sha256=Y75BSpzf-zyyeD9-vKnQfJ3QwIjYxMwiN9DbEqnbONg,1735
-codeclone/cache.py,sha256=PZ9XgHc3A-JSGXHYQHJK_Ldu24EIaGL7Spi2cTpbEUo,1334
-codeclone/cfg.py,sha256=e4zCfHeqWRvxIN1E4D-t_717ZftQY7XlwgYBfFaa9oU,4794
-codeclone/cli.py,sha256=Zp6e7PC-9WJIBkqX88V-4L7wryi1c2qPB87Pbpo4BfE,5177
-codeclone/extractor.py,sha256=crCxgkK1n2fl5FUz6HtbaEZUH5CO8S0zqM0Xj0RSE6E,4558
-codeclone/fingerprint.py,sha256=H0YY209sfGf02VeLlxHNDp7n6es0vLiMmq3TBWDm3SE,545
-codeclone/html_report.py,sha256=Es4lYOMm24O2UTsaF59qjvCxLA2nwojwLX-zOpvluro,24337
-codeclone/normalize.py,sha256=AzKE-1kOrOV3LVK8x4gGytulxXVYBkB0W_3oIqiRWS8,3236
-codeclone/report.py,sha256=2Yu9267M2GLYKqsMAD4mrTUWhTbHP6_fIOGqhtDkxL0,1912
-codeclone/scanner.py,sha256=BdJFyaLv1xvimVkJyvvTN0FcG2RQZzRlTlHWi2fRQnU,1050
-codeclone-1.1.0.dist-info/licenses/LICENSE,sha256=ndXAbunvN-jCQjgCaoBOF5AN4FcRlAa0R7hK1lWDuBU,1073
-codeclone-1.1.0.dist-info/METADATA,sha256=J2l_qX6VxJ_WRCK87KJPuzdVlFI5hcFR9lWjMzuQ55w,6984
-codeclone-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-codeclone-1.1.0.dist-info/entry_points.txt,sha256=_MI9DVTLOmv3OlxpyogdOmMAduiLVIdHeOlZ_KBsrIY,49
-codeclone-1.1.0.dist-info/top_level.txt,sha256=4tQa_d-4Zle-qV9KmNDkWq0WHYgZsW9vdaeF30rNntg,10
-codeclone-1.1.0.dist-info/RECORD,,