beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 01:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibJS: Use String::trim_whitespace() for String.prototype.trim*()

Browse source
This commit is contained in:
Linus Groh 2020-05-13 00:23:43 +01:00 committed by Andreas Kling
parent 1febee768d
commit f39c7c2978
Notes: sideshowbarker 2024-07-19 06:41:07 +09:00 
Author: https://github.com/linusg
Commit: https://github.com/SerenityOS/serenity/commit/f39c7c29780
Pull-request: https://github.com/SerenityOS/serenity/pull/2208
1 changed files with 3 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Libraries/LibJS/Runtime/StringPrototype.cpp
View file

@ -237,54 +237,12 @@ Value StringPrototype::pad_end(Interpreter& interpreter)
return pad_string(interpreter, string, PadPlacement::End);
}
enum class TrimMode {
Left,
Right,
Both
};
static Value trim_string(Interpreter& interpreter, const String& string, TrimMode mode)
{
size_t substring_start = 0;
size_t substring_length = string.length();
auto is_white_space_character = [](char character) -> bool {
return character == 0x9 || character == 0xa || character == 0xb || character == 0xc || character == 0xd || character == 0x20;
};
if (mode == TrimMode::Left || mode == TrimMode::Both) {
for (size_t i = 0; i < string.length(); ++i) {
if (!is_white_space_character(string[i])) {
substring_start = i;
substring_length -= substring_start;
break;
}
}
}
if (substring_length == 0)
return js_string(interpreter, "");
if (mode == TrimMode::Right || mode == TrimMode::Both) {
size_t count = 0;
for (size_t i = string.length() - 1; i > 0; --i) {
if (!is_white_space_character(string[i])) {
substring_length -= count;
break;
}
count++;
}
}
return js_string(interpreter, string.substring(substring_start, substring_length));
}
Value StringPrototype::trim(Interpreter& interpreter)
{
auto string = string_from(interpreter);
if (string.is_null())
return {};
return trim_string(interpreter, string, TrimMode::Both);
return js_string(interpreter, string.trim_whitespace(String::TrimMode::Both));
}
Value StringPrototype::trim_start(Interpreter& interpreter)
@ -292,7 +250,7 @@ Value StringPrototype::trim_start(Interpreter& interpreter)
auto string = string_from(interpreter);
if (string.is_null())
return {};
return trim_string(interpreter, string, TrimMode::Left);
return js_string(interpreter, string.trim_whitespace(String::TrimMode::Left));
}
Value StringPrototype::trim_end(Interpreter& interpreter)
@ -300,7 +258,7 @@ Value StringPrototype::trim_end(Interpreter& interpreter)
auto string = string_from(interpreter);
if (string.is_null())
return {};
return trim_string(interpreter, string, TrimMode::Right);
return js_string(interpreter, string.trim_whitespace(String::TrimMode::Right));
}
Value StringPrototype::concat(Interpreter& interpreter)