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%2FETransformation.java;h=e6f57ac861ce2b0440400c90bbbdfdee82283b06;hp=24584fe65cee8a0a457925bcba857ce2aa4c2927;hb=6dfe20b0f514b91337fcac4de0267ffd8268be07;hpb=3303fe4a3b363e88662ac75a4f7e873ddb3ab352

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ETransformation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ETransformation.java
index 24584fe65..e6f57ac86 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ETransformation.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ETransformation.java
@@ -1,131 +1,96 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
-import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
-import org.simantics.scl.compiler.elaboration.query.Query;
-import org.simantics.scl.compiler.elaboration.rules.TransformationRule;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.elaboration.transformations.TransformationBuilder;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
-import org.simantics.scl.compiler.top.SCLCompilerConfiguration;
-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 ETransformation extends SimplifiableExpression {
-    public static final Object TRANSFORMATION_RULES_TYPECHECKED = new Object();
-    
-    public final String name;
-    public Query seed;
-    
-    public ETransformation(String name, Query seed) {
-        this.name = name;
-        this.seed = seed;
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        {
-            int ref = allRefs.get(TRANSFORMATION_RULES_TYPECHECKED);
-            if(ref >= 0)
-                refs.add(ref);
-        }
-        seed.collectRefs(allRefs, refs);
-    }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        seed.collectVars(allVars, vars);
-    }
-
-    @Override
-    protected void updateType() throws MatchException {
-        setType(Types.UNIT);
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        seed.collectFreeVariables(vars);
-    }
-    
-    @Override
-    public Expression inferType(TypingContext context) {
-        context.declareEffect(location, Types.PROC);
-        seed.checkType(context);
-        return compile(context);
-    }
-
-    private Expression compile(TypingContext context) {
-        ArrayList<TransformationRule> rules = new ArrayList<TransformationRule>(); 
-        context.getEnvironment().collectRules(rules);
-        Collections.sort(rules, new Comparator<TransformationRule>() {
-            @Override
-            public int compare(TransformationRule o1, TransformationRule o2) {
-                return Integer.compare(Locations.beginOf(o1.location), Locations.beginOf(o2.location));
-            }
-        });
-       
-        // Translation
-        TransformationBuilder tb = new TransformationBuilder(context.getErrorLog(), context);
-        tb.handleSeed(seed);
-        for(TransformationRule rule : rules)
-            if(!rule.isAbstract)
-                tb.handleRule(rule);
-        Expression expression = tb.compileRules();
-        
-        if(SCLCompilerConfiguration.SHOW_COMPILED_RULES)
-            System.out.println(expression);
-        return expression;
-    }
-
-    @Override
-    public Expression resolve(TranslationContext context) {
-        seed = seed.resolve(context);
-        return this;
-    }
-
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            seed.setLocationDeep(loc);
-        }
-    }
-
-    @Override
-    public Expression decorate(ExpressionDecorator decorator) {
-        return decorator.decorate(this);
-    }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        effects.add(Types.PROC);
-        //seed.collectEffects(Query.RW, effects); // FIXME
-    }
-
-    @Override
-    public void accept(ExpressionVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        seed.forVariables(procedure);
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
+package org.simantics.scl.compiler.elaboration.expressions;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
+import org.simantics.scl.compiler.elaboration.query.Query;
+import org.simantics.scl.compiler.elaboration.rules.TransformationRule;
+import org.simantics.scl.compiler.errors.Locations;
+import org.simantics.scl.compiler.internal.elaboration.transformations.TransformationBuilder;
+import org.simantics.scl.compiler.top.SCLCompilerConfiguration;
+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.TIntHashSet;
+
+public class ETransformation extends SimplifiableExpression {
+    public static final Object TRANSFORMATION_RULES_TYPECHECKED = new Object();
+    
+    public final String name;
+    public Query seed;
+    
+    public ETransformation(String name, Query seed) {
+        this.name = name;
+        this.seed = seed;
+    }
+
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars,
+            TIntHashSet vars) {
+        seed.collectVars(allVars, vars);
+    }
+
+    @Override
+    protected void updateType() throws MatchException {
+        setType(Types.UNIT);
+    }
+    
+    @Override
+    public Expression inferType(TypingContext context) {
+        context.declareEffect(location, Types.PROC);
+        seed.checkType(context);
+        return compile(context);
+    }
+
+    private Expression compile(TypingContext context) {
+        ArrayList<TransformationRule> rules = new ArrayList<TransformationRule>(); 
+        context.getEnvironment().collectRules(rules);
+        Collections.sort(rules, new Comparator<TransformationRule>() {
+            @Override
+            public int compare(TransformationRule o1, TransformationRule o2) {
+                return Integer.compare(Locations.beginOf(o1.location), Locations.beginOf(o2.location));
+            }
+        });
+       
+        // Translation
+        TransformationBuilder tb = new TransformationBuilder(context.getErrorLog(), context);
+        tb.handleSeed(seed);
+        for(TransformationRule rule : rules)
+            if(!rule.isAbstract)
+                tb.handleRule(rule);
+        Expression expression = tb.compileRules();
+        
+        if(SCLCompilerConfiguration.SHOW_COMPILED_RULES)
+            System.out.println(expression);
+        return expression;
+    }
+
+    @Override
+    public Expression resolve(TranslationContext context) {
+        seed = seed.resolve(context);
+        return this;
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            seed.setLocationDeep(loc);
+        }
+    }
+
+    @Override
+    public void accept(ExpressionVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+
+}