moved check function to wchar_utils

Author: Sriya Pratipati

libc/src/wchar/wchar_utils.h

@@ -14,14 +14,26 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/attributes.h" // LIBC_INLINE
 
+bool check_span(wchar_t c, const wchar_t *str) {
+  for (int n = 0; str[n]; ++n) {
+    if (str[n] == c)
+      return true;
+  }
+  return false;
+}
+
 namespace LIBC_NAMESPACE_DECL {
 namespace internal {
 
-template <typename Check>
-LIBC_INLINE size_t inline_wcsspn(const wchar_t *s1, Check check) {
+// To avoid duplicated code, call this with true for wcscspn and call with false
+// for wcsspn
+LIBC_INLINE size_t inline_wcsspn(const wchar_t *s1, const wchar_t *s2,
+                                 bool invert) {
   size_t i = 0;
   for (; s1[i]; ++i) {
-    if (!check(s1[i]))
+    bool check = check_span(s1[i], s2);
+    check = invert ? !check : check;
+    if (!check)
       return i;
   }
   return i;

libc/src/wchar/wcscspn.cpp

@@ -16,21 +16,8 @@
 
 namespace LIBC_NAMESPACE_DECL {
 
-struct CheckCSpan {
-  const wchar_t *str;
-  CheckCSpan(const wchar_t *w) { str = w; }
-  bool operator()(wchar_t c) {
-    for (int n = 0; str[n]; ++n) {
-      if (str[n] == c)
-        return false;
-    }
-    return true;
-  }
-};
-
 LLVM_LIBC_FUNCTION(size_t, wcscspn, (const wchar_t *s1, const wchar_t *s2)) {
-  CheckCSpan check(s2);
-  return internal::inline_wcsspn(s1, check);
+  return internal::inline_wcsspn(s1, s2, true);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/wchar/wcsspn.cpp

@@ -14,23 +14,10 @@
 #include "src/__support/macros/config.h"
 #include "wchar_utils.h"
 
-struct CheckSpan {
-  const wchar_t *str;
-  CheckSpan(const wchar_t *w) { str = w; }
-  bool operator()(wchar_t c) {
-    for (int n = 0; str[n]; ++n) {
-      if (str[n] == c)
-        return true;
-    }
-    return false;
-  }
-};
-
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(size_t, wcsspn, (const wchar_t *s1, const wchar_t *s2)) {
-  CheckSpan check(s2);
-  return internal::inline_wcsspn(s1, check);
+  return internal::inline_wcsspn(s1, s2, false);
 }
 
 } // namespace LIBC_NAMESPACE_DECL