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%2FEFieldAccess.java;fp=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FEFieldAccess.java;h=4ebd0248d5f799d1fdfe2023cee77f93d0db7f31;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=faadca33e0f10ccbf0f5059ed7c4742d904e4c42;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EFieldAccess.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EFieldAccess.java
index faadca33e..4ebd0248d 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EFieldAccess.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EFieldAccess.java
@@ -1,178 +1,178 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-import org.simantics.scl.compiler.common.names.Names;
-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.accessor.FieldAccessor;
-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 gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
-public class EFieldAccess extends SimplifiableExpression {
-
-    private static final Type VARIABLE = Types.con("Simantics/Variables", "Variable");
-    
-    Expression parent;
-    FieldAccessor[] accessors;
-
-    public EFieldAccess(Expression parent, FieldAccessor[] accessors) {
-        if(parent instanceof EFieldAccess) {
-            EFieldAccess parentAccess = (EFieldAccess)parent;
-            parent = parentAccess.parent;
-            accessors = concat(parentAccess.accessors, accessors);
-        }
-        this.parent = parent;
-        this.accessors = accessors;
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-        parent.collectRefs(allRefs, refs);
-        for(FieldAccessor accessor : accessors)
-            accessor.collectRefs(allRefs, refs);
-    }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-        parent.collectVars(allVars, vars);
-        for(FieldAccessor accessor : accessors)
-            accessor.collectVars(allVars, vars);
-    }
-
-    private boolean returnsValue() {
-        FieldAccessor lastAccessor = accessors[accessors.length-1];
-        return lastAccessor.accessSeparator=='#' && !lastAccessor.isVariableId();
-    }
-
-    @Override
-    protected void updateType() throws MatchException {
-        // Type is already updated in checkBasicType
-    }
-    
-    @Override
-    public Expression checkBasicType(TypingContext context, Type requiredType) {
-        if(returnsValue())
-            setType(requiredType);
-        else {
-            setType(VARIABLE);
-            context.subsume(this, requiredType);
-        }
-        parent = parent.checkType(context, VARIABLE);
-        for(FieldAccessor accessor : accessors)
-            accessor.checkType(context);
-        context.declareEffect(getLocation(), Types.READ_GRAPH);
-        return this;
-    }
-
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        parent.collectFreeVariables(vars);
-        for(FieldAccessor accessor : accessors)
-            accessor.collectFreeVariables(vars);
-    }
-
-    @Override
-    public Expression simplify(SimplificationContext context) {
-        // Simplify subexpressions
-        parent = parent.simplify(context);
-        for(FieldAccessor accessor : accessors)
-            accessor.simplify(context);
-        
-        // ...
-        Expression result = parent;
-        for(int i=0;i<accessors.length;++i) {
-            FieldAccessor accessor = accessors[i];
-            if(accessor.accessSeparator == '.')
-                result = new EApply(
-                        getLocation(),
-                        Types.READ_GRAPH,
-                        context.getConstant(Names.Simantics_Variables_child_),
-                        result,
-                        accessor.asExpression()
-                        );
-            else if(i < accessors.length-1)
-                result = new EApply(
-                        getLocation(),
-                        Types.READ_GRAPH,
-                        context.getConstant(Names.Simantics_Variables_property),
-                        result,
-                        accessor.asExpression()
-                        );
-            else if(accessor.isVariableId())
-                ;
-            else
-                result = new EApply(
-                        getLocation(),
-                        Types.READ_GRAPH,
-                        context.getConstant(Names.Simantics_Variables_untypedPropertyValue, getType()),
-                        result,
-                        accessor.asExpression()
-                        );
-        }
-        return result;
-    }
-
-    private static FieldAccessor[] concat(FieldAccessor[] accessors1,
-            FieldAccessor[] accessors2) {
-        FieldAccessor[] result = new FieldAccessor[accessors1.length + accessors2.length];
-        System.arraycopy(accessors1, 0, result, 0, accessors1.length);
-        System.arraycopy(accessors2, 0, result, accessors1.length, accessors2.length);
-        return result;
-    }
-
-    @Override
-    public Expression resolve(TranslationContext context) {
-        parent = parent.resolve(context);
-        for(FieldAccessor accessor : accessors)
-            accessor.resolve(context);
-        return this;
-    }
-
-    @Override
-    public Expression decorate(ExpressionDecorator decorator) {
-        return decorator.decorate(this);
-    }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-        // FIXME
-        effects.add(Types.READ_GRAPH);
-    }
-    
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            parent.setLocationDeep(loc);
-            for(FieldAccessor accessor : accessors)
-                accessor.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(ExpressionVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        parent.forVariables(procedure);
-        for(FieldAccessor accessor : accessors)
-            accessor.forVariables(procedure);
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
+package org.simantics.scl.compiler.elaboration.expressions;
+
+import org.simantics.scl.compiler.common.names.Names;
+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.accessor.FieldAccessor;
+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 gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.THashSet;
+import gnu.trove.set.hash.TIntHashSet;
+
+public class EFieldAccess extends SimplifiableExpression {
+
+    private static final Type VARIABLE = Types.con("Simantics/Variables", "Variable");
+    
+    Expression parent;
+    FieldAccessor[] accessors;
+
+    public EFieldAccess(Expression parent, FieldAccessor[] accessors) {
+        if(parent instanceof EFieldAccess) {
+            EFieldAccess parentAccess = (EFieldAccess)parent;
+            parent = parentAccess.parent;
+            accessors = concat(parentAccess.accessors, accessors);
+        }
+        this.parent = parent;
+        this.accessors = accessors;
+    }
+
+    @Override
+    public void collectRefs(TObjectIntHashMap<Object> allRefs,
+            TIntHashSet refs) {
+        parent.collectRefs(allRefs, refs);
+        for(FieldAccessor accessor : accessors)
+            accessor.collectRefs(allRefs, refs);
+    }
+
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars,
+            TIntHashSet vars) {
+        parent.collectVars(allVars, vars);
+        for(FieldAccessor accessor : accessors)
+            accessor.collectVars(allVars, vars);
+    }
+
+    private boolean returnsValue() {
+        FieldAccessor lastAccessor = accessors[accessors.length-1];
+        return lastAccessor.accessSeparator=='#' && !lastAccessor.isVariableId();
+    }
+
+    @Override
+    protected void updateType() throws MatchException {
+        // Type is already updated in checkBasicType
+    }
+    
+    @Override
+    public Expression checkBasicType(TypingContext context, Type requiredType) {
+        if(returnsValue())
+            setType(requiredType);
+        else {
+            setType(VARIABLE);
+            context.subsume(this, requiredType);
+        }
+        parent = parent.checkType(context, VARIABLE);
+        for(FieldAccessor accessor : accessors)
+            accessor.checkType(context);
+        context.declareEffect(getLocation(), Types.READ_GRAPH);
+        return this;
+    }
+
+    @Override
+    public void collectFreeVariables(THashSet<Variable> vars) {
+        parent.collectFreeVariables(vars);
+        for(FieldAccessor accessor : accessors)
+            accessor.collectFreeVariables(vars);
+    }
+
+    @Override
+    public Expression simplify(SimplificationContext context) {
+        // Simplify subexpressions
+        parent = parent.simplify(context);
+        for(FieldAccessor accessor : accessors)
+            accessor.simplify(context);
+        
+        // ...
+        Expression result = parent;
+        for(int i=0;i<accessors.length;++i) {
+            FieldAccessor accessor = accessors[i];
+            if(accessor.accessSeparator == '.')
+                result = new EApply(
+                        getLocation(),
+                        Types.READ_GRAPH,
+                        context.getConstant(Names.Simantics_Variables_child_),
+                        result,
+                        accessor.asExpression()
+                        );
+            else if(i < accessors.length-1)
+                result = new EApply(
+                        getLocation(),
+                        Types.READ_GRAPH,
+                        context.getConstant(Names.Simantics_Variables_property),
+                        result,
+                        accessor.asExpression()
+                        );
+            else if(accessor.isVariableId())
+                ;
+            else
+                result = new EApply(
+                        getLocation(),
+                        Types.READ_GRAPH,
+                        context.getConstant(Names.Simantics_Variables_untypedPropertyValue, getType()),
+                        result,
+                        accessor.asExpression()
+                        );
+        }
+        return result;
+    }
+
+    private static FieldAccessor[] concat(FieldAccessor[] accessors1,
+            FieldAccessor[] accessors2) {
+        FieldAccessor[] result = new FieldAccessor[accessors1.length + accessors2.length];
+        System.arraycopy(accessors1, 0, result, 0, accessors1.length);
+        System.arraycopy(accessors2, 0, result, accessors1.length, accessors2.length);
+        return result;
+    }
+
+    @Override
+    public Expression resolve(TranslationContext context) {
+        parent = parent.resolve(context);
+        for(FieldAccessor accessor : accessors)
+            accessor.resolve(context);
+        return this;
+    }
+
+    @Override
+    public Expression decorate(ExpressionDecorator decorator) {
+        return decorator.decorate(this);
+    }
+
+    @Override
+    public void collectEffects(THashSet<Type> effects) {
+        // FIXME
+        effects.add(Types.READ_GRAPH);
+    }
+    
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            parent.setLocationDeep(loc);
+            for(FieldAccessor accessor : accessors)
+                accessor.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ExpressionVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void forVariables(VariableProcedure procedure) {
+        parent.forVariables(procedure);
+        for(FieldAccessor accessor : accessors)
+            accessor.forVariables(procedure);
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+
+}