RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 14:17:36 +00:00
Code Issues Activity Actions

LibCpp: Add support for parsing function types

Browse source 
This makes it work with types like `Function<T(U, V)>`.
This commit is contained in:
Ali Mohammad Pur 2021-07-28 06:04:51 +04:30 • committed by Andreas Kling
parent b3cbe14569
commit 5f66874ea0
3 changed files with 66 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Userland/Libraries/LibCpp/AST.cpp
View file

@ -113,6 +113,27 @@ String Reference::to_string() const
return builder.to_string();
}
String FunctionType::to_string() const
{
StringBuilder builder;
builder.append(m_return_type->to_string());
builder.append("(");
bool first = true;
for (auto& parameter : m_parameters) {
if (first)
first = false;
else
builder.append(", ");
builder.append(parameter.type()->to_string());
if (!parameter.name().is_empty()) {
builder.append(" ");
builder.append(parameter.name());
}
}
builder.append(")");
return builder.to_string();
}
void Parameter::dump(FILE* output, size_t indent) const
{
ASTNode::dump(output, indent);
@ -382,6 +403,19 @@ void Reference::dump(FILE* output, size_t indent) const
}
}
void FunctionType::dump(FILE* output, size_t indent) const
{
ASTNode::dump(output, indent);
if (m_return_type)
m_return_type->dump(output, indent + 1);
print_indent(output, indent + 1);
outln("(");
for (auto& parameter : m_parameters)
parameter.dump(output, indent + 2);
print_indent(output, indent + 1);
outln(")");
}
void MemberExpression::dump(FILE* output, size_t indent) const
{
ASTNode::dump(output, indent);

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

@ -308,6 +308,26 @@ private:
Kind m_kind;
};
class FunctionType : public Type {
public:
virtual ~FunctionType() override = default;
virtual const char* class_name() const override { return "FunctionType"; }
virtual void dump(FILE* = stdout, size_t indent = 0) const override;
virtual String to_string() const override;
FunctionType(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename)
: Type(parent, start, end, filename)
{
}
void set_return_type(Type& type) { m_return_type = type; }
void set_parameters(NonnullRefPtrVector<Parameter> parameters) { m_parameters = move(parameters); }
private:
RefPtr<Type> m_return_type;
NonnullRefPtrVector<Parameter> m_parameters;
};
class FunctionDefinition : public ASTNode {
public:
virtual ~FunctionDefinition() override = default;

12
Userland/Libraries/LibCpp/Parser.cpp
View file

@ -1255,7 +1255,19 @@ NonnullRefPtr<Type> Parser::parse_type(ASTNode& parent)
type = ref;
}
if (peek().type() == Token::Type::LeftParen) {
consume();
auto fn_type = create_ast_node<FunctionType>(parent, type->start(), position());
fn_type->set_return_type(*type);
type->set_parent(*fn_type);
if (auto parameters = parse_parameter_list(*type); parameters.has_value())
fn_type->set_parameters(parameters.release_value());
consume(Token::Type::RightParen);
type = fn_type;
}
type->set_end(position());
return type;
}