Fixes escaped newlines not working

spacestation13 · Jul 7, 2024 · 28e5d50 · 28e5d50
1 parent 9942f0f
commit 28e5d50
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/dm-lezer/src/dm.grammar b/dm-lezer/src/dm.grammar
@@ -11,7 +11,7 @@
   }
 }
 
-@skip { s | escapedWs }
+@skip { s }
 
 preprocessor[@isGroup=Preprocessor] {
   PpDefine |
@@ -140,11 +140,9 @@ UnaryOp[group=operator] {"!"}
 
 
 @tokens {
-  escapedWs { "\\" ws+ }
+  s { ("\\\n" | " " | "\t" )+ }
   Identifier { ("\\" ![\n] | @asciiLetter | @digit | "_" | "-")+ }
   PpIdentifier { (@asciiLetter | "_")  (@asciiLetter | @digit | "_" | "-")+ }
-  ws { @whitespace }
-  s { " " }
   nl { "\n" | @eof }
   "!"
   "==" "!=" ">" ">=" "<" "<=" "||" "&&" "*" "/" "+" "-"

diff --git a/dm-lezer/tests/ppdefine b/dm-lezer/tests/ppdefine
@@ -52,3 +52,13 @@ File(
     PpIdentifier
   ),Expression)
 )
+
+# Escaped newlines
+\
+#       \
+           define\
+         test
+==>
+File(
+  PpDefine(define,PpIdentifier)
+)