X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FDecoratingExpression.java;h=c531b854745540fb0f87930b2a25706820a9a6d0;hb=6dfe20b0f514b91337fcac4de0267ffd8268be07;hp=3d2031ee5af6154cb9a1f89b071358a4c91410b3;hpb=862c09c9608329f326404342d12da61792eece2c;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/DecoratingExpression.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/DecoratingExpression.java index 3d2031ee5..c531b8547 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/DecoratingExpression.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/DecoratingExpression.java @@ -12,12 +12,10 @@ import org.simantics.scl.compiler.elaboration.expressions.lhstype.LhsType; 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.types.Type; 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 abstract class DecoratingExpression extends SimplifiableExpression { @@ -27,11 +25,6 @@ public abstract class DecoratingExpression extends SimplifiableExpression { super(loc); this.expression = expression; } - - @Override - public void collectRefs(TObjectIntHashMap allRefs, TIntHashSet refs) { - expression.collectRefs(allRefs, refs); - } @Override public void collectVars(TObjectIntHashMap allVars, @@ -44,11 +37,6 @@ public abstract class DecoratingExpression extends SimplifiableExpression { setType(expression.getType()); } - @Override - public void collectFreeVariables(THashSet vars) { - expression.collectFreeVariables(vars); - } - @Override public Expression simplify(SimplificationContext context) { expression = expression.simplify(context); @@ -87,17 +75,6 @@ public abstract class DecoratingExpression extends SimplifiableExpression { public int getFunctionDefinitionPatternArity() throws NotPatternException { return expression.getFunctionDefinitionPatternArity(); } - - @Override - public Expression decorate(ExpressionDecorator decorator) { - expression = expression.decorate(decorator); - return this; - } - - @Override - public void collectEffects(THashSet effects) { - expression.collectEffects(effects); - } @Override public void setLocationDeep(long loc) { @@ -107,11 +84,6 @@ public abstract class DecoratingExpression extends SimplifiableExpression { } } - @Override - public void forVariables(VariableProcedure procedure) { - expression.forVariables(procedure); - } - @Override public IVal toVal(CompilationContext context, CodeWriter w) { throw new InternalCompilerError("Cannot generate code for " + getClass().getSimpleName() + ".");