Do not use StatementSourceReference in AbstractDeclaredEffectiveStatement

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / grouping / AbstractGroupingStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java
index 26ec9ea155772235288f3803cfda56bf7f6db765..e74b69bc5f355fffeddeabd50a46793c6df523d3 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java
@@ -15,6 +15,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.GroupingEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.GroupingStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseQNameStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.SubstatementIndexingException;
 import org.opendaylight.yangtools.yang.parser.spi.GroupingNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
@@ -44,7 +45,7 @@ abstract class AbstractGroupingStatementSupport
                 // Shadowing check: make sure we do not trample on pre-existing definitions. This catches sibling
                 // declarations and parent declarations which have already been declared.
                 checkConflict(parent, stmt);
-                parent.addContext(GroupingNamespace.class, stmt.coerceStatementArgument(), stmt);
+                parent.addContext(GroupingNamespace.class, stmt.getArgument(), stmt);
             }
         }
     }
@@ -53,20 +54,24 @@ abstract class AbstractGroupingStatementSupport
     protected final GroupingStatement createDeclared(final StmtContext<QName, GroupingStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
         checkDeclaredConflict(ctx);
-        return new RegularGroupingStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularGroupingStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final GroupingStatement createEmptyDeclared(final StmtContext<QName, GroupingStatement, ?> ctx) {
         checkDeclaredConflict(ctx);
-        return new EmptyGroupingStatement(ctx.coerceStatementArgument());
+        return new EmptyGroupingStatement(ctx.getArgument());
     }
 
     @Override
     protected GroupingEffectiveStatement createEffective(final Current<QName, GroupingStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new GroupingEffectiveStatementImpl(stmt.declared(), substatements, stmt.sourceReference(),
-            historyAndStatusFlags(stmt.history(), substatements), stmt.getSchemaPath());
+        try {
+            return new GroupingEffectiveStatementImpl(stmt.declared(), substatements,
+                historyAndStatusFlags(stmt.history(), substatements), stmt.getSchemaPath());
+        } catch (SubstatementIndexingException e) {
+            throw new SourceException(e.getMessage(), stmt.sourceReference(), e);
+        }
     }
 
     private static void checkDeclaredConflict(final StmtContext<QName, ?, ?> ctx) {
@@ -82,7 +87,7 @@ abstract class AbstractGroupingStatementSupport
     }
 
     private static void checkConflict(final StmtContext<?, ?, ?> parent, final StmtContext<QName, ?, ?> stmt) {
-        final QName arg = stmt.coerceStatementArgument();
+        final QName arg = stmt.getArgument();
         final StmtContext<?, ?, ?> existing = parent.getFromNamespace(GroupingNamespace.class, arg);
         SourceException.throwIf(existing != null, stmt.sourceReference(), "Duplicate name for grouping %s", arg);
     }