[ONOS-4941][ONOS-4883][ONOS-4979]Grouping and uses interfile linking issue + defect fix
Change-Id: I5e8145f05d3ef570d4ecbbe885c93de172de0ea3
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/antlrgencode/GeneratedYangListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/antlrgencode/GeneratedYangListener.java
index 5e55e15..72e7995 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/antlrgencode/GeneratedYangListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/antlrgencode/GeneratedYangListener.java
@@ -1835,136 +1835,94 @@
void exitCompilerAnnotationStatement(GeneratedYangParser.CompilerAnnotationStatementContext currentContext);
/**
- * Enters a parse tree produced by GeneratedYangParser for grammar rule annotation statement.
+ * Enters a parse tree produced by GeneratedYangParser for grammar rule compiler annotation body statement.
*
* @param currentContext current context in the parsed tree
*/
- void enterAnnotationStatement(GeneratedYangParser.AnnotationStatementContext currentContext);
-
- /**
- * Exits a parse tree produced by GeneratedYangParser for grammar rule annotation statement.
- *
- * @param currentContext current context in the parsed tree
- */
- void exitAnnotationStatement(GeneratedYangParser.AnnotationStatementContext currentContext);
-
- /**
- * Enters a parse tree produced by GeneratedYangParser for grammar rule annotation type.
- *
- * @param currentContext current context in the parsed tree
- */
- void enterAnnotationType(GeneratedYangParser.AnnotationTypeContext currentContext);
-
- /**
- * Exits a parse tree produced by GeneratedYangParser for grammar rule annotation type.
- *
- * @param currentContext current context in the parsed tree
- */
- void exitAnnotationType(GeneratedYangParser.AnnotationTypeContext currentContext);
-
- /**
- * Enters a parse tree produced by GeneratedYangParser for grammar rule
- * annotation parameter specification.
- *
- * @param currentContext current context in the parsed tree
- */
- void enterAnnotationParameterSpecification(GeneratedYangParser.AnnotationParameterSpecificationContext
- currentContext);
-
- /**
- * Exits a parse tree produced by GeneratedYangParser for grammar rule
- * annotation parameter specification.
- *
- * @param currentContext current context in the parsed tree
- */
- void exitAnnotationParameterSpecification(GeneratedYangParser.AnnotationParameterSpecificationContext
+ void enterCompilerAnnotationBodyStatement(GeneratedYangParser.CompilerAnnotationBodyStatementContext
currentContext);
/**
- * Enters a parse tree produced by GeneratedYangParser for grammar rule
- * annotation parameter specification argument.
+ * Exits a parse tree produced by GeneratedYangParser for grammar rule compiler annotation body statement.
*
* @param currentContext current context in the parsed tree
*/
- void enterAnnotationParameterSpecificationArg(GeneratedYangParser.AnnotationParameterSpecificationArgContext
- currentContext);
+ void exitCompilerAnnotationBodyStatement(GeneratedYangParser.CompilerAnnotationBodyStatementContext
+ currentContext);
/**
- * Exits a parse tree produced by GeneratedYangParser for grammar rule
- * annotation parameter specification argument.
+ * Enters a parse tree produced by GeneratedYangParser for grammar rule app data structure statement.
*
* @param currentContext current context in the parsed tree
*/
- void exitAnnotationParameterSpecificationArg(GeneratedYangParser.AnnotationParameterSpecificationArgContext
- currentContext);
+ void enterAppDataStructureStatement(GeneratedYangParser.AppDataStructureStatementContext
+ currentContext);
/**
- * Enters a parse tree produced by GeneratedYangParser for grammar rule annotation parameter instance.
+ * Exits a parse tree produced by GeneratedYangParser for grammar rule app data structure statement.
*
* @param currentContext current context in the parsed tree
*/
- void enterAnnotationParaInstance(GeneratedYangParser.AnnotationParaInstanceContext
- currentContext);
+ void exitAppDataStructureStatement(GeneratedYangParser.AppDataStructureStatementContext currentContext);
/**
- * Exits a parse tree produced by GeneratedYangParser for grammar rule annotation parameter instance.
+ * Enters a parse tree produced by GeneratedYangParser for grammar rule app data structure.
*
* @param currentContext current context in the parsed tree
*/
- void exitAnnotationParaInstance(GeneratedYangParser.AnnotationParaInstanceContext
- currentContext);
+ void enterAppDataStructure(GeneratedYangParser.AppDataStructureContext currentContext);
+
+ /**
+ * Exits a parse tree produced by GeneratedYangParser for grammar rule app data strcuture.
+ *
+ * @param currentContext current context in the parsed tree
+ */
+ void exitAppDataStructure(GeneratedYangParser.AppDataStructureContext currentContext);
+
+ /**
+ * Enters a parse tree produced by GeneratedYangParser for grammar rule app extended statement.
+ *
+ * @param currentContext current context in the parsed tree
+ */
+ void enterAppExtendedStatement(GeneratedYangParser.AppExtendedStatementContext currentContext);
+
+ /**
+ * Exits a parse tree produced by GeneratedYangParser for grammar rule app extended statement.
+ *
+ * @param currentContext current context in the parsed tree
+ */
+ void exitAppExtendedStatement(GeneratedYangParser.AppExtendedStatementContext currentContext);
+
+ /**
+ * Enters a parse tree produced by GeneratedYangParser for grammar rule extended name.
+ *
+ * @param currentContext current context in the parsed tree
+ */
+ void enterExtendedName(GeneratedYangParser.ExtendedNameContext currentContext);
+
+ /**
+ * Exits a parse tree produced by GeneratedYangParser for grammar rule extended name.
+ *
+ * @param currentContext current context in the parsed tree
+ */
+ void exitExtendedName(GeneratedYangParser.ExtendedNameContext currentContext);
+
/**
* Enters a parse tree produced by GeneratedYangParser for grammar rule
- * annotation parameter type identifier.
+ * data structure key statement.
*
* @param currentContext current context in the parsed tree
*/
- void enterAnnotationParaTypeIdentifier(GeneratedYangParser.AnnotationParaTypeIdentifierContext
- currentContext);
+ void enterDataStructureKeyStatement(GeneratedYangParser.DataStructureKeyStatementContext currentContext);
/**
* Exits a parse tree produced by GeneratedYangParser for grammar rule
- * annotation parameter type identifier.
+ * data structure key statement.
*
* @param currentContext current context in the parsed tree
*/
- void exitAnnotationParaTypeIdentifier(GeneratedYangParser.AnnotationParaTypeIdentifierContext
- currentContext);
-
- /**
- * Enters a parse tree produced by GeneratedYangParser for grammar rule
- * annotation parameter type value.
- *
- * @param currentContext current context in the parsed tree
- */
- void enterAnnotationParaTypeValue(GeneratedYangParser.AnnotationParaTypeValueContext
- currentContext);
-
- /**
- * Exits a parse tree produced by GeneratedYangParser for grammar rule
- * annotation parameter type value.
- *
- * @param currentContext current context in the parsed tree
- */
- void exitAnnotationParaTypeValue(GeneratedYangParser.AnnotationParaTypeValueContext
- currentContext);
-
- /**
- * Enters a parse tree produced by GeneratedYangParser for grammar rule annotation identifier.
- *
- * @param currentContext current context in the parsed tree
- */
- void enterAnnotationIdentifier(GeneratedYangParser.AnnotationIdentifierContext
- currentContext);
-
- /**
- * Exits a parse tree produced by GeneratedYangParser for grammar rule annotation identifier.
- *
- * @param currentContext current context in the parsed tree
- */
- void exitAnnotationIdentifier(GeneratedYangParser.AnnotationIdentifierContext
- currentContext);
+ void exitDataStructureKeyStatement(GeneratedYangParser.DataStructureKeyStatementContext currentContext);
/**
* Enters a parse tree produced by GeneratedYangParser for grammar rule require instance.