(refs #7614) Assign type-checked expression back to list comprehension

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / expressions / list / ListGuard.java

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
old mode 100755 (executable)
new mode 100644 (file)
index d591652..dfa618a
--- 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
@@ -1,91 +1,51 @@
-package org.simantics.scl.compiler.elaboration.expressions.list;\r
-\r
-import gnu.trove.map.hash.TObjectIntHashMap;\r
-import gnu.trove.set.hash.THashSet;\r
-import gnu.trove.set.hash.TIntHashSet;\r
-\r
-import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;\r
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;\r
-import org.simantics.scl.compiler.elaboration.contexts.TypingContext;\r
-import org.simantics.scl.compiler.elaboration.expressions.Expression;\r
-import org.simantics.scl.compiler.elaboration.expressions.Variable;\r
-import org.simantics.scl.compiler.elaboration.expressions.VariableProcedure;\r
-import org.simantics.scl.compiler.errors.Locations;\r
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;\r
-import org.simantics.scl.compiler.types.Type;\r
-import org.simantics.scl.compiler.types.Types;\r
-\r
-public class ListGuard extends ListQualifier {\r
-    public Expression condition;\r
-\r
-    public ListGuard(Expression condition) {\r
-        this.condition = condition;\r
-    }\r
-\r
-    @Override\r
-    public void checkType(TypingContext context) {\r
-        condition.checkType(context, Types.BOOLEAN);\r
-    }\r
-\r
-    @Override\r
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,\r
-            TIntHashSet refs) {\r
-        condition.collectRefs(allRefs, refs);\r
-    }\r
-\r
-    @Override\r
-    public void collectVars(TObjectIntHashMap<Variable> allVars,\r
-            TIntHashSet vars) {\r
-        condition.collectVars(allVars, vars);\r
-    }\r
-\r
-    @Override\r
-    public void collectFreeVariables(THashSet<Variable> vars) {\r
-        condition.collectFreeVariables(vars);\r
-    }\r
-\r
-    @Override\r
-    public CompiledQualifier compile(SimplificationContext context) {\r
-        return new CompiledQualifier(\r
-                context.guardList(condition.copy()), \r
-                context.tuple());\r
-    }\r
-\r
-    @Override\r
-    public void resolve(TranslationContext context) {\r
-        condition = condition.resolve(context);        \r
-    }\r
-\r
-    @Override\r
-    public void decorate(ExpressionDecorator decorator) {\r
-        condition = condition.decorate(decorator);\r
-    }\r
-    \r
-    @Override\r
-    public void collectEffects(THashSet<Type> effects) {\r
-        condition.collectEffects(effects);\r
-    }\r
-    \r
-    @Override\r
-    public void setLocationDeep(long loc) {\r
-        if(location == Locations.NO_LOCATION) {\r
-            location = loc;\r
-            condition.setLocationDeep(loc);\r
-        }\r
-    }\r
-    \r
-    @Override\r
-    public void accept(ListQualifierVisitor visitor) {\r
-        visitor.visit(this);\r
-    }\r
-    \r
-    @Override\r
-    public void forVariables(VariableProcedure procedure) {\r
-        condition.forVariables(procedure);\r
-    }\r
-    \r
-    @Override\r
-    public ListQualifier accept(ListQualifierTransformer transformer) {\r
-        return transformer.transform(this);\r
-    }\r
-}\r
+package org.simantics.scl.compiler.elaboration.expressions.list;
+
+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.errors.Locations;
+import org.simantics.scl.compiler.types.Types;
+
+public class ListGuard extends ListQualifier {
+    public Expression condition;
+
+    public ListGuard(Expression condition) {
+        this.condition = condition;
+    }
+
+    @Override
+    public void checkType(TypingContext context) {
+        condition = condition.checkType(context, Types.BOOLEAN);
+    }
+
+    @Override
+    public CompiledQualifier compile(SimplificationContext context) {
+        return new CompiledQualifier(
+                context.guardList(condition.copy()), 
+                context.tuple());
+    }
+
+    @Override
+    public void resolve(TranslationContext context) {
+        condition = condition.resolve(context);
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            condition.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ListQualifierVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    @Override
+    public ListQualifier accept(ListQualifierTransformer transformer) {
+        return transformer.transform(this);
+    }
+}