merge revision(s) 47820: [Backport #10330]

* error.c: update exception tree. [DOC]
	  reported by @hemge via twitter.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-10-15 07:09:43 +00:00
parent a7679182e5
commit c436b4658f
3 changed files with 13 additions and 5 deletions

View file

@ -1,3 +1,8 @@
Wed Oct 15 16:05:47 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* error.c: update exception tree. [DOC]
reported by @hemge via twitter.
Wed Oct 15 15:57:48 2014 NAKAMURA Usaku <usa@ruby-lang.org> Wed Oct 15 15:57:48 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not * win32/Makefile.sub (VCSUP): nothing to do if this worktree is not

11
error.c
View file

@ -1673,14 +1673,18 @@ syserr_eqq(VALUE self, VALUE exc)
* * LoadError * * LoadError
* * NotImplementedError * * NotImplementedError
* * SyntaxError * * SyntaxError
* * SecurityError
* * SignalException * * SignalException
* * Interrupt * * Interrupt
* * StandardError -- default for +rescue+ * * StandardError -- default for +rescue+
* * ArgumentError * * ArgumentError
* * IndexError * * EncodingError
* * StopIteration * * FiberError
* * IOError * * IOError
* * EOFError * * EOFError
* * IndexError
* * KeyError
* * StopIteration
* * LocalJumpError * * LocalJumpError
* * NameError * * NameError
* * NoMethodError * * NoMethodError
@ -1688,14 +1692,13 @@ syserr_eqq(VALUE self, VALUE exc)
* * FloatDomainError * * FloatDomainError
* * RegexpError * * RegexpError
* * RuntimeError -- default for +raise+ * * RuntimeError -- default for +raise+
* * SecurityError
* * SystemCallError * * SystemCallError
* * Errno::* * * Errno::*
* * SystemStackError
* * ThreadError * * ThreadError
* * TypeError * * TypeError
* * ZeroDivisionError * * ZeroDivisionError
* * SystemExit * * SystemExit
* * SystemStackError
* * fatal -- impossible to rescue * * fatal -- impossible to rescue
*/ */

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-10-15" #define RUBY_RELEASE_DATE "2014-10-15"
#define RUBY_PATCHLEVEL 579 #define RUBY_PATCHLEVEL 580
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10