Merge "Ensure GetElementClassRequest is not constructed without elementFactory"

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / internal / codegen / analysis / LoopAnalysis.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/analysis/LoopAnalysis.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/analysis/LoopAnalysis.java
index 9d6a5645ac1b52cd8bff29da183ea7b9bdb30d35..34f6578e33e847619a4ed6c3c62c090d9f0d2399 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/analysis/LoopAnalysis.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/analysis/LoopAnalysis.java
@@ -1,8 +1,7 @@
 package org.simantics.scl.compiler.internal.codegen.analysis;\r
 \r
-import gnu.trove.set.hash.THashSet;\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.constants.SCLConstant;\r
 import org.simantics.scl.compiler.internal.codegen.references.Val;\r
 import org.simantics.scl.compiler.internal.codegen.references.ValRef;\r
@@ -11,6 +10,8 @@ import org.simantics.scl.compiler.internal.codegen.ssa.SSAFunction;
 import org.simantics.scl.compiler.internal.codegen.ssa.binders.ValRefBinder;\r
 import org.simantics.scl.compiler.internal.codegen.ssa.statements.LetApply;\r
 \r
+import gnu.trove.set.hash.THashSet;\r
+\r
 public class LoopAnalysis {\r
 \r
     /**\r
@@ -58,8 +59,6 @@ public class LoopAnalysis {
             return isLoopingBlockWithBreaker(apply.getParent(), breaker);\r
         }\r
     }    \r
-\r
-    private static final Name BUILD = Name.create("Prelude", "build");\r
     \r
     private static boolean isAppliedAtMostOnce(LetApply apply, ValRef funRef, SSAFunction function) {\r
         ValRef applyFunctionRef = apply.getFunction();\r
@@ -70,7 +69,7 @@ public class LoopAnalysis {
         if(!(applyFunction instanceof SCLConstant))\r
             return false; // Not necessarily the right answer\r
         Name name = ((SCLConstant)applyFunction).getName();\r
-        if(name == BUILD)\r
+        if(name == Names.Prelude_build)\r
             return true;\r
         return false;\r
     }\r