ruby-changes:56781
From: Nobuyoshi <ko1@a...>
Date: Sat, 3 Aug 2019 14:07:43 +0900 (JST)
Subject: [ruby-changes:56781] Nobuyoshi Nakada: ec0d742dd7 (master): Suppress warnings against locations in eval
https://git.ruby-lang.org/ruby.git/commit/?id=ec0d742dd7 From ec0d742dd744b13e89d82ffc88d193f165942acf Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 3 Aug 2019 14:06:56 +0900 Subject: Suppress warnings against locations in eval diff --git a/spec/ruby/core/binding/eval_spec.rb b/spec/ruby/core/binding/eval_spec.rb index c026419..fff8c9c 100644 --- a/spec/ruby/core/binding/eval_spec.rb +++ b/spec/ruby/core/binding/eval_spec.rb @@ -26,26 +26,26 @@ describe "Binding#eval" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/binding/eval_spec.rb#L26 it "inherits __LINE__ from the enclosing scope" do obj = BindingSpecs::Demo.new(1) bind = obj.get_binding - bind.eval("__LINE__").should == obj.get_line_of_binding + suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding end it "preserves __LINE__ across multiple calls to eval" do obj = BindingSpecs::Demo.new(1) bind = obj.get_binding - bind.eval("__LINE__").should == obj.get_line_of_binding - bind.eval("__LINE__").should == obj.get_line_of_binding + suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding + suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding end it "increments __LINE__ on each line of a multiline eval" do obj = BindingSpecs::Demo.new(1) bind = obj.get_binding - bind.eval("#foo\n__LINE__").should == obj.get_line_of_binding + 1 + suppress_warning {bind.eval("#foo\n__LINE__")}.should == obj.get_line_of_binding + 1 end it "inherits __LINE__ from the enclosing scope even if the Binding is created with #send" do obj = BindingSpecs::Demo.new(1) bind, line = obj.get_binding_with_send_and_line - bind.eval("__LINE__").should == line + suppress_warning {bind.eval("__LINE__")}.should == line end it "starts with a __LINE__ of 1 if a filename is passed" do @@ -63,7 +63,7 @@ describe "Binding#eval" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/binding/eval_spec.rb#L63 it "inherits __FILE__ from the enclosing scope" do obj = BindingSpecs::Demo.new(1) bind = obj.get_binding - bind.eval("__FILE__").should == obj.get_file_of_binding + suppress_warning {bind.eval("__FILE__")}.should == obj.get_file_of_binding end it "uses the __FILE__ that is passed in" do @@ -77,7 +77,7 @@ describe "Binding#eval" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/binding/eval_spec.rb#L77 bind = obj.get_binding bind.eval("__FILE__", "test.rb").should == "test.rb" - bind.eval("__FILE__").should_not == "test.rb" + suppress_warning {bind.eval("__FILE__")}.should_not == "test.rb" end end diff --git a/spec/ruby/core/kernel/eval_spec.rb b/spec/ruby/core/kernel/eval_spec.rb index 9442725..02f7ae8 100644 --- a/spec/ruby/core/kernel/eval_spec.rb +++ b/spec/ruby/core/kernel/eval_spec.rb @@ -161,11 +161,11 @@ describe "Kernel#eval" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/kernel/eval_spec.rb#L161 it "uses the filename of the binding if none is provided" do eval("__FILE__").should == "(eval)" - eval("__FILE__", binding).should == __FILE__ + suppress_warning {eval("__FILE__", binding)}.should == __FILE__ eval("__FILE__", binding, "success").should == "success" - eval("eval '__FILE__', binding").should == "(eval)" - eval("eval '__FILE__', binding", binding).should == __FILE__ - eval("eval '__FILE__', binding", binding, 'success').should == 'success' + suppress_warning {eval("eval '__FILE__', binding")}.should == "(eval)" + suppress_warning {eval("eval '__FILE__', binding", binding)}.should == __FILE__ + suppress_warning {eval("eval '__FILE__', binding", binding, 'success')}.should == 'success' end # Found via Rubinius bug github:#149 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/