X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FStandardExpressionVisitor.java;h=3cdb32b72c93e12c3ad65a722260b8dc29926a3b;hb=refs%2Fchanges%2F50%2F750%2F1;hp=6bdd7abde4bcf90df1926bad6901f5ce79a48b97;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionVisitor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionVisitor.java index 6bdd7abde..3cdb32b72 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionVisitor.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionVisitor.java @@ -1,23 +1,40 @@ package org.simantics.scl.compiler.elaboration.expressions; 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; import org.simantics.scl.compiler.elaboration.equation.EquationVisitor; import org.simantics.scl.compiler.elaboration.expressions.ERuleset.DatalogRule; import org.simantics.scl.compiler.elaboration.expressions.accessor.ExpressionAccessor; -import org.simantics.scl.compiler.elaboration.expressions.accessor.FieldAccessor; import org.simantics.scl.compiler.elaboration.expressions.accessor.FieldAccessorVisitor; import org.simantics.scl.compiler.elaboration.expressions.accessor.IdAccessor; import org.simantics.scl.compiler.elaboration.expressions.accessor.StringAccessor; +import org.simantics.scl.compiler.elaboration.expressions.block.BindStatement; +import org.simantics.scl.compiler.elaboration.expressions.block.CHRStatement; +import org.simantics.scl.compiler.elaboration.expressions.block.GuardStatement; +import org.simantics.scl.compiler.elaboration.expressions.block.IncludeStatement; +import org.simantics.scl.compiler.elaboration.expressions.block.LetStatement; +import org.simantics.scl.compiler.elaboration.expressions.block.RuleStatement; +import org.simantics.scl.compiler.elaboration.expressions.block.Statement; +import org.simantics.scl.compiler.elaboration.expressions.block.StatementVisitor; 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.ListQualifierVisitor; import org.simantics.scl.compiler.elaboration.expressions.list.ListSeq; import org.simantics.scl.compiler.elaboration.expressions.list.ListThen; +import org.simantics.scl.compiler.elaboration.expressions.records.FieldAssignment; import org.simantics.scl.compiler.elaboration.query.QAlternative; import org.simantics.scl.compiler.elaboration.query.QAtom; import org.simantics.scl.compiler.elaboration.query.QConjunction; @@ -32,7 +49,7 @@ import org.simantics.scl.compiler.elaboration.query.QueryVisitor; public class StandardExpressionVisitor implements ExpressionVisitor, QueryVisitor, FieldAccessorVisitor, ListQualifierVisitor, -EquationVisitor { +EquationVisitor, StatementVisitor, CHRAstQueryVisitor { @Override public void visit(EApply expression) { @@ -56,6 +73,8 @@ EquationVisitor { expression.pattern.accept(this); expression.value.accept(this); expression.in.accept(this); + if(expression.monadEvidence != null) + visit(expression.monadEvidence); } @Override @@ -78,8 +97,7 @@ EquationVisitor { @Override public void visit(EFieldAccess expression) { expression.parent.accept(this); - for(FieldAccessor accessor : expression.accessors) - accessor.accept(this); + expression.accessor.accept(this); } @Override @@ -129,6 +147,7 @@ EquationVisitor { public void visit(ELet expression) { for(Assignment assignment : expression.assignments) visit(assignment); + expression.in.accept(this); } public void visit(Assignment assignment) { @@ -189,6 +208,12 @@ EquationVisitor { expression.query.accept(this); expression.expression.accept(this); } + + @Override + public void visit(ECHRSelect expression) { + visit(expression.query); + expression.expression.accept(this); + } @Override public void visit(ESimpleLambda expression) { @@ -211,6 +236,10 @@ EquationVisitor { expression.value.accept(this); } + @Override + public void visit(EVar expression) { + } + @Override public void visit(EVariable expression) { } @@ -342,18 +371,132 @@ EquationVisitor { for(Equation equation : expression.equations) equation.accept(this); } + + public void visit(CHRQuery query) { + for(CHRLiteral literal : query.literals) + for(Expression parameter : literal.parameters) + parameter.accept(this); + } + + public void visit(CHRRuleset ruleset) { + for(CHRRule rule : ruleset.rules) { + visit(rule.head); + visit(rule.body); + } + for(IncludeStatement include : ruleset.includes) + include.value.accept(this); + } + + @Override + public void visit(ECHRRuleset expression) { + visit(expression.ruleset); + expression.in.accept(this); + } + + @Override + public void visit(ECHRRulesetConstructor expression) { + visit(expression.ruleset); + } + + @Override + public void visit(EBinary expression) { + expression.left.accept(this); + for(EBinaryRightSide right : expression.rights) + right.right.accept(this); + } + + @Override + public void visit(EBlock expression) { + for(Statement stat : expression.statements) + stat.accept(this); + } @Override - public void visit(ECHRRuleset ruleset) { - for(CHRRule rule : ruleset.ruleset.rules) { - for(CHRLiteral literal : rule.head.literals) - for(Expression parameter : literal.parameters) - parameter.accept(this); - for(CHRLiteral literal : rule.body.literals) - for(Expression parameter : literal.parameters) - parameter.accept(this); + public void visit(EPreLet expression) { + for(LetStatement stat : expression.assignments) { + stat.pattern.accept(this); + stat.value.accept(this); } - ruleset.in.accept(this); + expression.in.accept(this); + } + + @Override + public void visit(ERange expression) { + expression.from.accept(this); + expression.to.accept(this); + } + + @Override + public void visit(ERecord expression) { + for(FieldAssignment assignment : expression.fields) + assignment.value.accept(this); + + } + + @Override + public void visit(EStringLiteral expression) { + for(Expression exp : expression.expressions) + exp.accept(this); + } + + @Override + public void visit(BindStatement statement) { + statement.pattern.accept(this); + statement.value.accept(this); + } + + @Override + public void visit(GuardStatement statement) { + statement.value.accept(this); + } + + @Override + public void visit(LetStatement statement) { + statement.value.accept(this); + } + + @Override + public void visit(RuleStatement statement) { + statement.head.accept(this); + statement.body.accept(this); + } + + @Override + public void visit(IncludeStatement statement) { + statement.value.accept(this); + } + + @Override + public void visit(CHRStatement statement) { + statement.body.accept(this); + statement.head.accept(this); + } + + @Override + public void visit(CHRAstAtom query) { + query.expression.accept(this); + } + + @Override + public void visit(CHRAstBinds query) { + query.left.accept(this); + query.right.accept(this); } + @Override + public void visit(CHRAstConjunction query) { + for(CHRAstQuery conjunct : query.conjuncts) + conjunct.accept(this); + } + + @Override + public void visit(CHRAstEquals query) { + query.left.accept(this); + query.right.accept(this); + } + + @Override + public void visit(CHRAstNegation query) { + query.subquery.accept(this); + } }