Couple of import/export/struct fixes

overturetool · Mar 2, 2019 · 5c8e530 · 5c8e530
1 parent 5434655
commit 5c8e530
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/core/typechecker/src/main/java/org/overture/typechecker/ModuleTypeChecker.java b/core/typechecker/src/main/java/org/overture/typechecker/ModuleTypeChecker.java
@@ -244,7 +244,7 @@ public void typeCheck()
 						{
 							try
 							{
-								d.apply(tc, new TypeCheckInfo(assistantFactory, e, NameScope.NAMES));
+								d.apply(tc, new TypeCheckInfo(assistantFactory, e, NameScope.NAMES).newModule(m.getName().getName()));
 								// System.out.println();
 							} catch (TypeCheckException te)
 							{

diff --git a/core/typechecker/src/main/java/org/overture/typechecker/utilities/type/IsEqVisitor.java b/core/typechecker/src/main/java/org/overture/typechecker/utilities/type/IsEqVisitor.java
@@ -32,7 +32,7 @@ public class IsEqVisitor extends QuestionAnswerAdaptor<ILexLocation, Boolean>
 	@Override public Boolean caseANamedInvariantType(ANamedInvariantType node,
 			ILexLocation q) throws AnalysisException
 	{
-		if (TypeChecker.isOpaque(node, node.getLocation().getModule()))
+		if (TypeChecker.isOpaque(node, q.getModule()))
 			return false;
 		if (node.getEqDef() != null)
 			return true;

diff --git a/core/typechecker/src/main/java/org/overture/typechecker/utilities/type/IsOrderedVisitor.java b/core/typechecker/src/main/java/org/overture/typechecker/utilities/type/IsOrderedVisitor.java
@@ -1,9 +1,6 @@
 package org.overture.typechecker.utilities.type;
 
-import com.sun.org.apache.xpath.internal.operations.Bool;
-
 import org.overture.ast.analysis.AnalysisException;
-import org.overture.ast.analysis.AnswerAdaptor;
 import org.overture.ast.analysis.QuestionAnswerAdaptor;
 import org.overture.ast.intf.lex.ILexLocation;
 import org.overture.ast.node.INode;
@@ -20,7 +17,7 @@ public class IsOrderedVisitor
 	@Override public Boolean caseANamedInvariantType(ANamedInvariantType node,
 			ILexLocation q) throws AnalysisException
 	{
-		if (TypeChecker.isOpaque(node, node.getLocation().getModule()))
+		if (TypeChecker.isOpaque(node, q.getModule()))
 			return false;
 		if (node.getOrdDef() != null)
 			return true;

diff --git a/core/typechecker/src/main/java/org/overture/typechecker/visitor/TypeCheckerExpVisitor.java b/core/typechecker/src/main/java/org/overture/typechecker/visitor/TypeCheckerExpVisitor.java
@@ -2076,7 +2076,7 @@ else if (question.assistantFactory.createPTypeAssistant().isType(node.getLeft().
 
 		node.setRecordType((ARecordInvariantType) rec);
 
-		if (TypeChecker.isOpaque(node.getRecordType(), node.getRecordType().getLocation().getModule()))
+		if (TypeChecker.isOpaque(node.getRecordType(), question.fromModule))
 		{
 			TypeCheckerErrors.report(3127, "Type '" + node.getTypeName()
 					+ "' has no struct export", node.getLocation(), node);