ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 07:08:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing errors for variadic signatures

Browse Source
This commit is contained in:
gingerBill
2017-11-10 22:03:05 +00:00
parent 85fab55e57
commit 40281d595d
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+21 -1
View File
@@ -2625,7 +2625,7 @@ AstNode *parse_call_expr(AstFile *f, AstNode *operand) {
Token eq = expect_token(f, Token_Eq); Token eq = expect_token(f, Token_Eq);
if (prefix_ellipsis) { if (prefix_ellipsis) {
syntax_error(ellipsis, "`..` must be applied to value rather than the field name"); syntax_error(ellipsis, "`...` must be applied to value rather than the field name");
} }
if (f->curr_token.kind == Token_Ellipsis) { if (f->curr_token.kind == Token_Ellipsis) {
ellipsis = f->curr_token; ellipsis = f->curr_token;
@@ -3526,12 +3526,19 @@ AstNode *parse_field_list(AstFile *f, isize *name_count_, u32 allowed_flags, Tok
isize total_name_count = 0; isize total_name_count = 0;
bool allow_ellipsis = allowed_flags&FieldFlag_ellipsis; bool allow_ellipsis = allowed_flags&FieldFlag_ellipsis;
bool seen_ellipsis = false;
while (f->curr_token.kind != follow && while (f->curr_token.kind != follow &&
f->curr_token.kind != Token_Colon && f->curr_token.kind != Token_Colon &&
f->curr_token.kind != Token_EOF) { f->curr_token.kind != Token_EOF) {
u32 flags = parse_field_prefixes(f); u32 flags = parse_field_prefixes(f);
AstNode *param = parse_var_type(f, allow_ellipsis, allow_type_token); AstNode *param = parse_var_type(f, allow_ellipsis, allow_type_token);
if (param->kind == AstNode_Ellipsis) {
if (seen_ellipsis) syntax_error(param, "Extra variadic parameter");
seen_ellipsis = true;
} else if (seen_ellipsis) {
syntax_error(param, "Extra parameter have variadic parameters");
}
AstNodeAndFlags naf = {param, flags}; AstNodeAndFlags naf = {param, flags};
array_add(&list, naf); array_add(&list, naf);
if (!allow_token(f, Token_Comma)) { if (!allow_token(f, Token_Comma)) {
@@ -3539,6 +3546,7 @@ AstNode *parse_field_list(AstFile *f, isize *name_count_, u32 allowed_flags, Tok
} }
} }
if (f->curr_token.kind == Token_Colon) { if (f->curr_token.kind == Token_Colon) {
Array<AstNode *> names = convert_to_ident_list(f, list, true); // Copy for semantic reasons Array<AstNode *> names = convert_to_ident_list(f, list, true); // Copy for semantic reasons
if (names.count == 0) { if (names.count == 0) {
@@ -3558,6 +3566,12 @@ AstNode *parse_field_list(AstFile *f, isize *name_count_, u32 allowed_flags, Tok
if (f->curr_token.kind != Token_Eq) { if (f->curr_token.kind != Token_Eq) {
type = parse_var_type(f, allow_ellipsis, allow_type_token); type = parse_var_type(f, allow_ellipsis, allow_type_token);
} }
if (type != nullptr && type->kind == AstNode_Ellipsis) {
if (seen_ellipsis) syntax_error(type, "Extra variadic parameter");
seen_ellipsis = true;
} else if (seen_ellipsis) {
syntax_error(f->curr_token, "Extra variadic parameter");
}
if (allow_token(f, Token_Eq)) { if (allow_token(f, Token_Eq)) {
// TODO(bill): Should this be true==lhs or false==rhs? // TODO(bill): Should this be true==lhs or false==rhs?
default_value = parse_expr(f, false); default_value = parse_expr(f, false);
@@ -3594,6 +3608,12 @@ AstNode *parse_field_list(AstFile *f, isize *name_count_, u32 allowed_flags, Tok
if (f->curr_token.kind != Token_Eq) { if (f->curr_token.kind != Token_Eq) {
type = parse_var_type(f, allow_ellipsis, allow_type_token); type = parse_var_type(f, allow_ellipsis, allow_type_token);
} }
if (type != nullptr && type->kind == AstNode_Ellipsis) {
if (seen_ellipsis) syntax_error(type, "Extra variadic parameter");
seen_ellipsis = true;
} else if (seen_ellipsis) {
syntax_error(f->curr_token, "Extra variadic parameter");
}
if (allow_token(f, Token_Eq)) { if (allow_token(f, Token_Eq)) {
// TODO(bill): Should this be true==lhs or false==rhs? // TODO(bill): Should this be true==lhs or false==rhs?
default_value = parse_expr(f, false); default_value = parse_expr(f, false);