From: Peter Kajsa <pkajsa@cisco.com>
Date: Tue, 26 Apr 2016 08:43:40 +0000 (+0200)
Subject: Bug 5484: Fix of Yang statement lexer
X-Git-Tag: release/beryllium-sr3~12
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=2ade6e056733b6fbbdfb00c61597dc4c2cce0119

Bug 5484: Fix of Yang statement lexer

Fix of Yang statement lexer to support statement arguments which
contain characters like '=' | '[' | ']' | '+' and which
are not enclosed in quotes or double quotes.

Change-Id: I6d9ba953985eca5018f196cfd16fc11ae5986876
Signed-off-by: Peter Kajsa <pkajsa@cisco.com>
(cherry picked from commit 2bb2f1cc8cea334dbe2806dbd919bc810fcba32a)
---

diff --git a/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4 b/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4
index a9e19acf6c..c40927eb61 100644
--- a/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4
+++ b/yang/yang-parser-impl/src/main/antlr/YangStatementLexer.g4
@@ -39,8 +39,7 @@ 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;