summaryrefslogtreecommitdiff
path: root/lib9p/idl
diff options
context:
space:
mode:
authorLuke T. Shumaker <lukeshu@lukeshu.com>2025-01-23 18:45:16 -0700
committerLuke T. Shumaker <lukeshu@lukeshu.com>2025-01-23 18:45:16 -0700
commitfbc408b36495a60aaf87f5e368a11f57f246d023 (patch)
tree8e63d13e124ea464a9f6367439ef2d6605c6a872 /lib9p/idl
parent104ea21b497171f5a1c4ba80d82337da3f7c2632 (diff)
parent1c368cb010df8f14da9b2585bdcf303014b57b8c (diff)
Merge branch 'lukeshu/9p-idl-defs'
Diffstat (limited to 'lib9p/idl')
-rw-r--r--lib9p/idl/2010-9P2000.L.9p4
-rw-r--r--lib9p/idl/__init__.py7
2 files changed, 10 insertions, 1 deletions
diff --git a/lib9p/idl/2010-9P2000.L.9p b/lib9p/idl/2010-9P2000.L.9p
index 972e7d0..3886265 100644
--- a/lib9p/idl/2010-9P2000.L.9p
+++ b/lib9p/idl/2010-9P2000.L.9p
@@ -7,7 +7,9 @@
# https://github.com/chaos/diod/blob/master/protocol.md
version "9P2000.L"
-from ./2002-9P2000.9p import tag, fid, s, qt, qid, Tversion, Rversion, Tflush, Rflush, Twalk, Rwalk, Tread, Rread, Twrite, Rwrite, Tclunk, RClunk, Tremove, Rremove
+from ./2002-9P2000.9p import tag, fid, s, d, qt, qid
+from ./2002-9P2000.9p import Rerror
+from ./2002-9P2000.9p import Tversion, Rversion, Tflush, Rflush, Twalk, Rwalk, Tread, Rread, Twrite, Rwrite, Tclunk, RClunk, Tremove, Rremove
from ./2005-9P2000.u.9p import nuid, Tauth, Rauth, Tattach, Rattach
bitfield getattr = 8
diff --git a/lib9p/idl/__init__.py b/lib9p/idl/__init__.py
index 8fd7e25..fec6c41 100644
--- a/lib9p/idl/__init__.py
+++ b/lib9p/idl/__init__.py
@@ -550,6 +550,13 @@ def parse_file(
for typ in [typ for typ in typs if isinstance(typ, Struct)]:
valid_syms = ["end", "s32_max", "s64_max", *["&" + m.name for m in typ.members]]
for member in typ.members:
+ if (
+ not isinstance(member.typ, Primitive)
+ and member.typ.in_versions < member.in_versions
+ ):
+ raise ValueError(
+ f"{typ.name}.{member.name}: type {member.typ.name} does not exist in {member.in_versions.difference(member.typ.in_versions)}"
+ )
for tok in [*member.max.tokens, *member.val.tokens]:
if isinstance(tok, ExprSym) and tok.name not in valid_syms:
raise ValueError(