From 6d233d1b05176e40f634766537082d2a2ec65fd0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hannu=20Niemist=C3=B6?= <hannu.niemisto@semantum.fi>
Date: Sun, 4 Jun 2017 14:49:30 +0300
Subject: [PATCH] (refs #7250) Support for record syntax for CHR relations

Change-Id: I8dd80eb5216a1b6023ab9097af58d4f1aaa077b2
---
 .../scl/compiler/compilation/Elaboration.java |   2 +-
 .../compiler/elaboration/chr/CHRLiteral.java  |  37 ++++++-
 .../compiler/elaboration/chr/CHRRelation.java |   3 +
 .../chr/relations/CHRConstraint.java          |   6 ++
 .../chr/relations/ExternalCHRRelation.java    |   5 +
 .../chr/translation/CHRTranslation.java       |  45 ++++++---
 .../contexts/TranslationContext.java          |  16 ++-
 .../elaboration/expressions/ERecord.java      |  91 +++++++++++-------
 .../elaboration/expressions/EVar.java         |   7 +-
 .../block/ConstraintStatement.java            |   7 +-
 .../elaboration/relations/SCLRelation.java    |   7 +-
 .../parsing/declarations/ConstructorAst.java  |   5 +-
 .../internal/parsing/parser/SCL.grammar       |   2 +-
 .../internal/parsing/parser/SCLParser.dat     | Bin 24024 -> 25012 bytes
 .../internal/parsing/parser/SCLParser.java    |  49 ++++++----
 .../parsing/parser/SCLParserImpl.java         |  32 +++---
 .../compiler/tests/ModuleRegressionTests.java |   2 +
 .../scl/compiler/tests/scl/CHR10.scl          |  30 ++++++
 .../simantics/scl/compiler/tests/scl/CHR5.scl |   6 +-
 .../simantics/scl/compiler/tests/scl/CHR6.scl |   6 +-
 .../simantics/scl/compiler/tests/scl/CHR7.scl |   6 +-
 .../simantics/scl/compiler/tests/scl/CHR8.scl |   8 +-
 .../simantics/scl/compiler/tests/scl/CHR9.scl |  42 ++++++++
 23 files changed, 298 insertions(+), 116 deletions(-)
 create mode 100644 tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR10.scl
 create mode 100644 tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR9.scl

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
index 359448e1d..fccf26815 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
@@ -376,7 +376,7 @@ public class Elaboration {
             dataTypes.add(dataType);
             for(int j=0;j<constructors.length;++j) {
                 ConstructorAst constructor = dataTypeAst.constructors[j];
-                String name = constructor.name;
+                String name = constructor.name.text;
                 Type[] parameterTypes = new Type[constructor.parameters.length];
                 for(int i=constructor.parameters.length-1;i>=0;--i)
                     parameterTypes[i] = context.toType(constructor.parameters[i]);
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 b34328a53..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,7 @@ 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;
@@ -55,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);
@@ -67,8 +75,33 @@ 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) {
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRelation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRelation.java
index 7369d496c..3daae67a9 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRelation.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRelation.java
@@ -12,4 +12,7 @@ public interface CHRRelation {
     TVar[] getTypeVariables();
     Type[] getParameterTypes();
     TPred[] getTypeConstraints();
+    default String[] getFieldNames() {
+        return null;
+    }
 }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/relations/CHRConstraint.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/relations/CHRConstraint.java
index c0f439288..ee7347791 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/relations/CHRConstraint.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/relations/CHRConstraint.java
@@ -34,6 +34,7 @@ import gnu.trove.map.hash.TIntObjectHashMap;
 public class CHRConstraint extends Symbol implements CHRRelation {
     public final String name;
     public final Type[] parameterTypes;
+    public String[] fieldNames;
     
     public boolean implicitlyDeclared;
 
@@ -229,4 +230,9 @@ public class CHRConstraint extends Symbol implements CHRRelation {
         else
             return w.apply(location, accessor, fact);
     }
+    
+    @Override
+    public String[] getFieldNames() {
+        return fieldNames;
+    }
 }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/relations/ExternalCHRRelation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/relations/ExternalCHRRelation.java
index 5e4f5868c..6f44bc2ab 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/relations/ExternalCHRRelation.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/relations/ExternalCHRRelation.java
@@ -32,4 +32,9 @@ public class ExternalCHRRelation implements CHRRelation {
     public String toString() {
         return relation.toString();
     }
+    
+    @Override
+    public String[] getFieldNames() {
+        return relation.getFieldNames();
+    }
 }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/translation/CHRTranslation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/translation/CHRTranslation.java
index 6972eb864..367960dfa 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/translation/CHRTranslation.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/translation/CHRTranslation.java
@@ -3,6 +3,7 @@ package org.simantics.scl.compiler.elaboration.chr.translation;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
 import org.simantics.scl.compiler.elaboration.chr.CHRLiteral;
 import org.simantics.scl.compiler.elaboration.chr.CHRQuery;
 import org.simantics.scl.compiler.elaboration.chr.CHRRule;
@@ -12,6 +13,7 @@ import org.simantics.scl.compiler.elaboration.chr.relations.UnresolvedCHRRelatio
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.expressions.EApply;
 import org.simantics.scl.compiler.elaboration.expressions.EBinary;
+import org.simantics.scl.compiler.elaboration.expressions.ERecord;
 import org.simantics.scl.compiler.elaboration.expressions.EVar;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.elaboration.expressions.block.CHRStatement;
@@ -20,9 +22,11 @@ import org.simantics.scl.compiler.elaboration.expressions.list.ListAssignment;
 import org.simantics.scl.compiler.elaboration.expressions.list.ListGenerator;
 import org.simantics.scl.compiler.elaboration.expressions.list.ListGuard;
 import org.simantics.scl.compiler.elaboration.expressions.list.ListQualifier;
+import org.simantics.scl.compiler.elaboration.expressions.records.FieldAssignment;
 import org.simantics.scl.compiler.environment.AmbiguousNameException;
 import org.simantics.scl.compiler.environment.Environments;
 import org.simantics.scl.compiler.errors.Locations;
+import org.simantics.scl.compiler.internal.parsing.declarations.DAnnotationAst;
 import org.simantics.scl.compiler.internal.parsing.types.TypeAst;
 
 public class CHRTranslation {
@@ -35,18 +39,27 @@ public class CHRTranslation {
     }
 
     private static CHRLiteral convertConstraint(boolean remove, boolean negated, Expression expression) {
-        ArrayList<Expression> parameters = new ArrayList<Expression>(4);
-        while(expression instanceof EApply) {
+        long location = expression.location;
+        Expression[] parameters;
+        FieldAssignment[] fields = null;
+        if(expression instanceof EApply) {
             EApply apply = (EApply)expression;
-            for(int i=apply.parameters.length-1;i>=0;--i)
-                parameters.add(apply.parameters[i]);
+            parameters = apply.parameters;
             expression = apply.function;
         }
-        EVar var = (EVar)expression;
-        Expression[] parametersArray = new Expression[parameters.size()];
-        for(int i=0,j=parametersArray.length-1;i<parametersArray.length;++i,--j)
-            parametersArray[i] = parameters.get(j);
-        return new CHRLiteral(expression.location, new UnresolvedCHRRelation(var.location, var.name), parametersArray, remove, negated);
+        else if(expression instanceof ERecord) {
+            ERecord record = (ERecord)expression;
+            parameters = null;
+            fields = record.fields;
+            expression = record.constructor;
+        }
+        else // if(expression instanceof EVar)
+            parameters = Expression.EMPTY_ARRAY;
+        EVar var = (EVar)expression; // this should succeed because of isConstraint test
+        CHRLiteral literal = new CHRLiteral(location, new UnresolvedCHRRelation(var.location, var.name),
+                parameters, remove, negated);
+        literal.fields = fields;
+        return literal;
     }
     
     private static CHRLiteral convertListQualifier(TranslationContext context, boolean isHead, ListQualifier qualifier) {
@@ -102,8 +115,10 @@ public class CHRTranslation {
     }
     
     private static boolean isConstraint(TranslationContext context, Expression expression) {
-        while(expression instanceof EApply)
+        if(expression instanceof EApply)
             expression = ((EApply)expression).function;
+        else if(expression instanceof ERecord)
+            expression = ((ERecord)expression).constructor;
         if(!(expression instanceof EVar))
             return false;
         String name = ((EVar)expression).name;
@@ -136,7 +151,15 @@ public class CHRTranslation {
     }
 
     public static CHRConstraint convertConstraintStatement(TranslationContext context, ConstraintStatement statement) {
-        return new CHRConstraint(statement.location, statement.name.text, TypeAst.toTypes(context, statement.parameterTypes));
+        CHRConstraint constraint = new CHRConstraint(statement.location, statement.name.text, TypeAst.toTypes(context, statement.parameterTypes));
+        for(DAnnotationAst annotation : statement.annotations)
+            applyConstraintAnnotation(context, constraint, annotation);
+        constraint.fieldNames = statement.fieldNames;
+        return constraint;
+    }
+
+    private static void applyConstraintAnnotation(TranslationContext context, CHRConstraint constraint, DAnnotationAst annotation) {
+        context.getErrorLog().log(annotation.location, "Invalid constraint annotation");
     }
     
 }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TranslationContext.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TranslationContext.java
index 75090ae38..0331f9a50 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TranslationContext.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TranslationContext.java
@@ -46,7 +46,15 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
     public static class ExistentialFrame {
         THashSet<String> variables = new THashSet<String>(4);
         ArrayList<Variable> blanks = new ArrayList<Variable>(2); 
-        boolean disallowNewExistentials;
+        public boolean disallowNewExistentials;
+        
+        public EVariable createBlank(long location) {
+            Variable variable = new Variable("_");
+            blanks.add(variable);
+            EVariable result = new EVariable(variable);
+            result.location = location;
+            return result;
+        }
     }
     
     THashMap<String, Variable> variables = new THashMap<String, Variable>();
@@ -128,14 +136,12 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
         }
         case '_': {
             if(name.length()==1) {
-                variable = new Variable("_");
                 ExistentialFrame existentialFrame = getCurrentExistentialFrame();
                 if(existentialFrame == null || existentialFrame.disallowNewExistentials) {
                     errorLog.log(location, "Blank variables can be used only in queries.");
                     return new EError(location);
                 }
-                existentialFrame.blanks.add(variable);
-                return new EVariable(variable);
+                return existentialFrame.createBlank(location);
             }
             break;
         }
@@ -143,7 +149,7 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
         return null;
     }
     
-    private ExistentialFrame getCurrentExistentialFrame() {
+    public ExistentialFrame getCurrentExistentialFrame() {
         int size = existentialFrames.size(); 
         if(size == 0)
             return null;
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ERecord.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ERecord.java
index a41c0f042..e1f444d82 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ERecord.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ERecord.java
@@ -2,20 +2,20 @@ package org.simantics.scl.compiler.elaboration.expressions;
 
 import org.simantics.scl.compiler.constants.SCLConstructor;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TranslationContext.ExistentialFrame;
 import org.simantics.scl.compiler.elaboration.expressions.records.FieldAssignment;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.environment.AmbiguousNameException;
 import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.parsing.Token;
 
 import gnu.trove.map.hash.THashMap;
 
 public class ERecord extends ASTExpression {
 
-    Token constructor;
-    FieldAssignment[] fields;
+    public final EVar constructor;
+    public final FieldAssignment[] fields;
     
-    public ERecord(Token constructor, FieldAssignment[] fields) {
+    public ERecord(EVar constructor, FieldAssignment[] fields) {
         this.constructor = constructor;
         this.fields = fields;
     }
@@ -33,30 +33,67 @@ public class ERecord extends ASTExpression {
     public Expression resolve(TranslationContext context, boolean asPattern) {
         SCLValue constructorValue; 
         try {
-            constructorValue = context.getEnvironment().getLocalNamespace().getValue(constructor.text);
+            constructorValue = context.getEnvironment().getLocalNamespace().getValue(constructor.name);
         } catch (AmbiguousNameException e) {
             context.getErrorLog().log(constructor.location, e.getMessage());
             return new EError(constructor.location);
         }
         if(constructorValue == null) {
-            context.getErrorLog().log(constructor.location, "Couldn't resolve the record constructor " + constructor.text + ".");
+            context.getErrorLog().log(constructor.location, "Couldn't resolve the record constructor " + constructor.name + ".");
             return new EError(constructor.location);
         }
         if(!(constructorValue.getValue() instanceof SCLConstructor)) {
-            context.getErrorLog().log(constructor.location, "Value " + constructor.text + " is not a record constructor.");
+            context.getErrorLog().log(constructor.location, "Value " + constructor.name + " is not a record constructor.");
             return new EError(constructor.location);
         }
         String[] fieldNames = ((SCLConstructor)constructorValue.getValue()).recordFieldNames;
         if(fieldNames == null) {
-            context.getErrorLog().log(constructor.location, "Value " + constructor.text + " is not a record constructor.");
+            context.getErrorLog().log(constructor.location, "Value " + constructor.name + " is not a record constructor.");
             return new EError(constructor.location);
         }
+        Expression[] parameters = translateFieldsToFunctionParameters(context, fields, fieldNames);
+        if(parameters == null)
+            return new EError(location);
+        if(asPattern)
+            for(int i=0;i<parameters.length;++i) {
+                Expression parameter = parameters[i];
+                if(parameter == null)
+                    parameters[i] = Expressions.blank(null);
+                else
+                    parameters[i] = parameter.resolveAsPattern(context);
+            }
+        else {
+            boolean error = false;
+            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.");
+                        error = true;
+                    }
+                    else
+                        parameters[i] = frame.createBlank(location); 
+                }
+                else
+                    parameters[i] = parameter.resolve(context);
+            }
+            if(error)
+                return new EError(location);
+        }
+        EApply result = new EApply(new EConstant(constructorValue), parameters);
+        result.setLocationDeep(location);
+        return result;
+    }
+    
+    public static Expression[] translateFieldsToFunctionParameters(TranslationContext context, FieldAssignment[] fields, String[] fieldNames) {
         THashMap<String,FieldAssignment> recordMap = new THashMap<String,FieldAssignment>(fields.length);
+        boolean error = false;
         for(FieldAssignment field : fields) {
             if(field.value == null) {
-            	String actualName = field.name;
-            	if(actualName.charAt(0) == '?')
-            		actualName = actualName.substring(1);
+                String actualName = field.name;
+                if(actualName.charAt(0) == '?')
+                    actualName = actualName.substring(1);
                 String bestMatch = null;
                 int bestMatchLength = 0;
                 for(int i=0;i<fieldNames.length;++i) {
@@ -68,46 +105,30 @@ public class ERecord extends ASTExpression {
                 }
                 if(bestMatch == null) {
                     context.getErrorLog().log(field.location, "Invalid shorthand field " + field.name + " is defined twice.");
-                    return new EError(location);
+                    error = true;
                 }
                 field.value = new EVar(field.location, field.name);
                 field.name = bestMatch;
             }
             if(recordMap.put(field.name, field) != null) {
                 context.getErrorLog().log(field.location, "Field " + field.name + " is defined more than once.");
-                return new EError(location);
+                error = true;
             }
         }
+        if(error)
+            return null;
         Expression[] parameters = new Expression[fieldNames.length];
-        boolean error = false;
         for(int i=0;i<fieldNames.length;++i) {
             FieldAssignment assignment = recordMap.remove(fieldNames[i]);
-            if(assignment == null) {
-                if(asPattern) {
-                    parameters[i] = Expressions.blank(null);
-                }
-                else {
-                    context.getErrorLog().log(location, "Field " + fieldNames[i] + " not defined.");
-                    error = true;
-                }
-            }
-            else
-                parameters[i] = asPattern
-                        ? assignment.value.resolveAsPattern(context) 
-                        : assignment.value.resolve(context);
+            if(assignment != null)
+                parameters[i] = assignment.value;
         }
         if(!recordMap.isEmpty()) {
             for(FieldAssignment field : recordMap.values())
                 context.getErrorLog().log(field.location, "Field " + field.name + " is not defined in the constructor.");
-            error = true;
-        }
-        if(error)
-            return new EError(location);
-        else {
-            EApply result = new EApply(new EConstant(constructorValue), parameters);
-            result.setLocationDeep(location);
-            return result;
+            return null;
         }
+        return parameters;
     }
 
     @Override
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVar.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVar.java
index fda9d37ac..d78fa8565 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVar.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVar.java
@@ -2,17 +2,22 @@ package org.simantics.scl.compiler.elaboration.expressions;
 
 import java.util.ArrayList;
 
-import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.errors.NotPatternException;
 import org.simantics.scl.compiler.elaboration.expressions.lhstype.FunctionDefinitionLhs;
 import org.simantics.scl.compiler.elaboration.expressions.lhstype.LhsType;
 import org.simantics.scl.compiler.elaboration.expressions.lhstype.PatternMatchingLhs;
 import org.simantics.scl.compiler.errors.Locations;
+import org.simantics.scl.compiler.internal.parsing.Token;
 
 public class EVar extends ASTExpression {
     public final String name;
 
+    public EVar(Token token) {
+        this.location = token.location;
+        this.name = token.text;
+    }
+    
     public EVar(long location, String name) {
         this.location = location;
         this.name = name;
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/block/ConstraintStatement.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/block/ConstraintStatement.java
index fc92190a9..4cccf2f46 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/block/ConstraintStatement.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/block/ConstraintStatement.java
@@ -5,16 +5,21 @@ import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.errors.Locations;
 import org.simantics.scl.compiler.internal.parsing.Token;
+import org.simantics.scl.compiler.internal.parsing.declarations.DAnnotationAst;
 import org.simantics.scl.compiler.internal.parsing.types.TypeAst;
 
 public class ConstraintStatement extends Statement {
 
     public Token name;
     public TypeAst[] parameterTypes;
+    public String[] fieldNames;
+    public DAnnotationAst[] annotations;
     
-    public ConstraintStatement(Token name, TypeAst[] parameterTypes) {
+    public ConstraintStatement(Token name, TypeAst[] parameterTypes, String[] fieldNames, DAnnotationAst[] annotations) {
         this.name = name;
         this.parameterTypes = parameterTypes;
+        this.fieldNames = fieldNames;
+        this.annotations = annotations;
     }
     
     @Override
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/relations/SCLRelation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/relations/SCLRelation.java
index 4ac37bbc1..e93ff6e8f 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/relations/SCLRelation.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/relations/SCLRelation.java
@@ -35,7 +35,7 @@ public interface SCLRelation {
         return TPred.EMPTY_ARRAY;
     }
     int getPhase();
-    
+
     double getSelectivity(int boundVariables);
     int getRequiredVariablesMask();
     void generate(long location,
@@ -45,7 +45,10 @@ public interface SCLRelation {
     Expression generateEnforce(long location, EnforcingContext context,
             Type[] typeParameters,
             Variable[] parameters);
-
+    default String[] getFieldNames() {
+        return null;
+    }
+    
     void generateIterate(
             PlanContext context,
             CodeWriter w,
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/declarations/ConstructorAst.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/declarations/ConstructorAst.java
index 3edb9ce81..bbb669506 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/declarations/ConstructorAst.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/declarations/ConstructorAst.java
@@ -1,6 +1,7 @@
 package org.simantics.scl.compiler.internal.parsing.declarations;
 
 import org.simantics.scl.compiler.internal.parsing.Symbol;
+import org.simantics.scl.compiler.internal.parsing.Token;
 import org.simantics.scl.compiler.internal.parsing.types.TypeAst;
 
 
@@ -8,11 +9,11 @@ public class ConstructorAst extends Symbol {
     public static final ConstructorAst[] EMPTY_ARRAY = new ConstructorAst[0];
     
     public final DAnnotationAst[] annotations;
-    public final String name;
+    public final Token name;
     public final TypeAst[] parameters;
     public final String[] fieldNames; // null, if no field names
     
-    public ConstructorAst(DAnnotationAst[] annotations, String name,
+    public ConstructorAst(DAnnotationAst[] annotations, Token name,
             TypeAst[] parameters, String[] fieldNames) {
         this.annotations = annotations;
         this.name = name;
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
index b0911febe..f7ea1b263 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
@@ -200,7 +200,7 @@ statement
     | exp FOLLOWS queryBlock                                 # RuleStatement
     | chrQuery IMPLIES chrQuery                              # CHRStatement
     | WHEN verboseChrQuery THEN_AFTER_WHEN verboseChrQuery   # VerboseCHRStatement
-    | CONSTRAINT ID atype*                                   # ConstraintStatement
+    | CONSTRAINT constructor                                 # ConstraintStatement
     | INCLUDE ID aexp                                        # LocalInclude
     ;
 
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.dat b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.dat
index 3b8a4c400293523d105ea223a57485b7a3b2e43a..378013be5fbabbeb1085e6d43b3854b269873bf0 100644
GIT binary patch
literal 25012
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
D8=lVg

literal 24024
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
PFCf41yAN<*;L_g%-P&q0

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
index 527c66f5d..fc2242dce 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
@@ -13,18 +13,18 @@ public abstract class SCLParser {
     public static final boolean TRACE = false;
 
     private static final int INITIAL_CAPACITY = 16;
-    private static final int STATE_COUNT = 353;
+    private static final int STATE_COUNT = 358;
     private static final int TERMINAL_COUNT = 84;
-    private static final int NONTERMINAL_COUNT = 51;
-    private static final int PRODUCT_COUNT = 134;
+    private static final int NONTERMINAL_COUNT = 52;
+    private static final int PRODUCT_COUNT = 135;
     
     private static final int[] ACTION_ROW_ID = new int[STATE_COUNT];
     private static final int[] ACTION_COLUMN_ID = new int[TERMINAL_COUNT];
-    private static final short[] ACTION_TABLE = new short[6588];
-    private static final int[] ERROR_TABLE = new int[927];
+    private static final short[] ACTION_TABLE = new short[6944];
+    private static final int[] ERROR_TABLE = new int[940];
     private static final int[] GOTO_ROW_ID = new int[STATE_COUNT];
     private static final int[] GOTO_COLUMN_ID = new int[NONTERMINAL_COUNT];
-    private static final short[] GOTO_TABLE = new short[1620];
+    private static final short[] GOTO_TABLE = new short[1708];
     private static final int[] PRODUCT_LHS = new int[PRODUCT_COUNT];
 
     private static final short STATE_MASK = (short)0x0fff;
@@ -161,6 +161,7 @@ public abstract class SCLParser {
         "listQualifier",
         "chrQuery",
         "verboseChrQuery",
+        "constraintSpec",
         "caseRhs",
         "guardedExpArrow",
         "equation",
@@ -394,19 +395,19 @@ public abstract class SCLParser {
         return parse(0);
     }
     public Object parseCommands() {
-        return parse(337);
+        return parse(342);
     }
     public Object parseImport() {
-        return parse(345);
+        return parse(350);
     }
     public Object parseType() {
-        return parse(347);
+        return parse(352);
     }
     public Object parseExp() {
-        return parse(349);
+        return parse(354);
     }
     public Object parseEquationBlock() {
-        return parse(351);
+        return parse(356);
     }
 
 
@@ -650,24 +651,26 @@ public abstract class SCLParser {
         case 117:
             return reduceVerboseCHRQuery();
         case 118:
-            return reduceSimpleCaseRhs();
+            return reduceConstraintSpec();
         case 119:
-            return reduceGuardedCaseRhs();
+            return reduceSimpleCaseRhs();
         case 120:
-            return reduceGuardedExpArrow();
+            return reduceGuardedCaseRhs();
         case 121:
-            return reduceGuardEquation();
+            return reduceGuardedExpArrow();
         case 122:
-            return reduceBasicEquation();
+            return reduceGuardEquation();
         case 123:
-            return reduceEffect();
+            return reduceBasicEquation();
         case 124:
-            return reduceJustEtype();
+            return reduceEffect();
         case 125:
-            return reduceForAll();
+            return reduceJustEtype();
         case 126:
-            return reduceApplyType();
+            return reduceForAll();
         case 127:
+            return reduceApplyType();
+        case 128:
             return reduceDummy();
 
         default:
@@ -821,7 +824,7 @@ public abstract class SCLParser {
      */
     protected abstract Object reduceVerboseCHRStatement();
     /**
-     * statement ::= CONSTRAINT ID atype&#42;
+     * statement ::= CONSTRAINT constructor (WHERE constraintSpec)?
      */
     protected abstract Object reduceConstraintStatement();
     /**
@@ -1136,6 +1139,10 @@ public abstract class SCLParser {
      * verboseChrQuery ::= LBRACE listQualifier (SEMICOLON listQualifier)&#42; RBRACE
      */
     protected abstract Object reduceVerboseCHRQuery();
+    /**
+     * constraintSpec ::= LBRACE exp (SEMICOLON exp)&#42; RBRACE
+     */
+    protected abstract Object reduceConstraintSpec();
     /**
      * caseRhs ::= ARROW exp (WHERE statements)?
      */
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
index 09fc79e0f..34f8d6a9f 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
@@ -308,7 +308,7 @@ public class SCLParserImpl extends SCLParser {
         else
             context = (ArrayList<TypeAst>)get(i++);
         Token nameToken = (Token)get(i++);
-        EVar name = new EVar(nameToken.location, nameToken.text);
+        EVar name = new EVar(nameToken);
         ArrayList<TypeAst> parameters = new ArrayList<TypeAst>();
         while(i < length()) {
             Object symbol = get(i++);
@@ -334,7 +334,7 @@ public class SCLParserImpl extends SCLParser {
         else
             context = (ArrayList<TypeAst>)get(i++);
         Token nameToken = (Token)get(i++);
-        EVar name = new EVar(nameToken.location, nameToken.text);
+        EVar name = new EVar(nameToken);
         ArrayList<TypeAst> parameters = new ArrayList<TypeAst>();
         while(i < length()) {
             Object symbol = get(i++);
@@ -424,12 +424,12 @@ public class SCLParserImpl extends SCLParser {
 
     @Override
     protected Object reduceVarId() {
-        return new EVar(((Token)get(0)).text);
+        return new EVar((Token)get(0));
     }
 
     @Override
     protected Object reduceEscapedSymbol() {
-        return new EVar(((Token)get(0)).text);
+        return new EVar((Token)get(0));
     }
 
     @Override
@@ -460,7 +460,7 @@ public class SCLParserImpl extends SCLParser {
         EVar negation = null;
         if(get(i) instanceof Token) {
             Token token = (Token)get(i++);
-            negation = new EVar(token.location, token.text);
+            negation = new EVar(token);
         }
         EBinary binary = new EBinary((Expression)get(i++), negation);
         while(i < length()) {
@@ -527,7 +527,7 @@ public class SCLParserImpl extends SCLParser {
         TypeAst[] parameters = new TypeAst[length()-idPos-1];
         for(int i=0;i<parameters.length;++i)
             parameters[i] = (TypeAst)get(i+idPos+1);
-        return new ConstructorAst(annotations, ((Token)get(idPos)).text, parameters, null);
+        return new ConstructorAst(annotations, (Token)get(idPos), parameters, null);
     }
 
     @Override
@@ -581,7 +581,7 @@ public class SCLParserImpl extends SCLParser {
 
     @Override
     protected Object reduceBlank() {
-        return new EVar("_");
+        return new EVar(((Token)get(0)).location, "_");
     }
 
     @Override
@@ -1178,7 +1178,7 @@ public class SCLParserImpl extends SCLParser {
         FieldAssignment[] fields = new FieldAssignment[length()/2-1];
         for(int i=0;i<fields.length;++i)
             fields[i] = (FieldAssignment)get(2+i*2);
-        return new ERecord((Token)get(0), fields);
+        return new ERecord(new EVar((Token)get(0)), fields);
     }
 
     @Override
@@ -1208,7 +1208,7 @@ public class SCLParserImpl extends SCLParser {
             parameters[i] = fieldDesc.type;
             fieldNames[i] = fieldDesc.name;
         }
-        return new ConstructorAst(annotations, ((Token)get(idPos)).text, parameters, fieldNames);
+        return new ConstructorAst(annotations, (Token)get(idPos), parameters, fieldNames);
     }
 
     @Override
@@ -1253,10 +1253,8 @@ public class SCLParserImpl extends SCLParser {
 
     @Override
     protected Object reduceConstraintStatement() {
-        TypeAst[] parameterTypes = new TypeAst[length()-2];
-        for(int i=0;i<parameterTypes.length;++i)
-            parameterTypes[i] = (TypeAst)get(2+i);
-        return new ConstraintStatement((Token)get(1), parameterTypes);
+        ConstructorAst constructor = (ConstructorAst)get(1);
+        return new ConstraintStatement(constructor.name, constructor.parameters, constructor.fieldNames, constructor.annotations);
     }
 
     @Override
@@ -1307,4 +1305,12 @@ public class SCLParserImpl extends SCLParser {
         return new IncludeStatement(name, value);
     }
 
+    @Override
+    protected Object reduceConstraintSpec() {
+        Expression[] expressions = new Expression[length()/2-1];
+        for(int i=0;i<expressions.length;++i)
+            expressions[i] = (Expression)get(2*i+1);
+        return expressions;
+    }
+
 }
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
index f3aa463d5..f065b765e 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
@@ -30,6 +30,8 @@ public class ModuleRegressionTests extends TestBase {
     @Test public void CHR6() { test(); }
     @Test public void CHR7() { test(); }
     @Test public void CHR8() { test(); }
+    @Test public void CHR9() { test(); }
+    @Test public void CHR10() { test(); }
     @Test public void ClosureRecursion() { test(); }
     @Test public void Collaz() { test(); }
     @Test public void Compose() { test(); }
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR10.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR10.scl
new file mode 100644
index 000000000..758074d32
--- /dev/null
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR10.scl
@@ -0,0 +1,30 @@
+module { export = [main], chr }
+import "StandardLibrary"
+
+data V = V { x :: Double, y :: Double }
+
+main = ()
+  where
+    constraint X V 
+    X V { ?x } => print ?x
+    X V { ?y } => print ?y
+    True => X V { x = 1.0, y = 2.0 }
+    True => X V { x = 3.0, y = 4.0 }
+--
+1.0
+2.0
+3.0
+4.0
+()
+--
+module { export = [main], chr }
+import "StandardLibrary"
+
+data V = V { x :: Double, y :: Double }
+
+main = ()
+  where
+    constraint X V 
+    True => X V { x = 1.0 }
+--
+9:15-9:28: Field y not defined.
\ No newline at end of file
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR5.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR5.scl
index edefae634..c59c02dbb 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR5.scl
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR5.scl
@@ -1,8 +1,4 @@
-module {
-    export = [main],
-    chr
-}
-
+module { export = [main], chr }
 import "StandardLibrary"
 
 ruleset IntegerSet where
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR6.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR6.scl
index 325af5270..f1e28d08a 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR6.scl
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR6.scl
@@ -1,8 +1,4 @@
-module {
-    export = [main],
-    chr
-}
-
+module { export = [main], chr }
 import "StandardLibrary"
 
 ruleset RS where
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR7.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR7.scl
index 6576cf47e..b10257ca8 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR7.scl
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR7.scl
@@ -1,8 +1,4 @@
-module {
-    export = [main],
-    chr
-}
-
+module { export = [main], chr }
 import "StandardLibrary"
 
 ruleset RS where
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR8.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR8.scl
index ce3064aa4..c3a88f58a 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR8.scl
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR8.scl
@@ -1,12 +1,8 @@
-module {
-    export = [main],
-    chr
-}
-
+module { export = [main], chr }
 import "StandardLibrary"
 
 main = ()
   where
     X ?x => Y ?y
 --
-10:15-10:17: New existential variables can be defined only in queries.
\ No newline at end of file
+6:15-6:17: New existential variables can be defined only in queries.
\ No newline at end of file
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR9.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR9.scl
new file mode 100644
index 000000000..07514821a
--- /dev/null
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR9.scl
@@ -0,0 +1,42 @@
+module { export = [main], chr }
+import "StandardLibrary"
+
+main = ()
+  where
+    constraint V { x :: Double, y :: Double } 
+    V { ?x } => print ?x
+    True => V { x = 1.0, y = 2.0 }
+--
+1.0
+()
+--
+module { export = [main], chr }
+import "StandardLibrary"
+
+main = ()
+  where
+    constraint V { x :: Double, y :: Double }
+    True => V { x = 1.0 }
+--
+7:13-7:26: Field y not defined.
+--
+module { export = [main], chr }
+
+import "StandardLibrary"
+
+main = ()
+  where
+    constraint V Double Double
+    True => V { x = 1.0, y = 2.0 }
+--
+8:13-8:35: Relation V does not define field names.
+--
+module { export = [main], chr }
+
+import "StandardLibrary"
+
+main = ()
+  where
+    True => V { x = 1.0, y = 2.0 }
+--
+7:13-7:35: Relation must be declared if record syntax is used.
\ No newline at end of file
-- 
2.47.0