(refs #7375) Replaced collectEffects by CollectEffectsVisitor

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / expressions / EGetConstraint.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EGetConstraint.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EGetConstraint.java
old mode 100755 (executable)
new mode 100644 (file)
index ef5412c..95948d4
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EGetConstraint.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EGetConstraint.java
@@ -1,101 +1,80 @@
-package org.simantics.scl.compiler.elaboration.expressions;\r
-\r
-import gnu.trove.map.hash.TObjectIntHashMap;\r
-import gnu.trove.set.hash.THashSet;\r
-import gnu.trove.set.hash.TIntHashSet;\r
-\r
-import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;\r
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;\r
-import org.simantics.scl.compiler.elaboration.contexts.TypingContext;\r
-import org.simantics.scl.compiler.errors.Locations;\r
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;\r
-import org.simantics.scl.compiler.types.TPred;\r
-import org.simantics.scl.compiler.types.Type;\r
-import org.simantics.scl.compiler.types.exceptions.MatchException;\r
-\r
-public class EGetConstraint extends SimplifiableExpression {\r
-    TPred constraint;\r
-    EVariable evidence;\r
-        \r
-    public EGetConstraint(long loc, TPred constraint) {\r
-        super(loc);\r
-        this.constraint = constraint;\r
-    }\r
-\r
-    @Override\r
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,\r
-            TIntHashSet refs) {\r
-    }\r
-    \r
-    @Override\r
-    public void collectVars(TObjectIntHashMap<Variable> allVars,\r
-            TIntHashSet vars) {\r
-        if(evidence != null)\r
-            evidence.collectVars(allVars, vars);        \r
-    }\r
-    \r
-    @Override\r
-    public Expression inferType(TypingContext context) {\r
-        Variable variable = new Variable("evidence");\r
-        variable.setType(constraint);\r
-        evidence = new EVariable(getLocation(), variable);\r
-        evidence.setType(variable.getType());\r
-        context.addConstraintDemand(evidence);\r
-        return this;\r
-    }\r
-    \r
-    @Override\r
-    protected void updateType() throws MatchException {\r
-        setType(constraint);\r
-    }\r
-    \r
-    @Override\r
-    public void collectFreeVariables(THashSet<Variable> vars) {\r
-        if(evidence != null)\r
-            evidence.collectFreeVariables(vars);\r
-    }\r
-    \r
-    @Override\r
-    public Expression simplify(SimplificationContext context) {\r
-        return evidence.simplify(context);\r
-    }\r
-    \r
-    @Override\r
-    public Expression resolve(TranslationContext context) {\r
-        return this;\r
-    }\r
-    \r
-    @Override\r
-    public Expression decorate(ExpressionDecorator decorator) {     \r
-        return decorator.decorate(this);\r
-    }\r
-\r
-    @Override\r
-    public void collectEffects(THashSet<Type> effects) {\r
-    }\r
-    \r
-    @Override\r
-    public void setLocationDeep(long loc) {\r
-        if(location == Locations.NO_LOCATION) {\r
-            location = loc;\r
-            if(evidence != null)\r
-                evidence.setLocationDeep(loc);\r
-        }\r
-    }\r
-    \r
-    @Override\r
-    public void accept(ExpressionVisitor visitor) {\r
-        visitor.visit(this);\r
-    }\r
-\r
-    @Override\r
-    public void forVariables(VariableProcedure procedure) {\r
-        evidence.forVariables(procedure);\r
-    }\r
-    \r
-    @Override\r
-    public Expression accept(ExpressionTransformer transformer) {\r
-        return transformer.transform(this);\r
-    }\r
-\r
-}\r
+package org.simantics.scl.compiler.elaboration.expressions;
+
+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.errors.Locations;
+import org.simantics.scl.compiler.types.TPred;
+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 EGetConstraint extends SimplifiableExpression {
+    TPred constraint;
+    EVariable evidence;
+        
+    public EGetConstraint(long loc, TPred constraint) {
+        super(loc);
+        this.constraint = constraint;
+    }
+    
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars,
+            TIntHashSet vars) {
+        if(evidence != null)
+            evidence.collectVars(allVars, vars);        
+    }
+    
+    @Override
+    public Expression inferType(TypingContext context) {
+        Variable variable = new Variable("evidence");
+        variable.setType(constraint);
+        evidence = new EVariable(getLocation(), variable);
+        evidence.setType(variable.getType());
+        context.addConstraintDemand(evidence);
+        return this;
+    }
+    
+    @Override
+    protected void updateType() throws MatchException {
+        setType(constraint);
+    }
+    
+    @Override
+    public void collectFreeVariables(THashSet<Variable> vars) {
+        if(evidence != null)
+            evidence.collectFreeVariables(vars);
+    }
+    
+    @Override
+    public Expression simplify(SimplificationContext context) {
+        return evidence.simplify(context);
+    }
+    
+    @Override
+    public Expression resolve(TranslationContext context) {
+        return this;
+    }
+    
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            if(evidence != null)
+                evidence.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ExpressionVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+
+}