Fixed bugs in antlr lexer and parser. Fixed distributionManagement section in pom...

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

diff --git a/pom.xml b/pom.xml
index 089fc274202043df9732a2349044b0f27ec41625..73998a9703d72e7767913194b6a077f3d458f5db 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.2</slf4j.version>
+        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     </properties>
 
     <modules>

diff --git a/yang-parser-impl/src/main/antlr/YangLexer.g4 b/yang-parser-impl/src/main/antlr/YangLexer.g4
index 1c511355e964a7885b709d0a49dc8463b1829422..2fa4843bd5dffa95d46536b96f299257e7efd822 100644 (file)
--- 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 c8148312534518e96b75b13348bac815f684f65b..cd47dced2ad0a3e2d17a9b562869434123d650e2 100644 (file)
--- 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));