1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common conversion functions

Browse Source 
* array.c (rb_to_array_type): make public to share common code
  internally.

* hash.c (rb_to_hash_type): make public to share common code
  internally.

* symbol.c (rb_to_symbol_type): make public to share common code
  internally.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-10-26 07:23:23 +00:00
parent 7e3bd6646c
commit 6b818dd961
11 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
array.c
View File

@ -641,11 +641,12 @@ rb_assoc_new(VALUE car, VALUE cdr)
return rb_ary_new3(2, car, cdr); return rb_ary_new3(2, car, cdr);
} }
static VALUE VALUE
to_ary(VALUE ary) rb_to_array_type(VALUE ary)
{ {
return rb_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary); return rb_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary);
} }
#define to_ary rb_to_array_type
VALUE VALUE
rb_check_array_type(VALUE ary) rb_check_array_type(VALUE ary)

16
compile.c
View File

@ -7058,7 +7058,7 @@ register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
{ {
LABEL *label = 0; LABEL *label = 0;
st_data_t tmp; st_data_t tmp;
obj = rb_convert_type_with_id(obj, T_SYMBOL, "Symbol", idTo_sym); obj = rb_to_symbol_type(obj);
if (st_lookup(labels_table, obj, &tmp) == 0) { if (st_lookup(labels_table, obj, &tmp) == 0) {
label = NEW_LABEL(0); label = NEW_LABEL(0);
@ -7111,8 +7111,7 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
LABEL *lstart, *lend, *lcont; LABEL *lstart, *lend, *lcont;
unsigned int sp; unsigned int sp;
v = rb_convert_type_with_id(RARRAY_AREF(exception, i), T_ARRAY, v = rb_to_array_type(RARRAY_AREF(exception, i));
"Array", idTo_ary);
if (RARRAY_LEN(v) != 6) { if (RARRAY_LEN(v) != 6) {
rb_raise(rb_eSyntaxError, "wrong exception entry"); rb_raise(rb_eSyntaxError, "wrong exception entry");
} }
@ -7300,7 +7299,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
} }
break; break;
case TS_GENTRY: case TS_GENTRY:
op = rb_convert_type_with_id(op, T_SYMBOL, "Symbol", idTo_sym); op = rb_to_symbol_type(op);
argv[j] = (VALUE)rb_global_entry(SYM2ID(op)); argv[j] = (VALUE)rb_global_entry(SYM2ID(op));
break; break;
case TS_IC: case TS_IC:
@ -7316,8 +7315,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
argv[j] = Qfalse; argv[j] = Qfalse;
break; break;
case TS_ID: case TS_ID:
argv[j] = rb_convert_type_with_id(op, T_SYMBOL, argv[j] = rb_to_symbol_type(op);
"Symbol", idTo_sym);
break; break;
case TS_CDHASH: case TS_CDHASH:
{ {
@ -7325,7 +7323,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
VALUE map = rb_hash_new_with_size(RARRAY_LEN(op)/2); VALUE map = rb_hash_new_with_size(RARRAY_LEN(op)/2);
rb_hash_tbl_raw(map)->type = &cdhash_type; rb_hash_tbl_raw(map)->type = &cdhash_type;
op = rb_convert_type_with_id(op, T_ARRAY, "Array", idTo_ary); op = rb_to_array_type(op);
for (i=0; i<RARRAY_LEN(op); i+=2) { for (i=0; i<RARRAY_LEN(op); i+=2) {
VALUE key = RARRAY_AREF(op, i); VALUE key = RARRAY_AREF(op, i);
VALUE sym = RARRAY_AREF(op, i+1); VALUE sym = RARRAY_AREF(op, i+1);
@ -7367,8 +7365,8 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
return iseq_setup(iseq, anchor); return iseq_setup(iseq, anchor);
} }
#define CHECK_ARRAY(v) rb_convert_type_with_id((v), T_ARRAY, "Array", idTo_ary) #define CHECK_ARRAY(v) rb_to_array_type(v)
#define CHECK_SYMBOL(v) rb_convert_type_with_id((v), T_SYMBOL, "Symbol", idTo_sym) #define CHECK_SYMBOL(v) rb_to_symbol_type(v)
static int static int
int_param(int *dst, VALUE param, VALUE sym) int_param(int *dst, VALUE param, VALUE sym)

5
hash.c
View File

@ -712,11 +712,12 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
return hash; return hash;
} }
static VALUE VALUE
to_hash(VALUE hash) rb_to_hash_type(VALUE hash)
{ {
return rb_convert_type_with_id(hash, T_HASH, "Hash", idTo_hash); return rb_convert_type_with_id(hash, T_HASH, "Hash", idTo_hash);
} }
#define to_hash rb_to_hash_type
VALUE VALUE
rb_check_hash_type(VALUE hash) rb_check_hash_type(VALUE hash)

3
internal.h
View File

@ -1037,6 +1037,7 @@ VALUE rb_ary_at(VALUE, VALUE);
VALUE rb_ary_aref1(VALUE ary, VALUE i); VALUE rb_ary_aref1(VALUE ary, VALUE i);
VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e); VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
size_t rb_ary_memsize(VALUE); size_t rb_ary_memsize(VALUE);
VALUE rb_to_array_type(VALUE obj);
#ifdef __GNUC__ #ifdef __GNUC__
#define rb_ary_new_from_args(n, ...) \ #define rb_ary_new_from_args(n, ...) \
__extension__ ({ \ __extension__ ({ \
@ -1268,6 +1269,7 @@ long rb_dbl_long_hash(double d);
st_table *rb_init_identtable(void); st_table *rb_init_identtable(void);
st_table *rb_init_identtable_with_size(st_index_t size); st_table *rb_init_identtable_with_size(st_index_t size);
VALUE rb_hash_compare_by_id_p(VALUE hash); VALUE rb_hash_compare_by_id_p(VALUE hash);
VALUE rb_to_hash_type(VALUE obj);
#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h) #define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h)
VALUE rb_hash_keys(VALUE hash); VALUE rb_hash_keys(VALUE hash);
@ -1686,6 +1688,7 @@ VALUE rb_sym_intern_ascii_cstr(const char *ptr);
rb_sym_intern_ascii_cstr(ptr); \ rb_sym_intern_ascii_cstr(ptr); \
}) })
#endif #endif
VALUE rb_to_symbol_type(VALUE obj);
/* struct.c */ /* struct.c */
VALUE rb_struct_init_copy(VALUE copy, VALUE s); VALUE rb_struct_init_copy(VALUE copy, VALUE s);

2
io.c
View File

@ -10166,7 +10166,7 @@ open_key_args(int argc, VALUE *argv, VALUE opt, struct foreach_arg *arg)
VALUE args; VALUE args;
long n; long n;
v = rb_convert_type_with_id(v, T_ARRAY, "Array", idTo_ary); v = rb_to_array_type(v);
n = RARRAY_LEN(v) + 1; n = RARRAY_LEN(v) + 1;
#if SIZEOF_LONG > SIZEOF_INT #if SIZEOF_LONG > SIZEOF_INT
if (n > INT_MAX) { if (n > INT_MAX) {

8
iseq.c
View File

@ -520,10 +520,10 @@ rb_iseq_load_iseq(VALUE fname)
return NULL; return NULL;
} }
#define CHECK_ARRAY(v) rb_convert_type_with_id((v), T_ARRAY, "Array", idTo_ary) #define CHECK_ARRAY(v) rb_to_array_type(v)
#define CHECK_HASH(v) rb_convert_type_with_id((v), T_HASH, "Hash", idTo_hash) #define CHECK_HASH(v) rb_to_hash_type(v)
#define CHECK_STRING(v) rb_convert_type_with_id((v), T_STRING, "String", idTo_str) #define CHECK_STRING(v) rb_str_to_str(v)
#define CHECK_SYMBOL(v) rb_convert_type_with_id((v), T_SYMBOL, "Symbol", idTo_sym) #define CHECK_SYMBOL(v) rb_to_symbol_type(v)
static inline VALUE CHECK_INTEGER(VALUE v) {(void)NUM2LONG(v); return v;} static inline VALUE CHECK_INTEGER(VALUE v) {(void)NUM2LONG(v); return v;}
static enum iseq_type static enum iseq_type

2
process.c
View File

@ -2386,7 +2386,7 @@ rb_execarg_parent_start1(VALUE execarg_obj)
} }
else { else {
envtbl = rb_const_get(rb_cObject, id_ENV); envtbl = rb_const_get(rb_cObject, id_ENV);
envtbl = rb_convert_type_with_id(envtbl, T_HASH, "Hash", idTo_hash); envtbl = rb_to_hash_type(envtbl);
} }
hide_obj(envtbl); hide_obj(envtbl);
if (envopts != Qfalse) { if (envopts != Qfalse) {

6
symbol.c
View File

@ -1044,6 +1044,12 @@ rb_sym_intern_ascii_cstr(const char *ptr)
return rb_sym_intern_ascii(ptr, strlen(ptr)); return rb_sym_intern_ascii(ptr, strlen(ptr));
} }
VALUE
rb_to_symbol_type(VALUE obj)
{
return rb_convert_type_with_id(obj, T_SYMBOL, "Symbol", idTo_sym);
}
static ID static ID
attrsetname_to_attr_id(VALUE name) attrsetname_to_attr_id(VALUE name)
{ {

2
thread.c
View File

@ -1867,7 +1867,7 @@ rb_thread_s_handle_interrupt(VALUE self, VALUE mask_arg)
} }
mask = 0; mask = 0;
mask_arg = rb_convert_type_with_id(mask_arg, T_HASH, "Hash", idTo_hash); mask_arg = rb_to_hash_type(mask_arg);
rb_hash_foreach(mask_arg, handle_interrupt_arg_check_i, (VALUE)&mask); rb_hash_foreach(mask_arg, handle_interrupt_arg_check_i, (VALUE)&mask);
if (!mask) { if (!mask) {
return rb_yield(Qnil); return rb_yield(Qnil);

3
vm.c
View File

@ -2763,8 +2763,7 @@ core_hash_merge_kwd(int argc, VALUE *argv)
VALUE hash, kw; VALUE hash, kw;
rb_check_arity(argc, 1, 2); rb_check_arity(argc, 1, 2);
hash = argv[0]; hash = argv[0];
kw = argv[argc-1]; kw = rb_to_hash_type(argv[argc-1]);
kw = rb_convert_type_with_id(kw, T_HASH, "Hash", idTo_hash);
if (argc < 2) hash = kw; if (argc < 2) hash = kw;
rb_hash_foreach(kw, argc < 2 ? kwcheck_i : kwmerge_i, hash); rb_hash_foreach(kw, argc < 2 ? kwcheck_i : kwmerge_i, hash);
return hash; return hash;

2
vm_trace.c
View File

@ -668,7 +668,7 @@ static rb_event_flag_t
symbol2event_flag(VALUE v) symbol2event_flag(VALUE v)
{ {
ID id; ID id;
VALUE sym = rb_convert_type_with_id(v, T_SYMBOL, "Symbol", idTo_sym); VALUE sym = rb_to_symbol_type(v);
const rb_event_flag_t RUBY_EVENT_A_CALL = const rb_event_flag_t RUBY_EVENT_A_CALL =
RUBY_EVENT_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_C_CALL; RUBY_EVENT_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_C_CALL;
const rb_event_flag_t RUBY_EVENT_A_RETURN = const rb_event_flag_t RUBY_EVENT_A_RETURN =