Merge pull request #3014 from sekito1107/fix/issue-2974

Ruby 3.4 の引用符変更に伴うバックトレース表示例の更新 (#2974)

Author: znz

refm/api/src/_builtin/Array

@@ -2084,14 +2084,22 @@ p [].transpose
 
 p [1,2,3].transpose
 
+#@since 3.4
+# => -:1:in 'transpose': cannot convert Fixnum into Array (TypeError)
+#@else
 # => -:1:in `transpose': cannot convert Fixnum into Array (TypeError)
+#@end
 #       from -:1
 
 p [[1,2],
    [3,4,5],
    [6,7]].transpose
+#@since 3.4
+# => -:3:in 'transpose': element size differ (3 should be 2) (IndexError)
+#@else
 # => -:3:in `transpose': element size differ (3 should be 2) (IndexError)
 #@end
+#@end
 
 --- uniq     -> Array
 --- uniq!    -> self | nil

refm/api/src/_builtin/Data

@@ -162,11 +162,18 @@ Point.new に渡した位置引数の数が多い場合(上から2番目)のみ
 #@samplecode 例
 Point = Data.define(:x, :y)
 
+#@since 3.4
+Point.new(1)                 # => in 'initialize': missing keyword: :y (ArgumentError)
+Point.new(1, 2, 3)           # => in 'new': wrong number of arguments (given 3, expected 0..2) (ArgumentError)
+Point.new(x: 1)              # => in 'initialize': missing keyword: :y (ArgumentError)
+Point.new(x: 1, y: 2, z: 3)  # => in 'initialize': unknown keyword: :z (ArgumentError)
+#@else
 Point.new(1)                 # => in `initialize': missing keyword: :y (ArgumentError)
 Point.new(1, 2, 3)           # => in `new': wrong number of arguments (given 3, expected 0..2) (ArgumentError)
 Point.new(x: 1)              # => in `initialize': missing keyword: :y (ArgumentError)
 Point.new(x: 1, y: 2, z: 3)  # => in `initialize': unknown keyword: :z (ArgumentError)
 #@end
+#@end
 
 下の例のように、initialize メソッドをオーバーライドすることで new のオプション引数を実現できます。
 

refm/api/src/_builtin/Exception

@@ -63,8 +63,13 @@ end
 
 デフォルトでは
 
+#@since 3.4
+  * "#{sourcefile}:#{sourceline}:in '#{method}'"
+    (メソッド内の場合)
+#@else
   * "#{sourcefile}:#{sourceline}:in `#{method}'"
     (メソッド内の場合)
+#@end
   * "#{sourcefile}:#{sourceline}"
     (トップレベルの場合)
 
@@ -81,8 +86,12 @@ rescue => e
   p e.backtrace
 end
 
+#@since 3.4
+#=> ["filename.rb:2:in 'methd'", "filename.rb:6"]
+#@else
 #=> ["filename.rb:2:in `methd'", "filename.rb:6"]
 #@end
+#@end
 
 #@since 2.1.0
 @see [[m:Exception#backtrace_locations]]
@@ -112,8 +121,12 @@ end
 
 e = get_exception { check_long_month(2) }
 p e.backtrace_locations
+#@since 3.4
+# => ["test.rb:4:in 'check_long_month'", "test.rb:15:in 'block in <main>'", "test.rb:9:in 'get_exception'", "test.rb:15:in '<main>'"]
+#@else
 # => ["test.rb:4:in `check_long_month'", "test.rb:15:in `block in <main>'", "test.rb:9:in `get_exception'", "test.rb:15:in `<main>'"]
 #@end
+#@end
 
 @see [[m:Exception#backtrace]]
 #@end
@@ -149,7 +162,11 @@ begin
     raise "outer"
   end
 rescue
+#@since 3.4
+  $!.backtrace # => ["/path/to/test.rb:5:in 'rescue in <main>'", "/path/to/test.rb:2:in '<main>'"]
+#@else
   $!.backtrace # => ["/path/to/test.rb:5:in `rescue in <main>'", "/path/to/test.rb:2:in `<main>'"]
+#@end
   $!.set_backtrace(["dummy1", "dummy2"])
   $!.backtrace # => ["dummy1", "dummy2"]
 end
@@ -271,11 +288,23 @@ end
 begin
   raise "test"
 rescue => e
+#@since 3.4
+  p e.full_message   # => "\e[1mTraceback \e[m(most recent call last):\ntest.rb:2:in '<main>': \e[1mtest (\e[4;1mRuntimeError\e[m\e[1m)\n\e[m"
+#@else
   p e.full_message   # => "\e[1mTraceback \e[m(most recent call last):\ntest.rb:2:in `<main>': \e[1mtest (\e[4;1mRuntimeError\e[m\e[1m)\n\e[m"
+#@end
   $stderr = $stdout
+#@since 3.4
+  p e.full_message   # => "test.rb:2:in '<main>': test (RuntimeError)\n"
+#@else
   p e.full_message   # => "test.rb:2:in `<main>': test (RuntimeError)\n"
+#@end
   $stderr = STDERR
+#@since 3.4
+  p e.full_message   # => "\e[1mTraceback \e[m(most recent call last):\ntest.rb:2:in '<main>': \e[1mtest (\e[4;1mRuntimeError\e[m\e[1m)\n\e[m"
+#@else
   p e.full_message   # => "\e[1mTraceback \e[m(most recent call last):\ntest.rb:2:in `<main>': \e[1mtest (\e[4;1mRuntimeError\e[m\e[1m)\n\e[m"
+#@end
 end
 #@end
 

refm/api/src/_builtin/IO

@@ -1854,7 +1854,11 @@ outbuf は空文字列になります。
     buf = f.read(3)
     f.sysseek(0)
   }
+#@since 3.4
+  # => -:3:in 'sysseek': sysseek for buffered IO (IOError)
+#@else
   # => -:3:in `sysseek': sysseek for buffered IO (IOError)
+#@end
 
   File.open("/dev/null", "w") {|f|
     f.print "foo"

refm/api/src/_builtin/Integer

@@ -78,7 +78,11 @@ self を文字コードとして見た時に、引数で与えたエンコーデ
 p 65.chr
 # => "A"
 p 12354.chr
+#@since 3.4
+# => 'chr': 12354 out of char range (RangeError)
+#@else
 # => `chr': 12354 out of char range (RangeError)
+#@end
 
 p 12354.chr(Encoding::UTF_8)
 # => "あ"

refm/api/src/_builtin/Marshal

@@ -36,8 +36,12 @@ obj を指定された出力先に再帰的に出力します。
 
 #@samplecode 例
 p Marshal.dump(Hash.new {})
+#@since 3.4
+# => -:1:in 'dump': cannot dump hash with default proc (TypeError)
+#@else
 # => -:1:in `dump': cannot dump hash with default proc (TypeError)
 #@end
+#@end
 
 マーシャルの動作を任意に定義することもできます。
 

refm/api/src/_builtin/MatchData

@@ -82,8 +82,12 @@ p $~.begin(0)   # => 0
 p $~.begin(1)   # => 0
 p $~.begin(2)   # => 3
 p $~.begin(3)   # => nil
+#@since 3.4
+p $~.begin(4)   # => 'begin': index 4 out of matches (IndexError)
+#@else
 p $~.begin(4)   # => `begin': index 4 out of matches (IndexError)
 #@end
+#@end
 
 @see [[m:MatchData#end]]
 
@@ -104,8 +108,12 @@ p $~.end(0)   # => 6
 p $~.end(1)   # => 3
 p $~.end(2)   # => 6
 p $~.end(3)   # => nil
+#@since 3.4
+p $~.end(4)   # => 'end': index 4 out of matches (IndexError)
+#@else
 p $~.end(4)   # => `end': index 4 out of matches (IndexError)
 #@end
+#@end
 
 @see [[m:MatchData#begin]]
 
@@ -207,8 +215,12 @@ p $~.offset(:year)     # => [0, 4]
 p $~.offset('month')   # => [5, 6]
 p $~.offset(:month)    # => [5, 6]
 p $~.offset('day')     # => [nil, nil]
+#@since 3.4
+p $~.offset('century') # => 'offset': undefined group name reference: century (IndexError)
+#@else
 p $~.offset('century') # => `offset': undefined group name reference: century (IndexError)
 #@end
+#@end
 
 #@since 3.2
 @see [[m:MatchData#begin]], [[m:MatchData#end]], [[m:MatchData#byteoffset]]
@@ -248,8 +260,12 @@ p $~.byteoffset(:year)     # => [0, 4]
 p $~.byteoffset('month')   # => [7, 8]
 p $~.byteoffset(:month)    # => [7, 8]
 p $~.byteoffset('day')     # => [nil, nil]
+#@since 3.4
+p $~.byteoffset('century') # => 'offset': undefined group name reference: century (IndexError)
+#@else
 p $~.byteoffset('century') # => `offset': undefined group name reference: century (IndexError)
 #@end
+#@end
 
 @see [[m:MatchData#offset]]
 #@end

refm/api/src/_builtin/Module

@@ -158,9 +158,12 @@ p Baz < Bar     # => true
 p Baz < Foo     # => true
 p Baz < Qux     # => nil
 p Baz > Qux     # => nil
-
+#@since 3.4
+p Foo < Object.new # => in '<': compared with non class/module (TypeError)
+#@else
 p Foo < Object.new # => in `<': compared with non class/module (TypeError)
 #@end
+#@end
 
 --- <=(other) -> bool | nil
 
@@ -373,8 +376,12 @@ class Foo
   autoload :Bar, '/tmp/bar.rb'
 end
 p Foo::Bar
+#@since 3.4
+#=> -:4:in '<main>': uninitialized constant Foo::Bar (NameError)
+#@else
 #=> -:4:in `<main>': uninitialized constant Foo::Bar (NameError)
 #@end
+#@end
 
 @see [[m:Kernel.#autoload]]
 
@@ -1005,8 +1012,12 @@ self の public インスタンスメソッド name をオブジェクト化し
 
 #@samplecode 例
 Kernel.public_instance_method(:object_id) #=> #<UnboundMethod: Kernel#object_id>
+#@since 3.4
+Kernel.public_instance_method(:p)         #   method 'p' for module 'Kernel' is private (NameError)
+#@else
 Kernel.public_instance_method(:p)         #   method `p' for module `Kernel' is private (NameError)
 #@end
+#@end
 
 @see [[m:Module#instance_method]],[[m:Object#public_method]]
 
@@ -1129,7 +1140,11 @@ class Foo
   private_class_method :foo
 end
 
+#@since 3.4
+Foo.foo # NoMethodError: private method 'foo' called for Foo:Class
+#@else
 Foo.foo # NoMethodError: private method `foo' called for Foo:Class
+#@end
 
 Foo.public_class_method(:foo) # => Foo
 Foo.foo # => "foo"
@@ -1657,8 +1672,12 @@ end
 
 foo = Foo.new
 p foo.foo1          # => 1
+#@since 3.4
+p foo.foo2          # => private method 'foo2' called for #<Foo:0x401b7628> (NoMethodError)
+#@else
 p foo.foo2          # => private method `foo2' called for #<Foo:0x401b7628> (NoMethodError)
 #@end
+#@end
 
 --- protected() -> nil
 --- protected(name) -> String | Symbol
@@ -1708,7 +1727,11 @@ p foo.foo2          # => private method `foo2' called for #<Foo:0x401b7628> (NoM
 def foo() 1 end
 p foo             # => 1
 # the toplevel default is private
+#@since 3.4
+p self.foo        # => private method 'foo' called for #<Object:0x401c83b0> (NoMethodError)
+#@else
 p self.foo        # => private method `foo' called for #<Object:0x401c83b0> (NoMethodError)
+#@end
 
 def bar() 2 end
 public :bar       # visibility changed (all access allowed)

refm/api/src/_builtin/Module.include

@@ -19,8 +19,13 @@ end
 
 実行結果:
 
+#@since 3.4
+  -:3:in 'append_features': cyclic include detected (ArgumentError)
+          from -:3:in 'include'
+#@else
   -:3:in `append_features': cyclic include detected (ArgumentError)
           from -:3:in `include'
+#@end
           from -:3
 
 

refm/api/src/_builtin/NameError

@@ -5,7 +5,11 @@
 例:
 
   bar
+#@since 3.4
+  # => NameError: undefined local variable or method 'bar' for main:Object
+#@else
   # => NameError: undefined local variable or method `bar' for main:Object
+#@end
 
 == Class Methods
 
@@ -42,7 +46,11 @@
   begin
     foobar
   rescue NameError => err
+#@since 3.4
+    p err       # => #<NameError: undefined local variable or method 'foobar' for main:Object>
+#@else
     p err       # => #<NameError: undefined local variable or method `foobar' for main:Object>
+#@end
     p err.name  # => :foobar
   end
 
@@ -55,8 +63,13 @@
   begin
     foobar
   rescue NameError => err
+#@since 3.4
+    p err       # => #<NameError: undefined local variable or method 'foobar' for main:Object>
+    p err.to_s  # => "undefined local variable or method 'foobar' for main:Object"
+#@else
     p err       # => #<NameError: undefined local variable or method `foobar' for main:Object>
     p err.to_s  # => "undefined local variable or method `foobar' for main:Object"
+#@end
   end
 
 #@since 2.3.0