Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-06 12:10:13 +01:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

tools/codeformat.py: Remove sizeof fixup.

Browse Source 
Formatting for `* sizeof` was fixed in uncrustify v0.71, so we no longer
need the fixups for it.  Also, there was one file where the updated
uncrustify caught a problem that the regex didn't pick up, which is updated
in this commit.

Signed-off-by: David Lechner <david@pybricks.com>
This commit is contained in:
David Lechner
2020-06-13 13:05:48 -05:00
committed by Damien George
parent bd7c92e17d
commit ecd7826316
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
py/objfun.c
View File

@@ -197,8 +197,8 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state_out_var, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_args); \ MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state_out_var, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_args); \
\ \
/* state size in bytes */ \ /* state size in bytes */ \
state_size_out_var = n_state_out_var *sizeof(mp_obj_t) \ state_size_out_var = n_state_out_var * sizeof(mp_obj_t) \
+ n_exc_stack *sizeof(mp_exc_stack_t); \ + n_exc_stack * sizeof(mp_exc_stack_t); \
} }
#define INIT_CODESTATE(code_state, _fun_bc, _n_state, n_args, n_kw, args) \ #define INIT_CODESTATE(code_state, _fun_bc, _n_state, n_args, n_kw, args) \

7
tools/codeformat.py
View File

@@ -76,9 +76,6 @@ C_EXTS = (
PY_EXTS = (".py",) PY_EXTS = (".py",)
FIXUP_REPLACEMENTS = ((re.compile("sizeof\(([a-z_]+)\) \*\(([a-z_]+)\)"), r"sizeof(\1) * (\2)"),)
def list_files(paths, exclusions=None, prefix=""): def list_files(paths, exclusions=None, prefix=""):
files = set() files = set()
for pattern in paths: for pattern in paths:
@@ -124,10 +121,6 @@ def fixup_c(filename):
if directive == "endif": if directive == "endif":
dedent_stack.pop() dedent_stack.pop()
# Apply general regex-based fixups.
for regex, replacement in FIXUP_REPLACEMENTS:
l = regex.sub(replacement, l)
# Write out line. # Write out line.
f.write(l) f.write(l)