X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2Faccessor%2FExpressionAccessor.java;h=e4cdd0937f7027e0498f270d79a0126de5676488;hb=refs%2Fchanges%2F50%2F750%2F1;hp=db1da2bd8fee8e976dfdb557980d8c82c1eca11d;hpb=eecd74faded034bd067094b42bbac0d286d8d9fa;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/ExpressionAccessor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/ExpressionAccessor.java
index db1da2bd8..e4cdd0937 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/ExpressionAccessor.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/ExpressionAccessor.java
@@ -1,83 +1,72 @@
-package org.simantics.scl.compiler.elaboration.expressions.accessor;
-
-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.expressions.Expression;
-import org.simantics.scl.compiler.elaboration.expressions.Variable;
-import org.simantics.scl.compiler.elaboration.expressions.VariableProcedure;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
-import org.simantics.scl.compiler.types.Types;
-
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
-public class ExpressionAccessor extends FieldAccessor {
-    public Expression fieldName;
-
-    public ExpressionAccessor(Expression fieldName) {
-        this.fieldName = fieldName;
-    }
-    
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        fieldName.collectFreeVariables(vars);
-    }
-    
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        fieldName.collectRefs(allRefs, refs);
-    }
-    
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        fieldName.collectVars(allVars, vars);
-    }
-    
-    @Override
-    public void decorate(ExpressionDecorator decorator) {
-        fieldName = fieldName.decorate(decorator);
-    }
-    
-    @Override
-    public void resolve(TranslationContext context) {
-        fieldName = fieldName.resolve(context);
-    }
-    
-    @Override
-    public void simplify(SimplificationContext context) {
-        fieldName = fieldName.simplify(context);
-    }
-    
-    @Override
-    public void checkType(TypingContext context) {
-        fieldName = fieldName.checkType(context, Types.STRING);
-    }
-
-    @Override
-    public Expression asExpression() {
-        return fieldName;
-    }
-
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            fieldName.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(FieldAccessorVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        fieldName.forVariables(procedure);
-    }
-}
+package org.simantics.scl.compiler.elaboration.expressions.accessor;
+
+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.expressions.Expression;
+import org.simantics.scl.compiler.elaboration.expressions.Variable;
+import org.simantics.scl.compiler.errors.Locations;
+import org.simantics.scl.compiler.types.Types;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.THashSet;
+import gnu.trove.set.hash.TIntHashSet;
+
+public class ExpressionAccessor extends FieldAccessor {
+    public Expression fieldName;
+
+    public ExpressionAccessor(char accessSeparator, Expression fieldName) {
+        super(accessSeparator);
+        this.fieldName = fieldName;
+    }
+    
+    @Override
+    public void collectFreeVariables(THashSet<Variable> vars) {
+        fieldName.collectFreeVariables(vars);
+    }
+    
+    @Override
+    public void collectRefs(TObjectIntHashMap<Object> allRefs,
+            TIntHashSet refs) {
+        fieldName.collectRefs(allRefs, refs);
+    }
+    
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars,
+            TIntHashSet vars) {
+        fieldName.collectVars(allVars, vars);
+    }
+    
+    @Override
+    public void resolve(TranslationContext context) {
+        fieldName = fieldName.resolve(context);
+    }
+    
+    @Override
+    public void simplify(SimplificationContext context) {
+        fieldName = fieldName.simplify(context);
+    }
+    
+    @Override
+    public void checkType(TypingContext context) {
+        fieldName = fieldName.checkType(context, Types.STRING);
+    }
+
+    @Override
+    public Expression asExpression() {
+        return fieldName;
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            fieldName.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(FieldAccessorVisitor visitor) {
+        visitor.visit(this);
+    }
+}