Merged changes from feature/scl to master.

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / contexts / TypeTranslationContext.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TypeTranslationContext.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TypeTranslationContext.java
index b9dbb4be823b1e3d7c1bb769073c91f7bbe654c3..927720611de5cab6816d5b517223bea54ff34995 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TypeTranslationContext.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TypeTranslationContext.java
@@ -1,5 +1,6 @@
 package org.simantics.scl.compiler.elaboration.contexts;
 
+import org.simantics.scl.compiler.compilation.CompilationContext;
 import org.simantics.scl.compiler.environment.Environment;
 import org.simantics.scl.compiler.errors.ErrorLog;
 import org.simantics.scl.compiler.internal.parsing.exceptions.SCLSyntaxErrorException;
@@ -17,15 +18,18 @@ import gnu.trove.map.hash.THashMap;
 
 public class TypeTranslationContext {
     
+    CompilationContext compilationContext;
+    
     Environment environment;
    
     ErrorLog errorLog;    
     
     THashMap<String, TVar> typeVariables = new THashMap<String, TVar>();
     
-    public TypeTranslationContext(ErrorLog errorLog, Environment environment) {
-        this.errorLog = errorLog;
-        this.environment = environment;
+    public TypeTranslationContext(CompilationContext compilationContext) {
+        this.compilationContext = compilationContext;
+        this.errorLog = compilationContext.errorLog;
+        this.environment = compilationContext.environment;
     }
     
     /**
@@ -106,7 +110,7 @@ public class TypeTranslationContext {
     }
 
     public Kind getKind(TCon con) {
-        return environment.getTypeConstructor(con).kind;
+        return environment.getTypeDescriptor(con).getKind();
     }
 
     /**