Merge pull request #415 from boriel/bugfix/token_error_in_asm

Bugfix/token error in asm

Author: boriel

src/libzxbpp/zxbasmpplex.py

@@ -106,7 +106,7 @@ def t_INITIAL_CHAR(self, t):
         return t
 
     def t_INITIAL_TOKEN(self, t):
-        r"[][%'`,.:$()*/<>~&|+^-]"
+        r"[][}{%'`,.:$()*/<>~&|+^-]"
         return t
 
     def t_prepro_define_defargs_defargsopt_defexpr_pragma_NEWLINE(self, t):

src/libzxbpp/zxbpplex.py

@@ -122,7 +122,7 @@ def t_asm_CHAR(self, t):
         return t
 
     def t_asm_TOKEN(self, t):
-        r"[]['`.:$*/+<>|&~%^-]"
+        r"[][}{'`.:$*/+<>|&~%^-]"
         return t
 
     def t_INITIAL_CONTINUE(self, t):

tests/functional/asm_tokens.asm

@@ -0,0 +1,40 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+#line 0
+		ld a, {{macro_value}}
+#line 1
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	exx
+	pop iy
+	pop ix
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+	END

tests/functional/asm_tokens.bas

@@ -0,0 +1,4 @@
+asm
+ld a, {{macro_value}}
+end asm
+