Do 1-origin loops correctly.

diff --git a/ctopy b/ctopy
index 9f8f491a9d99d9eea361bc48dcacc3d34d6154b5..3db468cf8da684439ce0ed9ec9f421da75b6c108 100755 (executable)
--- a/ctopy
+++ b/ctopy
@@ -55,14 +55,14 @@ unsafe_transformations = (
     (r"while *\(", r"while "), 
     (r"while 1:", r"while True"),
     (r"for \(;;\)\s*{", r"while True"),
-    (r"for \((%(id)s) *= *0; *\1 *< *([^;]+); *\1\+\+\)",
-                                       r"for \1 in range(\2))"),
     (r"for \((%(id)s) *= *0; *\1 *<= *([^;]+); *\1\+\+\)",
                                        r"for \1 in range(\2+1))"),
-    (r"for \((%(id)s) *= *(\d+); *\1 *< *([^;]+); *\1\+\+\)",
-                                       r"for \1 in range(\2, \3))"),
     (r"for \((%(id)s) *= *(\d+); *\1 *<= *([^;]+); *\1\+\+\)",
                                        r"for \1 in range(\2, \3+1))"),
+    (r"for \((%(id)s) *= *0; *\1 *< *([^;]+); *\1\+\+\)",
+                                       r"for \1 in range(\2))"),
+    (r"for \((%(id)s) *= *(\d+); *\1 *< *([^;]+); *\1\+\+\)",
+                                       r"for \1 in range(\2, \3))"),
     (r"\)\s*{", r":"),
     (r"(?<!\()\) *\n([ \t]+)", r":\n\1"),      # ) not followed by ; but by indent
     (r"else if", r"elif"),