Merge branch 'master' into highprecision

nickbattle · Oct 27, 2023 · f3342df · f3342df
2 parents c8f9d33 + ccebdf6
commit f3342df
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/in/expressions/INExistsExpression.java b/vdmj/src/main/java/com/fujitsu/vdmj/in/expressions/INExistsExpression.java
@@ -1,4 +1,3 @@
-
 /*******************************************************************************
  *
  *	Copyright (c) 2016 Fujitsu Services Ltd.

diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/tc/definitions/TCThreadDefinition.java b/vdmj/src/main/java/com/fujitsu/vdmj/tc/definitions/TCThreadDefinition.java
@@ -119,6 +119,7 @@ public int hashCode()
 	public void typeCheck(Environment base, NameScope scope)
 	{
 		FlatEnvironment local = new FlatEnvironment(getSelfDefinition(), base);
+		local.setEnclosingDefinition(this);
 		TCType rt = statement.typeCheck(local, NameScope.NAMESANDSTATE, null, false);
 
 		if (!(rt instanceof TCVoidType) && !(rt instanceof TCUnknownType))