optimize strspn and strcspn

1 files changed, 26 insertions, 10 deletions

diff --git a/src/library.js b/src/library.js
index 7a46a68f..cead2bf8 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3956,19 +3956,35 @@ LibraryManager.library = {
   },
 
   strspn: function(pstr, pset) {
-    var str = String_copy(pstr, true);
-    var set = String_copy(pset);
-    var i = 0;
-    while (set.indexOf(str[i]) != -1) i++; // Must halt, as 0 is in str but not set
-    return i;
+    var str = pstr, set, strcurr, setcurr;
+    while (1) {
+      strcurr = {{{ makeGetValue('str', '0', 'i8') }}};
+      if (!strcurr) return str - pstr;
+      set = pset;
+      while (1) {
+        setcurr = {{{ makeGetValue('set', '0', 'i8') }}};
+        if (!setcurr || setcurr == strcurr) break;
+        set++;
+      }
+      if (!setcurr) return str - pstr;
+      str++;
+    }
   },
 
   strcspn: function(pstr, pset) {
-    var str = String_copy(pstr, true);
-    var set = String_copy(pset, true);
-    var i = 0;
-    while (set.indexOf(str[i]) == -1) i++; // Must halt, as 0 is in both
-    return i;
+    var str = pstr, set, strcurr, setcurr;
+    while (1) {
+      strcurr = {{{ makeGetValue('str', '0', 'i8') }}};
+      if (!strcurr) return str - pstr;
+      set = pset;
+      while (1) {
+        setcurr = {{{ makeGetValue('set', '0', 'i8') }}};
+        if (!setcurr || setcurr == strcurr) break;
+        set++;
+      }
+      if (setcurr) return str - pstr;
+      str++;
+    }
   },
 
   strcpy: function(pdest, psrc) {