ruby-changes:3243
From: ko1@a...
Date: 27 Dec 2007 17:58:24 +0900
Subject: [ruby-changes:3243] akr - Ruby:r14736 (trunk): * lib/weakref.rb, lib/irb/ruby-lex.rb, lib/irb/lc/error.rb, enc/trans/japanese.c:
akr 2007-12-27 17:58:03 +0900 (Thu, 27 Dec 2007)
New Revision: 14736
Modified files:
trunk/ChangeLog
trunk/enc/trans/japanese.c
trunk/lib/irb/lc/error.rb
trunk/lib/irb/ruby-lex.rb
trunk/lib/weakref.rb
Log:
* lib/weakref.rb, lib/irb/ruby-lex.rb, lib/irb/lc/error.rb, enc/trans/japanese.c:
change "illegal" to "invalid" in a context which doesn' t against
a law.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/weakref.rb?r1=14736&r2=14735
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/irb/ruby-lex.rb?r1=14736&r2=14735
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14736&r2=14735
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/trans/japanese.c?r1=14736&r2=14735
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/irb/lc/error.rb?r1=14736&r2=14735
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14735)
+++ ChangeLog (revision 14736)
@@ -1,7 +1,9 @@
-Thu Dec 27 17:25:27 2007 Tanaka Akira <akr@f...>
+Thu Dec 27 17:57:30 2007 Tanaka Akira <akr@f...>
- * parse.y, transcode_data.h, transcode.c: change "illegal" to
- "invalid" in a context which doesn' t against a law.
+ * parse.y, transcode_data.h, transcode.c, lib/weakref.rb,
+ lib/irb/ruby-lex.rb, lib/irb/lc/error.rb, enc/trans/japanese.c:
+ change "illegal" to "invalid" in a context which doesn' t against
+ a law.
Thu Dec 27 16:37:06 2007 Tanaka Akira <akr@f...>
Index: enc/trans/japanese.c
===================================================================
--- enc/trans/japanese.c (revision 14735)
+++ enc/trans/japanese.c (revision 14736)
@@ -23743,7 +23743,7 @@
/* SHIFT */
rb_raise(rb_eRuntimeError /*change exception*/, "shift is not supported");
} else if (c1 >= 0x80) {
- rb_raise(rb_eRuntimeError /*change exception*/, "illegal byte sequence");
+ rb_raise(rb_eRuntimeError /*change exception*/, "invalid byte sequence");
} else {
switch (cur_mode) {
case ISO_2022_GZ_ASCII:
Index: lib/weakref.rb
===================================================================
--- lib/weakref.rb (revision 14735)
+++ lib/weakref.rb (revision 14736)
@@ -52,12 +52,12 @@
def __getobj__
unless @@id_rev_map[self.object_id] == @__id
- Kernel::raise RefError, "Illegal Reference - probably recycled", Kernel::caller(2)
+ Kernel::raise RefError, "Invalid Reference - probably recycled", Kernel::caller(2)
end
begin
ObjectSpace._id2ref(@__id)
rescue RangeError
- Kernel::raise RefError, "Illegal Reference - probably recycled", Kernel::caller(2)
+ Kernel::raise RefError, "Invalid Reference - probably recycled", Kernel::caller(2)
end
end
def __setobj__(obj)
Index: lib/irb/lc/error.rb
===================================================================
--- lib/irb/lc/error.rb (revision 14735)
+++ lib/irb/lc/error.rb (revision 14736)
@@ -18,7 +18,7 @@
def_exception :UnrecognizedSwitch, "Unrecognized switch: %s"
def_exception :NotImplementedError, "Need to define `%s'"
def_exception :CantReturnToNormalMode, "Can't return to normal mode."
- def_exception :IllegalParameter, "Illegal parameter(%s)."
+ def_exception :IllegalParameter, "Invalid parameter(%s)."
def_exception :IrbAlreadyDead, "Irb is already dead."
def_exception :IrbSwitchedToCurrentThread, "Switched to current thread."
def_exception :NoSuchJob, "No such job(%s)."
Index: lib/irb/ruby-lex.rb
===================================================================
--- lib/irb/ruby-lex.rb (revision 14735)
+++ lib/irb/ruby-lex.rb (revision 14736)
@@ -967,7 +967,7 @@
when /[0-7]/
match = /[0-7_]/
when /[89]/
- RubyLex.fail SyntaxError, "Illegal octal digit"
+ RubyLex.fail SyntaxError, "Invalid octal digit"
else
return Token(TkINTEGER)
end
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml