cpp-pd-code-simplify-interface 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

cpp_pd_code_simplify_interface/__main__.py

@@ -1,4 +1,10 @@
+import json
+
 from .main import main
 
 if __name__ == "__main__":
-    raise SystemExit(main())
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        print(json.dumps({"error": "interrupted by Ctrl+C"}, indent=2))
+        raise SystemExit(130)

cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp

@@ -2598,8 +2598,7 @@ ReductionResult reduce_pd_code(
                 emit_progress(run_options, message.str());
             }
 
-            if (!search.found && reduction_round < 0 &&
-                run_options.max_paths == -1 && !run_options.ban_heuristic) {
+            if (!search.found && run_options.max_paths == -1 && !run_options.ban_heuristic) {
                 SimplifierOptions brute_options = run_options;
                 brute_options.max_paths = -1;
                 brute_options.ban_heuristic = true;

cpp_pd_code_simplify_interface/main.py

@@ -90,10 +90,7 @@ def normalize_pd_codes(pd_codes: PdManyInput) -> list[str]:
     return [normalize_pd_code(pd_code) for pd_code in pd_codes]
 
 
-def _label_for_block(text: str, block_start: int, label_prefix: str, index: int) -> str:
-    line_start = text.rfind("\n", 0, block_start)
-    line_start = 0 if line_start == -1 else line_start + 1
-    before_block = text[line_start:block_start]
+def _label_for_line_prefix(before_block: str, label_prefix: str, index: int) -> str:
     if ":" in before_block:
         line_label = before_block.split(":", 1)[0].strip()
         if line_label:
@@ -104,56 +101,62 @@ def _label_for_block(text: str, block_start: int, label_prefix: str, index: int)
 
 
 def _pd_file_jobs(path: str) -> list[tuple[str, str]]:
-    text = pathlib.Path(path).read_text(encoding="utf-8")
     jobs: list[tuple[str, str]] = []
-    position = 0
-    index = 0
-
-    while True:
-        start = text.find("PD[", position)
-        if start == -1:
-            break
-        depth = 0
-        end = -1
-        for cursor in range(start + 2, len(text)):
-            if text[cursor] == "[":
-                depth += 1
-            elif text[cursor] == "]":
-                depth -= 1
-                if depth == 0:
-                    end = cursor
+    fallback_jobs: list[tuple[str, str]] = []
+    current_label: Optional[str] = None
+    current_block: list[str] = []
+    bracket_depth = 0
+
+    with pathlib.Path(path).open("r", encoding="utf-8") as input_file:
+        for line in input_file:
+            cleaned = line.strip()
+            if not jobs and not current_block and cleaned and not cleaned.startswith("#"):
+                label = path
+                payload = cleaned
+                if ":" in cleaned:
+                    line_label, payload = cleaned.split(":", 1)
+                    line_label = line_label.strip()
+                    payload = payload.strip()
+                    if line_label:
+                        label = f"{path}:{line_label}"
+                elif fallback_jobs:
+                    label = f"{path}#{len(fallback_jobs) + 1}"
+                fallback_jobs.append((label, payload))
+
+            cursor = 0
+            while cursor < len(line):
+                if current_block:
+                    char = line[cursor]
+                    current_block.append(char)
+                    if char == "[":
+                        bracket_depth += 1
+                    elif char == "]":
+                        bracket_depth -= 1
+                        if bracket_depth == 0:
+                            jobs.append((current_label or f"{path}#{len(jobs) + 1}", "".join(current_block)))
+                            current_label = None
+                            current_block = []
+                    cursor += 1
+                    continue
+
+                start = line.find("PD[", cursor)
+                if start == -1:
                     break
-        if end == -1:
-            jobs.append((f"{path}#{index + 1}", text[start:].strip()))
-            break
-        jobs.append((
-            _label_for_block(text, start, path, index),
-            text[start : end + 1],
-        ))
-        index += 1
-        position = end + 1
+                current_label = _label_for_line_prefix(line[:start], path, len(jobs))
+                current_block = ["PD["]
+                bracket_depth = 1
+                cursor = start + 3
 
     if jobs:
+        if current_block:
+            jobs.append((f"{path}#{len(jobs) + 1}", "".join(current_block).strip()))
         if len(jobs) == 1:
             jobs[0] = (path, jobs[0][1])
         return jobs
 
-    for line in text.splitlines():
-        cleaned = line.strip()
-        if not cleaned or cleaned.startswith("#"):
-            continue
-        label = path
-        payload = cleaned
-        if ":" in cleaned:
-            line_label, payload = cleaned.split(":", 1)
-            line_label = line_label.strip()
-            payload = payload.strip()
-            if line_label:
-                label = f"{path}:{line_label}"
-        elif jobs:
-            label = f"{path}#{len(jobs) + 1}"
-        jobs.append((label, payload))
-    return jobs
+    if current_block:
+        fallback_jobs.append((f"{path}#{len(fallback_jobs) + 1}", "".join(current_block).strip()))
+    return fallback_jobs
 
 
 @contextlib.contextmanager
@@ -1033,7 +1036,14 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
 
     exit_code = 0
     if args.pd_file:
-        jobs = _pd_file_jobs(args.pd_file)
+        try:
+            jobs = _pd_file_jobs(args.pd_file)
+        except KeyboardInterrupt:
+            print(json.dumps({"error": "interrupted by Ctrl+C"}, indent=2))
+            return 130
+        except Exception as exc:
+            print(json.dumps({"error": str(exc)}, indent=2))
+            return 2
         batch_payload = []
         show_labels = len(jobs) > 1
         for label, line in jobs:

{cpp_pd_code_simplify_interface-0.1.14.dist-info → cpp_pd_code_simplify_interface-0.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.14
+Version: 0.1.16
 Summary: Python interface for cpp-pd-code-simplify with runtime C++ compilation.
 License-Expression: MIT
 Author: GGN_2015

{cpp_pd_code_simplify_interface-0.1.14.dist-info → cpp_pd_code_simplify_interface-0.1.16.dist-info}/RECORD

@@ -1,12 +1,12 @@
 cpp_pd_code_simplify_interface/__init__.py,sha256=aaNwD--zgQX13xiU1hpuvgXy8vVTFGRk-r5zLm8zIRY,447
-cpp_pd_code_simplify_interface/__main__.py,sha256=fdA1QWBe5LNX0fbtaJXa1-dwEhrg_4sS_5UnjaajcMo,80
+cpp_pd_code_simplify_interface/__main__.py,sha256=ldwc-YVQlsSH9RwXZHCW4r1pmfCBM0iAYPk5ebM-dUo,238
 cpp_pd_code_simplify_interface/_worker.py,sha256=RPLUE-4amjh78C1fmFolmSIM2_s8AXWk-2fWvASq7A0,2338
-cpp_pd_code_simplify_interface/main.py,sha256=yVWv0zmsJGT3pHhruwK4QaHl3Dn4rJ6spr_fqMMm1Dk,38307
+cpp_pd_code_simplify_interface/main.py,sha256=CDylx7K0tiaNNtu4jYVZfpYMGuSo6tL0RRX5P_lA5bU,39185
 cpp_pd_code_simplify_interface/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-cpp_pd_code_simplify_interface-0.1.14.dist-info/entry_points.txt,sha256=ThorC4Enxp317TKITsXm9pE0gUp7pt-pP6Dl5mEPUR8,91
-cpp_pd_code_simplify_interface-0.1.14.dist-info/METADATA,sha256=InpkotMDzumP-fnGzGTHVcpk-LKV0-gvmf8w-wvFYIM,4762
-cpp_pd_code_simplify_interface-0.1.14.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
+cpp_pd_code_simplify_interface-0.1.16.dist-info/entry_points.txt,sha256=ThorC4Enxp317TKITsXm9pE0gUp7pt-pP6Dl5mEPUR8,91
+cpp_pd_code_simplify_interface-0.1.16.dist-info/METADATA,sha256=PqsV_wAaEO9K7FYhzTC5b_8J7m3yq785CrCHQhXxuFA,4762
+cpp_pd_code_simplify_interface-0.1.16.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
 cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp,sha256=U49Urs6bMXwkygJsVTnXp-q7y_aWkfRfGimy8mxHoms,5195
 cpp_pd_code_simplify_interface/data/src/native_interface.cpp,sha256=YiYlbGyWTM_FA0V_XzjHtnb9sD4eqMGQmdom6ivm0f0,7094
-cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp,sha256=A9ozSFzD_bkgrSl_9tIxH6PVAceUix76nRceEO6Ymho,96021
-cpp_pd_code_simplify_interface-0.1.14.dist-info/RECORD,,
+cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp,sha256=2XhK8pWM_IakPFXybm7k7y3YwvO2Jm73Nn4b5x3HETc,95982
+cpp_pd_code_simplify_interface-0.1.16.dist-info/RECORD,,