mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:17:35 +00:00
AK+Everywhere: Rename FlyString to DeprecatedFlyString
DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
This commit is contained in:
parent
2eacc7aec1
commit
f3db548a3d
316 changed files with 1177 additions and 1177 deletions
|
@ -6,8 +6,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedFlyString.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/FlyString.h>
|
||||
#include <AK/StringView.h>
|
||||
#include <AK/Variant.h>
|
||||
|
||||
|
@ -207,16 +207,16 @@ public:
|
|||
{
|
||||
return m_value.visit(
|
||||
[](StringView view) { return view; },
|
||||
[](FlyString const& identifier) { return identifier.view(); },
|
||||
[](DeprecatedFlyString const& identifier) { return identifier.view(); },
|
||||
[](Empty) -> StringView { VERIFY_NOT_REACHED(); });
|
||||
}
|
||||
|
||||
FlyString flystring_value() const
|
||||
DeprecatedFlyString DeprecatedFlyString_value() const
|
||||
{
|
||||
return m_value.visit(
|
||||
[](StringView view) -> FlyString { return view; },
|
||||
[](FlyString const& identifier) -> FlyString { return identifier; },
|
||||
[](Empty) -> FlyString { VERIFY_NOT_REACHED(); });
|
||||
[](StringView view) -> DeprecatedFlyString { return view; },
|
||||
[](DeprecatedFlyString const& identifier) -> DeprecatedFlyString { return identifier; },
|
||||
[](Empty) -> DeprecatedFlyString { VERIFY_NOT_REACHED(); });
|
||||
}
|
||||
|
||||
StringView filename() const { return m_filename; }
|
||||
|
@ -236,7 +236,7 @@ public:
|
|||
DeprecatedString string_value(StringValueStatus& status) const;
|
||||
DeprecatedString raw_template_value() const;
|
||||
|
||||
void set_identifier_value(FlyString value)
|
||||
void set_identifier_value(DeprecatedFlyString value)
|
||||
{
|
||||
m_value = move(value);
|
||||
}
|
||||
|
@ -249,7 +249,7 @@ private:
|
|||
DeprecatedString m_message;
|
||||
StringView m_trivia;
|
||||
StringView m_original_value;
|
||||
Variant<Empty, StringView, FlyString> m_value {};
|
||||
Variant<Empty, StringView, DeprecatedFlyString> m_value {};
|
||||
StringView m_filename;
|
||||
size_t m_line_number { 0 };
|
||||
size_t m_line_column { 0 };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue