Merged changes from feature/scl to master.

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

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 b49999c06e72c35b021f99bacba81c02b54dd2b9..faadca33e0f10ccbf0f5059ed7c4742d904e4c42 100644 (file)
--- 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,6 +1,6 @@
 package org.simantics.scl.compiler.elaboration.expressions;\r
 \r
 package org.simantics.scl.compiler.elaboration.expressions;\r
 \r

-import org.simantics.scl.compiler.common.names.Name;\r
+import org.simantics.scl.compiler.common.names.Names;\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.elaboration.contexts.SimplificationContext;\r
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;\r
 import org.simantics.scl.compiler.elaboration.contexts.TypingContext;\r


@@ -80,10 +80,6 @@ public class EFieldAccess extends SimplifiableExpression {
             accessor.collectFreeVariables(vars);\r
     }\r
 \r
             accessor.collectFreeVariables(vars);\r
     }\r
 \r

-    private static final Name CHILD = Name.create("Simantics/Variables", "child_");\r
-    private static final Name PROPERTY = Name.create("Simantics/Variables", "property");\r
-    private static final Name PROPERTY_VALUE = Name.create("Simantics/Variables", "untypedPropertyValue");\r
-\r

     @Override\r
     public Expression simplify(SimplificationContext context) {\r
         // Simplify subexpressions\r
     @Override\r
     public Expression simplify(SimplificationContext context) {\r
         // Simplify subexpressions\r


@@ -99,7 +95,7 @@ public class EFieldAccess extends SimplifiableExpression {
                 result = new EApply(\r
                         getLocation(),\r
                         Types.READ_GRAPH,\r
                 result = new EApply(\r
                         getLocation(),\r
                         Types.READ_GRAPH,\r

-                        context.getConstant(CHILD),\r
+                        context.getConstant(Names.Simantics_Variables_child_),\r

                         result,\r
                         accessor.asExpression()\r
                         );\r
                         result,\r
                         accessor.asExpression()\r
                         );\r


@@ -107,7 +103,7 @@ public class EFieldAccess extends SimplifiableExpression {
                 result = new EApply(\r
                         getLocation(),\r
                         Types.READ_GRAPH,\r
                 result = new EApply(\r
                         getLocation(),\r
                         Types.READ_GRAPH,\r

-                        context.getConstant(PROPERTY),\r
+                        context.getConstant(Names.Simantics_Variables_property),\r

                         result,\r
                         accessor.asExpression()\r
                         );\r
                         result,\r
                         accessor.asExpression()\r
                         );\r


@@ -117,7 +113,7 @@ public class EFieldAccess extends SimplifiableExpression {
                 result = new EApply(\r
                         getLocation(),\r
                         Types.READ_GRAPH,\r
                 result = new EApply(\r
                         getLocation(),\r
                         Types.READ_GRAPH,\r

-                        context.getConstant(PROPERTY_VALUE, getType()),\r
+                        context.getConstant(Names.Simantics_Variables_untypedPropertyValue, getType()),\r

                         result,\r
                         accessor.asExpression()\r
                         );\r
                         result,\r
                         accessor.asExpression()\r
                         );\r