X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FEFieldAccess.java;h=faadca33e0f10ccbf0f5059ed7c4742d904e4c42;hp=bcb7bf37b867d300306aa17ed8e4727c0e94212b;hb=1b4d8b692f40d946deb5db8280eb4ca5b36a75a7;hpb=969bd23cab98a79ca9101af33334000879fb60c5

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 bcb7bf37b..faadca33e 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,10 +1,6 @@
 package org.simantics.scl.compiler.elaboration.expressions;
 
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
-import org.simantics.scl.compiler.common.names.Name;
+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;
@@ -15,6 +11,10 @@ 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");
@@ -80,10 +80,6 @@ public class EFieldAccess extends SimplifiableExpression {
             accessor.collectFreeVariables(vars);
     }
 
-    private static final Name CHILD = Name.create("Simantics/Variables", "child_");
-    private static final Name PROPERTY = Name.create("Simantics/Variables", "property");
-    private static final Name PROPERTY_VALUE = Name.create("Simantics/Variables", "untypedPropertyValue");
-
     @Override
     public Expression simplify(SimplificationContext context) {
         // Simplify subexpressions
@@ -99,7 +95,7 @@ public class EFieldAccess extends SimplifiableExpression {
                 result = new EApply(
                         getLocation(),
                         Types.READ_GRAPH,
-                        context.getConstant(CHILD),
+                        context.getConstant(Names.Simantics_Variables_child_),
                         result,
                         accessor.asExpression()
                         );
@@ -107,7 +103,7 @@ public class EFieldAccess extends SimplifiableExpression {
                 result = new EApply(
                         getLocation(),
                         Types.READ_GRAPH,
-                        context.getConstant(PROPERTY),
+                        context.getConstant(Names.Simantics_Variables_property),
                         result,
                         accessor.asExpression()
                         );
@@ -117,7 +113,7 @@ public class EFieldAccess extends SimplifiableExpression {
                 result = new EApply(
                         getLocation(),
                         Types.READ_GRAPH,
-                        context.getConstant(PROPERTY_VALUE, getType()),
+                        context.getConstant(Names.Simantics_Variables_untypedPropertyValue, getType()),
                         result,
                         accessor.asExpression()
                         );