Add more tests, add more casts

sweeneyde · sweeneyde · commit bd7575e49586 · 2022-04-19T19:34:43.000-04:00
diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
@@ -507,7 +507,7 @@ def test_range_iterators(self):
         # exercise 'fast' iterators, that use a rangeiterobject internally.
         # see issue 7298
         limits = [base + jiggle
-                  for M in (2**32, 2**64)
+                  for M in (2**15, 2**30, 2**32, 2**64)
                   for base in (-M, -M//2, 0, M//2, M)
                   for jiggle in (-2, -1, 0, 1, 2)]
         test_ranges = [(start, end, step)
@@ -519,13 +519,14 @@ def test_range_iterators(self):
             iter1 = range(start, end, step)
             iter2 = pyrange(start, end, step)
             test_id = "range({}, {}, {})".format(start, end, step)
-            # check first 100 entries
-            self.assert_iterators_equal(iter1, iter2, test_id, limit=100)
+            # check first 10 entries
+            self.assert_iterators_equal(iter1, iter2, test_id, limit=10)
 
             iter1 = reversed(range(start, end, step))
             iter2 = pyrange_reversed(start, end, step)
             test_id = "reversed(range({}, {}, {}))".format(start, end, step)
-            self.assert_iterators_equal(iter1, iter2, test_id, limit=100)
+            self.assert_iterators_equal(iter1, iter2, test_id, limit=10)
+
 
     def test_range_iterators_invocation(self):
         # verify range iterators instances cannot be created by
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
@@ -1097,10 +1097,10 @@ range_iter(PyObject *seq)
         goto long_range;
     }
     ulen = get_len_of_range(lstart, lstop, lstep);
-    if (ulen > PyLong_MASK ||
-        lstart > PyLong_MASK || lstart < -(long)PyLong_MASK ||
-        lstop > PyLong_MASK || lstop < -(long)PyLong_MASK ||
-        lstep > PyLong_MASK || lstep < -(long)PyLong_MASK)
+    if (ulen > (long)PyLong_MASK ||
+        lstart > (long)PyLong_MASK || lstart < -(long)PyLong_MASK ||
+        lstop > (long)PyLong_MASK || lstop < -(long)PyLong_MASK ||
+        lstep > (long)PyLong_MASK || lstep < -(long)PyLong_MASK)
     {
         goto long_range;
     }
@@ -1190,10 +1190,10 @@ range_reverse(PyObject *seq, PyObject *Py_UNUSED(ignored))
 
     new_stop = lstart - lstep;
     new_start = (long)(new_stop + ulen * lstep);
-    if (ulen > PyLong_MASK ||
-        new_start > PyLong_MASK || new_start < -(long)PyLong_MASK ||
-        new_stop > PyLong_MASK || new_stop < -(long)PyLong_MASK ||
-        lstep > PyLong_MASK || lstep < -(long)PyLong_MASK)
+    if (ulen > (long)PyLong_MASK ||
+        new_start > (long)PyLong_MASK || new_start < -(long)PyLong_MASK ||
+        new_stop > (long)PyLong_MASK || new_stop < -(long)PyLong_MASK ||
+        lstep > (long)PyLong_MASK || lstep < -(long)PyLong_MASK)
     {
         goto long_range;
     }

Original file line number	Diff line number	Diff line change
`@@ -1097,10 +1097,10 @@ range_iter(PyObject *seq)`
`1097`	`1097`	`goto long_range;`
`1098`	`1098`	`}`
`1099`	`1099`	`ulen = get_len_of_range(lstart, lstop, lstep);`
`1100`		`- if (ulen > PyLong_MASK \|\|`
`1101`		`- lstart > PyLong_MASK \|\| lstart < -(long)PyLong_MASK \|\|`
`1102`		`- lstop > PyLong_MASK \|\| lstop < -(long)PyLong_MASK \|\|`
`1103`		`- lstep > PyLong_MASK \|\| lstep < -(long)PyLong_MASK)`
	`1100`	`+ if (ulen > (long)PyLong_MASK \|\|`
	`1101`	`+ lstart > (long)PyLong_MASK \|\| lstart < -(long)PyLong_MASK \|\|`
	`1102`	`+ lstop > (long)PyLong_MASK \|\| lstop < -(long)PyLong_MASK \|\|`
	`1103`	`+ lstep > (long)PyLong_MASK \|\| lstep < -(long)PyLong_MASK)`
`1104`	`1104`	`{`
`1105`	`1105`	`goto long_range;`
`1106`	`1106`	`}`
`@@ -1190,10 +1190,10 @@ range_reverse(PyObject seq, PyObject Py_UNUSED(ignored))`
`1190`	`1190`
`1191`	`1191`	`new_stop = lstart - lstep;`
`1192`	`1192`	`new_start = (long)(new_stop + ulen * lstep);`
`1193`		`- if (ulen > PyLong_MASK \|\|`
`1194`		`- new_start > PyLong_MASK \|\| new_start < -(long)PyLong_MASK \|\|`
`1195`		`- new_stop > PyLong_MASK \|\| new_stop < -(long)PyLong_MASK \|\|`
`1196`		`- lstep > PyLong_MASK \|\| lstep < -(long)PyLong_MASK)`
	`1193`	`+ if (ulen > (long)PyLong_MASK \|\|`
	`1194`	`+ new_start > (long)PyLong_MASK \|\| new_start < -(long)PyLong_MASK \|\|`
	`1195`	`+ new_stop > (long)PyLong_MASK \|\| new_stop < -(long)PyLong_MASK \|\|`
	`1196`	`+ lstep > (long)PyLong_MASK \|\| lstep < -(long)PyLong_MASK)`
`1197`	`1197`	`{`
`1198`	`1198`	`goto long_range;`
`1199`	`1199`	`}`