diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-03-24 02:17:21 -0600 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-03-25 12:43:16 -0600 |
| commit | f17c709c6e35a0bea471a4e8ae7d2183b4a1f32d (patch) | |
| tree | 1220b9feef6f3d0572124176bc2c05b3d184771d /lib9p/protogen/c_marshal.py | |
| parent | e9677b4744452dcc001f1dd6c21c98ca23b6731f (diff) | |
lib9p: protogen: marshal, unmarshal: collapse identitical if's
Diffstat (limited to 'lib9p/protogen/c_marshal.py')
| -rw-r--r-- | lib9p/protogen/c_marshal.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib9p/protogen/c_marshal.py b/lib9p/protogen/c_marshal.py index 38a2feb..36a09d4 100644 --- a/lib9p/protogen/c_marshal.py +++ b/lib9p/protogen/c_marshal.py @@ -254,6 +254,8 @@ def gen_c_marshal(versions: set[str], typs: list[idl.UserType]) -> str: nonlocal indent_stack nonlocal indent_stack_len while len(indent_stack) > indent_stack_len: + if len(indent_stack) == indent_stack_len + 1 and indent_stack[-1].ifdef: + break ret += f"{'\t'*(indent_lvl()-1)}}}\n" if indent_stack.pop().ifdef: ret += cutil.ifdef_pop(ifdef_lvl()) @@ -302,11 +304,14 @@ def gen_c_marshal(versions: set[str], typs: list[idl.UserType]) -> str: child = path.elems[-1] parent = path.elems[-2].typ if len(path.elems) > 1 else path.root if child.in_versions < parent.in_versions: - ret += cutil.ifdef_push( + if line := cutil.ifdef_push( ifdef_lvl() + 1, c9util.ver_ifdef(child.in_versions) - ) - ret += f"{'\t'*indent_lvl()}if ({c9util.ver_cond(child.in_versions)}) {{\n" - indent_stack.append(IndentLevel(ifdef=True)) + ): + ret += line + ret += ( + f"{'\t'*indent_lvl()}if ({c9util.ver_cond(child.in_versions)}) {{\n" + ) + indent_stack.append(IndentLevel(ifdef=True)) if child.cnt: cnt_path = path.parent().add(child.cnt) if child.typ.static_size == 1: # SPECIAL (zerocopy) @@ -369,6 +374,10 @@ def gen_c_marshal(versions: set[str], typs: list[idl.UserType]) -> str: # Pass 2 - write data indent_stack = [IndentLevel(ifdef=True)] idlutil.walk(typ, handle) + while len(indent_stack) > 1: + ret += f"{'\t'*(indent_lvl()-1)}}}\n" + if indent_stack.pop().ifdef: + ret += cutil.ifdef_pop(ifdef_lvl()) # Return ret += "\treturn false;\n" |