diff options
| author | gingerBill <bill@gingerbill.org> | 2020-04-30 17:48:46 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2020-04-30 17:48:46 +0100 |
| commit | 832a586b8d02251c8d6e4f6d016d67bbfb2828f5 (patch) | |
| tree | 18f2b09fa262ed8356faf68cc173589d80dab07a | |
| parent | 117ade0700b8a1500f314841ec896ace213419c4 (diff) | |
| parent | a10d180d81b2d2c9cf7459c2f245642a124bb12f (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
| -rw-r--r-- | core/odin/ast/ast.odin | 1 | ||||
| -rw-r--r-- | core/odin/parser/parser.odin | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/odin/ast/ast.odin b/core/odin/ast/ast.odin index 80974b0a9..6d7d4f5c2 100644 --- a/core/odin/ast/ast.odin +++ b/core/odin/ast/ast.odin @@ -609,6 +609,7 @@ Union_Type :: struct { variants: []^Expr, where_token: tokenizer.Token, where_clauses: []^Expr, + is_maybe: bool, } Enum_Type :: struct { diff --git a/core/odin/parser/parser.odin b/core/odin/parser/parser.odin index 5b43374ff..55e7ac2f1 100644 --- a/core/odin/parser/parser.odin +++ b/core/odin/parser/parser.odin @@ -2224,6 +2224,7 @@ parse_operand :: proc(p: ^Parser, lhs: bool) -> ^ast.Expr { tok := expect_token(p, .Union); poly_params: ^ast.Field_List; align: ^ast.Expr; + is_maybe: bool; if allow_token(p, .Open_Paren) { param_count: int; @@ -2244,6 +2245,9 @@ parse_operand :: proc(p: ^Parser, lhs: bool) -> ^ast.Expr { case "align": if align != nil do error(p, tag.pos, "duplicate union tag '#%s'", tag.text); align = parse_expr(p, true); + case "maybe": + if is_maybe do error(p, tag.pos, "duplicate union tag '#%s'", tag.text); + is_maybe = true; case: error(p, tag.pos, "invalid union tag '#%s", tag.text); } @@ -2282,6 +2286,7 @@ parse_operand :: proc(p: ^Parser, lhs: bool) -> ^ast.Expr { ut.align = align; ut.where_token = where_token; ut.where_clauses = where_clauses; + ut.is_maybe = is_maybe; return ut; |