From bef9b09493403187079f4b8ec6633f5258376f44 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Fri, 3 Nov 2023 20:07:39 +0200 Subject: Improve macro parsing --- asm/text_mode.atk16 | 2 -- digital/atk16_mem.dig | 13 ++++++++----- src/tokenizer.py | 2 -- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/asm/text_mode.atk16 b/asm/text_mode.atk16 index f33120d..fa4f297 100644 --- a/asm/text_mode.atk16 +++ b/asm/text_mode.atk16 @@ -13,8 +13,6 @@ cursor_to_line RA 2 put_string RA RB " BY JAN" - ; set graphics mode to sprite mode - ; set_graphics_mode gr_sprite_mode set_graphics_mode gr_text_mode @label loop diff --git a/digital/atk16_mem.dig b/digital/atk16_mem.dig index a5279d0..0e2c2f2 100644 --- a/digital/atk16_mem.dig +++ b/digital/atk16_mem.dig @@ -39,11 +39,14 @@ ,4855,f000,3140,1b48,3148,1b48,4016,2000,2000,4215,2240,3040,1800 ,3148,1b48,3140,1b48,e000,4017,2000,4200,3008,6000,6001,f840,4032 ,2000,4200,3008,1008,4208,3008,1008,4205,3008,1008,420c,3008,1008 -,420c,3008,1008,420f,3008,1008,4200,3008,1008,4203,3008,1008,420f -,3008,1008,4212,3008,1008,4205,3008,1008,4203,3008,1008,4201,3008 -,1008,420d,3008,1008,4210,3008,1008,6001,f880,4063,2000,4200,3008 -,1008,4202,3008,1008,4219,3008,1008,4200,3008,1008,420a,3008,1008 -,4201,3008,1008,420e,3008,1008,4017,2000,4201,3008,61ff +,420c,3008,1008,420f,3008,1008,4200,3008,1008,4216,3008,1008,4201 +,3008,1008,4209,3008,1008,420e,3008,1008,4203,3008,1008,420f,3008 +,1008,420f,3008,1008,4204,3008,1008,4209,3008,1008,420a,3008,1008 +,4215,3008,1008,4214,3008,1008,4215,3008,1008,4214,3008,1008,6001 +,f880,4075,2000,4200,3008,1008,4202,3008,1008,4205,3008,1008,420e +,3008,1008,4209,3008,1008,4213,3008,1008,4200,3008,1008,4202,3008 +,1008,4209,3008,1008,4202,3008,1008,4205,3008,1008,420c,3008,1008 +,4209,3008,1008,4017,2000,4201,3008,61ff diff --git a/src/tokenizer.py b/src/tokenizer.py index d9c6058..d89309f 100644 --- a/src/tokenizer.py +++ b/src/tokenizer.py @@ -40,6 +40,4 @@ def tokenize(line: str) -> list[str]: if len(cur) > 0: result.append(cur) - print(result) - return [r for r in result if r != ""] \ No newline at end of file -- cgit v1.3