X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fequation%2FEqGuard.java;h=aa66cd8906fa9dd7149996d665dc93b1385aa45a;hb=refs%2Fchanges%2F55%2F755%2F2;hp=c753924e64eb7fc5e99576e2e6fa2e4c13200475;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

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 c753924e6..aa66cd890 100644
--- 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;
-
-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.elaboration.expressions.VariableProcedure;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
-import org.simantics.scl.compiler.types.Type;
-
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-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 forVariables(VariableProcedure procedure) {
-        guard.forVariables(procedure);
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        guard.collectFreeVariables(vars);
-    }
-
-    @Override
-    public void decorate(ExpressionDecorator decorator) {
-        guard = guard.decorate(decorator);
-    }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        guard.collectEffects(effects);
-    }
-
-    @Override
-    public void checkType(TypingContext context) {
-        guard = guard.inferType(context);
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {
-        guard.collectRefs(allRefs, refs);
-    }
-
-    @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));
-    }
-}
+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));
+    }
+}