commit | bcd7fbace410bc02e00d651583a827c41494321b | [log] [tgz] |
---|---|---|
author | Vidyashree Rama <vidyashree.rama@huawei.com> | Wed Mar 09 20:41:44 2016 +0530 |
committer | Gerrit Code Review <gerrit@onlab.us> | Wed Mar 09 17:40:58 2016 +0000 |
tree | 89939f2ffb5a0d836addea8e72e22400d755082d | |
parent | 70dffe4447747ed3c05c5bc4e39cc53254eab071 [diff] |
Module & Sub module grammar issue fix Change-Id: Ia90b90510233195c5eab7402ebe790014ce137d1
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ModuleListener.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ModuleListener.java index bc8ee02..d65af88 100644 --- a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ModuleListener.java +++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ModuleListener.java
@@ -79,7 +79,7 @@ YangModule yangModule = new YangModule(); yangModule.setName(identifier); - if (ctx.moduleBody(0).moduleHeaderStatement().yangVersionStatement() == null) { + if (ctx.moduleBody().moduleHeaderStatement().yangVersionStatement() == null) { yangModule.setVersion((byte) 1); }
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/SubModuleListener.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/SubModuleListener.java index 080767a..14bad1e 100644 --- a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/SubModuleListener.java +++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/SubModuleListener.java
@@ -82,7 +82,7 @@ YangSubModule yangSubModule = new YangSubModule(); yangSubModule.setName(identifier); - if (ctx.submoduleBody(0).submoduleHeaderStatement().yangVersionStatement() == null) { + if (ctx.submoduleBody().submoduleHeaderStatement().yangVersionStatement() == null) { yangSubModule.setVersion((byte) 1); }
diff --git a/utils/yangutils/src/main/resources/GeneratedYang.g4 b/utils/yangutils/src/main/resources/GeneratedYang.g4 index 9614b21..44b5c51 100644 --- a/utils/yangutils/src/main/resources/GeneratedYang.g4 +++ b/utils/yangutils/src/main/resources/GeneratedYang.g4
@@ -40,7 +40,7 @@ * "}" optsep */ - moduleStatement : MODULE_KEYWORD identifier LEFT_CURLY_BRACE moduleBody* RIGHT_CURLY_BRACE; + moduleStatement : MODULE_KEYWORD identifier LEFT_CURLY_BRACE moduleBody RIGHT_CURLY_BRACE; moduleBody : moduleHeaderStatement linkageStatements metaStatements revisionStatements bodyStatements; @@ -210,7 +210,7 @@ * body-stmts * "}" optsep */ - subModuleStatement : SUBMODULE_KEYWORD identifier LEFT_CURLY_BRACE submoduleBody* RIGHT_CURLY_BRACE; + subModuleStatement : SUBMODULE_KEYWORD identifier LEFT_CURLY_BRACE submoduleBody RIGHT_CURLY_BRACE; submoduleBody : submoduleHeaderStatement linkageStatements metaStatements revisionStatements bodyStatements; /** submodule-header-stmts =