From 425c0ffa014fb950a4f9f90aa9a200fbc4d8e091 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 17 Jul 2016 16:30:41 -0700 Subject: rename NodeTypeStructDecl to NodeTypeContainerDecl --- src/all_types.hpp | 2 +- src/analyze.cpp | 28 ++++++++++++++-------------- src/ast_render.cpp | 6 +++--- src/codegen.cpp | 2 +- src/eval.cpp | 2 +- src/parseh.cpp | 4 ++-- src/parser.cpp | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/all_types.hpp b/src/all_types.hpp index 329bbb4249..49336f8924 100644 --- a/src/all_types.hpp +++ b/src/all_types.hpp @@ -179,7 +179,7 @@ enum NodeType { NodeTypeBreak, NodeTypeContinue, NodeTypeAsmExpr, - NodeTypeStructDecl, + NodeTypeContainerDecl, NodeTypeStructField, NodeTypeContainerInitExpr, NodeTypeStructValueField, diff --git a/src/analyze.cpp b/src/analyze.cpp index 28a9070bf0..2f7a1f78b7 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -95,7 +95,7 @@ static AstNode *first_executing_node(AstNode *node) { case NodeTypeBreak: case NodeTypeContinue: case NodeTypeAsmExpr: - case NodeTypeStructDecl: + case NodeTypeContainerDecl: case NodeTypeStructField: case NodeTypeStructValueField: case NodeTypeWhileExpr: @@ -1505,7 +1505,7 @@ static void preview_generic_fn_proto(CodeGen *g, ImportTableEntry *import, AstNo } node->data.fn_proto.generic_fn_type = get_generic_fn_type(g, node); - } else if (node->type == NodeTypeStructDecl) { + } else if (node->type == NodeTypeContainerDecl) { if (node->data.struct_decl.generic_params_is_var_args) { add_node_error(g, node, buf_sprintf("generic parameters cannot be var args")); node->data.struct_decl.skip = true; @@ -1589,7 +1589,7 @@ static void preview_fn_proto(CodeGen *g, ImportTableEntry *import, AstNode *prot } static void scan_struct_decl(CodeGen *g, ImportTableEntry *import, BlockContext *context, AstNode *node) { - assert(node->type == NodeTypeStructDecl); + assert(node->type == NodeTypeContainerDecl); if (node->data.struct_decl.type_entry) { // 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) if (tld->resolution != TldResolutionUnresolved) { return; } - if (pointer_only && node->type == NodeTypeStructDecl) { + if (pointer_only && node->type == NodeTypeContainerDecl) { return; } @@ -1685,7 +1685,7 @@ static void resolve_top_level_decl(CodeGen *g, AstNode *node, bool pointer_only) case NodeTypeFnProto: preview_fn_proto(g, import, node); break; - case NodeTypeStructDecl: + case NodeTypeContainerDecl: resolve_struct_decl(g, import, node); break; case NodeTypeVariableDeclaration: @@ -3013,7 +3013,7 @@ static TypeTableEntry *analyze_decl_ref(CodeGen *g, AstNode *source_node, AstNod assert(fn_entry->type_entry); return resolve_expr_const_val_as_fn(g, source_node, fn_entry, depends_on_compile_var); } - } else if (decl_node->type == NodeTypeStructDecl) { + } else if (decl_node->type == NodeTypeContainerDecl) { if (decl_node->data.struct_decl.generic_params.length > 0) { TypeTableEntry *type_entry = decl_node->data.struct_decl.generic_fn_type; assert(type_entry); @@ -5355,7 +5355,7 @@ static TypeTableEntry *analyze_generic_fn_call(CodeGen *g, ImportTableEntry *imp ZigList *generic_params; if (decl_node->type == NodeTypeFnProto) { generic_params = &decl_node->data.fn_proto.generic_params; - } else if (decl_node->type == NodeTypeStructDecl) { + } else if (decl_node->type == NodeTypeContainerDecl) { generic_params = &decl_node->data.struct_decl.generic_params; } else { zig_unreachable(); @@ -5423,7 +5423,7 @@ static TypeTableEntry *analyze_generic_fn_call(CodeGen *g, ImportTableEntry *imp if (impl_decl_node->type == NodeTypeFnProto) { FnTableEntry *fn_table_entry = impl_decl_node->data.fn_proto.fn_table_entry; return resolve_expr_const_val_as_fn(g, node, fn_table_entry, false); - } else if (impl_decl_node->type == NodeTypeStructDecl) { + } else if (impl_decl_node->type == NodeTypeContainerDecl) { TypeTableEntry *type_entry = impl_decl_node->data.struct_decl.type_entry; return resolve_expr_const_val_as_type(g, node, type_entry, false); } else { @@ -5440,7 +5440,7 @@ static TypeTableEntry *analyze_generic_fn_call(CodeGen *g, ImportTableEntry *imp g->generic_table.put(generic_fn_type_id, impl_decl_node); FnTableEntry *fn_table_entry = impl_decl_node->data.fn_proto.fn_table_entry; return resolve_expr_const_val_as_fn(g, node, fn_table_entry, false); - } else if (decl_node->type == NodeTypeStructDecl) { + } else if (decl_node->type == NodeTypeContainerDecl) { AstNode *impl_decl_node = ast_clone_subtree(decl_node, &g->next_node_index); g->generic_table.put(generic_fn_type_id, impl_decl_node); scan_struct_decl(g, import, child_context, impl_decl_node); @@ -6291,7 +6291,7 @@ static TypeTableEntry *analyze_expression_pointer_only(CodeGen *g, ImportTableEn case NodeTypeFnDef: case NodeTypeUse: case NodeTypeLabel: - case NodeTypeStructDecl: + case NodeTypeContainerDecl: case NodeTypeStructField: case NodeTypeStructValueField: case NodeTypeErrorValueDecl: @@ -6408,7 +6408,7 @@ static void add_top_level_decl(CodeGen *g, ImportTableEntry *import, BlockContex bool want_as_export = (g->check_unused || g->is_test_build || tld->visib_mod == VisibModExport); bool is_generic = (node->type == NodeTypeFnProto && node->data.fn_proto.generic_params.length > 0) || - (node->type == NodeTypeStructDecl && node->data.struct_decl.generic_params.length > 0); + (node->type == NodeTypeContainerDecl && node->data.struct_decl.generic_params.length > 0); if (!is_generic && want_as_export) { g->export_queue.append(node); } @@ -6433,7 +6433,7 @@ static void scan_decls(CodeGen *g, ImportTableEntry *import, BlockContext *conte scan_decls(g, import, context, child); } break; - case NodeTypeStructDecl: + case NodeTypeContainerDecl: { Buf *name = &node->data.struct_decl.name; add_top_level_decl(g, import, context, node, name); @@ -6782,7 +6782,7 @@ Expr *get_resolved_expr(AstNode *node) { case NodeTypeParamDecl: case NodeTypeDirective: case NodeTypeUse: - case NodeTypeStructDecl: + case NodeTypeContainerDecl: case NodeTypeStructField: case NodeTypeStructValueField: case NodeTypeErrorValueDecl: @@ -6800,7 +6800,7 @@ static TopLevelDecl *get_as_top_level_decl(AstNode *node) { return &node->data.fn_proto.top_level_decl; case NodeTypeFnDef: return &node->data.fn_def.fn_proto->data.fn_proto.top_level_decl; - case NodeTypeStructDecl: + case NodeTypeContainerDecl: return &node->data.struct_decl.top_level_decl; case NodeTypeErrorValueDecl: return &node->data.error_value_decl.top_level_decl; diff --git a/src/ast_render.cpp b/src/ast_render.cpp index 3ce435a959..86b70d3c39 100644 --- a/src/ast_render.cpp +++ b/src/ast_render.cpp @@ -170,8 +170,8 @@ static const char *node_type_str(NodeType node_type) { return "AsmExpr"; case NodeTypeFieldAccessExpr: return "FieldAccessExpr"; - case NodeTypeStructDecl: - return "StructDecl"; + case NodeTypeContainerDecl: + return "ContainerDecl"; case NodeTypeStructField: return "StructField"; case NodeTypeStructValueField: @@ -565,7 +565,7 @@ static void render_node(AstRender *ar, AstNode *node) { zig_panic("TODO"); case NodeTypeAsmExpr: zig_panic("TODO"); - case NodeTypeStructDecl: + case NodeTypeContainerDecl: { const char *struct_name = buf_ptr(&node->data.struct_decl.name); const char *pub_str = visib_mod_string(node->data.struct_decl.top_level_decl.visib_mod); diff --git a/src/codegen.cpp b/src/codegen.cpp index 43fc41bed9..da2aa25416 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -3487,7 +3487,7 @@ static LLVMValueRef gen_expr(CodeGen *g, AstNode *node) { case NodeTypeParamDecl: case NodeTypeDirective: case NodeTypeUse: - case NodeTypeStructDecl: + case NodeTypeContainerDecl: case NodeTypeStructField: case NodeTypeStructValueField: case NodeTypeSwitchProng: diff --git a/src/eval.cpp b/src/eval.cpp index f7ef68467a..334a15fb4b 100644 --- a/src/eval.cpp +++ b/src/eval.cpp @@ -1269,7 +1269,7 @@ static bool eval_expr(EvalFn *ef, AstNode *node, ConstExprValue *out) { case NodeTypeGoto: case NodeTypeBreak: case NodeTypeContinue: - case NodeTypeStructDecl: + case NodeTypeContainerDecl: case NodeTypeStructField: case NodeTypeStructValueField: case NodeTypeArrayType: diff --git a/src/parseh.cpp b/src/parseh.cpp index ef457b51a8..812807684b 100644 --- a/src/parseh.cpp +++ b/src/parseh.cpp @@ -936,7 +936,7 @@ static void visit_enum_decl(Context *c, const EnumDecl *enum_decl) { if (enum_type->id == TypeTableEntryIdEnum) { if (enum_type->data.enumeration.complete) { // now create top level decl for the type - AstNode *enum_node = create_node(c, NodeTypeStructDecl); + AstNode *enum_node = create_node(c, NodeTypeContainerDecl); buf_init_from_buf(&enum_node->data.struct_decl.name, &enum_type->name); enum_node->data.struct_decl.kind = ContainerKindEnum; 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) { if (struct_type->data.structure.complete) { // now create a top level decl node for the type - AstNode *struct_node = create_node(c, NodeTypeStructDecl); + AstNode *struct_node = create_node(c, NodeTypeContainerDecl); buf_init_from_buf(&struct_node->data.struct_decl.name, &struct_type->name); struct_node->data.struct_decl.kind = ContainerKindStruct; struct_node->data.struct_decl.top_level_decl.visib_mod = VisibModExport; diff --git a/src/parser.cpp b/src/parser.cpp index bafcbd767e..ff9a6268f9 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -2659,7 +2659,7 @@ static AstNode *ast_parse_container_decl(ParseContext *pc, int *token_index, Token *struct_name = ast_eat_token(pc, token_index, TokenIdSymbol); - AstNode *node = ast_create_node(pc, NodeTypeStructDecl, first_token); + AstNode *node = ast_create_node(pc, NodeTypeContainerDecl, first_token); node->data.struct_decl.kind = kind; ast_buf_from_token(pc, struct_name, &node->data.struct_decl.name); 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 visit_field(&asm_output->return_type, visit, context); } break; - case NodeTypeStructDecl: + case NodeTypeContainerDecl: visit_node_list(&node->data.struct_decl.fields, visit, context); visit_node_list(&node->data.struct_decl.decls, visit, context); 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) { case NodeTypeAsmExpr: zig_panic("TODO"); break; - case NodeTypeStructDecl: + case NodeTypeContainerDecl: clone_subtree_list(&new_node->data.struct_decl.fields, &old_node->data.struct_decl.fields, next_node_index); clone_subtree_list(&new_node->data.struct_decl.decls, &old_node->data.struct_decl.decls, -- cgit v1.2.3