Js.Array(2) -> Array

Author: cknitt

tests/build_tests/uncurried-always/src/UncurriedAlways.res

@@ -12,4 +12,4 @@ let a = 3->foo(4)
 
 Console.log(a) // Test automatic uncurried application
 
-let _ = Js.Array2.map([1], x => x + 1)
+let _ = Array.map([1], x => x + 1)

tests/tests/src/UncurriedAlways.res

@@ -14,7 +14,7 @@ let a = 3->foo(4)
 
 Console.log(a) // Test automatic uncurried application
 
-let _ = Js.Array2.map([1], x => x + 1)
+let _ = Array.map([1], x => x + 1)
 
 let ptl = foo(10, ...) // force partial application
 

tests/tests/src/array_subtle_test.mjs

@@ -1,7 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Mt from "./mt.mjs";
-import * as Primitive_array from "rescript/lib/es6/Primitive_array.js";
 
 let suites = {
   contents: /* [] */0
@@ -41,8 +40,8 @@ eq("File \"array_subtle_test.res\", line 16, characters 12-19", [
 ]);
 
 eq("File \"array_subtle_test.res\", line 19, characters 5-12", [
-  5,
-  v.push(3)
+  undefined,
+  (v.push(3), undefined)
 ]);
 
 eq("File \"array_subtle_test.res\", line 20, characters 5-12", [
@@ -57,14 +56,14 @@ eq("File \"array_subtle_test.res\", line 21, characters 5-12", [
 
 eq("File \"array_subtle_test.res\", line 25, characters 5-12", [
   3,
-  Primitive_array.get(v, 2)
+  v[2]
 ]);
 
-Primitive_array.set(v, 2, 4);
+v[2] = 4;
 
 eq("File \"array_subtle_test.res\", line 27, characters 5-12", [
   4,
-  Primitive_array.get(v, 2)
+  v[2]
 ]);
 
 while (v.length > 0) {
@@ -87,7 +86,7 @@ function f(v) {
 }
 
 function fff(x) {
-  return true;
+  return x.length >= 0;
 }
 
 function fff2(x) {
@@ -99,11 +98,15 @@ function fff2(x) {
 }
 
 function fff3(x) {
-  return 1;
+  if (x.length >= 0) {
+    return 1;
+  } else {
+    return 2;
+  }
 }
 
 function fff4(x) {
-  if (x.length !== 0) {
+  if (x.length > 0) {
     return 1;
   } else {
     return 2;
@@ -127,10 +130,7 @@ eq("File \"array_subtle_test.res\", line 68, characters 3-10", [
 
 Mt.from_pair_suites("Array_subtle_test", suites.contents);
 
-let $$Array;
-
 export {
-  $$Array,
   suites,
   test_id,
   eq,

tests/tests/src/array_subtle_test.res

@@ -1,4 +1,4 @@
-module Array = Ocaml_Array
+// module Array = Ocaml_Array
 
 let suites: ref<Mt.pair_suites> = ref(list{})
 let test_id = ref(0)
@@ -16,30 +16,30 @@ let v = [1, 2, 3, 3]
 let () = eq(__LOC__, (4, Array.length(v)))
 
 let () = {
-  eq(__LOC__, (5, Js.Array2.push(v, 3))) /* in Js array length can be changing .. */
+  eq(__LOC__, ((), Array.push(v, 3))) /* in Js array length can be changing .. */
+  eq(__LOC__, (5, Array.length(v)))
   eq(__LOC__, (5, Array.length(v)))
-  eq(__LOC__, (5, Js.Array2.length(v)))
 }
 
 let () = {
-  eq(__LOC__, (3, v[2]))
+  eq(__LOC__, (Some(3), v[2]))
   v[2] = 4
-  eq(__LOC__, (4, v[2]))
+  eq(__LOC__, (Some(4), v[2]))
 } /* should not inline */
 
 let () = {
-  while Js.Array2.length(v) > 0 {
-    ignore(Js.Array2.pop(v))
+  while Array.length(v) > 0 {
+    ignore(Array.pop(v))
   }
-  eq(__LOC__, (0, Js.Array2.length(v)))
+  eq(__LOC__, (0, Array.length(v)))
 }
 
 let f = v => {
-  switch Js.Array2.pop(v) {
+  switch Array.pop(v) {
   | Some(x) => Console.log("hi")
   | None => Console.log("hi2")
   }
-  Console.log(ignore(Js.Array2.pop(v)))
+  Console.log(ignore(Array.pop(v)))
 }
 
 let fff = x => Array.length(x) >= 0

tests/tests/src/bs_array_test.mjs

@@ -3,6 +3,7 @@
 import * as Mt from "./mt.mjs";
 import * as Belt_List from "rescript/lib/es6/Belt_List.js";
 import * as Belt_Array from "rescript/lib/es6/Belt_Array.js";
+import * as Stdlib_Array from "rescript/lib/es6/Stdlib_Array.js";
 import * as Primitive_int from "rescript/lib/es6/Primitive_int.js";
 import * as Primitive_object from "rescript/lib/es6/Primitive_object.js";
 
@@ -45,12 +46,12 @@ function push(prim0, prim1) {
   prim0.push(prim1);
 }
 
-console.log([
+console.log(Stdlib_Array.reduce([
   1,
   2,
   3,
   4
-].filter(x => x > 2).map((x, i) => x + i | 0).reduce((x, y) => x + y | 0, 0));
+].filter(x => x > 2).map((x, i) => x + i | 0), 0, (x, y) => x + y | 0));
 
 let v = [
   1,

tests/tests/src/bs_array_test.res

@@ -17,12 +17,12 @@ module L = Belt.List
 
 let {push} = module(A)
 
-type t<'a> = Js.Array2.t<'a>
+type t<'a> = array<'a>
 let () =
   [1, 2, 3, 4]
-  ->Js.Array2.filter(x => x > 2)
-  ->Js.Array2.mapi((x, i) => x + i)
-  ->Js.Array2.reduce((x, y) => x + y, 0)
+  ->Array.filter(x => x > 2)
+  ->Array.mapWithIndex((x, i) => x + i)
+  ->Array.reduce(0, (x, y) => x + y)
   ->Console.log
 
 let () = {

tests/tests/src/bs_auto_uncurry_test.mjs

@@ -1,6 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Mt from "./mt.mjs";
+import * as Stdlib_Array from "rescript/lib/es6/Stdlib_Array.js";
 
 let suites = {
   contents: /* [] */0
@@ -77,17 +78,17 @@ eq("File \"bs_auto_uncurry_test.res\", line 32, characters 5-12", [
   4
 ]);
 
-eq("File \"bs_auto_uncurry_test.res\", line 34, characters 5-12", [
+eq("File \"bs_auto_uncurry_test.res\", line 34, characters 5-12", Stdlib_Array.reduce([
   1,
   2,
   3
-].reduce((prim0, prim1) => prim0 + prim1 | 0, 0), 6);
+], 0, (prim0, prim1) => prim0 + prim1 | 0), 6);
 
-eq("File \"bs_auto_uncurry_test.res\", line 36, characters 5-12", [
+eq("File \"bs_auto_uncurry_test.res\", line 36, characters 5-12", Stdlib_Array.reduceWithIndex([
   1,
   2,
   3
-].reduce((x, y, i) => (x + y | 0) + i | 0, 0), 9);
+], 0, (x, y, i) => (x + y | 0) + i | 0), 9);
 
 eq("File \"bs_auto_uncurry_test.res\", line 38, characters 5-12", [
   1,

tests/tests/src/bs_auto_uncurry_test.res

@@ -29,15 +29,15 @@ let () = {
 
 let () = {
   eq(__LOC__, [1, 2, 3]->map(x => x + 1), [2, 3, 4])
-  eq(__LOC__, [1, 2, 3]->Js.Array2.map(x => x + 1), [2, 3, 4])
+  eq(__LOC__, [1, 2, 3]->Array.map(x => x + 1), [2, 3, 4])
 
-  eq(__LOC__, [1, 2, 3]->Js.Array2.reduce(\"+", 0), 6)
+  eq(__LOC__, [1, 2, 3]->Array.reduce(0, \"+"), 6)
 
-  eq(__LOC__, [1, 2, 3]->Js.Array2.reducei((x, y, i) => x + y + i, 0), 9)
+  eq(__LOC__, [1, 2, 3]->Array.reduceWithIndex(0, (x, y, i) => x + y + i), 9)
 
-  eq(__LOC__, [1, 2, 3]->Js.Array2.some(x => x < 1), false)
+  eq(__LOC__, [1, 2, 3]->Array.some(x => x < 1), false)
 
-  eq(__LOC__, [1, 2, 3]->Js.Array2.every(x => x > 0), true)
+  eq(__LOC__, [1, 2, 3]->Array.every(x => x > 0), true)
 }
 
 let () = Mt.from_pair_suites(__MODULE__, suites.contents)

tests/tests/src/bs_string_test.mjs

@@ -1,6 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Mt from "./mt.mjs";
+import * as Stdlib_Array from "rescript/lib/es6/Stdlib_Array.js";
 
 let suites = {
   contents: /* [] */0
@@ -25,7 +26,7 @@ function eq(loc, x, y) {
   };
 }
 
-eq("File \"bs_string_test.res\", line 13, characters 2-9", "ghso ghso g".split(" ").reduce((x, y) => x + ("-" + y), ""), "-ghso-ghso-g");
+eq("File \"bs_string_test.res\", line 13, characters 2-9", Stdlib_Array.reduce("ghso ghso g".split(" "), "", (x, y) => x + ("-" + y)), "-ghso-ghso-g");
 
 Mt.from_pair_suites("Bs_string_test", suites.contents);
 

tests/tests/src/bs_string_test.res

@@ -11,7 +11,7 @@ let eq = (loc, x, y) => {
 
 let () = eq(
   __LOC__,
-  "ghso ghso g"->Js.String2.split(" ")->Js.Array2.reduce((x, y) => x ++ ("-" ++ y), ""),
+  "ghso ghso g"->Js.String2.split(" ")->Array.reduce("", (x, y) => x ++ ("-" ++ y)),
   "-ghso-ghso-g",
 )