From d87064cc88b59c970a02cb2567cd34fc7eb421ce Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Wed, 12 Nov 2014 12:28:42 +0100 Subject: [PATCH] Bug 2354: Fixed parsing of block comments between statement and argument Lexer didn't contain BLOCK_COMMENT_MODE in VALUE_MODE, therefore parser tried to parse comments instead of skipping them Change-Id: I6d131a45df121570537686006aa31397124ea6ca Signed-off-by: Martin Ciglan --- yang/yang-parser-impl/src/main/antlr/YangLexer.g4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang/yang-parser-impl/src/main/antlr/YangLexer.g4 b/yang/yang-parser-impl/src/main/antlr/YangLexer.g4 index ac9358c72e..48d75a0fee 100644 --- a/yang/yang-parser-impl/src/main/antlr/YangLexer.g4 +++ b/yang/yang-parser-impl/src/main/antlr/YangLexer.g4 @@ -105,7 +105,9 @@ fragment HEX : [0-9a-fA-F] ; END_IDENTIFIER_SEMICOLON : ';' -> type(SEMICOLON),popMode; END_IDENTIFIER_LEFT_BRACE : '{' ->type(LEFT_BRACE), popMode; - + +START_INNER_BLOCK_COMMENT : '/*' ->pushMode(BLOCK_COMMENT_MODE), skip ; + fragment SUB_STRING : ('"' (ESC | ~["])*'"') | ('\'' (ESC | ~['])*'\'') ; STRING: ((~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '"' | '\'')~( '\r' | '\n' | '\t' | ' ' | ';' | '{' )* ) | SUB_STRING ) ->popMode;// IDENTIFIER ; -- 2.36.6