Merged changes from feature/scl to master.

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Environment.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Environment.java
index 70c62062dcbdd0ee7b66923e682ddc74f6f327b6..b25fc72091a8bf23d0046c2901ae9bba258b72c5 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Environment.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Environment.java
@@ -5,10 +5,9 @@ import java.util.Collection;
 import org.simantics.scl.compiler.common.names.Name;
 import org.simantics.scl.compiler.elaboration.contexts.EnvironmentalContext;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
-import org.simantics.scl.compiler.elaboration.modules.TypeAlias;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
 import org.simantics.scl.compiler.elaboration.modules.TypeClassInstance;
-import org.simantics.scl.compiler.elaboration.modules.TypeConstructor;
+import org.simantics.scl.compiler.elaboration.modules.TypeDescriptor;
 import org.simantics.scl.compiler.elaboration.relations.SCLEntityType;
 import org.simantics.scl.compiler.elaboration.relations.SCLRelation;
 import org.simantics.scl.compiler.elaboration.rules.TransformationRule;
@@ -21,9 +20,8 @@ public interface Environment extends EnvironmentalContext {
     SCLValue getValue(Name name);
     SCLRelation getRelation(Name name);
     SCLEntityType getEntityType(Name name);
-    TypeConstructor getTypeConstructor(TCon type);
+    TypeDescriptor getTypeDescriptor(TCon type);
     EffectConstructor getEffectConstructor(TCon type);
-    TypeAlias getTypeAlias(TCon type);
     TypeClass getTypeClass(TCon type);
     Collection<TypeClassInstance> getInstances(TCon typeClass);
     void collectRules(Collection<TransformationRule> rules);