From e47c478f005178af00f515d51ef8d99bc8887d84 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Tue, 30 Jul 2013 11:56:56 +0200 Subject: [PATCH] Fixed bugs in antlr lexer and parser. Fixed distributionManagement section in pom.xml. Signed-off-by: Martin Vitez --- pom.xml | 1 + yang-parser-impl/src/main/antlr/YangLexer.g4 | 2 +- yang-parser-impl/src/main/antlr/YangParser.g4 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 089fc27420..73998a9703 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ UTF-8 1.7.2 + http://nexus.opendaylight.org/content diff --git a/yang-parser-impl/src/main/antlr/YangLexer.g4 b/yang-parser-impl/src/main/antlr/YangLexer.g4 index 1c511355e9..2fa4843bd5 100644 --- a/yang-parser-impl/src/main/antlr/YangLexer.g4 +++ b/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' | ' ' | ';' | '{' )+)) ->popMode;// IDENTIFIER ; +STRING: (SUB_STRING | (~( '\r' | '\n' | '\t' | ' ' | ';' | '{' )+)) ->popMode;// IDENTIFIER ; S : [ \n\r\t] -> skip; mode BLOCK_COMMENT_MODE; diff --git a/yang-parser-impl/src/main/antlr/YangParser.g4 b/yang-parser-impl/src/main/antlr/YangParser.g4 index c814831253..cd47dced2a 100644 --- a/yang-parser-impl/src/main/antlr/YangParser.g4 +++ b/yang-parser-impl/src/main/antlr/YangParser.g4 @@ -46,7 +46,7 @@ short_case_stmt : container_stmt | leaf_stmt | leaf_list_stmt | list_stmt | anyx choice_stmt : CHOICE_KEYWORD string (SEMICOLON | (LEFT_BRACE (identifier_stmt |when_stmt | if_feature_stmt | default_stmt | config_stmt | mandatory_stmt | status_stmt | description_stmt | reference_stmt | short_case_stmt | case_stmt)* RIGHT_BRACE)); unique_stmt : UNIQUE_KEYWORD string stmtend; key_stmt : KEY_KEYWORD string stmtend; -list_stmt : LIST_KEYWORD string LEFT_BRACE (identifier_stmt |when_stmt | if_feature_stmt | must_stmt | key_stmt | unique_stmt | config_stmt | min_elements_stmt | max_elements_stmt | ordered_by_stmt | status_stmt | description_stmt | reference_stmt | typedef_stmt | grouping_stmt | data_def_stmt )+ RIGHT_BRACE; +list_stmt : LIST_KEYWORD string LEFT_BRACE (identifier_stmt |when_stmt | if_feature_stmt | must_stmt | key_stmt | unique_stmt | config_stmt | min_elements_stmt | max_elements_stmt | ordered_by_stmt | status_stmt | description_stmt | reference_stmt | typedef_stmt | grouping_stmt | data_def_stmt )* RIGHT_BRACE; leaf_list_stmt : LEAF_LIST_KEYWORD string LEFT_BRACE (identifier_stmt |when_stmt | if_feature_stmt | type_stmt | units_stmt | must_stmt | config_stmt | min_elements_stmt | max_elements_stmt | ordered_by_stmt | status_stmt | description_stmt | reference_stmt )* RIGHT_BRACE; leaf_stmt : LEAF_KEYWORD string LEFT_BRACE (identifier_stmt |when_stmt | if_feature_stmt | type_stmt | units_stmt | must_stmt | default_stmt | config_stmt | mandatory_stmt | status_stmt | description_stmt | reference_stmt )* RIGHT_BRACE; container_stmt : CONTAINER_KEYWORD string (SEMICOLON | (LEFT_BRACE (identifier_stmt | when_stmt | if_feature_stmt | must_stmt | presence_stmt | config_stmt | status_stmt | description_stmt | reference_stmt | typedef_stmt | grouping_stmt | data_def_stmt )* RIGHT_BRACE)); -- 2.36.6