admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement Hash#initialize in C

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-04-04 11:03:26 +09:00
parent 786ed10d59
commit b9a4d64064
2 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrblib/hash.rb
-8
View File
@@ -142,14 +142,6 @@ class Hash
self
end
##
# Create a direct instance of the class Hash.
#
# ISO 15.2.13.4.16
def initialize(*args, &block)
self.__init_core(block, *args)
end
##
# Replaces the contents of <i>hsh</i> with the contents of other hash
#
src/hash.c
+7 -16
View File
@@ -309,25 +309,16 @@ mrb_hash_modify(mrb_state *mrb, mrb_value hash)
*/
static mrb_value
mrb_hash_init_core(mrb_state *mrb, mrb_value hash)
mrb_hash_init(mrb_state *mrb, mrb_value hash)
{
mrb_value block, ifnone;
mrb_value *argv;
int argc;
mrb_bool ifnone_p;
mrb_get_args(mrb, "o*", &block, &argv, &argc);
ifnone = mrb_nil_value();
mrb_get_args(mrb, "&|o?", &block, &ifnone, &ifnone_p);
mrb_hash_modify(mrb, hash);
if (mrb_nil_p(block)) {
if (argc > 0) {
if (argc != 1) mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
ifnone = argv[0];
}
else {
ifnone = mrb_nil_value();
}
}
else {
if (argc > 0) {
if (!mrb_nil_p(block)) {
if (ifnone_p) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
}
RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
@@ -849,7 +840,7 @@ mrb_init_hash(mrb_state *mrb)
mrb_define_method(mrb, h, "has_key?", mrb_hash_has_key, MRB_ARGS_REQ(1)); /* 15.2.13.4.13 */
mrb_define_method(mrb, h, "has_value?", mrb_hash_has_value, MRB_ARGS_REQ(1)); /* 15.2.13.4.14 */
mrb_define_method(mrb, h, "include?", mrb_hash_has_key, MRB_ARGS_REQ(1)); /* 15.2.13.4.15 */
mrb_define_method(mrb, h, "__init_core", mrb_hash_init_core, MRB_ARGS_ANY()); /* core of 15.2.13.4.16 */
mrb_define_method(mrb, h, "initialize", mrb_hash_init, MRB_ARGS_OPT(1)); /* 15.2.13.4.16 */
mrb_define_method(mrb, h, "key?", mrb_hash_has_key, MRB_ARGS_REQ(1)); /* 15.2.13.4.18 */
mrb_define_method(mrb, h, "keys", mrb_hash_keys, MRB_ARGS_NONE()); /* 15.2.13.4.19 */
mrb_define_method(mrb, h, "length", mrb_hash_size_m, MRB_ARGS_NONE()); /* 15.2.13.4.20 */