From 82ac4a2399516a3ffda750b815c244aad6d38277 Mon Sep 17 00:00:00 2001 From: Chris Salzberg Date: Tue, 9 Aug 2022 22:22:23 +0900 Subject: Support using at toplevel in wrapped script Allow refinements to be used at the toplevel within a script that is loaded under a module. Fixes [Bug #18960] --- spec/ruby/core/main/fixtures/using.rb | 1 + spec/ruby/core/main/fixtures/using_in_main.rb | 5 +++++ spec/ruby/core/main/fixtures/using_in_method.rb | 5 +++++ spec/ruby/core/main/using_spec.rb | 20 ++++++++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 spec/ruby/core/main/fixtures/using.rb create mode 100644 spec/ruby/core/main/fixtures/using_in_main.rb create mode 100644 spec/ruby/core/main/fixtures/using_in_method.rb (limited to 'spec/ruby/core') diff --git a/spec/ruby/core/main/fixtures/using.rb b/spec/ruby/core/main/fixtures/using.rb new file mode 100644 index 0000000000..30713ef309 --- /dev/null +++ b/spec/ruby/core/main/fixtures/using.rb @@ -0,0 +1 @@ +using Module.new diff --git a/spec/ruby/core/main/fixtures/using_in_main.rb b/spec/ruby/core/main/fixtures/using_in_main.rb new file mode 100644 index 0000000000..a4a71c89cc --- /dev/null +++ b/spec/ruby/core/main/fixtures/using_in_main.rb @@ -0,0 +1,5 @@ +MAIN = self + +module X + MAIN.send(:using, Module.new) +end diff --git a/spec/ruby/core/main/fixtures/using_in_method.rb b/spec/ruby/core/main/fixtures/using_in_method.rb new file mode 100644 index 0000000000..d9ea2e9ef0 --- /dev/null +++ b/spec/ruby/core/main/fixtures/using_in_method.rb @@ -0,0 +1,5 @@ +def foo + using Module.new +end + +foo diff --git a/spec/ruby/core/main/using_spec.rb b/spec/ruby/core/main/using_spec.rb index f9f709f7dc..8a23970c4b 100644 --- a/spec/ruby/core/main/using_spec.rb +++ b/spec/ruby/core/main/using_spec.rb @@ -129,4 +129,24 @@ describe "main.using" do x.call_bar(cls2.new).should == 'bar' end + + it "raises error when called from method in wrapped script" do + -> do + load File.expand_path('../fixtures/using_in_method.rb', __FILE__), true + end.should raise_error(RuntimeError) + end + + it "raises error when called on toplevel from module" do + -> do + load File.expand_path('../fixtures/using_in_main.rb', __FILE__), true + end.should raise_error(RuntimeError) + end + + ruby_version_is "3.2" do + it "does not raise error when wrapped with module" do + -> do + load File.expand_path('../fixtures/using.rb', __FILE__), true + end.should_not raise_error + end + end end -- cgit v1.2.3