Skip to content
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

Jump to bottom

Simple pp output #524

Closed
wants to merge 2 commits into from
Closed

Simple pp output #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9f2c19
Add new simple output mode for drivers
patricoferris Sep 23, 2024
0ea8c52
Rename -pp-simple to -pp-ast
patricoferris Sep 25, 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
20 changes: 19 additions & 1 deletion src/driver.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,7 @@ let load_source_file fn =

type output_mode =
| Pretty_print
| Pp_ast
| Dump_ast
| Dparsetree
| Reconcile of Reconcile.mode
Expand Down Expand Up @@ -1149,6 +1150,14 @@ let process_file (kind : Kind.t) fn ~input_name ~relocate ~output_mode
Ast_io.write oc
{ input_name; input_version; ast }
~add_ppx_context:true)
| Pp_ast ->
with_output output ~binary:false ~f:(fun oc ->
let ppf = Stdlib.Format.formatter_of_out_channel oc in
let ast = add_cookies ast in
(match ast with
| Intf ast -> Pp_ast.signature ppf ast
| Impl ast -> Pp_ast.structure ppf ast);
Stdlib.Format.pp_print_newline ppf ())
| Dparsetree ->
with_output output ~binary:false ~f:(fun oc ->
let ppf = Stdlib.Format.formatter_of_out_channel oc in
Expand Down Expand Up @@ -1191,11 +1200,12 @@ let set_output_mode mode =
match (!output_mode, mode) with
| Pretty_print, _ -> output_mode := mode
| _, Pretty_print -> assert false
| Dump_ast, Dump_ast | Dparsetree, Dparsetree -> ()
| Dump_ast, Dump_ast | Pp_ast, Pp_ast | Dparsetree, Dparsetree -> ()
| Reconcile a, Reconcile b when Poly.equal a b -> ()
| x, y ->
let arg_of_output_mode = function
| Pretty_print -> assert false
| Pp_ast -> "-pp-ast"
| Dump_ast -> "-dump-ast"
| Dparsetree -> "-dparsetree"
| Reconcile Using_line_directives -> "-reconcile"
Expand Down Expand Up @@ -1343,6 +1353,14 @@ let standalone_args =
Arg.Unit (fun () -> set_output_mode Dump_ast),
" Dump the marshaled ast to the output file instead of pretty-printing it"
);
( "-pp-ast",
Arg.Unit (fun () -> set_output_mode Pp_ast),
" Pretty-print a simple version of the AST using the internal Pp_ast \
module. This is useful for comparing ASTs. For more configuration see \
the ppxlib-tools package." );
( "--pp-ast",
Arg.Unit (fun () -> set_output_mode Pp_ast),
" Same as -pp-simple" );
( "--dump-ast",
Arg.Unit (fun () -> set_output_mode Dump_ast),
" Same as -dump-ast" );
Expand Down
Loading
Loading