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

Clean up code for return statements, slightly

Browse Source
This commit is contained in:
Ginger Bill
2017-06-22 13:47:50 +01:00
parent 8197c02dcf
commit 8744c60563
2 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_stmt.cpp
+18 -16
View File
@@ -900,24 +900,26 @@ void check_stmt_internal(Checker *c, AstNode *node, u32 flags) {
gb_string_free(str); gb_string_free(str);
} }
} }
} else {
// TODO(bill): Cleanup this checking of variables } else if (result_count == 0 && rs->results.count > 0) {
if (result_count == 0 && rs->results.count > 0) { error(rs->results[0], "No return values expected");
error(rs->results[0], "No return values expected"); } else if (operands.count > result_count) {
} else if (operands.count > result_count) { if (result_count_excluding_defaults < result_count) {
error(node, "Expected a maximum of %td return values, got %td", result_count, operands.count); error(node, "Expected a maximum of %td return values, got %td", result_count, operands.count);
} else if (operands.count < result_count_excluding_defaults) {
error(node, "Expected %td return values, got %td", result_count_excluding_defaults, operands.count);
} else if (result_count_excluding_defaults == 0) {
return;
} else if (rs->results.count == 0) {
error(node, "Expected %td return values, got 0", result_count_excluding_defaults);
} else { } else {
isize max_count = rs->results.count; error(node, "Expected %td return values, got %td", result_count, operands.count);
for (isize i = 0; i < max_count; i++) { }
Entity *e = pt->results->Tuple.variables[i]; } else if (operands.count < result_count_excluding_defaults) {
check_assignment(c, &operands[i], e->type, str_lit("return statement")); if (result_count_excluding_defaults < result_count) {
} error(node, "Expected a minimum of %td return values, got %td", result_count_excluding_defaults, operands.count);
} else {
error(node, "Expected %td return values, got %td", result_count_excluding_defaults, operands.count);
}
} else {
isize max_count = rs->results.count;
for (isize i = 0; i < max_count; i++) {
Entity *e = pt->results->Tuple.variables[i];
check_assignment(c, &operands[i], e->type, str_lit("return statement"));
} }
} }
src/parser.cpp
+43 -27
View File
@@ -2341,10 +2341,14 @@ AstNode *parse_call_expr(AstFile *f, AstNode *operand) {
f->curr_token.kind != Token_EOF && f->curr_token.kind != Token_EOF &&
ellipsis.pos.line == 0) { ellipsis.pos.line == 0) {
if (f->curr_token.kind == Token_Comma) { if (f->curr_token.kind == Token_Comma) {
syntax_error(f->curr_token, "Expected an expression not a ,"); syntax_error(f->curr_token, "Expected an expression not ,");
} else if (f->curr_token.kind == Token_Eq) {
syntax_error(f->curr_token, "Expected an expression not =");
} }
bool prefix_ellipsis = false;
if (f->curr_token.kind == Token_Ellipsis) { if (f->curr_token.kind == Token_Ellipsis) {
prefix_ellipsis = true;
ellipsis = f->curr_token; ellipsis = f->curr_token;
next_token(f); next_token(f);
} }
@@ -2352,8 +2356,19 @@ AstNode *parse_call_expr(AstFile *f, AstNode *operand) {
AstNode *arg = parse_expr(f, false); AstNode *arg = parse_expr(f, false);
if (f->curr_token.kind == Token_Eq) { if (f->curr_token.kind == Token_Eq) {
Token eq = expect_token(f, Token_Eq); Token eq = expect_token(f, Token_Eq);
if (prefix_ellipsis) {
syntax_error(ellipsis, "`..` must be applied to value rather than the field name");
}
if (f->curr_token.kind == Token_Ellipsis) {
ellipsis = f->curr_token;
next_token(f);
}
AstNode *value = parse_value(f); AstNode *value = parse_value(f);
arg = ast_field_value(f, arg, value, eq); arg = ast_field_value(f, arg, value, eq);
} }
array_add(&args, arg); array_add(&args, arg);
@@ -2398,8 +2413,7 @@ AstNode *parse_macro_call_expr(AstFile *f, AstNode *operand) {
return ast_macro_call_expr(f, operand, bang, args, open_paren, close_paren); return ast_macro_call_expr(f, operand, bang, args, open_paren, close_paren);
} }
AstNode *parse_atom_expr(AstFile *f, bool lhs) { AstNode *parse_atom_expr(AstFile *f, AstNode *operand, bool lhs) {
AstNode *operand = parse_operand(f, lhs);
if (operand == NULL) { if (operand == NULL) {
Token begin = f->curr_token; Token begin = f->curr_token;
syntax_error(begin, "Expected an operand"); syntax_error(begin, "Expected an operand");
@@ -2540,7 +2554,8 @@ AstNode *parse_unary_expr(AstFile *f, bool lhs) {
} break; } break;
} }
return parse_atom_expr(f, lhs); AstNode *operand = parse_operand(f, lhs);
return parse_atom_expr(f, operand, lhs);
} }
bool is_ast_node_a_range(AstNode *expr) { bool is_ast_node_a_range(AstNode *expr) {
@@ -3489,6 +3504,8 @@ AstNode *parse_record_fields(AstFile *f, isize *field_count_, u32 flags, String
} }
AstNode *parse_type_or_ident(AstFile *f) { AstNode *parse_type_or_ident(AstFile *f) {
AstNode *type = NULL;
switch (f->curr_token.kind) { switch (f->curr_token.kind) {
case Token_Ident: case Token_Ident:
{ {
@@ -3504,20 +3521,20 @@ AstNode *parse_type_or_ident(AstFile *f) {
// HACK NOTE(bill): For type_of_val(expr) et al. // HACK NOTE(bill): For type_of_val(expr) et al.
// e = parse_call_expr(f, e); // e = parse_call_expr(f, e);
// } // }
return e; type = e;
} } break;
case Token_Pointer: { case Token_Pointer: {
Token token = expect_token(f, Token_Pointer); Token token = expect_token(f, Token_Pointer);
AstNode *elem = parse_type(f); AstNode *elem = parse_type(f);
return ast_pointer_type(f, token, elem); type = ast_pointer_type(f, token, elem);
} } break;
case Token_atomic: { case Token_atomic: {
Token token = expect_token(f, Token_atomic); Token token = expect_token(f, Token_atomic);
AstNode *elem = parse_type(f); AstNode *elem = parse_type(f);
return ast_atomic_type(f, token, elem); type = ast_atomic_type(f, token, elem);
} } break;
case Token_OpenBracket: { case Token_OpenBracket: {
Token token = expect_token(f, Token_OpenBracket); Token token = expect_token(f, Token_OpenBracket);
@@ -3549,8 +3566,8 @@ AstNode *parse_type_or_ident(AstFile *f) {
if (is_vector) { if (is_vector) {
return ast_vector_type(f, token, count_expr, parse_type(f)); return ast_vector_type(f, token, count_expr, parse_type(f));
} }
return ast_array_type(f, token, count_expr, parse_type(f)); type = ast_array_type(f, token, count_expr, parse_type(f));
} } break;
case Token_map: { case Token_map: {
Token token = expect_token(f, Token_map); Token token = expect_token(f, Token_map);
@@ -3567,7 +3584,7 @@ AstNode *parse_type_or_ident(AstFile *f) {
Token close = expect_token(f, Token_CloseBracket); Token close = expect_token(f, Token_CloseBracket);
value = parse_type(f); value = parse_type(f);
return ast_map_type(f, token, count, key, value); type = ast_map_type(f, token, count, key, value);
} break; } break;
case Token_struct: { case Token_struct: {
@@ -3618,7 +3635,7 @@ AstNode *parse_type_or_ident(AstFile *f) {
decls = fields->FieldList.list; decls = fields->FieldList.list;
} }
return ast_struct_type(f, token, decls, decl_count, is_packed, is_ordered, align); type = ast_struct_type(f, token, decls, decl_count, is_packed, is_ordered, align);
} break; } break;
case Token_union: { case Token_union: {
@@ -3672,8 +3689,8 @@ AstNode *parse_type_or_ident(AstFile *f) {
Token close = expect_token(f, Token_CloseBrace); Token close = expect_token(f, Token_CloseBrace);
return ast_union_type(f, token, decls, total_decl_name_count, variants); type = ast_union_type(f, token, decls, total_decl_name_count, variants);
} } break;
case Token_raw_union: { case Token_raw_union: {
Token token = expect_token(f, Token_raw_union); Token token = expect_token(f, Token_raw_union);
@@ -3688,8 +3705,8 @@ AstNode *parse_type_or_ident(AstFile *f) {
decls = fields->FieldList.list; decls = fields->FieldList.list;
} }
return ast_raw_union_type(f, token, decls, decl_count); type = ast_raw_union_type(f, token, decls, decl_count);
} } break;
case Token_enum: { case Token_enum: {
Token token = expect_token(f, Token_enum); Token token = expect_token(f, Token_enum);
@@ -3702,8 +3719,8 @@ AstNode *parse_type_or_ident(AstFile *f) {
Array<AstNode *> values = parse_element_list(f); Array<AstNode *> values = parse_element_list(f);
Token close = expect_token(f, Token_CloseBrace); Token close = expect_token(f, Token_CloseBrace);
return ast_enum_type(f, token, base_type, values); type = ast_enum_type(f, token, base_type, values);
} } break;
case Token_bit_field: { case Token_bit_field: {
Token token = expect_token(f, Token_bit_field); Token token = expect_token(f, Token_bit_field);
@@ -3747,8 +3764,8 @@ AstNode *parse_type_or_ident(AstFile *f) {
close = expect_token(f, Token_CloseBrace); close = expect_token(f, Token_CloseBrace);
return ast_bit_field_type(f, token, fields, align); type = ast_bit_field_type(f, token, fields, align);
} } break;
case Token_proc: { case Token_proc: {
Token token = f->curr_token; next_token(f); Token token = f->curr_token; next_token(f);
@@ -3756,19 +3773,18 @@ AstNode *parse_type_or_ident(AstFile *f) {
if (pt->ProcType.tags != 0) { if (pt->ProcType.tags != 0) {
syntax_error(token, "A procedure type cannot have tags"); syntax_error(token, "A procedure type cannot have tags");
} }
return pt; type = pt;
} } break;
case Token_OpenParen: { case Token_OpenParen: {
Token open = expect_token(f, Token_OpenParen); Token open = expect_token(f, Token_OpenParen);
AstNode *type = parse_type(f); AstNode *type = parse_type(f);
Token close = expect_token(f, Token_CloseParen); Token close = expect_token(f, Token_CloseParen);
return ast_paren_expr(f, type, open, close); type = ast_paren_expr(f, type, open, close);
} break; } break;
} }
// No type found return type;
return NULL;
} }