Merged changes from feature/scl to master.

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / environment / AbstractEnvironment.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/AbstractEnvironment.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/AbstractEnvironment.java
index e91e39444281479ba9fc0655464d63b669d5e774..d6929232a99f1563d6f97d2b6982e27e453580da 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/AbstractEnvironment.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/AbstractEnvironment.java
@@ -6,10 +6,9 @@ import java.util.Collections;
 \r
 import org.simantics.scl.compiler.common.names.Name;\r
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;\r
-import org.simantics.scl.compiler.elaboration.modules.TypeAlias;\r
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;\r
 import org.simantics.scl.compiler.elaboration.modules.TypeClassInstance;\r
-import org.simantics.scl.compiler.elaboration.modules.TypeConstructor;\r
+import org.simantics.scl.compiler.elaboration.modules.TypeDescriptor;\r
 import org.simantics.scl.compiler.elaboration.relations.SCLEntityType;\r
 import org.simantics.scl.compiler.elaboration.relations.SCLRelation;\r
 import org.simantics.scl.compiler.internal.codegen.effects.EffectConstructor;\r
@@ -45,11 +44,11 @@ public abstract class AbstractEnvironment implements Environment {
     }\r
 \r
     @Override\r
-    public TypeConstructor getTypeConstructor(TCon type) {\r
+    public TypeDescriptor getTypeDescriptor(TCon type) {\r
         Module module = getModule(type.module);\r
         if(module == null)\r
             return null;\r
-        return module.getTypeConstructor(type.name);\r
+        return module.getTypeDescriptor(type.name);\r
     }\r
 \r
     @Override\r
@@ -60,14 +59,6 @@ public abstract class AbstractEnvironment implements Environment {
         return module.getEffectConstructor(type.name);\r
     }\r
 \r
-    @Override\r
-    public TypeAlias getTypeAlias(TCon type) {\r
-        Module module = getModule(type.module);\r
-        if(module == null)\r
-            return null;\r
-        return module.getTypeAlias(type.name);\r
-    }\r
-\r
     @Override\r
     public TypeClass getTypeClass(TCon type) {\r
         Module module = getModule(type.module);\r