1 files changed, 16 insertions, 7 deletions

diff --git a/lib/system/iterators_1.nim b/lib/system/iterators_1.nim
index 2bc58c2b7..d00e3f823 100644
--- a/lib/system/iterators_1.nim
+++ b/lib/system/iterators_1.nim
@@ -12,11 +12,11 @@ iterator countdown*[T](a, b: T, step: Positive = 1): T {.inline.} =
   ## **Note**: This fails to count to `low(int)` if T = int for
   ## efficiency reasons.
   runnableExamples:
-    import sugar
+    import std/sugar
     let x = collect(newSeq):
       for i in countdown(7, 3):
         i
-    
+
     assert x == @[7, 6, 5, 4, 3]
 
     let y = collect(newseq):
@@ -32,7 +32,10 @@ iterator countdown*[T](a, b: T, step: Positive = 1): T {.inline.} =
   elif T is IntLikeForCount and T is Ordinal:
     var res = int(a)
     while res >= int(b):
-      yield T(res)
+      when defined(nimHasCastExtendedVm):
+        yield cast[T](res)
+      else:
+        yield T(res)
       dec(res, step)
   else:
     var res = a
@@ -49,7 +52,7 @@ iterator countup*[T](a, b: T, step: Positive = 1): T {.inline.} =
   ## **Note**: This fails to count to `high(int)` if T = int for
   ## efficiency reasons.
   runnableExamples:
-    import sugar
+    import std/sugar
     let x = collect(newSeq):
       for i in countup(3, 7):
         i
@@ -64,7 +67,10 @@ iterator countup*[T](a, b: T, step: Positive = 1): T {.inline.} =
   when T is IntLikeForCount and T is Ordinal:
     var res = int(a)
     while res <= int(b):
-      yield T(res)
+      when defined(nimHasCastExtendedVm):
+        yield cast[T](res)
+      else:
+        yield T(res)
       inc(res, step)
   else:
     var res = a
@@ -78,7 +84,7 @@ iterator `..`*[T](a, b: T): T {.inline.} =
   ## See also:
   ## * [..<](#..<.i,T,T)
   runnableExamples:
-    import sugar
+    import std/sugar
 
     let x = collect(newSeq):
       for i in 3 .. 7:
@@ -89,7 +95,10 @@ iterator `..`*[T](a, b: T): T {.inline.} =
   when T is IntLikeForCount and T is Ordinal:
     var res = int(a)
     while res <= int(b):
-      yield T(res)
+      when defined(nimHasCastExtendedVm):
+        yield cast[T](res)
+      else:
+        yield T(res)
       inc(res)
   else:
     var res = a