Skip to content

Commit 6b41fa1

Browse files
author
Hongbo Zhang
committed
fix travis and bump version
1 parent 5d10daf commit 6b41fa1

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

jscomp/bin/compiler.ml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(** Bundled by ocaml_pack 05/31-16:04 *)
1+
(** Bundled by ocaml_pack 05/31-17:04 *)
22
module Literals : sig
33
#1 "literals.mli"
44
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2356,8 +2356,8 @@ module Lam_current_unit : sig
23562356

23572357

23582358

2359-
val set_file : string -> unit
2360-
val get_file : unit -> string
2359+
val set_current_file : string -> unit
2360+
val get_current_file : unit -> string
23612361
val get_module_name : unit -> string
23622362

23632363
val iset_debug_file : string -> unit
@@ -2402,8 +2402,8 @@ end = struct
24022402
let file = ref ""
24032403
let debug_file = ref ""
24042404

2405-
let set_file f = file := f
2406-
let get_file () = !file
2405+
let set_current_file f = file := f
2406+
let get_current_file () = !file
24072407
let get_module_name () =
24082408
Filename.chop_extension (String.uncapitalize !file)
24092409

@@ -6150,7 +6150,7 @@ let dump env ext lam =
61506150
Printlambda.seriaize env
61516151
(Ext_filename.chop_extension
61526152
~loc:__LOC__
6153-
(Lam_current_unit.get_file ()) ^
6153+
(Lam_current_unit.get_current_file ()) ^
61546154
(Printf.sprintf ".%02d%s.lam" !log_counter ext)
61556155
) lam;
61566156
lam
@@ -7041,7 +7041,7 @@ let calculate_used_idents
70417041
begin match Hashtbl.find ident_free_vars id with
70427042
| exception Not_found ->
70437043
Ext_log.err __LOC__ "%s/%d when compiling %s"
7044-
id.name id.stamp (Lam_current_unit.get_file ());
7044+
id.name id.stamp (Lam_current_unit.get_current_file ());
70457045
assert false
70467046
| e -> e
70477047
end
@@ -13067,7 +13067,7 @@ let find_cmj file =
1306713067
| exception _
1306813068
->
1306913069
Ext_log.warn __LOC__
13070-
"@[%s corrupted in database, when looking %s while compiling %s please update @]" file target (Lam_current_unit.get_file ()) ;
13070+
"@[%s corrupted in database, when looking %s while compiling %s please update @]" file target (Lam_current_unit.get_current_file ()) ;
1307113071
Js_cmj_format.no_pure_dummy; (* FIXME *)
1307213072
| v -> v
1307313073
end
@@ -15777,7 +15777,7 @@ let query (prim : Lam_compile_env.primitive_description)
1577715777
| _ ->
1577815778
Ext_log.err __LOC__
1577915779
"JS.unsafe_js_expr is applied to an non literal string in %s"
15780-
(Lam_current_unit.get_file ())
15780+
(Lam_current_unit.get_current_file ())
1578115781
;
1578215782
assert false
1578315783
end
@@ -15788,7 +15788,7 @@ let query (prim : Lam_compile_env.primitive_description)
1578815788
| _ ->
1578915789
Ext_log.err __LOC__
1579015790
"JS.unsafe_js_expr is applied to an non literal string in %s"
15791-
(Lam_current_unit.get_file ())
15791+
(Lam_current_unit.get_current_file ())
1579215792
;
1579315793
assert false
1579415794
end
@@ -15848,7 +15848,7 @@ let query (prim : Lam_compile_env.primitive_description)
1584815848

1584915849
let comment = "Missing primitve" in
1585015850
Ext_log.warn __LOC__ "%s: %s when compiling %s\n" comment prim_name
15851-
(Lam_current_unit.get_file ()) ;
15851+
(Lam_current_unit.get_current_file ()) ;
1585215852
E.not_implemented prim_name
1585315853
(*we dont use [throw] here, since [throw] is an statement
1585415854
so we wrap in IIFE
@@ -24773,7 +24773,7 @@ let dump name (prog : J.program) =
2477324773
begin
2477424774
incr log_counter ;
2477524775
Ext_pervasives.with_file_as_chan
24776-
(Ext_filename.chop_extension ~loc:__LOC__ (Lam_current_unit.get_file()) ^
24776+
(Ext_filename.chop_extension ~loc:__LOC__ (Lam_current_unit.get_current_file()) ^
2477724777
(Printf.sprintf ".%02d.%s.jsx" !log_counter name)
2477824778
) (fun chan -> Js_dump.dump_program prog chan )
2477924779
end in
@@ -25260,7 +25260,7 @@ let lambda_as_module
2526025260
(output_prefix : string)
2526125261
(lam : Lambda.lambda) =
2526225262
begin
25263-
Lam_current_unit.set_file filename ;
25263+
Lam_current_unit.set_current_file filename ;
2526425264
Lam_current_unit.iset_debug_file "tuple_alloc.ml";
2526525265
Ext_pervasives.with_file_as_chan
2526625266
(Js_config.get_output_file filename)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"postinstall": "./scripts/postinstall.sh"
2424
},
2525
"name": "bs-platform",
26-
"version": "0.5.3",
26+
"version": "0.5.4",
2727
"description": "bucklescript compiler, ocaml standard libary by bucklescript and its required runtime support",
2828
"repository": {
2929
"type": "git",

0 commit comments

Comments
 (0)