import com.google.common.base.Verify;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableTable;
import com.google.common.collect.Multimap;
+import com.google.common.collect.Table;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import org.opendaylight.yangtools.yang.common.YangConstants;
import org.opendaylight.yangtools.yang.common.YangVersion;
import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
-import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
+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.meta.IdentifierNamespace;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.UnionSpecificationImpl;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.UnknownStatementImpl;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc7950.LeafrefSpecificationRfc7950Support;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
FINISHED
}
- @SuppressWarnings({"rawtypes", "unchecked"})
- private final class RootContextBuilder extends ContextBuilder {
- RootContextBuilder(final StatementDefinitionContext def, final StatementSourceReference sourceRef) {
- super(def, sourceRef);
- }
-
- @Override
- public StatementContextBase build() {
- /*
- * If root is null or root version is other than default,
- * we need to create new root.
- */
- if (root == null) {
- root = new RootStatementContext(this, SourceSpecificContext.this);
- } else if (!RootStatementContext.DEFAULT_VERSION.equals(root.getRootVersion())
- && inProgressPhase == ModelProcessingPhase.SOURCE_LINKAGE) {
- root = new RootStatementContext(this, SourceSpecificContext.this, root.getRootVersion());
- } else {
- Preconditions.checkState(root.getIdentifier().equals(createIdentifier()),
- "Root statement was already defined as %s.", root.getIdentifier());
- }
- root.resetLists();
- return root;
- }
- }
-
private static final Logger LOG = LoggerFactory.getLogger(SourceSpecificContext.class);
- private static final Map<String, StatementSupport<?, ?, ?>> BUILTIN_TYPE_SUPPORTS =
- ImmutableMap.<String, StatementSupport<?, ?, ?>>builder()
- .put(TypeUtils.DECIMAL64, new Decimal64SpecificationImpl.Definition())
- .put(TypeUtils.UNION, new UnionSpecificationImpl.Definition())
- .put(TypeUtils.ENUMERATION, new EnumSpecificationImpl.Definition())
- .put(TypeUtils.LEAF_REF, new LeafrefSpecificationImpl.Definition())
- .put(TypeUtils.BITS, new BitsSpecificationImpl.Definition())
- .put(TypeUtils.IDENTITY_REF, new IdentityRefSpecificationImpl.Definition())
- .put(TypeUtils.INSTANCE_IDENTIFIER, new InstanceIdentifierSpecificationImpl.Definition())
- .build();
- private static final QName TYPE = Rfc6020Mapping.TYPE.getStatementName();
+ private static final Table<YangVersion, String, StatementSupport<?, ?, ?>> BUILTIN_TYPE_SUPPORTS =
+ ImmutableTable.<YangVersion, String, StatementSupport<?, ?, ?>>builder()
+ .put(YangVersion.VERSION_1, TypeUtils.DECIMAL64, new Decimal64SpecificationImpl.Definition())
+ .put(YangVersion.VERSION_1, TypeUtils.UNION, new UnionSpecificationImpl.Definition())
+ .put(YangVersion.VERSION_1, TypeUtils.ENUMERATION, new EnumSpecificationImpl.Definition())
+ .put(YangVersion.VERSION_1, TypeUtils.LEAF_REF, new LeafrefSpecificationImpl.Definition())
+ .put(YangVersion.VERSION_1_1, TypeUtils.LEAF_REF, new LeafrefSpecificationRfc7950Support())
+ .put(YangVersion.VERSION_1, TypeUtils.BITS, new BitsSpecificationImpl.Definition())
+ .put(YangVersion.VERSION_1, TypeUtils.IDENTITY_REF, new IdentityRefSpecificationImpl.Definition())
+ .put(YangVersion.VERSION_1, TypeUtils.INSTANCE_IDENTIFIER, new InstanceIdentifierSpecificationImpl.Definition())
+ .build();
+
+ private static final QName TYPE = YangStmtMapping.TYPE.getStatementName();
private final Multimap<ModelProcessingPhase, ModifierImpl> modifiers = HashMultimap.create();
private final QNameToStatementDefinitionMap qNameToStmtDefMap = new QNameToStatementDefinitionMap();
return inProgressPhase;
}
- ContextBuilder<?, ?, ?> createDeclaredChild(final StatementContextBase<?, ?, ?> current, final int childId,
+ StatementContextBase<?, ?, ?> createDeclaredChild(final StatementContextBase<?, ?, ?> current, final int childId,
QName name, final String argument, final StatementSourceReference ref) {
+ if (current != null) {
+ // Fast path: we are entering a statement which was emitted in previous phase
+ final StatementContextBase<?, ?, ?> existing = current.lookupSubstatement(childId);
+ if (existing != null) {
+ return existing;
+ }
+ }
+
// FIXME: BUG-7038: Refactor/clean up this special case
if (TYPE.equals(name)) {
SourceException.throwIfNull(argument, ref, "Type statement requires an argument");
}
StatementDefinitionContext<?, ?, ?> def = currentContext.getStatementDefinition(getRootVersion(), name);
-
if (def == null) {
final StatementSupport<?, ?, ?> extension = qNameToStmtDefMap.get(name);
if (extension != null) {
def = new StatementDefinitionContext<>(extension);
} else {
// type-body-stmts
- def = resolveTypeBodyStmts(name.getLocalName());
+ def = resolveTypeBodyStmts(name.getLocalName(), getRootVersion());
}
} else if (current != null && current.definition().getRepresentingClass().equals(UnknownStatementImpl.class)) {
/*
*/
final QName qName = Utils.qNameFromArgument(current, name.getLocalName());
def = new StatementDefinitionContext<>(new UnknownStatementImpl.Definition(
- new ModelDefinedStatementDefinition(qName)));
+ new ModelDefinedStatementDefinition(qName, argument != null)));
}
- Preconditions.checkArgument(def != null, "Statement %s does not have type mapping defined.", name);
- final ContextBuilder<?, ?, ?> ret;
- if (current == null) {
- ret = new RootContextBuilder(def, ref);
+ InferenceException.throwIfNull(def, ref, "Statement %s does not have type mapping defined.", name);
+ if (def.hasArgument()) {
+ SourceException.throwIfNull(argument, ref, "Statement %s requires an argument", name);
} else {
- ret = current.substatementBuilder(childId, def, ref);
+ SourceException.throwIf(argument != null, ref, "Statement %s does not take argument", name);
}
- if (argument != null) {
- ret.setArgument(argument, ref);
+ if (current != null) {
+ return current.createSubstatement(childId, def, ref, argument);
}
- return ret;
+ /*
+ * If root is null or root version is other than default,
+ * we need to create new root.
+ */
+ if (root == null) {
+ root = new RootStatementContext<>(this, def, ref, argument);
+ } else if (!RootStatementContext.DEFAULT_VERSION.equals(root.getRootVersion())
+ && inProgressPhase == ModelProcessingPhase.SOURCE_LINKAGE) {
+ root = new RootStatementContext<>(this, def, ref, argument, root.getRootVersion());
+ } else {
+ final QName rootStatement = root.definition().getStatementName();
+ final String rootArgument = root.rawStatementArgument();
+
+ Preconditions.checkState(Objects.equals(def.getStatementName(), rootStatement)
+ && Objects.equals(argument, rootArgument),
+ "Root statement was already defined as '%s %s'.", rootStatement, rootArgument);
+ }
+ return root;
}
RootStatementContext<?, ?, ?> getRoot() {
void startPhase(final ModelProcessingPhase phase) {
@Nullable final ModelProcessingPhase previousPhase = phase.getPreviousPhase();
- Preconditions.checkState(Objects.equals(previousPhase, finishedPhase));
- Preconditions.checkState(modifiers.get(previousPhase).isEmpty());
+ Verify.verify(Objects.equals(previousPhase, finishedPhase),
+ "Phase sequencing violation: previous phase should be %s, source %s has %s", previousPhase, source,
+ finishedPhase);
+
+ final Collection<ModifierImpl> previousModifiers = modifiers.get(previousPhase);
+ Preconditions.checkState(previousModifiers.isEmpty(),
+ "Previous phase %s has unresolved modifiers %s in source %s",
+ previousPhase, previousModifiers, source);
+
inProgressPhase = phase;
LOG.debug("Source {} started phase {}", source, phase);
}
}
}
- private static StatementDefinitionContext<?, ?, ?> resolveTypeBodyStmts(final String typeArgument) {
- final StatementSupport<?, ?, ?> support = BUILTIN_TYPE_SUPPORTS.get(typeArgument);
+ private static StatementDefinitionContext<?, ?, ?> resolveTypeBodyStmts(final String typeArgument,
+ final YangVersion version) {
+ StatementSupport<?, ?, ?> support = BUILTIN_TYPE_SUPPORTS.get(version, typeArgument);
+
+ if (support == null) {
+ support = BUILTIN_TYPE_SUPPORTS.get(YangVersion.VERSION_1, typeArgument);
+ }
+
return support == null ? null : new StatementDefinitionContext<>(support);
}
Code Review / yangtools.git / blobdiff