import org.opendaylight.yangtools.yang.model.api.stmt.ModifierStatement;
import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
@Override
public ModifierKind parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
- return SourceException.unwrap(ModifierKind.parse(value), ctx.getStatementSourceReference(),
+ return SourceException.unwrap(ModifierKind.parse(value), ctx.sourceReference(),
"'%s' is not valid argument of modifier statement", value);
}
@Override
protected ModifierStatement createDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx,
final ImmutableList<? extends DeclaredStatement<?>> substatements) {
- return new RegularModifierStatement(ctx, substatements);
+ return new RegularModifierStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
}
@Override
protected ModifierStatement createEmptyDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx) {
- return new EmptyModifierStatement(ctx);
+ return new EmptyModifierStatement(ctx.getRawArgument(), ctx.getArgument());
}
@Override
- protected ModifierEffectiveStatement createEffective(
- final StmtContext<ModifierKind, ModifierStatement, ModifierEffectiveStatement> ctx,
- final ModifierStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
- return new RegularModifierEffectiveStatement(declared, substatements);
- }
-
- @Override
- protected ModifierEffectiveStatement createEmptyEffective(
- final StmtContext<ModifierKind, ModifierStatement, ModifierEffectiveStatement> ctx,
- final ModifierStatement declared) {
- return new EmptyModifierEffectiveStatement(declared);
+ protected ModifierEffectiveStatement createEffective(final Current<ModifierKind, ModifierStatement> stmt,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ return substatements.isEmpty() ? new EmptyModifierEffectiveStatement(stmt.declared())
+ : new RegularModifierEffectiveStatement(stmt.declared(), substatements);
}
}