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%2FListGuard.java;h=dfa618ad485387443226f43000823c1ee8d565f6;hp=1deaf92fae998d8a1bc2bcb1a83d484f2ba5c1ad;hb=a04614760395f09f5e9e3d38226b72f1b8e3d7ba;hpb=a8d72a172fdc815c8a9f0f584f010f7e35286f92 diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGuard.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGuard.java index 1deaf92fa..dfa618ad4 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGuard.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGuard.java @@ -4,14 +4,9 @@ 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.elaboration.expressions.Expression; -import org.simantics.scl.compiler.elaboration.expressions.Variable; import org.simantics.scl.compiler.errors.Locations; import org.simantics.scl.compiler.types.Types; -import gnu.trove.map.hash.TObjectIntHashMap; -import gnu.trove.set.hash.THashSet; -import gnu.trove.set.hash.TIntHashSet; - public class ListGuard extends ListQualifier { public Expression condition; @@ -21,18 +16,7 @@ public class ListGuard extends ListQualifier { @Override public void checkType(TypingContext context) { - condition.checkType(context, Types.BOOLEAN); - } - - @Override - public void collectVars(TObjectIntHashMap allVars, - TIntHashSet vars) { - condition.collectVars(allVars, vars); - } - - @Override - public void collectFreeVariables(THashSet vars) { - condition.collectFreeVariables(vars); + condition = condition.checkType(context, Types.BOOLEAN); } @Override