lib9p: idl: Rework bitfields, allow full exprs more places

1 files changed, 7 insertions, 5 deletions

diff --git a/lib9p/protogen/c_marshal.py b/lib9p/protogen/c_marshal.py
index a358cf2..4dab864 100644
--- a/lib9p/protogen/c_marshal.py
+++ b/lib9p/protogen/c_marshal.py
@@ -278,11 +278,13 @@ def gen_c_marshal(versions: set[str], typs: list[idl.UserType]) -> str:
                 if not member.val:
                     continue
                 for tok in member.val.tokens:
-                    if not isinstance(tok, idl.ExprSym):
-                        continue
-                    if tok.symname == "end" or tok.symname.startswith("&"):
-                        if tok.symname not in offsets:
-                            offsets.append(tok.symname)
+                    match tok:
+                        case idl.ExprSym(symname="end"):
+                            if tok.symname not in offsets:
+                                offsets.append(tok.symname)
+                        case idl.ExprOff():
+                            if f"&{tok.membname}" not in offsets:
+                                offsets.append(f"&{tok.membname}")
             for name in offsets:
                 name_prefix = f"offsetof{''.join('_'+m.membname for m in path.elems)}_"
                 if name == "end":