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 <mciglan@cisco.com>

diff --git a/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4 b/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4
index b717fbc8c56368875795c6e30c6d3edb5e11f60b..a9e19acf6cf2b09cfdfa02cfc8e77f02f45914b6 100644 (file)
--- 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;