Use re-stated types in definition imports (see #760)

overturetool · Oct 29, 2020 · bd2643b · bd2643b
1 parent e5b2e9f
commit bd2643b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/core/typechecker/src/main/java/org/overture/typechecker/utilities/DefinitionTypeFinder.java b/core/typechecker/src/main/java/org/overture/typechecker/utilities/DefinitionTypeFinder.java
@@ -52,6 +52,7 @@
 import org.overture.ast.definitions.SClassDefinition;
 import org.overture.ast.factory.AstFactory;
 import org.overture.ast.node.INode;
+import org.overture.ast.types.AFunctionType;
 import org.overture.ast.types.AUnionType;
 import org.overture.ast.types.PType;
 import org.overture.typechecker.assistant.ITypeCheckerAssistantFactory;
@@ -146,7 +147,18 @@ public PType caseAImplicitOperationDefinition(
 	public PType caseAImportedDefinition(AImportedDefinition node)
 			throws AnalysisException
 	{
-		return ((AImportedDefinition) node).getDef().apply(THIS);
+		PType type = node.getType();
+
+		if (type != null && !(type instanceof AFunctionType))
+		{
+			// Only for non-function types (polymorphic params cause trouble)
+			// See bug #760
+			return type;
+		}
+		else
+		{
+			return ((AImportedDefinition) node).getDef().apply(THIS);
+		}
 	}
 
 	public static void checkSuperDefinition(AInheritedDefinition d)
@@ -231,7 +243,18 @@ public PType caseAPerSyncDefinition(APerSyncDefinition node)
 	public PType caseARenamedDefinition(ARenamedDefinition node)
 			throws AnalysisException
 	{
-		return ((ARenamedDefinition) node).getDef().apply(THIS);
+		PType type = node.getType();
+
+		if (type != null && !(type instanceof AFunctionType))
+		{
+			// Only for non-function types (polymorphic params cause trouble)
+			// See bug #760
+			return type;
+		}
+		else
+		{
+			return ((ARenamedDefinition) node).getDef().apply(THIS);
+		}
 	}
 
 	@Override

diff --git a/...r/src/main/java/org/overture/typechecker/utilities/expression/ImportDefinitionFinder.java b/...r/src/main/java/org/overture/typechecker/utilities/expression/ImportDefinitionFinder.java
@@ -132,6 +132,11 @@ public List<PDefinition> defaultSValueImport(SValueImport imp,
 			{
 				expdef = AstFactory.newAImportedDefinition(imp.getLocation(), expdef);
 			}
+
+			if (imp.getImportType() != null)
+			{
+				expdef.setType(imp.getImportType());
+			}
 
 			list.add(expdef);
 		}