Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-11 18:20:43 +09:00
Code Activity

Shell: Convert builtins to use the modern main() style

Browse source 
That is, return ErrorOr<int>, handle fallible ops with TRY() and accept
a Main::Arguments.
Note that we do not populate the argc/argv members of Main::Arguments,
so all accesses have to go through .strings.
This commit is contained in:
Ali Mohammad Pur 2023-02-18 12:30:17 +03:30 • committed by Ali Mohammad Pur
parent 6e5ba82929
commit 007767fc14
Notes: sideshowbarker 2024-07-16 23:38:27 +09:00
3 changed files with 175 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Shell/Shell.h
View file

@ -21,6 +21,7 @@
#include <LibCore/Notifier.h>
#include <LibCore/Object.h>
#include <LibLine/Editor.h>
#include <LibMain/Main.h>
#include <termios.h>
#define ENUMERATE_SHELL_BUILTINS() \
@ -153,7 +154,7 @@ public:
ErrorOr<RefPtr<Job>> run_command(const AST::Command&);
NonnullRefPtrVector<Job> run_commands(Vector<AST::Command>&);
bool run_file(DeprecatedString const&, bool explicitly_invoked = true);
bool run_builtin(const AST::Command&, NonnullRefPtrVector<AST::Rewiring> const&, int& retval);
ErrorOr<bool> run_builtin(const AST::Command&, NonnullRefPtrVector<AST::Rewiring> const&, int& retval);
bool has_builtin(StringView) const;
RefPtr<AST::Node> run_immediate_function(StringView name, AST::ImmediateExpression& invoking_node, NonnullRefPtrVector<AST::Node> const&);
static bool has_immediate_function(StringView);
@ -417,6 +418,7 @@ private:
void run_tail(const AST::Command&, const AST::NodeWithAction&, int head_exit_code);
[[noreturn]] void execute_process(Vector<char const*>&& argv);
ErrorOr<void> execute_process(Span<StringView> argv);
virtual void custom_event(Core::CustomEvent&) override;
@ -430,7 +432,7 @@ private:
RefPtr<AST::Node> immediate_length_impl(AST::ImmediateExpression& invoking_node, NonnullRefPtrVector<AST::Node> const&, bool across);
#define __ENUMERATE_SHELL_BUILTIN(builtin) \
int builtin_##builtin(int argc, char const** argv);
ErrorOr<int> builtin_##builtin(Main::Arguments);
ENUMERATE_SHELL_BUILTINS();