RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 22:38:13 +00:00
Code Issues Activity Actions

LibCpp: Handle class access-specifiers in the Parser

Browse source 
We can now handle access-specifier tags (for example 'private:') when
parsing class declarations.

We currently only consume these tags on move on. We'll need to add some
logic that accounts for the access level of symbols down the road.
This commit is contained in:
Itamar 2021-06-06 21:30:53 +03:00 • committed by Andreas Kling
parent dcdb0c7035
commit fd851ec5c9
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -656,6 +656,7 @@ bool Parser::match_class_declaration()
if (!match_keyword("struct") && !match_keyword("class"))
return false;
consume(Token::Type::Keyword);
if (!match(Token::Type::Identifier))
@ -1439,6 +1440,8 @@ NonnullRefPtrVector<Declaration> Parser::parse_class_members(ASTNode& parent)
{
NonnullRefPtrVector<Declaration> members;
while (!eof() && peek().type() != Token::Type::RightCurly) {
if (match_access_specifier())
consume_access_specifier(); // FIXME: Do not ignore access specifiers
auto member_type = match_class_member();
if (member_type.has_value()) {
members.append(parse_declaration(parent, member_type.value()));
@ -1450,4 +1453,18 @@ NonnullRefPtrVector<Declaration> Parser::parse_class_members(ASTNode& parent)
return members;
}
bool Parser::match_access_specifier()
{
if (peek(1).type() != Token::Type::Colon)
return false;
return match_keyword("private") || match_keyword("protected") || match_keyword("public");
}
void Parser::consume_access_specifier()
{
consume(Token::Type::Keyword);
consume(Token::Type::Colon);
}
}

2
Userland/Libraries/LibCpp/Parser.h
View file

@ -75,6 +75,7 @@ private:
bool match_sizeof_expression();
bool match_braced_init_list();
bool match_type();
bool match_access_specifier();
Optional<NonnullRefPtrVector<Parameter>> parse_parameter_list(ASTNode& parent);
Optional<Token> consume_whitespace();
@ -162,6 +163,7 @@ private:
bool match_attribute_specification();
void consume_attribute_specification();
void consume_access_specifier();
bool match_ellipsis();
void initialize_program_tokens(const StringView& program);
void add_tokens_for_preprocessor(Token& replaced_token, Preprocessor::DefinedValue&);