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=fa8afe0a021a4daae8d0680c4f3497b223548fd0;hb=8959bb33806d2252cdf09e42386afd242919630a;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

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 fa8afe0a0..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;
@@ -11,7 +12,6 @@ import org.simantics.db.common.request.UnaryRead;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationContext;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationRequest;
-import org.simantics.db.layer0.util.RuntimeEnvironmentRequest;
 import org.simantics.db.layer0.util.RuntimeEnvironmentRequest2;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.document.server.request.ServerSCLValueRequest.CompilationContext;
@@ -25,8 +25,12 @@ import org.simantics.scl.compiler.elaboration.expressions.EVariable;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.environment.Environment;
+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;
@@ -36,11 +40,16 @@ import org.simantics.structural2.scl.ComponentTypeProperty;
 import org.simantics.structural2.scl.FindPossibleComponentTypeRequest;
 import org.simantics.structural2.scl.ReadComponentTypeInterfaceRequest;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<CompilationContext, Variable> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ServerSCLValueRequest.class);
+    
 	private final Pair<Resource,Resource> componentTypeAndRoot;
 	private final Resource literal;
+    protected String possibleExpectedValueType;
 
 	public static class CompilationContext extends AbstractExpressionCompilationContext {
 		public final Map<String, ComponentTypeProperty> propertyMap;
@@ -52,14 +61,15 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		}
 	}
 
-	private ServerSCLValueRequest(Pair<Resource,Resource> componentTypeAndRoot, Resource literal) {
+	private ServerSCLValueRequest(Pair<Resource,Resource> componentTypeAndRoot, Resource literal, String possibleExpectedValueType) {
 		assert(literal != null);
 		this.literal = literal;
 		this.componentTypeAndRoot = componentTypeAndRoot;
+		this.possibleExpectedValueType = possibleExpectedValueType;
 	}
 
 	public ServerSCLValueRequest(ReadGraph graph, Variable context) throws DatabaseException {
-		this(getComponentTypeAndRoot(graph, context), context.getRepresents(graph));
+		this(getComponentTypeAndRoot(graph, context), context.getRepresents(graph), resolveExpectedValueType(graph, context));
 	}
 
 	private static Pair<Resource,Resource> getComponentTypeAndRoot(ReadGraph graph, Variable property)  throws DatabaseException {
@@ -81,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) {
@@ -93,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)
@@ -193,6 +206,21 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		else
 			return null;
 	}
+	
+    @Override
+    protected Type getExpectedType(ReadGraph graph, CompilationContext context) throws DatabaseException {
+        if(possibleExpectedValueType != null) {
+            try {
+                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);
+            }
+        }
+        return super.getExpectedType(graph, context);
+    }
+
 
 	@Override
 	public int hashCode() {