Merged changes from feature/scl to master.

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ESelect.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ESelect.java
index 1e92952330fba5b4626eac399021349c31b84688..6c45daa87c21d44af38d49b3515b3a27c9056e3b 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ESelect.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ESelect.java
@@ -10,7 +10,7 @@ import static org.simantics.scl.compiler.elaboration.expressions.Expressions.tup
 import static org.simantics.scl.compiler.elaboration.expressions.Expressions.var;\r
 \r
 import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;\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
@@ -119,10 +119,10 @@ public class ESelect extends SimplifiableExpression {
         else {\r
             Variable accumulator = newVar("accum", Types.apply(ARRAY_LIST, elType));\r
             result =\r
-                    apply(context, Types.PROC, Name.create("ArrayList", "freeze"), elType,\r
+                    apply(context.getCompilationContext(), Types.PROC, Names.ArrayList_freeze, elType,\r
                             var(accumulator));\r
             Expression innerExpression = \r
-                    apply(context, Types.PROC, Name.create("ArrayList", "add"), elType,\r
+                    apply(context.getCompilationContext(), Types.PROC, Names.ArrayList_add, elType,\r
                             var(accumulator), expression);\r
             try {\r
                 QueryCompilationContext queryCompilationContext =\r
@@ -134,7 +134,7 @@ public class ESelect extends SimplifiableExpression {
                 return new EError(getLocation());\r
             }\r
             result = let(accumulator,\r
-                    apply(context, Types.PROC, Name.create("ArrayList", "new"), elType, tuple()),\r
+                    apply(context.getCompilationContext(), Types.PROC, Names.ArrayList_new, elType, tuple()),\r
                     result\r
                     );\r
         }\r