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

LibCpp: Parse empty for loops

Browse source
This commit is contained in:
Itamar 2021-04-02 11:02:14 +03:00 • committed by Andreas Kling
parent fc503b1368
commit d482b3fd60
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -394,8 +394,11 @@ NonnullRefPtrVector<Declaration> Statement::declarations() const
NonnullRefPtrVector<Declaration> ForStatement::declarations() const NonnullRefPtrVector<Declaration> ForStatement::declarations() const
{ {
auto declarations = m_init->declarations(); NonnullRefPtrVector<Declaration> declarations;
declarations.append(m_body->declarations()); if (m_init)
declarations.append(m_init->declarations());
if (m_body)
declarations.append(m_body->declarations());
return declarations; return declarations;
} }

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

@ -1204,13 +1204,20 @@ NonnullRefPtr<ForStatement> Parser::parse_for_statement(ASTNode& parent)
auto for_statement = create_ast_node<ForStatement>(parent, position(), {}); auto for_statement = create_ast_node<ForStatement>(parent, position(), {});
consume(Token::Type::Keyword); consume(Token::Type::Keyword);
consume(Token::Type::LeftParen); consume(Token::Type::LeftParen);
for_statement->m_init = parse_variable_declaration(*for_statement); if (peek().type() != Token::Type::Semicolon)
for_statement->m_init = parse_variable_declaration(*for_statement, false);
consume(Token::Type::Semicolon); consume(Token::Type::Semicolon);
for_statement->m_test = parse_expression(*for_statement);
if (peek().type() != Token::Type::Semicolon)
for_statement->m_test = parse_expression(*for_statement);
consume(Token::Type::Semicolon); consume(Token::Type::Semicolon);
for_statement->m_update = parse_expression(*for_statement);
if (peek().type() != Token::Type::RightParen)
for_statement->m_update = parse_expression(*for_statement);
consume(Token::Type::RightParen); consume(Token::Type::RightParen);
for_statement->m_body = parse_statement(*for_statement); for_statement->m_body = parse_statement(*for_statement);
for_statement->set_end(for_statement->m_body->end()); for_statement->set_end(for_statement->m_body->end());
return for_statement; return for_statement;
} }