From 00b73fe170154840ac11c2a9403c6bcd9a0e673a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hannu=20Niemist=C3=B6?= <hannu.niemisto@semantum.fi>
Date: Mon, 6 Nov 2017 10:14:39 +0200
Subject: [PATCH] (refs #7601) Wildcard syntax for SCL records

Change-Id: Ia044ce4598d0897bbd7416527707b49211aba9e3
---
 .../compiler/elaboration/chr/CHRLiteral.java  |   2 +-
 .../elaboration/expressions/ERecord.java      |  40 +++-
 .../expressions/records/FieldAssignment.java  |   2 +
 .../internal/parsing/parser/SCL.grammar       |   1 +
 .../internal/parsing/parser/SCLParser.dat     | Bin 25462 -> 25352 bytes
 .../internal/parsing/parser/SCLParser.java    | 210 +++++++++---------
 .../parsing/parser/SCLParserImpl.java         |   5 +
 .../compiler/tests/ModuleRegressionTests.java |   1 +
 .../compiler/tests/scl/RecordWildcards.scl    |  27 +++
 9 files changed, 183 insertions(+), 105 deletions(-)
 create mode 100644 tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/RecordWildcards.scl

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 e0921dc10..6bea58310 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
@@ -93,7 +93,7 @@ public class CHRLiteral extends Symbol {
                 context.getErrorLog().log(location, "Relation " + relation + " does not define field names.");
                 return;
             }
-            parameters = ERecord.translateFieldsToFunctionParameters(context, fields, fieldNames);
+            parameters = ERecord.translateFieldsToFunctionParameters(context, fields, fieldNames, true);
             if(parameters == null)
                 return;
             for(int i=0;i<parameters.length;++i) {
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 e1f444d82..a85978223 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
@@ -1,5 +1,7 @@
 package org.simantics.scl.compiler.elaboration.expressions;
 
+import java.util.Arrays;
+
 import org.simantics.scl.compiler.constants.SCLConstructor;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext.ExistentialFrame;
@@ -12,6 +14,8 @@ import gnu.trove.map.hash.THashMap;
 
 public class ERecord extends ASTExpression {
 
+    public static final boolean DEBUG = false;
+    
     public final EVar constructor;
     public final FieldAssignment[] fields;
     
@@ -51,7 +55,7 @@ public class ERecord extends ASTExpression {
             context.getErrorLog().log(constructor.location, "Value " + constructor.name + " is not a record constructor.");
             return new EError(constructor.location);
         }
-        Expression[] parameters = translateFieldsToFunctionParameters(context, fields, fieldNames);
+        Expression[] parameters = translateFieldsToFunctionParameters(context, fields, fieldNames, false);
         if(parameters == null)
             return new EError(location);
         if(asPattern)
@@ -86,12 +90,36 @@ public class ERecord extends ASTExpression {
         return result;
     }
     
-    public static Expression[] translateFieldsToFunctionParameters(TranslationContext context, FieldAssignment[] fields, String[] fieldNames) {
+    public static Expression[] translateFieldsToFunctionParameters(TranslationContext context, FieldAssignment[] fields, String[] fieldNames, boolean chrLiteral) {
+        if(DEBUG) {
+            System.out.println("translateFieldsToFunctionParameters");
+            System.out.println("    fieldNames = " + Arrays.toString(fieldNames));
+            System.out.print("    fields = {");
+            for(int i=0;i<fields.length;++i) {
+                FieldAssignment field = fields[i];
+                if(i > 0)
+                    System.out.print(", ");
+                System.out.print(field.name);
+                if(field.value != null) {
+                    System.out.print(" = ");
+                    System.out.print(field.value);
+                }
+            }
+            System.out.println("}");
+        }
+        
         THashMap<String,FieldAssignment> recordMap = new THashMap<String,FieldAssignment>(fields.length);
         boolean error = false;
+        FieldAssignment wildcardField = null;
         for(FieldAssignment field : fields) {
             if(field.value == null) {
                 String actualName = field.name;
+                if(actualName.equals(FieldAssignment.WILDCARD)) {
+                    if(wildcardField != null)
+                        context.getErrorLog().log(field.location, "The record has more than one wildcard.");
+                    wildcardField = field;
+                    continue;
+                }
                 if(actualName.charAt(0) == '?')
                     actualName = actualName.substring(1);
                 String bestMatch = null;
@@ -122,12 +150,20 @@ public class ERecord extends ASTExpression {
             FieldAssignment assignment = recordMap.remove(fieldNames[i]);
             if(assignment != null)
                 parameters[i] = assignment.value;
+            else if(wildcardField != null) {
+                String variableName = fieldNames[i];
+                if(chrLiteral)
+                    variableName = "?" + variableName;
+                parameters[i] = new EVar(wildcardField.location, variableName);
+            }
         }
         if(!recordMap.isEmpty()) {
             for(FieldAssignment field : recordMap.values())
                 context.getErrorLog().log(field.location, "Field " + field.name + " is not defined in the constructor.");
             return null;
         }
+        if(DEBUG)
+            System.out.println(" => parameters = " + Arrays.toString(parameters));
         return parameters;
     }
 
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/records/FieldAssignment.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/records/FieldAssignment.java
index af84130f8..ea220f107 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/records/FieldAssignment.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/records/FieldAssignment.java
@@ -5,6 +5,8 @@ import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.internal.parsing.Symbol;
 
 public class FieldAssignment extends Symbol {
+    public static final String WILDCARD = "..";
+    
     public String name;
     public Expression value; // null if shorthand
     
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 e17b5e70f..01a66a9ee 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
@@ -244,6 +244,7 @@ guardedExpArrow
 field
     = ID EQUALS exp                                          # Field
     | ID                                                     # FieldShorthand
+    | DOTDOT                                                 # Wildcard
     ;
 
 /******************************************************************************
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 59f0f80fc505a37d635d6d65130cf8a4c7b4ddbf..c24abdb0f00e248cb7844d94fee23ae2c4d6b63b 100644
GIT binary patch
literal 25352
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
I{ecJkKiNrC_5c6?

literal 25462
zcmcg!37lP3c|UiygzS4J0m69@LP7$BO;99>h!~M2AVO>;2?7!&%A!CdChv${sJ4}A
z7pg5#Ya5qVh+PC}e6ghzTdi1Iz_#Y4D^$UW3qBysT>t;?JLjEy?%ZUO%rM{mef#&F
z?`(H@cam$2z?sHmy^z2s-laJ0Zezv+r)*Gt5`5Fg8Z-4luYXqKnKR`n#SZYPQ(%Wr
zIK*s~>gGmpk79$&wz{8z9c`H11%EGmdo(w@6MU!ovKPP!zMbhSR3`6O3f!P|JMJ@P
z+Cubq6Kqc@vOm+-D^ezQ5?6ZJ8R<vogRt!}rVIH~&`uX}rYzN%uDhW>u5sOC!2#VX
zjG6p`&JFw3y$MEeg3Kvx&p-j6>vPDvAMp0i8q;Id4{CZ=lX^f-&s~sr10ff&=P_f(
zz%=GeAbexc&Y0cCjO_)k0^SKH?BmxfXCKDy1ioO*VM}2H9JT>?9|Xi5_LOo^(Z@~k
ze5En7b}CMLTx&3XsxxLB@j;DaopF0mZ=u#4e>XVdxwf3231c;mdt<^1U55#q;M)oP
z0pK&n%w)SO5eE<so#PARm|?N^fQ*~DTX9w|`~X?sh2VRD4;nLj19A~J{Q)?^C;4^)
z=RPM0hd=an&fSoK1mW-rfX{jX5_nioj+Z*;oBf!$8ZtO-9P`A-l*|5xZT3^rlK5vY
z^*-2nUNMK~9M^FY!=MY0(?))#F}*9}ob>L24fbBAe9~^^Y=ibW3xVrVrx$x~h1#TD
z_$IIN?V!!ccftqY`NCQm^x5}e-)~Tyg;?gzcnmu1vNnj5c({085xACIhZ(DNEX<)z
z_898SL=J77bJmy%8~2gS4_NPm8Z!$%)||xn-G1#5JN=osUhqg?=R6J$ALovHkLN0N
zwoT;uKNBYQOZp8P$1&rsh#WI@wlDV8;1+Emmwlj}`-sSP=5B(#!sA%w*-rG~@rb>M
zBh1<<OvX(=$3JZ$+Svni(9xeUyTLuMeF4NJoJt3<6W9gp2KE4X5f}&LrkMzw3Y-C)
z1Dp#y0yrOdEO0S!NdZrQd?N59;K?4@?kPa_<5b|QfM)<F08a;=1{@EZ4kRoEvJaRC
zsmuE8-|@gjK#bKK2V4L=rhrF7t^qCZDBwKckwA{=aA0o%XG5L^<U(>htUV3L@v)zi
zfgC^kNM!$rhXL8Ite|ra17z8>e866kO|4yO{?B}=c9Ho9^F8a#R<wMAc?R=!MeTg^
zOXj-TGJAwQ(jH|G&rY&a?Sk6rcA;HlkGIF#%j|{rV%ux#_O15A_FDTcdwuP++R1iH
zZAoo`onPy$&97N=jlIogHglb>(;fr7(JgX|?ECHeva`*<*)B85K2$rxoSV(FH|04z
zH|HL*qqA29IdapHEsh$c>=aUa3#qg)j@<mzUTVK#equji?y-;A-?hJEe_$Ow1cNs0
zZ`l*gd+cwA@tJ<u768-nZOu+BjBf(`TiAk~Pl}fA;`nOo-DEe}&Ia9>O++s?x{aia
zplrUc7S$*tuDhtIjnrHfWzCNi_5Q%OdXc-xyxW1M2ih!IhSIY|#R%q0J)zo~=;yd|
z%xVXk9*8JehSE)EF@pKpKB=}Qe7Re0<~h*xFmqFVXwA$i#-PG-ZJ(5y*Uxq5*2Xx{
z^gu+(GL)WXP?I`B)hGIK?zrqN4m3RwQL+rBry10=eNy!af0KI?G|=>@vZWDaEzO{&
z?USlc_%gQ)8fbb{+0uxzmS#}X_DR(zyxZ}70(ITyH07kh7A-?bX$CcIpHzLqm%63U
zK+~hjmPVAdG=rM9PpUrQcep#CfyTq0KG+t$MaeFUTG|RVZJ(5yeU0!_-Ko$()1%6k
zMwGQQgPOKasy^Xet_vDyILzxPRoOyBHBU3BY5Sz=6Yd=D1|TJ<vXw$gYMMb!+b30@
z@KYS_Qw}ses%&XQSxYmhY5Sz=6aFFhA!wlKQDsXb%37L1P1`3`pYW62$<RR4qso>>
zl(jU2nzm1>KH;ai)1ZN-N0lv&C~Ij3HEo|%eZuRm4h=Lts%&XQSxYmhY5Sz=6TXjY
z7b4^uci=S5pr-AUs!#aY?rdnF=}~1%Bg$HuK~38yRiE(JI9z8OXnIuH(ulH_W>C}i
zN!2HOg<Am)G(D<pX+&8|GpK3%r0NrXt-BT)XnIuHVuV>|)<sRFG=rM9PpUrQx4GM(
zc~p!2w0Rs)s@u#zQ7716P)=%UQI3*bALS~^Y_{*9-CgIdQ%WfwRkrA@lF|%n+P+q2
zhUgpI2KYeJqso>>l(jU2nzrxjNgY_vaAzo`6pt!f^j1k}1~sWCRDGhK?oNjWnjTfQ
zG@`7f8Pv3WKR&4gD}IHM#@}PKs7)n%6S=)vwS7}<EBL9gQv5xpx|5wpYPM-l5V_v$
zp=^E_Ear2x>X8}BQ4jW_g?WsLz$j|&aCbN<5a)zgZgba|uc2oT*&V3)w`zs|8a*WD
zny5#6kQ}`9hfLMHb&JFALZUe#_}$einV*^e4K~DFt%qbIBItn^Eg>e&7Hj4*L>{ZC
zekW%pdhqKp9{zXeAz6qBdf-J%h>7`(66>w*Rzw2LzpB^W>ej`$D7kfd(87qI2VS&<
z7;*(hQF0$}A0SoqmaE9i;I7hxc87?d2VS&<nAirR#Jbk4MI>lEtQ%}|Ys32j#@PkH
z()$AJu=e{9=Ii?cN?OOtest%#^H2{oJ*sSJL|IESs7W26>J$C-?)A_>)1%6kMwGQQ
zgPOKasy^YbbFYI2njTfQG@`7f8Pv3WQuPVPn-ggAW~E50Y(@WIInAJ^?USlc_yV`U
z{Hg;@5A&f^A6i43g*K>Z`=sg<eu29H8fbb{+0uxzmS#}X_DR(z{7iQyG|=>@vV{oq
zD?uvqG=rM9PpZDii+L)i*@OLqEosI+>s{zBgby@5s%&XQSxYmh$#{gSPxLpqH$VeT
zk1AUlQP$E7YT7=j`h;(Co1l60miLmE!M#@x+8rW-9(d6bVv21r2QgFKRMPN1R%|yF
z<AUsN(j!C!J#e(*Bb?+b4cYWc<_7~czZrb)#$XE;!~4gL{y+vJ+Pb$FEs`&-v|G5#
zx4PKjow49$!RKzEWFHE;a(9Cs=265WBItn^EzHnXLL2Tf)!mWqNce~t0|9r$_o$Ro
z_Z~eY1`$CIyl4qA#TK+xx6-XdBxrh6+0uxzmS#|sszTK#`WxLFp@F7Hl`V}ZYiR~G
zZC}U8XwetCh46u<N0lv&C~Ij3HErM5lRB`z%HgjUr0G#*OC!o!nn6wK300ry?{x2k
z2AUpKwlt!wr5V(;eLp^_1M92ZtCdoUN0lvltE4o8n$#1jKGCmt*FytMk1AUlQP$E7
zYTCXZpVWc%cy~N05Z6$N*ks43R838z%ATE2WsNrc)vueHyTo0hlu|sZY|&dKr5V(;
zeXYq1(ckRe3?FEERN2yqvX*90)AoHmsRQff?s8K6et1YdxN^#Ty35VO!BXUm9Sj*(
zWPf1BtJj_H&PP4a^r*6>5oImSpvDSH)hGH%?j&fyO#U81o0&|yFJSCo$mD7=*j~1{
zce{6^9%y=0+0uxzmS#|6Ev4!c{bF}9G|=>@vZWDaEzO{&?USlc_-oy3p@F7Hl`V}Z
zYiR~GZJ$(q!q0MNK?6;XDq9*+*3t}W+CHiJ$c@ah`9rrXo0ZMr-@M=hl7_#W1x^1V
zmTGE?vBemTBqeC8<|%tAsy+$*X8V|W@b~`zqGWcvo7F-Ze&33W-y-|_eJe3|=YgpC
zq<OyLll*;azw4&BDX0ZBa=y?P|Nc%bz@gO(+2%a`J)MoCB|8lDfP~`T`_-cKVCvN-
zpq*rVrpNz&e;ZqKphliAsJ$ZNTj}dv;jTbEkF18u)0J0K#vTgP^!@onH_@KuCWi4@
zJa1TelgKvB^1&^enbBrtCr5qX64p=aZDx!E%|xe`O(M11NC$)Y<H5F}Et#DCs5HmT
z0mZH*DrB`FjXZZJI6Mgu4dztASaRA%4%+v>4%dNNe+hgbv~G?I(#Uf+*UiOP-m0kW
zn=?kfPH52`<BmZspt&d5j9*({{p?^ba#Lw7Mx?U2S9SLm_ZHM6zCT3Nu!Fp}Z3~tn
zw~LC}P;zZHBeJ*W1E6>Y$}p!2_Sb?m^4wkOaDNbdUufNaF-Wd$3zh@p7V}jNZk)pv
zTkw_;kzH(-V!W%eRjzFdzTt8=%}ql+puv?)A?pfK<VN03Mg34EcZ53v^?(sFc{0Wb
z<&9gkkA&oAxEZJij8Ky|Ls1_|$*g8;=1+@lX6-v+(K<4+8|%hme833Vpz&qrMepz=
zH^JfFPmGYQpq$D3?r05CChw(#cHrFKZ)HB6(2(m+4ARJRH_74dN{kTi@6lE*9r*nn
z_iw$w&vv-35hG+Hbgsn~Df#()7iA}u62Y{uXR04OHT%Av9p>=dNsN#k8|9If+!D9M
zJm8iT+tu|;ZAE{S4}Sg3H<)d{6WhSbZZB#hE4x*073LEdA$ujCUuL;ks0WPjN}dnd
z+nm9Cehm20Q1KPLzgvf=P2%W)JIWn}dce^ES95rJCyoxdnQkWP0Y?Yi(e7x}1C9>3
zF>Va%0Y?Yim8_$5G%C8cOFf~ZQm@zbVtl~S0k?*Al#WJ4x7BS$J>Y19d2zI=xp{6L
z#s?f7aMRs%)B}zVxZ7Dr>48-=!#a1&Ue|+qz|jFW-r+9;#L<Bn+4M8I%;X)Y_A;=^
zs(mC8egN@1c|FhjgRKc+ASn6$l-NK!kHTJB2~D9SjXZCO!WP@mS1$)^PzYe~lPpho
ziKN*CsRIc~a6kLl;uZl%FY1ui0ox#b{U+3(uIjpA&lI!Fdj{CuR&!nh|5a^sD<8<3
z{jJu{6=pBm$(ObAEjfal^*a7mvIDKY-2O$*@_P}SBREbFTlKS1r>yYABlqW~<DUL!
z*W=&fZs~sx<y-YuzNbHL)?daVteMux&A832?RW6s6t-k!i;=pmam#j#|3$a){LQ^)
zQQ!9-9ouDEYo^_U|5hl$p|9H)=PiTaUIgd;eVe7~Ks~Rwn$65~_MySO?Y?p~05U)f
zjC%lcz&#)<R_rUvFGBfk_07GO^MQFCSTpV6L49qAPe==s6gEs9eZ{<LU+>NHpJC1V
z`h9(gW-yAAKx*P>v<5JPO)hUMzh(Pk<Zo-B{FJ`$Z9E_Ud2vy5*P~+_2xj;bk9;xC
ztFL-K76VhY5mRL_RgZ>w?SJBtZ7Z+{JFp0Th4PJf^B?9Feb^N?w=ds^^7z-FI<F|d
z8Rh%dVi8!KfMw0GtWRKBv2M>lt5)>i_jMQg+PALN%<+Fin=N!Wz?S}eido)5`8}bp
zO$@BFua2eS9#ClM<cLzQ=Q*}u6I&2|DBc(LKqEP~bhR3Y0t}E8``X{%kG{$_3q#Ja
z1#_&_8f-z+YPGf-Y?vIIo4J5K^tC;&dA{~hv8Du_-_p->E1lPTZ3qi}W$%_J=hkzu
zyxbM`Yq77`g3pFMfYXKh^~ENF2M~;@>g3sC@_V(fI<HUHF|RNBbE}EqP6Tsau?OxC
zd*Es9tC7>y&mB&e9H$G?^Q-|vz_~SO58Q)2fT@~>sT!B#tVLK~0|fgOOWoeDD|Np<
zGL|PI`&vA=P`;nn0i^8#N;jmheh-Ac@}f~aue)|JuR-Ehk@MPyfw&>Uybd(l-f~~t
z=N8IKUv<~`1ixSF=xexUNnbHAnO7_V&VVLb-|73hJpUGgF?R%=*MT}tmkg)NBRE|;
zum#tLJ)lv0Wh`M{2RN?{^%Un77P%J`_bX2A?d|Jpp8r3yBq-0hu>f_Uo}e2FVP0kO
z`@9VU;~rpNF|AFp#;MG4YGaKT_2JaUb)YW(CqITLkuV+4v%Fjexg2#Mv;t7U1+JlH
z=}V#cJl_gWgl!Z*N7BfDLYBW&UoIR3^V$si73vRZXVGxq%AeC&Xu{Us15!~}7oBBz
z013wM^SB2z*atn&KtHdNvv=#g!aaGCJQ+)W-Mb=d_C>iEj8nVLdu&7Rv0q_StM!w3
zkIlaziM$T_>%fke5G+O^+uGBN`_^LKx4wUSuMK`oRkLt?m4PjWllNGI;5u${lXui{
zLpHd+HbYwOuUVym`3;4zFt7SF<kR-<P=QRZS;;+Cu37Q=+F)>>tekF`;`0C=M_PCs
zX(DJR;|Q38{&+7?+x_TsIJa;sTCY}8U9pB5zDmaXN_-wDteEdBt`miM)jhzxFt2<b
zz^zE0UGlH`vBDqviWb{_&G**fQ3%fi+wh<hZ2kR({p$BdJvhOO_kz5^`&Ju}nJ4!x
zj7;D7)#(v81>PzvTGkcg1p-eRa^K2dYHuM}F$?0u681kS&xH98nluSC>$l^XkTv9)
zuu0<pNt@}s*2ScYpe?Fl>Z!NoX79IG@E+UP@}uS0f-S`E)?U{K@_~mnP-v@#0W=#0
z3$L#ce%zqU-lGrdNtd;7Ztc}>%Gt^+Lekf|n3U{Q)-0Gb7<(|nt_I{f^(J~zn8d;w
zgn2<k1ivhWzM`3W^f#gy^3$uSZtf<-d|6>)VB=q)=k_{xgYMVjW0=orG6vwMz9{W#
zG%+wX3C>5-zP!=Un>B20Xo@5>mWM4F{&TlW)H<P_++R?5CWN!q@7HECJm$fp<C6j9
zc>{*L@B4K!4-9UD1g9?_FtG#u`NJAAKvrC-{Kdi^=+`ya+R$L7PZpGZS-9e|ae@jU
z151WKP;a}<x!>e{i+>%<zQf;J#^8da<6{smL)@>+8@L#^lb&u%5Oid9G1ZkdMDc`e
z>FqLD8KwQHW9)l_xqZ!op?%Fl`NFfdhVn(DsfMFU=CWRL%QsbMV_d+XlM}84ehT;%
zDuC}Q6B^oo0iRFd_g5+)<F{cvWN$^>`&G$45v-nnu%w5Y#d@VW#kNb?Q7z^#^Jd@g
z?Ay>Gckuf*fQ}25i@Xt(zK?oa$c-T)b$q^H;9LPZzOG#4XYi8?-@Xy#_iYGa-c(Cy
z=Nk}vjhZ??oVW%louBq`U-Nvo=ehDS?c(=y3ea_SL8%bKns&Xt!dYeVYuJU~r-ZIg
zDlby5f7k=G584Mb`uXX4hzi<y%JY_T*^dyr`Mn>4pLfGG3i~w7v0t}tewPT)eVOO)
zQ(mOqACH>s4XEAQqpkb#g50Na55Fl?fF6D?3D9$a@-pqYUM)SJD|xWD2|Z6MFVZpm
z-ccFK=S#sq=GdqNdCa-dmPlcqym8FciMOqcxx<U4_;vt=eVijnOiAf^ObtCBNgbSj
z!7ruuq{dM73Vr3ZXP*$_0{4L(_-0hLN0qGHkI-1?L)e31U4or)9YB6xik#3{K>ReX
z{8ksgQ8f|B{l#xr;jt|FX4gFEM*@!k9u5pOdLb9Tg~htzTUb*eQzv!<`Askazk@|R
zd<%=VO31FLP0nW4R%c7iM{3h+bL}~HMRvIPOm<0jMs}`!wOwmJXa>x)S&vz3Z#BPX
zZ^(`@Q)(;i-<iL_SGWGCHW@eCDP~r78MApmGY{I&n7=ao*G4lW`|IZD>?r)j{8lsH
z-e6WC9@+4Ywa;f)Lwi?tj(y3VVoznZLbe?CV<r0^%|*1?TY)#2D=8af!;gRCmt9K<
z9%QrUs)<E<j@U;;)9iOfe|8;w7pT7P>`Z=3_}YIGv*V+K);4dBK3IHh-@4XrKLMcb
z%P~3~H|?e>`|k@G_^oW-WL`iWnYHS1YrOV6<|5}g^JBxOBf!4L?fueol_NF&-vHTD
z&_d;$$82*$%tNo2L``d(iWQ65Hp#Y4^FP^z-n-BB-dDCcDXkqfO6Gp<wO|`OYvyFc
z{JHuMe%9=lYgcAxWov8e?0<x8`!DTk73&>*<o3&|nI|+`Z0+o9$n4scwKcV?LhUpg
zt?zf-_!mVyzgIIWoZplK43!<?xYwc_B=cu+&Vwy-b9t0GYf)2a|F!MgjQ=^q+6S9$
z*2HRukd3QafJ4aM5ONQt=NR{WA^+fOhfMOy72CMq6?<>YANktF^)|RNrC>IhPX)^X
z)xJAKlN<g0ET#j>POePFmMUlMj{VNsFUI_XuWf#LSlM?DEBiNwmHqMIWXIg<om$*2
zyq=riFJ_p}M(q&h{PV-g{>rej|9V*2UmaHV-wY?)eluj7e-3jV?}Avx{oaYpw?g)z
zToui?hm#$99&4NS9eAjo$I8quYATz5-`~|C);7BiVb=aL)(hFuGE~paf5+HE$bNcQ
z+47e*ZQ&4V_YJ3Z%&lIr?6m!@nE6r6Klq-<Ts(ITdgdv5t7H>jbRNP}kCnf|v0YR8
zJ*Ktxe}>xUYU4Bie-wr{?y9pSo3Ot*FV02QThtCj&W?;x2j6r5vpW0==dX6Y4d7b<
z{sQNlo{>O)ZJWq1Tkj9~i=S@+h<pnWFuZ*TZy<_qA@~-djQrB}Xd&Nb%mB{x$hUxe
z<H0u{bAbHfH<52eipV!5d}C6De4E0zKLIV|8t`b~F~Ip1$hT}o<lEij3b+t5aS`x%
akBh+rE`iLqg?#&b5^yQ-WZ)^lQ-2OfJ)ai<

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 1a163b3b9..6852771b1 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,15 +13,15 @@ public abstract class SCLParser {
     public static final boolean TRACE = false;
 
     private static final int INITIAL_CAPACITY = 16;
-    private static final int STATE_COUNT = 362;
+    private static final int STATE_COUNT = 363;
     private static final int TERMINAL_COUNT = 86;
     private static final int NONTERMINAL_COUNT = 52;
-    private static final int PRODUCT_COUNT = 138;
+    private static final int PRODUCT_COUNT = 139;
     
     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[6832];
-    private static final int[] ERROR_TABLE = new int[973];
+    private static final short[] ACTION_TABLE = new short[6765];
+    private static final int[] ERROR_TABLE = new int[976];
     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[1953];
@@ -397,19 +397,19 @@ public abstract class SCLParser {
         return parse(0);
     }
     public Object parseCommands() {
-        return parse(346);
+        return parse(347);
     }
     public Object parseImport() {
-        return parse(354);
+        return parse(355);
     }
     public Object parseType() {
-        return parse(356);
+        return parse(357);
     }
     public Object parseExp() {
-        return parse(358);
+        return parse(359);
     }
     public Object parseEquationBlock() {
-        return parse(360);
+        return parse(361);
     }
 
 
@@ -493,192 +493,194 @@ public abstract class SCLParser {
         case 37:
             return reduceFieldShorthand();
         case 38:
-            return reduceVarId();
+            return reduceWildcard();
         case 39:
-            return reduceEscapedSymbol();
+            return reduceVarId();
         case 40:
-            return reduceTupleConstructor();
+            return reduceEscapedSymbol();
         case 41:
-            return reduceBinary();
+            return reduceTupleConstructor();
         case 42:
-            return reduceSimpleRhs();
+            return reduceBinary();
         case 43:
-            return reduceGuardedRhs();
+            return reduceSimpleRhs();
         case 44:
-            return reduceConstructor();
+            return reduceGuardedRhs();
         case 45:
-            return reduceRecordConstructor();
+            return reduceConstructor();
         case 46:
-            return reduceContext();
+            return reduceRecordConstructor();
         case 47:
-            return reduceFundeps();
+            return reduceContext();
         case 48:
-            return reduceTypeVar();
+            return reduceFundeps();
         case 49:
-            return reduceTupleType();
+            return reduceTypeVar();
         case 50:
-            return reduceListType();
+            return reduceTupleType();
         case 51:
-            return reduceListTypeConstructor();
+            return reduceListType();
         case 52:
-            return reduceTupleTypeConstructor();
+            return reduceListTypeConstructor();
         case 53:
-            return reduceLambda();
+            return reduceTupleTypeConstructor();
         case 54:
-            return reduceLambdaMatch();
+            return reduceLambda();
         case 55:
-            return reduceLet();
+            return reduceLambdaMatch();
         case 56:
-            return reduceIf();
+            return reduceLet();
         case 57:
-            return reduceMatch();
+            return reduceIf();
         case 58:
-            return reduceDo();
+            return reduceMatch();
         case 59:
-            return reduceSelect();
+            return reduceDo();
         case 60:
-            return reduceCHRSelect();
+            return reduceSelect();
         case 61:
-            return reduceEnforce();
+            return reduceCHRSelect();
         case 62:
-            return reduceVar();
+            return reduceEnforce();
         case 63:
-            return reduceHashedId();
+            return reduceVar();
         case 64:
-            return reduceBlank();
+            return reduceHashedId();
         case 65:
-            return reduceInteger();
+            return reduceBlank();
         case 66:
-            return reduceFloat();
+            return reduceInteger();
         case 67:
-            return reduceString();
+            return reduceFloat();
         case 68:
-            return reduceChar();
+            return reduceString();
         case 69:
-            return reduceTuple();
+            return reduceChar();
         case 70:
-            return reduceViewPattern();
+            return reduceTuple();
         case 71:
-            return reduceRightSection();
+            return reduceViewPattern();
         case 72:
-            return reduceLeftSection();
+            return reduceRightSection();
         case 73:
-            return reduceListLiteral();
+            return reduceLeftSection();
         case 74:
-            return reduceRange();
+            return reduceListLiteral();
         case 75:
-            return reduceListComprehension();
+            return reduceRange();
         case 76:
-            return reduceAs();
+            return reduceListComprehension();
         case 77:
-            return reduceRecord();
+            return reduceAs();
         case 78:
-            return reduceTransformation();
+            return reduceRecord();
         case 79:
-            return reduceEq();
+            return reduceTransformation();
         case 80:
-            return reduceRuleDeclarations();
+            return reduceEq();
         case 81:
-            return reduceStatements();
+            return reduceRuleDeclarations();
         case 82:
-            return reduceImportShowing();
+            return reduceStatements();
         case 83:
-            return reduceImportHiding();
+            return reduceImportShowing();
         case 84:
-            return reduceImportValueItem();
+            return reduceImportHiding();
         case 85:
-            return reduceFieldDescription();
+            return reduceImportValueItem();
         case 86:
-            return reduceGuardedExpEq();
+            return reduceFieldDescription();
         case 87:
-            return reduceFundep();
+            return reduceGuardedExpEq();
         case 88:
-            return reduceQueryRuleDeclaration();
+            return reduceFundep();
         case 89:
-            return reduceAnnotation();
+            return reduceQueryRuleDeclaration();
         case 90:
-            return reduceGuardQuery();
+            return reduceAnnotation();
         case 91:
-            return reduceEqualsQuery();
+            return reduceGuardQuery();
         case 92:
-            return reduceBindQuery();
+            return reduceEqualsQuery();
         case 93:
-            return reduceCompositeQuery();
+            return reduceBindQuery();
         case 94:
-            return reduceApply();
+            return reduceCompositeQuery();
         case 95:
-            return reduceSymbol();
+            return reduceApply();
         case 96:
-            return reduceEscapedId();
+            return reduceSymbol();
         case 97:
-            return reduceMinus();
+            return reduceEscapedId();
         case 98:
-            return reduceLess();
+            return reduceMinus();
         case 99:
-            return reduceGreater();
+            return reduceLess();
         case 100:
-            return reduceDot();
+            return reduceGreater();
         case 101:
-            return reduceFieldAccess();
+            return reduceDot();
         case 102:
-            return reduceIdAccessor();
+            return reduceFieldAccess();
         case 103:
-            return reduceStringAccessor();
+            return reduceIdAccessor();
         case 104:
-            return reduceExpAccessor();
+            return reduceStringAccessor();
         case 105:
-            return reduceCase();
+            return reduceExpAccessor();
         case 106:
-            return reduceQueryBlock();
+            return reduceCase();
         case 107:
-            return reduceVerboseCHRConjunction();
+            return reduceQueryBlock();
         case 108:
-            return reduceStringLiteral();
+            return reduceVerboseCHRConjunction();
         case 109:
-            return reduceSymbol();
+            return reduceStringLiteral();
         case 110:
-            return reduceEscapedId();
+            return reduceSymbol();
         case 111:
-            return reduceLess();
+            return reduceEscapedId();
         case 112:
-            return reduceGreater();
+            return reduceLess();
         case 113:
-            return reduceDot();
+            return reduceGreater();
         case 114:
-            return reduceGuardQualifier();
+            return reduceDot();
         case 115:
-            return reduceLetQualifier();
+            return reduceGuardQualifier();
         case 116:
-            return reduceBindQualifier();
+            return reduceLetQualifier();
         case 117:
-            return reduceThenQualifier();
+            return reduceBindQualifier();
         case 118:
-            return reduceCHRConjunction();
+            return reduceThenQualifier();
         case 119:
-            return reduceCHRAtom();
+            return reduceCHRConjunction();
         case 120:
-            return reduceCHREquals();
+            return reduceCHRAtom();
         case 121:
-            return reduceCHRBinds();
+            return reduceCHREquals();
         case 122:
-            return reduceSimpleCaseRhs();
+            return reduceCHRBinds();
         case 123:
-            return reduceGuardedCaseRhs();
+            return reduceSimpleCaseRhs();
         case 124:
-            return reduceGuardedExpArrow();
+            return reduceGuardedCaseRhs();
         case 125:
-            return reduceGuardEquation();
+            return reduceGuardedExpArrow();
         case 126:
-            return reduceBasicEquation();
+            return reduceGuardEquation();
         case 127:
-            return reduceEffect();
+            return reduceBasicEquation();
         case 128:
-            return reduceJustEtype();
+            return reduceEffect();
         case 129:
-            return reduceForAll();
+            return reduceJustEtype();
         case 130:
-            return reduceApplyType();
+            return reduceForAll();
         case 131:
+            return reduceApplyType();
+        case 132:
             return reduceDummy();
 
         default:
@@ -851,6 +853,10 @@ public abstract class SCLParser {
      * field ::= ID
      */
     protected abstract Object reduceFieldShorthand();
+    /**
+     * field ::= DOTDOT
+     */
+    protected abstract Object reduceWildcard();
     /**
      * var ::= ID
      */
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 a29368c2a..7cf1fb754 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
@@ -1347,4 +1347,9 @@ public class SCLParserImpl extends SCLParser {
         return new CHRStatement((CHRAstQuery)get(0), (CHRAstQuery)get(2));
     }
 
+    @Override
+    protected Object reduceWildcard() {
+        return new FieldAssignment(FieldAssignment.WILDCARD, null);
+    }
+
 }
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 6e11e24a4..e6eb2b5af 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
@@ -217,6 +217,7 @@ public class ModuleRegressionTests extends TestBase {
     @Test public void Record2() { test(); }
     @Test public void Record3() { test(); }
     @Test public void RecordShorthand() { test(); }
+    @Test public void RecordWildcards() { test(); }
     @Test public void RecursionBug() { test(); }
     @Test public void RecursiveContext() { test(); }
     @Test public void RecursiveValues2() { test(); }
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/RecordWildcards.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/RecordWildcards.scl
new file mode 100644
index 000000000..2ff5245b6
--- /dev/null
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/RecordWildcards.scl
@@ -0,0 +1,27 @@
+import "Prelude"
+
+data XYZ = XYZ { x :: Double, y :: Double, z :: Double }
+deriving instance Show XYZ
+
+updateX x' XYZ {..} = XYZ {x', ..} 
+
+main = print $ updateX 5 $ XYZ { x = 4, y = 3, .. }
+  where
+    z = 2
+-- 
+XYZ 5.0 3.0 2.0
+()
+--
+import "Prelude"
+
+main = ()
+  where
+    constraint R { a :: Integer, b :: Integer, label :: String }
+    
+    -R { a = 0, ..   } => print "Final: b = \(?b), label = \(?label)"
+    -R { ?a,  ?b, .. } => R { a=?a-1, b=?b+1, .. }
+    
+    True => R { a = 5, b = 5, label = "My label" } 
+--
+Final: b = 10, label = My label
+()
\ No newline at end of file
-- 
2.43.2