Merge pull request #517 from boriel/feature/allow_dot_in_init_names

Allow "." in INIT labels

Author: boriel

src/zxbpp/zxbasmpplex.py

@@ -146,7 +146,7 @@ def t_line_prepro_pragma_defargs_define_skip(self, t):
         pass  # Ignore whitespaces and tabs
 
     def t_prepro_ID(self, t):
-        r'[_a-zA-Z][_a-zA-Z0-9]*'  # preprocessor directives
+        r'[._a-zA-Z][._a-zA-Z0-9]*'  # preprocessor directives
         t.type = reserved_directives.get(t.value.lower(), 'ID')
         if t.type == 'DEFINE':
             t.lexer.begin('define')

src/zxbpp/zxbpplex.py

@@ -223,7 +223,7 @@ def t_if_LT(self, t):
         return t
 
     def t_prepro_ID(self, t):
-        r'[_a-zA-Z][_a-zA-Z0-9]*'  # preprocessor directives
+        r'[._a-zA-Z][._a-zA-Z0-9]*'  # preprocessor directives
         t.type = reserved_directives.get(t.value.lower(), 'ID')
         states_ = {
             'DEFINE': 'define',

tests/functional/init_with_dot.asm

@@ -0,0 +1,42 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	call A_LABEL.DOT
+	jp __MAIN_PROGRAM__
+__CALL_BACK__:
+	DEFW 0
+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 3 "init_with_dot.bas"
+	A_LABEL.DOT:
+#line 9 "init_with_dot.bas"
+	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
+	;; --- end of user code ---
+	END

tests/functional/init_with_dot.bas

@@ -0,0 +1,9 @@
+
+ASM
+
+#init A_LABEL.DOT
+
+A_LABEL.DOT:
+
+END ASM
+