X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FEEnforce.java;h=8e1adf7849c51b2b41bcb56bdc6df95e60f5b112;hb=e12e3ad357853a07b24923b341c4732962a94623;hp=bfaf699ed4c81081c32281ae5b12eeeb2e57fe62;hpb=a9f88c57e622d9ecf2732bd0278e0989dc0dfd5a;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEnforce.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEnforce.java index bfaf699ed..8e1adf784 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEnforce.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEnforce.java @@ -9,17 +9,12 @@ import org.simantics.scl.compiler.elaboration.query.QExists; import org.simantics.scl.compiler.elaboration.query.Query; import org.simantics.scl.compiler.elaboration.query.compilation.EnforcingContext; import org.simantics.scl.compiler.errors.Locations; -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 EEnforce extends SimplifiableExpression { - Query query; + public Query query; public EEnforce(Query query) { this.query = query; @@ -29,17 +24,6 @@ public class EEnforce extends SimplifiableExpression { return query; } - @Override - public void collectVars(TObjectIntHashMap allVars, - TIntHashSet vars) { - query.collectVars(allVars, vars); - } - - @Override - public void collectEffects(THashSet effects) { - throw new InternalCompilerError(location, getClass().getSimpleName() + " does not support collectEffects."); - } - @Override protected void updateType() throws MatchException { setType(Types.tupleConstructor(0)); @@ -56,11 +40,6 @@ public class EEnforce extends SimplifiableExpression { return query.generateEnforce(new EnforcingContext(context)); } - @Override - public void collectFreeVariables(THashSet vars) { - query.collectFreeVariables(vars); - } - @Override public Expression simplify(SimplificationContext context) { /*query = query.simplify(context);