authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-20 02:09:07-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-20 02:09:07-07:00
logf0f56a4a9bd416d4d6ecf9ff4766f70926715aa9
tree1acad8ed6841dbc6d59df1327b6f44af2e9fd2c4
parentebd8e2d6062bad96c9c1fbc0e73894a13e683831
parent361531891f3ec3b4e55ee8b10325fe693c581918

Merge pull request #80 from MovingtoMars/value_count_rename

rename value_count to member_count

4 files changed, 6 insertions(+), 6 deletions(-)

src/all_types.hpp+1-1
......@@ -850,7 +850,7 @@ enum BuiltinFnId {
850850 BuiltinFnIdSizeof,
851851 BuiltinFnIdMaxValue,
852852 BuiltinFnIdMinValue,
853 BuiltinFnIdValueCount,
853 BuiltinFnIdMemberCount,
854854 BuiltinFnIdTypeof,
855855 BuiltinFnIdAddWithOverflow,
856856 BuiltinFnIdSubWithOverflow,
src/analyze.cpp+1-1
......@@ -2702,7 +2702,7 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry
27022702 case BuiltinFnIdMinValue:
27032703 return analyze_min_max_value(g, import, context, node,
27042704 "no min value available for type '%s'", false);
2705 case BuiltinFnIdValueCount:
2705 case BuiltinFnIdMemberCount:
27062706 {
27072707 AstNode *type_node = node->data.fn_call_expr.params.at(0);
27082708 TypeTableEntry *type_entry = analyze_type_expr(g, import, context, type_node);
src/codegen.cpp+2-2
......@@ -315,7 +315,7 @@ static LLVMValueRef gen_builtin_fn_call_expr(CodeGen *g, AstNode *node) {
315315 zig_unreachable();
316316 }
317317 }
318 case BuiltinFnIdValueCount:
318 case BuiltinFnIdMemberCount:
319319 {
320320 assert(node->data.fn_call_expr.params.length == 1);
321321 AstNode *type_node = node->data.fn_call_expr.params.at(0);
......@@ -2558,7 +2558,7 @@ static void define_builtin_fns(CodeGen *g) {
25582558 create_builtin_fn_with_arg_count(g, BuiltinFnIdSizeof, "sizeof", 1);
25592559 create_builtin_fn_with_arg_count(g, BuiltinFnIdMaxValue, "max_value", 1);
25602560 create_builtin_fn_with_arg_count(g, BuiltinFnIdMinValue, "min_value", 1);
2561 create_builtin_fn_with_arg_count(g, BuiltinFnIdValueCount, "value_count", 1);
2561 create_builtin_fn_with_arg_count(g, BuiltinFnIdMemberCount, "member_count", 1);
25622562 create_builtin_fn_with_arg_count(g, BuiltinFnIdTypeof, "typeof", 1);
25632563 create_builtin_fn_with_arg_count(g, BuiltinFnIdAddWithOverflow, "add_with_overflow", 4);
25642564 create_builtin_fn_with_arg_count(g, BuiltinFnIdSubWithOverflow, "sub_with_overflow", 4);
test/run_tests.cpp+2-2
......@@ -1082,11 +1082,11 @@ pub fn main(args: [][]u8) i32 => {
10821082 print_str("BAD\n");
10831083 }
10841084
1085 if (@value_count(Foo) != 3) {
1085 if (@member_count(Foo) != 3) {
10861086 print_str("BAD\n");
10871087 }
10881088
1089 if (@value_count(Bar) != 4) {
1089 if (@member_count(Bar) != 4) {
10901090 print_str("BAD\n");
10911091 }
10921092