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

mruby-hash-ext: remove non-compatible Hash#deconstruct_keys

Browse Source 
CRuby's Hash#deconstruct_keys simply returns self regardless of
arguments. The mruby-hash-ext version filtered keys, which was
unnecessary since the compiler accesses individual keys via []
after calling deconstruct_keys. The Ruby implementation in
mrblib/hash.rb (returning self) is sufficient and CRuby-compatible.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2026-02-16 16:57:21 +09:00
parent 75738a350a
commit 34b94129d2
2 changed files with 0 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-hash-ext/src/hash_ext.c
-49
View File
@@ -328,54 +328,6 @@ hash_key(mrb_state *mrb, mrb_value hash)
return search.found ? search.result : mrb_nil_value();
}
/*
* call-seq:
* hsh.deconstruct_keys(keys) -> hash
*
* Returns a hash containing the contents of hsh for the given keys.
*
* If keys is nil, returns the hash itself.
* If keys is an array, returns a new hash containing only the specified keys.
*
* h = { a: 1, b: 2, c: 3, d: 4 }
* h.deconstruct_keys([:a, :c]) #=> { a: 1, c: 3 }
* h.deconstruct_keys(nil) #=> { a: 1, b: 2, c: 3, d: 4 }
* h.deconstruct_keys([:x, :y]) #=> { x: nil, y: nil }
*/
static mrb_value
hash_deconstruct_keys(mrb_state *mrb, mrb_value hash)
{
mrb_value keys;
mrb_value result;
mrb_int i, len;
mrb_get_args(mrb, "o", &keys);
/* If keys is nil, return the hash itself */
if (mrb_nil_p(keys)) {
return hash;
}
/* Keys must be an array */
if (!mrb_array_p(keys)) {
mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %C (expected Array or nil)",
mrb_obj_class(mrb, keys));
}
/* Create result hash */
result = mrb_hash_new(mrb);
len = RARRAY_LEN(keys);
/* Extract specified keys */
for (i = 0; i < len; i++) {
mrb_value key = mrb_ary_ref(mrb, keys, i);
mrb_value val = mrb_hash_get(mrb, hash, key);
mrb_hash_set(mrb, result, key, val);
}
return result;
}
/*
* call-seq:
* hsh.__merge(*others) -> hsh
@@ -425,7 +377,6 @@ mrb_mruby_hash_ext_gem_init(mrb_state *mrb)
mrb_define_method_id(mrb, h, MRB_SYM_B(slice), hash_slice_bang, MRB_ARGS_ANY());
mrb_define_method_id(mrb, h, MRB_SYM(except), hash_except, MRB_ARGS_ANY());
mrb_define_method_id(mrb, h, MRB_SYM(key), hash_key, MRB_ARGS_REQ(1));
mrb_define_method_id(mrb, h, MRB_SYM(deconstruct_keys), hash_deconstruct_keys, MRB_ARGS_REQ(1));
mrb_define_method_id(mrb, h, MRB_SYM(__merge), hash_merge, MRB_ARGS_ANY());
mrb_define_class_method_id(mrb, h, MRB_OPSYM(aref), hash_s_create, MRB_ARGS_ANY());
}
mrbgems/mruby-hash-ext/test/hash.rb
-25
View File
@@ -315,28 +315,3 @@ assert("Hash#except") do
assert_equal({:a=>100}, h.except(:b, :c, :d))
assert_equal(h, h.except)
end
assert("Hash#deconstruct_keys") do
h = { a: 1, b: 2, c: 3, d: 4 }
# Test with specific keys
result = h.deconstruct_keys([:a, :c])
assert_equal({ a: 1, c: 3 }, result)
# Test with nil (return self)
result_nil = h.deconstruct_keys(nil)
assert_equal(h, result_nil)
assert_true(result_nil.equal?(h))
# Test with non-existent keys
result_missing = h.deconstruct_keys([:a, :x, :y])
assert_equal({ a: 1, x: nil, y: nil }, result_missing)
# Test with empty array
result_empty = h.deconstruct_keys([])
assert_equal({}, result_empty)
# Test error cases
assert_raise(TypeError) { h.deconstruct_keys("not_an_array") }
assert_raise(TypeError) { h.deconstruct_keys(123) }
end