Upload block_relation_builder.py

utils/block_relation_builder.py

@@ -3441,6 +3441,215 @@ def _find_all_opcodes(code_block: str) -> list[str]:
     # Define a list of regex patterns and their corresponding opcodes,
     # ordered from most specific to least specific. The re.DOTALL flag
     # allows '.' to match newlines, which is crucial for multi-line blocks.
+    # patterns = [
+    #     # --- Multi-line Control Blocks (most specific, non-greedy) ---
+    #     (r"if <.+?> then(?:.|\n)+?else(?:.|\n)+?end", "control_if_else"), #(to test muliple stack)
+    #     # (r"if <.+?> then", "control_if"),
+    #     (r"if <.+?> then(?:(?!else).|\n)+?end", "control_if"),
+    #     (r"forever", "control_forever"),
+    #     (r"repeat until <.+?>", "control_repeat_until"),
+    #     (r"repeat\s+(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "control_repeat"),
+    #     # (r"stop\s+(?:all|this script|other scripts in sprite|\[(?:all|this script|other scripts in sprite)(?:\s+v)?\])", "control_stop"),
+    #     (r"stop\s+(?:all|this script|other scripts in sprite|\[(?:all|this script|other scripts in sprite)(?:\s+v)?\])(?!\s+sounds)", "control_stop"),
+    #     (r"when I start as a clone", "control_start_as_clone"),
+    #     (r"create clone of \[.+?(?:\s+v)?\]", "control_create_clone_of"),
+    #     (r"delete this clone", "control_delete_this_clone"),
+    #     (r"wait\s+(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)\s+sec(?:ond)?s?", "control_wait"),
+    #     (r"wait until <.+?>", "control_wait_until"),
+
+    #     # --- Event Blocks (most specific) ---
+    #     # (r"when green flag clicked", "event_whenflagclicked"),
+    #     (r"when (green )?flag click(ed)?", "event_whenflagclicked"),
+    #     (r"when\s+(?:key\s+\[(.+?)(?:\s+v)?\]|\[(.+?)(?:\s+v)?\]\s+key)\s+pressed", "event_whenkeypressed"),
+    #     (r"when this sprite clicked", "event_whenthisspriteclicked"),
+    #     (r"when backdrop switches to \[.+?(?:\s+v)?\]", "event_whenbackdropswitchesto"),
+    #     (r"when I receive \[.+?(?:\s+v)?\]", "event_whenbroadcastreceived"),
+    #     (r"when \[.+?(?:\s+v)?\] > (.+)", "event_whengreaterthan"),
+    #     (r"broadcast \[.+?(?:\s+v)?\] and wait", "event_broadcastandwait"),
+    #     (r"broadcast \[.+?(?:\s+v)?\]", "event_broadcast"),
+
+    #     # --- Data Blocks (Variables and Lists) - specific block types first ---
+    #     (r"set\s*\[\s*.+?(?:\s+v)?\s*\]\s*to\s*\(?\s*.+?\s*\)?", "data_setvariableto"),
+    #     (r"change\s*\[\s*.+?(?:\s+v)?\s*\]\s*by\s*\(?\s*.+?\s*\)?", "data_changevariableby"),
+    #     (r"show variable \[.+?(?:\s+v)?\]", "data_showvariable"),
+    #     (r"hide variable \[.+?(?:\s+v)?\]", "data_hidevariable"),
+    #     (r"show list \[.+?(?:\s+v)?\]", "data_showlist"),
+    #     (r"hide list \[.+?(?:\s+v)?\]", "data_hidelist"),
+    #     (r"add\s+(?:\[.+?\]|\(.+?\)|\w+)\s+to\s+\[.+?(?:\s+v)?\]", "data_addtolist"),
+    #     (r"delete\s*\((?!all\)).+?\)\s*of\s*\[.+?(?:\s+v)?\]", "data_deleteoflist"),
+    #     (r"delete\s*\(all\)\s*of\s*\[.+?(?:\s+v)?\]", "data_deletealloflist"),
+    #     # (r"insert (.+?) at (\(.+?\)|\[.+?\]|\(\[.+?\]\)) of \[.+?(?:\s+v)?\]", "data_insertatlist"),
+    #     (r"insert\s+(\(.+?\)|\[.+?\]|\(\[.+?\]\)|[^\s]+)\s+at\s+(\(.+?\)|\[.+?\]|\(\[.+?\]\)|\d+)\s+of\s+\[.+?(?:\s+v)?\]", "data_insertatlist"),
+    #     # (r"replace item (.+?) of \[.+?(?:\s+v)?\] with (.+)", "data_replaceitemoflist"),
+    #     # (r"replace item\s+(\(.+?\)|\[\s*.+?\s*(?:v)?\]|.+?)\s+of\s+\[.+?(?:\s+v)?\]\s+with\s+(.+)", "data_replaceitemoflist"),
+    #     (r"replace\s+item\s+(\(.+?\)|\[\s*.+?\s*(?:v)?\]|[^\s]+)\s+of\s+\[.+?(?:\s+v)?\]\s+with\s+(\(.+?\)|\[\s*.+?\s*(?:v)?\]|.+)","data_replaceitemoflist"),
+    #     # (r"\[.+?(?:\s+v)?\] contains \[.+?\]\?", "data_listcontainsitem"),
+    #     # (r"<?\s*\[.+?(?:\s+v)?\] contains \(?\[.+?(?:\s+v)?\]\)?\s*\?>?", "data_listcontainsitem"),
+    #     (r"[<(]\s*\[[^\]]+?\s+v\]\s*contains\s*\[[^\]]+?\]\s*\??\s*[)>]", "data_listcontainsitem"),
+    #     # (r"\(item \# of (.+?) in \[.+?(?:\s+v)?\]\)", "data_itemnumoflist"),
+    #     (r"\(item\s+#\s+of\s+\(?(.+?)\)?\s+in\s+\[.+?(?:\s+v)?\]\)", "data_itemnumoflist"),
+    #     # (r"\(item (.+?) of \[.+?(?:\s+v)?\]\)", "data_itemoflist"),
+    #     # (r"\(?item\s+(.+?)\s+of\s+\[.+?(?:\s+v)?\]\)?", "data_itemoflist"),
+    #     # (r"(?<!replace\s)\(?item\s+(\(.+?\)|\[\s*.+?\s*(?:v)?\]|[^\s]+)\s+of\s+\[.+?(?:\s+v)?\]\)?", "data_itemoflist"),
+    #     (r"(?<!replace\s)\(?item(?!\s+#)\s+(\(.+?\)|\[\s*.+?\s*(?:v)?\]|[^\s]+)\s+of\s+\[.+?(?:\s+v)?\]\)?", "data_itemoflist"),
+    #     (r"\(length of \[.+?(?:\s+v)?\]\)", "data_lengthoflist"),
+        
+    #     # --- Sensing Blocks ---
+    #     (r"ask \[.+?\] and wait", "sensing_askandwait"),
+    #     # (r"key \[.+? v\] pressed\??", "sensing_keypressed"),
+    #     (r"(?<!when\s)key\s+\[.+?(?:\s+v)?\]\s+pressed\??", "sensing_keypressed"),
+    #     (r"mouse down\??", "sensing_mousedown"),
+    #     # (r"color #\w{6} is touching #\w{6}\??", "sensing_coloristouchingcolor"),
+    #     (r"""\s*<?\s*color\s*\[?\s*(#[0-9A-Fa-f]{6})\s*\]?\s*is\s+touching\s*\[?\s*(#[0-9A-Fa-f]{6})\s*\]?\s*\??\s*>?\s*""", "sensing_coloristouchingcolor"),
+    #     # (r"touching color #\w{6}\??", "sensing_touchingcolor"),
+    #     # (r"touching\s*(?:color\s*)?#\w{6}\??", "sensing_touchingcolor"),
+    #     (r"(?<!is\s)touching\s*(?:color\s*)?\[?\s*#([0-9A-Fa-f]{6})\s*\]?\??", "sensing_touchingcolor"),
+    #     (r"touching \[.+? v\]\??", "sensing_touchingobject"),
+    #     (r"set drag mode \[.+? v\]", "sensing_setdragmode"),
+    #     (r"reset timer", "sensing_resettimer"),
+    #     # (r"(?<!at\s)(?<!item\s)\(.+? of \[.+? v]\)", "sensing_of"),
+    #     #(r"(?<!at\s)(?<!item\s)(?<!item\s)(?<!delete\s)[(].+? of \[.+? v\]", "sensing_of"),
+    #     # (r"(?<!at\s)(?<!delete\s)\((?!item\s*(?:\(|#))\s.+? of \[.+? v\]", "sensing_of"),
+    #     #(r"""(?ix)(?<!\bat\s)(?<!\bdelete\s)(?<!\bitem\s)(?<!\binsert\s)(?<!\bcreate\s)(?:\(\s*(?!item\b|\d|\#)[^)]+?\)\s*of\s*\[.+? v\]|\[\s*(?!item\b|\d|\#)[^\]]+?\]\s*of\s*\[.+? v|(?!item\b|\d|\#)[A-Za-z][^\(\[\n]+?\s*of\s*\[.+? v\])""", "sensing_of"),
+    #     (r"(?i)(?<!\bat\s)(?<!\bdelete\s)(?<!\binsert\s)(?<!\breplace\s)(?<!\bcreate\s)(?<!\bitem\s)(?<!\bletter\s)"r"(?:"r"\(\s*(?!(?:item\b|\d+|\#|length\b|insert\b|delete\b|replace\b|create\b|letter\b))[^()]{1,200}?\)\s*of\s*\[[^\]]+?(?:\s+v)?\](?!\s*in\s*\[)"r"|"r"\(\s*(?!(?:item\b|\d+|\#|length\b|insert\b|delete\b|replace\b|create\b|letter\b)).*?of\s*\[[^\]]+?(?:\s+v)?\].*?\)"r"|"r"\[\s*(?!(?:item\b|\d+|\#|length\b|letter\b))[^\]]+?\]\s*of\s*\[[^\]]+?(?:\s+v)?\](?!\s*in\s*\[)"r"|"r"\b(?:backdrop|costume|x\s+position|y\s+position|direction|size|volume|loudness|answer|day|month|year|username|timer|mouse\s+x|mouse\s+y)\b\s*of\s*\[[^\]]+?(?:\s+v)?\](?!\s*in\s*\[)"r")","sensing_of"),
+    #     #(r"(?<!at\s)(?<!delete\s)\((?!item\s*(?:\(|#)).+?\)\s*of \[.+? v\]", "sensing_of"),
+    #     (r"\(current \[.+? v]\)", "sensing_current"),
+    #     (r"\(?answer\)?", "sensing_answer"),         #(to test muliple bracket and alone should treet as the keyword)
+    #     (r"\(?username\)?", "sensing_username"),     #(to test muliple bracket and alone should treet as the keyword)
+    #     # commented for the mouse operations
+    #     (r"distance\s*to\s*[\[\(]\s*([^\]\)]+?)\s*v?\s*[\]\)]", "sensing_distanceto"),
+    #     # (r"(?:<\s*)?mouse\s*down\?\s*(?:>)?", "sensing_mousedown"),
+    #     # (r"(?:[\[\(])?\s*mouse\s*x\s*(?:v)?\s*(?:[\]\)])?", "sensing_mousex"),
+    #     # (r"(?:[\[\(])?\s*mouse\s*y\s*(?:v)?\s*(?:[\]\)])?", "sensing_mousey"),
+        
+    #     # --- Sound Blocks ---
+    #     # (r"play sound \[.+? v\] until done", "sound_playuntildone"),
+    #     # (r"start sound \[.+? v\]", "sound_play"),
+    #     (r"play sound\s+(?:\[\s*.+?\s*v\]|\(?\s*.+?\s*\)?)\s+until done", "sound_playuntildone"),
+    #     (r"start sound\s+(?:\[\s*.+?\s*v\]|\(?\s*.+?\s*\)?)", "sound_play"),    
+    #     (r"stop all sounds", "sound_stopallsounds"),
+    #     # (r"change volume by (.+?)", "sound_changevolumeby"),
+    #     (r"change volume by\s*(?:\((.+?)\)|\[(.+?)\]|(.+))", "sound_changevolumeby"),
+    #     # (r"set volume to (.+?) %", "sound_setvolumeto"),
+    #     (r"""set\ volume\ to\s+\(?\s*(?:-?\d+(?:\.\d+)?|\[?[a-zA-Z_][\w\s]*\]?(?:\ v)?)\s*\)?\s*%?""", "sound_setvolumeto"),
+        
+    #     (r"\(volume\)", "sound_volume"),
+
+    #     # --- Motion Blocks ---
+    #     # (r"go to x: (.+?) y: (.+)", "motion_gotoxy"),
+    #     (r"go to x:\s*\(?(.+?)\)?\s*y:\s*\(?(.+?)\)?", "motion_gotoxy"),
+    #     # (r"set x to (.+)", "motion_setx"),
+    #     (r"set x to (.+)", "motion_setx"),
+    #     (r"set y to (.+)", "motion_sety"),
+    #     # (r"move (.+?) steps", "motion_movesteps"),
+    #     (r"move\s*\(?(.+?)\)?\s*(?:steps?)?", "motion_movesteps"),
+    #     # (r"turn right (.+?) degrees", "motion_turnright"),
+    #     (r"turn right\s*\(?(.+?)\)?\s*(?:degrees?)?", "motion_turnright"),
+    #     # (r"turn left (.+?) degrees", "motion_turnleft"),
+    #     (r"turn left\s*\(?(.+?)\)?\s*(?:degrees?)?", "motion_turnleft"),
+    #     (r"go to\s*(?:random position|mouse-pointer|\[.*?\]|.+)", "motion_goto"),   #(to mouse-pointer is not include here for now) 
+    #     # (r"point in direction (.+)", "motion_pointindirection"),
+    #     (r"point in direction\s*\(?(.+?)\)?", "motion_pointindirection"),
+    #     (r"point towards \[.+? v\]", "motion_pointtowards"),
+    #     # (r"change x by (.+)", "motion_changexby"),
+    #     # (r"change y by (.+)", "motion_changeyby"),
+    #     (r"change x by\s*\(?(.+?)\)?", "motion_changexby"),
+    #     (r"change y by\s*\(?(.+?)\)?", "motion_changeyby"),
+    #     # (r"glide (.+?) secs to x: (.+?) y: (.+)", "motion_glidesecstoxy"),
+    #     # (r"glide (.+?) secs to \[.+? v\]", "motion_glideto"),
+    #     (r"glide\s*\(?(.+?)\)?\s*(?:sec|secs|second|seconds)\s*to\s*x:\s*\(?(.+?)\)?\s*y:\s*\(?(.+?)\)?", "motion_glidesecstoxy"),
+    #     (r"glide\s*\(?(.+?)\)?\s*(?:sec|secs|second|seconds)\s*to\s*\[.*?\]", "motion_glideto"),
+    #     (r"if on edge, bounce", "motion_ifonedgebounce"),
+    #     # (r"set rotation style \[.+? v\]", "motion_setrotationstyle"),
+    #     (r"set rotation style\s*\[(?:left-right|all around|don't rotate)(?:\s*v)?\]", "motion_setrotationstyle"),
+    #     (r"\(?x position\)?", "motion_xposition"), #(to x positon may detect where var is used) 
+    #     (r"\(?y position\)?", "motion_yposition"), #(to y position  may detect where var is used) 
+    #     (r"\(?direction\)?", "motion_direction"),  #(to direction  may detect where var is used) 
+        
+    #     # --- Looks Blocks ---
+    #     (r"switch costume to \[.+? v\]", "looks_switchcostumeto"),
+    #     (r"next costume", "looks_nextcostume"),
+    #     (r"switch backdrop to \[.+? v\] and wait", "looks_switchbackdroptowait"),
+    #     (r"switch backdrop to \[.+? v\]", "looks_switchbackdropto"),
+    #     (r"next backdrop", "looks_nextbackdrop"),
+    #     (r"^\s*show\s*$", "looks_show"),
+    #     (r"^\s*hide\s*$", "looks_hide"),
+    #     # (r"say \[.+?\] for (.+?) seconds", "looks_sayforsecs"),
+    #     # (r"say \[.+?\]", "looks_say"),
+    #     # (r"think \[.+?\] for (.+?) seconds", "looks_thinkforsecs"),
+    #     # (r"think \[.+?\]", "looks_think"),
+    #     # (r"change size by (.+)", "looks_changesizeby"),
+    #     # (r"set size to (.+?) %", "looks_setsizeto"),
+    #     # (r"say\s*\[.+?\]\s*for\s*\(?(.+?)\)?\s*(?:sec|secs|second|seconds)", "looks_sayforsecs"),
+    #     (r"say\s+(?:\[.+?\]|\(.+?\)|.+?)\s*for\s*\(?(.+?)\)?\s*(?:sec|secs|second|seconds)", "looks_sayforsecs"),
+    #     # (r"say\s*\[.+?\]", "looks_say"),
+    #     (r"say\s+(?!.*\bfor\b\s*\(?\d+\)?\s*(?:sec|secs|second|seconds))(?:\[.+?\]|\(.+?\)|.+?)", "looks_say"),
+    #     (r"think\s*\[.+?\]\s*for\s*\(?(.+?)\)?\s*(?:sec|secs|second|seconds)", "looks_thinkforsecs"),
+    #     (r"think\s*\[.+?\]", "looks_think"),
+    #     (r"change size by\s*\(?(.+?)\)?", "looks_changesizeby"),
+    #     # (r"set size to\s*\(?(.+?)\)?\s*%?", "looks_setsizeto"),
+    #     (r"set size to\s*\(?(.+?)\)?\s*%?", "looks_setsizeto"),
+    #     # (r"change \[.+? v\] effect by (.+)", "looks_changeeffectby"),
+    #     # (r"set \[.+? v\] effect to (.+)", "looks_seteffectto"),
+    #     (r"change\s*\[(.+?)(?:\s*v)?\]\s*effect by\s*\(?(.+?)\)?", "looks_changeeffectby"),
+    #     (r"set\s*\[(.+?)(?:\s*v)?\]\s*effect to\s*\(?(.+?)\)?", "looks_seteffectto"),
+    #     (r"clear graphic effects", "looks_cleargraphiceffects"),
+    #     (r"\(costume \[.+? v\]\)", "looks_costumenumbername"),
+    #     (r"\(backdrop \[.+? v\]\)", "looks_backdropnumbername"),
+
+    #     # --- Operators ---
+    #     # (r"<.+?\s*<\s*.+?>", "operator_lt"),
+    #     # (r"<.+?\s*=\s*.+?>", "operator_equals"),
+    #     # (r"<.+?\s*>\s*.+?>", "operator_gt"),
+    #     # (r"<.+? and .+?>", "operator_and"),
+    #     # (r"<.+? or .+?>", "operator_or"),
+    #     # (r"<not .+?>", "operator_not"),
+    #     # (r"\(join (.+?) (.+?)\)", "operator_join"),
+    #     # (r"\(.+?\s*\+\s*.+?\)", "operator_add"),
+    #     # (r"\(.+?\s*-\s*.+?\)", "operator_subtract"),
+    #     # (r"\(.+?\s*\*\s*.+?\)", "operator_multiply"),
+    #     # (r"\(.+?\s*/\s*.+?\)", "operator_divide"),
+    #     # (r"\(pick random (.+?) to (.+?)\)", "operator_random"),
+    #     # (r"\(letter (.+?) of (.+?)\)", "operator_letterof"),
+    #     # (r"\(length of (.+?)\)", "operator_length"),
+    #     # (r"\(.+? mod (.+?)\)", "operator_mod"),
+    #     # (r"\(round (.+?)\)", "operator_round"),
+    #     # (r"\(.+? contains (.+?)\)", "operator_contains"),
+    #     # (r"\(.+? of (.+?)\)", "operator_mathop"),
+    #     # (r"<\s*[^<>]+\s*<\s*[^<>]+\s*>", "operator_lt"),
+    #     # (r"<\s*[^<>]+\s*=\s*[^<>]+\s*>", "operator_equals"),
+    #     # (r"<\s*[^<>]+\s*>\s*[^<>]+\s*>", "operator_gt"),
+    #     (r"<\s*[^<>?]+\s*<\s*[^<>?]+\s*>", "operator_lt"),
+    #     (r"<\s*[^<>?]+\s*=\s*[^<>?]+\s*>", "operator_equals"),
+    #     (r"<\s*[^<>?]+\s*>\s*[^<>?]+\s*>", "operator_gt"),
+    #     (r"<\s*.*?\s+and\s+.*?\s*>", "operator_and"),
+    #     (r"<\s*.*?\s+or\s+.*?\s*>", "operator_or"),
+    #     (r"<\s*not\s+.*?\s*>", "operator_not"),
+
+    #     # (r"\(join\s+(.+?)\s+(.+?)\)", "operator_join"),
+    #     (r"(?:\(join\s+(.+?)\s+(.+?)\)|join\s+(.+?)\s+(.+?))", "operator_join"),
+    #     # (r"\(\s*[^()]+\s*\+\s*[^()]+\s*\)", "operator_add"),
+    #     # (r"\(\s*[^()]+\s*-\s*[^()]+\s*\)", "operator_subtract"),
+    #     # (r"\(\s*[^()]+\s*\*\s*[^()]+\s*\)", "operator_multiply"),
+    #     # (r"\(\s*[^()]+\s*/\s*[^()]+\s*\)", "operator_divide"),
+    #     # Allow nested expressions inside ()
+    #     (r"\(\s*.+?\s*\+\s*.+?\s*\)", "operator_add"),
+    #     # (r"\(\s*.+?\s*-\s*.+?\s*\)", "operator_subtract"),
+    #     (r"\(\s*(?!-\s*\d+(?:\.\d+)?\s*\))(.+?)\s+-\s+(.+?)\)", "operator_subtract"),
+    #     (r"\(\s*.+?\s*\*\s*.+?\s*\)", "operator_multiply"),
+    #     (r"\(\s*.+?\s*/\s*.+?\s*\)", "operator_divide"),
+    #     (r"\(pick random\s+(.+?)\s+to\s+(.+?)\)", "operator_random"),
+    #     (r"\(letter\s+(.+?)\s+of\s+(.+?)\)", "operator_letterof"),
+    #     (r"\(length of\s+(.+?)\)", "operator_length"),
+    #     # (r"\(\s*[^()]+\s+mod\s+[^()]+\s*\)", "operator_mod"),
+    #     (r"\(\s*.+?\s+mod\s+.+?\s*\)", "operator_mod"),
+    #     (r"\(round\s+(.+?)\)", "operator_round"),
+    #     # (r"\(\s*[^()]+\s+contains\s+[^()]+\s*\)", "operator_contains"),
+    #     (r"[<(]\s*\[(?![^\]]*\s+v\])[^\]]+?\]\s*contains\s*\[[^\]]+?\]\s*\??\s*[)>]", "operator_contains"),
+    #     # (r"\(\s*[^()]+\s+of\s+[^()]+\s*\)", "operator_mathop"),
+    #     (r"\(\s*\[?(abs|floor|ceiling|sqrt|sin|cos|tan|asin|acos|atan|ln|log|e \^|10 \^)\s*(?:v)?\]?\s+of\s+.+?\)", "operator_mathop"),
+
+    # ]
     patterns = [
         # --- Multi-line Control Blocks (most specific, non-greedy) ---
         (r"if <.+?> then(?:.|\n)+?else(?:.|\n)+?end", "control_if_else"), #(to test muliple stack)
@@ -3452,7 +3661,8 @@ def _find_all_opcodes(code_block: str) -> list[str]:
         # (r"stop\s+(?:all|this script|other scripts in sprite|\[(?:all|this script|other scripts in sprite)(?:\s+v)?\])", "control_stop"),
         (r"stop\s+(?:all|this script|other scripts in sprite|\[(?:all|this script|other scripts in sprite)(?:\s+v)?\])(?!\s+sounds)", "control_stop"),
         (r"when I start as a clone", "control_start_as_clone"),
-        (r"create clone of \[.+?(?:\s+v)?\]", "control_create_clone_of"),
+        # (r"create clone of \[.+?(?:\s+v)?\]", "control_create_clone_of"),
+        (r"create clone of\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "control_create_clone_of"),  # updated
         (r"delete this clone", "control_delete_this_clone"),
         (r"wait\s+(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)\s+sec(?:ond)?s?", "control_wait"),
         (r"wait until <.+?>", "control_wait_until"),
@@ -3462,19 +3672,28 @@ def _find_all_opcodes(code_block: str) -> list[str]:
         (r"when (green )?flag click(ed)?", "event_whenflagclicked"),
         (r"when\s+(?:key\s+\[(.+?)(?:\s+v)?\]|\[(.+?)(?:\s+v)?\]\s+key)\s+pressed", "event_whenkeypressed"),
         (r"when this sprite clicked", "event_whenthisspriteclicked"),
-        (r"when backdrop switches to \[.+?(?:\s+v)?\]", "event_whenbackdropswitchesto"),
-        (r"when I receive \[.+?(?:\s+v)?\]", "event_whenbroadcastreceived"),
+        #(r"when backdrop switches to \[.+?(?:\s+v)?\]", "event_whenbackdropswitchesto"),
+        #(r"when I receive \[.+?(?:\s+v)?\]", "event_whenbroadcastreceived"),
         (r"when \[.+?(?:\s+v)?\] > (.+)", "event_whengreaterthan"),
-        (r"broadcast \[.+?(?:\s+v)?\] and wait", "event_broadcastandwait"),
-        (r"broadcast \[.+?(?:\s+v)?\]", "event_broadcast"),
+        #(r"broadcast \[.+?(?:\s+v)?\] and wait", "event_broadcastandwait"),
+        #(r"broadcast \[.+?(?:\s+v)?\]", "event_broadcast"),
+        (r"when backdrop switches to\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "event_whenbackdropswitchesto"),  # updated
+        (r"when I receive\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "event_whenbroadcastreceived"),  # updated
+        (r"broadcast\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)\s+and wait", "event_broadcastandwait"),  # updated
+        (r"broadcast\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "event_broadcast"),  # updated
+                
 
         # --- Data Blocks (Variables and Lists) - specific block types first ---
         (r"set\s*\[\s*.+?(?:\s+v)?\s*\]\s*to\s*\(?\s*.+?\s*\)?", "data_setvariableto"),
         (r"change\s*\[\s*.+?(?:\s+v)?\s*\]\s*by\s*\(?\s*.+?\s*\)?", "data_changevariableby"),
-        (r"show variable \[.+?(?:\s+v)?\]", "data_showvariable"),
-        (r"hide variable \[.+?(?:\s+v)?\]", "data_hidevariable"),
-        (r"show list \[.+?(?:\s+v)?\]", "data_showlist"),
-        (r"hide list \[.+?(?:\s+v)?\]", "data_hidelist"),
+        # (r"show variable \[.+?(?:\s+v)?\]", "data_showvariable"),
+        # (r"hide variable \[.+?(?:\s+v)?\]", "data_hidevariable"),
+        # (r"show list \[.+?(?:\s+v)?\]", "data_showlist"),
+        # (r"hide list \[.+?(?:\s+v)?\]", "data_hidelist"),
+        (r"show variable\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "data_showvariable"),  # updated
+        (r"hide variable\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "data_hidevariable"),  # updated
+        (r"show list\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "data_showlist"),  # updated
+        (r"hide list\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "data_hidelist"),  # updated
         (r"add\s+(?:\[.+?\]|\(.+?\)|\w+)\s+to\s+\[.+?(?:\s+v)?\]", "data_addtolist"),
         (r"delete\s*\((?!all\)).+?\)\s*of\s*\[.+?(?:\s+v)?\]", "data_deleteoflist"),
         (r"delete\s*\(all\)\s*of\s*\[.+?(?:\s+v)?\]", "data_deletealloflist"),
@@ -3505,7 +3724,8 @@ def _find_all_opcodes(code_block: str) -> list[str]:
         # (r"touching\s*(?:color\s*)?#\w{6}\??", "sensing_touchingcolor"),
         (r"(?<!is\s)touching\s*(?:color\s*)?\[?\s*#([0-9A-Fa-f]{6})\s*\]?\??", "sensing_touchingcolor"),
         (r"touching \[.+? v\]\??", "sensing_touchingobject"),
-        (r"set drag mode \[.+? v\]", "sensing_setdragmode"),
+        # (r"set drag mode \[.+? v\]", "sensing_setdragmode"),
+        (r"set drag mode\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "sensing_setdragmode"),  # updated
         (r"reset timer", "sensing_resettimer"),
         # (r"(?<!at\s)(?<!item\s)\(.+? of \[.+? v]\)", "sensing_of"),
         #(r"(?<!at\s)(?<!item\s)(?<!item\s)(?<!delete\s)[(].+? of \[.+? v\]", "sensing_of"),
@@ -3550,7 +3770,8 @@ def _find_all_opcodes(code_block: str) -> list[str]:
         (r"go to\s*(?:random position|mouse-pointer|\[.*?\]|.+)", "motion_goto"),   #(to mouse-pointer is not include here for now) 
         # (r"point in direction (.+)", "motion_pointindirection"),
         (r"point in direction\s*\(?(.+?)\)?", "motion_pointindirection"),
-        (r"point towards \[.+? v\]", "motion_pointtowards"),
+        # (r"point towards \[.+? v\]", "motion_pointtowards"),
+        (r"point towards\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "motion_pointtowards"),  # updated
         # (r"change x by (.+)", "motion_changexby"),
         # (r"change y by (.+)", "motion_changeyby"),
         (r"change x by\s*\(?(.+?)\)?", "motion_changexby"),
@@ -3567,10 +3788,14 @@ def _find_all_opcodes(code_block: str) -> list[str]:
         (r"\(?direction\)?", "motion_direction"),  #(to direction  may detect where var is used) 
         
         # --- Looks Blocks ---
-        (r"switch costume to \[.+? v\]", "looks_switchcostumeto"),
+        # (r"switch costume to \[.+? v\]", "looks_switchcostumeto"),
+        # (r"next costume", "looks_nextcostume"),
+        # (r"switch backdrop to \[.+? v\] and wait", "looks_switchbackdroptowait"),
+        # (r"switch backdrop to \[.+? v\]", "looks_switchbackdropto"),
+        (r"switch costume to\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "looks_switchcostumeto"),  # updated
         (r"next costume", "looks_nextcostume"),
-        (r"switch backdrop to \[.+? v\] and wait", "looks_switchbackdroptowait"),
-        (r"switch backdrop to \[.+? v\]", "looks_switchbackdropto"),
+        (r"switch backdrop to\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)\s*and wait", "looks_switchbackdroptowait"),  # updated
+        (r"switch backdrop to\s*(?:\(.+?\)|\[.+?(?:\s+v)?\]|\S+)", "looks_switchbackdropto"),  # updated
         (r"next backdrop", "looks_nextbackdrop"),
         (r"^\s*show\s*$", "looks_show"),
         (r"^\s*hide\s*$", "looks_hide"),
@@ -3730,6 +3955,7 @@ def analyze_opcode_counts(pseudo_code: str) -> list[dict]:
 #         scripts.append(script.strip())
     
 #     return scripts
+
 def separate_scripts(pseudocode_string):
     """
     Separates a block of Scratch pseudocode into a list of individual scripts.