From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 8 Oct 2019 17:08:15 +0000 (+0200)
Subject: Cleanup yang-parser-rfc7950 antlr configuration
X-Git-Tag: v4.0.2~17
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9887727e92d3674d7cd77563f74683382a58f6a3;p=yangtools.git

Cleanup yang-parser-rfc7950 antlr configuration

This fixes up a long-standing issue with how antlr is configured,
fixing javadoc plugin interaction in the process.

Change-Id: Ia077b7b2f777203baea8aad3400abd484e3e6801
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index 1bde916d89..a6c70e006a 100644
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -39,8 +39,8 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <sourceDirectory>src/main/antlr</sourceDirectory>
-                    <outputDirectory>target/generated-sources/parser/org/opendaylight/yangtools/yang/data/impl/leafref</outputDirectory>
+                    <sourceDirectory>${project.basedir}/src/main/antlr</sourceDirectory>
+                    <outputDirectory>${project.build.directory}/generated-sources/parser/org/opendaylight/yangtools/yang/data/impl/leafref</outputDirectory>
                     <visitor>true</visitor>
                     <listener>true</listener>
                 </configuration>
diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml
index 83d0dc3473..284fc5e9fe 100644
--- a/yang/yang-parser-rfc7950/pom.xml
+++ b/yang/yang-parser-rfc7950/pom.xml
@@ -93,7 +93,7 @@
                 </executions>
                 <configuration>
                     <sourceDirectory>src/main/antlr</sourceDirectory>
-                    <outputDirectory>${project.build.directory}/generated-sources/parser/org/opendaylight/yangtools/antlrv4/code/gen</outputDirectory>
+                    <outputDirectory>${project.build.directory}/generated-sources/parser</outputDirectory>
                     <visitor>true</visitor>
                     <listener>false</listener>
                 </configuration>
diff --git a/yang/yang-parser-rfc7950/src/main/antlr/IfFeatureExpressionLexer.g4 b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionLexer.g4
similarity index 87%
rename from yang/yang-parser-rfc7950/src/main/antlr/IfFeatureExpressionLexer.g4
rename to yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionLexer.g4
index 6b837a81ce..51029d4fd4 100644
--- a/yang/yang-parser-rfc7950/src/main/antlr/IfFeatureExpressionLexer.g4
+++ b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionLexer.g4
@@ -7,10 +7,6 @@
 //
 lexer grammar IfFeatureExpressionLexer;
 
-@header {
-package org.opendaylight.yangtools.antlrv4.code.gen;
-}
-
 NOT : 'not';
 LP : '(';
 RP : ')';
diff --git a/yang/yang-parser-rfc7950/src/main/antlr/IfFeatureExpressionParser.g4 b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionParser.g4
similarity index 90%
rename from yang/yang-parser-rfc7950/src/main/antlr/IfFeatureExpressionParser.g4
rename to yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionParser.g4
index 33daa34f4b..8e5cc46d52 100644
--- a/yang/yang-parser-rfc7950/src/main/antlr/IfFeatureExpressionParser.g4
+++ b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/IfFeatureExpressionParser.g4
@@ -7,15 +7,10 @@
 //
 parser grammar IfFeatureExpressionParser;
 
-@header {
-package org.opendaylight.yangtools.antlrv4.code.gen;
-}
-
-options{
+options {
     tokenVocab = IfFeatureExpressionLexer;
 }
 
-
 if_feature_expr: if_feature_term (SEP OR SEP if_feature_term)*;
 if_feature_term: if_feature_factor (SEP AND SEP if_feature_term)*;
 if_feature_factor: NOT SEP if_feature_factor
diff --git a/yang/yang-parser-rfc7950/src/main/antlr/LeafRefPathLexer.g4 b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathLexer.g4
similarity index 81%
rename from yang/yang-parser-rfc7950/src/main/antlr/LeafRefPathLexer.g4
rename to yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathLexer.g4
index f87c5bb034..3d63ee9eea 100644
--- a/yang/yang-parser-rfc7950/src/main/antlr/LeafRefPathLexer.g4
+++ b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathLexer.g4
@@ -1,9 +1,5 @@
 lexer grammar LeafRefPathLexer;
 
-@header {
-package org.opendaylight.yangtools.antlrv4.code.gen;
-}
-
 COLON : ':' ;
 SLASH : '/' ;
 DOTS : '..' ;
diff --git a/yang/yang-parser-rfc7950/src/main/antlr/LeafRefPathParser.g4 b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathParser.g4
similarity index 89%
rename from yang/yang-parser-rfc7950/src/main/antlr/LeafRefPathParser.g4
rename to yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathParser.g4
index 766fc4bd2c..ec60a4cc32 100644
--- a/yang/yang-parser-rfc7950/src/main/antlr/LeafRefPathParser.g4
+++ b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/LeafRefPathParser.g4
@@ -1,11 +1,7 @@
 parser grammar LeafRefPathParser;
 
-@header {
-package org.opendaylight.yangtools.antlrv4.code.gen;
-}
-
 options {
- tokenVocab = LeafRefPathLexer;
+    tokenVocab = LeafRefPathLexer;
 }
 
 path_arg : absolute_path | relative_path;
diff --git a/yang/yang-parser-rfc7950/src/main/antlr/YangStatementLexer.g4 b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementLexer.g4
similarity index 94%
rename from yang/yang-parser-rfc7950/src/main/antlr/YangStatementLexer.g4
rename to yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementLexer.g4
index 3ddb6521ec..8185545f38 100644
--- a/yang/yang-parser-rfc7950/src/main/antlr/YangStatementLexer.g4
+++ b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementLexer.g4
@@ -7,11 +7,7 @@
 //
 lexer grammar YangStatementLexer;
 
-@header {
-package org.opendaylight.yangtools.antlrv4.code.gen;
-}
-
-tokens{
+tokens {
     SEMICOLON,
     LEFT_BRACE,
     RIGHT_BRACE,
diff --git a/yang/yang-parser-rfc7950/src/main/antlr/YangStatementParser.g4 b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementParser.g4
similarity index 80%
rename from yang/yang-parser-rfc7950/src/main/antlr/YangStatementParser.g4
rename to yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementParser.g4
index 9714bda7f8..9f836e2e32 100644
--- a/yang/yang-parser-rfc7950/src/main/antlr/YangStatementParser.g4
+++ b/yang/yang-parser-rfc7950/src/main/antlr/org/opendaylight/yangtools/antlrv4/code/gen/YangStatementParser.g4
@@ -7,15 +7,11 @@
 //
 parser grammar YangStatementParser;
 
-@header {
-package org.opendaylight.yangtools.antlrv4.code.gen;
-}
-
-options{
+options {
     tokenVocab = YangStatementLexer;
 }
 
 statement : SEP* keyword SEP* (argument)? SEP* (SEMICOLON | LEFT_BRACE SEP* (statement)* SEP* RIGHT_BRACE SEP*) SEP*;
 keyword : (IDENTIFIER COLON)? IDENTIFIER;
 
-argument : STRING (SEP* PLUS SEP* STRING)* | IDENTIFIER;
\ No newline at end of file
+argument : STRING (SEP* PLUS SEP* STRING)* | IDENTIFIER;