Skip to content

clean up #1314

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
merged 2 commits into from
Mar 6, 2017
Merged

clean up #1314

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
3357b8f
add missing dependencies
bobzhang Mar 6, 2017
81f39d4
clean up
bobzhang Mar 6, 2017
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
13 changes: 6 additions & 7 deletions jscomp/bin/bsdep.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31793,15 +31793,14 @@ let rec unsafe_mapper : Ast_mapper.mapper =
payload)
->
let strip s =
let len = String.length s in
if s.[len - 1] = '_' then
String.sub s 0 (len - 1)
else s in
match s with
| "_module" -> "module"
| x -> x in
begin match Ast_payload.as_ident payload with
| Some {txt = Lident
("__filename"
( "__filename"
| "__dirname"
| "module_"
| "_module"
| "require" as name); loc}
->
let exp =
Expand All @@ -31810,7 +31809,7 @@ let rec unsafe_mapper : Ast_mapper.mapper =
(strip name) ) in
let typ =
Ast_comb.to_undefined_type loc @@
if name = "module_" then
if name = "_module" then
Typ.constr ~loc
{ txt = Ldot (Lident "Node", "node_module") ;
loc} []
Expand Down
13 changes: 6 additions & 7 deletions jscomp/bin/bsppx.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14977,15 +14977,14 @@ let rec unsafe_mapper : Ast_mapper.mapper =
payload)
->
let strip s =
let len = String.length s in
if s.[len - 1] = '_' then
String.sub s 0 (len - 1)
else s in
match s with
| "_module" -> "module"
| x -> x in
begin match Ast_payload.as_ident payload with
| Some {txt = Lident
("__filename"
( "__filename"
| "__dirname"
| "module_"
| "_module"
| "require" as name); loc}
->
let exp =
Expand All @@ -14994,7 +14993,7 @@ let rec unsafe_mapper : Ast_mapper.mapper =
(strip name) ) in
let typ =
Ast_comb.to_undefined_type loc @@
if name = "module_" then
if name = "_module" then
Typ.constr ~loc
{ txt = Ldot (Lident "Node", "node_module") ;
loc} []
Expand Down
165 changes: 88 additions & 77 deletions jscomp/bin/whole_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66008,7 +66008,7 @@ let const ct : t = Lconst ct
*)
let apply fn args loc status : t =
match fn with
(*| Lfunction {kind ; params ;
| Lfunction {kind ; params ;
body = Lprim {primitive =
(Pundefined_to_opt | Pnull_to_opt | Pnull_undefined_to_opt | Pis_null | Pis_null_undefined | Pjs_boolean_to_bool | Pjs_typeof ) as wrap;
args = [Lprim ({primitive; args = inner_args} as primitive_call)]
Expand All @@ -66020,7 +66020,7 @@ let apply fn args loc status : t =
Lprim {primitive = wrap ; args = [Lprim { primitive_call with args ; loc = loc }] ; loc }
| exception _ ->
Lapply { fn; args; loc; status }
end *)
end
| Lfunction {kind ; params;
body = Lsequence (Lprim ({primitive; args = inner_args}as primitive_call), (Lconst _ as const )) }
->
Expand Down Expand Up @@ -66203,16 +66203,16 @@ let prim ~primitive:(prim : primitive) ~args:(ll : t list) loc : t =
Lift.int (int_of_float (float_of_string a))
(* | Pnegfloat -> Lift.float (-. a) *)
(* | Pabsfloat -> Lift.float (abs_float a) *)
| Pstringlength, ( (Const_string (a)) )
| Pstringlength, Const_string a
->
Lift.int (String.length a)
(* | Pnegbint Pnativeint, ( (Const_nativeint i)) *)
(* -> *)
(* Lift.nativeint (Nativeint.neg i) *)
| Pnegbint Pint32, ( (Const_int32 a))
| Pnegbint Pint32, Const_int32 a
->
Lift.int32 (Int32.neg a)
| Pnegbint Pint64, ( (Const_int64 a))
| Pnegbint Pint64, Const_int64 a
->
Lift.int64 (Int64.neg a)
| Pnot , Const_pointer (a,_)
Expand Down Expand Up @@ -66413,6 +66413,7 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : t =
| Pint_as_pointer
| Pidentity ->
begin match args with [x] -> x | _ -> assert false end
| Pccall _ -> assert false
| Prevapply -> assert false
| Pdirapply -> assert false
| Ploc loc -> assert false (* already compiled away here*)
Expand Down Expand Up @@ -66448,38 +66449,6 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : t =
-> prim ~primitive:(Pduprecord(repr,i)) ~args loc
| Plazyforce -> prim ~primitive:Plazyforce ~args loc

| Pccall a ->
let prim_name = a.prim_name in
begin match Ast_ffi_types.from_string a.prim_native_name with
| Ffi_normal ->
if Pervasives.not @@ Ext_string.starts_with prim_name "js_" then
prim ~primitive:(Pccall a ) ~args loc else
if prim_name = Literals.js_debugger then
prim ~primitive:Pdebugger ~args loc else
if prim_name = Literals.js_fn_run || prim_name = Literals.js_method_run then
prim ~primitive:(Pjs_fn_run (int_of_string a.prim_native_name)) ~args loc else
if prim_name = Literals.js_fn_mk then
prim ~primitive:(Pjs_fn_make (int_of_string a.prim_native_name)) ~args loc else
if prim_name = Literals.js_fn_method then
prim ~primitive:(Pjs_fn_method (int_of_string a.prim_native_name)) ~args loc else
if prim_name = Literals.js_fn_runmethod then
prim ~primitive:(Pjs_fn_runmethod (int_of_string a.prim_native_name)) ~args loc
else
prim ~primitive:(Pccall a) ~args loc
| Ffi_obj_create labels ->
prim ~primitive:(Pjs_object_create labels) ~args loc
| Ffi_bs(arg_types, result_type, ffi) ->

if no_auto_uncurried_arg_types arg_types then
result_wrap loc result_type @@ prim ~primitive:(Pjs_call(prim_name, arg_types, ffi))
~args loc
else
let n_arg_types, n_args =
transform_uncurried_arg_type loc arg_types args in
result_wrap loc result_type @@
prim ~primitive:(Pjs_call (prim_name, n_arg_types, ffi))
~args:n_args loc
end

| Praise _ ->
if Js_config.get_no_any_assert () then
Expand Down Expand Up @@ -66860,23 +66829,23 @@ let convert exports lam : _ * _ =
| Lprim(Prevapply, [x ; f ], outer_loc)
| Lprim(Pdirapply, [f ; x], outer_loc) ->
begin match f with
(* [x|>f]
TODO: [airty = 0] when arity =0, it can not be escaped user can only
write [f x ] instead of [x |> f ]
*)
(* [x|>f]
TODO: [airty = 0] when arity =0, it can not be escaped user can only
write [f x ] instead of [x |> f ]
*)
| Lfunction(kind, [param],Lprim(external_fn,[Lvar inner_arg],inner_loc))
when Ident.same param inner_arg
->
aux (Lprim(external_fn, [x], outer_loc))
when Ident.same param inner_arg
->
aux (Lprim(external_fn, [x], outer_loc))

| Lapply(Lfunction(kind, params,Lprim(external_fn,inner_args,inner_loc)), args, outer_loc ) (* x |> f a *)
when Ext_list.for_all2_no_exn (fun x y -> match y with Lambda.Lvar y when Ident.same x y -> true | _ -> false ) params inner_args
&&
Ext_list.length_larger_than_n 1 inner_args args
->
aux (Lprim(external_fn, args @ [x], outer_loc))

when Ext_list.for_all2_no_exn (fun x y -> match y with Lambda.Lvar y when Ident.same x y -> true | _ -> false ) params inner_args
&&
Ext_list.length_larger_than_n 1 inner_args args
->

aux (Lprim(external_fn, args @ [x], outer_loc))
| _ ->
let x = aux x in
let f = aux f in
Expand Down Expand Up @@ -66927,7 +66896,7 @@ let convert exports lam : _ * _ =
prim ~primitive:Pnull_to_opt ~args:[aux arg] loc
| _ -> assert false
end
| Lprim (Pccall {prim_name = "js_is_nil"}, args, loc) ->
| Lprim (Pccall {prim_name = "js_is_nil" }, args, loc) ->
begin match args with
| [arg] -> prim ~primitive:Pis_null ~args:[aux arg] loc
| _ -> assert false
Expand Down Expand Up @@ -66958,23 +66927,55 @@ let convert exports lam : _ * _ =
| [e] -> prim ~primitive:Pjs_typeof ~args:[aux e] loc
| _ -> assert false
end
| Lprim(Pccall a, args, loc) ->
let args = List.map aux args in
let prim_name = a.prim_name in
begin match Ast_ffi_types.from_string a.prim_native_name with
| Ffi_normal ->
if Pervasives.not @@ Ext_string.starts_with prim_name "js_" then
prim ~primitive:(Pccall a ) ~args loc else
if prim_name = Literals.js_debugger then
prim ~primitive:Pdebugger ~args loc else
if prim_name = Literals.js_fn_run || prim_name = Literals.js_method_run then
prim ~primitive:(Pjs_fn_run (int_of_string a.prim_native_name)) ~args loc else
if prim_name = Literals.js_fn_mk then
prim ~primitive:(Pjs_fn_make (int_of_string a.prim_native_name)) ~args loc else
if prim_name = Literals.js_fn_method then
prim ~primitive:(Pjs_fn_method (int_of_string a.prim_native_name)) ~args loc else
if prim_name = Literals.js_fn_runmethod then
prim ~primitive:(Pjs_fn_runmethod (int_of_string a.prim_native_name)) ~args loc
else
prim ~primitive:(Pccall a) ~args loc
| Ffi_obj_create labels ->
prim ~primitive:(Pjs_object_create labels) ~args loc
| Ffi_bs(arg_types, result_type, ffi) ->

if no_auto_uncurried_arg_types arg_types then
result_wrap loc result_type @@ prim ~primitive:(Pjs_call(prim_name, arg_types, ffi))
~args loc
else
let n_arg_types, n_args =
transform_uncurried_arg_type loc arg_types args in
result_wrap loc result_type @@
prim ~primitive:(Pjs_call (prim_name, n_arg_types, ffi))
~args:n_args loc
end

(* TODO: pick a invalid external name to avod conflict *)
| Lprim (Pgetglobal id, args, loc) ->
let args = List.map aux args in
if Ident.is_predef_exn id then
Lprim {primitive = Pglobal_exception id; args ; loc}
else
begin
may_depend may_depends (Lam_module_ident.of_ml id);
assert (args = []);
Lglobal_module id
end
| Lprim (primitive,args, loc)
->
let args = (List.map aux args) in
begin match primitive with
| Pgetglobal id ->
if Ident.is_predef_exn id then
Lprim {primitive = Pglobal_exception id; args ; loc}
else
begin
may_depend may_depends (Lam_module_ident.of_ml id);
assert (args = []);
Lglobal_module id
end
| _ ->
lam_prim ~primitive ~args loc
end
let args = List.map aux args in
lam_prim ~primitive ~args loc
| Lswitch (e,s) ->
Lswitch (aux e, aux_switch s)
| Lstringswitch (e, cases, default,_) ->
Expand Down Expand Up @@ -67017,8 +67018,8 @@ let convert exports lam : _ * _ =
Lsend(kind, aux a, b, List.map aux ls, loc )
end
| Levent (e, event) ->
(* disabled by upstream*)
assert false
(* disabled by upstream*)
assert false
| Lifused (id, e) ->
Lifused(id, aux e) (* TODO: remove it ASAP *)
and aux_switch (s : Lambda.lambda_switch) : switch =
Expand Down Expand Up @@ -91986,8 +91987,19 @@ let translate loc
| _ -> assert false
end
| Lam.Pnull_undefined_to_opt ->
E.runtime_call Js_config.js_primitive
"js_from_nullable_def" args
(*begin match args with
| [e] ->
begin match e.expression_desc with
| Var _ ->
E.econd (E.or_ (E.is_undef e) (E.is_nil e))
Js_of_lam_option.none
(Js_of_lam_option.some e)
| _ ->*)
E.runtime_call Js_config.js_primitive
"js_from_nullable_def" args
(*end*)
(* | _ -> assert false *)
(* end *)
| Pis_null ->
begin match args with
| [e] -> E.is_nil e
Expand Down Expand Up @@ -103402,15 +103414,14 @@ let rec unsafe_mapper : Ast_mapper.mapper =
payload)
->
let strip s =
let len = String.length s in
if s.[len - 1] = '_' then
String.sub s 0 (len - 1)
else s in
match s with
| "_module" -> "module"
| x -> x in
begin match Ast_payload.as_ident payload with
| Some {txt = Lident
("__filename"
( "__filename"
| "__dirname"
| "module_"
| "_module"
| "require" as name); loc}
->
let exp =
Expand All @@ -103419,7 +103430,7 @@ let rec unsafe_mapper : Ast_mapper.mapper =
(strip name) ) in
let typ =
Ast_comb.to_undefined_type loc @@
if name = "module_" then
if name = "_module" then
Typ.constr ~loc
{ txt = Ldot (Lident "Node", "node_module") ;
loc} []
Expand Down
7 changes: 7 additions & 0 deletions jscomp/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,11 @@ echo "Snapshot && update deps" >> ./build.compile

make -C test depend 2>>../build.compile
make -j7 depend snapshotml 2>> ./build.compile

echo "Updating dependencies in runtime"
cd runtime; make depend; cd ..

echo "Updating dependencies in others"
cd others; make depend; cd ..

echo "Done" >> ./build.compile
Loading