Skip to content

Commit 3feef88

Browse files
mununkimununki
committed
get module_id from J.expression
1 parent a18edd1 commit 3feef88

File tree

4 files changed

+24
-28
lines changed

4 files changed

+24
-28
lines changed

‎jscomp/core/lam_compile_primitive.ml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,26 +89,25 @@ let translate ?output_prefix loc (cxt : Lam_compile_context.t)
8989
let output_dir = Filename.dirname output_prefix in
9090

9191
(* TODO: pull this function out to top-level *)
92-
let rec module_names_of_expression = function
93-
| J.Var (J.Qualified ({ id = { name } }, _)) -> [ name ]
92+
let rec module_id_of_expression = function
93+
| J.Var (J.Qualified (module_id, _)) -> [ module_id ]
9494
| J.Caml_block (exprs, _, _, _) ->
9595
exprs
9696
|> List.map (fun (e : J.expression) ->
97-
module_names_of_expression e.expression_desc)
97+
module_id_of_expression e.expression_desc)
9898
|> List.concat
9999
| _ -> []
100100
in
101101

102-
let module_name =
103-
match module_names_of_expression e.expression_desc with
102+
let module_id =
103+
match module_id_of_expression e.expression_desc with
104104
| [ module_name ] -> module_name
105105
| _ -> assert false
106106
(* TODO: graceful error message here *)
107107
in
108108

109109
let path =
110-
Js_name_of_module_id.string_of_module_id
111-
{ id = Ident.create module_name; kind = Js_op.Ml }
110+
Js_name_of_module_id.string_of_module_id module_id
112111
~output_dir
113112
(* TODO: where is Js_package_info.module_system ? *)
114113
Js_packages_info.NodeJS

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96701,26 +96701,25 @@ let translate ?output_prefix loc (cxt : Lam_compile_context.t)
9670196701
let output_dir = Filename.dirname output_prefix in
9670296702

9670396703
(* TODO: pull this function out to top-level *)
96704-
let rec module_names_of_expression = function
96705-
| J.Var (J.Qualified ({ id = { name } }, _)) -> [ name ]
96704+
let rec module_id_of_expression = function
96705+
| J.Var (J.Qualified (module_id, _)) -> [ module_id ]
9670696706
| J.Caml_block (exprs, _, _, _) ->
9670796707
exprs
9670896708
|> List.map (fun (e : J.expression) ->
96709-
module_names_of_expression e.expression_desc)
96709+
module_id_of_expression e.expression_desc)
9671096710
|> List.concat
9671196711
| _ -> []
9671296712
in
9671396713

96714-
let module_name =
96715-
match module_names_of_expression e.expression_desc with
96714+
let module_id =
96715+
match module_id_of_expression e.expression_desc with
9671696716
| [ module_name ] -> module_name
9671796717
| _ -> assert false
9671896718
(* TODO: graceful error message here *)
9671996719
in
9672096720

9672196721
let path =
96722-
Js_name_of_module_id.string_of_module_id
96723-
{ id = Ident.create module_name; kind = Js_op.Ml }
96722+
Js_name_of_module_id.string_of_module_id module_id
9672496723
~output_dir
9672596724
(* TODO: where is Js_package_info.module_system ? *)
9672696725
Js_packages_info.NodeJS

‎lib/4.06.1/unstable/js_playground_compiler.ml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96701,26 +96701,25 @@ let translate ?output_prefix loc (cxt : Lam_compile_context.t)
9670196701
let output_dir = Filename.dirname output_prefix in
9670296702

9670396703
(* TODO: pull this function out to top-level *)
96704-
let rec module_names_of_expression = function
96705-
| J.Var (J.Qualified ({ id = { name } }, _)) -> [ name ]
96704+
let rec module_id_of_expression = function
96705+
| J.Var (J.Qualified (module_id, _)) -> [ module_id ]
9670696706
| J.Caml_block (exprs, _, _, _) ->
9670796707
exprs
9670896708
|> List.map (fun (e : J.expression) ->
96709-
module_names_of_expression e.expression_desc)
96709+
module_id_of_expression e.expression_desc)
9671096710
|> List.concat
9671196711
| _ -> []
9671296712
in
9671396713

96714-
let module_name =
96715-
match module_names_of_expression e.expression_desc with
96714+
let module_id =
96715+
match module_id_of_expression e.expression_desc with
9671696716
| [ module_name ] -> module_name
9671796717
| _ -> assert false
9671896718
(* TODO: graceful error message here *)
9671996719
in
9672096720

9672196721
let path =
96722-
Js_name_of_module_id.string_of_module_id
96723-
{ id = Ident.create module_name; kind = Js_op.Ml }
96722+
Js_name_of_module_id.string_of_module_id module_id
9672496723
~output_dir
9672596724
(* TODO: where is Js_package_info.module_system ? *)
9672696725
Js_packages_info.NodeJS

‎lib/4.06.1/whole_compiler.ml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -265895,26 +265895,25 @@ let translate ?output_prefix loc (cxt : Lam_compile_context.t)
265895265895
let output_dir = Filename.dirname output_prefix in
265896265896

265897265897
(* TODO: pull this function out to top-level *)
265898-
let rec module_names_of_expression = function
265899-
| J.Var (J.Qualified ({ id = { name } }, _)) -> [ name ]
265898+
let rec module_id_of_expression = function
265899+
| J.Var (J.Qualified (module_id, _)) -> [ module_id ]
265900265900
| J.Caml_block (exprs, _, _, _) ->
265901265901
exprs
265902265902
|> List.map (fun (e : J.expression) ->
265903-
module_names_of_expression e.expression_desc)
265903+
module_id_of_expression e.expression_desc)
265904265904
|> List.concat
265905265905
| _ -> []
265906265906
in
265907265907

265908-
let module_name =
265909-
match module_names_of_expression e.expression_desc with
265908+
let module_id =
265909+
match module_id_of_expression e.expression_desc with
265910265910
| [ module_name ] -> module_name
265911265911
| _ -> assert false
265912265912
(* TODO: graceful error message here *)
265913265913
in
265914265914

265915265915
let path =
265916-
Js_name_of_module_id.string_of_module_id
265917-
{ id = Ident.create module_name; kind = Js_op.Ml }
265916+
Js_name_of_module_id.string_of_module_id module_id
265918265917
~output_dir
265919265918
(* TODO: where is Js_package_info.module_system ? *)
265920265919
Js_packages_info.NodeJS

0 commit comments

Comments
 (0)