Ver Fonte

Meta: Port Generate_CSS_PropertyID_h to LibMain/Core::Stream

Sam Atkins há 3 anos atrás
pai
commit
a850465a4b

+ 1 - 1
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)

+ 6 - 10
Meta/Lagom/Tools/CodeGenerators/LibWeb/Generate_CSS_PropertyID_h.cpp

@@ -5,23 +5,18 @@
  */
 
 #include "GeneratorUtil.h"
-#include <AK/ByteBuffer.h>
-#include <AK/JsonObject.h>
 #include <AK/SourceGenerator.h>
 #include <AK/StringBuilder.h>
-#include <LibCore/File.h>
+#include <LibMain/Main.h>
 
-int main(int argc, char** argv)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
-    if (argc != 2) {
-        warnln("usage: {} <path/to/CSS/Properties.json>", argv[0]);
+    if (arguments.argc != 2) {
+        warnln("usage: {} <path/to/CSS/Properties.json>", 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<Web::CSS::PropertyID> : public GenericTraits<Web::CSS::PropertyID>
 )~~~");
 
     outln("{}", generator.as_string_view());
+    return 0;
 }