Skip to content

refactor: guarantee Js.dump only uses pp_assign with ~property #1430

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
anmonteiro merged 1 commit into from
Jun 19, 2025
Merged

refactor: guarantee Js.dump only uses pp_assign with ~property #1430

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
65 changes: 33 additions & 32 deletions jscomp/core/js_dump.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,31 +227,6 @@ let exp_need_paren (e : J.expression) =
else
id) *)

let pp_var_assign cxt id =
string cxt L.let_;
space cxt;
let acxt = ident cxt id in
space cxt;
string cxt L.eq;
space cxt;
acxt

let pp_const_assign cxt id =
string cxt L.const;
space cxt;
let acxt = ident cxt id in
space cxt;
string cxt L.eq;
space cxt;
acxt

let pp_var_assign_this cxt id =
let cxt = pp_var_assign cxt id in
string cxt L.this;
semi cxt;
newline cxt;
cxt

let pp_var_declare cxt id =
string cxt L.let_;
space cxt;
Expand Down Expand Up @@ -344,10 +319,36 @@ let block_has_all_int_fields =
!r
with Local r -> r

let pp_assign ~(property : Lam_group.let_kind) cxt name =
match property with
| Variable -> pp_var_assign cxt name
| Strict | Alias | StrictOpt -> pp_const_assign cxt name
let pp_assign =
let pp_var_assign cxt id =
string cxt L.let_;
space cxt;
let acxt = ident cxt id in
space cxt;
string cxt L.eq;
space cxt;
acxt
in
let pp_const_assign cxt id =
string cxt L.const;
space cxt;
let acxt = ident cxt id in
space cxt;
string cxt L.eq;
space cxt;
acxt
in
fun ~property cxt name ->
match property with
| Lam_group.Variable -> pp_var_assign cxt name
| Strict | Alias | StrictOpt -> pp_const_assign cxt name

let pp_var_assign_this cxt id =
let cxt = pp_assign ~property:Variable cxt id in
string cxt L.this;
semi cxt;
newline cxt;
cxt

(* TODO: refactoring
Note that {!pp_function} could print both statement and expression when [No_name] is given
Expand Down Expand Up @@ -1107,10 +1108,10 @@ and statement_desc top cxt (s : J.statement_desc) : cxt =
(for_ident_expression, finish.expression_desc)
with
| Some ident_expression, (Number _ | Var _) ->
let cxt = pp_var_assign cxt id in
let cxt = pp_assign ~property:Variable cxt id in
(expression ~level:0 cxt ident_expression, None)
| Some ident_expression, _ ->
let cxt = pp_var_assign cxt id in
let cxt = pp_assign ~property:Variable cxt id in
let cxt =
expression ~level:1 cxt ident_expression
in
Expand All @@ -1125,7 +1126,7 @@ and statement_desc top cxt (s : J.statement_desc) : cxt =
| None, (Number _ | Var _) -> (cxt, None)
| None, _ ->
let id = Ident.create (Ident.name id ^ "_finish") in
let cxt = pp_var_assign cxt id in
let cxt = pp_assign ~property:Variable cxt id in
(expression ~level:15 cxt finish, Some id)
in
semi cxt;
Expand Down