honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-10 14:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong collection type checking FHIRPath subsetOf parameter type

Browse Source
This commit is contained in:
Grahame Grieve 2024-03-14 16:46:39 +11:00
parent fc8be53260
commit 564a71fe1c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/fhirpath/FHIRPathEngine.java
View File

@ -3253,7 +3253,7 @@ public class FHIRPathEngine {
return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean); return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean);
} }
case SubsetOf : { case SubsetOf : {
checkParamTypes(exp, exp.getFunction().toCode(), paramTypes, focus); checkParamTypes(exp, exp.getFunction().toCode(), paramTypes, focus.toUnordered());
return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean); return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean);
} }
case SupersetOf : { case SupersetOf : {

10
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/fhirpath/TypeDetails.java
View File

@ -405,6 +405,16 @@ public class TypeDetails {
result.types.addAll(types); result.types.addAll(types);
return result; return result;
} }
public TypeDetails toOrdered() {
TypeDetails result = new TypeDetails(CollectionStatus.ORDERED);
result.types.addAll(types);
return result;
}
public TypeDetails toUnordered() {
TypeDetails result = new TypeDetails(CollectionStatus.UNORDERED);
result.types.addAll(types);
return result;
}
public CollectionStatus getCollectionStatus() { public CollectionStatus getCollectionStatus() {
return collectionStatus; return collectionStatus;
} }