X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLValueRequest.java;h=68602de69022bc6eeaf4f24375c1ff3c01bcf763;hp=5013f88146bbb232d48d8f27e8883df40fd81421;hb=8959bb33806d2252cdf09e42386afd242919630a;hpb=84d7675119770bf431ff77a5628ca78515fba807

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
index 5013f8814..68602de69 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
@@ -1,5 +1,6 @@
 package org.simantics.document.server.request;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 import org.simantics.databoard.Bindings;
@@ -28,6 +29,8 @@ import org.simantics.scl.compiler.environment.Environments;
 import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification;
 import org.simantics.scl.compiler.runtime.RuntimeEnvironment;
 import org.simantics.scl.compiler.top.SCLExpressionCompilationException;
+import org.simantics.scl.compiler.types.TMetaVar;
+import org.simantics.scl.compiler.types.TVar;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.kinds.Kinds;
@@ -88,8 +91,7 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		SCLContext sclContext = SCLContext.getCurrent();
         Object oldGraph = sclContext.get("graph");
 		try {
-			Function1<Variable,Object> exp = graph.syncRequest(new ServerSCLValueRequest(graph, context),
-					TransientCacheListener.<Function1<Variable,Object>>instance());
+			Function1<Variable,Object> exp = compile(graph, context);
 			sclContext.put("graph", graph);
 			return exp.apply(context);
 		} catch (DatabaseException e) {
@@ -100,6 +102,10 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
             sclContext.put("graph", oldGraph);
 		}
 	}
+	
+	public static Function1<Variable, Object> compile(ReadGraph graph, Variable context) throws DatabaseException {
+	    return graph.syncRequest(new ServerSCLValueRequest(graph, context), TransientCacheListener.<Function1<Variable,Object>>instance());
+	}
 
 	@Override
 	protected String getExpressionText(ReadGraph graph)
@@ -205,7 +211,9 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
     protected Type getExpectedType(ReadGraph graph, CompilationContext context) throws DatabaseException {
         if(possibleExpectedValueType != null) {
             try {
-                return Environments.getType(context.runtimeEnvironment.getEnvironment(), possibleExpectedValueType);
+                Type type = Environments.getType(context.runtimeEnvironment.getEnvironment(), possibleExpectedValueType);
+                type = Types.instantiate(Types.forAll(Types.freeVars(type).toArray(new TVar[0]), type), new ArrayList<TMetaVar>());
+                return type;
             } catch (SCLExpressionCompilationException e) {
                 LOGGER.error("Could not get type for " + String.valueOf(possibleExpectedValueType), e);
             }