X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fequation%2FEqBasic.java;h=785c27da0e6286e9f81222d266331cd6c4808815;hp=498720ea79a628d8af05beaf8e0b699237584ae8;hb=666ee533a3cfa9f59e79215a269f8342227cdbda;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/equation/EqBasic.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/equation/EqBasic.java
index 498720ea7..785c27da0 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/equation/EqBasic.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/equation/EqBasic.java
@@ -1,97 +1,53 @@
-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 EqBasic extends Equation {
-    public Expression left;
-    public Expression right;
-    
-    public EqBasic(Expression left, Expression right) {
-        this.left = left;
-        this.right = right;
-    }
-    
-    public EqBasic(long location, Expression left, Expression right) {
-        this(left, right);
-        this.location = location;
-    }
-    
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            left.setLocationDeep(loc);
-            right.setLocationDeep(loc);
-        }
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        left.forVariables(procedure);
-        right.forVariables(procedure);
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        left.collectFreeVariables(vars);
-        right.collectFreeVariables(vars);
-    }
-
-    @Override
-    public void decorate(ExpressionDecorator decorator) {
-        left = left.decorate(decorator);
-        right = right.decorate(decorator);
-    }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        left.collectEffects(effects);
-        right.collectEffects(effects);
-    }
-
-    @Override
-    public void checkType(TypingContext context) {
-        left = left.inferType(context);
-        right = right.checkType(context, left.getType());
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {
-        left.collectRefs(allRefs, refs);
-        right.collectRefs(allRefs, refs);
-    }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {
-        left.collectVars(allVars, vars);
-        right.collectVars(allVars, vars);
-    }
-
-    @Override
-    public void resolve(TranslationContext context) {
-        left = left.resolve(context);
-        right = right.resolve(context);
-    }
-
-    @Override
-    public void accept(EquationVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public Equation replace(ReplaceContext context) {
-        return new EqBasic(location, left.replace(context), right.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.errors.Locations;
+
+public class EqBasic extends Equation {
+    public Expression left;
+    public Expression right;
+    
+    public EqBasic(Expression left, Expression right) {
+        this.left = left;
+        this.right = right;
+    }
+    
+    public EqBasic(long location, Expression left, Expression right) {
+        this(left, right);
+        this.location = location;
+    }
+    
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            left.setLocationDeep(loc);
+            right.setLocationDeep(loc);
+        }
+    }
+
+    @Override
+    public void checkType(TypingContext context) {
+        left = left.inferType(context);
+        right = right.checkType(context, left.getType());
+    }
+
+    @Override
+    public void resolve(TranslationContext context) {
+        left = left.resolve(context);
+        right = right.resolve(context);
+    }
+
+    @Override
+    public void accept(EquationVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Equation replace(ReplaceContext context) {
+        return new EqBasic(location, left.replace(context), right.replace(context));
+    }
+}