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%2FEListComprehension.java;h=7a8b71ebb7b2758c7c01d87673a8c8a7b41a5470;hp=abfeb2bc70c84431e30b5aa9409e87b08785f1ae;hb=747231cca0974ca9ed5f78caa6517ee9dcb8e4fc;hpb=9a175feb652b2b7bba7afa540831b9076be3c10e

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
old mode 100755
new mode 100644
index abfeb2bc7..7a8b71ebb
--- 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
@@ -1,142 +1,134 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-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.list.CompiledQualifier;
-import org.simantics.scl.compiler.elaboration.expressions.list.ListQualifier;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
-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;
-    public ListQualifier qualifier;
-    
-    public EListComprehension(Expression head, ListQualifier qualifier) {
-        this.head = head;
-        this.qualifier = qualifier;
-    }
-
-    public EListComprehension(long loc, Expression head,
-            ListQualifier qualifier) {
-        super(loc);
-        this.head = head;
-        this.qualifier = qualifier;
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        head.collectRefs(allRefs, refs);
-        qualifier.collectRefs(allRefs, refs);
-    }
-
-    @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) {
-        qualifier.checkType(context);
-        Type componentType;
-        try {
-            componentType = Types.unifyApply(Types.LIST, requiredType);
-        } catch (MatchException e) {
-            context.getErrorLog().log(location, "Expected a value with type " + requiredType + " but got a list.");
-            return new EError(location);
-        }
-        head = head.checkType(context, componentType);
-        return this;
-    }
-    
-    @Override
-    protected void updateType() throws MatchException {
-        setType(Types.list(head.getType()));
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        head.collectFreeVariables(vars);
-        qualifier.collectFreeVariables(vars);
-    }
-
-    @Override
-    public Expression simplify(SimplificationContext context) {
-        context.pushLocation(location);
-        try {
-            CompiledQualifier cq = qualifier.compile(context);            
-            Expression exp = context.mapList(
-                    context.lambda(cq.pattern, head), 
-                    cq.value);
-            //System.out.println("simplified: " + exp);
-            /*try {
-                exp.validateType(context.getEnvironment());
-            } catch (TypeValidationException e) {
-                throw new InternalCompilerError(e);
-            }*/
-            exp = exp.simplify(context);
-            return exp;
-        } finally {
-            context.popLocation();
-        }
-    }
-
-    @Override
-    public Expression resolve(TranslationContext context) {
-        context.pushFrame();
-        qualifier.resolve(context);
-        head = head.resolve(context);
-        context.popFrame();
-        return this;
-    }
-
-    @Override
-    public Expression decorate(ExpressionDecorator decorator) {
-        head = head.decorate(decorator);
-        qualifier.decorate(decorator);
-        return decorator.decorate(this);
-    }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        head.collectEffects(effects);
-        qualifier.collectEffects(effects);
-    }
-
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            head.setLocationDeep(loc);
-            qualifier.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(ExpressionVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        head.forVariables(procedure);
-        qualifier.forVariables(procedure);
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
+package org.simantics.scl.compiler.elaboration.expressions;
+
+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.list.CompiledQualifier;
+import org.simantics.scl.compiler.elaboration.expressions.list.ListQualifier;
+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 EListComprehension extends SimplifiableExpression {
+
+    public Expression head;
+    public ListQualifier qualifier;
+    
+    public EListComprehension(Expression head, ListQualifier qualifier) {
+        this.head = head;
+        this.qualifier = qualifier;
+    }
+
+    public EListComprehension(long loc, Expression head,
+            ListQualifier qualifier) {
+        super(loc);
+        this.head = head;
+        this.qualifier = qualifier;
+    }
+
+    @Override
+    public void collectRefs(TObjectIntHashMap<Object> allRefs,
+            TIntHashSet refs) {
+        head.collectRefs(allRefs, refs);
+        qualifier.collectRefs(allRefs, refs);
+    }
+
+    @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) {
+        qualifier.checkType(context);
+        Type componentType;
+        try {
+            componentType = Types.unifyApply(Types.LIST, requiredType);
+        } catch (MatchException e) {
+            context.getErrorLog().log(location, "Expected a value with type " + requiredType + " but got a list.");
+            return new EError(location);
+        }
+        head = head.checkType(context, componentType);
+        return this;
+    }
+    
+    @Override
+    protected void updateType() throws MatchException {
+        setType(Types.list(head.getType()));
+    }
+
+    @Override
+    public void collectFreeVariables(THashSet<Variable> vars) {
+        head.collectFreeVariables(vars);
+        qualifier.collectFreeVariables(vars);
+    }
+
+    @Override
+    public Expression simplify(SimplificationContext context) {
+        context.pushLocation(location);
+        try {
+            CompiledQualifier cq = qualifier.compile(context);            
+            Expression exp = context.mapList(
+                    context.lambda(cq.pattern, head), 
+                    cq.value);
+            //System.out.println("simplified: " + exp);
+            /*try {
+                exp.validateType(context.getEnvironment());
+            } catch (TypeValidationException e) {
+                throw new InternalCompilerError(e);
+            }*/
+            exp = exp.simplify(context);
+            return exp;
+        } finally {
+            context.popLocation();
+        }
+    }
+
+    @Override
+    public Expression resolve(TranslationContext context) {
+        context.pushFrame();
+        qualifier.resolve(context);
+        head = head.resolve(context);
+        context.popFrame();
+        return this;
+    }
+
+    @Override
+    public void collectEffects(THashSet<Type> effects) {
+        head.collectEffects(effects);
+        qualifier.collectEffects(effects);
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            head.setLocationDeep(loc);
+            qualifier.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ExpressionVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void forVariables(VariableProcedure procedure) {
+        head.forVariables(procedure);
+        qualifier.forVariables(procedure);
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+
+}