diff options
-rw-r--r-- | compile.c | 11 | ||||
-rw-r--r-- | defs/id.def | 2 | ||||
-rw-r--r-- | insns.def | 12 | ||||
-rw-r--r-- | vm.c | 40 |
4 files changed, 13 insertions, 52 deletions
@@ -3957,9 +3957,7 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro ADD_INSN1(ret, line, duparray, ary); } else { /* COMPILE_ARRAY_TYPE_HASH */ - ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); - ADD_INSN1(ret, line, putobject, ary); - ADD_SEND(ret, line, id_core_hash_from_ary, INT2FIX(1)); + ADD_INSN2(ret, line, newhashfromarray, INT2FIX(RARRAY_LEN(ary)/2), ary); } } else { @@ -3968,15 +3966,8 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro ADD_INSN(ret, line, concatarray); } else { -#if 0 - ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); - ADD_INSN1(ret, line, putobject, ary); - ADD_SEND(ret, line, id_core_hash_merge_ary, INT2FIX(1)); - /* wrong number of arguments -----------------------^ */ -#else COMPILE_ERROR(ERROR_ARGS "core#hash_merge_ary"); return -1; -#endif } } } diff --git a/defs/id.def b/defs/id.def index fe61d254c9..bb7cc6f922 100644 --- a/defs/id.def +++ b/defs/id.def @@ -63,8 +63,6 @@ firstline, predefined = __LINE__+1, %[\ core#define_method core#define_singleton_method core#set_postexe - core#hash_from_ary - core#hash_merge_ary core#hash_merge_ptr core#hash_merge_kwd @@ -512,6 +512,18 @@ newhash } } +/* make new Hash object from (frozen) Array object */ +DEFINE_INSN +newhashfromarray +(rb_num_t num, VALUE ary) +() +(VALUE hash) +{ + VM_ASSERT(num * 2 == RARRAY_LEN(ary)); + hash = rb_hash_new_with_size(num); + rb_hash_bulk_insert(num * 2, RARRAY_CONST_PTR(ary), hash); +} + /* put new Range object.(Range.new(low, high, flag)) */ DEFINE_INSN newrange @@ -2676,8 +2676,6 @@ m_core_set_postexe(VALUE self) return Qnil; } -static VALUE core_hash_merge_ary(VALUE hash, VALUE ary); -static VALUE core_hash_from_ary(VALUE ary); static VALUE core_hash_merge_kwd(VALUE hash, VALUE kw); static VALUE @@ -2690,40 +2688,6 @@ core_hash_merge(VALUE hash, long argc, const VALUE *argv) } static VALUE -m_core_hash_from_ary(VALUE self, VALUE ary) -{ - VALUE hash; - REWIND_CFP(hash = core_hash_from_ary(ary)); - return hash; -} - -static VALUE -core_hash_from_ary(VALUE ary) -{ - VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary) / 2); - - RUBY_DTRACE_CREATE_HOOK(HASH, (Check_Type(ary, T_ARRAY), RARRAY_LEN(ary))); - return core_hash_merge_ary(hash, ary); -} - -#if 0 -static VALUE -m_core_hash_merge_ary(VALUE self, VALUE hash, VALUE ary) -{ - REWIND_CFP(core_hash_merge_ary(hash, ary)); - return hash; -} -#endif - -static VALUE -core_hash_merge_ary(VALUE hash, VALUE ary) -{ - Check_Type(ary, T_ARRAY); - core_hash_merge(hash, RARRAY_LEN(ary), RARRAY_CONST_PTR(ary)); - return hash; -} - -static VALUE m_core_hash_merge_ptr(int argc, VALUE *argv, VALUE recv) { VALUE hash = argv[0]; @@ -2864,10 +2828,6 @@ Init_VM(void) rb_define_method_id(klass, id_core_define_method, m_core_define_method, 2); rb_define_method_id(klass, id_core_define_singleton_method, m_core_define_singleton_method, 3); rb_define_method_id(klass, id_core_set_postexe, m_core_set_postexe, 0); - rb_define_method_id(klass, id_core_hash_from_ary, m_core_hash_from_ary, 1); -#if 0 - rb_define_method_id(klass, id_core_hash_merge_ary, m_core_hash_merge_ary, 2); -#endif rb_define_method_id(klass, id_core_hash_merge_ptr, m_core_hash_merge_ptr, -1); rb_define_method_id(klass, id_core_hash_merge_kwd, m_core_hash_merge_kwd, 2); rb_define_method_id(klass, idProc, rb_block_proc, 0); |