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%2Felaboration%2Fchr%2FCHRLiteral.java;h=7b4a5bc26b1c7afb59addb97fa91d93985d7cc39;hp=be34361c24ecdca939c654b9302257648655fd92;hb=1ec0193a5a5b8f368b03adb24acd762838ddf8ea;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRLiteral.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRLiteral.java
index be34361c2..7b4a5bc26 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRLiteral.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRLiteral.java
@@ -7,11 +7,14 @@ import org.simantics.scl.compiler.elaboration.chr.relations.SpecialCHRRelation;
 import org.simantics.scl.compiler.elaboration.chr.relations.UnresolvedCHRRelation;
 import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TranslationContext.ExistentialFrame;
 import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
+import org.simantics.scl.compiler.elaboration.expressions.ERecord;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.elaboration.expressions.Variable;
 import org.simantics.scl.compiler.elaboration.expressions.VariableProcedure;
 import org.simantics.scl.compiler.elaboration.expressions.printing.ExpressionToStringVisitor;
+import org.simantics.scl.compiler.elaboration.expressions.records.FieldAssignment;
 import org.simantics.scl.compiler.elaboration.relations.SCLRelation;
 import org.simantics.scl.compiler.errors.Locations;
 import org.simantics.scl.compiler.internal.parsing.Symbol;
@@ -29,6 +32,8 @@ public class CHRLiteral extends Symbol {
     public CHRRelation relation;
     public Type[] typeParameters;
     public Expression[] parameters;
+    public FieldAssignment[] fields; // optional
+    public Expression[] typeConstraintEvidenceParameters;
     public boolean killAfterMatch;
     public boolean negated;
     public boolean passive = true;
@@ -54,6 +59,10 @@ public class CHRLiteral extends Symbol {
                 if(sclRelation != null)
                     relation = new ExternalCHRRelation(sclRelation);
                 else {
+                    if(parameters == null) {
+                        context.getErrorLog().log(location, "Relation must be declared if record syntax is used.");
+                        return;
+                    }
                     Type[] parameterTypes = new Type[parameters.length];
                     for(int i=0;i<parameterTypes.length;++i)
                         parameterTypes[i] = Types.metaVar(Kinds.STAR);
@@ -66,13 +75,41 @@ public class CHRLiteral extends Symbol {
                 }
             }
         }
-        for(int i=0;i<parameters.length;++i)
-            parameters[i] = parameters[i].resolve(context);
+        if(parameters == null && fields != null) {
+            String[] fieldNames = relation.getFieldNames();
+            if(fieldNames == null) {
+                context.getErrorLog().log(location, "Relation " + relation + " does not define field names.");
+                return;
+            }
+            parameters = ERecord.translateFieldsToFunctionParameters(context, fields, fieldNames);
+            if(parameters == null)
+                return;
+            for(int i=0;i<parameters.length;++i) {
+                Expression parameter = parameters[i];
+                if(parameter == null) {
+                    ExistentialFrame frame = context.getCurrentExistentialFrame();
+                    if(frame == null || frame.disallowNewExistentials)
+                        context.getErrorLog().log(location, "Field " + fieldNames[i] + " not defined.");
+                    else
+                        parameters[i] = frame.createBlank(location);
+                }
+                else
+                    parameters[i] = parameters[i].resolve(context);
+            }
+            fields = null;
+        }
+        else {
+            for(int i=0;i<parameters.length;++i)
+                parameters[i] = parameters[i].resolve(context);
+        }
     }
 
     public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {
         for(Expression parameter : parameters)
             parameter.collectRefs(allRefs, refs);
+        if(typeConstraintEvidenceParameters != null)
+            for(Expression parameter : typeConstraintEvidenceParameters)
+                parameter.collectRefs(allRefs, refs);
     }
 
     public void checkType(TypingContext context) {
@@ -80,6 +117,7 @@ public class CHRLiteral extends Symbol {
             if(parameters.length != 1)
                 throw new InternalCompilerError("Wrong number of parameters for EXECUTE constraint.");
             parameters[0] = parameters[0].checkIgnoredType(context);
+            typeConstraintEvidenceParameters = Expression.EMPTY_ARRAY;
         }
         else {
             TVar[] typeVariables = relation.getTypeVariables();
@@ -92,22 +130,33 @@ public class CHRLiteral extends Symbol {
             else
                 for(int i=0;i<parameters.length;++i)
                     parameters[i] = parameters[i].checkType(context, parameterTypes[i]);
+            
+            typeConstraintEvidenceParameters = context.addConstraints(Types.replace(relation.getTypeConstraints(), typeVariables, typeParameters));
         }
     }
 
     public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {
         for(Expression parameter : parameters)
             parameter.collectVars(allVars, vars);
+        if(typeConstraintEvidenceParameters != null)
+            for(Expression parameter : typeConstraintEvidenceParameters)
+                parameter.collectVars(allVars, vars);
     }
 
     public void forVariables(VariableProcedure procedure) {
         for(Expression parameter : parameters)
             parameter.forVariables(procedure);
+        if(typeConstraintEvidenceParameters != null)
+            for(Expression parameter : typeConstraintEvidenceParameters)
+                parameter.forVariables(procedure);
     }
 
     public void collectFreeVariables(THashSet<Variable> vars) {
         for(Expression parameter : parameters)
             parameter.collectFreeVariables(vars);
+        if(typeConstraintEvidenceParameters != null)
+            for(Expression parameter : typeConstraintEvidenceParameters)
+                parameter.collectFreeVariables(vars);
     }
 
     public void setLocationDeep(long loc) {
@@ -121,6 +170,9 @@ public class CHRLiteral extends Symbol {
     public void simplify(SimplificationContext context) {
         for(int i=0;i<parameters.length;++i)
             parameters[i] = parameters[i].simplify(context);
+        if(typeConstraintEvidenceParameters != null)
+            for(int i=0;i<typeConstraintEvidenceParameters.length;++i)
+                typeConstraintEvidenceParameters[i] = typeConstraintEvidenceParameters[i].simplify(context);
     }
     
     public String toString() {