Integrate {Inference,Source}Exception with CommonStmtCtx

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java
index 933eae7955209f1c7279118318ac44e6e0e487fb..98477a55f73f347c2b80b4539bcb820e290d79a7 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java
@@ -55,7 +55,7 @@ abstract class AbstractIfFeatureStatementSupport
 
         final ModelActionBuilder verifyFeatures = stmt.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL);
         final Map<Prerequisite<?>, QName> backRef = new HashMap<>();
-        for (QName feature : stmt.coerceStatementArgument().getReferencedFeatures()) {
+        for (QName feature : stmt.getArgument().getReferencedFeatures()) {
             backRef.put(verifyFeatures.requiresCtx(stmt, FeatureNamespace.class, feature,
                 ModelProcessingPhase.EFFECTIVE_MODEL), feature);
         }
@@ -73,9 +73,8 @@ abstract class AbstractIfFeatureStatementSupport
                     unresolvedFeatures.add(verifyNotNull(backRef.get(prereq)));
                 }
 
-                throw new InferenceException(stmt.getStatementSourceReference(),
-                    "Failed to resolve feature references %s in \"%s\"", unresolvedFeatures,
-                    stmt.rawStatementArgument());
+                throw new InferenceException(stmt, "Failed to resolve feature references %s in \"%s\"",
+                    unresolvedFeatures, stmt.rawArgument());
             }
         });
     }
@@ -88,14 +87,13 @@ abstract class AbstractIfFeatureStatementSupport
     @Override
     protected final IfFeatureStatement createDeclared(final StmtContext<IfFeatureExpr, IfFeatureStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularIfFeatureStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularIfFeatureStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected final IfFeatureStatement createEmptyDeclared(
             final StmtContext<IfFeatureExpr, IfFeatureStatement, ?> ctx) {
-        return new EmptyIfFeatureStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyIfFeatureStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override