Ver código fonte

Shell: Use default constructors/destructors

https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#cother-other-default-operation-rules

"The compiler is more likely to get the default semantics right and
you cannot implement these functions better than the compiler."
Lenny Maiorani 3 anos atrás
pai
commit
dd05934539

+ 0 - 32
Userland/Shell/AST.cpp

@@ -408,10 +408,6 @@ Vector<Line::CompletionSuggestion> Node::complete_for_editor(Shell& shell, size_
     return Node::complete_for_editor(shell, offset, { nullptr, nullptr, nullptr });
 }
 
-Node::~Node()
-{
-}
-
 void And::dump(int level) const
 {
     Node::dump(level);
@@ -463,10 +459,6 @@ And::And(Position position, NonnullRefPtr<Node> left, NonnullRefPtr<Node> right,
         set_is_syntax_error(m_right->syntax_error_node());
 }
 
-And::~And()
-{
-}
-
 void ListConcatenate::dump(int level) const
 {
     Node::dump(level);
@@ -580,10 +572,6 @@ ListConcatenate::ListConcatenate(Position position, Vector<NonnullRefPtr<Node>>
     }
 }
 
-ListConcatenate::~ListConcatenate()
-{
-}
-
 void Background::dump(int level) const
 {
     Node::dump(level);
@@ -617,10 +605,6 @@ Background::Background(Position position, NonnullRefPtr<Node> command)
         set_is_syntax_error(m_command->syntax_error_node());
 }
 
-Background::~Background()
-{
-}
-
 void BarewordLiteral::dump(int level) const
 {
     Node::dump(level);
@@ -673,10 +657,6 @@ BarewordLiteral::BarewordLiteral(Position position, String text)
 {
 }
 
-BarewordLiteral::~BarewordLiteral()
-{
-}
-
 void BraceExpansion::dump(int level) const
 {
     Node::dump(level);
@@ -732,10 +712,6 @@ BraceExpansion::BraceExpansion(Position position, NonnullRefPtrVector<Node> entr
     }
 }
 
-BraceExpansion::~BraceExpansion()
-{
-}
-
 void CastToCommand::dump(int level) const
 {
     Node::dump(level);
@@ -799,10 +775,6 @@ CastToCommand::CastToCommand(Position position, NonnullRefPtr<Node> inner)
         set_is_syntax_error(m_inner->syntax_error_node());
 }
 
-CastToCommand::~CastToCommand()
-{
-}
-
 void CastToList::dump(int level) const
 {
     Node::dump(level);
@@ -865,10 +837,6 @@ CastToList::CastToList(Position position, RefPtr<Node> inner)
         set_is_syntax_error(m_inner->syntax_error_node());
 }
 
-CastToList::~CastToList()
-{
-}
-
 void CloseFdRedirection::dump(int level) const
 {
     Node::dump(level);

+ 9 - 9
Userland/Shell/AST.h

@@ -420,7 +420,7 @@ public:
     }
     virtual String class_name() const { return "Node"; }
     Node(Position);
-    virtual ~Node();
+    virtual ~Node() = default;
 
     virtual bool is_bareword() const { return false; }
     virtual bool is_command() const { return false; }
@@ -531,7 +531,7 @@ protected:
 class And final : public Node {
 public:
     And(Position, NonnullRefPtr<Node>, NonnullRefPtr<Node>, Position and_position);
-    virtual ~And();
+    virtual ~And() = default;
     virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }
 
     const NonnullRefPtr<Node>& left() const { return m_left; }
@@ -553,7 +553,7 @@ private:
 class ListConcatenate final : public Node {
 public:
     ListConcatenate(Position, Vector<NonnullRefPtr<Node>>);
-    virtual ~ListConcatenate();
+    virtual ~ListConcatenate() = default;
     virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }
     const Vector<NonnullRefPtr<Node>> list() const { return m_list; }
 
@@ -573,7 +573,7 @@ private:
 class Background final : public Node {
 public:
     Background(Position, NonnullRefPtr<Node>);
-    virtual ~Background();
+    virtual ~Background() = default;
     virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }
 
     const NonnullRefPtr<Node>& command() const { return m_command; }
@@ -591,7 +591,7 @@ private:
 class BarewordLiteral final : public Node {
 public:
     BarewordLiteral(Position, String);
-    virtual ~BarewordLiteral();
+    virtual ~BarewordLiteral() = default;
     virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }
 
     const String& text() const { return m_text; }
@@ -610,7 +610,7 @@ private:
 class BraceExpansion final : public Node {
 public:
     BraceExpansion(Position, NonnullRefPtrVector<Node>);
-    virtual ~BraceExpansion();
+    virtual ~BraceExpansion() = default;
     virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }
 
     const NonnullRefPtrVector<Node>& entries() const { return m_entries; }
@@ -628,7 +628,7 @@ private:
 class CastToCommand final : public Node {
 public:
     CastToCommand(Position, NonnullRefPtr<Node>);
-    virtual ~CastToCommand();
+    virtual ~CastToCommand() = default;
     virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }
 
     const NonnullRefPtr<Node>& inner() const { return m_inner; }
@@ -650,7 +650,7 @@ private:
 class CastToList final : public Node {
 public:
     CastToList(Position, RefPtr<Node>);
-    virtual ~CastToList();
+    virtual ~CastToList() = default;
     virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }
 
     const RefPtr<Node>& inner() const { return m_inner; }
@@ -733,7 +733,7 @@ public:
         , m_kind(kind)
     {
     }
-    virtual ~ContinuationControl() { }
+    virtual ~ContinuationControl() = default;
     virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }
 
     ContinuationKind continuation_kind() const { return m_kind; }

+ 1 - 1
Userland/Shell/Execution.h

@@ -17,7 +17,7 @@ namespace Shell {
 
 class FileDescriptionCollector {
 public:
-    FileDescriptionCollector() { }
+    FileDescriptionCollector() = default;
     ~FileDescriptionCollector();
 
     void collect();

+ 0 - 4
Userland/Shell/SyntaxHighlighter.cpp

@@ -581,8 +581,4 @@ bool SyntaxHighlighter::token_types_equal(u64 token0, u64 token1) const
     return token0 == token1;
 }
 
-SyntaxHighlighter::~SyntaxHighlighter()
-{
-}
-
 }

+ 2 - 2
Userland/Shell/SyntaxHighlighter.h

@@ -12,8 +12,8 @@ namespace Shell {
 
 class SyntaxHighlighter : public Syntax::Highlighter {
 public:
-    SyntaxHighlighter() { }
-    virtual ~SyntaxHighlighter() override;
+    SyntaxHighlighter() = default;
+    virtual ~SyntaxHighlighter() override = default;
 
     virtual bool is_identifier(u64) const override;
     virtual bool is_navigatable(u64) const override;