RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:57:35 +00:00
Code Issues Activity Actions

Shell: Use NonnullRefPtr to simplify some things in the parser/AST

Browse source
This commit is contained in:
Andreas Kling 2020-08-04 18:16:37 +02:00
parent 7a3ab6c517
commit 3cb8ae873c
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Shell/AST.h
View file

@ -78,7 +78,7 @@ struct Rewiring : public RefCounted<Rewiring> {
};
struct Redirection : public RefCounted<Redirection> {
virtual Result<RefPtr<Rewiring>, String> apply() const = 0;
virtual Result<NonnullRefPtr<Rewiring>, String> apply() const = 0;
virtual ~Redirection();
virtual bool is_path_redirection() const { return false; }
virtual bool is_fd_redirection() const { return false; }
@ -88,7 +88,7 @@ struct Redirection : public RefCounted<Redirection> {
struct CloseRedirection : public Redirection {
int fd { -1 };
virtual Result<RefPtr<Rewiring>, String> apply() const override;
virtual Result<NonnullRefPtr<Rewiring>, String> apply() const override;
virtual ~CloseRedirection();
CloseRedirection(int fd)
: fd(fd)
@ -109,7 +109,7 @@ struct PathRedirection : public Redirection {
ReadWrite,
} direction { Read };
virtual Result<RefPtr<Rewiring>, String> apply() const override;
virtual Result<NonnullRefPtr<Rewiring>, String> apply() const override;
virtual ~PathRedirection();
PathRedirection(String path, int fd, decltype(direction) direction)
: path(move(path))
@ -123,9 +123,9 @@ private:
};
struct FdRedirection : public Redirection {
virtual Result<RefPtr<Rewiring>, String> apply() const override
virtual Result<NonnullRefPtr<Rewiring>, String> apply() const override
{
return RefPtr<Rewiring>(adopt(*new Rewiring(source_fd, dest_fd, other_pipe_end, action)));
return adopt(*new Rewiring(source_fd, dest_fd, other_pipe_end, action));
}
virtual ~FdRedirection();
FdRedirection(int source, int dest, Rewiring::Close close)