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

Printtyped: change printing of "extra" nodes #9444

Merged
merged 2 commits into from
Nov 16, 2021
Merged

Printtyped: change printing of "extra" nodes #9444

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd29189
Printtyped: remove redundant quoting
let-def Apr 14, 2020
0b3a51f
Printtyped: printing {exp,pat}_extra reflects tree representation
let-def Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 16 additions & 13 deletions typing/printtyped.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,12 @@ and pattern : type k . _ -> _ -> k general_pattern -> unit = fun i ppf x ->
line i ppf "pattern %a\n" fmt_location x.pat_loc;
attributes i ppf x.pat_attributes;
let i = i+1 in
match x.pat_extra with
| extra :: rem ->
pattern_extra i ppf extra;
pattern i ppf { x with pat_extra = rem }
| [] ->
begin match x.pat_extra with
| [] -> ()
| extra ->
line i ppf "extra\n";
List.iter (pattern_extra (i+1) ppf) extra;
end;
match x.pat_desc with
| Tpat_any -> line i ppf "Tpat_any\n";
| Tpat_var (s,_) -> line i ppf "Tpat_var \"%a\"\n" fmt_ident s;
Expand Down Expand Up @@ -294,10 +295,10 @@ and pattern_extra i ppf (extra_pat, _, attrs) =
line i ppf "Tpat_extra_type %a\n" fmt_path id;
attributes i ppf attrs;
| Tpat_open (id,_,_) ->
line i ppf "Tpat_extra_open \"%a\"\n" fmt_path id;
line i ppf "Tpat_extra_open %a\n" fmt_path id;
attributes i ppf attrs;

and expression_extra i ppf x attrs =
and expression_extra i ppf (x,_,attrs) =
match x with
| Texp_constraint ct ->
line i ppf "Texp_constraint\n";
Expand All @@ -319,11 +320,13 @@ and expression_extra i ppf x attrs =
and expression i ppf x =
line i ppf "expression %a\n" fmt_location x.exp_loc;
attributes i ppf x.exp_attributes;
let i =
List.fold_left (fun i (extra,_,attrs) ->
expression_extra i ppf extra attrs; i+1)
(i+1) x.exp_extra
in
let i = i+1 in
begin match x.exp_extra with
| [] -> ()
| extra ->
line i ppf "extra\n";
List.iter (expression_extra (i+1) ppf) extra;
end;
match x.exp_desc with
| Texp_ident (li,_,_) -> line i ppf "Texp_ident %a\n" fmt_path li;
| Texp_instvar (_, li,_) -> line i ppf "Texp_instvar %a\n" fmt_path li;
Expand Down Expand Up @@ -407,7 +410,7 @@ and expression i ppf x =
expression i ppf e
| Texp_new (li, _, _) -> line i ppf "Texp_new %a\n" fmt_path li;
| Texp_setinstvar (_, s, _, e) ->
line i ppf "Texp_setinstvar \"%a\"\n" fmt_path s;
line i ppf "Texp_setinstvar %a\n" fmt_path s;
expression i ppf e;
| Texp_override (_, l) ->
line i ppf "Texp_override\n";
Expand Down