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

LibCpp: Generalize ASTNode::dump() to support redirecting its output

Browse source 
Previously, ASTNode::dump() used outln() for output, which meant it
always wrote its output to stdout.

After this commit, ASTNode::dump() receives an 'output' argument (which
is stdout by default). This enables writing the output to somewhere
else.

This will be useful for testing the LibCpp Parser with the output of
ASTNode::dump.
This commit is contained in:
Itamar 2021-05-17 13:04:15 +03:00 • committed by Andreas Kling
parent 463a91c4a2
commit 402483ec1f
4 changed files with 194 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Userland/Libraries/LibCpp/AST.h
View file

@ -29,7 +29,7 @@ class ASTNode : public RefCounted<ASTNode> {
public:
virtual ~ASTNode() = default;
virtual const char* class_name() const = 0;
virtual void dump(size_t indent) const;
virtual void dump(FILE* = stdout, size_t indent = 0) const;
ASTNode* parent() const { return m_parent; }
Position start() const
@ -81,7 +81,7 @@ class TranslationUnit : public ASTNode {
public:
virtual ~TranslationUnit() override = default;
virtual const char* class_name() const override { return "TranslationUnit"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual NonnullRefPtrVector<Declaration> declarations() const override { return m_declarations; }
TranslationUnit(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
@ -144,7 +144,7 @@ class FunctionDeclaration : public Declaration {
public:
virtual ~FunctionDeclaration() override = default;
virtual const char* class_name() const override { return "FunctionDeclaration"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual bool is_function() const override { return true; }
RefPtr<FunctionDefinition> definition() { return m_definition; }
@ -179,7 +179,7 @@ class Parameter : public VariableOrParameterDeclaration {
public:
virtual ~Parameter() override = default;
virtual const char* class_name() const override { return "Parameter"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
Parameter(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename, StringView name)
: VariableOrParameterDeclaration(parent, start, end, filename)
@ -196,7 +196,7 @@ class Type : public ASTNode {
public:
virtual ~Type() override = default;
virtual const char* class_name() const override { return "Type"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual bool is_type() const override { return true; }
virtual bool is_templatized() const { return false; }
virtual String to_string() const;
@ -215,7 +215,7 @@ class Pointer : public Type {
public:
virtual ~Pointer() override = default;
virtual const char* class_name() const override { return "Pointer"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual String to_string() const override;
Pointer(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
@ -231,7 +231,7 @@ public:
virtual ~FunctionDefinition() override = default;
virtual const char* class_name() const override { return "FunctionDefinition"; }
NonnullRefPtrVector<Statement>& statements() { return m_statements; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
FunctionDefinition(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
: ASTNode(parent, start, end, filename)
@ -279,7 +279,7 @@ class VariableDeclaration : public VariableOrParameterDeclaration {
public:
virtual ~VariableDeclaration() override = default;
virtual const char* class_name() const override { return "VariableDeclaration"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
VariableDeclaration(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
: VariableOrParameterDeclaration(parent, start, end, filename)
@ -295,7 +295,7 @@ class Identifier : public Expression {
public:
virtual ~Identifier() override = default;
virtual const char* class_name() const override { return "Identifier"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
Identifier(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename, StringView name)
: Expression(parent, start, end, filename)
@ -316,7 +316,7 @@ class Name : public Expression {
public:
virtual ~Name() override = default;
virtual const char* class_name() const override { return "Name"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual bool is_name() const override { return true; }
virtual bool is_templatized() const { return false; }
@ -349,7 +349,7 @@ class NumericLiteral : public Expression {
public:
virtual ~NumericLiteral() override = default;
virtual const char* class_name() const override { return "NumricLiteral"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
NumericLiteral(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename, StringView value)
: Expression(parent, start, end, filename)
@ -364,7 +364,7 @@ class NullPointerLiteral : public Expression {
public:
virtual ~NullPointerLiteral() override = default;
virtual const char* class_name() const override { return "NullPointerLiteral"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
NullPointerLiteral(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
: Expression(parent, start, end, filename)
@ -376,7 +376,7 @@ class BooleanLiteral : public Expression {
public:
virtual ~BooleanLiteral() override = default;
virtual const char* class_name() const override { return "BooleanLiteral"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
BooleanLiteral(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename, bool value)
: Expression(parent, start, end, filename)
@ -418,7 +418,7 @@ public:
virtual ~BinaryExpression() override = default;
virtual const char* class_name() const override { return "BinaryExpression"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
BinaryOp m_op;
RefPtr<Expression> m_lhs;
@ -440,7 +440,7 @@ public:
virtual ~AssignmentExpression() override = default;
virtual const char* class_name() const override { return "AssignmentExpression"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
AssignmentOp m_op;
RefPtr<Expression> m_lhs;
@ -456,7 +456,7 @@ public:
virtual ~FunctionCall() override = default;
virtual const char* class_name() const override { return "FunctionCall"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual bool is_function_call() const override { return true; }
virtual bool is_templatized() const { return false; }
@ -473,7 +473,7 @@ public:
~StringLiteral() override = default;
virtual const char* class_name() const override { return "StringLiteral"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
String m_value;
};
@ -487,7 +487,7 @@ public:
: Statement(parent, start, end, filename)
{
}
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
RefPtr<Expression> m_value;
};
@ -496,7 +496,7 @@ class EnumDeclaration : public Declaration {
public:
virtual ~EnumDeclaration() override = default;
virtual const char* class_name() const override { return "EnumDeclaration"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
EnumDeclaration(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
: Declaration(parent, start, end, filename)
@ -510,7 +510,7 @@ class MemberDeclaration : public Declaration {
public:
virtual ~MemberDeclaration() override = default;
virtual const char* class_name() const override { return "MemberDeclaration"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual bool is_member() const override { return true; }
MemberDeclaration(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
@ -526,7 +526,7 @@ class StructOrClassDeclaration : public Declaration {
public:
virtual ~StructOrClassDeclaration() override = default;
virtual const char* class_name() const override { return "StructOrClassDeclaration"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual bool is_struct_or_class() const override { return true; }
virtual bool is_struct() const override { return m_type == Type::Struct; }
virtual bool is_class() const override { return m_type == Type::Class; }
@ -566,7 +566,7 @@ public:
virtual ~UnaryExpression() override = default;
virtual const char* class_name() const override { return "UnaryExpression"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
UnaryOp m_op;
RefPtr<Expression> m_lhs;
@ -581,7 +581,7 @@ public:
virtual ~MemberExpression() override = default;
virtual const char* class_name() const override { return "MemberExpression"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual bool is_member_expression() const override { return true; }
RefPtr<Expression> m_object;
@ -597,7 +597,7 @@ public:
virtual ~ForStatement() override = default;
virtual const char* class_name() const override { return "ForStatement"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual NonnullRefPtrVector<Declaration> declarations() const override;
@ -616,7 +616,7 @@ public:
virtual ~BlockStatement() override = default;
virtual const char* class_name() const override { return "BlockStatement"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual NonnullRefPtrVector<Declaration> declarations() const override;
@ -643,7 +643,7 @@ public:
virtual ~IfStatement() override = default;
virtual const char* class_name() const override { return "IfStatement"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual NonnullRefPtrVector<Declaration> declarations() const override;
RefPtr<Expression> m_predicate;
@ -655,7 +655,7 @@ class NamespaceDeclaration : public Declaration {
public:
virtual ~NamespaceDeclaration() override = default;
virtual const char* class_name() const override { return "NamespaceDeclaration"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual bool is_namespace() const override { return true; }
NamespaceDeclaration(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
@ -677,7 +677,7 @@ public:
virtual ~CppCastExpression() override = default;
virtual const char* class_name() const override { return "CppCastExpression"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
StringView m_cast_type;
RefPtr<Type> m_type;
@ -693,7 +693,7 @@ public:
virtual ~CStyleCastExpression() override = default;
virtual const char* class_name() const override { return "CStyleCastExpression"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
RefPtr<Type> m_type;
RefPtr<Expression> m_expression;
@ -708,7 +708,7 @@ public:
virtual ~SizeofExpression() override = default;
virtual const char* class_name() const override { return "SizeofExpression"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
RefPtr<Type> m_type;
};
@ -722,7 +722,7 @@ public:
virtual ~BracedInitList() override = default;
virtual const char* class_name() const override { return "BracedInitList"; }
virtual void dump(size_t indent) const override;
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
NonnullRefPtrVector<Expression> m_expressions;
};
@ -735,6 +735,6 @@ public:
}
virtual bool is_dummy_node() const override { return true; }
virtual const char* class_name() const override { return "DummyAstNode"; }
virtual void dump(size_t) const override { }
virtual void dump(FILE* = stdout, size_t = 0) const override { }
};
}