Fix .endmacro not at the start of the line. Fix last commit

2024-06-19 14:29:40 +00:00 · 2023-03-01 21:55:14 -05:00 · 2023-03-01 21:55:14 -05:00 · 0b71d1cfff
commit 0b71d1cfff
parent 1c60bc5009
4 changed files with 46 additions and 10 deletions
--- a/test/asm/err/bug2013.s
+++ b/test/asm/err/bug2013.s
@ -0,0 +1,6 @@
+; for PR #2013
+; should produce error output:
+; ... Error: '.ENDMACRO' expected for macro 'test'
+
+.macro test
+    nop .endmacro
--- a/test/asm/val/bug2013.s
+++ b/test/asm/val/bug2013.s
@ -0,0 +1,30 @@
+; for PR #2013
+    .import _exit
+    .export _main
+
+    ; this macro is invalid, but should not cause an error (if it is never expanded)
+    .macro invalid
+        nop .endmacro
+    .endmacro
+
+    .define temp_endmac .endmacro
+    .macro new_mac
+        .define startmac .macro
+        .define endmac .endmacro
+    temp_endmac
+
+    .undefine temp_endmac
+
+    new_mac
+
+    startmac dex2
+        dex
+        dex
+    endmac
+
+_main:
+    ldx #$02
+    dex2
+    ; x should be zero
+    txa
+    jmp _exit