tools/codeformat.py: Remove sizeof fixup.

dlech · dpgeorge · commit ecd782631608 · 2020-06-14T20:24:18.000+10:00
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 &lt;david@pybricks.com&gt;
diff --git a/py/objfun.c b/py/objfun.c
@@ -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); \
                                     \
         /* state size in bytes */                                                 \
-        state_size_out_var = n_state_out_var *sizeof(mp_obj_t)                   \
-            + n_exc_stack *sizeof(mp_exc_stack_t);                \
+        state_size_out_var = n_state_out_var * sizeof(mp_obj_t)                   \
+            + n_exc_stack * sizeof(mp_exc_stack_t);                \
     }
 
 #define INIT_CODESTATE(code_state, _fun_bc, _n_state, n_args, n_kw, args) \
diff --git a/tools/codeformat.py b/tools/codeformat.py
@@ -76,9 +76,6 @@
 PY_EXTS = (".py",)
 
 
-FIXUP_REPLACEMENTS = ((re.compile("sizeof\(([a-z_]+)\) \*\(([a-z_]+)\)"), r"sizeof(\1) * (\2)"),)
-
-
 def list_files(paths, exclusions=None, prefix=""):
     files = set()
     for pattern in paths:
@@ -124,10 +121,6 @@ def fixup_c(filename):
                     if directive == "endif":
                         dedent_stack.pop()
 
-            # Apply general regex-based fixups.
-            for regex, replacement in FIXUP_REPLACEMENTS:
-                l = regex.sub(replacement, l)
-
             # Write out line.
             f.write(l)
 

Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,8 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {`
`197`	`197`	`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); \`
`198`	`198`	`\`
`199`	`199`	`/* state size in bytes */ \`
`200`		`- state_size_out_var = n_state_out_var *sizeof(mp_obj_t) \`
`201`		`- + n_exc_stack *sizeof(mp_exc_stack_t); \`
	`200`	`+ state_size_out_var = n_state_out_var * sizeof(mp_obj_t) \`
	`201`	`+ + n_exc_stack * sizeof(mp_exc_stack_t); \`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`#define INIT_CODESTATE(code_state, _fun_bc, _n_state, n_args, n_kw, args) \`