Skip to content

Commit 6edb6c5

Browse files
committed
integrate unit tests with ninja build, test the workflow with refactoring of Ext_array.for_all2
1 parent 6115bda commit 6edb6c5

12 files changed

+27
-26
lines changed

jscomp/core/js_cmj_format.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ and for_sure_arity (x : arity) y =
119119
match x, y with
120120
| Single x0, Single y0 -> Lam_arity.equal x0 y0
121121
| Submodule xs, Submodule ys ->
122-
Ext_array.for_all2_no_exn Lam_arity.equal xs ys
122+
Ext_array.for_all2_no_exn xs ys Lam_arity.equal
123123
| Single _, Submodule _ -> false
124124
| Submodule _, Single _ -> false
125125
and for_sure_eq_optional_lambda

jscomp/ext/ext_array.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ let rec unsafe_loop index len p xs ys =
234234
(Array.unsafe_get ys index) &&
235235
unsafe_loop (succ index) len p xs ys
236236

237-
let for_all2_no_exn p xs ys =
237+
let for_all2_no_exn xs ys p =
238238
let len_xs = Array.length xs in
239239
let len_ys = Array.length ys in
240240
len_xs = len_ys &&

jscomp/ext/ext_array.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ val exists : ('a -> bool) -> 'a array -> bool
7575
val is_empty : 'a array -> bool
7676

7777
val for_all2_no_exn :
78-
('a -> 'b -> bool) ->
7978
'a array ->
8079
'b array ->
80+
('a -> 'b -> bool) ->
8181
bool
8282

8383
val map :

jscomp/ext/ext_json.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ let rec equal
127127
begin match y with
128128
| Arr {content = content2}
129129
->
130-
Ext_array.for_all2_no_exn equal content content2
130+
Ext_array.for_all2_no_exn content content2 equal
131131
| _ -> false
132132
end
133133

jscomp/ext/ext_json_noloc.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ let rec equal
8282
begin match y with
8383
| Arr content2
8484
->
85-
Ext_array.for_all2_no_exn equal content content2
85+
Ext_array.for_all2_no_exn content content2 equal
8686
| _ -> false
8787
end
8888

jscomp/ounit_tests/ounit_array_tests.ml

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,29 +61,29 @@ let suites =
6161

6262
__LOC__ >:: begin fun _ ->
6363
OUnit.assert_bool __LOC__
64-
(Ext_array.for_all2_no_exn
65-
(=)
64+
(Ext_array.for_all2_no_exn
6665
[|1;2;3|]
6766
[|1;2;3|]
67+
(=)
6868
)
6969
end;
7070
__LOC__ >:: begin fun _ ->
7171
OUnit.assert_bool __LOC__
7272
(Ext_array.for_all2_no_exn
73-
(=) [||] [||]
73+
[||] [||] (=)
7474
);
7575
OUnit.assert_bool __LOC__
7676
(not @@ Ext_array.for_all2_no_exn
77-
(=) [||] [|1|]
77+
[||] [|1|] (=)
7878
)
7979
end
8080
;
8181
__LOC__ >:: begin fun _ ->
8282
OUnit.assert_bool __LOC__
83-
(not (Ext_array.for_all2_no_exn
84-
(=)
83+
(not (Ext_array.for_all2_no_exn
8584
[|1;2;3|]
8685
[|1;2;33|]
86+
(=)
8787
))
8888
end
8989
]

lib/bsb.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ val exists : ('a -> bool) -> 'a array -> bool
225225
val is_empty : 'a array -> bool
226226

227227
val for_all2_no_exn :
228-
('a -> 'b -> bool) ->
229228
'a array ->
230229
'b array ->
230+
('a -> 'b -> bool) ->
231231
bool
232232

233233
val map :
@@ -477,7 +477,7 @@ let rec unsafe_loop index len p xs ys =
477477
(Array.unsafe_get ys index) &&
478478
unsafe_loop (succ index) len p xs ys
479479

480-
let for_all2_no_exn p xs ys =
480+
let for_all2_no_exn xs ys p =
481481
let len_xs = Array.length xs in
482482
let len_ys = Array.length ys in
483483
len_xs = len_ys &&
@@ -2318,7 +2318,7 @@ let rec equal
23182318
begin match y with
23192319
| Arr {content = content2}
23202320
->
2321-
Ext_array.for_all2_no_exn equal content content2
2321+
Ext_array.for_all2_no_exn content content2 equal
23222322
| _ -> false
23232323
end
23242324

@@ -10939,7 +10939,7 @@ let rec equal
1093910939
begin match y with
1094010940
| Arr content2
1094110941
->
10942-
Ext_array.for_all2_no_exn equal content content2
10942+
Ext_array.for_all2_no_exn content content2 equal
1094310943
| _ -> false
1094410944
end
1094510945

lib/bsb_helper.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,9 @@ val exists : ('a -> bool) -> 'a array -> bool
262262
val is_empty : 'a array -> bool
263263

264264
val for_all2_no_exn :
265-
('a -> 'b -> bool) ->
266265
'a array ->
267266
'b array ->
267+
('a -> 'b -> bool) ->
268268
bool
269269

270270
val map :
@@ -514,7 +514,7 @@ let rec unsafe_loop index len p xs ys =
514514
(Array.unsafe_get ys index) &&
515515
unsafe_loop (succ index) len p xs ys
516516

517-
let for_all2_no_exn p xs ys =
517+
let for_all2_no_exn xs ys p =
518518
let len_xs = Array.length xs in
519519
let len_ys = Array.length ys in
520520
len_xs = len_ys &&
@@ -2355,7 +2355,7 @@ let rec equal
23552355
begin match y with
23562356
| Arr {content = content2}
23572357
->
2358-
Ext_array.for_all2_no_exn equal content content2
2358+
Ext_array.for_all2_no_exn content content2 equal
23592359
| _ -> false
23602360
end
23612361

lib/bsdep.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29518,9 +29518,9 @@ val exists : ('a -> bool) -> 'a array -> bool
2951829518
val is_empty : 'a array -> bool
2951929519

2952029520
val for_all2_no_exn :
29521-
('a -> 'b -> bool) ->
2952229521
'a array ->
2952329522
'b array ->
29523+
('a -> 'b -> bool) ->
2952429524
bool
2952529525

2952629526
val map :
@@ -29770,7 +29770,7 @@ let rec unsafe_loop index len p xs ys =
2977029770
(Array.unsafe_get ys index) &&
2977129771
unsafe_loop (succ index) len p xs ys
2977229772

29773-
let for_all2_no_exn p xs ys =
29773+
let for_all2_no_exn xs ys p =
2977429774
let len_xs = Array.length xs in
2977529775
let len_ys = Array.length ys in
2977629776
len_xs = len_ys &&

lib/bsppx.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11456,9 +11456,9 @@ val exists : ('a -> bool) -> 'a array -> bool
1145611456
val is_empty : 'a array -> bool
1145711457

1145811458
val for_all2_no_exn :
11459-
('a -> 'b -> bool) ->
1146011459
'a array ->
1146111460
'b array ->
11461+
('a -> 'b -> bool) ->
1146211462
bool
1146311463

1146411464
val map :
@@ -11708,7 +11708,7 @@ let rec unsafe_loop index len p xs ys =
1170811708
(Array.unsafe_get ys index) &&
1170911709
unsafe_loop (succ index) len p xs ys
1171011710

11711-
let for_all2_no_exn p xs ys =
11711+
let for_all2_no_exn xs ys p =
1171211712
let len_xs = Array.length xs in
1171311713
let len_ys = Array.length ys in
1171411714
len_xs = len_ys &&

lib/whole_compiler.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26379,9 +26379,9 @@ val exists : ('a -> bool) -> 'a array -> bool
2637926379
val is_empty : 'a array -> bool
2638026380

2638126381
val for_all2_no_exn :
26382-
('a -> 'b -> bool) ->
2638326382
'a array ->
2638426383
'b array ->
26384+
('a -> 'b -> bool) ->
2638526385
bool
2638626386

2638726387
val map :
@@ -26631,7 +26631,7 @@ let rec unsafe_loop index len p xs ys =
2663126631
(Array.unsafe_get ys index) &&
2663226632
unsafe_loop (succ index) len p xs ys
2663326633

26634-
let for_all2_no_exn p xs ys =
26634+
let for_all2_no_exn xs ys p =
2663526635
let len_xs = Array.length xs in
2663626636
let len_ys = Array.length ys in
2663726637
len_xs = len_ys &&
@@ -68886,7 +68886,7 @@ and for_sure_arity (x : arity) y =
6888668886
match x, y with
6888768887
| Single x0, Single y0 -> Lam_arity.equal x0 y0
6888868888
| Submodule xs, Submodule ys ->
68889-
Ext_array.for_all2_no_exn Lam_arity.equal xs ys
68889+
Ext_array.for_all2_no_exn xs ys Lam_arity.equal
6889068890
| Single _, Submodule _ -> false
6889168891
| Submodule _, Single _ -> false
6889268892
and for_sure_eq_optional_lambda

scripts/tasks.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ var sourceDirs =
2020
'others',
2121
'stdlib-406',
2222
'runtime',
23-
'test'
23+
'test',
24+
'ounit_tests'
2425
]
2526

2627

0 commit comments

Comments
 (0)