Property following functions value and possibleValue to ontology modules

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EListComprehension.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EListComprehension.java
index 102d6465825a4cbee8d8bca1625598fae837c2df..10045b34fb1e156e917874c44066041282f5f83f 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EListComprehension.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EListComprehension.java
@@ -10,10 +10,6 @@ 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 EListComprehension extends SimplifiableExpression {
 
     public Expression head;
@@ -30,13 +26,6 @@ public class EListComprehension extends SimplifiableExpression {
         this.head = head;
         this.qualifier = qualifier;
     }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        head.collectVars(allVars, vars);
-        qualifier.collectVars(allVars, vars);
-    }
     
     @Override
     public Expression checkBasicType(TypingContext context, Type requiredType) {
@@ -57,21 +46,21 @@ public class EListComprehension extends SimplifiableExpression {
         setType(Types.list(head.getType()));
     }
 
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        head.collectFreeVariables(vars);
-        qualifier.collectFreeVariables(vars);
-    }
-
     @Override
     public Expression simplify(SimplificationContext context) {
+        //System.out.println("--------");
         context.pushLocation(location);
         try {
-            CompiledQualifier cq = qualifier.compile(context);            
+            CompiledQualifier cq = qualifier.compile(context);
+            /*
+            System.out.println("cq.pattern = " + cq.pattern);
+            System.out.println("cq.value   = " + cq.value);
+            System.out.println("head       = " + head);
+            */
             Expression exp = context.mapList(
                     context.lambda(cq.pattern, head), 
                     cq.value);
-            //System.out.println("simplified: " + exp);
+            //System.out.println("simplified = " + exp);
             /*try {
                 exp.validateType(context.getEnvironment());
             } catch (TypeValidationException e) {