From e4f2a11bead0677222ac1f98ed20dc3676634e6c Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Wed, 30 Sep 2015 13:37:05 +0200 Subject: [PATCH 1/1] Bug 4378: New parser can't handle "}}" sequence Two and more subsequent occurences of right brace "}" shoudln't be recognized by lexer as STRING. Change-Id: Ic033e923b380f86cba424dec2fceae432d65c6e0 Signed-off-by: Martin Ciglan --- yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4 b/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4 index b717fbc8c5..a9e19acf6c 100644 --- a/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4 +++ b/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4 @@ -39,7 +39,8 @@ fragment ESC : '\\' (["\\/bfnrt] | UNICODE); fragment UNICODE : 'u' HEX HEX HEX HEX; fragment HEX : [0-9a-fA-F] ; -STRING : ((~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '"' | '\'' | '/' | '=' | '[' | ']' | '+' )~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '/' | '=' | '[' | ']')* ) | SUB_STRING ); +STRING : ((~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '"' | '\'' | '/' | '=' | '[' | ']' | '+' | '}' )~( '\r' | '\n' | +'\t' | ' ' | ';' | '{' | '/' | '=' | '[' | ']' | '}')* ) | SUB_STRING ); mode BLOCK_COMMENT_MODE; END_BLOCK_COMMENT : '*/' -> popMode, skip; -- 2.36.6