Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-04 11:10:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

tools/codeformat.py: Iterate lines instead of modifying list in-place.

Browse Source 
Co-authored-by: David Lechner <david@pybricks.com>
Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
This commit is contained in:
Daniël van de Giessen
2025-08-07 13:30:13 +02:00
committed by Damien George
parent 20e1ae0733
commit 6e450dba7e
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/codeformat.py
View File

@@ -92,21 +92,20 @@ def fixup_c(filename):
# Write out file with fixups.
with open(filename, "w", newline="") as f:
dedent_stack = []
while lines:
# Get next line.
l = lines.pop(0)
for line_number, line in enumerate(lines, 1):
# Dedent #'s to match indent of following line (not previous line).
m = re.match(r"( +)#(if |ifdef |ifndef |elif |else|endif)", l)
m = re.match(r"( +)#(if |ifdef |ifndef |elif |else|endif)", line)
if m:
indent = len(m.group(1))
directive = m.group(2)
if directive in ("if ", "ifdef ", "ifndef "):
l_next = lines[0]
indent_next = len(re.match(r"( *)", l_next).group(1))
if indent - 4 == indent_next and re.match(r" +(} else |case )", l_next):
# Line numbers are 1-based, and lists are always 0-based,
# thus this retrieves the next line, not the current one
line_next = lines[line_number]
indent_next = len(re.match(r"( *)", line_next).group(1))
if indent - 4 == indent_next and re.match(r" +(} else |case )", line_next):
# This #-line (and all associated ones) needs dedenting by 4 spaces.
l = l[4:]
line = line[4:]
dedent_stack.append(indent - 4)
else:
# This #-line does not need dedenting.
@@ -116,12 +115,12 @@ def fixup_c(filename):
# This associated #-line needs dedenting to match the #if.
indent_diff = indent - dedent_stack[-1]
assert indent_diff >= 0
l = l[indent_diff:]
line = line[indent_diff:]
if directive == "endif":
dedent_stack.pop()
# Write out line.
f.write(l)
f.write(line)
assert not dedent_stack, filename