tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Tools: improve code_clean's 'use_brief_types' edit to skip typedef's 

`typedef unsigned int uint;` could be converted into
`typedef uint uint;`.

Resolve by skipping instances of unsigned that follow a typedef.
This commit is contained in:
Campbell Barton 2023-07-25 11:40:14 +10:00
parent 921d6dc3e2
commit 481eaff790
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/utils_maintenance/code_clean.py
View File

@ -523,8 +523,21 @@ class edit_generators:
def edit_list_from_file(_source: str, data: str, _shared_edit_data: Any) -> List[Edit]:
edits = []
# Keep `typedef` unsigned as some files have local types, e.g.
# `typedef unsigned int uint;`
# Should not be changed to:
# `typedef uint uint;`
# ... even if it happens to compile - because it may cause problems on other platforms
# that don't have `uint` defined.
span_skip = set()
for match in re.finditer(r"\btypedef\s+(unsigned)\b", data):
span_skip.add(match.span(1))
# `unsigned char` -> `uchar`.
for match in re.finditer(r"(unsigned)\s+([a-z]+)", data):
if match.span(1) in span_skip:
continue
edits.append(Edit(
span=match.span(),
content='u%s' % match.group(2),
@ -533,7 +546,10 @@ class edit_generators:
# There may be some remaining uses of `unsigned` without any integer type afterwards.
# `unsigned` -> `uint`.
for match in re.finditer(r"\bunsigned\b", data):
for match in re.finditer(r"\b(unsigned)\b", data):
if match.span(1) in span_skip:
continue
edits.append(Edit(
span=match.span(),
content='uint',