Added grouping
This commit is contained in:
@@ -33,7 +33,9 @@ shared_ptr<Expression> Parser::primary() {
|
||||
do {
|
||||
if((expression = matchInteger()) != Expression::Invalid)
|
||||
break;
|
||||
|
||||
|
||||
if((expression = matchGrouping()) != Expression::Invalid)
|
||||
break;
|
||||
} while(false);
|
||||
|
||||
return expression;
|
||||
@@ -49,6 +51,20 @@ shared_ptr<Expression> Parser::matchInteger() {
|
||||
return Expression::Invalid;
|
||||
}
|
||||
|
||||
shared_ptr<Expression> Parser::matchGrouping() {
|
||||
Token token = tokens.at(currentIndex);
|
||||
if (token.getKind() == Token::Kind::LEFT_PAREN) {
|
||||
currentIndex++;
|
||||
shared_ptr<Expression> expression = term();
|
||||
if (tokens.at(currentIndex).getKind() == Token::Kind::RIGHT_PAREN) {
|
||||
currentIndex++;
|
||||
return make_shared<Expression>(Expression::Kind::GROUPING, token, expression, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
return Expression::Invalid;
|
||||
}
|
||||
|
||||
shared_ptr<Expression> Parser::matchBinary(shared_ptr<Expression> left) {
|
||||
Token token = tokens.at(currentIndex);
|
||||
if (token.isOneOf({Token::Kind::PLUS, Token::Kind::MINUS, Token::Kind::STAR, Token::Kind::SLASH, Token::Kind::PERCENT})) {
|
||||
|
||||
Reference in New Issue
Block a user