lib9p: idl.gen: Sort the enum msg_typ values

2 files changed, 47 insertions, 40 deletions

diff --git a/lib9p/idl.gen b/lib9p/idl.gen
index 7c79a28..f154cb1 100755
--- a/lib9p/idl.gen
+++ b/lib9p/idl.gen
@@ -183,6 +183,10 @@ def gen_h(versions: set[str], typs: list[idl.Type]) -> str:
 #include <stdint.h> /* for uint{{n}}_t types */
 """
 
+    id2typ: dict[int, idl.Message] = {}
+    for msg in [msg for msg in typs if isinstance(msg, idl.Message)]:
+        id2typ[msg.msgid] = msg
+
     ret += f"""
 /* config *********************************************************************/
 
@@ -216,7 +220,10 @@ enum {idprefix}version {{
 """
     ret += f"enum {idprefix}msg_type {{ /* uint8_t */\n"
     namewidth = max(len(msg.name) for msg in typs if isinstance(msg, idl.Message))
-    for msg in [msg for msg in typs if isinstance(msg, idl.Message)]:
+    for n in range(0x100):
+        if n not in id2typ:
+            continue
+        msg = id2typ[n]
         ret += ifdef_push(1, c_ver_ifdef(msg.in_versions))
         ret += f"\t{idprefix.upper()}TYP_{msg.name.ljust(namewidth)} = {msg.msgid},\n"
     ret += ifdef_pop(0)
diff --git a/lib9p/include/lib9p/9p.generated.h b/lib9p/include/lib9p/9p.generated.h
index 1c3c2b6..abc2686 100644
--- a/lib9p/include/lib9p/9p.generated.h
+++ b/lib9p/include/lib9p/9p.generated.h
@@ -48,45 +48,6 @@ enum lib9p_version {
 /* enum msg_type **************************************************************/
 
 enum lib9p_msg_type { /* uint8_t */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Tversion     = 100,
-	LIB9P_TYP_Rversion     = 101,
-	LIB9P_TYP_Tauth        = 102,
-	LIB9P_TYP_Rauth        = 103,
-	LIB9P_TYP_Tattach      = 104,
-	LIB9P_TYP_Rattach      = 105,
-	LIB9P_TYP_Rerror       = 107,
-	LIB9P_TYP_Tflush       = 108,
-	LIB9P_TYP_Rflush       = 109,
-	LIB9P_TYP_Twalk        = 110,
-	LIB9P_TYP_Rwalk        = 111,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Topen        = 112,
-	LIB9P_TYP_Ropen        = 113,
-	LIB9P_TYP_Tcreate      = 114,
-	LIB9P_TYP_Rcreate      = 115,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Tread        = 116,
-	LIB9P_TYP_Rread        = 117,
-	LIB9P_TYP_Twrite       = 118,
-	LIB9P_TYP_Rwrite       = 119,
-	LIB9P_TYP_Tclunk       = 120,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Rclunk       = 121,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Tremove      = 122,
-	LIB9P_TYP_Rremove      = 123,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Tstat        = 124,
-	LIB9P_TYP_Rstat        = 125,
-	LIB9P_TYP_Twstat       = 126,
-	LIB9P_TYP_Rwstat       = 127,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 	LIB9P_TYP_Rlerror      = 7,
 	LIB9P_TYP_Tstatfs      = 8,
@@ -127,6 +88,45 @@ enum lib9p_msg_type { /* uint8_t */
 	LIB9P_TYP_Tunlinkat    = 76,
 	LIB9P_TYP_Runlinkat    = 77,
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Tversion     = 100,
+	LIB9P_TYP_Rversion     = 101,
+	LIB9P_TYP_Tauth        = 102,
+	LIB9P_TYP_Rauth        = 103,
+	LIB9P_TYP_Tattach      = 104,
+	LIB9P_TYP_Rattach      = 105,
+	LIB9P_TYP_Rerror       = 107,
+	LIB9P_TYP_Tflush       = 108,
+	LIB9P_TYP_Rflush       = 109,
+	LIB9P_TYP_Twalk        = 110,
+	LIB9P_TYP_Rwalk        = 111,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Topen        = 112,
+	LIB9P_TYP_Ropen        = 113,
+	LIB9P_TYP_Tcreate      = 114,
+	LIB9P_TYP_Rcreate      = 115,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Tread        = 116,
+	LIB9P_TYP_Rread        = 117,
+	LIB9P_TYP_Twrite       = 118,
+	LIB9P_TYP_Rwrite       = 119,
+	LIB9P_TYP_Tclunk       = 120,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Rclunk       = 121,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Tremove      = 122,
+	LIB9P_TYP_Rremove      = 123,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Tstat        = 124,
+	LIB9P_TYP_Rstat        = 125,
+	LIB9P_TYP_Twstat       = 126,
+	LIB9P_TYP_Rwstat       = 127,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_e
 	LIB9P_TYP_Tsession     = 150,
 	LIB9P_TYP_Rsession     = 151,