From 7258997bbb9e8ffd72643ef96dc50623e0a84bcb Mon Sep 17 00:00:00 2001 From: dekuNukem Date: Mon, 22 Jan 2024 18:37:39 +0000 Subject: [PATCH] not replacing TRUE and FALSE inside STRING statements --- pc_software/duckypad_config_latest_source.zip | Bin 159940 -> 159992 bytes pc_software/keywords.py | 3 +++ 2 files changed, 3 insertions(+) diff --git a/pc_software/duckypad_config_latest_source.zip b/pc_software/duckypad_config_latest_source.zip index 509e9015aff8bb6acb6ad64e3393ae4b8ce2bdf4..74b2a0728c8d87877b9a52f0f42dd966201475b2 100644 GIT binary patch delta 3496 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 Wmtb%L9s#76e{cdn2CQoW0000%db!8| delta 3492 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 S01f~S05$~x0C;Nx00013YpEsx diff --git a/pc_software/keywords.py b/pc_software/keywords.py index ebe51985..3669537a 100644 --- a/pc_software/keywords.py +++ b/pc_software/keywords.py @@ -167,6 +167,9 @@ valid_var_chars = set(valid_var_chars) def replace_DEFINE(pgm_line, dd): + if pgm_line.startswith(cmd_STRING+" ") or pgm_line.startswith(cmd_STRINGLN+" "): + dd.pop("TRUE", None) + dd.pop("FALSE", None) dd_list_longest_first = sorted(list(dd.keys()), key=len, reverse=True) temp_line = f" {pgm_line} " for key in dd_list_longest_first: