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%2FEWhen.java;h=df6d56888d22013fe9ff38a836ace4ecc188d836;hp=8021c407bee5687f055212c54db0ae157ef2c18a;hb=666ee533a3cfa9f59e79215a269f8342227cdbda;hpb=eecd74faded034bd067094b42bbac0d286d8d9fa

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EWhen.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EWhen.java
index 8021c407b..df6d56888 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EWhen.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EWhen.java
@@ -1,175 +1,131 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
-import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;
-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.query.QExists;
-import org.simantics.scl.compiler.elaboration.query.Query;
-import org.simantics.scl.compiler.elaboration.query.compilation.QueryCompilationContext;
-import org.simantics.scl.compiler.elaboration.query.compilation.QueryCompilationMode;
-import org.simantics.scl.compiler.elaboration.query.compilation.UnsolvableQueryException;
-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 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 EWhen extends SimplifiableExpression {
-
-    public Query query;
-    public Expression action;
-    Variable[] variables;
-    
-    public EWhen(Query query, Expression action) {
-        this.query = query;
-        this.action = action;
-    }
-    
-    public EWhen(long location, Query query, Expression action, Variable[] variables) {
-        if(variables == null)
-            throw new NullPointerException();
-        if(location == Locations.NO_LOCATION)
-            new Exception().printStackTrace();
-        this.location = location;
-        this.query = query;
-        this.action = action;
-        this.variables = variables;
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        query.collectRefs(allRefs, refs);
-        action.collectRefs(allRefs, refs);
-    }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        query.collectVars(allVars, vars);
-        action.collectVars(allVars, vars);
-    }
-    
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        throw new InternalCompilerError(location, getClass().getSimpleName() + " does not support collectEffects.");
-    }
-
-    @Override
-    protected void updateType() throws MatchException {
-        setType(Types.UNIT);
-    }
-    
-    @Override
-    public Expression checkBasicType(TypingContext context, Type requiredType) {
-        try {
-            Types.unify(requiredType, Types.UNIT);
-        } catch (UnificationException e) {
-            context.typeError(location, requiredType, Types.UNIT);
-            return this;
-        }
-        for(Variable variable : variables)
-            variable.setType(Types.metaVar(Kinds.STAR));
-        query.checkType(context);
-        action.checkIgnoredType(context);
-        
-        // Compile query
-        return compile(context);
-    }
-    
-    public Expression compile(TypingContext context) {
-        try {
-            QueryCompilationContext queryCompilationContext =
-                    new QueryCompilationContext(context, QueryCompilationMode.ITERATE, null, action);
-            new QExists(variables, query).generate(queryCompilationContext);
-            return queryCompilationContext.getContinuation();
-        } catch(UnsolvableQueryException e) {
-            context.getErrorLog().log(getLocation(), "Failed to compile the query.\n" +  e.getMessage());
-            return new EError(getLocation());
-        }
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        action.collectFreeVariables(vars);
-        query.collectFreeVariables(vars);
-        for(Variable var : variables)
-            vars.remove(var);
-    }
-
-    @Override
-    public Expression resolve(TranslationContext context) {
-        context.pushExistentialFrame();
-        query = query.resolve(context);
-        action = action.resolve(context);
-        variables = context.popExistentialFrame();
-        return this;
-    }
-
-    @Override
-    public Expression decorate(ExpressionDecorator decorator) {     
-        return decorator.decorate(this);
-    }
-    
-    @Override
-    public Expression replace(ReplaceContext context) {
-        Variable[] newVariables = new Variable[variables.length];
-        for(int i=0;i<variables.length;++i) {
-            Variable variable = variables[i];
-            Variable newVariable = new Variable(variable.name, variable.getType());
-            newVariables[i] = newVariable;
-            context.varMap.put(variable, new EVariable(newVariable));
-        }
-        EWhen result = new EWhen(location, query.replace(context), action.replace(context), newVariables);
-        for(int i=0;i<variables.length;++i)
-            context.varMap.remove(variables[i]);
-        return result;
-    }
-
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            query.setLocationDeep(loc);
-            action.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(ExpressionVisitor visitor) {
-        visitor.visit(this);
-    }
-    
-    public Query getQuery() {
-        return query;
-    }
-    
-    public Expression getAction() {
-        return action;
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        query.forVariables(procedure);
-        action.forVariables(procedure);
-    }
-    
-    @Override
-    public Expression simplify(SimplificationContext context) {
-        throw new UnsupportedOperationException();
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
+package org.simantics.scl.compiler.elaboration.expressions;
+
+import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;
+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.query.QExists;
+import org.simantics.scl.compiler.elaboration.query.Query;
+import org.simantics.scl.compiler.elaboration.query.compilation.QueryCompilationContext;
+import org.simantics.scl.compiler.elaboration.query.compilation.QueryCompilationMode;
+import org.simantics.scl.compiler.elaboration.query.compilation.UnsolvableQueryException;
+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 org.simantics.scl.compiler.types.exceptions.UnificationException;
+import org.simantics.scl.compiler.types.kinds.Kinds;
+
+public class EWhen extends SimplifiableExpression {
+
+    public Query query;
+    public Expression action;
+    public Variable[] variables;
+    
+    public EWhen(Query query, Expression action) {
+        this.query = query;
+        this.action = action;
+    }
+    
+    public EWhen(long location, Query query, Expression action, Variable[] variables) {
+        if(variables == null)
+            throw new NullPointerException();
+        if(location == Locations.NO_LOCATION)
+            new Exception().printStackTrace();
+        this.location = location;
+        this.query = query;
+        this.action = action;
+        this.variables = variables;
+    }
+
+    @Override
+    protected void updateType() throws MatchException {
+        setType(Types.UNIT);
+    }
+    
+    @Override
+    public Expression checkBasicType(TypingContext context, Type requiredType) {
+        try {
+            Types.unify(requiredType, Types.UNIT);
+        } catch (UnificationException e) {
+            context.typeError(location, requiredType, Types.UNIT);
+            return this;
+        }
+        for(Variable variable : variables)
+            variable.setType(Types.metaVar(Kinds.STAR));
+        query.checkType(context);
+        action.checkIgnoredType(context);
+        
+        // Compile query
+        return compile(context);
+    }
+    
+    public Expression compile(TypingContext context) {
+        try {
+            QueryCompilationContext queryCompilationContext =
+                    new QueryCompilationContext(context, QueryCompilationMode.ITERATE, null, action);
+            new QExists(variables, query).generate(queryCompilationContext);
+            return queryCompilationContext.getContinuation();
+        } catch(UnsolvableQueryException e) {
+            context.getErrorLog().log(getLocation(), "Failed to compile the query.\n" +  e.getMessage());
+            return new EError(getLocation());
+        }
+    }
+
+    @Override
+    public Expression resolve(TranslationContext context) {
+        context.pushExistentialFrame();
+        query = query.resolve(context);
+        action = action.resolve(context);
+        variables = context.popExistentialFrame();
+        return this;
+    }
+    
+    @Override
+    public Expression replace(ReplaceContext context) {
+        Variable[] newVariables = new Variable[variables.length];
+        for(int i=0;i<variables.length;++i) {
+            Variable variable = variables[i];
+            Variable newVariable = new Variable(variable.name, variable.getType());
+            newVariables[i] = newVariable;
+            context.varMap.put(variable, new EVariable(newVariable));
+        }
+        EWhen result = new EWhen(location, query.replace(context), action.replace(context), newVariables);
+        for(int i=0;i<variables.length;++i)
+            context.varMap.remove(variables[i]);
+        return result;
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            query.setLocationDeep(loc);
+            action.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ExpressionVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    public Query getQuery() {
+        return query;
+    }
+    
+    public Expression getAction() {
+        return action;
+    }
+    
+    @Override
+    public Expression simplify(SimplificationContext context) {
+        throw new UnsupportedOperationException();
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+
+}