X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fcontexts%2FTypeTranslationContext.java;h=927720611de5cab6816d5b517223bea54ff34995;hp=29b9028e6d721e6a21d1f5e5d9d998c41762e35b;hb=a8758de5bc19e5adb3f618d3038743a164f09912;hpb=969bd23cab98a79ca9101af33334000879fb60c5 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 29b9028e6..927720611 100644 --- 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,7 +1,6 @@ package org.simantics.scl.compiler.elaboration.contexts; -import gnu.trove.map.hash.THashMap; - +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; @@ -15,17 +14,22 @@ import org.simantics.scl.compiler.types.exceptions.KindUnificationException; import org.simantics.scl.compiler.types.kinds.Kind; import org.simantics.scl.compiler.types.kinds.Kinds; +import gnu.trove.map.hash.THashMap; + public class TypeTranslationContext { + CompilationContext compilationContext; + Environment environment; ErrorLog errorLog; THashMap typeVariables = new THashMap(); - 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(); } /**