From 278eb0c090a276e7236c50a4d637030e078d5824 Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(win7-laptop)>
Date: Sun, 28 Nov 2010 19:08:18 +0100
Subject: [PATCH] Fix multiline comment in Lexer.
---
libwccl/parser/grammar.g | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index 781ed05..c98b850 100644
--- a/libwccl/parser/grammar.g
+++ b/libwccl/parser/grammar.g
@@ -1056,10 +1056,15 @@ ML_COMMENT
options {
paraphrase = "Multi line comment";
}
- : "/*"
- (.)*
- "*/"
- { $setType(antlr::Token::SKIP); }
+ : "/*"
+ ({ LA(2)!='/' }? '*'
+ | ('\r' '\n') => '\r' '\n' {newline();}
+ | '\r' {newline();}
+ | '\n' {newline();}
+ | ~('*'|'\n'|'\r')
+ )*
+ "*/"
+ {$setType(antlr::Token::SKIP);}
;
HASH
--
GitLab