diff options
| author | Tetralux <tetralux@teknik.io> | 2019-08-22 20:41:33 +0000 |
|---|---|---|
| committer | Tetralux <tetralux@teknik.io> | 2019-08-22 22:58:02 +0000 |
| commit | 3ec10ea174d5738098e9bd1ef709b552603cc3b4 (patch) | |
| tree | 54718d6ad8bfa40ef8bf8450b816cffe3abeab38 /src/parser.cpp | |
| parent | ec7d7a5b14540ea3b2bab9f11318630338467965 (diff) | |
| download | zig-3ec10ea174d5738098e9bd1ef709b552603cc3b4.tar.gz zig-3ec10ea174d5738098e9bd1ef709b552603cc3b4.zip | |
parsing of align(N) on struct fields
Diffstat (limited to 'src/parser.cpp')
| -rw-r--r-- | src/parser.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index 1e7e36d0bd..6cd6c2f045 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -782,24 +782,26 @@ static AstNode *ast_parse_var_decl(ParseContext *pc) { return res; } -// ContainerField <- IDENTIFIER (COLON TypeExpr)? (EQUAL Expr)? +// ContainerField <- IDENTIFIER (COLON TypeExpr ByteAlign?)? (EQUAL Expr)? static AstNode *ast_parse_container_field(ParseContext *pc) { Token *identifier = eat_token_if(pc, TokenIdSymbol); if (identifier == nullptr) return nullptr; AstNode *type_expr = nullptr; - if (eat_token_if(pc, TokenIdColon) != nullptr) + if (eat_token_if(pc, TokenIdColon) != nullptr) { type_expr = ast_expect(pc, ast_parse_type_expr); + } + AstNode *align_expr = ast_parse_byte_align(pc); AstNode *expr = nullptr; if (eat_token_if(pc, TokenIdEq) != nullptr) expr = ast_expect(pc, ast_parse_expr); - AstNode *res = ast_create_node(pc, NodeTypeStructField, identifier); res->data.struct_field.name = token_buf(identifier); res->data.struct_field.type = type_expr; res->data.struct_field.value = expr; + res->data.struct_field.align_expr = align_expr; return res; } |
