From f6b8b24b036847d3e55dc1cc2d45711ab0e8abe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20K=C4=99dzia?= <pawel.kedzia@pwr.wroc.pl>
Date: Mon, 6 Dec 2010 12:57:03 +0100
Subject: [PATCH] Fix lexer rules: WS and STRING
---
libwccl/parser/grammar.g | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index beab755..a4ac6c4 100644
--- a/libwccl/parser/grammar.g
+++ b/libwccl/parser/grammar.g
@@ -1190,12 +1190,14 @@ options {
k = 2;
}
+
+// TODO
STRING
options {
paraphrase = "a string";
}
- : '"'! (~'"')* '"'!
- | '\''! (~'\'')* '\''!
+ : '"'! (~('"' | '\n' | '\r'))* '"'!
+ | '\''! (~('\'' | '\n' | '\r'))* '\''!
;
SIGNED_INT
@@ -1336,15 +1338,14 @@ options {
WS
: ( ' '
- | '\t'
- | '\f'
- | ( "\r\n"
- | '\r'
- | '\n'
- )
- { newline(); }
- )
- { $setType(antlr::Token::SKIP); }
+ | '\t'
+ | '\f'
+ |
+ ( "\r\n"
+ | '\r'
+ | '\n'
+ ) { newline(); }
+ ) { $setType(antlr::Token::SKIP); }
;
COMMENT
--
GitLab