RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 01:27:44 +00:00
Code Issues Activity Actions

AK+Everywhere: Rename FlyString to DeprecatedFlyString

Browse source 
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:
Timothy Flynn 2023-01-08 19:23:00 -05:00 • committed by Linus Groh
parent 2eacc7aec1
commit f3db548a3d
316 changed files with 1177 additions and 1177 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibPDF/ColorSpace.cpp
View file

@ -16,7 +16,7 @@ namespace PDF {
ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE);
#undef ENUMERATE
PDFErrorOr<ColorSpaceFamily> ColorSpaceFamily::get(FlyString const& family_name)
PDFErrorOr<ColorSpaceFamily> ColorSpaceFamily::get(DeprecatedFlyString const& family_name)
{
#define ENUMERATE(f_name, ever_needs_parameters) \
if (family_name == f_name.name()) { \
@ -27,7 +27,7 @@ PDFErrorOr<ColorSpaceFamily> ColorSpaceFamily::get(FlyString const& family_name)
return Error(Error::Type::MalformedPDF, DeprecatedString::formatted("Unknown ColorSpace family {}", family_name));
}
PDFErrorOr<NonnullRefPtr<ColorSpace>> ColorSpace::create(FlyString const& name)
PDFErrorOr<NonnullRefPtr<ColorSpace>> ColorSpace::create(DeprecatedFlyString const& name)
{
// Simple color spaces with no parameters, which can be specified directly
if (name == CommonNames::DeviceGray)
@ -305,7 +305,7 @@ PDFErrorOr<NonnullRefPtr<ColorSpace>> ICCBasedColorSpace::create(Document* docum
auto dict = param.get<NonnullRefPtr<Object>>()->cast<StreamObject>()->dict();
FlyString name;
DeprecatedFlyString name;
if (!dict->contains(CommonNames::Alternate)) {
auto number_of_components = dict->get_value(CommonNames::N).to_int();
if (number_of_components == 1)

12
Userland/Libraries/LibPDF/ColorSpace.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <AK/FlyString.h>
#include <AK/DeprecatedFlyString.h>
#include <AK/Forward.h>
#include <LibGfx/Color.h>
#include <LibPDF/Value.h>
@ -28,28 +28,28 @@ namespace PDF {
class ColorSpaceFamily {
public:
ColorSpaceFamily(FlyString name, bool never_needs_paramaters_p)
ColorSpaceFamily(DeprecatedFlyString name, bool never_needs_paramaters_p)
: m_name(move(name))
, m_never_needs_parameters(never_needs_paramaters_p)
{
}
FlyString name() const { return m_name; };
DeprecatedFlyString name() const { return m_name; };
bool never_needs_parameters() const { return m_never_needs_parameters; };
static PDFErrorOr<ColorSpaceFamily> get(FlyString const&);
static PDFErrorOr<ColorSpaceFamily> get(DeprecatedFlyString const&);
#define ENUMERATE(name, ever_needs_parameters) static ColorSpaceFamily name;
ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE)
#undef ENUMERATE
private:
FlyString m_name;
DeprecatedFlyString m_name;
bool m_never_needs_parameters;
};
class ColorSpace : public RefCounted<ColorSpace> {
public:
static PDFErrorOr<NonnullRefPtr<ColorSpace>> create(FlyString const&);
static PDFErrorOr<NonnullRefPtr<ColorSpace>> create(DeprecatedFlyString const&);
static PDFErrorOr<NonnullRefPtr<ColorSpace>> create(Document*, NonnullRefPtr<ArrayObject>);
virtual ~ColorSpace() = default;

4
Userland/Libraries/LibPDF/CommonNames.cpp
View file

@ -8,10 +8,10 @@
namespace PDF {
#define ENUMERATE(name) FlyString CommonNames::name = #name;
#define ENUMERATE(name) DeprecatedFlyString CommonNames::name = #name;
ENUMERATE_COMMON_NAMES(ENUMERATE)
#undef ENUMERATE
FlyString CommonNames::IdentityH = "Identity-H";
DeprecatedFlyString CommonNames::IdentityH = "Identity-H";
}

6
Userland/Libraries/LibPDF/CommonNames.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <AK/FlyString.h>
#include <AK/DeprecatedFlyString.h>
#define ENUMERATE_COMMON_NAMES(A) \
A(AIS) \
@ -150,11 +150,11 @@ namespace PDF {
class CommonNames {
public:
#define ENUMERATE(name) static FlyString name;
#define ENUMERATE(name) static DeprecatedFlyString name;
ENUMERATE_COMMON_NAMES(ENUMERATE)
#undef ENUMERATE
static FlyString IdentityH;
static DeprecatedFlyString IdentityH;
};
}

10
Userland/Libraries/LibPDF/Document.cpp
View file

@ -199,7 +199,7 @@ PDFErrorOr<void> Document::add_page_tree_node_to_page_tree(NonnullRefPtr<DictObj
return {};
}
PDFErrorOr<NonnullRefPtr<Object>> Document::find_in_name_tree(NonnullRefPtr<DictObject> tree, FlyString name)
PDFErrorOr<NonnullRefPtr<Object>> Document::find_in_name_tree(NonnullRefPtr<DictObject> tree, DeprecatedFlyString name)
{
if (tree->contains(CommonNames::Kids)) {
return find_in_name_tree_nodes(tree->get_array(CommonNames::Kids), name);
@ -210,7 +210,7 @@ PDFErrorOr<NonnullRefPtr<Object>> Document::find_in_name_tree(NonnullRefPtr<Dict
return find_in_key_value_array(key_value_names_array, name);
}
PDFErrorOr<NonnullRefPtr<Object>> Document::find_in_name_tree_nodes(NonnullRefPtr<ArrayObject> siblings, FlyString name)
PDFErrorOr<NonnullRefPtr<Object>> Document::find_in_name_tree_nodes(NonnullRefPtr<ArrayObject> siblings, DeprecatedFlyString name)
{
for (size_t i = 0; i < siblings->size(); i++) {
auto sibling = TRY(resolve_to<DictObject>(siblings->at(i)));
@ -226,7 +226,7 @@ PDFErrorOr<NonnullRefPtr<Object>> Document::find_in_name_tree_nodes(NonnullRefPt
return Error { Error::Type::MalformedPDF, DeprecatedString::formatted("Didn't find node in name tree containing name {}", name) };
}
PDFErrorOr<NonnullRefPtr<Object>> Document::find_in_key_value_array(NonnullRefPtr<ArrayObject> key_value_array, FlyString name)
PDFErrorOr<NonnullRefPtr<Object>> Document::find_in_key_value_array(NonnullRefPtr<ArrayObject> key_value_array, DeprecatedFlyString name)
{
if (key_value_array->size() % 2 == 1)
return Error { Error::Type::MalformedPDF, "key/value array has dangling key" };
@ -306,7 +306,7 @@ PDFErrorOr<Destination> Document::create_destination_from_parameters(NonnullRefP
return Destination { type, page_number_by_index_ref.get(page_ref.as_ref_index()), parameters };
}
PDFErrorOr<NonnullRefPtr<Object>> Document::get_inheritable_object(FlyString const& name, NonnullRefPtr<DictObject> object)
PDFErrorOr<NonnullRefPtr<Object>> Document::get_inheritable_object(DeprecatedFlyString const& name, NonnullRefPtr<DictObject> object)
{
if (!object->contains(name)) {
auto parent = TRY(object->get_dict(this, CommonNames::Parent));
@ -352,7 +352,7 @@ PDFErrorOr<NonnullRefPtr<OutlineItem>> Document::build_outline_item(NonnullRefPt
auto dest_arr = dest_obj->cast<ArrayObject>();
outline_item->dest = TRY(create_destination_from_parameters(dest_arr, page_number_by_index_ref));
} else if (dest_obj->is<NameObject>() || dest_obj->is<StringObject>()) {
FlyString dest_name;
DeprecatedFlyString dest_name;
if (dest_obj->is<NameObject>())
dest_name = dest_obj->cast<NameObject>()->name();
else

8
Userland/Libraries/LibPDF/Document.h
View file

@ -138,11 +138,11 @@ private:
PDFErrorOr<Destination> create_destination_from_parameters(NonnullRefPtr<ArrayObject>, HashMap<u32, u32> const&);
PDFErrorOr<Destination> create_destination_from_dictionary_entry(NonnullRefPtr<Object> const& entry, HashMap<u32, u32> const& page_number_by_index_ref);
PDFErrorOr<NonnullRefPtr<Object>> get_inheritable_object(FlyString const& name, NonnullRefPtr<DictObject>);
PDFErrorOr<NonnullRefPtr<Object>> get_inheritable_object(DeprecatedFlyString const& name, NonnullRefPtr<DictObject>);
PDFErrorOr<NonnullRefPtr<Object>> find_in_name_tree(NonnullRefPtr<DictObject> root, FlyString name);
PDFErrorOr<NonnullRefPtr<Object>> find_in_name_tree_nodes(NonnullRefPtr<ArrayObject> siblings, FlyString name);
PDFErrorOr<NonnullRefPtr<Object>> find_in_key_value_array(NonnullRefPtr<ArrayObject> key_value_array, FlyString name);
PDFErrorOr<NonnullRefPtr<Object>> find_in_name_tree(NonnullRefPtr<DictObject> root, DeprecatedFlyString name);
PDFErrorOr<NonnullRefPtr<Object>> find_in_name_tree_nodes(NonnullRefPtr<ArrayObject> siblings, DeprecatedFlyString name);
PDFErrorOr<NonnullRefPtr<Object>> find_in_key_value_array(NonnullRefPtr<ArrayObject> key_value_array, DeprecatedFlyString name);
NonnullRefPtr<DocumentParser> m_parser;
RefPtr<DictObject> m_catalog;

2
Userland/Libraries/LibPDF/Filter.cpp
View file

@ -12,7 +12,7 @@
namespace PDF {
ErrorOr<ByteBuffer> Filter::decode(ReadonlyBytes bytes, FlyString const& encoding_type, RefPtr<DictObject> decode_parms)
ErrorOr<ByteBuffer> Filter::decode(ReadonlyBytes bytes, DeprecatedFlyString const& encoding_type, RefPtr<DictObject> decode_parms)
{
int predictor = 1;
int columns = 1;

4
Userland/Libraries/LibPDF/Filter.h
View file

@ -7,15 +7,15 @@
#pragma once
#include <AK/ByteBuffer.h>
#include <AK/DeprecatedFlyString.h>
#include <AK/Error.h>
#include <AK/FlyString.h>
#include <LibPDF/ObjectDerivatives.h>
namespace PDF {
class Filter {
public:
static ErrorOr<ByteBuffer> decode(ReadonlyBytes bytes, FlyString const& encoding_type, RefPtr<DictObject> decode_parms);
static ErrorOr<ByteBuffer> decode(ReadonlyBytes bytes, DeprecatedFlyString const& encoding_type, RefPtr<DictObject> decode_parms);
private:
static ErrorOr<ByteBuffer> decode_ascii_hex(ReadonlyBytes bytes);

2
Userland/Libraries/LibPDF/Fonts/PDFFont.cpp
View file

@ -14,7 +14,7 @@
namespace PDF {
static bool is_standard_latin_font(FlyString const& font)
static bool is_standard_latin_font(DeprecatedFlyString const& font)
{
return font.is_one_of(
"Times-Roman", "TimesNewRoman",

2
Userland/Libraries/LibPDF/Object.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <AK/Debug.h>
#include <AK/FlyString.h>
#include <AK/DeprecatedFlyString.h>
#include <AK/Format.h>
#include <AK/RefCounted.h>
#include <AK/SourceLocation.h>

46
Userland/Libraries/LibPDF/ObjectDerivatives.cpp
View file

@ -15,33 +15,33 @@ PDFErrorOr<NonnullRefPtr<Object>> ArrayObject::get_object_at(Document* document,
return document->resolve_to<Object>(at(index));
}
PDFErrorOr<NonnullRefPtr<Object>> DictObject::get_object(Document* document, FlyString const& key) const
PDFErrorOr<NonnullRefPtr<Object>> DictObject::get_object(Document* document, DeprecatedFlyString const& key) const
{
return document->resolve_to<Object>(get_value(key));
}
#define DEFINE_ACCESSORS(class_name, snake_name) \
PDFErrorOr<NonnullRefPtr<class_name>> ArrayObject::get_##snake_name##_at(Document* document, size_t index) const \
{ \
if (index >= m_elements.size()) \
return Error { Error::Type::Internal, "Out of bounds array access" }; \
return document->resolve_to<class_name>(m_elements[index]); \
} \
\
NonnullRefPtr<class_name> ArrayObject::get_##snake_name##_at(size_t index) const \
{ \
VERIFY(index < m_elements.size()); \
return cast_to<class_name>(m_elements[index]); \
} \
\
PDFErrorOr<NonnullRefPtr<class_name>> DictObject::get_##snake_name(Document* document, FlyString const& key) const \
{ \
return document->resolve_to<class_name>(get_value(key)); \
} \
\
NonnullRefPtr<class_name> DictObject::get_##snake_name(FlyString const& key) const \
{ \
return cast_to<class_name>(get_value(key)); \
#define DEFINE_ACCESSORS(class_name, snake_name) \
PDFErrorOr<NonnullRefPtr<class_name>> ArrayObject::get_##snake_name##_at(Document* document, size_t index) const \
{ \
if (index >= m_elements.size()) \
return Error { Error::Type::Internal, "Out of bounds array access" }; \
return document->resolve_to<class_name>(m_elements[index]); \
} \
\
NonnullRefPtr<class_name> ArrayObject::get_##snake_name##_at(size_t index) const \
{ \
VERIFY(index < m_elements.size()); \
return cast_to<class_name>(m_elements[index]); \
} \
\
PDFErrorOr<NonnullRefPtr<class_name>> DictObject::get_##snake_name(Document* document, DeprecatedFlyString const& key) const \
{ \
return document->resolve_to<class_name>(get_value(key)); \
} \
\
NonnullRefPtr<class_name> DictObject::get_##snake_name(DeprecatedFlyString const& key) const \
{ \
return cast_to<class_name>(get_value(key)); \
}
ENUMERATE_OBJECT_TYPES(DEFINE_ACCESSORS)

26
Userland/Libraries/LibPDF/ObjectDerivatives.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <AK/FlyString.h>
#include <AK/DeprecatedFlyString.h>
#include <AK/HashMap.h>
#include <AK/RefCounted.h>
#include <AK/SourceLocation.h>
@ -44,14 +44,14 @@ private:
class NameObject final : public Object {
public:
explicit NameObject(FlyString name)
explicit NameObject(DeprecatedFlyString name)
: m_name(move(name))
{
}
~NameObject() override = default;
[[nodiscard]] ALWAYS_INLINE FlyString const& name() const { return m_name; }
[[nodiscard]] ALWAYS_INLINE DeprecatedFlyString const& name() const { return m_name; }
char const* type_name() const override { return "name"; }
DeprecatedString to_deprecated_string(int indent) const override;
@ -60,7 +60,7 @@ protected:
bool is_name() const override { return true; }
private:
FlyString m_name;
DeprecatedFlyString m_name;
};
class ArrayObject final : public Object {
@ -106,14 +106,14 @@ private:
class DictObject final : public Object {
public:
explicit DictObject(HashMap<FlyString, Value> map)
explicit DictObject(HashMap<DeprecatedFlyString, Value> map)
: m_map(move(map))
{
}
~DictObject() override = default;
[[nodiscard]] ALWAYS_INLINE HashMap<FlyString, Value> const& map() const { return m_map; }
[[nodiscard]] ALWAYS_INLINE HashMap<DeprecatedFlyString, Value> const& map() const { return m_map; }
template<typename... Args>
bool contains(Args&&... keys) const { return (m_map.contains(keys) && ...); }
@ -121,20 +121,20 @@ public:
template<typename... Args>
bool contains_any_of(Args&&... keys) const { return (m_map.contains(keys) || ...); }
ALWAYS_INLINE Optional<Value> get(FlyString const& key) const { return m_map.get(key); }
ALWAYS_INLINE Optional<Value> get(DeprecatedFlyString const& key) const { return m_map.get(key); }
Value get_value(FlyString const& key) const
Value get_value(DeprecatedFlyString const& key) const
{
auto value = get(key);
VERIFY(value.has_value());
return value.value();
}
PDFErrorOr<NonnullRefPtr<Object>> get_object(Document*, FlyString const& key) const;
PDFErrorOr<NonnullRefPtr<Object>> get_object(Document*, DeprecatedFlyString const& key) const;
#define DEFINE_GETTER(class_name, snake_name) \
PDFErrorOr<NonnullRefPtr<class_name>> get_##snake_name(Document*, FlyString const& key) const; \
NonnullRefPtr<class_name> get_##snake_name(FlyString const& key) const;
#define DEFINE_GETTER(class_name, snake_name) \
PDFErrorOr<NonnullRefPtr<class_name>> get_##snake_name(Document*, DeprecatedFlyString const& key) const; \
NonnullRefPtr<class_name> get_##snake_name(DeprecatedFlyString const& key) const;
ENUMERATE_OBJECT_TYPES(DEFINE_GETTER)
#undef DEFINE_GETTER
@ -148,7 +148,7 @@ protected:
bool is_dict() const override { return true; }
private:
HashMap<FlyString, Value> m_map;
HashMap<DeprecatedFlyString, Value> m_map;
};
class StreamObject : public Object {

4
Userland/Libraries/LibPDF/Parser.cpp
View file

@ -418,7 +418,7 @@ PDFErrorOr<NonnullRefPtr<DictObject>> Parser::parse_dict()
return error("Expected dict to start with \"<<\"");
m_reader.consume_whitespace();
HashMap<FlyString, Value> map;
HashMap<DeprecatedFlyString, Value> map;
while (!m_reader.done()) {
if (m_reader.matches(">>"))
@ -479,7 +479,7 @@ PDFErrorOr<NonnullRefPtr<StreamObject>> Parser::parse_stream(NonnullRefPtr<DictO
m_document->security_handler()->decrypt(stream_object, m_current_reference_stack.last());
if (dict->contains(CommonNames::Filter)) {
Vector<FlyString> filters;
Vector<DeprecatedFlyString> filters;
// We may either get a single filter or an array of cascading filters
auto filter_object = TRY(dict->get_object(m_document, CommonNames::Filter));

2
Userland/Libraries/LibPDF/Renderer.cpp
View file

@ -773,7 +773,7 @@ PDFErrorOr<NonnullRefPtr<Gfx::Bitmap>> Renderer::load_image(NonnullRefPtr<Stream
auto width = image_dict->get_value(CommonNames::Width).get<int>();
auto height = image_dict->get_value(CommonNames::Height).get<int>();
auto is_filter = [&](FlyString const& name) {
auto is_filter = [&](DeprecatedFlyString const& name) {
if (filter_object->is<NameObject>())
return filter_object->cast<NameObject>()->name() == name;
auto filters = filter_object->cast<ArrayObject>();