Skip to content

Commit 019428e

Browse files
bobzhangbobzhang
authored
Merge pull request #1158 from bloomberg/es6
fix Makefile, split caml_oo_curry (less used) from curry and es6 module support [
2 parents 7d1a2c3 + 192a0bc commit 019428e

File tree

152 files changed

+36606
-1055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+36606
-1055
lines changed

‎jscomp/all.depend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,8 @@ core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
463463
core/js_stmt_make.cmx core/js_program_loader.cmx core/js_op_util.cmx \
464464
core/js_op.cmx core/js_number.cmx core/js_fun_env.cmx \
465465
core/js_exp_make.cmx common/js_config.cmx core/js_closure.cmx core/j.cmx \
466-
ext/ident_set.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx ext/ext_list.cmx \
467-
ext/ext_ident.cmx common/bs_version.cmx core/js_dump.cmi
466+
ext/ident_set.cmx ext/ext_string.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx \
467+
ext/ext_list.cmx ext/ext_ident.cmx common/bs_version.cmx core/js_dump.cmi
468468
core/js_pass_debug.cmx : core/js_dump.cmx common/js_config.cmx core/j.cmx \
469469
ext/ext_pervasives.cmx ext/ext_filename.cmx core/js_pass_debug.cmi
470470
core/js_of_lam_option.cmx : core/js_exp_make.cmx common/js_config.cmx \

‎jscomp/bin/bsb.ml‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,7 +2447,7 @@ module Js_config : sig
24472447

24482448
type module_system =
24492449
| NodeJS | AmdJS | Goog (* This will be serliazed *)
2450-
2450+
| Es6
24512451

24522452
type package_info =
24532453
(module_system * string )
@@ -2557,6 +2557,7 @@ val string : string
25572557
val bytes : string
25582558
val float : string
25592559
val curry : string
2560+
val caml_oo_curry : string
25602561
(* val bigarray : string *)
25612562
(* val unix : string *)
25622563
val int64 : string
@@ -2615,24 +2616,12 @@ end = struct
26152616
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
26162617

26172618

2618-
2619-
2620-
2621-
2622-
2623-
type env =
2624-
| NodeJS
2625-
| AmdJS
2626-
| Goog (* of string option *)
2627-
2628-
2629-
26302619
type path = string
2631-
type module_system = env =
2620+
type module_system =
26322621
| NodeJS
26332622
| AmdJS
26342623
| Goog
2635-
2624+
| Es6
26362625

26372626
type package_info =
26382627
( module_system * string )
@@ -2682,6 +2671,7 @@ let set_npm_package_path s =
26822671
| "commonjs" -> NodeJS
26832672
| "amdjs" -> AmdJS
26842673
| "goog" -> Goog
2674+
| "es6" -> Es6
26852675
| _ ->
26862676
Ext_pervasives.bad_argf "invalid module system %s" package_name), path
26872677
| [path] ->
@@ -2776,6 +2766,7 @@ let float = "Caml_float"
27762766
let hash = "Caml_hash"
27772767
let oo = "Caml_oo"
27782768
let curry = "Curry"
2769+
let caml_oo_curry = "Caml_oo_curry"
27792770
let int64 = "Caml_int64"
27802771
let md5 = "Caml_md5"
27812772
let weak = "Caml_weak"

‎jscomp/bin/bsdep.ml‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ val version : string
55

66
end = struct
77
#1 "bs_version.ml"
8-
let version = "1.4.2"
8+
let version = "1.4.3"
99

1010
end
1111
module Terminfo : sig
@@ -24594,7 +24594,7 @@ module Js_config : sig
2459424594

2459524595
type module_system =
2459624596
| NodeJS | AmdJS | Goog (* This will be serliazed *)
24597-
24597+
| Es6
2459824598

2459924599
type package_info =
2460024600
(module_system * string )
@@ -24704,6 +24704,7 @@ val string : string
2470424704
val bytes : string
2470524705
val float : string
2470624706
val curry : string
24707+
val caml_oo_curry : string
2470724708
(* val bigarray : string *)
2470824709
(* val unix : string *)
2470924710
val int64 : string
@@ -24762,24 +24763,12 @@ end = struct
2476224763
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2476324764

2476424765

24765-
24766-
24767-
24768-
24769-
24770-
type env =
24771-
| NodeJS
24772-
| AmdJS
24773-
| Goog (* of string option *)
24774-
24775-
24776-
2477724766
type path = string
24778-
type module_system = env =
24767+
type module_system =
2477924768
| NodeJS
2478024769
| AmdJS
2478124770
| Goog
24782-
24771+
| Es6
2478324772

2478424773
type package_info =
2478524774
( module_system * string )
@@ -24829,6 +24818,7 @@ let set_npm_package_path s =
2482924818
| "commonjs" -> NodeJS
2483024819
| "amdjs" -> AmdJS
2483124820
| "goog" -> Goog
24821+
| "es6" -> Es6
2483224822
| _ ->
2483324823
Ext_pervasives.bad_argf "invalid module system %s" package_name), path
2483424824
| [path] ->
@@ -24923,6 +24913,7 @@ let float = "Caml_float"
2492324913
let hash = "Caml_hash"
2492424914
let oo = "Caml_oo"
2492524915
let curry = "Curry"
24916+
let caml_oo_curry = "Caml_oo_curry"
2492624917
let int64 = "Caml_int64"
2492724918
let md5 = "Caml_md5"
2492824919
let weak = "Caml_weak"

‎jscomp/bin/bsppx.ml‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6441,7 +6441,7 @@ module Js_config : sig
64416441

64426442
type module_system =
64436443
| NodeJS | AmdJS | Goog (* This will be serliazed *)
6444-
6444+
| Es6
64456445

64466446
type package_info =
64476447
(module_system * string )
@@ -6551,6 +6551,7 @@ val string : string
65516551
val bytes : string
65526552
val float : string
65536553
val curry : string
6554+
val caml_oo_curry : string
65546555
(* val bigarray : string *)
65556556
(* val unix : string *)
65566557
val int64 : string
@@ -6609,24 +6610,12 @@ end = struct
66096610
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
66106611

66116612

6612-
6613-
6614-
6615-
6616-
6617-
type env =
6618-
| NodeJS
6619-
| AmdJS
6620-
| Goog (* of string option *)
6621-
6622-
6623-
66246613
type path = string
6625-
type module_system = env =
6614+
type module_system =
66266615
| NodeJS
66276616
| AmdJS
66286617
| Goog
6629-
6618+
| Es6
66306619

66316620
type package_info =
66326621
( module_system * string )
@@ -6676,6 +6665,7 @@ let set_npm_package_path s =
66766665
| "commonjs" -> NodeJS
66776666
| "amdjs" -> AmdJS
66786667
| "goog" -> Goog
6668+
| "es6" -> Es6
66796669
| _ ->
66806670
Ext_pervasives.bad_argf "invalid module system %s" package_name), path
66816671
| [path] ->
@@ -6770,6 +6760,7 @@ let float = "Caml_float"
67706760
let hash = "Caml_hash"
67716761
let oo = "Caml_oo"
67726762
let curry = "Curry"
6763+
let caml_oo_curry = "Caml_oo_curry"
67736764
let int64 = "Caml_int64"
67746765
let md5 = "Caml_md5"
67756766
let weak = "Caml_weak"
@@ -9114,7 +9105,7 @@ val version : string
91149105

91159106
end = struct
91169107
#1 "bs_version.ml"
9117-
let version = "1.4.2"
9108+
let version = "1.4.3"
91189109

91199110
end
91209111
module Ast_ffi_types : sig

0 commit comments

Comments
 (0)