diff options
| author | gingerBill <bill@gingerbill.org> | 2020-03-05 21:12:16 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2020-03-05 21:12:16 +0000 |
| commit | db7a3ffd2a66d976c985ebfc2c5a96b21c9684e3 (patch) | |
| tree | f5fd15ae28e664dd37f69018e5a6ce1f35e0beab /src/parser.hpp | |
| parent | 7d93dd60240a58834c950f341ec9761050784b3b (diff) | |
| parent | c213d72ec6a64e973017bf326e0f241a3eef8adb (diff) | |
Merge branch 'master' into llvm-integration
Diffstat (limited to 'src/parser.hpp')
| -rw-r--r-- | src/parser.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/parser.hpp b/src/parser.hpp index decdd319a..129f1d41b 100644 --- a/src/parser.hpp +++ b/src/parser.hpp @@ -283,8 +283,10 @@ AST_KIND(_ExprBegin, "", bool) \ Token ellipsis; \ ProcInlining inlining; \ }) \ - AST_KIND(FieldValue, "field value", struct { Token eq; Ast *field, *value; }) \ - AST_KIND(TernaryExpr, "ternary expression", struct { Ast *cond, *x, *y; }) \ + AST_KIND(FieldValue, "field value", struct { Token eq; Ast *field, *value; }) \ + AST_KIND(TernaryExpr, "ternary expression", struct { Ast *cond, *x, *y; }) \ + AST_KIND(TernaryIfExpr, "ternary if expression", struct { Ast *x, *cond, *y; }) \ + AST_KIND(TernaryWhenExpr, "ternary when expression", struct { Ast *x, *cond, *y; }) \ AST_KIND(TypeAssertion, "type assertion", struct { Ast *expr; Token dot; Ast *type; }) \ AST_KIND(TypeCast, "type cast", struct { Token token; Ast *type, *expr; }) \ AST_KIND(AutoCast, "auto_cast", struct { Token token; Ast *expr; }) \ |