* lib/irb/completion.rb (CompletionProc): calling the method "methods"

  may raise an exception.  [ruby-core:28366]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a6a00a44ea..f7150d0a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  9 01:12:07 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/irb/completion.rb (CompletionProc): calling the method "methods"
+	  may raise an exception.  [ruby-core:28366]
+
 Thu Apr  8 14:33:24 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* configure.in: --disable-install-doc should prohibit doxygen.
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index 459f856dfe..6ba168e813 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -138,10 +138,7 @@ module IRB
 	lv = eval("local_variables", bind).collect{|m| m.to_s}
 	cv = eval("self.class.constants", bind).collect{|m| m.to_s}
 
-	if (gv | lv | cv).include?(receiver)
-	  # foo.func and foo is local var.
-	  candidates = eval("#{receiver}.methods", bind).collect{|m| m.to_s}
-	elsif /^[A-Z]/ =~ receiver and /\./ !~ receiver
+	if (gv | lv | cv).include?(receiver) || /^[A-Z]/ =~ receiver and /\./ !~ receiver
 	  # Foo::Bar.func
 	  begin
 	    candidates = eval("#{receiver}.methods", bind).collect{|m| m.to_s}