aboutsummaryrefslogtreecommitdiff
path: root/src/parser.cpp
diff options
context:
space:
mode:
authorhryx <codroid@gmail.com>2019-04-22 00:14:21 -0700
committerhryx <codroid@gmail.com>2019-04-22 00:14:51 -0700
commit5765cbd2de9d31bc1135d3b8f7e1a579078bc3ba (patch)
tree40f202b7c479cea863cda1444bea28ee096e0783 /src/parser.cpp
parent0f8fc3b924ac0d971a800bc6e3b6c931612e06a6 (diff)
downloadzig-5765cbd2de9d31bc1135d3b8f7e1a579078bc3ba.tar.gz
zig-5765cbd2de9d31bc1135d3b8f7e1a579078bc3ba.zip
Allow tag expr for enum but not struct
Diffstat (limited to 'src/parser.cpp')
-rw-r--r--src/parser.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/parser.cpp b/src/parser.cpp
index 9172e21b92..9e72954b64 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -2750,12 +2750,19 @@ static AstNode *ast_parse_container_decl_auto(ParseContext *pc) {
}
// ContainerDeclType
-// <- (KEYWORD_struct / KEYWORD_enum) (LPAREN Expr RPAREN)?
+// <- KEYWORD_struct
+// / KEYWORD_enum (LPAREN Expr RPAREN)?
// / KEYWORD_union (LPAREN (KEYWORD_enum (LPAREN Expr RPAREN)? / Expr) RPAREN)?
static AstNode *ast_parse_container_decl_type(ParseContext *pc) {
Token *first = eat_token_if(pc, TokenIdKeywordStruct);
- if (first == nullptr)
- first = eat_token_if(pc, TokenIdKeywordEnum);
+ if (first != nullptr) {
+ AstNode *res = ast_create_node(pc, NodeTypeContainerDecl, first);
+ res->data.container_decl.init_arg_expr = nullptr;
+ res->data.container_decl.kind = ContainerKindStruct;
+ return res;
+ }
+
+ first = eat_token_if(pc, TokenIdKeywordEnum);
if (first != nullptr) {
AstNode *init_arg_expr = nullptr;
if (eat_token_if(pc, TokenIdLParen) != nullptr) {
@@ -2764,9 +2771,7 @@ static AstNode *ast_parse_container_decl_type(ParseContext *pc) {
}
AstNode *res = ast_create_node(pc, NodeTypeContainerDecl, first);
res->data.container_decl.init_arg_expr = init_arg_expr;
- res->data.container_decl.kind = first->id == TokenIdKeywordStruct
- ? ContainerKindStruct
- : ContainerKindEnum;
+ res->data.container_decl.kind = ContainerKindEnum;
return res;
}