Fmt: allow Field wrap

trdthg · Jul 25, 2024 · fd32b89 · fd32b89
1 parent 04dd79f
commit fd32b89
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/lib/format_sail.ml b/src/lib/format_sail.ml
@@ -482,7 +482,8 @@ let rec can_chunks_list_wrap ?(opt = { nest = 0; in_braces = false }) cqs =
           let can_wrap_nested =
             match c with
             | Atom _ | String_literal _ | Delim _ | Opt_delim _ -> true
-            | Block (_, exps) -> can_chunks_list_wrap ~opt exps
+            | Block (_, cqs) -> can_chunks_list_wrap ~opt cqs
+            | Field (cq, id) -> can_chunks_list_wrap ~opt [cq]
             | _ -> false
           in
           if not can_wrap_nested then count := !count + 1;
@@ -493,16 +494,18 @@ let rec can_chunks_list_wrap ?(opt = { nest = 0; in_braces = false }) cqs =
             | Atom _ | String_literal _ -> true
             (* unit => (), *)
             | Delim _ | Opt_delim _ -> true (* Xs[unsigned(r)], *)
-            | App (id, chunks) -> can_chunks_list_wrap ~opt:(opt |> nest_add) chunks
+            | App (id, cqs) -> can_chunks_list_wrap ~opt:(opt |> nest_add) cqs
+            (* zero_extend(fcsr.bits) *)
+            | Field (cq, id) -> can_chunks_list_wrap ~opt [cq]
             (* (v128 >> shift)[64..0] *)
             | Binary (x, op, y) -> can_chunks_list_wrap ~opt [x] && can_chunks_list_wrap ~opt [y]
             (* if regval[31..16] then *)
-            | Index (exp, ix) -> can_chunks_list_wrap ~opt:(opt |> in_braces) [exp] && can_chunks_list_wrap ~opt [ix]
+            | Index (cq, ix) -> can_chunks_list_wrap ~opt:(opt |> in_braces) [cq] && can_chunks_list_wrap ~opt [ix]
             (* if (a > 1) then {1} else {2} *)
             | If_then_else (_, i, t, e) ->
                 can_chunks_list_wrap ~opt [i] && can_chunks_list_wrap ~opt [t] && can_chunks_list_wrap ~opt [e]
             (* {{{ Atom }}} *)
-            | Block (_, exps) -> can_chunks_list_wrap ~opt:(opt |> in_braces) exps
+            | Block (_, cqs) -> can_chunks_list_wrap ~opt:(opt |> in_braces) cqs
             (* case => (), // comment *)
             (* then 2 // comment *)
             | Comment (_, _, _, _, trailing) -> (not opt.in_braces) && trailing

diff --git a/test/format/default/wrap.expect b/test/format/default/wrap.expect
@@ -0,0 +1,3 @@
+function clause ext_read_CSR 0x001 = Some(zero_extend(fcsr[FFLAGS]))
+function clause ext_read_CSR 0x002 = Some(zero_extend(fcsr[FRM]))
+function clause ext_read_CSR 0x003 = Some(zero_extend(fcsr.bits))
diff --git a/test/format/wrap.sail b/test/format/wrap.sail
@@ -0,0 +1,3 @@
+function clause ext_read_CSR 0x001 = Some(zero_extend(fcsr[FFLAGS]))
+function clause ext_read_CSR 0x002 = Some(zero_extend(fcsr[FRM]))
+function clause ext_read_CSR 0x003 = Some(zero_extend(fcsr.bits))