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

Nullable token in statement

Browse Source
This commit is contained in:
Rafał Grodziński
2025-06-01 11:43:49 +09:00
parent 265ce4c94d
commit 23dedf2eff
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Parser.cpp
View File

@@ -10,7 +10,7 @@ vector<shared_ptr<Statement>> Parser::getStatements() {
shared_ptr<Statement> statement = nextStatement();
// Abort parsing if we got an error
if (!statement->isValid()) {
cerr << "Unexpected token '" << statement->getToken().getLexme() << "' at " << statement->getToken().getLine() << ":" << statement->getToken().getColumn() << endl;
cerr << "Unexpected token '" << statement->getToken()->getLexme() << "' at " << statement->getToken()->getLine() << ":" << statement->getToken()->getColumn() << endl;
return vector<shared_ptr<Statement>>();
}
statements.push_back(statement);
@@ -33,7 +33,7 @@ shared_ptr<Statement> Parser::nextStatement() {
}
shared_ptr<Statement> Parser::matchInvalidStatement() {
return make_shared<Statement>(Statement::Kind::INVALID, tokens.at(currentIndex), nullptr);
return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), nullptr);
}
//
@@ -42,9 +42,9 @@ shared_ptr<Statement> Parser::matchInvalidStatement() {
shared_ptr<Statement> Parser::matchExpressionStatement() {
shared_ptr<Expression> expression = term();
if (expression->isValid()) {
return make_shared<Statement>(Statement::Kind::EXPRESSION, tokens.at(currentIndex), expression);
return make_shared<Statement>(Statement::Kind::EXPRESSION, nullptr, expression);
} else {
return make_shared<Statement>(Statement::Kind::INVALID, tokens.at(currentIndex), expression);
return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), expression);
}
}