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%2Ftypes%2FTFun.java;h=e26c5b07ac923922a8c4e4270ede948b3b1f3cbb;hp=917526dd0bd4494bfa3e4dc73f295f2a0cc3befd;hb=9a175feb652b2b7bba7afa540831b9076be3c10e;hpb=0b72d3e4ec886838314ffeba0fa201e32c0aae3e

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/TFun.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/TFun.java
index 917526dd0..e26c5b07a 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/TFun.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/TFun.java
@@ -1,11 +1,9 @@
 package org.simantics.scl.compiler.types;
 
-import gnu.trove.map.hash.THashMap;
-import gnu.trove.set.hash.THashSet;
-
 import java.util.ArrayList;
 
 import org.simantics.scl.compiler.environment.Environment;
+import org.simantics.scl.compiler.internal.types.HashCodeUtils;
 import org.simantics.scl.compiler.internal.types.TypeHashCodeContext;
 import org.simantics.scl.compiler.internal.types.ast.TEffectAst;
 import org.simantics.scl.compiler.internal.types.ast.TFunctionAst;
@@ -17,10 +15,13 @@ import org.simantics.scl.compiler.types.kinds.Kinds;
 import org.simantics.scl.compiler.types.util.Polarity;
 import org.simantics.scl.compiler.types.util.TypeUnparsingContext;
 
+import gnu.trove.map.hash.THashMap;
+import gnu.trove.set.hash.THashSet;
+
 public class TFun extends Type {
-    public final Type domain;
-    public final Type effect;
-    public final Type range;
+    public Type domain;
+    public Type effect;
+    public Type range;
     
     TFun(Type domain, Type effect, Type range) {
         if(domain == null)
@@ -189,4 +190,57 @@ public class TFun extends Type {
         Type newRange = range.copySkeleton(metaVarMap);
         return new TFun(newDomain, newEffect, newRange);
     }
+    
+    @Override
+    public int hashCode(int hash) {
+        hash = HashCodeUtils.updateWithPreprocessedValue(hash, FUN_HASH);
+        hash = domain.hashCode(hash);
+        hash = effect.hashCode(hash);
+        hash = range.hashCode(hash);
+        return hash;
+    }
+    
+    @Override
+    public int hashCode(int hash, TVar[] boundVars) {
+        hash = HashCodeUtils.updateWithPreprocessedValue(hash, FUN_HASH);
+        hash = domain.hashCode(hash, boundVars);
+        hash = effect.hashCode(hash, boundVars);
+        hash = range.hashCode(hash, boundVars);
+        return hash;
+    }
+    
+    public Type getCanonicalDomain() {
+        if(domain instanceof TMetaVar)
+            domain = domain.canonical();
+        return domain;
+    }
+    
+    public Type getCanonicalEffect() {
+        if(effect instanceof TMetaVar)
+            effect = effect.canonical();
+        return effect;
+    }
+    
+    public Type getCanonicalRange() {
+        if(range instanceof TMetaVar)
+            range = range.canonical();
+        return range;
+    }
+
+    @Override
+    public boolean equalsCanonical(Type other) {
+        if(this == other)
+            return true;
+        if(!other.getClass().equals(TFun.class))
+            return false;
+        TFun fun = (TFun)other;
+        return getCanonicalDomain().equalsCanonical(fun.getCanonicalDomain())
+                && getCanonicalEffect().equalsCanonical(fun.getCanonicalEffect())
+                && getCanonicalRange().equalsCanonical(fun.getCanonicalRange());
+    }
+
+    @Override
+    public Kind getKind(Environment context) {
+        return Kinds.STAR;
+    }
 }