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%2FEApplyType.java;h=30d1209cea12b692c3575337033d31bfe29ac5bd;hp=cd54a44d6b30531fa803442bcf87bb8322200f84;hb=666ee533a3cfa9f59e79215a269f8342227cdbda;hpb=2f63e7a58e49a233b28c6968b848281060117c43

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EApplyType.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EApplyType.java
index cd54a44d6..30d1209ce 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EApplyType.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EApplyType.java
@@ -15,12 +15,8 @@ import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.exceptions.MatchException;
 
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
 public class EApplyType extends Expression {    
-    Expression expression;
+    public Expression expression;
     Type parameter;
     
     public EApplyType(Expression expression, Type parameter) {
@@ -50,30 +46,17 @@ public class EApplyType extends Expression {
         return parameter;
     }
 
-	public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {
-        expression.collectRefs(allRefs, refs);
+    @Override
+    protected void updateType() throws MatchException {
+        setType(Types.instantiate(expression.getType(), parameter));
     }
-	
-	public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {
-	    expression.collectVars(allVars, vars);
-	}
 
-	@Override
-	protected void updateType() throws MatchException {
-	    setType(Types.instantiate(expression.getType(), parameter));
-	}
-	
-	@Override
-	public IVal toVal(CompilationContext context, CodeWriter w) {
+    @Override
+    public IVal toVal(CompilationContext context, CodeWriter w) {
         IVal val = expression.toVal(context, w);
         return val.createSpecialization(parameter);
     }
 
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        expression.collectFreeVariables(vars);
-    }
-
     @Override
     public Expression simplify(SimplificationContext context) {
         expression = expression.simplify(context);
@@ -89,11 +72,6 @@ public class EApplyType extends Expression {
         expression = expression.resolve(context);
         return this;
     }
-    
-    @Override
-    public void removeFreeVariables(THashSet<Variable> vars) {
-        expression.removeFreeVariables(vars);
-    }
 
     @Override
     public Expression replace(ReplaceContext context) {
@@ -115,11 +93,6 @@ public class EApplyType extends Expression {
     public boolean isEffectful() {
     	return expression.isEffectful();
     }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        expression.collectEffects(effects);
-    }
     
     @Override
     public void setLocationDeep(long loc) {