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%2Flist%2FListGenerator.java;h=959e3bf3d5d71afec0f61d5817f201946eb73e00;hp=db12689c862b69d250bba2336a59c3a447eee49a;hb=6dfe20b0f514b91337fcac4de0267ffd8268be07;hpb=a9f88c57e622d9ecf2732bd0278e0989dc0dfd5a diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGenerator.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGenerator.java index db12689c8..959e3bf3d 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGenerator.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGenerator.java @@ -1,5 +1,7 @@ package org.simantics.scl.compiler.elaboration.expressions.list; +import java.util.Set; + import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext; import org.simantics.scl.compiler.elaboration.contexts.TranslationContext; import org.simantics.scl.compiler.elaboration.contexts.TypingContext; @@ -9,12 +11,10 @@ import org.simantics.scl.compiler.elaboration.expressions.Expression; import org.simantics.scl.compiler.elaboration.expressions.Variable; import org.simantics.scl.compiler.errors.Locations; import org.simantics.scl.compiler.types.TMetaVar; -import org.simantics.scl.compiler.types.Type; import org.simantics.scl.compiler.types.Types; import org.simantics.scl.compiler.types.kinds.Kinds; import gnu.trove.map.hash.TObjectIntHashMap; -import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.TIntHashSet; public class ListGenerator extends ListQualifier { @@ -39,18 +39,12 @@ public class ListGenerator extends ListQualifier { value.collectVars(allVars, vars); } - @Override - public void collectFreeVariables(THashSet vars) { - value.collectFreeVariables(vars); - pattern.collectFreeVariables(vars); - } - @Override public CompiledQualifier compile(SimplificationContext context) { if(pattern instanceof EVariable) return new CompiledQualifier(value, pattern); else { - THashSet variables = pattern.getFreeVariables(); + Set variables = pattern.getFreeVariables(); Variable[] variableArray = variables.toArray(new Variable[variables.size()]); Expression[] variableExps = new Expression[variableArray.length]; for(int i=0;i effects) { - pattern.collectEffects(effects); - value.collectEffects(effects); - } - + @Override public void setLocationDeep(long loc) { if(location == Locations.NO_LOCATION) {