Skip to content

Commit b5c72fe

Browse files
committed
refactor: apply suggestions from code review
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: na - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: na - task: lint_javascript_tests status: na - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: na - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: passed - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent 160acb5 commit b5c72fe

File tree

2 files changed

+8
-140
lines changed

2 files changed

+8
-140
lines changed

lib/node_modules/@stdlib/blas/ext/base/gconjoin/lib/accessors.js

Lines changed: 0 additions & 117 deletions
This file was deleted.

lib/node_modules/@stdlib/blas/ext/base/gconjoin/lib/ndarray.js

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
// MODULES //
2222

2323
var isUndefinedOrNull = require( '@stdlib/assert/is-undefined-or-null' );
24-
var arraylike2object = require( '@stdlib/array/base/arraylike2object' );
24+
var resolveGetter = require( '@stdlib/array/base/resolve-getter' );
2525
var gjoin = require( '@stdlib/blas/ext/base/gjoin' ).ndarray;
26-
var accessors = require( './accessors.js' );
2726

2827

2928
// VARIABLES //
@@ -38,12 +37,13 @@ var SPACE = ' ';
3837
* Returns the string representation of an array element.
3938
*
4039
* @private
40+
* @param {Function} get - accessor function
4141
* @param {Collection} x - input array
4242
* @param {integer} idx - element index
4343
* @returns {string} string representation
4444
*/
45-
function str( x, idx ) {
46-
var v = x[ idx ];
45+
function str( get, x, idx ) {
46+
var v = get( x, idx );
4747
if ( isUndefinedOrNull( v ) ) {
4848
return '';
4949
}
@@ -75,32 +75,17 @@ function str( x, idx ) {
7575
function gconjoin( N, prefix, suffix, conjunction, oxfordComma, x, strideX, offsetX ) { // eslint-disable-line max-len
7676
var last;
7777
var out;
78-
var ix;
79-
var o;
80-
var i;
78+
var get;
8179

8280
if ( N <= 0 ) {
8381
return prefix + suffix;
8482
}
85-
o = arraylike2object( x );
86-
if ( o.accessorProtocol ) {
87-
return accessors( N, prefix, suffix, conjunction, oxfordComma, o, strideX, offsetX ); // eslint-disable-line max-len
88-
}
8983
if ( conjunction === '' || N === 1 ) {
9084
return prefix + gjoin( N, SEP, x, strideX, offsetX ) + suffix;
9185
}
92-
if ( strideX === 1 ) {
93-
out = prefix + gjoin( N-1, SEP, x, strideX, offsetX );
94-
} else {
95-
ix = offsetX;
96-
out = prefix + str( x, ix );
97-
ix += strideX;
98-
for ( i = 1; i < N - 1; i++ ) {
99-
out += SEP + str( x, ix );
100-
ix += strideX;
101-
}
102-
}
103-
last = str( x, offsetX + ( (N-1) * strideX ) );
86+
get = resolveGetter( x );
87+
out = prefix + gjoin( N-1, SEP, x, strideX, offsetX );
88+
last = str( get, x, offsetX + ( (N-1) * strideX ) );
10489
if ( N >= 3 && oxfordComma ) {
10590
return out + SEP + conjunction + SPACE + last + suffix;
10691
}

0 commit comments

Comments
 (0)