Skip to content

Commit

Permalink
Shell: Use default constructors/destructors
Browse files Browse the repository at this point in the history
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."
  • Loading branch information
ldm5180 authored and bgianfo committed Mar 25, 2022
1 parent 0b7baa7 commit dd05934
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 48 deletions.
32 changes: 0 additions & 32 deletions Userland/Shell/AST.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -580,10 +572,6 @@ ListConcatenate::ListConcatenate(Position position, Vector<NonnullRefPtr<Node>>
}
}

ListConcatenate::~ListConcatenate()
{
}

void Background::dump(int level) const
{
Node::dump(level);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -673,10 +657,6 @@ BarewordLiteral::BarewordLiteral(Position position, String text)
{
}

BarewordLiteral::~BarewordLiteral()
{
}

void BraceExpansion::dump(int level) const
{
Node::dump(level);
Expand Down Expand Up @@ -732,10 +712,6 @@ BraceExpansion::BraceExpansion(Position position, NonnullRefPtrVector<Node> entr
}
}

BraceExpansion::~BraceExpansion()
{
}

void CastToCommand::dump(int level) const
{
Node::dump(level);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
18 changes: 9 additions & 9 deletions Userland/Shell/AST.h
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ class Node : public RefCounted<Node> {
}
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; }
Expand Down Expand Up @@ -531,7 +531,7 @@ class PathRedirectionNode : public Node {
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; }
Expand All @@ -553,7 +553,7 @@ class And final : public Node {
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; }

Expand All @@ -573,7 +573,7 @@ class ListConcatenate final : public Node {
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; }
Expand All @@ -591,7 +591,7 @@ class Background final : public Node {
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; }
Expand All @@ -610,7 +610,7 @@ class BarewordLiteral final : public Node {
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; }
Expand All @@ -628,7 +628,7 @@ class BraceExpansion final : public Node {
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; }
Expand All @@ -650,7 +650,7 @@ class CastToCommand final : public Node {
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; }
Expand Down Expand Up @@ -733,7 +733,7 @@ class ContinuationControl final : public Node {
, m_kind(kind)
{
}
virtual ~ContinuationControl() { }
virtual ~ContinuationControl() = default;
virtual void visit(NodeVisitor& visitor) override { visitor.visit(this); }

ContinuationKind continuation_kind() const { return m_kind; }
Expand Down
2 changes: 1 addition & 1 deletion Userland/Shell/Execution.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Shell {

class FileDescriptionCollector {
public:
FileDescriptionCollector() { }
FileDescriptionCollector() = default;
~FileDescriptionCollector();

void collect();
Expand Down
4 changes: 0 additions & 4 deletions Userland/Shell/SyntaxHighlighter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,4 @@ bool SyntaxHighlighter::token_types_equal(u64 token0, u64 token1) const
return token0 == token1;
}

SyntaxHighlighter::~SyntaxHighlighter()
{
}

}
4 changes: 2 additions & 2 deletions Userland/Shell/SyntaxHighlighter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit dd05934

Please sign in to comment.