Navigation Menu

Skip to content

Commit

Permalink
Use meaningful name
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Apr 11, 2015
1 parent 0d014e0 commit 56eb328
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 37 deletions.
1 change: 1 addition & 0 deletions ext/groonga/extconf.rb
Expand Up @@ -282,6 +282,7 @@ def install_local_groonga(package_name, major, minor, micro)
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_args", "ruby.h")
have_func("rb_ary_new_from_values", "ruby.h")
have_type("enum ruby_value_type", "ruby.h")

Expand Down
2 changes: 1 addition & 1 deletion ext/groonga/rb-grn-context.c
Expand Up @@ -817,7 +817,7 @@ rb_grn_context_receive (VALUE self)
}
rb_grn_context_check(context, self);

return rb_ary_new3(2, UINT2NUM(query_id), rb_result);
return rb_ary_new_from_args(2, UINT2NUM(query_id), rb_result);
}

static const char *
Expand Down
10 changes: 7 additions & 3 deletions ext/groonga/rb-grn-expression.c
Expand Up @@ -475,7 +475,10 @@ 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_new_from_values(argc, argv));
related_object =
rb_ary_new_from_args(2,
self,
rb_ary_new_from_values(argc, argv));
exception = rb_grn_context_to_exception(context, related_object);
}
if (default_column_is_created)
Expand Down Expand Up @@ -694,7 +697,7 @@ rb_grn_expression_snippet (int argc, VALUE *argv, VALUE self)
}

if (TYPE(RARRAY_PTR(rb_tags)[0]) == T_STRING) {
rb_tags = rb_ary_new3(1, rb_tags);
rb_tags = rb_ary_new_from_args(1, rb_tags);
}

rb_tag_values = RARRAY_PTR(rb_tags);
Expand Down Expand Up @@ -740,7 +743,8 @@ 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_new_from_values(argc, argv));
related_object =
rb_ary_new_from_args(2, self, rb_ary_new_from_values(argc, argv));
rb_grn_context_check(context, related_object);

return GRNOBJECT2RVAL(Qnil, context, snippet, GRN_TRUE);
Expand Down
2 changes: 1 addition & 1 deletion ext/groonga/rb-grn-index-column.c
Expand Up @@ -709,7 +709,7 @@ static VALUE
rb_grn_index_column_set_source (VALUE self, VALUE rb_source)
{
if (!RVAL2CBOOL(rb_obj_is_kind_of(rb_source, rb_cArray)))
rb_source = rb_ary_new3(1, rb_source);
rb_source = rb_ary_new_from_args(1, rb_source);

return rb_grn_index_column_set_sources(self, rb_source);
}
Expand Down
10 changes: 5 additions & 5 deletions ext/groonga/rb-grn-patricia-trie.c
Expand Up @@ -424,11 +424,11 @@ rb_grn_patricia_trie_scan (VALUE self, VALUE rb_string)
term = rb_grn_context_rb_string_new(context,
string + hits[i].offset,
hits[i].length);
matched_info = rb_ary_new3(4,
record,
term,
UINT2NUM(hits[i].offset),
UINT2NUM(hits[i].length));
matched_info = rb_ary_new_from_args(4,
record,
term,
UINT2NUM(hits[i].offset),
UINT2NUM(hits[i].length));
if (block_given) {
rb_yield(matched_info);
} else {
Expand Down
12 changes: 8 additions & 4 deletions ext/groonga/rb-grn-table-key-support.c
Expand Up @@ -525,7 +525,9 @@ rb_grn_table_key_support_array_set (VALUE self, VALUE rb_key, VALUE rb_values)
if (id == GRN_ID_NIL) {
rb_raise(rb_eGrnError,
"failed to add record: %s",
rb_grn_inspect(rb_ary_new3(3, self, rb_key, rb_values)));
rb_grn_inspect(rb_ary_new_from_args(3,
self,
rb_key, rb_values)));
}

data.self = self;
Expand Down Expand Up @@ -568,9 +570,11 @@ rb_grn_table_key_support_set_column_value (int argc, VALUE *argv, VALUE self)
if (id == GRN_ID_NIL) {
rb_raise(rb_eGrnError,
"failed to add record: %s",
rb_grn_inspect(rb_ary_new3(4,
self, rb_key,
rb_name, rb_value)));
rb_grn_inspect(rb_ary_new_from_args(4,
self,
rb_key,
rb_name,
rb_value)));
}

return rb_grn_table_set_column_value_raw(self, id, rb_name, rb_value);
Expand Down
49 changes: 34 additions & 15 deletions ext/groonga/rb-grn-table.c
Expand Up @@ -328,9 +328,12 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
column = grn_column_create(context, table, name, name_size,
path, flags, value_type);
if (context->rc) {
rb_grn_context_check(context,
rb_ary_new3(2, self,
rb_ary_new_from_values(argc, argv)));
VALUE rb_related_object;
rb_related_object =
rb_ary_new_from_args(2,
self,
rb_ary_new_from_values(argc, argv));
rb_grn_context_check(context, rb_related_object);
}

rb_column = GRNCOLUMN2RVAL(Qnil, context, column, GRN_TRUE);
Expand Down Expand Up @@ -452,8 +455,10 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self)
column = grn_column_create(context, table, name, name_size,
path, flags, value_type);
if (context->rc) {
rb_grn_context_check(context,
rb_ary_new3(2, self, rb_ary_new_from_values(argc, argv)));
VALUE rb_related_object;
rb_related_object =
rb_ary_new_from_args(2, self, rb_ary_new_from_values(argc, argv));
rb_grn_context_check(context, rb_related_object);
}

rb_column = GRNCOLUMN2RVAL(Qnil, context, column, GRN_TRUE);
Expand Down Expand Up @@ -1585,10 +1590,14 @@ rb_grn_table_get_value_convenience (int argc, VALUE *argv, VALUE self)
"id", &rb_option_id,
NULL);
if (!(NIL_P(rb_option_id) || RVAL2CBOOL(rb_option_id))) {
VALUE rb_related_object;
rb_related_object =
rb_ary_new_from_args(2,
self,
rb_ary_new_from_values(argc, argv));
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_new_from_values(argc, argv))));
rb_grn_inspect(rb_related_object));
}
}

Expand Down Expand Up @@ -1643,10 +1652,14 @@ rb_grn_table_set_value_convenience (int argc, VALUE *argv, VALUE self)
"id", &rb_option_id,
NULL);
if (!(NIL_P(rb_option_id) || RVAL2CBOOL(rb_option_id))) {
VALUE rb_related_object;
rb_related_object =
rb_ary_new_from_args(2,
self,
rb_ary_new_from_values(argc, argv));
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_new_from_values(argc, argv))));
rb_grn_inspect(rb_related_object));
}
}

Expand Down Expand Up @@ -1694,11 +1707,14 @@ rb_grn_table_get_column_value_convenience (int argc, VALUE *argv, VALUE self)
"id", &rb_option_id,
NULL);
if (!(NIL_P(rb_option_id) || RVAL2CBOOL(rb_option_id))) {
VALUE rb_related_object;
rb_related_object =
rb_ary_new_from_args(2,
self,
rb_ary_new_from_values(argc, argv));
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_new_from_values(argc, argv))));
rb_grn_inspect(rb_related_object));
}
}

Expand Down Expand Up @@ -1895,11 +1911,14 @@ rb_grn_table_set_column_value_convenience (int argc, VALUE *argv, VALUE self)
"id", &rb_option_id,
NULL);
if (!(NIL_P(rb_option_id) || RVAL2CBOOL(rb_option_id))) {
VALUE rb_related_object;
rb_related_object =
rb_ary_new_from_args(2,
self,
rb_ary_new_from_values(argc, argv));
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_new_from_values(argc, argv))));
rb_grn_inspect(rb_related_object));
}
}

Expand Down
4 changes: 4 additions & 0 deletions ext/groonga/rb-grn.h
Expand Up @@ -49,6 +49,10 @@
# define rb_to_symbol(rb_string) (rb_str_intern(rb_string))
#endif

#ifndef HAVE_RB_ARY_NEW_FROM_ARGS
# define rb_ary_new_from_args(n, ...) rb_ary_new3((n), __VA_ARGS__)
#endif

#ifndef HAVE_RB_ARY_NEW_FROM_VALUES
# define rb_ary_new_from_values(n, values) rb_ary_new4((n), (values))
#endif
Expand Down
16 changes: 8 additions & 8 deletions ext/groonga/rb-groonga.c
Expand Up @@ -84,21 +84,21 @@ rb_grn_init_version (VALUE mGrn)

rb_grn_init_runtime_version(mGrn);

build_version = rb_ary_new3(3,
INT2NUM(GRN_MAJOR_VERSION),
INT2NUM(GRN_MINOR_VERSION),
INT2NUM(GRN_MICRO_VERSION));
build_version = rb_ary_new_from_args(3,
INT2NUM(GRN_MAJOR_VERSION),
INT2NUM(GRN_MINOR_VERSION),
INT2NUM(GRN_MICRO_VERSION));
rb_obj_freeze(build_version);
/*
* ビルドしたgroongaのバージョン。 @[メジャーバージョン,
* マイナーバージョン, マイクロバージョン]@ の配列。
*/
rb_define_const(mGrn, "BUILD_VERSION", build_version);

bindings_version = rb_ary_new3(3,
INT2NUM(RB_GRN_MAJOR_VERSION),
INT2NUM(RB_GRN_MINOR_VERSION),
INT2NUM(RB_GRN_MICRO_VERSION));
bindings_version = rb_ary_new_from_args(3,
INT2NUM(RB_GRN_MAJOR_VERSION),
INT2NUM(RB_GRN_MINOR_VERSION),
INT2NUM(RB_GRN_MICRO_VERSION));
rb_obj_freeze(bindings_version);
/*
* rroongaのバージョン。 @[メジャーバージョン, マ
Expand Down

0 comments on commit 56eb328

Please sign in to comment.