From 96986a7a9019ff063e2ef3ecbe223c0b23c68d52 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 1 Dec 2002 14:10:51 +0000
Subject: [PATCH] * lib/optparse.rb (OptionParser::new): same as
 OptionParser#on but   returns new OptionParser::switch.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       |  5 +++++
 lib/optparse.rb | 30 +++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 582126ec00..4a4a665570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec  1 23:04:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (OptionParser::new): same as OptionParser#on but
+	  returns new OptionParser::switch.
+
 Sun Dec  1 22:43:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* win32/win32.c (rb_w32_stat): empty path is invalid, and return
diff --git a/lib/optparse.rb b/lib/optparse.rb
index c92af70c98..cbbd572bda 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -899,7 +899,7 @@ Default options, which never appear in option summary.
   end
   private :notwice
 
-  def switch(*opts, &block)
+  def make_switch(*opts, &block)
     short, long, nolong, style, pattern, conv, not_pattern, not_conv, not_style = [], [], []
     ldesc, sdesc, desc, arg = [], [], []
     default_style = Switch::NoArgument
@@ -1022,23 +1022,39 @@ Default options, which never appear in option summary.
 
     cf. ((<OptionParser#switch>)).
 =end #'#"#`#
+  def new(*opts, &block)
+    top.append(*(sw = make_switch(*opts, &block)))
+    sw[0]
+  end
   def on(*opts, &block)
-    top.append(*switch(*opts, &block))
+    new(*opts, &block)
     self
   end
-  alias def_option on
+  alias def_option new
 
+  def new_head(*opts, &block)
+    top.prepend(*(sw = make_switch(*opts, &block)))
+    sw[0]
+  end
   def on_head(*opts, &block)
-    top.prepend(*switch(*opts, &block))
+    new_head(*opts, &block)
     self
   end
-  alias def_head_option on_head
+  alias def_head_option new_head
 
+  def new_tail(*opts, &block)
+    base.append(*(sw = make_switch(*opts, &block)))
+    sw[0]
+  end
   def on_tail(*opts, &block)
-    base.append(*switch(*opts, &block))
+    new_tail(*opts, &block)
     self
   end
-  alias def_tail_option on_tail
+  alias def_tail_option new_tail
+
+  def separator(string)
+    top.append(string, nil, nil)
+  end
 
 
 =begin