0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-11 17:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Utilities: Port cpp utilities to Core::Stream

Browse source
This commit is contained in:
Sam Atkins 2022-09-14 11:24:13 +01:00 committed by Linus Groh
parent 39a4f1560b
commit 05c3b48e63
Notes: sideshowbarker 2024-07-18 05:37:06 +09:00 
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
3 changed files with 20 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Userland/Utilities/cpp-lexer.cpp
View file

@ -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);
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("Failed to open {}: {}", path, file->error_string());
exit(1);
}
auto content = file->read_all();
auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read));
auto content = TRY(file->read_all());
StringView content_view(content);
Cpp::Lexer lexer(content);

18
Userland/Utilities/cpp-parser.cpp
View file

@ -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)
path = "Source/little/main.cpp";
auto file = Core::File::construct(path);
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("Failed to open {}: {}", path, file->error_string());
exit(1);
}
auto content = file->read_all();
if (path.is_empty())
path = "Source/little/main.cpp"sv;
auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read));
auto content = TRY(file->read_all());
StringView content_view(content);
::Cpp::Preprocessor processor(path, content_view);

17
Userland/Utilities/cpp-preprocessor.cpp
View file

@ -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)) {
warnln("Failed to open {}: {}", path, file->error_string());
exit(1);
}
auto content = file->read_all();
auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read));
auto content = TRY(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