package org.simantics.scl.compiler.elaboration.expressions;\r
\r
-import gnu.trove.map.hash.TObjectIntHashMap;\r
-import gnu.trove.set.hash.THashSet;\r
-import gnu.trove.set.hash.TIntHashSet;\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.types.Types;\r
import org.simantics.scl.compiler.types.exceptions.MatchException;\r
\r
+import gnu.trove.map.hash.TObjectIntHashMap;\r
+import gnu.trove.set.hash.THashSet;\r
+import gnu.trove.set.hash.TIntHashSet;\r
+\r
public class EFieldAccess extends SimplifiableExpression {\r
\r
private static final Type VARIABLE = Types.con("Simantics/Variables", "Variable");\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
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 = 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 = 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