Support empty bitfield

rems-project · Jan 22, 2025 · f1fedff · f1fedff
1 parent f8de74b
commit f1fedff
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/lib/parser.mly b/src/lib/parser.mly
@@ -975,6 +975,12 @@ r_def_body:
   | r_id_def Comma r_def_body
     { $1 :: $3 }
 
+bitfield_def_body:
+  | Lcurly Rcurly
+    { [] }
+  | Lcurly r_def_body Rcurly
+    { $2 }
+
 param_kopt:
   | kid Colon kind
     { KOpt_aux (KOpt_kind (None, [$1], Some $3, None), loc $startpos $endpos) }
@@ -1017,8 +1023,8 @@ type_def:
     { mk_td (TD_variant ($2, TypQ_aux (TypQ_tq [], loc $endpos($2) $startpos($3)), $5)) $startpos $endpos }
   | Union id typaram Eq Lcurly type_unions Rcurly
     { mk_td (TD_variant ($2, $3, $6)) $startpos $endpos }
-  | Bitfield id Colon typ Eq Lcurly r_def_body Rcurly
-    { mk_td (TD_bitfield ($2, $4, $7)) $startpos $endpos }
+  | Bitfield id Colon typ Eq bitfield_def_body
+    { mk_td (TD_bitfield ($2, $4, $6)) $startpos $endpos }
 
 enum_functions:
   | id MinusGt typ Comma enum_functions

diff --git a/test/typecheck/pass/bitfield_empty.sail b/test/typecheck/pass/bitfield_empty.sail
@@ -0,0 +1,11 @@
+default Order dec
+
+$include <prelude.sail>
+
+type xlen : Int = 2 ^ 2
+
+bitfield foo : bits(xlen) = { }
+
+bitfield bar : bits(xlen) = {
+
+}