Add missing @t param defence

nickbattle · Dec 2, 2023 · 14cd6fb · 14cd6fb
1 parent 7ed4240
commit 14cd6fb
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/pog/ProofObligation.java b/vdmj/src/main/java/com/fujitsu/vdmj/pog/ProofObligation.java
@@ -263,7 +263,14 @@ private String launchExplicitFunction(POExplicitFunctionDefinition efd, Context
 
 		if (efd.typeParams != null)
 		{
-			callString.append(addTypeParams(efd.typeParams, ctxt));
+			String inst = addTypeParams(efd.typeParams, ctxt);
+
+			if (inst == null)
+			{
+				return null;
+			}
+
+			callString.append(inst);
 		}
 
 		for (POPatternList pl: efd.paramPatternList)
@@ -298,7 +305,14 @@ private String launchImplicitFunction(POImplicitFunctionDefinition ifd, Context
 
 		if (ifd.typeParams != null)
 		{
-			callString.append(addTypeParams(ifd.typeParams, ctxt));
+			String inst = addTypeParams(ifd.typeParams, ctxt);
+
+			if (inst == null)
+			{
+				return null;
+			}
+
+			callString.append(inst);
 		}
 
 		String sep = "";
@@ -336,6 +350,12 @@ private String addTypeParams(TCTypeList params, Context ctxt)
 		{
 			TCParameterType param = (TCParameterType)p;
 			ParameterValue inst = (ParameterValue) ctxt.get(param.name);
+
+			if (inst == null)
+			{
+				return null;	// Missing type parameter?
+			}
+
 			callString.append(sep);
 			callString.append(inst.type);
 			sep = ", ";