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%2FETypeAnnotation.java;h=713342ed568cedd6b1e747743a394d967158d64d;hp=6452812fc370f82989e662b643cb7675f85a65ac;hb=666ee533a3cfa9f59e79215a269f8342227cdbda;hpb=dcb08ba8db427e1e9951e61892c653c23977a8cc diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ETypeAnnotation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ETypeAnnotation.java index 6452812fc..713342ed5 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ETypeAnnotation.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ETypeAnnotation.java @@ -8,12 +8,8 @@ import org.simantics.scl.compiler.internal.parsing.types.TypeAst; 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 class ETypeAnnotation extends SimplifiableExpression { - Expression value; + public Expression value; Type type; TypeAst typeAst; @@ -28,24 +24,9 @@ public class ETypeAnnotation extends SimplifiableExpression { this.type = type; } - public void collectRefs(TObjectIntHashMap allRefs, TIntHashSet refs) { - value.collectRefs(allRefs, refs); - } - - @Override - public void collectVars(TObjectIntHashMap allVars, - TIntHashSet vars) { - value.collectVars(allVars, vars); - } - - @Override - protected void updateType() throws MatchException { - setType(type); - } - @Override - public void collectFreeVariables(THashSet vars) { - value.collectFreeVariables(vars); + protected void updateType() throws MatchException { + setType(type); } @Override @@ -72,11 +53,6 @@ public class ETypeAnnotation extends SimplifiableExpression { return value.checkType(context, type); } - @Override - public void collectEffects(THashSet effects) { - value.collectEffects(effects); - } - @Override public void setLocationDeep(long loc) { if(location == Locations.NO_LOCATION) {