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=f9426f21ac500cf7bb1e4f72988f0d1c5007b97f;hp=98c9aaedbfde9aa5b317ef533b4cc1b10c365538;hb=6dfe20b0f514b91337fcac4de0267ffd8268be07;hpb=eecd74faded034bd067094b42bbac0d286d8d9fa

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
old mode 100755
new mode 100644
index 98c9aaedb..f9426f21a
--- 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
@@ -1,154 +1,122 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
-import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;
-import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
-import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
-import org.simantics.scl.compiler.environment.Environment;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.codegen.references.IVal;
-import org.simantics.scl.compiler.internal.codegen.writer.CodeWriter;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
-import org.simantics.scl.compiler.internal.interpreted.IExpression;
-import org.simantics.scl.compiler.top.ExpressionInterpretationContext;
-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;
-    Type parameter;
-    
-    public EApplyType(Expression expression, Type parameter) {
-        this.expression = expression;
-        this.parameter = parameter;
-    }
-    
-    public static Expression create(Expression expression, Type ... parameters) {
-        for(Type parameter : parameters)
-            expression = new EApplyType(expression, parameter);
-        return expression;
-    }
-
-    public EApplyType(long loc, Expression expression, Type parameter) {
-        super(loc);
-        if(parameter == null)
-            throw new NullPointerException();
-        this.expression = expression;
-        this.parameter = parameter;
-    }
-    
-    public Expression getExpression() {
-        return expression;
-    }
-    
-    public Type getParameter() {
-        return parameter;
-    }
-
-	public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {
-        expression.collectRefs(allRefs, refs);
-    }
-	
-	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(Environment env, CodeWriter w) {
-        IVal val = expression.toVal(env, 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);
-        if(expression instanceof EConstant) {
-            ((EConstant)expression).addTypeParameters(parameter);
-            return expression;
-        }
-        return this;
-    }
-
-    @Override
-    public Expression resolve(TranslationContext context) {
-        expression = expression.resolve(context);
-        return this;
-    }
-    
-    @Override
-    public void removeFreeVariables(THashSet<Variable> vars) {
-        expression.removeFreeVariables(vars);
-    }
-
-    @Override
-    public Expression replace(ReplaceContext context) {
-        return new EApplyType(expression.replace(context), 
-                parameter.replace(context.tvarMap));
-    }
-    
-    @Override
-    public IExpression toIExpression(ExpressionInterpretationContext target) {
-        return expression.toIExpression(target);
-    }
-    
-    @Override
-    public Expression inferType(TypingContext context) {
-        throw new InternalCompilerError("Should not type check " + getClass().getSimpleName() + ".");
-    }
-
-    @Override
-    public Expression decorate(ExpressionDecorator decorator) {
-        expression = expression.decorate(decorator);
-        return decorator.decorate(this);
-    }
-    
-    @Override
-    public boolean isEffectful() {
-    	return expression.isEffectful();
-    }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        expression.collectEffects(effects);
-    }
-    
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            expression.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(ExpressionVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        expression.forVariables(procedure);
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
+package org.simantics.scl.compiler.elaboration.expressions;
+
+import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
+import org.simantics.scl.compiler.compilation.CompilationContext;
+import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;
+import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
+import org.simantics.scl.compiler.errors.Locations;
+import org.simantics.scl.compiler.internal.codegen.references.IVal;
+import org.simantics.scl.compiler.internal.codegen.writer.CodeWriter;
+import org.simantics.scl.compiler.internal.interpreted.IExpression;
+import org.simantics.scl.compiler.top.ExpressionInterpretationContext;
+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.TIntHashSet;
+
+public class EApplyType extends Expression {    
+    public Expression expression;
+    Type parameter;
+    
+    public EApplyType(Expression expression, Type parameter) {
+        this.expression = expression;
+        this.parameter = parameter;
+    }
+    
+    public static Expression create(Expression expression, Type ... parameters) {
+        for(Type parameter : parameters)
+            expression = new EApplyType(expression, parameter);
+        return expression;
+    }
+
+    public EApplyType(long loc, Expression expression, Type parameter) {
+        super(loc);
+        if(parameter == null)
+            throw new NullPointerException();
+        this.expression = expression;
+        this.parameter = parameter;
+    }
+    
+    public Expression getExpression() {
+        return expression;
+    }
+    
+    public Type getParameter() {
+        return 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) {
+        IVal val = expression.toVal(context, w);
+        return val.createSpecialization(parameter);
+    }
+
+    @Override
+    public Expression simplify(SimplificationContext context) {
+        expression = expression.simplify(context);
+        if(expression instanceof EConstant) {
+            ((EConstant)expression).addTypeParameters(parameter);
+            return expression;
+        }
+        return this;
+    }
+
+    @Override
+    public Expression resolve(TranslationContext context) {
+        expression = expression.resolve(context);
+        return this;
+    }
+
+    @Override
+    public Expression replace(ReplaceContext context) {
+        return new EApplyType(expression.replace(context), 
+                parameter.replace(context.tvarMap));
+    }
+    
+    @Override
+    public IExpression toIExpression(ExpressionInterpretationContext target) {
+        return expression.toIExpression(target);
+    }
+    
+    @Override
+    public Expression inferType(TypingContext context) {
+        throw new InternalCompilerError("Should not type check " + getClass().getSimpleName() + ".");
+    }
+    
+    @Override
+    public boolean isEffectful() {
+    	return expression.isEffectful();
+    }
+    
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            expression.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ExpressionVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+
+}