Fixed bug in antlr grammar.

Fixed incorrect string parsing when string is concatenating with + sign.

Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/yang/yang-parser-impl/src/main/antlr/YangLexer.g4 b/yang/yang-parser-impl/src/main/antlr/YangLexer.g4
index 0395f78273b17542af39bb2c3ca7d95cfb973869..bf4ecbf42df4ff4ee14a4ee68804b7adbd8999b3 100644 (file)
--- a/yang/yang-parser-impl/src/main/antlr/YangLexer.g4
+++ b/yang/yang-parser-impl/src/main/antlr/YangLexer.g4
@@ -101,7 +101,7 @@ END_IDENTIFIER_LEFT_BRACE : '{' ->type(LEFT_BRACE), popMode;
  
 fragment SUB_STRING : ('"' (ESC | ~["])*'"') | ('\'' (ESC | ~['])*'\'') ;
 
-STRING: (SUB_STRING |  (~( '\r' | '\n' | '\t' | ' ' | ';' | '{' )+)) ->popMode;// IDENTIFIER ;
+STRING: ((~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '"' | '\'' )+) | SUB_STRING ) ->popMode;// IDENTIFIER ;
 S : [ \n\r\t] -> skip;    
 
 mode BLOCK_COMMENT_MODE;