CarGDev/bits-runner-builder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One expression per line

Browse Source
This commit is contained in:
Rafał Grodziński
2025-06-01 12:06:37 +09:00
parent 23dedf2eff
commit 16439e2fb2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Parser.cpp
View File

@@ -41,7 +41,8 @@ shared_ptr<Statement> Parser::matchInvalidStatement() {
// //
shared_ptr<Statement> Parser::matchExpressionStatement() { shared_ptr<Statement> Parser::matchExpressionStatement() {
shared_ptr<Expression> expression = term(); shared_ptr<Expression> expression = term();
if (expression->isValid()) { if (expression->isValid() && tokens.at(currentIndex).isOfKind({Token::Kind::NEW_LINE, Token::Kind::END})) {
currentIndex++;
return make_shared<Statement>(Statement::Kind::EXPRESSION, nullptr, expression); return make_shared<Statement>(Statement::Kind::EXPRESSION, nullptr, expression);
} else { } else {
return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), expression); return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), expression);
@@ -50,6 +51,8 @@ shared_ptr<Statement> Parser::matchExpressionStatement() {
shared_ptr<Expression> Parser::term() { shared_ptr<Expression> Parser::term() {
shared_ptr<Expression> expression = factor(); shared_ptr<Expression> expression = factor();
if (!expression->isValid())
return expression;
while (tokens.at(currentIndex).isOfKind({Token::Kind::PLUS, Token::Kind::MINUS})) { while (tokens.at(currentIndex).isOfKind({Token::Kind::PLUS, Token::Kind::MINUS})) {
expression = matchBinary(expression); expression = matchBinary(expression);
@@ -60,6 +63,8 @@ shared_ptr<Expression> Parser::term() {
shared_ptr<Expression> Parser::factor() { shared_ptr<Expression> Parser::factor() {
shared_ptr<Expression> expression = primary(); shared_ptr<Expression> expression = primary();
if (!expression->isValid())
return expression;
while (tokens.at(currentIndex).isOfKind({Token::Kind::STAR, Token::Kind::SLASH, Token::Kind::PERCENT})) { while (tokens.at(currentIndex).isOfKind({Token::Kind::STAR, Token::Kind::SLASH, Token::Kind::PERCENT})) {
expression = matchBinary(expression); expression = matchBinary(expression);