authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-11-17 21:17:58-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-11-17 21:17:58-05:00
logc3b603fdf9f1edcfe8a0e45413a1c30a563e87d4
treefd9e34fcc48ce162cc2b63ca3ac19bd9555b3bcc
parent7a2a0672b4370d0dfe7a64541c4fb90a89132113

remove AST cloning code and add AST render for while loops

5 files changed, 13 insertions(+), 337 deletions(-)

src/all_types.hpp-1
......@@ -793,7 +793,6 @@ struct AstNode {
793793 size_t column;
794794 uint32_t create_index; // for determinism purposes
795795 ImportTableEntry *owner;
796 AstNode **parent_field; // for AST rewriting
797796 // the context in which this expression/node is evaluated.
798797 // for blocks, this points to the containing scope, not the block's own scope for its children.
799798 BlockContext *block_context;
src/ast_render.cpp+13-3
......@@ -343,8 +343,6 @@ static void print_symbol(AstRender *ar, Buf *symbol) {
343343}
344344
345345static void render_node(AstRender *ar, AstNode *node) {
346 assert(node->type == NodeTypeRoot || *node->parent_field == node);
347
348346 switch (node->type) {
349347 case NodeTypeRoot:
350348 for (size_t i = 0; i < node->data.root.top_level_decls.length; i += 1) {
......@@ -658,6 +656,19 @@ static void render_node(AstRender *ar, AstNode *node) {
658656 fprintf(ar->f, ")");
659657 break;
660658 }
659 case NodeTypeWhileExpr:
660 {
661 const char *inline_str = node->data.while_expr.is_inline ? "inline " : "";
662 fprintf(ar->f, "%swhile (", inline_str);
663 render_node(ar, node->data.while_expr.condition);
664 if (node->data.while_expr.continue_expr) {
665 fprintf(ar->f, "; ");
666 render_node(ar, node->data.while_expr.continue_expr);
667 }
668 fprintf(ar->f, ") ");
669 render_node(ar, node->data.while_expr.body);
670 break;
671 }
661672 case NodeTypeFnDecl:
662673 case NodeTypeParamDecl:
663674 case NodeTypeErrorValueDecl:
......@@ -672,7 +683,6 @@ static void render_node(AstRender *ar, AstNode *node) {
672683 case NodeTypeThisLiteral:
673684 case NodeTypeIfBoolExpr:
674685 case NodeTypeIfVarExpr:
675 case NodeTypeWhileExpr:
676686 case NodeTypeForExpr:
677687 case NodeTypeSwitchExpr:
678688 case NodeTypeSwitchProng:
src/parseh.cpp-14
......@@ -112,7 +112,6 @@ static AstNode *create_field_access_node(Context *c, const char *lhs, const char
112112 AstNode *node = create_node(c, NodeTypeFieldAccessExpr);
113113 node->data.field_access_expr.struct_expr = create_symbol_node(c, lhs);
114114 node->data.field_access_expr.field_name = buf_create_from_str(rhs);
115 normalize_parent_ptrs(node);
116115 return node;
117116}
118117
......@@ -125,7 +124,6 @@ static AstNode *create_typed_var_decl_node(Context *c, bool is_const, const char
125124 node->data.variable_declaration.top_level_decl.visib_mod = c->visib_mod;
126125 node->data.variable_declaration.expr = init_node;
127126 node->data.variable_declaration.type = type_node;
128 normalize_parent_ptrs(node);
129127 return node;
130128}
131129
......@@ -138,7 +136,6 @@ static AstNode *create_prefix_node(Context *c, PrefixOp op, AstNode *child_node)
138136 AstNode *node = create_node(c, NodeTypePrefixOpExpr);
139137 node->data.prefix_op_expr.prefix_op = op;
140138 node->data.prefix_op_expr.primary_expr = child_node;
141 normalize_parent_ptrs(node);
142139 return node;
143140}
144141
......@@ -149,7 +146,6 @@ static AstNode *create_struct_field_node(Context *c, const char *name, AstNode *
149146 node->data.struct_field.top_level_decl.visib_mod = VisibModPub;
150147 node->data.struct_field.type = type_node;
151148
152 normalize_parent_ptrs(node);
153149 return node;
154150}
155151
......@@ -160,7 +156,6 @@ static AstNode *create_param_decl_node(Context *c, const char *name, AstNode *ty
160156 node->data.param_decl.type = type_node;
161157 node->data.param_decl.is_noalias = is_noalias;
162158
163 normalize_parent_ptrs(node);
164159 return node;
165160}
166161
......@@ -225,7 +220,6 @@ static AstNode *create_type_decl_node(Context *c, const char *name, AstNode *chi
225220 node->data.type_decl.top_level_decl.visib_mod = c->visib_mod;
226221 node->data.type_decl.child_type = child_type_node;
227222
228 normalize_parent_ptrs(node);
229223 return node;
230224}
231225
......@@ -249,7 +243,6 @@ static AstNode *create_fn_proto_node(Context *c, Buf *name, TypeTableEntry *fn_t
249243 make_type_node(c, info->type), info->is_noalias));
250244 }
251245
252 normalize_parent_ptrs(node);
253246 return node;
254247}
255248
......@@ -257,7 +250,6 @@ static AstNode *create_one_statement_block(Context *c, AstNode *statement) {
257250 AstNode *node = create_node(c, NodeTypeBlock);
258251 node->data.block.statements.append(statement);
259252
260 normalize_parent_ptrs(node);
261253 return node;
262254}
263255
......@@ -275,11 +267,9 @@ static AstNode *create_inline_fn_node(Context *c, Buf *fn_name, Buf *var_name, T
275267 fn_call_node->data.fn_call_expr.params.append(create_symbol_node(c, buf_ptr(param_name)));
276268 }
277269
278 normalize_parent_ptrs(fn_call_node);
279270
280271 node->data.fn_def.body = create_one_statement_block(c, fn_call_node);
281272
282 normalize_parent_ptrs(node);
283273 return node;
284274}
285275
......@@ -761,7 +751,6 @@ static void visit_fn_decl(Context *c, const FunctionDecl *fn_decl) {
761751 node->data.fn_proto.params.append(create_param_decl_node(c, name, type_node, param_info->is_noalias));
762752 }
763753
764 normalize_parent_ptrs(node);
765754
766755 c->fn_table.put(buf_create_from_buf(fn_name), true);
767756 c->root->data.root.top_level_decls.append(node);
......@@ -981,7 +970,6 @@ static void visit_enum_decl(Context *c, const EnumDecl *enum_decl) {
981970 enum_node->data.struct_decl.fields.append(field_node);
982971 }
983972
984 normalize_parent_ptrs(enum_node);
985973 c->root->data.root.top_level_decls.append(enum_node);
986974 } else {
987975 TypeTableEntry *typedecl_type = get_typedecl_type(c->codegen, buf_ptr(&enum_type->name),
......@@ -1158,7 +1146,6 @@ static void visit_record_decl(Context *c, const RecordDecl *record_decl) {
11581146 struct_node->data.struct_decl.fields.append(field_node);
11591147 }
11601148
1161 normalize_parent_ptrs(struct_node);
11621149 c->root->data.root.top_level_decls.append(struct_node);
11631150 } else {
11641151 TypeTableEntry *typedecl_type = get_typedecl_type(c->codegen, buf_ptr(&struct_type->name),
......@@ -1622,7 +1609,6 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch
16221609 render_macros(c);
16231610 render_aliases(c);
16241611
1625 normalize_parent_ptrs(c->root);
16261612 import->root = c->root;
16271613
16281614 return 0;
src/parser.cpp-309
......@@ -281,7 +281,6 @@ static AstNode *ast_parse_param_decl(ParseContext *pc, size_t *token_index) {
281281
282282 node->data.param_decl.type = ast_parse_type_expr(pc, token_index, true);
283283
284 normalize_parent_ptrs(node);
285284 return node;
286285}
287286
......@@ -396,7 +395,6 @@ static AstNode *ast_parse_array_type_expr(ParseContext *pc, size_t *token_index,
396395
397396 node->data.array_type.child_type = ast_parse_type_expr(pc, token_index, true);
398397
399 normalize_parent_ptrs(node);
400398 return node;
401399}
402400
......@@ -580,7 +578,6 @@ static AstNode *ast_parse_asm_expr(ParseContext *pc, size_t *token_index, bool m
580578
581579 ast_eat_token(pc, token_index, TokenIdRParen);
582580
583 normalize_parent_ptrs(node);
584581 return node;
585582}
586583
......@@ -667,7 +664,6 @@ static AstNode *ast_parse_primary_expr(ParseContext *pc, size_t *token_index, bo
667664 ast_parse_fn_call_param_list(pc, token_index, &node->data.fn_call_expr.params);
668665 node->data.fn_call_expr.is_builtin = true;
669666
670 normalize_parent_ptrs(node);
671667 return node;
672668 } else if (token->id == TokenIdSymbol) {
673669 *token_index += 1;
......@@ -750,7 +746,6 @@ static AstNode *ast_parse_curly_suffix_expr(ParseContext *pc, size_t *token_inde
750746 field_node->data.struct_val_field.name = token_buf(field_name_tok);
751747 field_node->data.struct_val_field.expr = ast_parse_expression(pc, token_index, true);
752748
753 normalize_parent_ptrs(field_node);
754749 node->data.container_init_expr.entries.append(field_node);
755750
756751 Token *comma_tok = &pc->tokens->at(*token_index);
......@@ -797,7 +792,6 @@ static AstNode *ast_parse_curly_suffix_expr(ParseContext *pc, size_t *token_inde
797792 }
798793 }
799794
800 normalize_parent_ptrs(node);
801795 prefix_op_expr = node;
802796 } else {
803797 return prefix_op_expr;
......@@ -828,7 +822,6 @@ static AstNode *ast_parse_suffix_op_expr(ParseContext *pc, size_t *token_index,
828822 node->data.fn_call_expr.fn_ref_expr = primary_expr;
829823 ast_parse_fn_call_param_list(pc, token_index, &node->data.fn_call_expr.params);
830824
831 normalize_parent_ptrs(node);
832825 primary_expr = node;
833826 } else if (first_token->id == TokenIdLBracket) {
834827 *token_index += 1;
......@@ -853,7 +846,6 @@ static AstNode *ast_parse_suffix_op_expr(ParseContext *pc, size_t *token_index,
853846 node->data.slice_expr.is_const = true;
854847 }
855848
856 normalize_parent_ptrs(node);
857849 primary_expr = node;
858850 } else if (ellipsis_or_r_bracket->id == TokenIdRBracket) {
859851 *token_index += 1;
......@@ -862,7 +854,6 @@ static AstNode *ast_parse_suffix_op_expr(ParseContext *pc, size_t *token_index,
862854 node->data.array_access_expr.array_ref_expr = primary_expr;
863855 node->data.array_access_expr.subscript = expr_node;
864856
865 normalize_parent_ptrs(node);
866857 primary_expr = node;
867858 } else {
868859 ast_invalid_token_error(pc, first_token);
......@@ -876,7 +867,6 @@ static AstNode *ast_parse_suffix_op_expr(ParseContext *pc, size_t *token_index,
876867 node->data.field_access_expr.struct_expr = primary_expr;
877868 node->data.field_access_expr.field_name = token_buf(name_token);
878869
879 normalize_parent_ptrs(node);
880870 primary_expr = node;
881871 } else {
882872 return primary_expr;
......@@ -955,8 +945,6 @@ static AstNode *ast_parse_prefix_op_expr(ParseContext *pc, size_t *token_index,
955945 node->data.prefix_op_expr.primary_expr = prefix_op_expr;
956946 node->data.prefix_op_expr.prefix_op = prefix_op;
957947
958 normalize_parent_ptrs(node);
959 normalize_parent_ptrs(parent_node);
960948 return parent_node;
961949}
962950
......@@ -1010,7 +998,6 @@ static AstNode *ast_parse_mult_expr(ParseContext *pc, size_t *token_index, bool
1010998 node->data.bin_op_expr.bin_op = mult_op;
1011999 node->data.bin_op_expr.op2 = operand_2;
10121000
1013 normalize_parent_ptrs(node);
10141001 operand_1 = node;
10151002 }
10161003}
......@@ -1064,7 +1051,6 @@ static AstNode *ast_parse_add_expr(ParseContext *pc, size_t *token_index, bool m
10641051 node->data.bin_op_expr.bin_op = add_op;
10651052 node->data.bin_op_expr.op2 = operand_2;
10661053
1067 normalize_parent_ptrs(node);
10681054 operand_1 = node;
10691055 }
10701056}
......@@ -1116,7 +1102,6 @@ static AstNode *ast_parse_bit_shift_expr(ParseContext *pc, size_t *token_index,
11161102 node->data.bin_op_expr.bin_op = bit_shift_op;
11171103 node->data.bin_op_expr.op2 = operand_2;
11181104
1119 normalize_parent_ptrs(node);
11201105 operand_1 = node;
11211106 }
11221107}
......@@ -1143,7 +1128,6 @@ static AstNode *ast_parse_bin_and_expr(ParseContext *pc, size_t *token_index, bo
11431128 node->data.bin_op_expr.bin_op = BinOpTypeBinAnd;
11441129 node->data.bin_op_expr.op2 = operand_2;
11451130
1146 normalize_parent_ptrs(node);
11471131 operand_1 = node;
11481132 }
11491133}
......@@ -1169,7 +1153,6 @@ static AstNode *ast_parse_bin_xor_expr(ParseContext *pc, size_t *token_index, bo
11691153 node->data.bin_op_expr.bin_op = BinOpTypeBinXor;
11701154 node->data.bin_op_expr.op2 = operand_2;
11711155
1172 normalize_parent_ptrs(node);
11731156 operand_1 = node;
11741157 }
11751158}
......@@ -1195,7 +1178,6 @@ static AstNode *ast_parse_bin_or_expr(ParseContext *pc, size_t *token_index, boo
11951178 node->data.bin_op_expr.bin_op = BinOpTypeBinOr;
11961179 node->data.bin_op_expr.op2 = operand_2;
11971180
1198 normalize_parent_ptrs(node);
11991181 operand_1 = node;
12001182 }
12011183}
......@@ -1246,7 +1228,6 @@ static AstNode *ast_parse_comparison_expr(ParseContext *pc, size_t *token_index,
12461228 node->data.bin_op_expr.bin_op = cmp_op;
12471229 node->data.bin_op_expr.op2 = operand_2;
12481230
1249 normalize_parent_ptrs(node);
12501231 return node;
12511232}
12521233
......@@ -1271,7 +1252,6 @@ static AstNode *ast_parse_bool_and_expr(ParseContext *pc, size_t *token_index, b
12711252 node->data.bin_op_expr.bin_op = BinOpTypeBoolAnd;
12721253 node->data.bin_op_expr.op2 = operand_2;
12731254
1274 normalize_parent_ptrs(node);
12751255 operand_1 = node;
12761256 }
12771257}
......@@ -1349,7 +1329,6 @@ static AstNode *ast_parse_if_expr(ParseContext *pc, size_t *token_index, bool ma
13491329 node->data.if_var_expr.then_block = ast_parse_expression(pc, token_index, true);
13501330 node->data.if_var_expr.else_node = ast_parse_else(pc, token_index, false);
13511331
1352 normalize_parent_ptrs(node);
13531332 return node;
13541333 } else {
13551334 AstNode *node = ast_create_node(pc, NodeTypeIfBoolExpr, if_tok);
......@@ -1358,7 +1337,6 @@ static AstNode *ast_parse_if_expr(ParseContext *pc, size_t *token_index, bool ma
13581337 node->data.if_bool_expr.then_block = ast_parse_expression(pc, token_index, true);
13591338 node->data.if_bool_expr.else_node = ast_parse_else(pc, token_index, false);
13601339
1361 normalize_parent_ptrs(node);
13621340 return node;
13631341 }
13641342}
......@@ -1402,7 +1380,6 @@ static AstNode *ast_parse_return_expr(ParseContext *pc, size_t *token_index) {
14021380 node->data.return_expr.kind = kind;
14031381 node->data.return_expr.expr = ast_parse_expression(pc, token_index, false);
14041382
1405 normalize_parent_ptrs(node);
14061383 return node;
14071384}
14081385
......@@ -1445,7 +1422,6 @@ static AstNode *ast_parse_defer_expr(ParseContext *pc, size_t *token_index) {
14451422 node->data.defer.kind = kind;
14461423 node->data.defer.expr = ast_parse_expression(pc, token_index, false);
14471424
1448 normalize_parent_ptrs(node);
14491425 return node;
14501426}
14511427
......@@ -1505,7 +1481,6 @@ static AstNode *ast_parse_variable_declaration_expr(ParseContext *pc, size_t *to
15051481 if (eq_or_colon->id == TokenIdEq) {
15061482 node->data.variable_declaration.expr = ast_parse_expression(pc, token_index, true);
15071483
1508 normalize_parent_ptrs(node);
15091484 return node;
15101485 } else if (eq_or_colon->id == TokenIdColon) {
15111486 node->data.variable_declaration.type = ast_parse_type_expr(pc, token_index, true);
......@@ -1516,7 +1491,6 @@ static AstNode *ast_parse_variable_declaration_expr(ParseContext *pc, size_t *to
15161491 node->data.variable_declaration.expr = ast_parse_expression(pc, token_index, true);
15171492 }
15181493
1519 normalize_parent_ptrs(node);
15201494 return node;
15211495 } else {
15221496 ast_invalid_token_error(pc, eq_or_colon);
......@@ -1544,7 +1518,6 @@ static AstNode *ast_parse_bool_or_expr(ParseContext *pc, size_t *token_index, bo
15441518 node->data.bin_op_expr.bin_op = BinOpTypeBoolOr;
15451519 node->data.bin_op_expr.op2 = operand_2;
15461520
1547 normalize_parent_ptrs(node);
15481521 operand_1 = node;
15491522 }
15501523}
......@@ -1596,7 +1569,6 @@ static AstNode *ast_parse_while_expr(ParseContext *pc, size_t *token_index, bool
15961569 }
15971570
15981571
1599 normalize_parent_ptrs(node);
16001572 return node;
16011573}
16021574
......@@ -1666,7 +1638,6 @@ static AstNode *ast_parse_for_expr(ParseContext *pc, size_t *token_index, bool m
16661638
16671639 node->data.for_expr.body = ast_parse_expression(pc, token_index, true);
16681640
1669 normalize_parent_ptrs(node);
16701641 return node;
16711642}
16721643
......@@ -1700,7 +1671,6 @@ static AstNode *ast_parse_switch_expr(ParseContext *pc, size_t *token_index, boo
17001671 if (token->id == TokenIdRBrace) {
17011672 *token_index += 1;
17021673
1703 normalize_parent_ptrs(node);
17041674 return node;
17051675 }
17061676
......@@ -1721,7 +1691,6 @@ static AstNode *ast_parse_switch_expr(ParseContext *pc, size_t *token_index, boo
17211691 range_node->data.switch_range.start = expr1;
17221692 range_node->data.switch_range.end = ast_parse_expression(pc, token_index, true);
17231693
1724 normalize_parent_ptrs(range_node);
17251694 } else {
17261695 prong_node->data.switch_prong.items.append(expr1);
17271696 }
......@@ -1745,7 +1714,6 @@ static AstNode *ast_parse_switch_expr(ParseContext *pc, size_t *token_index, boo
17451714 prong_node->data.switch_prong.expr = ast_parse_expression(pc, token_index, true);
17461715 ast_eat_token(pc, token_index, TokenIdComma);
17471716
1748 normalize_parent_ptrs(prong_node);
17491717 }
17501718}
17511719
......@@ -1843,7 +1811,6 @@ static AstNode *ast_parse_unwrap_expr(ParseContext *pc, size_t *token_index, boo
18431811 node->data.bin_op_expr.bin_op = BinOpTypeUnwrapMaybe;
18441812 node->data.bin_op_expr.op2 = rhs;
18451813
1846 normalize_parent_ptrs(node);
18471814 return node;
18481815 } else if (token->id == TokenIdPercentPercent) {
18491816 *token_index += 1;
......@@ -1859,7 +1826,6 @@ static AstNode *ast_parse_unwrap_expr(ParseContext *pc, size_t *token_index, boo
18591826 }
18601827 node->data.unwrap_err_expr.op2 = ast_parse_expression(pc, token_index, true);
18611828
1862 normalize_parent_ptrs(node);
18631829 return node;
18641830 } else {
18651831 return lhs;
......@@ -1886,7 +1852,6 @@ static AstNode *ast_parse_ass_expr(ParseContext *pc, size_t *token_index, bool m
18861852 node->data.bin_op_expr.bin_op = ass_op;
18871853 node->data.bin_op_expr.op2 = rhs;
18881854
1889 normalize_parent_ptrs(node);
18901855 return node;
18911856}
18921857
......@@ -1961,7 +1926,6 @@ static AstNode *ast_parse_label(ParseContext *pc, size_t *token_index, bool mand
19611926
19621927static AstNode *ast_create_void_expr(ParseContext *pc, Token *token) {
19631928 AstNode *node = ast_create_node(pc, NodeTypeBlock, token);
1964 normalize_parent_ptrs(node);
19651929 return node;
19661930}
19671931
......@@ -2017,7 +1981,6 @@ static AstNode *ast_parse_block(ParseContext *pc, size_t *token_index, bool mand
20171981 if (last_token->id == TokenIdRBrace) {
20181982 *token_index += 1;
20191983
2020 normalize_parent_ptrs(node);
20211984 return node;
20221985 } else if (!semicolon_expected) {
20231986 continue;
......@@ -2079,7 +2042,6 @@ static AstNode *ast_parse_fn_proto(ParseContext *pc, size_t *token_index, bool m
20792042 node->data.fn_proto.return_type = ast_create_void_type_node(pc, next_token);
20802043 }
20812044
2082 normalize_parent_ptrs(node);
20832045 return node;
20842046}
20852047
......@@ -2117,14 +2079,12 @@ static AstNode *ast_parse_fn_def(ParseContext *pc, size_t *token_index, bool man
21172079 Token *semi_token = &pc->tokens->at(*token_index);
21182080 if (semi_token->id == TokenIdSemicolon) {
21192081 *token_index += 1;
2120 normalize_parent_ptrs(fn_proto);
21212082 return fn_proto;
21222083 }
21232084
21242085 AstNode *node = ast_create_node(pc, NodeTypeFnDef, first_token);
21252086 node->data.fn_def.fn_proto = fn_proto;
21262087 node->data.fn_def.body = ast_parse_block(pc, token_index, true);
2127 normalize_parent_ptrs(node);
21282088 return node;
21292089}
21302090
......@@ -2148,7 +2108,6 @@ static AstNode *ast_parse_extern_decl(ParseContext *pc, size_t *token_index, boo
21482108
21492109 fn_proto_node->data.fn_proto.is_extern = true;
21502110
2151 normalize_parent_ptrs(fn_proto_node);
21522111 return fn_proto_node;
21532112 }
21542113
......@@ -2158,7 +2117,6 @@ static AstNode *ast_parse_extern_decl(ParseContext *pc, size_t *token_index, boo
21582117
21592118 var_decl_node->data.variable_declaration.is_extern = true;
21602119
2161 normalize_parent_ptrs(var_decl_node);
21622120 return var_decl_node;
21632121 }
21642122
......@@ -2181,7 +2139,6 @@ static AstNode *ast_parse_use(ParseContext *pc, size_t *token_index, VisibMod vi
21812139
21822140 ast_eat_token(pc, token_index, TokenIdSemicolon);
21832141
2184 normalize_parent_ptrs(node);
21852142 return node;
21862143}
21872144
......@@ -2279,13 +2236,11 @@ static AstNode *ast_parse_container_decl(ParseContext *pc, size_t *token_index,
22792236 }
22802237
22812238 node->data.struct_decl.fields.append(field_node);
2282 normalize_parent_ptrs(field_node);
22832239 } else {
22842240 ast_invalid_token_error(pc, token);
22852241 }
22862242 }
22872243
2288 normalize_parent_ptrs(node);
22892244 return node;
22902245}
22912246
......@@ -2307,7 +2262,6 @@ static AstNode *ast_parse_error_value_decl(ParseContext *pc, size_t *token_index
23072262 node->data.error_value_decl.top_level_decl.visib_mod = visib_mod;
23082263 node->data.error_value_decl.name = token_buf(name_tok);
23092264
2310 normalize_parent_ptrs(node);
23112265 return node;
23122266}
23132267
......@@ -2333,7 +2287,6 @@ static AstNode *ast_parse_type_decl(ParseContext *pc, size_t *token_index, Visib
23332287
23342288 node->data.type_decl.top_level_decl.visib_mod = visib_mod;
23352289
2336 normalize_parent_ptrs(node);
23372290 return node;
23382291}
23392292
......@@ -2415,7 +2368,6 @@ static AstNode *ast_parse_root(ParseContext *pc, size_t *token_index) {
24152368 ast_invalid_token_error(pc, &pc->tokens->at(*token_index));
24162369 }
24172370
2418 normalize_parent_ptrs(node);
24192371 return node;
24202372}
24212373
......@@ -2630,264 +2582,3 @@ void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *cont
26302582 break;
26312583 }
26322584}
2633
2634static void normalize_parent_ptrs_visit(AstNode **node, void *context) {
2635 (*node)->parent_field = node;
2636}
2637
2638void normalize_parent_ptrs(AstNode *node) {
2639 ast_visit_node_children(node, normalize_parent_ptrs_visit, nullptr);
2640}
2641
2642static void clone_subtree_list(ZigList<AstNode *> *dest, ZigList<AstNode *> *src, uint32_t *next_node_index) {
2643 memset(dest, 0, sizeof(ZigList<AstNode *>));
2644 dest->resize(src->length);
2645 for (size_t i = 0; i < src->length; i += 1) {
2646 dest->at(i) = ast_clone_subtree(src->at(i), next_node_index);
2647 dest->at(i)->parent_field = &dest->at(i);
2648 }
2649}
2650
2651static void clone_subtree_list_omit_inline_params(ZigList<AstNode *> *dest, ZigList<AstNode *> *src,
2652 uint32_t *next_node_index)
2653{
2654 memset(dest, 0, sizeof(ZigList<AstNode *>));
2655 dest->ensure_capacity(src->length);
2656 for (size_t i = 0; i < src->length; i += 1) {
2657 AstNode *src_node = src->at(i);
2658 assert(src_node->type == NodeTypeParamDecl);
2659 if (src_node->data.param_decl.is_inline) {
2660 continue;
2661 }
2662 dest->append(ast_clone_subtree(src_node, next_node_index));
2663 dest->last()->parent_field = &dest->last();
2664 }
2665}
2666
2667static void clone_subtree_field_special(AstNode **dest, AstNode *src, uint32_t *next_node_index,
2668 enum AstCloneSpecial special)
2669{
2670 if (src) {
2671 *dest = ast_clone_subtree_special(src, next_node_index, special);
2672 (*dest)->parent_field = dest;
2673 } else {
2674 *dest = nullptr;
2675 }
2676}
2677
2678static void clone_subtree_field(AstNode **dest, AstNode *src, uint32_t *next_node_index) {
2679 return clone_subtree_field_special(dest, src, next_node_index, AstCloneSpecialNone);
2680}
2681
2682AstNode *ast_clone_subtree_special(AstNode *old_node, uint32_t *next_node_index, enum AstCloneSpecial special) {
2683 AstNode *new_node = allocate_nonzero<AstNode>(1);
2684 safe_memcpy(new_node, old_node, 1);
2685 new_node->create_index = *next_node_index;
2686 *next_node_index += 1;
2687 new_node->parent_field = nullptr;
2688
2689 switch (new_node->type) {
2690 case NodeTypeRoot:
2691 clone_subtree_list(&new_node->data.root.top_level_decls,
2692 &old_node->data.root.top_level_decls, next_node_index);
2693 break;
2694 case NodeTypeFnProto:
2695 clone_subtree_field(&new_node->data.fn_proto.return_type, old_node->data.fn_proto.return_type,
2696 next_node_index);
2697
2698 if (special == AstCloneSpecialOmitInlineParams) {
2699 clone_subtree_list_omit_inline_params(&new_node->data.fn_proto.params, &old_node->data.fn_proto.params,
2700 next_node_index);
2701 } else {
2702 clone_subtree_list(&new_node->data.fn_proto.params, &old_node->data.fn_proto.params,
2703 next_node_index);
2704 }
2705
2706 break;
2707 case NodeTypeFnDef:
2708 clone_subtree_field_special(&new_node->data.fn_def.fn_proto, old_node->data.fn_def.fn_proto,
2709 next_node_index, special);
2710 new_node->data.fn_def.fn_proto->data.fn_proto.fn_def_node = new_node;
2711 clone_subtree_field(&new_node->data.fn_def.body, old_node->data.fn_def.body, next_node_index);
2712 break;
2713 case NodeTypeFnDecl:
2714 clone_subtree_field(&new_node->data.fn_decl.fn_proto, old_node->data.fn_decl.fn_proto,
2715 next_node_index);
2716 break;
2717 case NodeTypeParamDecl:
2718 clone_subtree_field(&new_node->data.param_decl.type, old_node->data.param_decl.type, next_node_index);
2719 break;
2720 case NodeTypeBlock:
2721 clone_subtree_list(&new_node->data.block.statements, &old_node->data.block.statements,
2722 next_node_index);
2723 break;
2724 case NodeTypeReturnExpr:
2725 clone_subtree_field(&new_node->data.return_expr.expr, old_node->data.return_expr.expr, next_node_index);
2726 break;
2727 case NodeTypeDefer:
2728 clone_subtree_field(&new_node->data.defer.expr, old_node->data.defer.expr, next_node_index);
2729 break;
2730 case NodeTypeVariableDeclaration:
2731 clone_subtree_field(&new_node->data.variable_declaration.type, old_node->data.variable_declaration.type, next_node_index);
2732 clone_subtree_field(&new_node->data.variable_declaration.expr, old_node->data.variable_declaration.expr, next_node_index);
2733 break;
2734 case NodeTypeTypeDecl:
2735 clone_subtree_field(&new_node->data.type_decl.child_type, old_node->data.type_decl.child_type, next_node_index);
2736 break;
2737 case NodeTypeErrorValueDecl:
2738 // none
2739 break;
2740 case NodeTypeBinOpExpr:
2741 clone_subtree_field(&new_node->data.bin_op_expr.op1, old_node->data.bin_op_expr.op1, next_node_index);
2742 clone_subtree_field(&new_node->data.bin_op_expr.op2, old_node->data.bin_op_expr.op2, next_node_index);
2743 break;
2744 case NodeTypeUnwrapErrorExpr:
2745 clone_subtree_field(&new_node->data.unwrap_err_expr.op1, old_node->data.unwrap_err_expr.op1, next_node_index);
2746 clone_subtree_field(&new_node->data.unwrap_err_expr.symbol, old_node->data.unwrap_err_expr.symbol, next_node_index);
2747 clone_subtree_field(&new_node->data.unwrap_err_expr.op2, old_node->data.unwrap_err_expr.op2, next_node_index);
2748 break;
2749 case NodeTypeNumberLiteral:
2750 // none
2751 break;
2752 case NodeTypeStringLiteral:
2753 // none
2754 break;
2755 case NodeTypeCharLiteral:
2756 // none
2757 break;
2758 case NodeTypeSymbol:
2759 // none
2760 break;
2761 case NodeTypePrefixOpExpr:
2762 clone_subtree_field(&new_node->data.prefix_op_expr.primary_expr,
2763 old_node->data.prefix_op_expr.primary_expr, next_node_index);
2764 break;
2765 case NodeTypeFnCallExpr:
2766 clone_subtree_field(&new_node->data.fn_call_expr.fn_ref_expr,
2767 old_node->data.fn_call_expr.fn_ref_expr, next_node_index);
2768 clone_subtree_list(&new_node->data.fn_call_expr.params,
2769 &old_node->data.fn_call_expr.params, next_node_index);
2770 break;
2771 case NodeTypeArrayAccessExpr:
2772 clone_subtree_field(&new_node->data.array_access_expr.array_ref_expr,
2773 old_node->data.array_access_expr.array_ref_expr, next_node_index);
2774 clone_subtree_field(&new_node->data.array_access_expr.subscript,
2775 old_node->data.array_access_expr.subscript, next_node_index);
2776 break;
2777 case NodeTypeSliceExpr:
2778 clone_subtree_field(&new_node->data.slice_expr.array_ref_expr, old_node->data.slice_expr.array_ref_expr, next_node_index);
2779 clone_subtree_field(&new_node->data.slice_expr.start, old_node->data.slice_expr.start, next_node_index);
2780 clone_subtree_field(&new_node->data.slice_expr.end, old_node->data.slice_expr.end, next_node_index);
2781 break;
2782 case NodeTypeFieldAccessExpr:
2783 clone_subtree_field(&new_node->data.field_access_expr.struct_expr, old_node->data.field_access_expr.struct_expr, next_node_index);
2784 break;
2785 case NodeTypeUse:
2786 clone_subtree_field(&new_node->data.use.expr, old_node->data.use.expr, next_node_index);
2787 break;
2788 case NodeTypeBoolLiteral:
2789 // none
2790 break;
2791 case NodeTypeNullLiteral:
2792 // none
2793 break;
2794 case NodeTypeUndefinedLiteral:
2795 // none
2796 break;
2797 case NodeTypeZeroesLiteral:
2798 // none
2799 break;
2800 case NodeTypeThisLiteral:
2801 // none
2802 break;
2803 case NodeTypeIfBoolExpr:
2804 clone_subtree_field(&new_node->data.if_bool_expr.condition, old_node->data.if_bool_expr.condition, next_node_index);
2805 clone_subtree_field(&new_node->data.if_bool_expr.then_block, old_node->data.if_bool_expr.then_block, next_node_index);
2806 clone_subtree_field(&new_node->data.if_bool_expr.else_node, old_node->data.if_bool_expr.else_node, next_node_index);
2807 break;
2808 case NodeTypeIfVarExpr:
2809 clone_subtree_field(&new_node->data.if_var_expr.var_decl.type, old_node->data.if_var_expr.var_decl.type, next_node_index);
2810 clone_subtree_field(&new_node->data.if_var_expr.var_decl.expr, old_node->data.if_var_expr.var_decl.expr, next_node_index);
2811 clone_subtree_field(&new_node->data.if_var_expr.then_block, old_node->data.if_var_expr.then_block, next_node_index);
2812 clone_subtree_field(&new_node->data.if_var_expr.else_node, old_node->data.if_var_expr.else_node, next_node_index);
2813 break;
2814 case NodeTypeWhileExpr:
2815 clone_subtree_field(&new_node->data.while_expr.condition, old_node->data.while_expr.condition, next_node_index);
2816 clone_subtree_field(&new_node->data.while_expr.body, old_node->data.while_expr.body, next_node_index);
2817 clone_subtree_field(&new_node->data.while_expr.continue_expr,
2818 old_node->data.while_expr.continue_expr, next_node_index);
2819 break;
2820 case NodeTypeForExpr:
2821 clone_subtree_field(&new_node->data.for_expr.elem_node, old_node->data.for_expr.elem_node, next_node_index);
2822 clone_subtree_field(&new_node->data.for_expr.array_expr, old_node->data.for_expr.array_expr, next_node_index);
2823 clone_subtree_field(&new_node->data.for_expr.index_node, old_node->data.for_expr.index_node, next_node_index);
2824 clone_subtree_field(&new_node->data.for_expr.body, old_node->data.for_expr.body, next_node_index);
2825 break;
2826 case NodeTypeSwitchExpr:
2827 clone_subtree_field(&new_node->data.switch_expr.expr, old_node->data.switch_expr.expr, next_node_index);
2828 clone_subtree_list(&new_node->data.switch_expr.prongs, &old_node->data.switch_expr.prongs,
2829 next_node_index);
2830 break;
2831 case NodeTypeSwitchProng:
2832 clone_subtree_list(&new_node->data.switch_prong.items, &old_node->data.switch_prong.items,
2833 next_node_index);
2834 clone_subtree_field(&new_node->data.switch_prong.var_symbol, old_node->data.switch_prong.var_symbol, next_node_index);
2835 clone_subtree_field(&new_node->data.switch_prong.expr, old_node->data.switch_prong.expr, next_node_index);
2836 break;
2837 case NodeTypeSwitchRange:
2838 clone_subtree_field(&new_node->data.switch_range.start, old_node->data.switch_range.start, next_node_index);
2839 clone_subtree_field(&new_node->data.switch_range.end, old_node->data.switch_range.end, next_node_index);
2840 break;
2841 case NodeTypeLabel:
2842 // none
2843 break;
2844 case NodeTypeGoto:
2845 // none
2846 break;
2847 case NodeTypeBreak:
2848 // none
2849 break;
2850 case NodeTypeContinue:
2851 // none
2852 break;
2853 case NodeTypeAsmExpr:
2854 zig_panic("TODO");
2855 break;
2856 case NodeTypeContainerDecl:
2857 clone_subtree_list(&new_node->data.struct_decl.fields, &old_node->data.struct_decl.fields,
2858 next_node_index);
2859 clone_subtree_list(&new_node->data.struct_decl.decls, &old_node->data.struct_decl.decls,
2860 next_node_index);
2861 break;
2862 case NodeTypeStructField:
2863 clone_subtree_field(&new_node->data.struct_field.type, old_node->data.struct_field.type, next_node_index);
2864 break;
2865 case NodeTypeContainerInitExpr:
2866 clone_subtree_field(&new_node->data.container_init_expr.type, old_node->data.container_init_expr.type, next_node_index);
2867 clone_subtree_list(&new_node->data.container_init_expr.entries,
2868 &old_node->data.container_init_expr.entries, next_node_index);
2869 break;
2870 case NodeTypeStructValueField:
2871 clone_subtree_field(&new_node->data.struct_val_field.expr, old_node->data.struct_val_field.expr, next_node_index);
2872 break;
2873 case NodeTypeArrayType:
2874 clone_subtree_field(&new_node->data.array_type.size, old_node->data.array_type.size, next_node_index);
2875 clone_subtree_field(&new_node->data.array_type.child_type, old_node->data.array_type.child_type, next_node_index);
2876 break;
2877 case NodeTypeErrorType:
2878 // none
2879 break;
2880 case NodeTypeTypeLiteral:
2881 // none
2882 break;
2883 case NodeTypeVarLiteral:
2884 // none
2885 break;
2886 }
2887
2888 return new_node;
2889}
2890
2891AstNode *ast_clone_subtree(AstNode *old_node, uint32_t *next_node_index) {
2892 return ast_clone_subtree_special(old_node, next_node_index, AstCloneSpecialNone);
2893}
src/parser.hpp-10
......@@ -22,16 +22,6 @@ AstNode * ast_parse(Buf *buf, ZigList<Token> *tokens, ImportTableEntry *owner, E
2222
2323void ast_print(AstNode *node, int indent);
2424
25void normalize_parent_ptrs(AstNode *node);
26
27AstNode *ast_clone_subtree(AstNode *node, uint32_t *next_node_index);
28
29enum AstCloneSpecial {
30 AstCloneSpecialNone,
31 AstCloneSpecialOmitInlineParams,
32};
33AstNode *ast_clone_subtree_special(AstNode *node, uint32_t *next_node_index, enum AstCloneSpecial special);
34
3525void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *context), void *context);
3626
3727#endif