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%2FEEnforce.java;h=9b0a13b20180da7026c5e4ad232931d2d7d7ca03;hp=11bc4b63357f3f459a61d6505b629d63a9a029d7;hb=a8d72a172fdc815c8a9f0f584f010f7e35286f92;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEnforce.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEnforce.java
index 11bc4b633..9b0a13b20 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEnforce.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEnforce.java
@@ -1,121 +1,98 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
-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.EnforcingContext;
-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;
-
-public class EEnforce extends SimplifiableExpression {
-    
-    Query query;
-    
-    public EEnforce(Query query) {
-        this.query = query;
-    }
-    
-    public Query getQuery() {
-        return query;
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        query.collectRefs(allRefs, refs);
-    }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        query.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.tupleConstructor(0));
-    }
-    
-    @Override
-    public Expression inferType(TypingContext context) {
-        query.checkType(context);
-        //context.declareEffect(location, query.getEffect(Query.W));
-        return compile(context);
-    }
-    
-    public Expression compile(TypingContext context) {
-        return query.generateEnforce(new EnforcingContext(context));
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        query.collectFreeVariables(vars);
-    }
-
-    @Override
-    public Expression simplify(SimplificationContext context) {
-        /*query = query.simplify(context);
-        return query.generateEnforce(context);*/
-        throw new InternalCompilerError();
-    }
-
-    @Override
-    public Expression resolve(TranslationContext context) {
-        context.pushExistentialFrame();
-        query = query.resolve(context);
-        Variable[] variables = context.popExistentialFrame();
-        if(variables.length > 0)
-            query = new QExists(variables, query);
-        return this;
-    }
-
-    @Override
-    public Expression decorate(ExpressionDecorator decorator) {     
-        return decorator.decorate(this);
-    }
-    
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            query.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(ExpressionVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        query.forVariables(procedure);
-    }
-    
-    @Override
-    public Expression replace(ReplaceContext context) {
-        return new EEnforce(query.replace(context));
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
+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.EnforcingContext;
+import org.simantics.scl.compiler.errors.Locations;
+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 EEnforce extends SimplifiableExpression {
+    
+    Query query;
+    
+    public EEnforce(Query query) {
+        this.query = query;
+    }
+    
+    public Query getQuery() {
+        return query;
+    }
+
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars,
+            TIntHashSet vars) {
+        query.collectVars(allVars, vars);
+    }
+
+    @Override
+    protected void updateType() throws MatchException {
+        setType(Types.tupleConstructor(0));
+    }
+    
+    @Override
+    public Expression inferType(TypingContext context) {
+        query.checkType(context);
+        //context.declareEffect(location, query.getEffect(Query.W));
+        return compile(context);
+    }
+    
+    public Expression compile(TypingContext context) {
+        return query.generateEnforce(new EnforcingContext(context));
+    }
+
+    @Override
+    public void collectFreeVariables(THashSet<Variable> vars) {
+        query.collectFreeVariables(vars);
+    }
+
+    @Override
+    public Expression simplify(SimplificationContext context) {
+        /*query = query.simplify(context);
+        return query.generateEnforce(context);*/
+        throw new InternalCompilerError();
+    }
+
+    @Override
+    public Expression resolve(TranslationContext context) {
+        context.pushExistentialFrame();
+        query = query.resolve(context);
+        Variable[] variables = context.popExistentialFrame();
+        if(variables.length > 0)
+            query = new QExists(variables, query);
+        return this;
+    }
+    
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            query.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ExpressionVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    @Override
+    public Expression replace(ReplaceContext context) {
+        return new EEnforce(query.replace(context));
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+
+}