aboutsummaryrefslogtreecommitdiff
path: root/src/parser.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2016-04-24 11:24:04 -0700
committerAndrew Kelley <superjoe30@gmail.com>2016-04-24 11:24:04 -0700
commit46ab981787a108ad4326c86aa2a6af4247e7191b (patch)
tree6ae8c6ca2774ea4dba4f5db784efb8233c623421 /src/parser.cpp
parent4961910e7faf4df0a88d9571e894563f80613f7f (diff)
downloadzig-46ab981787a108ad4326c86aa2a6af4247e7191b.tar.gz
zig-46ab981787a108ad4326c86aa2a6af4247e7191b.zip
add skeleton for union support
Diffstat (limited to 'src/parser.cpp')
-rw-r--r--src/parser.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/parser.cpp b/src/parser.cpp
index d73bacead2..311bbe093a 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -2504,11 +2504,11 @@ static AstNode *ast_parse_use(ParseContext *pc, int *token_index,
}
/*
-ContainerDecl : ("struct" | "enum") "Symbol" "{" many(StructMember) "}"
+ContainerDecl = ("struct" | "enum" | "union") "Symbol" "{" many(StructMember) "}"
StructMember: many(Directive) option(VisibleMod) (StructField | FnDef)
StructField : "Symbol" option(":" Expression) ",")
*/
-static AstNode *ast_parse_struct_decl(ParseContext *pc, int *token_index,
+static AstNode *ast_parse_container_decl(ParseContext *pc, int *token_index,
ZigList<AstNode*> *directives, VisibMod visib_mod)
{
Token *first_token = &pc->tokens->at(*token_index);
@@ -2519,6 +2519,8 @@ static AstNode *ast_parse_struct_decl(ParseContext *pc, int *token_index,
kind = ContainerKindStruct;
} else if (first_token->id == TokenIdKeywordEnum) {
kind = ContainerKindEnum;
+ } else if (first_token->id == TokenIdKeywordUnion) {
+ kind = ContainerKindUnion;
} else {
return nullptr;
}
@@ -2689,7 +2691,7 @@ static void ast_parse_top_level_decls(ParseContext *pc, int *token_index, ZigLis
continue;
}
- AstNode *struct_node = ast_parse_struct_decl(pc, token_index, directives, visib_mod);
+ AstNode *struct_node = ast_parse_container_decl(pc, token_index, directives, visib_mod);
if (struct_node) {
top_level_decls->append(struct_node);
continue;