karma/interpreter-cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reformulated the parsing of the parameters and

Browse Source 
made it memory safe
This commit is contained in:
Karma Riuk
2025-07-15 01:43:22 +02:00
parent 4a9deff8da
commit 6313027d07
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/parser/parser.cpp
View File

@@ -248,23 +248,42 @@ namespace parser {
);
};
static void free_vec(std::vector<ast::identifier*> v) {
for (auto& e : v)
delete e;
}
std::vector<ast::identifier*> parser::parse_function_parameters() {
if (next.type == token::type::RPAREN) {
next_token();
return {}; // no params
}
std::vector<ast::identifier*> ret;
while (next.type != token::type::RPAREN
&& expect_next(token::type::IDENTIFIER)) {
if (!expect_next(token::type::IDENTIFIER))
return {};
ret.push_back(parse_identifier());
if (next.type == token::type::RPAREN)
break;
if (!expect_next(token::type::COMMA))
while (next.type == token::type::COMMA) {
next_token();
if (!expect_next(token::type::IDENTIFIER)) {
free_vec(ret);
return {};
}
ret.push_back(parse_identifier());
}
if (current.type == token::type::COMMA
&& next.type == token::type::RPAREN) {
next_error(token::type::IDENTIFIER);
free_vec(ret);
return {};
}
if (!expect_next(token::type::RPAREN))
if (!expect_next(token::type::RPAREN)) {
free_vec(ret);
return {};
}
return ret;
}

6
test/parser/function.cpp
View File

@@ -53,13 +53,13 @@ TEST_SUITE("Parser: function") {
);
}
SUBCASE("Missing comma with no closing paren one param") {
test_failing_parsing("fn (x { return 2; }", {token::type::COMMA});
SUBCASE("Missing closing paren one param") {
test_failing_parsing("fn (x { return 2; }", {token::type::RPAREN});
}
SUBCASE("Missing closing paren two params") {
test_failing_parsing(
"fn (x, y { return 2; }",
{token::type::COMMA}
{token::type::RPAREN}
);
}