(refs #7375) Replaced collectFreeVariables method by a visitor

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / equation / EqGuard.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/equation/EqGuard.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/equation/EqGuard.java
index 8b24943478792887543d9a6cc363ff63fe1281b7..aa66cd8906fa9dd7149996d665dc93b1385aa45a 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/equation/EqGuard.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/equation/EqGuard.java
@@ -1,86 +1,57 @@
-package org.simantics.scl.compiler.elaboration.equation;\r
-\r
-import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;\r
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;\r
-import org.simantics.scl.compiler.elaboration.contexts.TypingContext;\r
-import org.simantics.scl.compiler.elaboration.expressions.Expression;\r
-import org.simantics.scl.compiler.elaboration.expressions.Variable;\r
-import org.simantics.scl.compiler.elaboration.expressions.VariableProcedure;\r
-import org.simantics.scl.compiler.errors.Locations;\r
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;\r
-import org.simantics.scl.compiler.types.Type;\r
-\r
-import gnu.trove.map.hash.TObjectIntHashMap;\r
-import gnu.trove.set.hash.THashSet;\r
-import gnu.trove.set.hash.TIntHashSet;\r
-\r
-public class EqGuard extends Equation {\r
-    public Expression guard;\r
-\r
-    public EqGuard(Expression guard) {\r
-        this.guard = guard;\r
-    }\r
-    \r
-    public EqGuard(long location, Expression guard) {\r
-        this(guard);\r
-        this.location = location;\r
-    }\r
-\r
-    @Override\r
-    public void setLocationDeep(long loc) {\r
-        if(location == Locations.NO_LOCATION) {\r
-            location = loc;\r
-            guard.setLocationDeep(loc);\r
-        }\r
-    }\r
-\r
-    @Override\r
-    public void forVariables(VariableProcedure procedure) {\r
-        guard.forVariables(procedure);\r
-    }\r
-\r
-    @Override\r
-    public void collectFreeVariables(THashSet<Variable> vars) {\r
-        guard.collectFreeVariables(vars);\r
-    }\r
-\r
-    @Override\r
-    public void decorate(ExpressionDecorator decorator) {\r
-        guard = guard.decorate(decorator);\r
-    }\r
-\r
-    @Override\r
-    public void collectEffects(THashSet<Type> effects) {\r
-        guard.collectEffects(effects);\r
-    }\r
-\r
-    @Override\r
-    public void checkType(TypingContext context) {\r
-        guard = guard.checkIgnoredType(context);\r
-    }\r
-\r
-    @Override\r
-    public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {\r
-        guard.collectRefs(allRefs, refs);\r
-    }\r
-\r
-    @Override\r
-    public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {\r
-        guard.collectVars(allVars, vars);\r
-    }\r
-\r
-    @Override\r
-    public void resolve(TranslationContext context) {\r
-        guard = guard.resolve(context);\r
-    }\r
-    \r
-    @Override\r
-    public void accept(EquationVisitor visitor) {\r
-        visitor.visit(this);\r
-    }\r
-\r
-    @Override\r
-    public Equation replace(ReplaceContext context) {\r
-        return new EqGuard(location, guard.replace(context));\r
-    }\r
-}\r
+package org.simantics.scl.compiler.elaboration.equation;
+
+import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;
+import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
+import org.simantics.scl.compiler.elaboration.expressions.Expression;
+import org.simantics.scl.compiler.elaboration.expressions.Variable;
+import org.simantics.scl.compiler.errors.Locations;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.TIntHashSet;
+
+public class EqGuard extends Equation {
+    public Expression guard;
+
+    public EqGuard(Expression guard) {
+        this.guard = guard;
+    }
+    
+    public EqGuard(long location, Expression guard) {
+        this(guard);
+        this.location = location;
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            guard.setLocationDeep(loc);
+        }
+    }
+
+    @Override
+    public void checkType(TypingContext context) {
+        guard = guard.checkIgnoredType(context);
+    }
+
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {
+        guard.collectVars(allVars, vars);
+    }
+
+    @Override
+    public void resolve(TranslationContext context) {
+        guard = guard.resolve(context);
+    }
+    
+    @Override
+    public void accept(EquationVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Equation replace(ReplaceContext context) {
+        return new EqGuard(location, guard.replace(context));
+    }
+}