Skip to content

Commit 8834a45

Browse files
bobzhangbobzhang
authored
Merge pull request #4467 from BuckleScript/update
bump to 8.0.1
2 parents b3c1ef6 + dddf32b commit 8834a45

19 files changed

+141
-139
lines changed

‎jscomp/artifacts.json‎

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"lib": [
4747
"bstracing",
4848
"minisocket.js",
49-
"jsconfig.json",
5049
"build.ninja",
5150
"prebuilt.ninja"
5251
],
@@ -228,9 +227,7 @@
228227
"string.js",
229228
"stringLabels.js",
230229
"sys.js",
231-
"uchar.js",
232-
"unix.js",
233-
"unixLabels.js"
230+
"uchar.js"
234231
],
235232
"lib/js": [
236233
"arg.js",
@@ -400,8 +397,7 @@
400397
"string.js",
401398
"stringLabels.js",
402399
"sys.js",
403-
"uchar.js",
404-
"unix.js",
400+
"uchar.js"
405401
],
406402
"lib/ocaml": [
407403
"arg.cmi",
@@ -441,7 +437,6 @@
441437
"belt_SortArrayInt.cmi",
442438
"belt_SortArrayString.cmi",
443439
"belt.cmi",
444-
"bigarray.cmi",
445440
"buffer.cmi",
446441
"bytes.cmi",
447442
"bytesLabels.cmi",
@@ -458,7 +453,6 @@
458453
"dom_storage.cmi",
459454
"dom_storage2.cmi",
460455
"dom.cmi",
461-
"ephemeron.cmi",
462456
"filename.cmi",
463457
"format.cmi",
464458
"gc.cmi",
@@ -512,7 +506,6 @@
512506
"node_process.cmi",
513507
"node.cmi",
514508
"obj.cmi",
515-
"oo.cmi",
516509
"parsing.cmi",
517510
"pervasives.cmi",
518511
"printexc.cmi",
@@ -531,9 +524,6 @@
531524
"stringLabels.cmi",
532525
"sys.cmi",
533526
"uchar.cmi",
534-
"unix.cmi",
535-
"unixLabels.cmi",
536-
"weak.cmi",
537527
"arg.cmt",
538528
"array.cmt",
539529
"arrayLabels.cmt",
@@ -580,7 +570,6 @@
580570
"belt_SortArrayInt.cmt",
581571
"belt_SortArrayString.cmt",
582572
"belt.cmt",
583-
"bigarray.cmt",
584573
"buffer.cmt",
585574
"bytes.cmt",
586575
"bytesLabels.cmt",
@@ -597,7 +586,6 @@
597586
"dom_storage.cmt",
598587
"dom_storage2.cmt",
599588
"dom.cmt",
600-
"ephemeron.cmt",
601589
"filename.cmt",
602590
"format.cmt",
603591
"gc.cmt",
@@ -651,7 +639,6 @@
651639
"node_process.cmt",
652640
"node.cmt",
653641
"obj.cmt",
654-
"oo.cmt",
655642
"parsing.cmt",
656643
"pervasives.cmt",
657644
"printexc.cmt",
@@ -670,9 +657,6 @@
670657
"stringLabels.cmt",
671658
"sys.cmt",
672659
"uchar.cmt",
673-
"unix.cmt",
674-
"unixLabels.cmt",
675-
"weak.cmt",
676660
"arg.cmti",
677661
"array.cmti",
678662
"arrayLabels.cmti",
@@ -714,7 +698,6 @@
714698
"belt_SortArray.cmti",
715699
"belt_SortArrayInt.cmti",
716700
"belt_SortArrayString.cmti",
717-
"bigarray.cmti",
718701
"buffer.cmti",
719702
"bytes.cmti",
720703
"bytesLabels.cmti",
@@ -727,7 +710,6 @@
727710
"char.cmti",
728711
"complex.cmti",
729712
"digest.cmti",
730-
"ephemeron.cmti",
731713
"filename.cmti",
732714
"format.cmti",
733715
"gc.cmti",
@@ -758,7 +740,6 @@
758740
"nativeint.cmti",
759741
"node_process.cmti",
760742
"obj.cmti",
761-
"oo.cmti",
762743
"parsing.cmti",
763744
"pervasives.cmti",
764745
"printexc.cmti",
@@ -776,9 +757,6 @@
776757
"stringLabels.cmti",
777758
"sys.cmti",
778759
"uchar.cmti",
779-
"unix.cmti",
780-
"unixLabels.cmti",
781-
"weak.cmti",
782760
"arg.ml",
783761
"array.ml",
784762
"arrayLabels.ml",
@@ -826,7 +804,6 @@
826804
"belt_SortArrayInt.ml",
827805
"belt_SortArrayString.ml",
828806
"belt.ml",
829-
"bigarray.ml",
830807
"buffer.ml",
831808
"bytes.ml",
832809
"bytesLabels.ml",
@@ -843,7 +820,6 @@
843820
"dom_storage.ml",
844821
"dom_storage2.ml",
845822
"dom.ml",
846-
"ephemeron.ml",
847823
"filename.ml",
848824
"format.ml",
849825
"gc.ml",
@@ -905,7 +881,6 @@
905881
"node_process.ml",
906882
"node.ml",
907883
"obj.ml",
908-
"oo.ml",
909884
"parsing.ml",
910885
"pervasives.ml",
911886
"printexc.ml",
@@ -926,9 +901,6 @@
926901
"stringLabels.ml",
927902
"sys.ml",
928903
"uchar.ml",
929-
"unix.ml",
930-
"unixLabels.ml",
931-
"weak.ml",
932904
"arg.mli",
933905
"array.mli",
934906
"arrayLabels.mli",
@@ -971,7 +943,6 @@
971943
"belt_SortArray.mli",
972944
"belt_SortArrayInt.mli",
973945
"belt_SortArrayString.mli",
974-
"bigarray.mli",
975946
"buffer.mli",
976947
"bytes.mli",
977948
"bytesLabels.mli",
@@ -984,7 +955,6 @@
984955
"char.mli",
985956
"complex.mli",
986957
"digest.mli",
987-
"ephemeron.mli",
988958
"filename.mli",
989959
"format.mli",
990960
"gc.mli",
@@ -1019,7 +989,6 @@
1019989
"nativeint.mli",
1020990
"node_process.mli",
1021991
"obj.mli",
1022-
"oo.mli",
1023992
"parsing.mli",
1024993
"pervasives.mli",
1025994
"printexc.mli",
@@ -1038,10 +1007,7 @@
10381007
"string.mli",
10391008
"stringLabels.mli",
10401009
"sys.mli",
1041-
"uchar.mli",
1042-
"unix.mli",
1043-
"unixLabels.mli",
1044-
"weak.mli"
1010+
"uchar.mli"
10451011
],
10461012
"linux": [
10471013
"ninja.COPYING",
@@ -1063,6 +1029,7 @@
10631029
"install.js",
10641030
"installUtils.js",
10651031
"js_internal_gen.js",
1032+
"littlecase.js",
10661033
"ninja.js",
10671034
"ninjaFactory.js",
10681035
"prebuilt.js",
@@ -1072,6 +1039,7 @@
10721039
"shake.js",
10731040
"tasks.js",
10741041
"tmp.js",
1042+
"validate.js",
10751043
"jsconfig.json",
10761044
"build_sorted.ml",
10771045
"caml_oo_curry_gen.ml",

‎jscomp/common/bs_version.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* You should have received a copy of the GNU Lesser General Public License
2323
* along with this program; if not, write to the Free Software
2424
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
25-
let version = "8.0.0-dev.1"
25+
let version = "8.1.0-dev.1"
2626
let header =
2727
"// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"
2828
let package_name = "bs-platform"

‎jscomp/others/belt_internalAVLtree.ml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,14 @@ let rec findFirstByU n p =
169169
match n with
170170
| None -> None
171171
| Some n ->
172-
let left = n .left |. findFirstByU p in
172+
let left = findFirstByU n.left p in
173173
if left <> None then left
174174
else
175175
let {key = v; value = d} = n in
176176
let pvd = p v d [@bs] in
177177
if pvd then Some(v, d)
178178
else
179-
let right = n.right|. findFirstByU p in
179+
let right = findFirstByU n.right p in
180180
if right <> None then right else None
181181

182182
let findFirstBy n p = findFirstByU n (fun [@bs] a b -> p a b)
@@ -185,9 +185,9 @@ let rec forEachU n f =
185185
match n with
186186
| None -> ()
187187
| Some n ->
188-
n .left |. forEachU f ;
188+
forEachU n.left f ;
189189
f n.key n.value [@bs];
190-
n.right|. forEachU f
190+
forEachU n.right f
191191

192192
let forEach n f = forEachU n (fun [@bs] a b -> f a b)
193193

@@ -196,9 +196,9 @@ let rec mapU n f =
196196
None ->
197197
None
198198
| Some n ->
199-
let newLeft = n .left |. mapU f in
199+
let newLeft = mapU n.left f in
200200
let newD = f n.value [@bs] in
201-
let newRight = n.right|. mapU f in
201+
let newRight = mapU n.right f in
202202
Some { left = newLeft; key = n.key; value = newD; right = newRight; height = n.height}
203203

204204
let map n f = mapU n (fun[@bs] a -> f a)
@@ -209,9 +209,9 @@ let rec mapWithKeyU n f =
209209
None
210210
| Some n ->
211211
let key = n.key in
212-
let newLeft = n .left |. mapWithKeyU f in
212+
let newLeft = mapWithKeyU n.left f in
213213
let newD = f key n.value [@bs] in
214-
let newRight = n.right|. mapWithKeyU f in
214+
let newRight = mapWithKeyU n.right f in
215215
Some { left = newLeft; key; value = newD; right = newRight; height = n.height}
216216

217217
let mapWithKey n f = mapWithKeyU n (fun [@bs] a b -> f a b)
@@ -232,17 +232,17 @@ let rec everyU n p =
232232
None -> true
233233
| Some n ->
234234
p n.key n.value [@bs] &&
235-
n .left |. everyU p &&
236-
n.right|. everyU p
235+
everyU n.left p &&
236+
everyU n.right p
237237
let every n p = everyU n (fun [@bs] a b -> p a b)
238238

239239
let rec someU n p =
240240
match n with
241241
None -> false
242242
| Some n ->
243243
p n.key n.value [@bs] ||
244-
n .left |. someU p ||
245-
n.right|. someU p
244+
someU n.left p ||
245+
someU n.right p
246246
let some n p = someU n (fun[@bs] a b -> p a b)
247247
(* Beware: those two functions assume that the added k is *strictly*
248248
smaller (or bigger) than all the present keys in the tree; it
@@ -304,9 +304,9 @@ let rec keepSharedU n p =
304304
| Some n ->
305305
(* call [p] in the expected left-to-right order *)
306306
let {key = v; value = d} = n in
307-
let newLeft = n .left |. keepSharedU p in
307+
let newLeft = keepSharedU n.left p in
308308
let pvd = p v d [@bs] in
309-
let newRight = n.right|. keepSharedU p in
309+
let newRight = keepSharedU n.right p in
310310
if pvd then join newLeft v d newRight else concat newLeft newRight
311311

312312
let keepShared n p = keepSharedU n (fun [@bs] a b -> p a b)
@@ -317,9 +317,9 @@ let rec keepMapU n p =
317317
| Some n ->
318318
(* call [p] in the expected left-to-right order *)
319319
let {key = v; value = d} = n in
320-
let newLeft = n .left |. keepMapU p in
320+
let newLeft = keepMapU n.left p in
321321
let pvd = p v d [@bs] in
322-
let newRight = n.right|. keepMapU p in
322+
let newRight = keepMapU n.right p in
323323
match pvd with
324324
| None -> concat newLeft newRight
325325
| Some d -> join newLeft v d newRight
@@ -332,9 +332,9 @@ let rec partitionSharedU n p =
332332
| Some n ->
333333
let {key; value } = n in
334334
(* call [p] in the expected left-to-right order *)
335-
let (lt, lf) = n .left |. partitionSharedU p in
335+
let (lt, lf) = partitionSharedU n.left p in
336336
let pvd = p key value [@bs] in
337-
let (rt, rf) = n.right|. partitionSharedU p in
337+
let (rt, rf) = partitionSharedU n.right p in
338338
if pvd
339339
then (join lt key value rt, concat lf rf)
340340
else (concat lt rt, join lf key value rf)
@@ -365,7 +365,7 @@ let rec toListAux n accu =
365365
| None -> accu
366366
| Some n ->
367367
let {left = l; right = r ; key = k; value = v} = n in
368-
l |. toListAux ((k, v) :: ( r |. toListAux accu ))
368+
toListAux l ((k, v) :: (toListAux r accu ))
369369

370370
let toList s =
371371
toListAux s []

‎jscomp/syntax/ast_attributes.ml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,10 @@ let iter_process_bs_int_as (attrs : t) =
307307
| _ -> ()
308308
) ; !st
309309

310+
type as_const_payload =
311+
| Int of int
312+
| Str of string
313+
| Json_str of string
310314

311315
let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
312316
let st = ref None in
@@ -322,15 +326,15 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
322326
| None ->
323327
begin match Ast_payload.is_single_string payload with
324328
| Some (s,None) ->
325-
st := Some (`Str (s))
329+
st := Some (Str (s))
326330
| Some (s, Some "json") ->
327-
st := Some (`Json_str s )
331+
st := Some (Json_str s )
328332
| None | Some (_, Some _) ->
329333
Bs_syntaxerr.err loc Expect_int_or_string_or_json_literal
330334

331335
end
332336
| Some v->
333-
st := (Some (`Int v))
337+
st := (Some (Int v))
334338
)
335339
else
336340
Bs_syntaxerr.err loc Duplicated_bs_as

‎jscomp/syntax/ast_attributes.mli‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,15 @@ val has_bs_optional :
8181
val iter_process_bs_int_as :
8282
t -> int option
8383

84+
type as_const_payload =
85+
| Int of int
86+
| Str of string
87+
| Json_str of string
88+
8489

8590
val iter_process_bs_string_or_int_as :
8691
t ->
87-
[ `Int of int
88-
| `Str of string
89-
| `Json_str of string ] option
92+
as_const_payload option
9093

9194

9295
val process_derive_type :

0 commit comments

Comments
 (0)