summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-27 08:58:03 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-27 08:58:03 +0000
commitdaf826d6e65569fd283198893b75c98ce7c96347 (patch)
tree2ea7354ed2f9fbd5f728a7c3445b2eb94f8ff629 /lib
parent162e84d970f5b152ac2127fe1a4dad596c9fe9f2 (diff)
downloadruby-daf826d6e65569fd283198893b75c98ce7c96347.tar.gz
ruby-daf826d6e65569fd283198893b75c98ce7c96347.tar.xz
ruby-daf826d6e65569fd283198893b75c98ce7c96347.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@14736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/irb/lc/error.rb2
-rw-r--r--lib/irb/ruby-lex.rb2
-rw-r--r--lib/weakref.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
index 247596b7f..d7c2ec9ca 100644
--- a/lib/irb/lc/error.rb
+++ b/lib/irb/lc/error.rb
@@ -18,7 +18,7 @@ module IRB
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)."
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 561028fb6..de9a62a5c 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -967,7 +967,7 @@ class RubyLex
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
diff --git a/lib/weakref.rb b/lib/weakref.rb
index 3b5bcd1b8..ba3924244 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -52,12 +52,12 @@ class WeakRef < Delegator
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)