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

Make switch in f { valid

Browse Source
This commit is contained in:
gingerBill
2018-02-25 10:55:18 +00:00
parent b74ae77745
commit f96a897821
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/demo.odin
+1 -1
View File
@@ -752,7 +752,7 @@ complete_switch :: proc() {
{ // union { // union
Foo :: union {int, bool}; Foo :: union {int, bool};
f: Foo = 123; f: Foo = 123;
#complete switch _ in f { #complete switch in f {
case int: fmt.println("int"); case int: fmt.println("int");
case bool: fmt.println("bool"); case bool: fmt.println("bool");
case: case:
src/parser.cpp
+9 -5
View File
@@ -3360,8 +3360,13 @@ AstNode *parse_switch_stmt(AstFile *f) {
defer (f->expr_level = prev_level); defer (f->expr_level = prev_level);
if (allow_token(f, Token_in)) { if (allow_token(f, Token_in)) {
Array<AstNode *> lhs = {}; Array<AstNode *> lhs = make_ast_node_array(f, 1);
Array<AstNode *> rhs = make_ast_node_array(f, 1); Array<AstNode *> rhs = make_ast_node_array(f, 1);
Token blank_ident = token;
blank_ident.kind = Token_Ident;
blank_ident.string = str_lit("_");
AstNode *blank = ast_ident(f, blank_ident);
array_add(&lhs, blank);
array_add(&rhs, parse_expr(f, false)); array_add(&rhs, parse_expr(f, false));
tag = ast_assign_stmt(f, token, lhs, rhs); tag = ast_assign_stmt(f, token, lhs, rhs);
@@ -3391,12 +3396,11 @@ AstNode *parse_switch_stmt(AstFile *f) {
body = ast_block_stmt(f, list, open, close); body = ast_block_stmt(f, list, open, close);
if (!is_type_match) { if (is_type_match) {
tag = convert_stmt_to_expr(f, tag, str_lit("switch expression"));
return ast_switch_stmt(f, token, init, tag, body);
} else {
return ast_type_switch_stmt(f, token, tag, body); return ast_type_switch_stmt(f, token, tag, body);
} }
tag = convert_stmt_to_expr(f, tag, str_lit("switch expression"));
return ast_switch_stmt(f, token, init, tag, body);
} }
AstNode *parse_defer_stmt(AstFile *f) { AstNode *parse_defer_stmt(AstFile *f) {