python: Use range() instead of xrange()

Python 2 has a range() function which returns a list, and an xrange()
one which returns an iterator.

Python 3 lost the function returning a list, and renamed the function
returning an iterator as range().

As a result, using range() makes the scripts compatible with both Python
versions 2 and 3.

Signed-off-by: Mathieu Bridon <bochecha@daitauha.fr>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Mathieu Bridon
2018-07-06 12:22:18 +02:00
committed by Dylan Baker
parent 022d2a381d
commit 9ebd8372b9
9 changed files with 12 additions and 12 deletions

View File

@@ -136,7 +136,7 @@ static const struct string_map_entry string_map_entries[] = {
/* Hash table stats:
* size ${len(strmap.sorted_strings)} entries
* collisions entries:
% for i in xrange(10):
% for i in range(10):
* ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]}
% endfor
*/

View File

@@ -216,7 +216,7 @@ class Group(object):
first_byte = field.start // 8
last_byte = field.end // 8
for b in xrange(first_byte, last_byte + 1):
for b in range(first_byte, last_byte + 1):
if not b in bytes:
bytes[b] = self.Byte()

View File

@@ -116,7 +116,7 @@ constant_template_common = mako.template.Template("""\
constant_template_vector_scalar = mako.template.Template("""\
case ${op.get_enum_name()}:
% if "mixed" in op.flags:
% for i in xrange(op.num_operands):
% for i in range(op.num_operands):
assert(op[${i}]->type->base_type == ${op.source_types[0].glsl_type} ||
% for src_type in op.source_types[1:-1]:
op[${i}]->type->base_type == ${src_type.glsl_type} ||

View File

@@ -367,8 +367,8 @@ for (unsigned bit = 0; bit < bit_size; bit++) {
""")
for i in xrange(1, 5):
for j in xrange(1, 5):
for i in range(1, 5):
for j in range(1, 5):
unop_horiz("fnoise{0}_{1}".format(i, j), i, tfloat, j, tfloat, "0.0f")

View File

@@ -145,7 +145,7 @@ static const struct string_map_entry string_map_entries[] = {
/* Hash table stats:
* size ${len(strmap.sorted_strings)} entries
* collisions entries:
% for i in xrange(10):
% for i in range(10):
* ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]}
% endfor
*/

View File

@@ -392,7 +392,7 @@ static const struct proc_pair
_glapi_proc proc;
} proc_pairs[%d] = {""" % len(procs))
names = sorted(procs.keys())
for i in xrange(len(names)):
for i in range(len(names)):
comma = ',' if i < len(names) - 1 else ''
print(' { "%s", (_glapi_proc) gl%s }%s' % (names[i], procs[names[i]], comma))
print("""};

View File

@@ -216,13 +216,13 @@ class PrintCode(gl_XML.gl_print_base):
# Check that the table has no gaps. We expect a function at every offset,
# and the code which generates the table relies on this.
for i in xrange(0, func_count):
for i in range(0, func_count):
if funcnames[i] is None:
raise Exception("Function table has no function at offset %d" % (i))
print("#define GLAPI_TABLE_COUNT %d" % func_count)
print("static const char * const _glapi_table_func_names[GLAPI_TABLE_COUNT] = {")
for i in xrange(0, func_count):
for i in range(0, func_count):
print(" /* %5d */ \"%s\"," % (i, funcnames[i]))
print("};")

View File

@@ -260,7 +260,7 @@ def abi_sanity_check(entries):
all_names = []
last_slot = entries[-1].slot
i = 0
for slot in xrange(last_slot + 1):
for slot in range(last_slot + 1):
if entries[i].slot != slot:
raise Exception('entries are not ordered by slots')
if entries[i].alias:

View File

@@ -216,8 +216,8 @@ class Swizzle:
component, exactly as you would expect.
"""
rev = [Swizzle.SWIZZLE_NONE] * 4
for i in xrange(4):
for j in xrange(4):
for i in range(4):
for j in range(4):
if self.__list[j] == i and rev[i] == Swizzle.SWIZZLE_NONE:
rev[i] = j
return Swizzle(rev)