Skip to content

Commit

Permalink
Compiler: js-parser, fix pringing for empty elt in array lit
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhugo
hhugo committed Dec 15, 2023
1 parent b74379a commit 00711b7
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 33 deletions.
32 changes: 17 additions & 15 deletions compiler/lib/js_output.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,32 +386,33 @@ struct
let pp_ident_or_string_lit f (Stdlib.Utf8_string.Utf8 s_lit as s) =
if is_ident s_lit then PP.string f s_lit else pp_string_lit f s

let rec comma_list f f_elt l =
let rec comma_list f ~force_last_comma f_elt l =
match l with
| [] -> ()
| [ x ] ->
PP.start_group f 0;
f_elt f x;
if force_last_comma x then PP.string f ",";
PP.end_group f
| x :: r ->
PP.start_group f 0;
f_elt f x;
PP.end_group f;
PP.string f ",";
PP.space f;
comma_list f f_elt r
comma_list f ~force_last_comma f_elt r

let comma_list_rest f f_elt l f_rest rest =
let comma_list_rest f ~force_last_comma f_elt l f_rest rest =
match l, rest with
| [], None -> ()
| [], Some rest ->
PP.start_group f 0;
PP.string f "...";
f_rest f rest;
PP.end_group f
| l, None -> comma_list f f_elt l
| l, None -> comma_list f ~force_last_comma f_elt l
| l, Some r ->
comma_list f f_elt l;
comma_list f ~force_last_comma:(fun _ -> false) f_elt l;
PP.string f ",";
PP.space f;
PP.start_group f 0;
Expand Down Expand Up @@ -731,13 +732,13 @@ struct
| ObjectTarget list ->
PP.start_group f 1;
PP.string f "{";
comma_list f property list;
comma_list f ~force_last_comma:(fun _ -> false) property list;
PP.string f "}";
PP.end_group f
| ArrayTarget list ->
PP.start_group f 1;
PP.string f "[";
comma_list f element list;
comma_list f ~force_last_comma:(function TargetElementHole -> true | _ -> false) element list;
PP.string f "]";
PP.end_group f)
| EArr el ->
Expand Down Expand Up @@ -911,7 +912,7 @@ struct
expression Expression f e;
PP.string f "]"

and property_list f l = comma_list f property l
and property_list f l = comma_list f ~force_last_comma:(fun _ -> false) property l

and property f p =
match p with
Expand Down Expand Up @@ -959,7 +960,7 @@ struct
in
function_declaration f "" fpn (Some ()) l b loc'

and element_list f el = comma_list f element el
and element_list f el = comma_list f ~force_last_comma:(function ElementHole -> true | _ -> false)element el

and element f (e : element) =
match e with
Expand All @@ -977,7 +978,7 @@ struct
and formal_parameter f e = binding_element f e

and formal_parameter_list f { list; rest } =
comma_list_rest f formal_parameter list binding rest
comma_list_rest f ~force_last_comma:(fun _ -> false) formal_parameter list binding rest

and function_body f b = statement_list f ~skip_last_semi:true b

Expand All @@ -990,7 +991,7 @@ struct
expression AssignementExpression f e);
PP.end_group f

and arguments f l = comma_list f argument l
and arguments f l = comma_list f ~force_last_comma:(fun _ -> false) argument l

and variable_declaration f x =
match x with
Expand Down Expand Up @@ -1064,13 +1065,13 @@ struct
| ObjectBinding { list; rest } ->
PP.start_group f 1;
PP.string f "{";
comma_list_rest f binding_property list ident rest;
comma_list_rest f ~force_last_comma:(fun _ -> false) binding_property list ident rest;
PP.string f "}";
PP.end_group f
| ArrayBinding { list; rest } ->
PP.start_group f 1;
PP.string f "[";
comma_list_rest f binding_array_elt list binding rest;
comma_list_rest f ~force_last_comma:(function None -> true | Some _ -> false) binding_array_elt list binding rest;
PP.string f "]";
PP.end_group f

Expand Down Expand Up @@ -1516,6 +1517,7 @@ struct
PP.space f;
comma_list
f
~force_last_comma:(fun _ -> false)
(fun f (s, i) ->
if match i with
| S { name; _ } when Stdlib.Utf8_string.equal name s -> true
Expand Down Expand Up @@ -1545,7 +1547,7 @@ struct
PP.space f;
PP.string f "{";
PP.space f;
comma_list
comma_list ~force_last_comma:(fun _ -> false)
f
(fun f (i, s) ->
if match i with
Expand All @@ -1569,7 +1571,7 @@ struct
| Export_names l ->
PP.string f "{";
PP.space f;
comma_list
comma_list ~force_last_comma:(fun _ -> false)
f
(fun f (a, b) ->
if Stdlib.Utf8_string.equal a b
Expand Down
35 changes: 17 additions & 18 deletions compiler/lib/js_parser.mly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,22 +231,27 @@ listc_rev(X):
| listc_rev(X) { List.rev $1 }

listc_with_empty_trail_rev(X):
| e=elision { (List.rev_map (fun () -> None) (() :: e)) }
| x=X e=elision { List.rev_append (List.rev_map (fun () -> None) e) [ Some x ] }
| listc_with_empty_trail_rev(X) x=X e=elision { List.rev_append (List.rev_map (fun () -> None) e) (Some x :: $1) }
| "," { [ None ] }
| X "," { [ Some $1 ] }
| listc_with_empty_trail_rev(X) X "," { Some $2 :: $1 }
| listc_with_empty_trail_rev(X) "," { None :: $1 }

listc_with_empty(X):
| X { [ Some $1 ] }
| listc_with_empty_trail_rev(X) { List.rev $1 }
| listc_with_empty_trail_rev(X) X { List.rev ((Some $2) :: $1) }
| listc_with_empty_trail_rev(X) x=X? {
match x with
| None -> List.rev $1
| Some _ -> List.rev (x :: $1)
}
| x=X { [ Some x ] }
| (* empty *) { [] }

listc_with_empty2(X,Y):
| X { [ Some $1 ], None }
| Y { [ ], Some $1 }
| listc_with_empty_trail_rev(X) { List.rev $1, None }
| listc_with_empty_trail_rev(X) X { List.rev (Some $2 :: $1), None }
| listc_with_empty_trail_rev(X) Y { List.rev ($1), Some $2 }

| listc_with_empty_trail_rev(X) x=X { List.rev (Some x :: $1), None }
| listc_with_empty_trail_rev(X) { List.rev $1, None }
| listc_with_empty_trail_rev(X) y=Y { List.rev $1, Some y }
| X { [Some $1], None }
| Y { [], Some $1 }
| (* empty *) { [], None }

optl(X):
| (* empty *) { [] }
Expand Down Expand Up @@ -515,7 +520,6 @@ binding_element:
* type like for the (call)argument type.
*)
array_binding_pattern:
| "[" "]" { ArrayBinding (list []) }
| "[" l=listc_with_empty2(binding_element, binding_element_rest) "]" {
ArrayBinding {list = fst l; rest = snd l }
}
Expand Down Expand Up @@ -1017,7 +1021,6 @@ assignment_operator:
(*----------------------------*)

array_literal:
| "[" "]" { EArr [] }
| "[" l=listc_with_empty (element) "]"
{ (EArr (List.map (function None -> ElementHole | Some x -> x) l)) }

Expand Down Expand Up @@ -1288,7 +1291,3 @@ property_name:
sc:
| ";" { $1 }
| T_VIRTUAL_SEMICOLON { $1 }

elision:
| "," { [] }
| elision "," { () :: $1 }

0 comments on commit 00711b7

Please sign in to comment.