Skip to content

Fix parser call statement handling #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Frityet merged 1 commit into from
Jun 4, 2025
Merged

Fix parser call statement handling #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions src/teal-parser/Parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,17 @@ std::optional<ast::Statement> Parser::parse_stat()
std::optional<UnionSlice<ast::AssignmentStatement, ast::CallStatement>> Parser::parse_assignment_or_call()
{
const Token &prefix_tk = peek_token();
auto prefix = parse_prefix_expression();
bool called = false;
auto prefix = parse_prefix_expression(&called);
if (not prefix) {
skip_to_next_statement();
return nullopt;
}
auto val = prefix.value();
if (check(TokenType::ASSIGN) or check(TokenType::COMMA)) {
if (val.is<ast::FunctionCallExpression>()) {
if (called) {
push_error(UnexpectedFunctionCall());
skip_to_next_statement();
// return nullopt;
prefix = make_node(NameExpression { .name = "ERROR" });
}

Expand All @@ -152,14 +152,14 @@ std::optional<UnionSlice<ast::AssignmentStatement, ast::CallStatement>> Parser::
push_error(ExpectedExpression(tk));
return assign;
} else {
// auto call_expression = dynamic_cast<FunctionCallExpression *>(prefix.get());
if (not val.is<ast::FunctionCallExpression>()) {
if (!called) {
push_error(UnexpectedExpression(prefix_tk));
skip_to_next_statement();
return nullopt;
}

return make_node(CallStatement { .call = val.get<ast::FunctionCallExpression>() });

auto call_expr = val.get_unsafe<ast::FunctionCallExpression>();
return make_node(CallStatement { .call = call_expr });
}

}
Expand Down Expand Up @@ -668,9 +668,10 @@ std::vector<ast::Expression> Parser::parse_expression_list()
return exprs;
}

std::optional<ast::PrefixExpression> Parser::parse_prefix_expression()
std::optional<ast::PrefixExpression> Parser::parse_prefix_expression(bool *is_call)
{
std::optional<ast::PrefixExpression> base;
bool called = false;
if (match(TokenType::L_PAREN)) {
base = parse_expression();
consume(TokenType::R_PAREN);
Expand Down Expand Up @@ -706,6 +707,7 @@ std::optional<ast::PrefixExpression> Parser::parse_prefix_expression()
push_error(ExpectedArguments());
// $push_error("expected arguments after method call");
}
called = true;
base = make_node(FunctionCallExpression {
.base = base.value(),
.method_name = method,
Expand All @@ -715,13 +717,15 @@ std::optional<ast::PrefixExpression> Parser::parse_prefix_expression()
auto args = std::vector<Expression>();
if (not check(TokenType::R_PAREN)) { args = parse_expression_list(); }
consume(TokenType::R_PAREN);
called = true;
base = make_node(FunctionCallExpression {
.base = base.value(),
.method_name = "",
.arguments = args
});
} else if (check(TokenType::L_BRACE)) {
auto table_arg = parse_table_constructor();
called = true;
base = make_node(FunctionCallExpression {
.base = base.value(),
.method_name = "",
Expand All @@ -730,6 +734,7 @@ std::optional<ast::PrefixExpression> Parser::parse_prefix_expression()
} else if (check(TokenType::STRING)) {
auto lit = peek_token().text;
_pos++;
called = true;
base = make_node(FunctionCallExpression {
.base = base.value(),
.method_name = "",
Expand Down Expand Up @@ -786,12 +791,13 @@ std::optional<ast::PrefixExpression> Parser::parse_prefix_expression()
break;
}
}
if (is_call) *is_call = called;
return base;
}

std::optional<ast::PrefixExpression> Parser::parse_var_expression()
{
auto expr = parse_prefix_expression();
auto expr = parse_prefix_expression(nullptr);
if (not expr) return nullopt;
if (expr->is<ast::FunctionCallExpression>()) {
// $push_error("unexpected function call in assignment");
Expand Down Expand Up @@ -835,7 +841,7 @@ std::optional<ast::PrimaryExpression> Parser::parse_primary_expression()
if (t == TokenType::FUNCTION) { return parse_function_def_expression(); }
if (t == TokenType::L_BRACE) { return parse_table_constructor(); }
if (t == TokenType::NAME or t == TokenType::L_PAREN or Token::type_is_teal_keyword(t)) {
return parse_prefix_expression();
return parse_prefix_expression(nullptr);
}
// $push_error(std::format("unexpected token `{}` (type: {}) in expression", peek_token().text, peek_token().type));
push_error(UnexpectedToken(peek_token()));
Expand Down
4 changes: 2 additions & 2 deletions src/teal-parser/Parser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ namespace teal::parser
Parser(std::vector<Token> toks) : max_errors(10), _tokens(std::move(toks)), _pos(0), _nodes()
{
//TODO: Change `_nodes` into a custom datastructure that can be "frozen", we cannot have any more reallocations as it would break all pointers
_nodes.reserve(_tokens.size());
_nodes.reserve(_tokens.size() * 2);
}
std::tuple<std::optional<std::reference_wrapper<const ast::Block>>, std::vector<Error>> parse()
{
Expand Down Expand Up @@ -263,7 +263,7 @@ namespace teal::parser
std::vector<std::string_view> parse_name_list();
std::optional<ast::Expression> parse_expression();
std::vector<ast::Expression> parse_expression_list();
std::optional<ast::PrefixExpression> parse_prefix_expression();
std::optional<ast::PrefixExpression> parse_prefix_expression(bool *is_call = nullptr);
std::optional<ast::PrefixExpression> parse_var_expression();
std::optional<ast::PrimaryExpression> parse_primary_expression();
int get_binary_precedence(TokenType op);
Expand Down
31 changes: 31 additions & 0 deletions tests/test_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,34 @@ end
const Block &blk = ast_opt.value().get();
CHECK_FALSE(blk.statements.empty());
}

TEST_CASE("parser call statement") {
std::string_view src = R"(
print("hi")
)";
Lexer lex(src);
auto [tks, lex_errs] = lex.tokenize();
REQUIRE(lex_errs.empty());
Parser parser(tks);
auto [ast_opt, parse_errs] = parser.parse();
REQUIRE(parse_errs.empty());
REQUIRE(ast_opt.has_value());
const Block &blk = ast_opt.value().get();
CHECK_EQ(blk.statements.size(), 1);
}

TEST_CASE("parser method call statement") {
std::string_view src = R"(
io.stderr:write("hi")
)";
Lexer lex(src);
auto [tks, lex_errs] = lex.tokenize();
REQUIRE(lex_errs.empty());
Parser parser(tks);
auto [ast_opt, parse_errs] = parser.parse();
REQUIRE(parse_errs.empty());
REQUIRE(ast_opt.has_value());
const Block &blk = ast_opt.value().get();
CHECK_EQ(blk.statements.size(), 1);
}