Fixed example locutusjs#2 and start/length (locutusjs#322)

theriault · kvz · commit 60fb2efc8dd1 · 2017-03-02T17:00:59.000+01:00
* Fixed example locutusjs#2 and start/length * Fixed lint issues
diff --git a/src/php/strings/strcspn.js b/src/php/strings/strcspn.js
@@ -1,21 +1,27 @@
 module.exports = function strcspn (str, mask, start, length) {
   //  discuss at: http://locutus.io/php/strcspn/
   // original by: Brett Zamir (http://brett-zamir.me)
+  //  revised by: Theriault
   //   example 1: strcspn('abcdefg123', '1234567890')
   //   returns 1: 7
   //   example 2: strcspn('123abc', '1234567890')
-  //   returns 2: 3
+  //   returns 2: 0
+  //   example 3: strcspn('abcdefg123', '1234567890', 1)
+  //   returns 3: 6
+  //   example 4: strcspn('abcdefg123', '1234567890', -6, -5)
+  //   returns 4: 1
 
   start = start || 0
-  var count = (length && ((start + length) < str.length)) ? start + length : str.length
-  strct: for (var i = start, lgth = 0; i < count; i++) { // eslint-disable-line no-labels
-    for (var j = 0; j < mask.length; j++) {
-      if (str.charAt(i).indexOf(mask[j]) !== -1) {
-        continue strct // eslint-disable-line no-labels
-      }
+  length = typeof length === 'undefined' ? str.length : (length || 0)
+  if (start < 0) start = str.length + start
+  if (length < 0) length = str.length - start + length
+  if (start < 0 || start >= str.length || length <= 0 || e >= str.length) return 0
+  var e = Math.min(str.length, start + length)
+  for (var i = start, lgth = 0; i < e; i++) {
+    if (mask.indexOf(str.charAt(i)) !== -1) {
+      break
     }
     ++lgth
   }
-
   return lgth
 }
