diff options
| author | MovingtoMars <liam@bumblebee.net.nz> | 2016-01-20 21:32:11 +1300 |
|---|---|---|
| committer | MovingtoMars <liam@bumblebee.net.nz> | 2016-01-20 22:03:03 +1300 |
| commit | 361531891f3ec3b4e55ee8b10325fe693c581918 (patch) | |
| tree | 1acad8ed6841dbc6d59df1327b6f44af2e9fd2c4 | |
| parent | 26b9d709aa579c16251796ae59defc799ccfaf39 (diff) | |
| download | zig-361531891f3ec3b4e55ee8b10325fe693c581918.tar.gz zig-361531891f3ec3b4e55ee8b10325fe693c581918.zip | |
rename value_count to member_count
rename BuiltinFnIdValueCount to BuiltinFnIdMemberCount
rename value_count to member_count
| -rw-r--r-- | src/all_types.hpp | 2 | ||||
| -rw-r--r-- | src/analyze.cpp | 2 | ||||
| -rw-r--r-- | src/codegen.cpp | 4 | ||||
| -rw-r--r-- | test/run_tests.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/all_types.hpp b/src/all_types.hpp index 351b1847c5..3c23d62633 100644 --- a/src/all_types.hpp +++ b/src/all_types.hpp @@ -850,7 +850,7 @@ enum BuiltinFnId { BuiltinFnIdSizeof, BuiltinFnIdMaxValue, BuiltinFnIdMinValue, - BuiltinFnIdValueCount, + BuiltinFnIdMemberCount, BuiltinFnIdTypeof, BuiltinFnIdAddWithOverflow, BuiltinFnIdSubWithOverflow, diff --git a/src/analyze.cpp b/src/analyze.cpp index b7ec217c17..1b4c6b3af5 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -2702,7 +2702,7 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry case BuiltinFnIdMinValue: return analyze_min_max_value(g, import, context, node, "no min value available for type '%s'", false); - case BuiltinFnIdValueCount: + case BuiltinFnIdMemberCount: { AstNode *type_node = node->data.fn_call_expr.params.at(0); TypeTableEntry *type_entry = analyze_type_expr(g, import, context, type_node); diff --git a/src/codegen.cpp b/src/codegen.cpp index 2d0caf8440..e97ad9a1e7 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -315,7 +315,7 @@ static LLVMValueRef gen_builtin_fn_call_expr(CodeGen *g, AstNode *node) { zig_unreachable(); } } - case BuiltinFnIdValueCount: + case BuiltinFnIdMemberCount: { assert(node->data.fn_call_expr.params.length == 1); AstNode *type_node = node->data.fn_call_expr.params.at(0); @@ -2558,7 +2558,7 @@ static void define_builtin_fns(CodeGen *g) { create_builtin_fn_with_arg_count(g, BuiltinFnIdSizeof, "sizeof", 1); create_builtin_fn_with_arg_count(g, BuiltinFnIdMaxValue, "max_value", 1); create_builtin_fn_with_arg_count(g, BuiltinFnIdMinValue, "min_value", 1); - create_builtin_fn_with_arg_count(g, BuiltinFnIdValueCount, "value_count", 1); + create_builtin_fn_with_arg_count(g, BuiltinFnIdMemberCount, "member_count", 1); create_builtin_fn_with_arg_count(g, BuiltinFnIdTypeof, "typeof", 1); create_builtin_fn_with_arg_count(g, BuiltinFnIdAddWithOverflow, "add_with_overflow", 4); create_builtin_fn_with_arg_count(g, BuiltinFnIdSubWithOverflow, "sub_with_overflow", 4); diff --git a/test/run_tests.cpp b/test/run_tests.cpp index 91cfd66317..2a712dfc1a 100644 --- a/test/run_tests.cpp +++ b/test/run_tests.cpp @@ -1082,11 +1082,11 @@ pub fn main(args: [][]u8) i32 => { print_str("BAD\n"); } - if (@value_count(Foo) != 3) { + if (@member_count(Foo) != 3) { print_str("BAD\n"); } - if (@value_count(Bar) != 4) { + if (@member_count(Bar) != 4) { print_str("BAD\n"); } |