Merge pull request boriel-basic#656 from boriel/bugfix/prepro_line_co…

…mment_continuation fix: backlash continuation ignored after comment
boriel · Aug 9, 2023 · 7e6431d · 7e6431d
2 parents 1f71db8 + d417e3c
commit 7e6431d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/src/zxbpp/zxbpplex.py b/src/zxbpp/zxbpplex.py
@@ -185,6 +185,13 @@ def t_msg_TEXT(self, t):
         t.value = t.value.strip()  # remove newline and spaces
         return t
 
+    def t_singlecomment_CONTINUE(self, t):
+        r"\\\r?\n"
+        t.lexer.lineno += 1
+        t.value = t.value[1:]
+        t.lexer.pop_state()
+        return t
+
     # Any other character is ignored until EOL
     def t_singlecomment_comment_Skip(self, t):
         r"."

diff --git a/tests/functional/prepro03.bi b/tests/functional/prepro03.bi
@@ -1,10 +1,7 @@
 
 #define test x 'a comment \
+    this line must be compiled
 #define test2 y ' This define should not be ignored
 
 test
 test2
-
-
-
-
diff --git a/tests/functional/prepro03.out b/tests/functional/prepro03.out
@@ -1,11 +1,9 @@
 #line 1 "prepro03.bi"
 
-#line 3 "prepro03.bi"
 #line 4 "prepro03.bi"
+#line 5 "prepro03.bi"
 
-x
+x 
+    this line must be compiled
+#line 7
 y
-
-
-
-
diff --git a/tests/functional/prepro80.bi b/tests/functional/prepro80.bi
@@ -7,5 +7,7 @@ REM simple WaitRetrace macro
 		halt \
 	end asm
 
-#endif
+waitretrace
+waitretrace
 
+#endif
diff --git a/tests/functional/prepro80.out b/tests/functional/prepro80.out
@@ -3,11 +3,18 @@
 
 
 
+
+
 	asm 
 		halt 
 		halt 
 	end asm
-#line 9
+#line 11
 
-#line 11 "prepro80.bi"
+	asm 
+		halt 
+		halt 
+	end asm
+#line 12
 
+#line 14 "prepro80.bi"