authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-07-17 16:30:41-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-07-17 16:30:41-07:00
log425c0ffa014fb950a4f9f90aa9a200fbc4d8e091
tree8575e5e71c8c8985dc967fb36257c28793a21bba
parent3971bf3d728ebb78a90caab504827db8a4c24423

rename NodeTypeStructDecl to NodeTypeContainerDecl

7 files changed, 25 insertions(+), 25 deletions(-)

src/all_types.hpp+1-1
......@@ -179,7 +179,7 @@ enum NodeType {
179179 NodeTypeBreak,
180180 NodeTypeContinue,
181181 NodeTypeAsmExpr,
182 NodeTypeStructDecl,
182 NodeTypeContainerDecl,
183183 NodeTypeStructField,
184184 NodeTypeContainerInitExpr,
185185 NodeTypeStructValueField,
src/analyze.cpp+14-14
......@@ -95,7 +95,7 @@ static AstNode *first_executing_node(AstNode *node) {
9595 case NodeTypeBreak:
9696 case NodeTypeContinue:
9797 case NodeTypeAsmExpr:
98 case NodeTypeStructDecl:
98 case NodeTypeContainerDecl:
9999 case NodeTypeStructField:
100100 case NodeTypeStructValueField:
101101 case NodeTypeWhileExpr:
......@@ -1505,7 +1505,7 @@ static void preview_generic_fn_proto(CodeGen *g, ImportTableEntry *import, AstNo
15051505 }
15061506
15071507 node->data.fn_proto.generic_fn_type = get_generic_fn_type(g, node);
1508 } else if (node->type == NodeTypeStructDecl) {
1508 } else if (node->type == NodeTypeContainerDecl) {
15091509 if (node->data.struct_decl.generic_params_is_var_args) {
15101510 add_node_error(g, node, buf_sprintf("generic parameters cannot be var args"));
15111511 node->data.struct_decl.skip = true;
......@@ -1589,7 +1589,7 @@ static void preview_fn_proto(CodeGen *g, ImportTableEntry *import, AstNode *prot
15891589}
15901590
15911591static void scan_struct_decl(CodeGen *g, ImportTableEntry *import, BlockContext *context, AstNode *node) {
1592 assert(node->type == NodeTypeStructDecl);
1592 assert(node->type == NodeTypeContainerDecl);
15931593
15941594 if (node->data.struct_decl.type_entry) {
15951595 // already scanned; we can ignore. This can happen from importing from an .h file.
......@@ -1666,7 +1666,7 @@ static void resolve_top_level_decl(CodeGen *g, AstNode *node, bool pointer_only)
16661666 if (tld->resolution != TldResolutionUnresolved) {
16671667 return;
16681668 }
1669 if (pointer_only && node->type == NodeTypeStructDecl) {
1669 if (pointer_only && node->type == NodeTypeContainerDecl) {
16701670 return;
16711671 }
16721672
......@@ -1685,7 +1685,7 @@ static void resolve_top_level_decl(CodeGen *g, AstNode *node, bool pointer_only)
16851685 case NodeTypeFnProto:
16861686 preview_fn_proto(g, import, node);
16871687 break;
1688 case NodeTypeStructDecl:
1688 case NodeTypeContainerDecl:
16891689 resolve_struct_decl(g, import, node);
16901690 break;
16911691 case NodeTypeVariableDeclaration:
......@@ -3013,7 +3013,7 @@ static TypeTableEntry *analyze_decl_ref(CodeGen *g, AstNode *source_node, AstNod
30133013 assert(fn_entry->type_entry);
30143014 return resolve_expr_const_val_as_fn(g, source_node, fn_entry, depends_on_compile_var);
30153015 }
3016 } else if (decl_node->type == NodeTypeStructDecl) {
3016 } else if (decl_node->type == NodeTypeContainerDecl) {
30173017 if (decl_node->data.struct_decl.generic_params.length > 0) {
30183018 TypeTableEntry *type_entry = decl_node->data.struct_decl.generic_fn_type;
30193019 assert(type_entry);
......@@ -5355,7 +5355,7 @@ static TypeTableEntry *analyze_generic_fn_call(CodeGen *g, ImportTableEntry *imp
53555355 ZigList<AstNode *> *generic_params;
53565356 if (decl_node->type == NodeTypeFnProto) {
53575357 generic_params = &decl_node->data.fn_proto.generic_params;
5358 } else if (decl_node->type == NodeTypeStructDecl) {
5358 } else if (decl_node->type == NodeTypeContainerDecl) {
53595359 generic_params = &decl_node->data.struct_decl.generic_params;
53605360 } else {
53615361 zig_unreachable();
......@@ -5423,7 +5423,7 @@ static TypeTableEntry *analyze_generic_fn_call(CodeGen *g, ImportTableEntry *imp
54235423 if (impl_decl_node->type == NodeTypeFnProto) {
54245424 FnTableEntry *fn_table_entry = impl_decl_node->data.fn_proto.fn_table_entry;
54255425 return resolve_expr_const_val_as_fn(g, node, fn_table_entry, false);
5426 } else if (impl_decl_node->type == NodeTypeStructDecl) {
5426 } else if (impl_decl_node->type == NodeTypeContainerDecl) {
54275427 TypeTableEntry *type_entry = impl_decl_node->data.struct_decl.type_entry;
54285428 return resolve_expr_const_val_as_type(g, node, type_entry, false);
54295429 } else {
......@@ -5440,7 +5440,7 @@ static TypeTableEntry *analyze_generic_fn_call(CodeGen *g, ImportTableEntry *imp
54405440 g->generic_table.put(generic_fn_type_id, impl_decl_node);
54415441 FnTableEntry *fn_table_entry = impl_decl_node->data.fn_proto.fn_table_entry;
54425442 return resolve_expr_const_val_as_fn(g, node, fn_table_entry, false);
5443 } else if (decl_node->type == NodeTypeStructDecl) {
5443 } else if (decl_node->type == NodeTypeContainerDecl) {
54445444 AstNode *impl_decl_node = ast_clone_subtree(decl_node, &g->next_node_index);
54455445 g->generic_table.put(generic_fn_type_id, impl_decl_node);
54465446 scan_struct_decl(g, import, child_context, impl_decl_node);
......@@ -6291,7 +6291,7 @@ static TypeTableEntry *analyze_expression_pointer_only(CodeGen *g, ImportTableEn
62916291 case NodeTypeFnDef:
62926292 case NodeTypeUse:
62936293 case NodeTypeLabel:
6294 case NodeTypeStructDecl:
6294 case NodeTypeContainerDecl:
62956295 case NodeTypeStructField:
62966296 case NodeTypeStructValueField:
62976297 case NodeTypeErrorValueDecl:
......@@ -6408,7 +6408,7 @@ static void add_top_level_decl(CodeGen *g, ImportTableEntry *import, BlockContex
64086408
64096409 bool want_as_export = (g->check_unused || g->is_test_build || tld->visib_mod == VisibModExport);
64106410 bool is_generic = (node->type == NodeTypeFnProto && node->data.fn_proto.generic_params.length > 0) ||
6411 (node->type == NodeTypeStructDecl && node->data.struct_decl.generic_params.length > 0);
6411 (node->type == NodeTypeContainerDecl && node->data.struct_decl.generic_params.length > 0);
64126412 if (!is_generic && want_as_export) {
64136413 g->export_queue.append(node);
64146414 }
......@@ -6433,7 +6433,7 @@ static void scan_decls(CodeGen *g, ImportTableEntry *import, BlockContext *conte
64336433 scan_decls(g, import, context, child);
64346434 }
64356435 break;
6436 case NodeTypeStructDecl:
6436 case NodeTypeContainerDecl:
64376437 {
64386438 Buf *name = &node->data.struct_decl.name;
64396439 add_top_level_decl(g, import, context, node, name);
......@@ -6782,7 +6782,7 @@ Expr *get_resolved_expr(AstNode *node) {
67826782 case NodeTypeParamDecl:
67836783 case NodeTypeDirective:
67846784 case NodeTypeUse:
6785 case NodeTypeStructDecl:
6785 case NodeTypeContainerDecl:
67866786 case NodeTypeStructField:
67876787 case NodeTypeStructValueField:
67886788 case NodeTypeErrorValueDecl:
......@@ -6800,7 +6800,7 @@ static TopLevelDecl *get_as_top_level_decl(AstNode *node) {
68006800 return &node->data.fn_proto.top_level_decl;
68016801 case NodeTypeFnDef:
68026802 return &node->data.fn_def.fn_proto->data.fn_proto.top_level_decl;
6803 case NodeTypeStructDecl:
6803 case NodeTypeContainerDecl:
68046804 return &node->data.struct_decl.top_level_decl;
68056805 case NodeTypeErrorValueDecl:
68066806 return &node->data.error_value_decl.top_level_decl;
src/ast_render.cpp+3-3
......@@ -170,8 +170,8 @@ static const char *node_type_str(NodeType node_type) {
170170 return "AsmExpr";
171171 case NodeTypeFieldAccessExpr:
172172 return "FieldAccessExpr";
173 case NodeTypeStructDecl:
174 return "StructDecl";
173 case NodeTypeContainerDecl:
174 return "ContainerDecl";
175175 case NodeTypeStructField:
176176 return "StructField";
177177 case NodeTypeStructValueField:
......@@ -565,7 +565,7 @@ static void render_node(AstRender *ar, AstNode *node) {
565565 zig_panic("TODO");
566566 case NodeTypeAsmExpr:
567567 zig_panic("TODO");
568 case NodeTypeStructDecl:
568 case NodeTypeContainerDecl:
569569 {
570570 const char *struct_name = buf_ptr(&node->data.struct_decl.name);
571571 const char *pub_str = visib_mod_string(node->data.struct_decl.top_level_decl.visib_mod);
src/codegen.cpp+1-1
......@@ -3487,7 +3487,7 @@ static LLVMValueRef gen_expr(CodeGen *g, AstNode *node) {
34873487 case NodeTypeParamDecl:
34883488 case NodeTypeDirective:
34893489 case NodeTypeUse:
3490 case NodeTypeStructDecl:
3490 case NodeTypeContainerDecl:
34913491 case NodeTypeStructField:
34923492 case NodeTypeStructValueField:
34933493 case NodeTypeSwitchProng:
src/eval.cpp+1-1
......@@ -1269,7 +1269,7 @@ static bool eval_expr(EvalFn *ef, AstNode *node, ConstExprValue *out) {
12691269 case NodeTypeGoto:
12701270 case NodeTypeBreak:
12711271 case NodeTypeContinue:
1272 case NodeTypeStructDecl:
1272 case NodeTypeContainerDecl:
12731273 case NodeTypeStructField:
12741274 case NodeTypeStructValueField:
12751275 case NodeTypeArrayType:
src/parseh.cpp+2-2
......@@ -936,7 +936,7 @@ static void visit_enum_decl(Context *c, const EnumDecl *enum_decl) {
936936 if (enum_type->id == TypeTableEntryIdEnum) {
937937 if (enum_type->data.enumeration.complete) {
938938 // now create top level decl for the type
939 AstNode *enum_node = create_node(c, NodeTypeStructDecl);
939 AstNode *enum_node = create_node(c, NodeTypeContainerDecl);
940940 buf_init_from_buf(&enum_node->data.struct_decl.name, &enum_type->name);
941941 enum_node->data.struct_decl.kind = ContainerKindEnum;
942942 enum_node->data.struct_decl.top_level_decl.visib_mod = VisibModExport;
......@@ -1113,7 +1113,7 @@ static void visit_record_decl(Context *c, const RecordDecl *record_decl) {
11131113
11141114 if (struct_type->data.structure.complete) {
11151115 // now create a top level decl node for the type
1116 AstNode *struct_node = create_node(c, NodeTypeStructDecl);
1116 AstNode *struct_node = create_node(c, NodeTypeContainerDecl);
11171117 buf_init_from_buf(&struct_node->data.struct_decl.name, &struct_type->name);
11181118 struct_node->data.struct_decl.kind = ContainerKindStruct;
11191119 struct_node->data.struct_decl.top_level_decl.visib_mod = VisibModExport;
src/parser.cpp+3-3
......@@ -2659,7 +2659,7 @@ static AstNode *ast_parse_container_decl(ParseContext *pc, int *token_index,
26592659
26602660 Token *struct_name = ast_eat_token(pc, token_index, TokenIdSymbol);
26612661
2662 AstNode *node = ast_create_node(pc, NodeTypeStructDecl, first_token);
2662 AstNode *node = ast_create_node(pc, NodeTypeContainerDecl, first_token);
26632663 node->data.struct_decl.kind = kind;
26642664 ast_buf_from_token(pc, struct_name, &node->data.struct_decl.name);
26652665 node->data.struct_decl.top_level_decl.visib_mod = visib_mod;
......@@ -3077,7 +3077,7 @@ void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *cont
30773077 visit_field(&asm_output->return_type, visit, context);
30783078 }
30793079 break;
3080 case NodeTypeStructDecl:
3080 case NodeTypeContainerDecl:
30813081 visit_node_list(&node->data.struct_decl.fields, visit, context);
30823082 visit_node_list(&node->data.struct_decl.decls, visit, context);
30833083 visit_node_list(node->data.struct_decl.top_level_decl.directives, visit, context);
......@@ -3319,7 +3319,7 @@ AstNode *ast_clone_subtree(AstNode *old_node, uint32_t *next_node_index) {
33193319 case NodeTypeAsmExpr:
33203320 zig_panic("TODO");
33213321 break;
3322 case NodeTypeStructDecl:
3322 case NodeTypeContainerDecl:
33233323 clone_subtree_list(&new_node->data.struct_decl.fields, &old_node->data.struct_decl.fields,
33243324 next_node_index);
33253325 clone_subtree_list(&new_node->data.struct_decl.decls, &old_node->data.struct_decl.decls,