X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FESelect.java;h=6c45daa87c21d44af38d49b3515b3a27c9056e3b;hb=refs%2Fchanges%2F21%2F221%2F6;hp=1e92952330fba5b4626eac399021349c31b84688;hpb=12d9af17384d960b75d58c3935d2b7b46d93e87b;p=simantics%2Fplatform.git 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 1e9295233..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 @@ -10,7 +10,7 @@ import static org.simantics.scl.compiler.elaboration.expressions.Expressions.tup import static org.simantics.scl.compiler.elaboration.expressions.Expressions.var; 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; @@ -119,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 = @@ -134,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 ); }