[FIX] edge cases.

compute-io · Mar 3, 2015 · baa11d6 · baa11d6
1 parent 1c9cab4
commit baa11d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -193,6 +193,8 @@ function indexspace( str, len ) {
 				if ( x2 < 0 ) {
 					// WARNING: forgive the user for exceeding the range bounds...
 					x2 = 0;
+				} else if ( x2 === x1 ) {
+					return [];
 				}
 			} else {
 				x2 = (len-1) / parseInt( tmp[ 2 ], 10 );
@@ -221,6 +223,8 @@ function indexspace( str, len ) {
 			if ( x2 < 0 ) {
 				// WARNING: forgive the user for exceeding index bounds...
 				x2 = 0;
+			} else if ( x2 === x1 ) {
+				return [];
 			}
 		}
 		// Handle positive index...
@@ -241,10 +245,6 @@ function indexspace( str, len ) {
 
 	arr = [];
 
-	// Handle equal indices...
-	if ( x1 === x2 ) {
-		return arr;
-	}
 	if ( inc < 0 ) {
 		if ( x2 > x1 ) {
 			return arr;

diff --git a/test/test.js b/test/test.js
@@ -191,10 +191,13 @@ describe( 'compute-indexspace', function tests() {
 	it( 'should return an empty array if start and end indices are equal', function test() {
 		var actual;
 
-		actual = indexspace( '[2:]', 3 );
+		actual = indexspace( '[2:end-2]', 5 );
 		assert.deepEqual( actual, [] );
 
-		actual = indexspace( '[:2:-1]', 3 );
+		actual = indexspace( '[2:-2]', 5 );
+		assert.deepEqual( actual, [] );
+
+		actual = indexspace( '[2:2]', 5 );
 		assert.deepEqual( actual, [] );
 	});