mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-07 13:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/fix-matrix-return

Browse Source
This commit is contained in:
Platin21
2021-12-27 22:11:08 +01:00
parent 86f831ddd1 6f370fdbf2
commit 982ec1e58b
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/odin/ast/ast.odin
View File

@@ -711,6 +711,7 @@ Union_Type :: struct {
poly_params: ^Field_List,
align: ^Expr,
is_maybe: bool,
is_no_nil: bool,
where_token: tokenizer.Token,
where_clauses: []^Expr,
variants: []^Expr,

8
core/odin/parser/parser.odin
View File

@@ -888,6 +888,7 @@ parse_for_stmt :: proc(p: ^Parser) -> ^ast.Stmt {
error(p, body.pos, "the body of a 'do' must be on the same line as the 'for' token")
}
} else {
allow_token(p, .Semicolon)
body = parse_body(p)
}
@@ -2600,6 +2601,7 @@ parse_operand :: proc(p: ^Parser, lhs: bool) -> ^ast.Expr {
poly_params: ^ast.Field_List
align: ^ast.Expr
is_maybe: bool
is_no_nil: bool
if allow_token(p, .Open_Paren) {
param_count: int
@@ -2626,6 +2628,11 @@ parse_operand :: proc(p: ^Parser, lhs: bool) -> ^ast.Expr {
error(p, tag.pos, "duplicate union tag '#%s'", tag.text)
}
is_maybe = true
case "no_nil":
if is_no_nil {
error(p, tag.pos, "duplicate union tag '#%s'", tag.text)
}
is_no_nil = true
case:
error(p, tag.pos, "invalid union tag '#%s", tag.text)
}
@@ -2669,6 +2676,7 @@ parse_operand :: proc(p: ^Parser, lhs: bool) -> ^ast.Expr {
ut.where_token = where_token
ut.where_clauses = where_clauses
ut.is_maybe = is_maybe
ut.is_no_nil = is_no_nil
return ut