mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-15 04:13:11 +00:00
AK: Add String::contains(String)
This is just a wrapper around strstr() for now. There are many better ways to search for a string within a string, but I'm just adding a nice API at the moment. :^)
This commit is contained in:
parent
fe83d5087b
commit
01c6088789
|
@ -3,6 +3,10 @@
|
||||||
#include <AK/StringBuilder.h>
|
#include <AK/StringBuilder.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
#ifdef KERNEL
|
||||||
|
extern "C" char* strstr(const char* haystack, const char* needle);
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace AK {
|
namespace AK {
|
||||||
|
|
||||||
bool String::operator==(const String& other) const
|
bool String::operator==(const String& other) const
|
||||||
|
@ -313,4 +317,10 @@ bool String::match_helper(const StringView& mask) const
|
||||||
return (mask_ptr == mask_end) && !*string_ptr;
|
return (mask_ptr == mask_end) && !*string_ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool String::contains(const String& needle) const
|
||||||
|
{
|
||||||
|
return strstr(characters(), needle.characters());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -110,6 +110,8 @@ public:
|
||||||
return m_impl->to_uppercase();
|
return m_impl->to_uppercase();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool contains(const String&) const;
|
||||||
|
|
||||||
Vector<String> split_limit(char separator, int limit) const;
|
Vector<String> split_limit(char separator, int limit) const;
|
||||||
Vector<String> split(char separator) const;
|
Vector<String> split(char separator) const;
|
||||||
String substring(int start, int length) const;
|
String substring(int start, int length) const;
|
||||||
|
|
|
@ -138,6 +138,37 @@ int memcmp(const void* v1, const void* v2, size_t n)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int strncmp(const char* s1, const char* s2, size_t n)
|
||||||
|
{
|
||||||
|
if (!n)
|
||||||
|
return 0;
|
||||||
|
do {
|
||||||
|
if (*s1 != *s2++)
|
||||||
|
return *(const unsigned char*)s1 - *(const unsigned char*)--s2;
|
||||||
|
if (*s1++ == 0)
|
||||||
|
break;
|
||||||
|
} while (--n);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
char* strstr(const char* haystack, const char* needle)
|
||||||
|
{
|
||||||
|
char nch;
|
||||||
|
char hch;
|
||||||
|
|
||||||
|
if ((nch = *needle++) != 0) {
|
||||||
|
size_t len = strlen(needle);
|
||||||
|
do {
|
||||||
|
do {
|
||||||
|
if ((hch = *haystack++) == 0)
|
||||||
|
return nullptr;
|
||||||
|
} while (hch != nch);
|
||||||
|
} while (strncmp(haystack, needle, len) != 0);
|
||||||
|
--haystack;
|
||||||
|
}
|
||||||
|
return const_cast<char*>(haystack);
|
||||||
|
}
|
||||||
|
|
||||||
[[noreturn]] void __cxa_pure_virtual()
|
[[noreturn]] void __cxa_pure_virtual()
|
||||||
{
|
{
|
||||||
ASSERT_NOT_REACHED();
|
ASSERT_NOT_REACHED();
|
||||||
|
|
Loading…
Reference in a new issue