X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Ftypes%2FTypes.java;h=e6454fc0c22fcc6561fbe82cb6f96dc651b21b3c;hb=55ca14c;hp=a706e2b8f17d3d9415b30c3ccd7eed14ea01b1f9;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java
index a706e2b8f..e6454fc0c 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java
@@ -86,6 +86,8 @@ public class Types {
     public static final TCon VEC_COMP = con(BUILTIN, "VecComp");
     public static final TCon BINDING = con(BUILTIN, "Binding");
 
+    public static final TCon TYPE = con(BUILTIN, "Type");
+    
     public static final TCon DYNAMIC = con("Prelude", "Dynamic");
     public static final TCon VARIANT = con(BUILTIN, "Variant");
     
@@ -147,36 +149,18 @@ public class Types {
             function = apply(function, parameter);
         return function;
     }
-
-    /**
-     * Get the concrete type or alias type pointed to by a chain of type meta-variables,
-     * or the last metavariable in the link, if it is not linked to an actual type.
-     * Unlike {@link #canonical(Type)}, this method does not resolve type aliases. 
-     */
-    public static Type weakCanonical(Type type) {
-        while(true) {
-            if(type instanceof TMetaVar) {
-                TMetaVar metaVar = (TMetaVar)type;
-                if(metaVar.ref == null)
-                    return type;
-                else
-                    type = metaVar.ref;
-            }
-            else
-                return type;
-        }
-    }
     
     /**
-     * Get the concrete type pointed to by a chain of type meta-variables. Unlike {@link #weakCanonical(Type)}
-     * this method also resolves type aliases.
+     * Get the concrete type pointed to by a chain of type meta-variables.
      */
     public static Type canonical(Type type) {
-        while(type instanceof TMetaVar) {
+        if(type instanceof TMetaVar) {
             TMetaVar metaVar = (TMetaVar)type;
             type = metaVar.ref;
             if(type == null)
                 return metaVar;
+            else
+                return metaVar.ref = canonical(type);
         }
         return type;
     }
@@ -572,7 +556,15 @@ public class Types {
             parameters.add(Types.canonical(apply.parameter));
             type = canonical(apply.function);
         }
-        return new MultiApply(type, parameters.toArray(new Type[parameters.size()]));
+        Type[] parametersArray;
+        if(parameters.isEmpty())
+            parametersArray = Type.EMPTY_ARRAY;
+        else {
+            parametersArray = new Type[parameters.size()];
+            for(int i=0,j=parametersArray.length-1;i<parametersArray.length;++i,--j)
+                parametersArray[i] = parameters.get(j);
+        }
+        return new MultiApply(type, parametersArray);
     }
     
     public static Type unifyApply(TCon func, Type type) throws MatchException {
@@ -795,8 +787,8 @@ public class Types {
     }
 
     public static void unify(Type a, Type b) throws UnificationException {
-        a = weakCanonical(a);
-        b = weakCanonical(b);
+        a = canonical(a);
+        b = canonical(b);
         if(a == b)
             return;
         if(a instanceof TMetaVar) {
@@ -1137,4 +1129,30 @@ public class Types {
                     e.getMessage()));
         }
     }
+
+    public static Type instantiateAndStrip(Type type) {
+        while(true) {
+            if(type instanceof TForAll) {
+                TForAll forAll = (TForAll)type;
+                type = forAll.type.replace(forAll.var, metaVar(forAll.var.getKind()));
+            }
+            else if(type instanceof TFun) {
+                TFun fun = (TFun)type;
+                if(fun.domain instanceof TPred || fun.domain == Types.PUNIT)
+                    type = fun.range;
+                else
+                    return type;
+            }
+            else if(type instanceof TMetaVar) {
+                TMetaVar metaVar = (TMetaVar)type;
+                if(metaVar.ref == null)
+                    return type;
+                else
+                    type = metaVar.ref;
+            }
+            else
+                return type;
+        }
+    }
+    
 }