diff options
Diffstat (limited to 'Meta/Lagom')
22 files changed, 135 insertions, 127 deletions
diff --git a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp index 2a106802a3..6f7b1dfee6 100644 --- a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp @@ -10,6 +10,7 @@ #include <AK/HashMap.h> #include <AK/SourceGenerator.h> #include <AK/StringBuilder.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <LibMain/Main.h> #include <ctype.h> @@ -69,7 +70,7 @@ static bool is_primitive_type(DeprecatedString const& type) static bool is_simple_type(DeprecatedString const& type) { // Small types that it makes sense just to pass by value. - return type.is_one_of("Gfx::Color", "Gfx::IntPoint", "Gfx::FloatPoint", "Gfx::IntSize", "Gfx::FloatSize", "Core::Stream::OpenMode"); + return type.is_one_of("Gfx::Color", "Gfx::IntPoint", "Gfx::FloatPoint", "Gfx::IntSize", "Gfx::FloatSize", "Core::File::OpenMode"); } static bool is_primitive_or_simple_type(DeprecatedString const& type) @@ -796,7 +797,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) return 1; } - auto file = TRY(Core::Stream::File::open(arguments.strings[1], Core::Stream::OpenMode::Read)); + auto file = TRY(Core::File::open(arguments.strings[1], Core::File::OpenMode::Read)); auto file_contents = TRY(file->read_until_eof()); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp b/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp index ebd8ad8623..fca6c8d1cb 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp @@ -6,6 +6,7 @@ #include <AK/SourceGenerator.h> #include <LibCore/ArgsParser.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> enum class PnpIdColumns { @@ -116,7 +117,7 @@ static ErrorOr<ApprovalDate> parse_approval_date(StringView const& str) return ApprovalDate { .year = year.value(), .month = month.value(), .day = day.value() }; } -static ErrorOr<HashMap<DeprecatedString, PnpIdData>> parse_pnp_ids_database(Core::Stream::File& pnp_ids_file) +static ErrorOr<HashMap<DeprecatedString, PnpIdData>> parse_pnp_ids_database(Core::File& pnp_ids_file) { auto pnp_ids_file_bytes = TRY(pnp_ids_file.read_until_eof()); StringView pnp_ids_file_contents(pnp_ids_file_bytes); @@ -181,7 +182,7 @@ static ErrorOr<HashMap<DeprecatedString, PnpIdData>> parse_pnp_ids_database(Core return pnp_id_data; } -static ErrorOr<void> generate_header(Core::Stream::File& file, HashMap<DeprecatedString, PnpIdData> const& pnp_ids) +static ErrorOr<void> generate_header(Core::File& file, HashMap<DeprecatedString, PnpIdData> const& pnp_ids) { StringBuilder builder; SourceGenerator generator { builder }; @@ -215,7 +216,7 @@ namespace PnpIDs { return {}; } -static ErrorOr<void> generate_source(Core::Stream::File& file, HashMap<DeprecatedString, PnpIdData> const& pnp_ids) +static ErrorOr<void> generate_source(Core::File& file, HashMap<DeprecatedString, PnpIdData> const& pnp_ids) { StringBuilder builder; SourceGenerator generator { builder }; @@ -281,17 +282,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_option(pnp_ids_file_path, "Path to the input PNP ID database file", "pnp-ids-file", 'p', "pnp-ids-file"); args_parser.parse(arguments); - auto open_file = [&](StringView path, Core::Stream::OpenMode mode = Core::Stream::OpenMode::Read) -> ErrorOr<NonnullOwnPtr<Core::Stream::File>> { + auto open_file = [&](StringView path, Core::File::OpenMode mode = Core::File::OpenMode::Read) -> ErrorOr<NonnullOwnPtr<Core::File>> { if (path.is_empty()) { args_parser.print_usage(stderr, arguments.argv[0]); return Error::from_string_literal("Must provide all command line options"); } - return Core::Stream::File::open(path, mode); + return Core::File::open(path, mode); }; - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::ReadWrite)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::ReadWrite)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::ReadWrite)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::ReadWrite)); auto pnp_ids_file = TRY(open_file(pnp_ids_file_path)); auto pnp_id_map = TRY(parse_pnp_ids_database(*pnp_ids_file)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp b/Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp index e44191c93d..99bf32fe44 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp @@ -14,6 +14,7 @@ #include <AK/StringView.h> #include <AK/Vector.h> #include <LibCore/ArgsParser.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <LibMain/Main.h> @@ -355,7 +356,7 @@ Vector<FunctionDefinition> create_function_definitions(DeprecatedString function return functions; } -ErrorOr<void> generate_header_file(JsonObject& api_data, Core::Stream::File& file) +ErrorOr<void> generate_header_file(JsonObject& api_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; @@ -409,7 +410,7 @@ ErrorOr<void> generate_header_file(JsonObject& api_data, Core::Stream::File& fil return {}; } -ErrorOr<void> generate_implementation_file(JsonObject& api_data, Core::Stream::File& file) +ErrorOr<void> generate_implementation_file(JsonObject& api_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; @@ -535,7 +536,7 @@ ErrorOr<void> generate_implementation_file(JsonObject& api_data, Core::Stream::F ErrorOr<JsonValue> read_entire_file_as_json(StringView filename) { - auto file = TRY(Core::Stream::File::open(filename, Core::Stream::OpenMode::Read)); + auto file = TRY(Core::File::open(filename, Core::File::OpenMode::Read)); auto json_size = TRY(file->size()); auto json_data = TRY(ByteBuffer::create_uninitialized(json_size)); TRY(file->read_entire_buffer(json_data.bytes())); @@ -558,8 +559,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) VERIFY(json.is_object()); auto api_data = json.as_object(); - auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(Core::File::open(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(Core::File::open(generated_implementation_path, Core::File::OpenMode::Write)); TRY(generate_header_file(api_data, *generated_header_file)); TRY(generate_implementation_file(api_data, *generated_implementation_file)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp index c54b4fbd45..b33a4a17c2 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp @@ -1701,7 +1701,7 @@ static DeprecatedString format_identifier(StringView owner, DeprecatedString ide return identifier; } -static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR& cldr) +static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -1729,7 +1729,7 @@ namespace Locale { return {}; } -static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr) +static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -2416,8 +2416,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_option(dates_path, "Path to cldr-dates directory", "dates-path", 'd', "dates-path"); args_parser.parse(arguments); - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write)); CLDR cldr; TRY(parse_all_locales(core_path, dates_path, cldr)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp index f2e0249bcf..3a2cd6ebda 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp @@ -1007,7 +1007,7 @@ static ErrorOr<void> parse_all_locales(DeprecatedString bcp47_path, DeprecatedSt return {}; } -static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR& cldr) +static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -1052,7 +1052,7 @@ namespace Locale { return {}; } -static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr) +static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) { auto string_index_type = cldr.unique_strings.type_that_fits(); @@ -1774,8 +1774,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_option(dates_path, "Path to cldr-dates directory", "dates-path", 'd', "dates-path"); args_parser.parse(arguments); - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write)); CLDR cldr; TRY(parse_all_locales(bcp47_path, core_path, locale_names_path, misc_path, numbers_path, dates_path, cldr)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp index f9c35fae1b..7609d9e7b7 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp @@ -745,7 +745,7 @@ static DeprecatedString format_identifier(StringView, DeprecatedString identifie return identifier.to_titlecase(); } -static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR& cldr) +static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -768,7 +768,7 @@ namespace Locale { return {}; } -static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr) +static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -1128,8 +1128,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_option(units_path, "Path to cldr-units directory", "units-path", 'u', "units-path"); args_parser.parse(arguments); - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write)); CLDR cldr; TRY(parse_all_locales(core_path, numbers_path, units_path, cldr)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp index d13b5f3753..70ce71efe0 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp @@ -426,7 +426,7 @@ static ErrorOr<void> parse_all_locales(DeprecatedString core_path, DeprecatedStr return {}; } -static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR&) +static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR&) { StringBuilder builder; SourceGenerator generator { builder }; @@ -447,7 +447,7 @@ namespace Locale { return {}; } -static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr) +static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -673,8 +673,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_option(locale_names_path, "Path to cldr-localenames directory", "locale-names-path", 'l', "locale-names-path"); args_parser.parse(arguments); - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write)); CLDR cldr; TRY(parse_all_locales(core_path, locale_names_path, cldr)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp index 0ec821c8a6..382c6b8472 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp @@ -164,7 +164,7 @@ static ErrorOr<void> parse_all_locales(DeprecatedString dates_path, CLDR& cldr) return {}; } -static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR&) +static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR&) { StringBuilder builder; SourceGenerator generator { builder }; @@ -185,7 +185,7 @@ namespace Locale { return {}; } -static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr) +static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -293,8 +293,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_option(dates_path, "Path to cldr-dates directory", "dates-path", 'd', "dates-path"); args_parser.parse(arguments); - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write)); CLDR cldr; TRY(parse_all_locales(dates_path, cldr)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp index a1839d01de..0290e46a77 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp @@ -317,7 +317,7 @@ static void parse_rule(StringView rule_line, TimeZoneData& time_zone_data) static ErrorOr<void> parse_time_zones(StringView time_zone_path, TimeZoneData& time_zone_data) { // For reference, the man page for `zic` has the best documentation of the TZDB file format. - auto file = TRY(open_file(time_zone_path, Core::Stream::OpenMode::Read)); + auto file = TRY(open_file(time_zone_path, Core::File::OpenMode::Read)); Array<u8, 1024> buffer {}; Vector<TimeZoneOffset>* last_parsed_zone = nullptr; @@ -346,7 +346,7 @@ static ErrorOr<void> parse_time_zones(StringView time_zone_path, TimeZoneData& t return {}; } -static ErrorOr<void> parse_time_zone_coordinates(Core::Stream::BufferedFile& file, TimeZoneData& time_zone_data) +static ErrorOr<void> parse_time_zone_coordinates(Core::BufferedFile& file, TimeZoneData& time_zone_data) { auto parse_coordinate = [](auto coordinate) { VERIFY(coordinate.substring_view(0, 1).is_one_of("+"sv, "-"sv)); @@ -448,7 +448,7 @@ static DeprecatedString format_identifier(StringView owner, DeprecatedString ide return identifier; } -static ErrorOr<void> generate_time_zone_data_header(Core::Stream::BufferedFile& file, TimeZoneData& time_zone_data) +static ErrorOr<void> generate_time_zone_data_header(Core::BufferedFile& file, TimeZoneData& time_zone_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -473,7 +473,7 @@ namespace TimeZone { return {}; } -static ErrorOr<void> generate_time_zone_data_implementation(Core::Stream::BufferedFile& file, TimeZoneData& time_zone_data) +static ErrorOr<void> generate_time_zone_data_implementation(Core::BufferedFile& file, TimeZoneData& time_zone_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -819,9 +819,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_positional_argument(time_zone_paths, "Paths to the time zone database files", "time-zone-paths"); args_parser.parse(arguments); - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write)); - auto time_zone_coordinates_file = TRY(open_file(time_zone_coordinates_path, Core::Stream::OpenMode::Read)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write)); + auto time_zone_coordinates_file = TRY(open_file(time_zone_coordinates_path, Core::File::OpenMode::Read)); TimeZoneData time_zone_data {}; for (auto time_zone_path : time_zone_paths) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp index 984f44396c..ca792f4167 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp @@ -50,7 +50,7 @@ static void set_image_path_for_emoji(StringView emoji_resource_path, Emoji& emoj emoji.image_path = move(path); } -static ErrorOr<void> parse_emoji_test_data(Core::Stream::BufferedFile& file, EmojiData& emoji_data) +static ErrorOr<void> parse_emoji_test_data(Core::BufferedFile& file, EmojiData& emoji_data) { static constexpr auto group_header = "# group: "sv; static constexpr auto subgroup_header = "# subgroup: "sv; @@ -114,7 +114,7 @@ static ErrorOr<void> parse_emoji_test_data(Core::Stream::BufferedFile& file, Emo return {}; } -static ErrorOr<void> parse_emoji_serenity_data(Core::Stream::BufferedFile& file, EmojiData& emoji_data) +static ErrorOr<void> parse_emoji_serenity_data(Core::BufferedFile& file, EmojiData& emoji_data) { static constexpr auto code_point_header = "U+"sv; @@ -164,7 +164,7 @@ static ErrorOr<void> parse_emoji_serenity_data(Core::Stream::BufferedFile& file, return {}; } -static ErrorOr<void> generate_emoji_data_header(Core::Stream::BufferedFile& file, EmojiData const&) +static ErrorOr<void> generate_emoji_data_header(Core::BufferedFile& file, EmojiData const&) { StringBuilder builder; SourceGenerator generator { builder }; @@ -173,7 +173,7 @@ static ErrorOr<void> generate_emoji_data_header(Core::Stream::BufferedFile& file return {}; } -static ErrorOr<void> generate_emoji_data_implementation(Core::Stream::BufferedFile& file, EmojiData const& emoji_data) +static ErrorOr<void> generate_emoji_data_implementation(Core::BufferedFile& file, EmojiData const& emoji_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -276,7 +276,7 @@ Optional<Emoji> find_emoji_for_code_points(ReadonlySpan<u32> code_points) return {}; } -static ErrorOr<void> generate_emoji_installation(Core::Stream::BufferedFile& file, EmojiData const& emoji_data) +static ErrorOr<void> generate_emoji_installation(Core::BufferedFile& file, EmojiData const& emoji_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -339,14 +339,14 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_option(emoji_resource_path, "Path to the /res/emoji directory", "emoji-resource-path", 'r', "emoji-resource-path"); args_parser.parse(arguments); - auto emoji_test_file = TRY(open_file(emoji_test_path, Core::Stream::OpenMode::Read)); + auto emoji_test_file = TRY(open_file(emoji_test_path, Core::File::OpenMode::Read)); VERIFY(!emoji_resource_path.is_empty() && Core::DeprecatedFile::exists(emoji_resource_path)); EmojiData emoji_data {}; TRY(parse_emoji_test_data(*emoji_test_file, emoji_data)); if (!emoji_serenity_path.is_empty()) { - auto emoji_serenity_file = TRY(open_file(emoji_serenity_path, Core::Stream::OpenMode::Read)); + auto emoji_serenity_file = TRY(open_file(emoji_serenity_path, Core::File::OpenMode::Read)); TRY(parse_emoji_serenity_data(*emoji_serenity_file, emoji_data)); } @@ -357,11 +357,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) } if (!generated_header_path.is_empty()) { - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write)); TRY(generate_emoji_data_header(*generated_header_file, emoji_data)); } if (!generated_implementation_path.is_empty()) { - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write)); TRY(generate_emoji_data_implementation(*generated_implementation_file, emoji_data)); } @@ -371,7 +371,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) for (auto& emoji : emoji_data.emojis) set_image_path_for_emoji(emoji_resource_path, emoji); - auto generated_installation_file = TRY(open_file(generated_installation_path, Core::Stream::OpenMode::Write)); + auto generated_installation_file = TRY(open_file(generated_installation_path, Core::File::OpenMode::Write)); TRY(generate_emoji_installation(*generated_installation_file, emoji_data)); } diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp index 3fc0c74808..f3244b3507 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp @@ -219,7 +219,7 @@ static CodePointRange parse_code_point_range(StringView list) return code_point_range; } -static ErrorOr<void> parse_special_casing(Core::Stream::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr<void> parse_special_casing(Core::BufferedFile& file, UnicodeData& unicode_data) { Array<u8, 1024> buffer; @@ -290,7 +290,7 @@ static ErrorOr<void> parse_special_casing(Core::Stream::BufferedFile& file, Unic return {}; } -static ErrorOr<void> parse_case_folding(Core::Stream::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr<void> parse_case_folding(Core::BufferedFile& file, UnicodeData& unicode_data) { Array<u8, 1024> buffer; @@ -338,7 +338,7 @@ static ErrorOr<void> parse_case_folding(Core::Stream::BufferedFile& file, Unicod return {}; } -static ErrorOr<void> parse_prop_list(Core::Stream::BufferedFile& file, PropList& prop_list, bool multi_value_property = false, bool sanitize_property = false) +static ErrorOr<void> parse_prop_list(Core::BufferedFile& file, PropList& prop_list, bool multi_value_property = false, bool sanitize_property = false) { Array<u8, 1024> buffer; @@ -371,7 +371,7 @@ static ErrorOr<void> parse_prop_list(Core::Stream::BufferedFile& file, PropList& return {}; } -static ErrorOr<void> parse_alias_list(Core::Stream::BufferedFile& file, PropList const& prop_list, Vector<Alias>& prop_aliases) +static ErrorOr<void> parse_alias_list(Core::BufferedFile& file, PropList const& prop_list, Vector<Alias>& prop_aliases) { DeprecatedString current_property; Array<u8, 1024> buffer; @@ -417,7 +417,7 @@ static ErrorOr<void> parse_alias_list(Core::Stream::BufferedFile& file, PropList return {}; } -static ErrorOr<void> parse_name_aliases(Core::Stream::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr<void> parse_name_aliases(Core::BufferedFile& file, UnicodeData& unicode_data) { Array<u8, 1024> buffer; @@ -448,7 +448,7 @@ static ErrorOr<void> parse_name_aliases(Core::Stream::BufferedFile& file, Unicod return {}; } -static ErrorOr<void> parse_value_alias_list(Core::Stream::BufferedFile& file, StringView desired_category, Vector<DeprecatedString> const& value_list, Vector<Alias>& prop_aliases, bool primary_value_is_first = true, bool sanitize_alias = false) +static ErrorOr<void> parse_value_alias_list(Core::BufferedFile& file, StringView desired_category, Vector<DeprecatedString> const& value_list, Vector<Alias>& prop_aliases, bool primary_value_is_first = true, bool sanitize_alias = false) { TRY(file.seek(0, SeekMode::SetPosition)); Array<u8, 1024> buffer; @@ -494,7 +494,7 @@ static ErrorOr<void> parse_value_alias_list(Core::Stream::BufferedFile& file, St return {}; } -static ErrorOr<void> parse_normalization_props(Core::Stream::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr<void> parse_normalization_props(Core::BufferedFile& file, UnicodeData& unicode_data) { Array<u8, 1024> buffer; @@ -628,7 +628,7 @@ static Optional<CodePointDecomposition> parse_decomposition_mapping(StringView s return mapping; } -static ErrorOr<void> parse_block_display_names(Core::Stream::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr<void> parse_block_display_names(Core::BufferedFile& file, UnicodeData& unicode_data) { Array<u8, 1024> buffer; while (TRY(file.can_read_line())) { @@ -651,7 +651,7 @@ static ErrorOr<void> parse_block_display_names(Core::Stream::BufferedFile& file, return {}; } -static ErrorOr<void> parse_unicode_data(Core::Stream::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr<void> parse_unicode_data(Core::BufferedFile& file, UnicodeData& unicode_data) { Optional<u32> code_point_range_start; @@ -756,7 +756,7 @@ static ErrorOr<void> parse_unicode_data(Core::Stream::BufferedFile& file, Unicod return {}; } -static ErrorOr<void> generate_unicode_data_header(Core::Stream::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr<void> generate_unicode_data_header(Core::BufferedFile& file, UnicodeData& unicode_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -871,7 +871,7 @@ ReadonlySpan<CaseFolding const*> case_folding_mapping(u32 code_point); return {}; } -static ErrorOr<void> generate_unicode_data_implementation(Core::Stream::BufferedFile& file, UnicodeData const& unicode_data) +static ErrorOr<void> generate_unicode_data_implementation(Core::BufferedFile& file, UnicodeData const& unicode_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -1530,26 +1530,26 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_option(sentence_break_path, "Path to SentenceBreakProperty.txt file", "sentence-break-path", 'i', "sentence-break-path"); args_parser.parse(arguments); - auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write)); - auto unicode_data_file = TRY(open_file(unicode_data_path, Core::Stream::OpenMode::Read)); - auto derived_general_category_file = TRY(open_file(derived_general_category_path, Core::Stream::OpenMode::Read)); - auto special_casing_file = TRY(open_file(special_casing_path, Core::Stream::OpenMode::Read)); - auto case_folding_file = TRY(open_file(case_folding_path, Core::Stream::OpenMode::Read)); - auto prop_list_file = TRY(open_file(prop_list_path, Core::Stream::OpenMode::Read)); - auto derived_core_prop_file = TRY(open_file(derived_core_prop_path, Core::Stream::OpenMode::Read)); - auto derived_binary_prop_file = TRY(open_file(derived_binary_prop_path, Core::Stream::OpenMode::Read)); - auto prop_alias_file = TRY(open_file(prop_alias_path, Core::Stream::OpenMode::Read)); - auto prop_value_alias_file = TRY(open_file(prop_value_alias_path, Core::Stream::OpenMode::Read)); - auto name_alias_file = TRY(open_file(name_alias_path, Core::Stream::OpenMode::Read)); - auto scripts_file = TRY(open_file(scripts_path, Core::Stream::OpenMode::Read)); - auto script_extensions_file = TRY(open_file(script_extensions_path, Core::Stream::OpenMode::Read)); - auto blocks_file = TRY(open_file(blocks_path, Core::Stream::OpenMode::Read)); - auto emoji_data_file = TRY(open_file(emoji_data_path, Core::Stream::OpenMode::Read)); - auto normalization_file = TRY(open_file(normalization_path, Core::Stream::OpenMode::Read)); - auto grapheme_break_file = TRY(open_file(grapheme_break_path, Core::Stream::OpenMode::Read)); - auto word_break_file = TRY(open_file(word_break_path, Core::Stream::OpenMode::Read)); - auto sentence_break_file = TRY(open_file(sentence_break_path, Core::Stream::OpenMode::Read)); + auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write)); + auto unicode_data_file = TRY(open_file(unicode_data_path, Core::File::OpenMode::Read)); + auto derived_general_category_file = TRY(open_file(derived_general_category_path, Core::File::OpenMode::Read)); + auto special_casing_file = TRY(open_file(special_casing_path, Core::File::OpenMode::Read)); + auto case_folding_file = TRY(open_file(case_folding_path, Core::File::OpenMode::Read)); + auto prop_list_file = TRY(open_file(prop_list_path, Core::File::OpenMode::Read)); + auto derived_core_prop_file = TRY(open_file(derived_core_prop_path, Core::File::OpenMode::Read)); + auto derived_binary_prop_file = TRY(open_file(derived_binary_prop_path, Core::File::OpenMode::Read)); + auto prop_alias_file = TRY(open_file(prop_alias_path, Core::File::OpenMode::Read)); + auto prop_value_alias_file = TRY(open_file(prop_value_alias_path, Core::File::OpenMode::Read)); + auto name_alias_file = TRY(open_file(name_alias_path, Core::File::OpenMode::Read)); + auto scripts_file = TRY(open_file(scripts_path, Core::File::OpenMode::Read)); + auto script_extensions_file = TRY(open_file(script_extensions_path, Core::File::OpenMode::Read)); + auto blocks_file = TRY(open_file(blocks_path, Core::File::OpenMode::Read)); + auto emoji_data_file = TRY(open_file(emoji_data_path, Core::File::OpenMode::Read)); + auto normalization_file = TRY(open_file(normalization_path, Core::File::OpenMode::Read)); + auto grapheme_break_file = TRY(open_file(grapheme_break_path, Core::File::OpenMode::Read)); + auto word_break_file = TRY(open_file(word_break_path, Core::File::OpenMode::Read)); + auto sentence_break_file = TRY(open_file(sentence_break_path, Core::File::OpenMode::Read)); UnicodeData unicode_data {}; TRY(parse_special_casing(*special_casing_file, unicode_data)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h index c83378f6f9..472d489a61 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h @@ -20,6 +20,7 @@ #include <AK/Traits.h> #include <AK/Vector.h> #include <LibCore/DirIterator.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <LibLocale/Locale.h> @@ -323,18 +324,18 @@ struct CanonicalLanguageID { Vector<size_t> variants {}; }; -inline ErrorOr<NonnullOwnPtr<Core::Stream::BufferedFile>> open_file(StringView path, Core::Stream::OpenMode mode) +inline ErrorOr<NonnullOwnPtr<Core::BufferedFile>> open_file(StringView path, Core::File::OpenMode mode) { if (path.is_empty()) return Error::from_string_literal("Provided path is empty, please provide all command line options"); - auto file = TRY(Core::Stream::File::open(path, mode)); - return Core::Stream::BufferedFile::create(move(file)); + auto file = TRY(Core::File::open(path, mode)); + return Core::BufferedFile::create(move(file)); } inline ErrorOr<JsonValue> read_json_file(StringView path) { - auto file = TRY(open_file(path, Core::Stream::OpenMode::Read)); + auto file = TRY(open_file(path, Core::File::OpenMode::Read)); auto buffer = TRY(file->read_until_eof()); return JsonValue::from_string(buffer); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp index ec07396c5f..86f8a6031f 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp @@ -11,6 +11,7 @@ #include <AK/Debug.h> #include <AK/LexicalPath.h> #include <LibCore/ArgsParser.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <LibIDL/IDLParser.h> #include <LibIDL/Types.h> @@ -64,7 +65,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_positional_argument(import_base_path, "Import base path", "import-base-path", Core::ArgsParser::Required::No); args_parser.parse(arguments); - auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read)); + auto file = TRY(Core::File::open(path, Core::File::OpenMode::Read)); LexicalPath lexical_path(path); auto& namespace_ = lexical_path.parts_view().at(lexical_path.parts_view().size() - 2); @@ -74,7 +75,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) if (import_base_path.is_null()) import_base_path = lexical_path.dirname(); - auto output_file = TRY(Core::Stream::File::open_file_or_standard_stream(output_path, Core::Stream::OpenMode::Write)); + auto output_file = TRY(Core::File::open_file_or_standard_stream(output_path, Core::File::OpenMode::Write)); IDL::Parser parser(path, data, import_base_path); auto& interface = parser.parse(); @@ -151,7 +152,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) TRY(output_file->write(output_builder.string_view().bytes())); if (!depfile_path.is_null()) { - auto depfile = TRY(Core::Stream::File::open_file_or_standard_stream(depfile_path, Core::Stream::OpenMode::Write)); + auto depfile = TRY(Core::File::open_file_or_standard_stream(depfile_path, Core::File::OpenMode::Write)); StringBuilder depfile_builder; depfile_builder.append(depfile_target.is_null() ? output_path : depfile_target); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp index 891d43f0bc..51e21dbbf4 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp @@ -10,8 +10,8 @@ #include <LibCore/ArgsParser.h> #include <LibMain/Main.h> -ErrorOr<void> generate_header_file(JsonObject& enums_data, Core::Stream::File& file); -ErrorOr<void> generate_implementation_file(JsonObject& enums_data, Core::Stream::File& file); +ErrorOr<void> generate_header_file(JsonObject& enums_data, Core::File& file); +ErrorOr<void> generate_implementation_file(JsonObject& enums_data, Core::File& file); ErrorOr<int> serenity_main(Main::Arguments arguments) { @@ -29,8 +29,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) VERIFY(json.is_object()); auto enums_data = json.as_object(); - auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(Core::File::open(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(Core::File::open(generated_implementation_path, Core::File::OpenMode::Write)); TRY(generate_header_file(enums_data, *generated_header_file)); TRY(generate_implementation_file(enums_data, *generated_implementation_file)); @@ -38,7 +38,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) return 0; } -ErrorOr<void> generate_header_file(JsonObject& enums_data, Core::Stream::File& file) +ErrorOr<void> generate_header_file(JsonObject& enums_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; @@ -99,7 +99,7 @@ enum class ValueID; return {}; } -ErrorOr<void> generate_implementation_file(JsonObject& enums_data, Core::Stream::File& file) +ErrorOr<void> generate_implementation_file(JsonObject& enums_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp index 11b7f08423..6cf5abcf43 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp @@ -10,8 +10,8 @@ #include <LibCore/ArgsParser.h> #include <LibMain/Main.h> -ErrorOr<void> generate_header_file(JsonObject& media_feature_data, Core::Stream::File& file); -ErrorOr<void> generate_implementation_file(JsonObject& media_feature_data, Core::Stream::File& file); +ErrorOr<void> generate_header_file(JsonObject& media_feature_data, Core::File& file); +ErrorOr<void> generate_implementation_file(JsonObject& media_feature_data, Core::File& file); ErrorOr<int> serenity_main(Main::Arguments arguments) { @@ -29,8 +29,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) VERIFY(json.is_object()); auto media_feature_data = json.as_object(); - auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(Core::File::open(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(Core::File::open(generated_implementation_path, Core::File::OpenMode::Write)); TRY(generate_header_file(media_feature_data, *generated_header_file)); TRY(generate_implementation_file(media_feature_data, *generated_implementation_file)); @@ -38,7 +38,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) return 0; } -ErrorOr<void> generate_header_file(JsonObject& media_feature_data, Core::Stream::File& file) +ErrorOr<void> generate_header_file(JsonObject& media_feature_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; @@ -84,7 +84,7 @@ bool media_feature_accepts_identifier(MediaFeatureID, ValueID); return {}; } -ErrorOr<void> generate_implementation_file(JsonObject& media_feature_data, Core::Stream::File& file) +ErrorOr<void> generate_implementation_file(JsonObject& media_feature_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp index ad90d396a6..5724dd7b1c 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp @@ -11,8 +11,8 @@ #include <LibCore/ArgsParser.h> #include <LibMain/Main.h> -ErrorOr<void> generate_header_file(JsonObject& properties, Core::Stream::File& file); -ErrorOr<void> generate_implementation_file(JsonObject& properties, Core::Stream::File& file); +ErrorOr<void> generate_header_file(JsonObject& properties, Core::File& file); +ErrorOr<void> generate_implementation_file(JsonObject& properties, Core::File& file); ErrorOr<int> serenity_main(Main::Arguments arguments) { @@ -30,8 +30,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) VERIFY(json.is_object()); auto properties = json.as_object(); - auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(Core::File::open(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(Core::File::open(generated_implementation_path, Core::File::OpenMode::Write)); TRY(generate_header_file(properties, *generated_header_file)); TRY(generate_implementation_file(properties, *generated_implementation_file)); @@ -39,7 +39,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) return 0; } -ErrorOr<void> generate_header_file(JsonObject& properties, Core::Stream::File& file) +ErrorOr<void> generate_header_file(JsonObject& properties, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; @@ -143,7 +143,7 @@ struct Traits<Web::CSS::PropertyID> : public GenericTraits<Web::CSS::PropertyID> return {}; } -ErrorOr<void> generate_implementation_file(JsonObject& properties, Core::Stream::File& file) +ErrorOr<void> generate_implementation_file(JsonObject& properties, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSTransformFunctions.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSTransformFunctions.cpp index 4dedf3e81f..9276061b12 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSTransformFunctions.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSTransformFunctions.cpp @@ -11,8 +11,8 @@ #include <LibCore/ArgsParser.h> #include <LibMain/Main.h> -ErrorOr<void> generate_header_file(JsonObject& transforms_data, Core::Stream::File& file); -ErrorOr<void> generate_implementation_file(JsonObject& transforms_data, Core::Stream::File& file); +ErrorOr<void> generate_header_file(JsonObject& transforms_data, Core::File& file); +ErrorOr<void> generate_implementation_file(JsonObject& transforms_data, Core::File& file); ErrorOr<int> serenity_main(Main::Arguments arguments) { @@ -30,8 +30,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) VERIFY(json.is_object()); auto transforms_data = json.as_object(); - auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(Core::File::open(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(Core::File::open(generated_implementation_path, Core::File::OpenMode::Write)); TRY(generate_header_file(transforms_data, *generated_header_file)); TRY(generate_implementation_file(transforms_data, *generated_implementation_file)); @@ -48,7 +48,7 @@ static DeprecatedString title_casify_transform_function(StringView input) return builder.to_deprecated_string(); } -ErrorOr<void> generate_header_file(JsonObject& transforms_data, Core::Stream::File& file) +ErrorOr<void> generate_header_file(JsonObject& transforms_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; @@ -100,7 +100,7 @@ TransformFunctionMetadata transform_function_metadata(TransformFunction); return {}; } -ErrorOr<void> generate_implementation_file(JsonObject& transforms_data, Core::Stream::File& file) +ErrorOr<void> generate_implementation_file(JsonObject& transforms_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp index bb70156c6d..ba0dba9088 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp @@ -11,8 +11,8 @@ #include <LibCore/ArgsParser.h> #include <LibMain/Main.h> -ErrorOr<void> generate_header_file(JsonArray& identifier_data, Core::Stream::File& file); -ErrorOr<void> generate_implementation_file(JsonArray& identifier_data, Core::Stream::File& file); +ErrorOr<void> generate_header_file(JsonArray& identifier_data, Core::File& file); +ErrorOr<void> generate_implementation_file(JsonArray& identifier_data, Core::File& file); ErrorOr<int> serenity_main(Main::Arguments arguments) { @@ -30,8 +30,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) VERIFY(json.is_array()); auto identifier_data = json.as_array(); - auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write)); - auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(Core::File::open(generated_header_path, Core::File::OpenMode::Write)); + auto generated_implementation_file = TRY(Core::File::open(generated_implementation_path, Core::File::OpenMode::Write)); TRY(generate_header_file(identifier_data, *generated_header_file)); TRY(generate_implementation_file(identifier_data, *generated_implementation_file)); @@ -39,7 +39,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) return 0; } -ErrorOr<void> generate_header_file(JsonArray& identifier_data, Core::Stream::File& file) +ErrorOr<void> generate_header_file(JsonArray& identifier_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; @@ -78,7 +78,7 @@ StringView string_from_value_id(ValueID); return {}; } -ErrorOr<void> generate_implementation_file(JsonArray& identifier_data, Core::Stream::File& file) +ErrorOr<void> generate_implementation_file(JsonArray& identifier_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp index 03e3ee7b31..09806e93a4 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp @@ -9,6 +9,7 @@ #include <AK/SourceGenerator.h> #include <AK/StringBuilder.h> #include <LibCore/ArgsParser.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <LibIDL/IDLParser.h> #include <LibIDL/Types.h> @@ -110,7 +111,7 @@ class @legacy_constructor_class@;)~~~"); )~~~"); auto generated_forward_path = LexicalPath(output_path).append("Forward.h"sv).string(); - auto generated_forward_file = TRY(Core::Stream::File::open(generated_forward_path, Core::Stream::OpenMode::Write)); + auto generated_forward_file = TRY(Core::File::open(generated_forward_path, Core::File::OpenMode::Write)); TRY(generated_forward_file->write(generator.as_string_view().bytes())); return {}; @@ -224,7 +225,7 @@ void Intrinsics::create_web_prototype_and_constructor<@prototype_class@>(JS::Rea )~~~"); auto generated_intrinsics_path = LexicalPath(output_path).append("IntrinsicDefinitions.cpp"sv).string(); - auto generated_intrinsics_file = TRY(Core::Stream::File::open(generated_intrinsics_path, Core::Stream::OpenMode::Write)); + auto generated_intrinsics_file = TRY(Core::File::open(generated_intrinsics_path, Core::File::OpenMode::Write)); TRY(generated_intrinsics_file->write(generator.as_string_view().bytes())); return {}; @@ -250,7 +251,7 @@ void add_@global_object_snake_name@_exposed_interfaces(JS::Object&); )~~~"); auto generated_header_path = LexicalPath(output_path).append(DeprecatedString::formatted("{}ExposedInterfaces.h", class_name)).string(); - auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write)); + auto generated_header_file = TRY(Core::File::open(generated_header_path, Core::File::OpenMode::Write)); TRY(generated_header_file->write(generator.as_string_view().bytes())); return {}; @@ -332,7 +333,7 @@ void add_@global_object_snake_name@_exposed_interfaces(JS::Object& global) )~~~"); auto generated_implementation_path = LexicalPath(output_path).append(DeprecatedString::formatted("{}ExposedInterfaces.cpp", class_name)).string(); - auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write)); + auto generated_implementation_file = TRY(Core::File::open(generated_implementation_path, Core::File::OpenMode::Write)); TRY(generated_implementation_file->write(generator.as_string_view().bytes())); return {}; @@ -359,7 +360,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) // Read in all IDL files, we must own the storage for all of these for the lifetime of the program Vector<DeprecatedString> file_contents; for (DeprecatedString const& path : paths) { - auto file_or_error = Core::Stream::File::open(path, Core::Stream::OpenMode::Read); + auto file_or_error = Core::File::open(path, Core::File::OpenMode::Read); if (file_or_error.is_error()) { s_error_string = DeprecatedString::formatted("Unable to open file {}", path); return Error::from_string_view(s_error_string); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h index f3b396a756..5fa86d90ae 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h @@ -10,6 +10,7 @@ #include <AK/DeprecatedString.h> #include <AK/JsonObject.h> #include <AK/Vector.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <ctype.h> @@ -56,7 +57,7 @@ DeprecatedString snake_casify(DeprecatedString const& dashy_name) ErrorOr<JsonValue> read_entire_file_as_json(StringView filename) { - auto file = TRY(Core::Stream::File::open(filename, Core::Stream::OpenMode::Read)); + auto file = TRY(Core::File::open(filename, Core::File::OpenMode::Read)); auto json_size = TRY(file->size()); auto json_data = TRY(ByteBuffer::create_uninitialized(json_size)); TRY(file->read_entire_buffer(json_data.bytes())); diff --git a/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp b/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp index 984e4eff59..f3755f68c6 100644 --- a/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp @@ -12,6 +12,7 @@ #include <AK/StringBuilder.h> #include <AK/Types.h> #include <LibCore/ArgsParser.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <LibMain/Main.h> #include <ctype.h> @@ -221,7 +222,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) args_parser.add_positional_argument(path, "Path to parser description", "input", Core::ArgsParser::Required::Yes); args_parser.parse(arguments); - auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read)); + auto file = TRY(Core::File::open(path, Core::File::OpenMode::Read)); auto content = TRY(file->read_until_eof()); auto state_machine = parse_state_machine(content); diff --git a/Meta/Lagom/Tools/ConfigureComponents/main.cpp b/Meta/Lagom/Tools/ConfigureComponents/main.cpp index a184dd5405..e356589b0c 100644 --- a/Meta/Lagom/Tools/ConfigureComponents/main.cpp +++ b/Meta/Lagom/Tools/ConfigureComponents/main.cpp @@ -192,7 +192,7 @@ static Result<Vector<DeprecatedString>, int> run_whiptail(WhiptailMode mode, Vec return return_code; } - auto file_or_error = Core::Stream::File::adopt_fd(read_fd, Core::Stream::OpenMode::Read); + auto file_or_error = Core::File::adopt_fd(read_fd, Core::File::OpenMode::Read); if (file_or_error.is_error()) { warnln("\e[31mError:\e[0m Could not adopt file descriptor for reading: {}", file_or_error.error()); return -1; |