Merge branch 'lukeshu/9p-idl-improvements'

1 files changed, 9 insertions, 4 deletions

diff --git a/lib9p/protogen/c_unmarshal.py b/lib9p/protogen/c_unmarshal.py
index 018d750..34635f9 100644
--- a/lib9p/protogen/c_unmarshal.py
+++ b/lib9p/protogen/c_unmarshal.py
@@ -93,15 +93,20 @@ def gen_c_unmarshal(versions: set[str], typs: list[idl.UserType]) -> str:
                 )
                 indent_stack.append(IndentLevel(ifdef=True))
         if child.cnt:
-            cnt_path = path.parent().add(child.cnt)
+            if isinstance(child.cnt, int):
+                cnt_str = str(child.cnt)
+                cnt_typ = "size_t"
+            else:
+                cnt_str = path.parent().add(child.cnt).c_str("out->")
+                cnt_typ = c9util.typename(child.cnt.typ)
             if child.typ.static_size == 1:  # SPECIAL (zerocopy)
-                ret += f"{'\t'*indent_lvl()}UNMARSHAL_BYTES(ctx, {path.c_str('out->')[:-3]}, {cnt_path.c_str('out->')});\n"
+                ret += f"{'\t'*indent_lvl()}UNMARSHAL_BYTES(ctx, {path.c_str('out->')[:-3]}, {cnt_str});\n"
                 return idlutil.WalkCmd.KEEP_GOING, pop
             ret += f"{'\t'*indent_lvl()}{path.c_str('out->')[:-3]} = extra;\n"
-            ret += f"{'\t'*indent_lvl()}extra += sizeof({path.c_str('out->')[:-3]}[0]) * {cnt_path.c_str('out->')};\n"
+            ret += f"{'\t'*indent_lvl()}extra += sizeof({path.c_str('out->')[:-3]}[0]) * {cnt_str};\n"
             loopdepth = sum(1 for elem in path.elems if elem.cnt)
             loopvar = chr(ord("i") + loopdepth - 1)
-            ret += f"{'\t'*indent_lvl()}for ({c9util.typename(child.cnt.typ)} {loopvar} = 0; {loopvar} < {cnt_path.c_str('out->')}; {loopvar}++) {{\n"
+            ret += f"{'\t'*indent_lvl()}for ({cnt_typ} {loopvar} = 0; {loopvar} < {cnt_str}; {loopvar}++) {{\n"
             indent_stack.append(IndentLevel(ifdef=False))
         if not isinstance(child.typ, idl.Struct):
             if child.val: