* lib/irb/completion.rb: Use %w literal construction for long lists.

Patch by Dave Goodchild. [Fixes GH-299] git-svn-id: svn ssh://ci.ruby-lang.org/ruby/trunk@41062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Jun 4, 2013 · 5f55e23 · 5f55e23
1 parent 71b6077
commit 5f55e23
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3  1,8 @@
 Tue Jun  4 23:16:49 2013  Benoit Daloze  <[email protected]>
 
 	* lib/irb/completion.rb: Use %w literal construction for long lists.
 	  Patch by Dave Goodchild. [Fixes GH-299]
 
 Tue Jun  4 23:08:42 2013  Benoit Daloze  <[email protected]>
 
 	* ext/objspace/objspace.c: improve wording and remove duplicated comment.

diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
@@ -15,24  15,24 @@ module InputCompletor # :nodoc:
 
     # Set of reserved words used by Ruby, you should not use these for
     # constants or variables
-    ReservedWords = [
-      "BEGIN", "END",
-      "alias", "and",
-      "begin", "break",
-      "case", "class",
-      "def", "defined", "do",
-      "else", "elsif", "end", "ensure",
-      "false", "for",
-      "if", "in",
-      "module",
-      "next", "nil", "not",
-      "or",
-      "redo", "rescue", "retry", "return",
-      "self", "super",
-      "then", "true",
-      "undef", "unless", "until",
-      "when", "while",
-      "yield",
     ReservedWords = %w[
       BEGIN END
       alias and
       begin break
       case class
       def defined do
       else elsif end ensure
       false for
       if in
       module
       next nil not
       or
       redo rescue retry return
       self super
       then true
       undef unless until
       when while
       yield
     ]
 
     CompletionProc = proc { |input|
@@ -211,9  211,7 @@ module InputCompletor # :nodoc:
     }
 
     # Set of available operators in Ruby
-    Operators = ["%", "&", "*", "**", " ",  "-",  "/",
-      "<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
-      "[]", "[]=", "^", "!", "!=", "!~"]
     Operators = %w[% & * **   - / < << <= <=> == === =~ > >= >> [] []= ^ ! != !~]
 
     def self.select_message(receiver, message, candidates, sep = ".")
       candidates.grep(/^#{message}/).collect do |e|