Skip to content

Finish variant system refactor #3

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

Open
wants to merge 7 commits into
base: variant-node
Choose a base branch
from
Open

Finish variant system refactor #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
235e044
Add lexer and parser tests
Frityet Jun 4, 2025
a7b5624
Delete llvm.sh
Frityet Jun 4, 2025
a3ee1ce
Add doctest framework and expand lexer and parser tests
Frityet Jun 4, 2025
d98037a
Fix doctest suite
Frityet Jun 4, 2025
51f94bc
Merge pull request #4 from TheLuaOSProject/codex/add-tests-for-lexer-…
Frityet Jun 4, 2025
c21c1ba
Fix call statement parsing
Frityet Jun 4, 2025
7bd7161
Merge pull request #5 from TheLuaOSProject/codex/run-tests-and-fix-pa…
Frityet Jun 4, 2025
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
6 changes: 3 additions & 3 deletions src/teal-parser/AST.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ namespace teal::parser::ast {

struct Unrepresentable {
Unrepresentable() = delete;
~Unrepresentable() = delete;
~Unrepresentable() = default;
};

#define $(n) n,
Expand Down Expand Up @@ -353,9 +353,9 @@ namespace teal::parser::ast {

struct RecordBody {
std::vector<GenericTypeParameter> type_parameters;
Type structural_ext;
std::optional<Type> structural_ext;
std::vector<Type> interface_ext;
Expression where_clause;
std::optional<Expression> where_clause;

struct Userdata {};
struct TypeAlias {
Expand Down
83 changes: 48 additions & 35 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 Expand Up @@ -1383,9 +1389,10 @@ UnionSlice<ast::RecordBody> Parser::parse_record_body()
}
auto rb = make_node(RecordBody {
.type_parameters = type_parameters,
.structural_ext = std::nullopt,
.interface_ext = std::vector<Type>(),
.where_clause = std::nullopt,
.entries = std::vector<RecordBody::Entry>(),
.structural_ext = nullptr,
.where_clause = nullptr,
});
if (match(TokenType::IS)) { parse_interface_list(rb); }
if (match(TokenType::WHERE)) {
Expand Down Expand Up @@ -1433,10 +1440,6 @@ UnionSlice<ast::RecordBody> Parser::parse_record_body()
_pos++;
}
auto body = parse_record_body();
if (not body) {
// $push_error("expected record body after 'record'");
push_error(ExpectedToken(TokenType::NAME, peek_token()));
}
rb->entries.emplace_back(RecordBody::Record {
.name = type_name,
.body = body,
Expand All @@ -1447,45 +1450,49 @@ UnionSlice<ast::RecordBody> Parser::parse_record_body()
continue;
}
if (match(TokenType::ENUM)) {
std::string_view enum_name = "<unnamed>";
if (not check(TokenType::NAME)) {
// $push_error("expected name after 'enum'");
push_error(ExpectedToken(TokenType::NAME, peek_token()));
} else {
entry.nested_name = peek_token().text;
enum_name = peek_token().text;
_pos++;
}
entry.nested_body = parse_enum_body();
entry.entry_kind = RecordBody::Entry::Kind::ENUM;
rb->entries.push_back(std::move(entry));
auto enum_body = parse_enum_body();
rb->entries.emplace_back(RecordBody::Enum {
.name = enum_name,
.body = enum_body,
});
continue;
}
if (match(TokenType::INTERFACE)) {
std::string_view iface_name = "<unnamed>";
if (not check(TokenType::NAME)) {
// $push_error(std::format("expected name after 'interface', got {}", peek_token()));
push_error(ExpectedToken(TokenType::NAME, peek_token()));
} else {
entry.nested_name = peek_token().text;
iface_name = peek_token().text;
_pos++;
}
entry.nested_body = parse_record_body();
entry.entry_kind = RecordBody::Entry::Kind::INTERFACE;
rb->entries.push_back(std::move(entry));
auto iface_body = parse_record_body();
rb->entries.emplace_back(RecordBody::Interface { { iface_name, iface_body } });
continue;
}
bool is_meta = false;
if (check(TokenType::NAME) and peek_token().text == "metamethod") {
_pos++;
is_meta = true;
}
std::string_view field_name = "";
if (check(TokenType::NAME)) {
entry.name = peek_token().text;
field_name = peek_token().text;
_pos++;
} else if (match(TokenType::L_BRACKET)) {
if (not check(TokenType::STRING)) {
// $push_error("expected literal string key in record field");
push_error(ExpectedToken(TokenType::STRING, peek_token()));
} else {
entry.key_literal = peek_token().text;
field_name = peek_token().text;
_pos++;
}
consume(TokenType::R_BRACKET);
Expand All @@ -1497,16 +1504,22 @@ UnionSlice<ast::RecordBody> Parser::parse_record_body()
continue;
}
consume(TokenType::COLON);
entry.type = parse_type();
entry.is_metamethod = is_meta;
entry.entry_kind = RecordBody::Entry::Kind::FIELD;
rb->entries.push_back(std::move(entry));
auto field_type = parse_type();
if (not field_type) {
push_error(ExpectedToken(TokenType::NAME, peek_token()));
continue;
}
rb->entries.emplace_back(RecordBody::Field {
.is_metamethod = is_meta,
.name = field_name,
.type = field_type.value(),
});
}
consume(TokenType::END);
return rb;
}

ast::Pointer<EnumBody> Parser::parse_enum_body()
UnionSlice<ast::EnumBody> Parser::parse_enum_body()
{
auto body = make_node<EnumBody>();
while (not check(TokenType::END) and not is_at_end()) {
Expand All @@ -1526,15 +1539,15 @@ ast::Pointer<EnumBody> Parser::parse_enum_body()
return body;
}

void Parser::parse_interface_list(RecordBody *rb)
void Parser::parse_interface_list(UnionSlice<RecordBody> rb)
{
if (match(TokenType::L_BRACE)) {
rb->structural_ext = parse_type();
consume(TokenType::R_BRACE);
if (match(TokenType::COMMA)) {
do {
auto nom = parse_nominal_type();
if (nom) rb->interface_ext.push_back(std::move(nom));
if (nom) rb->interface_ext.push_back(nom.value());
else {
// $push_error("expected interface name");
push_error(ExpectedToken(TokenType::NAME, peek_token()));
Expand All @@ -1544,11 +1557,11 @@ void Parser::parse_interface_list(RecordBody *rb)
}
} else {
auto nom = parse_nominal_type();
if (nom) rb->interface_ext.push_back(std::move(nom));
if (nom) rb->interface_ext.push_back(nom.value());
else push_error(ExpectedToken(TokenType::NAME, peek_token()));
while (match(TokenType::COMMA)) {
auto nom2 = parse_nominal_type();
if (nom2) rb->interface_ext.push_back(std::move(nom2));
if (nom2) rb->interface_ext.push_back(nom2.value());
else {
push_error(ExpectedToken(TokenType::NAME, peek_token()));
break;
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
Loading