Select copyPolicy for each StatementSupport class

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java
index 2c2d6783e97229e6646468305d0dbdf4f1570fdf..e731301af92250e12948cf17be5e0fea1ac35f7f 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java
@@ -27,7 +27,7 @@ public final class ModifierStatementSupport
     private static final ModifierStatementSupport INSTANCE = new ModifierStatementSupport();
 
     private ModifierStatementSupport() {
-        super(YangStmtMapping.MODIFIER);
+        super(YangStmtMapping.MODIFIER, CopyPolicy.CONTEXT_INDEPENDENT);
     }
 
     public static ModifierStatementSupport getInstance() {
@@ -36,7 +36,7 @@ public final class ModifierStatementSupport
 
     @Override
     public ModifierKind parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-        return SourceException.unwrap(ModifierKind.parse(value), ctx.sourceReference(),
+        return SourceException.unwrap(ModifierKind.parse(value), ctx,
             "'%s' is not valid argument of modifier statement", value);
     }
 
@@ -53,13 +53,12 @@ public final class ModifierStatementSupport
     @Override
     protected ModifierStatement createDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularModifierStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularModifierStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected ModifierStatement createEmptyDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx) {
-        return new EmptyModifierStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyModifierStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override