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%2FEIf.java;h=149c52f500235d5f732aa4a12f744b3d75851bc7;hb=refs%2Fchanges%2F34%2F1534%2F3;hp=a6574824398e5965299d7e545afcf04d19a48613;hpb=6dfe20b0f514b91337fcac4de0267ffd8268be07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIf.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIf.java
index a65748243..149c52f50 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIf.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIf.java
@@ -17,9 +17,6 @@ import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.exceptions.MatchException;
 import org.simantics.scl.runtime.tuple.Tuple0;
 
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.TIntHashSet;
-
 public class EIf extends Expression {
     public Expression condition;
     public Expression then_;
@@ -38,15 +35,6 @@ public class EIf extends Expression {
         this.else_ = else_;
     }
 
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        condition.collectVars(allVars, vars);
-        then_.collectVars(allVars, vars);
-        if(else_ != null)
-            else_.collectVars(allVars, vars);
-    }
-
     @Override
     protected void updateType() throws MatchException {
         setType(then_.getType());
@@ -59,16 +47,16 @@ public class EIf extends Expression {
         CodeWriter thenBlock = w.createBlock();
         if(else_ != null) {
             CodeWriter elseBlock = w.createBlock();        
-            w.if_(conditionVal, thenBlock.getContinuation(), elseBlock.getContinuation());
+            w.if_(location, conditionVal, thenBlock.getContinuation(), elseBlock.getContinuation());
                 
             IVal elseVal = else_.toVal(context, elseBlock);
-            elseBlock.jump(joinPoint.getContinuation(), elseVal);
+            elseBlock.jump(location, joinPoint.getContinuation(), elseVal);
         }
         else {
-            w.if_(conditionVal, thenBlock.getContinuation(), joinPoint.getContinuation());
+            w.if_(location, conditionVal, thenBlock.getContinuation(), joinPoint.getContinuation());
         }
         IVal thenVal = then_.toVal(context, thenBlock);
-        thenBlock.jump(joinPoint.getContinuation(), thenVal);
+        thenBlock.jump(location, joinPoint.getContinuation(), thenVal);
         w.continueAs(joinPoint);
         
         return w.getParameters()[0];