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

Fix support for dynamic keys. (#8273)

Browse Source 
* Skip RBS test.
This commit is contained in:
Samuel Williams 2023-08-24 15:19:33 +12:00 committed by GitHub
parent bd22bb259c
commit d4c720a91b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-08-24 03:19:56 +00:00 
Merged-By: ioquatix <samuel@codeotaku.com>
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cont.c
View File

@ -2118,7 +2118,7 @@ rb_fiber_storage_get(VALUE self)
static int
fiber_storage_validate_each(VALUE key, VALUE value, VALUE _argument)
{
rb_check_id(&key);
Check_Type(key, T_SYMBOL);
return ST_CONTINUE;
}
@ -2190,8 +2190,7 @@ rb_fiber_storage_set(VALUE self, VALUE value)
static VALUE
rb_fiber_storage_aref(VALUE class, VALUE key)
{
ID id = rb_check_id(&key);
if (!id) return Qnil;
Check_Type(key, T_SYMBOL);
VALUE storage = fiber_storage_get(fiber_current(), FALSE);
if (storage == Qnil) return Qnil;
@ -2212,8 +2211,7 @@ rb_fiber_storage_aref(VALUE class, VALUE key)
static VALUE
rb_fiber_storage_aset(VALUE class, VALUE key, VALUE value)
{
ID id = rb_check_id(&key);
if (!id) return Qnil;
Check_Type(key, T_SYMBOL);
VALUE storage = fiber_storage_get(fiber_current(), value != Qnil);
if (storage == Qnil) return Qnil;

14
spec/ruby/core/fiber/storage_spec.rb
View File

@ -74,6 +74,20 @@ describe "Fiber.[]" do
Fiber.new { Fiber[:life] }.resume.should be_nil
end
end
ruby_version_is "3.2.3" do
it "can use dynamically defined keys" do
key = :"#{self.class.name}#.#{self.object_id}"
Fiber.new { Fiber[key] = 42; Fiber[key] }.resume.should == 42
end
it "can't use invalid keys" do
invalid_keys = [Object.new, "Foo", 12]
invalid_keys.each do |key|
-> { Fiber[key] }.should raise_error(TypeError)
end
end
end
end
describe "Fiber.[]=" do

2
tool/rbs_skip_tests
View File

@ -25,6 +25,8 @@ test_subtract(RBS::CliTest) running tests without Bundler
test_subtract_several_subtrahends(RBS::CliTest) running tests without Bundler
test_subtract_write(RBS::CliTest) running tests without Bundler
test_aref(FiberSingletonTest) the method should not accept String keys
NetSingletonTest depending on external resources
NetInstanceTest depending on external resources
TestHTTPRequest depending on external resources