Merge branch 'master' into highprecision

nickbattle · Jan 14, 2024 · 75e0640 · 75e0640
2 parents 9fc8ad2 + 5acca7c
commit 75e0640
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/tc/statements/TCCallObjectStatement.java b/vdmj/src/main/java/com/fujitsu/vdmj/tc/statements/TCCallObjectStatement.java
@@ -170,6 +170,7 @@ else if (fdef == null)
 		{
 			// Use raw method, so we can use field's location
 			TypeChecker.report(3209, "Member " + field + " is not in scope", field.getLocation());
+			env.listAlternatives(field);
 			return setType(new TCUnknownType(location));
 		}
 		else if (fdef.isStatic() && !env.isStatic())

diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/typechecker/Environment.java b/vdmj/src/main/java/com/fujitsu/vdmj/typechecker/Environment.java
@@ -210,10 +210,10 @@ public void listAlternatives(TCNameToken name)
 		{
 			if (possible.isFunctionOrOperation())
 			{
-				boolean accessible = TCClassDefinition.isAccessible(this, possible, false);
 				String tag = "Possible";
 
-				if (!accessible)
+				if (Settings.dialect != Dialect.VDM_SL &&
+					!TCClassDefinition.isAccessible(this, possible, false))
 				{
 					tag = tag + " (but " + possible.accessSpecifier + ")";
 				}