import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import java.math.BigDecimal;
-import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.Uint64;
import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.RangeStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.UnresolvedNumber;
import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange;
+import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements;
import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
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;
public final class RangeStatementSupport
- extends BaseStatementSupport<List<ValueRange>, RangeStatement, RangeEffectiveStatement> {
- private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
- .RANGE)
- .addOptional(YangStmtMapping.DESCRIPTION)
- .addOptional(YangStmtMapping.ERROR_APP_TAG)
- .addOptional(YangStmtMapping.ERROR_MESSAGE)
- .addOptional(YangStmtMapping.REFERENCE)
- .build();
+ extends AbstractStatementSupport<List<ValueRange>, RangeStatement, RangeEffectiveStatement> {
+ private static final SubstatementValidator SUBSTATEMENT_VALIDATOR =
+ SubstatementValidator.builder(YangStmtMapping.RANGE)
+ .addOptional(YangStmtMapping.DESCRIPTION)
+ .addOptional(YangStmtMapping.ERROR_APP_TAG)
+ .addOptional(YangStmtMapping.ERROR_MESSAGE)
+ .addOptional(YangStmtMapping.REFERENCE)
+ .build();
private static final RangeStatementSupport INSTANCE = new RangeStatementSupport();
private RangeStatementSupport() {
- super(YangStmtMapping.RANGE);
+ super(YangStmtMapping.RANGE, StatementPolicy.contextIndependent());
}
public static RangeStatementSupport getInstance() {
max = parseDecimalConstraintValue(ctx, boundaries.next());
// if min larger than max then error
- SourceException.throwIf(ArgumentUtils.compareNumbers(min, max) == 1, ctx.getStatementSourceReference(),
- "Range constraint %s has descending order of boundaries; should be ascending", singleRange);
- SourceException.throwIf(boundaries.hasNext(), ctx.getStatementSourceReference(),
+ SourceException.throwIf(ArgumentUtils.compareNumbers(min, max) == 1, ctx,
+ "Range constraint %s has descending order of boundaries; should be ascending", singleRange);
+ SourceException.throwIf(boundaries.hasNext(), ctx,
"Wrong number of boundaries in range constraint %s", singleRange);
} else {
max = min;
}
// some of intervals overlapping
- InferenceException.throwIf(ranges.size() > 1
- && ArgumentUtils.compareNumbers(min, Iterables.getLast(ranges).upperBound()) != 1,
- ctx.getStatementSourceReference(), "Some of the value ranges in %s are not disjoint", rangeArgument);
+ InferenceException.throwIf(
+ ranges.size() > 1 && ArgumentUtils.compareNumbers(min, Iterables.getLast(ranges).upperBound()) != 1,
+ ctx, "Some of the value ranges in %s are not disjoint", rangeArgument);
ranges.add(ValueRange.of(min, max));
}
@Override
protected RangeStatement createDeclared(final StmtContext<List<ValueRange>, RangeStatement, ?> ctx,
final ImmutableList<? extends DeclaredStatement<?>> substatements) {
- return new RegularRangeStatement(ctx, substatements);
+ return DeclaredStatements.createRange(ctx.getRawArgument(), ctx.getArgument(), substatements);
}
@Override
protected RangeStatement createEmptyDeclared(final StmtContext<List<ValueRange>, RangeStatement, ?> ctx) {
- return new EmptyRangeStatement(ctx);
+ return DeclaredStatements.createRange(ctx.getRawArgument(), ctx.getArgument());
}
@Override
- protected RangeEffectiveStatement createEffective(
- final StmtContext<List<ValueRange>, RangeStatement, RangeEffectiveStatement> ctx,
- final RangeStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
- return new RegularRangeEffectiveStatement(declared, substatements);
- }
-
- @Override
- protected RangeEffectiveStatement createEmptyEffective(
- final StmtContext<List<ValueRange>, RangeStatement, RangeEffectiveStatement> ctx,
- final RangeStatement declared) {
- return new EmptyRangeEffectiveStatement(declared);
+ protected RangeEffectiveStatement createEffective(final Current<List<ValueRange>, RangeStatement> stmt,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ return substatements.isEmpty() ? new EmptyRangeEffectiveStatement(stmt.declared())
+ : new RegularRangeEffectiveStatement(stmt.declared(), substatements);
}
@Override
return SUBSTATEMENT_VALIDATOR;
}
- private static Number parseDecimalConstraintValue(final StmtContext<?, ?, ?> ctx, final String value) {
+ private static @NonNull Number parseDecimalConstraintValue(final @NonNull StmtContext<?, ?, ?> ctx,
+ final @NonNull String value) {
if ("max".equals(value)) {
return UnresolvedNumber.max();
}
if ("min".equals(value)) {
return UnresolvedNumber.min();
}
+ // Deal with decimal64, i.e. 'decimal-value' production of the RFC6020 ABNF
+ if (value.indexOf('.') != -1) {
+ try {
+ // FIXME: YANGTOOLS-556: Use Decimal64 here
+ return new BigDecimal(value);
+ } catch (NumberFormatException e) {
+ throw new SourceException(ctx, e, "Value %s is not a valid decimal number", value);
+ }
+ }
+ // This has to be an 'integer-value' production of the RFC6020 ABNF. We also clamp allowed range to Long/Uint,
+ // as that is the effectively-valid range of allowed values. For Uint64 we also try to intern the value.
try {
- return value.indexOf('.') != -1 ? new BigDecimal(value) : new BigInteger(value);
- } catch (final NumberFormatException e) {
- throw new SourceException(String.format("Value %s is not a valid decimal number", value),
- ctx.getStatementSourceReference(), e);
+ return value.startsWith("-") ? Long.valueOf(value) : Uint64.valueOf(value).intern();
+ } catch (IllegalArgumentException e) {
+ throw new SourceException(ctx, e, "Value %s is not a valid integral range number", value);
}
}
}
\ No newline at end of file
Code Review / yangtools.git / blobdiff