From c1d0c0549da2f43cb4b4c40751add7c28b563dc3 Mon Sep 17 00:00:00 2001 From: dekuNukem Date: Thu, 8 Jan 2026 01:50:02 +0000 Subject: [PATCH] better handle invalid lines --- src/dsvm_make_bytecode.py | 9 +++++++++ src/dsvm_preprocessor.py | 5 ++++- src/duckypad_config.py | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/dsvm_make_bytecode.py b/src/dsvm_make_bytecode.py index d46ef4e..489d09f 100644 --- a/src/dsvm_make_bytecode.py +++ b/src/dsvm_make_bytecode.py @@ -622,11 +622,20 @@ def replace_dummy_with_drop_from_context_dict(ctx_dict): for key in ctx_dict['func_assembly_dict']: replace_dummy_with_drop(ctx_dict['func_assembly_dict'][key]) +def flip_import_line_number(import_dict): + if import_dict is None: + return + for key in import_dict: + for line_obj in import_dict[key]: + line_obj.orig_lnum_sf1 *= -1 + def make_dsb_with_exception(program_listing, should_print=False, remove_unused_func=True, import_name_to_line_obj_dict=None): global global_context_dict global print_asm print_asm = should_print + flip_import_line_number(import_name_to_line_obj_dict) + orig_listing = copy.deepcopy(program_listing) rdict = dsvm_preprocessor.run_all(program_listing, import_name_to_line_obj_dict=import_name_to_line_obj_dict) diff --git a/src/dsvm_preprocessor.py b/src/dsvm_preprocessor.py index 7401261..c6ad0f1 100644 --- a/src/dsvm_preprocessor.py +++ b/src/dsvm_preprocessor.py @@ -791,7 +791,10 @@ def preprocess_import_str_dict(import_str_dict): for key in import_str_dict: lineobj_list = make_list_of_ds_line_obj_from_str_listing(import_str_dict[key], key) rdict = run_all(lineobj_list) - preprocessed_import_lineobj_dict[key] = rdict["dspp_listing_with_indent_level"] + if rdict['is_success'] is False: + preprocessed_import_lineobj_dict[key] = lineobj_list + else: + preprocessed_import_lineobj_dict[key] = rdict["dspp_listing_with_indent_level"] return preprocessed_import_lineobj_dict if __name__ == "__main__": diff --git a/src/duckypad_config.py b/src/duckypad_config.py index 1d00688..682f487 100644 --- a/src/duckypad_config.py +++ b/src/duckypad_config.py @@ -1812,7 +1812,7 @@ def check_syntax(force=False): if error_lnum >= 0: script_textbox.tag_add("error", str(error_lnum)+".0", str(error_lnum)+".0 lineend") else: - error_text = f"Errors in {user_header_source_tag_NO_SPACE}!\nClick \"Edit Headers\" Button." + error_text = f"Errors in {user_header_source_tag_NO_SPACE}\nClick \"User Header\" Button." check_syntax_label.config(text=error_text, fg='red') check_syntax_label = Label(scripts_lf, text="")