From d9a283acefae11c2cc094ed1c7b74759f8166f17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hannu=20Niemist=C3=B6?= Date: Fri, 21 Jul 2017 14:06:25 +0300 Subject: [PATCH] (refs #7377) Refactoring CHR query parsing Change-Id: Ia0e2e4589180505c02fabeb5b1dd2267825e3255 --- .../scl/compiler/elaboration/chr/CHRRule.java | 4 + .../elaboration/chr/ast/CHRAstAtom.java | 143 ++++++++++++++++++ .../elaboration/chr/ast/CHRAstBinds.java | 29 ++++ .../chr/ast/CHRAstConjunction.java | 40 +++++ .../elaboration/chr/ast/CHRAstEquals.java | 29 ++++ .../elaboration/chr/ast/CHRAstNegation.java | 24 +++ .../elaboration/chr/ast/CHRAstQuery.java | 28 ++++ .../chr/ast/CHRAstQueryVisitor.java | 9 ++ .../chr/translation/CHRTranslation.java | 6 +- .../elaboration/expressions/EBlock.java | 7 +- .../expressions/EPreCHRSelect.java | 11 +- .../elaboration/expressions/Expression.java | 2 +- .../StandardExpressionTransformer.java | 43 +++++- .../StandardExpressionVisitor.java | 44 +++++- .../expressions/block/CHRStatement.java | 15 +- .../internal/parsing/parser/SCL.grammar | 13 +- .../internal/parsing/parser/SCLParser.dat | Bin 24560 -> 25414 bytes .../internal/parsing/parser/SCLParser.java | 71 +++++---- .../parsing/parser/SCLParserImpl.java | 74 +++++---- .../generator/table/ParseTableBuilder.java | 4 +- .../simantics/scl/compiler/tests/scl/CHR3.scl | 3 +- 21 files changed, 504 insertions(+), 95 deletions(-) create mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstAtom.java create mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstBinds.java create mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstConjunction.java create mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstEquals.java create mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstNegation.java create mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstQuery.java create mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstQueryVisitor.java diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRule.java index f714497c4..c668005d7 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRule.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRule.java @@ -45,6 +45,10 @@ public class CHRRule extends Symbol { this.body = body; this.existentialVariables = existentialVariables; } + + public CHRRule(long location, CHRQuery head, CHRQuery body) { + this(location, head, body, null); + } public void resolve(TranslationContext context) { context.pushExistentialFrame(); diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstAtom.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstAtom.java new file mode 100644 index 000000000..031d8edd8 --- /dev/null +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstAtom.java @@ -0,0 +1,143 @@ +package org.simantics.scl.compiler.elaboration.chr.ast; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; + +import org.simantics.scl.compiler.common.names.Name; +import org.simantics.scl.compiler.elaboration.chr.CHRLiteral; +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.TranslationContext; +import org.simantics.scl.compiler.elaboration.expressions.EApply; +import org.simantics.scl.compiler.elaboration.expressions.EBinary; +import org.simantics.scl.compiler.elaboration.expressions.EConstant; +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.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.types.Types; + +public class CHRAstAtom extends CHRAstQuery { + public Expression expression; + public boolean remove; + + public CHRAstAtom(Expression expression, boolean remove) { + this.expression = expression; + this.remove = remove; + } + + @Override + public void accept(CHRAstQueryVisitor visitor) { + visitor.visit(this); + } + + public static CHRAstQuery atom(Expression expression) { + boolean remove = false; + if(expression instanceof EVar) { + EVar var = (EVar)expression; + if(var.name.equals("True")) { + CHRAstConjunction query = new CHRAstConjunction(Collections.emptyList()); + query.location = expression.location; + return query; + } + } + else if(expression instanceof EBinary) { + EBinary binary = (EBinary)expression; + if(binary.negation != null && binary.rights.isEmpty()) { + remove = true; + expression = binary.left; + } + // If query is marked for removal, it must be an atom + } + else if(expression instanceof EApply) { + EApply apply = (EApply)expression; + if(apply.function instanceof EVar && ((EVar)apply.function).name.equals("not")) { + Expression subExpression; + if(apply.parameters.length == 1) + subExpression = apply.parameters[0]; + else + subExpression = new EApply( + Locations.combine(apply.parameters[0].location, apply.parameters[apply.parameters.length-1].location), + apply.parameters[0], + Arrays.copyOfRange(apply.parameters, 1, apply.parameters.length)); + CHRAstNegation query = new CHRAstNegation(atom(subExpression)); + query.location = expression.location; + return query; + } + else if(apply.function instanceof EConstant) { + Name valueName = ((EConstant)apply.function).getValue().getName(); + if(valueName.module.equals(Types.BUILTIN) && valueName.name.startsWith("(")) { + CHRAstQuery[] conjuncts = new CHRAstQuery[apply.parameters.length]; + for(int i=0;i literals) { + literals.add( + isConstraint(context, expression) ? + convertConstraint(remove, expression) : + convertExpression(isHead, expression)); + } + + private static boolean isConstraint(TranslationContext context, Expression expression) { + 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; + if(TranslationContext.isConstructorName(name)) + return true; + try { + return Environments.getRelation(context.getEnvironment(), name) != null; + } catch (AmbiguousNameException e) { + return true; + } + } + + private static CHRLiteral convertExpression(boolean isHead, Expression expression) { + if(isHead) + return new CHRLiteral(expression.location, SpecialCHRRelation.CHECK, new Expression[] {expression}, false, false); + else + return new CHRLiteral(expression.location, SpecialCHRRelation.EXECUTE, new Expression[] {expression}, false, false); + } + + private static CHRLiteral convertConstraint(boolean remove, Expression expression) { + long location = expression.location; + Expression[] parameters; + FieldAssignment[] fields = null; + if(expression instanceof EApply) { + EApply apply = (EApply)expression; + parameters = apply.parameters; + expression = apply.function; + } + 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, false); + literal.fields = fields; + return literal; + } +} diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstBinds.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstBinds.java new file mode 100644 index 000000000..aa78f4e98 --- /dev/null +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstBinds.java @@ -0,0 +1,29 @@ +package org.simantics.scl.compiler.elaboration.chr.ast; + +import java.util.ArrayList; + +import org.simantics.scl.compiler.elaboration.chr.CHRLiteral; +import org.simantics.scl.compiler.elaboration.chr.relations.SpecialCHRRelation; +import org.simantics.scl.compiler.elaboration.contexts.TranslationContext; +import org.simantics.scl.compiler.elaboration.expressions.Expression; + +public class CHRAstBinds extends CHRAstQuery { + public Expression left; + public Expression right; + + public CHRAstBinds(Expression left, Expression right) { + this.left = left; + this.right = right; + } + + @Override + public void accept(CHRAstQueryVisitor visitor) { + visitor.visit(this); + } + + @Override + protected void translate(TranslationContext context, boolean isHead, ArrayList literals) { + literals.add(new CHRLiteral(location, SpecialCHRRelation.MEMBER, + new Expression[] { left, right }, false, false)); + } +} diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstConjunction.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstConjunction.java new file mode 100644 index 000000000..48f8ae71f --- /dev/null +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstConjunction.java @@ -0,0 +1,40 @@ +package org.simantics.scl.compiler.elaboration.chr.ast; + +import java.util.ArrayList; +import java.util.List; + +import org.simantics.scl.compiler.elaboration.chr.CHRLiteral; +import org.simantics.scl.compiler.elaboration.contexts.TranslationContext; + +public class CHRAstConjunction extends CHRAstQuery { + public List conjuncts; + + public CHRAstConjunction(List conjuncts) { + this.conjuncts = conjuncts; + } + + @Override + public void accept(CHRAstQueryVisitor visitor) { + visitor.visit(this); + } + + public static CHRAstQuery conjunction(CHRAstQuery[] conjuncts) { + ArrayList result = new ArrayList(conjuncts.length); + for(CHRAstQuery conjunct : conjuncts) { + if(conjunct instanceof CHRAstConjunction) + result.addAll(((CHRAstConjunction)conjunct).conjuncts); + else + result.add(conjunct); + } + if(result.size() == 1) + return result.get(0); + else + return new CHRAstConjunction(result); + } + + @Override + protected void translate(TranslationContext context, boolean isHead, ArrayList literals) { + for(CHRAstQuery conjunct : conjuncts) + conjunct.translate(context, isHead, literals); + } +} diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstEquals.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstEquals.java new file mode 100644 index 000000000..d2828934f --- /dev/null +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstEquals.java @@ -0,0 +1,29 @@ +package org.simantics.scl.compiler.elaboration.chr.ast; + +import java.util.ArrayList; + +import org.simantics.scl.compiler.elaboration.chr.CHRLiteral; +import org.simantics.scl.compiler.elaboration.chr.relations.SpecialCHRRelation; +import org.simantics.scl.compiler.elaboration.contexts.TranslationContext; +import org.simantics.scl.compiler.elaboration.expressions.Expression; + +public class CHRAstEquals extends CHRAstQuery { + public Expression left; + public Expression right; + + public CHRAstEquals(Expression left, Expression right) { + this.left = left; + this.right = right; + } + + @Override + public void accept(CHRAstQueryVisitor visitor) { + visitor.visit(this); + } + + @Override + protected void translate(TranslationContext context, boolean isHead, ArrayList literals) { + literals.add(new CHRLiteral(location, SpecialCHRRelation.EQUALS, + new Expression[] { left, right }, false, false)); + } +} diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstNegation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstNegation.java new file mode 100644 index 000000000..b97f1e7f7 --- /dev/null +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstNegation.java @@ -0,0 +1,24 @@ +package org.simantics.scl.compiler.elaboration.chr.ast; + +import java.util.ArrayList; + +import org.simantics.scl.compiler.elaboration.chr.CHRLiteral; +import org.simantics.scl.compiler.elaboration.contexts.TranslationContext; + +public class CHRAstNegation extends CHRAstQuery { + public CHRAstQuery subquery; + + public CHRAstNegation(CHRAstQuery subquery) { + this.subquery = subquery; + } + + @Override + public void accept(CHRAstQueryVisitor visitor) { + visitor.visit(this); + } + + @Override + protected void translate(TranslationContext context, boolean isHead, ArrayList literals) { + context.getCompilationContext().errorLog.log(location, "CHR negation is not yet supported."); + } +} diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstQuery.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstQuery.java new file mode 100644 index 000000000..bd708e690 --- /dev/null +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstQuery.java @@ -0,0 +1,28 @@ +package org.simantics.scl.compiler.elaboration.chr.ast; + +import java.util.ArrayList; + +import org.simantics.scl.compiler.elaboration.chr.CHRLiteral; +import org.simantics.scl.compiler.elaboration.chr.CHRQuery; +import org.simantics.scl.compiler.elaboration.contexts.TranslationContext; +import org.simantics.scl.compiler.internal.parsing.Symbol; + +public abstract class CHRAstQuery extends Symbol { + public CHRQuery translateAsHead(TranslationContext context) { + return translate(context, true); + } + + public CHRQuery translateAsBody(TranslationContext context) { + return translate(context, false); + } + + private CHRQuery translate(TranslationContext context, boolean isHead) { + ArrayList literals = new ArrayList(); + translate(context, isHead, literals); + return new CHRQuery(literals.toArray(new CHRLiteral[literals.size()])); + } + + protected abstract void translate(TranslationContext context, boolean isHead, ArrayList literals); + + public abstract void accept(CHRAstQueryVisitor visitor); +} diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstQueryVisitor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstQueryVisitor.java new file mode 100644 index 000000000..3c7b42525 --- /dev/null +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/ast/CHRAstQueryVisitor.java @@ -0,0 +1,9 @@ +package org.simantics.scl.compiler.elaboration.chr.ast; + +public interface CHRAstQueryVisitor { + void visit(CHRAstAtom query); + void visit(CHRAstBinds query); + void visit(CHRAstConjunction query); + void visit(CHRAstEquals query); + void visit(CHRAstNegation query); +} 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 d4f21a726..260927b74 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 @@ -5,7 +5,6 @@ import java.util.Arrays; import org.simantics.scl.compiler.elaboration.chr.CHRLiteral; import org.simantics.scl.compiler.elaboration.chr.CHRQuery; -import org.simantics.scl.compiler.elaboration.chr.CHRRule; import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint; import org.simantics.scl.compiler.elaboration.chr.relations.SpecialCHRRelation; import org.simantics.scl.compiler.elaboration.chr.relations.UnresolvedCHRRelation; @@ -15,7 +14,6 @@ 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; import org.simantics.scl.compiler.elaboration.expressions.block.ConstraintStatement; import org.simantics.scl.compiler.elaboration.expressions.list.ListAssignment; import org.simantics.scl.compiler.elaboration.expressions.list.ListGenerator; @@ -140,12 +138,12 @@ public class CHRTranslation { return new CHRQuery(query.toArray(new CHRLiteral[query.size()])); } - public static CHRRule convertCHRStatement(TranslationContext context, CHRStatement statement) { + /*public static CHRRule convertCHRStatement(TranslationContext context, CHRStatement statement) { return new CHRRule(statement.location, convertCHRQuery(context, true, statement.head), convertCHRQuery(context, false, statement.body), null); - } + }*/ public static CHRConstraint convertConstraintStatement(TranslationContext context, ConstraintStatement statement) { CHRConstraint constraint = new CHRConstraint(statement.location, statement.name.text, TypeAst.toTypes(context, statement.parameterTypes)); diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBlock.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBlock.java index 2c70bd907..e184b1397 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBlock.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBlock.java @@ -3,6 +3,7 @@ package org.simantics.scl.compiler.elaboration.expressions; import java.util.ArrayList; import java.util.List; +import org.simantics.scl.compiler.elaboration.chr.CHRRule; import org.simantics.scl.compiler.elaboration.chr.CHRRuleset; import org.simantics.scl.compiler.elaboration.chr.translation.CHRTranslation; import org.simantics.scl.compiler.elaboration.contexts.TranslationContext; @@ -92,8 +93,10 @@ public class EBlock extends ASTExpression { ruleset.location = Locations.combine(statements.get(begin).location, statements.get(end-1).location); for(int i=begin;i result = new THashSet(); collectFreeVariables(result); return result; - } + } public static Expression[] concat(Expression[] a, Expression[] b) { if(a.length == 0) diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionTransformer.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionTransformer.java index 948f7c645..c489422a5 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionTransformer.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionTransformer.java @@ -4,6 +4,13 @@ import org.simantics.scl.compiler.elaboration.chr.CHRLiteral; import org.simantics.scl.compiler.elaboration.chr.CHRQuery; import org.simantics.scl.compiler.elaboration.chr.CHRRule; import org.simantics.scl.compiler.elaboration.chr.CHRRuleset; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstAtom; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstBinds; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstConjunction; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstEquals; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstNegation; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstQuery; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstQueryVisitor; import org.simantics.scl.compiler.elaboration.equation.EqBasic; import org.simantics.scl.compiler.elaboration.equation.EqGuard; import org.simantics.scl.compiler.elaboration.equation.Equation; @@ -41,7 +48,7 @@ import org.simantics.scl.compiler.elaboration.query.pre.QPreGuard; public class StandardExpressionTransformer implements ExpressionTransformer, QueryTransformer, ListQualifierTransformer, StatementVisitor, -EquationVisitor { +EquationVisitor, CHRAstQueryVisitor { @Override public Expression transform(EAmbiguous expression) { @@ -532,10 +539,36 @@ EquationVisitor { @Override public void visit(CHRStatement statement) { - for(int i=0;iw@snM-UjeS_;vFMusxowk^p{G63wolNo zL#gp?(Cv3ESWC3s5|FGGe*EJ~jnGcN-?h%pjt465$K2%Ejz56$B1UpIum?D(RKp_4 z*|164_Ia?~2K^2J$JM@GK)wNEX4^=t1dQ}GVoW?9+jl_O<7+~!Ciphp2keDzi&D+4 zXhF>#N{u@x3m}BBvSx5GqplixL8Smt~B|rBbj*;hxai+n~o;T`A`*B z$=w*k-he4PlqJr;r7hCO<7l6UI0pcO9*ogmQ(|S~d;6%R&;T?7O+Yg+0%!q70;7O2 zz<6LHFb$XvoCM4UP6HMI3o|$!{29O^V6g+^o&~f4=K$vc=K`aFCBWGL7bx?P&IB+A zHs=Ji91q7gAHZ>{Q-Qg_9N-j(S!fG@24(^?fRh0p&xyd)45ome4DclKSeT<7;IVOx z;{c9_<0Ci^lurOSt^}ZtGUv}zlC-B4eMK_9aHaYm_4UH#>YM6WZPcBJJWsuVF|R3H ztbSeHTv)D8(kJVg`o!c+Jzk$)I7gqU7wI|rYJI7`Os~>Y^*i*(^^N*HdW)J?SW;N5 zw-*-b*@d}<#=>lMoqktA>qIA}(KPCB16$2}Ghg4XKawm{|5`Xnjn&`NP3od#hMAwH z`onr#>L^jkxtN>QmIK`T_M7{SEz~{<3~i8|h0^ zH5d4xp09W4Kk&z=`Vi-IAU?i3!|^2x3Zv1#9hmL1+^^r2riJx5zHw%pdN1nD$(S@X zo6Y7>BiGL;i-vtHNpmcFeQ1+2#D{h+-@~3Wmz&G=6xMN3(_?uck}8_Zk;}p6Ms&$+ zE;1LXwXEX;`x?#B%c{{_M1O(JhgdG(3bR7ZFsS1K+ZxT$%j$Zwg8l-V53$%nbD_B~ zxr%jMq$k!Ltwi4dpT(w2&8g8}gDSx%pml|0XQ0g^?(ku9`Mrb%jYENVrp6WRA3P0M%zA&cdV!ETAFhVpbZCUr&n z281k@`I_mXN8f;u#d0T_6VXR}m@-@aCH;5!ZTvm;1N`Fs zp=d*`3V{!tULW}WoVr185Ush{+>9KkPz$u zu=#8j%bjP=Lm%q6bT_TVvG6`eFH)k%i*aHee=WfAD;t7 zC!BpQ#PeT}j>IvZAUyw3WAlBO>(aw%)~nrEpPyGH%Gy0sne|eVS+K`y^m6}}UScDh z*a~mnZTnEG&sTeIP_K|z2WJ@J|r`*M(RA z?RC^jv0fX4?De4)9|Idt>~q@0B=DUhaJmiZx4dO&%?2sd7+k$x?%#?JZ9LJ&X~&!K z@CEpM?{uA>%eJOd3U#KFs8_^`HlAoHyjfrtz?b-7wfB0p-|lDs5p?LkUW)o>@AZ#dP0!`G^bH7E z0@vT~aQXUM$C{9fc|#V0*oe5`6Znl{%!7^}Wixl+_u!V(}`?ul~NAZ$*r+FuQiK~5Vb1OOOvSe;`g|@J$%3fb> z#Y>_%{%S9o+s*Cp1=Lfn?{@RPY#z^>_er5l3orL?#Uqa5C9~43gfHs2Pz$u2w5yQ&)|2UK^>PoU2IWbqHjRRV!1b%H=qx7T=I0W zMSY3B0U?X!ZZWr@4|QDfbg@N!iM|0Li{-ZQy7Lf?ZecqxN=`qVJ^tp`EdAyRa|QCD zj!T{{wx}=BH-LF)>+)SoC{UN5csY%GhE;EJnHYJ~4I?=|m5 ze$;Wv)5R9`CHe+16Ky42p1& zCV37sf%kw%L+XO+-#5=RXX03ZJeda5fOGekz@t8jI>U3vzBSX$bR6G11QK7JckJ`{h~^Y?3UUElpK2NP z3cLG}NGy+J<@?ozo-(xi+ofTEH__f;kn^ zpYq(XZ_Skk_XmruKDz#zS|Gfs>U`hPwHou4PiCaSj&1QFZ;`A@R^xa9Q`Pytp|+;o zv?DH{sykNFR2x+-t{ZuaH`&KPcZoHLIg6$ zbH5&IaCapFh5LKZ<#R`Sf5$HY|9fJFnSp#jpyZfcZ6RiLK35y=BS0YawZIRKQ+4;V zAs;Y2WUgZ#sfQz@ zX)!Ix2MiCHsRq9ciQyr0E%Qh{92r%w!MiPDc*smJ6Oa!W9x~T3kJQ7F(cEe7L_T16 z$P^5oo{8Zh^B(4rdN?wgkJ@~;KDvDB{YPh)Z)GN$i8wxBcu0MldDLGIPc|IcD1&$P z#PE>O25(!4;h~Aig!3BIxZTKB0lJyBmldce=tFZT?Ll1zNVJ5a#KuW!7q~J-62tf? z5|crMBhy!8&5$MMZ$naPsch?KQ17%HszXK3q3vdZl2h2wR+1p)w9>N^*~^EVfo&?@ zJWY4Be)0Y`wfzO?5BTACf4Z|zwd{r){_XMhzP?tqyayf!pG&(-X`)(sFj&=FMy~xl zH}>GlV7iMvW&C%6#&Eb$`U5SI7uvdOL8{b4rQM%uYemT22>D!3TEr;(dJs}Qfw8NZ zT{w(8n!0+fX;(&#?C#q4B)$1#y<9Bf?=-u?z1~pj?e5;wkwhn;yHvvXpQCvK*qK0O z$4MnZmJqV*s(nwYRd>F)LAR-7^Tl0L)%@;fH#Rk>-be0P)uEb~&3|dVd8o8?R~!CU zUW(DCchVc9{P9y?)2iWt%Ik|d5VTTEi+yRi8lE;q9yh8KlLRWIkKEIlB4jT@c0jwk zlJ-7d;z{@9768ISgV7fIdfUI9rXw){PhtYn-rjv_Pd8_?ulw1}7dPPlE8eqeV-rF? zf{<$KuK6!j=Tw$c-&0sH4G;AFcu|K|Y5LsjqPBx8BT#9>nqrz@0;XaDkhF_K>BLwO z@*ae2M#%LzODh^ez6aKJT1urfZK?2(5`~aE{hW5CPgH){q-Od!_Tq30sR-q6tbhtG)b5uN zzhy;ln(paG_j%1Jm)sh?9U{g<%x zp*`r|(bUZ8AVe+a>^pW((l32?=8RP zEp1z5{fuR$Di+gp99CP33Bb}%JCeQA3`pFY!0rCi9N62G;vNJ@^kvCo6~YR zO&cpkBsHee+nctj;tz_r_J85$lxHJ#bGp4RZB;9tN63Q+`4~bfgxrOt--o5IF{hvB zoTkrxm-ACXob<&FYf^;U-i}F-n|Md+qhu)~2$>?}6DbxIw{OxKz+e06p|0>7y|2{CemN`T zK(a*(i_MRxsf^7JutcE|n;+*iO>cdMO37loqiY}A$$V@l56xNjsWv~SJv}|UGW#i_ zrPxS8Za>9oN>#BNhjE~dn;({b9}c|Y=M<+YRVz4RyH1}+JIRj!LD^5S^sx@FD&sUY zA!M0bw575%ew}t>PK!8NYOzJ9{@RCX8Fidyf9+SW`9Z|UNb6Q$JjEY@L;IqQz=c{R zX9gML>chx;)7R_>orTG#_Q6?Cr^-m8;V}Y1e7kPwfIgtTLT=oH^@MZldTz9ENoF{YrH|#X9W?>$Jkm z;dc`K+ywA!VCkm@7b+$O*QpRfruZpQ=6(uIC$*W=lt%k07J%KNyVLzJaKLoQAZ$l)3L0d5@}+&6&MNVHhvjURiFXs%2Vop>4?2 zby!{RPwhH=k@qOoqNohChBHum=^Hb147{~XT{)%{e~>5uw))BU&(+&CT#{%PulX;m`V zFhx{y=wbV%hUcuiOwJC+a;)5a-%TGBAnd0__qbc#PZjP)DxYT7sB7h#Zu^}S>S*WT zWwxa2fct@OQ2_l!8e9AL2k}W1d{ZUiH(eYh?|^)p2+8NXwoZG8(=(4J=3_3z_QV{d zY#z~M>WqCxE9`QoapO*Y2pN3C8KQ5v%=M#b*bIEq>AxEEwOqsZGa47a;f0`UrD>mQd!)_Q&HSE^^K0fehCt0% zyY@rU+I39*XPxZMh0WvFx9hTNgSNYzg8beL-!1$IeitZ1Bl!Iz(1=T=t*uAgBAO9j zsp)a+cEs~FdWbFjhEXl~Yo=BYxrN_Fa^(4z3%#bM^>gj*H`erf{auc!v5&0%^%W^| zgp8g279C7Rd?L2v{9AlI*84S4qsConZsM1C<;QA*mgQ59W`>uO)w8 zyqOA2Gkhp< zIZ=Hkxgt3)xlq4BuhVy^ih3y-q1Ndx^+)=)h_v(_O%A>L&7v54~xE`)6_^Iq~MmMY0+@a@hWpmBjnj(4X9lzDq=A?tJeA zcjjvD&joM(bWkfruJ7&oCHFsOyfZ%^=&jx!`jE|yJo2^=zD|RmOX{FLL@Ay%YE+Il z^`7+0>i?Dd_drKCa_{L|^=9GpV&u=AbJvgKR=0UCwhGT6o+P)*Ib&iW=i6Je)n)Zx z$z`s$?iq9acFu*DTAdc8oLSq+wdO7Q=T-|b`ahTcfzO)$PT{)b{A69BQ~#Uy)_+sY zcBC`*9kEnD7H>+yJ2|3v;kv>#h3kFp*c*`!d))YD8?W!R^zzp?c~3|3_IAjF)ly69 zkuc}AeVFfe23`L%cBGN(ThyO=|ABj}cdI`ckoO;YYqsjzAPpk-#vyrc8j3e&?LO~6 zh>^d~`|^Be_jAz?akYHlu&d=m$1`_!}?y!I!g^m4sJ6J>2dP=3G5Dh}H7%A)ogSnj@aE z{|vT+@P2+s-uA7%L>NTw%saP%dxvr7pRr`g;m(-)zu-T#+{xJ?($R4WZz4SnJh!$l zVpW|dizBTT{c>Sc(kj^pp4*R_ZQfOqj6U3)XT6gtS?Or_U7A@~-d7W{hlaDi_#_$Gv3? zk8eEq=EJ`onGT+BMY7qtX>0n;|@55eoku2Y_L(mlw57}0xx-vE|GTIOkP=AHB- zk%`-&Lw`b_CXYk^foyO2xToI}X>9?X1iS@4PlIk%f7-P^iJa(r+ce<$!1niU!b`-H|%Ts8l|Y+e1`tl<^c26{t4g@lCgKZA@S+B4Ls+9fOsAE={U)cTA{k` z&7iPx6#9^(<0;t8P`gp@2mKcCcOsof0Ivdm3iz1F=nnNCy&U`<>OcA`J`M=ujsAtw zF*8M`U#>X$E{(@_uK$<|MP^>1`-J`BesTRoZqlw-M5gq^?gPM`z!z1|xfr_`h_xL1 z8Q|mU%f55n#`UNj_r|z85$6)n`;qHopuZHEHUYTNxa!&Zk_8>*{o` zho9R|u%G%47(wQIF~^igFh5uyH&)Em^hdFN$Td9&igCL01p9(($9&VUu3RHt=Ug+M zPg8em8}sp6=JiTj>WRG8r+yxNM!!P8*^jA5C+Olp=J=@R{&aoAnZomkdX9<6I5T79 zddA~+rJPq@3jw>&Mn3?&P8?v|Y~xrtX70&wUh;Yj!1xYeS4Szd09%1PAKQVvW=8?J zme{X?@ymGNB;Zsau2VS(cnEL~@Ce|d6mmZ=0UinDIuIH6DBuJj=0c7G^15Lz>?b(} z$o$MfSPJAd&b-WrHF14f2)Y0`A2<&<7l{4s@GwxUu^1rt+@V11H5m=WH7DIEoB@71 z5a+GyJL69Va$FqqL?HXhJ`u-yWGwcJ{iZGga{dBD(fGJ(4v)s=E|CA0ujbB`f0Uma zE1P9O?o9a~^!c*fN%DTVPWsIuW|o<44mOi=%ghqfZI+s4X0Ex!oNq2LE9ENlCi6aX zt$ByJCAT!U*lfzp&*jVrw$--E<+jzdMV&Gs21F;y6LD<518%1L zZ*B&4;6*98qsU21kd;RB8ssHuS>9^KP?nN;+I&-<$1L4vE;jd=FPMKYmM!Kl(TW&y zn^|b?jb_!x_Ib1|F`FC4HZwK0QLxzLV$5NU7@y_Xa#z}kc4D-`PK4%jactMy^{kb% z>*ZYFm6YUVwrL5iK_-pnB$Bo>3nLNav&z{Oc7?gfu8@PsWiOI%^ko*if;Fjf_FQ|e znPJa`23+)99=$>;8{#>;Pyq$vB82d>WfBa%{FtAqiwbgl0ysLw#g|aIke!j7RIPA8lAPaIhs1T>QA2GNr*U< zldISE!qTAypS3VXeQ{$!T&2tao8@*nYvm|qE6x5Iops0pda^y4wQ`iQm1cjJ1#y)! z18h#Sr?FO!Qnu3UuhChDETCuEvsf!fDO+jwcUcfuDKo(4T6-;Pf7qV8)Y%uSphQ+)qaNzGu@$XFdgj4@SW<>08245b9bwmMaeB`Ooy87K^OR^8fNkXM6`>Xv-$~cV9#Vq*T0Wtiy+#YAz$Y}V zQw#Odns!cmm&Is_vLLkEb%B$o$Es8&j%en(mbW$7wjF4Y=pMCifUoqm8iUY zL@C;@*5bT8A9VCc^OS;Luy=HporN~y9ola1uxpg7uk9Kw)CNAGX`Nc6y=mvPN7y4^ zNxWU#?d|rew59U$J$scF=jHjJqeq&jl#anR=eOFfMw>$mp2gU}rD^z0!C5r@rhwgE z`@O_jY|`kO6EWZH( zB>B~2c$`K``)G95Aq(g{J5RO%-$O2Y(MV~3mt~$y=CU~Xe0x4D9a`{N3uDw5jqbC# zEU-Dzp2%7`O8YMIfo7X#f0qq$l`=!NY|Xg_>a9j+9kPI4U@u^;9Hnff+23VBT&2ta zo8#^Atd*mbtu*^$s{w71k-di^cd73bx7)v!j4noce1V`xm=J8>5c=HLMZCx2ty&Lt}aEyPP*_dx`47-H5wY?U_im@@Mu&EzaKaK}U}? zuQ5VA#-;`6IrbdZ%2CQzn*BApX4EXOIoqDiS~*JDO0&PqhPX=M>ExyHK&RGdj_27_qsV6Ba9GFCPAJbNBuJ0zdAFh+f0e8yF(oSkWBLOVxM z+XR1&+ZRNK@5^GKc6+_O9+@1H&srFxzAzi(Dpk&|v@4-?NIq*}jQZlTAg)qofXyG+ zKVYpKrEI0yU!$`QSwP=l-@sZqO4&-YzsrKSN|^yRhg+;SF`5)jX6G>c=J>{!JJo z#Mn^FeFrKV<7l=JQU1nfYq2fJ^mX6^wYDjNJ8(329Anw>cDy;+;zUlZTQ6G-+Qpx9 z;HFX62_MpCq^P>+5Tysc zwoC0&WCBKKgy>=dmrz>lKiJFcWyt1HDg%$Oe?NLNqxZd!+V$rCRxq z(3*wHY3gMs*-6L-jB3vY;?L3~uHYUq9C$5zyUMOYHedp|sR=(AXO<1tTHls)*Kl-M zT*bKXgcn^H+RcXpcc7`g*y7|TCSd+9;j?h2Zl=-^>=-)+*?WJ z*-l0_U;>h`2bi;+wiDTa2}HGP0b_ITT}j*iarSchYaJrx+^HO-14-=+I|JE(2}J%{ zOf(0Ilj|8tKAnyi)r~Fkzt*NLvhsGE9fz?26Nqq@M75_S)kniTO_FHJ`Mc?8%ez_a znS^b2fK$2AJDY4L*a?UaOu*F5WTJ28hI;SDDSr~Z?G%d>jF>=lOu`>1&d=l_7I$i5 z0RIXdSCf%CmhrMo7E$(K-1kCn?Kd_vA zE8}S$B1eY>?m$yJ-A+d~U;?k-6%buw1t-@>fgcL_UdMa)VHWd790{=9wj0@iBLQ}r z#rp(tB*6CBK4b%q9LVoSCYQWqJ1{ojNPs=m9*S(hkpTH7v&gqcA{RzA%JSDp;7EXd zC$nfhSU$OFu-2ir*|*SA>!JE&x3gEeY_858WvHHZww;Z!0Y?JtJD5f5*FT@Q_W=3Z z*FTdRm9co{A&vytv34x70Y?IC&gPH}I1(^5nsP#mOx%H7c-xOl%-PQhkXNjL?2XH) zi$DS`p(v1eDeePTq)1?x5Jh7$h;n2qdDaYB@cu3&l@5xo-i>;j<52C*2M)Bv1O=~f zp`D~bigC5P4cUu(y@4auU>?Vx@BH*2WqPTl&|fO;>W#|r zSJ)cIJAtJ_VFyBTz9NWjCaTq{>nCjxvVf3%tDbmRR&L&Nwds;*{ds-evas~?b!{!u zfB%-1z0$sX;j?S)*20GEUHJcSF?t(srgvOK1OzJ;os@+e)1(%$1y?{ z5wd`gF+%P^NVL0M8?QmH5ONDbwj<RsbNm{VovJ;ovCgrVSBvLC0Hix^M$2t*i^xa z14qbB2r04KIgF15sg%pu`u)WhofxV-ncYDG&FABIVg>7m3BcBmd!tGL>Rkv~LC8}c zoQrE?YWaCA6X$emnA6|+IV~3BxV4%`QfsUI{c)G%AIsy~eJ<#Ks@>O4iX7zZi9pQl)+Sn?$d0yuEKK&Kw zG}r%o^*qIKf_>R_K%W-vs zQ*ZrUXl6*aPh)H`fiB_EPl-nck-bYWL`Ds6l#D zRSGMqtUE4J`xH%E*?u>06)sf%AMYY=D6OS6zAbM)9mygY+qj^$+)`5;j%YU;AO??t;WkI(_Z4H({TyezcQws<1mS zpjAHs*g9cO(>ntpaX+Zt_th~qLE#>S<3w;o_v47(RNb5GL!752JW3R>nReB(RtgF0 z?@_p>eFjqQ>Ql7Lw=v`(0%IS_hU|RoVa@wI3Jp%qW*PPTcw9BsgUtJyxq>eYe5Uo z({gc2Y-J)BUP|0le3IDJ+*MU9rc`-t&#Q_gJ*C(IdieFY_OkQmdqfTD`*tt&oXoQ87l){u z%87m-ypr0dxEU5;6!vM6eBDhLrx;<4t9_ME3)&RcR$F>%2ECJxc_;4sk3;d)UHP3= zJZ#U#pz^^0%Y?6=Z2EPz5Z^<*)DexWqg3v(VV}>zy zoYY|C+dJ@8D+i5zXp|e=_a(MJqZaL7t+$NuB`AlD=R|rRr1^Sxl~R36pF>Ti!7fm5 z5Pc7Qct8dAWk3jh2sEs9km-ciK;b#U>i|#Z?(0wFiCilp_2G+EV4V&9_?0Gpy=okg zUy$N?%4>fLup2lN$S*yGb1MBcD1PCJz^_3~0;c!sD9DV>FF!FZDdpFM=;GX%+^T4i z{BdqVZd!DHbad1c8Tpu59Yyj(=`tJTA$b-3Ty6T~OXd#wdwD!}dNe&ZCK@Z#qm}fM z2ho>5m8pha2StbC-!5#FSL86kuL|&*W9|TbJUU$-iB?BzqvhrWbCfwcx+Xf=^q3RP zaJ`fZ^#PX`Ai?sc~Qch@QuIyY*r)MpQ{(!U&E^$ykH%?zCW0koQYO98-iEUFfQYst~f4*bPt8U znVkyTXF{&vl0MsJ`Y~!3z<#A@hK_xXJ=<7giZWxx=UukT) zVn|+JO!p6~{FWhkrFInkWnCt(w-3ilKBYY!-fV=?$&JIw6}*ybSv7L2??debNGuah zZa)yYn)jjL6m5ovefVCr*vCHn!z?|NKg#6w!AxF%lF94tOkSVNyc%~@^D6UB zB<^=f(1-nMrp|e42KGvy^R$wkS$ZhDGI>3k$?LnBy#6(l*S}@)YFsb*31=4C0Z#zI z{mZouYrS~aOT6Ssm4>{^zsNE!`DG@r-(>Q7Hj~%?W$|iUuV|^C+X2_BHq-9;Fi4zv z8RYpev5SsO_!EfeDmX*S-|iX7~TZK+aTZU_=eYreDfPAPpd{gCHb{hHZW&WBo5b{@x*(o&ObHKxZhXdyffc%bf8s|Zt?{NX>LXZ5V WEZ`#Wi-AjkM*^1umjRCg9{vB&xSp*5 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 612b118ad..3e857b7f1 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 = 357; + private static final int STATE_COUNT = 362; private static final int TERMINAL_COUNT = 85; - private static final int NONTERMINAL_COUNT = 51; - private static final int PRODUCT_COUNT = 135; + private static final int NONTERMINAL_COUNT = 52; + private static final int PRODUCT_COUNT = 138; 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[6765]; - private static final int[] ERROR_TABLE = new int[949]; + private static final short[] ACTION_TABLE = new short[6832]; + private static final int[] ERROR_TABLE = new int[962]; 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[1647]; + private static final short[] GOTO_TABLE = new short[1953]; private static final int[] PRODUCT_LHS = new int[PRODUCT_COUNT]; private static final short STATE_MASK = (short)0x0fff; @@ -162,6 +162,7 @@ public abstract class SCLParser { "symbolWithoutMinus", "listQualifier", "chrQuery", + "chrQueryPart", "caseRhs", "guardedExpArrow", "equation", @@ -395,19 +396,19 @@ public abstract class SCLParser { return parse(0); } public Object parseCommands() { - return parse(341); + return parse(346); } public Object parseImport() { - return parse(349); + return parse(354); } public Object parseType() { - return parse(351); + return parse(356); } public Object parseExp() { - return parse(353); + return parse(358); } public Object parseEquationBlock() { - return parse(355); + return parse(360); } @@ -629,7 +630,7 @@ public abstract class SCLParser { case 106: return reduceQueryBlock(); case 107: - return reduceVerboseCHRQuery(); + return reduceVerboseCHRConjunction(); case 108: return reduceStringLiteral(); case 109: @@ -651,26 +652,32 @@ public abstract class SCLParser { case 117: return reduceThenQualifier(); case 118: - return reduceCHRQuery(); + return reduceCHRConjunction(); case 119: - return reduceSimpleCaseRhs(); + return reduceCHRAtom(); case 120: - return reduceGuardedCaseRhs(); + return reduceCHREquals(); case 121: - return reduceGuardedExpArrow(); + return reduceCHRBinds(); case 122: - return reduceGuardEquation(); + return reduceSimpleCaseRhs(); case 123: - return reduceBasicEquation(); + return reduceGuardedCaseRhs(); case 124: - return reduceEffect(); + return reduceGuardedExpArrow(); case 125: - return reduceJustEtype(); + return reduceGuardEquation(); case 126: - return reduceForAll(); + return reduceBasicEquation(); case 127: - return reduceApplyType(); + return reduceEffect(); case 128: + return reduceJustEtype(); + case 129: + return reduceForAll(); + case 130: + return reduceApplyType(); + case 131: return reduceDummy(); default: @@ -1116,9 +1123,9 @@ public abstract class SCLParser { */ protected abstract Object reduceQueryBlock(); /** - * verboseChrQuery ::= LBRACE listQualifier (SEMICOLON listQualifier)* RBRACE + * verboseChrQuery ::= LBRACE chrQuery (SEMICOLON chrQuery)* RBRACE */ - protected abstract Object reduceVerboseCHRQuery(); + protected abstract Object reduceVerboseCHRConjunction(); /** * stringLiteral ::= BEGIN_STRING (SUSPEND_STRING exp CONTINUE_STRING)* END_STRING */ @@ -1140,9 +1147,21 @@ public abstract class SCLParser { */ protected abstract Object reduceThenQualifier(); /** - * chrQuery ::= (listQualifier COMMA)* listQualifier + * chrQuery ::= (chrQueryPart COMMA)* chrQueryPart + */ + protected abstract Object reduceCHRConjunction(); + /** + * chrQueryPart ::= exp + */ + protected abstract Object reduceCHRAtom(); + /** + * chrQueryPart ::= exp EQUALS exp + */ + protected abstract Object reduceCHREquals(); + /** + * chrQueryPart ::= exp BINDS exp */ - protected abstract Object reduceCHRQuery(); + protected abstract Object reduceCHRBinds(); /** * 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 dd614f964..bda298bd6 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 @@ -11,6 +11,11 @@ import org.simantics.scl.compiler.common.precedence.Precedence; import org.simantics.scl.compiler.compilation.CompilationContext; import org.simantics.scl.compiler.constants.CharacterConstant; import org.simantics.scl.compiler.constants.StringConstant; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstAtom; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstBinds; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstConjunction; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstEquals; +import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstQuery; import org.simantics.scl.compiler.elaboration.equation.EqBasic; import org.simantics.scl.compiler.elaboration.equation.EqGuard; import org.simantics.scl.compiler.elaboration.equation.Equation; @@ -1247,25 +1252,12 @@ public class SCLParserImpl extends SCLParser { return new EViewPattern((Expression)get(1), (Expression)get(3)); } - @Override - protected Object reduceCHRStatement() { - return new CHRStatement((ListQualifier[])get(0), (ListQualifier[])get(2)); - } - @Override protected Object reduceConstraintStatement() { ConstructorAst constructor = (ConstructorAst)get(1); return new ConstraintStatement(constructor.name, constructor.parameters, constructor.fieldNames, constructor.annotations); } - @Override - protected Object reduceCHRQuery() { - ListQualifier[] query = new ListQualifier[(length()+1)/2]; - for(int i=0;i A (?x-1) True => A 0 -- -0 -() \ No newline at end of file +6:11-6:23: CHR negation is not yet supported. \ No newline at end of file -- 2.43.2