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%2FESelect.java;h=6c45daa87c21d44af38d49b3515b3a27c9056e3b;hp=9a0bb040d6acb15ff0aa9edba0f894aa1c28434b;hb=1b4d8b692f40d946deb5db8280eb4ca5b36a75a7;hpb=969bd23cab98a79ca9101af33334000879fb60c5

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 9a0bb040d..6c45daa87 100644
--- 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;
 import static org.simantics.scl.compiler.elaboration.expressions.Expressions.tuple;
 import static org.simantics.scl.compiler.elaboration.expressions.Expressions.var;
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
 
 import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
-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;
@@ -30,6 +27,10 @@ import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.exceptions.MatchException;
 import org.simantics.scl.compiler.types.kinds.Kinds;
 
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.THashSet;
+import gnu.trove.set.hash.TIntHashSet;
+
 public class ESelect extends SimplifiableExpression {
 
     private final Type ARRAY_LIST = Types.con("ArrayList", "T"); 
@@ -118,10 +119,10 @@ public class ESelect extends SimplifiableExpression {
         else {
             Variable accumulator = newVar("accum", Types.apply(ARRAY_LIST, elType));
             result =
-                    apply(context, Types.PROC, Name.create("ArrayList", "freeze"), elType,
+                    apply(context.getCompilationContext(), Types.PROC, Names.ArrayList_freeze, elType,
                             var(accumulator));
             Expression innerExpression = 
-                    apply(context, Types.PROC, Name.create("ArrayList", "add"), elType,
+                    apply(context.getCompilationContext(), Types.PROC, Names.ArrayList_add, elType,
                             var(accumulator), expression);
             try {
                 QueryCompilationContext queryCompilationContext =
@@ -133,7 +134,7 @@ public class ESelect extends SimplifiableExpression {
                 return new EError(getLocation());
             }
             result = let(accumulator,
-                    apply(context, Types.PROC, Name.create("ArrayList", "new"), elType, tuple()),
+                    apply(context.getCompilationContext(), Types.PROC, Names.ArrayList_new, elType, tuple()),
                     result
                     );
         }