Skip to content

Commit b520031

Browse files
committed
Restored capability to map non unary functions.
1 parent 88e1aa7 commit b520031

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/function/matrix/map.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ export const createMap = /* #__PURE__ */ factory(name, dependencies, ({ typed })
5858
* Transformed map of x; always has the same type and shape as x
5959
*/
6060
return typed(name, {
61-
'Array, function': function (x, callback) { return _mapArray(x, callback, true) },
61+
'Array, function': _mapArray,
6262

6363
'Matrix, function': function (x, callback) {
64-
return x.map(callback, false, true)
64+
return x.map(callback)
6565
},
6666

6767
'Array|Matrix, Array|Matrix, ...Array|Matrix|function': (A, B, rest) =>
@@ -124,9 +124,9 @@ export const createMap = /* #__PURE__ */ factory(name, dependencies, ({ typed })
124124
idx)
125125

126126
if (firstArrayIsMatrix) {
127-
return broadcastedArrays[0].map(broadcastedArraysCallback, false)
127+
return broadcastedArrays[0].map(broadcastedArraysCallback)
128128
} else {
129-
return _mapArray(broadcastedArrays[0], broadcastedArraysCallback, false)
129+
return _mapArray(broadcastedArrays[0], broadcastedArraysCallback)
130130
}
131131
}
132132

@@ -251,8 +251,8 @@ export const createMap = /* #__PURE__ */ factory(name, dependencies, ({ typed })
251251
* @return {Array}
252252
* @private
253253
*/
254-
function _mapArray (array, callback, isUnary) {
255-
const fastCallback = optimizeCallback(callback, array, name, isUnary)
254+
function _mapArray (array, callback) {
255+
const fastCallback = optimizeCallback(callback, array, name)
256256
return deepMap(array, fastCallback.fn, fastCallback.isUnary)
257257
}
258-
})
258+
})

src/utils/optimizeCallback.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function optimizeCallback (callback, array, name, isUnary) {
3030
numberOfArguments = _findNumberOfArgumentsTyped(callback, firstValue, firstIndex, array)
3131
}
3232
let fastCallback
33-
if (array.isMatrix && (array.dataType !== 'mixed' && array.dataType !== undefined)) {
33+
if (isMatrix && (array.dataType !== 'mixed' && array.dataType !== undefined)) {
3434
const singleSignature = _findSingleSignatureWithArity(callback, numberOfArguments)
3535
fastCallback = (singleSignature !== undefined) ? singleSignature : callback
3636
} else {
@@ -157,4 +157,4 @@ function _createCallbackError (err, args, mappingFnName, callbackName) {
157157
throw new TypeError(`Function ${mappingFnName} cannot apply callback arguments ` +
158158
`to function ${callbackName}: ${err.message}`)
159159
}
160-
}
160+
}

0 commit comments

Comments
 (0)