Changeset 6447:e539439d4989

Timestamp:

09/20/07 14:47:40 (6 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Message:

More 1..n work

File:

• sage/misc/misc.py (modified) (2 diffs)

sage/misc/misc.py

@@ -639 +639 @@
         L = []
         while start < end:
+            L.append(start)
             start += step
+        return L
+
+
+def xurange(start, end, step=1, universe=None, check=True):
+    from sage.structure.sequence import Sequence
+    from sage.rings.all import ZZ
+    if check:
+        if universe is None:
+            universe = Sequence([start, end, step]).universe()
+        start, end, step = universe(start), universe(end), universe(step)
+    if universe is int:
+        return xrange(start, end, step)
+    elif universe is ZZ:
+        return xsrange(start, end, step)
+    else:
+        L = []
+        while start < end:
             L.append(start)
+            start += step
         return L
+        
+def generic_xurange(start, end, step):
+    while start < end:
+        yield start
+        start += step
+        
 
 
@@ -727 +752 @@
                     cur += diff
                     yield cur
-            for num in urange(args[i-1]+diff, args[i+1]+1, diff, universe=universe, check=False):
+            for num in xurange(args[i-1]+diff, args[i+1]+1, diff, universe=universe, check=False):
                 yield num
             last = num