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%2FStandardExpressionTransformer.java;h=ac61eb4866844c1822abf0c7323f958df6b9cbaa;hb=fad36d463b75c3a9944d875fc627c3533f6da74d;hp=2fc6d1e7eb4d93ea1f224dc214650eae6c766a14;hpb=ca40974f87c9db00eb77aaf1acc1e9937b37261b;p=simantics%2Fplatform.git

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 2fc6d1e7e..ac61eb486 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
@@ -2,14 +2,15 @@ package org.simantics.scl.compiler.elaboration.expressions;
 
 import org.simantics.scl.compiler.elaboration.chr.CHRLiteral;
 import org.simantics.scl.compiler.elaboration.chr.CHRRule;
+import org.simantics.scl.compiler.elaboration.chr.CHRRuleset;
 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.accessor.ExpressionAccessor;
-import org.simantics.scl.compiler.elaboration.expressions.accessor.FieldAccessor;
 import org.simantics.scl.compiler.elaboration.expressions.block.BindStatement;
 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;
@@ -119,9 +120,12 @@ EquationVisitor {
     }
 
     @Override
-    public Expression transform(ECHRRuleset expression) {
-        expression.in = expression.in.accept(this);
-        for(CHRRule rule : expression.ruleset.rules) {
+    public void visit(IncludeStatement statement) {
+        statement.value = statement.value.accept(this);
+    }
+    
+    public void transform(CHRRuleset ruleset) {
+        for(CHRRule rule : ruleset.rules) {
             for(CHRLiteral lit : rule.head.literals)
                 for(int i=0;i<lit.parameters.length;++i)
                     lit.parameters[i] = lit.parameters[i].accept(this);
@@ -129,25 +133,29 @@ EquationVisitor {
                 for(int i=0;i<lit.parameters.length;++i)
                     lit.parameters[i] = lit.parameters[i].accept(this);
         }
+    }
+    
+    @Override
+    public Expression transform(ECHRRuleset expression) {
+        expression.in = expression.in.accept(this);
+        transform(expression.ruleset);
         return expression;
     }
-
+    
     @Override
-    public Expression transform(EConstant expression) {
+    public Expression transform(ECHRRulesetConstructor expression) {
+        transform(expression.ruleset);
         return expression;
     }
 
     @Override
-    public Expression transform(EEnforce expression) {
-        expression.query = expression.query.accept(this);
+    public Expression transform(EConstant expression) {
         return expression;
     }
 
     @Override
-    public Expression transform(EEntityTypeAnnotation expression) {
-        expression.expression = expression.expression.accept(this);
-        if(expression.query != null)
-            expression.query = expression.query.accept(this);
+    public Expression transform(EEnforce expression) {
+        expression.query = expression.query.accept(this);
         return expression;
     }
 
@@ -164,11 +172,10 @@ EquationVisitor {
     @Override
     public Expression transform(EFieldAccess expression) {
         expression.parent = expression.parent.accept(this);
-        for(FieldAccessor accessor : expression.accessors)
-            if(accessor instanceof ExpressionAccessor) {
-                ExpressionAccessor expAcc = (ExpressionAccessor)accessor;
-                expAcc.fieldName = expAcc.fieldName.accept(this);
-            }
+        if(expression.accessor instanceof ExpressionAccessor) {
+        	ExpressionAccessor expAcc = (ExpressionAccessor)expression.accessor;
+        	expAcc.fieldName = expAcc.fieldName.accept(this);
+        }
         return expression;
     }