Kouhei Sutou
null+****@clear*****
Sun Apr 12 00:12:38 JST 2015
Kouhei Sutou 2015-04-12 00:12:38 +0900 (Sun, 12 Apr 2015) New Revision: 0d014e0463fbf5f36b46330a090a1aef74528225 https://github.com/ranguba/rroonga/commit/0d014e0463fbf5f36b46330a090a1aef74528225 Message: Use meaningful name Modified files: ext/groonga/extconf.rb ext/groonga/rb-grn-array.c ext/groonga/rb-grn-column.c ext/groonga/rb-grn-database.c ext/groonga/rb-grn-double-array-trie.c ext/groonga/rb-grn-expression.c ext/groonga/rb-grn-hash.c ext/groonga/rb-grn-patricia-trie.c ext/groonga/rb-grn-plugin.c ext/groonga/rb-grn-snippet.c ext/groonga/rb-grn-table.c ext/groonga/rb-grn-type.c ext/groonga/rb-grn.h Modified: ext/groonga/extconf.rb (+1 -0) =================================================================== --- ext/groonga/extconf.rb 2015-04-12 00:04:16 +0900 (2a680c4) +++ ext/groonga/extconf.rb 2015-04-12 00:12:38 +0900 (fbfac57) @@ -282,6 +282,7 @@ have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h") have_func("rb_errinfo", "ruby.h") have_func("rb_sym2str", "ruby.h") have_func("rb_to_symbol", "ruby.h") +have_func("rb_ary_new_from_values", "ruby.h") have_type("enum ruby_value_type", "ruby.h") # TODO: Remove me when Groonga 5.0.1 is released. Modified: ext/groonga/rb-grn-array.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-array.c 2015-04-12 00:04:16 +0900 (b58b97e) +++ ext/groonga/rb-grn-array.c 2015-04-12 00:12:38 +0900 (17d1cc2) @@ -131,7 +131,7 @@ rb_grn_array_s_create (int argc, VALUE *argv, VALUE klass) table = grn_table_create(context, name, name_size, path, flags, NULL, value_type); if (!table) - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE); rb_grn_context_check(context, rb_table); rb_iv_set(rb_table, "@context", rb_context); Modified: ext/groonga/rb-grn-column.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-column.c 2015-04-12 00:04:16 +0900 (73c8e55) +++ ext/groonga/rb-grn-column.c 2015-04-12 00:12:38 +0900 (2b12e4e) @@ -351,7 +351,7 @@ rb_grn_column_select (int argc, VALUE *argv, VALUE self) "should be [query_string, option_hash], " "[expression, option_hash] " "or [option_hash]: %s", - rb_grn_inspect(rb_ary_new4(argc, argv))); + rb_grn_inspect(rb_ary_new_from_values(argc, argv))); options = condition_or_options; } Modified: ext/groonga/rb-grn-database.c (+2 -2) =================================================================== --- ext/groonga/rb-grn-database.c 2015-04-12 00:04:16 +0900 (4b157f8) +++ ext/groonga/rb-grn-database.c 2015-04-12 00:12:38 +0900 (768a89a) @@ -200,13 +200,13 @@ rb_grn_database_s_create (int argc, VALUE *argv, VALUE klass) grn_obj_unlink(context, old_database); reset_floating_objects(rb_context); database = grn_db_create(context, path, &create_args); - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); owner = (context->flags & GRN_CTX_PER_DB) ? GRN_FALSE : GRN_TRUE; rb_database = GRNOBJECT2RVAL(klass, context, database, owner); rb_iv_set(rb_database, "@context", rb_context); if (!NIL_P(rb_context)) rb_iv_set(rb_context, "database", rb_database); - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); if (rb_block_given_p()) return rb_ensure(rb_yield, rb_database, Modified: ext/groonga/rb-grn-double-array-trie.c (+2 -2) =================================================================== --- ext/groonga/rb-grn-double-array-trie.c 2015-04-12 00:04:16 +0900 (debd74b) +++ ext/groonga/rb-grn-double-array-trie.c 2015-04-12 00:12:38 +0900 (72745b6) @@ -309,7 +309,7 @@ rb_grn_double_array_trie_s_create (int argc, VALUE *argv, VALUE klass) table = grn_table_create(context, name, name_size, path, flags, key_type, value_type); if (!table) - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE); if (!NIL_P(rb_default_tokenizer)) @@ -458,7 +458,7 @@ rb_grn_double_array_trie_open_grn_prefix_cursor (int argc, VALUE *argv, if (!NIL_P(rb_key_bytes) && !NIL_P(rb_key_bits)) { rb_raise(rb_eArgError, "should not specify both :key_bytes and :key_bits once: %s", - rb_grn_inspect(rb_ary_new4(argc, argv))); + rb_grn_inspect(rb_ary_new_from_values(argc, argv))); } else if (!NIL_P(rb_key_bytes)) { prefix_size = NUM2UINT(rb_key_bytes); } else if (!NIL_P(rb_key_bits)) { Modified: ext/groonga/rb-grn-expression.c (+2 -2) =================================================================== --- ext/groonga/rb-grn-expression.c 2015-04-12 00:04:16 +0900 (78356e6) +++ ext/groonga/rb-grn-expression.c 2015-04-12 00:12:38 +0900 (df8fcfc) @@ -475,7 +475,7 @@ rb_grn_expression_parse (int argc, VALUE *argv, VALUE self) if (rc != GRN_SUCCESS) { VALUE related_object; - related_object = rb_ary_new3(2, self, rb_ary_new4(argc, argv)); + related_object = rb_ary_new3(2, self, rb_ary_new_from_values(argc, argv)); exception = rb_grn_context_to_exception(context, related_object); } if (default_column_is_created) @@ -740,7 +740,7 @@ rb_grn_expression_snippet (int argc, VALUE *argv, VALUE self) (const char **)open_tags, open_tag_lengths, (const char **)close_tags, close_tag_lengths, mapping); - related_object = rb_ary_new3(2, self, rb_ary_new4(argc, argv)); + related_object = rb_ary_new3(2, self, rb_ary_new_from_values(argc, argv)); rb_grn_context_check(context, related_object); return GRNOBJECT2RVAL(Qnil, context, snippet, GRN_TRUE); Modified: ext/groonga/rb-grn-hash.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-hash.c 2015-04-12 00:04:16 +0900 (9d928de) +++ ext/groonga/rb-grn-hash.c 2015-04-12 00:12:38 +0900 (8e93a6a) @@ -216,7 +216,7 @@ rb_grn_hash_s_create (int argc, VALUE *argv, VALUE klass) table = grn_table_create(context, name, name_size, path, flags, key_type, value_type); if (!table) - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE); if (!NIL_P(rb_default_tokenizer)) Modified: ext/groonga/rb-grn-patricia-trie.c (+3 -3) =================================================================== --- ext/groonga/rb-grn-patricia-trie.c 2015-04-12 00:04:16 +0900 (d6cea13) +++ ext/groonga/rb-grn-patricia-trie.c 2015-04-12 00:12:38 +0900 (b3bf6ed) @@ -232,7 +232,7 @@ rb_grn_patricia_trie_s_create (int argc, VALUE *argv, VALUE klass) table = grn_table_create(context, name, name_size, path, flags, key_type, value_type); if (!table) - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE); if (!NIL_P(rb_default_tokenizer)) @@ -534,7 +534,7 @@ rb_grn_patricia_trie_open_grn_prefix_cursor (int argc, VALUE *argv, VALUE self, if (!NIL_P(rb_key_bytes) && !NIL_P(rb_key_bits)) { rb_raise(rb_eArgError, "should not specify both :key_bytes and :key_bits once: %s", - rb_grn_inspect(rb_ary_new4(argc, argv))); + rb_grn_inspect(rb_ary_new_from_values(argc, argv))); } else if (!NIL_P(rb_key_bytes)) { prefix_size = NUM2UINT(rb_key_bytes); } else if (!NIL_P(rb_key_bits)) { @@ -684,7 +684,7 @@ rb_grn_patricia_trie_open_grn_rk_cursor (int argc, VALUE *argv, VALUE self, if (!NIL_P(rb_key_bytes) && !NIL_P(rb_key_bits)) { rb_raise(rb_eArgError, "should not specify both :key_bytes and :key_bits once: %s", - rb_grn_inspect(rb_ary_new4(argc, argv))); + rb_grn_inspect(rb_ary_new_from_values(argc, argv))); } else if (!NIL_P(rb_key_bytes)) { prefix_size = NUM2UINT(rb_key_bytes); } else if (!NIL_P(rb_key_bits)) { Modified: ext/groonga/rb-grn-plugin.c (+2 -2) =================================================================== --- ext/groonga/rb-grn-plugin.c 2015-04-12 00:04:16 +0900 (d1b904b) +++ ext/groonga/rb-grn-plugin.c 2015-04-12 00:12:38 +0900 (fcfb36b) @@ -117,7 +117,7 @@ rb_grn_plugin_s_register (int argc, VALUE *argv, VALUE klass) grn_plugin_register_by_path(context, path); } - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); return Qnil; } @@ -163,7 +163,7 @@ rb_grn_plugin_s_unregister (int argc, VALUE *argv, VALUE klass) grn_plugin_unregister(context, name); - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); return Qnil; } Modified: ext/groonga/rb-grn-snippet.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-snippet.c 2015-04-12 00:04:16 +0900 (5563ead) +++ ext/groonga/rb-grn-snippet.c 2015-04-12 00:12:38 +0900 (6126304) @@ -146,7 +146,7 @@ rb_grn_snippet_initialize (int argc, VALUE *argv, VALUE self) default_open_tag, default_open_tag_length, default_close_tag, default_close_tag_length, mapping); - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); rb_grn_object_assign(Qnil, self, rb_context, context, snippet); rb_grn_context_register_floating_object(DATA_PTR(self)); Modified: ext/groonga/rb-grn-table.c (+9 -8) =================================================================== --- ext/groonga/rb-grn-table.c 2015-04-12 00:04:16 +0900 (bca0b62) +++ ext/groonga/rb-grn-table.c 2015-04-12 00:12:38 +0900 (3848717) @@ -329,7 +329,8 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self) path, flags, value_type); if (context->rc) { rb_grn_context_check(context, - rb_ary_new3(2, self, rb_ary_new4(argc, argv))); + rb_ary_new3(2, self, + rb_ary_new_from_values(argc, argv))); } rb_column = GRNCOLUMN2RVAL(Qnil, context, column, GRN_TRUE); @@ -452,7 +453,7 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self) path, flags, value_type); if (context->rc) { rb_grn_context_check(context, - rb_ary_new3(2, self, rb_ary_new4(argc, argv))); + rb_ary_new3(2, self, rb_ary_new_from_values(argc, argv))); } rb_column = GRNCOLUMN2RVAL(Qnil, context, column, GRN_TRUE); @@ -1587,7 +1588,7 @@ rb_grn_table_get_value_convenience (int argc, VALUE *argv, VALUE self) rb_raise(rb_eArgError, ":id options must be true or nil: %s: %s", rb_grn_inspect(rb_option_id), rb_grn_inspect(rb_ary_new3(2, - self, rb_ary_new4(argc, argv)))); + self, rb_ary_new_from_values(argc, argv)))); } } @@ -1645,7 +1646,7 @@ rb_grn_table_set_value_convenience (int argc, VALUE *argv, VALUE self) rb_raise(rb_eArgError, ":id options must be true or nil: %s: %s", rb_grn_inspect(rb_option_id), rb_grn_inspect(rb_ary_new3(2, - self, rb_ary_new4(argc, argv)))); + self, rb_ary_new_from_values(argc, argv)))); } } @@ -1697,7 +1698,7 @@ rb_grn_table_get_column_value_convenience (int argc, VALUE *argv, VALUE self) rb_grn_inspect(rb_option_id), rb_grn_inspect(rb_ary_new3(2, self, - rb_ary_new4(argc, argv)))); + rb_ary_new_from_values(argc, argv)))); } } @@ -1898,7 +1899,7 @@ rb_grn_table_set_column_value_convenience (int argc, VALUE *argv, VALUE self) rb_grn_inspect(rb_option_id), rb_grn_inspect(rb_ary_new3(2, self, - rb_ary_new4(argc, argv)))); + rb_ary_new_from_values(argc, argv)))); } } @@ -2257,7 +2258,7 @@ rb_grn_table_select (int argc, VALUE *argv, VALUE self) "should be [query_string, option_hash], " "[expression, option_hash] " "or [option_hash]: %s", - rb_grn_inspect(rb_ary_new4(argc, argv))); + rb_grn_inspect(rb_ary_new_from_values(argc, argv))); options = condition_or_options; } @@ -2285,7 +2286,7 @@ rb_grn_table_select (int argc, VALUE *argv, VALUE self) if (!result) { rb_raise(rb_eGrnNoMemoryAvailable, "failed to create result table: %s", - rb_grn_inspect(rb_ary_new4(argc, argv))); + rb_grn_inspect(rb_ary_new_from_values(argc, argv))); } rb_result = GRNTABLE2RVAL(context, result, GRN_TRUE); } else { Modified: ext/groonga/rb-grn-type.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-type.c 2015-04-12 00:04:16 +0900 (30d2c98) +++ ext/groonga/rb-grn-type.c 2015-04-12 00:12:38 +0900 (d0024f7) @@ -124,7 +124,7 @@ rb_grn_type_initialize (int argc, VALUE *argv, VALUE self) type = grn_type_create(context, name, name_size, flags, size); rb_grn_object_assign(Qnil, self, rb_context, context, type); - rb_grn_context_check(context, rb_ary_new4(argc, argv)); + rb_grn_context_check(context, rb_ary_new_from_values(argc, argv)); return Qnil; } Modified: ext/groonga/rb-grn.h (+5 -1) =================================================================== --- ext/groonga/rb-grn.h 2015-04-12 00:04:16 +0900 (dda3443) +++ ext/groonga/rb-grn.h 2015-04-12 00:12:38 +0900 (4d6be24) @@ -1,7 +1,7 @@ /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* Copyright (C) 2015 Masafumi Yokoyama <yokoyama �� clear-code.com> - Copyright (C) 2009-2014 Kouhei Sutou <kou �� clear-code.com> + Copyright (C) 2009-2015 Kouhei Sutou <kou �� clear-code.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -49,6 +49,10 @@ # define rb_to_symbol(rb_string) (rb_str_intern(rb_string)) #endif +#ifndef HAVE_RB_ARY_NEW_FROM_VALUES +# define rb_ary_new_from_values(n, values) rb_ary_new4((n), (values)) +#endif + #include <groonga.h> #if defined(__cplusplus) -------------- next part -------------- HTML����������������������������...다운로드
