Call isInstantiable recursively to make sure that type parameters (if…

… present) are bound
cqframework · Oct 30, 2024 · 3345ba1 · 3345ba1
1 parent 4866823
commit 3345ba1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ChoiceType.java b/Src/java/model/src/main/java/org/hl7/cql/model/ChoiceType.java
@@ -148,6 +148,16 @@ public boolean isGeneric() {
 
     @Override
     public boolean isInstantiable(DataType callType, InstantiationContext context) {
+        // Call isInstantiable recursively to make sure that type parameters (if present) are bound
+        if (callType.equals(DataType.ANY)) {
+            for (var type : types) {
+                if (!type.isInstantiable(callType, context)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         return isSuperTypeOf(callType);
     }
 

diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/TupleType.java b/Src/java/model/src/main/java/org/hl7/cql/model/TupleType.java
@@ -164,7 +164,13 @@ public boolean isGeneric() {
 
     @Override
     public boolean isInstantiable(DataType callType, InstantiationContext context) {
+        // Call isInstantiable recursively to make sure that type parameters (if present) are bound
         if (callType.equals(DataType.ANY)) {
+            for (var element : elements) {
+                if (!element.getType().isInstantiable(callType, context)) {
+                    return false;
+                }
+            }
             return true;
         }