From e689d077e30d4680af140be5549a369590e3db39 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 22 Mar 2003 04:31:24 +0000
Subject: [PATCH] * lib/optparse.rb, lib/jcode.rb, ext/tk/lib/tk.rb: reorder
 character   class /[\]\[]/ to /[\[\]]/ to readability.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        |  5 +++++
 ext/tk/lib/tk.rb | 18 +++++++++---------
 lib/jcode.rb     |  2 +-
 lib/optparse.rb  |  6 +++---
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9639d057c8..1b4e219b4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 22 13:26:33 2003  Tanaka Akira  <akr@m17n.org>
+
+        * lib/optparse.rb, lib/jcode.rb, ext/tk/lib/tk.rb: reorder character
+          class /[\]\[]/ to /[\[\]]/ to readability.
+
 Sat Mar 22 12:44:15 2003  Tanaka Akira  <akr@m17n.org>
 
         * lib/date/format.rb, lib/uri/common.rb: `[', `]', `-' in chracter
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index c24d6150aa..ab7fcc4b39 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -605,7 +605,7 @@ module TkCore
   end
 
   def rb_appsend(interp, async, *args)
-    args = args.collect!{|c| _get_eval_string(c).gsub(/[\]\[$"]/, '\\\\\&')}
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
     args.push(').to_s"')
     appsend(interp, async, 'ruby "(', *args)
   end
@@ -620,7 +620,7 @@ module TkCore
   end
 
   def rb_appsend_displayof(interp, win, async, *args)
-    args = args.collect!{|c| _get_eval_string(c).gsub(/[\]\[$"]/, '\\\\\&')}
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
     args.push(').to_s"')
     appsend_displayof(interp, win, async, 'ruby "(', *args)
   end
@@ -1179,14 +1179,14 @@ class TkVariable
     elsif val.kind_of?(Array)
       a = []
       val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
-      s = '"' + a.join(" ").gsub(/[\]\[$"]/, '\\\\\&') + '"'
+      s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
       INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
     elsif  val.kind_of?(Hash)
       s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
-                   .gsub(/[\]\[$"]/, '\\\\\&') + '"'
+                   .gsub(/[\[\]$"]/, '\\\\\&') + '"'
       INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
     else
-      s = '"' + _get_eval_string(val).gsub(/[\]\[$"]/, '\\\\\&') + '"'
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
       INTERP._eval(format('global %s; set %s %s', @id, @id, s))
     end
   end
@@ -1214,7 +1214,7 @@ class TkVariable
 
   def value=(val)
     begin
-      s = '"' + _get_eval_string(val).gsub(/[\]\[$"]/, '\\\\\&') + '"'
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
       INTERP._eval(format('global %s; set %s %s', @id, @id, s))
     rescue
       if INTERP._eval(format('global %s; array exists %s', @id, @id)) != "1"
@@ -1226,12 +1226,12 @@ class TkVariable
 	elsif val.kind_of?(Array)
 	  a = []
 	  val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
-	  s = '"' + a.join(" ").gsub(/[\]\[$"]/, '\\\\\&') + '"'
+	  s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
 	  INTERP._eval(format('global %s; unset %s; array set %s %s', 
 			      @id, @id, @id, s))
 	elsif  val.kind_of?(Hash)
 	  s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
-	                        .gsub(/[\]\[$"]/, '\\\\\&') + '"'
+	                        .gsub(/[\[\]$"]/, '\\\\\&') + '"'
 	  INTERP._eval(format('global %s; unset %s; array set %s %s', 
 			      @id, @id, @id, s))
 	else
@@ -1438,7 +1438,7 @@ class TkVarAccess<TkVariable
   def initialize(varname, val=nil)
     @id = varname
     if val
-      s = '"' + _get_eval_string(val).gsub(/[\]\[$"]/, '\\\\\&') + '"' #"
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"' #"
       INTERP._eval(format('global %s; set %s %s', @id, @id, s))
     end
   end
diff --git a/lib/jcode.rb b/lib/jcode.rb
index df2cd61b3f..1e8fd64518 100644
--- a/lib/jcode.rb
+++ b/lib/jcode.rb
@@ -9,7 +9,7 @@ class String
   printf STDERR, "feel free for some warnings:\n" if $VERBOSE
 
   def _regex_quote(str)
-    str.gsub(/(\\[\]\[\-\\])|\\(.)|([\]\[\\])/) do
+    str.gsub(/(\\[\[\]\-\\])|\\(.)|([\[\]\\])/) do
       $1 || $2 || '\\' + $3
     end
   end
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 1da5ef2cc0..ea1ba61356 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -965,7 +965,7 @@ Default options, which never appear in option summary.
 	raise ArgumentError, "unsupported argument type: #{o}"
       when *ArgumentStyle.keys
 	style = notwice(ArgumentStyle[o], style, 'style')
-      when /^--no-([^\]\[=\s]*)(.+)?/
+      when /^--no-([^\[\]=\s]*)(.+)?/
 	q, a = $1, $2
 	o = notwice(a ? Object : TrueClass, klass, 'type')
 	not_pattern, not_conv = search(:atype, o) unless not_style
@@ -975,7 +975,7 @@ Default options, which never appear in option summary.
 	ldesc << "--no-#{q}"
 	long << 'no-' + (q = q.downcase)
 	nolong << q
-      when /^--\[no-\]([^\]\[=\s]*)(.+)?/
+      when /^--\[no-\]([^\[\]=\s]*)(.+)?/
 	q, a = $1, $2
 	o = notwice(a ? Object : TrueClass, klass, 'type')
 	if a
@@ -987,7 +987,7 @@ Default options, which never appear in option summary.
 	not_pattern, not_conv = search(:atype, FalseClass) unless not_style
 	not_style = Switch::NoArgument
 	nolong << 'no-' + o
-      when /^--([^\]\[=\s]*)(.+)?/
+      when /^--([^\[\]=\s]*)(.+)?/
 	q, a = $1, $2
 	if a
 	  o = notwice(NilClass, klass, 'type')