Skip to content

Commit

Permalink
Completed support for flag, field, assembly, and document kind tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@david-waltermire
david-waltermire committed Nov 23, 2024
1 parent cfb27a1 commit 5381e87
Show file tree
Hide file tree
Showing 22 changed files with 893 additions and 167 deletions.
24 changes: 23 additions & 1 deletion core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ private String getDefaultFunctionNamespace() {
}

@NonNull
private IEnhancedQName parseAtomicTypeName(@NonNull String name) {
public IEnhancedQName parseAtomicTypeName(@NonNull String name) {
return EQNameFactory.instance().parseName(
name,
this::resolveAtomicTypePrefix);
Expand Down Expand Up @@ -431,6 +431,9 @@ public static IFunction lookupFunction(@NonNull IEnhancedQName qname, int arity)
* @param name
* the name
* @return the parsed qualified name
* @throws StaticMetapathException
* with the code {@link StaticMetapathException#PREFIX_NOT_EXPANDABLE}
* if a non-empty prefix is provided
*/
@NonNull
public IEnhancedQName parseFlagName(@NonNull String name) {
Expand Down Expand Up @@ -722,4 +725,23 @@ public StaticContext build() {
return new StaticContext(this);
}
}

/**
* Provides a callback for resolving namespace prefixes.
*/
@FunctionalInterface
public interface EQNameResolver {
/**
* Get the URI string for the provided namespace prefix.
*
* @param name
* the name to resolve
* @return the URI string or {@code null} if the prefix is unbound
* @throws StaticMetapathException
* with the code {@link StaticMetapathException#PREFIX_NOT_EXPANDABLE}
* if a non-empty prefix is provided
*/
@NonNull
IEnhancedQName resolve(@NonNull String name);
}
}
96 changes: 55 additions & 41 deletions core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/impl/TypeTestSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@

import gov.nist.secauto.metaschema.core.metapath.StaticContext;
import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10;
import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.FlagnameorwildcardContext;
import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.Typename_Context;
import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10Lexer;
import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType;
import gov.nist.secauto.metaschema.core.metapath.type.IItemType;
import gov.nist.secauto.metaschema.core.metapath.type.IKindTest;
import gov.nist.secauto.metaschema.core.metapath.type.ISequenceType;
import gov.nist.secauto.metaschema.core.metapath.type.Occurrence;
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
Expand Down Expand Up @@ -39,7 +43,7 @@ public final class TypeTestSupport {
Metapath10.ParenthesizeditemtypeContext.class, TypeTestSupport::parseParenthesizedItemType);
private static final Map<
Class<? extends ParseTree>,
ParseTreeParser<IItemType>> KIND_TEST_HANDLER_MAP
ParseTreeParser<? extends IKindTest<?>>> KIND_TEST_HANDLER_MAP
= Map.of(
Metapath10.DocumenttestContext.class, TypeTestSupport::parseKindDocumentTest,
Metapath10.FieldtestContext.class, TypeTestSupport::parseKindFieldTest,
Expand Down Expand Up @@ -73,11 +77,11 @@ private static IItemType parseItemType(
@NonNull Metapath10.ItemtypeContext ctx,
@NonNull StaticContext staticContext) {
IItemType retval;
if (ctx.KW_ITEM() != null) {
retval = IItemType.item();
} else {
if (ctx.KW_ITEM() == null) {
ParseTree tree = ctx.getChild(0);
retval = ITEM_TYPE_HANDLER_MAP.get(tree.getClass()).parse(tree, staticContext);
} else {
retval = IItemType.item();
}
return retval;
}
Expand All @@ -91,63 +95,73 @@ private static IItemType parseKindTest(
}

@NonNull
private static IItemType parseKindDocumentTest(
private static IKindTest<IDocumentNodeItem> parseKindDocumentTest(
@NonNull ParseTree tree,
@NonNull StaticContext staticContext) {
Metapath10.DocumenttestContext ctx = (Metapath10.DocumenttestContext) tree;
assert ctx != null;
throw new UnsupportedOperationException("implement");

return ctx.assemblytest() == null
? IItemType.document()
: IItemType.document(parseKindAssemblyTest(ObjectUtils.notNull(ctx.assemblytest()), staticContext));
}

@NonNull
private static IItemType parseKindFieldTest(
private static IKindTest<IAssemblyNodeItem> parseKindAssemblyTest(
@NonNull ParseTree tree,
@NonNull StaticContext staticContext) {
Metapath10.FieldtestContext ctx = (Metapath10.FieldtestContext) tree;
assert ctx != null;
throw new UnsupportedOperationException("implement");

Metapath10.AssemblytestContext ctx = (Metapath10.AssemblytestContext) tree;
IEnhancedQName instanceName
= ctx.elementnameorwildcard() == null || ctx.elementnameorwildcard().elementname() == null
? null
: staticContext.parseModelName(ObjectUtils.notNull(
ctx.elementnameorwildcard().elementname().eqname().getText()));
String typeName = ctx.typename_() == null ? null : ctx.typename_().eqname().getText();
return instanceName == null
? typeName == null
? IItemType.assembly()
: IItemType.assembly(typeName, staticContext)
: IItemType.assembly(instanceName, typeName, staticContext);
}

@NonNull
private static IItemType parseKindAssemblyTest(
private static IKindTest<IFieldNodeItem> parseKindFieldTest(
@NonNull ParseTree tree,
@NonNull StaticContext staticContext) {
Metapath10.AssemblytestContext ctx = (Metapath10.AssemblytestContext) tree;
assert ctx != null;
throw new UnsupportedOperationException("implement");
Metapath10.FieldtestContext ctx = (Metapath10.FieldtestContext) tree;
IEnhancedQName instanceName
= ctx.elementnameorwildcard() == null || ctx.elementnameorwildcard().elementname() == null
? null
: staticContext.parseModelName(ObjectUtils.notNull(
ctx.elementnameorwildcard().elementname().eqname().getText()));
String typeName = ctx.typename_() == null ? null : ctx.typename_().eqname().getText();
return instanceName == null
? typeName == null
? IItemType.field()
: IItemType.field(typeName, staticContext)
: IItemType.field(instanceName, typeName, staticContext);
}

@NonNull
private static IItemType parseKindFlagTest(
private static IKindTest<IFlagNodeItem> parseKindFlagTest(
@NonNull ParseTree tree,
@NonNull StaticContext staticContext) {
Metapath10.FlagtestContext ctx = (Metapath10.FlagtestContext) tree;

FlagnameorwildcardContext nameOrWildcard = ctx.flagnameorwildcard();
IItemType retval;
if (nameOrWildcard == null) {
retval = IItemType.flag();
} else {
IEnhancedQName name = nameOrWildcard.STAR() == null
// eqname
? staticContext.parseFlagName(ObjectUtils.requireNonNull(nameOrWildcard.flagname().eqname().getText()))
// STAR
: null;

IAtomicOrUnionType dataType = null;
Typename_Context typeName = ctx.typename_();
if (typeName != null) {
String dataTypeName = ObjectUtils.notNull(typeName.eqname().getText());
dataType = staticContext.lookupAtomicType(dataTypeName);
}

retval = IItemType.flag(name, dataType);
}
return retval;
IEnhancedQName instanceName
= ctx.flagnameorwildcard() == null || ctx.flagnameorwildcard().flagname() == null
? null
: staticContext.parseFlagName(ObjectUtils.notNull(
ctx.flagnameorwildcard().flagname().eqname().getText()));
String typeName = ctx.typename_() == null ? null : ctx.typename_().eqname().getText();
return instanceName == null
? typeName == null
? IItemType.flag()
: IItemType.flag(typeName, staticContext)
: IItemType.flag(instanceName, typeName, staticContext);
}

@NonNull
private static IItemType parseKindAny(
private static IKindTest<INodeItem> parseKindAny(
@NonNull ParseTree tree,
@SuppressWarnings("unused") @NonNull StaticContext staticContext) {
Metapath10.AnykindtestContext ctx = (Metapath10.AnykindtestContext) tree;
Expand Down
21 changes: 21 additions & 0 deletions core/src/main/java/gov/nist/secauto/metaschema/core/metapath/type/IAtomicOrUnionType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,25 @@ static IAtomicOrUnionType of(
default String toSignature() {
return getQName().toEQName(null);
}

/**
* Check if the other type is a member of this type.
*
* @param other
* @return
*/
default boolean isMemberType(@NonNull IAtomicOrUnionType other) {
// member types are not supported
return false;
}

/**
* Check if this type is the parent type of the other type.
*
* @param actualType
* @return
*/
default boolean isSubType(@NonNull IAtomicOrUnionType other) {
return getItemClass().isAssignableFrom(other.getItemClass());
}
}
Loading

0 comments on commit 5381e87

Please sign in to comment.