Merge "(refs #7375) Replace collectRefs by CollectRefsVisitor"

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ASTExpression.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ASTExpression.java
index fbc0a79014dcb107c3b17842ef5bbb06fddaac8b..fa54f8ab28e3acf80b3044375b38c4d35b1d7dc1 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ASTExpression.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ASTExpression.java
@@ -3,7 +3,7 @@ package org.simantics.scl.compiler.elaboration.expressions;
 import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
 import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
 import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
+import org.simantics.scl.compiler.errors.Locations;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.exceptions.MatchException;
 
@@ -23,13 +23,6 @@ public abstract class ASTExpression extends SimplifiableExpression {
     @Override
     final public void collectFreeVariables(THashSet<Variable> vars) {
         throw new InternalCompilerError(getClass().getSimpleName() + " does not support collectFreeVariables.");
-
-    }
-    
-    @Override
-    final public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        throw new InternalCompilerError(getClass().getSimpleName() + " does not support collectRefs.");
     }
     
     @Override
@@ -43,11 +36,6 @@ public abstract class ASTExpression extends SimplifiableExpression {
         throw new InternalCompilerError(getClass().getSimpleName() + " does not support updateType.");
     }
     
-    @Override
-    final public Expression decorate(ExpressionDecorator decorator) {
-        throw new InternalCompilerError(getClass().getSimpleName() + " does not support decorate.");
-    }
-    
     @Override
     final public void collectEffects(THashSet<Type> effects) {
         throw new InternalCompilerError(getClass().getSimpleName() + " does not support collectEffects.");
@@ -58,6 +46,11 @@ public abstract class ASTExpression extends SimplifiableExpression {
         throw new InternalCompilerError(getClass().getSimpleName() + " does not support accept.");
     }
     
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        throw new InternalCompilerError(getClass().getSimpleName() + " does not support accept.");
+    }
+    
     @Override
     public Expression checkBasicType(TypingContext context, Type requiredType) {
         throw new InternalCompilerError("Class " + 
@@ -71,8 +64,8 @@ public abstract class ASTExpression extends SimplifiableExpression {
     }
     
     @Override
-    public void forVariables(VariableProcedure procedure) {
-        throw new InternalCompilerError("Class " + 
-                getClass().getSimpleName() + " does not implement method forVariables.");
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION)
+            location = loc;
     }
 }