Update utils/block_relation_builder.py

utils/block_relation_builder.py

@@ -46,6 +46,9 @@ def generate_blocks_from_opcodes(opcode_counts, all_block_definitions):
         if opcode == "sensing_istouching": # Handle potential old opcode name
             opcode = "sensing_touchingobject"
 
+        if opcode == "sensing_touchingobject": # Handle potential old opcode name
+            opcode = "sensing_touchingobject"
+
         if not opcode or opcode not in all_block_definitions:
             print(f"Warning: Skipping opcode '{opcode}' (missing or not in definitions).")
             continue
@@ -1713,7 +1716,9 @@ def parse_condition(stmt, parent_key, pick_key_func, all_generated_blocks):
         return {"kind": "block", "block": block_id}
 
     # 5) Touching object: <touching [edge v]?>
-    m_touch = re.fullmatch(r"""\s*<?\s*touching\s*\[\s*(?P<sprite>[^\]]+?)\s*(?:v)?\s*\]\s*\?\s*>?""", s_lower, re.IGNORECASE | re.VERBOSE)
+    # m_touch = re.fullmatch(r"""\s*<?\s*touching\s*\[\s*(?P<sprite>[^\]]+?)\s*(?:v)?\s*\]\s*\?\s*>?""", s_lower, re.IGNORECASE | re.VERBOSE)
+    #m_touch = re.fullmatch(r"""\s*<?\s*touching\s*\[\s*(?P<sprite>[^\]]+?)\s*(?:v)?\s*\]\s*\?\s*>?\s*""", s_lower, re.IGNORECASE | re.VERBOSE)
+    m_touch = re.fullmatch(r"""\s*<?\s*touching\s*\[\s*(?P<sprite>[^\]]+?)\s*(?:v)?\s*\]\s*(?:\?)?\s*>?\s*""", s_lower, re.IGNORECASE | re.VERBOSE)
     if m_touch:
         sprite = m_touch.group('sprite').strip()
         val = {'mouse-pointer':'_mouse_', 'edge':'_edge_'}.get(sprite, sprite)
@@ -1874,7 +1879,7 @@ def classify(line):
     if l.startswith("repeat until <"): return "control_repeat_until", "c_block"
     # Updated regex for stop block to handle different options
     #if re.match(r"stop \[(all|this script|other scripts in sprite)\s*v\]", l): return "control_stop", "cap"
-    if re.match(r"stop\s*(?:[\[(]?\s*(all|this script|other scripts in sprite)\s*[\])]?$)", l, re.IGNORECASE): return "control_stop", "cap"
+    if re.match(r"stop\s*[\[(]?\s*(all|this script|other scripts in sprite)\s*(?:v)?\s*[\])]?$", l, re.IGNORECASE): return "control_stop", "cap"
     if l.startswith("create clone of"): return "control_create_clone_of", "stack"
     if l == "delete this clone": return "control_delete_this_clone", "cap"
 
@@ -2348,34 +2353,34 @@ def generate_plan(generated_input, opcode_keys, pseudo_code):
                 info["fields"]["VARIABLE"] = [var_name, None]
         if "LIST" in info["fields"]:
             m = re.search(r"(?:to|of|in)\s*\[([^\]]+)\s*v\]", stmt_for_parse)
-            if m: info["fields"]["LIST"] = [m.group(1), None]
+            if m: info["fields"]["LIST"] = [m.group(1).strip(), None]
         if "STOP_OPTION" in info["fields"]:
             m = re.search(r"stop \[([^\]]+)\s*v\]", stmt_for_parse)
-            if m: info["fields"]["STOP_OPTION"] = [m.group(1), None]
+            if m: info["fields"]["STOP_OPTION"] = [m.group(1).strip(), None]
         if "STYLE" in info["fields"]:
             m = re.search(r"set rotation style \[([^\]]+)\s*v\]", stmt_for_parse)
-            if m: info["fields"]["STYLE"] = [m.group(1), None]
+            if m: info["fields"]["STYLE"] = [m.group(1).strip(), None]
         if "DRAG_MODE" in info["fields"]:
             m = re.search(r"set drag mode \[([^\]]+)\s*v\]", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["DRAG_MODE"] = [m.group(1), None]
+            if m: info["fields"]["DRAG_MODE"] = [m.group(1).strip(), None]
         if "EFFECT" in info["fields"] and opcode in ["looks_changeeffectby", "looks_seteffectto", "sound_changeeffectby", "sound_seteffectto"]:
             m = re.search(r"(?:change|set)\s*\[([^\]]+)\s*v\] effect", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["EFFECT"] = [m.group(1).upper(), None]
+            if m: info["fields"]["EFFECT"] = [m.group(1).upper().strip(), None]
         if "NUMBER_NAME" in info["fields"] and opcode in ["looks_costumenumbername", "looks_backdropnumbername"]:
             m = re.search(r"(?:costume|backdrop)\s*\[([^\]]+)\s*v\]", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["NUMBER_NAME"] = [m.group(1), None]
+            if m: info["fields"]["NUMBER_NAME"] = [m.group(1).strip(), None]
         if "FRONT_BACK" in info["fields"] and opcode == "looks_gotofrontback":
             m = re.search(r"go to\s*\[([^\]]+)\s*v\] layer", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["FRONT_BACK"] = [m.group(1), None]
+            if m: info["fields"]["FRONT_BACK"] = [m.group(1).strip(), None]
         if "FORWARD_BACKWARD" in info["fields"] and opcode == "looks_goforwardbackwardlayers":
             m = re.search(r"go\s*\[([^\]]+)\s*v\]", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["FORWARD_BACKWARD"] = [m.group(1), None]
+            if m: info["fields"]["FORWARD_BACKWARD"] = [m.group(1).strip(), None]
         if "OPERATOR" in info["fields"] and opcode == "operator_mathop":
             m = re.search(r"\[([^\]]+)\s*v\] of", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["OPERATOR"] = [m.group(1).upper(), None]
+            if m: info["fields"]["OPERATOR"] = [m.group(1).upper().strip(), None]
         if "CURRENTMENU" in info["fields"] and opcode == "sensing_current":
             m = re.search(r"current\s*\[([^\]]+)\s*v\]", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["CURRENTMENU"] = [m.group(1).upper(), None]
+            if m: info["fields"]["CURRENTMENU"] = [m.group(1).upper().strip(), None]
         if "PROPERTY" in info["fields"] and opcode == "sensing_of":
             m = re.search(r"\((.+?)\) of", stmt_for_parse, re.IGNORECASE)
             if m:
@@ -2388,16 +2393,16 @@ def generate_plan(generated_input, opcode_keys, pseudo_code):
                 info["fields"]["PROPERTY"] = [prop_map.get(prop, prop), None]
         if "WHENGREATERTHANMENU" in info["fields"] and opcode == "event_whengreaterthan":
             m = re.search(r"when\s*\[([^\]]+)\s*v\] >", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["WHENGREATERTHANMENU"] = [m.group(1).upper(), None]
+            if m: info["fields"]["WHENGREATERTHANMENU"] = [m.group(1).upper().strip(), None]
         if "KEY_OPTION" in info["fields"] and opcode == "event_whenkeypressed": # For event_whenkeypressed hat block's field
             m = re.search(r"when\s*\[([^\]]+)\s*v\] key pressed", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["KEY_OPTION"] = [m.group(1), None]
+            if m: info["fields"]["KEY_OPTION"] = [m.group(1).strip(), None]
         if "BACKDROP" in info["fields"] and opcode == "event_whenbackdropswitchesto": # For event_whenbackdropswitchesto hat block's field
             m = re.search(r"when backdrop switches to\s*\[([^\]]+)\s*v\]", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["BACKDROP"] = [m.group(1), None]
+            if m: info["fields"]["BACKDROP"] = [m.group(1).strip(), None]
         if "BROADCAST_OPTION" in info["fields"] and opcode == "event_whenbroadcastreceived": # For event_whenbroadcastreceived hat block's field
             m = re.search(r"when i receive\s*\[([^\]]+)\s*v\]", stmt_for_parse, re.IGNORECASE)
-            if m: info["fields"]["BROADCAST_OPTION"] = [m.group(1), None]
+            if m: info["fields"]["BROADCAST_OPTION"] = [m.group(1).strip(), None]
 
         # Custom block specific parsing
         if opcode == "procedures_definition":
@@ -2453,7 +2458,6 @@ def generate_plan(generated_input, opcode_keys, pseudo_code):
                         info["mutation"]["argumentnames"].append(f"arg{idx+1}") # Placeholder name for mutation
                         
                         info["inputs"][arg_input_name] = parse_reporter_or_value(arg_val_str, key, pick_key, all_generated_blocks) # Pass current block's key
-
         i += 1 # Move to the next line
 
     # Final pass to ensure last blocks have next: None (already handled by stack pops)