Skip to content

Enhancements to Lambda printing for unboxed products #2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2024
Merged

Enhancements to Lambda printing for unboxed products #2574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions ocaml/lambda/printlambda.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ and value_kind' ppf = function
| Pvariant { consts; non_consts; } ->
variant_kind value_kind' ppf ~consts ~non_consts

let rec layout is_top ppf layout_ =
let rec layout' is_top ppf layout_ =
match layout_ with
| Pvalue k -> (if is_top then value_kind else value_kind') ppf k
| Ptop -> fprintf ppf "[top]"
Expand All @@ -191,11 +191,11 @@ let rec layout is_top ppf layout_ =
| Punboxed_int bi -> fprintf ppf "[unboxed_%s]" (boxed_integer_name bi)
| Punboxed_vector (Pvec128 v) -> fprintf ppf "[unboxed_%s]" (vec128_name v)
| Punboxed_product layouts ->
fprintf ppf "@[<hov 1>[%a]@]"
(pp_print_list ~pp_sep:(fun ppf () -> fprintf ppf ",@ ") (layout false))
fprintf ppf "@[<hov 1>#(%a)@]"
(pp_print_list ~pp_sep:(fun ppf () -> fprintf ppf ",@ ") (layout' false))
layouts

let layout ppf layout_ = layout true ppf layout_
let layout ppf layout_ = layout' true ppf layout_

let return_kind ppf (mode, kind) =
let smode = alloc_mode_if_local mode in
Expand Down Expand Up @@ -504,11 +504,13 @@ let primitive ppf = function
| Presume -> fprintf ppf "resume"
| Preperform -> fprintf ppf "reperform"
| Pmake_unboxed_product layouts ->
fprintf ppf "make_unboxed_product [%a]"
(pp_print_list ~pp_sep:(fun ppf () -> fprintf ppf ", ") layout) layouts
fprintf ppf "make_unboxed_product #(%a)"
(pp_print_list ~pp_sep:(fun ppf () -> fprintf ppf ", ") (layout' false))
layouts
| Punboxed_product_field (n, layouts) ->
fprintf ppf "unboxed_product_field %d [%a]" n
(pp_print_list ~pp_sep:(fun ppf () -> fprintf ppf ", ") layout) layouts
fprintf ppf "unboxed_product_field %d #(%a)" n
(pp_print_list ~pp_sep:(fun ppf () -> fprintf ppf ", ") (layout' false))
layouts
| Pccall p -> fprintf ppf "%s" p.prim_name
| Praise k -> fprintf ppf "%s" (Lambda.raise_kind k)
| Psequand -> fprintf ppf "&&"
Expand Down
Loading