Utilities: Port cpp utilities to Core::Stream

Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/05c3b48e63
Pull-request: https://github.com/SerenityOS/serenity/pull/15244
Reviewed-by: https://github.com/davidot ✅
Reviewed-by: https://github.com/demostanis

Userland/Utilities/cpp-lexer.cpp

@@ -1,27 +1,24 @@
 /*
- * Copyright (c) 2021, the SerenityOS developers.
+ * Copyright (c) 2021-2022, the SerenityOS developers.
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <AK/Try.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/File.h>
+#include <LibCore/Stream.h>
 #include <LibCpp/Lexer.h>
 #include <LibMain/Main.h>
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
     Core::ArgsParser args_parser;
-    char const* path = nullptr;
+    StringView path;
     args_parser.add_positional_argument(path, "Cpp File", "cpp-file", Core::ArgsParser::Required::Yes);
     args_parser.parse(arguments);
 
-    auto file = Core::File::construct(path);
+    auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read));
-    if (!file->open(Core::OpenMode::ReadOnly)) {
+    auto content = TRY(file->read_all());
-        warnln("Failed to open {}: {}", path, file->error_string());
-        exit(1);
-    }
-    auto content = file->read_all();
     StringView content_view(content);
 
     Cpp::Lexer lexer(content);

Userland/Utilities/cpp-parser.cpp

@@ -1,31 +1,27 @@
 /*
- * Copyright (c) 2021, the SerenityOS developers.
+ * Copyright (c) 2021-2022, the SerenityOS developers.
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <LibCore/ArgsParser.h>
-#include <LibCore/File.h>
+#include <LibCore/Stream.h>
 #include <LibCpp/Parser.h>
 #include <LibMain/Main.h>
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
     Core::ArgsParser args_parser;
-    char const* path = nullptr;
+    StringView path;
     bool tokens_mode = false;
     args_parser.add_option(tokens_mode, "Print Tokens", "tokens", 'T');
     args_parser.add_positional_argument(path, "Cpp File", "cpp-file", Core::ArgsParser::Required::No);
     args_parser.parse(arguments);
 
-    if (!path)
+    if (path.is_empty())
-        path = "Source/little/main.cpp";
+        path = "Source/little/main.cpp"sv;
-    auto file = Core::File::construct(path);
+    auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read));
-    if (!file->open(Core::OpenMode::ReadOnly)) {
+    auto content = TRY(file->read_all());
-        warnln("Failed to open {}: {}", path, file->error_string());
-        exit(1);
-    }
-    auto content = file->read_all();
     StringView content_view(content);
 
     ::Cpp::Preprocessor processor(path, content_view);

Userland/Utilities/cpp-preprocessor.cpp

@@ -1,36 +1,33 @@
 /*
- * Copyright (c) 2021, the SerenityOS developers.
+ * Copyright (c) 2021-2022, the SerenityOS developers.
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <AK/LexicalPath.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/File.h>
+#include <LibCore/Stream.h>
 #include <LibCpp/Preprocessor.h>
 #include <LibMain/Main.h>
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
     Core::ArgsParser args_parser;
-    char const* path = nullptr;
+    StringView path;
     bool print_definitions = false;
     args_parser.add_positional_argument(path, "File", "file", Core::ArgsParser::Required::Yes);
     args_parser.add_option(print_definitions, "Print preprocessor definitions", "definitions", 'D');
     args_parser.parse(arguments);
-    auto file = Core::File::construct(path);
+
-    if (!file->open(Core::OpenMode::ReadOnly)) {
+    auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read));
-        warnln("Failed to open {}: {}", path, file->error_string());
+    auto content = TRY(file->read_all());
-        exit(1);
-    }
-    auto content = file->read_all();
     String name = LexicalPath::basename(path);
     Cpp::Preprocessor cpp(name, StringView { content });
     auto tokens = cpp.process_and_lex();
 
     if (print_definitions) {
         outln("Definitions:");
-        for (auto& definition : cpp.definitions()) {
+        for (auto const& definition : cpp.definitions()) {
             if (definition.value.parameters.is_empty())
                 outln("{}: {}", definition.key, definition.value.value);
             else