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%2Fexpressions%2FELambda.java;h=b01b771894a831b16d193d208317b746eede221e;hp=5138ec596290fe0f32e524e4e36f09cfe8a8f7ad;hb=4bb82aede02d798846196cc4f51e09d9f9161fef;hpb=dcb08ba8db427e1e9951e61892c653c23977a8cc

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ELambda.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ELambda.java
index 5138ec596..b01b77189 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ELambda.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ELambda.java
@@ -12,10 +12,6 @@ import org.simantics.scl.compiler.types.exceptions.UnificationException;
 import org.simantics.scl.compiler.types.kinds.Kinds;
 import org.simantics.scl.compiler.types.util.MultiFunction;
 
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
 public class ELambda extends SimplifiableExpression {
     public Case[] cases;
     Type effect = Types.NO_EFFECTS;
@@ -33,24 +29,18 @@ public class ELambda extends SimplifiableExpression {
         this.cases = cases;
     }
     
+    public ELambda(long loc, Type effect, Case ... cases) {
+        super(loc);
+        this.cases = cases;
+        this.effect = effect;
+    }
+    
     public ELambda(long loc, Expression pat, Expression exp) {
         this(loc, new Case(new Expression[] {pat}, exp));
     }
 
-	public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {
-        for(Case case_ : cases)
-            case_.collectRefs(allRefs, refs);
-    }
-	
-	@Override
-	public void collectVars(TObjectIntHashMap<Variable> allVars,
-	        TIntHashSet vars) {
-	    for(Case case_ : cases)
-            case_.collectVars(allVars, vars);
-	}
-
-	public Expression decomposeMatching() {
-	    Expression[] patterns = cases[0].patterns;
+    public Expression decomposeMatching() {
+        Expression[] patterns = cases[0].patterns;
         int arity = patterns.length;
         
         // Simple cases
@@ -103,12 +93,6 @@ public class ELambda extends SimplifiableExpression {
 	    return decomposeMatching().simplify(context);
 	}
 
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        for(Case case_ : cases)
-            case_.collectFreeVariables(vars);
-    }
-
     @Override
     public Expression resolve(TranslationContext context) {
         for(Case case_ : cases)
@@ -177,15 +161,6 @@ public class ELambda extends SimplifiableExpression {
     public boolean isEffectful() {
     	return false;
     }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        for(Case case_ : cases) {
-            for(Expression pattern : case_.patterns)
-                pattern.collectEffects(effects);
-            case_.value.collectEffects(effects);
-        }
-    }
     
     @Override
     public void accept(ExpressionVisitor visitor) {