workaround: i, x, msg should not be used in .eo code (and in .py code…

… until #11 is resolved)
polystat · Nov 8, 2021 · 3f6f280 · 3f6f280
1 parent 6783fd1
commit 3f6f280
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/python/python3/Java/SimplePass.scala b/python/python3/Java/SimplePass.scala
@@ -6,7 +6,8 @@ object SimplePass {
 
   case class Names(used : HashMap[String, Int]) {
 
-    def this() = this(HashMap())
+    // the names mentioned here are incompatible with EO (see issue #416 in github.com/cqfn/eo)
+    def this() = this(HashMap("x" -> 1, "i" -> 1, "msg" -> 1, "txt" -> 1))
 
     def last(s : String) : String = s + (used(s) - 1)
 

diff --git a/python/python3/test/trivial.py b/python/python3/test/trivial.py
@@ -2,10 +2,10 @@
 def testFib1():
     f0 = 0
     f1 = 1
-    i = 0
-    while (i < 10):
+    ii = 0
+    while (ii < 10):
         f2 = f0 + f1
-        i = i + 1
+        ii = ii + 1
         f0 = f1
         f1 = f2
     return 55 == f0

diff --git a/python/python3/test/trivialWithBreak.py b/python/python3/test/trivialWithBreak.py
@@ -2,13 +2,13 @@
 def testFib1():
     f0 = 0
     f1 = 1
-    i = 0
-    while (i < 10):
+    ii = 0
+    while (ii < 10):
         f2 = f0 + f1
-        i = i + 1
+        ii = ii + 1
         f0 = f1
         f1 = f2
-        if i == 9: break
+        if ii == 9: break
     print(f0)
     return (34 == f0)