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%2FListThen.java;h=b8bd395668b2be7a046a3191e29c44e6af6778c5;hp=c79714c4e406a8f118f2280cf5526a3507ae5712;hb=6dfe20b0f514b91337fcac4de0267ffd8268be07;hpb=3303fe4a3b363e88662ac75a4f7e873ddb3ab352

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListThen.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListThen.java
old mode 100755
new mode 100644
index c79714c4e..b8bd39566
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListThen.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListThen.java
@@ -1,147 +1,103 @@
-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.elaboration.expressions.Variable;
-import org.simantics.scl.compiler.elaboration.expressions.VariableProcedure;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
-import org.simantics.scl.compiler.types.TMetaVar;
-import org.simantics.scl.compiler.types.Type;
-import org.simantics.scl.compiler.types.Types;
-import org.simantics.scl.compiler.types.exceptions.UnificationException;
-import org.simantics.scl.compiler.types.kinds.Kinds;
-
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
-public class ListThen extends ListQualifier {
-    public ListQualifier left;
-    public Expression transformer;
-    public Expression by; // optional
-    TMetaVar cType;
-    
-    public ListThen(Expression transformer, Expression by) {
-        this.transformer = transformer;
-        this.by = by;
-    }
-    
-    public void setLeft(ListQualifier inner) {
-        this.left = inner;
-    }
-    
-    @Override
-    public void checkType(TypingContext context) {
-        left.checkType(context);
-        
-        cType = Types.metaVar(Kinds.STAR);
-        Type transformerType = Types.function(Types.list(cType), Types.list(cType));
-        if(by != null) {
-            by = by.checkType(context, Types.metaVar(Kinds.STAR));
-            transformerType = Types.function(Types.function(cType, by.getType()), transformerType);
-        }
-        transformer = transformer.checkType(context, transformerType);
-        if(!(Types.canonical(cType) instanceof TMetaVar)) {
-            context.getErrorLog().log(location, "Transformation function must be generic on list elements.");
-        }
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        left.collectRefs(allRefs, refs);
-        transformer.collectRefs(allRefs, refs);
-        if(by != null)
-            by.collectRefs(allRefs, refs);
-    }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        left.collectVars(allVars, vars);
-        transformer.collectVars(allVars, vars);
-        if(by != null)
-            by.collectVars(allVars, vars);
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        left.collectFreeVariables(vars);
-        transformer.collectFreeVariables(vars);
-        if(by != null)
-            by.collectFreeVariables(vars);
-    }
-
-    @Override
-    public CompiledQualifier compile(SimplificationContext context) {
-        CompiledQualifier q = left.compile(context);
-        
-        try {
-            Types.unify(cType, q.pattern.getType());
-        } catch (UnificationException e) {
-            context.getErrorLog().log(location, "Transformation function must be generic on list elements.");
-        }
-        
-        if(by == null)
-            q.value = context.apply(transformer, q.value);
-        else
-            q.value = context.apply(transformer, context.lambda(q.pattern.copy(), by), q.value);
-        return q;
-    }
-
-    @Override
-    public void resolve(TranslationContext context) {
-        transformer = transformer.resolve(context);
-        left.resolve(context);
-        if(by != null)
-            by = by.resolve(context);
-    }
-
-    @Override
-    public void decorate(ExpressionDecorator decorator) {
-        transformer = transformer.decorate(decorator);
-        if(by != null)
-            by = by.decorate(decorator);
-        left.decorate(decorator);
-    }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        left.collectEffects(effects);
-        transformer.collectEffects(effects);
-        if(by != null)
-            by.collectEffects(effects);
-    }
-    
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            left.setLocationDeep(loc);
-            transformer.setLocationDeep(loc);
-            if(by != null)
-                by.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(ListQualifierVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        left.forVariables(procedure);
-        transformer.forVariables(procedure);
-        if(by != null)
-            by.forVariables(procedure);
-    }
-    
-    @Override
-    public ListQualifier accept(ListQualifierTransformer transformer) {
-        return transformer.transform(this);
-    }
-}
+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.elaboration.expressions.Variable;
+import org.simantics.scl.compiler.errors.Locations;
+import org.simantics.scl.compiler.types.TMetaVar;
+import org.simantics.scl.compiler.types.Type;
+import org.simantics.scl.compiler.types.Types;
+import org.simantics.scl.compiler.types.exceptions.UnificationException;
+import org.simantics.scl.compiler.types.kinds.Kinds;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.TIntHashSet;
+
+public class ListThen extends ListQualifier {
+    public ListQualifier left;
+    public Expression transformer;
+    public Expression by; // optional
+    TMetaVar cType;
+    
+    public ListThen(Expression transformer, Expression by) {
+        this.transformer = transformer;
+        this.by = by;
+    }
+    
+    public void setLeft(ListQualifier inner) {
+        this.left = inner;
+    }
+    
+    @Override
+    public void checkType(TypingContext context) {
+        left.checkType(context);
+        
+        cType = Types.metaVar(Kinds.STAR);
+        Type transformerType = Types.function(Types.list(cType), Types.list(cType));
+        if(by != null) {
+            by = by.checkType(context, Types.metaVar(Kinds.STAR));
+            transformerType = Types.function(Types.function(cType, by.getType()), transformerType);
+        }
+        transformer = transformer.checkType(context, transformerType);
+        if(!(Types.canonical(cType) instanceof TMetaVar)) {
+            context.getErrorLog().log(location, "Transformation function must be generic on list elements.");
+        }
+    }
+
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars,
+            TIntHashSet vars) {
+        left.collectVars(allVars, vars);
+        transformer.collectVars(allVars, vars);
+        if(by != null)
+            by.collectVars(allVars, vars);
+    }
+
+    @Override
+    public CompiledQualifier compile(SimplificationContext context) {
+        CompiledQualifier q = left.compile(context);
+        
+        try {
+            Types.unify(cType, q.pattern.getType());
+        } catch (UnificationException e) {
+            context.getErrorLog().log(location, "Transformation function must be generic on list elements.");
+        }
+        
+        if(by == null)
+            q.value = context.apply(transformer, q.value);
+        else
+            q.value = context.apply(transformer, context.lambda(q.pattern.copy(), by), q.value);
+        return q;
+    }
+
+    @Override
+    public void resolve(TranslationContext context) {
+        transformer = transformer.resolve(context);
+        left.resolve(context);
+        if(by != null)
+            by = by.resolve(context);
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            left.setLocationDeep(loc);
+            transformer.setLocationDeep(loc);
+            if(by != null)
+                by.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ListQualifierVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    @Override
+    public ListQualifier accept(ListQualifierTransformer transformer) {
+        return transformer.transform(this);
+    }
+}