* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-12-27 08:58:03 +00:00
Родитель efd7504d44
Коммит 173f1e1563
5 изменённых файлов: 10 добавлений и 8 удалений

Просмотреть файл

@ -1,7 +1,9 @@
Thu Dec 27 17:25:27 2007 Tanaka Akira <akr@fsij.org> Thu Dec 27 17:57:30 2007 Tanaka Akira <akr@fsij.org>
* parse.y, transcode_data.h, transcode.c: change "illegal" to * parse.y, transcode_data.h, transcode.c, lib/weakref.rb,
"invalid" in a context which doesn' t against a law. 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@fsij.org> Thu Dec 27 16:37:06 2007 Tanaka Akira <akr@fsij.org>

Просмотреть файл

@ -23743,7 +23743,7 @@ from_iso_2022_jp_transcoder_preprocessor(char **in_pos, char **out_pos,
/* SHIFT */ /* SHIFT */
rb_raise(rb_eRuntimeError /*change exception*/, "shift is not supported"); rb_raise(rb_eRuntimeError /*change exception*/, "shift is not supported");
} else if (c1 >= 0x80) { } else if (c1 >= 0x80) {
rb_raise(rb_eRuntimeError /*change exception*/, "illegal byte sequence"); rb_raise(rb_eRuntimeError /*change exception*/, "invalid byte sequence");
} else { } else {
switch (cur_mode) { switch (cur_mode) {
case ISO_2022_GZ_ASCII: case ISO_2022_GZ_ASCII:

Просмотреть файл

@ -18,7 +18,7 @@ module IRB
def_exception :UnrecognizedSwitch, "Unrecognized switch: %s" def_exception :UnrecognizedSwitch, "Unrecognized switch: %s"
def_exception :NotImplementedError, "Need to define `%s'" def_exception :NotImplementedError, "Need to define `%s'"
def_exception :CantReturnToNormalMode, "Can't return to normal mode." 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 :IrbAlreadyDead, "Irb is already dead."
def_exception :IrbSwitchedToCurrentThread, "Switched to current thread." def_exception :IrbSwitchedToCurrentThread, "Switched to current thread."
def_exception :NoSuchJob, "No such job(%s)." def_exception :NoSuchJob, "No such job(%s)."

Просмотреть файл

@ -967,7 +967,7 @@ class RubyLex
when /[0-7]/ when /[0-7]/
match = /[0-7_]/ match = /[0-7_]/
when /[89]/ when /[89]/
RubyLex.fail SyntaxError, "Illegal octal digit" RubyLex.fail SyntaxError, "Invalid octal digit"
else else
return Token(TkINTEGER) return Token(TkINTEGER)
end end

Просмотреть файл

@ -52,12 +52,12 @@ class WeakRef < Delegator
def __getobj__ def __getobj__
unless @@id_rev_map[self.object_id] == @__id 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 end
begin begin
ObjectSpace._id2ref(@__id) ObjectSpace._id2ref(@__id)
rescue RangeError rescue RangeError
Kernel::raise RefError, "Illegal Reference - probably recycled", Kernel::caller(2) Kernel::raise RefError, "Invalid Reference - probably recycled", Kernel::caller(2)
end end
end end
def __setobj__(obj) def __setobj__(obj)