From ce76a7dfa5ee5f6efa6615c0054b0f0442ffcb3e Mon Sep 17 00:00:00 2001 From: meisl Date: Mon, 14 Jun 2021 22:04:22 +0200 Subject: [PATCH] * #40: fix grammar wrt line endings - tests pass --- parser/antlr/prog8.g4 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/parser/antlr/prog8.g4 b/parser/antlr/prog8.g4 index 2d9eec53f..34d163b28 100644 --- a/parser/antlr/prog8.g4 +++ b/parser/antlr/prog8.g4 @@ -14,15 +14,9 @@ grammar prog8; package prog8.parser; } -//FIXME: why isn't testWindowsAndMacNewlinesAreAlsoFine *failing* with this old stuff?! -// note: when we build the whole thing with it, then non-Unix newlines actually DO NOT work with it...?! -LINECOMMENT : '\n' [ \t]* COMMENT -> channel(HIDDEN); -COMMENT : ';' ~[\n]* -> channel(HIDDEN) ; -EOL : '\n'+ ; - -//LINECOMMENT : ('\r'? '\n' | '\r') [ \t]* COMMENT -> channel(HIDDEN); -//COMMENT : ';' ~[\r\n]* -> channel(HIDDEN) ; -//EOL : ('\r'? '\n' | '\r')+ ; +LINECOMMENT : ('\r'? '\n' | '\r') [ \t]* COMMENT -> channel(HIDDEN); +COMMENT : ';' ~[\r\n]* -> channel(HIDDEN) ; +EOL : ('\r'? '\n' | '\r')+ ; WS : [ \t] -> skip ; // WS2 : '\\' EOL -> skip;