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 9a0bb040d6acb15ff0aa9edba0f894aa1c28434b..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
@@ -8,12 +8,9 @@ import static org.simantics.scl.compiler.elaboration.expressions.Expressions.new
 import static org.simantics.scl.compiler.elaboration.expressions.Expressions.seq;\r
 import static org.simantics.scl.compiler.elaboration.expressions.Expressions.tuple;\r
 import static org.simantics.scl.compiler.elaboration.expressions.Expressions.var;\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.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
@@ -30,6 +27,10 @@ import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.exceptions.MatchException;\r
 import org.simantics.scl.compiler.types.kinds.Kinds;\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 ESelect extends SimplifiableExpression {\r
 \r
     private final Type ARRAY_LIST = Types.con("ArrayList", "T"); \r
@@ -118,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
@@ -133,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