authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-12-18 17:53:12-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-12-18 17:53:12-05:00
log4816121e008aa4c28241a94253b0c4a2b7b6ba7c
treec9f54883ca9dfcbada61a182a356eed1dc253cc4
parentba008fb9d7bb6cbffba57dcde0853a9f7cc2f674

remove duplicate definition of container_string

3 files changed, 3 insertions(+), 10 deletions(-)

src/ast_render.cpp+1-1
...@@ -115,7 +115,7 @@ static const char *const_or_var_string(bool is_const) {...@@ -115,7 +115,7 @@ static const char *const_or_var_string(bool is_const) {
115 return is_const ? "const" : "var";115 return is_const ? "const" : "var";
116}116}
117117
118static const char *container_string(ContainerKind kind) {118const char *container_string(ContainerKind kind) {
119 switch (kind) {119 switch (kind) {
120 case ContainerKindEnum: return "enum";120 case ContainerKindEnum: return "enum";
121 case ContainerKindStruct: return "struct";121 case ContainerKindStruct: return "struct";
src/ast_render.hpp+2
...@@ -17,5 +17,7 @@ void ast_print(FILE *f, AstNode *node, int indent);...@@ -17,5 +17,7 @@ void ast_print(FILE *f, AstNode *node, int indent);
1717
18void ast_render(FILE *f, AstNode *node, int indent_size);18void ast_render(FILE *f, AstNode *node, int indent_size);
1919
20const char *container_string(ContainerKind kind);
21
20#endif22#endif
2123
src/ir.cpp-9
...@@ -3853,15 +3853,6 @@ static IrInstruction *ir_gen_err_ok_or(IrBuilder *irb, Scope *parent_scope, AstN...@@ -3853,15 +3853,6 @@ static IrInstruction *ir_gen_err_ok_or(IrBuilder *irb, Scope *parent_scope, AstN
3853 return ir_build_phi(irb, parent_scope, node, 2, incoming_blocks, incoming_values);3853 return ir_build_phi(irb, parent_scope, node, 2, incoming_blocks, incoming_values);
3854}3854}
38553855
3856static const char *container_string(ContainerKind kind) {
3857 switch (kind) {
3858 case ContainerKindEnum: return "enum";
3859 case ContainerKindStruct: return "struct";
3860 case ContainerKindUnion: return "union";
3861 }
3862 zig_unreachable();
3863}
3864
3865static IrInstruction *ir_gen_container_decl(IrBuilder *irb, Scope *parent_scope, AstNode *node) {3856static IrInstruction *ir_gen_container_decl(IrBuilder *irb, Scope *parent_scope, AstNode *node) {
3866 assert(node->type == NodeTypeContainerDecl);3857 assert(node->type == NodeTypeContainerDecl);
38673858