Cleanup LeafRefPath{Lexer,Parser}

Drop CRLFs and remove a trailing space.

JIRA: YANGTOOLS-969
Change-Id: I24fabf164db72164e07bc3ea149e11e028ba91a2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-impl/src/main/antlr/LeafRefPathLexer.g4 b/yang/yang-data-impl/src/main/antlr/LeafRefPathLexer.g4
index 526c7ca8c1ce3fc21df447af909e96eb46b06e13..3ba4c07ddfff86ad45d5667c30c9b9aec959d6fb 100644 (file)
--- a/yang/yang-data-impl/src/main/antlr/LeafRefPathLexer.g4
+++ b/yang/yang-data-impl/src/main/antlr/LeafRefPathLexer.g4
@@ -1,20 +1,20 @@
-lexer grammar LeafRefPathLexer;\r
-\r
-@header {\r
-package org.opendaylight.yangtools.yang.data.impl.leafref;\r
-}\r
-\r
-COLON : ':' ;\r
-SLASH : '/' ;\r
-DOTS : '..' ;\r
-EQUAL : '=' ;\r
-LEFT_SQUARE_BRACKET : '[' ;\r
-RIGHT_SQUARE_BRACKET : ']' ;\r
-LEFT_PARENTHESIS : '(' ;\r
-RIGHT_PARENTHESIS : ')' ;\r
-\r
-CURRENT_KEYWORD : 'current';\r
-\r
-SEP: [ \n\r\t]+ ;\r
-IDENTIFIER : [a-zA-Z_][a-zA-Z0-9_\-.]*;\r
-\r
+lexer grammar LeafRefPathLexer;
+
+@header {
+package org.opendaylight.yangtools.yang.data.impl.leafref;
+}
+
+COLON : ':' ;
+SLASH : '/' ;
+DOTS : '..' ;
+EQUAL : '=' ;
+LEFT_SQUARE_BRACKET : '[' ;
+RIGHT_SQUARE_BRACKET : ']' ;
+LEFT_PARENTHESIS : '(' ;
+RIGHT_PARENTHESIS : ')' ;
+
+CURRENT_KEYWORD : 'current';
+
+SEP: [ \n\r\t]+ ;
+IDENTIFIER : [a-zA-Z_][a-zA-Z0-9_\-.]*;
+

diff --git a/yang/yang-data-impl/src/main/antlr/LeafRefPathParser.g4 b/yang/yang-data-impl/src/main/antlr/LeafRefPathParser.g4
index 535d040a215c20d136bd7cac6dfca8c3b4c5c06a..d89d7235f7f33077f0eda8fd6b6ce2f34219f094 100644 (file)
--- a/yang/yang-data-impl/src/main/antlr/LeafRefPathParser.g4
+++ b/yang/yang-data-impl/src/main/antlr/LeafRefPathParser.g4
@@ -1,39 +1,39 @@
-parser grammar LeafRefPathParser;\r
-\r
-@header {\r
-package org.opendaylight.yangtools.yang.data.impl.leafref;\r
-}\r
-\r
-options{\r
- tokenVocab = LeafRefPathLexer;\r
-}\r
-\r
-path_arg : absolute_path | relative_path;\r
-\r
-absolute_path : (SLASH node_identifier (path_predicate)*)+; \r
-\r
-relative_path : (DOTS SLASH)* descendant_path;\r
-\r
-descendant_path : node_identifier ((path_predicate)* absolute_path)?;\r
-\r
-path_predicate : LEFT_SQUARE_BRACKET SEP? path_equality_expr SEP? RIGHT_SQUARE_BRACKET;\r
-\r
-path_equality_expr : node_identifier SEP? EQUAL SEP? path_key_expr;\r
-\r
-path_key_expr : current_function_invocation SEP? SLASH SEP? rel_path_keyexpr;\r
-\r
-rel_path_keyexpr : (DOTS SEP? SLASH SEP?)* (node_identifier SEP? SLASH SEP?)* node_identifier;\r
-\r
-node_identifier : (prefix COLON)? identifier;\r
-\r
-current_function_invocation : CURRENT_KEYWORD SEP? LEFT_PARENTHESIS SEP? RIGHT_PARENTHESIS;\r
-\r
-descendant_schema_nodeid :  node_identifier\r
-                            absolute_schema_nodeid;\r
-\r
-absolute_schema_nodeid : (SLASH node_identifier)+;\r
-\r
-prefix : identifier;\r
-\r
-identifier: IDENTIFIER | CURRENT_KEYWORD;\r
-\r
+parser grammar LeafRefPathParser;
+
+@header {
+package org.opendaylight.yangtools.yang.data.impl.leafref;
+}
+
+options{
+ tokenVocab = LeafRefPathLexer;
+}
+
+path_arg : absolute_path | relative_path;
+
+absolute_path : (SLASH node_identifier (path_predicate)*)+;
+
+relative_path : (DOTS SLASH)* descendant_path;
+
+descendant_path : node_identifier ((path_predicate)* absolute_path)?;
+
+path_predicate : LEFT_SQUARE_BRACKET SEP? path_equality_expr SEP? RIGHT_SQUARE_BRACKET;
+
+path_equality_expr : node_identifier SEP? EQUAL SEP? path_key_expr;
+
+path_key_expr : current_function_invocation SEP? SLASH SEP? rel_path_keyexpr;
+
+rel_path_keyexpr : (DOTS SEP? SLASH SEP?)* (node_identifier SEP? SLASH SEP?)* node_identifier;
+
+node_identifier : (prefix COLON)? identifier;
+
+current_function_invocation : CURRENT_KEYWORD SEP? LEFT_PARENTHESIS SEP? RIGHT_PARENTHESIS;
+
+descendant_schema_nodeid :  node_identifier
+                            absolute_schema_nodeid;
+
+absolute_schema_nodeid : (SLASH node_identifier)+;
+
+prefix : identifier;
+
+identifier: IDENTIFIER | CURRENT_KEYWORD;
+