From a850465a4ba0e9f8bb2c3a6e5b07dbc49c9a791f Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 10 Mar 2022 11:54:59 +0000 Subject: [PATCH] Meta: Port Generate_CSS_PropertyID_h to LibMain/Core::Stream --- .../Tools/CodeGenerators/LibWeb/CMakeLists.txt | 2 +- .../LibWeb/Generate_CSS_PropertyID_h.cpp | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/CMakeLists.txt b/Meta/Lagom/Tools/CodeGenerators/LibWeb/CMakeLists.txt index 9409b05ac3..fcb758fcac 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/CMakeLists.txt +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/CMakeLists.txt @@ -2,7 +2,7 @@ set(SOURCES "") # avoid pulling SOURCES from parent scope lagom_tool(Generate_CSS_MediaFeatureID_h SOURCES Generate_CSS_MediaFeatureID_h.cpp LIBS LagomMain) lagom_tool(Generate_CSS_MediaFeatureID_cpp SOURCES Generate_CSS_MediaFeatureID_cpp.cpp LIBS LagomMain) -lagom_tool(Generate_CSS_PropertyID_h SOURCES Generate_CSS_PropertyID_h.cpp) +lagom_tool(Generate_CSS_PropertyID_h SOURCES Generate_CSS_PropertyID_h.cpp LIBS LagomMain) lagom_tool(Generate_CSS_PropertyID_cpp SOURCES Generate_CSS_PropertyID_cpp.cpp) lagom_tool(Generate_CSS_ValueID_h SOURCES Generate_CSS_ValueID_h.cpp LIBS LagomMain) lagom_tool(Generate_CSS_ValueID_cpp SOURCES Generate_CSS_ValueID_cpp.cpp LIBS LagomMain) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/Generate_CSS_PropertyID_h.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/Generate_CSS_PropertyID_h.cpp index 2e6413f679..d6db7a7008 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/Generate_CSS_PropertyID_h.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/Generate_CSS_PropertyID_h.cpp @@ -5,23 +5,18 @@ */ #include "GeneratorUtil.h" -#include -#include #include #include -#include +#include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (argc != 2) { - warnln("usage: {} ", argv[0]); + if (arguments.argc != 2) { + warnln("usage: {} ", arguments.strings[0]); return 1; } - auto file = Core::File::construct(argv[1]); - if (!file->open(Core::OpenMode::ReadOnly)) - return 1; - auto json = JsonValue::from_string(file->read_all()).release_value_but_fixme_should_propagate_errors(); + auto json = TRY(read_entire_file_as_json(arguments.strings[1])); VERIFY(json.is_object()); StringBuilder builder; @@ -120,4 +115,5 @@ struct Traits : public GenericTraits )~~~"); outln("{}", generator.as_string_view()); + return 0; }