From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Wed, 18 Oct 2017 11:28:14 +0000 (+0300)
Subject: (refs #7561) Allow extra parameters to the application of type alias
X-Git-Tag: v1.31.0~111
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F24%2F1124%2F1;p=simantics%2Fplatform.git

(refs #7561) Allow extra parameters to the application of type alias

Change-Id: I02da6fe19a96d110bfcd43516c893fea40082cf1
---

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/types/TApplyAst.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/types/TApplyAst.java
index 3c7700075..1aeba2071 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/types/TApplyAst.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/types/TApplyAst.java
@@ -49,15 +49,19 @@ public class TApplyAst extends TypeAst {
                 return Types.metaVar(Kinds.STAR);
             }
             if(alias != null) {
-                if(parameters.length != alias.getArity()) {
+                int arity = alias.getArity();
+                if(parameters.length < arity) {
                     context.getErrorLog().log(location, "Wrong number of parameters are given to the type alias. Expected " +
-                            alias.getArity() + " parameters, got " + parameters.length + " parameters.");
+                            arity + " parameters, got " + parameters.length + " parameters.");
                     return Types.metaVar(Kinds.metaVar());
                 }
-                Type[] parameterTypes = new Type[parameters.length];
-                for(int i=0;i<parameters.length;++i)
+                Type[] parameterTypes = new Type[arity];
+                for(int i=0;i<arity;++i)
                     parameterTypes[i] = parameters[i].toType(context, Kinds.metaVar());
-                return alias.body.replace(alias.parameters, parameterTypes);
+                Type result = alias.body.replace(alias.parameters, parameterTypes);
+                for(int i=arity;i<parameters.length;++i)
+                    result = Types.apply(result, parameters[i].toType(context, Kinds.metaVar()));
+                return result;
             }
         }
         
diff --git a/bundles/org.simantics.scl.osgi/scl/Extras/HashMap.scl b/bundles/org.simantics.scl.osgi/scl/Extras/HashMap.scl
index 312f57c54..76ab15c6c 100644
--- a/bundles/org.simantics.scl.osgi/scl/Extras/HashMap.scl
+++ b/bundles/org.simantics.scl.osgi/scl/Extras/HashMap.scl
@@ -4,7 +4,7 @@ module {
 
 import "MMap" as MMap
 
-type T a b = MMap.T a b
+type T = MMap.T
 
 create :: () -> <Proc> T a b
 create = MMap.create