lib9p_idl: parser: Tidy regex group names

1 files changed, 6 insertions, 8 deletions

diff --git a/lib9p/idl/__init__.py b/lib9p/idl/__init__.py
index 2d09217..154e157 100644
--- a/lib9p/idl/__init__.py
+++ b/lib9p/idl/__init__.py
@@ -648,16 +648,14 @@ re_line_version = f"version\\s+{re_string('version')}"
 re_line_import = f"from\\s+(?P<file>\\S+)\\s+import\\s+(?P<syms>{re_impname}(?:\\s*,\\s*{re_impname})*)"
 re_line_num = f"num\\s+(?P<name>{re_symname})\\s*=\\s*(?P<prim>{re_priname})"
 re_line_bitfield = f"bitfield\\s+(?P<name>{re_symname})\\s*=\\s*(?P<prim>{re_priname})"
-re_line_bitfield_ = (
-    f"bitfield\\s+(?P<name>{re_symname})\\s*\\+=\\s*{re_string('member')}"
-)
+re_line_bitfield_ = f"bitfield\\s+(?P<name>{re_symname})\\s*\\+=\\s*{re_string('spec')}"
 re_line_struct = (
     f"struct\\s+(?P<name>{re_symname})\\s*(?P<op>\\+?=)\\s*{re_string('members')}"
 )
 re_line_msg = (
     f"msg\\s+(?P<name>{re_msgname})\\s*(?P<op>\\+?=)\\s*{re_string('members')}"
 )
-re_line_cont = f"\\s+{re_string('specs')}"  # could be bitfield/struct/msg
+re_line_cont = f"\\s+{re_string('spec')}"  # could be bitfield/struct/msg
 
 
 def parse_file(
@@ -754,7 +752,7 @@ def parse_file(
                     prev = bf
                 elif m := re.fullmatch(re_line_bitfield_, line):
                     bf = get_type(env, m.group("name"), Bitfield)
-                    parse_bitspec(env, version, bf, m.group("member"))
+                    parse_bitspec(env, version, bf, m.group("spec"))
 
                     prev = bf
                 elif m := re.fullmatch(re_line_struct, line):
@@ -798,11 +796,11 @@ def parse_file(
                 elif m := re.fullmatch(re_line_cont, line):
                     match prev:
                         case Bitfield():
-                            parse_bitspec(env, version, prev, m.group("specs"))
+                            parse_bitspec(env, version, prev, m.group("spec"))
                         case Number():
-                            parse_numspec(env, version, prev, m.group("specs"))
+                            parse_numspec(env, version, prev, m.group("spec"))
                         case Struct():  # and Message()
-                            parse_members(version, env, prev, m.group("specs"))
+                            parse_members(version, env, prev, m.group("spec"))
                         case _:
                             raise SyntaxError(
                                 "continuation line must come after a bitfield, struct, or msg line"