Merge pull request #243 from boriel/feature/allow_extra_chars

Feature/allow extra chars

Author: boriel

requirements.txt

@@ -1,3 +1,3 @@
-ply==3.10
+ply==3.11
 six
 

tests/functional/extra_chars.asm

@@ -0,0 +1,38 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+#line 1
+	`mylabel:
+		ld a, #0
+#line 3
+	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
+ZXBASIC_USER_DATA:
+; Defines DATA END --> HEAP size is 0
+ZXBASIC_USER_DATA_END:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	END

tests/functional/extra_chars.bas

@@ -0,0 +1,6 @@
+
+ASM
+`mylabel:
+ld a, #0
+END ASM
+

tests/functional/extra_chars1.bas

@@ -0,0 +1,6 @@
+
+REM This should fail because it's used in BASIC context
+
+LET `a = 1
+
+

tests/functional/test_errmsg.txt

@@ -109,6 +109,7 @@ fornextopt2.bas:4: warning: FOR start value is lower than end. This FOR loop is
 atoloduplbl.asm:3: label '.SetSubScreen' already defined at line 2
 >>> process_file('asmerror2.asm')
 asmerror2.asm:2: Error: illegal preprocessor character '@'
+asmerror2.asm:2: illegal character '#'
 asmerror2.asm:2: Syntax error. Unexpected end of line [NEWLINE]
 >>> process_file('llb.bas')
 llb.bas:3: Undeclared function "f$"

zxbasmpplex.py

@@ -105,7 +105,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):
@@ -250,6 +250,9 @@ def t_INIIAL_sharp(self, t):
         r'\#'  # Only matches if at beginning of line and "#"
         if t.value == '#' and self.find_column(t) == 1:
             t.lexer.push_state('prepro')  # Start preprocessor
+        else:
+            t.type = 'TOKEN'
+            return t
 
     def t_defexpr_TOKEN(self, t):
         r'=>|<=|>=|<>|[@:.<>^=+*/&|%-]'

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):
@@ -331,6 +331,9 @@ def t_INITIAL_asm_sharp(self, t):
         if self.find_column(t) == 1:
             t.lexer.push_state('prepro')  # Start preprocessor
             self.expectingDirective = True
+        else:
+            t.type = 'TOKEN'
+            return t
 
     def t_INITIAL_defexpr_TOKEN(self, t):
         r'=>|<=|>=|<>|[$!&|~@:;{}.<>^=+*/%-]'