Merge branch 'master' into highprecision

nickbattle · Nov 26, 2023 · bd0146b · bd0146b
2 parents c170d0f + 3a2f685
commit bd0146b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/tc/definitions/TCExplicitFunctionDefinition.java b/vdmj/src/main/java/com/fujitsu/vdmj/tc/definitions/TCExplicitFunctionDefinition.java
@@ -440,6 +440,11 @@ else if (this.typeParams != null && efd.typeParams != null
 					detail2(mname.getName(), mtype.parameters, "Expected", type.parameters);
 				}
 			}
+			else if (isCurried && !(mtype.result instanceof TCFunctionType))
+			{
+				mname.report(3303, "Measure parameters different to function");
+				detail2(mname.getName(), mtype, "Expected", type.getMeasureType(mtype.result));
+			}
 			else if (!TypeComparator.compatible(mtype.parameters, type.parameters))
 			{
 				mname.report(3303, "Measure parameters different to function");