fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/genxml: use ElementTree.write and .indent

Browse source 
This removes a bunch of hand-written code, and allows for fewer corner
cases. The resulting code has some minor differences (no empty newlines
and the encoding is declared in the xml declaration)

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18955>
This commit is contained in:
Dylan Baker 2022-10-03 10:22:20 -07:00
parent b876f4daa9
commit 9a185d78ca
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/intel/genxml/gen_sort_tags.py
View file

@ -91,22 +91,6 @@ GENXML_DESC = {
'register' : [ 'name', 'length', 'num', ],
}
space_delta = 2
def print_node(f: typing.TextIO, offset: int, node: et.Element) -> None:
spaces = ''.rjust(offset * space_delta)
f.write('{0}<{1}'.format(spaces, node.tag))
for k, v in node.attrib.items():
f.write(f' {k}="{v}"')
children = list(node)
if len(children) > 0:
f.write('>\n')
for c in children:
print_node(f, offset + 1, c)
f.write('{0}</{1}>\n'.format(spaces, node.tag))
else:
f.write(' />\n')
def node_validator(old: et.Element, new: et.Element) -> bool:
"""Compare to ElementTree Element nodes.
@ -187,11 +171,10 @@ def process(filename: pathlib.Path, validate: bool) -> None:
for old, new in zip(original, genxml):
assert node_validator(old, new), f'{filename} is invalid, run gen_sort_tags.py and commit that'
else:
tmp = filename.with_suffix(f'{filename.suffix}.tmp')
with tmp.open('w') as f:
f.write('<?xml version="1.0" ?>\n')
print_node(f, 0, genxml)
tree = et.ElementTree(genxml)
et.indent(tree, space=' ')
tree.write(tmp, encoding="utf-8", xml_declaration=True)
filename.unlink()
tmp.rename(filename)