Skip to content

Declare show's with_path argument for interface deriver as well #277

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
NathanReb merged 2 commits into from
Mar 14, 2024
Merged

Declare show's with_path argument for interface deriver as well #277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83dc1b7
Declare show with_path argument for interface deriver as well
NathanReb Mar 12, 2024
7e43dda
Declare separate args for intf and impl in ppx_deriving_show
NathanReb Mar 13, 2024
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
8 changes: 5 additions & 3 deletions src_plugins/show/ppx_deriving_show.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,10 @@ let str_of_type ~with_path ~path ({ ptype_loc = loc } as type_decl) =
(Ppx_deriving.sanitize ~quoter (polymorphize prettyprinter));
Vb.mk ~attrs:[no_warn_32] (Pat.constraint_ show_var show_type) (polymorphize stringprinter);]

let args = Deriving.Args.(empty +> arg "with_path" (Ast_pattern.ebool __))
let impl_args = Deriving.Args.(empty +> arg "with_path" (Ast_pattern.ebool __))
(* TODO: add arg_default to ppxlib? *)

let impl_generator = Deriving.Generator.V2.make args (fun ~ctxt (_, type_decls) with_path ->
let impl_generator = Deriving.Generator.V2.make impl_args (fun ~ctxt (_, type_decls) with_path ->
let path =
let code_path = Expansion_context.Deriver.code_path ctxt in
(* Cannot use main_module_name from code_path because that contains .cppo suffix (via line directives), so it's actually not the module name. *)
Expand All @@ -330,7 +330,9 @@ let impl_generator = Deriving.Generator.V2.make args (fun ~ctxt (_, type_decls)
in
[Str.value Recursive (List.concat (List.map (str_of_type ~with_path ~path) type_decls))])

let intf_generator = Deriving.Generator.V2.make_noarg (fun ~ctxt:_ (_, type_decls) ->
let intf_args = Deriving.Args.(empty +> arg "with_path" (Ast_pattern.ebool __))

let intf_generator = Deriving.Generator.V2.make intf_args (fun ~ctxt:_ (_, type_decls) _with_path ->
List.concat (List.map sig_of_type type_decls))

let deriving: Deriving.t =
Expand Down