RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:07:35 +00:00
Code Issues Activity Actions

AK+Everywhere: Rename String to DeprecatedString

Browse source 
We have a new, improved string type coming up in AK (OOM aware, no null
state), and while it's going to use UTF-8, the name UTF8String is a
mouthful - so let's free up the String name by renaming the existing
class.
Making the old one have an annoying name will hopefully also help with
quick adoption :^)
This commit is contained in:
Linus Groh 2022-12-04 18:02:33 +00:00 • committed by Andreas Kling
parent f74251606d
commit 6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/Libraries/LibWeb/URL/URLSearchParams.cpp
View file

@ -28,7 +28,7 @@ void URLSearchParams::visit_edges(Cell::Visitor& visitor)
visitor.visit(m_url);
}
String url_encode(Vector<QueryParam> const& pairs, AK::URL::PercentEncodeSet percent_encode_set)
DeprecatedString url_encode(Vector<QueryParam> const& pairs, AK::URL::PercentEncodeSet percent_encode_set)
{
StringBuilder builder;
for (size_t i = 0; i < pairs.size(); ++i) {
@ -89,7 +89,7 @@ JS::NonnullGCPtr<URLSearchParams> URLSearchParams::create(JS::Realm& realm, Vect
// https://url.spec.whatwg.org/#dom-urlsearchparams-urlsearchparams
// https://url.spec.whatwg.org/#urlsearchparams-initialize
WebIDL::ExceptionOr<JS::NonnullGCPtr<URLSearchParams>> URLSearchParams::construct_impl(JS::Realm& realm, Variant<Vector<Vector<String>>, OrderedHashMap<String, String>, String> const& init)
WebIDL::ExceptionOr<JS::NonnullGCPtr<URLSearchParams>> URLSearchParams::construct_impl(JS::Realm& realm, Variant<Vector<Vector<DeprecatedString>>, OrderedHashMap<DeprecatedString, DeprecatedString>, DeprecatedString> const& init)
{
// 1. If init is a string and starts with U+003F (?), then remove the first code point from init.
// NOTE: We do this when we know that it's a string on step 3 of initialization.
@ -99,8 +99,8 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<URLSearchParams>> URLSearchParams::construc
// URLSearchParams init from this point forward
// 1. If init is a sequence, then for each pair in init:
if (init.has<Vector<Vector<String>>>()) {
auto const& init_sequence = init.get<Vector<Vector<String>>>();
if (init.has<Vector<Vector<DeprecatedString>>>()) {
auto const& init_sequence = init.get<Vector<Vector<DeprecatedString>>>();
Vector<QueryParam> list;
list.ensure_capacity(init_sequence.size());
@ -108,7 +108,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<URLSearchParams>> URLSearchParams::construc
for (auto const& pair : init_sequence) {
// a. If pair does not contain exactly two items, then throw a TypeError.
if (pair.size() != 2)
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, String::formatted("Expected only 2 items in pair, got {}", pair.size()) };
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, DeprecatedString::formatted("Expected only 2 items in pair, got {}", pair.size()) };
// b. Append a new name-value pair whose name is pair’s first item, and value is pair’s second item, to query’s list.
list.append(QueryParam { .name = pair[0], .value = pair[1] });
@ -118,8 +118,8 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<URLSearchParams>> URLSearchParams::construc
}
// 2. Otherwise, if init is a record, then for each name → value of init, append a new name-value pair whose name is name and value is value, to query’s list.
if (init.has<OrderedHashMap<String, String>>()) {
auto const& init_record = init.get<OrderedHashMap<String, String>>();
if (init.has<OrderedHashMap<DeprecatedString, DeprecatedString>>()) {
auto const& init_record = init.get<OrderedHashMap<DeprecatedString, DeprecatedString>>();
Vector<QueryParam> list;
list.ensure_capacity(init_record.size());
@ -133,7 +133,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<URLSearchParams>> URLSearchParams::construc
// 3. Otherwise:
// a. Assert: init is a string.
// NOTE: `get` performs `VERIFY(has<T>())`
auto const& init_string = init.get<String>();
auto const& init_string = init.get<DeprecatedString>();
// See NOTE at the start of this function.
StringView stripped_init = init_string.substring_view(init_string.starts_with('?'));
@ -142,7 +142,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<URLSearchParams>> URLSearchParams::construc
return URLSearchParams::create(realm, url_decode(stripped_init));
}
void URLSearchParams::append(String const& name, String const& value)
void URLSearchParams::append(DeprecatedString const& name, DeprecatedString const& value)
{
// 1. Append a new name-value pair whose name is name and value is value, to list.
m_list.empend(name, value);
@ -164,7 +164,7 @@ void URLSearchParams::update()
m_url->set_query({}, move(serialized_query));
}
void URLSearchParams::delete_(String const& name)
void URLSearchParams::delete_(DeprecatedString const& name)
{
// 1. Remove all name-value pairs whose name is name from list.
m_list.remove_all_matching([&name](auto& entry) {
@ -174,7 +174,7 @@ void URLSearchParams::delete_(String const& name)
update();
}
String URLSearchParams::get(String const& name)
DeprecatedString URLSearchParams::get(DeprecatedString const& name)
{
// return the value of the first name-value pair whose name is name in this’s list, if there is such a pair, and null otherwise.
auto result = m_list.find_if([&name](auto& entry) {
@ -186,10 +186,10 @@ String URLSearchParams::get(String const& name)
}
// https://url.spec.whatwg.org/#dom-urlsearchparams-getall
Vector<String> URLSearchParams::get_all(String const& name)
Vector<DeprecatedString> URLSearchParams::get_all(DeprecatedString const& name)
{
// return the values of all name-value pairs whose name is name, in this’s list, in list order, and the empty sequence otherwise.
Vector<String> values;
Vector<DeprecatedString> values;
for (auto& entry : m_list) {
if (entry.name == name)
values.append(entry.value);
@ -197,7 +197,7 @@ Vector<String> URLSearchParams::get_all(String const& name)
return values;
}
bool URLSearchParams::has(String const& name)
bool URLSearchParams::has(DeprecatedString const& name)
{
// return true if there is a name-value pair whose name is name in this’s list, and false otherwise.
return !m_list.find_if([&name](auto& entry) {
@ -206,7 +206,7 @@ bool URLSearchParams::has(String const& name)
.is_end();
}
void URLSearchParams::set(String const& name, String const& value)
void URLSearchParams::set(DeprecatedString const& name, DeprecatedString const& value)
{
// 1. If this’s list contains any name-value pairs whose name is name, then set the value of the first such name-value pair to value and remove the others.
auto existing = m_list.find_if([&name](auto& entry) {
@ -255,7 +255,7 @@ void URLSearchParams::sort()
update();
}
String URLSearchParams::to_string() const
DeprecatedString URLSearchParams::to_string() const
{
// return the serialization of this’s list.
return url_encode(m_list, AK::URL::PercentEncodeSet::ApplicationXWWWFormUrlencoded);