Shell: Add create() factory function for PathRedirection

lanmonster · Aug 12, 2020 · 85b02d8 · 85b02d8
1 parent e8d6653
commit 85b02d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Shell/AST.cpp b/Shell/AST.cpp
@@ -1261,7 +1261,7 @@ RefPtr<Value> ReadRedirection::run(RefPtr<Shell> shell)
  StringBuilder builder;
  builder.join(" ", path_segments);
 
- command.redirections.append(adopt(*new PathRedirection(builder.to_string(), m_fd, PathRedirection::Read)));
+ command.redirections.append(PathRedirection::create(builder.to_string(), m_fd, PathRedirection::Read));
  return create<CommandValue>(move(command));
 }
 
@@ -1288,7 +1288,7 @@ RefPtr<Value> ReadWriteRedirection::run(RefPtr<Shell> shell)
  StringBuilder builder;
  builder.join(" ", path_segments);
 
- command.redirections.append(adopt(*new PathRedirection(builder.to_string(), m_fd, PathRedirection::ReadWrite)));
+ command.redirections.append(PathRedirection::create(builder.to_string(), m_fd, PathRedirection::ReadWrite));
  return create<CommandValue>(move(command));
 }
 
@@ -1781,7 +1781,7 @@ RefPtr<Value> WriteAppendRedirection::run(RefPtr<Shell> shell)
  StringBuilder builder;
  builder.join(" ", path_segments);
 
- command.redirections.append(adopt(*new PathRedirection(builder.to_string(), m_fd, PathRedirection::WriteAppend)));
+ command.redirections.append(PathRedirection::create(builder.to_string(), m_fd, PathRedirection::WriteAppend));
  return create<CommandValue>(move(command));
 }
 
@@ -1808,7 +1808,7 @@ RefPtr<Value> WriteRedirection::run(RefPtr<Shell> shell)
  StringBuilder builder;
  builder.join(" ", path_segments);
 
- command.redirections.append(adopt(*new PathRedirection(builder.to_string(), m_fd, PathRedirection::Write)));
+ command.redirections.append(PathRedirection::create(builder.to_string(), m_fd, PathRedirection::Write));
  return create<CommandValue>(move(command));
 }
 

diff --git a/Shell/AST.h b/Shell/AST.h
@@ -109,16 +109,22 @@ struct PathRedirection : public Redirection {
  ReadWrite,
  } direction { Read };
 
+ static NonnullRefPtr<PathRedirection> create(String path, int fd, decltype(direction) direction)
+ {
+ return adopt(*new PathRedirection(move(path), fd, direction));
+ }
+
  virtual Result<NonnullRefPtr<Rewiring>, String> apply() const override;
  virtual ~PathRedirection();
+
+private:
  PathRedirection(String path, int fd, decltype(direction) direction)
  : path(move(path))
  , fd(fd)
  , direction(direction)
  {
  }
 
-private:
  virtual bool is_path_redirection() const override { return true; }
 };