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%2FListGenerator.java;h=959e3bf3d5d71afec0f61d5817f201946eb73e00;hp=622b53842e212699a3e16704821b6c9c4d04067b;hb=6dfe20b0f514b91337fcac4de0267ffd8268be07;hpb=3303fe4a3b363e88662ac75a4f7e873ddb3ab352

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGenerator.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGenerator.java
old mode 100755
new mode 100644
index 622b53842..959e3bf3d
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGenerator.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/list/ListGenerator.java
@@ -1,124 +1,93 @@
-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.Case;
-import org.simantics.scl.compiler.elaboration.expressions.EVariable;
-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.kinds.Kinds;
-
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
-public class ListGenerator extends ListQualifier {
-    public Expression pattern;
-    public Expression value;
-    
-    public ListGenerator(Expression pattern, Expression value) {
-        this.pattern = pattern;
-        this.value = value;
-    }
-    
-    @Override
-    public void checkType(TypingContext context) {
-        TMetaVar componentType = Types.metaVar(Kinds.STAR);
-        value.checkType(context, Types.apply(Types.LIST, componentType));
-        pattern.checkTypeAsPattern(context, componentType);
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        value.collectRefs(allRefs, refs);
-    }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        value.collectVars(allVars, vars);
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        value.collectFreeVariables(vars);
-        pattern.collectFreeVariables(vars);
-    }
-
-    @Override
-    public CompiledQualifier compile(SimplificationContext context) {
-        if(pattern instanceof EVariable)
-            return new CompiledQualifier(value, pattern);
-        else {
-            THashSet<Variable> variables = pattern.getFreeVariables();
-            Variable[] variableArray = variables.toArray(new Variable[variables.size()]);
-            Expression[] variableExps = new Expression[variableArray.length];
-            for(int i=0;i<variableArray.length;++i)
-                variableExps[i] = new EVariable(variableArray[i]);
-            Expression newPattern = context.tuple(variableExps);
-            
-            EVariable blank = context.blank();
-            blank.getVariable().setType(pattern.getType());
-            
-            return new CompiledQualifier(
-                    context.concatMap(
-                            context.lambda(
-                                    new Case(pattern, context.singletonList(newPattern.copy())),
-                                    new Case(blank, context.emptyList(newPattern.getType()))
-                                    ), 
-                            value
-                            ), 
-                    newPattern);
-        }
-    }
-
-    @Override
-    public void resolve(TranslationContext context) {
-        value = value.resolve(context);
-        pattern = pattern.resolveAsPattern(context);
-    }
-    
-    @Override
-    public void decorate(ExpressionDecorator decorator) {
-        value = value.decorate(decorator);
-        pattern = pattern.decorate(decorator);
-    }
-    
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        pattern.collectEffects(effects);
-        value.collectEffects(effects);
-    }
-    
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            pattern.setLocationDeep(loc);
-            value.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(ListQualifierVisitor visitor) {
-        visitor.visit(this);
-    }
-    
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        value.forVariables(procedure);
-    }
-    
-    @Override
-    public ListQualifier accept(ListQualifierTransformer transformer) {
-        return transformer.transform(this);
-    }
-}
+package org.simantics.scl.compiler.elaboration.expressions.list;
+
+import java.util.Set;
+
+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.Case;
+import org.simantics.scl.compiler.elaboration.expressions.EVariable;
+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.Types;
+import org.simantics.scl.compiler.types.kinds.Kinds;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.TIntHashSet;
+
+public class ListGenerator extends ListQualifier {
+    public Expression pattern;
+    public Expression value;
+    
+    public ListGenerator(Expression pattern, Expression value) {
+        this.pattern = pattern;
+        this.value = value;
+    }
+    
+    @Override
+    public void checkType(TypingContext context) {
+        TMetaVar componentType = Types.metaVar(Kinds.STAR);
+        value.checkType(context, Types.apply(Types.LIST, componentType));
+        pattern.checkTypeAsPattern(context, componentType);
+    }
+
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars,
+            TIntHashSet vars) {
+        value.collectVars(allVars, vars);
+    }
+
+    @Override
+    public CompiledQualifier compile(SimplificationContext context) {
+        if(pattern instanceof EVariable)
+            return new CompiledQualifier(value, pattern);
+        else {
+            Set<Variable> variables = pattern.getFreeVariables();
+            Variable[] variableArray = variables.toArray(new Variable[variables.size()]);
+            Expression[] variableExps = new Expression[variableArray.length];
+            for(int i=0;i<variableArray.length;++i)
+                variableExps[i] = new EVariable(variableArray[i]);
+            Expression newPattern = context.tuple(variableExps);
+            
+            EVariable blank = context.blank();
+            blank.getVariable().setType(pattern.getType());
+            
+            return new CompiledQualifier(
+                    context.concatMap(
+                            context.lambda(
+                                    new Case(pattern, context.singletonList(newPattern.copy())),
+                                    new Case(blank, context.emptyList(newPattern.getType()))
+                                    ), 
+                            value
+                            ), 
+                    newPattern);
+        }
+    }
+
+    @Override
+    public void resolve(TranslationContext context) {
+        value = value.resolve(context);
+        pattern = pattern.resolveAsPattern(context);
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            pattern.setLocationDeep(loc);
+            value.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ListQualifierVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    @Override
+    public ListQualifier accept(ListQualifierTransformer transformer) {
+        return transformer.transform(this);
+    }
+}