Unpack the parameter of Vector.tabulate/Array.tabulate

minoki · minoki · commit 425a8fabcf9b · 2025-09-26T21:57:43.000+09:00
diff --git a/lib/lunarml/ml/basis/js/array-prim.sml b/lib/lunarml/ml/basis/js/array-prim.sml
@@ -11,6 +11,6 @@ fun update (arr, i, value) = if i < 0 orelse length arr <= i then
                                  Unsafe.Array.update (arr, i, value)
 fun array (n, init) = _primCall "Array.array" (n, init)
 val fromList = _Prim.Array.fromList
-val tabulate = _Prim.Array.tabulate
+fun tabulate (n, f) = _primCall "call2" (_Prim.Array.tabulate, n, f)
 end;
 (* equality is defined in equal.sml *)
diff --git a/lib/lunarml/ml/basis/js/vector-prim.sml b/lib/lunarml/ml/basis/js/vector-prim.sml
@@ -6,7 +6,7 @@ fun sub (vec, i) = if i < 0 orelse length vec <= i then
                    else
                        Unsafe.Vector.sub (vec, i)
 val fromList = _Prim.Vector.fromList
-val tabulate = _Prim.Vector.tabulate
+fun tabulate (n, f) = _primCall "call2" (_Prim.Vector.tabulate, n, f)
 val concat = _Prim.Vector.concat
 end
 _equality ''a vector = fn (x, y) => let val n = Vector.length x
diff --git a/lib/lunarml/ml/basis/lua/array-prim.sml b/lib/lunarml/ml/basis/lua/array-prim.sml
@@ -11,6 +11,6 @@ fun update (arr, i, value) = if i < 0 orelse length arr <= i then
                                  Unsafe.Array.update (arr, i, value)
 fun array (n, init) = _primCall "Array.array" (n, init)
 val fromList = _Prim.Array.fromList
-val tabulate = _Prim.Array.tabulate
+fun tabulate (n, f) = _primCall "call2" (_Prim.Array.tabulate, n, f)
 end;
 (* equality is defined in equal.sml *)
diff --git a/lib/lunarml/ml/basis/lua/vector-prim.sml b/lib/lunarml/ml/basis/lua/vector-prim.sml
@@ -6,7 +6,7 @@ fun sub (vec, i) = if i < 0 orelse length vec <= i then
                    else
                        Unsafe.Vector.sub (vec, i)
 val fromList = _Prim.Vector.fromList
-val tabulate = _Prim.Vector.tabulate
+fun tabulate (n, f) = _primCall "call2" (_Prim.Vector.tabulate, n, f)
 val concat = _Prim.Vector.concat
 end
 _equality ''a vector = fn (x, y) => let val n = Vector.length x
diff --git a/lib/lunarml/ml/basis/luajit/array-prim.sml b/lib/lunarml/ml/basis/luajit/array-prim.sml
@@ -11,6 +11,6 @@ fun update (arr, i, value) = if i < 0 orelse length arr <= i then
                                  Unsafe.Array.update (arr, i, value)
 fun array (n, init) = _primCall "Array.array" (n, init)
 val fromList = _Prim.Array.fromList
-val tabulate = _Prim.Array.tabulate
+fun tabulate (n, f) = _primCall "call2" (_Prim.Array.tabulate, n, f)
 end;
 (* equality is defined in equal.sml *)
diff --git a/lib/lunarml/mlinit-continuations.lua b/lib/lunarml/mlinit-continuations.lua
@@ -410,8 +410,7 @@ local function _Vector_unsafeFromListRevN(n, xs)
 end
 --END
 --BEGIN _VectorOrArray_tabulate: _raise _Size
-local function _VectorOrArray_tabulate(t)
-  local n, f = t[1], t[2]
+local function _VectorOrArray_tabulate(n, f)
   if n < 0 then -- or maxLen < n
     _raise(_Size, "(Vector|Array).tabulate")
   end
diff --git a/lib/lunarml/mlinit-luajit.lua b/lib/lunarml/mlinit-luajit.lua
@@ -439,8 +439,7 @@ local function _Vector_unsafeFromListRevN(n, xs)
 end
 --END
 --BEGIN _VectorOrArray_tabulate: _raise _Size
-local function _VectorOrArray_tabulate(t)
-  local n, f = t[1], t[2]
+local function _VectorOrArray_tabulate(n, f)
   if n < 0 then -- or maxLen < n
     _raise(_Size, "(Vector|Array).tabulate")
   end
diff --git a/lib/lunarml/mlinit.js b/lib/lunarml/mlinit.js
@@ -467,8 +467,7 @@ function _Vector_unsafeFromListRevN(n, xs) {
 }
 //END
 //BEGIN _VectorOrArray_tabulate: _Size
-function _VectorOrArray_tabulate(t) {
-    const n = t[0], f = t[1];
+function _VectorOrArray_tabulate(n, f) {
     if (n < 0 || n > 0xffffffff) {
         throw _Size;
     }
diff --git a/lib/lunarml/mlinit.lua b/lib/lunarml/mlinit.lua
@@ -411,8 +411,7 @@ local function _Vector_unsafeFromListRevN(n, xs)
 end
 --END
 --BEGIN _VectorOrArray_tabulate: _raise _Size
-local function _VectorOrArray_tabulate(t)
-  local n, f = t[1], t[2]
+local function _VectorOrArray_tabulate(n, f)
   if n < 0 then -- or maxLen < n
     _raise(_Size, "(Vector|Array).tabulate")
   end
diff --git a/src/initialenv.sml b/src/initialenv.sml
@@ -527,7 +527,7 @@ struct
               , VId_Vector_tabulate
               , TypeScheme
                   ( [(tyVarA, NONE)]
-                  , PT.pair (PT.int, PT.int --> tyA) --> PT.vector tyA
+                  , PT.function2 (PT.int, PT.int --> tyA) (PT.vector tyA)
                   )
               )
             , ( "_Prim.Vector.concat"
@@ -543,7 +543,7 @@ struct
               , VId_Array_tabulate
               , TypeScheme
                   ( [(tyVarA, NONE)]
-                  , PT.pair (PT.int, PT.int --> tyA) --> PT.array tyA
+                  , PT.function2 (PT.int, PT.int --> tyA) (PT.array tyA)
                   )
               )
             , ("_Prim.Lua.NIL", VId_Lua_NIL, TypeScheme ([], PT.lua_value))

Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,7 @@ function _Vector_unsafeFromListRevN(n, xs) {`
`467`	`467`	`}`
`468`	`468`	`//END`
`469`	`469`	`//BEGIN _VectorOrArray_tabulate: _Size`
`470`		`-function _VectorOrArray_tabulate(t) {`
`471`		`- const n = t[0], f = t[1];`
	`470`	`+function _VectorOrArray_tabulate(n, f) {`
`472`	`471`	`if (n < 0 \|\| n > 0xffffffff) {`
`473`	`472`	`throw _Size;`
`474`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ struct`
`527`	`527`	`, VId_Vector_tabulate`
`528`	`528`	`, TypeScheme`
`529`	`529`	`( [(tyVarA, NONE)]`
`530`		`- , PT.pair (PT.int, PT.int --> tyA) --> PT.vector tyA`
	`530`	`+ , PT.function2 (PT.int, PT.int --> tyA) (PT.vector tyA)`
`531`	`531`	`)`
`532`	`532`	`)`
`533`	`533`	`, ( "_Prim.Vector.concat"`
`@@ -543,7 +543,7 @@ struct`
`543`	`543`	`, VId_Array_tabulate`
`544`	`544`	`, TypeScheme`
`545`	`545`	`( [(tyVarA, NONE)]`
`546`		`- , PT.pair (PT.int, PT.int --> tyA) --> PT.array tyA`
	`546`	`+ , PT.function2 (PT.int, PT.int --> tyA) (PT.array tyA)`
`547`	`547`	`)`
`548`	`548`	`)`
`549`	`549`	`, ("_Prim.Lua.NIL", VId_Lua_NIL, TypeScheme ([], PT.lua_value))`