*/
package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
-import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verifyNotNull;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
import java.math.BigDecimal;
import java.util.Collection;
-import java.util.Optional;
import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.Empty;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.Uint32;
-import org.opendaylight.yangtools.yang.common.YangVersion;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.EnumEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.LengthEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.PatternEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.RangeEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.ValueEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
import org.opendaylight.yangtools.yang.model.api.type.Int64TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.Int8TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.RangeRestrictedTypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BitsTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.EnumerationTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.InstanceIdentifierTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.InvalidLengthConstraintException;
-import org.opendaylight.yangtools.yang.model.util.type.LengthRestrictedTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RangeRestrictedTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements;
+import org.opendaylight.yangtools.yang.model.ri.type.BitsTypeBuilder;
+import org.opendaylight.yangtools.yang.model.ri.type.EnumerationTypeBuilder;
+import org.opendaylight.yangtools.yang.model.ri.type.InstanceIdentifierTypeBuilder;
+import org.opendaylight.yangtools.yang.model.ri.type.InvalidLengthConstraintException;
+import org.opendaylight.yangtools.yang.model.ri.type.InvalidRangeConstraintException;
+import org.opendaylight.yangtools.yang.model.ri.type.LengthRestrictedTypeBuilder;
+import org.opendaylight.yangtools.yang.model.ri.type.RangeRestrictedTypeBuilder;
+import org.opendaylight.yangtools.yang.model.ri.type.RequireInstanceRestrictedTypeBuilder;
+import org.opendaylight.yangtools.yang.model.ri.type.RestrictedTypes;
+import org.opendaylight.yangtools.yang.model.ri.type.StringTypeBuilder;
import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx;
+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.ModelActionBuilder;
import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceAction;
import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
abstract class AbstractTypeStatementSupport
- extends BaseStatementSupport<String, TypeStatement, EffectiveStatement<String, TypeStatement>> {
+ extends AbstractStringStatementSupport<TypeStatement, EffectiveStatement<String, TypeStatement>> {
private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
YangStmtMapping.TYPE)
.addOptional(YangStmtMapping.BASE)
static final String UINT64 = "uint64";
static final String UNION = "union";
- private static final ImmutableMap<String, String> BUILT_IN_TYPES = ImmutableMap.<String, String>builder()
- .put(BINARY, BINARY)
- .put(BITS, BITS)
- .put(BOOLEAN, BOOLEAN)
- .put(DECIMAL64, DECIMAL64)
- .put(EMPTY, EMPTY)
- .put(ENUMERATION, ENUMERATION)
- .put(IDENTITY_REF,IDENTITY_REF)
- .put(INSTANCE_IDENTIFIER, INSTANCE_IDENTIFIER)
- .put(INT8, INT8)
- .put(INT16, INT16)
- .put(INT32, INT32)
- .put(INT64, INT64)
- .put(LEAF_REF, LEAF_REF)
- .put(STRING, STRING)
- .put(UINT8, UINT8)
- .put(UINT16, UINT16)
- .put(UINT32, UINT32)
- .put(UINT64, UINT64)
- .put(UNION, UNION)
- .build();
+ private static final ImmutableMap<String, BuiltinEffectiveStatement> STATIC_BUILT_IN_TYPES =
+ ImmutableMap.<String, BuiltinEffectiveStatement>builder()
+ .put(BINARY, BuiltinEffectiveStatement.BINARY)
+ .put(BOOLEAN, BuiltinEffectiveStatement.BOOLEAN)
+ .put(EMPTY, BuiltinEffectiveStatement.EMPTY)
+ // FIXME: this overlaps with DYNAMIC_BUILT_IN_TYPES. One of these is not needed, but we need to decide
+ // what to do. I think we should gradually use per-statement validators, hence go towards dynamic?
+ .put(INSTANCE_IDENTIFIER, BuiltinEffectiveStatement.INSTANCE_IDENTIFIER)
+ .put(INT8, BuiltinEffectiveStatement.INT8)
+ .put(INT16, BuiltinEffectiveStatement.INT16)
+ .put(INT32, BuiltinEffectiveStatement.INT32)
+ .put(INT64, BuiltinEffectiveStatement.INT64)
+ .put(STRING, BuiltinEffectiveStatement.STRING)
+ .put(UINT8, BuiltinEffectiveStatement.UINT8)
+ .put(UINT16, BuiltinEffectiveStatement.UINT16)
+ .put(UINT32, BuiltinEffectiveStatement.UINT32)
+ .put(UINT64, BuiltinEffectiveStatement.UINT64)
+ .build();
- private static final ImmutableMap<String, StatementSupport<?, ?, ?>> ARGUMENT_SPECIFIC_SUPPORTS =
+ private static final ImmutableMap<String, StatementSupport<?, ?, ?>> DYNAMIC_BUILT_IN_TYPES =
ImmutableMap.<String, StatementSupport<?, ?, ?>>builder()
.put(BITS, new BitsSpecificationSupport())
.put(DECIMAL64, new Decimal64SpecificationSupport())
.put(UNION, new UnionSpecificationSupport())
.build();
- AbstractTypeStatementSupport() {
- super(YangStmtMapping.TYPE);
- }
+ private static final ImmutableMap<String, String> BUILT_IN_TYPES = Maps.uniqueIndex(ImmutableSet.copyOf(
+ Iterables.<String>concat(STATIC_BUILT_IN_TYPES.keySet(), DYNAMIC_BUILT_IN_TYPES.keySet())), key -> key);
- @Override
- public final String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
- return value;
+ AbstractTypeStatementSupport() {
+ super(YangStmtMapping.TYPE, StatementPolicy.exactReplica());
}
@Override
final Mutable<String, TypeStatement, EffectiveStatement<String, TypeStatement>> stmt) {
super.onFullDefinitionDeclared(stmt);
- // if it is yang built-in type, no prerequisite is needed, so simply return
- if (BUILT_IN_TYPES.containsKey(stmt.getStatementArgument())) {
+ final String argument = stmt.getArgument();
+ final BuiltinEffectiveStatement builtin = STATIC_BUILT_IN_TYPES.get(argument);
+ if (builtin != null) {
+ stmt.addToNs(BaseTypeNamespace.class, Empty.getInstance(), builtin);
return;
}
- final QName typeQName = StmtContextUtils.parseNodeIdentifier(stmt, stmt.getStatementArgument());
+ final QName typeQName = StmtContextUtils.parseNodeIdentifier(stmt, argument);
final ModelActionBuilder typeAction = stmt.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL);
final Prerequisite<StmtContext<?, ?, ?>> typePrereq = typeAction.requiresCtx(stmt, TypeNamespace.class,
typeQName, ModelProcessingPhase.EFFECTIVE_MODEL);
typeAction.mutatesEffectiveCtx(stmt.getParentContext());
/*
- * If the type does not exist, throw new InferenceException.
- * Otherwise perform no operation.
+ * If the type does not exist, throw an InferenceException.
+ * If the type exists, store a reference to it in BaseTypeNamespace.
*/
typeAction.apply(new InferenceAction() {
@Override
public void apply(final InferenceContext ctx) {
- // Intentional NOOP
+ // Note: do not attempt to call buildEffective() here
+ stmt.addToNs(BaseTypeNamespace.class, Empty.getInstance(), typePrereq.resolve(ctx));
}
@Override
public void prerequisiteFailed(final Collection<? extends Prerequisite<?>> failed) {
- InferenceException.throwIf(failed.contains(typePrereq), stmt.getStatementSourceReference(),
- "Type [%s] was not found.", typeQName);
+ InferenceException.throwIf(failed.contains(typePrereq), stmt, "Type [%s] was not found.", typeQName);
}
});
}
@Override
public boolean hasArgumentSpecificSupports() {
- return !ARGUMENT_SPECIFIC_SUPPORTS.isEmpty();
+ return !DYNAMIC_BUILT_IN_TYPES.isEmpty();
}
@Override
public StatementSupport<?, ?, ?> getSupportSpecificForArgument(final String argument) {
- return ARGUMENT_SPECIFIC_SUPPORTS.get(argument);
+ return DYNAMIC_BUILT_IN_TYPES.get(argument);
}
@Override
@Override
protected final TypeStatement createDeclared(final StmtContext<String, TypeStatement, ?> ctx,
final ImmutableList<? extends DeclaredStatement<?>> substatements) {
- return new RegularTypeStatement(ctx, substatements);
+ return DeclaredStatements.createType(ctx.getRawArgument(), substatements);
}
@Override
protected final TypeStatement createEmptyDeclared(final StmtContext<String, TypeStatement, ?> ctx) {
final TypeStatement builtin;
- return (builtin = BuiltinTypeStatement.lookup(ctx)) != null ? builtin : new EmptyTypeStatement(ctx);
+ return (builtin = BuiltinTypeStatement.lookup(ctx)) != null ? builtin
+ : DeclaredStatements.createType(ctx.getRawArgument());
}
@Override
- protected final TypeEffectiveStatement<TypeStatement> createEffective(
- final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
- final TypeStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ protected EffectiveStatement<String, TypeStatement> createEffective(final Current<String, TypeStatement> stmt,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
// First look up the proper base type
- final TypeEffectiveStatement<TypeStatement> typeStmt = resolveType(ctx);
+ final TypeEffectiveStatement<TypeStatement> typeStmt = resolveType(stmt);
+ if (substatements.isEmpty()) {
+ return typeStmt;
+ }
+
// Now instantiate the proper effective statement for that type
final TypeDefinition<?> baseType = typeStmt.getTypeDefinition();
+ final TypeStatement declared = stmt.declared();
if (baseType instanceof BinaryTypeDefinition) {
- return createBinary(ctx, (BinaryTypeDefinition) baseType, declared, substatements);
+ return createBinary(stmt, (BinaryTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof BitsTypeDefinition) {
- return createBits(ctx, (BitsTypeDefinition) baseType, declared, substatements);
+ return createBits(stmt, (BitsTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof BooleanTypeDefinition) {
- return createBoolean(ctx, (BooleanTypeDefinition) baseType, declared, substatements);
+ return createBoolean(stmt, (BooleanTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof DecimalTypeDefinition) {
- return createDecimal(ctx, (DecimalTypeDefinition) baseType, declared, substatements);
+ return createDecimal(stmt, (DecimalTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof EmptyTypeDefinition) {
- return createEmpty(ctx, (EmptyTypeDefinition) baseType, declared, substatements);
+ return createEmpty(stmt, (EmptyTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof EnumTypeDefinition) {
- return createEnum(ctx, (EnumTypeDefinition) baseType, declared, substatements);
+ return createEnum(stmt, (EnumTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof IdentityrefTypeDefinition) {
- return createIdentityref(ctx, (IdentityrefTypeDefinition) baseType, declared, substatements);
+ return createIdentityref(stmt, (IdentityrefTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof InstanceIdentifierTypeDefinition) {
- return createInstanceIdentifier(ctx, (InstanceIdentifierTypeDefinition) baseType, declared, substatements);
+ return createInstanceIdentifier(stmt, (InstanceIdentifierTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof Int8TypeDefinition) {
- return new IntegralTypeEffectiveStatementImpl<>(ctx,
- RestrictedTypes.newInt8Builder((Int8TypeDefinition) baseType, typeEffectiveSchemaPath(ctx)));
+ return createIntegral(stmt, declared, substatements,
+ RestrictedTypes.newInt8Builder((Int8TypeDefinition) baseType, typeEffectiveQName(stmt)));
} else if (baseType instanceof Int16TypeDefinition) {
- return new IntegralTypeEffectiveStatementImpl<>(ctx,
- RestrictedTypes.newInt16Builder((Int16TypeDefinition) baseType, typeEffectiveSchemaPath(ctx)));
+ return createIntegral(stmt, declared, substatements,
+ RestrictedTypes.newInt16Builder((Int16TypeDefinition) baseType, typeEffectiveQName(stmt)));
} else if (baseType instanceof Int32TypeDefinition) {
- return new IntegralTypeEffectiveStatementImpl<>(ctx,
- RestrictedTypes.newInt32Builder((Int32TypeDefinition) baseType, typeEffectiveSchemaPath(ctx)));
+ return createIntegral(stmt, declared, substatements,
+ RestrictedTypes.newInt32Builder((Int32TypeDefinition) baseType, typeEffectiveQName(stmt)));
} else if (baseType instanceof Int64TypeDefinition) {
- return new IntegralTypeEffectiveStatementImpl<>(ctx,
- RestrictedTypes.newInt64Builder((Int64TypeDefinition) baseType, typeEffectiveSchemaPath(ctx)));
+ return createIntegral(stmt, declared, substatements,
+ RestrictedTypes.newInt64Builder((Int64TypeDefinition) baseType, typeEffectiveQName(stmt)));
} else if (baseType instanceof LeafrefTypeDefinition) {
- return new LeafrefTypeEffectiveStatementImpl(ctx, (LeafrefTypeDefinition) baseType);
+ return createLeafref(stmt, (LeafrefTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof StringTypeDefinition) {
- return new StringTypeEffectiveStatementImpl(ctx, (StringTypeDefinition) baseType);
+ return createString(stmt, (StringTypeDefinition) baseType, declared, substatements);
} else if (baseType instanceof Uint8TypeDefinition) {
- return new IntegralTypeEffectiveStatementImpl<>(ctx,
- RestrictedTypes.newUint8Builder((Uint8TypeDefinition) baseType, typeEffectiveSchemaPath(ctx)));
+ return createIntegral(stmt, declared, substatements,
+ RestrictedTypes.newUint8Builder((Uint8TypeDefinition) baseType, typeEffectiveQName(stmt)));
} else if (baseType instanceof Uint16TypeDefinition) {
- return new IntegralTypeEffectiveStatementImpl<>(ctx,
- RestrictedTypes.newUint16Builder((Uint16TypeDefinition) baseType, typeEffectiveSchemaPath(ctx)));
+ return createIntegral(stmt, declared, substatements,
+ RestrictedTypes.newUint16Builder((Uint16TypeDefinition) baseType, typeEffectiveQName(stmt)));
} else if (baseType instanceof Uint32TypeDefinition) {
- return new IntegralTypeEffectiveStatementImpl<>(ctx,
- RestrictedTypes.newUint32Builder((Uint32TypeDefinition) baseType, typeEffectiveSchemaPath(ctx)));
+ return createIntegral(stmt, declared, substatements,
+ RestrictedTypes.newUint32Builder((Uint32TypeDefinition) baseType, typeEffectiveQName(stmt)));
} else if (baseType instanceof Uint64TypeDefinition) {
- return new IntegralTypeEffectiveStatementImpl<>(ctx,
- RestrictedTypes.newUint64Builder((Uint64TypeDefinition) baseType, typeEffectiveSchemaPath(ctx)));
+ return createIntegral(stmt, declared, substatements,
+ RestrictedTypes.newUint64Builder((Uint64TypeDefinition) baseType, typeEffectiveQName(stmt)));
} else if (baseType instanceof UnionTypeDefinition) {
- return createUnion(ctx, (UnionTypeDefinition) baseType, declared, substatements);
+ return createUnion(stmt, (UnionTypeDefinition) baseType, declared, substatements);
} else {
throw new IllegalStateException("Unhandled base type " + baseType);
}
}
- @Override
- protected final EffectiveStatement<String, TypeStatement> createEmptyEffective(
- final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
- final TypeStatement declared) {
- return resolveType(ctx);
- }
-
- static final SchemaPath typeEffectiveSchemaPath(final StmtContext<?, ?, ?> stmtCtx) {
- final SchemaPath path = stmtCtx.getSchemaPath().get();
- final SchemaPath parent = path.getParent();
- final QName parentQName = parent.getLastComponent();
- checkArgument(parentQName != null, "Path %s has an empty parent", path);
-
- final QName qname = path.getLastComponent().bindTo(parentQName.getModule()).intern();
- return parent.createChild(qname);
+ // FIXME: YANGTOOLS-1208: this needs to happen during onFullDefinitionDeclared() and stored (again) in a namespace
+ static final @NonNull QName typeEffectiveQName(final Current<String, ?> stmt) {
+ // FIXME: YANGTOOLS-1117: this really should be handled through A=AbstractQName, with two values coming out of
+ // parseArgument(): either UnqualifiedQName or QualifiedQName. Each of those can easily be bound to
+ // parent module:
+ // stmt.getArgument().bindTo(parentNamespace).
+ final String argument = stmt.getArgument();
+ return QName.create(stmt.getEffectiveParent().effectiveNamespace(),
+ // Split out localName event if it is prefixed. This should really be in parseArgument()
+ argument.substring(argument.indexOf(':') + 1)).intern();
}
/**
* @return Resolved type
* @throws SourceException if the target type cannot be found
*/
- private static @NonNull TypeEffectiveStatement<TypeStatement> resolveType(final StmtContext<String, ?, ?> ctx) {
- final String argument = ctx.coerceStatementArgument();
- switch (argument) {
- case BINARY:
- return BuiltinEffectiveStatement.BINARY;
- case BOOLEAN:
- return BuiltinEffectiveStatement.BOOLEAN;
- case EMPTY:
- return BuiltinEffectiveStatement.EMPTY;
- case INSTANCE_IDENTIFIER:
- return BuiltinEffectiveStatement.INSTANCE_IDENTIFIER;
- case INT8:
- return BuiltinEffectiveStatement.INT8;
- case INT16:
- return BuiltinEffectiveStatement.INT16;
- case INT32:
- return BuiltinEffectiveStatement.INT32;
- case INT64:
- return BuiltinEffectiveStatement.INT64;
- case STRING:
- return BuiltinEffectiveStatement.STRING;
- case UINT8:
- return BuiltinEffectiveStatement.UINT8;
- case UINT16:
- return BuiltinEffectiveStatement.UINT16;
- case UINT32:
- return BuiltinEffectiveStatement.UINT32;
- case UINT64:
- return BuiltinEffectiveStatement.UINT64;
- default:
- final QName qname = StmtContextUtils.parseNodeIdentifier(ctx, argument);
- final StmtContext<?, TypedefStatement, TypedefEffectiveStatement> typedef =
- SourceException.throwIfNull(ctx.getFromNamespace(TypeNamespace.class, qname),
- ctx.getStatementSourceReference(), "Type '%s' not found", qname);
- return typedef.buildEffective().asTypeEffectiveStatement();
+ private static @NonNull TypeEffectiveStatement<TypeStatement> resolveType(final Current<String, ?> ctx) {
+ final Object obj = verifyNotNull(ctx.namespaceItem(BaseTypeNamespace.class, Empty.getInstance()));
+ if (obj instanceof BuiltinEffectiveStatement) {
+ return (BuiltinEffectiveStatement) obj;
+ } else if (obj instanceof StmtContext) {
+ return ((TypedefEffectiveStatement) ((StmtContext<?, ?, ?>) obj).buildEffective())
+ .asTypeEffectiveStatement();
+ } else {
+ throw new InferenceException(ctx, "Unexpected base object %s", obj);
}
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createBinary(final StmtContext<?, ?, ?> ctx,
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createBinary(final Current<String, ?> ctx,
final BinaryTypeDefinition baseType, final TypeStatement declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
final LengthRestrictedTypeBuilder<BinaryTypeDefinition> builder =
- RestrictedTypes.newBinaryBuilder(baseType, typeEffectiveSchemaPath(ctx));
+ RestrictedTypes.newBinaryBuilder(baseType, typeEffectiveQName(ctx));
for (EffectiveStatement<?, ?> stmt : substatements) {
if (stmt instanceof LengthEffectiveStatement) {
try {
builder.setLengthConstraint(length, length.argument());
} catch (IllegalStateException e) {
- throw new SourceException(ctx.getStatementSourceReference(), e,
- "Multiple length constraints encountered");
+ throw new SourceException(ctx, e, "Multiple length constraints encountered");
} catch (InvalidLengthConstraintException e) {
- throw new SourceException(ctx.getStatementSourceReference(), e, "Invalid length constraint %s",
- length.argument());
+ throw new SourceException(ctx, e, "Invalid length constraint %s", length.argument());
}
}
}
return new TypeEffectiveStatementImpl<>(declared, substatements, builder);
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createBits(final StmtContext<?, ?, ?> ctx,
+ private @NonNull TypeEffectiveStatement<TypeStatement> createBits(final Current<?, ?> ctx,
final BitsTypeDefinition baseType, final TypeStatement declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
- final BitsTypeBuilder builder = RestrictedTypes.newBitsBuilder(baseType, ctx.getSchemaPath().get());
+ final BitsTypeBuilder builder = RestrictedTypes.newBitsBuilder(baseType, ctx.argumentAsTypeQName());
- final YangVersion yangVersion = ctx.getRootVersion();
for (final EffectiveStatement<?, ?> stmt : substatements) {
if (stmt instanceof BitEffectiveStatement) {
- SourceException.throwIf(yangVersion != YangVersion.VERSION_1_1, ctx.getStatementSourceReference(),
- "Restricted bits type is allowed only in YANG 1.1 version.");
- final BitEffectiveStatement bitSubStmt = (BitEffectiveStatement) stmt;
-
- // FIXME: this looks like a duplicate of BitsSpecificationEffectiveStatement
- final Optional<Uint32> declaredPosition = bitSubStmt.getDeclaredPosition();
- final Uint32 effectivePos;
- if (declaredPosition.isEmpty()) {
- effectivePos = getBaseTypeBitPosition(bitSubStmt.argument(), baseType, ctx);
- } else {
- effectivePos = declaredPosition.get();
- }
-
- builder.addBit(EffectiveTypeUtil.buildBit(bitSubStmt, effectivePos));
+ builder.addBit(addRestrictedBit(ctx, baseType, (BitEffectiveStatement) stmt));
}
}
return new TypeEffectiveStatementImpl<>(declared, substatements, builder);
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createBoolean(final StmtContext<?, ?, ?> ctx,
+ abstract @NonNull Bit addRestrictedBit(@NonNull EffectiveStmtCtx stmt, @NonNull BitsTypeDefinition base,
+ @NonNull BitEffectiveStatement bit);
+
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createBoolean(final Current<String, ?> ctx,
final BooleanTypeDefinition baseType, final TypeStatement declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newBooleanBuilder(baseType,
- typeEffectiveSchemaPath(ctx)));
+ typeEffectiveQName(ctx)));
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createDecimal(final StmtContext<?, ?, ?> ctx,
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createDecimal(final Current<String, ?> ctx,
final DecimalTypeDefinition baseType, final TypeStatement declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
final RangeRestrictedTypeBuilder<DecimalTypeDefinition, BigDecimal> builder =
- RestrictedTypes.newDecima64Builder(baseType, typeEffectiveSchemaPath(ctx));
+ RestrictedTypes.newDecima64Builder(baseType, typeEffectiveQName(ctx));
for (EffectiveStatement<?, ?> stmt : substatements) {
if (stmt instanceof RangeEffectiveStatement) {
}
if (stmt instanceof FractionDigitsEffectiveStatement) {
final Integer digits = ((FractionDigitsEffectiveStatement)stmt).argument();
- SourceException.throwIf(baseType.getFractionDigits() != digits, ctx.getStatementSourceReference(),
+ SourceException.throwIf(baseType.getFractionDigits() != digits, ctx,
"Cannot override fraction-digits from base type %s to %s", baseType, digits);
}
}
return new TypeEffectiveStatementImpl<>(declared, substatements, builder);
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createEmpty(final StmtContext<?, ?, ?> ctx,
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createEmpty(final Current<String, ?> ctx,
final EmptyTypeDefinition baseType, final TypeStatement declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newEmptyBuilder(baseType,
- typeEffectiveSchemaPath(ctx)));
+ typeEffectiveQName(ctx)));
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createEnum(final StmtContext<?, ?, ?> ctx,
+ private @NonNull TypeEffectiveStatement<TypeStatement> createEnum(final Current<?, ?> ctx,
final EnumTypeDefinition baseType, final TypeStatement declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
final EnumerationTypeBuilder builder = RestrictedTypes.newEnumerationBuilder(baseType,
- ctx.getSchemaPath().get());
+ ctx.argumentAsTypeQName());
- final YangVersion yangVersion = ctx.getRootVersion();
for (final EffectiveStatement<?, ?> stmt : substatements) {
if (stmt instanceof EnumEffectiveStatement) {
- SourceException.throwIf(yangVersion != YangVersion.VERSION_1_1, ctx.getStatementSourceReference(),
- "Restricted enumeration type is allowed only in YANG 1.1 version.");
-
- final EnumEffectiveStatement enumSubStmt = (EnumEffectiveStatement) stmt;
- final Optional<Integer> declaredValue =
- enumSubStmt.findFirstEffectiveSubstatementArgument(ValueEffectiveStatement.class);
- final int effectiveValue;
- if (declaredValue.isEmpty()) {
- effectiveValue = getBaseTypeEnumValue(enumSubStmt.getDeclared().rawArgument(), baseType, ctx);
- } else {
- effectiveValue = declaredValue.orElseThrow();
- }
-
- builder.addEnum(EffectiveTypeUtil.buildEnumPair(enumSubStmt, effectiveValue));
+ builder.addEnum(addRestrictedEnum(ctx, baseType, (EnumEffectiveStatement) stmt));
}
}
return new TypeEffectiveStatementImpl<>(declared, substatements, builder);
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createIdentityref(final StmtContext<?, ?, ?> ctx,
+ abstract @NonNull EnumPair addRestrictedEnum(@NonNull EffectiveStmtCtx stmt, @NonNull EnumTypeDefinition base,
+ @NonNull EnumEffectiveStatement enumStmt);
+
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createIdentityref(final Current<String, ?> ctx,
final IdentityrefTypeDefinition baseType, final TypeStatement declared,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newIdentityrefBuilder(baseType,
- typeEffectiveSchemaPath(ctx)));
+ typeEffectiveQName(ctx)));
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createInstanceIdentifier(
- final StmtContext<?, ?, ?> ctx, final InstanceIdentifierTypeDefinition baseType,
- final TypeStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createInstanceIdentifier(final Current<String, ?> ctx,
+ final InstanceIdentifierTypeDefinition baseType, final TypeStatement declared,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
final InstanceIdentifierTypeBuilder builder = RestrictedTypes.newInstanceIdentifierBuilder(baseType,
- typeEffectiveSchemaPath(ctx));
+ typeEffectiveQName(ctx));
for (EffectiveStatement<?, ?> stmt : substatements) {
if (stmt instanceof RequireInstanceEffectiveStatement) {
return new TypeEffectiveStatementImpl<>(declared, substatements, builder);
}
- private static @NonNull TypeEffectiveStatement<TypeStatement> createUnion(final StmtContext<?, ?, ?> ctx,
- final UnionTypeDefinition baseType, final TypeStatement declared,
- final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
- return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newUnionBuilder(baseType,
- typeEffectiveSchemaPath(ctx)));
+ private static <T extends RangeRestrictedTypeDefinition<T, N>, N extends Number & Comparable<N>>
+ @NonNull TypeEffectiveStatement<TypeStatement> createIntegral(final Current<?, ?> ctx,
+ final TypeStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements,
+ final RangeRestrictedTypeBuilder<T, N> builder) {
+ for (EffectiveStatement<?, ?> stmt : substatements) {
+ if (stmt instanceof RangeEffectiveStatement) {
+ final RangeEffectiveStatement rangeStmt = (RangeEffectiveStatement)stmt;
+ builder.setRangeConstraint(rangeStmt, rangeStmt.argument());
+ }
+ }
+
+ try {
+ return new TypeEffectiveStatementImpl<>(declared, substatements, builder);
+ } catch (InvalidRangeConstraintException e) {
+ throw new SourceException(ctx, e, "Invalid range constraint: %s", e.getOffendingRanges());
+ }
}
- private static Uint32 getBaseTypeBitPosition(final String bitName, final BitsTypeDefinition baseType,
- final StmtContext<?, ?, ?> ctx) {
- for (Bit baseTypeBit : baseType.getBits()) {
- if (bitName.equals(baseTypeBit.getName())) {
- return baseTypeBit.getPosition();
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createLeafref(final Current<String, ?> ctx,
+ final LeafrefTypeDefinition baseType, final TypeStatement declared,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ final RequireInstanceRestrictedTypeBuilder<LeafrefTypeDefinition> builder =
+ RestrictedTypes.newLeafrefBuilder(baseType, AbstractTypeStatementSupport.typeEffectiveQName(ctx));
+
+ for (final EffectiveStatement<?, ?> stmt : substatements) {
+ if (stmt instanceof RequireInstanceEffectiveStatement) {
+ builder.setRequireInstance(((RequireInstanceEffectiveStatement) stmt).argument());
}
}
-
- throw new SourceException(ctx.getStatementSourceReference(),
- "Bit '%s' is not a subset of its base bits type %s.", bitName, baseType.getQName());
+ return new TypeEffectiveStatementImpl<>(declared, substatements, builder);
}
- private static int getBaseTypeEnumValue(final String enumName, final EnumTypeDefinition baseType,
- final StmtContext<?, ?, ?> ctx) {
- for (EnumPair baseTypeEnumPair : baseType.getValues()) {
- if (enumName.equals(baseTypeEnumPair.getName())) {
- return baseTypeEnumPair.getValue();
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createString(final Current<String, ?> ctx,
+ final StringTypeDefinition baseType, final TypeStatement declared,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ final StringTypeBuilder builder = RestrictedTypes.newStringBuilder(baseType,
+ AbstractTypeStatementSupport.typeEffectiveQName(ctx));
+
+ for (EffectiveStatement<?, ?> stmt : substatements) {
+ if (stmt instanceof LengthEffectiveStatement) {
+ final LengthEffectiveStatement length = (LengthEffectiveStatement)stmt;
+
+ try {
+ builder.setLengthConstraint(length, length.argument());
+ } catch (IllegalStateException e) {
+ throw new SourceException(ctx, e, "Multiple length constraints encountered");
+ } catch (InvalidLengthConstraintException e) {
+ throw new SourceException(ctx, e, "Invalid length constraint %s", length.argument());
+ }
+ }
+ if (stmt instanceof PatternEffectiveStatement) {
+ builder.addPatternConstraint((PatternEffectiveStatement) stmt);
}
}
- throw new SourceException(ctx.getStatementSourceReference(),
- "Enum '%s' is not a subset of its base enumeration type %s.", enumName, baseType.getQName());
+ return new TypeEffectiveStatementImpl<>(declared, substatements, builder);
+ }
+
+ private static @NonNull TypeEffectiveStatement<TypeStatement> createUnion(final Current<String, ?> ctx,
+ final UnionTypeDefinition baseType, final TypeStatement declared,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newUnionBuilder(baseType,
+ typeEffectiveQName(ctx)));
}
}
\ No newline at end of file
Code Review / yangtools.git / blobdiff