0 files changed, 0 insertions, 0 deletions
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 52a5620133..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,54 +0,0 @@
-*.bak
-*.orig
-*.rej
-*.sav
-*~
-.ccmalloc
-.ppack
-COPYING.LIB
-ChangeLog.pre-alpha
-ChangeLog.pre1_1
-Makefile
-README.fat-patch
-README.v6
-README.atheos
-archive
-autom4te*.cache
-automake
-beos
-config.cache
-config.h
-config.h.in
-config.log
-config.status
-configure
-foo.rb
-libruby.so.*
-miniruby
-miniruby.elhash
-miniruby.elhash2
-miniruby.orig2
-miniruby.plhash
-miniruby.plhash2
-modex.rb
-newdate.rb
-newver.rb
-parse.c
-parse.y.try
-pitest.rb
-ppack
-preview
-rbconfig.rb
-rename2.h
-repack
-riscos
-rubicon
-ruby
-ruby-man.rd.gz
-rubyunit
-st.c.power
-this that
-tmp
-web
-y.output
-y.tab.c
diff --git a/COPYING b/COPYING
index 870a5f22d6..eeb586b392 100644
--- a/COPYING
+++ b/COPYING
@@ -1,56 +1,340 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see the file GPL), or the conditions below:
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
+			    Preamble
 
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
 
-       b) use the modified software only within your corporation or
-          organization.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
-       d) make other distribution arrangements with the author.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
 
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
 
-       b) accompany the distribution with the machine-readable source of
-	  the software.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-       d) make other distribution arrangements with the author.
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
 
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
 
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
 
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
 
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/COPYING.ja b/COPYING.ja
deleted file mode 100644
index 933cc7cb9a..0000000000
--- a/COPYING.ja
+++ /dev/null
@@ -1,51 +0,0 @@
-$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
-Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
-$B$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
-
-  1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
-
-  2. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$N%=!<%9$r(B
-     $B<+M3$KJQ99$G$-$^$9!%(B
-
-     (a) $B%M%C%H%K%e!<%:$K%]%9%H$7$?$j!$:n<T$KJQ99$rAwIU$9$k(B
-         $B$J$I$NJ}K!$G!$JQ99$r8x3+$9$k!%(B
-
-     (b) $BJQ99$7$?K\%W%m%0%i%`$r<+J,$N=jB0$9$kAH?%FbIt$@$1$G(B
-         $B;H$&!%(B
-
-     (c) $BJQ99E@$rL@<($7$?$&$(!$%=%U%H%&%'%"$NL>A0$rJQ99$9$k!%(B
-         $B$=$N%=%U%H%&%'%"$rG[I[$9$k;~$K$OJQ99A0$NK\%W%m%0%i(B
-         $B%`$bF1;~$KG[I[$9$k!%$^$?$OJQ99A0$NK\%W%m%0%i%`$N%=!<(B
-         $B%9$NF~<jK!$rL@<($9$k!%(B
-
-     (d) $B$=$NB>$NJQ99>r7o$r:n<T$H9g0U$9$k!%(B
-
-  3. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$r%3%s%Q%$(B
-     $B%k$7$?%*%V%8%'%/%H%3!<%I$d<B9T7A<0$G$bG[I[$G$-$^$9!%(B
-
-     (a) $B%P%$%J%j$r<u$1<h$C$??M$,%=!<%9$rF~<j$G$-$k$h$&$K!$(B
-         $B%=!<%9$NF~<jK!$rL@<($9$k!%(B
-
-     (b) $B5!3#2DFI$J%=!<%9%3!<%I$rE:IU$9$k!%(B
-
-     (c) $BJQ99$r9T$C$?%P%$%J%j$OL>A0$rJQ99$7$?$&$(!$%*%j%8%J(B
-         $B%k$N%=!<%9%3!<%I$NF~<jK!$rL@<($9$k!%(B
-
-     (d) $B$=$NB>$NG[I[>r7o$r:n<T$H9g0U$9$k!%(B
-
-  4. $BB>$N%W%m%0%i%`$X$N0zMQ$O$$$+$J$kL\E*$G$"$l<+M3$G$9!%$?(B
-     $B$@$7!$K\%W%m%0%i%`$K4^$^$l$kB>$N:n<T$K$h$k%3!<%I$O!$$=(B
-     $B$l$>$l$N:n<T$N0U8~$K$h$k@)8B$,2C$($i$l$k>l9g$,$"$j$^$9!%(B
-
-     $B$=$l$i%U%!%$%k$N0lMw$H$=$l$>$l$NG[I[>r7o$J$I$KIU$$$F$O(B
-     LEGAL$B%U%!%$%k$r;2>H$7$F$/$@$5$$!%(B
-
-  5. $BK\%W%m%0%i%`$X$NF~NO$H$J$k%9%/%j%W%H$*$h$S!$K\%W%m%0%i(B
-     $B%`$+$i$N=PNO$N8"Mx$OK\%W%m%0%i%`$N:n<T$G$O$J$/!$$=$l$>(B
-     $B$l$NF~=PNO$r@8@.$7$??M$KB0$7$^$9!%$^$?!$K\%W%m%0%i%`$K(B
-     $BAH$_9~$^$l$k$?$a$N3HD%%i%$%V%i%j$K$D$$$F$bF1MM$G$9!%(B
-
-  6. $BK\%W%m%0%i%`$OL5J]>Z$G$9!%:n<T$OK\%W%m%0%i%`$r%5%]!<%H(B
-     $B$9$k0U;V$O$"$j$^$9$,!$%W%m%0%i%`<+?H$N%P%0$"$k$$$OK\%W(B
-     $B%m%0%i%`$N<B9T$J$I$+$iH/@8$9$k$$$+$J$kB;32$KBP$7$F$b@U(B
-     $BG$$r;}$A$^$;$s!%(B
diff --git a/ChangeLog b/ChangeLog
index 6343a87f57..83cc64e0d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,2681 +1,4863 @@
-Fri Oct 31 01:38:14 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jul 28 18:24:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* wince/Makefile.sub, win32/Makefile.sub (.y.c): allow white spaces
-	  at the beginning of line to remove by sed. (ruby-bugs-ja PR#580)
+	* version 1.3.6 - version 1.4 alpha
 
-Fri Oct 31 01:02:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jul 27 09:38:08 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* compar.c (cmp_equal): protect exceptions from <=> comparison
-	  again.  returns nil if any exception or error happened during
-	  comparison.
+	* eval.c (rb_eval): reduce recursive rb_eval() calls by
+	  NODE_BLOCKs. 
 
-	* eval.c (search_required): should update *featurep when DLEXT2 is
-	  defined. (ruby-bugs-ja PR#581)
+Tue Jul 27 01:20:40 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Thu Oct 30 23:41:04 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* file.c (rb_file_s_expand_path): drive letter patch.
 
-	* lib/drb/drb.rb: add DRbArray
+Mon Jul 26 02:36:31 1999  Shugo Maeda  <shugo@netlab.co.jp>
 
-	* lib/drb/invokemethod.rb: fix Hash#each problem. [ruby-dev:21773]
+	* eval.c (rb_load): should clear ruby_nerr.
 
-	* lib/drb/unix.rb: add LoadError. [ruby-dev:21743]
+	* eval.c (rb_thread_join): oldbt should not be empty to unshift.
 
-Thu Oct 30 23:19:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Jul 25 12:09:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/soap/generator.rb: better XML pretty printing.
+	* dir.c (push_braces): should treat nested braces.
 
-	* lib/soap/encodingstyle/soapHandler.rb: remove unnecessary namespace
-	  assignment in the element which has "encodingStyle" attribute, and
-	  add necessary namespace assignment for "arrayType" attribute.
+Fri Jul 23 02:49:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/soap/calc/test_calc_cgi.rb: take over $DEBUG to ruby process
-	  through CGI.
+	* hash.c (rb_hash_clear): dummy argument added; suggested by
+	  <eguchi@shizuokanet.ne.jp>.  thanks.
 
-Thu Oct 30 22:59:39 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+Thu Jul 22 19:37:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/yaml2byte.c: HASH const too long.  Thanks, matz.
+	* eval.c (rb_thread_join): get_backtrace() may retrun Qnil.
+	  typecheck added.
 
-Thu Oct 30 19:13:53 2003  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 20 02:28:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/MANIFEST: Add yamlbyte.h.
+	* io.c (rb_gets): $_ should be nil, when get returns nil.
 
-Thu Oct 30 14:25:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_f_gets): ditto.
 
-	* io.c (READ_DATA_BUFFERED): new macro to detect whether stdio
-	  buffer filled.
+Mon Jul 19 17:13:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (rb_io_fptr_cleanup): move path deallocation to
-	  rb_io_fptr_finalize (finalizer called by GC).
+	* regex.c (re_compile_fastmap): should continue fastmap compile
+	  for anychar_repeat, for it's repeat anyway.
 
-Thu Oct 30 13:23:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 26 13:33:45 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* parse.y (logop): left may be NULL. [ruby-talk:84539]
+	* lib/jcode.rb: replaced by faster code.
 
-	* eval.c (rb_eval): NODE_CASE nd_head may be NULL.
+Mon Jul 19 01:57:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct 30 10:14:51 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/mkmf.rb: no longer use install program.
 
-	* lib/test/unit/autorunner.rb: make fox runner work.
+	* ext/extmk.rb.in: use miniruby to install programs.
 
-Thu Oct 30 09:32:26 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Jul 17 00:06:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* process.c (rb_f_system): fixed lack of security check before
-	  calling do_spawn() on win32. [ruby-talk:84555]
+	* ext/socket/socket.c (ipaddr): don't do reverse lookup if
+	  attribute do_not_reverse_lookup is set for socket classes.
+	  Experimental.  Note this is a global attribute.
 
-Thu Oct 30 02:46:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 16 22:18:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (proc_invoke): single array value to normal Proc#call
-	  (i.e. not via lambda call), should be treated just like yield.
-	  [ruby-dev:21726]
+	* io.c (rb_io_eof): use feof() to check EOF already met.
 
-Thu Oct 30 02:25:48 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* io.c (read_all): should return nil at EOF.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
-	  add new method to inherit @sync from @io.sync.
+Fri Jul 16 13:39:42 1999  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): no need to
-	  set sync flag explicitly.
+	* lib/telnet.rb: version 0.231.
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): call super.
+Fri Jul 16 10:58:22 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): set extra chain
-	  certificates in @extra_chain_cert.
+	* regex.c (re_match): debug print removed.
 
-Wed Oct 29 22:02:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Jul 16 09:58:15 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* test/drb/drbtest.rb: use rbconfig.rb to make the path of ruby
-	  interpreter to exec, instead of test/ruby/envutil.rb,
+	* many files: clean up unsed variables found by gcc -Wall.
 
-Wed Oct 29 19:58:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* lib/mkmf.rb: better cygwin support etc.
 
-	* ext/tcltklib/tcltklib.c (CONST84): define CONST84 when it is not
-	  defined and TCL_MAJOR_VERSION >= 8.
+	* ext/extmk.rb.in: ditto.
 
-	* ext/tcltklib/tcltklib.c (VwaitVarProc, WaitVariableProc,
-	  rb_threadVwaitProc): use CONST84 instead of CONST.
+	* instruby.rb: ditto.
 
-	* ext/tcltklib/tcltklib.c (ip_rbTkWaitCommand,
-	  ip_rb_threadTkWaitCommand): use CONST84 always.
+Fri Jul 16 01:37:50 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Wed Oct 29 17:27:05 2003  Tanaka Akira  <akr@m17n.org>
+	* string.c (rb_str_squeeze_bang): the type of local variable `c'
+	  should be int, not char.
 
-	* re.c (rb_reg_s_union, Init_Regexp): new method `Regexp.union'.
+	* string.c (rb_str_reverse): should always return copy.
 
-	* lib/pathname.rb (realpath): examine Dir.pwd because it may have
-	  symlinks.
+Thu Jul 15 23:25:57 1999  NAKAMURA Hiroshi  <nakahiro@sarion.co.jp>
 
-Wed Oct 29 17:16:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/debug.rb: better display & frame treatment.
 
-	* eval.c (rb_longjmp): must not disturb original jump.
-	  [ruby-dev:21733]
+Thu Jul 15 21:16:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 29 15:28:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_each): returns self for normal termination;
+	  returns nil for break.
 
-	* eval.c (Init_Proc): taint preallocated exception object
-	  sysstack_error. [ruby-talk:84534]
+	* string.c: non bang methods (e.g. String#sub) should always
+	  return copy of the receiver.
 
-Wed Oct 29 11:27:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jul 15 21:09:15 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
 
-	* parse.y (ret_args): node may be NULL. [ruby-talk:84530]
+	* eval.c (find_file): do not add empty string to the path.
 
-Tue Oct 28 15:20:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* configure.in (with-search-path): should not add empty string if
+	  the option is not supplied.
 
-	* ext/tcltklib/tcltklib.c (VwaitVarProc, ip_rbVwaitObjCmd, 
-	  WaitVariableProc, WaitVisibilityProc, WaitWindowProc,
-	  ip_rbTkWaitObjCmd, ip_rbTkWaitCommand, rb_threadVwaitProc,
-	  rb_threadWaitVisibilityProc, rb_threadWaitWindowProc,
-	  ip_rb_threadVwaitObjCmd, ip_rb_threadTkWaitObjCmd): prototype;
-	  avoid VC++ warnings.
+Thu Jul 15 17:49:08 1999  Ryo HAYASAKA  <hayasaka@univ21.u-aizu.ac.jp>
 
-Mon Oct 27 19:19:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tcltklib/tcltklib.c: move `#include "ruby.h"' forward.
 
-	* eval.c (rb_longjmp): ignore reentering error while warning.
-	  [ruby-dev:21730]
+Thu Jul 15 16:54:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Oct 27 00:23:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* version 1.3.5 - version 1.4 alpha
 
-	* ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when
-	  calling 'exit' in the Tk callback procedure. [ruby-list:38656]
+Wed Jul 14 23:45:33 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Sat Oct 25 09:18:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (ruby_init): initialize for the first time only.
 
-	* eval.c (rb_method_missing): protect exception from within
-	  "inspect".  (ruby-bugs PR#1204)
+Tue Jul 13 00:15:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Oct 24 23:26:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (rb_hash_index): re-defined; method to retrieve a key
+	  from the value.
 
-	* hash.c (rb_hash_each): Hash#each should yield single value.
-	  [ruby-talk:84420]
+	* hash.c (Init_Hash): member? should be re-defined for Hash.
 
-	* hash.c (env_each): ditto for ENV.each.
+Tue Jul 12 13:54:51 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-Thu Oct 23 20:25:32 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* io.c (rb_file_sysopen): wrong number of argument.
 
-	* lib/webrick/server.rb (GenericServer#start): should rescue
-	  IOError from IO::accept. [ruby-dev:21692]
+Mon Jul 12 11:52:35 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct 23 17:59:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_f_missing): class name included in message.
 
-	* eval.c (ruby_cleanup): initialize stack bottom for embedding.
-	  [ruby-dev:21686]
+	* eval.c (print_undef): better error message.
 
-	* ext/dl/extconf.rb: move list of files to clean from DEPEND file,
-	  to get rid of macro redefinitions.
+Sun Jul 11 05:36:17 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
-Thu Oct 23 13:44:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/debug.rb: patch to show proper position.
 
-	* parse.y: integrate operations for stack_type.  [ruby-dev:21681]
+Fri Jul  9 23:56:14 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Thu Oct 23 00:41:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* dln.c (dln_find_1): path conv. moved to conv_to_posix_path.
 
-	* test/soap/calc/*, test/soap/helloworld/*: set logging threshold
-	  to ERROR.
+	* dln.c (conv_to_posix_path): path conv. should be done.
 
-Wed Oct 22 12:53:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul  9 10:26:47 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
-	  ignore tests which raised LoadError.
+	* random.c (RANDOM_NUMBER): should place parentheses.
 
-	* test/drb/drbtest.rb, test/ruby/test_beginendblock.rb,
-	  test/ruby/test_system.rb: avoid requiring same file twice.
+Fri Jul  8 11:00:51 1999  Shugo Maeda  <shugo@netlab.co.jp>
 
-	* test/drb/test_drbssl.rb, test/drb/test_drbunix.rb: should not use
-	  ARGV unless invoked directly.  do not create test cases unless
-	  required libraries are available.
+	* numeric.c (fix_div): division may be out of fixnum range.
 
-Wed Oct 22 02:31:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (bigdivmod): proper sign calculation to result.
 
-	* eval.c (ruby_cleanup): should not ignore exit_value in END
-	  execution. [ruby-dev:21670]
+Wed Jul  7 18:27:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Oct 21 23:16:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* st.c (st_delete_safe): was modifying wrong slot.
 
-	* eval.c (ruby_cleanup): call finalizers and exit procs before
-	  terminating threads.
+Mon Jul  5 13:17:46 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (ruby_cleanup): preserve ruby_errinfo before ruby_finalize_0().
+	* gc.c (rb_gc_call_finalizer_at_exit): close all files at exit.
 
-Tue Oct 21 15:57:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul  2 18:00:21 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
-	  prepend the directory of target file to the load path.
+	* lib/Mail/README: Mail-0.3.0 added to the distribution.
 
-Tue Oct 21 15:08:53 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Jul  2 01:45:32 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* win32/win32.c (do_spawn, do_aspawn): should wait child process even
-	  if callded with P_OVERLAY.
+	* regex.c (re_compile_fastmap): avoid allocation of register
+	  variables for each invocation of re_match().  Suggested by
+	  Zasukhin Ruslan <ruslan@paradigmasoft.com>.  Thanks.
 
-	* win32/win32.c (do_spawn, do_aspawn): should return child's exit
-	  status to parent.
+Tue Jun 29 20:39:24 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Tue Oct 21 00:35:02 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/tk/lib/tk.rb (TkVariable): bug fix; should value type check
+	  be added?
 
-	* test/soap/calc/*, test/soap/helloworld/*: catch the exception from
-	  test server thread and recover.
+	* string.c (rb_str_each_line): a bug in paragraph mode.
 
-Tue Oct 21 00:22:57 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ruby.c (load_file): shifted too much to skip #!.
 
-	* test/drb/*: import drb/runit.
+Tue Jun 29 06:50:21 1999  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Mon Oct 20 23:55:47 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/CGI.rb: 0.30 - cleanup release, incompatible.
 
-	* eval.c (rb_eval): set current node after arguments evaluation.
-	  [ruby-dev:21632]
+	* lib/telnet.rb: 0.22 - timeout added.
 
-	* eval.c (rb_yield_0): set current node and keep it at local jump.
+Tue Jun 29 10:49:25 1999  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
 
-Mon Oct 20 22:01:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: better Rhapsody support.
 
-	* eval.c (rb_thread_cleanup): keep thread group for main thread.
-	  [ruby-dev:21644]
+	* lib/mkmf.rb: Rhapsody/NEXTSTEP support.
 
-Mon Oct 20 18:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 29 01:42:13 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_catch): backout.
+	* ext/pty/pty.c (chld_changed): should use POSIX.1 style wait.
 
-Mon Oct 20 17:31:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jun 28 21:07:36 1999  KIMURA Koichi  <kbk@kt.rim.or.jp>
 
-	* eval.c (PUSH_FRAME): generate unique number to be TAG_JUMP()
-	  destination.
+	* ext/extmk.rb.nt: wrong result for have_library().
 
-	* eval.c (localjump_destination): use unique number in ruby_frame
-	  for localjump destination.
+Mon Jun 28 15:24:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Oct 20 11:31:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* missing/isinf.c: OSF/1 raises SIGFPE on one()/zero().
 
-	* test/ruby/test_signal.rb (test_signal): restore old trap.
+	* regex.c (re_search): should search til EOS, for patterns may
+	  match beyond the end of range.
 
-Mon Oct 20 11:00:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jun 28 12:49:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* gc.c (gc_sweep): loosen page free condition to avoid add_heap()
-	  race condition. [ruby-dev:21633]
+	* io.c (rb_f_select): should not accept Time objects as an
+	  argument for it is time interval.
 
-	* gc.c (gc_sweep): do not update malloc_limit when malloc_increase
-	  is smaller than malloc_limit.
+	* process.c (rb_f_sleep): ditto.
 
-Mon Oct 20 09:45:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* file.c (test_s): should return nil for false condition.
 
-	* lib/debug.rb (debug_command): remove debug print.
+Mon Jun 28 12:23:52 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Sun Oct 19 13:12:30 2003  Tanaka Akira  <akr@m17n.org>
+	* bignum.c (rb_dbl2big): typo.
 
-	* lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
+	* file.c (rb_f_test): ditto.
 
-Sun Oct 19 00:14:22 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* string.c (rb_str_crypt): wrong message.
 
-	* test/soap/calc/*, test/soap/helloworkd/*: changed port# of test
-	  server. (17171)
+Sun Jun 27 19:50:11 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Sat Oct 18 23:01:32 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (rb_f_exit): should have treat signed integer status, not
+	  VALUE.
 
-	* missing/acosh.c (DBL_MANT_DIG): typo fix(ifdef -> ifndef).
+	* process.c (rb_f_exit_bang): should work like exit().
 
-Sat Oct 18 05:48:59 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+Sun Jun 27 16:21:32 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/syck/rubyext.c: YAML::Syck::compile method.
+	* string.c (rb_str_rindex): wrong position to search.
 
-	* ext/syck/syck.c: Buffer edge bug.
+Sat Jun 26 04:05:30 1999  Takaaki Tateishi  <ttate@jaist.ac.jp>
 
-	* ext/syck/yaml2byte.c: YAML to bytecode converter.
+	* configure.in (configure_args): --with-search-path to specify
+	  additional ruby search path.
 
-	* ext/syck/yamlbyte.h: Ditto.
+	* ruby.c (ruby_prog_init): additional search path.
 
-	* ext/syck/bytecode.c: Bytecode parser fixes to empty collections
-	  and empty strings.
+Fri Jun 25 13:09:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/token.c: Ditto.
+	* pack.c (pack_unpack): needed to initialize natint.
 
-Fri Oct 17 23:07:38 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* regex.c (re_compile_pattern): add start_paren to avoid too much
+	  finalization on maybe_finalize_jump.
 
-	* ext/enumerator/enumerator.c, ext/enumerator/enumerator.txt:
-	  Provide Kernel#to_enum as an alias for Kernel#enum_for.  Maybe
-	  this is a better name.
+Fri Jun 25 13:07:20 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
 
-Fri Oct 17 23:00:30 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* missing/isinf.c: include "config.h" added.
 
-	* lib/generator.rb: Add rdoc documentation.
+Fri Jun 25 07:25:05 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Fri Oct 17 22:16:42 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/mkmf.rb: initialize $(topdir).
 
-	* lib/set.rb: Reword and fix Overview.
+	* ext/extmk.rb.in (install_rb): install lib/*.rb properly.
 
-	* lib/set.rb: It is not necessary to require
-	  'test/unit/ui/console/testrunner'.
+	* configure.in (linux): specifies -rpath on --enable-shared.
 
-Fri Oct 17 11:15:22 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* configure.in (aix): ruby.imp must reside in $(topdir).
 
-	* test/ruby/test_range.rb: added.
+Thu Jun 24 19:11:29 1999  Yoshida Masato  <yoshidam@yoshidam.net>
 
-	* MANIFEST: add test/ruby/test_range.rb.
+	* parse.y (rb_str_extend): multi-byte identifier in expression
+	  interpolation in strings.
 
-Fri Oct 17 03:21:23 2003  William Sobel  <will.sobel@barra.com>
+	* parse.y (yylex): support multi-byte char identifiers.
 
-	* ext/socket/socket.c (make_hostent): h_aliases may be NULL.
-	  (ruby-bugs PR#1195)
+Thu Jun 24 15:27:13 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/socket/socket.c (sock_s_gethostbyaddr): ditto.
+	* parse.y (f_arg): check duplicate argument names.
 
-Fri Oct 17 00:12:41 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (rb_gc_mark): marking wrong member for NODE_ARGS.
 
-	* ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used
-	  without initializing on TkComposite module.
+	* string.c (rb_str_rindex): POSITION specifies start point, not
+	  end point.
 
-Thu Oct 16 23:51:04 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jun 24 13:00:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused
-	  in a callback operation, Ruby/Tk shows a (verbose) backtrace
-	  information on the callback process.
+	* regex.c (print_mbc): wrong boundary.
 
-Thu Oct 16 17:09:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* pack.c (uv_to_utf8): raises ArgError for too big value.
 
-	* lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
-	  debug_silent_eval() when $1 is not set. (ruby-bugs PR#1194)
+Thu Jun 24 11:02:51 1999  Yoshida Masato  <yoshidam@yoshidam.net>
 
-Thu Oct 16 16:54:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* pack.c (uv_to_utf8): mask needed.
 
-	* string.c (rb_str_upto): ("a"..."a").to_a should return [].
-	  [ruby-core:01634]
+Wed Jun 23 21:03:56 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Thu Oct 16 16:40:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ruby.h (struct RFile): remove iv_tbl from struct. instance
+	  variables are handled as generic ivs.
 
-	* ext/tk/lib/tk.rb:
-	  Add Tk::EncodedString and Tk::UTF8_String class to support
-	  characters using the \uXXXX escape to the UNICODE string.
+Wed Jun 23 22:06:26 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* ext/tk/sample/{demos-en,demos-jp}/unicodeout.rb
-	  new demo-scripts (samples of Tk::UTF8_String)
+	* pack.c (utf8_to_uv): pack to 7 bytes sequence.
 
-	* ext/tk/sample/{demos-en,demos-jp}/widget
-	  add entries for 'unicodeout.rb'
+	* pack.c (uv_to_utf8): wrong boundary.
 
-Thu Oct 16 08:38:06 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c (pack_unpack): should treat as unsigned long.
 
-	* test/digest/test_digest.rb (test_eq): show failed class.
+Wed Jun 23 15:10:11 1999  Inaba Hiroto  <inaba@sdd.tokyo-sc.toshiba.co.jp>
 
-	* test/ruby/test_iterator.rb (test_break, test_return_trace_func):
-	  test localjump destination.
+	* parse.y (parse_string): failed to parse nested braces.
 
-Wed Oct 15 20:22:31 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* parse.y (parse_regx): nested braces within #{} available.
 
-	* lib/soap/netHttpClient.rb: use URI::HTTP#request_uri instead of
-	  instance_eval('path_query').  [ruby-list:38575]
+Wed Jun 23 11:18:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 15 17:24:45 2003  URABE Shyouhei  <root@mput.dip.jp>
+	* regex.c (slow_search): wrong shift width for mbcs.
 
-	* lib/cgi.rb (CGI::Cookie): tiny typo fix.
+	* eval.c (rb_thread_save_context): should not clear th->locals.
 
-Wed Oct 15 15:00:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jun 23 02:06:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (ruby_run): just return FAILURE instead of parse error
-	  count.  [ruby-list:38569]
+	* parse.y (yylex): UMINUS binds too tight with digits. changed so
+	  that -2**2 => -4.
 
-Wed Oct 15 13:17:02 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* parse.y (close_paren): `do' for expr termination now works it
+	  used to be.
 
-	* ext/digest/digest.c (rb_digest_base_alloc): need to initialize
-	  buffer. [ruby-dev:21622]
+Wed Jun 22 18:26:42 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Wed Oct 15 11:23:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* pack.c (pack_pack): should initialize local variable `j'.
 
-	* marshal.c (w_object): dump extended modules as well.
+Wed Jun 22 15:24:59 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* marshal.c (r_object0): TYPE_USRMARSHAL should restore extended
-	  modules before invoking marshal_load.  these two fixes are done
-	  by Masatoshi Seki <m_seki@mva.biglobe.ne.jp>.
+	* parse.y (here_document): a bug for multiline heredoc.
 
-Wed Oct 15 09:30:34 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jun 22 15:06:36 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
+	* ext/socket/socket.c (ruby_socket): forgot to return fd
+	  explicitly.
 
-	* ext/syck/syck.h: include stdio.h for definition of FILE.
+Tue Jun 22 13:34:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 15 08:09:07 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+	* rubyio.h (MakeOpenFile): should initialize member `iv_tbl'.
 
-	* ext/syck/bytecode.c: Checkin of YAML bytecode support.
+Wed Jun 22 10:35:51 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* ext/syck/gram.c: Ditto.
+	* io.c (rb_io_gets_internal): getc(3) may not set errno on
+	  interrupt.
 
-	* ext/syck/syck.c: Ditto.
+Mon Jun 21 22:39:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/token.c: Ditto.
+	* eval.c (call_required_libraries): ruby_sourceline should be
+	  cleared before loading libraries.
 
-	* ext/syck/handler.c: Ditto.
+	* io.c (set_stdin): do not use reopen(), so that we don't need to
+	  dup original stdin before assigning $stdin.
 
-	* ext/syck/handler.c: Now using 'tag' rather than 'taguri' in type URIs.
+Mon Jun 21 18:04:27 1999  Ryo HAYASAKA  <hayasaka@univ21.u-aizu.ac.jp>
 
-	* ext/syck/rubyext.c: Ditto (on both counts).
+	* ext/dbm/dbm.c: include <cdefs.h> for solaris 2.6.
 
-Wed Oct 15 05:05:53 2003  Akinori MUSHA  <knu@iDaemons.org>
+Mon Jun 21 15:59:47 1999  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/generator.rb: A new library which converts an internal
-	  iterator to an external iterator.
+	* ext/socket/socket.c (ip_addrsetup): forgot to put `else'.
 
-	* lib/abbrev.rb: A new library which creates an abbreviation table
-	  from a list.
+Mon Jun 21 15:38:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 15 04:31:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* io.c (fptr_finalize): remove rb_syswait() invocation to avoid
+	  wait4(2) within GC.  rb_syswait() moved to rb_io_fptr_close().
 
-	* ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb :
-	  new demo-scripts
+Mon Jun 21 12:05:59 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget :
-	  add entries for 'entry3.rb'
+	* dir.c (dir_s_glob): remove MAXPATHLEN restriction.
 
-Wed Oct 15 04:31:47 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/md5/md5init.c (md5_hexdigest): should have used "%02x".
 
-	* test/digest/test_digest.rb: Moved from ext/digest/test.rb.
+Sun Jun 20 19:50:38 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Wed Oct 15 03:53:20 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* string.c (rb_str_each_line): should have checked string
+	  boundary.
 
-	* ext/tk/lib/tk.rb: fixed trouble on auto-load Tcl commands (enbug
-	  on the last commit).
+Sat Jun 19 22:24:12 1999  Kenji Nagasawa  <kenn@hma.att.ne.jp>
 
-Wed Oct 15 00:25:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* OS/2 patch improved.
 
-	* parse.y (yylex): argument parentheses preceded by spaces should
-	  be warned; not error.  [ruby-talk:84103]
+Fri Jun 18 08:30:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 15 00:20:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* marshal.c (r_byte): add data length check.
 
-	* ext/tcltklib/tcltklib.c: replace Tcl/Tk's vwait and tkwait to
-	  switch on threads smoothly and avoid seg-fault.
+	* ext/tcltklib/tcltklib.c (_timer_for_tcl): was doing busy-wait.
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp._thread_vwait and
-	  _thread_tkwait for waiting on a thread. (Because Tcl/Tk's vwait
-	  and tkwait command wait on an eventloop.)
+Tue Jun 15 10:01:21 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* ext/tk/lib/multi-tk.rb: support TclTkIp._thread_vwait and
-	  _thread_tkwait.
+	* configure.in: remove trailing slash from interpreter embedded
+	  shared library path.
 
-	* ext/tk/lib/tk.rb: now, TkVariable#wait has 2 arguments.
-	  If 1st argument is true, waits on a thread. If false, waits on
-	  an eventloop. If 2nd argument is true, checks existence of
-	  rootwidgets. If false, doesn't. Default is wait(true, false).
+	* configure.in (INSTALL_DLLIB): install shared lib with 0555.
 
-	* ext/tk/lib/tk.rb: add TkVariable#tkwait(arg) which is equal to
-	  TkVariable#wait(arg, true). wait_visibility and wait_destroy
-	  have an argument for waiting on a thread or an eventloop.
+	* instruby.rb: changed mode for shared library into 0555.
 
-	* ext/tk/lib/tk.rb: improve of accessing Tcl/Tk's special variables.
+Fri Jun 11 23:27:00 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* ext/tk/lib/tkafter.rb: support 'wait on a thread' and 'wait on
-	  an eventloop'.
+	* ext/etc/etc.c (etc_passwd): should return nil, not exception for
+	  call after last passwd entry.
 
-Wed Oct 15 00:10:24 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Jun 11 15:21:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/baseData.rb: Introduce SOAPType as the common ancestor of
-	  SOAPBasetype and SOAPCompoundtype.
+	* gc.c (rb_gc_mark_locations): add safty margin 1.
 
-	* lib/soap/generator.rb, lib/soap/element.rb, lib/soap/encodingstyle/*:
-	  Encoding methods signature change.  Pass SOAPGenerator as a parameter.
+	* eval.c (ruby_run): should protect toplevel node tree.
 
-	* lib/soap/mapping/*, test/soap/marshal/test_marshal.rb: Refactoring
-	  for better marshalling/unmarshalling support.  Now I think SOAP
-	  marshaller supports all kind of object graph which is supported by
-	  Ruby's original marshaller.  Of course there could be bugs as always.
-	  Find it.  :-)
+	* ext/etc/etc.c (etc_group): dumps core if there's no more group.
 
-	* lib/soap/rpc/standaloneServer.rb: Set severity threshould to INFO.
-	  DEBUG is too noisy.
+Fri Jun 11 01:50:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/xsd/datatypes.rb: DateTime#of is obsoleted.  Use DateTime#offset.
+	* eval.c (ruby_run): Init_stack() was called too late; local
+	  variables happend to be higher (or lower) than stack_start.
 
-	* test/wsdl/emptycomplextype.wsdl, test/xsd/xmlschema.xml: Avoid
-	  useless warning.
+Thu Jun 10 16:41:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Oct 14 19:09:35 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c: do not call `initialize' for IO objects.  So with Array,
+	  Hash, Range, and Time objects.
+	
+	* ext/curses/curses.c (curses_getch): made thread aware using
+	  rb_read_check().
 
-	* eval.c (ruby_finalize_0): return the given exit status unless
-	  SystemExit got raised.
+	* ext/curses/curses.c (window_getch): ditto.
 
-Tue Oct 14 11:53:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/curses/curses.c (curses_getstr): made (partially) thread
+	  aware using rb_read_check().
 
-	* intern.h (ruby_stop): never return.
+	* ext/curses/curses.c (window_getstr): ditto.
 
-	* ruby.h (ruby_run): ditto.
+	* io.c (rb_read_check): new function to help making something
+	  (like extension libraries) thread aware.
 
-Tue Oct 14 04:43:55 2003  Tanaka Akira  <akr@m17n.org>
+	* eval.c (is_defined): `defined? super' should be true even for
+	  private superclass methods.
 
-	* lib/pathname.rb (realpath): make ELOOP check bit more robust.
-	  (children): prepend self by default.
-	  (chroot): obsoleted.
+Fri Jun 10 13:42:10 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Tue Oct 14 02:29:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c (pack_pack): template `Z' should be allowed.
 
-	* eval.c (rb_require_safe): segfault after loading .so.
+Wed Jun  9 13:26:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Oct 14 02:05:23 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* eval.c (rb_thread_loading): modified to avoid nested race
+	  condition of require().
 
-	* ext/Setup*, ext/enumerator/*: Add ext/enumerator, a helper
-	  module for the Enumerable interface.
+	* ext/tcltklib/tcltklib.c (ip_invoke): queue invocation on non
+	  main threads.
 
-Mon Oct 13 23:55:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/tcltklib/tcltklib.c (lib_mainloop): flush invocation
+	  queues periodically.
 
-	* test/ruby/envutil.rb: use Config::CONFIG["ruby_install_name"],
-	  not "ruby".
+	* version.c (ruby_show_version): now print the message to stdout.
 
-Mon Oct 13 23:57:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* version.c (ruby_show_copyright): ditto.
 
-	* eval.c (rb_feature_p): match by classified suffix.
+Tue Jun  8 00:00:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_require_safe): require library in the specified safe
-	  level.
+	* pack.c (pack_unpack): append sentinel (NUL) to the string.
 
-	* variable.c (rb_autoload, rb_autoload_load): restore safe level
-	  when autoload was called.  [ruby-dev:21338]
+	* ext/md5/md5init.c (md5_hexdigest): new method to obtain
+	  printable hash string.
 
-	* intern.h: prototypes; rb_require_safe.
+	* ext/md5/md5init.c (md5_update): should return self.
 
-	* test/runner.rb: accept non-option arguments.
+	* pack.c (pack_pack): undocumented template 'U' for UTF8.
 
-Mon Oct 13 20:49:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* pack.c (pack_unpack): ditto.
 
-	* string.c (str_new4): should not preserve FL_TAINT status in the
-	  internal shared string. [ruby-dev:21601]
+	* marshal.c (r_byte): should replace getc() with rb_getc().
 
-	* string.c (rb_str_new4): ditto.
+	* io.c (rb_getc): getc() replacement uses READ_DATA_PENDING() and
+	  rb_thread_wait_fd().
 
-	* eval.c: use EXIT_SUCCESS and EXIT_FAILURE for exit values.
+Mon Jun  7 23:23:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* process.c: ditto. [ruby-list:38521]
+	* object.c (rb_mod_clone): should call CLOSESETUP().
 
-Mon Oct 13 19:51:02 2003  Koji Arai  <jca02266@nifty.ne.jp>
+	* eval.c (bind_clone): should call CLONESETUP() for new clone.
 
-	* lib/debug.rb (debug_command): should enter emacs mode when
-	  assigned any value to the environment variable "EMACS".
-	  On Meadow, (getenv "EMACS") is "meadow".
+Sat Jun  5 10:32:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct 12 14:45:03 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* string.c (rb_str_oct): binary (e.g. 0b10111) support.
 
-	* ext/win32ole/extconf.rb: check "windows.h", not "windows".
-	  [ruby-talk:84051]
+	* variable.c (rb_const_set): raise warning, not exception.
 
-Sat Oct 11 20:41:03 2003  Corinna Vinschen  <corinna@vinschen.de>
+	* parse.y (yycompile): initialize parser internal variables.
 
-	* file.c (eaccess): Use access(2) on Cygwin.
+	* parse.y (close_paren): set lex_state to EXPR_PAREN after closing
+	  parenthesis.
 
-Sat Oct 11 17:09:21 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* parse.y (yylex): returns kDO for `do' right after method_call.
 
-	* lib/rexml/quickpath.rb (REXML::QuickPath::match):
-	  escape '[' to avoid warning.
+Thu Jun  3 11:05:30 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Sat Oct 11 16:08:41 2003  Tanaka Akira  <akr@m17n.org>
+	* regex.c (read_backslash): should decode \b within class.
 
-	* lib/pathname.rb (realpath): check existence of the file.
+Thu Jun  3 01:06:18 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* lib/pathname.rb (realpath): re-implemented.
-	  (realpath_root?, realpath_rec): removed
+	* dln.c (dln_load): AIX improvement (aix_findmain removed).
 
-Sat Oct 11 10:19:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Jun  2 00:41:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/monitor.rb: handle exceptions correctly. Thanks, Gennady
-	  Bystritsky.
+	* pack.c (pack_unpack): new undocumented template Z which strips
+	  stuff after first null.
 
-Fri Oct 10 07:50:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c (pack_pack): should preserve specified length of the
+	  resulting string.
 
-	* eval.c (is_defined): inheritance line adjustment as like as
-	  rb_call_super().
+Tue Jun  1 15:29:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Oct 10 01:19:00 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/socket/socket.c (ruby_socket): retry after GC, if socket(2)
+	  failed on EMFILE or ENFILE.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): add
-	  optional argument to specify the DirectoryString type
-	  (ASN1::UTF8STRING by default). RFC3280 deprecates PrintableString
-	  for DirectoryString, and strongly requires to use UTF8String for
-	  all certificates issued after December, 31 2003.
+	* ext/socket/socket.c (sock_s_socketpair): ditto.
 
-	* ext/openssl/lib/openssl/x509.rb (X509::Name::parse): ditto.
+	* eval.c (module_setup): need to add PUSH_VAR/POP_VAR to clear
+	  dyna vars link list.
 
-Thu Oct  9 23:50:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* version.h (RUBY_RELEASE_CODE): integer macro contant for source
+	  version detection.
 
-	* eval.c (rb_thread_start_0): prevent thread from GC.
-	  [ruby-dev:21572]
+Sun May 30 22:19:12 1999  Kenji Nagasawa  <kenn@tcp-ip.or.jp>
 
-Thu Oct  9 19:11:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c: emx/gcc 0.9d now fixes things about
+	  AF_UNIX.
 
-	* eval.c (rb_thread_start_0): non-volatile should be restored from
-	  volatile.
+	* process.c: OS/2 EMX kludge.
 
-Thu Oct  9 17:43:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* Makefile.in (strncasecmp.o): added dependency.
 
-	* eval.c (proc_save_safe_level, proc_get_safe_level,
-	  proc_set_safe_level): save/restore safe level 1..4.
+Mon May 31 16:06:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  9 16:33:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* version 1.3.4 - preliminary release for 1.4
 
-	* marshal.c (r_object0): remove unnecessary iv restoration for
-	  USRMARSHAL. [ruby-dev:21582]
+Mon May 31 15:57:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_object): dump generic instance variables from
-	  a string from '_dump'.
+	* io.c (rb_io_fptr_close): close on IO which main_thread is
+	  waiting cause serious exception, that vanishes the actual fd
+	  closing.  Invocation of rb_thread_fd_close() is deferred
+	  a little.
 
-	* variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
-	  is not set.
+Sat May 29 18:27:13 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* time.c (time_dump): copy instance variables to dumped string, to
-	  be included in the marshaled data.
+	* regex.c (re_match): stack boundary check needed.
 
-	* bignum.c (rb_big2ulong): add range check to ensure round trip.
+Sat May 29 12:27:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  9 15:45:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/tcltklib/tcltklib.c (ip_invoke): proper ref count management
+	  to avoid leak.  I HATE REF COUNTING!!
 
-	* pack.c (uv_to_utf8): change message to "out of range", since
-	  negative values are not "too big". [ruby-dev:21567]
+	* eval.c (ruby_run): moved ruby_require_libraries() to handle `-r'
+	  from ruby_options() to avoid stack corruption for threads
+	  created in libraries.
 
-Thu Oct  9 14:05:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat May 29 02:22:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
-	  [ruby-dev:21557]
+	* eval.c (rb_yield_0): when `for' appeared in blocks, it
+	  introduced new scope for local variables.
 
-Thu Oct  9 10:51:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May 28 17:16:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_yield_0): no error if block is empty.
+	* string.c (rb_str_squeeze_bang): squeeze AND of the arguments.
+	  UNDOCUMENTED.
 
-Thu Oct  9 06:43:33 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_count): new UNDOCUMENTED method.
 
-	* eval.c (localjump_error): id should be ID.
+	* string.c (rb_str_delete_bang): delete AND of the arg ranges.
+	  UNDOCUMENTED FEATURE for 1.3.x.
 
-	* eval.c (rb_eval): nd_rval is set in copy_node_scope().
+	* ext/socket/socket.c (setipaddr): re-wrote using ip_addrsetup().
 
-	* eval.c (rb_yield_0): unused variable.
+	* ext/sockt/socket.c (ip_addrsetup): decode symbolic address
+	  <broadcast>.
 
-	* eval.c (rb_yield_0): nothing to do for empty node.
+Thu May 27 12:27:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (call_end_proc, proc_invoke): adjust backtrace in END.
-	  [ruby-dev:21551]
+	* string.c (tr_trans): should handle NUL (\0) within strings.
 
-	* eval.c (rb_thread_start_0): set the value by break as the result.
-	  [ruby-dev:21552]
+Tue May 25 16:45:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_thread_start_0, rb_thread_raise, rb_callcc): save
-	  variables across THREAD_SAVE_CONTEXT.
+	* io.c (rb_f_syscall): syscall may return values other than zero
+	  on success.
 
-Wed Oct  8 22:19:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* regex.c (re_match): handle empty loop properly (hopefully).
 
-	* lib/test/unit.rb: removed installation instructions.
+	* regex.c (re_match): remove empty group check, because it does
+	  not help non-grouping parentheses (?:..).
 
-	* lib/test/unit/ui/testrunnermediator.rb: moved the run flag to a more
-	  central location.
+	* regex.c (re_compile_fastmap): treating try_next, finalize_push
+	  wrong way.
 
-	* lib/test/unit.rb: ditto.
+	* regex.c: remove some obsolete functions such as
+	  group_match_null_string_p().
 
-	* lib/test/unit.rb: extracted the running code in to AutoRunner.
+Mon May 24 14:47:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/autorunner.rb: added.
+	* regex.c (read_backslash): read backslash by regex.
 
-	* lib/test/unit/collector/objectspace.rb: extracted common test
-	  collection functionality in to a module.
+Sun May 23 19:44:58 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/test/unit/collector.rb: ditto; added.
+	* ext/pty/pty.c (getDevice): portability patch.
 
-	* test/testunit/collector/test_objectspace.rb: ditto.
+Fri May 21 23:01:26 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* lib/test/unit/collector/dir.rb: added. Supports collecting tests out
-	  of a directory structure.
+	* ext/socket/getaddrinfo.c (GET_AI): should set error code.
 
-	* test/testunit/collector/test_dir.rb: added.
+Thu May 20 03:43:44 1999  Jun-ichiro itojun Hagino  <itojun@itojun.org>
 
-	* test/runner.rb: simplified to use the new capabilities.
+	* ext/socket/socket.c: you should use sockaddr_storage to handle
+	  IPv6 addresses.
 
-Tue Oct  7 15:23:09 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/socket/getaddrinfo.c (getaddrinfo): prevent retrieving
+	  AF_INET6 address if hints.ai_flags == AI_PASSIVE.
 
-	* test/ruby/test_beginendblock.rb: add tests for nested BEGIN/END.
+Wed May 19 12:27:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/beginmainend.rb: add tests for nested BEGIN/END.
+	* eval.c (exec_end_proc): should protect exceptions.
 
-	* test/ruby/endblockwarn.rb: new file added to test of END-in-method
-	  warning.
+	* gc.c (run_final): ditto.
 
-Tue Oct  7 12:23:47 2003  Tanaka Akira  <akr@m17n.org>
+	* parse.y (f_rest_arg): allow just * for rest arg.
 
-	* ext/fcntl/fcntl.c (Init_fcntl): define Fcntl::O_ACCMODE.
+	* parse.y (mlhs_basic): allow * without formal argument.
 
-	* ext/socket/extconf.rb: useless assignment removed.
+	* regex.c (re_match): the variable `part' should be initialized.
 
-Tue Oct  7 09:13:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 18 15:25:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_beginendblock.rb (test_endinmethod): END{} is now
-	  allowed in eval.
+	* regex.c (re_search): a bug in range adjustment.
 
-Tue Oct  7 04:15:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 18 11:35:59 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* parse.y (stmt): should not expand mrhs if lhs is solely starred.
+	* dln.c (conv_to_posix_path): path_len argument added.
 
-Tue Oct  7 02:57:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon May 17 12:26:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* parse.y (stmt): rhs of multiple assignment should not be
-	  expanded using "to_a". [ruby-dev:21527]
+	* numeric.c (fix_rev): should treat Fixnum as signed long.
 
-Tue Oct  7 01:42:34 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (massign): add strict number check for yield (and call).
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): use appropriate
-	  free function for ASN1_OBJECT.
+	* eval.c (proc_arity): new method to return number of arguments.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_sn): add new function for
-	  ASN1::ObjectId#sn; it returns short name text representation of OID.
+	* eval.c (method_arity): new method to return number of arguments.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_ln): add new function for
-	  ASN1::ObjectId#ln; it returns long name text representation of OID.
+	* parse.y (read_escape): char may be unsigned.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_oid): add new function for
-	  ASN1::ObjectId#oid; it returns numerical representation of OID.
+	* string.c (rb_str_succ): ditto.
 
-Mon Oct  6 22:59:46 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* string.c (tr_trans): ditto.
 
-	* lib/csv.rb (IOReader, BasicWriter): call binmode when a given IO
-	  respond_to?(:binmode).  record separator was wrong when you gave
-	  text mode IO to Reader.parse and Writer.generate.
+	* object.c (Init_Object): methods `&', `|', `^' are added to nil.
 
-	* test/csv/test_csv.rb: add tests for above change.
+	* range.c (rb_range_beg_len): it should be OK for [0..-len-1].
 
-Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
+	* regex.c (re_search): search for byte literal within mbcs.
 
-	* ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
+	* regex.c (is_in_list): parsh
 
-	* ext/socket/socket.c (thread_read_select): restored.
+	* regex.c (re_compile_fastmap): should have not alter the loop
+	  variable `j' if TRASLATE_P().
 
-Mon Oct  6 16:23:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_compile_pattern): escaped characters should be read
+	  by PATFETCH_RAW(c).
 
-	* marshal.c (w_object): wrong method name in the message.
+Sat May 15 11:23:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Oct  6 16:02:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_match): endline2 (\Z) should not match at the point
+	  between a newline and end-of-line, like endline ($).
 
-	* parse.y (stmt): END in method should cause warning.
-	  [ruby-dev:21519]
+	* class.c (include_class_new): should initialize iv_tbl to share
+	  between module and iclass.
 
-Mon Oct  6 15:17:23 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri May 14 08:50:27 1999  Akira Endo  <akendo@t3.rim.or.jp>
 
-	* test/ruby/test_iterator.rb (test_block_argument_without_paren):
-	  added. (follows sample/test.rb)
+	* regex.c (re_compile_fastmap): it should be k != 0 to skip.
 
-Mon Oct  6 11:57:06 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri May 14 12:46:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: added
-	  test for eval-ed BEGIN END order.
+	* time.c (time_load): a bug in old marshal format support.
 
-Mon Oct  6 09:19:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* instruby.rb: make site_ruby directory.
 
-	* marshal.c (w_object): should pass "weak" value to next level.
-	  [ruby-dev:21496]
+Fri May 14 10:18:02 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* eval.c (proc_alloc): should not use cached object if klass is
-	  different. [ruby-talk:83685]
+	* regex.c (re_match): a bug in inline `.*' etc.
 
-Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
+Fri May 14 09:58:46 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/pathname.rb: version information is added in document.
+	* ruby.c (addpath): should have specified string length.
 
-Sun Oct  5 23:07:03 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 13 10:40:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_f_END): block should be given.  [ruby-dev:21497]
+	* eval.c (rb_eval_string_wrap): new function.
 
-Sun Oct  5 22:51:23 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* regex.c (re_compile_pattern): POSIX line match should alter
+	  behavior for `^' and `$' to begbuf and endbuf2 respectively.
 
-	* lib/ext/openssl/extconf.rb: add check for some engine functions
-	  unavailable in OpenSSL-0.9.6.
+	* ext/pty/pty.c: un-ANSI-fy function arguments.
 
-	* lib/ext/openssl/ossl_engine.c: ditto.
+Wed May 12 14:19:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 17:56:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* struct.c (iv_get): in case of inheritance of generated struct
+	  class, __member__ and __size__ should also be inherited.
+	  Thanks for Pros Yeboah <yeboah@tu-harburg.de>.
 
-	* eval.c (rb_eval): fix evaluation order.  [ruby-list:38431]
+	* io.c (rb_f_gets_internal): should check number of arguments
+	  before checking rb_rs == rb_default_rs.  Thanks for Koji Arai
+	  <JCA02266@nifty.ne.jp>.
 
-Sun Oct  5 15:05:06 2003  akira yamada  <akira@ruby-lang.org>
+Tue May 11 08:29:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/uri/*: translated RUNIT to Test::Unit.
+	* regex.c (re_compile_pattern): .?, .+ did not work.
 
-Sun Oct  5 14:37:39 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon May 10 00:59:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/xsd/datatypes.rb: Rational -> Decimal string bug fix.
+	* lib/jcode.rb: forgot to squeeze on reverse (complement) case.
 
-	* test/soap/marshal/test_marshal.rb: ditto.
+	* string.c (tr_squeeze): should not set modify flag to be honest,
+	  if the string is not modified.
 
-	* test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEEXT"] to
-	  RUBYBIN.
+	* signal.c (Init_signal): SIGTERM should not be handled.
 
-Sun Oct  5 13:47:22 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* regex.c (re_match): seeking for longest match is now optional,
+	  which can be set using RE_OPTION_POSIXMATCH.  This satisfies
+	  POSIX longest match as much as Emacs's posix-* functions, which
+	  are known to be incomplete.
 
-	* test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: add tests
-	  about scope, order and allowed syntax.
+Sun May  9 13:04:01 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Sun Oct  5 11:54:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/socket/socket.c (sock_s_getaddrinfo): conversion from
+	  Fixnums to C integers needed.
 
-	* test/ruby/envutil.rb: added.  split "rubybin" from test_system.rb.
+Sun May  9 11:51:43 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* test/ruby/test_system.rb: use envutil.rb
+	* range.c (range_eqq): reverse condition.
 
-	* test/ruby/test_beginendblock.rb: added.
+	* range.c (range_s_new): default should be end inclusive.
 
-	* test/ruby/beginmainend.rb: added.  used in test_beginendblock.rb.
+Sat May  8 03:27:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 11:23:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* ext/socket/socket.c (thread_connect): replace nasty
+	  rb_thread_fd_writable() with rb_thread_select().
 
-	* test/testunit/runit/test_testresult.rb: removed some unnecessary
-	  cruft.
+Fri May  7 20:49:00 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Sun Oct  5 11:14:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* ext/socket/getaddrinfo.c (inet_pton): wrong parameter to
+	  inet_aton().
 
-	* lib/rubyunit.rb: aliasing TestCase into the top level is
-	  problematic.
+	* ext/socket/addrinfo.h (__P): silly cut and paste typo.
 
-	* lib/runit/assert.rb: fixed a couple of bugs caused by recent
-	  refactoring in Test::Unit.
+Fri May  7 17:03:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/testunit/runit/*: added.
+	* dir.c (glob): removed GPL'ed glob.c completely.
 
-Sun Oct  5 10:55:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri May  7 08:17:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not
-	  work.  [ruby-dev:21484]
+	* ext/sdbm/extconf.rb: sdbm extension added to the distribution.
 
-Sun Oct  5 09:52:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Fri May  7 01:42:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/assertions.rb: will use pp for output if available.
-	  Can be disabled by setting Assertions.use_pp = false.
+	* ext/socket/socket.c (tcp_s_gethostbyname): aboid using struct
+	  sockaddr_storage.
 
-	* test/testunit/test_assertions.rb: made a small change to exception
-	  formatting.
+Thu May  6 13:21:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 07:42:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* array.c (rb_ary_indexes): should not use rb_ary_concat().
 
-	* lib/test/unit/assertions.rb: made small improvements to assertion
-	  messages. Deprecated Assertions#assert_not_nil; use #assert instead.
+Thu May  4 12:34:18 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* test/testunit/test_assertions.rb: ditto.
+	* parse.y (parse_string): there shuould be newline escape by
+	  backslashes in strings.
 
-	* test/testunit/util/test_procwrapper.rb: use #assert instead of
-	  #assert_not_nil.
+	* parse.y (parse_qstring): ditto.
 
-Sun Oct  5 04:10:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Mon May  3 04:37:20 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/test/unit/assertions.rb: refactored message building.
+	* ext/tcltklib/extconf.rb: better search for libX11.
 
-Sun Oct  5 03:40:22 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* range.c (range_s_new): embarrassing =/== typo.
 
-	* ext/openssl/ossl_asn1.h: global symbols should be declared
-	  as external.
+	* re.c (Init_Regexp): failed to set default kcode.
 
-Sun Oct  5 03:03:20 2003  akira yamada  <akira@ruby-lang.org>
+Mon May  3 02:39:55 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* test/ruby/test_exception.rb (test_else): added.
+	* ext/socket/socket.c (open_inet): typo (res and res0).
 
-Sun Oct  5 02:12:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Tue May  4 02:07:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/assertions.rb: changed assertion messages to rely more
-	  heavily on #inspect. Added backtrace filtering for exceptions in
-	  assertion messages.
+	* mkconfig.rb: leave undefined $(VARIABLE) unexpanded in the
+	  Config::CONFIG hash table.
 
-	* test/testunit/test_assertions.rb: ditto.
+Mon May  3 09:37:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 02:12:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* regex.c (re_compile_pattern): expand exactn{n} at compile time.
+	  handles stop_paren specially.
 
-	* lib/drb/acl.rb, lib/drb/ssl.rb: added.
+	* regex.c (re_compile_pattern): expand x{n} at compile time.
 
-	* lib/drb/drb.rb: exit from a thread using 'break'.
+	* regex.c (re_search): posix line match should be checked.
 
-Sat Oct  4 21:49:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* regex.c (re_search): a bug in anchor condition.
 
-	* gc.c (Init_stack): the type of space is changed to unsigned int
-	  from double.  [ruby-dev:21483]
+Fri Apr 30 18:57:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Oct  4 17:52:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* version 1.3.3
 
-	* lib/soap/netHttpClient.rb: follow http-access2.  hosts which matches
-	  ENV['no_proxy'] or ENV['NO_PROXY'] are not proxyed.
-	  - [,:] separated. ("ruby-lang.org:rubyist.net")
-	  - no regexp. (give "ruby-lang.org", not "*.ruby-lang.org")
-	  - if you want specify host by IP address, give full address.
-	    ("192.168.1.1, 192.168.1.2")
+	* string.c (rb_str_rindex): position should be END point, not
+	  START point.
 
-	* lib/soap/rpc/cgistub.rb: return "Status: XXX MMM" line.
+	* re.c (rb_reg_search): pos means end point on reverse now.
 
-	* test/runner.rb: give testsuite name.
+	* array.c (rb_ary_s_create): should clear ary->ptr to avoid
+	  potential gc crash.
 
-Sat Oct  4 15:16:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Apr 30 15:24:58 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_object): instance variable dump do not cause error
-	  for objects that cannot be dumped, if they traversed from
-	  marshal_dump.  they are just ignored.
+	* ext/socket/addrinfo.h: compatibility hack for ipv4.
 
-	* gc.c (Init_stack): cast "space" (doble value) into unsigned
-	  int.  should run on PowerPC.
+	* ext/socket/socket.c: itojun's ipv6 patches applied.
 
-	* eval.c (rb_eval): should not execute else part if any exception
-	  is caught. [ruby-dev:21482]
+	* ext/socket/extconf.rb: detect ipv6 features based on itojun's
+	  ipv6 patches.
 
-	* parse.y (f_args): should allow unparenthesized block argument.
+	* ext/extmk.rb.in (enable_config): can handle --enable-xxx now.
 
-	* parse.y (f_rest_arg): should allow unparenthesized rest
-	  argument.
+	* lib/mkmf.rb (enable_config): ditto.
 
-Sat Oct  4 14:59:51 2003  Tanaka Akira  <akr@m17n.org>
+Fri Apr 30 05:22:23 1999  Shugo Maeda  <shugo@netlab.co.jp>
 
-	* lib/pathname.rb (initialize): raise ArgumentError if argument has
-	  '\0' character.
-	  (relative_path_from): new method.
-	  (each_entry): new method for replacement of dir_foreach.
-	  (foreach, foreachline, dir_foreach, chdir): obsoleted.
+	* string.c (rb_str_aset): last index should not append.
 
-Sat Oct  4 12:58:48 2003  akira yamada  <akira@ruby-lang.org>
+Thu Apr 29 18:55:31 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* test/uri/* (6 files): added.
+	* dln.c (conv_to_posix_path): remove const from args.
 
-Sat Oct  4 12:44:45 2003  akira yamada  <akira@ruby-lang.org>
+	* ruby.c (rubylib_mangle): remove Fatal(), the obsolete function.
 
-	* lib/uri/ftp.rb, lib/uri/mailto.rb: renamed to #to_s from #to_str.
+Tue Apr 27 14:11:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Oct  4 07:33:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* parse.y (fname): lazy workaround for keywords did not work well.
 
-	* lib/test/unit/testsuite.rb: changed #<< to return self, and added
-	  #delete.
+	* ext/extmk.rb.in: `--with-xxx=yyy' argument configuration.
 
-	* test/testunit/test_testsuite.rb: ditto. Also slightly refactored
-	  #test_size.
+	* lib/mkmf.rb: ditto.
 
-	* lib/test/unit/collector/objectspace.rb: collector now preserves the
-	  hierarchy of suites.
+	* misc/ruby-mode.el: forgot to handle $`.
 
-	* test/testunit/collector/test_objectspace.rb: ditto.
+	* ext/extmk.rb.in: better AIX link support proposed by
+	  <komatsu@sarion.co.jp>.
 
-Sat Oct  4 04:48:49 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+Mon Apr 26 16:46:59 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/rubyext.c: default keys handled.
+	* ext/extmk.rb.in: AIX shared library support modified.
 
-	* ext/syck/syck.h: lowered default buffer size to 16k for increased
-	  performance.
+	* ext/aix_mksym.rb: ditto.
 
-	* test/yaml: checkin of basic unit tests.
+	* configure.in: ditto.
 
-Sat Oct  4 04:24:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* sprintf.c (rb_f_sprintf): should allocate proper sized buffer
+	  for float numbers.
 
-	* ext/openssl/extconf.rb: add check for X509V3_set_nconf.
+Sat Apr 24 00:00:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
-	  cannot implement if X509V3_set_nconf doesn't exist.
+	* parse.y (operation): syntax like `a.[]=(1,2)' is allowed.
 
-Sat Oct  4 02:12:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Apr 23 23:54:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/xsd/datatypes.rb: dump sign by itself.  under the problematic
-	  platform, sprintf("%+.10g", -0.0) => +0.  sigh.
+	* io.c (argf_binmode): binmode method added to ARGF.
 
-	* sample/wsdl/amazon/*: update schema ver2 to ver3.
+Fri Apr 23 13:55:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Oct  4 01:33:46 2003  Tanaka Akira  <akr@m17n.org>
+	* string.c (rb_f_chomp): should assign the result to $_.  or maybe
+	  sub/gsub/chop/chomp should NOT assign $_ altogether.
 
-	* lib/pathname.rb (initialize): duplicate and freeze argument.
-	  (to_s): return duplicated string.
-	  (children): new method.
-	  (each_line): new alias to foreachline.
+Thu Apr 22 16:50:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Oct  3 16:13:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_callcc): call scope_dup() for all scopes in
+	  the interpreter stack.
 
-	* ext/openssl/ossl_asn1.c: add DER encoder and decoder.
+Tue Apr 20 11:24:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_asn1.h: add OpenSSL::ASN1 module.
+	* string.c (rb_str_dump): `#' should be escaped.
 
-	* ext/openssl/ossl.c (Init_openssl): call Init_ossl_asn1.
+Tue Apr 20 02:32:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/extconf.rb: check if X509_ATTRIBUTE has field "single".
+	* parse.y (parse_regx): option /p for posix match added.
 
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): accept
-	  DER encoded data argument.
+	* re.c (rb_reg_desc): did not print options properly.
 
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_get_value): return
-	  DER encoded data in OpenSSL::ASN1 types.
+	* io.c (rb_file_s_open): intialize was called twice.
 
-Fri Oct  3 13:02:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
+Mon Apr 19 18:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit.rb: refactored to use optparse.
+	* configure.in (DEFAULT_KCODE): can specify default code for
+	  $KCODE by --with-default-kcode=(euc|sjis|utf8|none).
 
-	* lib/test/unit.rb: added support for selecting the output
-	  level from the command-line.
+	* regex.c (IS_A_LETTER): a byte sequence shorter than mbc should
+	  not match with \w etc.
 
-	* lib/test/unit.rb: added a command-line switch to stop processing
-	  the command-line, allowing arguments to be passed to tests.
+Mon Apr 19 13:49:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit.rb: changed the method for specifying a runner or a
-	  filter from the command-line.
+	* eval.c (eval): should restore ruby_dyna_vars.
 
-	* lib/test/unit/collector/objectspace.rb: fixed a bug causing all
-	  tests to be excluded when the filter was set to an empty array.
+Fri Apr 16 21:40:43 1999  Nobuyoshi Nakada  <gea02117@nifty.ne.jp>
 
-	* test/testunit/collector/test_objectspace.rb: ditto.
+	* io.c (f_backquote): pipe_open may return nil.
 
-Fri Oct  3 08:14:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (f_open): rb_io_open may return nil.
 
-	* lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
-	  'class ::Foo' syntax. [ruby-talk:83514]
+	* io.c (io_s_foreach): ditto.
 
-Fri Oct  3 08:01:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
+	* io.c (io_s_readlines): ditto.
 
-	* lib/test/unit/assertions.rb: added a default message for #assert,
-	  #assert_block, and #flunk.
+	* io.c (io_defset): wrong message.
 
-	* test/testunit/test_assertions.rb: ditto.
+Fri Apr 16 15:09:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/failure.rb: failures now show a better trace of where
-	  they occurred.
+	* bignum.c (rb_str2inum): strtoul() returns long, not int.
 
-	* test/testunit/test_failure.rb: ditto (added).
+	* eval.c (rb_load): size of VALUE and ID may be different.
 
-	* lib/test/unit/testcase.rb: ditto.
+	* util.c (mmprepare): int is too small to cast from pointers.
 
-	* test/testunit/test_testcase.rb: ditto.
+	* config.guess: avoid 'linux-gnu' for alpha-unknown-linux.
 
-	* lib/test/unit/util/backtracefilter.rb: added.
+Thu Apr 15 23:46:20 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* test/testunit/util/test_backtracefilter.rb: added.
+	* ruby.c (rubylib_mangle): mangle path by RUBYLIB_PREFIX.
 
-	* lib/test/unit/error.rb: changed to use BacktraceFilter and improved
-	  output.
+Wed Apr 14 23:52:51 1999  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
 
-	* test/testunit/test_error.rb: ditto.
+	* node.h (NODE_LMASK): should be long to avoid overflow.
 
-Thu Oct  2 20:33:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 14 13:14:35 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* ext/iconv/iconv.c (iconv_failure_initialize): conform with
-	  orthodox initialization method.
+	* dln.c: AIX dynamic link.
 
-	* ext/iconv/iconv.c (iconv_fail): initialize exception instance
-	  from the class, and do not share instance variables with the
-	  others.  [ruby-dev:21470]
+	* ext/aix_ld.rb: ditto.
 
-Thu Oct  2 18:20:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 14 12:19:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* time.c (Init_Time): define initialize.  [ruby-dev:21469]
+	* lib/thread.rb: Queue#{enq,deq} added.
 
-Thu Oct  2 17:39:38 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Apr 13 17:43:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_engine.c: add a new module OpenSSL::Engine.
-	  it supports OpenSSL hardware cryptographic engine interface.
+	* hash.c (rb_hash_s_create): Hash::[] acts more like casting.
 
-	* ext/openssl/ossl_engine.h: ditto.
+Tue Apr 13 00:33:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/MANIFEST: add ossl_engine.c and ossl_engine.h.
+	* io.c (rb_io_stdio_set): warning for assignment to the variables
+	  $std{in,out,err}.
 
-	* ext/openssl/extconf.rb: add check for openssl/engine.h.
+Mon Apr 12 23:12:32 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl.c: call Init_ossl_engine().
+	* io.c (rb_io_reopen): check for reopening same IO.
 
-	* ext/openssl/ossl.h: include openssl/engine.h.
+Fri Apr  9 17:45:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_pkey_{rsa,dsa,dh}.c: check if underlying
-	  EVP_PKEY referes engine.
+	* parse.y (rb_compile_string): bug for nested eval().
 
-Thu Oct  2 17:22:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_match): should pop non-greedy stack items on
+	  failure, after best_regs are fixed.
 
-	* time.c (time_load): restore instance variables (if any) before
-	  loading from marshaled data.
+Thu Apr  8 17:30:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  2 14:19:15 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c (PACK_LENGTH_ADJUST): need to adjust for `*' length.
 
-	* ext/iconv/iconv.c (iconv_fail): now yield erred substring, and
-	  set error object to $!.
+Tue Apr  6 23:28:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/iconv/iconv.c (iconv_convert): error handler block should
-	  return appended part and the rest.  if rest is nil, the
-	  conversion stops.
+	* parse.y (void_check): add void context checks.
 
-Thu Oct  2 12:00:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Apr  5 12:23:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* variable.c (rb_const_defined_0): look up constants in Object as
-	  well.  [ruby-dev:21458]
+	* time.c (time_s_at): should copy gmt-mode.
 
-	* test/ruby/test_defined.rb (TestDefined::test_defined): test for
-	  constants.
+	* eval.c (eval_node): preserve ruby_eval_tree.
 
-Thu Oct  2 11:17:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Fri Apr  2 14:00:34 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
-	* lib/test/unit/assertions.rb: should not capture an
-	  AssertionFailedError unless explicitly requested.
+	* lib/debug.rb: wrong command interpreting.
 
-	* test/testunit/test_assertions.rb: ditto.
+Fri Apr  2 11:46:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/testunit/collector/test_objectspace.rb: fixed a test failure
-	  caused by methods being returned in different orders on different
-	  platforms by moving test sorting from TestSuite into the locations
-	  where suites are constructed. [ruby-talk:83156]
+	* version 1.3.2
 
-	* lib/test/unit/testcase.rb: ditto.
+Fri Apr  2 10:40:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/testsuite.rb: ditto.
+	* io.c (rb_io_s_pipe): forgot to define IO::pipe.
 
-	* lib/test/unit/collector/objectspace.rb: ditto.
+Thu Apr  1 14:40:46 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  2 03:25:01 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* eval.c (assign): modified for rhs change.
 
-	* eval.c (rb_thread_raise): prototype; avoid VC++ warning.
+	* parse.y (stmt): unparenthesisized method calls can be right hand
+	  side expression of the assignment.
 
-Thu Oct  2 01:37:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Mar 27 22:42:47 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* time.c (time_mdump): new marshal dumper. _dump is still
-	  available for compatibility.
+	* ext/nkf/nkf.c (rb_nkf_kconv): check size output_ctr before
+	  decrement.
 
-	* time.c (time_mload): new marshal loader.
+Thu Mar 25 09:11:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_object): preserve instance variables for objects
-	  with marshal_dump.
+	* time.c (time_s_at): preserve gmt-mode for result.
 
-	* marshal.c (r_object0): restore instance variables before calling
-	  marshal_load.
+	* parse.y (rb_compile_string): do not use cur_mid, use
+	  compile_for_eval instead.
 
-	* error.c (rb_warn_m): always return nil.
+	* st.c (PTR_NOT_EQUAL): wrong logical condition.
 
-Thu Oct  2 01:32:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Mar 24 13:06:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_f_block_given_p): real required condition is
-	  ruby_frame->prev->iter == ITER_CUR.
+	* parse.y (yycompile): should clear cur_mid after compilation.
 
-	* eval.c (rb_block_given_p): ditto.
+	* io.c (next_argv): need to check type for ARGV.shift.
 
-	* eval.c (block_pass): update ruby_frame->iter only when previous
-	  value is ITER_NOT.
+	* eval.c (blk_copy_prev): need to preverse outer scope as well as
+	  outer frames.
 
-Thu Oct  2 01:02:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (rb_compile_string): return can appear within eval().
 
-	* variable.c (rb_const_defined_at): should exclude constants from
-	  Object when TYPE(klass) == T_MODULE *and* exclude is on.
-	  [ruby-dev:21458]
+Tue Mar 23 10:15:07 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* variable.c (rb_const_get_0): do not lookup constants from Object
-	  when TYPE(klass) == T_MODULE *and* exclude is on.
+	* configure.in: AC_C_CONST check added.
 
-Thu Oct  2 00:21:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Mar 23 02:07:35 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/logger/test_logger.rb: unlinking file before close causes
-	  problem under win32 box.
+	* time.c (time_plus): preserve gmt-mode for result.
 
-	* lib/xsd/datatypes.rb(XSDFloat, XSDDouble): add +/- sign explicitly
-	  when stringified and embedded into XML instance.  Ruby's sprintf may
-	  format -0.0 as "0.0" (no minus sign) depending on underlying C
-	  sprintf implementation.
+Mon Mar 22 01:32:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/xsd/test_xsd.rb, test/soap/test_basetype.rb: follow above change.
+	* eval.c (rb_eval): adjust line numbers before expression
+	  interpolation within strings.
 
-	* test/soap/calc/*: give httpd config param "CGIInterpreter".
-	  "/usr/bin/env ruby" thing does not work under non-Unix boxes.
+	* eval.c (rb_eval): defined? returns nil for false condition.
 
-Thu Oct  2 00:25:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (num_nonzero_p): returns nil for false condition.
 
-	* signal.c (ruby_signal_name): adjust to the prototype.
+Sat Mar 20 13:07:43 1999  Keiju Ishitsuka  <keiju@rational.com>
 
-	* process.c (pst_inspect): ditto.
+	* lib/weakref.rb: avoid leak for two weakrefs for one object.
 
-	* ext/etc/etc.c (etc_getgrent, Init_etc): typo.
+Fri Mar 19 11:26:45 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Wed Oct  1 20:49:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (ruby_run): needed to eval END{} on exit.
 
-	* gc.c (heaps): manage slots and limits together.  [ruby-dev:21453]
+	* eval.c (rb_exit): ditto.
 
-	* gc.c (add_heap): should not clear heaps slot even if realloc()
-	  failed.
+Fri Mar 19 02:17:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct  1 20:36:49 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* signal.c (Init_signal): handles terminating signals HUP, TERM,
+	  QUIT, PIPE, etc.
 
-	* MANIFEST: add wince/mkconfig_wce.rb.
+Thu Mar 18 15:47:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct  1 17:22:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_big_and): bug in sign calculation.
 
-	* ext/etc/etc.c: add new functions: setpwent, getpwent, endpwent,
-	  setgrent, getgrent, endgrent.
+	* bignum.c (rb_big_or): ditto.
 
-	* ext/socket/socket.c (sock_s_gethostbyname): do not reverse lookup.
+	* io.c (rb_f_select): forgot to use to_io to retrieve IO, after
+	  calling select(2).
 
-Wed Oct  1 17:01:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 16 19:54:31 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* eval.c (rb_load): Object scope had priority over required file
-	  scope.  [ruby-dev:21415]
+	* ext/extmk.rb.in: static linking cause infinite make loop.
 
-Wed Oct 01 14:09:53 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+Tue Mar 16 18:50:04 1999  Yoshida Masato  <yoshidam@yoshidam.net>
 
-	* wince/mkconfig_wce.rb: sorry, forget to commit.
+	* ext/socket/socket.c (tcp_s_gethostbyname): typo, not NUM2INT(),
+	  but INT2NUM().
 
-Wed Oct 01 10:08:42 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+	* ext/socket/socket.c (mkhostent): ditto.
 
-	* wince/setup.mak: add sigmarionIII SDK support.
+Tue Mar 16 12:31:44 1999  Ryo HAYASAKA  <hayasaka@cheer.u-aizu.ac.jp>
 
-	* wince/Makefile.sub: ditto.
+	* file.c (utime_internal): suppress warning by const.
 
-	* wince/mkexports.rb: fix linker error in SH4.
+	* time.c (time_gmtime): ditto.
 
-	* wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
+Tue Mar 16 10:23:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 01 08:02:52 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+	* time.c (time_clone): Time object can be cloned.
 
-	* wince/time_wce.c (time): add zero check.
+Tue Mar 16 03:13:10 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Tue Sep 30 16:11:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.c (load_file): argv[argc] should be NULL.
 
-	* Makefile.in: copy lex.c from $(srcdir) if it's not the current
-	  directory.  [ruby-dev:21437]
+Mon Mar 15 22:12:08 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Tue Sep 30 11:29:23 2003  Tanaka Akira  <akr@m17n.org>
+	* sprintf.c (rb_f_sprintf): typo in arg_num check at exit.
 
-	* process.c (pst_inspect): describe stopped process "stopped".
+Mon Mar 15 16:42:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Sep 30 09:31:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_dup): dup2 should copy class too.
 
-	* test/runner.rb: glob for directories.
+Mon Mar 15 15:12:53 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-Tue Sep 30 09:11:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb: install program relative path check.
 
-	* eval.c (rb_eval): while/until should not capture break unless
-	  they are destination of the break.
+Mon Mar 15 14:05:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Sep 30 03:12:02 2003  Minero Aoki  <aamine@loveruby.net>
+	* re.c (rb_reg_s_new): 2nd argument is now option.
+	  Regexp::EXTENDED can be specified.
 
-	* lib/net/http.rb (finish): revert to 1.93.
+Fri Mar 12 10:47:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/pop.rb (finish): revert to 1.60.
+	* string.c (rb_str_index): str.index("") should always match at
+	  offset point.
 
-	* lib/net/smtp.rb (finish): revert to 1.67.
+	* string.c (rb_str_upto): can specify end point exclusion.
 
-	* lib/net/http.rb (do_start): ensure to close socket if failed to
-	  start session.
+	* string.c (rb_str_index): negative offset.
 
-	* lib/net/pop.rb (do_start): ditto.
+	* regex.c (re_match): begline should not match at the point
+	  between a newline and end-of-string.  endline neither.
 
-	* lib/net/smtp.rb (do_start): ditto.
+	* regex.c (re_compile_pattern): context_indep_anchors .
 
-	* lib/net/smtp.rb: SMTP#started? wrongly returned false always.
+	* parse.y (parse_regx): need not to push backslashes before
+	  escaped characters.
 
-Tue Sep 30 02:54:49 2003  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (rb_thread_join): re-raises exception within target.
 
-	* test/ruby/test_iterator.rb: new test
-	  test_break__nested_loop[123].
+Fri Mar 12 01:09:36 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Mon Sep 29 23:39:13 2003  Minero Aoki  <aamine@loveruby.net>
+	* ext/readline/readline.c (readline_s_vi_editing_mode): wrong
+	  number of arguments.
 
-	* lib/net/http.rb (finish): does not raise IOError even if
-	  !started?, to allow closing socket which was opened before
-	  session started.
+Fri Mar 12 02:12:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/pop.rb (finish): ditto.
+	* pack.c (PACK_ITEM_ADJUST): "a".unpack("C3") => [97, nil, nil]
 
-	* lib/net/smtp.rb (finish): ditto.
+Thu Mar 11 18:23:50 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-Mon Sep 29 19:06:51 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/socket/socket.c (Init_socket): UDPsocket was ommited.
 
-	* ext/win32ole/extconf.rb: add windows.h checking.
-	  (ruby-bugs PR#1185)
+Thu Mar 11 16:43:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Sep 29 16:18:30 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* pack.c (PACK_LENGTH_ADJUST): push fixed number of items per
+	  template to result array.
 
-	* lib/logger.rb: check if the given logdevice object respond_to :write
-	  and :close, not is_a? IO.  duck duck.
+	* pack.c (pack_unpack): I/N/C etc. push nil in the array for "".
 
-	* test/logger/test_logger.rb: self IO.pipe reading/writing may be
-	  locked by the flood.  use tempfile.
+Tue Mar  9 00:19:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/wsdl/xmlSchema/data.rb: wrong constant reference.
+	* hash.c (ruby_unsetenv): use ruby_setenv(name, 0).
 
-Mon Sep 29 16:11:23 2003  Minero Aoki  <aamine@loveruby.net>
+	* hash.c (env_delete): ditto.
 
-	* test/fileutils/test_fileutils.rb: clean up temporary symlink.
-	  Patched by NaHi.  [ruby-dev:21420]
+	* string.c (rb_str_upto): do not check `beg<end' to generate
+	  strings for the pattern like "a".upto("#a").
 
-Mon Sep 29 11:16:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* range.c (range_each): treat strings as special case.
 
-	* eval.c (rb_thread_atfork): wrong format specifier.
-	  [ruby-dev:21428]
+	* range.c (range_each): no longer use upto for generic cases.
 
-	* process.c (pst_inspect): better description.
+Sun Mar  7 14:21:32 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
 
-Mon Sep 29 02:31:44 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (rb_str_index): wrong end point calculation.
 
-	* lib/webrick/utils.rb (Utils::su): use setgid and setuid to
-	  set real and effective IDs. and setup group access list by
-	  initgroups.
+Sat Mar  6 02:19:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Sep 28 11:14:19 2003  Koji Arai  <jca02266@nifty.ne.jp>
+	* re.c (match_index): MatchingData#index(n) added.
 
-	* ext/digest/digest.c (Init_digest): `copy_object' was deprecated.
-	  `initialize_copy' should be defined.
+	* array.c (rb_ary_subseq): ary[n..-1] returns an sub-array unless
+	  n is too small negative index.
 
-	* ext/stringio/stringio.c (Init_stringio): ditto.
+	* re.c (rb_reg_match_method): Regexp#match(str) added.
 
-Sat Sep 27 18:25:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* array.c (rb_ary_indexes): understands ranges as indexes.
 
-	* lib/xsd/charset.rb: XSD::Charset.is_ces did return always true under
-	  $KCODE = "NONE" environment.  check added.
+	* re.c (match_size): MatchingData#size added.
 
-	* test/xsd/test_xsd.rb: add tests for above fix.
+Fri Mar  5 01:04:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Sep 27 15:58:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* array.c (rb_ary_fill): modified for range.
 
-	* lib/soap/rpc/cgistub.rb: make logging severity threshold higher.
+	* array.c (rb_ary_aset): a[n..m] revisited.
 
-	* lib/soap/rpc/standaloneServer.rb: defer WEBrick server start to give
-	  a chance to reset logging severity threshold.
+Thu Mar  4 14:23:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/soap/calc/test_*, test/soap/helloworld/test_helloworld.rb: run
-	  silent.
+	* string.c (rb_str_subseq): a[n..m] revisited.
 
-Sat Sep 27 09:44:18 2003  Minero Aoki  <aamine@loveruby.net>
+	* parse.y (method_call): allow Const::method{}.
 
-	* test/fileutils/test_fileutils.rb: clear all errors on Windows.
-	  [ruby-dev:21417]
+	* array.c (rb_ary_replace_method): should replace original array.
 
-	* test/fileutils/test_nowrite.rb: ditto.
+Thu Mar  4 02:30:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Sep 27 04:57:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* configure.in: remove --disable-thread, thread feature is no
+	  longer optional.
 
-	* test/ruby/test_file.rb: new file.  only asserts unlink-before-close
-	  behaviour now.
+Thu Mar  4 00:32:17 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-	* test/soap/marshal/test_digraph.rb: should close before unlink.
-	  unlink-before-close pattern is not needed here.
+	* parse.y (read_escape): wrong arguments for scan_oct,scan_hex.
 
-Sat Sep 27 03:32:37 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Mar  3 11:51:53 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/soap/*, test/wsdl/*, test/xsd/*: move TestCase classes into
-	  each module namespace.  TestMarshal in
-	  test/soap/marshal/test_marshal.rb crashed with
-	  test/ruby/test_marshal.rb.
+	* ext/socket/socket.c (Init_socket): rename class names as
+	  TCPsocket -> TCPSocket etc.
 
-Sat Sep 27 01:30:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Mar  2 19:46:42 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/socket/socket.c (ruby_connect): on win32, type of the 4th
-	  argument of getsockopt is char *.
+	* configure.in (LDSHARED): use gcc -Wl,-G for solaris with gcc.
 
-Fri Sep 26 18:35:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar  2 17:04:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/resolv-replace.rb: 1.8 compliance.  [ruby-talk:82946]
+	* parse.y (yylex): backslashes do not concatenate comment lines
+	  anymore.
 
-Fri Sep 26 17:39:27 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Mar  1 14:05:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_marshal.rb: add test for ruby's objects.
+	* eval.c (rb_call0): adjust argv for optional arguments.  super
+	  without arguments emit superclasse method with the value from
+	  optinal arguments.  enabled as experiment.
 
-Fri Sep 26 09:52:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 28 14:04:07 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* defines.h (flush_register_windows): use volatile only for gcc on
-	  Solaris.  [ruby-dev:21403]
+	* parse.y (nextc): backslash at the eof cause infinite loop
 
-	* lib/mkmf.rb (xsystem): use system directly to honor shell meta
-	  charaters.
+Sun Feb 28 11:01:26 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Fri Sep 26 00:10:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* time.c (make_time_t): month range check added.
 
-	* lib/README: updated.
+Sat Feb 27 02:36:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Sep 25 17:48:10 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* re.c (Init_Regexp): add escape as alias of quote.
 
-	* ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
-	  rb_protect.
+	* re.c (rb_reg_s_quote): char-code can be specified now.
 
-	* ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
-	  value.
+Fri Feb 26 18:45:36 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-Thu Sep 25 09:00:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
+	* eval.c (error_print): bug for error message with newlines.
 
-	* lib/ostruct.rb: Added OpenStruct#==.
+Fri Feb 26 12:00:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ostruct/test_ostruct.rb: Added.
+	* time.c (make_time_t): future check modified to allow 1969-12-31
+	  at certain timezone.
 
-Thu Sep 25 07:55:26 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (time_arg): year >= 1000 should be past.
 
-	* ext/win32ole/win32ole.c, ext/openssl/ossl_pkey_dsa.c,
-	  ext/openssl/ossl_pkey_rsa.c, ext/bigdecimal/bigdecimal.h: must
-	  not use C++ or C99 style comment yet.  (ruby-bugs:PR#1184)
+	* version.c (Init_version): constant RELEASE_DATE added.
 
-Thu Sep 25 00:23:22 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Feb 26 01:08:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* MANIFEST: add SOAP4R.
+	* string.c (rb_str_substr): returns nil for out-of-range access.
 
-Thu Sep 25 00:13:15 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* array.c (rb_ary_subseq): returns nil for out-of-range access.
 
-	* lib/soap/* (29 files): SOAP4R added.
+	* array.c (rb_ary_store): negative index message has changed.
 
-	* lib/wsdl/* (42 files): WSDL4R added.
+	* string.c (rb_str_aset): reallocation needed.
 
-	* lib/xsd/* (12 files): XSD4R added.
+	* string.c (rb_str_aset): allow char append to the string.
 
-	* test/soap/* (16 files): added.
+Thu Feb 25 23:30:17 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* test/wsdl/* (2 files): added.
+	* time.c (time_load): tm_year should be packed in 17 bits, not 18.
 
-	* test/xsd/* (3 files): added.
+Thu Feb 25 12:50:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* sample/soap/* (27 files): added.
+	* missing/dup2.c: replaced by public domain version.
 
-	* sample/wsdl/* (13 files): added.
+	* time.c (make_time_t): add `future check' in loops.
 
-Wed Sep 24 02:08:11 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* object.c (rb_num2dbl): forbid implicit conversion from nil, or
+	  strings.  thus `Time.now + str' should raise error.
 
-	* lib/webrick/httpservlet/cgihandler.rb: conform to mswin32.
-	  [ruby-talk:82735], [ruby-talk:82748], [ruby-talk:82818]
+	* object.c (rb_Float): convert nil into 0.0.
 
-Tue Sep 23 23:10:16 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* object.c (rb_Integer): conversion method improved.
 
-	* lib/logger.rb: add Logger#<<(msg) for writing msg without any
-	  formatting.
+Thu Feb 25 03:27:50 1999  Shugo Maeda  <shugo@netlab.co.jp>
 
-	* test/logger/test_logger.rb: ditto.
+	* eval.c (rb_call): should handle T_ICLASS properly.
 
-Tue Sep 23 20:47:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Feb 25 00:04:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* error.c (rb_warn_m): should not warn if -W0 is specified.
-	  [ruby-talk:82675]
+	* error.c (Init_Exception): global function Exception() removed.
 
-Mon Sep 22 21:28:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* variable.c (rb_class2name): returns "nil"/"true"/"false" for them.
 
-	* MANIFEST: updated.
+	* time.c (time_dump): time marshaling format compressed size from
+	  11 bytes to 8 bytes.  thanx to tadf@kt.rim.or.jp.
 
-Mon Sep 22 19:22:26 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_obj_call_init): should specify arguments explicitly.
 
-	* configure.in (AC_CHECK_FUNCS): add setuid and setgid.
+Wed Feb 24 15:43:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Sep 22 12:34:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (yylex): comment concatenation requires preceding space
+	  before backslash at the end of line.
 
-	* util.c (ruby_strtod): skip preceding zeros before counting
-	  digits in the mantissa. (ruby-bugs PR#1181)
+	* io.c (rb_f_pipe): global pipe is obsolete now.
 
-Sun Sep 21 04:12:36 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* object.c (Init_Object): remove true.to_i, false.to_i.
 
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument
-	  should be a String.
+Tue Feb 23 14:21:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.
+	* parse.y (yylex): warn if identifier! immediately followed by `='.
 
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.
+Tue Feb 23 12:32:41 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+	* eval.c (rb_load): tilde expandion moved to find_file.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
+	* eval.c (find_file): tilde expandion added.
 
-Sat Sep 20 11:49:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Feb 23 10:50:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/logger.rb: typo fixed.
+	* eval.c (require_method): require can handle multiple fnames.
 
-	* test/logger/test_logger.rb: new file.
+	* hash.c (rb_hash_foreach_iter): hash key may be nil.
 
-Fri Sep 19 11:39:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
+Mon Feb 22 17:44:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/testunit/*: Added.
+	* regex.c (re_match): should not pop failure point on success for
+	  non-greedy matches.
 
-	* lib/test/unit.rb: Documentation update.
+	* io.c (Init_IO): remove global_functions getc, readchar, ungetc,
+	  seek, tell, rewind.
 
-	* lib/test/unit/ui/console/testrunner.rb (TestRunner#initialize):
-	  Ditto.
+Sat Feb 20 22:54:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit.rb: Factored out an ObjectSpace collector.
+	* numeric.c (rb_num2long): no implicit conversion from boolean.
 
-	* lib/test/unit/collector/objectspace.rb: Ditto.
+Sat Feb 20 09:58:42 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* sample/testunit/*: Added.
+	* numeric.c (flo_to_s): portable Infinity and NaN support.
 
-Fri Sep 19 01:00:48 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Feb 20 07:13:31 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* lib/webrick/log.rb (BasicLog#log): get rid of as ineffectual
-	  condition.
+	* io.c (rb_file_sysopen): forgot to initialize a local variable.
 
-	* lib/webrick/log.rb (BasicLog#format): add "\n" to message.
+Fri Feb 19 23:05:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Sep 18 22:43:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_subseq): range check changed.
 
-	* eval.c (proc_invoke): should push PROT_PCALL tag for orphans.
+	* marshal.c: increment MARSHAL_MINOR for Time format change.
 
-	* eval.c (proc_invoke): should update "result" for orphans.
+	* time.c (time_old_load): support old marshal format.
 
-Thu Sep 18 20:33:03 2003  Tietew  <tietew-ml-ruby-list@tietew.net>
+	* time.c (time_load): changed for new format Y/M/D/h/m/s/usec.
 
-	* parse.y (str_xquote): do not prepend escapes in
-	  backqoute literals.  [ruby-list:38409]
+	* time.c (time_dump): marshal dump format has changed.
 
-Thu Sep 18 20:30:17 2003  Tanaka Akira  <akr@m17n.org>
+Fri Feb 19 00:25:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/pathname.rb: update document.
+	* time.c (time_arg): should reject "sep\0" and such.
 
-Thu Sep 18 15:27:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* time.c (time_plus): Time#+ should not receive Time object
+	  operand.
 
-	* lib/logger.rb: new file.  Logger, formerly called devel-logger or
-	  Devel::Logger.
+	* string.c (rb_str_substr): nagative length raises exception now.
 
-	* sample/logger/*: new file.  samples of logger.rb.
+	* array.c (beg_len): if end == -1, it points end of the array.
 
-Wed Sep 17 23:41:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_subseq): nagative length raises exception now.
 
-	* eval.c (localjump_destination): should not raise ThreadError
-	  exception for "break". [ruby-dev:21348]
+Thu Feb 18 20:57:04 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* eval.c (proc_invoke): use result instead of prot_tag->retval.
-	  retval is no longer propagated to the ancestors.
+	* time.c (rb_strftime): strftime() may return 0 on success too.
 
-Wed Sep 17 20:34:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (time_strftime): `\0' within format string shoule not be
+	  ommited in the result.
 
-	* parse.y (tokadd_string, parse_string, yylex): escaped terminator
-	  is now interpreted as is.  [ruby-talk:82206]
+	* time.c (rb_strftime): zero length format.
 
-Wed Sep 17 18:52:36 2003  Minero Aoki  <aamine@loveruby.net>
+	* time.c (time_to_a): yday start with 1 now.
 
-	* test/fileutils/fileassertions.rb: new file.
+	* time.c (time_zone): support for long timezone name.
 
-	* test/fileutils/test_fileutils.rb: new file.
+	* time.c (time_yday): yday start with 1 now.
 
-	* test/fileutils/test_nowrite.rb: new file.
+	* time.c (time_minus): minus calculation was wrong.
 
-Wed Sep 17 18:51:02 2003  Minero Aoki  <aamine@loveruby.net>
+	* time.c (time_minus): sec, usec should be at least `long', maybe
+	  they should be `time_t'.
 
-	* test/strscan/test_stringscanner.rb: require test/unit.
+	* time.c (time_plus): addition with float was wrong.
 
-Wed Sep 17 18:35:34 2003  Minero Aoki  <aamine@loveruby.net>
+	* time.c (time_to_s): support for long timezone name.
 
-	* test/strscan/test_stringscanner.rb: new file.
+	* time.c (time_gm_or_local): too far future check moved.
 
-Wed Sep 17 18:03:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* time.c (time_arg): treat 2 digit year as 69-99 => 1969-1999,
+	  00-68 => 2000-2068
 
-	* ext/openssl: all files are reviewed to simplify and avoid memory leak.
+Thu Feb 18 03:56:47 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/extconf.rb: add check for assert.h.
+	* missing/fnmatch.c: moved to missing directory.
 
-	* ext/openssl/ossl.c (ossl_buf2str): new function to convert
-	  C buffer to String and free buffer.
+Wed Feb 17 16:22:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert
-	  Array of OpenSSL::X509 to STACK_OF(X509) with exception safe.
+	* struct.c (rb_struct_alloc): actual initialization now be done in
+	  `initialize'.
 
-	* ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new
-	  functions to convert object to DER string.
+Wed Feb 17 09:47:15 1999  okabe katsuyuki  <hgc02147@nifty.ne.jp>
 
-	* ext/openssl/ossl.h: ditto.
+	* regex.c (re_search): use mbclen() instead of ismbchar().
 
-	* ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert
-	  BIO to String object and free BIO.
+	* re.c (rb_reg_s_quote): should handle mbchars properly.
 
-	* ext/openssl/ossl_bio.h: ditto.
+Wed Feb 17 01:25:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der".
+	* parse.y (yylex): stop comment concatenation by backslash follows
+	  after >= 0x80 char.  may cause problem with Latin chars.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto.
+	* eval.c (error_print): exception in rb_obj_as_string() caused
+	  SEGV. protect it by PUSH_TAG/POP_TAG.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto.
+	* error.c (exc_exception): `Exception#exception' should return self.
 
-	* ext/openssl/ossl_x509ext.c (create_ext_from_array): removed
-	  and reimplement in openssl/x509.rb.
+Wed Feb 17 01:12:22 1999  Hirotaka Ichikawa  <hirotaka.ichikawa@tosmec.toshiba.co.jp>
 
-	* ext/openssl/ossl_x509attr.c: reimplemented and disable some
-	  method temporarily. this class doesn't work fine without ASN.1
-	  data support;-) I'll rewrite in near future.
+	* configure.in: BeOS patch.
 
-	* ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off
-	  unused code.
+Tue Feb 16 14:25:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all.
+	* regex.c (re_compile_pattern): should reallocate mbc space for
+	  character class unless current_mbctype is ASCII.
 
-Tue Sep 16 22:25:06 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Feb 15 15:48:30 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* test/csv/test_csv.rb: add negative tests of row_sep.
+	* configure.in: specify `-Wl,-E' only for GNU ld.
 
-Tue Sep 16 18:02:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb 15 11:43:22 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
 
-	* regex.c (re_compile_pattern): should not translate character
-	  class range edge. [ruby-list:38393]
+	* array.c (rb_inspecting_p): should return Qfalse.
 
-Tue Sep 16 16:47:56 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sun Feb 14 22:36:40 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* MANIFEST: add test/csv/mac.csv.
+	* sprintf.c (rb_f_sprintf): `%G' was ommited.
 
-	* win32/Makefile.sub, bcc32/Makefile.sub (test): add phony NUL target.
+Sun Feb 14 12:47:48 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-Mon Sep 15 19:02:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* numeric.c (Init_Numeric): allow divide by zero on FreeBSD.
 
-	* lib/csv.rb: add extra pamameter to specify row(record) separater
-	  character.  To parse Mac's CR separated CSV, do like this.
-	    CSV.open("mac.csv", "r", ?,, ?\r) { |row| p row.to_a }
-	  The 3rd parameter in this example ?, is for column separater and the
-	  4th ?\r is for row separater.  Row separater is nil by default.  Nil
-	  separater means "\r\n" or "\n".
+	* numeric.c (Init_Numeric): FloatDomainError added.
 
-	* test/csv/test_csv.rb: add tests for above feature.
+	* configure.in (AC_REPLACE_FUNCS): add checks for functions
+	  insinf, isnan, and finite.
 
-	* test/csv/mac.csv: added.  Sample CR separated CSV file.
+Sat Feb 13 01:24:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep 12 22:41:48 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+	* eval.c (rb_thread_create_0): should protect th->thread.
 
-	* ext/openssl/ossl.c: move ASN.1 stuff to ossl_asn1.[ch]
+Fri Feb 12 16:16:47 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-	* ext/openssl/ossl.c: move BIO stuff to ossl_bio.[ch]
+	* string.c (rb_str_inspect): wrong mbc position.
 
-	* ext/openssl/ossl_asn1.[ch]: new files
+Fri Feb 12 16:21:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_bio.[ch]: new files
+	* eval.c (rb_thread_fd_close): 
 
-Fri Sep 12 12:30:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_io_fptr_close): tell scheduler that fd is closed.
 
-	* intern.h (rb_disable_super, rb_enable_super): replace with dummy
-	  expressions instead of prototypes.  the functions remain yet for
-	  binary compatibility.  [ruby-talk:81758]
+	* io.c (rb_io_reopen): ditto.
 
-Fri Sep 12 12:09:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (READ_CHECK): check if closed after thread context switch.
 
-	* bignum.c (rb_big_and): convert argument using 'to_int'.
+	* ext/socket/socket.c (bsock_close_read): do not check
+	  the return value from shutdown(2).
 
-	* bignum.c (rb_big_or): ditto.
+	* ext/socket/socket.c (bsock_close_write): ditto.
+
+	* ext/socket/socket.c (sock_new): need to dup(fd) for close_read
+	  and close_write.
+
+	* parse.y (here_document): handle newlines within #{}.
+
+	* regex.h: should replace symbols for ruby.
+
+Fri Feb 12 00:46:28 1999  Shugo Maeda  <shugo@netlab.co.jp>
+
+	* marshal.c (r_object): should update the method name in message.
+
+	* marshal.c (w_object): limit should be converted into Fixnum.
+
+Wed Feb 10 15:20:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): empty pattern should not cause infinite
+	  pattern match loop.
+
+	* regex.c (re_compile_pattern): RE_OPTIMIZE_ANCHOR for /.*/, not
+	  for /(.|\n)/.
+
+	* numeric.c (fix_pow): `fixnum**nil' should raise TypeError.
+
+	* bignum.c (rb_big_pow): need to normalize results.
+
+Wed Feb 10 01:42:41 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* numeric.c (fix_pow): `(5**1).type' should be Integer.
+
+Tue Feb  9 01:22:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): do not ignore newlines in mbchars.
+
+	* io.c (rb_file_s_open): mode can be specified by flags like
+	  open(2), e.g. File::open(path, File::CREAT|File::WRONLY).
+
+	* io.c (rb_f_open): bit-wise mode flags for pipes
+
+	* io.c (Init_IO): bit flags for open.
+
+Sat Feb  6 22:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_sub_bang): should not overwrite match data by
+	  regexp match within the block.
+
+	* string.c (rb_str_gsub_bang): ditto.
+
+Sat Feb  6 03:06:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (match_getter): accessng $~ without matching caused SEGV.
+
+Fri Feb  5 22:11:08 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* parse.y (yylex): binary literal support, like 0b01001.
+
+	* parse.y (yylex): octal numbers can contain `_'s.
+
+	* parse.y (yylex): warns if non-octal number follows immediately
+	  after octal literal.
+
+	* parse.y (yylex): now need at least one digit after prefix such
+	  as 0x, or 0b.
+
+	* bignum.c (rb_str2inum): recognize binary numbers like 0b0101.
+
+Fri Feb  5 03:26:56 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
+
+	* ruby.c (proc_options): -e without program prints error.
+
+Fri Feb  5 00:01:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (terms): needed to clear heredoc_end.
+
+	* numeric.c (flo_div): allow float division by zero.
+
+Thu Feb  4 11:56:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* missing/strtod.c: for compatibility.
+
+	* configure.in (strtod): add strtod compatible check.
+
+	* numeric.c (rb_num2long): missing/vsnprintf.c does not supprt
+	  floating points.
+
+	* numeric.c (flo_to_s): ditto.
+
+Wed Feb  3 23:02:12 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* regex.c (re_compile_pattern): use ismbchar() to get next char.
+
+	* regex.c (re_search): wrong mbchar shift.
+
+	* re.c (rb_reg_search): needed to reset $KCODE after match.
+
+	* regex.c (re_compile_fastmap): mbchars should match with \w.
+
+Wed Feb  3 22:35:12 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* parse.y (yylex): too big float raise warning, not error.
+
+Tue Feb  2 23:41:42 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* regex.c (re_match): wrong boundary.
+
+	* regex.c (IS_A_LETTER): re_mbctab[c] may not be 1 for mbc.
+
+	* regex.c (re_search): mbchar support for shifting ranges.
+
+	* regex.c (MBC2WC): wrong conversion.
+
+Wed Feb  3 15:03:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (parse_regx): need to escape parens if terminators are
+	  not any kind of parenthesis.
+
+	* parse.y (parse_qstring): ditto.
+
+	* parse.y (parse_string): ditto.
+
+Tue Feb  2 17:11:26 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* string.c (rb_str_gsub_bang): too small realoc condition.
+
+Mon Feb  1 10:01:17 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* parse.y (yylex): range check for the float literal.
+
+Sat Jan 30 18:34:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (usage): -h option to show brief command description.
+
+Sat Jan 30 08:45:16 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
+
+	* lib/cgi-lib.rb: cookie support added.
+
+Sat Jan 30 13:38:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): mbchars should match with \w
+	  within character classs.  Was matching with \W.
+
+	* regex.c (re_match): \w should match with multi byte characters,
+	  not its first byte.
+
+Sat Jan 30 10:06:41 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* re.c (rb_reg_s_new): UTF-8 flag handle (/u, /U).
+
+	* re.c (rb_kcode): $KCODE handle for UTF-8.
+
+Sat Jan 30 01:51:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_delete_if): RTEST() missing.
+
+	* hash.c (delete_if_i): ditto.
+
+	* enum.c (Init_Enumerable): select (=find_all), detect (=find)
+	  added as aliases.
+
+Fri Jan 29 21:32:19 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* hash.c (rb_f_setenv): SEGV caused by small typo.
+
+Fri Jan 29 00:15:58 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/parsedate.rb (parsedate): support date format like
+	  23-Feb-93, which is required by HTTP/1.1.
+
+	* variable.c (find_class_path): avoid calling rb_iv_set().
+
+	* eval.c (backtrace): do not need to modify $SAFE internally.
+
+	* variable.c (classname): inline __classid__ access.
+
+	* eval.c (THREAD_ALLOC): needed to initialize wrapper.
+
+	* lib/ftools.rb (makedirs): allows slash at the end of the path.
+
+	* numeric.c (rb_fix_induced_from): ensure result to be Fixnum.
+
+Thu Jan 28 17:31:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (flo_to_s): float format changed to "%16.10g".
+
+Thu Jan 28 02:13:11 1999  Yoshinori Toki  <toki@freedom.ne.jp>
+
+	* array.c (rb_ary_store): expand allocated buffer by 3/2.
+
+Wed Jan 27 17:50:02 1999  Kazuhiro HIWADA  <hiwada@kuee.kyoto-u.ac.jp>
+
+	* bignum.c (dbl2big): raised error if double is too big to cast
+	  into long.  check added.
+
+Wed Jan 27 03:16:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_mod_const_at): can't list constants of the
+	  untainted objects in safe mode.
+
+	* class.c (method_list): can't list methods of untainted objects
+	  in safe mode.
+
+Tue Jan 26 02:40:41 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
+
+	* prec.c: Precision support for numbers.
+
+Thu Jan 21 19:08:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_f_raise): calls `exception' method, not `new'.
+
+	* error.c (exc_exception): renamed from `new'.
+
+Wed Jan 20 03:39:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yycompile): rb_in_compile renamed to ruby_in_compile.
+
+	* ruby.c (load_file): define DATA iff __END__ appeared in script.
+
+Tue Jan 19 14:57:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): need to protect lex_lastline.
+
+	* parse.y (yylex): disable %//, %'', %``.
+
+Tue Jan 19 05:01:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* array.c (beg_len): round range value too much.
+
+Mon Jan 18 13:02:27 1999  Kuroda Jun  <jkuro@dwe.co.jp>
+
+	* hash.c (env_keys): strchr() may return NULL.
+
+Mon Jan 18 17:51:47 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* instruby.rb (wdir): install libruby.a in archdir.
+
+	* lib/ftools.rb (install): removes file before installing.
+
+Mon Jan 18 16:55:31 1999  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* eval.c (rb_callcc): experimental continuation support.
+
+Sun Jan 17 19:45:37 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* pack.c (pack_pack): nil packing caused SEGV.
+
+Sat Jan 16 13:18:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_concat): character (fixnum) can be append to
+	  strings
+
+	* array.c (rb_ary_unshift): unshift returns array.
+
+Sat Jan 16 01:39:19 1999  Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
+
+	* string.c (rb_str_split_method): UTF-8 support.
+
+	* regex.c: UTF-8 support.
+
+Thu Jan 14 00:42:55 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_gsub_bang): forget to add offset for null match.
+
+	* eval.c (rb_thread_local_aset): can't modify in tainted mode.
+
+	* hash.c (env_each_key): avoid generating temporary array.
+
+Wed Jan 13 23:58:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_f_setenv): name and value can be tainted.
+
+Wed Jan  6 02:42:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (Init_Bignum): forgot to define Bignum#===.
+
+	* gc.c (gc_sweep): if add_heap() is called during GC, objects on
+	  allocated heap page(s) are not marked, should not be recycled.
+
+	* gc.c (gc_sweep): should refer latest freelist.
+
+	* gc.c (id2ref): modified to support performance patch.
+
+	* object.c (rb_obj_id): performance patch (no bignum for id).
+
+Tue Jan  5 01:56:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* config.guess: merge up-to-date from autoconf 2.12.
+
+	* array.c (rb_ary_join): avoid calling rb_protect_inspect() till
+	  it is really needed.
+
+	* object.c (rb_obj_inspect): show detailed information for the
+	  instance variables (infinite loop can avoid now).
+
+	* struct.c (rb_struct_inspect): avoid infinite loop.
+
+Sun Jan  3 01:37:58 1999  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
+
+	* misc/ruby-mode.el (ruby-end-of-defun): moved too much.
+
+	* misc/ruby-mode.el (ruby-mode-variables): set paragraph-separator
+	  for the mode.
+
+	* misc/ruby-mode.el: proper font-lock for `def' and `nil' etc.
+
+Sat Jan  2 17:09:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_jump_tag): new api to invoke JUMP_TAG.  tag values
+	  can obtained from rb_eval_string_protect()/rb_load_protect().
+
+	* eval.c (rb_rescue): now catches all exceptions but SystemExit.
+
+	* eval.c (rb_eval_string_protect): eval string with protection.
+
+	* eval.c (rb_load_protect): load file with protection.
+
+	* io.c (rb_io_puts): avoid infinite loop for cyclic arrays.
+
+	* eval.c (rb_thread_local_aref): thread local hash tables.
+
+	* object.c (rb_equal): check exact equal before calling `=='.
+
+Thu Dec 31 22:28:53 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* eval.c (rb_f_require): feature names should be provided with
+	  DLEXT extension.
+
+	* marshal.c (Init_marshal): need to provide `marshal.so'.
+
+Wed Dec 30 02:29:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (classname): do not call rb_ivar_set().
+
+	* eval.c (ruby_run): finalizers were called too early.
+
+Fri Dec 25 12:19:30 1998  Fukuda Masaki  <fukuda@wni.co.jp>
+
+	* gc.c (rb_gc_mark): should not return on FL_EXIVAR.
+
+Fri Dec 25 11:56:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (gc_mark): proper scanning for temporary region.
+
+	* eval.c (TMP_ALLOC): protection for C_ALLOCA was broken.
+
+Thu Dec 24 18:26:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* development version 1.3 released.
+
+Thu Dec 24 00:17:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_load): top self should be set properly.
+
+	* variable.c (classname): check __classpath__ iff it is defined.
+
+	* variable.c (classname): invalid warning at -v with static linked
+	  ruby interpreter.
+
+	* eval.c (is_defined): modified for expr::Const support.
+
+	* eval.c (rb_eval): invoke method expr::Const if expr is not class
+	  nor module.
+
+	* parse.y (primary): enable expr::identifier as method
+	  invocation.
+
+Wed Dec 23 03:04:36 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): avoid too many loop pops for (?:..).
+
+Tue Dec 22 18:01:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental version 1.1d1 released.
+
+Mon Dec 21 01:33:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (TMP_PROTECT): add volatile to ensure GC protection.
+
+	* string.c (rb_str_gsub_bang): calculate buffer size properly.
+
+	* parse.y (lex_get_str): needed to return Qnil at EOS.
+
+	* eval.c (find_file): check policy modified, raise exception
+	  immediately for tainted load_path.
+
+	* hash.c (rb_f_setenv): do not depend on setenv() nor putenv().
+
+Thu Dec 17 06:29:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/tk/tkutil.c (tk_s_new): use rb_obj_instance_eval(), instead
+	  of rb_yield_0().
+
+	* eval.c (rb_f_require): forgot to call find_file in some cases.
+
+	* eval.c (rb_f_require): `require "feature.so"' to load dynamic
+	  libraries.  old `require "feature.o"' is still OK.
+
+	* eval.c (rb_eval): yield without value dumped core.
+
+Wed Dec 16 16:28:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental version 1.1d0 (pre1.2) released.
+
+Wed Dec 16 10:43:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): bound check before calling re_match().
+
+Tue Dec 15 13:59:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (exc_to_s): returns class name for unset mesg.
+
+	* error.c (exc_initialize): do not initialize @mesg by "".
+
+	* parse.y (nextc): __END__ should handle CR+LF newlines.
+
+Wed Dec  9 13:37:12 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* pack.c (encodes): use buffering for B-encoding.
+
+	* pack.c (pack_pack): Q-encoding by 'M'.
+
+Tue Dec  8 14:10:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (generic_ivar_get): any object can have instance
+	  variables now.  great improvement.
+
+	* variable.c (rb_name_class): do not set __classpath__ by default,
+	  use __classid__ instead.
+
+Mon Dec  7 22:08:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.h (struct RFile): IO objects can have instance variables now.
+
+	* parse.y (primary): allows `def obj::foo; .. end'.
+
+Mon Dec  7 18:24:50 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* ruby.c (set_arg0): $0 supprt for HP-UX.
+
+Mon Dec  7 01:30:28 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* dln.c (dln_strerror): better error messages on win32.
+
+Sat Dec  5 23:27:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): indentable here-doc delimiter by
+	  `<<-'.  Proposed by Clemens <c.hintze@gmx.net>.  Thanks.
+
+Thu Dec  3 16:50:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/extmk.rb.in (realclean): trouble on install.
+
+Sun Nov 29 22:25:39 1998  Takaaki Tateishi  <ttate@jaist.ac.jp>
+
+	* process.c (f_exec): check number of argument.
+
+Thu Nov 26 17:27:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c9 released.
+
+Wed Nov 25 13:07:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_dup): do not copy additional data (STR_NO_ORIG).
+
+	* parse.y (yycompile): reduce known memory leak (hard to remove).
+
+Wed Nov 25 03:41:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* st.c (st_init_table_with_size): round size up to prime number.
+
+Sat Nov 21 23:27:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_hash_aset): reduce copying key strings.
+
+	* gc.c (looks_pointerp): declare as inline function if possible.
+
+	* st.c (PTR_NOT_EQUAL): compare hash values first before calling
+	  comparing function.
+
+	* st.c (ADD_DIRECT): save hash value in entries to reduce hash
+	  calculation.
+
+	* string.c (rb_str_gsub_bang): avoid rb_scan_args() to speed-up.
+
+	* string.c (rb_str_sub_bang): ditto.
+
+Sat Nov 21 18:44:06 1998  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
+
+	* time.c (time_s_now): had memory leak.
+
+	* ext/md5/md5init.c (md5_new): had memory leak.
+
+	* ext/md5/md5init.c (md5_clone): ditto.
+
+Fri Nov 20 23:23:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/delegate.rb: do not propagate hash and eql?.
+
+Thu Nov 19 01:40:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sample/ruby-mode.el (ruby-expr-beg): failed to find reserved
+	  word boundary.
+
+	* eval.c (rb_eval): avoid calling `concat' method.  calls
+	  rb_ary_concat() directly for efficiency.
+
+	* eval.c (rb_eval): actual rest arguments extended arrays too much.
+
+Wed Nov 18 14:30:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (rb_define_global_function): global functions now be
+	  module function of the Kernel.
+
+Wed Nov 18 10:48:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (read_all): SEGV on large files.
+
+Tue Nov 17 18:11:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c8 released.
+
+Tue Nov 17 16:58:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg): assignment to attribute name start with capital
+	  should be allowed.
+
+	* eval.c (thread_alloc): needed to mark terminated threads too.
+
+Tue Nov 17 12:33:48 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* ext/extmk.rb.in (create_makefile): Set `libdir' to `@libdir@',
+	  Set `pkglibdir' to `$libdir/$(RUBY_INSTALL_NAME)'.
+
+Tue Nov 17 10:30:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (f_sprintf): %l%%c -> %%l%c
+
+Tue Nov 17 01:08:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (ret_args): distinguish `a' and `*a' for the arguments
+	  of yield and return.
+
+	* eval.c (rb_eval): flip3 should work like sed.
+
+	* eval.c (rb_eval): flip{2,3} now have independent state for each
+	  scope to work fine with thread.
+
+Mon Nov 16 23:26:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (primary): exec else clause if no exception raised.
+
+Sun Nov 15 15:44:07 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* ext/extmk.rb.in (install): bug in target.
+
+Sat Nov 14 11:02:05 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* Makefile.in (install): Give the argument `$(DESTDIR)' to
+	`instruby.rb'.
+	* instruby.rb: Recognize ARG[0] as `destdir'.
+	* instruby.rb: Give the argument `destdir' to `extmk.rb'.
+	* ext/extmk.rb.in: Recognize ARG[1] as `$destdir'.
+
+	* instruby.rb: Create the installation directories (bindir, libdir,
+	archdir, pkglibdir, archdir, and mandir) under `destdir', and
+	install all files under there.
+	* ext/extmk.rb.in: Likewise.
+	
+Sat Nov 14 10:56:55 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* instruby.rb: Add the variable `pkglibdir'.
+	* instruby.rb: Set the variable `libdir' to `$(libdir)', not
+	`$(libdir)/$(ruby_install_name)'. `libruby.so' and `libruby.so.LIB'
+	are installed at `libdir'.
+	* instruby.rb: Set the variable `archdir' to `$(pkglibdir)/$(arch)'.
+
+Fri Nov 13 19:43:29 1998  KIMURA Koichi  <kbk@kt.rim.or.jp>
+
+	* missing/nt.c (SafeFree): wrong free offset.
+
+Thu Nov 12 20:11:53 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* sample/ruby-mode.el: wrong highlight.
+
+	* parse.y (parse_regx): newline in regexp was ignored.
+
+Wed Nov 11 10:54:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): <<'FOO' should not escape anything.
+
+	* parse.y (here_document): bare << here-doc available, even though
+	  it's deprecated.
+
+	* file.c (rb_file_s_readlink): return value should be tainted.
+
+	* ext/etc/etc.c (setup_passwd): information (eg. GCOS name) should
+	  be tainted (modified at Perl Conference).
+
+Tue Nov 10 00:22:11 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* configure.in: elf supprt for FreeBSD 3.x
+
+Tue Nov 10 00:05:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): here document available in eval.
+
+Mon Nov  9 17:55:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c7 released.
+
+Fri Nov  6 19:25:27 1998  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
+
+	* sample/ruby-mode.el: font-lock patch.
+
+Thu Nov  5 15:42:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sample/README, lib/README: simple description for each file.
+
+Wed Nov  4 18:14:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (assign): attribute assignment should be called as public.
+
+Tue Nov  3 23:36:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_dump): dumps core for negative char value.
+
+	* regex.c (re_compile_pattern): out of boundary access for empty
+	  regexp.
+
+Mon Nov  2 22:54:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_aset): `str[str]' replaces first match.
+
+Mon Nov  2 18:24:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_create): was accessing modified status.
+
+Sun Nov  1 01:18:52 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* gc.c (xrealloc): size 0 needs round up to 1.
+
+Sat Oct 31 23:18:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_split_method): negative LIMIT means number of
+	  splitted fields are unlimited, as in perl.
+
+	* string.c (rb_str_split_method): if LIMIT is unspecified,
+	  trailing null fields are stripped.
+
+Sat Oct 31 04:16:14 1998  Inaba Hiroto  <inaba@st.rim.or.jp>
+
+	* string.c (str_aref): regexp index SEGVed.
+
+Fri Oct 30 14:33:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_match): returns nil for unmatch.
+
+	* dir.c (dir_entries): new method.
+
+	* eval.c (block_pass): do not push block, substitute it.
+
+Fri Oct 30 01:28:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* range.c (range_check): avoid <=> check for Fixnums.
+
+	* array.c (rb_ary_aset): accept negative index.
+
+Wed Oct 28 22:00:54 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): access out of boundary fixed.
+
+Wed Oct 28 11:37:42 1998  TAMITO  <tommy@valley.ne.jp>
+
+	* io.c (f_select): fd number comparison bug.
+
+Tue Oct 27 23:07:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sample/ruby-mode.el (ruby-parse-region): forgot to support %w()
+	  style array literal.
+
+	* eval.c (rb_eval): unused block raises warning.
+
+Mon Oct 26 09:37:53 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (dvar_asgn_push): dvar pushed too many times if
+	  variable-in-block first appear in loops.
+
+Sun Oct 25 22:59:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (set_list_bits): was using wrong offset.
+
+Thu Oct 22 00:07:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_obj_method): method retrieved from tainted object
+	  should be tainted too.
+
+	* eval.c (method_call): safe_level should be restored during
+	  Method#call.
+
+Wed Oct 21 14:21:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (Init_IO): new constants IO::SEEK_{SET,CUR,END}.
+
+	* io.c (rb_f_ungetc): ungetc pushes a char back into STDIN.
+
+Mon Oct 19 11:50:00 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* ext/extmk.rb: Load '@top_srcdir@/lib/find.rb', not
+	'../lib/find.rb'.
+	* ext/extmk.rb: Distinguish between `top_srcdir' and `topdir'.
+	* Makefile.in (CFLAGS): Add `-I.'.
+	* Makefile.in (lex.c): Give `@srcdir@/keywords' to gperf, not
+	`keywords'.
+	* instruby.rb: Use `CONFIG["bindir"]', instead of `prefix + "/bin"'.
+	* instruby.rb: Use `CONFIG["libdir"]', instead of `prefix + "/lib"'.
+	* instruby.rb Use `CONFIG["mandir"]', instead of `prefix + "/man"'.
+	* instruby.rb (wdir): Add the variable to preserve the current
+	working directory.
+	* instruby.rb: Chdir to wdir before install `config.h' and
+	`rbconfig.rb'.
+
+Mon Oct 19 10:07:01 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* eval.c (rb_eval): reduce recursive calls to rb_eval().
+
+Fri Oct 16 15:31:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_new_internal): timeval must be positive.
+
+Thu Oct 15 13:54:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg): local variabls can be accessed within right side
+ 	  expression in assignment, notably in blocks.
+
+Wed Oct 14 00:18:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (Init_Array): Array#=== is now for equal check, not
+	  inclusion check.
+
+	* parse.y (when_args): `when a, *b' style new syntax for array
+	  expansion in `case'.
+
+Tue Oct 13 14:30:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (rb_obj_untaint): taint marks can be unset.
+
+	* eval.c (rb_eval): taint propagation for embedded strings.
+
+Mon Oct 12 13:27:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_call0): check stack depth more frequently.
+
+Mon Oct 12 08:08:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_p): can print even in secure mode.
+
+Sun Oct 11 22:50:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_const_set): taint check for modification.
+
+	* variable.c (rb_ivar_set): taint check for modification.
+
+	* string.c (rb_str_modify): taint check for modification.
+
+	* hash.c (rb_hash_modify): taint check for modification.
+
+	* array.c (rb_ary_modify): taint check for modification.
+
+	* ruby.h (FL_TAINT): taint for all objects, not only strings.
+
+Fri Oct  9 17:01:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (read_all): read() returns "" at immediate EOF.
+
+	* io.c (io_read): read(nil) read all until EOF.
+
+Thu Oct  8 13:32:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_dump): marshal can dump Time object now.
+
+	* marshal.c (Init_marshal): rename marshal methods `_dump_to' to
+ 	  `_dump', `_load_from' to `_load'.
+
+	* parse.y (rb_intern): "+=".intern generates proper symbol.
+
+Mon Oct  5 18:31:53 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c6 released.
+
+Fri Oct  2 14:22:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): `/\s*(--)$/ =~ "- --"' did not match,
+	  because of wrong optimize condition.
+
+Mon Oct  1 01:55:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (rb_intern): should not raise exceptions.
+
+	* parse.y (yylex): symbol like `:foo?=' should not be allowed.
+
+	* ext/extmk.rb.in: makes *.a for static link modules.
+
+Wed Sep 30 14:13:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_start): supports making a subclass of the
+	  Thread class.
+
+Tue Sep 29 17:46:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_join): join is now an instance method.
+
+Fri Sep 25 12:01:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): `@foo!' should be an error.
+
+Thu Sep 24 14:55:06 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* ext/etc/etc.c (Init_etc): wrong field definition.
+
+Thu Sep 17 17:09:05 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_reopen): was creating FILE* for wrong fd.
+
+Tue Sep 15 05:28:11 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* regex.c (re_compile_pattern): forgot to fixup for the pattern
+ 	  like (?=(A)|(B)).
+
+Tue Sep 15 01:06:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_gets_internal): do not set $_ by default, only
+	  gets/readline set the variable.
+
+	* eval.c (rb_f_load): load toplevel class is set to anonymous
+	  module if safe_level >= 5, to encapsulate modification.
+
+	* eval.c (rb_f_load): set frame properly.
+
+	* string.c (rb_str_each_line): do not set $_.
+
+Mon Sep 14 14:42:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): beginning and end of the string, do not
+	  automatically match `\b'.
+
+	* string.c (scan_once): comsume at leaset on character.
+
+	* regex.c (re_search): wrong behavior for negative range.
+
+Sat Sep 12 21:21:26 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* regex.c (re_search): range value should be maintained.
+
+Thu Sep 10 10:55:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (backref_error): yyerror does not understand formats.
+
+Tue Sep  8 18:05:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c5 released.
+
+Tue Sep  8 10:03:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_each_line): wrong line splitting with newline at
+ 	  top of the string.
+
+	* string.c: non bang methods return copied string.
+
+	* eval.c (f_END): needed to initialize frame->argc;
+
+Fri Sep  4 11:27:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (bigadd): proper sign combination.
+
+	* regex.c (re_search): wrong return value for \A.
+
+>>>>>>> 1.1.1.2.2.154
+Thu Sep  3 14:08:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c4 released.
+
+Tue Sep  1 10:47:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (slow_search): do not compare llen and blen.  llen may
+	  be longer than blen, if little contains 0xff.
+
+	* regex.c (mbctab_euc): set 0x8e as multibyte character.
+
+	* string.c (str_inspect): mask character for octal output.
+
+Mon Aug 31 15:32:41 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): use calculated offset if exactn is the
+	  first opcode in the compiled regexp.
+
+	* regex.c (bm_search): use Boyer-Moore search for simple search.
+
+	* regex.c (must_instr): wrong length check if pattern includes
+	  byte escape by 0xff.
+
+	* regex.c (re_compile_pattern): need not to check current_mbctype.
+
+Sat Aug 29 16:31:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_check_safe_str): avoid calling rb_id2name() in normal 
+	  cases to speed-up.
+
+	* eval.c (thread_raise): do not save context of terminated thread.
+
+	* regex.c (re_compile_pattern): mask \nnn over 256.
+
+Sat Aug 29 02:09:46 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* sprintf.c (f_sprintf): wrong buffer size check.
+
+Fri Aug 28 01:57:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
+
+Fri Aug 28 12:25:33 1998  Hiroshi Igarashi  <igarashi@ueda.info.waseda.ac.jp>
+
+	* ruby.c (ruby_require_modules): load modules in appearing order.
+
+Fri Aug 28 01:57:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
+
+Thu Aug 27 12:54:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c3 released.
+
+Wed Aug 26 14:40:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): check whether ruby_class is properly set,
+	  before accessing it.
+
+	* eval.c (rb_obj_instance_eval): ruby_class should be Qnil for
+	  special objects like Fixnums.
+
+	* ext/tkutil/tkutil.c (Init_tkutil): removes calls to
+	  rb_yield_0().  used instance_eval() instead in the tk.rb.
+
+Wed Aug 26 11:47:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): pop non-greedy stack elements on success.
+
+Wed Aug 26 09:25:35 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ruby.h: add #define environ for cygwin32.
+
+Tue Aug 25 08:57:41 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_sort_bang): temporarily freeze sorting array.
+
+Mon Aug 24 18:46:44 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* dln.c (dln_find_1): path check was too strict.
+
+Mon Aug 24 15:28:11 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* parse.y (f_arglist): opt_nl added after f_args.
+
+Fri Aug 21 01:06:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c: grand renaming on socket.c.
+
+	* ext/socket/socket.c (inet_aton): supply inet_aton for those
+	  systems that do not have it.
+
+	* ext/socket/socket.c (setipaddr): use inet_aton instead of
+	  inet_addr.
+
+	* ext/socket/socket.c (tcp_s_gethostbyname): new method: works
+	  like Socket.gethostbyname but returning array contains ip-addrs
+	  as octet decimal string format like "127.0.0.1".
+
+	* ext/socket/socket.c (mkhostent): return format changed to
+	  [host, aliases, type, ipaddr..]  as documented.
+
+Wed Aug 19 00:31:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_ctl): forgot to place TRAP_END at right position.
+
+Fri Aug 14 11:01:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (call_trace_func): save __FILE__, __LINE__ before
+ 	  executing trace_func, since trace function should not corrupt
+ 	  line number information.
+
+Thu Aug 13 15:09:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_s_new): was marking unallocated region on GC.
+
+Tue Aug 11 11:57:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c2 released.
+
+Mon Aug 10 14:05:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* process.c (f_system): removed fflush(stdin).
+
+Fri Aug  7 17:44:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (err_snprintf): replace sprintf for fixed sized buffer,
+ 	  with snprintf to avoid buffer over-run.  For systems which does
+	  dot provide snprintf, missing/snprintf.c added.
+
+Wed Aug  5 00:47:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_search): recycle match object.
+
+Mon Aug  3 09:17:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_gsub_bang): do not allocate temporary string.
+
+	* string.c (rb_str_sub_bang): use inline replace.
+
+Wed Jul 29 00:36:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (hash_s_new): the default value can be specified.
+
+	* hash.c (hash_default): method to set the default value.
+
+	* hash.c (hash_aref): now returns the default value.
+
+Tue Jul 28 13:03:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_s_new): argument to specify initial value is added.
+
+	* array.c (ary_s_new): specifies size, not capacity.
+
+Mon Jul 27 12:39:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_replace): zero fill for expansion gap.
+
+	* regex.c (mbctab_euc): set flags on for 0xA1-0xFE.  suggested by
+	  <inaba@st.rim.or.jp>.
+
+	* string.c (str_inspect): consider current_mbctype.
+
+Sun Jul 26 15:37:11 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* array.c (ary_s_new): Array.new(1<<30) dumps core.
+
+Fri Jul 24 13:40:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c1 released.
+
+Fri Jul 24 02:10:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (r_bytes2): allocated buffer size was too short.
+
+	* marshal.c (w_object): saves all options, not only casefold flag.
+
+	* re.c (reg_clone): now copies options properly.
+
+	* re.c (reg_get_kcode): code number was wrong.
+
+Thu Jul 23 13:11:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_attr): argument should be symbol or string.
+
+Wed Jul 22 11:59:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (calculate_must_string): wrong offset added.
+
+Wed Jul 22 11:59:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* st.c (rehash): still had a GC problem.  fixed.
+
+Tue Jul 21 13:19:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (gc_mark_threads): crashed on GC before thread allocation.
+
+	* st.c (rehash): GC during rehash caused SEGV.
+
+Tue Jul 21 01:25:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (f_sprintf): integer formatter totally re-written.
+
+	* sprintf.c (remove_sign_bits): support uppercase hexadecimal.
+
+Sat Jul 18 00:14:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (f_sprintf): proper sign position for %X and %O.
+
+Fri Jul 17 14:10:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c0 released.
+
+Fri Jul 17 08:01:49 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* process.c (f_exec): Check_SafeStr() added.
+
+	* process.c (f_system): Check_SafeStr() moved before fork().
+
+Thu Jul 16 22:58:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (scan_once): substrings to the block should not be
+ 	  tainted.  use reg_nth_match(), not str_substr().
+
+	* string.c (str_substr): needed to transfer taint.
+
+Thu Jul 16 16:15:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (xmalloc): object allocation count added to GC trigger.
+
+	* eval.c (thread_save_context): avoid marking uninitialized stack
+	  in thread_mark.  GC may be triggered by REALLOC_N().
+
+Wed Jul 15 15:11:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_31.
+
+Wed Jul 15 15:05:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_create): exit() and abort() in threads now
+ 	  forwarded to main_thread.
+
+Tue Jul 14 14:03:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (obj_instance_variables): list names that is not
+	  instance variables.
+
+	* gc.c (GC_MALLOC_LIMIT): choose smaller limit value.
+
+Mon Jul 13 12:39:38 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (str2cstr): should not return NULL.
+
+Fri Jul 10 11:51:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (gettable): needed to add dyna_in_block() check.
+
+Thu Jul  9 17:38:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_30.
+
+Thu Jul  9 16:01:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (fmt_setup): format specifier for long needed.
+
+	* sprintf.c (f_sprintf): ditto.
+
+	* numeric.c (fix2str): ditto.
+
+	* eval.c (thread_create): no more ITIMER_REAL.
+
+	* eval.c (thread_create): thread finalization needed before
+	  aborting thread if thread_abort is set.
+
+Wed Jul  8 18:17:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (big_pow): abandon power by bignum (too big).
+
+Tue Jul  7 13:58:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_catch): add C level catch/throw feature.
+
+Mon Jul  6 15:18:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg): proper return values for `||=' and `&&='.
+
+Fri Jul  3 16:05:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_29.
+
+Fri Jul  3 11:20:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (r_byte): byte should not extend sign bit.
+
+	* numeric.c (fix_mul): use FIX2LONG() instead of FIX2INT() for
+	  64bit architectures.
+
+	* marshal.c (r_bytes): remove weird casting bwetween pointer and int.
+
+	* process.c (proc_setsid): new method Process#setsid().
+
+Thu Jul  2 12:49:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (w_object): remove `write_bignum' label for 64bit
+ 	  architectures.
+
+	* marshal.c (r_bytes): needs int, not long.
+
+Wed Jul  1 14:21:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (flo_plus): should not allow addition with strings.
+
+Wed Jul  1 13:09:01 1998  Keiju ISHITSUKA  <keiju@rational.com>
+
+	* numeric.c (num_uminus): wrong coerce direction.
+
+Tue Jun 30 10:13:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (f_p): accepts arbitrary number of arguments.
+
+	* eval.c (rb_yield_0): there's some case that iterator_p() returns 
+	  true even if the_block was not set.  check added.
+
+Tue Jun 30 01:05:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (BEGIN_CALLARGS): adjust the_block before evaluating the
+	  receiver's value and the arguments.
+
+Fri Jun 26 18:02:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_28.
+
+Fri Jun 26 11:01:26 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* string.c (str_aset_method): needed to convert to string.
+
+Thu Jun 25 02:05:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): optimize for `.*' at beginning of the
+	  pattern.
+
+	* regex.c (re_search): optimize for character class repeat at
+	  beginning of the pattern.
+
+	* regex.c (re_compile_pattern): detect optimization potential for
+	  the compiled patterns.
+
+Thu Jun 25 00:02:26 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* re.c (reg_s_new): flag value was wrong.
+
+Wed Jun 24 23:45:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): wrong anchor handling for reverse search.
+
+Wed Jun 24 02:18:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (mlhs): `((a,b)),c = [[1,2]],3' assigns a=1,b=2,c=3.
+
+Tue Jun 23 11:46:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): `&&=' and `||=' added.
+
+Sat Jun 20 02:53:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (assignable): nesting local variables should have higher
+ 	  priority than normal local variables for assignment too.
+
+Fri Jun 19 18:28:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_27.
+
+Fri Jun 19 14:34:49 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (assign): support hack for nested multiple assignment.
+
+	* parse.y (mlhs): nested multiple assignment.
+
+	* eval.c (rb_eval): in-block variables now honors static scope.
+
+	* configure.in: RSHIFT check moved to configure.
+
+Thu Jun 18 16:46:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_26.
+
+Thu Jun 18 13:37:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (file_s_ftype): uses lstat(2) instead of stat(2).
+
+	* dir.c (dir_s_glob): there can be buffer overrun, check added.
+
+	* eval.c (f_binding): handles in-block variables declared after
+	  binding's generation.
+
+	* numeric.c (flo_floor): floor, ceil, round added to Float.
+
+Wed Jun 17 11:20:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (gettable): nesting local variables should have higher
+ 	  priority than normal local variables.
+
+Tue Jun 16 12:30:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (str2inum): handles `+ddd'.
+
+	* struct.c (make_struct): name parameter can be nil for unnamed
+	  structures.
+
+Mon Jun 15 16:30:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (class_s_inherited): prohibiting to make subclass of
+	  class Class.
+
+	* object.c (module_s_new): support for making subclass of Module.
+
+	* parse.y (yycompile): clear eval_tree before compiling.
+
+Fri Jun 12 17:58:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (eval): write back the_dyna_var into the block.
+
+Thu Jun 11 18:19:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_25.
+
+	* eval.c (dvar_add_compiling): register dyna_var at compile time.
+
+	* regex.c (re_compile_pattern): RE_DUP_MAX iteration is too big.
+
+Wed Jun 10 15:12:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_eof): do not block other threads.
+
+	* signal.c (trap): reserve SIGALRM for thread.
+
+	* eval.c (thread_create): use ITIMER_REAL also to avoid system
+	  call blocking.
+
+	* io.c (f_syscall): add TRAP_BEG, TRAP_END around system calls.
+
+	* io.c (io_ctl): add TRAP_BEG, TRAP_END around system calls.
+
+	* enum.c (enum_collect): did not collect false values.
+
+	* array.c (ary_new2): forgot to initialize capa field.
+
+Tue Jun  9 18:36:15 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* string.c (str_split_method): split dumped core for "\xff".
+
+Tue Jun  9 16:22:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_24.
+
+Tue Jun  9 16:04:07 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/kconv/kconv.c (kconv_guess): more precise decision for EUC,
+	  using jless algorithm (3 sequential EUC hiragana characters).
+
+Tue Jun  9 15:12:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/kconv/kconv.c (kconv_guess): wrong guess for EUC as SJIS in
+	  some cases (0xe0 - 0xef).
+
+	* gc.c (xmalloc): insert size check for big (negative in signed)
+	  allocation size.
+
+Tue Jun  9 02:54:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/parsedate.rb: wday moved to the last in the return values.
+
+Mon Jun  8 10:40:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_split_method): split dumped core for "\0".
+
+Sat Jun  6 22:50:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (calculate_must_string): wrong condition for
+	  {start,stop}_nowidth.
+
+	* regex.c (re_match): various features imported from GNU regex.c
+ 	  0.12, such as nested grouping, avoiding infinite loop with empty
+ 	  match, etc.
+
+	* regex.c (register_info_type): now use union.
+
+	* regex.c (re_search): more precise anchor(^) check.
+
+Wed Jun  3 18:07:54 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_raise): check rb_in_compile, not rb_in_eval.
+
+Mon Jun  1 05:26:06 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* string.c (trnext): casting to signed char* needed.
+
+Tue Jun  2 16:00:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (udp_addrsetup): error check enhanced.
+
+	* ext/socket/socket.c (sock_s_getservbyaname): use strtoul(), if
+	  possible.
+
+Sat May 30 07:10:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_prepare_re): no more needless regular expression
+ 	  recompile on casefold conditions.
+
+Thu May 28 18:02:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (nil_plus): no more `+' method for nil.
+
+Wed May 27 17:33:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (hash_fetch): new method.
+
+	* regex.c (re_search): check whether translate table is set.
+
+Tue May 26 11:39:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_23.
+
+	* parse.y (yylex): no UPLUS/UMINUS for 1st argument if
+	  parenthesises are omitted.
+
+Tue May 26 01:09:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): (?XI) for turns off the
+	  corresponding option.
+
+Mon May 25 12:38:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): inline i option (?i).
+
+	* regex.c (re_compile_pattern): inline x option (?x).
+
+	* regex.c (re_compile_pattern): x option for regexp.
+
+	* dir.c (dir_s_open): returns block's evaluated value.
+
+	* io.c (f_open): returns block's evaluated value.
+
+	* ext/curses/curses.c (curses_addstr): nil argument caused SEGV.
+
+Fri May 22 11:52:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): push mark on (?:), so that
+	  laststart check for {a,b} can be done.
+
+Thu May 21 17:31:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): wrong match (too non-greedy) for `{a,b}?'.
+
+	* io.c (io_lineno): new method IO#lineno, IO#lineno=.
+
+Wed May 20 06:04:43 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* BeOS patch.
+
+Wed May 20 16:32:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (BIGDN): use RSHIFT(), instead of mere `>>'.
+
+Tue May 19 16:36:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_22.
+
+Tue May 19 16:31:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (assignable): specification changed for in-block
+ 	  variable definition.
+
+	* eval.c (dyna_var_asgn): error in in-block variables' compile
+ 	  time definition.
+
+	* parse.y (str_extend): wrong nesting detection.
+
+Tue May 19 09:47:55 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* numeric.c (num2int): re-defined (extensions may use this).
+
+Mon May 18 16:40:50 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* error.c (get_syserr): BeOS support.
+
+	* configure.in: modified for BeOS.
+
+	* string.c (str_dump): do not call isascii().
+
+	* sprintf.c (remove_sign_bits): forgot to initialize end pointer.
+
+	* glob.c: #include <alloca.h> added.
+
+Mon May 18 14:52:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+	
+	* experimental release 1.1b9_21.
+
+Mon May 18 03:27:57 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* file.c (file_s_expand_path): optional second argument
+	  `default_directory' added.
+
+Sat May 16 22:06:52 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* error.c (RAISE_ERROR): wrong error message
+
+Fri May 15 14:43:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_20.
+
+Thu May 14 14:44:21 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* sun4 cc patches for intern.h and regex.h.
+
+Thu May 14 14:03:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* random.c (RANDOM_MAX): guessing proper maximum value for random
+ 	  numbers.
+
+	* random.c (f_rand): use drand48 if possible.
+
+Wed May 13 19:05:20 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* BeOS patches for io.c, error.c and config.guess.
+
+Wed May 13 14:56:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_19.
+
+	* most of the Mac and BeOS patches merged, except path separators.
+
+	* error.c (err_append): generated SyntaxError was String.
+
+	* ruby.h: xxx2INT, xxx2UINT checks values as int, not long.
+
+	* ruby.h: remove typedef's. INT, UINT, UCHAR, USHORT.
+
+Tue May 12 17:38:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_18.
+
+Tue May 12 11:38:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (syserr_errno): returns errno of the SystemCallError.
+
+	* error.c (rb_sys_fail): saves errno in the Exception.
+
+	* error.c (set_syserr): no need to protect syserr_list.
+
+	* error.c (rb_sys_fail): no more bufsize limit.
+
+	* error.c (set_syserr): integer value of errno can be accessed by
+	  Errno::EXXX::Errno.
+
+Sun May 10 03:10:33 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* io.c (io_tell etc.): moved from File class to IO class.
+
+Fri May  8 12:26:37 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (pack_unpack): should be unsigned int (was signed int).
+
+Thu May  7 16:34:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (pack_pack): `V', `N' uses newly created NUM2UINT().
+
+	* ruby.h (NUM2UINT): new macro.
+
+	* bignum.c (big2uint): try to convert bignum into UINT.
+
+	* re.c (reg_match): needed to return false for match with nil.
+
+	* gc.c (obj_free): wrong condition to free string.
+
+Wed May  6 21:08:08 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ruby.c (ruby_process_options): modified for DJGPP.
+
+Wed May  6 15:48:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_17.
+
+Wed May  6 01:37:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c: remove global variable `errat'.
+
+	* eval.c (rb_longjmp): embed error position information in the
+ 	  exception object.
+
+Sat May  2 12:20:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_search): supports reverse search.
+
+	* string.c (str_index_method): does update $~ etc.
+
+	* eval.c (f_load): needed to clear the_dyna_vars.
+
+	* eval.c (dyna_var_asgn): do not push dyna_var, which is id == 0.
+
+	* error.c (Init_Exception): NotImplementError is no longer
+	  StandardError, which is not handled by default rescue.
+
+Fri May  1 00:35:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (proc_options): `-d' turns on verbose flag too.
+
+	* error.c (exception): last argument may be the superclass of the
+	  defining exception(s).
+
+	* io.c (Init_IO): EOFError is now subclass of the IOError.
+
+	* io.c (Init_IO): forgot to define IOError.
+
+	* error.c (Init_Exception): old Exception class renamed to
+	  StandardError.  Exception now replaces old GlobalExit.
+
+	* error.c (Init_Exception): Exception is now the root of the
+	  Global Exits.  There's no longer GlobalExit class.
+
+	* util.c (ruby_mktemp): check TMP, TMPDIR first.
+
+Thu Apr 30 01:08:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/tk.rb: call 'unknown', if proc not defined.
+
+	* eval.c (handle_rescue): default rescue handles `Exceptional' not 
+	  only the instance of the `Exception's.
+
+	* eval.c (f_raise): exception can be any object.
+
+	* time.c (time_gm_or_local): call time_gmtime or time_localtime.
+
+	* eval.c (f_raise): raises TypeError if the class which is not a
+	  subclass of String is specified (checked in exc_new()).
+
+	* error.c (exc_new): need to check whether invalid class (not a
+	  subclass of String) is specified.
+
+Wed Apr 29 21:05:44 1998  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ruby.c (proc_options): option '-e' via tempfile.
+
+Tue Apr 28 15:27:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_16.
+
+Tue Apr 28 00:07:38 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (obj_is_proc): type check predicate.
+
+	* eval.c (obj_is_block): ditto.
+
+Mon Apr 27 16:59:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/gtk/gtk.c (Init_gtk): use timeout, not idle to avoid
+	  comsuming CPU too much.
+
+	* lib/tk.rb: use tcltklib#_invoke instead of `_eval'.
+
+Mon Apr 27 16:59:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_sort): use dup, not clone.
+
+Mon Apr 27 13:46:27 1998  Tadahiro Maebashi  <maebashi@iij.ad.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_invoke): invoke tcl command
+	  directly.  need not worry about escaping tcl characters.
+
+Mon Apr 27 12:04:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* random.c (f_rand): do not call srand() implicitly.
+
+Fri Apr 24 14:35:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_15.
+
+	* parse.y (assignable): dyna_var_asgn actually defines nested
+	  local variables in outer context.
+
+	* random.c (f_rand): call srand(), if it has not called yet.
+
+	* random.c (f_srand): use tv_usec as the default seed.
+
+	* eval.c (rb_eval): values of nested local variables should be
+ 	  independent.
+
+	* eval.c (rb_yield_0): local variables wrong nested conditions.
+
+Wed Apr 22 23:27:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (select_get_io): get IO object by `to_io'.
+
+	* io.c (io_to_io): method to retrieve IO object, from delegating
+ 	  object for example.
+
+Wed Apr 22 16:52:37 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_14.
+
+	* string.c (str_modify): check for embedded pointer reference.
+
+	* gc.c (obj_free): ditto.
+
+	* pack.c (pack_pack): p/P template to embed pointers.
+
+Wed Apr 22 00:07:10 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* array.c (ary_rindex): embarrassing typo.
+
+Tue Apr 21 12:31:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_13.
+
+	* configure.in (RUBY_LIB): supports --program-{prefix,suffix}.
+
+	* array.c (ary_rindex): new method.
+
+	* io.c (io_binmode): should return self.
+
+Tue Apr 21 08:23:04 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* parse.y (here_document): calling parse_string with wrong
+	  arguments.
+
+	* struct.c (struct_aset): problem member assignment with name.
+
+Mon Apr 20 14:47:49 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_12.
+
+	* time.c (time_arg): args may be string (support for reduced
+	  implicit type conversion).
+
+	* lib/base64.rb: changed to use pack/unpack with `m' template.
+
+Mon Apr 20 06:23:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (mod_remove_const): new method.
+
+Sat Apr 18 03:53:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (hash_each_with_index): removed.  use Enumerable's
+	  each_with_index instead.
+
+	* class.c (rb_include_module): check for super modules, since
+ 	  module's included modules may be changed.
+
+Fri Apr 17 21:50:47 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* marshal.c (r_long): r_byte() may return signed byte.
+
+Fri Apr 17 11:58:30 1998  NAGAI Hidetoshi  <nagai@dumbo.ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (lib_mainloop): thread and interrupt check.
+
+Fri Apr 17 11:06:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (find_file): try to fopen() to check whether file exists.
+
+	* ruby.c (load_file): ditto.
+
+	* struct.c (struct_aset): struct member can be set by member name.
+
+Fri Apr 17 00:47:19 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/extmk.rb.in: added m68k-human support
+
+	* file.c (LOCK_SH): defines moved.
+
+	* array.c (ary_flatten_bang): simplified loop.
+
+Thu Apr 16 16:52:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_11.
+
+	* lib/tk.rb: thread support (experimental - maybe slow).
+
+	* eval.c (rb_longjmp): trace event on exception in raising
+ 	  context, just before raising exception.
+
+	* struct.c (struct_s_members): forgot to check singletons.
+
+	* struct.c (struct_aref): members can be accessed by names too.
+
+	* array.c (ary_flatten): new method.
+
+	* eval.c (rb_longjmp): prints exception information with `-d'.
+
+	* object.c (any_to_s): remove class name restriction.
+
+Thu Apr 16 01:38:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (thread_flock): do not block other threads.
+
+	* eval.c (thread_trap_eval): signals are now delivered to the
+ 	  current thread again.  In case that the current thread is dead,
+ 	  signals are forwarded to the main thread.
+
+	* string.c (str_new4): need not to duplicate frozen strings.
+
+Wed Apr 15 08:33:47 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* struct.c (struct_inspect): remove restriction for struct names.
+
+Wed Apr 15 02:55:02 1998  Kazuya 'Sharl' Masuda  <sharl@www.ufo.co.jp>
+
+	* x68 patches to config.sub, ext/extmk.rb.in
+
+Wed Apr 15 01:22:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_dup_frozen): do not duplicate frozen strings.
+
+	* parse.y (yylex): allow nested parenthesises.
+
+	* io.c (obj_displayln): prints newline after `display'ing the
+	  receiver.
+
+	* io.c (io_puts): avoid generating "\n" each time.  use RS_default
+ 	  instead.
+
+	* io.c (f_p): ditto.
+
+Tue Apr 14 22:18:17 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* struct.c (struct_aref): should not subtract negative index.
+
+Tue Apr 14 11:34:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_10.
+
+	* parse.y: token names prefixed by `t'.
+
+	* struct.c (struct_s_def): supports subclassing of Struct.
+
+	* io.c (io_s_new): supports subclassing of IO.
+
+Mon Apr 13 11:07:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (f_binding): need to restore method name.
+
+	* eval.c (rb_call0): raises SystemStackError, not Fatal.
+
+	* io.c (obj_display): same as `print self'.
+
+	* io.c (f_p): can now be called in the method form.
+
+	* re.c (reg_regsub): needed to be mbchar aware.
+
+Mon Apr 13 13:18:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_trap_eval): all signals delivered to main_thread.
+
+Mon Apr 13 12:47:03 1998  TAKAHASHI Masayoshi  <maki@inac.co.jp>
+
+	* re.c (kcode_set_option): did not set SJIS on SJIS condition.
+
+Sun Apr 12 22:14:07 1998  Kazunori NISHI  <kazunori@swlab.csce.kyushu-u.ac.jp>
+
+	* array.c (ary_uniq_bang): should be `==', not `='. embarrassing.
+
+Sat Apr 11 02:13:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_subseq): SEGVed for `[][1,1]'.
+
+Fri Apr 10 21:29:06 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* array.c (ary_subseq): add check for beg larger than array length.
+
+Wed Apr  8 17:24:11 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* dir.c (dir_s_open): can be called with block (like IO#open).
+
+	* dir.c (dir_s_chdir): print directory path on error.
+
+	* dir.c (dir_s_chroot): ditto
+
+	* dir.c (Init_Dir): needed to override `new'.
+
+Thu Apr  9 18:24:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_09.
+
+	* string.c (str_cmp): do not depend on sentinel at the end of the
+	  strings. 
+
+	* string.c (str_chomp_bang): forgot to set the sentinel.
+
+Wed Apr  8 00:59:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (big2int): converted int may be too big to fit in
+	  signed int.
+
+	* parse.y (arg): `foo += 1' should not cause an error.
+
+	* variable.c (rb_const_defined): returned false even if the
+	  constant is defined at the top level.
+
+	* eval.c (f_local_variables): dyna_var->id may be null.  should
+	  have checked before calling str_new2().
+
+Tue Apr  7 01:15:15 1998  Kaneko Naoshi  <wbs01621@mail.wbs.or.jp>
+
+	* re.c (reg_regsub): need to check string boundary.
+
+Tue Apr  7 19:19:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_cmp): returns either 1, 0, -1.
+
+	* array.c (ary_cmp): should check array length, too
+
+Tue Apr  7 18:50:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_08.
+
+Tue Apr  7 18:31:27 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* instruby.rb (mandir): dll installation for cygwin32
+
+Tue Apr  7 01:16:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* config.sub (maybe_os): TOWNS support?
+
+	* config.guess: too strict check for libc versions on linuxes.
+
+	* experimental release 1.1b9_07.
+
+	* array.c (ary_cmp): compare each element using `<=>'.
+
+	* hash.c (hash_each_with_index): yields [value, key] pair.
+
+	* class.c (class_protected_instance_methods): list protected
+	  method names.
+
+	* class.c (ins_methods_i): exclude protected methods.
+
+	* eval.c (PUSH_BLOCK): dynamic variables can be accessed from
+ 	  eval() with bindings.
+
+Mon Apr  6 14:49:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_yield): must return evaluated value.
+
+Fri Apr  3 13:07:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_schedule): context switch bypassed on wrong
+	  conditions.
+
+	* variable.c (rb_name_class): set classname by id before String
+ 	  class is initialized (1.0 behavior restored).
+
+Fri Apr  3 11:25:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (num2int): no implicit conversion from string.
+
+	* numeric.c (num2int): check whether `to_i' returns an Integer.
+
+	* numeric.c (num_zero_p): new method.
+
+	* numeric.c (num_nonzero_p): new method.  returns the receiver if
+ 	  it's not zero.
+
+	* eval.c (obj_instance_eval): the_class should be the object's
+	  singleton class.
+
+	* error.c (exc_s_new): message is converted into a string.
+
+Thu Apr  2 18:31:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (obj_call_init): every object call `initialize'.
+
+Wed Apr  1 08:51:53 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* parse.y (stmt): UNTIL_MOD should be for stmt, not only for expr.
+
+Wed Apr  1 01:20:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (true_and): boolean operators &, | and ^.
+
+Tue Mar 31 13:23:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_compact_bang): returns nil, if it does not modify
+	  the array like String's bang methods.
+
+	* array.c (ary_uniq_bang): new method to remove duplicate items.
+
+	* eval.c (bind_s_new): new method.
+
+	* numeric.c (num2int): raise exception if Fixnums too big to
+ 	  convert into `int' in case that sizeof(int) < sizeof(INT).
+
+	* string.c (str_center): SEGV on negative width.
+
+	* eval.c (eval): forgot to set sourcefile.
+
+Mon Mar 30 11:12:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (f_test): raises exception for unkown command.
+
+	* eval.c (Init_eval): `class_eval': alias to the module_eval.
+
+Mon Mar 30 18:50:42 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* string.c (str_capitalize_bang): did not check string modification.
+
+	* string.c (str_delete_bang): wrong conversion.
+
+	* string.c (str_intern): typo in error message.
+
+Mon Mar 30 01:44:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (obj_instance_eval): accepts block as evaluation body.
+	  No compilation needed each time.
+
+	* eval.c (mod_module_eval): ditto
+
+	* file.c (file_s_umask): umask did not return old values, if no
+ 	  argument given.
+
+Sun Mar 29 00:54:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (f_throw): nil returned always.
+
+Sat Mar 28 20:40:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_06.
+
+Sat Mar 28 16:07:11 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* io.c (io_closed): should not cause exception fot closed IO.
+
+	* string.c (str_tr): returned nil for success.
+
+Sat Mar 28 00:47:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (f_local_variables): new method to return an array of
+ 	  local variable names.
+
+	* variable.c (obj_instance_variables): now returns an array of
+	  variable names, as described in the reference.
+
+	* eval.c (rb_attr): honors default method visibility of the
+	  current scope.
+
+Fri Mar 27 13:49:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_05.
+
+	* ruby.c (ruby_prog_init): `site_ruby' added to load_path.
+
+	* ruby.c (ruby_prog_init): load-path order changed.  Paths in
+ 	  the RUBYLIB environment variable comes first in non-tainted
+ 	  mode.
+
+Thu Mar 26 11:51:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_call): new feature: `protected' methods.
+
+	* string.c (str_dump): new method.
+
+	* eval.c (block_pass): block argument can be nil, which means no
+	  block is supplied for the method.
+
+Wed Mar 25 21:20:13 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* string.c (str_reverse_bang): string copied to wrong place.
+
+Wed Mar 25 08:12:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (flo_modulo): caused SEGV if left operand is not a
+ 	  float value.
+
+	* eval.c (f_eval): optional third and fourth argument to specify
+	  file-name and line-number.
+
+	* eval.c (eval): file-name and line-number set properly.
+
+	* parse.y (assign_in_cond): literal assignment is now warning, not 
+	  compile error.
+
+	* error.c (Warn): Warn() always print message, OTOH Waring()
+	  prints when verbose flag is set.
+
+Tue Mar 24 12:50:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (ruby_prog_init): `.' should come last in the load-path.
+
+	* eval.c (Init_eval): `__send__', alias for `send'.
+
+Mon Mar 23 12:44:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_chomp_bang): now takes `rs' as an argument.
+
+	* eval.c (thread_free): main_thread should not be freed.
+
+Fri Mar 20 16:40:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_chomp_bang): chomp! (and other ! methods) returns
+ 	  nil if it does not modify the string.
+
+	* string.c (str_sub_iter_s): should check last pattern since it
+ 	  may be matched to null.
+
+Thu Mar 19 13:48:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_04.
+
+	* parse.y (yylex): `10e0.9' should cause syntax error.
+
+Wed Mar 18 17:46:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (load_file): new file object constant DATA.  Only
+	  available for the script from the file.
+
+	* regex.c (re_match): forwading failure point popped too much. 
+
+Tue Mar 17 18:23:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* math.c (math_frexp): newly added.
+
+	* math.c (math_ldexp): ditto.
+
+	* bignum.c (bigdivmod): calculates modulo.
+
+	* numeric.c (fix_remainder): returns reminder, formerly introduced
+ 	  as modulo.
+
+	* numeric.c (fix_modulo): calculates proper `modulo'.
+
+	* bignum.c (bigdivmod): wrong sign for reminder.
+
+Mon Mar 16 17:07:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_03.
+
+Mon Mar 16 16:33:53 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* io.c (pipe_finalize): needed to add pipe_finalize to pipes on
+	  cygwin32.
+
+Mon Mar 16 14:11:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (ins_methods_i): needed to consider NOEX_UNDEF.
+
+Mon Mar 16 13:23:53 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* io.c (io_check_closed): check for `fptr->f2 == NULL'.
+
+	* io.c (io_fptr_close): ditto.
+
+Mon Mar 16 11:49:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (pipe_atexit): free()ing referencing pipe_list.
+
+	* range.c (range_length): returns zero, if the first is greater
+	  than the last.
+
+	* signal.c (trap_restore_mask): restore signal mask before raising 
+	  exceptions and throws.
+
+Fri Mar 13 13:49:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_02.
+
+	* object.c (mod_clone): need to dups constants and instance
+	  variables.
+
+	* eval.c (rb_eval): forgot to initialize body for NODE_DEFS.
+
+	* eval.c (rb_eval): retrieve self from calling frame, since self
+	  changes sometimes.
+
+	* env.h (FRAME): need to save self in the calling frame.
+
+	* io.c (f_gets_method): rs should be initialized by RS.
+
+Thu Mar 12 15:33:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_01.
+
+	* range.c (range_s_new): check values by `first <= last'.
+
+	* parse.y (lastline_set): fixed offset for $_ and $~ in the local
+	  variable space.
+
+Wed Mar 11 02:14:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_gets): handle normal case specially for speed.
+
+	* eval.c (rb_disable_super): function to disable superclass's
+	  method explicitly.
+
+	* eval.c (rb_eval): inherits previous method definition's
+	  NOEX_UNDEF-ness, if exists.
+
+	* class.c (rb_define_method): disables superclass's overriding
+ 	  method by default.
+
+Wed Mar 11 01:40:48 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* numeric.c (flo_gt,etc.): do not depend on `<=>', to handle NaN.
+
+Tue Mar 10 00:03:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (load_file): understands multiple options in #! line.
+
+	* regex.c (re_compile_pattern): support for [:alpha:] etc.
+
+Mon Mar  9 16:53:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.h (GetOpenFile): embed io_check_closed in GetOpenFile.
+
+	* sprintf.c (f_sprintf): zero padding failed for negative
+	  integers.
+
+	* sprintf.c (remove_sign_bits): failed to remove some bits.
+
+Sat Mar  7 21:51:46 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* class.c (ins_methods_i): body may be NULL for some case.
+
+Fri Mar  6 17:23:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (mbcinit): table driven mbchar detection.
+
+	* object.c (obj_alloc): check for allocating instance for the
+	  primitive classes (mostly perfect).
+
+	* ext/curses/curses.c (curses_finalize): restore original state at 
+	  interpreter temination.
+
+	* ext/curses/curses.c (curses_addstr): forgot to check argument
+	  type (caused SEGV).  now uses STR2CSTR() macro.
+
+Thu Mar  5 13:47:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (block_pass): accepts method object as block args.
+
+	* eval.c (f_missing): use any_to_s() for stringify.
+
+Wed Mar  4 01:39:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (block_arg): new syntax - block argument in the
+	  calling arglist.
+
+	* eval.c (rb_call): no module search. simplified a lot.
+
+	* eval.c (rb_eval): block arg support.
+
+	* parse.y (f_block_arg): new syntax - block argument in the
+ 	  formal arglist.
+
+Tue Mar  3 14:20:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (obj_method): returns bound method object.
+
+	* eval.c (rb_call): argument check for empty methods.
+
+	* ruby.h (NUM2CHR): new macro, originally from curses module.
+
+Tue Mar  3 13:03:35 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* io.c (io_putc): new method.
+
+Tue Mar  3 11:21:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_inspect): more strict charcode detection.
+
+	* eval.c (thread_stop): stopping only thread raises ThreadError
+	  exception.
+
+Tue Mar  3 08:04:56 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* struct.c (struct_alloc): imcomplete struct initialization made
+ 	  GC to access unallocated addresses.
+
+Mon Mar  2 16:28:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_stop_method): remove Thread#stop.
+
+Fri Feb 27 18:16:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b9 released.
+
+Fri Feb 27 09:36:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (hash_delete_nil): needed to compare value to nil, since
+	  nil is the valid key for hashes.
+
+	* hash.c (hash_foreach_iter): rehashing causes IndexError.
+
+	* hash.c (hash_foreach_iter): rehash check by pointer comparison.
+
+Thu Feb 26 17:22:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (fname): convert reswords into symbols.
+
+	* parse.y (reswords): reserved words are now embedded in the
+ 	  syntax (sigh).
+
+	* parse.y: now reserved words can be method names safely.
+
+Wed Feb 25 15:50:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (mod_module_eval): clear the_scope's PRIVATE flag before
+	  calling eval().
+
+	* gc.c (gc_call_finalizer_at_exit): run finalizers before any data 
+	  object being freed.
+
+	* eval.c (rb_eval): needed to keep prot_tag->retval before
+	  evaluating the ensure clause.
+
+Tue Feb 24 11:16:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): reserved words can be appear as method names at
+ 	  right after 'def' and `.'(dot), like foo.next.
+
+	* eval.c (return_check): checks for return out of thread (formerly
+ 	  done in return_value).
+
+	* eval.c (POP_TAG): copy retval to outer level.
+
+	* eval.c (return_value): just set retval, no check, no unwinding.
+
+	* parse.y (nextc): line continuation by backslash at end of line.
+
+	* regex.c (re_compile_pattern): forgot to clear pending_exact on
+	  closing parentheses.
+
+	* parse.y (assignable): should not assign dyna_var to true, if it
+ 	  is already defined.
+
+Mon Feb 23 14:35:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (obj_is_kind_of): no longer accepts true/false/nil.
+
+	* object.c ({true,false,nil}_to_i): can be converted into integers.
+
+Mon Feb 23 12:11:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_s_quote): needed to be mbchar aware.
+
+	* eval.c (proc_s_new): wrong iter mark.
+
+Sat Feb 21 22:59:30 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* io.c (f_syscall): no argument check.
+
+Fri Feb 20 10:17:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b8 released.
+
+	* ext/kconv/kconv.c (kconv_kconv): default output code now be
+	  determined according to the value of $KCODE.
+
+	* re.c (rb_get_kcode): can retrieve $KCODE from C code. 
+
+	* parse.y (stmt): if/unless modifiers returns nil, if condition is 
+	  not established.
+
+Thu Feb 19 11:06:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/kconv/kconv.c (kconv_kconv): charcode can be specified by
+	  code name (JIS, SJIS, EUC like value of $KCODE).
+
+	* regex.c (re_compile_pattern): forgot to fixup_jump for (?:..).
+
+	* regex.c (re_compile_pattern): needed to clear pending_exact on
+	  non-registering grouping (?:...).
+
+Wed Feb 18 19:54:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): needed to set lex_state to EXPR_END.
+
+Wed Feb 18 18:45:10 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* patches for cygwin32 applied.
+
+Wed Feb 18 00:41:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_sub_s): needed to be mbchar aware to increment one
+ 	  character.
+
+	* regex.c (re_match): \Z matches newline just before the end of
+	  the string.
+
+Tue Feb 17 00:04:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_arg): Time.gm and Time.local now understands
+ 	  Time#to_a format.
+
+	* string.c (str_sub_s): replace happened twice for null pattern.
+
+	* regex.c (re_search): null pattern should not match after newline 
+	  at the end of string.
+
+	* time.c (time_isdst): now returns boolean value.
+
+	* error.c (rb_check_type): treat special constants in messages.
+
+	* parse.y (yylex): new form `::Const' to see toplevel constants.
+
+	* parse.y (cond): SEGV on `if ()'.
+
+	* gc.c (obj_free): some data needed explicit free().
+
+Mon Feb 16 23:55:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (blk_free): release duplicated block informations.
+
+	* eval.c (blk_copy_prev): duplicate outer block information into
+ 	  the heap, when proc/binding created.
+
+Mon Feb 16 14:38:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_mon): now 1 for January and so on.
+
+	* time.c (time_year): year in 19xx (no + 1900 needed anymore).
+
+Mon Feb 16 13:28:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): need to fetch mbchar's second byte
+ 	  without translation.
+
+Mon Feb 16 12:29:27 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* eval.c (f_pass_block): pass iterator block to other method.
+
+Fri Feb 13 08:16:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (parse_regx): handle \s before read_escape().
+
+	* parse.y (read_escape): `\s' in strings as space.
+
+Tue Feb 10 17:29:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b7 released.
+
+	* string.c (str_aset): string insertion by `str[n] = str2'.
 
-	* bignum.c (rb_big_xor): ditto.
+	* string.c (str_oct): does recognize `0x'.
 
-Fri Sep 11 22:06:14 2003   David Black <dblack@superlink.net>
+ 	* sprintf.c (f_sprintf): use baes 10 for conversion from string to
+ 	  integer.
 
-	* lib/scanf.rb: Took out useless @matched_item variable; some small
-	  refactoring.
+Mon Feb  9 14:51:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Sep 11 08:43:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c (do_coerce): proper error message.
 
-	* eval.c (rb_f_require): allow "require" on $SAFE>0, if feature
-	  name is not tainted.
+	* string.c (str_sum): bug - masked by wrong value. (sigh..)
 
-	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream):
-	  Supports StringIO.
+Sat Feb  7 15:11:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Sep 10 22:47:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (str_empty): new method
 
-	* ext/openssl/ossl.h: add a workaround for win32 platform.
-	  libeay32.dll doesn't export functions defined in conf_api.h.
+Fri Feb  6 01:42:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_config.c (ossl_config_initialize): ditto.
+	* time.c (time_asctime): use asctime(3), not strftime(3).
 
-	* ext/openssl/ossl_config.c (ossl_config_add_value): ditto.
+Thu Feb  5 18:58:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_config.c (set_conf_section_i): should check
-	  if the argument is Array.
+	* io.c (io_fptr_close): do not free path on close().
 
-Wed Sep 10 22:41:54 2003  Tietew <tietew@tietew.net>
+	* array.c (ary_filter): new method.
 
-	* eval.c (win32_get_exception_list): avoid VC7 warning.
-	  [ruby-win32:577]
+	* enum.c (enum_each_with_index): new method.
 
-Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Feb  5 14:10:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (struct tag): dst should be VALUE.
+	* parse.y (primary): singleton class def can be appeared inside
+ 	  method bodies.
 
-Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* hash.c (hash_replace): replace content.
 
-	* eval.c (localjump_destination): stop at the scope where the current
-	  block was created.  [ruby-dev:21353]
+	* string.c (str_replace_method): replace content.
 
-Tue Sep  9 05:17:04 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* array.c (ary_replace_method): replace elements.
 
-	* ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
+	* string.c (str_succ_bang): String#succ!
 
-Tue Sep 9 02:41:35 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+Thu Feb  5 18:20:30 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/ossl_config.c: Refine compatibility.
+	* string.c (str_upcase_bang): multi byte character support.
 
-Tue Sep  9 01:50:45 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Feb  4 13:55:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to
-	  the message.
+	* array.c (ary_reverse): SEGV on empty array reverse.
 
-	* lib/webrick/log.rb (BasicLog#log): add "\n" only if needed.
+Tue Feb  3 12:24:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Sep  8 22:15:33 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* re.c (match_to_a): non matching element should be nil.
 
-	* ext/tk/lib/multi-tk.rb: modify security check at creating
-	  a new interpreter
+	* ruby.c (ruby_load_script): load script after all initialization.
 
-Mon Sep  8 20:00:12 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (str2inum): need to interpret prefix `0' of `0x'.
 
-	* lib/optparse.rb, lib/optparse/version.rb: search also all
-	  capital versions.
+Tue Feb  3 10:00:18 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Mon Sep  8 19:26:33 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* numeric.c (fix_rshift): use `sizeof(INT)*8' instead of 32.
 
-	* ext/openssl/ossl.h: include openssl/conf.h and openssl/conf_api.h.
+Mon Feb  2 14:09:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_config.c: refine all with backward compatibility.
+	* ruby.c (set_arg0): grab environment region too.
 
-	* ext/openssl/ossl_config.h: export GetConfigPtr() and DupConfigPtr().
+Thu Jan 29 18:36:25 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/ossl_x509.c: added new constants under X509 module.
-	  DEFAULT_CERT_AREA, DEFAULT_CERT_DIR, DEFAULT_CERT_FILE,
-	  DEFAULT_CERT_DIR_ENV, DEFAULT_CERT_FILE_ENV and DEFAULT_PRIVATE_DIR.
+	* process.c (rb_proc_exec): check `sh' to be exist.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_free): don't free
-	  the members of the struct. it's left to GC.
+Thu Jan 29 18:18:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509_set_config): add for config=.
+	* io.c (io_stdio_set): assignment to $stdin or $stdout does
+	  reopen() as well as $stderr.
 
-	* ext/openssl/ossl_x509ext.c (Xossl_x509extfactory_initialize):
-	  add attr readers: issuer_certificate, subject_certificate,
-	  subject_request, crl and config.
+Thu Jan 29 14:18:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Sep  8 18:26:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* class.c (mod_ancestors): should not include singleton classes.
 
-	* lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port
-	  instead of config[:Port] or req.request_uri.port.
+	* object.c (obj_type): should not return internal class.
 
-	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.
+	* io.c (io_reopen): unwillingly closes stdio streams.
 
-	* lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.
+Thu Jan 29 11:50:35 1998  Toshihiko SHIMOKAWA  <toshi@csce.kyushu-u.ac.jp>
 
-	* lib/webrick/config.rb: :Listen option never be used.
+	* ext/socket/socket.c (udp_addrsetup): forgot to use htons().
 
-	* lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
-	  option and add warning message.
+Tue Jan 27 23:15:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).
+	* keywords: __FILE__, __LINE__ are available again.
 
-	* lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.
+Fri Jan 23 14:19:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Sep  7 16:08:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* version 1.1b6 released.
 
-	* ext/tcltklib/tcltklib.c (lib_mainloop_core): fixed signal-trap bug
+	* object.c (mod_to_s): need to duplicate classpath.
 
-	* ext/tk/lib/*.rb : Ruby/Tk works at $SAFE == 4
+	* error.c (exc_inspect): need to duplicate classpath.
 
-Sat Sep  6 02:26:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Jan 22 00:37:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_*.rb: assert_same, assert_match, and so on.
+	* ruby.h (STR2CSTR): new macro to retrieve char*.
 
-Sat Sep  6 18:45:46 2003  Mauricio Fernandez <batsman.geo@yahoo.com>
+	* class.c (rb_define_method): `initialize' should always be
+	  private, even if it defined by C extensions.
 
-	* parse.y (assignable): call rb_compile_error(), not rb_bug().
-	  [ruby-core:01523]
+	* eval.c (rb_eval): `initialize' should always be private.
 
-Sat Sep  6 17:40:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jan 22 16:21:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ruby_missing.c: rid of unnecessary backward
-	  compatibility stuff. and remove DEFINE_ALLOC_WRAPPER from
-	  all sources.
+	* eval.c (rb_eval): some singleton class def cause SEGV.
 
-	* ext/openssl/ossl_x509ext.c (X509::Extension.new): new method.
+	* eval.c (TMP_ALLOC): replace ALLOCA_N, where thread context
+ 	  switch may happen.
 
-	* ext/openssl/ossl_x509ext.c (X509::Extension#oid=): new method.
+Wed Jan 21 01:43:42 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_x509ext.c (X509::Extension#value=): new method.
+	* eval.c (PUSH_FRAME): do not use ALLOCA_N().  crash on some
+	  platforms that use missing/alloca.c.
 
-	* ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
+	* regex.c (re_compile_pattern): too many pops for non register
+	  subexpr.
 
-Sat Sep  6 01:23:22 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* parse.y (yylex): open parentheses after identifiers are argument 
+	  list, even if whitespaces have seen.
 
-	* win32/win32.c (CreateChild): need to quote cmd if RUBYSHELL is set.
+Tue Jan 20 15:19:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* win32/win32.c (CreateChild): fix condition about whether to call
-	  shell or not.
+	* parse.y (terms): quoted word list by %w(a b c).
 
-Sat Sep  6 00:36:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+	* ext/tcltklib/extconf.rb: more accurate check for tcl/tk libs.
 
-	* Makefile.in (test): phony target.
+	* file.c (rb_stat): most of the FileTest methods (and function
+ 	  `test') accept File objects as the argument.
 
-	* lib/mkmf.rb (have_library, find_library): configure by library
-	  name.
+Tue Jan 19 18:19:24 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/optparse.rb (OptionParser#order, #permute, #parse): allow an
-	  array as argument.
+	* ext/extmk.rb.in (install): there should be no newline after install:
 
-	* test/ruby/test_*.rb: moved invariants to left side in
-	  assert_equal, and use assert_nil, assert_raises and so on.
+	* re.c (MIN): renamed from min().  there's a local variable named
+ 	  min in the file, so that some cpp will raise an error.
 
-	* win32/win32.c (isInternalCmd): distinguish command.com and
-	  cmd.exe.
+Mon Jan 19 16:30:05 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* win32/win32.c (make_cmdvector): a character just after wildcard
-	  was ignored.  [ruby-core:01518]
+	* version 1.1b5 released.
 
-Fri Sep  5 20:27:08 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* process.c (rb_syswait): no exception raised.
 
-	* test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'
+Fri Jan 16 00:43:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep  5 18:00:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ruby.h (CLONESETUP): copies its singleton classes too.
 
-	* ext/openssl/lib/openssl/x509.rb: new method X509::Name::parse.
+	* class.c (singleton_class_attached): saves binded object in the
+	  singleton classes.
 
-	* ext/openssl/ossl_digest.c: add ossl_digest_new().
+	* eval.c (rb_eval): calls singleton_method_added even in the
+	  singleton class clauses.
 
-	* ext/openssl/ossl_digest.h: ditto.
+Fri Jan 15 23:22:43 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/ossl_cipher.c: add ossl_cipher_new().
+	* ruby.c (proc_options): -S does not recognize PATH.
 
-	* ext/openssl/ossl_cipher.h: ditto.
+Thu Jan 15 02:03:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep  5 15:32:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_clear_cache_by_id): clear only affected cache
+	  entries.
 
-	* misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): should not
-	  search delimiter forward if found in backward.
+Wed Jan 14 02:14:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep  5 13:32:48 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c: new UDP/IP socket classes.
 
-	* test/runner.rb: arguments should be keys.
+Tue Jan 13 10:00:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep  5 12:09:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* string.c (str_cmp): ignorecase($=) works wrong.
 
-	* test/ruby/test_system.rb (test_system): check existence of ruby
-	  interpreter.
+Fri Jan  9 13:19:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep  5 11:32:17 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* version 1.1b4 released.
 
-	* lib/optparse.rb (--version): fix assignment/reference order.
+	* eval.c (f_missing): class name omitted from the error message.
 
-	* lib/optparse.rb (OptionParser#help): new; OptionParser#to_s may
-	  be deprecated in future.
+	* error.c (exc_inspect): description changed.
 
-	* lib/optparse/version.rb (OptionParser#show_version): hide Object.
+	* string.c (Init_String): GlobalExit's superclass did not filled,
+	  since GlobalExit created earlier than String.
 
-	* test/runner.rb: fix optparse usage.
+Thu Jan  8 12:10:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/runner.rb: glob all testsuits if no tests given.
+	* parse.y (aryset): expr in the brackets can be null.
 
-Fri Sep  5 10:42:58 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Jan  7 21:13:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/runner.rb: added.  gets testcases from command line and runs it.
+	* io.c (io_reopen): keep stderr unclosed.
 
-	* test/ruby/test_gc.rb: remove useless part which was for dumping test
-	  result.
+	* io.c (io_errset): keep stderr unclosed.
 
-Fri Sep  5 09:28:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Jan  6 00:27:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_gc.rb: added.  splitter.rb which I made to split
-	  sample/test.rb into test/ruby/test_* kindly removed GC test (the
-	  last section in the original test) to reduce things to be worried.
+	* parse.y: syntax modified for `while expr do .. end' etc.
 
-Fri Sep  5 03:00:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (f_exec,f_system): can supply arbitrary name for the
+ 	  new process.
 
-	* test/ruby/test_iterator.rb (test_block_in_arg): add no block
-	  given tests.
+Mon Jan  5 16:59:13 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* test/ruby/test_iterator.rb (test_ljump): uncomment LocalJumpError
-	  test.
+	* file.c (file_s_basename): removes any extention by ".*".
 
-Fri Sep  5 01:10:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Jan  4 19:36:22 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* test/ruby: tests for ruby itself.
+	* parse.y (yylex): needed to update lex_p (reading point).
 
-	* test/ruby/test_*.rb: split sample/test.rb into 28 test/unit testcases.
-	  some tests could not be translates...  search '!!' mark to see it.
+Sat Jan  3 19:14:14 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* test/csv/test_csv.rb: should require 'csv', not '../lib/csv'.  test
-	  runner should set load path correctly.
+	* class.c,object.c: duplicate defines mKernel and cFinxnum.
 
-Fri Sep  5 01:03:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Jan  2 20:38:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/csv/test_csv.rb: close opened files for CSV::IOBuf explicitly.
-	  opened file cannot be removed under win32 box.
+	* ext/curses/curses.c (NUM2CHAR): uses the first character for
+ 	  string arguments.
 
-Thu Sep  4 23:59:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (ary_fill): did not extend array for ranges.
 
-	* parse.y (tokadd_string): newlines have no special meanings in
-	  %w/%W, otherwise they are ignored only when interpolation is
-	  enabled.  [ruby-dev:21325]
+	* array.c (beg_len): did not return end pos bigger than size.
 
-Thu Sep  4 19:38:25 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Jan  2 02:09:16 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/io/wait/.cvsignore: added.
+	* dir.c (dir_s_chdir): bug in nil check.
 
-	* ext/openssl/.cvsignore: added.
+	* array.c (ary_fill): bug in nil check.
 
-Thu Sep  4 19:28:24 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Dec 30 11:46:23 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* sample/openssl: added.  Sample of standard distribution library
-	  should be locate in sample/{module_name}/*.
+	* hash.c (env_path_tainted): checks directories in PATH
+	  environment variable are not world writable.
 
-	* ext/openssl/sample/*: removed.  move to sample/openssl/*.
+	* ruby.c (load_file): invoke specified interpreter if the #! line
+ 	  does not contain the word `ruby'.
 
-Thu Sep  4 18:02:15 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Dec 26 03:26:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/csv/test_csv.rb: use remove_const to reduce warnings.  use
-	  Dir.tmpdir to locate working files.
+	* string.c (uscore_get): type information included in the error
+ 	  message.
 
-Thu Sep  4 17:41:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* variable.c (f_untrace_var): does not free trace-data within
+ 	  trace procedure.
 
-	* misc/ruby-mode.el (ruby-here-doc-beg-re): underscore also is
-	  valid delimiter.
+Thu Dec 25 02:50:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* misc/ruby-mode.el (ruby-here-doc-end-match): must quote
-	  arbitrary string to use as regexp.
+	* version 1.1b3 released.
 
-	* misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): must not
-	  call `ruby-here-doc-end-match' unless `ruby-here-doc-beg-re'
-	  matched.
+	* ruby.h: inlining some functions on gcc 2.x
 
-Thu Sep  4 15:40:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Dec 23 02:47:33 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/csv/test_csv.rb: run on test/unit original layer.
+	* eval.c (rb_eval): public/private information kept in the current 
+	  scope, to remove undesired state from the class/module.
 
-Thu Sep  4 12:54:50 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+	* time.c (time_strftime): remove hidden limit of 100 bytes of
+	  result string, using malloc'ed buffer. 
 
-	* ext/syck/token.c: headerless documents with root-level spacing now
-	  honored.
+	* hash.c (hash_update): merges the contents of another hash,
+	  overriding existing keys.
 
-Thu Sep  4 00:06:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (must_instr): totally re-written.
 
-	* eval.c (mark_frame_adj): need to adjust argv pointer if using
-	  system's alloca. [ruby-core:01503]
+	* io.c (read_all): try to allocate proper sized buffer using
+	  fstat(2) for speedup.
 
-Wed Sep  3 21:33:20 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Dec 20 00:27:28 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test: add test directory.  Test::Unit aware testcases and needed
-	  files should be located in this directory.  dir/file name convention;
-	    test/{module_name}/test_{testcase_name}.rb
-	    test/{module_name}/{needed_files}
-	  someday, someone will write testrunner which searches test_*.rb and
-	  run testcases automatically.
+	* regex.c (must_instr): need to skip 2 bytes for mbchars.
 
-	* test/csv/*: add testcase for lib/csv.rb.
+Fri Dec 19 01:18:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Sep  3 01:37:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* version 1.1b2 released.
 
-	* io.c (rb_f_gets): should call next_argv() before type check
-	  current_file. [ruby-list:38336]
+	* eval.c (check_errat): check and convert (if necessary) traceback 
+	  information before assigning to the variable $@.
 
-Tue Sep  2 20:37:15 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (f_raise): optional third argument to specify traceback
+	  information.
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): warning
-	  for skipping server verification.
+	* io.c (f_open): prevent infinite recursive call.
 
-Tue Sep  2 23:36:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Dec 18 19:33:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (proc_invoke): should retrieve retval when pcall is true.
+	* string.c (str_rindex): now accepts regexp as index.
 
-Tue Sep  2 14:09:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Dec 18 18:42:50 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/socket/extconf.rb: check s6_addr8 in in6_addr (Tru64 UNIX).
-	  the patch is submitted by nmu <nmu@users.sourceforge.jp>.
+	* ext/socket/extconf.rb: modified to detect win32 socket lib.
 
-	* ext/socket/getaddrinfo.c (getaddrinfo): should use in6_addr8 on
-	  some platforms.
+Thu Dec 18 00:25:03 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/socket/getnameinfo.c (getnameinfo): ditto.
+	* re.c (reg_equal): checks for source and casefold and kcode matching.
 
-Tue Sep  2 14:02:19 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* marshal.c: became built-in module.
 
-	* ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception
+	* ext/marshal/marshal.c (r_object): displays struct name for
+	  non-compatible struct.
 
-	* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
-	  bug fix and improvement of font control
+	* string.c (str_index_method): now searches character (fixnum) in
+	  the string.
 
-Tue Sep  2 09:51:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (str_include): redefine `include?'.
 
-	* eval.c (rb_eval): should not handle exceptions within rescue
-	  argument.  [ruby-talk:80804]
+	* regex.c (re_match): start_nowidth saves current stack position
+	  to stop_nowidth.
 
-Tue Sep  2 00:44:37 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_compile_pattern): add space to stop_nowidth to save
+	  runtime stack position.
 
-	* re.c (rb_memsearch): fix overrun.  [ruby-talk:80759]
+Tue Dec 16 14:57:43 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Sep  2 00:41:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (scan_once): wrong exception for regexp that match with 
+	  null string (use substr instead of subseq).
 
-	* ext/iconv/iconv.c (map_charset): use lower case keys.
+Sat Dec 13 00:13:32 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/iconv/iconv.c (iconv_fail): just yield error and return the
-	  result if a block is given.
+	* parse.y (expr): remove bare assocs from expr rule.
 
-	* ext/iconv/iconv.c (iconv_convert): yield error and append the
-	  result if a block is given.
+	* rbconfig.rb: renamed from config.rb (it was too generic name).
 
-	* ext/iconv/charset_alias.rb (charset_alias): optional third
-	  argument.
+Fri Dec 12 00:50:25 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/iconv/charset_alias.rb (charset_alias): use CP932 instead of
-	  SHIFT_JIS on cygwin.
+	* parse.y (expr): warns if BEGIN or END appear in the method
+ 	  bodies.
 
-Mon Sep  1 18:34:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (str_match): calls y =~ x if y is neither String nor
+	  Regexp so that eregex.rb works.  
 
-	* eval.c (rb_eval): make tail recursion in ELSE clause of
-	  RESCUE a jump.
+	* eval.c (f_at_exit): to register end proc.
 
-Mon Sep  1 18:00:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* class.c (rb_define_module_function): define 'function' method
+	  for the Module, not private method.
 
-	* parse.y (aref_args): forgot to call NEW_SPLAT(). reported by
-	  Dave Butcher.
+	* class.c (rb_define_function): function to define `function' method.
 
-	* eval.c (Init_Thread): protect thgroup_default.  suggested by Guy
-	  Decoux in [ruby-talk:80623]
+	* eval.c (rb_eval): inherit visibility from superclass's method
+	  except when it is set to `function'
 
-Mon Sep  1 16:59:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): new visibility status `function'.
 
-	* eval.c (rb_thread_switch): add RESTORE_EXIT; exit by another
-	  thread termination.
+	* parse.y (yycompile): do not clear eval_tree. thus enable multipe 
+	  command line script by optn `-e'.
 
-	* eval.c (rb_thread_start_0): should not error_print() within
-	  terminated thread, because $stderr used by it might be
-	  overriden now.  [ruby-dev:21280]
+	* eval.c (rb_eval): END execute just once.
 
-Sun Aug 31 22:46:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* parse.y (expr): BEGIN/END built in the syntax.
 
-	* eval.c (TAG_DST()): take no argument.
+Thu Dec 11 13:14:35 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* process.c (p_gid_sw_ensure): return VALUE.
+	* object.c (mod_le): Module (or Class) comparison.
 
-Sun Aug 31 22:27:10 2003  Hidetoshi NAGAI  <nagai@dumbo.ai.kyutech.ac.jp>
+	* eval.c (rb_remove_method): raises NameError if named method does 
+	  not exist.
 
-	* process.c (p_gid_sw_ensure): lack of function type
+	* ext/curses/curses.c: remove CHECK macro for BSD curses.
+	
+Thu Dec 11 12:44:01 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Sun Aug 31 12:25:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+	* pack.c: sun4 cc patch
 
-	* lib/optparse.rb: --version takes an optional argument; "all" or
-	  a list of package names.
+Wed Dec 10 15:21:36 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Aug 31 10:17:02 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ext/marshal/marshal.c (marshal_load): can supply evolution proc
+	  object as optional second argument.
 
-	* lib/date/format.rb: yyyy/mm is not an acceptable format.
+	* re.c (reg_source): get source string of the regular expression.
 
-	* lib/time.rb: follow above.
+Tue Dec  9 10:05:17 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Aug 30 14:25:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* version 1.1b1 released.
 
-	* eval.c (rb_iter_break): should not call TAG_JUMP directly.
+	* parse.y (tokadd): token buffer overrun.
 
-Sat Aug 30 03:58:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.c (ruby_prog_init): forgot to protect rb_argv0 from gc.
 
-	* eval.c (struct BLOCK): remove BLOCKTAG, use scope instead.
+	* eval.c (ruby_run): call finalizers at process termination.
 
-	* eval.c (POP_TAG): no longer propagate retval.  retval is now set
-	  directly by localjump_destination().
+	* gc.c (gc_call_finalizer_at_exit): call free proc for every Data
+ 	  Wrapper, and finalizer for specified objects at termination.
 
-	* eval.c (localjump_destination): new function to cast
-	  return/break local jump.
+	* version.c (show_version): version format changed.
 
-	* eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
+	* regex.c (re_match): wrong match with non-greedy if they appear
+	  more than once in regular expressions.
 
-Fri Aug 29 22:35:00 2003  Shigeo Kobayashi <shigek@ruby-lang.org>
+	* sample/ruby-mode.el (ruby-expr-beg): forgot to handle modifiers.
 
-	* bigdecimal.c *.html: The 2nd arg. for add,sub,mult, and div is 0,
-	  then result will be the same as +,-,*,/ respectively.
+Mon Dec  8 19:00:15 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+	* io.c (io_puts): just put a newline if no argument given.
 
-	* process.c: bug fix
+	* ext/tcltklib/tcltklib.c (lib_mainloop): thread-aware tk handle
+ 	  when $tk_thread_safe is set.
 
-	* process.c: add rb_secure(2) to methods of Process::{UID,GID,Sys}
+	* ext/tcltklib/tcltklib.c (lib_mainloop): use Tcl_DoOneEvent()
+	  instead of Tk_MainLoop().
 
-	* process.c: deny handling IDs during evaluating the block given to
-	  the Process::{UID,GID}.switch method
+Mon Dec  6 07:11:16 1997  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-	* ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
+	* io.c (io_puts): core dumped without any argument.
 
-	* ext/tcltklib/tcltklib.c : can create a interpreter without Tk
+Fri Dec  5 18:17:17 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tcltklib/tcltklib.c : bug fix on handling exceptions
+	* eval.c (mod_remove_method): remove (not undef) a method from the 
+	  class/module.
 
-	* ext/tcltklib/MANUAL.euc : modify
+	* variable.c (obj_remove_instance_variable): method to remove
+	  instance variables.
 
-	* ext/tk/lib/tk.rb : freeze some core modules
+Thu Dec  4 13:50:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/multi-tk.rb : more secure
+	* version 1.1b0 released.
 
-	* ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
-	  Tk's list
+	* string.c (str_aref): called str_index for regexp.
 
-	* ext/tk/lib/tk.rb: improve accessibility of TkVariable object
+Mon Dec  1 15:24:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tkfont.rb, ext/tk/lib/tkcanvas.rb,
-	  ext/tk/lib/tktext.rb : fix bug of font handling
+	* compar.c (cmp_between): wrong comparison made.
 
-	* ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
+Wed Nov 26 18:18:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Aug 28 22:07:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb: generate Makefile for extention modules out of ruby 
+	  source tree. use like `ruby -r mkmf extconf.rb'.
 
-	* variable.c (rb_autoload_load): call const_missing if autoloading
-	  constant is not defined to allow hook.
+	* numeric.c (fix2str): enlarge buffer to prevent overflow on some
+	  machines.
 
-	* eval.c (rb_eval): use rb_const_get_from() instead of
-	  rb_const_get_at().
+	* parse.y (here_document): wrong line number generated after here-doc.
 
-	* eval.c (is_defined): forgot to check NODE_COLON3.
+Fri Nov 21 13:17:12 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Aug 28 17:30:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (yylex): skip multibyte characters in comments.
 
-	* variable.c (rb_const_get_0): should check constants defined in
-	  included modules, if klass is Object. [ruby-talk:79302]
+Wed Nov 19 17:19:20 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* numeric.c (check_uint): check should be done using UINT_MAX, not
-	  INT_MAX. this fix is submitted by Lyle Johnson
-	  <lyle@knology.net> in [ruby-core:01486]
+	* object.c (nil_to_a): nil.to_a => [].
 
-Thu Aug 28 05:02:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (call_args): wrong node generation.
 
-	* parse.y (singleton): typo fixed (ruby-bugs-ja PR#562)
+Tue Nov 18 10:13:08 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Aug 28 02:37:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (Init_Array): Array#=== works as Array#include?
 
-	* eval.c (rb_eval): *a = [1,2] now assigns [[1,2]] to a.
-	  consistent with *a = [1], which set [[1]] to a.
+	* regex.c (re_compile_pattern): insert initialize code for jump_n, 
+	  before entering loops.
 
-	* node.h: merge NODE_RESTARY to NODE_SPLAT.
+	* re.c (reg_search): does not save registers unless $& etc appear
+	  in the script.
 
-	* parse.y: rules simplified a bit by removing NODE_RESTARY.
+Mon Nov 17 13:01:43 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* sample/test.rb: updated for new assignment behavior.
+	* eval.c (is_defined): add defined? check for receivers and
+ 	  arguments for calls.
 
-Wed Aug 27 22:33:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* re.c (reg_search): cache last match object.
 
-	* error.c (rb_bug): should not use other methods; this function is
-	  not for ordinary use.  [ruby-dev:21259]
+	* re.c (match_aref): $[0] etc. are available.
 
-Wed Aug 27 15:07:57 2003  Minero Aoki  <aamine@loveruby.net>
+Sat Nov 15 00:11:36 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/net/smtp.rb (check_response): AUTH CRAM-MD5 returns 334
-	  response. [ruby-list:38279]
+	* io.c (io_s_popen): "rb" detection
 
-Wed Aug 27 05:10:15 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Nov 14 18:28:40 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* win32/win32.c (map_errno): support winsock error.
+	* string.c (scan_once): returns whole match if the pattern does
+	  not contain any parentheses.
 
-	* win32/win32.c (pipe_exec, CreateChild, poll_child_status, waitpid,
-	  kill, link, rb_w32_rename, unixtime_to_filetime, rb_w32_utime):
-	  pass errno to map_errno().
+Thu Nov 13 14:39:06 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* win32/win32.c (rb_w32_select, rb_w32_accept, rb_w32_bind,
-	  rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
-	  rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
-	  rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
-	  rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
-	  rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
-	  rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport,
-	  rb_w32_fclose, rb_w32_close): use map_errno().
+	* string.c (str_sub): returns copy of the receiver string, even if 
+	  any substitution occurred.
 
-	* win32/win32.h: add winsock errors.
+	* regex.c (re_compile_pattern): no-width match by (?=..), (?!..).
 
-Tue Aug 26 23:53:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Nov 12 13:44:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/ostruct.rb (OpenStruct::method_missing): prohibit modifying
-	  frozen OpenStruct. [ruby-talk:80214]
+	* time.c: remove coerce from Time class.
 
-Tue Aug 26 20:03:50 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_match): non-greedy match by ??, *? +?, {n,m}?.
 
-	* lib/mkmf.rb (create_tmpsrc): add the hook for source.
-	  [ruby-list:38122]
+Mon Nov 10 11:24:51 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Aug 26 15:59:53 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+	* regex.c (re_compile_pattern): non-resitering parens (?:..).
 
-	* implicit.c (syck_type_id_to_taguri): corrected detection of
-	  x-private types.
+	* regex.c (re_compile_pattern): new meta character \< (wordbeg)
+	  and \> (wordend).
 
-Sun Aug 24 01:02:48 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_compile_pattern): embedded comment for regular
+	  expression by (?#...).
 
-	* file.c (file_expand_path): performance improvement.
-	  [ruby-talk:79748]
+Fri Nov  7 16:58:24 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Aug 23 23:41:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_compile_pattern): perl5 regxp \A and \Z available.
 
-	* file.c (rb_file_s_expand_path): avoid calling rb_scan_args() for
-	  apparent cases. [ruby-talk:79748]
+	* regex.c (re_compile_pattern): can expand compile stack dynamically.
 
-Sat Aug 23 18:56:53 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (PUSH_FAILURE_POINT): wrong compare condition.
 
-	* ext/nkf/nkf.c (rb_nkf_putchar): should use rb_str_resize() to just
-	  resize a string, rb_str_cat() disallows NULL.  [ruby-dev:21237]
+Wed Nov  2 16:00:00 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Sat Aug 23 16:48:41 2003  Keiju Ishitsuka <keiju@ishitsuka.com>
+	* string.c (str_sub_s): "".sub! "", "" => "\000"
 
-	* lib/irb/ruby-lex.rb: bug fix for "foo" !~ /bar/. [ruby-talk:79942]
+Fri Oct 31 15:52:10 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Aug 23 15:59:58 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (assoc): keyword assoc like {fg->"black"}.
 
-	* eval.c (rb_eval, rb_iterate, block_pass): reduce PUSH/POP_TAG and
-	  EXEC_TAG() for retry.  [ruby-dev:21216]
+Thu Oct 30 17:33:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Aug 23 02:32:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (io_println): print with newline, which is not affected by
+	  the values of $/ and $\.
 
-	* eval.c (rb_yield_splat): should check if "values" is array.
+Thu Oct 30 16:54:01 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* enum.c (each_with_index_i): typo.
+	* string.c (str_chop_bang): "".chop caused SEGV.
 
-Fri Aug 22 17:07:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (str_chomp_bang): method to chop out last newline.
 
-	* enum.c (inject_i): use rb_yield_values.
+Mon Oct 27 13:49:13 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* enum.c (each_with_index_i): ditto.
+	* ext/extmk.rb.in: library may have pathname contains `.'
 
-	* eval.c (rb_yield_splat): new function to call "yield *values".
+	* eval.c (rb_rescue): should not protect SystemError.
 
-	* string.c (rb_str_scan): use rb_yield_splat().
+Fri Oct 24 10:58:53 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Aug 22 06:13:22 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+	* io.c (io_s_with_open_stream): ensures to close stream.
 
-	* ext/syck/rubyext.c: refactoring of the transfer method
-	  dispatch.  added yaml_org_handler for faster dispatch of
-	  transfers to base types.
+Thu Oct 23 11:17:44 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/yaml/rubytypes.rb: removed handling of builtins from
-	  Ruby library.
+	* io.c (io_errset): value of $stderr can be changed (to any IO
+ 	  object).
 
-	* ext/syck/token.c: quoted and block scalars are now implicit !str
+	* io.c (next_argv): $< can be anything that responds to `write'.
 
-	* ext/syck/implicit.c: empty string detected as !null.
+	* file.c (file_s_with_open_file): ensures to close file.
 
-Fri Aug 22 01:00:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* error.c (exception): create error under the current class/module.
 
-	* eval.c (block_pass): improve passing current block.
+	* range.c (range_eqq): fixnum check for last needed too.
 
-Tue Aug 21 00:13:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Wed Oct 22 12:52:30 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/bigdecimal/bigdecimal.c: Int. overflow bug in multiplication
-	  fixed, and VpNmlz() speed up.
+	* ext/socket/socket.c: Socket::Constants added.
 
-Wed Aug 20 16:44:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c: File::Constants added for inclusion.
 
-	* ext/socket/socket.c (ruby_connect): many systems seem to have
-	  a problem in select() after EINPROGRESS.  [ruby-list:38080]
+	* array.c (ary_join): call ary_join() recursively for the 1st
+ 	  array element.
 
-Wed Aug 20 01:31:17 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+Mon Oct 20 12:18:29 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/syck/syck.h: Parser definition problems on HP-UX.
-	  [ruby-talk:79389]
+	* ruby.c (load_file): wrong condition for #! check with -x.
 
-	* ext/syck/handler.c (syck_hdlr_get_anchor): Memory leak.
+	* file.c (file_s_dirname): did return "" for "/a".
 
-	* ext/syck/syck.s (syck_io_file_read): Bad arguments to fread.
+Fri Oct 17 14:29:09 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/rubyext.c: Tainting issues.
+	* ruby.c: now works on alpha-linux.
 
-Tue Aug 19 23:20:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* bignum.c (bigadd): some undefined side effect order assumed.
 
-	* ext/bigdecimal/bigdecimal.c .h .html: to_s("+") implemented.
+Wed Oct 15 17:49:24 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: E implemented.
+	* intern.h: function prototypes added.
 
-Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Oct 13 16:54:18 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
+	* class.c (rb_define_class_id): call superclass's `inherited'
+ 	  method when making subclasses.
 
-	* lib/webrick/https.rb: SSLSocket handling is moved to webrick/ssl.rb.
+	* parse.y (nextc): clear lex_lastline at the end of file.
 
-	* lib/webrick/compat.rb (File::fnmatch): remove old migration code.
+	* object.c (Init_Object): need to undef Class#append_features.
 
-	* lib/webrick/httpserver.rb (HTTPServer#run): ditto.
+	* eval.c (rb_eval): no warning on extending classes or modules.
 
-	* lib/webrick/server.rb (GenericServer#listen): the body of this
-	  method is pull out as Utils::create_lisnteners.
+Thu Oct  9 11:17:50 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/utils.rb (Utils::create_lisnteners): new method.
+	* eval.c (error_print): the exception name follows after the error 
+	  message.
 
-	* lib/webrick/server.rb (GenericServer#start): should rescue
-	  unknown errors. and refine comments.
+	* eval.c (compile_error): error message slightly changed.
 
-	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
-	  socket if SSLSocket raises error.
+	* parse.y (nextc): script parsing will be terminated by __END__ at
+ 	  beginning of line.
 
-Tue Aug 19 11:19:33 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (compile_error): `__END__' is no longer a keyword.
 
-	* io.c (next_argv): should not call GetOpenFile() if rb_stdout is
-	  not a IO (T_FILE).
+	* parse.y (nextc): protect lastline read from script stream.
 
-Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Oct  7 14:06:06 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
-	  a builtin.
+	* version 1.1 alpha9 released.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#close): ditto.
+	* eval.c (mod_append_features): renamed from extend_class.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#puts): should
-	  add a return to the tails of each line.
+	* eval.c (rb_eval): defining method calls `method_added'.
 
-	* ext/openssl/lib/openssl/ssl.rb: new class OpenSSL::SSL::SSLServer.
+	* eval.c (ruby_options): exception while processing options must
+	  terminate the interpreter.
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): use sync_close.
+	* error.c (Init_Exception): wrong method configuration.  `new'
+	  should have been a singleton method.
 
-	* ext/openssl/sample/echo_svr.rb: use SSLServer.
+Mon Oct  6 18:55:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/sample/echo_cli.rb: add example of SSLSocket#sync_close.
+	* ext/kconv/kconv.c (kconv_guess): code to guess character code
+	  from string.
 
-Tue Aug 19 01:24:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct  6 18:38:17 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): Mac OS X standard
-	  headers are inconsistent at this macro.  [ruby-core:01432]
+	* pack.c: now encode/decode base64 by `m' template.
 
-	* ext/curses/extconf.rb: check if _XOPEN_SOURCE_EXTENDED breaks.
+Fri Oct  3 10:51:10 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tcltklib/stubs.c: Status macro in X11/Xthreads.h bothers
-	  winspool.h
+	* MANIFEST: needed to include lex.c in the distribution.
 
-	* instruby.rb: make list at first instead of iterator.
-	  [ruby-talk:79347]
+	* eval.c (ruby_options): f_require() called too early.
 
-Mon Aug 18 11:23:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_provide): module extentions should always be `.o'.
 
-	* dir.c (glob_helper): preserve raw order for **.
+Thu Oct  2 11:38:31 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Aug 17 23:39:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* version 1.1 alpha8 released.
 
-	* ext/openssl/extconf.rb (HAVE_VA_ARGS_MACRO): need to compile.
+	* ext/marshal/marshal.c (r_object): remove temporal regist for
+ 	  structs. (caused problem if structs form cycles.)
 
-Sun Aug 17 17:10:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (match_gen): static binding for match(=~) calls
+	  with regexp literals.
 
-	* ext/openssl/lib/openssl/ssl.rb (SSLSocket#sync_close=): add a
-	  method to specify if the underlying IO will be closed in
-	  SSLSocket#close.
+Wed Oct  1 15:26:55 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/lib/openssl/buffering.rb: add forwarders to
-	  setsockopt, getsockopt and fcntl.
+	* eval.c: protect retval in struct tag from GC for C_ALLOCA.
 
-	* ext/openssl/lib/net/protocols.rb: enable sync for SSLSocket.
+	* eval.c: no more pointer value from setjmp/longjmp.
 
-Sun Aug 17 11:32:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct  1 14:01:49 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/extmk.rb (extmake): should not force to remake Makefile when
-	  installation and so on.
+	* ext/marshal/marshal.c (w_byte): argument must be char.
 
-Sat Aug 16 23:58:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct  1 10:30:22 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_symbol, w_object): get rid of warnings.
+	* variable.c (mod_const_at): global constants now belongs to the
+	  class Object.
 
-	* re.c (rb_memsearch): ditto.
+	* object.c (Init_Object): new global constant NIL.
 
-	* time.c (time_dump): ditto.
+	* ext/marshal/marshal.c (marshal_dump): try to set binmode.
 
-	* ext/extmk.rb (extmake): not continue making when extconf.rb
-	  failed.
+	* ext/marshal/marshal.c (r_object): forgot to re-regist structs in 
+	  the object table.
 
-	* ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.
+	* eval.c (ruby_options): call Init_ext() before any require()
+ 	  calls by `-r'.
 
-	* ext/openssl/ossl.h: remove version.h dependency.
+Fri Sep 30 14:29:22 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/ruby_missing.h: ditto.
+	* ext/marshal/marshal.c (w_object): marshal dumped core.
 
-	* lib/mkmf.rb (pkg_config): use --libs output except with
-	  only-L for other options.  [ruby-list:38099]
+Tue Sep 30 10:27:39 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/mkmf.rb (create_makefile): separate rule for static
-	  library from shared object.
+	* sample/test.rb: bignum test suits added.
 
-	* win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
-	  define exec_prefix and libdir.
+	* eval.c (rb_eval): new pseudo variable `true' and `false'.
 
-Fri Aug 15 23:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* parse.y: new keywords `true' and `false' added.
 
-	* ext/bigdecimal/bigdecimal.c .h: Bug in combination of limit & div
-	  method fixed.
+Mon Sep 29 13:37:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
+	* ruby.c (forbid_setid): forbid some options in suid mode.
 
-Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.h (NUM2DBL): new macro to convert into doubles.
 
-	* configure.in (HUGE_ST_INO): check whether struct stat.st_ino
-	  is larger than long.  [ruby-dev:21194]
-	  http://www.geocities.co.jp/SiliconValley-PaloAlto/1409/ruby/beos.html
+Mon Sep 27 09:53:48 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
 
-	* error.c (syserr_eqq): errno might exceed Fixnum limit.
+	* bignum.c: modified for speeding.
 
-	* error.c (Init_Exception): moved base initialization from
-	  init_syserr().
+Fri Sep 26 18:27:59 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* inits.c (rb_call_inits): postpone initializing errnos until
-	  Bignum is available.
+	* sample/from.rb: some extensions.
 
-Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Sep 29 13:15:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): needed to let
-	  keyname() and so on be declared.
+	* parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.
 
-	* ext/curses/curses.c (curses_resizeterm, window_resize):
-	  arguments conflicted with macros in term.h.
+Fri Sep 26 14:41:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/curses/curses.c (Curses module methods): ensure
-	  initialized.  [ruby-dev:21191]
+	* eval.c (ruby_run): deferred calling Init_ext() just before eval_node.
 
-Fri Aug 15 02:08:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep 26 13:27:24 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* gc.c (id2ref): recycle check should be done by klass == 0.
-	  [ruby-core:01408]
+	* io.c (io_isatty): forgot to return TRUE value.
 
-Fri Aug 15 01:34:23 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+Fri Sep 25 11:10:58 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
 
-	* ext/openssl/ossl_pkey.c: move generate_cb here
+	* eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
+	  platforms.
 
-	* ext/openssl/ossl_pkey_{dh|dsa|rsa}.c: adapt to this cb
+Wed Sep 24 17:43:13 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/openssl_missing.[ch]: add (0.9.6x, x<j) missing BN funcs
+	* string.c (Init_String): String#taint and String#taint? added.
 
-	* ext/openssl/ossl_bn.c: use supplied funcs from openssl_missing.c
+	* class.c (mod_ancestors): ancestors include the class itself.
 
-Fri Aug 15 00:38:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Wed Sep 24 00:57:00 1997  Katsuyuki Okabe  <HGC02147@niftyserve.or.jp>
 
-	* ext/bigdecimal/bigdecimal.c: Bug in div method fixed.
+	* X68000 patch.
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: Newly added.
+Tue Sep 23 20:42:30 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
 
-	* ext/bigdecimal/sample/pi.rb: Changed so as to use math.rb.
+	* parse.y (node_newnode): SEGV on null node setup.
 
-Thu Aug 14 21:19:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Sep 22 11:22:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (Init_Thread): Continuation#[] added.  [ruby-talk:79028]
+	* ruby.c (ruby_prog_init): wrong safe condition check.
 
-Thu Aug 14 20:03:34 2003  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sun Sep 21 14:46:02 1997  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-	* ext/win32ole/win32ole.c (OLE_FREE): should not call
-	  ole_message_loop.
+	* error.c (exc_inspect): garbage added to classpath.
 
-	* ext/win32ole/win32ole.c (ole_event_free): ditto.
+Fri Sep 19 11:49:23 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/win32ole/win32ole.c (ole_initialize): stop calling
-	  OleUninitialize at exit.
+	* parse.y (newtok): forgot to adjust buffer size when shrinking
+	  the token buffer.
 
-Thu Aug 14 11:27:37 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* enum.c (enum_find): rb_eval_cmd() does not return value.
 
-	* gc.c (rb_data_object_alloc): check type of 1st argument.
-	  [ruby-dev:21192]
+	* io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
+	  no longer used.
 
-Thu Aug 14 00:21:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Sep 16 17:54:25 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* parse.y (mlhs_node): should allow "::Foo" (colon3) as lhs.
+	* file.c (f_test): problem if wrong command specified.
 
-	* parse.y (lhs): ditto.
+	* ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.
 
-	* parse.y (yylex): should return tCOLON3 right after kCLASS.
-	  [ruby-talk:78918]
+	* ruby.c (ruby_prog_init): should not add path from environment
+	  variable, if ruby is running under seuid.
 
-	* error.c (exc_initialize): was converting argument to string too
-	  eagerly.  Only check was needed. [ruby-talk:78958]
+	* process.c (init_ids): check suid check for setuid/seteuid etc.
 
-Wed Aug 13 23:31:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Mon Sep 15 00:42:04 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/bigdecimal/bigdecimal.c .h .html: Ambiguity of
-	  BigDecimal::limit removed.
+	* regex.c (re_compile_pattern): \w{3} and \W{3} did not work.
 
-Wed Aug 13 19:21:34 2003  Christian Neukirchen  <chneukirchen@yahoo.de>
+Thu Sep 11 10:31:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
-	  to SSLSocket. [ruby-talk:78919]
+	* version 1.1 alpha7 released.
 
-Wed Aug 13 18:13:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/socket.c (sock_new): no setbuf() for NT.
 
-	* eval.c (POP_BLOCK): turn on BLOCK_LEFT flag when leaving block.
+	* io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.
 
-	* eval.c (proc_invoke): unpack return/break destination when block
-	  is already left.
+Wed Sep 10 15:55:31 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 13 15:58:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/marshal/marshal.c (r_bytes0): extra big length check.
 
-	* object.c (rb_class_s_alloc): add function prototype to avoid VC++
-	  warning.
+Tue Sep  9 16:27:14 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 13 13:50:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* io.c (pipe_fptr_atexit): clean up popen()'ed fptr.
 
-	* ext/Win32API/Win32API.c (Win32API_initialize): should pass some
-	  class to first argument of Data_Wrap_Struct(). (ruby-bugs PR#1109)
+	* error.c (set_syserr): some system has error code that is bigger
+	  than sys_nerr. grrr.
 
-Tue Aug 12 16:55:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Sep  8 18:33:33 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* Makefile.in: static link libraries to LIBRUBY_SO with static linked
-	  ext.  [ruby-dev:21157]
+	* io.c (io_s_new): dereferenced nil for optional mode.
 
-	* ext/extmk.rb (extmake): sort extension library initialization order.
+Fri Sep  5 10:26:03 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/extmk.rb (extmake): compact $extlibs.
+	* class.c (class_instance_methods): do not include methods which
+	  are changed to private in subclasses.
 
-Tue Aug 12 02:48:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Sep  4 12:38:53 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the
-	  flag before calling getcontext(2).
+	* variable.c (f_global_variables): list name of the global
+	  variables.
 
-	* eval.c (struct thread): add member to save backing store on
-	  IA64. (ruby-bugs PR1086)
+	* object.c (obj_id): returns unique integer.
 
-	* eval.c (thread_mark): mark IA64 backing store region.
+Wed Sep  3 14:05:16 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (thread_free): free saved IA64 backing store.
+	* version 1.1 alpha6 released.
 
-	* eval.c (rb_thread_save_context): save IA64 backing store as well.
+	* eval.c (mod_s_constants): context sensitive constant list.
 
-	* eval.c (rb_thread_restore_context): restore IA64 backing store.
+	* variable.c (mod_constants): no more `all' option.
 
-	* eval.c (THREAD_ALLOC): initialize IA64 members.
+	* variable.c (mod_const_of): the values for autoload classes are
+	  their name strings.
 
-Mon Aug 11 22:31:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-	* lib/debug.rb(debug_command): inspection command should inspect
-	  resulting value even if it's nil.  [ruby-dev:21180] by OMAE, jun
-	  <jun66j5@ybb.ne.jp>.
+	* class.c (class_instance_methods): no special treatment for
+	  singleton classes.
 
-	* lib/debug.rb(debug_command): incomplete regexp.
+	* object.c (obj_singleton_methods): returns list of singleton
+	  method names.
 
-Mon Aug 11 17:33:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (yylex): no here document after `class' keyword.
 
-	* eval.c (rb_call_super): do not use rb_block_given_p() for
-	  check. [ruby-talk:78656]
+	* eval.c (f_load): expand path if fname begins with `~'.
 
-	* eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
+Tue Sep  2 13:19:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Aug 10 10:43:05 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* class.c (ins_methods_i): do not list undef'ed methods.
 
-	* ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE
-	  from 1k to 16k bytes. [ruby-talk:78603]
+Mon Sep  1 13:42:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): enable
-	  partial write to allow interruption in SSLSocket#write.
+	* version 1.1 alpha5 released.
 
-Sun Aug 10 00:34:16 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* object.c (mod_attr_reader): create methods to define attribute
+ 	  reader/write/accessor.
 
-	* cygwin/GNUmakefile: remove unnecessary '--drive-name=$(CC)'
-	  for ccache.
+	* class.c (rb_define_attr): always defines accessors.
 
-Sat Aug  9 10:36:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_call): alias occured in the module body caused SEGV.
 
-	* marshal.c (w_object): do not dump generic instance variable when
-	  marshal_dump is defined.
+	* parse.y: did not generate here document strings properly.
 
-Sat Aug  9 00:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Mon Sep  1 11:43:57 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+	
+	* parse.y (yylex): heredoc dropped an extra character.
 
-	* ext/bigdecimal.c: F style output(like 1234.56789) implemented
-	  to to_s method.
-	* ext/bigdecimal_??.html: F style output(like 1234.56789)
-	  implemented to to_s method.
+Fri Aug 29 11:10:21 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Aug  8 12:33:17 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* class.c (class_instance_methods): same method names should not
+ 	  appear more than twice.
 
-	* bcc32/Makefile.sub: rubyw.exe should be a Windows GUI program.
-	  add the -aa option to WLDFLAGS.
+	* parse.y (yylex): spaces can follow =begin/=end.
 
-Fri Aug  8 11:29:26 2003  Koji Arai  <jca02266@nifty.ne.jp>
+	* variable.c (find_class_path): look for class_tbl also for
+	  unnamed fundamental classes, such as Object, String, etc.
 
-	* marshal.c (w_object): should set `c_arg' at first.
+	* variable.c (rb_name_class): can't name class before String class
+ 	  is initilialized.
 
-Fri Aug  8 03:22:28 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* inits.c (rb_call_inits): unrecognized dependency from GC to
+	  Array.
 
-	* lib/webrick/httputils.rb (FormData#list): should not take
-	  a side effect for the receiver.
+	* variable.c (find_class_path): could not find class if Object's
+ 	  iv_tbl is NULL.
 
-Thu Aug  7 14:40:37 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Thu Aug 28 13:12:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* cygwin/GNUmakefile: better --disbale-shared option support.
+	* version 1.1 alpha4 released.
 
-	* cygwin/GNUmakefile: add forwarding DLL target for cygwin.
+	* variable.c (mod_constants): wrong condition for singleton
+	  class. 
 
-Thu Aug  7 14:21:05 2003  Corinna Vinschen  <vinschen@redhat.com>
+	* parse.y (yylex): revised `=begin' skip code.
 
-	* configure.in: Fix Cygwin specific naming of libraries to
-	  be net distribution compliant. (ruby-bugs PR#1077)
-	  cygwin-ruby18.dll -> cygruby18.dll
+	* parse.y (here_document): forgot to free(eos).
 
-Thu Aug  7 12:51:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (yylex): spaces after `<<' prohibited for here
+ 	  documents to avoid confusing with operator `<<'.
 
-	* eval.c (rb_f_at_exit): should not be called without a block.
-	  block_given check added.
+	* eval.c (is_defined): separated from rb_eval().
 
-Thu Aug  7 06:46:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Aug 27 11:32:42 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_call0): forgot to pop ruby_class.
+	* version 1.1 alpha3 released.
 
-	* eval.c (rb_call0): update ruby_class as well as ruby_cref.
-	  (ruby-bugs-ja PR#540)
+	* variable.c (mod_name): returns name of the class/module.
 
-Thu Aug  7 04:52:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (here_document): finally here document available now.
 
-	* eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
-	  ruby_cref.  [ruby-talk:78141]
+	* variable.c (fc_i): some classes/modules does not have iv_tbl.
 
-Thu Aug  7 04:19:15 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* variable.c (find_class_path): avoid inifinite loop.
 
-	* gc.c: FreeBSD/ia64's mcontext_t is a bit different from that of
-	  Linux/ia64.  This makes gc.c compile but miniruby coredumps for
-	  the moment.
+Tue Aug 26 13:43:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug  7 00:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* eval.c (rb_eval): undef'ing non-existing method will raise
+	  NameError exception.
 
-	* ext/bigdecimal.c: Comparison results adjusted to Float's.
-	* ext/bigdecimal.c: Use rb_num_coerce_????(x,y) instead of own.
+	* object.c (class_s_new): needed to create metaclass too.
 
-Wed Aug  6 22:58:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* eval.c (error_print): no class name print for anonymous class.
 
-	* lib/test/unit/testcase.rb: Added equality checking.
-	* lib/test/unit/testsuite.rb: Added equality checking.
-	* lib/test/unit/assertions.rb: Fixed a warning.
+	* eval.c (rb_longjmp): proper exception raised if raise() called
+ 	  without arguments, with $! or $@ set.
 
-Wed Aug  6 17:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (Init_Object): superclass()'s method argument setting
+ 	  was wrong again.
 
-	* ext/extmk.rb (extmake): pass LIBPATH to make ruby.  [ruby-dev:21137]
+	* class.c (mod_anscestors): list superclasses and included modules 
+	  in priority order.
 
-	* ext/extmk.rb (extmake): set library name as source file name in
-	  Init_ext().  [ruby-dev:21137]
+Mon Aug 25 11:53:11 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/mkmf.rb (Logging::postpone): postpone logging messages after
-	  heading message as the result of the block.
+	* version 1.1 alpha2 released.
 
-	* lib/mkmf.rb (macro_defined?): append newline to src unless ended
-	  with it.
+	* sample/ruby-mode.el (ruby-parse-region): auto-indent now
+ 	  supports "\\" in the strings.
 
-	* lib/mkmf.rb (have_library): treat nil function name as "main".
-	  (ruby-bugs:PR#1083)
+	* struct.c (struct_getmember): new API to get member value from C
+	  language side.
 
-	* lib/mkmf.rb (pkg_config): should append additional libraries to
-	  $libs but not $LIBS.  [ruby-dev:21137]
+Sat Aug 23 21:39:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/io/wait/extconf.rb: check DOSISH macro instead of platform.
+	* parse.y (asignable): remove unnecessary local variable
+	  initialize by nil.
 
-	* ext/digest/sha1/extconf.rb: have_library already appends library
-	  name.
+Fri Aug 22 14:26:40 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug  6 17:23:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (error_print): modified exception print format.
 
-	* eval.c: initialize /* OK */ variables by Qnil to stop warnings.
+Thu Aug 21 16:10:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug  6 04:58:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+	* sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
+	  calculated with keyword operators.
 
-	* ext/Setup*: add io/wait and openssl.
+Thu Aug 21 11:36:58 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Wed Aug  6 01:13:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (arg): ary[0] += 1 cause SEGV
 
-	* eval.c (rb_f_autoload): use ruby_cbase instead of ruby_class.
+Wed Aug 20 17:28:50 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_f_autoload_p): ditto.
+	* ruby.c (ruby_process_options): require() all modules after
+ 	  processing all options
 
-	* class.c (rb_mod_init_copy): no longer implements independent
-	  clone and dup methods.  override "initialize_copy" instead.
-	  [ruby-core:01352]
+	* process.c (rb_proc_exec): more security checks added.
 
-	* object.c (rb_class_s_alloc): define Class allocation function.
-	  this makes Classes to follow clone framework that uses
-	  initialize_copy.
+	* process.c (rb_proc_exec): insecure path on exec.
 
-	* object.c (rb_class_initialize): separate instantiation and
-	  initialization.
+	* hash.c (f_getenv): PATH modification security check.
 
-	* object.c (rb_obj_alloc): prohibit instantiation from
-	  uninitialized class.
+Tue Aug 19 00:15:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* object.c (rb_class_superclass): check uninitialized class.
+	* version 1.1 alpha1 released.
 
-	* array.c (rb_ary_fill): wrong index processing with block.  this
-	  fix was done by Koji Arai <JCA02266@nifty.ne.jp> [ruby-list:38029]
+	* eval.c (mod_eval): work as normal eval() if second binding
+ 	  argument given.
 
-	* marshal.c (w_object): should preserve generic ivar for nil,
-	  true, false, symbols, and fixnums.
+	* eval.c (rb_call): did not raise ArgumentError if too many
+ 	  arguments more than optional arguments (without rest arg).
 
-	* marshal.c (w_uclass): base_klass check should be done after
-	  rb_class_real().
+	* eval.c (rb_eval): did not work well for op_asgn2 (attribute
+	  self assignment).
 
-Wed Aug  6 01:18:50 2003  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (Init_Thread): returns main thread.
 
-	* lib/net/http.rb: update document.
+Mon Aug 18 09:25:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/pop.rb: ditto.
+	* object.c (inspect_i): did not display T_DATA instance variables.
 
-	* lib/net/protocol.rb: ditto.
+	* parse.y: provides more accurate line number information.
 
-Wed Aug  6 00:48:37 2003  Koji Arai  <jca02266@nifty.ne.jp>
+	* eval.c (thread_value): include value's backtrace information in
+	  the variable `$@'. 
 
-	* marshal.c (w_object): should recommend marshal_dump rather than
-	  _dump_data.
+	* eval.c (f_abort): print backtrace and exit.
 
-Tue Aug  5 17:58:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Aug 16 00:17:44 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/fileutils.rb (install): should preserve timestamp only.
+	* eval.c (class_new_instance): do not make instance from virtual
+	  classes. 
 
-Tue Aug  5 17:31:59 2003  Ian Macdonald  <ian@caliban.org>
+	* object.c (class_s_new): do not make subclass of singleton class.
 
-	* lib/shell/command-processor.rb (Shell::CommandProcessor::rmdir):
-	  simple typo.
+Fri Aug 15 15:49:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Aug  5 15:47:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (call_trace_func): block context switch in the trace
+          function.
 
-	* eval.c (rb_load): should preserve current source file/line.
+	* eval.c (rb_eval): clear method cache at class extention.
 
-Tue Aug  5 10:04:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* object.c (obj_type): returns object's class even if it defines
+	  singleton methods.
 
-	* string.c (str_new4): ptr may refer null_str.
+Fri Aug 15 19:40:43 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Mon Aug  4 17:25:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/socket.c (Init_socket): small typo caused SEGV.
 
-	* stable version 1.8.0 released.
+Wed Aug 13 17:51:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-For the changes before 1.8.0, see doc/ChangeLog-1.8.0
+	* version 1.1 alpha0 released.
 
-Local variables:
-add-log-time-format: (lambda ()
-  (let* ((time (current-time))
-	 (diff (+ (cadr time) 32400))
-	 (lo (% diff 65536))
-	 (hi  (+ (car time) (/ diff 65536))))
-  (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-end:
diff --git a/GPL b/GPL
deleted file mode 100644
index 5b6e7c66c2..0000000000
--- a/GPL
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/LEGAL b/LEGAL
deleted file mode 100644
index dce7c1acbf..0000000000
--- a/LEGAL
+++ /dev/null
@@ -1,371 +0,0 @@
-LEGAL NOTICE INFORMATION
-------------------------
-
-All the files in this distribution are covered under either the Ruby's
-license (see the file COPYING) or public-domain except some files
-mentioned below.
-
-regex.[ch]:
-
-  These files are under LGPL.  Treat them as LGPL says. (See the file
-  LGPL for details)
-
-    Extended regular expression matching and search library.
-    Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
-
-    The GNU C Library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public License as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.
-
-    The GNU C Library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with the GNU C Library; see the file LGPL.  If not,
-    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.  */
-
-    Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-    Last change: May 21, 1993 by t^2
-    removed gapped buffer support, multiple syntax support by matz <matz@nts.co.jp>
-    Perl5 extension added by matz <matz@caelum.co.jp>
-    UTF-8 extension added Jan 16 1999 by Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
-
-configure:
-
-  This file is free software.
-
-    Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-
-    This configure script is free software; the Free Software Foundation
-    gives unlimited permission to copy, distribute and modify it.
-
-config.guess:
-config.sub:
-parse.c:
-
-  As long as you distribute these files with the file configure, they
-  are covered under the Ruby's license.
-
-      Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
-      Free Software Foundation, Inc.
-
-    This file is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-    As a special exception to the GNU General Public License, if you
-    distribute this file as part of a program that contains a
-    configuration script generated by Autoconf, you may include it under
-    the same distribution terms that you use for the rest of that program.
-
-util.c (partly):
-win32/win32.[ch]:
-
-  You can apply the Artistic License to these files. (or GPL,
-  alternatively)
-
-    Copyright (c) 1993, Intergraph Corporation
-
-    You may distribute under the terms of either the GNU General Public
-    License or the Artistic License, as specified in the perl README file.
-
-random.c
-
-  This file is under the new-style BSD license.
-
-    A C-program for MT19937, with initialization improved 2002/2/10.
-    Coded by Takuji Nishimura and Makoto Matsumoto.
-    This is a faster version by taking Shawn Cokus's optimization,
-    Matthe Bellew's simplification, Isaku Wada's real version.
-
-    Before using, initialize the state by using init_genrand(seed) 
-    or init_by_array(init_key, key_length).
-
-    Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-    All rights reserved.                          
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-      1. Redistributions of source code must retain the above copyright
-	 notice, this list of conditions and the following disclaimer.
-
-      2. Redistributions in binary form must reproduce the above copyright
-	 notice, this list of conditions and the following disclaimer in the
-	 documentation and/or other materials provided with the distribution.
-
-      3. The names of its contributors may not be used to endorse or promote 
-	 products derived from this software without specific prior written 
-	 permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-    Any feedback is very welcome.
-    http://www.math.keio.ac.jp/matumoto/emt.html
-    email: matumoto@math.keio.ac.jp
-
-st.[ch]:
-x68/*:
-missing/alloca.c:
-missing/dup2.c:
-missing/erf.c:
-missing/finite.c:
-missing/hypot.c:
-missing/isinf.c:
-missing/isnan.c:
-missing/memcmp.c:
-missing/memmove.c:
-missing/mkdir.c:
-missing/strcasecmp.c:
-missing/strchr.c:
-missing/streror.c:
-missing/strftime.c:
-missing/strncasecmp.c:
-missing/strstr.c:
-missing/strtol.c:
-ext/digest/sha1/sha1.[ch]:
-
-  These files are all under public domain.
-
-missing/strtod.c:
-
-  This file will not be used on most platforms depending on how the
-  configure script results.  In any case you must not receive any fee
-  with the file itself.
-
-    Copyright (c) 1988-1993 The Regents of the University of California.
-    Copyright (c) 1994 Sun Microsystems, Inc.
-
-    Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without
-    fee is hereby granted, provided that the above copyright
-    notice appear in all copies.  The University of California
-    makes no representations about the suitability of this
-    software for any purpose.  It is provided "as is" without
-    express or implied warranty.
-
-missing/strtoul.c:
-
-  This file will not be used on most platforms depending on how the
-  configure script results.  In any case you must not receive any fee
-  with the file itself.
-
-    Copyright 1988 Regents of the University of California
-
-    Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without
-    fee is hereby granted, provided that the above copyright
-    notice appear in all copies.  The University of California
-    makes no representations about the suitability of this
-    software for any purpose.  It is provided "as is" without
-    express or implied warranty.
-
-missing/vsnprintf.c:
-
-  This file is under the old-style BSD license.  Note that the
-  paragraph 3 below is now null and void.
-
-    Copyright (c) 1990, 1993
-         The Regents of the University of California.  All rights reserved.
-
-    This code is derived from software contributed to Berkeley by
-    Chris Torek.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. All advertising materials mentioning features or use of this software
-       must display the following acknowledgement:
-         This product includes software developed by the University of
-         California, Berkeley and its contributors.
-    4. Neither the name of the University nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-    IMPORTANT NOTE:
-    --------------
-    From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-    paragraph 3 above is now null and void.
-
-ext/digest/md5/md5.[ch]:
-
-  These files are under the following license.  Ruby uses modified
-  versions of them.
-
-    Copyright (C) 1999, 2000 Aladdin Enterprises.  All rights reserved.
-
-    This software is provided 'as-is', without any express or implied
-    warranty.  In no event will the authors be held liable for any damages
-    arising from the use of this software.
-
-    Permission is granted to anyone to use this software for any purpose,
-    including commercial applications, and to alter it and redistribute it
-    freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-       claim that you wrote the original software. If you use this software
-       in a product, an acknowledgment in the product documentation would be
-       appreciated but is not required.
-    2. Altered source versions must be plainly marked as such, and must not be
-       misrepresented as being the original software.
-    3. This notice may not be removed or altered from any source distribution.
-
-    L. Peter Deutsch
-    ghost@aladdin.com
-
-ext/digest/rmd160/rmd160.[ch]:
-
-  These files have the following copyright information, and by the
-  author we are allowed to use it under the new-style BSD license.
-
-    AUTHOR:   Antoon Bosselaers, ESAT-COSIC
-              (Arranged for libc by Todd C. Miller)
-    DATE:     1 March 1996
-
-    Copyright (c) Katholieke Universiteit Leuven
-    1996, All Rights Reserved
-
-ext/digest/rmd160/rmd160hl.c:
-ext/digest/sha1/sha1hl.c:
-
-  These files are under the beer-ware license.
-
-    "THE BEER-WARE LICENSE" (Revision 42):
-    <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
-    can do whatever you want with this stuff. If we meet some day, and you think
-    this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
-
-ext/digest/sha2/sha2.[ch]:
-ext/digest/sha2/sha2hl.c:
-
-  These files are under the new-style BSD license.
-
-    Copyright 2000 Aaron D. Gifford.  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holder nor the names of contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-ext/nkf/nkf1.7/nkf.c:
-
-  This file is under the following license.  So to speak, it is
-  copyrighted semi-public-domain software.
-
-    Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
-       Everyone is permitted to do anything on this program 
-       including copying, modifying, improving.
-       as long as you don't try to pretend that you wrote it.
-       i.e., the above copyright notice has to appear in all copies.
-       You don't have to ask before copying or publishing.
-       THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
-
-ext/socket/addrinfo.h:
-ext/socket/getaddrinfo.c:
-ext/socket/getnameinfo.c:
-
-  These files are under the new-style BSD license.
-
-    Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the project nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-ext/win32ole/win32ole.c:
-
-  You can apply the Artistic License to this file. (or GPL,
-  alternatively)
-
-    (c) 1995 Microsoft Corporation. All rights reserved.
-    Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
-
-    Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
-    <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
- 
-    You may distribute under the terms of either the GNU General Public
-    License or the Artistic License, as specified in the README file
-    of the Perl distribution.
diff --git a/LGPL b/LGPL
deleted file mode 100644
index b1e3f5a263..0000000000
--- a/LGPL
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/MANIFEST b/MANIFEST
index 78df503fe6..d3ff22e14e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,24 +1,24 @@
 COPYING
-COPYING.ja
+COPYING.LIB
 ChangeLog
-GPL
-LEGAL
-LGPL
 MANIFEST
 Makefile.in
 README
+README.jp
 README.EXT
-README.EXT.ja
-README.ja
+README.EXT.jp
 ToDo
 array.c
 bignum.c
 class.c
 compar.c
-config.guess
-config.sub
 configure
+configure.bat
 configure.in
+config_h.dj
+config_s.dj
+config.guess
+config.sub
 defines.h
 dir.c
 dln.c
@@ -32,7 +32,6 @@ file.c
 gc.c
 hash.c
 inits.c
-install-sh
 instruby.rb
 intern.h
 io.c
@@ -41,8 +40,6 @@ lex.c
 main.c
 marshal.c
 math.c
-mdoc2man.rb
-missing.h
 mkconfig.rb
 node.h
 numeric.c
@@ -71,427 +68,85 @@ st.h
 string.c
 struct.c
 time.c
-util.c
+top.sed
 util.h
+util.c
 variable.c
 version.c
 version.h
-bcc32/Makefile.sub
-bcc32/README.bcc32
-bcc32/configure.bat
-bcc32/mkexports.rb
-bcc32/setup.mak
-bin/erb
-bin/irb
+beos/ruby.def.in
 cygwin/GNUmakefile.in
-djgpp/GNUmakefile.in
-djgpp/README.djgpp
-djgpp/config.hin
-djgpp/config.sed
-djgpp/configure.bat
-djgpp/mkver.sed
-doc/ChangeLog-1.8.0
-doc/NEWS
-doc/forwardable.rd
-doc/forwardable.rd.ja
-doc/irb/irb-tools.rd.ja
-doc/irb/irb.rd
-doc/irb/irb.rd.ja
-doc/shell.rd
-doc/shell.rd.ja
 ext/Setup
-ext/Setup.atheos
 ext/Setup.dj
 ext/Setup.emx
 ext/Setup.nt
 ext/Setup.x68
-ext/extmk.rb
+ext/aix_mksym.rb
+ext/cygwin32_ld.rb
+ext/extmk.rb.in
+ext/extmk.rb.nt
+lib/CGI.rb
 lib/English.rb
 lib/Env.rb
 lib/README
-lib/abbrev.rb
 lib/base64.rb
-lib/benchmark.rb
 lib/cgi-lib.rb
-lib/cgi.rb
-lib/cgi/session.rb
-lib/cgi/session/pstore.rb
 lib/complex.rb
-lib/csv.rb
 lib/date.rb
-lib/date/format.rb
 lib/date2.rb
 lib/debug.rb
 lib/delegate.rb
-lib/drb.rb
-lib/drb/acl.rb
-lib/drb/drb.rb
-lib/drb/eq.rb
-lib/drb/extserv.rb
-lib/drb/extservm.rb
-lib/drb/gw.rb
-lib/drb/invokemethod.rb
-lib/drb/observer.rb
-lib/drb/ssl.rb
-lib/drb/timeridconv.rb
-lib/drb/unix.rb
 lib/e2mmap.rb
-lib/erb.rb
 lib/eregex.rb
-lib/fileutils.rb
-lib/finalize.rb
 lib/find.rb
-lib/forwardable.rb
+lib/final.rb
+lib/finalize.rb
+lib/ftplib.rb
 lib/ftools.rb
-lib/generator.rb
-lib/getoptlong.rb
 lib/getopts.rb
-lib/gserver.rb
+lib/getoptlong.rb
 lib/importenv.rb
-lib/ipaddr.rb
-lib/irb.rb
-lib/irb/cmd/chws.rb
-lib/irb/cmd/fork.rb
-lib/irb/cmd/load.rb
-lib/irb/cmd/nop.rb
-lib/irb/cmd/pushws.rb
-lib/irb/cmd/subirb.rb
-lib/irb/completion.rb
-lib/irb/context.rb
-lib/irb/ext/change-ws.rb
-lib/irb/ext/history.rb
-lib/irb/ext/loader.rb
-lib/irb/ext/math-mode.rb
-lib/irb/ext/multi-irb.rb
-lib/irb/ext/tracer.rb
-lib/irb/ext/use-loader.rb
-lib/irb/ext/workspaces.rb
-lib/irb/extend-command.rb
-lib/irb/frame.rb
-lib/irb/help.rb
-lib/irb/init.rb
-lib/irb/input-method.rb
-lib/irb/lc/error.rb
-lib/irb/lc/help-message
-lib/irb/lc/ja/error.rb
-lib/irb/lc/ja/help-message
-lib/irb/locale.rb
-lib/irb/ruby-lex.rb
-lib/irb/ruby-token.rb
-lib/irb/slex.rb
-lib/irb/version.rb
-lib/irb/workspace.rb
-lib/irb/ws-for-case-2.rb
-lib/irb/xmp.rb
 lib/jcode.rb
-lib/logger.rb
 lib/mailread.rb
 lib/mathn.rb
 lib/matrix.rb
 lib/mkmf.rb
 lib/monitor.rb
 lib/mutex_m.rb
-lib/net/ftp.rb
-lib/net/http.rb
-lib/net/imap.rb
-lib/net/pop.rb
-lib/net/protocol.rb
-lib/net/smtp.rb
-lib/net/telnet.rb
 lib/observer.rb
-lib/open-uri.rb
 lib/open3.rb
-lib/optparse.rb
-lib/optparse/date.rb
-lib/optparse/shellwords.rb
-lib/optparse/time.rb
-lib/optparse/uri.rb
-lib/optparse/version.rb
 lib/ostruct.rb
 lib/parsearg.rb
 lib/parsedate.rb
-lib/pathname.rb
 lib/ping.rb
-lib/pp.rb
-lib/prettyprint.rb
 lib/profile.rb
-lib/profiler.rb
 lib/pstore.rb
-lib/racc/parser.rb
 lib/rational.rb
 lib/readbytes.rb
-lib/resolv-replace.rb
-lib/resolv.rb
-lib/rexml/attlistdecl.rb
-lib/rexml/attribute.rb
-lib/rexml/cdata.rb
-lib/rexml/child.rb
-lib/rexml/comment.rb
-lib/rexml/doctype.rb
-lib/rexml/document.rb
-lib/rexml/dtd/attlistdecl.rb
-lib/rexml/dtd/dtd.rb
-lib/rexml/dtd/elementdecl.rb
-lib/rexml/dtd/entitydecl.rb
-lib/rexml/dtd/notationdecl.rb
-lib/rexml/element.rb
-lib/rexml/encoding.rb
-lib/rexml/encodings/EUC-JP.rb
-lib/rexml/encodings/ICONV.rb
-lib/rexml/encodings/ISO-8859-1.rb
-lib/rexml/encodings/SHIFT-JIS.rb
-lib/rexml/encodings/SHIFT_JIS.rb
-lib/rexml/encodings/UNILE.rb
-lib/rexml/encodings/US-ASCII.rb
-lib/rexml/encodings/UTF-16.rb
-lib/rexml/encodings/UTF-8.rb
-lib/rexml/entity.rb
-lib/rexml/functions.rb
-lib/rexml/instruction.rb
-lib/rexml/light/node.rb
-lib/rexml/namespace.rb
-lib/rexml/node.rb
-lib/rexml/output.rb
-lib/rexml/parent.rb
-lib/rexml/parseexception.rb
-lib/rexml/parsers/baseparser.rb
-lib/rexml/parsers/lightparser.rb
-lib/rexml/parsers/pullparser.rb
-lib/rexml/parsers/sax2parser.rb
-lib/rexml/parsers/streamparser.rb
-lib/rexml/parsers/ultralightparser.rb
-lib/rexml/parsers/xpathparser.rb
-lib/rexml/quickpath.rb
-lib/rexml/rexml.rb
-lib/rexml/sax2listener.rb
-lib/rexml/source.rb
-lib/rexml/streamlistener.rb
-lib/rexml/text.rb
-lib/rexml/xmldecl.rb
-lib/rexml/xmltokens.rb
-lib/rexml/xpath.rb
-lib/rexml/xpath_parser.rb
-lib/rinda/rinda.rb
-lib/rinda/ring.rb
-lib/rinda/tuplespace.rb
-lib/rubyunit.rb
-lib/runit/assert.rb
-lib/runit/cui/testrunner.rb
-lib/runit/error.rb
-lib/runit/testcase.rb
-lib/runit/testresult.rb
-lib/runit/testsuite.rb
-lib/runit/topublic.rb
-lib/scanf.rb
-lib/set.rb
-lib/shell.rb
-lib/shell/builtin-command.rb
-lib/shell/command-processor.rb
-lib/shell/error.rb
-lib/shell/filter.rb
-lib/shell/process-controller.rb
-lib/shell/system-command.rb
-lib/shell/version.rb
 lib/shellwords.rb
 lib/singleton.rb
-lib/soap/baseData.rb
-lib/soap/element.rb
-lib/soap/encodingstyle/aspDotNetHandler.rb
-lib/soap/encodingstyle/handler.rb
-lib/soap/encodingstyle/literalHandler.rb
-lib/soap/encodingstyle/soapHandler.rb
-lib/soap/generator.rb
-lib/soap/mapping.rb
-lib/soap/mapping/factory.rb
-lib/soap/mapping/mapping.rb
-lib/soap/mapping/registry.rb
-lib/soap/mapping/rubytypeFactory.rb
-lib/soap/mapping/typeMap.rb
-lib/soap/mapping/wsdlRegistry.rb
-lib/soap/marshal.rb
-lib/soap/netHttpClient.rb
-lib/soap/parser.rb
-lib/soap/processor.rb
-lib/soap/rpc/cgistub.rb
-lib/soap/rpc/driver.rb
-lib/soap/rpc/element.rb
-lib/soap/rpc/proxy.rb
-lib/soap/rpc/router.rb
-lib/soap/rpc/rpc.rb
-lib/soap/rpc/soaplet.rb
-lib/soap/rpc/standaloneServer.rb
-lib/soap/soap.rb
-lib/soap/streamHandler.rb
-lib/soap/wsdlDriver.rb
 lib/sync.rb
+lib/telnet.rb
 lib/tempfile.rb
-lib/test/unit.rb
-lib/test/unit/assertionfailederror.rb
-lib/test/unit/assertions.rb
-lib/test/unit/autorunner.rb
-lib/test/unit/collector.rb
-lib/test/unit/collector/dir.rb
-lib/test/unit/collector/objectspace.rb
-lib/test/unit/error.rb
-lib/test/unit/failure.rb
-lib/test/unit/testcase.rb
-lib/test/unit/testresult.rb
-lib/test/unit/testsuite.rb
-lib/test/unit/ui/console/testrunner.rb
-lib/test/unit/ui/fox/testrunner.rb
-lib/test/unit/ui/gtk/testrunner.rb
-lib/test/unit/ui/testrunnermediator.rb
-lib/test/unit/ui/testrunnerutilities.rb
-lib/test/unit/util/backtracefilter.rb
-lib/test/unit/util/observable.rb
-lib/test/unit/util/procwrapper.rb
 lib/thread.rb
 lib/thwait.rb
-lib/time.rb
 lib/timeout.rb
-lib/tmpdir.rb
 lib/tracer.rb
-lib/tsort.rb
-lib/un.rb
-lib/uri.rb
-lib/uri/common.rb
-lib/uri/ftp.rb
-lib/uri/generic.rb
-lib/uri/http.rb
-lib/uri/https.rb
-lib/uri/ldap.rb
-lib/uri/mailto.rb
 lib/weakref.rb
-lib/webrick.rb
-lib/webrick/accesslog.rb
-lib/webrick/compat.rb
-lib/webrick/config.rb
-lib/webrick/cookie.rb
-lib/webrick/htmlutils.rb
-lib/webrick/httpauth.rb
-lib/webrick/httpauth/authenticator.rb
-lib/webrick/httpauth/basicauth.rb
-lib/webrick/httpauth/digestauth.rb
-lib/webrick/httpauth/htdigest.rb
-lib/webrick/httpauth/htgroup.rb
-lib/webrick/httpauth/htpasswd.rb
-lib/webrick/httpauth/userdb.rb
-lib/webrick/httpproxy.rb
-lib/webrick/httprequest.rb
-lib/webrick/httpresponse.rb
-lib/webrick/https.rb
-lib/webrick/httpserver.rb
-lib/webrick/httpservlet.rb
-lib/webrick/httpservlet/abstract.rb
-lib/webrick/httpservlet/cgi_runner.rb
-lib/webrick/httpservlet/cgihandler.rb
-lib/webrick/httpservlet/erbhandler.rb
-lib/webrick/httpservlet/filehandler.rb
-lib/webrick/httpservlet/prochandler.rb
-lib/webrick/httpstatus.rb
-lib/webrick/httputils.rb
-lib/webrick/httpversion.rb
-lib/webrick/log.rb
-lib/webrick/server.rb
-lib/webrick/ssl.rb
-lib/webrick/utils.rb
-lib/webrick/version.rb
-lib/wsdl/binding.rb
-lib/wsdl/data.rb
-lib/wsdl/definitions.rb
-lib/wsdl/documentation.rb
-lib/wsdl/import.rb
-lib/wsdl/importer.rb
-lib/wsdl/info.rb
-lib/wsdl/message.rb
-lib/wsdl/operation.rb
-lib/wsdl/operationBinding.rb
-lib/wsdl/param.rb
-lib/wsdl/parser.rb
-lib/wsdl/part.rb
-lib/wsdl/port.rb
-lib/wsdl/portType.rb
-lib/wsdl/service.rb
-lib/wsdl/soap/address.rb
-lib/wsdl/soap/binding.rb
-lib/wsdl/soap/body.rb
-lib/wsdl/soap/complexType.rb
-lib/wsdl/soap/data.rb
-lib/wsdl/soap/definitions.rb
-lib/wsdl/soap/fault.rb
-lib/wsdl/soap/header.rb
-lib/wsdl/soap/headerfault.rb
-lib/wsdl/soap/operation.rb
-lib/wsdl/types.rb
-lib/wsdl/wsdl.rb
-lib/wsdl/xmlSchema/all.rb
-lib/wsdl/xmlSchema/any.rb
-lib/wsdl/xmlSchema/attribute.rb
-lib/wsdl/xmlSchema/choice.rb
-lib/wsdl/xmlSchema/complexContent.rb
-lib/wsdl/xmlSchema/complexType.rb
-lib/wsdl/xmlSchema/content.rb
-lib/wsdl/xmlSchema/data.rb
-lib/wsdl/xmlSchema/element.rb
-lib/wsdl/xmlSchema/import.rb
-lib/wsdl/xmlSchema/parser.rb
-lib/wsdl/xmlSchema/schema.rb
-lib/wsdl/xmlSchema/sequence.rb
-lib/wsdl/xmlSchema/unique.rb
-lib/xmlrpc/base64.rb
-lib/xmlrpc/client.rb
-lib/xmlrpc/config.rb
-lib/xmlrpc/create.rb
-lib/xmlrpc/datetime.rb
-lib/xmlrpc/httpserver.rb
-lib/xmlrpc/marshal.rb
-lib/xmlrpc/parser.rb
-lib/xmlrpc/server.rb
-lib/xmlrpc/utils.rb
-lib/xsd/charset.rb
-lib/xsd/datatypes.rb
-lib/xsd/datatypes1999.rb
-lib/xsd/iconvcharset.rb
-lib/xsd/namedelements.rb
-lib/xsd/ns.rb
-lib/xsd/qname.rb
-lib/xsd/xmlparser.rb
-lib/xsd/xmlparser/parser.rb
-lib/xsd/xmlparser/rexmlparser.rb
-lib/xsd/xmlparser/xmlparser.rb
-lib/xsd/xmlparser/xmlscanner.rb
-lib/yaml.rb
-lib/yaml/baseemitter.rb
-lib/yaml/basenode.rb
-lib/yaml/constants.rb
-lib/yaml/dbm.rb
-lib/yaml/emitter.rb
-lib/yaml/encoding.rb
-lib/yaml/error.rb
-lib/yaml/loader.rb
-lib/yaml/rubytypes.rb
-lib/yaml/store.rb
-lib/yaml/stream.rb
-lib/yaml/stringio.rb
-lib/yaml/syck.rb
-lib/yaml/types.rb
-lib/yaml/yamlnode.rb
-lib/yaml/ypath.rb
 misc/README
 misc/inf-ruby.el
 misc/ruby-mode.el
 misc/rubydb2x.el
 misc/rubydb3x.el
-missing/acosh.c
 missing/alloca.c
 missing/crypt.c
+missing/dir.h
 missing/dup2.c
-missing/erf.c
 missing/file.h
-missing/fileblocks.c
 missing/finite.c
 missing/flock.c
-missing/hypot.c
+missing/fnmatch.c
+missing/fnmatch.h
 missing/isinf.c
 missing/isnan.c
 missing/memcmp.c
@@ -499,10 +154,11 @@ missing/memmove.c
 missing/mkdir.c
 missing/os2.c
 missing/strcasecmp.c
+missing/strncasecmp.c
 missing/strchr.c
+missing/strdup.c
 missing/strerror.c
 missing/strftime.c
-missing/strncasecmp.c
 missing/strstr.c
 missing/strtod.c
 missing/strtol.c
@@ -536,9 +192,6 @@ sample/less.rb
 sample/list.rb
 sample/list2.rb
 sample/list3.rb
-sample/logger/app.rb
-sample/logger/log.rb
-sample/logger/shifting.rb
 sample/mine.rb
 sample/mkproto.rb
 sample/mpart.rb
@@ -547,233 +200,32 @@ sample/observ.rb
 sample/occur.pl
 sample/occur.rb
 sample/occur2.rb
-sample/openssl/c_rehash.rb
-sample/openssl/cert2text.rb
-sample/openssl/cert_store_view.rb
-sample/openssl/certstore.rb
-sample/openssl/cipher.rb
-sample/openssl/crlstore.rb
-sample/openssl/echo_cli.rb
-sample/openssl/echo_svr.rb
-sample/openssl/gen_csr.rb
-sample/openssl/smime_read.rb
-sample/openssl/smime_write.rb
-sample/openssl/wget.rb
 sample/philos.rb
 sample/pi.rb
+sample/rename.rb
+sample/rbc.rb
 sample/rcs.awk
 sample/rcs.dat
 sample/rcs.rb
+sample/rd2html.rb
 sample/regx.rb
 sample/sieve.rb
-sample/soap/babelfish.rb
-sample/soap/calc/calc.rb
-sample/soap/calc/calc2.rb
-sample/soap/calc/client.rb
-sample/soap/calc/client2.rb
-sample/soap/calc/httpd.rb
-sample/soap/calc/server.cgi
-sample/soap/calc/server.rb
-sample/soap/calc/server2.rb
-sample/soap/digraph.rb
-sample/soap/exchange/client.rb
-sample/soap/exchange/exchange.rb
-sample/soap/exchange/httpd.rb
-sample/soap/exchange/server.cgi
-sample/soap/exchange/server.rb
-sample/soap/helloworld/hw_c.rb
-sample/soap/helloworld/hw_s.rb
-sample/soap/icd/IICD.rb
-sample/soap/icd/icd.rb
-sample/soap/raa/iRAA.rb
-sample/soap/raa/soap4r.rb
-sample/soap/sampleStruct/client.rb
-sample/soap/sampleStruct/httpd.rb
-sample/soap/sampleStruct/iSampleStruct.rb
-sample/soap/sampleStruct/sampleStruct.rb
-sample/soap/sampleStruct/server.cgi
-sample/soap/sampleStruct/server.rb
 sample/svr.rb
 sample/test.rb
-sample/testunit/adder.rb
-sample/testunit/subtracter.rb
-sample/testunit/tc_adder.rb
-sample/testunit/tc_subtracter.rb
-sample/testunit/ts_examples.rb
 sample/time.rb
 sample/trojan.rb
 sample/tsvr.rb
 sample/uumerge.rb
-sample/wsdl/amazon/AmazonSearch.rb
-sample/wsdl/amazon/AmazonSearchDriver.rb
-sample/wsdl/amazon/sampleClient.rb
-sample/wsdl/amazon/wsdlDriver.rb
-sample/wsdl/googleSearch/GoogleSearch.rb
-sample/wsdl/googleSearch/GoogleSearchDriver.rb
-sample/wsdl/googleSearch/README
-sample/wsdl/googleSearch/httpd.rb
-sample/wsdl/googleSearch/sampleClient.rb
-sample/wsdl/googleSearch/sjissearch.sh
-sample/wsdl/googleSearch/wsdlDriver.rb
-sample/wsdl/raa/raa.wsdl
-sample/wsdl/raa/soap4r.rb
-test/csv/bom.csv
-test/csv/mac.csv
-test/csv/test_csv.rb
-test/digest/test_digest.rb
-test/drb/drbtest.rb
-test/drb/test_acl.rb
-test/drb/test_drb.rb
-test/drb/test_drbssl.rb
-test/drb/test_drbunix.rb
-test/drb/ut_array.rb
-test/drb/ut_array_drbssl.rb
-test/drb/ut_array_drbunix.rb
-test/drb/ut_drb.rb
-test/drb/ut_drb_drbssl.rb
-test/drb/ut_drb_drbunix.rb
-test/drb/ut_eval.rb
-test/drb/ut_large.rb
-test/drb/ut_port.rb
-test/drb/ut_safe1.rb
-test/drb/ut_timerholder.rb
-test/fileutils/fileasserts.rb
-test/fileutils/test_fileutils.rb
-test/fileutils/test_nowrite.rb
-test/logger/test_logger.rb
-test/ostruct/test_ostruct.rb
-test/ruby/beginmainend.rb
-test/ruby/endblockwarn.rb
-test/ruby/envutil.rb
-test/ruby/test_alias.rb
-test/ruby/test_array.rb
-test/ruby/test_assignment.rb
-test/ruby/test_beginendblock.rb
-test/ruby/test_bignum.rb
-test/ruby/test_call.rb
-test/ruby/test_case.rb
-test/ruby/test_clone.rb
-test/ruby/test_condition.rb
-test/ruby/test_const.rb
-test/ruby/test_defined.rb
-test/ruby/test_eval.rb
-test/ruby/test_exception.rb
-test/ruby/test_file.rb
-test/ruby/test_float.rb
-test/ruby/test_gc.rb
-test/ruby/test_hash.rb
-test/ruby/test_ifunless.rb
-test/ruby/test_iterator.rb
-test/ruby/test_marshal.rb
-test/ruby/test_math.rb
-test/ruby/test_pack.rb
-test/ruby/test_path.rb
-test/ruby/test_proc.rb
-test/ruby/test_range.rb
-test/ruby/test_signal.rb
-test/ruby/test_stringchar.rb
-test/ruby/test_struct.rb
-test/ruby/test_system.rb
-test/ruby/test_trace.rb
-test/ruby/test_variable.rb
-test/ruby/test_whileuntil.rb
-test/runner.rb
-test/soap/calc/calc.rb
-test/soap/calc/calc2.rb
-test/soap/calc/server.cgi
-test/soap/calc/server.rb
-test/soap/calc/server2.rb
-test/soap/calc/test_calc.rb
-test/soap/calc/test_calc2.rb
-test/soap/calc/test_calc_cgi.rb
-test/soap/helloworld/hw_s.rb
-test/soap/helloworld/test_helloworld.rb
-test/soap/marshal/cmarshal.rb
-test/soap/marshal/test_digraph.rb
-test/soap/marshal/test_marshal.rb
-test/soap/marshal/test_struct.rb
-test/soap/test_basetype.rb
-test/soap/test_soapelement.rb
-test/strscan/test_stringscanner.rb
-test/testunit/collector/test_dir.rb
-test/testunit/collector/test_objectspace.rb
-test/testunit/runit/test_assert.rb
-test/testunit/runit/test_testcase.rb
-test/testunit/runit/test_testresult.rb
-test/testunit/runit/test_testsuite.rb
-test/testunit/test_assertions.rb
-test/testunit/test_error.rb
-test/testunit/test_failure.rb
-test/testunit/test_testcase.rb
-test/testunit/test_testresult.rb
-test/testunit/test_testsuite.rb
-test/testunit/util/test_backtracefilter.rb
-test/testunit/util/test_observable.rb
-test/testunit/util/test_procwrapper.rb
-test/uri/test_common.rb
-test/uri/test_ftp.rb
-test/uri/test_generic.rb
-test/uri/test_http.rb
-test/uri/test_ldap.rb
-test/uri/test_mailto.rb
-test/wsdl/emptycomplextype.wsdl
-test/wsdl/test_emptycomplextype.rb
-test/xsd/test_xmlschemaparser.rb
-test/xsd/test_xsd.rb
-test/xsd/xmlschema.xml
-test/yaml/test_yaml.rb
-vms/config.h_in
-vms/vms.h
-win32/Makefile.sub
-win32/README.win32
-win32/configure.bat
-win32/dir.h
-win32/mkexports.rb
-win32/resource.rb
-win32/setup.mak
+win32/Makefile
+win32/config.h
+win32/config.status
+win32/ntsetup.bat
+win32/ruby.def
+win32/sdbm.c
+win32/sdbm.h
 win32/win32.c
 win32/win32.h
-win32/winmain.c
-wince/Makefile.sub
-wince/README.wince
-wince/assert.c
-wince/assert.h
-wince/configure.bat
-wince/direct.c
-wince/direct.h
-wince/errno.c
-wince/errno.h
-wince/fcntl.h
-wince/io.h
-wince/io_wce.c
-wince/mkconfig_wce.rb
-wince/mkexports.rb
-wince/process.h
-wince/process_wce.c
-wince/resource.rb
-wince/setup.mak
-wince/signal.h
-wince/signal_wce.c
-wince/stddef.h
-wince/stdio.c
-wince/stdlib.c
-wince/string_wce.c
-wince/sys/stat.c
-wince/sys/stat.h
-wince/sys/timeb.c
-wince/sys/timeb.h
-wince/sys/types.h
-wince/sys/utime.c
-wince/sys/utime.h
-wince/time.h
-wince/time_wce.c
-wince/varargs.h
-wince/wince.c
-wince/wince.h
-wince/wincemain.c
-wince/wincon.h
-wince/winsock2.c
-x68/_dtos18.c
-x68/_round.c
 x68/fconvert.c
 x68/select.c
+x68/_dtos18.c
+x68/_round.c
diff --git a/Makefile.in b/Makefile.in
index 13de20321a..d6981a46dd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = @srcdir@
-VPATH = $(srcdir):$(srcdir)/missing
+VPATH = @srcdir@:@srcdir@/missing
 
 CC = @CC@
 YACC = @YACC@
@@ -12,34 +12,19 @@ AUTOCONF = autoconf
 @SET_MAKE@
 
 prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-arch = @arch@
-sitearch = @sitearch@
-sitedir = @sitedir@
-
-CFLAGS = @CFLAGS@ @XCFLAGS@
-CPPFLAGS = -I. -I$(srcdir)
+CFLAGS = @CFLAGS@ -I. -I@srcdir@ -I@includedir@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
-EXTLDFLAGS = 
-XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
+XLDFLAGS = @XLDFLAGS@
 EXTLIBS = 
 LIBS = @LIBS@ $(EXTLIBS)
 MISSING = @LIBOBJS@ @ALLOCA@
 LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS)
+DLDFLAGS = @LIBRUBY_DLDFLAGS@
 SOLIBS = @SOLIBS@
-MAINLIBS = @MAINLIBS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
-RUBY_SO_NAME=@RUBY_SO_NAME@
 EXEEXT = @EXEEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-RUBY = $(RUBY_INSTALL_NAME)
-MINIRUBY = @MINIRUBY@
 
 #### End of system configuration section. ####
 
@@ -52,16 +37,8 @@ LIBRUBY_SO    = @LIBRUBY_SO@
 LIBRUBY_ALIASES= @LIBRUBY_ALIASES@
 LIBRUBY	      = @LIBRUBY@
 LIBRUBYARG    = @LIBRUBYARG@
-LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
-LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
-
-PREP          = @PREP@ @ARCHFILE@
-SETUP         =
-EXTSTATIC     = @EXTSTATIC@
 
 EXTOBJS	      = 
-DLDOBJS	      = $(DMYEXT)
-DMYEXT	      = dmyext.@OBJEXT@
 
 MAINOBJ	      = main.@OBJEXT@
 
@@ -103,113 +80,52 @@ OBJS	      = array.@OBJEXT@ \
 		version.@OBJEXT@ \
 		$(MISSING)
 
-MANTYPE	      = @MANTYPE@
-
-SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
-		--make="$(MAKE)" \
-		--mflags="$(MFLAGS)" \
-		--make-flags="$(MAKEFLAGS)"
-
-all:		@MAKEFILES@ miniruby$(EXEEXT) rbconfig.rb $(LIBRUBY)
-		@$(MINIRUBY) $(srcdir)/ext/extmk.rb --extstatic="$(EXTSTATIC)" $(SCRIPT_ARGS)
+all:		miniruby$(EXEEXT) rbconfig.rb
+		@./miniruby$(EXEEXT) -Xext extmk.rb @EXTSTATIC@
 
-miniruby$(EXEEXT):	config.status $(LIBRUBY_A) $(MAINOBJ) $(DMYEXT)
+miniruby$(EXEEXT):	config.status $(LIBRUBY_A) $(MAINOBJ) dmyext.@OBJEXT@
 		@rm -f $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(DMYEXT) $(LIBRUBY_A) $(LIBS) -o $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) dmyext.@OBJEXT@ $(LIBRUBY_A) $(LIBS) -o $@
 
-$(PROGRAM):     $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) $(SETUP) miniruby$(EXEEXT)
+$(PROGRAM):     $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) 
 		@rm -f $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
-		@AR@ rcu $@ $(OBJS) $(DMYEXT)
+$(LIBRUBY_A):	$(OBJS) dmyext.@OBJEXT@
+		@AR@ rcu $@ $(OBJS) dmyext.@OBJEXT@
 		@-@RANLIB@ $@ 2> /dev/null || true
 
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) miniruby$(EXEEXT) $(PREP)
-		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) -o $@
-		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
+$(LIBRUBY_SO):	$(OBJS) dmyext.@OBJEXT@
+		$(LDSHARED) $(DLDFLAGS) $(SOLIBS) $(OBJS) dmyext.@OBJEXT@ -o $@
+		@-./miniruby -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-ruby.imp:	$(LIBRUBY_A)
-		@@NM@ -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
-# $(MINIRUBY) $< $@
-
 install:	rbconfig.rb
-		$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
-		$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) install
-
-what-where no-install:	rbconfig.rb
-		$(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
-		$(MINIRUBY) $(srcdir)/ext/extmk.rb -n $(SCRIPT_ARGS) install
-
-clean-ext:
-		@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) clean 2> /dev/null || true
+		./miniruby$(EXEEXT) $(srcdir)/instruby.rb $(DESTDIR)
 
-clean-local:
-		@rm -f $(OBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY_ALIASES)
+clean:;		@rm -f $(OBJS) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY_ALIASES) $(MAINOBJ) rbconfig.rb
 		@rm -f ext/extinit.c ext/extinit.@OBJEXT@ dmyext.@OBJEXT@
+		@-./miniruby$(EXEEXT) -Xext extmk.rb clean 2> /dev/null || true
 		@rm -f $(PROGRAM) miniruby$(EXEEXT)
 
-clean: clean-ext clean-local
-
-distclean-ext:
-		@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) distclean 2> /dev/null || true
-
-distclean-local: clean-local
-		@rm -f @MAKEFILES@ config.h rbconfig.rb
+distclean:	clean
+		@rm -f Makefile ext/extmk.rb config.h
 		@rm -f ext/config.cache config.cache config.log config.status
 		@rm -f *~ core *.core gmon.out y.tab.c y.output ruby.imp
 
-distclean: distclean-ext distclean-local
-
-realclean: 	distclean
+realclean:	distclean
 		@rm -f parse.c
 		@rm -f lex.c
 
-test:		miniruby$(EXEEXT) rbconfig.rb $(PROGRAM) PHONY
+test:		miniruby$(EXEEXT)
 		@./miniruby$(EXEEXT) $(srcdir)/rubytest.rb
 
-rbconfig.rb:	miniruby$(EXEEXT) $(srcdir)/mkconfig.rb config.status $(PREP)
-		@$(MINIRUBY) $(srcdir)/mkconfig.rb rbconfig.rb
-
-fake.rb:	miniruby$(EXEEXT) Makefile
-		@echo ' \
-		class Object; \
-		  CROSS_COMPILING = RUBY_PLATFORM; \
-		  remove_const :RUBY_PLATFORM; \
-		  remove_const :RUBY_VERSION; \
-		  RUBY_PLATFORM = "@arch@"; \
-		  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
-		end; \
-		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
-		  class File; \
-		    remove_const :ALT_SEPARATOR; \
-		    ALT_SEPARATOR = "\\"; \
-		  end; \
-		end; \
-		' > $@
-
-Makefile:	$(srcdir)/Makefile.in
-
-.PRECIOUS:	@MAKEFILES@
-
-.PHONY:		test
-
-PHONY:
-
-@MAKEFILES@: config.status
-		MAKE=$(MAKE) $(SHELL) ./config.status
-		@{ \
-		    echo "all:; -@rm -f conftest.mk"; \
-		    echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
-		    echo ".force:"; \
-		} > conftest.mk || exit 1; \
-		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
-		{ echo "Makefile updated, restart."; exit 1; }
+rbconfig.rb:	miniruby$(EXEEXT)
+		@./miniruby$(EXEEXT) $(srcdir)/mkconfig.rb rbconfig.rb
 
 config.status:	$(srcdir)/configure
-		MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
+		$(SHELL) ./config.status --recheck
 
 $(srcdir)/configure: $(srcdir)/configure.in
 		cd $(srcdir) && $(AUTOCONF)
@@ -218,155 +134,130 @@ $(srcdir)/configure: $(srcdir)/configure.in
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
 lex.c: keywords
-	if test "$(srcdir)" = "."; then \
-	  gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $> > $@; \
-	else \
-	  cp $(srcdir)/lex.c .; \
-	fi
+	gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ @srcdir@/keywords > lex.c
 
-.y.c:
+parse.c: parse.y
 	$(YACC) $<
-	sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
-	rm -f y.tab.c
+	mv -f y.tab.c parse.c
 
-ext/extinit.@OBJEXT@: ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(CPPFLAGS) @OUTFLAG@$@ -c ext/extinit.c
+alloca.@OBJEXT@: @srcdir@/missing/alloca.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/alloca.c
 
-acosh.@OBJEXT@: $(srcdir)/missing/acosh.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/acosh.c
+crypt.@OBJEXT@: @srcdir@/missing/crypt.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/crypt.c
 
-alloca.@OBJEXT@: $(srcdir)/missing/alloca.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/alloca.c
+dup2.@OBJEXT@: @srcdir@/missing/dup2.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/dup2.c
 
-crypt.@OBJEXT@: $(srcdir)/missing/crypt.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/crypt.c
+finite.@OBJEXT@: @srcdir@/missing/finite.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/finite.c
 
-dup2.@OBJEXT@: $(srcdir)/missing/dup2.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dup2.c
+flock.@OBJEXT@: @srcdir@/missing/flock.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/flock.c
 
-fileblocks.@OBJEXT@: $(srcdir)/missing/fileblocks.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fileblocks.c
+isinf.@OBJEXT@: @srcdir@/missing/isinf.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/isinf.c
 
-finite.@OBJEXT@: $(srcdir)/missing/finite.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/finite.c
+isnan.@OBJEXT@: @srcdir@/missing/isnan.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/isnan.c
 
-flock.@OBJEXT@: $(srcdir)/missing/flock.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/flock.c
+fnmatch.@OBJEXT@: @srcdir@/missing/fnmatch.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/fnmatch.c
 
-isinf.@OBJEXT@: $(srcdir)/missing/isinf.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isinf.c
+memcmp.@OBJEXT@: @srcdir@/missing/memcmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/memcmp.c
 
-isnan.@OBJEXT@: $(srcdir)/missing/isnan.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isnan.c
+memmove.@OBJEXT@: @srcdir@/missing/memmove.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/memmove.c
 
-fnmatch.@OBJEXT@: $(srcdir)/missing/fnmatch.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fnmatch.c
+mkdir.@OBJEXT@: @srcdir@/missing/mkdir.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/mkdir.c
 
-memcmp.@OBJEXT@: $(srcdir)/missing/memcmp.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memcmp.c
+vsnprintf.@OBJEXT@: @srcdir@/missing/vsnprintf.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/vsnprintf.c
 
-memmove.@OBJEXT@: $(srcdir)/missing/memmove.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memmove.c
+strcasecmp.@OBJEXT@: @srcdir@/missing/strcasecmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strcasecmp.c
 
-mkdir.@OBJEXT@: $(srcdir)/missing/mkdir.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/mkdir.c
+strncasecmp.@OBJEXT@: @srcdir@/missing/strncasecmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strncasecmp.c
 
-vsnprintf.@OBJEXT@: $(srcdir)/missing/vsnprintf.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/vsnprintf.c
+strchr.@OBJEXT@: @srcdir@/missing/strchr.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strchr.c
 
-strcasecmp.@OBJEXT@: $(srcdir)/missing/strcasecmp.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strcasecmp.c
+strdup.@OBJEXT@: @srcdir@/missing/strdup.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strdup.c
 
-strncasecmp.@OBJEXT@: $(srcdir)/missing/strncasecmp.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strncasecmp.c
+strerror.@OBJEXT@: @srcdir@/missing/strerror.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strerror.c
 
-strchr.@OBJEXT@: $(srcdir)/missing/strchr.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strchr.c
+strftime.@OBJEXT@: @srcdir@/missing/strftime.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strftime.c
 
-strerror.@OBJEXT@: $(srcdir)/missing/strerror.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strerror.c
+strstr.@OBJEXT@: @srcdir@/missing/strstr.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strstr.c
 
-strftime.@OBJEXT@: $(srcdir)/missing/strftime.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strftime.c
+strtod.@OBJEXT@: @srcdir@/missing/strtod.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strtod.c
 
-strstr.@OBJEXT@: $(srcdir)/missing/strstr.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strstr.c
+strtol.@OBJEXT@: @srcdir@/missing/strtol.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strtol.c
 
-strtol.@OBJEXT@: $(srcdir)/missing/strtol.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtol.c
+strtoul.@OBJEXT@: @srcdir@/missing/strtoul.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strtoul.c
 
-strtoul.@OBJEXT@: $(srcdir)/missing/strtoul.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtoul.c
+nt.@OBJEXT@: @srcdir@/missing/nt.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/nt.c
 
-x68.@OBJEXT@: $(srcdir)/missing/x68.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/x68.c
+x68.@OBJEXT@: @srcdir@/missing/x68.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/x68.c
 
-os2.@OBJEXT@: $(srcdir)/missing/os2.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/os2.c
+os2.@OBJEXT@: @srcdir@/missing/os2.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/os2.c
 
-dl_os2.@OBJEXT@: $(srcdir)/missing/dl_os2.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dl_os2.c
-
-win32.@OBJEXT@: $(srcdir)/win32/win32.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -I$(srcdir)/win32 -c $(srcdir)/win32/win32.c
+dl_os2.@OBJEXT@: @srcdir@/missing/dl_os2.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/dl_os2.c
 
 # Prevent GNU make v3 from overflowing arg limit on SysV.
 .NOEXPORT:
 ###
-array.@OBJEXT@: array.c ruby.h config.h defines.h intern.h missing.h \
-  util.h st.h
-bignum.@OBJEXT@: bignum.c ruby.h config.h defines.h intern.h missing.h
-class.@OBJEXT@: class.c ruby.h config.h defines.h intern.h missing.h \
-  rubysig.h node.h st.h version.h
-compar.@OBJEXT@: compar.c ruby.h config.h defines.h intern.h missing.h
-dir.@OBJEXT@: dir.c ruby.h config.h defines.h intern.h missing.h util.h
-dln.@OBJEXT@: dln.c ruby.h config.h defines.h intern.h missing.h dln.h
+parse.@OBJEXT@: parse.y ruby.h config.h defines.h intern.h env.h node.h st.h regex.h util.h lex.c
+###
+array.@OBJEXT@: array.c ruby.h config.h defines.h intern.h
+bignum.@OBJEXT@: bignum.c ruby.h config.h defines.h intern.h
+class.@OBJEXT@: class.c ruby.h config.h defines.h intern.h node.h st.h
+compar.@OBJEXT@: compar.c ruby.h config.h defines.h intern.h
+dir.@OBJEXT@: dir.c ruby.h config.h defines.h intern.h
+dln.@OBJEXT@: dln.c config.h defines.h dln.h
 dmyext.@OBJEXT@: dmyext.c
-enum.@OBJEXT@: enum.c ruby.h config.h defines.h intern.h missing.h node.h \
-  util.h
-error.@OBJEXT@: error.c ruby.h config.h defines.h intern.h missing.h \
-  env.h version.h st.h
-eval.@OBJEXT@: eval.c ruby.h config.h defines.h intern.h missing.h node.h \
-  env.h util.h rubysig.h st.h dln.h
-file.@OBJEXT@: file.c ruby.h config.h defines.h intern.h missing.h \
-  rubyio.h rubysig.h util.h dln.h
-gc.@OBJEXT@: gc.c ruby.h config.h defines.h intern.h missing.h rubysig.h \
-  st.h node.h env.h re.h regex.h
-hash.@OBJEXT@: hash.c ruby.h config.h defines.h intern.h missing.h st.h \
-  util.h rubysig.h version.h
-inits.@OBJEXT@: inits.c ruby.h config.h defines.h intern.h missing.h
-io.@OBJEXT@: io.c ruby.h config.h defines.h intern.h missing.h rubyio.h \
-  rubysig.h env.h util.h
-main.@OBJEXT@: main.c ruby.h config.h defines.h intern.h missing.h
-marshal.@OBJEXT@: marshal.c ruby.h config.h defines.h intern.h missing.h \
-  rubyio.h st.h util.h
-math.@OBJEXT@: math.c ruby.h config.h defines.h intern.h missing.h
-numeric.@OBJEXT@: numeric.c ruby.h config.h defines.h intern.h missing.h
-object.@OBJEXT@: object.c ruby.h config.h defines.h intern.h missing.h \
-  st.h util.h
-pack.@OBJEXT@: pack.c ruby.h config.h defines.h intern.h missing.h
-parse.@OBJEXT@: parse.c ruby.h config.h defines.h intern.h missing.h \
-  env.h node.h st.h regex.h util.h lex.c
-prec.@OBJEXT@: prec.c ruby.h config.h defines.h intern.h missing.h
-process.@OBJEXT@: process.c ruby.h config.h defines.h intern.h missing.h \
-  rubysig.h st.h
-random.@OBJEXT@: random.c ruby.h config.h defines.h intern.h missing.h
-range.@OBJEXT@: range.c ruby.h config.h defines.h intern.h missing.h
-re.@OBJEXT@: re.c ruby.h config.h defines.h intern.h missing.h re.h \
-  regex.h
-regex.@OBJEXT@: regex.c config.h regex.h
-ruby.@OBJEXT@: ruby.c ruby.h config.h defines.h intern.h missing.h dln.h \
-  node.h util.h
-signal.@OBJEXT@: signal.c ruby.h config.h defines.h intern.h missing.h \
-  rubysig.h
-sprintf.@OBJEXT@: sprintf.c ruby.h config.h defines.h intern.h missing.h
+enum.@OBJEXT@: enum.c ruby.h config.h defines.h intern.h
+error.@OBJEXT@: error.c ruby.h config.h defines.h intern.h env.h
+eval.@OBJEXT@: eval.c ruby.h config.h defines.h intern.h node.h env.h rubysig.h st.h dln.h
+file.@OBJEXT@: file.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h
+fnmatch.@OBJEXT@: fnmatch.c config.h fnmatch.h
+gc.@OBJEXT@: gc.c ruby.h config.h defines.h intern.h rubysig.h st.h node.h env.h re.h regex.h
+hash.@OBJEXT@: hash.c ruby.h config.h defines.h intern.h st.h rubysig.h util.h
+inits.@OBJEXT@: inits.c ruby.h config.h defines.h intern.h
+io.@OBJEXT@: io.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h
+main.@OBJEXT@: main.c ruby.h config.h defines.h intern.h
+marshal.@OBJEXT@: marshal.c ruby.h config.h defines.h intern.h rubyio.h st.h
+prec.@OBJEXT@: prec.c ruby.h config.h defines.h intern.h
+math.@OBJEXT@: math.c ruby.h config.h defines.h intern.h
+numeric.@OBJEXT@: numeric.c ruby.h config.h defines.h intern.h
+object.@OBJEXT@: object.c ruby.h config.h defines.h intern.h st.h
+pack.@OBJEXT@: pack.c ruby.h config.h defines.h intern.h
+process.@OBJEXT@: process.c ruby.h config.h defines.h intern.h rubysig.h st.h
+random.@OBJEXT@: random.c ruby.h config.h defines.h intern.h
+range.@OBJEXT@: range.c ruby.h config.h defines.h intern.h
+re.@OBJEXT@: re.c ruby.h config.h defines.h intern.h re.h regex.h
+regex.@OBJEXT@: regex.c config.h regex.h util.h
+ruby.@OBJEXT@: ruby.c ruby.h config.h defines.h intern.h dln.h util.h
+signal.@OBJEXT@: signal.c ruby.h config.h defines.h intern.h rubysig.h
+sprintf.@OBJEXT@: sprintf.c ruby.h config.h defines.h intern.h
 st.@OBJEXT@: st.c config.h st.h
-string.@OBJEXT@: string.c ruby.h config.h defines.h intern.h missing.h \
-  re.h regex.h version.h
-struct.@OBJEXT@: struct.c ruby.h config.h defines.h intern.h missing.h
-time.@OBJEXT@: time.c ruby.h config.h defines.h intern.h missing.h
-util.@OBJEXT@: util.c ruby.h config.h defines.h intern.h missing.h util.h
-variable.@OBJEXT@: variable.c ruby.h config.h defines.h intern.h \
-  missing.h env.h node.h st.h util.h
-version.@OBJEXT@: version.c ruby.h config.h defines.h intern.h missing.h \
-  version.h
+string.@OBJEXT@: string.c ruby.h config.h defines.h intern.h re.h regex.h
+struct.@OBJEXT@: struct.c ruby.h config.h defines.h intern.h
+time.@OBJEXT@: time.c ruby.h config.h defines.h intern.h
+util.@OBJEXT@: util.c ruby.h config.h defines.h intern.h util.h
+variable.@OBJEXT@: variable.c ruby.h config.h defines.h intern.h env.h node.h st.h
+version.@OBJEXT@: version.c ruby.h config.h defines.h intern.h version.h
diff --git a/README b/README
index bde22dff78..44e0844a8f 100644
--- a/README
+++ b/README
@@ -5,7 +5,6 @@ easy object-oriented programming.  It has many features to
 process text files and to do system management tasks (as in
 Perl).  It is simple, straight-forward, and extensible.
 
-
 * Features of Ruby
 
   + Simple Syntax
@@ -19,52 +18,21 @@ Perl).  It is simple, straight-forward, and extensible.
   + Highly Portable(works on many UNIX machines, and on DOS,
     Windows, Mac, BeOS etc.)
 
-
 * How to get Ruby
 
-The Ruby distribution can be found on:
-
-  ftp://ftp.ruby-lang.org/pub/ruby/
-
-You can get it by anonymous CVS.  How to check out is:
-
-  $ cvs -d :pserver:anonymous@cvs.ruby-lang.org:/src login
-  (Logging in to anonymous@cvs.ruby-lang.org)
-  CVS password: anonymous
-  $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:/src checkout ruby
-
-
-* Ruby home-page
-
-The URL of the Ruby home-page is:
-
-   http://www.ruby-lang.org/
-
-
-* Mailing list
-
-There is a mailing list to talk about Ruby.
-To subscribe this list, please send the following phrase
-
-	subscribe YourFirstName YourFamilyName
-e.g.
-        subscribe Joseph Smith
-
-in the mail body (not subject) to the address <ruby-talk-ctl@ruby-lang.org>.
+The Ruby distribution can be found on
 
+  ftp://ftp.netlab.co.jp/pub/lang/ruby/
 
 * How to compile and install
 
 This is what you need to do to compile and install Ruby:
 
-  1. If ./configure does not exist or is older than configure.in,
-     run autoconf to (re)generate configure.
+  1. Run ./configure, which will generate config.h and Makefile.
 
-  2. Run ./configure, which will generate config.h and Makefile.
+  2. Edit defines.h if you need.  Probably this step will not need.
 
-  3. Edit defines.h if you need.  Probably this step will not need.
-
-  4. Remove comment mark(#) before the module names from ext/Setup (or
+  3. Remove comment mark(#) before the module names from ext/Setup (or
      add module names if not present), if you want to link modules
      statically.
 
@@ -73,31 +41,90 @@ This is what you need to do to compile and install Ruby:
      remove comment mark from the line "#option nodynamic" in
      ext/Setup.
 
-  5. Run make.
+  4. Run make.
 
-  6. Optionally, run 'make test' to check whether the compiled Ruby
+  5. Optionally, run 'make test' to check whether the compiled Ruby
      interpreter works well.  If you see the message "test succeeded",
      your ruby works as it should (hopefully).
 
-  7. Run 'make install'
+  6. Run 'make install'
 
      You may have to be a super user to install ruby.
 
 If you fail to compile ruby, please send the detailed error report with
 the error log and machine/OS type, to help others.
 
-
 * Copying
 
-See the file COPYING.
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING file), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+
+* Ruby home-page
+
+The URL of the Ruby home-page is:
 
+   http://www.netlab.co.jp/ruby/
 
 * The Author
 
 Feel free to send comments and bug reports to the author.  Here is the 
 author's latest mail address:
 
-  matz@netlab.jp
+  matz@netlab.co.jp
 
 -------------------------------------------------------
 created at: Thu Aug  3 11:57:36 JST 1995
diff --git a/README.EXT b/README.EXT
index 3a37db4e11..cc6c963baf 100644
--- a/README.EXT
+++ b/README.EXT
@@ -1,30 +1,30 @@
 .\" README.EXT -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
 
-This document explains how to make extension libraries for Ruby.
+This document explains how to make extention libraries for Ruby.
 
-1. Basic knowledge
+1��Basic knowledge
 
 In C, variables have types and data do not have types.  In contrast,
-Ruby variables do not have a static type, and data themselves have
-types, so data will need to be converted between the languages.
+Ruby variables do not have static type and data themselves have
+types.  So, data need to be converted across the languages.
 
-Data in Ruby are represented by C type `VALUE'.  Each VALUE data has
-its data-type.
+Data in Ruby represented C type `VALUE'.  Each VALUE data have its
+data-type.
 
-To retrieve C data from a VALUE, you need to:
+To retrieve an C data from the VALUE, you need to:
 
- (1) Identify the VALUE's data type
- (2) Convert the VALUE into C data
+ (1) Identify VALUE's data type
+ (2) Convert VALUE into C data
 
-Converting to the wrong data type may cause serious problems.
+Converting to wrong data type may cause serious promblems.
 
 
 1.1 Data-types
 
-The Ruby interpreter has the following data types:
+Ruby interpreter has data-types as below:
 
 	T_NIL		nil
-	T_OBJECT	ordinary object
+	T_OBJECT	ordinaly object
 	T_CLASS		class
 	T_MODULE	module
 	T_FLOAT		floating point number
@@ -32,20 +32,17 @@ The Ruby interpreter has the following data types:
 	T_REGEXP	regular expression
 	T_ARRAY		array
 	T_FIXNUM	Fixnum(31bit integer)
-	T_HASH		associative array
+	T_HASH		assosiative array
 	T_STRUCT	(Ruby) structure
 	T_BIGNUM	multi precision integer
-	T_FILE		IO
 	T_TRUE		true
 	T_FALSE		false
 	T_DATA		data
-	T_SYMBOL        symbol
 
-In addition, there are several other types used internally:
+Otherwise, there are several other types used internally:
 
 	T_ICLASS
 	T_MATCH
-	T_UNDEF
 	T_VARMAP
 	T_SCOPE
 	T_NODE
@@ -54,9 +51,9 @@ Most of the types are represented by C structures.
 
 1.2 Check Data Type of the VALUE
 
-The macro TYPE() defined in ruby.h shows the data type of the VALUE.
+The macro TYPE() defined in ruby.h shows data-type of the VALUE.
 TYPE() returns the constant number T_XXXX described above.  To handle
-data types, your code will look something like this:
+data-types, the code will be like:
 
   switch (TYPE(obj)) {
     case T_FIXNUM:
@@ -70,17 +67,17 @@ data types, your code will look something like this:
       break;
     default:
       /* raise exception */
-      rb_raise(rb_eTypeError, "not valid value");
+      Fail("not valid value");
       break;
   }
 
-There is the data-type check function
+There is the data-type check function.
 
   void Check_Type(VALUE value, int type)
 
-which raises an exception if the VALUE does not have the type specified.
+It raises an exception, if the VALUE does not have the type specified.
 
-There are also faster check macros for fixnums and nil.
+There are faster check-macros for fixnums and nil.
 
   FIXNUM_P(obj)
   NIL_P(obj)
@@ -90,43 +87,29 @@ There are also faster check macros for fixnums and nil.
 The data for type T_NIL, T_FALSE, T_TRUE are nil, true, false
 respectively.  They are singletons for the data type.
 
-The T_FIXNUM data is a 31bit length fixed integer (63bit length on
-some machines), which can be convert to a C integer by using the
-FIX2INT() macro.  There is also NUM2INT() which converts any Ruby
-numbers into C integers.  The NUM2INT() macro includes a type check, so
-an exception will be raised if the conversion failed.  NUM2DBL() can
-be used to retrieve the double float value in same way.
-
-To get char* from a VALUE, version 1.7 recommend to use new macros
-StringValue() and StringValuePtr().  StringValue(var) replaces var's
-value to the result of "var.to_str()".  StringValuePtr(var) does same
-replacement and returns char* representation of var.  These macros
-will skip the replacement if var is a String.  Notice that the macros
-requires to take only lvalue as their argument, to change the value
-of var in the replacement. 
-
-In version 1.6 or earlier, STR2CSTR() was used to do same thing
-but now it is obsoleted in version 1.7 because of STR2CSTR() has
-a risk of dangling pointer problem in to_str() impliclit conversion.
+The T_FIXNUM data is the 31bit length fixed integer (63bit length on
+some machines), which can be conver to the C integer by using
+FIX2INT() macro.  There also be NUM2INT() which converts any Ruby
+numbers into C integer.  The NUM2INT() macro includes type check, so
+the exception will be raised if conversion failed.
 
 Other data types have corresponding C structures, e.g. struct RArray
-for T_ARRAY etc. The VALUE of the type which has corresponding structure
+for T_ARRAY etc.  VALUE of the type which has corresponding structure
 can be cast to retrieve the pointer to the struct.  The casting macro
-will be of the form RXXXX for each data type; for instance, RARRAY(obj). 
-See "ruby.h".
+RXXXX for each data type like RARRAY(obj).  see "ruby.h".
 
 For example, `RSTRING(size)->len' is the way to get the size of the
 Ruby String object.  The allocated region can be accessed by
-`RSTRING(str)->ptr'.  For arrays, use `RARRAY(ary)->len' and
+`RSTRING(str)->ptr'.  For arrays, `RARRAY(ary)->len' and
 `RARRAY(ary)->ptr' respectively.
 
 Notice: Do not change the value of the structure directly, unless you
-are responsible for the result.  This ends up being the cause of interesting
+are responsible about the result.  It will be the cause of interesting
 bugs.
 
 1.4 Convert C data into VALUE
 
-To convert C data to Ruby values:
+To convert C data to the values of Ruby:
 
   * FIXNUM
 
@@ -136,83 +119,75 @@ To convert C data to Ruby values:
 
     cast to VALUE.
 
-You can determine whether a VALUE is pointer or not by checking its LSB.  
+You can determine whether VALUE is pointer or not, by checking LSB.  
 
-Notice Ruby does not allow arbitrary pointer values to be a VALUE.  They
-should be pointers to the structures which Ruby knows about.  The known
+Notice Ruby does not allow arbitrary pointer value to be VALUE.  They
+should be pointers to the structures which Ruby knows.  The known
 structures are defined in <ruby.h>.
 
-To convert C numbers to Ruby values, use these macros.
+To convert C numbers to Ruby value, use these macros.
 
-  INT2FIX()	for integers within 31bits.
+  INT2FIX()	for intergers within 31bits.
   INT2NUM()	for arbitrary sized integer.
 
-INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM
-range, but is a bit slower.
+INT2NUM() converts integers into Bignums, if it is out of FIXNUM
+range, but bit slower.
 
-1.5 Manipulating Ruby data
+1.5 Manipulate Ruby data
 
-As I already mentioned, it is not recommended to modify an object's internal
-structure.  To manipulate objects, use the functions supplied by the Ruby
-interpreter. Some (not all) of the useful functions are listed below:
+As I already told, it is not recommended to modify object's internal
+structure.  To manipulate objects, use functions supplied by Ruby
+interpreter.  Useful functions are listed below (not all):
 
- String functions
+ String funtions
 
-  rb_str_new(const char *ptr, long len)
+  rb_str_new(char *ptr, int len)
 
     Creates a new Ruby string.
 
-  rb_str_new2(const char *ptr)
+  rb_str_new2(char *ptr)
 
-    Creates a new Ruby string from a C string.  This is equivalent to
+    Creates a new Ruby string from C string.  This is equivalent to
     rb_str_new(ptr, strlen(ptr)).
 
-  rb_tainted_str_new(const char *ptr, long len)
+  rb_str_cat(VALUE str, char *ptr, int len)
 
-    Creates a new tainted Ruby string.  Strings from external data
-    sources should be tainted.
-
-  rb_tainted_str_new2(const char *ptr)
-
-    Creates a new tainted Ruby string from a C string.
-
-  rb_str_cat(VALUE str, const char *ptr, long len)
-
-    Appends len bytes of data from ptr to the Ruby string.
+    Appends len bytes data from ptr to the Ruby string.
 
  Array functions
 
   rb_ary_new()
 
-    Creates an array with no elements.
+    Creates an array with no element.
 
-  rb_ary_new2(long len)
+  rb_ary_new2(int len)
 
-    Creates an array with no elements, allocating internal buffer
+    Creates an array with no element, with allocating internal buffer
     for len elements.
 
-  rb_ary_new3(long n, ...)
+  rb_ary_new3(int n, ...)
 
-    Creates an n-element array from the arguments.
+    Creates an n-elements array from arguments.
 
-  rb_ary_new4(long n, VALUE *elts)
+  rb_ary_new4(int n, VALUE *elts)
 
-    Creates an n-element array from a C array.
+    Creates an n-elements array from C array.
 
   rb_ary_push(VALUE ary, VALUE val)
   rb_ary_pop(VALUE ary)
   rb_ary_shift(VALUE ary)
   rb_ary_unshift(VALUE ary, VALUE val)
+  rb_ary_entry(VALUE ary, int idx)
 
     Array operations.  The first argument to each functions must be an 
     array.  They may dump core if other types given.
 
-2. Extending Ruby with C
+2. Extend Ruby with C
 
-2.1 Addding new features to Ruby
+2.1 Add new features to Ruby
 
 You can add new features (classes, methods, etc.) to the Ruby
-interpreter.  Ruby provides APIs for defining the following things:
+interpreter.  Ruby provides the API to define things below:
 
  * Classes, Modules
  * Methods, Singleton Methods
@@ -220,43 +195,38 @@ interpreter.  Ruby provides APIs for defining the following things:
 
 2.1.1 Class/module definition
 
-To define a class or module, use the functions below:
+To define class or module, use functions below:
 
-  VALUE rb_define_class(const char *name, VALUE super)
-  VALUE rb_define_module(const char *name)
+  VALUE rb_define_class(char *name, VALUE super)
+  VALUE rb_define_module(char *name)
 
-These functions return the newly created class or module.  You may
-want to save this reference into a variable to use later.
-
-To define nested classes or modules, use the functions below:
-
-  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
-  VALUE rb_define_module_under(VALUE outer, const char *name)
+These functions return the newly created class ot module.  You may
+want to save this reference into the variable to use later.
 
 2.1.2 Method/singleton method definition
 
-To define methods or singleton methods, use these functions:
+To define methods or singleton methods, use functions below:
 
-  void rb_define_method(VALUE klass, const char *name, 
+  void rb_define_method(VALUE class, char *name, 
 		        VALUE (*func)(), int argc)
 
-  void rb_define_singleton_method(VALUE object, const char *name, 
+  void rb_define_singleton_method(VALUE object, char *name, 
 			          VALUE (*func)(), int argc)
 
 The `argc' represents the number of the arguments to the C function,
 which must be less than 17.  But I believe you don't need that much. :-)
 
-If `argc' is negative, it specifies the calling sequence, not number of
+If `argc' is negative, it specifies calling sequence, not number of
 the arguments.  
 
-If argc is -1, the function will be called as:
+If argc is -1, the function will be called like:
 
   VALUE func(int argc, VALUE *argv, VALUE obj)
 
 where argc is the actual number of arguments, argv is the C array of
 the arguments, and obj is the receiver.
 
-If argc is -2, the arguments are passed in a Ruby array. The function
+if argc is -2, the arguments are passed in Ruby array. The function
 will be called like:
 
   VALUE func(VALUE obj, VALUE args)
@@ -264,14 +234,14 @@ will be called like:
 where obj is the receiver, and args is the Ruby array containing
 actual arguments.
 
-There are two more functions to define methods.  One is to define
-private methods:
+There're two more functions to define method.  One is to define
+private method:
 
-  void rb_define_private_method(VALUE klass, const char *name, 
+  void rb_define_private_method(VALUE class, char *name, 
 			        VALUE (*func)(), int argc)
 
-The other is to define module functions, which are private AND singleton
-methods of the module.  For example, sqrt is the module function
+The other is to define module function, which is private AND singleton
+method of the module.  For example, sqrt is the module function
 defined in Math module.  It can be call in the form like:
 
   Math.sqrt(4)
@@ -281,56 +251,56 @@ or
   include Math
   sqrt(4)
 
-To define module functions, use:
+To define module function
 
-  void rb_define_module_function(VALUE module, const char *name, 
+  void rb_define_module_function(VALUE module, char *name, 
 				 VALUE (*func)(), int argc)
 
-Oh, in addition, function-like methods, which are private methods defined
-in the Kernel module, can be defined using:
-
-  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
+Oh, in addition, function-like method, which is private method defined
+in Kernel module, can be defined using:
 
-To define alias to the method,
+  void rb_define_global_function(char *name, VALUE (*func)(), int argc)
 
-  void rb_define_alias(VALUE module, const char* new, const char* old);
 
 2.1.3 Constant definition
 
 We have 2 functions to define constants:
 
-  void rb_define_const(VALUE klass, const char *name, VALUE val)
-  void rb_define_global_const(const char *name, VALUE val)
+  void rb_define_const(VALUE class, char *name, VALUE val)
+  void rb_define_global_const(char *name, VALUE val)
 
-The former is to define a constant under specified class/module.  The
-latter is to define a global constant.
+The former is to define constant under specified class/module.  The
+latter is to define global constant.
 
 2.2 Use Ruby features from C
 
 There are several ways to invoke Ruby's features from C code.
 
-2.2.1 Evaluate Ruby Programs in a String
+2.2.1 Evaluate Ruby Program in String
 
-The easiest way to use Ruby's functionality from a C program is to
-evaluate the string as Ruby program.  This function will do the job.
+Easiest way to call Ruby's function from C program is to evaluate the
+string as Ruby program.  This function will do the job.
 
-  VALUE rb_eval_string(const char *str)
+  VALUE rb_eval_string(char *str)
 
-Evaluation is done under the current context, thus current local variables
+Evaluation is done under current context, thus current local variables
 of the innermost method (which is defined by Ruby) can be accessed.
 
 2.2.2 ID or Symbol
 
 You can invoke methods directly, without parsing the string.  First I
-need to explain about symbols (whose data type is ID).  ID is the
+need to explain about symbols (which data type is ID).  ID is the
 integer number to represent Ruby's identifiers such as variable names.
-It can be accessed from Ruby in the form:
+It can be accessed from Ruby in the form like:
 
  :Identifier
 
-You can get the symbol value from a string within C code by using
+You can get the symbol value from string within C code, by using
 
-  rb_intern(const char *name)
+  rb_intern(char *name)
+
+In addition, the symbols for one character operators (e.g +) is the
+code for that character.
 
 2.2.3 Invoke Ruby method from C
 
@@ -338,13 +308,13 @@ To invoke methods directly, you can use the function below
 
   VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
 
-This function invokes a method on the recv, with the method name
-specified by the symbol mid.
+This function invokes the method of the recv, which name is specified
+by the symbol mid.
 
 2.2.4 Accessing the variables and constants
 
-You can access class variables and instance variables using access
-functions.  Also, global variables can be shared between both environments.
+You can access class variables, and instance variables using access
+functions.  Also, global variables can be shared between both worlds.
 There's no way to access Ruby's local variables.
 
 The functions to access/modify instance variables are below:
@@ -360,16 +330,16 @@ To access the constants of the class/module:
 
 See 2.1.3 for defining new constant.
 
-3. Information sharing between Ruby and C
+3. Informatin sharing between Ruby and C
 
-3.1 Ruby constants that C can be accessed from C
+3.1 Ruby constant that C can be accessed from C
 
-The following Ruby constants can be referred from C.
+Following Ruby constants can be referred from C.
 
   Qtrue
   Qfalse
 
-Boolean values.  Qfalse is false in C also (i.e. 0).
+Boolean values.  Qfalse is false in the C also (i.e. 0).
 
   Qnil
 
@@ -377,81 +347,80 @@ Ruby nil in C scope.
 
 3.2 Global variables shared between C and Ruby
 
-Information can be shared between the two environments using shared global
+Information can be shared between two worlds, using shared global
 variables.  To define them, you can use functions listed below:
 
-  void rb_define_variable(const char *name, VALUE *var)
+  void rb_define_variable(char *name, VALUE *var)
 
-This function defines the variable which is shared by both environments.
-The value of the global variable pointed to by `var' can be accessed
+This function defines the variable which is shared by the both world.
+The value of the global variable pointerd by `var', can be accessed
 through Ruby's global variable named `name'.
 
-You can define read-only (from Ruby, of course) variables using the
+You can define read-only (from Ruby, of course) variable by the
 function below.
 
-  void rb_define_readonly_variable(const char *name, VALUE *var)
+  void rb_define_readonly_variable(char *name, VALUE *var)
 
 You can defined hooked variables.  The accessor functions (getter and
 setter) are called on access to the hooked variables.
 
-  void rb_define_hooked_variable(constchar *name, VALUE *var,
-				 VALUE (*getter)(), void (*setter)())
+  void rb_define_hooked_variable(char *name, VALUE *var,
+				 VALUE (*getter)(), VALUE (*setter)())
 
 If you need to supply either setter or getter, just supply 0 for the
 hook you don't need.  If both hooks are 0, rb_define_hooked_variable()
 works just like rb_define_variable().
 
-  void rb_define_virtual_variable(const char *name,
-				  VALUE (*getter)(), void (*setter)())
+  void rb_define_virtual_variable(char *name,
+				  VALUE (*getter)(), VALUE (*setter)())
 
-This function defines a Ruby global variable without a corresponding C
+This function defines the Ruby global variable without corresponding C
 variable.  The value of the variable will be set/get only by hooks.
 
-The prototypes of the getter and setter functions are as follows:
+The prototypes of the getter and setter functions are as following:
 
   (*getter)(ID id, void *data, struct global_entry* entry);
   (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
 
 3.3 Encapsulate C data into Ruby object
 
-To wrap and objectify a C pointer as a Ruby object (so called
+To wrapping and objectify the C pointer as Ruby object (so called
 DATA), use Data_Wrap_Struct().
 
-  Data_Wrap_Struct(klass, mark, free, ptr)
+  Data_Wrap_Struct(class,mark,free,ptr)
 
-Data_Wrap_Struct() returns a created DATA object.  The klass argument
+Data_Wrap_Struct() returns a created DATA object.  The class argument
 is the class for the DATA object.  The mark argument is the function
 to mark Ruby objects pointed by this data.  The free argument is the
-function to free the pointer allocation.  If this is -1, the pointer
-will be just freed.  The functions mark and free will be called from
-garbage collector.
+function to free the pointer allocation.  The functions, mark and
+free, will be called from garbage collector.
 
 You can allocate and wrap the structure in one step.
 
-  Data_Make_Struct(klass, type, mark, free, sval)
+  Data_Make_Struct(class, type, mark, free, sval)
 
 This macro returns an allocated Data object, wrapping the pointer to
 the structure, which is also allocated.  This macro works like:
 
-  (sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval))
+  (sval = ALLOC(type), Data_Wrap_Struct(class, mark, free, sval))
 
-Arguments klass, mark, and free work like their counterparts in
-Data_Wrap_Struct().  A pointer to the allocated structure will be
-assigned to sval, which should be a pointer of the type specified.
+Arguments, class, mark, free, works like thier counterpart of
+Data_Wrap_Struct().  The pointer to allocated structure will be
+assigned to sval, which should be the pointer to the type specified.
 
 To retrieve the C pointer from the Data object, use the macro
 Data_Get_Struct().
 
   Data_Get_Struct(obj, type, sval)
 
-A pointer to the structure will be assigned to the variable sval.
+The pointer to the structure will be assigned to the variable sval.
 
-See the example below for details. 
+See example below for detail. 
 
-4. Example - Creating dbm extension
+4��Example - Creating dbm extension
 
-OK, here's the example of making an extension library.  This is the
-extension to access DBMs.  The full source is included in the ext/
+OK, here's the example to make extension library.  This is the
+extension to access dbm.  The full source is included in ext/
 directory in the Ruby's source tree.
 
 (1) make the directory
@@ -466,7 +435,7 @@ Make a directory for the extension library under ext directory.
   % touch MANIFEST
 
 There should be MANIFEST file in the directory for the extension
-library.  Make an empty file for now.
+library.  Make empty file now.
 
 (3) design the library
 
@@ -476,12 +445,12 @@ You need to design the library features, before making it.
 
 You need to write C code for your extension library.  If your library
 has only one source file, choosing ``LIBRARY.c'' as a file name is
-preferred.  On the other hand, in case your library has multiple source
-files, avoid choosing ``LIBRARY.c'' for a file name.  It may conflict
-with an intermediate file ``LIBRARY.o'' on some platforms.
+preferred.  On the other hand, in case your library has prural source
+files, avoid chooing ``LIBRARY.c'' for a file name.  It may conflict
+with intermediate file ``LIBRARY.o'' on some platforms.
 
 Ruby will execute the initializing function named ``Init_LIBRARY'' in
-the library.  For example, ``Init_dbm()'' will be executed when loading
+the library.  For exapmle, ``Init_dbm()'' will be executed when loading
 the library.
 
 Here's the example of an initializing function.
@@ -503,13 +472,10 @@ Init_dbm()
     rb_define_method(cDBM, "[]", fdbm_fetch, 1);
 		:
 
-    /* ID for a instance variable to store DBM data */
-    id_dbm = rb_intern("dbm");
 }
 --
 
-The dbm extension wraps the dbm struct in the C environment using 
-Data_Make_Struct.
+The dbm extension wrap dbm struct in C world using Data_Make_Struct.
 
 --
 struct dbmdata {
@@ -518,14 +484,13 @@ struct dbmdata {
 };
 
 
-obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
+obj = Data_Make_Struct(class,struct dbmdata,0,free_dbm,dbmp);
 --
 
-This code wraps the dbmdata structure into a Ruby object.  We avoid wrapping
+This code wraps dbmdata structure into Ruby object.  We avoid wrapping
 DBM* directly, because we want to cache size information.
 
-To retrieve the dbmdata structure from a Ruby object, we define the
-following macro:
+To retrieve dbmdata structure from Ruby object, we define the macro below:
 
 --
 #define GetDBM(obj, dbmp) {\
@@ -534,11 +499,11 @@ following macro:
 }
 --
 
-This sort of complicated macro does the retrieving and close checking for
+This sort of complicated macro do the retrieving and close check for
 the DBM.
 
-There are three kinds of way to receive method arguments.  First,
-methods with a fixed number of arguments receive arguments like this:
+There are three kind of way to receiving method arguments.  First, the
+methods with fixed number of arguments receives arguments like this:
 
 --
 static VALUE
@@ -552,15 +517,15 @@ fdbm_delete(obj, keystr)
 The first argument of the C function is the self, the rest are the
 arguments to the method.
 
-Second, methods with an arbitrary number of arguments receive
+Second, the methods with arbtrary number of arguments receives
 arguments like this:
 
 --
 static VALUE
-fdbm_s_open(argc, argv, klass)
+fdbm_s_open(argc, argv, class)
     int argc;
     VALUE *argv;
-    VALUE klass;
+    VALUE class;
 {
 	:
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
@@ -570,15 +535,15 @@ fdbm_s_open(argc, argv, klass)
 }
 --
 
-The first argument is the number of method arguments, the second
-argument is the C array of the method arguments, and the third
+The first argument is the number of method arguments.  the second
+argument is the C array of the method arguments.  And the third
 argument is the receiver of the method.
 
 You can use the function rb_scan_args() to check and retrieve the
-arguments.  For example, "11" means that the method requires at least one
+arguments.  For exapmle "11" means, the method requires at least one
 argument, and at most receives two arguments.
 
-Methods with an arbitrary number of arguments can receive arguments
+The methods with arbtrary number of arguments can receives arguments
 by Ruby's array, like this:
 
 --
@@ -595,45 +560,45 @@ which contains the arguments to the method.
 
 ** Notice
 
-GC should know about global variables which refer to Ruby's objects, but
-are not exported to the Ruby world.  You need to protect them by
+GC should know about global variables which refers Ruby's objects, but
+not exported to the Ruby world.  You need to protect them by
 
   void rb_global_variable(VALUE *var)
 
 (5) prepare extconf.rb
 
-If the file named extconf.rb exists, it will be executed to generate
-Makefile.  If not, the compilation scheme will try to generate Makefile
-anyway.
+If there exists the file named extconf.rb, it will be executed to
+generate Makefile.  If not, compilation scheme try to generate
+Makefile anyway.
 
-extconf.rb is the file for check compilation conditions etc.  You
+The extconf.rb is the file to check compilation condition etc.  You
 need to put
 
   require 'mkmf'
 
-at the top of the file.  You can use the functions below to check
-various conditions.
+at the top of the file.  You can use the funcitons below to check the
+condition.
 
   have_library(lib, func): check whether library containing function exists.
-  have_func(func, header): check whether function exists
+  have_func(func): check whether function exists
   have_header(header): check whether header file exists
   create_makefile(target): generate Makefile
 
-The value of the variables below will affect the Makefile.
+The value of variables below will affect Makefile.
 
   $CFLAGS: included in CFLAGS make variable (such as -I)
   $LDFLAGS: included in LDFLAGS make variable (such as -L)
 
-If a compilation condition is not fulfilled, you should not call
-``create_makefile''.  The Makefile will not generated, compilation will
+If compilation condition is not fulfilled, you do not call
+``create_makefile''.  Makefile will not generated, compilation will
 not be done.
 
 (6) prepare depend (optional)
 
 If the file named depend exists, Makefile will include that file to
-check dependencies.  You can make this file by invoking
+check dependency.  You can make this file by invoking
 
-  % gcc -MM *.c > depend
+ % gcc -MM *.c > depend
 
 It's no harm.  Prepare it.
 
@@ -643,16 +608,16 @@ It's no harm.  Prepare it.
   % vi MANIFEST
 
 Append file names into MANIFEST.  The compilation scheme requires
-MANIFEST only to exist, but it's better to take this step in order
-to distinguish which files are required.
+MANIFEST only to be exist.  But, you'd better take this step to
+distinguish required files.
 
 (8) generate Makefile
 
-Try generating the Makefile by:
+Try generate Makefile by:
 
   ruby extconf.rb
 
-You don't need this step if you put the extension library under the ext
+You don't need this step, if you put extension library under ext
 directory of the ruby source tree.  In that case, compilation of the
 interpreter will do this step for you.
 
@@ -662,19 +627,19 @@ Type
 
   make
 
-to compile your extension.  You don't need this step either if you have
-put extension library under the ext directory of the ruby source tree.
+to compile your extension.  You don't need this step neither, if you
+put extension library under ext directory of the ruby source tree.
 
 (9) debug
 
-You may need to rb_debug the extension.  Extensions can be linked
-statically by the adding directory name in the ext/Setup file so that
-you can inspect the extension with the debugger.
+You may need to rb_debug the extension.  The extensions can be linked
+statically by adding directory name in the ext/Setup file, so that you
+can inspect the extension with the debugger.
 
 (10) done, now you have the extension library
 
 You can do anything you want with your library.  The author of Ruby
-will not claim any restrictions on your code depending on the Ruby API.
+will not claim any restriction about your code depending Ruby API.
 Feel free to use, modify, distribute or sell your program.
 
 Appendix A. Ruby source files overview
@@ -692,6 +657,8 @@ ruby language core
 utility functions
 
   dln.c
+  fnmatch.c
+  glob.c
   regex.c
   st.c
   util.c
@@ -714,11 +681,9 @@ class library
   file.c
   hash.c
   io.c
-  marshal.c
   math.c
   numeric.c
   pack.c
-  prec.c
   process.c
   random.c
   range.c
@@ -735,7 +700,7 @@ Appendix B. Ruby extension API reference
 
  VALUE
 
-The type for the Ruby object.  Actual structures are defined in ruby.h,
+The type for Ruby object.  Actual structures are defined in ruby.h,
 such as struct RString, etc.  To refer the values in structures, use
 casting macros like RSTRING(obj).
 
@@ -755,15 +720,14 @@ const: false object
 
 ** C pointer wrapping
 
- Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
+ Data_Wrap_Struct(VALUE class, void (*mark)(), void (*free)(), void *sval)
 
-Wrap a C pointer into a Ruby object.  If object has references to other
-Ruby objects, they should be marked by using the mark function during
-the GC process.  Otherwise, mark should be 0.  When this object is no
-longer referred by anywhere, the pointer will be discarded by free
-function.
+Wrap C pointer into Ruby object.  If object has references to other
+Ruby object, they should be marked by using mark function during GC
+process.  Otherwise, mark should be 0.  When this object is no longer
+referred by anywhere, the pointer will be discarded by free function.
 
- Data_Make_Struct(klass, type, mark, free, sval)
+ Data_Make_Struct(class, type, mark, free, sval)
 
 This macro allocates memory using malloc(), assigns it to the variable
 sval, and returns the DATA encapsulating the pointer to memory region.
@@ -773,72 +737,53 @@ sval, and returns the DATA encapsulating the pointer to memory region.
 This macro retrieves the pointer value from DATA, and assigns it to
 the variable sval. 
 
-** Checking data types
-
-TYPE(value)
-FIXNUM_P(value)
-NIL_P(value)
-void Check_Type(VALUE value, int type)
-void Check_SafeStr(VALUE value)
-
-** Data type conversion
-
-FIX2INT(value)
-INT2FIX(i)
-NUM2INT(value)
-INT2NUM(i)
-NUM2DBL(value)
-rb_float_new(f)
-STR2CSTR(value)
-rb_str_new2(s)
-
 ** defining class/module
 
- VALUE rb_define_class(const char *name, VALUE super)
+ VALUE rb_define_class(char *name, VALUE super)
 
-Defines a new Ruby class as a subclass of super.
+Defines new Ruby class as subclass of super.
 
- VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
+ VALUE rb_define_class_under(VALUE module, char *name, VALUE super)
 
-Creates a new Ruby class as a subclass of super, under the module's
+Creates new Ruby class as subclass of super, under the module's
 namespace.
 
- VALUE rb_define_module(const char *name)
+ VALUE rb_define_module(char *name)
 
-Defines a new Ruby module.
+Defines new Ruby module.
 
- VALUE rb_define_module_under(VALUE module, const char *name, VALUE super)
+ VALUE rb_define_module_under(VALUE module, char *name, VALUE super)
 
-Defines a new Ruby module under the module's namespace.
+Defines new Ruby module, under the modules's namespace.
 
- void rb_include_module(VALUE klass, VALUE module)
+ void rb_include_module(VALUE class, VALUE module)
 
 Includes module into class.  If class already includes it, just
-ignored.
+ignore.
 
  void rb_extend_object(VALUE object, VALUE module)
 
-Extend the object with the module's attributes.
+Extend the object with module's attribute.
 
 ** Defining Global Variables
 
- void rb_define_variable(const char *name, VALUE *var)
+ void rb_define_variable(char *name, VALUE *var)
 
 Defines a global variable which is shared between C and Ruby.  If name
-contains a character which is not allowed to be part of the symbol,
+contains the character which is not allowed to be part of the symbol,
 it can't be seen from Ruby programs.
 
- void rb_define_readonly_variable(const char *name, VALUE *var)
+ void rb_define_readonly_variable(char *name, VALUE *var)
 
 Defines a read-only global variable.  Works just like
 rb_define_variable(), except defined variable is read-only.
 
- void rb_define_virtual_variable(const char *name,
-				 VALUE (*getter)(), VALUE (*setter)())
+ void rb_define_virtual_variable(char *name,
+				VALUE (*getter)(), VALUE (*setter)())
 
-Defines a virtual variable, whose behavior is defined by a pair of C
+Defines a virtual variable, whose behavior is defined by pair of C
 functions.  The getter function is called when the variable is
-referred.  The setter function is called when the value is set to the
+referred. The setter function is called when the value is set to the
 variable.  The prototype for getter/setter functions are:
 
 	VALUE getter(ID id)
@@ -846,19 +791,19 @@ variable.  The prototype for getter/setter functions are:
 
 The getter function must return the value for the access.
 
- void rb_define_hooked_variable(const char *name, VALUE *var,
+ void rb_define_hooked_variable(char *name, VALUE *var,
 				VALUE (*getter)(), VALUE (*setter)())
 
-Defines hooked variable.  It's a virtual variable with a C variable.  
-The getter is called as
+Defines hooked variable.  It's virtual variable with C variable.  The
+getter is called as
 
 	VALUE getter(ID id, VALUE *var)
 
-returning a new value.  The setter is called as
+returning new value.  The setter is called as
 
 	void setter(VALUE val, ID id, VALUE *var)
 
-GC requires C global variables which hold Ruby values to be marked.
+GC requires to mark the C global variables which hold Ruby values.
 
  void rb_global_variable(VALUE *var)
 
@@ -866,81 +811,77 @@ Tells GC to protect these variables.
 
 ** Constant Definition
 
- void rb_define_const(VALUE klass, const char *name, VALUE val)
+ void rb_define_const(VALUE klass, char *name, VALUE val)
 
 Defines a new constant under the class/module.
 
- void rb_define_global_const(const char *name, VALUE val)
+ void rb_define_global_const(char *name, VALUE val)
 
-Defines a global constant.  This is just the same as
+Defines global contant.  This is just work as
 
      rb_define_const(cKernal, name, val)
 
 ** Method Definition
 
- rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+ rb_define_method(VALUE class, char *name, VALUE (*func)(), int argc)
 
 Defines a method for the class.  func is the function pointer.  argc
 is the number of arguments.  if argc is -1, the function will receive
-3 arguments: argc, argv, and self.  if argc is -2, the function will
-receive 2 arguments, self and args, where args is a Ruby array of
+3 arguments argc, argv, and self.  if argc is -2, the function will
+receive 2 arguments, self and args, where args is the Ruby array of
 the method arguments.
 
- rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+ rb_define_private_method(VALUE class, char *name, VALUE (*func)(), int argc)
 
 Defines a private method for the class.  Arguments are same as
 rb_define_method().
 
- rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+ rb_define_singleton_method(VALUE class, char *name, VALUE (*func)(), int argc)
 
 Defines a singleton method.  Arguments are same as rb_define_method().
 
- rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
+ rb_scan_args(int argc, VALUE *argv, char *fmt, ...)
 
 Retrieve argument from argc, argv.  The fmt is the format string for
-the arguments, such as "12" for 1 non-optional argument, 2 optional
-arguments.  If `*' appears at the end of fmt, it means the rest of
-the arguments are assigned to the corresponding variable, packed in
-an array.
+the arguments, such as "12" for 1 non-optinal argument, 2 optinal
+aruguments.  If `*' appears at the end of fmt, it means the rest of
+the arguments are assigned to corresponding variable, packed in
+array.
 
 ** Invoking Ruby method
 
  VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
 
-Invokes a method.  To retrieve mid from a method name, use rb_intern().
+Invokes the method.  To retrieve mid from method name, use rb_intern().
 
  VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
 
-Invokes a method, passing arguments by an array of values.
+Invokes method, passing arguments by array of values.
 
- VALUE rb_eval_string(const char *str)
+ VALUE rb_eval_string(char *str)
 
-Compiles and executes the string as a Ruby program.
+Compiles and executes the string as Ruby program.
 
- ID rb_intern(const char *name)
+ ID rb_intern(char *name)
 
-Returns ID corresponding to the name.
+Returns ID corresponding the name.
 
  char *rb_id2name(ID id)
 
 Returns the name corresponding ID.
 
- char *rb_class2name(VALUE klass)
+ char *rb_class2name(VALUE class)
 
 Returns the name of the class.
 
- int rb_respond_to(VALUE object, ID id)
-
-Returns true if the object responds to the message specified by id.
-
 ** Instance Variables
 
- VALUE rb_iv_get(VALUE obj, const char *name)
+ VALUE rb_iv_get(VALUE obj, char *name)
 
 Retrieve the value of the instance variable.  If the name is not
 prefixed by `@', that variable shall be inaccessible from Ruby.
 
- VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
+ VALUE rb_iv_set(VALUE obj, char *name, VALUE val)
 
 Sets the value of the instance variable.
 
@@ -951,6 +892,7 @@ Sets the value of the instance variable.
 Calls the function func1, supplying func2 as the block.  func1 will be
 called with the argument arg1.  func2 receives the value from yield as
 the first argument, arg2 as the second argument.
+
  
  VALUE rb_yield(VALUE val)
 
@@ -958,7 +900,7 @@ Evaluates the block with value val.
 
  VALUE rb_rescue(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
 
-Calls the function func1, with arg1 as the argument.  If an exception
+Calls the function func1, with arg1 as the argument.  If exception
 occurs during func1, it calls func2 with arg2 as the argument.  The
 return value of rb_rescue() is the return value from func1 if no
 exception occurs, from func2 otherwise.
@@ -966,51 +908,44 @@ exception occurs, from func2 otherwise.
  VALUE rb_ensure(VALUE (*func1)(), void *arg1, void (*func2)(), void *arg2)
 
 Calls the function func1 with arg1 as the argument, then calls func2
-with arg2 if execution terminated.  The return value from
+with arg2, whenever execution terminated.  The return value from
 rb_ensure() is that of func1.
 
 ** Exceptions and Errors
 
- void rb_warn(const char *fmt, ...)
+ void rb_warn(char *fmt, ...)
 
-Prints a warning message according to a printf-like format.
+Prints warning message according to the printf-like format.
 
- void rb_warning(const char *fmt, ...)
+ void rb_warning(char *fmt, ...)
 
-Prints a warning message according to a printf-like format, if
+Prints warning message according to the printf-like format, if
 $VERBOSE is true.
 
-void rb_raise(rb_eRuntimeError, const char *fmt, ...)
+ void rb_raise(VALUE exception, char *fmt, ...)
 
-Raises RuntimeError.  The fmt is a format string just like printf().
+Raises an exception of class exception.  The fmt is the format string
+just like printf().
 
- void rb_raise(VALUE exception, const char *fmt, ...)
+ void rb_fatal(char *fmt, ...)
 
-Raises a class exception.  The fmt is a format string just like printf().
+Raises fatal error, terminates the interpreter.  No exception handling
+will be done for fatal error, but ensure blocks will be executed.
 
- void rb_fatal(const char *fmt, ...)
+ void rb_bug(char *fmt, ...)
 
-Raises a fatal error, terminates the interpreter.  No exception handling
-will be done for fatal errors, but ensure blocks will be executed.
-
- void rb_bug(const char *fmt, ...)
-
-Terminates the interpreter immediately.  This function should be
+Termintates the interpreter immediately.  This function should be
 called under the situation caused by the bug in the interpreter.  No
 exception handling nor ensure execution will be done.
 
 ** Initialize and Starts the Interpreter
 
-The embedding API functions are below (not needed for extension libraries):
+The embedding API are below (not needed for extension libraries):
 
- void ruby_init()
+ void ruby_init(int argc, char **argv, char **envp)
 
 Initializes the interpreter.
 
- void ruby_options(int argc, char **argv)
-
-Process command line arguments for the interpreter.
-
  void ruby_run()
 
 Starts execution of the interpreter.
@@ -1019,49 +954,30 @@ Starts execution of the interpreter.
 
 Specifies the name of the script ($0).
 
-Appendix C. Functions Available in extconf.rb
+Appendix B. Functions Available in extconf.rb
 
 These functions are available in extconf.rb:
 
  have_library(lib, func)
 
-Checks whether the library exists, containing the specified function.
+Checks whether library which contains specified function exists.
 Returns true if the library exists.
 
- find_library(lib, func, path...)
-
-Checks whether a library which contains the specified function exists in
-path.  Returns true if the library exists.
+ have_func(func)
 
- have_func(func, header)
-
-Checks whether func exists with header.  Returns true if the function
-exists.  To check functions in an additional library, you need to
-check that library first using have_library().
+Checks whether func exists.  Returns true if the function exists.  To
+check functions in the additional library, you need to check that
+library first using have_library().
 
  have_header(header)
 
-Checks whether header exists.  Returns true if the header file exists.
+Checks for the header files.  Returns true if the header file exists.
 
  create_makefile(target)
 
 Generates the Makefile for the extension library.  If you don't invoke
 this method, the compilation will not be done.
 
- with_config(withval[, default=nil])
-
-Parses the command line options and returns the value specified by
---with-<withval>.
-
- dir_config(target[, default_dir])
- dir_config(target[, default_include, default_lib])
-
-Parses the command line options and adds the directories specified by
---with-<target>-dir, --with-<target>-include, and/or --with-<target>-lib
-to $CFLAGS and/or $LDFLAGS.  --with-<target>-dir=/path is equivalent to
---with-<target>-include=/path/include --with-<target>-lib=/path/lib.
-Returns an array of the added directories ([include_dir, lib_dir]).
-
 /*
  * Local variables:
  * fill-column: 70
diff --git a/README.EXT.ja b/README.EXT.jp
index f49083e60e..da3902b8cc 100644
--- a/README.EXT.ja
+++ b/README.EXT.jp
@@ -1,4 +1,4 @@
-.\" README.EXT.ja -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
+.\" README.EXT -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
 
 Ruby�γ�ĥ�饤�֥��κ�������������ޤ���
 
@@ -43,13 +43,11 @@ Ruby�ˤϥ桼�����Ȥ���ǽ���Τ���ʲ��Υ����פ�����ޤ���
 	T_TRUE		��
 	T_FALSE		��
 	T_DATA		�ǡ���
-	T_SYMBOL	����ܥ�
 
 ����¾�����������Ѥ���Ƥ���ʲ��Υ����פ�����ޤ���
 
 	T_ICLASS
 	T_MATCH
-	T_UNDEF
 	T_VARMAP
 	T_SCOPE
 	T_NODE
@@ -75,7 +73,7 @@ ruby.h�Ǥ�TYPE()�Ȥ����ޥ������������Ƥ��ơ�VALUE�Υǡ���
       break;
     default:
       /* �㳰��ȯ�������� */
-      rb_raise(rb_eTypeError, "not valid value");
+      TypeError("not valid value");
       break;
   }
 
@@ -104,19 +102,10 @@ FIXNUM��NIL�˴ؤ��ƤϤ���®��Ƚ�̥ޥ������Ѱդ���Ƥ��ޤ���
 ���ޤ������줫�顤FIXNUM�˸¤餺Ruby�Υǡ������������Ѵ�����
 ��NUM2INT()�פȤ����ޥ���������ޤ������Υޥ����ϥǡ�������
 �פΥ����å�̵���ǻȤ��ޤ�(�������Ѵ��Ǥ��ʤ����ˤ��㳰��
-ȯ������)��Ʊ�ͤ˥����å�̵���ǻȤ����Ѵ��ޥ�����double��
-���Ф���NUM2DBL()�פ�����ޤ���
-
-char* ����Ф���硢version 1.6 �����Ǥϡ�STR2CSTR()�פ�
-�����ޥ�����ȤäƤ��ޤ������������ to_str() �ˤ����ۤ�
-���Ѵ���̤� GC ������ǽ�������뤿�ᡢversion 1.7 �ʹߤǤ�
-obsolete �Ȥʤꡢ����� StringValue() �� StringValuePtr()
-��Ȥ�����侩���Ƥ��ޤ���StringValue(var) �� var �� String
- �Ǥ���в��⤻���������Ǥʤ���� var �� var.to_str() �η�̤�
-�֤�������ޥ�����StringValuePtr(var) ��Ʊ�ͤ� var ���֤�����
-�Ƥ��� var ��ʸ����ɽ�����Ф��� char* ���֤��ޥ����Ǥ���var ��
-���Ƥ�ľ���֤����������������Τǡ�var �� lvalue �Ǥ���ɬ�פ�
-����ޤ���
+ȯ������)��
+
+Ʊ�ͤ˥����å�̵���ǻȤ����Ѵ��ޥ�����double����Ф�
+��NUM2DBL()�פ�char*����Ф���STR2CSTR()�פ�����ޤ���
 
 ����ʳ��Υǡ��������פ��б�����C�ι�¤�Τ�����ޤ����б���
 �빽¤�ΤΤ���VALUE�Ϥ��Τޤޥ��㥹��(���Ѵ�)����й�¤�Τ�
@@ -182,26 +171,16 @@ Ruby���Ѱդ��Ƥ���ؿ����Ѥ��Ƥ���������
 
  ʸ������Ф���ؿ�
 
-  rb_str_new(const char *ptr, long len)
+  rb_str_new(char *ptr, int len)
 
     ������Ruby��ʸ������������롥
 
-  rb_str_new2(const char *ptr)
+  rb_str_new2(char *ptr)
 
     C��ʸ���󤫤�Ruby��ʸ������������롥���δؿ��ε�ǽ��
     rb_str_new(ptr, strlen(ptr))��Ʊ���Ǥ��롥
 
-  rb_tainted_str_new(const char *ptr, long len)
-
-    �����ޡ������ղä��줿������Ruby��ʸ������������롥����
-    ����Υǡ����˴�Ť�ʸ����ˤϱ����ޡ������ղä����٤�
-    �Ǥ��롥
-
-  rb_tainted_str_new2(const char *ptr)
-
-    C��ʸ���󤫤�����ޡ������ղä��줿Ruby��ʸ������������롥
-
-  rb_str_cat(VALUE str, const char *ptr, long len)
+  rb_str_cat(VALUE str, char *ptr, int len)
 
     Ruby��ʸ����str��len�Х��Ȥ�ʸ����ptr���ɲä��롥
 
@@ -211,16 +190,16 @@ Ruby���Ѱդ��Ƥ���ؿ����Ѥ��Ƥ���������
 
     ���Ǥ�0��������������롥
 
-  rb_ary_new2(long len)
+  rb_ary_new2(int len)
 
     ���Ǥ�0��������������롥len����ʬ���ΰ�򤢤餫������
     ���ƤƤ�����
 
-  rb_ary_new3(long n, ...)
+  rb_ary_new3(int n, ...)
 
     �����ǻ��ꤷ��n���Ǥ�ޤ�������������롥
 
-  rb_ary_new4(long n, VALUE *elts)
+  rb_ary_new4(int n, VALUE *elts)
 
     �����Ϳ����n���Ǥ�������������롥
 
@@ -228,6 +207,7 @@ Ruby���Ѱդ��Ƥ���ؿ����Ѥ��Ƥ���������
   rb_ary_pop(VALUE ary)
   rb_ary_shift(VALUE ary)
   rb_ary_unshift(VALUE ary, VALUE val)
+  rb_ary_entry(VALUE ary, int idx)
 
     Array��Ʊ̾�Υ᥽�åɤ�Ʊ��Ư���򤹤�ؿ�����1������ɬ��
     ����Ǥʤ���Фʤ�ʤ���
@@ -255,8 +235,8 @@ Ruby���󶡤���Ƥ���ؿ���Ȥ���Ruby���󥿥ץ꥿�˿�������ǽ
 
 ���饹��⥸�塼���������뤿��ˤϡ��ʲ��δؿ���Ȥ��ޤ���
 
-  VALUE rb_define_class(const char *name, VALUE super)
-  VALUE rb_define_module(const char *name)
+  VALUE rb_define_class(char *name, VALUE super)
+  VALUE rb_define_module(char *name)
 
 �����δؿ��Ͽ�����������줿���饹��⥸�塼����֤��ޤ���
 �᥽�åɤ����������ˤ������ͤ�ɬ�פʤΤǡ��ۤȤ�ɤξ��
@@ -265,17 +245,17 @@ Ruby���󶡤���Ƥ���ؿ���Ȥ���Ruby���󥿥ץ꥿�˿�������ǽ
 ���饹��⥸�塼���¾�Υ��饹�������˥ͥ��Ȥ�������������
 �ϰʲ��δؿ���Ȥ��ޤ���
 
-  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
-  VALUE rb_define_module_under(VALUE outer, const char *name)
+  VALUE rb_define_class(VALUE outer, char *name, VALUE super)
+  VALUE rb_define_module(VALUE outer, char *name)
 
 2.1.2 �᥽�å�/�ðۥ᥽�å����
 
 �᥽�åɤ��ðۥ᥽�åɤ��������ˤϰʲ��δؿ���Ȥ��ޤ���
 
-  void rb_define_method(VALUE klass, const char *name, 
+  void rb_define_method(VALUE class, char *name, 
 		        VALUE (*func)(), int argc)
 
-  void rb_define_singleton_method(VALUE object, const char *name, 
+  void rb_define_singleton_method(VALUE object, char *name, 
 			          VALUE (*func)(), int argc)
 
 
@@ -297,8 +277,8 @@ argc��-1�λ��ϰ����������������Ϥ���ޤ���argc��-2�λ��ϰ�
 �᥽�åɤ��������ؿ��Ϥ⤦��Ĥ���ޤ����ҤȤĤ�private��
 ���åɤ��������ؿ��ǡ�������rb_define_method()��Ʊ���Ǥ���
 
-  void rb_define_private_method(VALUE klass, const char *name, 
-				VALUE (*func)(), int argc)
+  void rb_define_private_method(VALUE class, char *name, 
+			        VALUE (*func)(), int argc)
 
 private�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
 �ɤǤ���
@@ -318,26 +298,22 @@ private�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
 �Ȥ��������Ǥ�Ȥ��ޤ����⥸�塼��ؿ����������ؿ��ϰʲ���
 �̤�Ǥ���
 
-  void rb_define_module_function(VALUE module, const char *name, 
+  void rb_define_module_function(VALUE module, char *name, 
 		                 VALUE (*func)(), int argc)
 
 �ؿ�Ū�᥽�å�(Kernel�⥸�塼���private method)��������뤿
 ��δؿ��ϰʲ����̤�Ǥ���
 
-  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
-
-
-�᥽�åɤ���̾��������뤿��δؿ��ϰʲ����̤�Ǥ���
+  void rb_define_global_function(char *name, VALUE (*func)(), int argc)
 
-  void rb_define_alias(VALUE module, const char* new, const char* old);
 
 2.1.3 ������
 
 ��ĥ�饤�֥�꤬ɬ�פ�����Ϥ��餫����������Ƥ����������ɤ�
 �Ǥ��礦��������������ؿ�����Ĥ���ޤ���
 
-  void rb_define_const(VALUE klass, const char *name, VALUE val)
-  void rb_define_global_const(const char *name, VALUE val)
+  void rb_define_const(VALUE class, char *name, VALUE val)
+  void rb_define_global_const(char *name, VALUE val)
 
 ���Ԥ�����Υ��饹/�⥸�塼���°�����������������Ρ���
 �Ԥϥ������Х���������������ΤǤ���
@@ -358,7 +334,7 @@ private�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
 C����Ruby�ε�ǽ��ƤӽФ���äȤ��ñ����ˡ�Ȥ��ơ�ʸ�����
 Ϳ����줿Ruby�Υץ�������ɾ������ʲ��δؿ�������ޤ���
 
-  VALUE rb_eval_string(const char *str)
+  VALUE rb_eval_string(char *str)
 
 ����ɾ���ϸ��ߤδĶ��ǹԤ��ޤ����Ĥޤꡤ���ߤΥ��������ѿ�
 �ʤɤ�����Ѥ��ޤ���
@@ -375,10 +351,11 @@ ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby����Ǥ�
 
 �ǥ��������Ǥ��ޤ���C���餳�����������뤿��ˤϴؿ�
 
-  rb_intern(const char *name)
+  rb_intern(char *name)
 
-��Ȥ��ޤ���Ruby��������Ȥ���Ϳ����줿����ܥ�(�ޤ���ʸ��
-��)��ID���Ѵ�����ˤϰʲ��δؿ���Ȥ��ޤ���
+��Ȥ��ޤ����ޤ���ʸ���α黻�ҤϤ���ʸ�������ɤ����Τޤޥ���
+�ܥ�ˤʤäƤ��ޤ���Ruby��������Ȥ���Ϳ����줿����ܥ�(��
+����ʸ����)��ID���Ѵ�����ˤϰʲ��δؿ���Ȥ��ޤ���
 
   rb_to_id(VALUE symbol)
 
@@ -441,7 +418,7 @@ C��Ruby������ѿ���Ȥäƾ����ͭ�Ǥ��ޤ�����ͭ�Ǥ������
 �ѿ��ˤϤ����Ĥ��μ��ब����ޤ������Τʤ��Ǥ�äȤ��ɤ��Ȥ�
 ���Ȼפ���Τ�rb_define_variable()�Ǥ���
 
-  void rb_define_variable(const char *name, VALUE *var)
+  void rb_define_variable(char *name, VALUE *var)
 
 ���δؿ���Ruby��C�ȤǶ�ͭ��������ѿ���������ޤ����ѿ�̾��
 `$'�ǻϤޤ�ʤ����ˤϼ�ưŪ���ɲä���ޤ��������ѿ����ͤ���
@@ -450,14 +427,14 @@ C��Ruby������ѿ���Ȥäƾ����ͭ�Ǥ��ޤ�����ͭ�Ǥ������
 �ޤ�Ruby¦����Ϲ����Ǥ��ʤ��ѿ��⤢��ޤ�������read only��
 �ѿ��ϰʲ��δؿ���������ޤ���
 
-  void rb_define_readonly_variable(const char *name, VALUE *var)
+  void rb_define_readonly_variable(char *name, VALUE *var)
 
 ������ѿ���¾��hook��Ĥ�������ѿ�������Ǥ��ޤ���hook�դ�
 ������ѿ��ϰʲ��δؿ����Ѥ���������ޤ���hook�դ�����ѿ���
 �ͤλ��Ȥ������hook�ǹԤ�ɬ�פ�����ޤ���
 
-  void rb_define_hooked_variable(const char *name, VALUE *var,
-				 VALUE (*getter)(), void (*setter)())
+  void rb_define_hooked_variable(char *name, VALUE *var,
+				 VALUE (*getter)(), VALUE (*setter)())
 
 ���δؿ���C�δؿ��ˤ�ä�hook�ΤĤ���줿����ѿ����������
 �����ѿ������Ȥ��줿���ˤϴؿ�getter�����ѿ����ͤ����åȤ���
@@ -469,8 +446,8 @@ setter��0����ꤷ�ޤ���
 ���줫�顤C�δؿ��ˤ�äƼ¸������Ruby������ѿ����������
 �ؿ�������ޤ���
 
-  void rb_define_virtual_variable(const char *name,
-				  VALUE (*getter)(), void (*setter)())
+  void rb_define_virtual_variable(char *name,
+				  VALUE (*getter)(), VALUE (*setter)())
 
 ���δؿ��ˤ�ä�������줿Ruby������ѿ������Ȥ��줿���ˤ�
 getter�����ѿ����ͤ����åȤ��줿���ˤ�setter���ƤФ�ޤ���
@@ -490,11 +467,11 @@ Ruby���֥������Ȥ�C�ι�¤��(�ؤΥݥ���)�򤯤�ळ�Ȥ�Ruby
 Data���֥������Ȥ��������ƹ�¤�Τ�Ruby���֥������Ȥ˥��ץ���
 �����뤿��ˤϡ��ʲ��Υޥ�����Ȥ��ޤ���
 
-  Data_Wrap_Struct(klass, mark, free, ptr)
+  Data_Wrap_Struct(class,mark,free,ptr)
 
 ���Υޥ���������ͤ��������줿Data���֥������ȤǤ���
 
-klass�Ϥ���Data���֥������ȤΥ��饹�Ǥ���ptr�ϥ��ץ��벽����
+class�Ϥ���Data���֥������ȤΥ��饹�Ǥ���ptr�ϥ��ץ��벽����
 C�ι�¤�ΤؤΥݥ��󥿤Ǥ���mark�Ϥ��ι�¤�Τ�Ruby�Υ��֥���
 ���Ȥؤλ��Ȥ�������˻Ȥ��ؿ��Ǥ������Τ褦�ʻ��Ȥ�ޤޤʤ�
 ���ˤ�0����ꤷ�ޤ���
@@ -502,17 +479,16 @@ C�ι�¤�ΤؤΥݥ��󥿤Ǥ���mark�Ϥ��ι�¤�Τ�Ruby�Υ��֥���
 # ���Τ褦�ʻ��Ȥϴ�����ޤ���
 
 free�Ϥ��ι�¤�Τ��⤦���פˤʤä����˸ƤФ��ؿ��Ǥ�������
-�ؿ��������١������쥯������ƤФ�ޤ������줬-1�ξ��ϡ�ñ
-��˳�������ޤ���
+�ؿ��������١������쥯������ƤФ�ޤ���
 
 C�ι�¤�Τγ�����Data���֥������Ȥ�������Ʊ���˹Ԥ��ޥ�����
 ���ưʲ��Τ�Τ��󶡤���Ƥ��ޤ���
 
-  Data_Make_Struct(klass, type, mark, free, sval)
+  Data_Make_Struct(class, type, mark, free, sval)
 
 ���Υޥ���������ͤ��������줿Data���֥������ȤǤ���
 
-klass, mark, free��Data_Wrap_Struct��Ʊ��Ư���򤷤ޤ���type
+class, mark, free��Data_Wrap_Struct��Ʊ��Ư���򤷤ޤ���type
 �ϳ�����Ƥ�C��¤�Τη��Ǥ���������Ƥ�줿��¤�Τ��ѿ�sval
 ����������ޤ��������ѿ��η��� (type*) �Ǥ���ɬ�פ�����ޤ���
 
@@ -561,7 +537,7 @@ MANIFEST�Ȥ����ե�����ϡ���Ū��󥯤�make�λ��˥ǥ��쥯�ȥ�
 �ޤ��������ʤ�Ǥ����ɡ��ɤ�������ǽ��¸����뤫�ɤ����ޤ���
 �פ���ɬ�פ�����ޤ����ɤ�ʥ��饹��Ĥ��뤫�����Υ��饹�ˤ�
 �ɤ�ʥ᥽�åɤ����뤫�����饹���󶡤�������ʤɤˤĤ����߷�
-���ޤ���
+���ޤ���dbm���饹�ˤĤ��Ƥ�ext/dbm.doc�򻲾Ȥ��Ƥ���������
 
 (4) C�����ɤ��
 
@@ -612,7 +588,7 @@ struct dbmdata {
 };
 
 
-obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
+obj = Data_Make_Struct(class,struct dbmdata,0,free_dbm,dbmp);
 --
 
 �����Ǥ�dbmstruct��¤�ΤؤΥݥ��󥿤�Data�˥��ץ��벽���Ƥ�
@@ -657,10 +633,10 @@ fdbm_delete(obj, keystr)
 
 --
 static VALUE
-fdbm_s_open(argc, argv, klass)
+fdbm_s_open(argc, argv, class)
     int argc;
     VALUE *argv;
-    VALUE klass;
+    VALUE class;
 {
 	:
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
@@ -718,7 +694,7 @@ Makefile������ο����ˤʤ�extconf.rb�Ȥ����ե��������
 ����Ȥ����Ȥ�����ޤ���
 
   have_library(lib, func): �饤�֥���¸�ߥ����å�
-  have_func(func, header): �ؿ���¸�ߥ����å�
+  have_func(func): �ؿ���¸�ߥ����å�
   have_header(header): �إå��ե������¸�ߥ����å�
   create_makefile(target): Makefile������
 
@@ -736,7 +712,7 @@ Makefile������ο����ˤʤ�extconf.rb�Ȥ����ե��������
 �⤷���ǥ��쥯�ȥ��depend�Ȥ����ե����뤬¸�ߤ���С�
 Makefile����¸�ط�������å����Ƥ���ޤ���
 
-  % gcc -MM *.c > depend
+ % gcc -MM *.c > depend
 
 �ʤɤǺ�뤳�Ȥ�����ޤ������ä�»��̵���Ǥ��礦��
 
@@ -817,6 +793,8 @@ Ruby����Υ���
 �桼�ƥ���ƥ��ؿ�
 
   dln.c
+  fnmatch.c
+  glob.c
   regex.c
   st.c
   util.c
@@ -843,7 +821,6 @@ Ruby���ޥ�ɤμ���
   math.c
   numeric.c
   pack.c
-  prec.c
   process.c
   random.c
   range.c
@@ -883,7 +860,7 @@ Qfalse
 
 ** C�ǡ����Υ��ץ��벽
 
-Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
+Data_Wrap_Struct(VALUE class, void (*mark)(), void (*free)(), void *sval)
 
   C��Ǥ�դΥݥ��󥿤򥫥ץ��벽����Ruby���֥������Ȥ��֤�����
   �Υݥ��󥿤�Ruby���饢����������ʤ��ʤä�����free�ǻ��ꤷ��
@@ -891,7 +868,7 @@ Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
   �������Ȥ�ؤ��Ƥ����硤mark�˻��ꤹ��ؿ��ǥޡ�������ɬ��
   �����롥
 
-Data_Make_Struct(klass, type, mark, free, sval)
+Data_Make_Struct(class, type, mark, free, sval)
 
   type���Υ����malloc�����ѿ�sval�����������塤����򥫥ץ�
   �벽�����ǡ������֤��ޥ�����
@@ -921,24 +898,24 @@ rb_str_new2(s)
 
 ** ���饹/�⥸�塼�����
 
-VALUE rb_define_class(const char *name, VALUE super)
+VALUE rb_define_class(char *name, VALUE super)
 
   super�Υ��֥��饹�Ȥ��ƿ�����Ruby���饹��������롥
 
-VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
+VALUE rb_define_class_under(VALUE module, char *name, VALUE super)
 
   super�Υ��֥��饹�Ȥ��ƿ�����Ruby���饹���������module��
   ����Ȥ���������롥
 
-VALUE rb_define_module(const char *name)
+VALUE rb_define_module(char *name)
 
   ������Ruby�⥸�塼���������롥
 
-VALUE rb_define_module_under(VALUE module, const char *name, VALUE super)
+VALUE rb_define_module_under(VALUE module, char *name, VALUE super)
 
   ������Ruby�⥸�塼����������module������Ȥ���������롥
 
-void rb_include_module(VALUE klass, VALUE module)
+void rb_include_module(VALUE class, VALUE module)
 
   �⥸�塼��򥤥󥯥롼�ɤ��롥class�����Ǥ�module�򥤥�
   �롼�ɤ��Ƥ�����ˤϲ��⤷�ʤ�(¿�ť��󥯥롼�ɤζػ�)��
@@ -949,27 +926,27 @@ void rb_extend_object(VALUE object, VALUE module)
 
 ** ����ѿ����
 
-void rb_define_variable(const char *name, VALUE *var)
+void rb_define_variable(char *name, VALUE *var)
 
   Ruby��C�ȤǶ�ͭ���륰�����Х��ѿ���������롥�ѿ�̾��`$'��
   �Ϥޤ�ʤ����ˤϼ�ưŪ���ɲä���롥name�Ȥ���Ruby�μ��̻�
   �Ȥ��Ƶ�����ʤ�ʸ��(�㤨��` ')��ޤ���ˤ�Ruby�ץ�����
   �फ��ϸ����ʤ��ʤ롥
 
-void rb_define_readonly_variable(const char *name, VALUE *var)
+void rb_define_readonly_variable(char *name, VALUE *var)
 
   Ruby��C�ȤǶ�ͭ����read only�Υ������Х��ѿ���������롥
   read only�Ǥ��뤳�Ȱʳ���rb_define_variable()��Ʊ����
 
-void rb_define_virtual_variable(const char *name,
-				VALUE (*getter)(), void (*setter)())
+void rb_define_virtual_variable(char *name,
+				VALUE (*getter)(), VALUE (*setter)())
 
   �ؿ��ˤ�äƼ¸������Ruby�ѿ���������롥�ѿ������Ȥ��줿
   ���ˤ�getter�����ѿ����ͤ����åȤ��줿���ˤ�setter���ƤФ�
   �롥
 
-void rb_define_hooked_variable(const char *name, VALUE *var,
-			       VALUE (*getter)(), void (*setter)())
+void rb_define_hooked_variable(char *name, VALUE *var,
+			       VALUE (*getter)(), VALUE (*setter)())
 
   �ؿ��ˤ�ä�hook�ΤĤ���줿�������Х��ѿ���������롥�ѿ�
   �����Ȥ��줿���ˤ�getter�����ؿ����ͤ����åȤ��줿���ˤ�
@@ -983,21 +960,21 @@ void rb_global_variable(VALUE *var)
 
 ** ���
 
-void rb_define_const(VALUE klass, const char *name, VALUE val)
+void rb_define_const(VALUE klass, char *name, VALUE val)
 
   �����������롥
 
-void rb_define_global_const(const char *name, VALUE val)
+void rb_define_global_const(char *name, VALUE val)
 
   ��������������롥
 
-     rb_define_const(rb_cObject, name, val)
+     rb_define_const(cKernal, name, val)
 
   ��Ʊ����̣��
 
 ** �᥽�å����
 
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+rb_define_method(VALUE class, char *name, VALUE (*func)(), int argc)
 
   �᥽�åɤ�������롥argc��self����������ο���argc��-1�λ�, 
   �ؿ��ˤϰ����ο�(self��ޤޤʤ�)����1����, �������������2
@@ -1005,17 +982,17 @@ rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
   ��1������self, ��2������args(args�ϰ�����ޤ�Ruby������)��
   ����������Ϳ�����롥
  
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+rb_define_private_method(VALUE class, char *name, VALUE (*func)(), int argc)
 
   private�᥽�åɤ�������롥������rb_define_method()��Ʊ����
 
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+rb_define_singleton_method(VALUE class, char *name, VALUE (*func)(), int argc)
 
   �ðۥ᥽�åɤ�������롥������rb_define_method()��Ʊ����
 
-rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
+rb_scan_args(int argc, VALUE *argv, char *fmt, ...)
 
-  argc, argv������Ϳ����줿������ʬ�򤹤롥fmt��ɬ�ܰ����ο�, 
+  argc,argv������Ϳ����줿������ʬ�򤹤롥fmt��ɬ�ܰ����ο�, 
   �ղð����ο�, �Ĥ�ΰ��������뤫����ꤹ��ʸ�����, "����
   ����*"�Ȥ��������Ǥ��롥 2 ���ܤο�����"*"�Ϥ��줾���ά��
   ǽ�Ǥ��롥ɬ�ܰ�������Ĥ�ʤ�����0����ꤹ�롥��3������
@@ -1032,13 +1009,13 @@ VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
 
 VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
 
-  �᥽�åɸƤӽФ���������argc, argv�������Ϥ���
+  �᥽�åɸƤӽФ���������argc,argv�������Ϥ���
 
-VALUE rb_eval_string(const char *str)
+VALUE rb_eval_string(char *str)
 
-  ʸ�����Ruby������ץȤȤ��ƥ���ѥ��롦�¹Ԥ��롥
+  ʸ�����Ruby�ȥ�����ץȤ��ƥ���ѥ��롦�¹Ԥ��롥
 
-ID rb_intern(const char *name)
+ID rb_intern(char *name)
 
   ʸ������б�����ID���֤���
 
@@ -1046,31 +1023,27 @@ char *rb_id2name(ID id)
 
   ID���б�����ʸ������֤�(�ǥХå���)��
 
-char *rb_class2name(VALUE klass)
+char *rb_class2name(VALUE class)
 
-  ���饹��̾�����֤�(�ǥХå���)�����饹��̾��������ʤ����ˤ�, 
+  class��̾�����֤�(�ǥХå���)��class��̾��������ʤ����ˤ�, 
   ������̤ä�̾������ĥ��饹��̾�����֤���
 
-int rb_respond_to(VALUE obj, ID id)
-
-  obj��id�Ǽ������᥽�åɤ���Ĥ��ɤ������֤���
-
 ** ���󥹥����ѿ�
 
-VALUE rb_iv_get(VALUE obj, const char *name)
+VALUE rb_iv_get(VALUE obj, char *name)
 
   obj�Υ��󥹥����ѿ����ͤ����롥`@'�ǻϤޤ�ʤ����󥹥���
   ���ѿ��� Ruby�ץ�����फ�饢�������Ǥ��ʤ��ֱ��줿�ץ���
   �������ѿ��ˤʤ롥�������ʸ����̾������ĥ��饹(�ޤ���
   �⥸�塼��)�Υ��󥹥����ѿ��Ȥ��Ƽ�������Ƥ��롥
 
-VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
+VALUE rb_iv_set(VALUE obj, char *name, VALUE val)
 
   obj�Υ��󥹥����ѿ���val�˥��åȤ��롥
 
 ** ���湽¤
 
-VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
+VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
 
   func2��֥��å��Ȥ������ꤷ, func1�򥤥ƥ졼���Ȥ��ƸƤ֡� 
   func1�ˤ� arg1�������Ȥ����Ϥ���, func2�ˤ���1�����˥��ƥ졼
@@ -1080,14 +1053,14 @@ VALUE rb_yield(VALUE val)
 
   val���ͤȤ��ƥ��ƥ졼���֥��å���ƤӽФ���
 
-VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
+VALUE rb_rescue(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
 
   �ؿ�func1��arg1������˸ƤӽФ���func1�μ¹�����㳰��ȯ��
   �������ˤ� func2��arg2������Ȥ��ƸƤ֡�����ͤ��㳰��ȯ��
   ���ʤ��ä�����func1�������, �㳰��ȯ���������ˤ�func2����
   ���ͤǤ��롥
 
-VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, void (*func2)(), VALUE arg2)
+VALUE rb_ensure(VALUE (*func1)(), void *arg1, void (*func2)(), void *arg2)
 
   �ؿ�func1��arg1������Ȥ��Ƽ¹Ԥ�, �¹Խ�λ��(���Ȥ��㳰��
   ȯ�����Ƥ�) func2��arg2������Ȥ��Ƽ¹Ԥ��롥����ͤ�func1
@@ -1095,27 +1068,27 @@ VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, void (*func2)(), VALUE arg2)
 
 ** �㳰�����顼
 
-void rb_warning(const char *fmt, ...)
+void rb_warning(char *fmt, ...)
 
   rb_verbose����ɸ�२�顼���Ϥ˷ٹ�����ɽ�����롥������
   printf()��Ʊ����
 
-void rb_raise(rb_eRuntimeError, const char *fmt, ...)
+void rb_raise(rb_eRuntimeError, char *fmt, ...)
 
   RuntimeError�㳰��ȯ�������롥������printf()��Ʊ����
 
-void rb_raise(VALUE exception, const char *fmt, ...)
+void rb_raise(VALUE exception, char *fmt, ...)
 
   exception�ǻ��ꤷ���㳰��ȯ�������롥fmt�ʲ��ΰ�����
   printf()��Ʊ����
 
-void rb_fatal(const char *fmt, ...)
+void rb_fatal(char *fmt, ...)
 
   ��̿Ū�㳰��ȯ�������롥�̾���㳰�����ϹԤʤ�줺, ���󥿡�
   �ץ꥿����λ����(������ensure�ǻ��ꤵ�줿�����ɤϽ�λ����
   �¹Ԥ����)��
 
-void rb_bug(const char *fmt, ...)
+void rb_bug(char *fmt, ...)
 
   ���󥿡��ץ꥿�ʤɥץ������ΥХ��Ǥ���ȯ������Ϥ��Τʤ�
   �����λ��Ƥ֡����󥿡��ץ꥿�ϥ�������פ�ľ���˽�λ���롥
@@ -1126,14 +1099,10 @@ void rb_bug(const char *fmt, ...)
 Ruby�򥢥ץꥱ����������������ˤϰʲ��Υ��󥿥ե�����
 ��Ȥ����̾�γ�ĥ�饤�֥��ˤ�ɬ�פʤ���
 
-void ruby_init()
+void ruby_init(int argc, char **argv, char **envp)
 
   Ruby���󥿥ץ꥿�ν������Ԥʤ���
 
-void ruby_options(int argc, char **argv)
-
-  Ruby���󥿥ץ꥿�Υ��ޥ�ɥ饤������ν�����Ԥʤ���
-
 void ruby_run()
 
   Ruby���󥿥ץ꥿��¹Ԥ��롥
@@ -1143,7 +1112,7 @@ void ruby_script(char *name)
   Ruby�Υ�����ץ�̾($0)�����ꤹ�롥
 
 
-Appendix C. extconf.rb�ǻȤ���ؿ�����
+Appendix B. extconf.rb�ǻȤ���ؿ�����
 
 extconf.rb����Ǥ����Ѳ�ǽ�ʥ���ѥ���������å��δؿ��ϰ�
 �����̤�Ǥ��롥
@@ -1157,19 +1126,25 @@ find_library(lib, func, path...)
 
   �ؿ�func��������Ƥ���饤�֥��lib��¸�ߤ� -Lpath ���ɲ�
   ���ʤ�������å����롥�饤�֥�꤬���դ��ä�����true���֤���
+  ��̤򥭥�å��夷�ʤ���
 
-have_func(func, header)
+have_func(func)
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ��ƴؿ�func��¸�ߤ������
-  �����롥func��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�ΤǤ�
-  ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
-  �����ؿ���¸�ߤ����true���֤���
+  �ؿ�func��¸�ߤ�����å����롥func��ɸ��Ǥϥ�󥯤���ʤ�
+  �饤�֥����Τ�ΤǤ�����ˤ����have_library�Ǥ��Υ饤��
+  ��������å����Ƥ��������ؿ���¸�ߤ����true���֤���
 
 have_header(header)
 
   �إå��ե������¸�ߤ�����å����롥�إå��ե����뤬¸�ߤ�
   ���true���֤���
 
+find_header(header)
+
+  �إå��ե������¸�ߤ� -Ipath ���ɲä��ʤ�������å����롥
+  �إå��ե����뤬���դ��ä���true���֤�����̤򥭥�å��夷
+  �ʤ���
+
 create_makefile(target)
 
   ��ĥ�饤�֥���Ѥ�Makefile���������롥���δؿ���ƤФʤ���
@@ -1178,17 +1153,13 @@ create_makefile(target)
 
 with_config(withval[, default=nil])
 
-  ���ޥ�ɥ饤����--with-<withval>�ǻ��ꤵ�줿���ץ�����ͤ����롥
+  --with-<withval>�ǻ��ꤵ�줿���ץ�����ͤ����롥
 
-dir_config(target[, default_dir])
-dir_config(target[, default_include, default_lib])
+dir_config(target)
 
-  ���ޥ�ɥ饤����--with-<target>-dir, --with-<target>-include,
-  --with-<target>-lib�Τ����줫�ǻ��ꤵ���ǥ��쥯�ȥ��
-  $CFLAGS �� $LDFLAGS ���ɲä��롥--with-<target>-dir=/path��
-  --with-<target>-include=/path/include --with-<target>-lib=/path/lib
-  �������Ǥ��롥�ɲä��줿 include �ǥ��쥯�ȥ�� lib �ǥ��쥯�ȥ��
-  ������֤��� ([include_dir, lib_dir])
+  --with-<target>-dir, --with-<target>-include, --with-<target>-lib
+  �Τ����줫�ǻ��ꤵ���ǥ��쥯�ȥ�� $CFLAGS �� $LDFLAGS
+  ���ɲä��롥
 
 /*
  * Local variables:
diff --git a/README.ja b/README.jp
index fc502dd440..4e2be09b26 100644
--- a/README.ja
+++ b/README.jp
@@ -10,7 +10,7 @@ Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
 �ˤ�äơ����ʬ����䤹���ץ�����ߥ󥰤�����ޤ���
 
 
-* Ruby����Ĺ
+* Ruby����Ĺ��
 
   + ����ץ��ʸˡ
   + ���̤Υ��֥������Ȼظ���ǽ(���饹���᥽�åɥ�����ʤ�)
@@ -30,66 +30,39 @@ Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
 
 �ʲ��ξ��ˤ����Ƥ���ޤ���
 
-  ftp://ftp.ruby-lang.org/pub/ruby/
-
-** CVS��
-
-  $ cvs -d :pserver:anonymous@cvs.ruby-lang.org:/src login
-  (Logging in to anonymous@cvs.ruby-lang.org)
-  CVS password: anonymous
-  $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:src checkout ruby
+  ftp://ftp.netlab.co.jp/pub/lang/ruby/
 
 
 * �ۡ���ڡ���
 
 Ruby�Υۡ���ڡ�����URL��
 
-   http://www.ruby-lang.org/
+   http://www.netlab.co.jp/ruby/jp/
 
 �Ǥ���
 
 
 * �᡼��󥰥ꥹ��
 
-Ruby�Υ᡼��󥰥ꥹ�Ȥ�����ޤ������ô�˾������
-
-   ruby-list-ctl@ruby-lang.org
-
-�ޤ���ʸ��
-
-   subscribe YourFirstName YourFamilyName
-   
-�Ƚ񤤤����äƲ������� 
-
-Ruby��ȯ�Ը����᡼��󥰥ꥹ�Ȥ⤢��ޤ���������Ǥ�ruby�Υ�
-��������λ��ͳ�ĥ�ʤɼ����������ˤĤ��Ƶ�������Ƥ��ޤ���
-���ô�˾������
+Ruby�˴ؤ������Τ���Υ᡼��󥰥ꥹ�Ȥ��ߤ��ޤ�������
+�ɥ쥹��
 
-   ruby-dev-ctl@ruby-lang.org
+   ruby-list@netlab.co.jp
 
-�ޤ�ruby-list��Ʊ�ͤ���ˡ�ǥ᡼�뤷�Ƥ��������� 
-
-Ruby��ĥ�⥸�塼��ˤĤ����ä��礦ruby-ext�᡼��󥰥ꥹ�Ȥ�
-���شط�������ˤĤ����ä��礦ruby-math�᡼��󥰥ꥹ�Ȥ�
-�Ѹ���ä��礦ruby-talk�᡼��󥰥ꥹ�Ȥ⤢��ޤ���������ˡ
-�Ϥɤ��Ʊ���Ǥ��� 
+�Ǥ������Υ��ɥ쥹�˥᡼�������С���ưŪ����Ͽ����ޤ���
 
 
 * ����ѥ��롦���󥹥ȡ���
 
 �ʲ��μ��ǹԤäƤ���������
 
-  1. �⤷configure�ե����뤬���Ĥ���ʤ����⤷����
-     configure.in���Ť��褦�ʤ顢autoconf��¹Ԥ���
-     ������configure����������
-
-  2. configure��¹Ԥ���Makefile�ʤɤ���������
+  1. configure��¹Ԥ���Makefile�ʤɤ���������
 
-  3. (ɬ�פʤ��)defines.h���Խ�����
+  2. (ɬ�פʤ��)defines.h���Խ�����
 
      ¿ʬ��ɬ��̵���Ȼפ��ޤ���
 
-  4. (ɬ�פʤ��)ext/Setup����Ū�˥�󥯤����ĥ�⥸�塼���
+  3. (ɬ�פʤ��)ext/Setup����Ū�˥�󥯤����ĥ�⥸�塼���
      ���ꤹ��
 
      ext/Setup�˵��Ҥ����⥸�塼�����Ū�˥�󥯤���ޤ���
@@ -100,14 +73,14 @@ Ruby��ĥ�⥸�塼��ˤĤ����ä��礦ruby-ext�᡼��󥰥ꥹ�Ȥ�
      ��ĥ�⥸�塼������Ѥ��뤿��ˤϡ����餫������Ū�˥��
      �����Ƥ���ɬ�פ�����ޤ���
 
-  5. make��¹Ԥ��ƥ���ѥ��뤹��
+  4. make��¹Ԥ��ƥ���ѥ��뤹��
 
-  6. make test�ǥƥ��Ȥ�Ԥ���
+  5. make test�ǥƥ��Ȥ�Ԥ���
 
      ��test succeeded�פ�ɽ�������������Ǥ����������ƥ���
      ���������Ƥⴰ�������ݾڤ���Ƥ������ǤϤ���ޤ���
 
-  7. make install
+  6. make install
 
      root�Ǻ�Ȥ���ɬ�פ����뤫�⤷��ޤ���
 
@@ -140,12 +113,60 @@ UNIX�Ǥ����configure���ۤȤ�ɤκ��ۤ�ۼ����Ƥ����Ϥ���
 
 * ���۾��
 
-COPYING.ja�ե�����򻲾Ȥ��Ƥ���������
+RUby�ϥե꡼���եȥ������Ǥ���GPL(the GNU General Public
+Licence)�ޤ��ϰʲ��˼�������Ruby������ۤǤ��ޤ���GPL�ˤ�
+���Ƥ�COPYING�ե�����򻲾Ȥ��Ʋ�������
+
+  1. ʣ�������¤ʤ���ͳ�Ǥ���
+
+  2. �ʲ��ξ��Τ����줫�����������˼긵��Ruby�Υ�������
+     ͳ���ѹ��Ǥ��ޤ���
+
+     (a) �ͥåȥ˥塼���˥ݥ��Ȥ����ꡤ��Ԥ��ѹ������դ���
+         �ʤɤ���ˡ�ǡ��ѹ���������롥
+
+     (b) �ѹ�����Ruby��ʬ�ν�°�����ȿ����������ǻȤ���
+
+     (c) �ѹ����������������������եȥ�������̾�����ѹ����롥
+         ���Υ��եȥ����������ۤ�����ˤ��ѹ�����Ruby��Ʊ��
+         �����ۤ��롥�ޤ����ѹ�����Ruby�Υ�����������ˡ����
+         �����롥
+
+     (d) ����¾���ѹ������Ԥȹ�դ��롥
+
+  3. �ʲ��ξ��Τ����줫������������Ruby�򥪥֥������ȥ���
+     �ɤ�¹Է����Ǥ����ۤǤ��ޤ���
+
+     (a) �Х��ʥ�������ä��ͤ�������������Ǥ���褦�ˡ�
+         ������������ˡ���������롥
+
+     (b) �������ɤʥ����������ɤ�ź�դ��롥
+
+     (c) �ѹ���Ԥä��Х��ʥ��̾�����ѹ��������������ꥸ��
+         ��Υ����������ɤ�����ˡ���������롥
+
+     (d) ����¾�����۾����Ԥȹ�դ��롥
+
+  4. ¾�Υץ������ؤΰ��ѤϤ����ʤ���Ū�Ǥ��켫ͳ�Ǥ�����
+     ������Ruby�˴ޤޤ��¾�κ�Ԥˤ�륳���ɤϡ����줾���
+     ��Ԥΰո��ˤ�����¤��ä����ޤ�������Ū�ˤ�gc.c(����)��
+     util.c(����)��st.[ch]��regex.[ch] �����.  /missing�ǥ�
+     �쥯�ȥ겼�Υե����뷲���������ޤ������줾������۾��
+     �ʤɤ��դ��Ƥϳƥե�����򻲾Ȥ��Ƥ���������
+
+  5. Ruby�ؤ����ϤȤʤ륹����ץȤ���ӡ�Ruby����ν��Ϥθ�
+     ����Ruby�κ�ԤǤϤʤ������줾��������Ϥ����������ͤ�
+     °���ޤ����ޤ���Ruby���Ȥ߹��ि��γ�ĥ�饤�֥��ˤ�
+     ���Ƥ�Ʊ�ͤǤ���
+
+  6. Ruby��̵�ݾڤǤ�����Ԥ�Ruby�򥵥ݡ��Ȥ���ջ֤Ϥ����
+     ������Ruby���ȤΥХ����뤤��Ruby������ץȤΥХ��ʤɤ�
+     ��ȯ�����뤤���ʤ�»�����Ф��Ƥ���Ǥ������ޤ���
 
 
 * ����
 
-�����ȡ��Х���ݡ��Ȥ���¾�� matz@netlab.jp �ޤǡ�
+�����ȡ��Х���ݡ��Ȥ���¾�� matz@netlab.co.jp �ޤǡ�
 -------------------------------------------------------
 created at: Thu Aug  3 11:57:36 JST 1995
 Local variables:
diff --git a/ToDo b/ToDo
index b55e399edf..021e07d72a 100644
--- a/ToDo
+++ b/ToDo
@@ -1,126 +1,54 @@
 Language Spec.
 
-- Class#allocate - basicNew
-- class Foo::Bar<Baz .. end, module Boo::Bar .. end
-* operator !! for rescue. ???
-* objectify characters
 * ../... outside condition invokes operator method too.
-* ... inside condition turns off just before right condition.???
-* package or access control for global variables??
+* %w(a\ b\ c abc) => ["a b c", "abc"]
+* package or access control for global variables
+* class variable (prefix?)
 * named arguments like foo(nation:="german") or foo(nation: "german").
-* method to retrieve argument information (needs new C API)
-* multiple return values, yield values.  maybe incompatible ???
+* method to retrieve argument information (need new C API)
+* multiple return values, yield values.  maybe incompatible
 * cascading method invocation ???
 * def Class#method .. end ??
+* class Foo::Bar<Baz .. end, module Boo::Bar .. end
 * def Foo::Bar::baz() .. end ??
-* I18N (or M17N) script/string/regexp
-* Fixnum 0 as false ????
-* discourage use of symbol variables (e.g. $/, etc.) in manual
-* discourage use of Perlish features by giving warnings.
-* non confusing in-block local variable (is it possible?)
-  + remove scope by block
-  + variables appears within block may have independent values.
-* Regexp: make /o thread safe.
-* decide whether begin with rescue or ensure make do..while loop.
-* a +1 to be a+1, not a(+1).
-* unify == and eql? again
-* to_i returns nil if str contains no digit.
-* raise exception by `` error
-* jar like combined library package. -> RubyGems?
-* resumable Exception via Exception#resume.
-* method combination, e.g. before, after, around, etc.
-* .. or something like defadvice in Emacs.
-* property - for methods, or for objects in general.
-* "in" modifier, to annotate, or to encourage assertion.
-* selector namespace - something like generic-flet in CLOS, to help RubyBehavior
-* private instance variable (as in Python?) @_foo in class Foo => @_Foo_foo
-* warn/error "bare word" method, like "foo",  you should type "foo()"
-* clarify evaluation order of operator argument (=~, .., ...)
-* :symbol => value hash in the form of {symbol: value, ...} ??
 
 Hacking Interpreter
 
-- generational GC
-* non-blocking open (e.g. for named pipe) for thread
-* avoid blocking with gethostbyname/gethostbyaddr (use fork ???)
-* objectify interpreters ???
+* non-blocking open (e.g. named pipe) for thread
+* avoid blocking with gethostbyname/gethostbyaddr
+* objectify interpreters
 * remove rb_eval() recursions
 * syntax tree -> bytecode ???
 * scrambled script, or script filter
 * setuid ruby
-* performance tune for in-block (dynamic) local variables.
-* give warnings to assign magic variables.
-* export rb_io_{addstr,printf,puts,print}
-* autoload should work with threads [ruby-talk:4589]
-* remove stdio dependency from IOs.
-* warn for inconsistent local variable usage (lv m and method m at the same time). 
-* MicroRuby
-* Built-in Interactive Ruby.
-* Parser API
-* trap every method invocation, which can be enabled by e.g. trap_call :method.
-* unify Errno exceptions of same errno, or new exception comparison scheme.
-* 2.times{|i| if i==0 then a = 15 else puts eval("a") end} should print nil.
-* Thread#max_stack_size attribute (possible??)
 
 Standard Libraries
 
-- Module#define_method which takes a name and a body (block, proc or method).
-- Enume#inject
-- Array#fetch
-- IO::for_fd
-- Process::waitall [ruby-talk:4557]
-- Process::Status
-- File::lchown, File::lchmod; xxx - still need work for non existing platforms
-- move Time::times to Process.
-- Enumerable#sort_by for Schwartzian transformation
-- fork_and_kill_other_threads.
-- signal list (Signal::trap, Signal::list).
-- move NameError under StandardError.
-- Integer#to_s(base)
-- Hash::new{default}
-- hash etc. should handle self referenceing array/hash
-- Array#select(n1,n2...) works like Array#indexes(n1,n2...)
-- use Mersenne Twister RNG for random.
-- deprecate Array#indexes, and Array#indices.
-- remove dependency on MAXPATHLEN.
 * String#scanf(?)
 * Object#fmt(?)
 * Time::strptime
 * Integer[num], Float[num];  Fixnum[num]?
-* method to retrieve non-number trailer for to_i/to_f.
+* method to detect non-number trailer for to_i/to_f.
 * Stream or Port, abstract superclass of IO ?
 * String#{pred,prev}, String#downto
 * optional stepsize argument for succ()
-* Ruby module -- Ruby::Version, Ruby::Interpreter
-* introduce Boolean class; super of TrueClass, FalseClass
-* synchronized method - synchronized{...}, synchronized :foo, :bar
-* Array#&, Array#| to allow duplication. ???
-* way to specify immortal (fork endurance) thread;
-* or raise ForkException to every thread but fork caller.
-* new user-defined marshal scheme. _dump(dumper), _load(restorer)
-* library to load per-user profile seeking .ruby_profile or ruby.ini file.
-* warning framework (warn, warning for Ruby level)
-* marshal should not depend on sprintf (works bad with locale).
-* ternary arg pow: a.pow(b,c) == a**b%c
-* new caller(), e.g. call_stack; needs better name.
-* pointer share mechanism similar to one in String for Array.
-* require "1.6" etc. by /usr/lib/ruby/1.6/1.6.rb ;-)
-* save both "feature names" and "normalized path" in $"
-* implement Mutex_m (or MutexMixin) using Mutex.
 
 Extension Libraries
 
+* FastCGI ruby
 * ptk.rb pTk wrapper that is compatible to tk.rb
-* Berkeley DB extension
-* BitVector
-* thread-safe fcgi
 
 Ruby Libraries
 
-* urllib.rb, nttplib.rb, etc.
+* net/pop.rb net/smtp.rb
+* httplib.rb, urllib.rb, nttplib.rb, etc.
 * format like perl's
 
 Tools
 
+* extension library maker like XS or SWIG
 * freeze or undump to bundle everything
-* bundle using zlib
+
+Misc
+
+* publish Ruby books
diff --git a/array.c b/array.c
index ed562060d2..1c5c41e092 100644
--- a/array.c
+++ b/array.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   array.c -
 
@@ -6,25 +6,21 @@
   $Date$
   created at: Fri Aug  6 09:46:12 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
 #include "util.h"
-#include "st.h"
 
 VALUE rb_cArray;
-static ID id_cmp;
 
 #define ARY_DEFAULT_SIZE 16
 
 void
 rb_mem_clear(mem, size)
     register VALUE *mem;
-    register long size;
+    register size_t size;
 {
     while (size--) {
 	*mem++ = Qnil;
@@ -34,7 +30,7 @@ rb_mem_clear(mem, size)
 static void
 memfill(mem, size, val)
     register VALUE *mem;
-    register long size;
+    register size_t size;
     register VALUE val;
 {
     while (size--) {
@@ -42,93 +38,59 @@ memfill(mem, size, val)
     }
 }
 
-#define ARY_TMPLOCK  FL_USER1
+#define ARY_FREEZE   FL_USER1
+#define ARY_TMPLOCK  FL_USER2
 
-static inline void
-rb_ary_modify_check(ary)
+static void
+rb_ary_modify(ary)
     VALUE ary;
 {
-    if (OBJ_FROZEN(ary)) rb_error_frozen("array");
+    if (FL_TEST(ary, ARY_FREEZE))
+	rb_raise(rb_eTypeError, "can't modify frozen array");
     if (FL_TEST(ary, ARY_TMPLOCK))
-	rb_raise(rb_eTypeError, "can't modify array during iteration");
-    if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
+	rb_raise(rb_eTypeError, "can't modify array during sort");
+    if (!FL_TEST(ary, FL_TAINT) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
 }
 
-static void
-rb_ary_modify(ary)
-    VALUE ary;
-{
-    VALUE *ptr;
-
-    rb_ary_modify_check(ary);
-    if (FL_TEST(ary, ELTS_SHARED)) {
-	ptr = ALLOC_N(VALUE, RARRAY(ary)->len);
-	FL_UNSET(ary, ELTS_SHARED);
-	RARRAY(ary)->aux.capa = RARRAY(ary)->len;
-	MEMCPY(ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
-	RARRAY(ary)->ptr = ptr;
-    }
-}
 VALUE
 rb_ary_freeze(ary)
     VALUE ary;
 {
-    return rb_obj_freeze(ary);
+    FL_SET(ary, ARY_FREEZE);
+    return ary;
 }
 
 static VALUE
 rb_ary_frozen_p(ary)
     VALUE ary;
 {
-    if (FL_TEST(ary, FL_FREEZE|ARY_TMPLOCK))
+    if (FL_TEST(ary, ARY_FREEZE|ARY_TMPLOCK))
 	return Qtrue;
     return Qfalse;
 }
 
-static VALUE ary_alloc _((VALUE));
-static VALUE
-ary_alloc(klass)
-    VALUE klass;
-{
-    NEWOBJ(ary, struct RArray);
-    OBJSETUP(ary, klass, T_ARRAY);
-
-    ary->len = 0;
-    ary->ptr = 0;
-    ary->aux.capa = 0;
-
-    return (VALUE)ary;
-}
-
-static VALUE
-ary_new(klass, len)
-    VALUE klass;
+VALUE
+rb_ary_new2(len)
     long len;
 {
-    VALUE ary = ary_alloc(klass);
+    NEWOBJ(ary, struct RArray);
+    OBJSETUP(ary, rb_cArray, T_ARRAY);
 
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative array size (or size too big)");
     }
-    if (len > 0 && len * sizeof(VALUE) <= len) {
+    if (len > 0 && len*sizeof(VALUE) <= 0) {
 	rb_raise(rb_eArgError, "array size too big");
     }
-    if (len == 0) len++;
-    RARRAY(ary)->ptr = ALLOC_N(VALUE, len);
-    RARRAY(ary)->aux.capa = len;
-
-    return ary;
-}
+    ary->len = 0;
+    ary->capa = len;
+    ary->ptr = 0;
+    ary->ptr = ALLOC_N(VALUE, len);
 
-VALUE
-rb_ary_new2(len)
-    long len;
-{
-    return ary_new(rb_cArray, len);
+    return (VALUE)ary;
 }
 
-
 VALUE
 rb_ary_new()
 {
@@ -156,7 +118,10 @@ rb_ary_new3(n, va_alist)
     VALUE ary;
     long i;
 
-    ary = rb_ary_new2(n);
+    if (n < 0) {
+	rb_raise(rb_eIndexError, "negative number of items(%d)", n);
+    }
+    ary = rb_ary_new2(n<ARY_DEFAULT_SIZE?ARY_DEFAULT_SIZE:n);
 
     va_init_list(ar, n);
     for (i=0; i<n; i++) {
@@ -171,12 +136,12 @@ rb_ary_new3(n, va_alist)
 VALUE
 rb_ary_new4(n, elts)
     long n;
-    const VALUE *elts;
+    VALUE *elts;
 {
     VALUE ary;
 
     ary = rb_ary_new2(n);
-    if (n > 0 && elts) {
+    if (elts) {
 	MEMCPY(RARRAY(ary)->ptr, elts, VALUE, n);
     }
     RARRAY(ary)->len = n;
@@ -199,75 +164,38 @@ rb_assoc_new(car, cdr)
 }
 
 static VALUE
-to_ary(ary)
-    VALUE ary;
-{
-    return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
-}
-
-VALUE
-rb_check_array_type(ary)
-    VALUE ary;
-{
-    return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
-}
-
-static VALUE rb_ary_replace _((VALUE, VALUE));
-
-static VALUE
-rb_ary_initialize(argc, argv, ary)
+rb_ary_s_new(argc, argv, klass)
     int argc;
     VALUE *argv;
-    VALUE ary;
+    VALUE klass;
 {
-    long len;
+    long len = 0;
     VALUE size, val;
+    NEWOBJ(ary, struct RArray);
+    OBJSETUP(ary, klass, T_ARRAY);
 
-    rb_ary_modify(ary);
+    ary->len = 0;
+    ary->ptr = 0;
     if (rb_scan_args(argc, argv, "02", &size, &val) == 0) {
-	RARRAY(ary)->len = 0;
-	if (rb_block_given_p()) {
-	    rb_warning("given block not used");
-	}
-	return ary;
-    }
-
-    if (argc == 1 && !FIXNUM_P(size)) {
-	val = rb_check_array_type(size);
-	if (!NIL_P(val)) {
-	    rb_ary_replace(ary, val);
-	    return ary;
-	}
+	ary->capa = ARY_DEFAULT_SIZE;
     }
+    else {
+	long capa = NUM2LONG(size);
 
-    len = NUM2LONG(size);
-    if (len < 0) {
-	rb_raise(rb_eArgError, "negative array size");
-    }
-    if (len > 0 && len * (long)sizeof(VALUE) <= len) {
-	rb_raise(rb_eArgError, "array size too big");
-    }
-    if (len > RARRAY(ary)->aux.capa) {
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
-	RARRAY(ary)->aux.capa = len;
-    }
-    if (rb_block_given_p()) {
-	long i;
-
-	if (argc > 1) {
-	    rb_raise(rb_eArgError, "wrong number of arguments");
+	if (capa < 0) {
+	    rb_raise(rb_eArgError, "negative array size");
 	}
-	for (i=0; i<len; i++) {
-	    RARRAY(ary)->ptr[i] = rb_yield(LONG2NUM(i));
-	    RARRAY(ary)->len = i + 1;
+	if (capa > 0 && capa*sizeof(VALUE) <= 0) {
+	    rb_raise(rb_eArgError, "array size too big");
 	}
+	ary->capa = capa;
+	len = capa;
     }
-    else {
-	memfill(RARRAY(ary)->ptr, len, val);
-	RARRAY(ary)->len = len;
-    }
+    ary->ptr = ALLOC_N(VALUE, ary->capa);
+    memfill(ary->ptr, len, val);
+    ary->len = len;
 
-    return ary;
+    return (VALUE)ary;
 }
 
 static VALUE
@@ -276,18 +204,20 @@ rb_ary_s_create(argc, argv, klass)
     VALUE *argv;
     VALUE klass;
 {
-    VALUE ary = ary_alloc(klass);
+    NEWOBJ(ary, struct RArray);
+    OBJSETUP(ary, klass, T_ARRAY);
 
-    if (argc < 0) {
-	rb_raise(rb_eArgError, "negative number of arguments");
+    ary->len = ary->capa = 0;
+    if (argc == 0) {
+	ary->ptr = 0;
     }
-    if (argc > 0) {
-	RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
-	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
+    else {
+	ary->ptr = ALLOC_N(VALUE, argc);
+	MEMCPY(ary->ptr, argv, VALUE, argc);
     }
-    RARRAY(ary)->len = RARRAY(ary)->aux.capa = argc;
+    ary->len = ary->capa = argc;
 
-    return ary;
+    return (VALUE)ary;
 }
 
 void
@@ -300,27 +230,22 @@ rb_ary_store(ary, idx, val)
     if (idx < 0) {
 	idx += RARRAY(ary)->len;
 	if (idx < 0) {
-	    rb_raise(rb_eIndexError, "index %ld out of array",
-		    idx - RARRAY(ary)->len);
+	    rb_raise(rb_eIndexError, "index %d out of array",
+		     idx - RARRAY(ary)->len);
 	}
     }
 
-    if (idx >= RARRAY(ary)->aux.capa) {
-	long new_capa = RARRAY(ary)->aux.capa / 2;
-
-	if (new_capa < ARY_DEFAULT_SIZE) {
-	    new_capa = ARY_DEFAULT_SIZE;
-	}
-	new_capa += idx;
-	if (new_capa * (long)sizeof(VALUE) <= new_capa) {
-	    rb_raise(rb_eArgError, "index too big");
+    if (idx >= RARRAY(ary)->capa) {
+	long capa_inc = RARRAY(ary)->capa / 2;
+	if (capa_inc < ARY_DEFAULT_SIZE) {
+	    capa_inc = ARY_DEFAULT_SIZE;
 	}
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, new_capa);
-	RARRAY(ary)->aux.capa = new_capa;
+	RARRAY(ary)->capa = idx + capa_inc;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
     }
     if (idx > RARRAY(ary)->len) {
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len,
-		     idx-RARRAY(ary)->len + 1);
+	rb_mem_clear(RARRAY(ary)->ptr+RARRAY(ary)->len,
+		     idx-RARRAY(ary)->len+1);
     }
 
     if (idx >= RARRAY(ary)->len) {
@@ -339,13 +264,13 @@ rb_ary_push(ary, item)
 }
 
 static VALUE
-rb_ary_push_m(argc, argv, ary)
+rb_ary_push_method(argc, argv, ary)
     int argc;
     VALUE *argv;
     VALUE ary;
 {
     while (argc--) {
-	rb_ary_push(ary, *argv++);
+	rb_ary_store(ary, RARRAY(ary)->len, *argv++);
     }
     return ary;
 }
@@ -354,46 +279,32 @@ VALUE
 rb_ary_pop(ary)
     VALUE ary;
 {
-    rb_ary_modify_check(ary);
     if (RARRAY(ary)->len == 0) return Qnil;
-    if (!FL_TEST(ary, ELTS_SHARED) &&
-	    RARRAY(ary)->len * 2 < RARRAY(ary)->aux.capa &&
-	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
-	RARRAY(ary)->aux.capa = RARRAY(ary)->len * 2;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+    if (RARRAY(ary)->len * 10 < RARRAY(ary)->capa && RARRAY(ary)->capa > ARY_DEFAULT_SIZE) {
+	RARRAY(ary)->capa = RARRAY(ary)->len * 2;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
     }
     return RARRAY(ary)->ptr[--RARRAY(ary)->len];
 }
 
-static void
-ary_make_shared(ary)
-    VALUE ary;
-{
-    if (!FL_TEST(ary, ELTS_SHARED)) {
-	NEWOBJ(shared, struct RArray);
-	OBJSETUP(shared, rb_cArray, T_ARRAY);
-
-	shared->len = RARRAY(ary)->len;
-	shared->ptr = RARRAY(ary)->ptr;
-	shared->aux.capa = RARRAY(ary)->aux.capa;
-	RARRAY(ary)->aux.shared = (VALUE)shared;
-	FL_SET(ary, ELTS_SHARED);
-    }
-}
-
 VALUE
 rb_ary_shift(ary)
     VALUE ary;
 {
     VALUE top;
 
-    rb_ary_modify_check(ary);
     if (RARRAY(ary)->len == 0) return Qnil;
+
     top = RARRAY(ary)->ptr[0];
-    ary_make_shared(ary);
-    RARRAY(ary)->ptr++;		/* shift ptr */
     RARRAY(ary)->len--;
 
+    /* sliding items */
+    MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+1, VALUE, RARRAY(ary)->len);
+    if (RARRAY(ary)->len * 10 < RARRAY(ary)->capa && RARRAY(ary)->capa > ARY_DEFAULT_SIZE) {
+	RARRAY(ary)->capa = RARRAY(ary)->len * 2;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
+    }
+
     return top;
 }
 
@@ -402,17 +313,17 @@ rb_ary_unshift(ary, item)
     VALUE ary, item;
 {
     rb_ary_modify(ary);
-    if (RARRAY(ary)->len == RARRAY(ary)->aux.capa) {
-	long capa_inc = RARRAY(ary)->aux.capa / 2;
+    if (RARRAY(ary)->len >= RARRAY(ary)->capa) {
+	long capa_inc = RARRAY(ary)->capa / 2;
 	if (capa_inc < ARY_DEFAULT_SIZE) {
 	    capa_inc = ARY_DEFAULT_SIZE;
 	}
-	RARRAY(ary)->aux.capa += capa_inc;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+	RARRAY(ary)->capa+=capa_inc;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
     }
 
     /* sliding items */
-    MEMMOVE(RARRAY(ary)->ptr + 1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    MEMMOVE(RARRAY(ary)->ptr+1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
 
     RARRAY(ary)->len++;
     RARRAY(ary)->ptr[0] = item;
@@ -420,29 +331,6 @@ rb_ary_unshift(ary, item)
     return ary;
 }
 
-static VALUE
-rb_ary_unshift_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    long len = RARRAY(ary)->len;
-
-    if (argc < 0) {
-	rb_raise(rb_eArgError, "negative number of arguments");
-    }
-    if (argc == 0) return ary;
-
-    /* make rooms by setting the last item */
-    rb_ary_store(ary, len + argc - 1, Qnil);
-
-    /* sliding items */
-    MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
-    MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
-    
-    return ary;
-}
-
 VALUE
 rb_ary_entry(ary, offset)
     VALUE ary;
@@ -451,7 +339,7 @@ rb_ary_entry(ary, offset)
     if (RARRAY(ary)->len == 0) return Qnil;
 
     if (offset < 0) {
-	offset += RARRAY(ary)->len;
+	offset = RARRAY(ary)->len + offset;
     }
     if (offset < 0 || RARRAY(ary)->len <= offset) {
 	return Qnil;
@@ -461,29 +349,26 @@ rb_ary_entry(ary, offset)
 }
 
 static VALUE
-rb_ary_subseq(ary, beg, len)
+rb_ary_subary(ary, beg, len)
     VALUE ary;
     long beg, len;
 {
-    VALUE klass, ary2;
+    VALUE ary2;
 
+    if (len < 0) return Qnil;
     if (beg > RARRAY(ary)->len) return Qnil;
-    if (beg < 0 || len < 0) return Qnil;
-
+    if (beg < 0) return Qnil;
     if (beg + len > RARRAY(ary)->len) {
 	len = RARRAY(ary)->len - beg;
-	if (len < 0)
-	    len = 0;
     }
-    klass = rb_obj_class(ary);
-    if (len == 0) return ary_new(klass, 0);
+    if (len < 0) {
+	len = 0;
+    }
+    if (len == 0) return rb_ary_new2(0);
 
-    ary_make_shared(ary);
-    ary2 = ary_alloc(klass);
-    RARRAY(ary2)->ptr = RARRAY(ary)->ptr + beg;
+    ary2 = rb_ary_new2(len);
+    MEMCPY(RARRAY(ary2)->ptr, RARRAY(ary)->ptr+beg, VALUE, len);
     RARRAY(ary2)->len = len;
-    RARRAY(ary2)->aux.shared = RARRAY(ary)->aux.shared;
-    FL_SET(ary2, ELTS_SHARED);
 
     return ary2;
 }
@@ -494,128 +379,37 @@ rb_ary_aref(argc, argv, ary)
     VALUE *argv;
     VALUE ary;
 {
-    VALUE arg;
+    VALUE arg1, arg2;
     long beg, len;
 
-    if (argc == 2) {
-	if (SYMBOL_P(argv[0])) {
-	    rb_raise(rb_eTypeError, "Symbol as array index");
-	}
-	beg = NUM2LONG(argv[0]);
-	len = NUM2LONG(argv[1]);
+    if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
+	beg = NUM2LONG(arg1);
+	len = NUM2LONG(arg2);
 	if (beg < 0) {
-	    beg += RARRAY(ary)->len;
+	    beg = RARRAY(ary)->len + beg;
 	}
-	return rb_ary_subseq(ary, beg, len);
-    }
-    if (argc != 1) {
-	rb_scan_args(argc, argv, "11", 0, 0);
-    }
-    arg = argv[0];
-    /* special case - speeding up */
-    if (FIXNUM_P(arg)) {
-	return rb_ary_entry(ary, FIX2LONG(arg));
-    }
-    if (SYMBOL_P(arg)) {
-	rb_raise(rb_eTypeError, "Symbol as array index");
-    }
-    /* check if idx is Range */
-    switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) {
-      case Qfalse:
-	break;
-      case Qnil:
-	return Qnil;
-      default:
-	return rb_ary_subseq(ary, beg, len);
+	return rb_ary_subary(ary, beg, len);
     }
-    return rb_ary_entry(ary, NUM2LONG(arg));
-}
-
-static VALUE
-rb_ary_at(ary, pos)
-    VALUE ary, pos;
-{
-    return rb_ary_entry(ary, NUM2LONG(pos));
-}
 
-static VALUE
-rb_ary_first(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    if (argc == 0) {
-	if (RARRAY(ary)->len == 0) return Qnil;
-	return RARRAY(ary)->ptr[0];
-    }
-    else {
-	VALUE nv, result;
-	long n, i;
-
-	rb_scan_args(argc, argv, "01", &nv);
-	n = NUM2LONG(nv);
-	if (n > RARRAY(ary)->len) n = RARRAY(ary)->len;
-	result = rb_ary_new2(n);
-	for (i=0; i<n; i++) {
-	    rb_ary_push(result, RARRAY(ary)->ptr[i]);
-	}
-	return result;
+    /* special case - speeding up */
+    if (FIXNUM_P(arg1)) {
+	return rb_ary_entry(ary, FIX2LONG(arg1));
     }
-}
-
-static VALUE
-rb_ary_last(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    if (argc == 0) {
-	if (RARRAY(ary)->len == 0) return Qnil;
-	return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
+    else if (TYPE(arg1) == T_BIGNUM) {
+	rb_raise(rb_eIndexError, "index too big");
     }
     else {
-	VALUE nv, result;
-	long n, i;
-
-	rb_scan_args(argc, argv, "01", &nv);
-	n = NUM2LONG(nv);
-	if (n > RARRAY(ary)->len) n = RARRAY(ary)->len;
-	result = rb_ary_new2(n);
-	for (i=RARRAY(ary)->len-n; n--; i++) {
-	    rb_ary_push(result, RARRAY(ary)->ptr[i]);
-	}
-	return result;
-    }
-}
-
-static VALUE
-rb_ary_fetch(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    VALUE pos, ifnone;
-    long idx;
-
-    rb_scan_args(argc, argv, "11", &pos, &ifnone);
-    idx = NUM2LONG(pos);
-
-    if (idx < 0) {
-	idx +=  RARRAY(ary)->len;
-    }
-    if (idx < 0 || RARRAY(ary)->len <= idx) {
-	if (rb_block_given_p()) {
-	    if (argc > 1) {
-		rb_raise(rb_eArgError, "wrong number of arguments");
-	    }
-	    return rb_yield(pos);
-	}
-	if (argc == 1) {
-	    rb_raise(rb_eIndexError, "index %ld out of array", idx);
+	/* check if idx is Range */
+	switch (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 0)) {
+	  case Qfalse:
+	    break;
+	  case Qnil:
+	    return Qnil;
+	  default:
+	    return rb_ary_subary(ary, beg, len);
 	}
-	return ifnone;
     }
-    return RARRAY(ary)->ptr[idx];
+    return rb_ary_entry(ary, NUM2LONG(arg1));
 }
 
 static VALUE
@@ -627,7 +421,7 @@ rb_ary_index(ary, val)
 
     for (i=0; i<RARRAY(ary)->len; i++) {
 	if (rb_equal(RARRAY(ary)->ptr[i], val))
-	    return LONG2NUM(i);
+	    return INT2NUM(i);
     }
     return Qnil;
 }
@@ -641,7 +435,7 @@ rb_ary_rindex(ary, val)
 
     while (i--) {
 	if (rb_equal(RARRAY(ary)->ptr[i], val))
-	    return LONG2NUM(i);
+	    return INT2NUM(i);
     }
     return Qnil;
 }
@@ -655,8 +449,6 @@ rb_ary_indexes(argc, argv, ary)
     VALUE new_ary;
     long i;
 
-    rb_warn("Array#%s is deprecated; use Array#values_at",
-	    rb_id2name(rb_frame_last_func()));
     new_ary = rb_ary_new2(argc);
     for (i=0; i<argc; i++) {
 	rb_ary_push(new_ary, rb_ary_aref(1, argv+i, ary));
@@ -665,58 +457,36 @@ rb_ary_indexes(argc, argv, ary)
     return new_ary;
 }
 
-VALUE
-rb_ary_to_ary(obj)
-    VALUE obj;
-{
-    if (TYPE(obj) == T_ARRAY) {
-	return obj;
-    }
-    if (rb_respond_to(obj, rb_intern("to_ary"))) {
-	return rb_convert_type(obj, T_ARRAY, "Array", "to_ary");
-    }
-    return rb_ary_new3(1, obj);
-}
-
 static void
-rb_ary_update(ary, beg, len, rpl)
-    VALUE ary;
+rb_ary_replace(ary, beg, len, rpl)
+    VALUE ary, rpl;
     long beg, len;
-    VALUE rpl;
 {
-    long rlen;
-
-    if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
+    if (len < 0) rb_raise(rb_eIndexError, "negative length %d", len);
     if (beg < 0) {
 	beg += RARRAY(ary)->len;
-	if (beg < 0) {
-	    beg -= RARRAY(ary)->len;
-	    rb_raise(rb_eIndexError, "index %ld out of array", beg);
-	}
+    }
+    if (beg < 0) {
+	beg -= RARRAY(ary)->len;
+	rb_raise(rb_eIndexError, "index %d out of array", beg);
     }
     if (beg + len > RARRAY(ary)->len) {
 	len = RARRAY(ary)->len - beg;
     }
 
-    rb_ary_modify(ary);
-    if (NIL_P(rpl)) {
-	rlen = 0;
-    }
-    else {
-	rpl = rb_ary_to_ary(rpl);
-	rlen = RARRAY(rpl)->len;
+    if (TYPE(rpl) != T_ARRAY) {
+	rpl = rb_Array(rpl);
     }
 
+    rb_ary_modify(ary);
     if (beg >= RARRAY(ary)->len) {
-	len = beg + rlen;
-	if (len >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
-	    RARRAY(ary)->aux.capa = len;
-	}
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, beg - RARRAY(ary)->len);
-	if (rlen > 0) {
-	    MEMCPY(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
+	len = beg + RARRAY(rpl)->len;
+	if (len >= RARRAY(ary)->capa) {
+	    RARRAY(ary)->capa=len;
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
 	}
+	rb_mem_clear(RARRAY(ary)->ptr+RARRAY(ary)->len, beg-RARRAY(ary)->len);
+	MEMCPY(RARRAY(ary)->ptr+beg, RARRAY(rpl)->ptr, VALUE, RARRAY(rpl)->len);
 	RARRAY(ary)->len = len;
     }
     else {
@@ -726,20 +496,18 @@ rb_ary_update(ary, beg, len, rpl)
 	    len = RARRAY(ary)->len - beg;
 	}
 
-	alen = RARRAY(ary)->len + rlen - len;
-	if (alen >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, alen);
-	    RARRAY(ary)->aux.capa = alen;
+	alen = RARRAY(ary)->len + RARRAY(rpl)->len - len;
+	if (alen >= RARRAY(ary)->capa) {
+	    RARRAY(ary)->capa=alen;
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
 	}
 
-	if (len != rlen) {
-	    MEMMOVE(RARRAY(ary)->ptr + beg + rlen, RARRAY(ary)->ptr + beg + len,
-		    VALUE, RARRAY(ary)->len - (beg + len));
+	if (len != RARRAY(rpl)->len) {
+	    MEMMOVE(RARRAY(ary)->ptr+beg+RARRAY(rpl)->len, RARRAY(ary)->ptr+beg+len,
+		    VALUE, RARRAY(ary)->len-(beg+len));
 	    RARRAY(ary)->len = alen;
 	}
-	if (rlen > 0) {
-	    MEMMOVE(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
-	}
+	MEMCPY(RARRAY(ary)->ptr+beg, RARRAY(rpl)->ptr, VALUE, RARRAY(rpl)->len);
     }
 }
 
@@ -749,62 +517,30 @@ rb_ary_aset(argc, argv, ary)
     VALUE *argv;
     VALUE ary;
 {
+    VALUE arg1, arg2, arg3;
     long offset, beg, len;
 
-    if (argc == 3) {
-	if (SYMBOL_P(argv[0])) {
-	    rb_raise(rb_eTypeError, "Symbol as array index");
-	}
-	if (SYMBOL_P(argv[1])) {
-	    rb_raise(rb_eTypeError, "Symbol as subarray length");
-	}
-	rb_ary_update(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
-	return argv[2];
+    if (rb_scan_args(argc, argv, "21", &arg1, &arg2, &arg3) == 3) {
+	rb_ary_replace(ary, NUM2LONG(arg1), NUM2LONG(arg2), arg3);
+	return arg3;
     }
-    if (argc != 2) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
-    }
-    if (FIXNUM_P(argv[0])) {
-	offset = FIX2LONG(argv[0]);
+    else if (FIXNUM_P(arg1)) {
+	offset = FIX2LONG(arg1);
 	goto fixnum;
     }
-    if (SYMBOL_P(argv[0])) {
-	rb_raise(rb_eTypeError, "Symbol as array index");
-    }
-    if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) {
+    else if (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 1)) {
 	/* check if idx is Range */
-	rb_ary_update(ary, beg, len, argv[1]);
-	return argv[1];
-    }
-
-    offset = NUM2LONG(argv[0]);
-fixnum:
-    rb_ary_store(ary, offset, argv[1]);
-    return argv[1];
-}
-
-static VALUE
-rb_ary_insert(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    long pos;
-
-    if (argc < 1) {
-	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
-    }
-    pos = NUM2LONG(argv[0]);
-    if (pos == -1) {
-	pos = RARRAY(ary)->len;
+	rb_ary_replace(ary, beg, len, arg2);
+	return arg2;
     }
-    else if (pos < 0) {
-	pos++;
+    if (TYPE(arg1) == T_BIGNUM) {
+	rb_raise(rb_eIndexError, "index too big");
     }
 
-    if (argc == 1) return ary;
-    rb_ary_update(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
-    return ary;
+    offset = NUM2LONG(arg1);
+  fixnum:
+    rb_ary_store(ary, offset, arg2);
+    return arg2;
 }
 
 VALUE
@@ -826,7 +562,7 @@ rb_ary_each_index(ary)
     long i;
 
     for (i=0; i<RARRAY(ary)->len; i++) {
-	rb_yield(LONG2NUM(i));
+	rb_yield(INT2NUM(i));
     }
     return ary;
 }
@@ -839,9 +575,6 @@ rb_ary_reverse_each(ary)
 
     while (len--) {
 	rb_yield(RARRAY(ary)->ptr[len]);
-	if (RARRAY(ary)->len < len) {
-	    len = RARRAY(ary)->len;
-	}
     }
     return ary;
 }
@@ -850,7 +583,7 @@ static VALUE
 rb_ary_length(ary)
     VALUE ary;
 {
-    return LONG2NUM(RARRAY(ary)->len);
+    return INT2NUM(RARRAY(ary)->len);
 }
 
 static VALUE
@@ -862,16 +595,30 @@ rb_ary_empty_p(ary)
     return Qfalse;
 }
 
-VALUE
+static VALUE
+rb_ary_clone(ary)
+    VALUE ary;
+{
+    VALUE ary2 = rb_ary_new2(RARRAY(ary)->len);
+
+    CLONESETUP(ary2, ary);
+    MEMCPY(RARRAY(ary2)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    RARRAY(ary2)->len = RARRAY(ary)->len;
+    return ary2;
+}
+
+static VALUE
 rb_ary_dup(ary)
     VALUE ary;
 {
-    VALUE dup = rb_ary_new2(RARRAY(ary)->len);
+    return rb_ary_s_create(RARRAY(ary)->len, RARRAY(ary)->ptr, CLASS_OF(ary));
+}
 
-    DUPSETUP(dup, ary);
-    MEMCPY(RARRAY(dup)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
-    RARRAY(dup)->len = RARRAY(ary)->len;
-    return dup;
+static VALUE
+to_ary(ary)
+    VALUE ary;
+{
+    return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
 
 extern VALUE rb_output_fs;
@@ -888,23 +635,33 @@ VALUE
 rb_ary_join(ary, sep)
     VALUE ary, sep;
 {
-    long len = 1, i;
-    int taint = Qfalse;
+    long i;
     VALUE result, tmp;
-
     if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-    if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = Qtrue;
 
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	tmp = rb_check_string_type(RARRAY(ary)->ptr[i]);
-	len += NIL_P(tmp) ? 10 : RSTRING(tmp)->len;
-    }
-    if (!NIL_P(sep)) {
-	StringValue(sep);
-	len += RSTRING(sep)->len * (RARRAY(ary)->len - 1);
+    tmp = RARRAY(ary)->ptr[0];
+    switch (TYPE(tmp)) {
+      case T_STRING:
+	result = rb_str_dup(tmp);
+	break;
+      case T_ARRAY:
+	if (rb_inspecting_p(tmp)) {
+	    result = rb_str_new2("[...]");
+	}
+	else {
+	    VALUE args[2];
+
+	    args[0] = tmp;
+	    args[1] = sep;
+	    result = rb_protect_inspect(inspect_join, ary, (VALUE)args);
+	}
+	break;
+      default:
+	result = rb_obj_as_string(tmp);
+	break;
     }
-    result = rb_str_buf_new(len);
-    for (i=0; i<RARRAY(ary)->len; i++) {
+
+    for (i=1; i<RARRAY(ary)->len; i++) {
 	tmp = RARRAY(ary)->ptr[i];
 	switch (TYPE(tmp)) {
 	  case T_STRING:
@@ -924,18 +681,16 @@ rb_ary_join(ary, sep)
 	  default:
 	    tmp = rb_obj_as_string(tmp);
 	}
-	if (i > 0 && !NIL_P(sep))
-	    rb_str_buf_append(result, sep);
-	rb_str_buf_append(result, tmp);
-	if (OBJ_TAINTED(tmp)) taint = Qtrue;
+	if (!NIL_P(sep)) rb_str_concat(result, sep);
+	rb_str_cat(result, RSTRING(tmp)->ptr, RSTRING(tmp)->len);
+	if (OBJ_TAINTED(tmp)) OBJ_TAINT(result);
     }
 
-    if (taint) OBJ_TAINT(result);
     return result;
 }
 
 static VALUE
-rb_ary_join_m(argc, argv, ary)
+rb_ary_join_method(argc, argv, ary)
     int argc;
     VALUE *argv;
     VALUE ary;
@@ -944,7 +699,6 @@ rb_ary_join_m(argc, argv, ary)
 
     rb_scan_args(argc, argv, "01", &sep);
     if (NIL_P(sep)) sep = rb_output_fs;
-    
     return rb_ary_join(ary, sep);
 }
 
@@ -952,9 +706,12 @@ VALUE
 rb_ary_to_s(ary)
     VALUE ary;
 {
+    VALUE str;
+
     if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-    
-    return rb_ary_join(ary, rb_output_fs);
+    str = rb_ary_join(ary, rb_output_fs);
+    if (NIL_P(str)) return rb_str_new(0, 0);
+    return str;
 }
 
 static ID inspect_key;
@@ -964,7 +721,7 @@ struct inspect_arg {
     VALUE arg1, arg2;
 };
 
-static VALUE
+VALUE
 inspect_call(arg)
     struct inspect_arg *arg;
 {
@@ -972,59 +729,37 @@ inspect_call(arg)
 }
 
 static VALUE
-get_inspect_tbl(create)
-    int create;
-{
-    VALUE inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
-
-    if (NIL_P(inspect_tbl)) {
-	if (create) {
-	  tbl_init:
-	    inspect_tbl = rb_ary_new();
-	    rb_thread_local_aset(rb_thread_current(), inspect_key, inspect_tbl);
-	}
-    }
-    else if (TYPE(inspect_tbl) != T_ARRAY) {
-	rb_warn("invalid inspect_tbl value");
-	if (create) goto tbl_init;
-	rb_thread_local_aset(rb_thread_current(), inspect_key, Qnil);
-	return Qnil;
-    }
-    return inspect_tbl;
-}
-
-static VALUE
 inspect_ensure(obj)
     VALUE obj;
 {
     VALUE inspect_tbl;
 
-    inspect_tbl = get_inspect_tbl(Qfalse);
-    if (!NIL_P(inspect_tbl)) {
-	rb_ary_pop(inspect_tbl);
-    }
+    inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
+    rb_ary_pop(inspect_tbl);
     return 0;
 }
 
 VALUE
 rb_protect_inspect(func, obj, arg)
-    VALUE (*func)(ANYARGS);
+    VALUE (*func)();
     VALUE obj, arg;
 {
     struct inspect_arg iarg;
+
     VALUE inspect_tbl;
-    VALUE id;
 
-    inspect_tbl = get_inspect_tbl(Qtrue);
-    id = rb_obj_id(obj);
-    if (rb_ary_includes(inspect_tbl, id)) {
-	return (*func)(obj, arg);
+    if (!inspect_key) {
+	inspect_key = rb_intern("__inspect_key__");
+    }
+    inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
+    if (NIL_P(inspect_tbl)) {
+	inspect_tbl = rb_ary_new();
+	rb_thread_local_aset(rb_thread_current(), inspect_key, inspect_tbl);
     }
-    rb_ary_push(inspect_tbl, id);
+    rb_ary_push(inspect_tbl, obj);
     iarg.func = func;
     iarg.arg1 = obj;
     iarg.arg2 = arg;
-
     return rb_ensure(inspect_call, (VALUE)&iarg, inspect_ensure, obj);
 }
 
@@ -1034,28 +769,28 @@ rb_inspecting_p(obj)
 {
     VALUE inspect_tbl;
 
-    inspect_tbl = get_inspect_tbl(Qfalse);
+    if (!inspect_key) return Qfalse;
+    inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
     if (NIL_P(inspect_tbl)) return Qfalse;
-    return rb_ary_includes(inspect_tbl, rb_obj_id(obj));
+    return rb_ary_includes(inspect_tbl, obj);
 }
 
 static VALUE
 inspect_ary(ary)
     VALUE ary;
 {
-    int tainted = OBJ_TAINTED(ary);
-    long i;
+    long i = 0;
     VALUE s, str;
 
-    str = rb_str_buf_new2("[");
+    str = rb_str_new2("[");
+
     for (i=0; i<RARRAY(ary)->len; i++) {
 	s = rb_inspect(RARRAY(ary)->ptr[i]);
-	if (OBJ_TAINTED(s)) tainted = Qtrue;
-	if (i > 0) rb_str_buf_cat2(str, ", ");
-	rb_str_buf_append(str, s);
+	if (i > 0) rb_str_cat(str, ", ", 2);
+	rb_str_cat(str, RSTRING(s)->ptr, RSTRING(s)->len);
     }
-    rb_str_buf_cat2(str, "]");
-    if (tainted) OBJ_TAINT(str);
+    rb_str_cat(str, "]", 1);
+
     return str;
 }
 
@@ -1072,18 +807,6 @@ static VALUE
 rb_ary_to_a(ary)
     VALUE ary;
 {
-    if (rb_obj_class(ary) != rb_cArray) {
-	VALUE dup = rb_ary_new2(RARRAY(ary)->len);
-	rb_ary_replace(dup, ary);
-	return dup;
-    }
-    return ary;
-}
-
-static VALUE
-rb_ary_to_ary_m(ary)
-    VALUE ary;
-{
     return ary;
 }
 
@@ -1094,60 +817,53 @@ rb_ary_reverse(ary)
     VALUE *p1, *p2;
     VALUE tmp;
 
-    rb_ary_modify(ary);
-    if (RARRAY(ary)->len > 1) {
-	p1 = RARRAY(ary)->ptr;
-	p2 = p1 + RARRAY(ary)->len - 1;	/* points last item */
-
-	while (p1 < p2) {
-	    tmp = *p1;
-	    *p1++ = *p2;
-	    *p2-- = tmp;
-	}
+    if (RARRAY(ary)->len == 0) return ary;
+
+    p1 = RARRAY(ary)->ptr;
+    p2 = p1 + RARRAY(ary)->len - 1;	/* points last item */
+
+    while (p1 < p2) {
+	tmp = *p1;
+	*p1 = *p2;
+	*p2 = tmp;
+	p1++; p2--;
     }
-    return ary;
-}
 
-static VALUE
-rb_ary_reverse_bang(ary)
-    VALUE ary;
-{
-    return rb_ary_reverse(ary);
+    return ary;
 }
 
 static VALUE
-rb_ary_reverse_m(ary)
+rb_ary_reverse_method(ary)
     VALUE ary;
 {
     return rb_ary_reverse(rb_ary_dup(ary));
 }
 
+static ID cmp;
+
 static int
 sort_1(a, b)
     VALUE *a, *b;
 {
-    VALUE retval = rb_yield_values(2, *a, *b);
-    return rb_cmpint(retval, *a, *b);
+    VALUE retval = rb_yield(rb_assoc_new(*a, *b));
+    return NUM2INT(retval);
 }
 
 static int
-sort_2(ap, bp)
-    VALUE *ap, *bp;
+sort_2(a, b)
+    VALUE *a, *b;
 {
     VALUE retval;
-    long a = (long)*ap, b = (long)*bp;
 
-    if (FIXNUM_P(a) && FIXNUM_P(b)) {
-	if (a > b) return 1;
-	if (a < b) return -1;
-	return 0;
+    if (FIXNUM_P(*a)) {
+	if (FIXNUM_P(*b)) return *a - *b;
     }
-    if (TYPE(a) == T_STRING && TYPE(b) == T_STRING) {
-	return rb_str_cmp(a, b);
+    else if (TYPE(*a) == T_STRING && TYPE(*b) == T_STRING) {
+	return rb_str_cmp(*a, *b);
     }
 
-    retval = rb_funcall(a, id_cmp, 1, b);
-    return rb_cmpint(retval, a, b);
+    retval = rb_funcall(*a, cmp, 1, *b);
+    return NUM2INT(retval);
 }
 
 static VALUE
@@ -1155,7 +871,7 @@ sort_internal(ary)
     VALUE ary;
 {
     qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE),
-	  rb_block_given_p()?sort_1:sort_2);
+	  rb_iterator_p()?sort_1:sort_2);
     return ary;
 }
 
@@ -1171,119 +887,20 @@ VALUE
 rb_ary_sort_bang(ary)
     VALUE ary;
 {
-    rb_ary_modify(ary);
-    if (RARRAY(ary)->len > 1) {
-	FL_SET(ary, ARY_TMPLOCK);	/* prohibit modification during sort */
-	rb_ensure(sort_internal, ary, sort_unlock, ary);
-    }
-    return ary;
-}
-
-VALUE
-rb_ary_sort(ary)
-    VALUE ary;
-{
-    ary = rb_ary_dup(ary);
-    rb_ary_sort_bang(ary);
-    return ary;
-}
-
-static VALUE
-rb_ary_collect(ary)
-    VALUE ary;
-{
-    long i;
-    VALUE collect;
-
-    if (!rb_block_given_p()) {
-	return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
-    }
-
-    collect = rb_ary_new2(RARRAY(ary)->len);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
-    }
-    return collect;
-}
-
-static VALUE
-rb_ary_collect_bang(ary)
-    VALUE ary;
-{
-    long i;
+    if (RARRAY(ary)->len <= 1) return ary;
 
     rb_ary_modify(ary);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	RARRAY(ary)->ptr[i] = rb_yield(RARRAY(ary)->ptr[i]);
-    }
+    FL_SET(ary, ARY_TMPLOCK);	/* prohibit modification during sort */
+    rb_ensure(sort_internal, ary, sort_unlock, ary);
     return ary;
 }
 
 VALUE
-rb_values_at(obj, olen, argc, argv, func)
-    VALUE obj;
-    long olen;
-    int argc;
-    VALUE *argv;
-    VALUE (*func) _((VALUE,long));
-{
-    VALUE result = rb_ary_new2(argc);
-    long beg, len, i, j;
-
-    for (i=0; i<argc; i++) {
-	if (FIXNUM_P(argv[i])) {
-	    rb_ary_push(result, (*func)(obj, FIX2LONG(argv[i])));
-	    continue;
-	}
-	/* check if idx is Range */
-	switch (rb_range_beg_len(argv[i], &beg, &len, olen, 0)) {
-	  case Qfalse:
-	    break;
-	  case Qnil:
-	    continue;
-	  default:
-	    for (j=0; j<len; j++) {
-		rb_ary_push(result, (*func)(obj, j+beg));
-	    }
-	    continue;
-	}
-	rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
-    }
-    return result;
-}
-
-static VALUE
-rb_ary_values_at(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    return rb_values_at(ary, RARRAY(ary)->len, argc, argv, rb_ary_entry);
-}
-
-static VALUE
-rb_ary_select(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+rb_ary_sort(ary)
     VALUE ary;
 {
-    VALUE result;
-    long i;
-
-    if (!rb_block_given_p()) {
-	rb_warn("Array#select(index..) is deprecated; use Array#values_at");
-	return rb_ary_values_at(argc, argv, ary);
-    }
-    if (argc > 0) {
-	rb_raise(rb_eArgError, "wrong number arguments (%d for 0)", argc);
-    }
-    result = rb_ary_new2(RARRAY(ary)->len);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
-	    rb_ary_push(result, RARRAY(ary)->ptr[i]);
-	}
-    }
-    return result;
+    if (RARRAY(ary)->len == 0) return ary;
+    return rb_ary_sort_bang(rb_ary_dup(ary));
 }
 
 VALUE
@@ -1302,84 +919,45 @@ rb_ary_delete(ary, item)
 	i2++;
     }
     if (RARRAY(ary)->len == i2) {
-	if (rb_block_given_p()) {
+	if (rb_iterator_p()) {
 	    return rb_yield(item);
 	}
-	return Qnil;
+	return ary;
     }
-
-    RARRAY(ary)->len = i2;
-    if (i2 * 2 < RARRAY(ary)->aux.capa &&
-	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
-	RARRAY(ary)->aux.capa = i2 * 2;
+    else {
+	RARRAY(ary)->len = i2;
     }
 
     return item;
 }
 
 VALUE
-rb_ary_delete_at(ary, pos)
+rb_ary_delete_at(ary, at)
     VALUE ary;
-    long pos;
+    VALUE at;
 {
-    long i, len = RARRAY(ary)->len;
-    VALUE del;
+    long i1, i2, pos;
+    VALUE del = Qnil;
 
     rb_ary_modify(ary);
-    if (pos >= len) return Qnil;
-    if (pos < 0) {
-	pos += len;
-	if (pos < 0) return Qnil;
-    }
-
-    del = RARRAY(ary)->ptr[pos];
-    for (i = pos + 1; i < len; i++, pos++) {
-	RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
-    }
-    RARRAY(ary)->len = pos;
-
-    return del;
-}
-
-static VALUE
-rb_ary_delete_at_m(ary, pos)
-    VALUE ary, pos;
-{
-    return rb_ary_delete_at(ary, NUM2LONG(pos));
-}
-
-static VALUE
-rb_ary_slice_bang(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    VALUE arg1, arg2;
-    long pos, len;
-
-    rb_ary_modify(ary);
-    if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
-	pos = NUM2LONG(arg1);
-	len = NUM2LONG(arg2);
-      delete_pos_len:
-	if (pos < 0) {
-	    pos = RARRAY(ary)->len + pos;
+    pos = NUM2LONG(at);
+    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
+	if (i1 == pos) {
+	    del = RARRAY(ary)->ptr[i1];
+	    continue;
 	}
-	arg2 = rb_ary_subseq(ary, pos, len);
-	rb_ary_update(ary, pos, len, Qnil);	/* Qnil/rb_ary_new2(0) */
-	return arg2;
-    }
-
-    if (!FIXNUM_P(arg1) && rb_range_beg_len(arg1, &pos, &len, RARRAY(ary)->len, 1)) {
-	goto delete_pos_len;
+	if (i1 != i2) {
+	    RARRAY(ary)->ptr[i2] = RARRAY(ary)->ptr[i1];
+	}
+	i2++;
     }
+    RARRAY(ary)->len = i2;
 
-    return rb_ary_delete_at(ary, NUM2LONG(arg1));
+    return del;
 }
 
 static VALUE
-rb_ary_reject_bang(ary)
+rb_ary_delete_if(ary)
     VALUE ary;
 {
     long i1, i2;
@@ -1392,124 +970,41 @@ rb_ary_reject_bang(ary)
 	}
 	i2++;
     }
-    if (RARRAY(ary)->len == i2) return Qnil;
     RARRAY(ary)->len = i2;
 
     return ary;
 }
 
 static VALUE
-rb_ary_reject(ary)
-    VALUE ary;
-{
-    ary = rb_ary_dup(ary);
-    rb_ary_reject_bang(ary);
-    return ary;
-}
-
-static VALUE
-rb_ary_delete_if(ary)
-    VALUE ary;
-{
-    rb_ary_reject_bang(ary);
-    return ary;
-}
-
-static VALUE
-rb_ary_zip(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+rb_ary_filter(ary)
     VALUE ary;
 {
-    int i, j;
-    long len;
-    VALUE result;
-
-    for (i=0; i<argc; i++) {
-	argv[i] = to_ary(argv[i]);
-    }
-    if (rb_block_given_p()) {
-	for (i=0; i<RARRAY(ary)->len; i++) {
-	    VALUE tmp = rb_ary_new2(argc+1);
-
-	    rb_ary_push(tmp, rb_ary_entry(ary, i));
-	    for (j=0; j<argc; j++) {
-		rb_ary_push(tmp, rb_ary_entry(argv[j], i));
-	    }
-	    rb_yield(tmp);
-	}
-	return Qnil;
-    }
-    len = RARRAY(ary)->len;
-    result = rb_ary_new2(len);
-    for (i=0; i<len; i++) {
-	VALUE tmp = rb_ary_new2(argc+1);
+    long i;
 
-	rb_ary_push(tmp, rb_ary_entry(ary, i));
-	for (j=0; j<argc; j++) {
-	    rb_ary_push(tmp, rb_ary_entry(argv[j], i));
-	}
-	rb_ary_push(result, tmp);
+    rb_ary_modify(ary);
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	RARRAY(ary)->ptr[i] = rb_yield(RARRAY(ary)->ptr[i]);
     }
-    return result;
+    return ary;
 }
 
 static VALUE
-rb_ary_transpose(ary)
-    VALUE ary;
+rb_ary_replace_method(ary, ary2)
+    VALUE ary, ary2;
 {
-    long elen = -1, alen, i, j;
-    VALUE tmp, result = 0;
-
-    alen = RARRAY(ary)->len;
-    if (alen == 0) return rb_ary_dup(ary);
-    for (i=0; i<alen; i++) {
-	tmp = to_ary(RARRAY(ary)->ptr[i]);
-	if (elen < 0) {		/* first element */
-	    elen = RARRAY(tmp)->len;
-	    result = rb_ary_new2(elen);
-	    for (j=0; j<elen; j++) {
-		rb_ary_store(result, j, rb_ary_new2(alen));
-	    }
-	}
-	else if (elen != RARRAY(tmp)->len) {
-	    rb_raise(rb_eIndexError, "element size differ (%d should be %d)",
-		     RARRAY(tmp)->len, elen);
-	}
-	for (j=0; j<elen; j++) {
-	    rb_ary_store(RARRAY(result)->ptr[j], i, RARRAY(tmp)->ptr[j]);
-	}
-    }
-    return result;
+    ary2 = to_ary(ary2);
+    rb_ary_replace(ary, 0, RARRAY(ary)->len, ary2);
+    return ary;
 }
 
 static VALUE
-rb_ary_replace(copy, orig)
-    VALUE copy, orig;
-{
-    rb_ary_modify(copy);
-    orig = to_ary(orig);
-    if (copy == orig) return copy;
-    ary_make_shared(orig);
-    if (RARRAY(copy)->ptr && !FL_TEST(copy, ELTS_SHARED))
-	free(RARRAY(copy)->ptr);
-    RARRAY(copy)->ptr = RARRAY(orig)->ptr;
-    RARRAY(copy)->len = RARRAY(orig)->len;
-    RARRAY(copy)->aux.shared = RARRAY(orig)->aux.shared;
-    FL_SET(copy, ELTS_SHARED);
-
-    return copy;
-}
-
-VALUE
 rb_ary_clear(ary)
     VALUE ary;
 {
-    rb_ary_modify(ary);
     RARRAY(ary)->len = 0;
-    if (ARY_DEFAULT_SIZE * 2 < RARRAY(ary)->aux.capa) {
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, ARY_DEFAULT_SIZE * 2);
-	RARRAY(ary)->aux.capa = ARY_DEFAULT_SIZE * 2;
+    if (ARY_DEFAULT_SIZE*3 < RARRAY(ary)->capa) {
+	RARRAY(ary)->capa = ARY_DEFAULT_SIZE * 2;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
     }
     return ary;
 }
@@ -1523,20 +1018,12 @@ rb_ary_fill(argc, argv, ary)
     VALUE item, arg1, arg2;
     long beg, end, len;
     VALUE *p, *pend;
-    int block_p = Qfalse;
 
-    if (rb_block_given_p()) {
-	block_p = Qtrue;
-	rb_scan_args(argc, argv, "02", &arg1, &arg2);
-	argc += 1;		/* hackish */
-    }
-    else {
-	rb_scan_args(argc, argv, "12", &item, &arg1, &arg2);
-    }
+    rb_scan_args(argc, argv, "12", &item, &arg1, &arg2);
     switch (argc) {
       case 1:
 	beg = 0;
-	len = RARRAY(ary)->len;
+	len = RARRAY(ary)->len - beg;
 	break;
       case 2:
 	if (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 1)) {
@@ -1544,43 +1031,30 @@ rb_ary_fill(argc, argv, ary)
 	}
 	/* fall through */
       case 3:
-	beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
+	beg = NIL_P(arg1)?0:NUM2LONG(arg1);
 	if (beg < 0) {
 	    beg = RARRAY(ary)->len + beg;
 	    if (beg < 0) beg = 0;
 	}
-	len = NIL_P(arg2) ? RARRAY(ary)->len - beg : NUM2LONG(arg2);
+	len = NIL_P(arg2)?RARRAY(ary)->len - beg:NUM2LONG(arg2);
 	break;
     }
     rb_ary_modify(ary);
     end = beg + len;
     if (end > RARRAY(ary)->len) {
-	if (end >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
-	    RARRAY(ary)->aux.capa = end;
+	if (end >= RARRAY(ary)->capa) {
+	    RARRAY(ary)->capa=end;
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
 	}
 	if (beg > RARRAY(ary)->len) {
-	    rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
+	    rb_mem_clear(RARRAY(ary)->ptr+RARRAY(ary)->len,end-RARRAY(ary)->len);
 	}
 	RARRAY(ary)->len = end;
     }
+    p = RARRAY(ary)->ptr + beg; pend = p + len;
 
-    if (block_p) {
-	VALUE v;
-	long i;
-
-	for (i=beg; i<RARRAY(ary)->len; i++) {
-	    v = rb_yield(LONG2NUM(i));
-	    if (i>=RARRAY(ary)->len) break;
-	    RARRAY(ary)->ptr[i] = v;
-	}
-    }
-    else {
-	p = RARRAY(ary)->ptr + beg;
-	pend = p + len;
-	while (p < pend) {
-	    *p++ = item;
-	}
+    while (p < pend) {
+	*p++ = item;
     }
     return ary;
 }
@@ -1590,14 +1064,15 @@ rb_ary_plus(x, y)
     VALUE x, y;
 {
     VALUE z;
-    long len;
 
-    y = to_ary(y);
-    len = RARRAY(x)->len + RARRAY(y)->len;
-    z = rb_ary_new2(len);
+    if (TYPE(y) != T_ARRAY) {
+	return rb_ary_plus(x, rb_Array(y));
+    }
+
+    z = rb_ary_new2(RARRAY(x)->len + RARRAY(y)->len);
     MEMCPY(RARRAY(z)->ptr, RARRAY(x)->ptr, VALUE, RARRAY(x)->len);
-    MEMCPY(RARRAY(z)->ptr + RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
-    RARRAY(z)->len = len;
+    MEMCPY(RARRAY(z)->ptr+RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
+    RARRAY(z)->len = RARRAY(x)->len + RARRAY(y)->len;
     return z;
 }
 
@@ -1605,59 +1080,61 @@ VALUE
 rb_ary_concat(x, y)
     VALUE x, y;
 {
-    y = to_ary(y);
-    if (RARRAY(y)->len > 0) {
-	rb_ary_update(x, RARRAY(x)->len, 0, y);
+    VALUE *p, *pend;
+
+    if (TYPE(y) != T_ARRAY) {
+	return rb_ary_concat(x, rb_Array(y));
+    }
+
+    p = RARRAY(y)->ptr;
+    pend = p + RARRAY(y)->len;
+    while (p < pend) {
+	rb_ary_store(x, RARRAY(x)->len, *p);
+	p++;
     }
     return x;
 }
 
 static VALUE
 rb_ary_times(ary, times)
-    VALUE ary, times;
+    VALUE ary;
+    VALUE times;
 {
-    VALUE ary2, tmp;
+    VALUE ary2;
     long i, len;
 
-    tmp = rb_check_string_type(times);
-    if (!NIL_P(tmp)) {
-	return rb_ary_join(ary, tmp);
+    if (TYPE(times) == T_STRING) {
+	return rb_ary_join(ary, times);
     }
 
     len = NUM2LONG(times);
-    if (len == 0) return rb_ary_new2(0);
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative argument");
     }
-    if (LONG_MAX/len < RARRAY(ary)->len) {
-	rb_raise(rb_eArgError, "argument too big");
-    }
     len *= RARRAY(ary)->len;
 
-    ary2 = ary_new(rb_obj_class(ary), len);
+    ary2 = rb_ary_new2(len);
     RARRAY(ary2)->len = len;
 
     for (i=0; i<len; i+=RARRAY(ary)->len) {
 	MEMCPY(RARRAY(ary2)->ptr+i, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
     }
-    OBJ_INFECT(ary2, ary);
 
     return ary2;
 }
 
 VALUE
 rb_ary_assoc(ary, key)
-    VALUE ary, key;
+    VALUE ary;
+    VALUE key;
 {
     VALUE *p, *pend;
 
-    p = RARRAY(ary)->ptr;
-    pend = p + RARRAY(ary)->len;
-    
+    p = RARRAY(ary)->ptr; pend = p + RARRAY(ary)->len;
     while (p < pend) {
-	if (TYPE(*p) == T_ARRAY &&
-		RARRAY(*p)->len > 0 &&
-		rb_equal(RARRAY(*p)->ptr[0], key))
+	if (TYPE(*p) == T_ARRAY
+	    && RARRAY(*p)->len > 1
+	    && rb_equal(RARRAY(*p)->ptr[0], key))
 	    return *p;
 	p++;
     }
@@ -1666,13 +1143,12 @@ rb_ary_assoc(ary, key)
 
 VALUE
 rb_ary_rassoc(ary, value)
-    VALUE ary, value;
+    VALUE ary;
+    VALUE value;
 {
     VALUE *p, *pend;
 
-    p = RARRAY(ary)->ptr;
-    pend = p + RARRAY(ary)->len;
-
+    p = RARRAY(ary)->ptr; pend = p + RARRAY(ary)->len;
     while (p < pend) {
 	if (TYPE(*p) == T_ARRAY
 	    && RARRAY(*p)->len > 1
@@ -1689,13 +1165,7 @@ rb_ary_equal(ary1, ary2)
 {
     long i;
 
-    if (ary1 == ary2) return Qtrue;
-    if (TYPE(ary2) != T_ARRAY) {
-	if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
-	    return Qfalse;
-	}
-	return rb_equal(ary2, ary1);
-    }
+    if (TYPE(ary2) != T_ARRAY) return Qfalse;
     if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
     for (i=0; i<RARRAY(ary1)->len; i++) {
 	if (!rb_equal(RARRAY(ary1)->ptr[i], RARRAY(ary2)->ptr[i]))
@@ -1710,9 +1180,9 @@ rb_ary_eql(ary1, ary2)
 {
     long i;
 
-    if (ary1 == ary2) return Qtrue;
     if (TYPE(ary2) != T_ARRAY) return Qfalse;
-    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
+    if (RARRAY(ary1)->len != RARRAY(ary2)->len)
+	return Qfalse;
     for (i=0; i<RARRAY(ary1)->len; i++) {
 	if (!rb_eql(RARRAY(ary1)->ptr[i], RARRAY(ary2)->ptr[i]))
 	    return Qfalse;
@@ -1724,16 +1194,15 @@ static VALUE
 rb_ary_hash(ary)
     VALUE ary;
 {
-    long i, h;
-    VALUE n;
+    long i;
+    int h;
 
     h = RARRAY(ary)->len;
     for (i=0; i<RARRAY(ary)->len; i++) {
-	h = (h << 1) | (h<0 ? 1 : 0);
-	n = rb_hash(RARRAY(ary)->ptr[i]);
+	int n = rb_hash(RARRAY(ary)->ptr[i]);
 	h ^= NUM2LONG(n);
     }
-    return LONG2FIX(h);
+    return INT2FIX(h);
 }
 
 VALUE
@@ -1742,7 +1211,6 @@ rb_ary_includes(ary, item)
     VALUE item;
 {
     long i;
-    
     for (i=0; i<RARRAY(ary)->len; i++) {
 	if (rb_equal(RARRAY(ary)->ptr[i], item)) {
 	    return Qtrue;
@@ -1751,59 +1219,42 @@ rb_ary_includes(ary, item)
     return Qfalse;
 }
 
-VALUE
-rb_ary_cmp(ary1, ary2)
-    VALUE ary1, ary2;
+static VALUE
+rb_ary_cmp(ary, ary2)
+    VALUE ary;
+    VALUE ary2;
 {
     long i, len;
 
     ary2 = to_ary(ary2);
-    len = RARRAY(ary1)->len;
+    len = RARRAY(ary)->len;
     if (len > RARRAY(ary2)->len) {
 	len = RARRAY(ary2)->len;
     }
     for (i=0; i<len; i++) {
-	VALUE v = rb_funcall(RARRAY(ary1)->ptr[i], id_cmp, 1, RARRAY(ary2)->ptr[i]);
+	VALUE v = rb_funcall(RARRAY(ary)->ptr[i],cmp,1,RARRAY(ary2)->ptr[i]);
 	if (v != INT2FIX(0)) {
 	    return v;
 	}
     }
-    len = RARRAY(ary1)->len - RARRAY(ary2)->len;
+    len = RARRAY(ary)->len - RARRAY(ary2)->len;
     if (len == 0) return INT2FIX(0);
     if (len > 0) return INT2FIX(1);
     return INT2FIX(-1);
 }
 
 static VALUE
-ary_make_hash(ary1, ary2)
-    VALUE ary1, ary2;
-{
-    VALUE hash = rb_hash_new();
-    long i;
-
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	rb_hash_aset(hash, RARRAY(ary1)->ptr[i], Qtrue);
-    }
-    if (ary2) {
-	for (i=0; i<RARRAY(ary2)->len; i++) {
-	    rb_hash_aset(hash, RARRAY(ary2)->ptr[i], Qtrue);
-	}
-    }
-    return hash;
-}
-
-static VALUE
 rb_ary_diff(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE ary3, hash;
+    VALUE ary3;
     long i;
 
-    hash = ary_make_hash(to_ary(ary2), 0);
+    ary2 = to_ary(ary2);
     ary3 = rb_ary_new();
-
     for (i=0; i<RARRAY(ary1)->len; i++) {
-	if (st_lookup(RHASH(hash)->tbl, RARRAY(ary1)->ptr[i], 0)) continue;
+	if (rb_ary_includes(ary2, RARRAY(ary1)->ptr[i])) continue;
+	if (rb_ary_includes(ary3, RARRAY(ary1)->ptr[i])) continue;
 	rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
     }
     return ary3;
@@ -1813,21 +1264,17 @@ static VALUE
 rb_ary_and(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE hash, ary3;
+    VALUE ary3;
     long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY(ary1)->len < RARRAY(ary2)->len ?
-	    RARRAY(ary1)->len : RARRAY(ary2)->len);
-    hash = ary_make_hash(ary2, 0);
-
+    ary3 = rb_ary_new();
     for (i=0; i<RARRAY(ary1)->len; i++) {
-	VALUE v = RARRAY(ary1)->ptr[i];
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
+	if (rb_ary_includes(ary2, RARRAY(ary1)->ptr[i])
+	    && !rb_ary_includes(ary3, RARRAY(ary1)->ptr[i])) {
 	    rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
 	}
     }
-
     return ary3;
 }
 
@@ -1835,25 +1282,22 @@ static VALUE
 rb_ary_or(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE hash, ary3;
-    VALUE v;
+    VALUE ary3;
     long i;
 
-    ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY(ary1)->len+RARRAY(ary2)->len);
-    hash = ary_make_hash(ary1, ary2);
+    if (TYPE(ary2) != T_ARRAY) {
+	if (rb_ary_includes(ary1, ary2)) return ary1;
+	else return rb_ary_plus(ary1, ary2);
+    }
 
+    ary3 = rb_ary_new();
     for (i=0; i<RARRAY(ary1)->len; i++) {
-	v = RARRAY(ary1)->ptr[i];
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
-	    rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
-	}
+	if (!rb_ary_includes(ary3, RARRAY(ary1)->ptr[i]))
+		rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
     }
     for (i=0; i<RARRAY(ary2)->len; i++) {
-	v = RARRAY(ary2)->ptr[i];
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
-	    rb_ary_push(ary3, RARRAY(ary2)->ptr[i]);
-	}
+	if (!rb_ary_includes(ary3, RARRAY(ary2)->ptr[i]))
+		rb_ary_push(ary3, RARRAY(ary2)->ptr[i]);
     }
     return ary3;
 }
@@ -1862,26 +1306,27 @@ static VALUE
 rb_ary_uniq_bang(ary)
     VALUE ary;
 {
-    VALUE hash;
-    VALUE *p, *q, *end;
-
-    rb_ary_modify(ary); 
-
-    hash = ary_make_hash(ary, 0);
+    VALUE *p, *q, *t, *end;
+    VALUE v;
 
-    if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
-	return Qnil;
-    }
-    p = q = RARRAY(ary)->ptr;
+    rb_ary_modify(ary);
+    p = RARRAY(ary)->ptr;
     end = p + RARRAY(ary)->len;
+
     while (p < end) {
-	VALUE v = *p;
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) {
-	    *q++ = *p;
+	v = *p++;
+	q = t = p;
+	while (q < end) {
+	    if (rb_equal(*q, v)) q++;
+	    else *t++ = *q++;
 	}
-	p++;
+	end = t;
     }
-    RARRAY(ary)->len = (q - RARRAY(ary)->ptr);
+    if (RARRAY(ary)->len == (end - RARRAY(ary)->ptr)) {
+	return Qnil;
+    }
+
+    RARRAY(ary)->len = (end - RARRAY(ary)->ptr);
 
     return ary;
 }
@@ -1890,9 +1335,10 @@ static VALUE
 rb_ary_uniq(ary)
     VALUE ary;
 {
-    ary = rb_ary_dup(ary);
-    rb_ary_uniq_bang(ary);
-    return ary;
+    VALUE v = rb_ary_uniq_bang(rb_ary_dup(ary));
+
+    if (NIL_P(v)) return ary;
+    return v;
 }
 
 static VALUE
@@ -1904,7 +1350,6 @@ rb_ary_compact_bang(ary)
     rb_ary_modify(ary);
     p = t = RARRAY(ary)->ptr;
     end = p + RARRAY(ary)->len;
-    
     while (t < end) {
 	if (NIL_P(*t)) t++;
 	else *p++ = *t++;
@@ -1912,7 +1357,7 @@ rb_ary_compact_bang(ary)
     if (RARRAY(ary)->len == (p - RARRAY(ary)->ptr)) {
 	return Qnil;
     }
-    RARRAY(ary)->len = RARRAY(ary)->aux.capa = (p - RARRAY(ary)->ptr);
+    RARRAY(ary)->len = RARRAY(ary)->capa = (p - RARRAY(ary)->ptr);
     REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
 
     return ary;
@@ -1922,9 +1367,10 @@ static VALUE
 rb_ary_compact(ary)
     VALUE ary;
 {
-    ary = rb_ary_dup(ary);
-    rb_ary_compact_bang(ary);
-    return ary;
+    VALUE v = rb_ary_compact_bang(rb_ary_dup(ary));
+
+    if (NIL_P(v)) return ary;
+    return v;
 }
 
 static VALUE
@@ -1936,62 +1382,27 @@ rb_ary_nitems(ary)
 
     p = RARRAY(ary)->ptr;
     pend = p + RARRAY(ary)->len;
-
     while (p < pend) {
 	if (!NIL_P(*p)) n++;
 	p++;
     }
-    return LONG2NUM(n);
-}
-
-static long
-flatten(ary, idx, ary2, memo)
-    VALUE ary;
-    long idx;
-    VALUE ary2, memo;
-{
-    VALUE id;
-    long i = idx;
-    long n, lim = idx + RARRAY(ary2)->len;
-
-    id = rb_obj_id(ary2);
-    if (rb_ary_includes(memo, id)) {
-	rb_raise(rb_eArgError, "tried to flatten recursive array");
-    }
-    rb_ary_push(memo, id);
-    rb_ary_update(ary, idx, 1, ary2);
-    while (i < lim) {
-	if (TYPE(RARRAY(ary)->ptr[i]) == T_ARRAY) {
-	    n = flatten(ary, i, RARRAY(ary)->ptr[i], memo);
-	    i += n; lim += n;
-	}
-	i++;
-    }
-    rb_ary_pop(memo);
-
-    return lim - idx - 1;	/* returns number of increased items */
+    return INT2NUM(n);
 }
 
 static VALUE
 rb_ary_flatten_bang(ary)
     VALUE ary;
 {
-    long i = 0;
+    long i;
     int mod = 0;
-    VALUE memo = Qnil;
 
     rb_ary_modify(ary);
-    while (i<RARRAY(ary)->len) {
+    for (i=0; i<RARRAY(ary)->len; i++) {
 	VALUE ary2 = RARRAY(ary)->ptr[i];
-
 	if (TYPE(ary2) == T_ARRAY) {
-	    if (NIL_P(memo)) {
-		memo = rb_ary_new();
-	    }
-	    i += flatten(ary, i, ary2, memo);
+	    rb_ary_replace(ary, i--, 1, ary2);
 	    mod = 1;
 	}
-	i++;
     }
     if (mod == 0) return Qnil;
     return ary;
@@ -2001,9 +1412,10 @@ static VALUE
 rb_ary_flatten(ary)
     VALUE ary;
 {
-    ary = rb_ary_dup(ary);
-    rb_ary_flatten_bang(ary);
-    return ary;
+    VALUE v = rb_ary_flatten_bang(rb_ary_dup(ary));
+
+    if (NIL_P(v)) return ary;
+    return v;
 }
 
 void
@@ -2012,34 +1424,29 @@ Init_Array()
     rb_cArray  = rb_define_class("Array", rb_cObject);
     rb_include_module(rb_cArray, rb_mEnumerable);
 
-    rb_define_alloc_func(rb_cArray, ary_alloc);
+    rb_define_singleton_method(rb_cArray, "new", rb_ary_s_new, -1);
     rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
-    rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1);
-    rb_define_method(rb_cArray, "initialize_copy", rb_ary_replace, 1);
-
     rb_define_method(rb_cArray, "to_s", rb_ary_to_s, 0);
     rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
     rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
-    rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
+    rb_define_method(rb_cArray, "to_ary", rb_ary_to_a, 0);
+
+    rb_define_method(rb_cArray, "freeze",  rb_ary_freeze, 0);
     rb_define_method(rb_cArray, "frozen?",  rb_ary_frozen_p, 0);
 
     rb_define_method(rb_cArray, "==", rb_ary_equal, 1);
     rb_define_method(rb_cArray, "eql?", rb_ary_eql, 1);
     rb_define_method(rb_cArray, "hash", rb_ary_hash, 0);
+    rb_define_method(rb_cArray, "===", rb_ary_equal, 1);
 
     rb_define_method(rb_cArray, "[]", rb_ary_aref, -1);
     rb_define_method(rb_cArray, "[]=", rb_ary_aset, -1);
-    rb_define_method(rb_cArray, "at", rb_ary_at, 1);
-    rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1);
-    rb_define_method(rb_cArray, "first", rb_ary_first, -1);
-    rb_define_method(rb_cArray, "last", rb_ary_last, -1);
     rb_define_method(rb_cArray, "concat", rb_ary_concat, 1);
     rb_define_method(rb_cArray, "<<", rb_ary_push, 1);
-    rb_define_method(rb_cArray, "push", rb_ary_push_m, -1);
+    rb_define_method(rb_cArray, "push", rb_ary_push_method, -1);
     rb_define_method(rb_cArray, "pop", rb_ary_pop, 0);
     rb_define_method(rb_cArray, "shift", rb_ary_shift, 0);
-    rb_define_method(rb_cArray, "unshift", rb_ary_unshift_m, -1);
-    rb_define_method(rb_cArray, "insert", rb_ary_insert, -1);
+    rb_define_method(rb_cArray, "unshift", rb_ary_unshift, 1);
     rb_define_method(rb_cArray, "each", rb_ary_each, 0);
     rb_define_method(rb_cArray, "each_index", rb_ary_each_index, 0);
     rb_define_method(rb_cArray, "reverse_each", rb_ary_reverse_each, 0);
@@ -2050,33 +1457,24 @@ Init_Array()
     rb_define_method(rb_cArray, "rindex", rb_ary_rindex, 1);
     rb_define_method(rb_cArray, "indexes", rb_ary_indexes, -1);
     rb_define_method(rb_cArray, "indices", rb_ary_indexes, -1);
-    rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
-    rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
-    rb_define_method(rb_cArray, "reverse!", rb_ary_reverse_bang, 0);
+    rb_define_method(rb_cArray, "clone", rb_ary_clone, 0);
+    rb_define_method(rb_cArray, "dup", rb_ary_dup, 0);
+    rb_define_method(rb_cArray, "join", rb_ary_join_method, -1);
+    rb_define_method(rb_cArray, "reverse", rb_ary_reverse_method, 0);
+    rb_define_method(rb_cArray, "reverse!", rb_ary_reverse, 0);
     rb_define_method(rb_cArray, "sort", rb_ary_sort, 0);
     rb_define_method(rb_cArray, "sort!", rb_ary_sort_bang, 0);
-    rb_define_method(rb_cArray, "collect", rb_ary_collect, 0);
-    rb_define_method(rb_cArray, "collect!", rb_ary_collect_bang, 0);
-    rb_define_method(rb_cArray, "map", rb_ary_collect, 0);
-    rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
-    rb_define_method(rb_cArray, "select", rb_ary_select, -1);
-    rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
     rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
-    rb_define_method(rb_cArray, "delete_at", rb_ary_delete_at_m, 1);
+    rb_define_method(rb_cArray, "delete_at", rb_ary_delete_at, 1);
     rb_define_method(rb_cArray, "delete_if", rb_ary_delete_if, 0);
-    rb_define_method(rb_cArray, "reject", rb_ary_reject, 0);
-    rb_define_method(rb_cArray, "reject!", rb_ary_reject_bang, 0);
-    rb_define_method(rb_cArray, "zip", rb_ary_zip, -1);
-    rb_define_method(rb_cArray, "transpose", rb_ary_transpose, 0);
-    rb_define_method(rb_cArray, "replace", rb_ary_replace, 1);
+    rb_define_method(rb_cArray, "reject!", rb_ary_delete_if, 0);
+    rb_define_method(rb_cArray, "filter", rb_ary_filter, 0);
+    rb_define_method(rb_cArray, "replace", rb_ary_replace_method, 1);
     rb_define_method(rb_cArray, "clear", rb_ary_clear, 0);
     rb_define_method(rb_cArray, "fill", rb_ary_fill, -1);
     rb_define_method(rb_cArray, "include?", rb_ary_includes, 1);
     rb_define_method(rb_cArray, "<=>", rb_ary_cmp, 1);
 
-    rb_define_method(rb_cArray, "slice", rb_ary_aref, -1);
-    rb_define_method(rb_cArray, "slice!", rb_ary_slice_bang, -1);
-
     rb_define_method(rb_cArray, "assoc", rb_ary_assoc, 1);
     rb_define_method(rb_cArray, "rassoc", rb_ary_rassoc, 1);
 
@@ -2095,6 +1493,5 @@ Init_Array()
     rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, 0);
     rb_define_method(rb_cArray, "nitems", rb_ary_nitems, 0);
 
-    id_cmp = rb_intern("<=>");
-    inspect_key = rb_intern("__inspect_key__");
+    cmp = rb_intern("<=>");
 }
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
deleted file mode 100644
index f3f36f7fdb..0000000000
--- a/bcc32/Makefile.sub
+++ /dev/null
@@ -1,593 +0,0 @@
-# -*- makefile -*-
-
-SHELL = $(COMSPEC)
-
-#### Start of system configuration section. ####
-OS = bccwin32
-RT = $(OS)
-
-## variables may be overridden by $(compile_dir)/Makefile
-!ifndef srcdir
-srcdir = ..
-!endif
-!ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = ruby
-!endif
-!ifndef RUBYW_INSTALL_NAME
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
-!elif "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
-!endif
-!if "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
-!endif
-!ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
-!endif
-!ifndef icondirs
-!ifdef ICONDIRS
-icondirs=$(ICONDIRS)
-!endif
-!endif
-!ifdef icondirs
-icondirs=$(icondirs:\=/)
-iconinc=-I$(icondirs: = -I)
-!endif
-###############
-
-VPATH = $(srcdir):$(srcdir)/missing
-.SUFFIXES: .y
-
-!ifndef CC
-CC = bcc32
-!endif
-!ifndef CPP
-CPP = cpp32
-!endif
-!ifndef RC
-RC = brcc32
-!endif
-!ifndef YACC
-YACC = byacc
-!endif
-!ifndef AR
-AR = tlib
-!endif
-
-PURIFY =
-AUTOCONF = autoconf
-
-!if !defined(PROCESSOR_ARCHITECTURE)
-PROCESSOR_ARCHITECTURE = x86
-!endif
-MACHINE = $(PROCESSOR_ARCHITECTURE)
-!if "$(PROCESSOR_ARCHITECTURE)" == "x86"
-!ifndef PROCESSOR_LEVEL
-PROCESSOR_LEVEL = 5
-!endif
-!if 6 < $(PROCESSOR_LEVEL)
-PROCESSOR_LEVEL = 6
-!endif
-PROCESSOR_FLAG = -$(PROCESSOR_LEVEL)
-CPU = i$(PROCESSOR_LEVEL)86
-ARCH = i386
-!else
-CPU = $(PROCESSOR_ARCHITECTURE)
-ARCH = $(PROCESSOR_ARCHITECTURE)
-!endif
-!ifndef DEBUGFLAGS
-DEBUGFLAGS = 
-!endif
-!ifndef OPTFLAGS
-OPTFLAGS = -O
-!endif
-
-!ifndef prefix
-prefix = /usr
-!endif
-!ifndef exec_prefix
-exec_prefix = $(prefix)
-!endif
-!ifndef libdir
-libdir = $(exec_prefix)/lib
-!endif
-!ifndef DESTDIR
-DESTDIR = $(prefix)
-!endif
-!ifndef CFLAGS
-CFLAGS = -q $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w-
-!endif
-!ifndef CPPFLAGS
-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing
-!endif
-!ifndef LDFLAGS
-LDFLAGS = -S:$(STACK)
-!endif
-!ifndef RFLAGS
-RFLAGS = $(iconinc)
-!endif
-!ifndef EXTLIBS
-EXTLIBS =
-!endif
-LIBS = cw32.lib import32.lib ws2_32.lib $(EXTLIBS)
-MISSING = acosh.obj crypt.obj erf.obj win32.obj
-
-!ifndef STACK
-STACK = 0x2000000
-!endif
-
-XCFLAGS = -DRUBY_EXPORT
-
-ARFLAGS = /a
-LD = ilink32 -q -Gn
-LDSHARED  = $(LD)
-XLDFLAGS  = -Tpe c0x32.obj
-WLDFLAGS  = -aa -Tpe c0w32.obj
-DLDFLAGS  = -Tpd c0d32.obj
-LIBRUBY_LDSHARED = $(LDSHARED)
-LIBRUBY_DLDFLAGS = -Gi $(DLDFLAGS) $(EXTLDFLAGS)
-LDOBJECTS = $(MAINOBJ)
-
-SOLIBS = 
-
-EXEEXT = .exe
-PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
-RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT)
-
-ORGLIBPATH = $(LIB)
-
-#### End of system configuration section. ####
-
-LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib
-LIBRUBY_SO    = $(RUBY_SO_NAME).dll
-LIBRUBY       = $(RUBY_SO_NAME).lib
-LIBRUBYARG    = $(LIBRUBY)
-
-!ifndef EXTOBJS
-EXTOBJS       = dmyext.obj
-!endif
-
-MAINOBJ       = main.obj
-WINMAINOBJ    = winmain.obj
-
-OBJS          = array.obj \
-		bignum.obj \
-		class.obj \
-		compar.obj \
-		dir.obj \
-		dln.obj \
-		enum.obj \
-		error.obj \
-		eval.obj \
-		file.obj \
-		gc.obj \
-		hash.obj \
-		inits.obj \
-		io.obj \
-		marshal.obj \
-		math.obj \
-		numeric.obj \
-		object.obj \
-		pack.obj \
-		parse.obj \
-		prec.obj \
-		process.obj \
-		random.obj \
-		range.obj \
-		re.obj \
-		regex.obj \
-		ruby.obj \
-		signal.obj \
-		sprintf.obj \
-		st.obj \
-		string.obj \
-		struct.obj \
-		time.obj \
-		util.obj \
-		variable.obj \
-		version.obj \
-		$(MISSING)
-
-SCRIPT_ARGS   =	"--dest-dir=$(DESTDIR)" \
-		"--make=$(MAKE)" \
-		"--mflags=$(MFLAGS)" \
-		"--make-flags=$(MAKEFLAGS)"
-
-all:		miniruby$(EXEEXT) rbconfig.rb \
-		$(LIBRUBY) $(MISCLIBS)
-		.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb --extstatic=$(EXTSTATIC) $(SCRIPT_ARGS)
-
-ruby: $(PROGRAM)
-rubyw: $(WPROGRAM)
-lib: $(LIBRUBY)
-dll: $(LIBRUBY_SO)
-
-config: config.h config.status
-
-config.h:
-	@echo Creating $(@:.\=)
-	@type > $@ &&|
-\#define HAVE_PROTOTYPES 1
-\#define HAVE_STDARG_PROTOTYPES 1
-/* \#define HAVE_ATTR_NORETURN 1 */
-\#define NORETURN(x) x
-\#define TOKEN_PASTE(x,y) x\#\#y
-\#define inline __inline
-/* \#define HAVE_DIRENT_H 1 */
-/* \#define HAVE_UNISTD_H 1 */
-\#define HAVE_STDLIB_H 1
-\#define HAVE_LIMITS_H 1
-/* \#define HAVE_SYS_FILE_H 1 */
-\#define HAVE_FCNTL_H 1
-/* \#define HAVE_PWD_H 1       */
-/* \#define HAVE_SYS_TIME_H 1  */
-/* \#define HAVE_SYS_TIMES_H 1 */
-/* \#define HAVE_SYS_PARAM_H 1 */
-/* \#define HAVE_SYS_WAIT_H 1  */
-\#define HAVE_STRING_H 1
-\#define HAVE_UTIME_H 1
-\#define HAVE_MEMORY_H 1
-/* \#define HAVE_ST_BLKSIZE 1  */
-\#define HAVE_ST_RDEV 1
-/* \#define GETGROUPS_T gid_t */
-\#define GETGROUPS_T int
-\#define RETSIGTYPE void
-\#define HAVE_ALLOCA 1
-\#define vfork fork
-\#define HAVE_FMOD 1
-/* \#define HAVE_RANDOM 1    */
-\#define HAVE_WAITPID 1
-\#define HAVE_GETCWD 1
-\#define HAVE_FSYNC 1
-/* \#define HAVE_TRUNCATE 1  */
-\#define HAVE_CHSIZE 1
-\#define HAVE_TIMES 1
-/* \#define HAVE_UTIMES 1    */
-/* \#define HAVE_FCNTL 1     */
-/* \#define HAVE_SETITIMER 1 */
-/* \#define HAVE_GETGROUPS 1 */
-/* \#define HAVE_SIGPROCMASK 1 */
-\#define HAVE_GETLOGIN 1
-\#define HAVE_TELLDIR 1
-\#define HAVE_SEEKDIR 1
-\#define HAVE_COSH 1
-\#define HAVE_SINH 1
-\#define HAVE_TANH 1
-
-\#define NEED_IO_SEEK_BETWEEN_RW 1
-\#define RSHIFT(x,y) ((x)>>y)
-\#define FILE_COUNT level
-\#define FILE_READPTR curp
-\#define DEFAULT_KCODE KCODE_NONE
-\#define DLEXT ".so"
-\#define DLEXT2 ".dll"
-\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
-\#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
-\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
-\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
-
-\#define SIZEOF_INT     4
-\#define SIZEOF_SHORT   2
-\#define SIZEOF_LONG    4
-\#define SIZEOF___INT64 8
-\#define SIZEOF_VOIDP   4
-\#define SIZEOF_FLOAT   4
-\#define SIZEOF_DOUBLE  8
-
-\#define HAVE_DECL_SYS_NERR 1
-\#define HAVE_ISINF         1
-\#define HAVE_ISNAN         1
-\#define HAVE_MEMMOVE       1
-\#define HAVE_MKDIR         1
-\#define HAVE_STRCASECMP    1
-\#define HAVE_STRNCASECMP   1
-\#define HAVE_STRCHR        1
-\#define HAVE_STRERROR      1
-\#define HAVE_STRFTIME      1
-\#define HAVE_STRSTR        1
-\#define HAVE_STRTOD        1
-\#define HAVE_STRTOUL       1
-|
-
-config.status: Makefile $(srcdir)bcc32/Makefile.sub
-	@echo Creating $@
-	@type > $@ &&|
-# Generated automatically by Makefile.sub.
-s,@SHELL@,$$(COMSPEC),;t t
-s,@CFLAGS@,$(CFLAGS),;t t
-s,@CPPFLAGS@,$(CPPFLAGS),;t t
-s,@CXXFLAGS@,$(CXXFLAGS),;t t
-s,@FFLAGS@,$(FFLAGS),;t t
-s,@LDFLAGS@,,;t t
-s,@LIBS@,$(LIBS),;t t
-s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,,;t t
-s,@program_transform_name@,s,,,,;t t
-s,@bindir@,$${exec_prefix}/bin,;t t
-s,@sbindir@,$${exec_prefix}/sbin,;t t
-s,@libexecdir@,$${exec_prefix}/libexec,;t t
-s,@datadir@,$${prefix}/share,;t t
-s,@sysconfdir@,$${prefix}/etc,;t t
-s,@sharedstatedir@,/etc,;t t
-s,@localstatedir@,/var,;t t
-s,@libdir@,$${exec_prefix}/lib,;t t
-s,@includedir@,$${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,$${prefix}/info,;t t
-s,@mandir@,$${prefix}/man,;t t
-s,@build@,$(CPU)-pc-$(OS),;t t
-s,@build_alias@,$(CPU)-$(OS),;t t
-s,@build_cpu@,$(CPU),;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,$(OS),;t t
-s,@host@,$(CPU)-pc-$(OS),;t t
-s,@host_alias@,$(CPU)-$(OS),;t t
-s,@host_cpu@,$(CPU),;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,$(OS),;t t
-s,@target@,$(ARCH)-pc-$(OS),;t t
-s,@target_alias@,$(ARCH)-$(OS),;t t
-s,@target_cpu@,$(ARCH),;t t
-s,@target_vendor@,pc,;t t
-s,@target_os@,$(OS),;t t
-s,@CC@,$(CC),;t t
-s,@CPP@,cpp32,;t t
-s,@YACC@,$(YACC),;t t
-s,@RANLIB@,,;t t
-s,@AR@,$(AR),;t t
-s,@ARFLAGS@,$(ARFLAGS) ,;t t
-s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
-s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
-s,@ALLOCA@,$(ALLOCA),;t t
-s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
-s,@EXEEXT@,.exe,;t t
-s,@OBJEXT@,obj,;t t
-s,@XLDFLAGS@,$(XLDFLAGS),;t t
-s,@DLDFLAGS@,$(DLDFLAGS),;t t
-s,@STATIC@,$(STATIC),;t t
-s,@CCDLFLAGS@,,;t t
-s,@LDSHARED@,$(LDSHARED),;t t
-s,@DLEXT@,so,;t t
-s,@DLEXT2@,dll,;t t
-s,@LIBEXT@,lib,;t t
-s,@STRIP@,$(STRIP),;t t
-s,@EXTSTATIC@,$(EXTSTATIC),;t t
-s,@setup@,Setup,;t t
-s,@MINIRUBY@,$(MINIRUBY),;t t
-s,@LIBRUBY_LDSHARED@,$$(LDSHARED),;t t
-s,@LIBRUBY_DLDFLAGS@,-Gi $$(DLDFLAGS),;t t
-s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
-s,@rubyw_install_name@,$(RUBYW_INSTALL_NAME),;t t
-s,@RUBYW_INSTALL_NAME@,$(RUBYW_INSTALL_NAME),;t t
-s,@RUBY_SO_NAME@,$(RUBY_SO_NAME),;t t
-s,@LIBRUBY_A@,$$(RUBY_SO_NAME)-static.lib,;t t
-s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
-s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
-s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
-s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
-s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A),;t t
-s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
-s,@SOLIBS@,$(SOLIBS),;t t
-s,@DLDLIBS@,$(DLDLIBS),;t t
-s,@ENABLE_SHARED@,yes,;t t
-s,@OUTFLAG@,-o,;t t
-s,@CPPOUTFILE@,,;t t
-s,@LIBPATHFLAG@, -L%s,;t t
-s,@LIBARG@,%s.lib,;t t
-s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$@, nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
-s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
-s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: .%s.%s:,;t t
-s,@COMMON_LIBS@,m,;t t
-s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN;t t
-s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
-s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
-s,@EXPORT_PREFIX@,_,;t t
-s,@arch@,$(ARCH)-$(OS),;t t
-s,@sitearch@,$(ARCH)-$(OS),;t t
-s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
-s,@configure_args@,--enable-shared $(configure_args),;t t
-s,@configure_input@,$$configure_input,;t t
-s,@srcdir@,$(srcdir),;t t
-s,@top_srcdir@,$(srcdir),;t t
-|
-
-miniruby$(EXEEXT):	$(LIBRUBY_A) $(MAINOBJ) dmyext.obj
-		@echo $(LIBS)
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) dmyext.obj,$@,nul,$(LIBRUBY_A) $(LIBS)
-
-$(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
-
-$(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
-		$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
-
-$(LIBRUBY_A):	$(OBJS) dmyext.obj
-		@-if exist $@ del $@
-		$(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj
-
-# $(LIBRUBY):	$(LIBRUBY_SO)
-#		implib $@ $(LIBRUBY_SO)
-
-$(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
-		@echo $(EXTOBJS)
-		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
-
-$(RUBYDEF):	$(LIBRUBY_A) miniruby$(EXEEXT)
-		$(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A)
-
-install:	rbconfig.rb
-		$(MINIRUBY) $(srcdir)instruby.rb $(SCRIPT_ARGS)
-		$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) install
-
-what-where no-install:	rbconfig.rb
-		$(MINIRUBY) $(srcdir)instruby.rb -n $(SCRIPT_ARGS)
-		$(MINIRUBY) $(srcdir)ext/extmk.rb -n $(SCRIPT_ARGS) install
-
-clean:		clean-ext clean-local
-
-clean-local:
-		@if exist $(LIBRUBY_A) del $(LIBRUBY_A)
-		@if exist $(MAINOBJ) del $(MAINOBJ)
-		@if exist rbconfig.rb del rbconfig.rb
-		@if exist ext\extinit.c del ext\extinit.c
-		@if exist ext\extinit.obj del ext\extinit.obj
-		@if exist ext\vc*.pdb del ext\vc*.pdb
-		@if exist *.obj del *.obj
-		@if exist *.res del *.res
-		@if exist *.tds del *.tds
-		@if exist *.il? del *.il?
-
-clean-ext:
-		@-$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) clean
-
-distclean:	distclean-ext distclean-local
-
-distclean-local:	clean-local
-		@if exist Makefile del Makefile
-		@if exist config.h del config.h
-		@if exist ext\config.cache del ext\config.cache
-		@if exist config.cache del config.cache
-		@if exist config.log del config.log
-		@if exist config.status del config.status
-		@if exist *~ del *~
-		@if exist *.bak del *.bak
-		@if exist *.stackdump del *.stackdump
-		@if exist *.core del *.core
-		@if exist gmon.out del gmon.out
-		@if exist y.tab.c del y.tab.c
-		@if exist y.output del y.output
-		@if exist *.map del *.map
-		@if exist *.pdb del *.pdb
-		@if exist *.ilk del *.ilk
-		@if exist *.exp del *.exp
-		@if exist $(RUBYDEF) del $(RUBYDEF)
-		@if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc
-		@if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc
-		@if exist $(RUBY_SO_NAME).rc del $(RUBY_SO_NAME).rc
-		@if exist $(PROGRAM) del $(PROGRAM)
-		@if exist $(WPROGRAM) del $(WPROGRAM)
-		@if exist $(LIBRUBY_SO) del $(LIBRUBY_SO)
-		@if exist $(LIBRUBY) del $(LIBRUBY)
-		@if exist ext\nul if not exist ext\* rmdir ext
-		@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
-
-distclean-ext:
-		@-$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) distclean
-
-realclean:	distclean
-		@if exist parse.c del parse.c
-		@if exist lex.c del lex.c
-
-test:		miniruby$(EXEEXT) NUL
-		@$(MINIRUBY) $(srcdir)rubytest.rb
-
-rbconfig.rb:	miniruby$(EXEEXT) config.status
-		@$(MINIRUBY) $(srcdir)mkconfig.rb -srcdir=$(srcdir) \
-			-install_name=$(RUBY_INSTALL_NAME) \
-			-so_name=$(RUBY_SO_NAME) rbconfig.rb
-
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
-		@$(MINIRUBY) $(srcdir)win32/resource.rb \
-			-ruby_name=$(RUBY_INSTALL_NAME) \
-			-rubyw_name=$(RUBYW_INSTALL_NAME) \
-			-so_name=$(RUBY_SO_NAME) \
-			. $(icondirs) $(srcdir)win32
-
-#config.status:	$(srcdir)configure
-#		$(SHELL) .config.status --recheck
-
-.path.c = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
-.path.h = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
-.path.y = $(srcdir)
-
-.c.obj:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
-
-.rc.res:
-	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)win32 $(RFLAGS) -fo$@ $(<:/=\)
-
-.y.c:
-	$(YACC) $(YFLAGS) $(<:\=/)
-	sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
-	@del y.tab.c
-
-parse.c: parse.y
-
-ext/extinit.obj: ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
-
-acosh.obj: acosh.c win32.h
-alloca.obj: alloca.c win32.h
-crypt.obj: crypt.c win32.h
-dup2.obj: dup2.c win32.h
-erf.obj: erf.c win32.h
-finite.obj: finite.c win32.h
-flock.obj: flock.c win32.h
-memcmp.obj: memcmp.c win32.h
-memmove.obj: memmove.c win32.h
-mkdir.obj: mkdir.c win32.h
-vsnprintf.obj: vsnprintf.c win32.h
-strcasecmp.obj: strcasecmp.c win32.h
-strncasecmp.obj: strncasecmp.c win32.h
-strchr.obj: strchr.c win32.h
-strdup.obj: strdup.c win32.h
-strerror.obj: strerror.c win32.h
-strftime.obj: strftime.c win32.h
-strstr.obj: strstr.c win32.h
-strtod.obj: strtod.c win32.h
-strtol.obj: strtol.c win32.h
-strtoul.obj: strtoul.c win32.h
-nt.obj: nt.c win32.h
-x68.obj: x68.c win32.h
-os2.obj: os2.c win32.h
-dl_os2.obj: dl_os2.c win32.h
-
-# when I use -I., there is confliction at "OpenFile" 
-# so, set . into environment varible "include"
-win32.obj: win32.c win32.h
-
-###
-array.obj: array.c ruby.h config.h defines.h intern.h missing.h util.h st.h win32.h
-bignum.obj: bignum.c ruby.h config.h defines.h intern.h missing.h win32.h
-class.obj: class.c ruby.h config.h defines.h intern.h missing.h rubysig.h node.h st.h version.h win32.h
-compar.obj: compar.c ruby.h config.h defines.h intern.h missing.h win32.h
-dir.obj: dir.c ruby.h config.h defines.h intern.h missing.h util.h win32.h
-dln.obj: dln.c ruby.h config.h defines.h intern.h missing.h dln.h win32.h
-dmyext.obj: dmyext.c
-enum.obj: enum.c ruby.h config.h defines.h intern.h missing.h node.h util.h win32.h
-error.obj: error.c ruby.h config.h defines.h intern.h missing.h env.h version.h st.h win32.h
-eval.obj: eval.c ruby.h config.h defines.h intern.h missing.h node.h env.h util.h rubysig.h st.h dln.h win32.h
-file.obj: file.c ruby.h config.h defines.h intern.h missing.h rubyio.h rubysig.h util.h dln.h win32.h
-gc.obj: gc.c ruby.h config.h defines.h intern.h missing.h rubysig.h st.h node.h env.h re.h regex.h win32.h
-hash.obj: hash.c ruby.h config.h defines.h intern.h missing.h st.h util.h rubysig.h version.h win32.h
-inits.obj: inits.c ruby.h config.h defines.h intern.h missing.h win32.h
-io.obj: io.c ruby.h config.h defines.h intern.h missing.h rubyio.h rubysig.h env.h util.h win32.h
-main.obj: main.c ruby.h config.h defines.h intern.h missing.h win32.h
-marshal.obj: marshal.c ruby.h config.h defines.h intern.h missing.h rubyio.h st.h util.h win32.h
-math.obj: math.c ruby.h config.h defines.h intern.h missing.h win32.h
-numeric.obj: numeric.c ruby.h config.h defines.h intern.h missing.h win32.h
-object.obj: object.c ruby.h config.h defines.h intern.h missing.h st.h util.h win32.h
-pack.obj: pack.c ruby.h config.h defines.h intern.h missing.h win32.h
-parse.obj: parse.c ruby.h config.h defines.h intern.h missing.h env.h node.h st.h regex.h util.h lex.c win32.h
-prec.obj: prec.c ruby.h config.h defines.h intern.h missing.h win32.h
-process.obj: process.c ruby.h config.h defines.h intern.h missing.h rubysig.h st.h win32.h
-random.obj: random.c ruby.h config.h defines.h intern.h missing.h win32.h
-range.obj: range.c ruby.h config.h defines.h intern.h missing.h win32.h
-re.obj: re.c ruby.h config.h defines.h intern.h missing.h re.h regex.h win32.h
-regex.obj: regex.c config.h regex.h win32.h
-ruby.obj: ruby.c ruby.h config.h defines.h intern.h missing.h dln.h node.h util.h win32.h
-signal.obj: signal.c ruby.h config.h defines.h intern.h missing.h rubysig.h win32.h
-sprintf.obj: sprintf.c ruby.h config.h defines.h intern.h missing.h win32.h
-st.obj: st.c config.h st.h
-string.obj: string.c ruby.h config.h defines.h intern.h missing.h re.h regex.h version.h win32.h
-struct.obj: struct.c ruby.h config.h defines.h intern.h missing.h win32.h
-time.obj: time.c ruby.h config.h defines.h intern.h missing.h win32.h
-util.obj: util.c ruby.h config.h defines.h intern.h missing.h util.h win32.h
-variable.obj: variable.c ruby.h config.h defines.h intern.h missing.h env.h node.h st.h util.h win32.h
-version.obj: version.c ruby.h config.h defines.h intern.h missing.h version.h win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
deleted file mode 100644
index a699d34a4e..0000000000
--- a/bcc32/README.bcc32
+++ /dev/null
@@ -1,125 +0,0 @@
-=begin
-
-= How to build ruby using Borland C++
-
-== Requirement
-
-(1) Borland C++ 5.0 or later.
-
-(2) If you want to run `((%make clean%))' or `((%make distclean%))'
-    properly, you must install UNIX compatible `((%rm%))' command on
-    your ((|PATH|)).
-
-(3) Please set environment variable (({INCLUDE})), (({LIB})), (({PATH}))
-    to run required commands properly from the command line.
-
-    Note: building ruby requires following commands.
-     * make
-     * bcc
-     * tlib
-     * ilink
-
-== How to compile and install
-
-(1) Execute bcc32\configure.bat on your build directory.
-     ex. c:\ruby-1.6.7>bcc32\configure.bat
-     
-(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
-    if you want to change the name of the executable files. 
-    And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
-    executable without console window if also you want.
-
-(3) Run `((%make%))'
-
-(4) Run `((%make test%))'
-
-(5) Run `((%make DESTDIR=<install_directory> install%))'
-
-    This command will create following directories and install files onto them.
-      * <install_directory>\bin
-      * <install_directory>\lib
-      * <install_directory>\lib\ruby
-      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
-      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
-      * <install_directory>\lib\ruby\site_ruby
-      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
-      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
-      * <install_directory>\man\man1
-    If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
-    The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
-
-== Icons
-
-Any icon files(*.ico) in the build directory, directories specified with
-((|icondirs|)) make variable and (({win32})) directory under the ruby
-source directory will be included in DLL or executable files, according
-to their base names.
-    $(RUBY_INSTALL_NAME).ico or ruby.ico   --> $(RUBY_INSTALL_NAME).exe
-    $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
-    the others                             --> $(RUBY_SO_NAME).dll
-
-Although no icons are distributed with the ruby source or in the official 
-site, you can use anything you like. For example, followings are written 
-in Japanese, but you can download at least.
-
-* ((<URL:http://member.nifty.ne.jp/ueivu/rubyico.html>)) or
-  ((<zipped icons|URL:http://member.nifty.ne.jp/ueivu/Ruby_ico.zip>))
-* ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
-  ((<icon itself|URL:http://homepage1.nifty.com/a_nakata/ruby/RubyIcon.ico>))
-
-== Build examples
-
-* Build on the ruby source directory.
-
-  ex.)
-    ruby source directory:  C:\ruby
-    build directory:        C:\ruby
-    install directory:      C:\usr\local
-
-    C:
-    cd \ruby
-    bcc32\configure
-    make
-    make test
-    make DESTDIR=/usr/local install
-
-* Build on the relative directory from the ruby source directory and CPU type 
-  i386.
-
-  ex.)
-    ruby source directory:  C:\ruby
-    build directory:        C:\ruby\bccwin32
-    install directory:      C:\usr\local
-    CPU                     i386
-    
-    C:
-    cd \ruby
-    mkdir bccwin32
-    cd bccwin32
-    ..\bcc32\configure target i386-bccwin32
-    make
-    make test
-    make DESTDIR=/usr/local install
-
-* Build on the different drive.
-
-  ex.)
-    ruby source directory:  C:\src\ruby
-    build directory:        D:\build\ruby
-    install directory:      C:\usr\local
-
-    D:
-    cd D:\build\ruby
-    C:\src\ruby\bcc32\configure
-    make
-    make test
-    make DESTDIR=C:/usr/local install
-
-== Bugs
-
-You can ((*NOT*)) use a path name contains any white space characters as
-the ruby source directory, this restriction comes from the behavior of
-(({!INCLUDE})) directives of (({MAKE})).
-((- you may call it a bug. -))
-
-=end
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
deleted file mode 100644
index 449b6e25b5..0000000000
--- a/bcc32/configure.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-@echo off
-::: Don't set environment variable in batch file other than autoexec.bat
-::: to avoid "Out of environment space" problem on Windows 95/98.
-::: set TMPMAKE=~tmp~.mak
-
-echo> ~tmp~.mak ####
-echo>> ~tmp~.mak conf = %0
-echo>> ~tmp~.mak $(conf:\=/): nul
-echo>> ~tmp~.mak 	@del ~tmp~.mak
-echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \
-echo>> ~tmp~.mak 	bcc32dir="$(@D)" \
-:loop
-if "%1" == "" goto :end
-if "%1" == "--srcdir" goto :srcdir
-if "%1" == "srcdir" goto :srcdir
-if "%1" == "--target" goto :target
-if "%1" == "target" goto :target
-  echo>> ~tmp~.mak 	"%1" 
-  shift
-goto :loop
-:srcdir
-  echo>> ~tmp~.mak 	"srcdir=%2" 
-  shift
-  shift
-goto :loop
-:target
-  echo>> ~tmp~.mak 	%2 
-  shift
-  shift
-goto :loop
-:end
-make -s -f ~tmp~.mak
diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
deleted file mode 100644
index e34b441e2f..0000000000
--- a/bcc32/mkexports.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#!./miniruby -s
-
-SYM = {}
-STDIN.reopen(open("nul"))
-ARGV.each do |obj|
-  IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
-    next unless /(?:PUBDEF|PUBD32)/ =~ l
-    SYM[$1] = true if /'(.*?)'/ =~ l
-  end
-end
-
-exports = []
-if $name
-  exports << "Name " + $name
-elsif $library
-  exports << "Library " + $library
-end
-exports << "Description " + $description.dump if $description
-exports << "EXPORTS" << SYM.keys.sort
-
-if $output
-  open($output, 'w') {|f| f.puts exports.join("\n")}
-else
-  puts exports.join("\n")
-end
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
deleted file mode 100644
index c81eaf2020..0000000000
--- a/bcc32/setup.mak
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- makefile -*-
-
-!if "$(srcdir)" != ""
-bcc32dir = $(srcdir)bcc32/
-!elseif "$(bcc32dir)" == "bcc32/"
-srcdir = ./
-!elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
-srcdir = $(bcc32dir:/bcc32/=/)
-!else
-srcdir = $(bcc32dir)../
-!endif
-
-OS = bccwin32
-RT = $(OS)
-INCLUDE = !include
-APPEND = echo>>$(MAKEFILE)
-!ifdef MAKEFILE
-MAKE = $(MAKE) -f $(MAKEFILE)
-!else
-MAKEFILE = Makefile
-!endif
-
-all: Makefile
-Makefile: -prologue- -generic- -epilogue-
-i386-$(OS): -prologue- -i386- -epilogue-
-i486-$(OS): -prologue- -i486- -epilogue-
-i586-$(OS): -prologue- -i586- -epilogue-
-i686-$(OS): -prologue- -i686- -epilogue-
-alpha-$(OS): -prologue- -alpha- -epilogue-
-
--prologue-: nul
-	@echo Creating $(MAKEFILE)
-	@type > $(MAKEFILE) &&|
-\#\#\# Makefile for ruby $(OS) \#\#\#
-srcdir = $(srcdir:\=/)
-|
-	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
-\#include "version.h"
-MAJOR = RUBY_VERSION_MAJOR
-MINOR = RUBY_VERSION_MINOR
-TEENY = RUBY_VERSION_TEENY
-|
-	@type $(MAKEFILE).i >> $(MAKEFILE)
-	@del $(MAKEFILE).i
-
--generic-: nul
-!if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
-	@type >> $(MAKEFILE) &&|
-!if defined(PROCESSOR_ARCHITECTURE)
-PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
-!endif
-!if defined(PROCESSOR_LEVEL)
-PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
-!endif
-
-|
-!endif
-
--alpha-: nul
-	@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
--ix86-: nul
-	@$(APPEND) PROCESSOR_ARCHITECTURE = x86
-
--i386-: -ix86-
-	@$(APPEND) PROCESSOR_LEVEL = 3
--i486-: -ix86-
-	@$(APPEND) PROCESSOR_LEVEL = 4
--i586-: -ix86-
-	@$(APPEND) PROCESSOR_LEVEL = 5
--i686-: -ix86-
-	@$(APPEND) PROCESSOR_LEVEL = 6
-
--epilogue-: nul
-	@type >> $(MAKEFILE) &&|
-
-\# OS = $(OS)
-\# RT = $(RT)
-\# RUBY_INSTALL_NAME = ruby
-\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-\# prefix = /usr
-\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w-
-\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
-\# STACK = 0x2000000
-\# LDFLAGS = -S:$$(STACK)
-\# RFLAGS = $$(iconinc)
-\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
-$(INCLUDE) $$(srcdir)bcc32/Makefile.sub
-|
-	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/bignum.c b/bignum.c
index 7c3e029d57..36a46af3fd 100644
--- a/bignum.c
+++ b/bignum.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   bignum.c -
 
@@ -6,34 +6,22 @@
   $Date$
   created at: Fri Jun 10 00:48:55 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
-
 #include <math.h>
 #include <ctype.h>
 
 VALUE rb_cBignum;
+typedef unsigned short USHORT;
 
-#if defined __MINGW32__
-#define USHORT _USHORT
-#endif
-
-#define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
-#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
-#define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
-#define DIGSPERLONG ((unsigned int)(SIZEOF_LONG/SIZEOF_BDIGITS))
-#if HAVE_LONG_LONG
-# define DIGSPERLL ((unsigned int)(SIZEOF_LONG_LONG/SIZEOF_BDIGITS))
-#endif
-#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
-#define BIGDN(x) RSHIFT(x,BITSPERDIG)
-#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
-#define BDIGMAX ((BDIGIT)-1)
-
-#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || (RBIGNUM(x)->len == 1 && BDIGITS(x)[0] == 0))
+#define BDIGITS(x) RBIGNUM(x)->digits
+#define BITSPERDIG (sizeof(short)*CHAR_BIT)
+#define BIGRAD (1L << BITSPERDIG)
+#define DIGSPERINT ((unsigned int)(sizeof(long)/sizeof(short)))
+#define BIGUP(x) ((unsigned long)(x) << BITSPERDIG)
+#define BIGDN(x) (((x)<0) ? ~((~(x))>>BITSPERDIG) : (x)>>BITSPERDIG)
+#define BIGLO(x) ((USHORT)((x) & (BIGRAD-1)))
 
 static VALUE
 bignew_1(klass, len, sign)
@@ -45,7 +33,7 @@ bignew_1(klass, len, sign)
     OBJSETUP(big, klass, T_BIGNUM);
     big->sign = sign;
     big->len = len;
-    big->digits = ALLOC_N(BDIGIT, len);
+    BDIGITS(big) = ALLOC_N(USHORT, len);
 
     return (VALUE)big;
 }
@@ -58,18 +46,17 @@ rb_big_clone(x)
 {
     VALUE z = bignew_1(CLASS_OF(x), RBIGNUM(x)->len, RBIGNUM(x)->sign);
 
-    MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, RBIGNUM(x)->len);
+    MEMCPY(BDIGITS(z), BDIGITS(x), USHORT, RBIGNUM(x)->len);
     return z;
 }
 
-static void
-get2comp(x, carry)		/* get 2's complement */
+void
+rb_big_2comp(x)			/* get 2's complement */
     VALUE x;
-    int carry;
 {
     long i = RBIGNUM(x)->len;
-    BDIGIT *ds = BDIGITS(x);
-    BDIGIT_DBL num;
+    USHORT *ds = BDIGITS(x);
+    long num;
 
     while (i--) ds[i] = ~ds[i];
     i = 0; num = 1;
@@ -78,43 +65,36 @@ get2comp(x, carry)		/* get 2's complement */
 	ds[i++] = BIGLO(num);
 	num = BIGDN(num);
     } while (i < RBIGNUM(x)->len);
-    if (!carry) return;
-    if ((ds[RBIGNUM(x)->len-1] & (1<<(BITSPERDIG-1))) == 0) {
-	REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
+    if (ds[0] == 1 || ds[0] == 0) {
+	for (i=1; i<RBIGNUM(x)->len; i++) {
+	    if (ds[i] != 0) return;
+	}
+	REALLOC_N(BDIGITS(x), USHORT, RBIGNUM(x)->len++);
 	ds = BDIGITS(x);
-	ds[RBIGNUM(x)->len-1] = ~0;
+	ds[RBIGNUM(x)->len-1] = 1;
     }
 }
 
-void
-rb_big_2comp(x)			/* get 2's complement */
-    VALUE x;
-{
-    get2comp(x, Qtrue);
-}
-
 static VALUE
 bignorm(x)
     VALUE x;
 {
-    if (!FIXNUM_P(x)) {
-	long len = RBIGNUM(x)->len;
-	BDIGIT *ds = BDIGITS(x);
+    long len = RBIGNUM(x)->len;
+    USHORT *ds = BDIGITS(x);
 
-	while (len-- && !ds[len]) ;
-	RBIGNUM(x)->len = ++len;
+    while (len-- && !ds[len]) ;
+    RBIGNUM(x)->len = ++len;
 
-	if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
-	    long num = 0;
-	    while (len--) {
-		num = BIGUP(num) + ds[len];
-	    }
-	    if (num >= 0) {
-		if (RBIGNUM(x)->sign) {
-		    if (POSFIXABLE(num)) return LONG2FIX(num);
-		}
-		else if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
+    if (len*sizeof(USHORT) <= sizeof(VALUE)) {
+	long num = 0;
+	while (len--) {
+	    num = BIGUP(num) + ds[len];
+	}
+	if (num >= 0) {
+	    if (RBIGNUM(x)->sign) {
+		if (POSFIXABLE(num)) return INT2FIX(num);
 	    }
+	    else if (NEGFIXABLE(-(long)num)) return INT2FIX(-(long)num);
 	}
     }
     return x;
@@ -131,20 +111,20 @@ VALUE
 rb_uint2big(n)
     unsigned long n;
 {
-    BDIGIT_DBL num = n;
-    long i = 0;
-    BDIGIT *digits;
+    unsigned int i = 0;
+    USHORT *digits;
     VALUE big;
 
-    big = bignew(DIGSPERLONG, 1);
+    i = 0;
+    big = bignew(DIGSPERINT, 1);
     digits = BDIGITS(big);
-    while (i < DIGSPERLONG) {
-	digits[i++] = BIGLO(num);
-	num = BIGDN(num);
+    while (i < DIGSPERINT) {
+	digits[i++] = BIGLO(n);
+	n = BIGDN(n);
     }
 
-    i = DIGSPERLONG;
-    while (--i && !digits[i]) ;
+    i = DIGSPERINT;
+    while (i-- && !digits[i]) ;
     RBIGNUM(big)->len = i+1;
     return big;
 }
@@ -171,7 +151,7 @@ VALUE
 rb_uint2inum(n)
     unsigned long n;
 {
-    if (POSFIXABLE(n)) return LONG2FIX(n);
+    if (POSFIXABLE(n)) return INT2FIX(n);
     return rb_uint2big(n);
 }
 
@@ -179,302 +159,111 @@ VALUE
 rb_int2inum(n)
     long n;
 {
-    if (FIXABLE(n)) return LONG2FIX(n);
+    if (FIXABLE(n)) return INT2FIX(n);
     return rb_int2big(n);
 }
 
-#ifdef HAVE_LONG_LONG
-
-void
-rb_quad_pack(buf, val)
-    char *buf;
-    VALUE val;
-{
-    LONG_LONG q;
-
-    val = rb_to_int(val);
-    if (FIXNUM_P(val)) {
-	q = FIX2LONG(val);
-    }
-    else {
-	long len = RBIGNUM(val)->len;
-	BDIGIT *ds;
-
-	ds = BDIGITS(val);
-	q = 0;
-	while (len--) {
-	    q = BIGUP(q);
-	    q += ds[len];
-	}
-	if (!RBIGNUM(val)->sign) q = -q;
-    }
-    memcpy(buf, (char*)&q, SIZEOF_LONG_LONG);
-}
-
 VALUE
-rb_quad_unpack(buf, sign)
-    const char *buf;
-    int sign;
-{
-    unsigned LONG_LONG q;
-    long neg = 0;
-    long i;
-    BDIGIT *digits;
-    VALUE big;
-
-    memcpy(&q, buf, SIZEOF_LONG_LONG);
-    if (sign) {
-	if (FIXABLE((LONG_LONG)q)) return LONG2FIX((LONG_LONG)q);
-	if ((LONG_LONG)q < 0) {
-	    q = -(LONG_LONG)q;
-	    neg = 1;
-	}
-    }
-    else {
-	if (POSFIXABLE(q)) return LONG2FIX(q);
-    }
-
-    i = 0;
-    big = bignew(DIGSPERLL, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLL) {
-	digits[i++] = BIGLO(q);
-	q = BIGDN(q);
-    }
-
-    i = DIGSPERLL;
-    while (i-- && !digits[i]) ;
-    RBIGNUM(big)->len = i+1;
-
-    if (neg) {
-	RBIGNUM(big)->sign = 0;
-    }
-    return bignorm(big);
-}
-
-#else
-
-#define QUAD_SIZE 8
-
-void
-rb_quad_pack(buf, val)
-    char *buf;
-    VALUE val;
-{
-    long len;
-
-    memset(buf, 0, QUAD_SIZE);
-    val = rb_to_int(val);
-    if (FIXNUM_P(val)) {
-	val = rb_int2big(FIX2LONG(val));
-    }
-    len = RBIGNUM(val)->len * SIZEOF_BDIGITS;
-    if (len > QUAD_SIZE) len = QUAD_SIZE;
-    memcpy(buf, (char*)BDIGITS(val), len);
-    if (!RBIGNUM(val)->sign) {
-	len = QUAD_SIZE;
-	while (len--) {
-	    *buf = ~*buf;
-	    buf++;
-	}
-    }
-}
-
-#define BNEG(b) (RSHIFT(((BDIGIT*)b)[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
-
-VALUE
-rb_quad_unpack(buf, sign)
-    const char *buf;
-    int sign;
-{
-    VALUE big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
-
-    memcpy((char*)BDIGITS(big), buf, QUAD_SIZE);
-    if (sign && BNEG(buf)) {
-	long len = QUAD_SIZE;
-	char *tmp = (char*)BDIGITS(big);
-
-	RBIGNUM(big)->sign = 0;
-	while (len--) {
-	    *tmp = ~*tmp;
-	    tmp++;
-	}
-    }
-
-    return bignorm(big);
-}
-
-#endif
-
-VALUE
-rb_cstr_to_inum(str, base, badcheck)
+rb_str2inum(str, base)
     const char *str;
     int base;
-    int badcheck;
 {
-    const char *s = str;
-    char *end;
-    char sign = 1, nondigit = 0;
-    int c;
-    BDIGIT_DBL num;
+    char sign = 1, c;
+    unsigned long num;
     long len, blen = 1;
     long i;
     VALUE z;
-    BDIGIT *zds;
+    USHORT *zds;
 
-    if (!str) {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
-    }
-    if (badcheck) {
-	while (ISSPACE(*str)) str++;
-    }
-    else {
-	while (ISSPACE(*str) || *str == '_') str++;
-    }
+    while (ISSPACE(*str)) str++;
 
-    if (str[0] == '+') {
+    if (*str == '+') {
 	str++;
     }
-    else if (str[0] == '-') {
+    else if (*str == '-') {
 	str++;
 	sign = 0;
     }
-    if (str[0] == '+' || str[0] == '-') {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
-    }
-    if (base <= 0) {
-	if (str[0] == '0') {
-	    switch (str[1]) {
-	      case 'x': case 'X':
+    if (base == 0) {
+	if (*str == '0') {
+	    str++;
+	    if (*str == 'x' || *str == 'X') {
+		str++;
 		base = 16;
-		break;
-	      case 'b': case 'B':
+	    }
+	    else if (*str == 'b' || *str == 'B') {
+		str++;
 		base = 2;
-		break;
-	      case 'o': case 'O':
-		base = 8;
-		break;
-	      case 'd': case 'D':
-		base = 10;
-		break;
-	      default:
+	    }
+	    else {
 		base = 8;
 	    }
-	}
-	else if (base < -1) {
-	    base = -base;
+	    if (*str == '\0') return INT2FIX(0);
 	}
 	else {
 	    base = 10;
 	}
     }
-    switch (base) {
-      case 2:
-	len = 1;
-	if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
-	    str += 2;
-	}
-	break;
-      case 3:
-	len = 2;
-	break;
-      case 8:
-	if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) {
-	    str += 2;
-	}
-      case 4: case 5: case 6: case 7:
-	len = 3;
-	break;
-      case 10:
-	if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
+    if (base == 8) {
+	while (str[0] == '0') str++;
+	len = 3*strlen(str)*sizeof(char);
+    }
+    else {			/* base == 10, 2 or 16 */
+	if (base == 16 && str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
 	    str += 2;
 	}
-      case 9: case 11: case 12: case 13: case 14: case 15:
-	len = 4;
-	break;
-      case 16:
-	len = 4;
-	if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
+	if (base == 2 && str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
 	    str += 2;
 	}
-	break;
-      default:
-	if (base < 2 || 36 < base) {
-	    rb_raise(rb_eArgError, "illegal radix %d", base);
-	}
-	if (base <= 32) {
-	    len = 5;
-	}
-	else {
-	    len = 6;
-	}
-	break;
-    }
-    if (*str == '0') {		/* squeeze preceeding 0s */
-	while (*++str == '0');
-	--str;
+	while (str[0] == '0') str++;
+	len = 4*strlen(str)*sizeof(char);
     }
-    len *= strlen(str)*sizeof(char);
 
     if (len <= (sizeof(VALUE)*CHAR_BIT)) {
-	unsigned long val = strtoul((char*)str, &end, base);
-
-	if (*end == '_') goto bigparse;
-	if (badcheck) {
-	    if (end == str) goto bad; /* no number */
-	    while (*end && ISSPACE(*end)) end++;
-	    if (*end) goto bad;	      /* trailing garbage */
-	}
+	unsigned long val = strtoul((char*)str, 0, base);
 
 	if (POSFIXABLE(val)) {
-	    if (sign) return LONG2FIX(val);
+	    if (sign) return INT2FIX(val);
 	    else {
 		long result = -(long)val;
-		return LONG2FIX(result);
+		return INT2FIX(result);
 	    }
 	}
 	else {
 	    VALUE big = rb_uint2big(val);
 	    RBIGNUM(big)->sign = sign;
-	    return bignorm(big);
+	    return big;
 	}
     }
-  bigparse:
     len = (len/BITSPERDIG)+1;
-    if (badcheck && *str == '_') goto bad;
 
     z = bignew(len, sign);
     zds = BDIGITS(z);
     for (i=len;i--;) zds[i]=0;
     while (c = *str++) {
-	if (c == '_') {
-	    if (badcheck) {
-		if (nondigit) goto bad;
-		nondigit = c;
-	    }
-	    continue;
-	}
-	else if (isdigit(c)) {
-	    c -= '0';
-	}
-	else if (islower(c)) {
-	    c -= 'a' - 10;
-	}
-	else if (isupper(c)) {
-	    c -= 'A' - 10;
-	}
-	else {
+	switch (c) {
+	  case '0': case '1': case '2': case '3': case '4':
+	  case '5': case '6': case '7': case '8': case '9':
+	    c = c - '0';
+	    break;
+	  case 'a': case 'b': case 'c':
+	  case 'd': case 'e': case 'f':
+	    c = c - 'a' + 10;
+	    break;
+	  case 'A': case 'B': case 'C':
+	  case 'D': case 'E': case 'F':
+	    c = c - 'A' + 10;
+	    break;
+	  default:
+	    c = base;
 	    break;
 	}
 	if (c >= base) break;
-	nondigit = 0;
 	i = 0;
 	num = c;
 	for (;;) {
 	    while (i<blen) {
-		num += (BDIGIT_DBL)zds[i]*base;
+		num += zds[i]*base;
 		zds[i++] = BIGLO(num);
 		num = BIGDN(num);
 	    }
@@ -485,133 +274,18 @@ rb_cstr_to_inum(str, base, badcheck)
 	    break;
 	}
     }
-    if (badcheck) {
-	str--;
-	if (s+1 < str && str[-1] == '_') goto bad;
-	while (*str && ISSPACE(*str)) str++;
-	if (*str) {
-	  bad:
-	    rb_invalid_str(s, "Integer");
-	}
-    }
-
     return bignorm(z);
 }
 
-VALUE
-rb_str_to_inum(str, base, badcheck)
-    VALUE str;
-    int base;
-    int badcheck;
-{
-    char *s;
-    long len;
-
-    StringValue(str);
-    if (badcheck) {
-	s = StringValueCStr(str);
-    }
-    else {
-	s = RSTRING(str)->ptr;
-    }
-    if (s) {
-	len = RSTRING(str)->len;
-	if (s[len]) {		/* no sentinel somehow */
-	    char *p = ALLOCA_N(char, len+1);
-
-	    MEMCPY(p, s, char, len);
-	    p[len] = '\0';
-	    s = p;
-	}
-    }
-    return rb_cstr_to_inum(s, base, badcheck); 
-}
-
-#if HAVE_LONG_LONG
-
-VALUE
-rb_ull2big(n)
-    unsigned LONG_LONG n;
-{
-    BDIGIT_DBL num = n;
-    long i = 0;
-    BDIGIT *digits;
-    VALUE big;
-
-    big = bignew(DIGSPERLL, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLL) {
-	digits[i++] = BIGLO(num);
-	num = BIGDN(num);
-    }
-
-    i = DIGSPERLL;
-    while (i-- && !digits[i]) ;
-    RBIGNUM(big)->len = i+1;
-    return big;
-}
-
-VALUE
-rb_ll2big(n)
-    LONG_LONG n;
-{
-    long neg = 0;
-    VALUE big;
-
-    if (n < 0) {
-	n = -n;
-	neg = 1;
-    }
-    big = rb_ull2big(n);
-    if (neg) {
-	RBIGNUM(big)->sign = 0;
-    }
-    return big;
-}
-
-VALUE
-rb_ull2inum(n)
-    unsigned LONG_LONG n;
-{
-    if (POSFIXABLE(n)) return LONG2FIX(n);
-    return rb_ull2big(n);
-}
-
-VALUE
-rb_ll2inum(n)
-    LONG_LONG n;
-{
-    if (FIXABLE(n)) return LONG2FIX(n);
-    return rb_ll2big(n);
-}
-
-#endif  /* HAVE_LONG_LONG */
- 
-VALUE
-rb_cstr2inum(str, base)
-    const char *str;
-    int base;
-{
-    return rb_cstr_to_inum(str, base, base==0);
-}
-
-VALUE
-rb_str2inum(str, base)
-    VALUE str;
-    int base;
-{
-    return rb_str_to_inum(str, base, base==0);
-}
-
-const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+static char hexmap[] = "0123456789abcdef";
 VALUE
 rb_big2str(x, base)
     VALUE x;
     int base;
 {
-    volatile VALUE t;
-    BDIGIT *ds;
-    long i, j, hbase;
+    VALUE t;
+    USHORT *ds;
+    unsigned long i, j, hbase;
     VALUE ss;
     char *s, c;
 
@@ -619,42 +293,28 @@ rb_big2str(x, base)
 	return rb_fix2str(x, base);
     }
     i = RBIGNUM(x)->len;
-    if (BIGZEROP(x)) {
-	return rb_str_new2("0");
-    }
-    j = SIZEOF_BDIGITS*CHAR_BIT*i;
-    switch (base) {
-      case 2: break;
-      case 3:
-	j = j * 647L / 1024;
-	break;
-      case 4: case 5: case 6: case 7:
-	j /= 2;
-	break;
-      case 8: case 9:
-	j /= 3;
-	break;
-      case 10: case 11: case 12: case 13: case 14: case 15:
-	j = j * 241L / 800;
-	break;
-      case 16: case 17: case 18: case 19: case 20: case 21:
-      case 22: case 23: case 24: case 25: case 26: case 27:
-      case 28: case 29: case 30: case 31:
-	j /= 4;
-	break;
-      case 32: case 33: case 34: case 35: case 36:
-	j /= 5;
-	break;
-      default:
-	rb_raise(rb_eArgError, "illegal radix %d", base);
-	break;
+    if (i == 0) return rb_str_new2("0");
+    if (base == 10) {
+	j = (sizeof(USHORT)/sizeof(char)*CHAR_BIT*i*241L)/800+2;
+	hbase = 10000;
+    }
+    else if (base == 16) {
+	j = (sizeof(USHORT)/sizeof(char)*CHAR_BIT*i)/4+2;
+	hbase = 0x10000;
+    }
+    else if (base == 8) {
+	j = (sizeof(USHORT)/sizeof(char)*CHAR_BIT*i)+2;
+	hbase = 010000;
+    }
+    else if (base == 2) {
+	j = (sizeof(USHORT)*CHAR_BIT*i)+2;
+	hbase = 020;
+    }
+    else {
+	j = 0;
+	hbase = 0;
+	rb_raise(rb_eArgError, "bignum cannot treat base %d", base);
     }
-    j += 2;
-
-    hbase = base * base;
-#if SIZEOF_BDIGITS > 2
-    hbase *= hbase;
-#endif
 
     t = rb_big_clone(x);
     ds = BDIGITS(t);
@@ -664,18 +324,17 @@ rb_big2str(x, base)
     s[0] = RBIGNUM(x)->sign ? '+' : '-';
     while (i && j) {
 	long k = i;
-	BDIGIT_DBL num = 0;
-
+	unsigned long num = 0;
 	while (k--) {
 	    num = BIGUP(num) + ds[k];
-	    ds[k] = (BDIGIT)(num / hbase);
+	    ds[k] = (USHORT)(num / hbase);
 	    num %= hbase;
 	}
 	if (ds[i-1] == 0) i--;
-	k = SIZEOF_BDIGITS;
+	k = 4;
 	while (k--) {
 	    c = (char)(num % base);
-	    s[--j] = ruby_digitmap[(int)c];
+	    s[--j] = hexmap[(int)c];
 	    num /= base;
 	    if (i == 0 && num == 0) break;
 	}
@@ -689,31 +348,22 @@ rb_big2str(x, base)
 }
 
 static VALUE
-rb_big_to_s(argc, argv, x)
-    int argc;
-    VALUE *argv;
+rb_big_to_s(x)
     VALUE x;
 {
-    VALUE b;
-    int base;
-
-    rb_scan_args(argc, argv, "01", &b);
-    if (argc == 0) base = 10;
-    else base = NUM2INT(b);
-    return rb_big2str(x, base);
+    return rb_big2str(x, 10);
 }
 
-static unsigned long
-big2ulong(x, type)
+unsigned long
+rb_big2ulong(x)
     VALUE x;
-    char *type;
 {
+    unsigned long num;
     long len = RBIGNUM(x)->len;
-    BDIGIT_DBL num;
-    BDIGIT *ds;
+    USHORT *ds;
 
-    if (len > SIZEOF_LONG/SIZEOF_BDIGITS)
-	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+    if (len > sizeof(long)/sizeof(USHORT))
+	rb_raise(rb_eArgError, "bignum too big to convert into `uint'");
     ds = BDIGITS(x);
     num = 0;
     while (len--) {
@@ -723,89 +373,33 @@ big2ulong(x, type)
     return num;
 }
 
-unsigned long
-rb_big2ulong(x)
-    VALUE x;
-{
-    unsigned long num = big2ulong(x, "unsigned long");
-
-    if (!RBIGNUM(x)->sign) {
-	if ((long)num < 0) {
-	    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
-	}
-	return -num;
-    }
-    return num;
-}
-
 long
 rb_big2long(x)
     VALUE x;
 {
-    unsigned long num = big2ulong(x, "int");
+    unsigned long num = rb_big2ulong(x);
 
-    if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `int'");
+    if ((long)num < 0) {
+	rb_raise(rb_eArgError, "bignum too big to convert into `int'");
     }
     if (!RBIGNUM(x)->sign) return -(long)num;
     return num;
 }
 
-#if HAVE_LONG_LONG
-
-static unsigned LONG_LONG
-big2ull(x, type)
-    VALUE x;
-    char *type;
-{
-    long len = RBIGNUM(x)->len;
-    BDIGIT_DBL num;
-    BDIGIT *ds;
-
-    if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
-	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
-    ds = BDIGITS(x);
-    num = 0;
-    while (len--) {
-	num = BIGUP(num);
-	num += ds[len];
-    }
-    return num;
-}
-
-unsigned LONG_LONG
-rb_big2ull(x)
-    VALUE x;
-{
-    unsigned LONG_LONG num = big2ull(x, "unsigned long long");
-
-    if (!RBIGNUM(x)->sign) return -num;
-    return num;
-}
-
-LONG_LONG
-rb_big2ll(x)
+static VALUE
+rb_big_to_i(x)
     VALUE x;
 {
-    unsigned LONG_LONG num = big2ull(x, "long long");
-
-    if ((LONG_LONG)num < 0 && (RBIGNUM(x)->sign
-			       || (LONG_LONG)num != LLONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
-    }
-    if (!RBIGNUM(x)->sign) return -(LONG_LONG)num;
-    return num;
+    return bignorm(x);
 }
 
-#endif  /* HAVE_LONG_LONG */
-
-static VALUE
-dbl2big(d)
+VALUE
+rb_dbl2big(d)
     double d;
 {
-    long i = 0;
-    BDIGIT c;
-    BDIGIT *digits;
+    unsigned long i = 0;
+    long c;
+    USHORT *digits;
     VALUE z;
     double u = (d < 0)?-d:d;
 
@@ -824,19 +418,12 @@ dbl2big(d)
     digits = BDIGITS(z);
     while (i--) {
 	u *= BIGRAD;
-	c = (BDIGIT)u;
+	c = (long)u;
 	u -= c;
-	digits[i] = c;
+	digits[i] = (USHORT)c;
     }
 
-    return z;
-}
-
-VALUE
-rb_dbl2big(d)
-    double d;
-{
-    return bignorm(dbl2big(d));
+    return bignorm(z);
 }
 
 double
@@ -845,15 +432,11 @@ rb_big2dbl(x)
 {
     double d = 0.0;
     long i = RBIGNUM(x)->len;
-    BDIGIT *ds = BDIGITS(x);
+    USHORT *ds = BDIGITS(x);
 
     while (i--) {
 	d = ds[i] + BIGRAD*d;
     }
-    if (isinf(d)) {
-	rb_warn("Bignum out of Float range");
-	d = HUGE_VAL;
-    }
     if (!RBIGNUM(x)->sign) d = -d;
     return d;
 }
@@ -879,11 +462,8 @@ rb_big_cmp(x, y)
       case T_BIGNUM:
 	break;
 
-      case T_FLOAT:
-	return rb_dbl_cmp(rb_big2dbl(x), RFLOAT(y)->value);
-
       default:
-	return rb_num_coerce_cmp(x, y);
+	return rb_num_coerce_bin(x, y);
     }
 
     if (RBIGNUM(x)->sign > RBIGNUM(y)->sign) return INT2FIX(1);
@@ -904,35 +484,8 @@ static VALUE
 rb_big_eq(x, y)
     VALUE x, y;
 {
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
-      case T_BIGNUM:
-	break;
-      case T_FLOAT:
-	if (rb_big2dbl(x) == RFLOAT(y)->value)
-	    return Qtrue;
-	else
-	    return Qfalse;
-      default:
-	return rb_equal(y, x);
-    }
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
-    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
-    return Qtrue;
-}
-
-static VALUE
-rb_big_eql(x, y)
-    VALUE x, y;
-{
-    if (TYPE(y) != T_BIGNUM) return Qfalse;
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
-    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
-    return Qtrue;
+    if (rb_big_cmp(x, y) == INT2FIX(0)) return Qtrue;
+    return Qfalse;
 }
 
 static VALUE
@@ -952,11 +505,11 @@ rb_big_neg(x)
 {
     VALUE z = rb_big_clone(x);
     long i = RBIGNUM(x)->len;
-    BDIGIT *ds = BDIGITS(z);
+    USHORT *ds = BDIGITS(z);
 
-    if (!RBIGNUM(x)->sign) get2comp(z, Qtrue);
+    if (!RBIGNUM(x)->sign) rb_big_2comp(z);
     while (i--) ds[i] = ~ds[i];
-    if (RBIGNUM(x)->sign) get2comp(z, Qfalse);
+    if (RBIGNUM(x)->sign) rb_big_2comp(z);
     RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
 
     return bignorm(z);
@@ -967,10 +520,11 @@ bigsub(x, y)
     VALUE x, y;
 {
     VALUE z = 0;
-    BDIGIT *zds;
-    BDIGIT_DBL_SIGNED num;
-    long i = RBIGNUM(x)->len;
-    
+    USHORT *zds;
+    long num;
+    long i;
+
+    i = RBIGNUM(x)->len;
     /* if x is larger than y, swap */
     if (RBIGNUM(x)->len < RBIGNUM(y)->len) {
 	z = x; x = y; y = z;	/* swap x y */
@@ -992,7 +546,7 @@ bigsub(x, y)
     zds = BDIGITS(z);
 
     for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) { 
-	num += (BDIGIT_DBL_SIGNED)BDIGITS(x)[i] - BDIGITS(y)[i];
+	num += (long)BDIGITS(x)[i] - BDIGITS(y)[i];
 	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     } 
@@ -1006,7 +560,7 @@ bigsub(x, y)
 	i++;
     }
     
-    return z;
+    return bignorm(z);
 }
 
 static VALUE
@@ -1015,7 +569,7 @@ bigadd(x, y, sign)
     char sign;
 {
     VALUE z;
-    BDIGIT_DBL num;
+    long num;
     long i, len;
 
     sign = (sign == RBIGNUM(y)->sign);
@@ -1035,7 +589,7 @@ bigadd(x, y, sign)
 
     len = RBIGNUM(x)->len;
     for (i = 0, num = 0; i < len; i++) {
-	num += (BDIGIT_DBL)BDIGITS(x)[i] + BDIGITS(y)[i];
+	num += BDIGITS(x)[i] + BDIGITS(y)[i];
 	BDIGITS(z)[i] = BIGLO(num);
 	num = BIGDN(num);
     }
@@ -1049,9 +603,9 @@ bigadd(x, y, sign)
 	BDIGITS(z)[i] = BDIGITS(y)[i];
 	i++;
     }
-    BDIGITS(z)[i] = (BDIGIT)num;
+    BDIGITS(z)[i] = (USHORT)num;
 
-    return z;
+    return bignorm(z);
 }
 
 VALUE
@@ -1063,7 +617,7 @@ rb_big_plus(x, y)
 	y = rb_int2big(FIX2LONG(y));
 	/* fall through */
       case T_BIGNUM:
-	return bignorm(bigadd(x, y, 1));
+	return bigadd(x, y, 1);
 
       case T_FLOAT:
 	return rb_float_new(rb_big2dbl(x) + RFLOAT(y)->value);
@@ -1082,7 +636,7 @@ rb_big_minus(x, y)
 	y = rb_int2big(FIX2LONG(y));
 	/* fall through */
       case T_BIGNUM:
-	return bignorm(bigadd(x, y, 0));
+	return bigadd(x, y, 0);
 
       case T_FLOAT:
 	return rb_float_new(rb_big2dbl(x) - RFLOAT(y)->value);
@@ -1097,9 +651,9 @@ rb_big_mul(x, y)
     VALUE x, y;
 {
     long i, j;
-    BDIGIT_DBL n = 0;
+    unsigned long n = 0;
     VALUE z;
-    BDIGIT *zds;
+    USHORT *zds;
 
     if (FIXNUM_P(x)) x = rb_int2big(FIX2LONG(x));
     switch (TYPE(y)) {
@@ -1122,11 +676,11 @@ rb_big_mul(x, y)
     zds = BDIGITS(z);
     while (j--) zds[j] = 0;
     for (i = 0; i < RBIGNUM(x)->len; i++) {
-	BDIGIT_DBL dd = BDIGITS(x)[i]; 
+	unsigned long dd = BDIGITS(x)[i]; 
 	if (dd == 0) continue;
 	n = 0;
 	for (j = 0; j < RBIGNUM(y)->len; j++) {
-	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * BDIGITS(y)[j];
+	    int ee = n + dd * BDIGITS(y)[j];
 	    n = zds[i + j] + ee;
 	    if (ee) zds[i + j] = BIGLO(n);
 	    n = BIGDN(n);
@@ -1140,23 +694,24 @@ rb_big_mul(x, y)
 }
 
 static void
-bigdivrem(x, y, divp, modp)
+bigdivmod(x, y, div, mod, modulo)
     VALUE x, y;
-    VALUE *divp, *modp;
+    VALUE *div, *mod;
+    int modulo;
 {
     long nx = RBIGNUM(x)->len, ny = RBIGNUM(y)->len;
     long i, j;
     VALUE yy, z;
-    BDIGIT *xds, *yds, *zds, *tds;
-    BDIGIT_DBL t2;
-    BDIGIT_DBL_SIGNED num;
-    BDIGIT dd, q;
+    USHORT *xds, *yds, *zds, *tds;
+    unsigned long t2;
+    long num;
+    USHORT dd, q;
 
-    if (BIGZEROP(y)) rb_num_zerodiv();
     yds = BDIGITS(y);
-    if (nx < ny || (nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1])) {
-	if (divp) *divp = rb_int2big(0);
-	if (modp) *modp = x;
+    if (ny == 0 && yds[0] == 0) rb_num_zerodiv();
+    if (nx < ny	|| nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1]) {
+	if (div) *div = INT2FIX(0);
+	if (mod) *mod = bignorm(x);
 	return;
     }
     xds = BDIGITS(x);
@@ -1167,75 +722,67 @@ bigdivrem(x, y, divp, modp)
 	t2 = 0; i = nx;
 	while (i--) {
 	    t2 = BIGUP(t2) + zds[i];
-	    zds[i] = (BDIGIT)(t2 / dd);
+	    zds[i] = (USHORT)(t2 / dd);
 	    t2 %= dd;
 	}
 	RBIGNUM(z)->sign = RBIGNUM(x)->sign==RBIGNUM(y)->sign;
-	if (modp) {
-	    *modp = rb_uint2big((unsigned long)t2);
-	    RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
+	if (div) *div = bignorm(z);
+	if (mod) {
+	    if (!RBIGNUM(y)->sign) t2 = -(long)t2;
+	    *mod = INT2NUM(t2);
 	}
-	if (divp) *divp = z;
 	return;
     }
     z = bignew(nx==ny?nx+2:nx+1, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
     zds = BDIGITS(z);
     if (nx==ny) zds[nx+1] = 0;
     while (!yds[ny-1]) ny--;
-
-    dd = 0;
-    q = yds[ny-1];
-    while ((q & (1<<(BITSPERDIG-1))) == 0) {
-	q <<= 1;
-	dd++;
-    }
-    if (dd) {
+    if ((dd = BIGRAD/(int)(yds[ny-1]+1)) != 1) {
 	yy = rb_big_clone(y);
 	tds = BDIGITS(yy);
 	j = 0;
-	t2 = 0;
+	num = 0;
 	while (j<ny) {
-	    t2 += (BDIGIT_DBL)yds[j]<<dd;
-	    tds[j++] = BIGLO(t2);
-	    t2 = BIGDN(t2);
+	    num += (long)yds[j]*dd;
+	    tds[j++] = BIGLO(num);
+	    num = BIGDN(num);
 	}
 	yds = tds;
 	j = 0;
-	t2 = 0;
+	num = 0;
 	while (j<nx) {
-	    t2 += (BDIGIT_DBL)xds[j]<<dd;
-	    zds[j++] = BIGLO(t2);
-	    t2 = BIGDN(t2);
+	    num += (long)xds[j]*dd;
+	    zds[j++] = BIGLO(num);
+	    num = BIGDN(num);
 	}
-	zds[j] = (BDIGIT)t2;
+	zds[j] = (USHORT)num;
     }
     else {
 	zds[nx] = 0;
 	j = nx;
 	while (j--) zds[j] = xds[j];
     }
-
     j = nx==ny?nx+1:nx;
     do {
 	if (zds[j] ==  yds[ny-1]) q = BIGRAD-1;
-	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
+	else q = (USHORT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
 	if (q) {
 	    i = 0; num = 0; t2 = 0;
 	    do {			/* multiply and subtract */
-		BDIGIT_DBL ee;
-		t2 += (BDIGIT_DBL)yds[i] * q;
+		int ee;
+		t2 += (long)yds[i] * q;
 		ee = num - BIGLO(t2);
-		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+		num = zds[j - ny + i] + ee;
 		if (ee) zds[j - ny + i] = BIGLO(num);
 		num = BIGDN(num);
 		t2 = BIGDN(t2);
 	    } while (++i < ny);
-	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
+	    num += zds[j - ny + i] - t2; /* borrow from high digit; don't update */
 	    while (num) {		/* "add back" required */
 		i = 0; num = 0; q--;
 		do {
-		    BDIGIT_DBL ee = num + yds[i];
-		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+		    int ee = num + yds[i];
+		    num = (long) zds[j - ny + i] + ee;
 		    if (ee) zds[j - ny + i] = BIGLO(num);
 		    num = BIGDN(num);
 		} while (++i < ny);
@@ -1244,46 +791,37 @@ bigdivrem(x, y, divp, modp)
 	}
 	zds[j] = q;
     } while (--j >= ny);
-    if (divp) {			/* move quotient down in z */
-	*divp = rb_big_clone(z);
-	zds = BDIGITS(*divp);
+    if (div) {			/* move quotient down in z */
+	*div = rb_big_clone(z);
+	zds = BDIGITS(*div);
 	j = (nx==ny ? nx+2 : nx+1) - ny;
 	for (i = 0;i < j;i++) zds[i] = zds[i+ny];
-	RBIGNUM(*divp)->len = i;
+	RBIGNUM(*div)->len = i;
+	*div = bignorm(*div);
     }
-    if (modp) {			/* normalize remainder */
-	*modp = rb_big_clone(z);
-	zds = BDIGITS(*modp);
-	while (--ny && !zds[ny]); ++ny;
+    if (mod) {			/* just normalize remainder */
+	*mod = rb_big_clone(z);
 	if (dd) {
+	    zds = BDIGITS(*mod);
 	    t2 = 0; i = ny;
 	    while(i--) {
-		t2 = (t2 | zds[i]) >> dd;
-		q = zds[i];
-		zds[i] = BIGLO(t2);
-		t2 = BIGUP(q);
+		t2 = BIGUP(t2) + zds[i];
+		zds[i] = (USHORT)(t2 / dd);
+		t2 %= dd;
 	    }
 	}
-	RBIGNUM(*modp)->len = ny;
-	RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
-    }
-}
-
-static void
-bigdivmod(x, y, divp, modp)
-    VALUE x, y;
-    VALUE *divp, *modp;
-{
-    VALUE mod;
-
-    bigdivrem(x, y, divp, &mod);
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && !BIGZEROP(mod)) {
-	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
-	if (modp) *modp = bigadd(mod, y, 1);
-    }
-    else {
-	if (divp) *divp = *divp;
-	if (modp) *modp = mod;
+	RBIGNUM(*mod)->len = ny;
+	RBIGNUM(*mod)->sign = RBIGNUM(x)->sign;
+	if (modulo && RBIGNUM(x)->sign != RBIGNUM(y)->sign) {
+	    long len = ny;
+	    zds = BDIGITS(*mod);
+	    while (len-- && !zds[len]);
+	    if (len > 0) {
+		*mod = bigadd(*mod, y, 1);
+		return;
+	    }
+	}
+	*mod = bignorm(*mod);
     }
 }
 
@@ -1307,14 +845,16 @@ rb_big_div(x, y)
       default:
 	return rb_num_coerce_bin(x, y);
     }
-    bigdivmod(x, y, &z, 0);
+    bigdivmod(x, y, &z, 0, 0);
 
-    return bignorm(z);
+    return z;
 }
 
+
 static VALUE
-rb_big_modulo(x, y)
+rb_big_modulo(x, y, modulo)
     VALUE x, y;
+    int modulo;
 {
     VALUE z;
 
@@ -1326,82 +866,56 @@ rb_big_modulo(x, y)
       case T_BIGNUM:
 	break;
 
+      case T_FLOAT:
+	y = rb_dbl2big(RFLOAT(y)->value);
+	break;
+
       default:
 	return rb_num_coerce_bin(x, y);
     }
-    bigdivmod(x, y, 0, &z);
+    bigdivmod(x, y, 0, &z, modulo);
 
-    return bignorm(z);
+    return z;
 }
 
 static VALUE
-rb_big_remainder(x, y)
+rb_big_mod(x, y)
     VALUE x, y;
 {
-    VALUE z;
-
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
-	return rb_num_coerce_bin(x, y);
-    }
-    bigdivrem(x, y, 0, &z);
-
-    return bignorm(z);
+    return rb_big_modulo(x, y, 1);
 }
 
-VALUE
-rb_big_divmod(x, y)
+static VALUE
+rb_big_remainder(x, y)
     VALUE x, y;
 {
-    VALUE div, mod;
-
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
-	return rb_num_coerce_bin(x, y);
-    }
-    bigdivmod(x, y, &div, &mod);
-
-    return rb_assoc_new(bignorm(div), bignorm(mod));
+    return rb_big_modulo(x, y, 0);
 }
 
 static VALUE
-rb_big_quo(x, y)
+rb_big_divmod(x, y)
     VALUE x, y;
 {
-    double dx = rb_big2dbl(x);
-    double dy;
+    VALUE div, mod;
 
     switch (TYPE(y)) {
       case T_FIXNUM:
-	dy = (double)FIX2LONG(y);
+	y = rb_int2big(FIX2LONG(y));
 	break;
 
-      case T_BIGNUM:
-	dy = rb_big2dbl(y);
+      case T_FLOAT:
+	y = rb_dbl2big(RFLOAT(y)->value);
 	break;
 
-      case T_FLOAT:
-	dy = RFLOAT(y)->value;
+      case T_BIGNUM:
 	break;
 
       default:
 	return rb_num_coerce_bin(x, y);
     }
-    return rb_float_new(dx / dy);
+    bigdivmod(x, y, &div, &mod, 1);
+
+    return rb_assoc_new(div, mod);;
 }
 
 VALUE
@@ -1425,18 +939,20 @@ rb_big_pow(x, y)
       case T_FIXNUM:
 	yy = NUM2LONG(y);
 	if (yy > 0) {
-	    VALUE z = x;
+	    VALUE z;
 
+	    z = x;
 	    for (;;) {
-		yy -= 1;
+		yy = yy - 1;
 		if (yy == 0) break;
 		while (yy % 2 == 0) {
-		    yy /= 2;
+		    yy = yy / 2;
 		    x = rb_big_mul(x, x);
 		}
 		z = rb_big_mul(z, x);
 	    }
-	    return bignorm(z);
+	    if (!FIXNUM_P(z)) z = bignorm(z);
+	    return z;
 	}
 	d = (double)yy;
 	break;
@@ -1452,21 +968,24 @@ rb_big_and(x, y)
     VALUE x, y;
 {
     VALUE z;
-    BDIGIT *ds1, *ds2, *zds;
+    USHORT *ds1, *ds2, *zds;
     long i, l1, l2;
     char sign;
 
-    y = rb_to_int(y);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
+    else {
+	Check_Type(y, T_BIGNUM);
+    }
+
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y, Qtrue);
+	rb_big_2comp(y);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x, Qtrue);
+	rb_big_2comp(x);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1491,7 +1010,7 @@ rb_big_and(x, y)
     for (; i<l2; i++) {
 	zds[i] = sign?0:ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
+    if (!RBIGNUM(z)->sign) rb_big_2comp(z);
     return bignorm(z);
 }
 
@@ -1500,22 +1019,24 @@ rb_big_or(x, y)
     VALUE x, y;
 {
     VALUE z;
-    BDIGIT *ds1, *ds2, *zds;
-    long i, l1, l2;
+    USHORT *ds1, *ds2, *zds;
+    unsigned long i, l1, l2;
     char sign;
 
-    y = rb_to_int(y);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
+    else {
+	Check_Type(y, T_BIGNUM);
+    }
 
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y, Qtrue);
+	rb_big_2comp(y);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x, Qtrue);
+	rb_big_2comp(x);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1540,7 +1061,7 @@ rb_big_or(x, y)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:(BIGRAD-1);
     }
-    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
+    if (!RBIGNUM(z)->sign) rb_big_2comp(z);
 
     return bignorm(z);
 }
@@ -1550,22 +1071,24 @@ rb_big_xor(x, y)
     VALUE x, y;
 {
     VALUE z;
-    BDIGIT *ds1, *ds2, *zds;
-    long i, l1, l2;
+    USHORT *ds1, *ds2, *zds;
+    unsigned int i, l1, l2;
     char sign;
 
-    y = rb_to_int(y);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
+    else {
+	Check_Type(y, T_BIGNUM);
+    }
 
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y, Qtrue);
+	rb_big_2comp(y);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x, Qtrue);
+	rb_big_2comp(x);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1592,7 +1115,7 @@ rb_big_xor(x, y)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:~ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
+    if (!RBIGNUM(z)->sign) rb_big_2comp(z);
 
     return bignorm(z);
 }
@@ -1603,24 +1126,24 @@ VALUE
 rb_big_lshift(x, y)
     VALUE x, y;
 {
-    BDIGIT *xds, *zds;
+    USHORT *xds, *zds;
     int shift = NUM2INT(y);
     int s1 = shift/BITSPERDIG;
     int s2 = shift%BITSPERDIG;
     VALUE z;
-    BDIGIT_DBL num = 0;
+    unsigned long num = 0;
     long len, i;
 
     if (shift < 0) return rb_big_rshift(x, INT2FIX(-shift));
+    xds = BDIGITS(x);
     len = RBIGNUM(x)->len;
     z = bignew(len+s1+1, RBIGNUM(x)->sign);
     zds = BDIGITS(z);
     for (i=0; i<s1; i++) {
 	*zds++ = 0;
     }
-    xds = BDIGITS(x);
     for (i=0; i<len; i++) {
-	num = num | (BDIGIT_DBL)*xds++<<s2;
+	num = num | *xds++<<s2;
 	*zds++ = BIGLO(num);
 	num = BIGDN(num);
     }
@@ -1632,41 +1155,31 @@ static VALUE
 rb_big_rshift(x, y)
     VALUE x, y;
 {
-    BDIGIT *xds, *zds;
+    USHORT *xds, *zds;
     int shift = NUM2INT(y);
-    long s1 = shift/BITSPERDIG;
-    long s2 = shift%BITSPERDIG;
+    int s1 = shift/BITSPERDIG;
+    int s2 = shift%BITSPERDIG;
     VALUE z;
-    BDIGIT_DBL num = 0;
-    long i, j;
+    unsigned long num = 0;
+    long i = RBIGNUM(x)->len;
+    long j;
 
     if (shift < 0) return rb_big_lshift(x, INT2FIX(-shift));
-
     if (s1 > RBIGNUM(x)->len) {
 	if (RBIGNUM(x)->sign)
 	    return INT2FIX(0);
 	else
 	    return INT2FIX(-1);
     }
-    if (!RBIGNUM(x)->sign) {
-	x = rb_big_clone(x);
-	get2comp(x, Qtrue);
-    }
     xds = BDIGITS(x);
     i = RBIGNUM(x)->len; j = i - s1;
     z = bignew(j, RBIGNUM(x)->sign);
-    if (!RBIGNUM(x)->sign) {
-	num = ((BDIGIT_DBL)~0) << BITSPERDIG;
-    }
     zds = BDIGITS(z);
     while (i--, j--) {
 	num = (num | xds[i]) >> s2;
 	zds[j] = BIGLO(num);
 	num = BIGUP(xds[i]);
     }
-    if (!RBIGNUM(x)->sign) {
-	get2comp(z, Qfalse);
-    }
     return bignorm(z);
 }
 
@@ -1674,16 +1187,10 @@ static VALUE
 rb_big_aref(x, y)
     VALUE x, y;
 {
-    BDIGIT *xds;
-    int shift;
-    long s1, s2;
+    USHORT *xds;
+    int shift = NUM2INT(y);
+    int s1, s2;
 
-    if (TYPE(y) == T_BIGNUM) {
-	if (!RBIGNUM(y)->sign || RBIGNUM(x)->sign)
-	    return INT2FIX(0);
-	return INT2FIX(1);
-    }
-    shift = NUM2INT(y);
     if (shift < 0) return INT2FIX(0);
     s1 = shift/BITSPERDIG;
     s2 = shift%BITSPERDIG;
@@ -1691,7 +1198,7 @@ rb_big_aref(x, y)
     if (!RBIGNUM(x)->sign) {
 	if (s1 >= RBIGNUM(x)->len) return INT2FIX(1);
 	x = rb_big_clone(x);
-	get2comp(x, Qtrue);
+	rb_big_2comp(x);
     }
     else {
 	if (s1 >= RBIGNUM(x)->len) return INT2FIX(0);
@@ -1706,14 +1213,15 @@ static VALUE
 rb_big_hash(x)
     VALUE x;
 {
-    long i, len, key;
-    BDIGIT *digits;
+    long i, len;
+    int key;
+    USHORT *digits;
 
-    key = 0; digits = BDIGITS(x); len = RBIGNUM(x)->len;
-    for (i=0; i<len; i++) {
+    key = 0; digits = BDIGITS(x);
+    for (i=0,len=RBIGNUM(x)->len; i<RBIGNUM(x)->len; i++) {
 	key ^= *digits++;
     }
-    return LONG2FIX(key);
+    return INT2FIX(key);
 }
 
 static VALUE
@@ -1725,7 +1233,7 @@ rb_big_coerce(x, y)
     }
     else {
 	rb_raise(rb_eTypeError, "Can't coerce %s to Bignum",
-		 rb_obj_classname(y));
+		 rb_class2name(CLASS_OF(y)));
     }
     /* not reached */
     return Qnil;
@@ -1742,30 +1250,42 @@ rb_big_abs(x)
     return x;
 }
 
+/* !!!warnig!!!!
+   this is not really a random number!!
+*/
+
 VALUE
-rb_big_rand(max, rand_buf)
+rb_big_rand(max)
     VALUE max;
-    double *rand_buf;
 {
-    VALUE v;
-    long len = RBIGNUM(max)->len;
+    struct RBignum *v;
+    long len;
 
-    if (BIGZEROP(max)) {
-	return rb_float_new(rand_buf[0]);
-    }
-    v = bignew(len,1);
+    len = RBIGNUM(max)->len;
+    v = RBIGNUM(bignew(len,1));
     while (len--) {
-	BDIGITS(v)[len] = ((BDIGIT)~0) * rand_buf[len];
+#ifdef HAVE_RANDOM
+	BDIGITS(v)[len] = random();
+#else
+	BDIGITS(v)[len] = rand();
+#endif
     }
 
-    return rb_big_modulo((VALUE)v, max);
+    return rb_big_mod((VALUE)v, max);
 }
 
 static VALUE
 rb_big_size(big)
     VALUE big;
 {
-    return LONG2FIX(RBIGNUM(big)->len*SIZEOF_BDIGITS);
+    return INT2FIX(RBIGNUM(big)->len*sizeof(USHORT));
+}
+
+static VALUE
+rb_big_zero_p(big)
+    VALUE big;
+{
+    return Qfalse;
 }
 
 void
@@ -1773,19 +1293,18 @@ Init_Bignum()
 {
     rb_cBignum = rb_define_class("Bignum", rb_cInteger);
 
-    rb_define_method(rb_cBignum, "to_s", rb_big_to_s, -1);
+    rb_undef_method(CLASS_OF(rb_cBignum), "new");
+
+    rb_define_method(rb_cBignum, "to_s", rb_big_to_s, 0);
     rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1);
     rb_define_method(rb_cBignum, "-@", rb_big_uminus, 0);
     rb_define_method(rb_cBignum, "+", rb_big_plus, 1);
     rb_define_method(rb_cBignum, "-", rb_big_minus, 1);
     rb_define_method(rb_cBignum, "*", rb_big_mul, 1);
     rb_define_method(rb_cBignum, "/", rb_big_div, 1);
-    rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
-    rb_define_method(rb_cBignum, "div", rb_big_div, 1);
+    rb_define_method(rb_cBignum, "%", rb_big_mod, 1);
     rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1);
-    rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1);
     rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
-    rb_define_method(rb_cBignum, "quo", rb_big_quo, 1);
     rb_define_method(rb_cBignum, "**", rb_big_pow, 1);
     rb_define_method(rb_cBignum, "&", rb_big_and, 1);
     rb_define_method(rb_cBignum, "|", rb_big_or, 1);
@@ -1797,9 +1316,12 @@ Init_Bignum()
 
     rb_define_method(rb_cBignum, "<=>", rb_big_cmp, 1);
     rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
-    rb_define_method(rb_cBignum, "eql?", rb_big_eql, 1);
+    rb_define_method(rb_cBignum, "===", rb_big_eq, 1);
+    rb_define_method(rb_cBignum, "eql?", rb_big_eq, 1);
     rb_define_method(rb_cBignum, "hash", rb_big_hash, 0);
+    rb_define_method(rb_cBignum, "to_i", rb_big_to_i, 0);
     rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0);
     rb_define_method(rb_cBignum, "abs", rb_big_abs, 0);
     rb_define_method(rb_cBignum, "size", rb_big_size, 0);
+    rb_define_method(rb_cBignum, "zero?", rb_big_zero_p, 0);
 }
diff --git a/bin/erb b/bin/erb
deleted file mode 100755
index 2459d2562e..0000000000
--- a/bin/erb
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env ruby
-# Tiny eRuby --- ERB2
-# Copyright (c) 1999-2000,2002 Masatoshi SEKI 
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-require 'erb'
-
-class ERB
-  module Main
-    def ARGV.switch
-      return nil if self.empty?
-      arg = self.shift
-      return nil if arg == '--'
-      if arg =~ /^-(.)(.*)/
-	return arg if $1 == '-'
-	raise 'unknown switch "-"' if $2.index('-')
-	self.unshift "-#{$2}" if $2.size > 0
-	"-#{$1}"
-      else
-	self.unshift arg
-	nil
-      end
-    end
-    
-    def ARGV.req_arg
-      self.shift || raise('missing argument')
-    end
-
-    def trim_mode_opt(trim_mode, disable_percent)
-      return trim_mode if disable_percent
-      case trim_mode
-      when 0
-	return '%'
-      when 1
-	return '%>'
-      when 2
-	return '%<>'
-      when '-'
-	return '%-'
-      end
-    end
-    module_function :trim_mode_opt
-
-    def run(factory=ERB)
-      trim_mode = 0
-      disable_percent = false
-      begin
-	while switch = ARGV.switch
-	  case switch
-	  when '-x'			# ruby source
-	    output = true
-	  when '-n'			# line number
-	    number = true
-	  when '-v'			# verbose
-	    $VERBOSE = true
-	  when '--version'		# version
-	    STDERR.puts factory.version
-	    exit
-	  when '-d', '--debug'	# debug
-	    $DEBUG = true
-	  when '-r'			# require
-	    require ARGV.req_arg
-	  when '-S'			# sacurity level
-	    arg = ARGV.req_arg
-	    raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-4]$/
-	    safe_level = arg.to_i
-	  when '-T'			# trim mode
-	    arg = ARGV.req_arg
-	    if arg == '-'
-	      trim_mode = arg 
-	      next
-	    end
-	    raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
-	    trim_mode = arg.to_i
-	  when '-K'			# KCODE
-	    arg = ARGV.req_arg
-	    case arg.downcase
-	    when 'e', '-e', 'euc'
-	      $KCODE = 'EUC'
-	    when 's', '-s', 'sjis'
-	      $KCODE = 'SJIS'
-	    when 'u', '-u', 'utf8'
-	      $KCODE = 'UTF8'
-	    when 'n', '-n', 'none'
-	      $KCODE = 'NONE'
-	    else
-	      raise "invalid KCODE #{arg.dump}"
-	    end
-	  when '-P'
-	    disable_percent = true
-	  when '--help'
-	    raise "print this help"
-	  else
-	    raise "unknown switch #{switch.dump}"
-	  end
-	end
-      rescue    			# usage
-	STDERR.puts $!.to_s
-	STDERR.puts File.basename($0) + 
-	  " [switches] [inputfile]"
-	STDERR.puts <<EOU
-  -x               print ruby script
-  -n               print ruby script with line number
-  -v               enable verbose mode
-  -d               set $DBEUG to true
-  -r [library]     load a library
-  -K [kcode]       specify KANJI code-set
-  -S [safe_level]  set $SAFE (0..4)
-  -T [trim_mode]   specify trim_mode (0..2, -)
-  -P               disregard the lin which starts in "%" 
-EOU
-	exit 1
-      end
-
-      src = $<.read
-      exit 2 unless src
-      trim = trim_mode_opt(trim_mode, disable_percent)
-      erb = factory.new(src.untaint, safe_level, trim)
-      if output
-	if number
-	  l = 1
-	  for line in erb.src
-	    puts "%3d %s"%[l, line]
-	    l += 1
-	  end
-	else
-	  puts erb.src
-	end
-      else
-	erb.run(TOPLEVEL_BINDING.taint)
-      end
-    end
-    module_function :run
-  end
-end
-
-if __FILE__ == $0
-  ERB::Main.run
-end
diff --git a/bin/irb b/bin/irb
deleted file mode 100644
index 309da52161..0000000000
--- a/bin/irb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-#
-#   irb.rb - intaractive ruby
-#   	$Release Version: 0.7.3 $
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-
-require "irb"
-
-if __FILE__ == $0
-  IRB.start(__FILE__)
-else
-  # check -e option
-  if /^-e$/ =~ $0
-    IRB.start(__FILE__)
-  else
-    IRB.setup(__FILE__)
-  end
-end
diff --git a/class.c b/class.c
index f137e698b6..32dc0e1372 100644
--- a/class.c
+++ b/class.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   class.c -
 
@@ -6,21 +6,23 @@
   $Date$
   created at: Tue Aug 10 15:05:44 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
-#include "rubysig.h"
 #include "node.h"
 #include "st.h"
-#include "version.h"
 #include <ctype.h>
 
+#ifdef USE_CWGUSI
+#include <stdio.h>
+#endif
+
 extern st_table *rb_class_tbl;
 
 VALUE
-rb_class_boot(super)
+rb_class_new(super)
     VALUE super;
 {
     NEWOBJ(klass, struct RClass);
@@ -31,22 +33,17 @@ rb_class_boot(super)
     klass->m_tbl = 0;		/* safe GC */
     klass->m_tbl = st_init_numtable();
 
-    OBJ_INFECT(klass, super);
     return (VALUE)klass;
 }
 
 VALUE
-rb_class_new(super)
+rb_singleton_class_new(super)
     VALUE super;
 {
-    Check_Type(super, T_CLASS);
-    if (super == rb_cClass) {
-	rb_raise(rb_eTypeError, "can't make subclass of Class");
-    }
-    if (FL_TEST(super, FL_SINGLETON)) {
-	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
-    }
-    return rb_class_boot(super);
+    VALUE klass = rb_class_new(super);
+
+    FL_SET(klass, FL_SINGLETON);
+    return klass;
 }
 
 static int
@@ -55,74 +52,26 @@ clone_method(mid, body, tbl)
     NODE *body;
     st_table *tbl;
 {
-    st_insert(tbl, mid, (st_data_t)NEW_METHOD(body->nd_body, body->nd_noex));
+    st_insert(tbl, mid, NEW_METHOD(body->nd_body, body->nd_noex));
     return ST_CONTINUE;
 }
 
 VALUE
-rb_mod_init_copy(clone, orig)
-    VALUE clone, orig;
-{
-    rb_obj_init_copy(clone, orig);
-    RCLASS(clone)->super = RCLASS(orig)->super;
-    if (RCLASS(orig)->iv_tbl) {
-	ID id;
-
-	RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
-	id = rb_intern("__classpath__");
-	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
-	id = rb_intern("__classid__");
-	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
-    }
-    if (RCLASS(orig)->m_tbl) {
-	RCLASS(clone)->m_tbl = st_init_numtable();
-	st_foreach(RCLASS(orig)->m_tbl, clone_method,
-	  (st_data_t)RCLASS(clone)->m_tbl);
-    }
-
-    return clone;
-}
-
-VALUE
-rb_class_init_copy(clone, orig)
-    VALUE clone, orig;
-{
-    if (RCLASS(clone)->super != 0) {
-	rb_raise(rb_eTypeError, "already initialized class");
-    }
-    return rb_mod_init_copy(clone, orig);
-}
-
-VALUE
-rb_singleton_class_clone(obj)
-    VALUE obj;
+rb_singleton_class_clone(klass)
+    VALUE klass;
 {
-    VALUE klass = RBASIC(obj)->klass;
-
     if (!FL_TEST(klass, FL_SINGLETON))
 	return klass;
     else {
 	/* copy singleton(unnamed) class */
 	NEWOBJ(clone, struct RClass);
-	OBJSETUP(clone, 0, RBASIC(klass)->flags);
-
-	if (BUILTIN_TYPE(obj) == T_CLASS) {
-	    RBASIC(clone)->klass = (VALUE)clone;
-	}
-	else {
-	    RBASIC(clone)->klass = rb_singleton_class_clone(klass);
-	}
+	CLONESETUP(clone, klass);
 
 	clone->super = RCLASS(klass)->super;
 	clone->iv_tbl = 0;
 	clone->m_tbl = 0;
-	if (RCLASS(klass)->iv_tbl) {
-	    clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
-	}
 	clone->m_tbl = st_init_numtable();
-	st_foreach(RCLASS(klass)->m_tbl, clone_method,
-	  (st_data_t)clone->m_tbl);
-	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
+	st_foreach(RCLASS(klass)->m_tbl, clone_method, clone->m_tbl);
 	FL_SET(clone, FL_SINGLETON);
 	return (VALUE)clone;
     }
@@ -132,36 +81,8 @@ void
 rb_singleton_class_attached(klass, obj)
     VALUE klass, obj;
 {
-    if (FL_TEST(klass, FL_SINGLETON)) {
-	if (!RCLASS(klass)->iv_tbl) {
-	    RCLASS(klass)->iv_tbl = st_init_numtable();
-	}
-	st_insert(RCLASS(klass)->iv_tbl, rb_intern("__attached__"), obj);
-    }
-}
-
-VALUE
-rb_make_metaclass(obj, super)
-    VALUE obj, super;
-{
-    VALUE klass = rb_class_boot(super);
-    FL_SET(klass, FL_SINGLETON);
-    RBASIC(obj)->klass = klass;
-    rb_singleton_class_attached(klass, obj);
-    if (BUILTIN_TYPE(obj) == T_CLASS && FL_TEST(obj, FL_SINGLETON)) {
-	RBASIC(klass)->klass = klass;
-	RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
-    }
-    else {
-	VALUE metasuper = RBASIC(rb_class_real(super))->klass;
-
-	/* metaclass of a superclass may be NULL at boot time */
-	if (metasuper) {
-	    RBASIC(klass)->klass = metasuper;
-	}
-    }
-
-    return klass;
+    if (FL_TEST(klass, FL_SINGLETON))
+	rb_iv_set(klass, "__attached__", obj);
 }
 
 VALUE
@@ -174,20 +95,15 @@ rb_define_class_id(id, super)
     if (!super) super = rb_cObject;
     klass = rb_class_new(super);
     rb_name_class(klass, id);
-    rb_make_metaclass(klass, RBASIC(super)->klass);
+    /* make metaclass */
+    RBASIC(klass)->klass = rb_singleton_class_new(RBASIC(super)->klass);
+    rb_singleton_class_attached(RBASIC(klass)->klass, klass);
+    rb_funcall(super, rb_intern("inherited"), 1, klass);
 
     return klass;
 }
 
 VALUE
-rb_class_inherited(super, klass)
-    VALUE super, klass;
-{
-    if (!super) super = rb_cObject;
-    return rb_funcall(super, rb_intern("inherited"), 1, klass);
-}
-
-VALUE
 rb_define_class(name, super)
     const char *name;
     VALUE super;
@@ -196,23 +112,9 @@ rb_define_class(name, super)
     ID id;
 
     id = rb_intern(name);
-    if (rb_const_defined(rb_cObject, id)) {
-	klass = rb_const_get(rb_cObject, id);
-	if (TYPE(klass) != T_CLASS) {
-	    rb_raise(rb_eTypeError, "%s is not a class", name);
-	}
-	if (rb_class_real(RCLASS(klass)->super) != super) {
-	    rb_name_error(id, "%s is already defined", name);
-	}
-	return klass;
-    }
-    if (!super) {
-	rb_warn("no super class for `%s', Object assumed", name);
-    }
     klass = rb_define_class_id(id, super);
+
     st_add_direct(rb_class_tbl, id, klass);
-    rb_const_set(rb_cObject, id, klass);
-    rb_class_inherited(super, klass);
 
     return klass;
 }
@@ -227,24 +129,9 @@ rb_define_class_under(outer, name, super)
     ID id;
 
     id = rb_intern(name);
-    if (rb_const_defined_at(outer, id)) {
-	klass = rb_const_get_at(outer, id);
-	if (TYPE(klass) != T_CLASS) {
-	    rb_raise(rb_eTypeError, "%s is not a class", name);
-	}
-	if (rb_class_real(RCLASS(klass)->super) != super) {
-	    rb_name_error(id, "%s is already defined", name);
-	}
-	return klass;
-    }
-    if (!super) {
-	rb_warn("no super class for `%s::%s', Object assumed",
-		rb_class2name(outer), name);
-    }
     klass = rb_define_class_id(id, super);
-    rb_set_class_path(klass, outer, name);
     rb_const_set(outer, id, klass);
-    rb_class_inherited(super, klass);
+    rb_set_class_path(klass, outer, name);
 
     return klass;
 }
@@ -283,15 +170,8 @@ rb_define_module(name)
     ID id;
 
     id = rb_intern(name);
-    if (rb_const_defined(rb_cObject, id)) {
-	module = rb_const_get(rb_cObject, id);
-	if (TYPE(module) == T_MODULE)
-	    return module;
-	rb_raise(rb_eTypeError, "%s is not a module", rb_obj_classname(module));
-    }
     module = rb_define_module_id(id);
     st_add_direct(rb_class_tbl, id, module);
-    rb_const_set(rb_cObject, id, module);
 
     return module;
 }
@@ -305,13 +185,6 @@ rb_define_module_under(outer, name)
     ID id;
 
     id = rb_intern(name);
-    if (rb_const_defined_at(outer, id)) {
-	module = rb_const_get_at(outer, id);
-	if (TYPE(module) == T_MODULE)
-	    return module;
-	rb_raise(rb_eTypeError, "%s::%s is not a module",
-		 rb_class2name(outer), rb_obj_classname(module));
-    }
     module = rb_define_module_id(id);
     rb_const_set(outer, id, module);
     rb_set_class_path(module, outer, name);
@@ -326,9 +199,6 @@ include_class_new(module, super)
     NEWOBJ(klass, struct RClass);
     OBJSETUP(klass, rb_cClass, T_ICLASS);
 
-    if (BUILTIN_TYPE(module) == T_ICLASS) {
-	module = RBASIC(module)->klass;
-    }
     if (!RCLASS(module)->iv_tbl) {
 	RCLASS(module)->iv_tbl = st_init_numtable();
     }
@@ -341,8 +211,6 @@ include_class_new(module, super)
     else {
 	RBASIC(klass)->klass = module;
     }
-    OBJ_INFECT(klass, module);
-    OBJ_INFECT(klass, super);
 
     return (VALUE)klass;
 }
@@ -351,50 +219,37 @@ void
 rb_include_module(klass, module)
     VALUE klass, module;
 {
-    VALUE p, c;
-    int changed = 0;
+    VALUE p;
 
-    rb_frozen_class_p(klass);
-    if (!OBJ_TAINTED(klass)) {
-	rb_secure(4);
-    }
-    
     if (NIL_P(module)) return;
     if (klass == module) return;
 
-    if (TYPE(module) != T_MODULE) {
+    switch (TYPE(module)) {
+      case T_MODULE:
+      case T_CLASS:
+      case T_ICLASS:
+	break;
+      default:
 	Check_Type(module, T_MODULE);
     }
 
-    OBJ_INFECT(klass, module);
-    c = klass;
     while (module) {
-	int superclass_seen = Qfalse;
-
-	if (RCLASS(klass)->m_tbl == RCLASS(module)->m_tbl)
-	    rb_raise(rb_eArgError, "cyclic include detected");
 	/* ignore if the module included already in superclasses */
 	for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
-	    switch (BUILTIN_TYPE(p)) {
-	      case T_ICLASS:
-		if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
-		    if (!superclass_seen) {
-			c = p;	/* move insertion point */
-		    }
-		    goto skip;
+	    if (BUILTIN_TYPE(p) == T_ICLASS &&
+		RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
+		if (RCLASS(module)->super) {
+		    rb_include_module(p, RCLASS(module)->super);
 		}
-		break;
-	      case T_CLASS:
-		superclass_seen = Qtrue;
-		break;
+		return;
 	    }
 	}
-	c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super);
-	changed = 1;
-      skip:
+	RCLASS(klass)->super =
+	    include_class_new(module, RCLASS(klass)->super);
+	klass = RCLASS(klass)->super;
 	module = RCLASS(module)->super;
     }
-    if (changed) rb_clear_cache();
+    rb_clear_cache();
 }
 
 VALUE
@@ -413,26 +268,11 @@ rb_mod_included_modules(mod)
 }
 
 VALUE
-rb_mod_include_p(mod, mod2)
-    VALUE mod;
-    VALUE mod2;
-{
-    VALUE p;
-
-    Check_Type(mod2, T_MODULE);
-    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
-	if (BUILTIN_TYPE(p) == T_ICLASS) {
-	    if (RBASIC(p)->klass == mod2) return Qtrue;
-	}
-    }
-    return Qfalse;
-}
-
-VALUE
 rb_mod_ancestors(mod)
     VALUE mod;
 {
-    VALUE p, ary = rb_ary_new();
+    VALUE ary = rb_ary_new();
+    VALUE p;
 
     for (p = mod; p; p = RCLASS(p)->super) {
 	if (FL_TEST(p, FL_SINGLETON))
@@ -447,122 +287,103 @@ rb_mod_ancestors(mod)
     return ary;
 }
 
-#define VISI(x) ((x)&NOEX_MASK)
-#define VISI_CHECK(x,f) (VISI(x) == (f))
-
 static int
-ins_methods_push(name, type, ary, visi)
-    ID name;
-    long type;
+ins_methods_i(key, body, ary)
+    ID key;
+    NODE *body;
     VALUE ary;
-    long visi;
-{
-    if (type == -1) return ST_CONTINUE;
-    switch (visi) {
-      case NOEX_PRIVATE:
-      case NOEX_PROTECTED:
-      case NOEX_PUBLIC:
-	visi = (type == visi);
-	break;
-      default:
-	visi = (type != NOEX_PRIVATE);
-	break;
+{
+    if ((body->nd_noex&(NOEX_PRIVATE|NOEX_PROTECTED)) == 0) {
+	VALUE name = rb_str_new2(rb_id2name(key));
+
+	if (!rb_ary_includes(ary, name)) {
+	    if (!body->nd_body) {
+		rb_ary_push(ary, Qnil);
+	    }
+	    rb_ary_push(ary, name);
+	}
     }
-    if (visi) {
-	rb_ary_push(ary, rb_str_new2(rb_id2name(name)));
+    else if (body->nd_body && nd_type(body->nd_body) == NODE_ZSUPER) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
     }
     return ST_CONTINUE;
 }
 
 static int
-ins_methods_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
-{
-    return ins_methods_push(name, type, ary, -1); /* everything but private */
-}
-
-static int
-ins_methods_prot_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
-{
-    return ins_methods_push(name, type, ary, NOEX_PROTECTED);
-}
-
-static int
-ins_methods_priv_i(name, type, ary)
-    ID name;
-    long type;
+ins_methods_prot_i(key, body, ary)
+    ID key;
+    NODE *body;
     VALUE ary;
 {
-    return ins_methods_push(name, type, ary, NOEX_PRIVATE);
-}
+    if (!body->nd_body) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    }
+    else if (body->nd_noex & NOEX_PROTECTED) {
+	VALUE name = rb_str_new2(rb_id2name(key));
 
-static int
-ins_methods_pub_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
-{
-    return ins_methods_push(name, type, ary, NOEX_PUBLIC);
+	if (!rb_ary_includes(ary, name)) {
+	    rb_ary_push(ary, name);
+	}
+    }
+    else if (nd_type(body->nd_body) == NODE_ZSUPER) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    }
+    return ST_CONTINUE;
 }
 
 static int
-method_entry(key, body, list)
+ins_methods_priv_i(key, body, ary)
     ID key;
     NODE *body;
-    st_table *list;
+    VALUE ary;
 {
-    long type;
+    if (!body->nd_body) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    }
+    else if (body->nd_noex & NOEX_PRIVATE) {
+	VALUE name = rb_str_new2(rb_id2name(key));
 
-    if (key == ID_ALLOCATOR) return ST_CONTINUE;
-    if (!st_lookup(list, key, 0)) {
-	if (!body->nd_body) type = -1; /* none */
-	else type = VISI(body->nd_noex);
-	st_add_direct(list, key, type);
+	if (!rb_ary_includes(ary, name)) {
+	    rb_ary_push(ary, name);
+	}
+    }
+    else if (nd_type(body->nd_body) == NODE_ZSUPER) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
     }
     return ST_CONTINUE;
 }
 
 static VALUE
-class_instance_method_list(argc, argv, mod, func)
-    int argc;
-    VALUE *argv;
+method_list(mod, option, func)
     VALUE mod;
-    int (*func) _((ID, long, VALUE));
+    int option;
+    int (*func)();
 {
     VALUE ary;
-    int recur;
-    st_table *list;
-
-    if (argc == 0) {
-#if RUBY_VERSION_CODE < 181
-	rb_warn("%s: parameter will default to 'true' as of 1.8.1", rb_id2name(rb_frame_last_func()));
-	recur = Qfalse;
-#else
-	recur = Qtrue;
-#endif
-    }
-    else {
-	VALUE r;
-	rb_scan_args(argc, argv, "01", &r);
-	recur = RTEST(r);
-    }
+    VALUE klass;
+    VALUE *p, *q, *pend;
 
-    list = st_init_numtable();
-    for (; mod; mod = RCLASS(mod)->super) {
-	st_foreach(RCLASS(mod)->m_tbl, method_entry, (st_data_t)list);
-	if (BUILTIN_TYPE(mod) == T_ICLASS) continue;
-	if (FL_TEST(mod, FL_SINGLETON)) continue;
-	if (!recur) break;
-    }
+    if (!FL_TEST(mod, FL_TAINT) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't get metainfo");
     ary = rb_ary_new();
-    st_foreach(list, func, ary);
-    st_free_table(list);
-
+    for (klass = mod; klass; klass = RCLASS(klass)->super) {
+	st_foreach(RCLASS(klass)->m_tbl, func, ary);
+	if (!option) break;
+    }
+    p = q = RARRAY(ary)->ptr; pend = p + RARRAY(ary)->len;
+    while (p < pend) {
+	if (*p == Qnil) {
+	    p+=2;
+	    continue;
+	}
+	*q++ = *p++;
+    }
+    RARRAY(ary)->len = q - RARRAY(ary)->ptr;
     return ary;
 }
 
@@ -572,7 +393,10 @@ rb_class_instance_methods(argc, argv, mod)
     VALUE *argv;
     VALUE mod;
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_i);
+    VALUE option;
+
+    rb_scan_args(argc, argv, "01", &option);
+    return method_list(mod, RTEST(option), ins_methods_i);
 }
 
 VALUE
@@ -581,7 +405,10 @@ rb_class_protected_instance_methods(argc, argv, mod)
     VALUE *argv;
     VALUE mod;
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_prot_i);
+    VALUE option;
+
+    rb_scan_args(argc, argv, "01", &option);
+    return method_list(mod, RTEST(option), ins_methods_prot_i);
 }
 
 VALUE
@@ -590,50 +417,37 @@ rb_class_private_instance_methods(argc, argv, mod)
     VALUE *argv;
     VALUE mod;
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_priv_i);
-}
+    VALUE option;
 
-VALUE
-rb_class_public_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-{
-    return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
+    rb_scan_args(argc, argv, "01", &option);
+    return method_list(mod, RTEST(option), ins_methods_priv_i);
 }
 
 VALUE
-rb_obj_singleton_methods(argc, argv, obj)
-    int argc;
-    VALUE *argv;
+rb_obj_singleton_methods(obj)
     VALUE obj;
 {
-    VALUE recur, ary, klass;
-    st_table *list;
+    VALUE ary;
+    VALUE klass;
+    VALUE *p, *q, *pend;
 
-    rb_scan_args(argc, argv, "01", &recur);
-    if (argc == 0) {
-#if RUBY_VERSION_CODE < 181
-	rb_warn("singleton_methods: parameter will default to 'true' as of 1.8.1");
-#else
-	recur = Qtrue;
-#endif
-    }
+    if (rb_safe_level() >= 4 && !FL_TEST(obj, FL_TAINT))
+	rb_raise(rb_eSecurityError, "Insecure: can't get metainfo");
+    ary = rb_ary_new();
     klass = CLASS_OF(obj);
-    list = st_init_numtable();
-    if (klass && FL_TEST(klass, FL_SINGLETON)) {
-	st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
+    while (klass && FL_TEST(klass, FL_SINGLETON)) {
+	st_foreach(RCLASS(klass)->m_tbl, ins_methods_i, ary);
 	klass = RCLASS(klass)->super;
     }
-    if (RTEST(recur)) {
-	while (klass && (FL_TEST(klass, FL_SINGLETON) || TYPE(klass) == T_ICLASS)) {
-	    st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
-	    klass = RCLASS(klass)->super;
+    p = q = RARRAY(ary)->ptr; pend = p + RARRAY(ary)->len;
+    while (p < pend) {
+	if (*p == Qnil) {
+	    p+=2;
+	    continue;
 	}
+	*q++ = *p++;
     }
-    ary = rb_ary_new();
-    st_foreach(list, ins_methods_i, ary);
-    st_free_table(list);
+    RARRAY(ary)->len = q - RARRAY(ary)->ptr;
 
     return ary;
 }
@@ -645,7 +459,7 @@ rb_define_method_id(klass, name, func, argc)
     VALUE (*func)();
     int argc;
 {
-    rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC);
+    rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC|NOEX_CFUNC);
 }
 
 void
@@ -656,10 +470,10 @@ rb_define_method(klass, name, func, argc)
     int argc;
 {
     ID id = rb_intern(name);
-    int ex = NOEX_PUBLIC;
 
-
-    rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
+    rb_add_method(klass, id, NEW_CFUNC(func, argc), 
+		  ((name[0] == 'i' && id == rb_intern("initialize"))?
+		   NOEX_PRIVATE:NOEX_PUBLIC)|NOEX_CFUNC);
 }
 
 void
@@ -669,7 +483,8 @@ rb_define_protected_method(klass, name, func, argc)
     VALUE (*func)();
     int argc;
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PROTECTED);
+    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc),
+		  NOEX_PROTECTED|NOEX_CFUNC);
 }
 
 void
@@ -679,7 +494,8 @@ rb_define_private_method(klass, name, func, argc)
     VALUE (*func)();
     int argc;
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PRIVATE);
+    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc),
+		  NOEX_PRIVATE|NOEX_CFUNC);
 }
 
 void
@@ -690,46 +506,19 @@ rb_undef_method(klass, name)
     rb_add_method(klass, rb_intern(name), 0, NOEX_UNDEF);
 }
 
-#define SPECIAL_SINGLETON(x,c) do {\
-    if (obj == (x)) {\
-	return c;\
-    }\
-} while (0)
-
 VALUE
 rb_singleton_class(obj)
     VALUE obj;
 {
-    VALUE klass;
-
-    if (FIXNUM_P(obj) || SYMBOL_P(obj)) {
-	rb_raise(rb_eTypeError, "can't define singleton");
-    }
     if (rb_special_const_p(obj)) {
-	SPECIAL_SINGLETON(Qnil, rb_cNilClass);
-	SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
-	SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
-	rb_bug("unknown immediate %ld", obj);
-    }
-
-    DEFER_INTS;
-    if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
-	rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj) {
-	klass = RBASIC(obj)->klass;
-    }
-    else {
-	klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
-    }
-    if (OBJ_TAINTED(obj)) {
-	OBJ_TAINT(klass);
+	rb_raise(rb_eTypeError, "can't define singleton");
     }
-    else {
-	FL_UNSET(klass, FL_TAINT);
+    if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON)) {
+	return RBASIC(obj)->klass;
     }
-    if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass);
-    ALLOW_INTS;
-
-    return klass;
+    RBASIC(obj)->klass = rb_singleton_class_new(RBASIC(obj)->klass);
+    rb_singleton_class_attached(RBASIC(obj)->klass, obj);
+    return RBASIC(obj)->klass;
 }
 
 void
@@ -789,28 +578,32 @@ rb_define_attr(klass, name, read, write)
 
 int
 #ifdef HAVE_STDARG_PROTOTYPES
-rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
 #else
 rb_scan_args(argc, argv, fmt, va_alist)
     int argc;
-    const VALUE *argv;
+    VALUE *argv;
     const char *fmt;
     va_dcl
 #endif
 {
-    int n, i = 0;
+    int n, i;
     const char *p = fmt;
     VALUE *var;
     va_list vargs;
 
     va_init_list(vargs, fmt);
 
-    if (*p == '*') goto rest_arg;
+    if (*p == '*') {
+	var = va_arg(vargs, VALUE*);
+	*var = rb_ary_new4(argc, argv);
+	return argc;
+    }
 
     if (ISDIGIT(*p)) {
 	n = *p - '0';
 	if (n > argc)
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
+	    rb_raise(rb_eArgError, "wrong # of arguments (%d for %d)", argc, n);
 	for (i=0; i<n; i++) {
 	    var = va_arg(vargs, VALUE*);
 	    if (var) *var = argv[i];
@@ -836,38 +629,24 @@ rb_scan_args(argc, argv, fmt, va_alist)
     }
 
     if(*p == '*') {
-      rest_arg:
 	var = va_arg(vargs, VALUE*);
 	if (argc > i) {
 	    if (var) *var = rb_ary_new4(argc-i, argv+i);
-	    i = argc;
 	}
 	else {
 	    if (var) *var = rb_ary_new();
 	}
-	p++;
     }
-
-    if (*p == '&') {
-	var = va_arg(vargs, VALUE*);
-	if (rb_block_given_p()) {
-	    *var = rb_block_proc();
-	}
-	else {
-	    *var = Qnil;
+    else if (*p == '\0') {
+	if (argc > i) {
+	    rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)", argc, i);
 	}
-	p++;
     }
-    va_end(vargs);
-
-    if (*p != '\0') {
+    else {
 	goto error;
     }
 
-    if (argc > i) {
-	rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)", argc, i);
-    }
-
+    va_end(vargs);
     return argc;
 
   error:
diff --git a/compar.c b/compar.c
index 5376ce4452..50e4fa3a87 100644
--- a/compar.c
+++ b/compar.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   compar.c -
 
@@ -6,9 +6,9 @@
   $Date$
   created at: Thu Aug 26 14:39:48 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
 
@@ -16,69 +16,15 @@ VALUE rb_mComparable;
 
 static ID cmp;
 
-int
-rb_cmpint(val, a, b)
-    VALUE val, a, b;
-{
-    if (NIL_P(val)) {
-	rb_cmperr(a, b);
-    }
-    if (FIXNUM_P(val)) return FIX2INT(val);
-    if (TYPE(val) == T_BIGNUM) {
-	if (RBIGNUM(val)->sign) return 1;
-	return -1;
-    }
-    if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
-    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
-    return 0;
-}
-
-void
-rb_cmperr(x, y)
-    VALUE x, y;
-{
-    const char *classname;
-
-    if (SPECIAL_CONST_P(y)) {
-	y = rb_inspect(y);
-	classname = StringValuePtr(y);
-    }
-    else {
-	classname = rb_obj_classname(y);
-    }
-    rb_raise(rb_eArgError, "comparison of %s with %s failed",
-	     rb_obj_classname(x), classname);
-}
-
-#define cmperr() (rb_cmperr(x, y), Qnil)
-
 static VALUE
-cmp_eq(a)
-    VALUE *a;
-{
-    VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
-
-    if (NIL_P(c)) return Qnil;
-    if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-cmp_failed()
-{
-    return Qnil;
-}
-
-static VALUE
-cmp_equal(x, y)
+cmp_eq(x, y)
     VALUE x, y;
 {
-    VALUE a[2];
-
-    if (x == y) return Qtrue;
+    VALUE c = rb_funcall(x, cmp, 1, y);
+    int t = NUM2INT(c);
 
-    a[0] = x; a[1] = y;
-    return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
+    if (t == 0) return Qtrue;
+    return Qfalse;
 }
 
 static VALUE
@@ -86,9 +32,9 @@ cmp_gt(x, y)
     VALUE x, y;
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
+    int t = NUM2INT(c);
 
-    if (NIL_P(c)) return cmperr();
-    if (rb_cmpint(c, x, y) > 0) return Qtrue;
+    if (t > 0) return Qtrue;
     return Qfalse;
 }
 
@@ -97,9 +43,9 @@ cmp_ge(x, y)
     VALUE x, y;
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
+    int t = NUM2INT(c);
 
-    if (NIL_P(c)) return cmperr();
-    if (rb_cmpint(c, x, y) >= 0) return Qtrue;
+    if (t >= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -108,9 +54,9 @@ cmp_lt(x, y)
     VALUE x, y;
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
+    int t = NUM2INT(c);
 
-    if (NIL_P(c)) return cmperr();
-    if (rb_cmpint(c, x, y) < 0) return Qtrue;
+    if (t < 0) return Qtrue;
     return Qfalse;
 }
 
@@ -119,9 +65,9 @@ cmp_le(x, y)
     VALUE x, y;
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
+    int t = NUM2INT(c);
 
-    if (NIL_P(c)) return cmperr();
-    if (rb_cmpint(c, x, y) <= 0) return Qtrue;
+    if (t <= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -129,8 +75,13 @@ static VALUE
 cmp_between(x, min, max)
     VALUE x, min, max;
 {
-    if (RTEST(cmp_lt(x, min))) return Qfalse;
-    if (RTEST(cmp_gt(x, max))) return Qfalse;
+    VALUE c = rb_funcall(x, cmp, 1, min);
+    long t = NUM2LONG(c);
+    if (t < 0) return Qfalse;
+
+    c = rb_funcall(x, cmp, 1, max);
+    t = NUM2LONG(c);
+    if (t > 0) return Qfalse;
     return Qtrue;
 }
 
@@ -138,7 +89,7 @@ void
 Init_Comparable()
 {
     rb_mComparable = rb_define_module("Comparable");
-    rb_define_method(rb_mComparable, "==", cmp_equal, 1);
+    rb_define_method(rb_mComparable, "==", cmp_eq, 1);
     rb_define_method(rb_mComparable, ">", cmp_gt, 1);
     rb_define_method(rb_mComparable, ">=", cmp_ge, 1);
     rb_define_method(rb_mComparable, "<", cmp_lt, 1);
diff --git a/config.guess b/config.guess
index 844739cdaf..7e23afe37b 100644
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-01-10'
-
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -24,207 +21,50 @@ timestamp='2003-01-10'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
 
-# Portable tmp directory creation inspired by the Autoconf team.
+# Modified for Human68k by K.Okabe 1997.07.09
+# Last change: 1997.07.09
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+case "$KSH_VERSION" in
+*X6*)
+  echo m68k-sharp-human
+  exit 0 ;;
+*)
+  ;;
+esac
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
+# (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:MicroBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
-	exit 0 ;;
+    *:OS/2:*:*)
+	echo "i386-pc-os2_emx"
+	exit 0;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -233,91 +73,90 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
+	cat <<EOF >dummy.s
 	.globl main
-	.align 4
 	.ent main
 main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
 	.end main
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+	${CC-cc} dummy.s -o dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		case `$dummy` in
-			0-0)
+		./dummy
+		case "$?" in
+			7)
 				UNAME_MACHINE="alpha"
 				;;
-			1-0)
+			15)
 				UNAME_MACHINE="alphaev5"
 				;;
-			1-1)
+			14)
 				UNAME_MACHINE="alphaev56"
 				;;
-			1-101)
+			10)
 				UNAME_MACHINE="alphapca56"
 				;;
-			2-303)
+			16)
 				UNAME_MACHINE="alphaev6"
 				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
 		esac
 	fi
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
 	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
+	echo m68k-cbm-sysv4
 	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
@@ -325,13 +164,9 @@ EOF
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
-    NILE*:*:*:dcosx)
+    NILE:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -360,7 +195,7 @@ EOF
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -374,35 +209,36 @@ EOF
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
@@ -412,18 +248,12 @@ EOF
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
+    2020:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
+	sed 's/^	//' << EOF >dummy.c
+	int main (argc, argv) int argc; char **argv; {
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
@@ -438,20 +268,12 @@ EOF
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	${CC-cc} dummy.c -o dummy \
+	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -467,18 +289,15 @@ EOF
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
 		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
 	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
 	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
  	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
@@ -499,21 +318,12 @@ EOF
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
+    i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
+		sed 's/^		//' << EOF >dummy.c
 		#include <sys/systemcfg.h>
 
 		main()
@@ -524,7 +334,8 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+		rm -f dummy.c dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -532,9 +343,9 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+    *:AIX:*:4)
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -542,7 +353,7 @@ EOF
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=4.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
@@ -552,7 +363,7 @@ EOF
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
@@ -568,47 +379,28 @@ EOF
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
+	    9000/[678]?? )
+              sed 's/^              //' << EOF >dummy.c
               #include <stdlib.h>
               #include <unistd.h>
-
+              
               int main ()
               {
               #if defined(_SC_KERNEL_BITS)
                   long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
+              #endif 
                   long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
+              
+                  switch (cpu) 
               	{
               	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
               	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
+              	case CPU_PA_RISC2_0: 
               #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
+              	    switch (bits) 
               		{
               		case 64: puts ("hppa2.0w"); break;
               		case 32: puts ("hppa2.0n"); break;
@@ -616,36 +408,20 @@ EOF
               		} break;
               #else  /* !defined(_SC_KERNEL_BITS) */
               	    puts ("hppa2.0"); break;
-              #endif
+              #endif 
               	default: puts ("hppa1.0"); break;
               	}
                   exit (0);
               }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
+	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
+	rm -f dummy.c dummy
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	sed 's/^	//' << EOF >dummy.c
 	#include <unistd.h>
 	int
 	main ()
@@ -670,7 +446,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -679,16 +456,13 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
 	exit 0 ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
-    i*86:OSF1:*:*)
+    i?86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
@@ -716,55 +490,57 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
         exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo ymp-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo t90-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:*:*BOW*:*)
+	echo i386-pc-bow
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -772,24 +548,6 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:3*)
-	echo i586-pc-interix3
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
 	exit 0 ;;
@@ -799,135 +557,113 @@ EOF
     *:GNU:*:*)
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux;;
-	  PA8*) echo hppa2.0-unknown-linux;;
-	  *)    echo hppa-unknown-linux;;
+    *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
 	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux
-	exit 0 ;;
-    i*86:Linux:*:*)
+
 	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
+				    s/.*supported emulations: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-aout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-coff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-oldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-oldld"
-		exit 0 ;;
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-aout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-coff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-aout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-aout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux"               ; exit 0 ;;
 	esac
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="-libc1"
+			fi
+		fi	
+		rm -f dummy.s dummy
+		echo ${UNAME_MACHINE}-unknown-linux${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >dummy.c <<EOF
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	else
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  echo ${UNAME_MACHINE}-${VENDOR}-linux
+	  exit 0
+	fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+    i?86:DYNIX/ptx:4*:*)
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
+    i?86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
         # I am not positive that other SVR4 systems won't match this,
@@ -935,59 +671,35 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
+    i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i?86:UnixWare:*:*)
+	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+	    && UNAME_MACHINE=i586
+	fi
+	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+	exit 0 ;;
     pc:*:*:*)
-	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
@@ -1009,15 +721,9 @@ EOF
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1028,27 +734,24 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+    m68*:LynxOS:2.*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
+    i?86:LynxOS:2.*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
 	exit 0 ;;
@@ -1060,8 +763,8 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
@@ -1073,23 +776,22 @@ EOF
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
-    news*:NEWS-OS:6*:*)
+    news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv`echo ${UNAME_RELEASE} | sed -n 's/\([.0-9]*\).*/\1/p'`
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
         exit 0 ;;
+    DS/90*:*:*:V20*)
+  	echo sparc-fujitsu-uxpds
+  	exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit 0 ;;
@@ -1099,87 +801,27 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
+
+	*:Rhapsody:*:*)
+	arch=`/usr/bin/arch`
+	case "$arch" in
+	ppc)
+		echo powerpc-apple-rhapsody${UNAME_RELEASE}
+		;;
+	i[3456]86)
+		echo i386-apple-rhapsody${UNAME_RELEASE}
+		;;
+	*)
+		echo $arch-apple-rhapsody${UNAME_RELEASE}
+		;;
 	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
 	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
+cat >dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
 # include <sys/utsname.h>
@@ -1221,6 +863,7 @@ main ()
     printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
   else
     printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+
   exit (0);
 #endif
 
@@ -1265,24 +908,11 @@ main ()
 #endif
 
 #if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1293,7 +923,8 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+rm -f dummy.c dummy
 
 # Apollos put the system type in the environment.
 
@@ -1325,48 +956,6 @@ then
     esac
 fi
 
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
+#echo '(Unable to guess system type)' 1>&2
 
 exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
index d2c7af03c5..aa2241272b 100644
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,6 @@
 #! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-01-03'
-
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -29,9 +25,6 @@ timestamp='2003-01-03'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -52,73 +45,30 @@ timestamp='2003-01-03'
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
 
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,33 +94,15 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple)
 		os=
 		basic_machine=$1
 		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
 	-sco5)
-		os=-sco3.2v5
+		os=sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
@@ -189,9 +121,6 @@ case $os in
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-isc)
 		os=-isc2.2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -214,153 +143,58 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
+	i[3456]86-TOWNS*)
+	  basic_machine=`echo $basic_machine | sed -e 's/-TOWNS.*/-TOWNS/'`
+	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		basic_machine=we32k-att
 		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
 	alliant | fx80)
 		basic_machine=fx80-alliant
 		;;
@@ -376,24 +210,20 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-sysv4
 		;;
 	apollo68)
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -402,10 +232,6 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -426,30 +252,27 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | j90)
-		basic_machine=j90-cray
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -477,10 +300,6 @@ case $basic_machine in
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
 	fx2800)
 		basic_machine=i860-alliant
 		;;
@@ -491,10 +310,6 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -503,14 +318,6 @@ case $basic_machine in
 		basic_machine=h8300-hitachi
 		os=-hms
 		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
@@ -526,30 +333,13 @@ case $basic_machine in
 		basic_machine=m68k-hp
 		os=-hpux
 		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
 		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -558,42 +348,27 @@ case $basic_machine in
 	hppa-next)
 		os=-nextstep3
 		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
+		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i*86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i*86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i*86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -619,16 +394,16 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux
 		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
@@ -636,38 +411,10 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
 		os=-newsos
@@ -680,10 +427,6 @@ case $basic_machine in
 		basic_machine=mips-sony
 		os=-newsos
 		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
 	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
@@ -709,40 +452,9 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-nindy
 		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -757,85 +469,51 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
+	pentium | p5 | k5 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | k6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i686-pc
+		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=power-ibm
+	power)	basic_machine=rs6000-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -843,10 +521,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
@@ -854,13 +528,6 @@ case $basic_machine in
 	spur)
 		basic_machine=spur-unknown
 		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -901,40 +568,16 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-        tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -946,10 +589,6 @@ case $basic_machine in
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
 	vaxv)
 		basic_machine=vax-dec
 		os=-sysv
@@ -959,8 +598,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -973,24 +612,12 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
+	xmp)
+		basic_machine=xmp-cray
 		os=-unicos
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
+        xps | xps100)
+		basic_machine=xps100-honeywell
 		;;
 	none)
 		basic_machine=none-none
@@ -999,14 +626,12 @@ case $basic_machine in
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
+	mips)
+		if [ x$os = x-linux ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
 		;;
 	romp)
 		basic_machine=romp-ibm
@@ -1017,26 +642,16 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1045,15 +660,6 @@ case $basic_machine in
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -1068,6 +674,10 @@ case $basic_machine in
 	*-commodore*)
 		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
 		;;
+	human)
+		basic_machine=m68k-sharp
+		os=-human
+		;;
 	*)
 		;;
 esac
@@ -1093,7 +703,9 @@ case $os in
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux|'`
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	-os2_emx)
 		;;
 	# First accept the basic system types.
 	# The portable systems comes first.
@@ -1107,56 +719,19 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -microbsd*)
+              | -mingw32* | -linux* | -uxpv* | -beos* | -rhapsody* )
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=-linux
-		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -1172,23 +747,11 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
 	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
+	        os=-nextstep2
 		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
@@ -1215,17 +778,16 @@ case $os in
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
+	-uxpds)
+		os=-uxpds
+		;;
+	-human)
+		;;
+	-beos)
+	        os=-beos
 		;;
 	-none)
 		;;
@@ -1252,17 +814,10 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-rebel)
-		os=-linux
-		;;
 	arm*-semi)
 		os=-aout
 		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1280,18 +835,6 @@ case $basic_machine in
 		# default.
 		# os=-sunos4
 		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1304,15 +847,6 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -1355,39 +889,27 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
 		os=-rtu
 		;;
-	f30[01]-fujitsu | f700-fujitsu)
+	f301-fujitsu)
 		os=-uxpv
 		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
 	*)
 		os=-none
 		;;
@@ -1409,15 +931,9 @@ case $basic_machine in
 			-aix*)
 				vendor=ibm
 				;;
-			-beos*)
-				vendor=be
-				;;
 			-hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
-				vendor=hp
-				;;
 			-hiux*)
 				vendor=hitachi
 				;;
@@ -1433,41 +949,21 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			-mvs*)
 				vendor=ibm
 				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)
 				vendor=apple
 				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
 echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config_h.dj b/config_h.dj
new file mode 100644
index 0000000000..aac8fcb667
--- /dev/null
+++ b/config_h.dj
@@ -0,0 +1,71 @@
+#define USE_THREAD 1
+#define SIZEOF_INT 4
+#define SIZEOF_SHORT 2
+#define SIZEOF_LONG 4
+#define SIZEOF_VOIDP 4
+#define SIZEOF_FLOAT 4
+#define SIZEOF_DOUBLE 8
+#define HAVE_PROTOTYPES 1
+#define TOKEN_PASTE(x,y) x##y
+#define HAVE_STDARG_PROTOTYPES 1
+#define HAVE_ATTR_NORETURN 1
+#define HAVE_DIRENT_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_SYS_FILE_H 1
+#define HAVE_SYS_IOCTL_H 1
+#define HAVE_PWD_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIMES_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_STRING_H 1
+#define HAVE_UTIME_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_DIRECT_H 1
+#define HAVE_ST_BLKSIZE 1
+#define HAVE_ST_RDEV 1
+#define GETGROUPS_T gid_t
+#define RETSIGTYPE void
+#define HAVE_ALLOCA 1
+#define vfork fork
+#define HAVE_DUP2 1
+#define HAVE_SETENV 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MKDIR 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRERROR 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRDUP 1
+#define HAVE_ISINF 1
+#define HAVE_ISNAN 1
+#define HAVE_FINITE 1
+#define HAVE_FMOD 1
+#define HAVE_RANDOM 1
+#define HAVE_WAITPID 1
+#define HAVE_GETCWD 1
+#define HAVE_TRUNCATE 1
+#define HAVE_CHSIZE 1
+#define HAVE_TIMES 1
+#define HAVE_UTIMES 1
+#define HAVE_FCNTL 1
+/*#define HAVE_SETITIMER 1*/
+#define HAVE_GETGROUPS 1
+#define HAVE_SIGPROCMASK 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETSID 1
+#define POSIX_SIGNAL 1
+#define BSD_SETPGRP setpgrp
+#define RSHIFT(x,y) ((x)>>y)
+#define FILE_COUNT _cnt
+#define DLEXT ".o"
+#define RUBY_LIB "/usr/local/lib/ruby/1.3"
+#define RUBY_SITE_LIB "/usr/local/lib/ruby/1.3/site_ruby"
+#define RUBY_PLATFORM "i386-djgpp"
+#define RUBY_ARCHLIB "/usr/local/lib/ruby/1.3/i386-djgpp"
+#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/1.3/site_ruby/i386-djgpp"
diff --git a/config_s.dj b/config_s.dj
new file mode 100644
index 0000000000..41b83660ac
--- /dev/null
+++ b/config_s.dj
@@ -0,0 +1,54 @@
+s%@CFLAGS@%-O2%g
+s%@CPPFLAGS@%%g
+s%@CXXFLAGS@%%g
+s%@DEFS@% -DUSE_THREAD=1 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_ATTR_NORETURN=1 -DHAVE_DIRENT_H=1 -DSTDC_HEADERS=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_PWD_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_TIMES_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_STRING_H=1 -DHAVE_UTIME_H=1 -DHAVE_MEMORY_H=1 -DHAVE_DIRECT_H=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=gid_t -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -Dvfork=fork -DHAVE_DUP2=1 -DHAVE_SETENV=1 -DHAVE_MEMMOVE=1 -DHAVE_MKDIR=1 -DHAVE_STRCASECMP=1 -DHAVE_STRERROR=1 -DHAVE_STRFTIME=1 -DHAVE_STRCHR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOUL=1 -DHAVE_STRDUP=1 -DHAVE_FMOD=1 -DHAVE_RANDOM=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_TRUNCATE=1 -DHAVE_CHSIZE=1 -DHAVE_TIMES=1 -DHAVE_UTIMES=1 -DHAVE_FCNTL=1 -DHAVE_SETITIMER=1 -DHAVE_GETGROUPS=1 -DHAVE_SIGPROCMASK=1 -DHAVE_SIGACTION=1 -DHAVE_SETSID=1 -DPOSIX_SIGNAL=1 -DBSD_SETPGRP=setpgrp -DRSHIFT=\(x,y\)\ \(\(x\)\>\>y\) -DFILE_COUNT=_cnt -DDLEXT=\".so\" -DRUBY_LIB=\"/usr/local/lib/ruby\" -DRUBY_SITE_LIB=\"/usr/local/lib/ruby/site_ruby\" -DRUBY_ARCHLIB=\"/usr/local/lib/ruby/i386-djgpp\" -DRUBY_SITE_ARCHLIB=\"/usr/local/lib/ruby/site_ruby/i386-djgpp\" -DRUBY_PLATFORM=\"i386-djgpp\" %g
+s%@LDFLAGS@%%g
+s%@LIBS@%-lm %g
+s%@exec_prefix@%${prefix}%g
+s%@prefix@%/usr/local%g
+s%@program_transform_name@%s,x,x,%g
+s%@bindir@%${exec_prefix}/bin%g
+s%@sbindir@%${exec_prefix}/sbin%g
+s%@libexecdir@%${exec_prefix}/libexec%g
+s%@datadir@%${prefix}/share%g
+s%@sysconfdir@%${prefix}/etc%g
+s%@sharedstatedir@%${prefix}/com%g
+s%@localstatedir@%${prefix}/var%g
+s%@libdir@%${exec_prefix}/lib%g
+s%@includedir@%${prefix}/include%g
+s%@oldincludedir@%/usr/include%g
+s%@infodir@%${prefix}/info%g
+s%@mandir@%${prefix}/man%g
+s%@host@%i386-pc-djgpp%g
+s%@host_alias@%i386-djgpp%g
+s%@host_cpu@%i386%g
+s%@host_vendor@%pc%g
+s%@host_os@%djgpp%g
+s%@CC@%gcc%g
+s%@CPP@%gcc -E%g
+s%@YACC@%bison -y%g
+s%@RANLIB@%ranlib%g
+s%@AR@%ar%g
+s%@INSTALL_PROGRAM@%${INSTALL}%g
+s%@INSTALL_DATA@%${INSTALL} -m 644%g
+s%@SET_MAKE@%%g
+s%@LIBOBJS@% crypt.o flock.o snprintf.o%g
+s%@ALLOCA@%%g
+s%@DEFAULT_KCODE@%%g
+s%@EXEEXT@%.exe%g
+s%@OBJEXT@%o%g
+s%@DLDFLAGS@%%g
+s%@STATIC@%%g
+s%@CCDLFLAGS@%%g
+s%@LDSHARED@%ld%g
+s%@DLEXT@%o%g
+s%@STRIP@%strip%g
+s%@EXTSTATIC@%%g
+s%@binsuffix@%.exe%g
+s%@setup@%Setup%g
+s%@LIBRUBY@%libruby.a%g
+s%@LIBRUBYARG@%libruby.a%g
+s%@SOLIBS@%%g
+s%@srcdir%.%g
+s%@arch@%i386-djgpp%g
+ac_given_srcdir=.
diff --git a/configure b/configure
new file mode 100644
index 0000000000..b42807d40b
--- /dev/null
+++ b/configure
@@ -0,0 +1,5009 @@
+#! /bin/sh
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.13 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+ac_help="$ac_help
+--without-gcc             never use gcc"
+ac_help="$ac_help
+--enable-fat-binary       build a NeXT/Apple Multi Architecture Binary. "
+ac_help="$ac_help
+--with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)"
+ac_help="$ac_help
+--with-dln-a-out          use dln_a_out if possible"
+ac_help="$ac_help
+--with-static-linked-ext  link external modules statically"
+ac_help="$ac_help
+--enable-shared           build a shared library for Ruby. "
+ac_help="$ac_help
+--with-search-path	  specify the additional search path"
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir="$ac_optarg" ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir="$ac_optarg" ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir="$ac_optarg" ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir="$ac_optarg" ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir="$ac_optarg" ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir="$ac_optarg" ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir="$ac_optarg" ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir="$ac_optarg" ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir="$ac_optarg" ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.13"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *)
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=ruby.h
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+ac_exeext=
+ac_objext=o
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+
+rb_version=`grep RUBY_VERSION $srcdir/version.h`
+MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'`
+MINOR=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*"'`
+TEENY=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)"'`
+
+
+
+# Check whether --with-gcc or --without-gcc was given.
+if test "${with_gcc+set}" = set; then
+  withval="$with_gcc"
+  
+	case $withval in
+	no)	CC=cc
+		without_gcc=yes;;
+	yes)	CC=gcc
+		without_gcc=no;;
+	*)	CC=$withval
+		without_gcc=$withval;;
+	esac
+else
+  without_gcc=no
+fi
+
+if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
+then
+  { echo "configure: error: cached CC is different -- throw away $cache_file
+(it is also a good idea to do 'make clean' before compiling)" 1>&2; exit 1; }
+fi
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+# Make sure we can run config.sub.
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:595: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+
+fat_binary=no
+# Check whether --enable-fat-binary or --disable-fat-binary was given.
+if test "${enable_fat_binary+set}" = set; then
+  enableval="$enable_fat_binary"
+  fat_binary=$enableval
+fi
+
+ if test "$fat_binary" = yes ; then
+
+    echo $ac_n "checking target architecture""... $ac_c" 1>&6
+echo "configure:626: checking target architecture" >&5
+
+    case "$host_os" in
+    rhapsody*)
+        echo -n "MacOS X Server: "
+	  	if test "$TARGET_ARCHS" = "" ; then
+   	        TARGET_ARCHS="ppc i386"
+  		fi
+	;;
+    nextstep*|openstep*)
+  	    echo -n "NeXTSTEP/OPENSTEP: "
+	    if test "$TARGET_ARCHS" = "" ; then
+	       if test `/usr/bin/arch` = "m68k" ; then
+		   TARGET_ARCHS="m68k i486"
+	       else # Black and Native one
+		   TARGET_ARCHS="m68k `/usr/bin/arch`"
+	       fi
+	    fi
+        ;;
+    esac
+    # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
+    for archs in $TARGET_ARCHS 
+    do
+        ARCH_FLAG="$ARCH_FLAG -arch $archs "
+        echo -n " $archs"
+    done
+    cat >> confdefs.h <<\EOF
+#define NEXT_FAT_BINARY 1
+EOF
+
+    echo "."
+fi 
+
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:682: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:712: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:763: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 806 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ac_cv_prog_cc_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cc_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:842: checking whether we are using GNU C" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:870: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:902: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 917 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 934 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 951 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+echo "configure:983: checking whether ${CC-cc} needs -traditional" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    ac_pattern="Autoconf.*'x'"
+  cat > conftest.$ac_ext <<EOF
+#line 989 "configure"
+#include "confdefs.h"
+#include <sgtty.h>
+Autoconf TIOCGETP
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "$ac_pattern" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_prog_gcc_traditional=yes
+else
+  rm -rf conftest*
+  ac_cv_prog_gcc_traditional=no
+fi
+rm -f conftest*
+
+
+  if test $ac_cv_prog_gcc_traditional = no; then
+    cat > conftest.$ac_ext <<EOF
+#line 1007 "configure"
+#include "confdefs.h"
+#include <termio.h>
+Autoconf TCGETA
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "$ac_pattern" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_prog_gcc_traditional=yes
+fi
+rm -f conftest*
+
+  fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+  if test $ac_cv_prog_gcc_traditional = yes; then
+    CC="$CC -traditional"
+  fi
+fi
+
+for ac_prog in 'bison -y' byacc
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1033: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_YACC="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+YACC="$ac_cv_prog_YACC"
+if test -n "$YACC"; then
+  echo "$ac_t""$YACC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1066: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+for ac_prog in ar aal
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1099: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AR="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+  echo "$ac_t""$AR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$AR" && break
+done
+test -n "$AR" || AR="ar"
+
+
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:1131: checking whether ln -s works" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+  rm -f conftestdata
+  ac_cv_prog_LN_S="ln -s"
+else
+  ac_cv_prog_LN_S=ln
+fi
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:1152: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:1180: checking for Cygwin environment" >&5
+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1185 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:1196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_cygwin=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_cygwin" 1>&6
+CYGWIN=
+test "$ac_cv_cygwin" = yes && CYGWIN=yes
+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+echo "configure:1213: checking for mingw32 environment" >&5
+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1218 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:1225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_mingw32=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1244: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+  ac_cv_exeext=.exe
+else
+  rm -f conftest*
+  echo 'int main () { return 0; }' > conftest.$ac_ext
+  ac_cv_exeext=
+  if { (eval echo configure:1254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+    for file in conftest.*; do
+      case $file in
+      *.c | *.o | *.obj) ;;
+      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+      esac
+    done
+  else
+    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+  fi
+  rm -f conftest*
+  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+ac_exeext=$EXEEXT
+
+echo $ac_n "checking for object suffix""... $ac_c" 1>&6
+echo "configure:1275: checking for object suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  rm -f conftest*
+echo 'int i = 1;' > conftest.$ac_ext
+if { (eval echo configure:1281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  for ac_file in conftest.*; do
+    case $ac_file in
+    *.c) ;;
+    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
+    esac
+  done
+else
+  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_objext" 1>&6
+OBJEXT=$ac_cv_objext
+ac_objext=$ac_cv_objext
+
+
+# checks for UNIX variants that set C preprocessor variables
+ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
+echo "configure:1302: checking for minix/config.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1307 "configure"
+#include "confdefs.h"
+#include <minix/config.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  MINIX=yes
+else
+  echo "$ac_t""no" 1>&6
+MINIX=
+fi
+
+if test "$MINIX" = yes; then
+  cat >> confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define _POSIX_1_SOURCE 2
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define _MINIX 1
+EOF
+
+fi
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:1351: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1359 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
+
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:1390: checking size of short" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1398 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_short=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:1429: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1437 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+
+echo $ac_n "checking size of void*""... $ac_c" 1>&6
+echo "configure:1468: checking size of void*" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1476 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(void*));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_voidp=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_voidp=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_voidp" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
+EOF
+
+
+echo $ac_n "checking size of float""... $ac_c" 1>&6
+echo "configure:1507: checking size of float" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1515 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(float));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_float=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_float=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_float" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_FLOAT $ac_cv_sizeof_float
+EOF
+
+
+echo $ac_n "checking size of double""... $ac_c" 1>&6
+echo "configure:1546: checking size of double" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1554 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(double));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_double=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_double=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_double" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_DOUBLE $ac_cv_sizeof_double
+EOF
+
+
+
+echo $ac_n "checking for prototypes""... $ac_c" 1>&6
+echo "configure:1586: checking for prototypes" >&5
+if eval "test \"`echo '$''{'rb_cv_have_prototypes'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1591 "configure"
+#include "confdefs.h"
+int foo(int x) { return 0; }
+int main() {
+return foo(10);
+; return 0; }
+EOF
+if { (eval echo configure:1598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_have_prototypes=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  rb_cv_have_prototypes=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$rb_cv_have_prototypes" 1>&6
+if test "$rb_cv_have_prototypes" = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_PROTOTYPES 1
+EOF
+
+fi
+
+echo $ac_n "checking token paste string""... $ac_c" 1>&6
+echo "configure:1619: checking token paste string" >&5
+if eval "test \"`echo '$''{'rb_cv_tokenpaste'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1624 "configure"
+#include "confdefs.h"
+#define paste(a,b) a##b
+int main() {
+int xy = 1; return paste(x,y);
+; return 0; }
+EOF
+if { (eval echo configure:1631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_tokenpaste=ansi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  rb_cv_tokenpaste=knr
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$rb_cv_tokenpaste" 1>&6
+if test "$rb_cv_tokenpaste" = ansi; then
+  cat >> confdefs.h <<\EOF
+#define TOKEN_PASTE(x,y) x##y
+EOF
+
+else
+  cat >> confdefs.h <<\EOF
+#define TOKEN_PASTE(x,y) x/**/y
+EOF
+
+fi
+
+echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
+echo "configure:1657: checking for variable length prototypes and stdarg.h" >&5
+if eval "test \"`echo '$''{'rb_cv_stdarg'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1662 "configure"
+#include "confdefs.h"
+
+#include <stdarg.h>
+int foo(int x, ...) {
+	va_list va;
+	va_start(va, x);
+	va_arg(va, int);
+	va_arg(va, char *);
+	va_arg(va, double);
+	return 0;
+}
+
+int main() {
+return foo(10, "", 3.14);
+; return 0; }
+EOF
+if { (eval echo configure:1679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_stdarg=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  rb_cv_stdarg=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$rb_cv_stdarg" 1>&6
+if test "$rb_cv_stdarg" = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_STDARG_PROTOTYPES 1
+EOF
+
+fi
+
+echo $ac_n "checking for gcc attribute noreturn""... $ac_c" 1>&6
+echo "configure:1700: checking for gcc attribute noreturn" >&5
+if eval "test \"`echo '$''{'rb_cv_have_attr_noreturn'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1705 "configure"
+#include "confdefs.h"
+void exit(int x) __attribute__ ((noreturn));
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_have_attr_noreturn=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  rb_cv_have_attr_noreturn=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$rb_cv_have_attr_noreturn" 1>&6
+if test "$rb_cv_have_attr_noreturn" = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ATTR_NORETURN 1
+EOF
+
+fi
+
+case "$host_os" in
+nextstep*)	;;
+openstep*)	;;
+rhapsody*)	;;
+human*)		;;
+beos*)		;;
+cygwin*)	;;
+*) LIBS="-lm $LIBS";;
+esac
+echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+echo "configure:1742: checking for crypt in -lcrypt" >&5
+ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lcrypt  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1750 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char crypt();
+
+int main() {
+crypt()
+; return 0; }
+EOF
+if { (eval echo configure:1761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lcrypt $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:1789: checking for dlopen in -ldl" >&5
+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1797 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldl $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+	# Dynamic linking for SunOS/Solaris and SYSV
+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+echo "configure:1836: checking for shl_load in -ldld" >&5
+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldld  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1844 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char shl_load();
+
+int main() {
+shl_load()
+; return 0; }
+EOF
+if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldld $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+	# Dynamic linking for HP-UX
+echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6
+echo "configure:1883: checking for setlocale in -lxpg4" >&5
+ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lxpg4  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1891 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char setlocale();
+
+int main() {
+setlocale()
+; return 0; }
+EOF
+if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo xpg4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lxpg4 $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+	# FreeBSD needs this
+
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+echo "configure:1935: checking for $ac_hdr that defines DIR" >&5
+if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1940 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <$ac_hdr>
+int main() {
+DIR *dirp = 0;
+; return 0; }
+EOF
+if { (eval echo configure:1948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_header_dirent_$ac_safe=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_dirent_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ ac_header_dirent=$ac_hdr; break
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+echo "configure:1973: checking for opendir in -ldir" >&5
+ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldir  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1981 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char opendir();
+
+int main() {
+opendir()
+; return 0; }
+EOF
+if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -ldir"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+echo "configure:2014: checking for opendir in -lx" >&5
+ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lx  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2022 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char opendir();
+
+int main() {
+opendir()
+; return 0; }
+EOF
+if { (eval echo configure:2033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lx"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:2056: checking for ANSI C header files" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2061 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  ac_cv_header_stdc=yes
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 2086 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 2104 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+  :
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2125 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+
+fi
+
+echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+echo "configure:2160: checking for sys/wait.h that is POSIX.1 compatible" >&5
+if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2165 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+int main() {
+int s;
+wait (&s);
+s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+; return 0; }
+EOF
+if { (eval echo configure:2181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_sys_wait_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_sys_wait_h=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
+if test $ac_cv_header_sys_wait_h = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_SYS_WAIT_H 1
+EOF
+
+fi
+
+for ac_hdr in stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\
+		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
+		 syscall.h pwd.h a.out.h utime.h memory.h direct.h fnmatch.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2207: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2212 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:2245: checking for uid_t in sys/types.h" >&5
+if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2250 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "uid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_uid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_uid_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define uid_t int
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define gid_t int
+EOF
+
+fi
+
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:2279: checking for size_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2284 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_size_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_size_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
+#define size_t unsigned
+EOF
+
+fi
+
+echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
+echo "configure:2312: checking for st_blksize in struct stat" >&5
+if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2317 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+int main() {
+struct stat s; s.st_blksize;
+; return 0; }
+EOF
+if { (eval echo configure:2325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_st_blksize=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_st_blksize=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6
+if test $ac_cv_struct_st_blksize = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ST_BLKSIZE 1
+EOF
+
+fi
+
+save_LIBOJBS="$LIBOBJS"
+echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
+echo "configure:2347: checking for st_blocks in struct stat" >&5
+if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2352 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+int main() {
+struct stat s; s.st_blocks;
+; return 0; }
+EOF
+if { (eval echo configure:2360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_st_blocks=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_st_blocks=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_struct_st_blocks" 1>&6
+if test $ac_cv_struct_st_blocks = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ST_BLOCKS 1
+EOF
+
+else
+  LIBOBJS="$LIBOBJS fileblocks.${ac_objext}"
+fi
+
+LIBOBJS="$save_LIBOBJS"
+echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
+echo "configure:2384: checking for st_rdev in struct stat" >&5
+if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2389 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+int main() {
+struct stat s; s.st_rdev;
+; return 0; }
+EOF
+if { (eval echo configure:2397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_st_rdev=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_st_rdev=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6
+if test $ac_cv_struct_st_rdev = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ST_RDEV 1
+EOF
+
+fi
+
+
+echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
+echo "configure:2419: checking type of array argument to getgroups" >&5
+if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_type_getgroups=cross
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2427 "configure"
+#include "confdefs.h"
+
+/* Thanks to Mike Rendell for this test.  */
+#include <sys/types.h>
+#define NGID 256
+#undef MAX
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
+main()
+{
+  gid_t gidset[NGID];
+  int i, n;
+  union { gid_t gval; long lval; }  val;
+
+  val.lval = -1;
+  for (i = 0; i < NGID; i++)
+    gidset[i] = val.gval;
+  n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
+                 gidset);
+  /* Exit non-zero if getgroups seems to require an array of ints.  This
+     happens when gid_t is short but getgroups modifies an array of ints.  */
+  exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
+}
+
+EOF
+if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+    ac_cv_type_getgroups=gid_t
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_type_getgroups=int
+fi
+rm -fr conftest*
+fi
+
+if test $ac_cv_type_getgroups = cross; then
+        cat > conftest.$ac_ext <<EOF
+#line 2466 "configure"
+#include "confdefs.h"
+#include <unistd.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "getgroups.*int.*gid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_getgroups=gid_t
+else
+  rm -rf conftest*
+  ac_cv_type_getgroups=int
+fi
+rm -f conftest*
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_type_getgroups" 1>&6
+cat >> confdefs.h <<EOF
+#define GETGROUPS_T $ac_cv_type_getgroups
+EOF
+
+
+echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+echo "configure:2490: checking return type of signal handlers" >&5
+if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2495 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+#undef signal
+#endif
+#ifdef __cplusplus
+extern "C" void (*signal (int, void (*)(int)))(int);
+#else
+void (*signal ()) ();
+#endif
+
+int main() {
+int i;
+; return 0; }
+EOF
+if { (eval echo configure:2512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_type_signal=void
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_type_signal=int
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_type_signal" 1>&6
+cat >> confdefs.h <<EOF
+#define RETSIGTYPE $ac_cv_type_signal
+EOF
+
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "configure:2533: checking for working alloca.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2538 "configure"
+#include "confdefs.h"
+#include <alloca.h>
+int main() {
+char *p = alloca(2 * sizeof(int));
+; return 0; }
+EOF
+if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_header_alloca_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_alloca_h=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
+if test $ac_cv_header_alloca_h = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ALLOCA_H 1
+EOF
+
+fi
+
+echo $ac_n "checking for alloca""... $ac_c" 1>&6
+echo "configure:2566: checking for alloca" >&5
+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2571 "configure"
+#include "confdefs.h"
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  if HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int main() {
+char *p = (char *) alloca(1);
+; return 0; }
+EOF
+if { (eval echo configure:2599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_func_alloca_works=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_alloca_works=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
+if test $ac_cv_func_alloca_works = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ALLOCA 1
+EOF
+
+fi
+
+if test $ac_cv_func_alloca_works = no; then
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+  # that cause trouble.  Some versions do not even contain alloca or
+  # contain a buggy version.  If you still want to use their alloca,
+  # use ar to extract alloca.o from them instead of compiling alloca.c.
+  ALLOCA=alloca.${ac_objext}
+  cat >> confdefs.h <<\EOF
+#define C_ALLOCA 1
+EOF
+
+
+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo "configure:2631: checking whether alloca needs Cray hooks" >&5
+if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2636 "configure"
+#include "confdefs.h"
+#if defined(CRAY) && ! defined(CRAY2)
+webecray
+#else
+wenotbecray
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "webecray" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_os_cray=yes
+else
+  rm -rf conftest*
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_os_cray" 1>&6
+if test $ac_cv_os_cray = yes; then
+for ac_func in _getb67 GETB67 getb67; do
+  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2661: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2666 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<EOF
+#define CRAY_STACKSEG_END $ac_func
+EOF
+
+  break
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+done
+fi
+
+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "configure:2716: checking stack direction for C alloca" >&5
+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2724 "configure"
+#include "confdefs.h"
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+main ()
+{
+  exit (find_stack_direction() < 0);
+}
+EOF
+if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_stack_direction=1
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_stack_direction=-1
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
+cat >> confdefs.h <<EOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+EOF
+
+fi
+
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+echo "configure:2765: checking for pid_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2770 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_pid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_pid_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+if test $ac_cv_type_pid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define pid_t int
+EOF
+
+fi
+
+ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
+echo "configure:2799: checking for vfork.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2804 "configure"
+#include "confdefs.h"
+#include <vfork.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_VFORK_H 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for working vfork""... $ac_c" 1>&6
+echo "configure:2834: checking for working vfork" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  echo $ac_n "checking for vfork""... $ac_c" 1>&6
+echo "configure:2840: checking for vfork" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2845 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char vfork(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char vfork();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_vfork) || defined (__stub___vfork)
+choke me
+#else
+vfork();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_vfork=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_vfork=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2890 "configure"
+#include "confdefs.h"
+/* Thanks to Paul Eggert for this test.  */
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_VFORK_H
+#include <vfork.h>
+#endif
+/* On some sparc systems, changes by the child to local and incoming
+   argument registers are propagated back to the parent.
+   The compiler is told about this with #include <vfork.h>,
+   but some compilers (e.g. gcc -O) don't grok <vfork.h>.
+   Test for this by using a static variable whose address
+   is put into a register that is clobbered by the vfork.  */
+static
+#ifdef __cplusplus
+sparc_address_test (int arg)
+#else
+sparc_address_test (arg) int arg;
+#endif
+{
+  static pid_t child;
+  if (!child) {
+    child = vfork ();
+    if (child < 0) {
+      perror ("vfork");
+      _exit(2);
+    }
+    if (!child) {
+      arg = getpid();
+      write(-1, "", 0);
+      _exit (arg);
+    }
+  }
+}
+main() {
+  pid_t parent = getpid ();
+  pid_t child;
+
+  sparc_address_test ();
+
+  child = vfork ();
+
+  if (child == 0) {
+    /* Here is another test for sparc vfork register problems.
+       This test uses lots of local variables, at least
+       as many local variables as main has allocated so far
+       including compiler temporaries.  4 locals are enough for
+       gcc 1.40.3 on a Solaris 4.1.3 sparc, but we use 8 to be safe.
+       A buggy compiler should reuse the register of parent
+       for one of the local variables, since it will think that
+       parent can't possibly be used any more in this routine.
+       Assigning to the local variable will thus munge parent
+       in the parent process.  */
+    pid_t
+      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+    /* Convince the compiler that p..p7 are live; otherwise, it might
+       use the same hardware register for all 8 local variables.  */
+    if (p != p1 || p != p2 || p != p3 || p != p4
+	|| p != p5 || p != p6 || p != p7)
+      _exit(1);
+
+    /* On some systems (e.g. IRIX 3.3),
+       vfork doesn't separate parent from child file descriptors.
+       If the child closes a descriptor before it execs or exits,
+       this munges the parent's descriptor as well.
+       Test for this by closing stdout in the child.  */
+    _exit(close(fileno(stdout)) != 0);
+  } else {
+    int status;
+    struct stat st;
+
+    while (wait(&status) != child)
+      ;
+    exit(
+	 /* Was there some problem with vforking?  */
+	 child < 0
+
+	 /* Did the child fail?  (This shouldn't happen.)  */
+	 || status
+
+	 /* Did the vfork/compiler bug occur?  */
+	 || parent != getpid()
+
+	 /* Did the file descriptor bug occur?  */
+	 || fstat(fileno(stdout), &st) != 0
+	 );
+  }
+}
+EOF
+if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_vfork_works=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_vfork_works=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
+if test $ac_cv_func_vfork_works = no; then
+  cat >> confdefs.h <<\EOF
+#define vfork fork
+EOF
+
+fi
+
+echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+echo "configure:3008: checking for 8-bit clean memcmp" >&5
+if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_memcmp_clean=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3016 "configure"
+#include "confdefs.h"
+
+main()
+{
+  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+}
+
+EOF
+if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_memcmp_clean=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_memcmp_clean=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
+test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
+
+for ac_func in dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\
+		 strchr strstr strtoul strdup crypt flock vsnprintf\
+		 fnmatch isinf isnan finite
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3048: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3053 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
+fi
+done
+
+
+for ac_func in fmod killpg drand48 random wait4 waitpid syscall getcwd\
+	      truncate chsize times utimes fcntl lockf setitimer\
+	      setruid seteuid setreuid setrgid setegid setregid\
+	      getpgrp setpgrp getpgid setpgid getgroups getpriority\
+	      dlopen sigprocmask sigaction _setjmp setsid
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3109: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3114 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+echo "configure:3162: checking whether struct tm is in sys/time.h or time.h" >&5
+if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3167 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <time.h>
+int main() {
+struct tm *tp; tp->tm_sec;
+; return 0; }
+EOF
+if { (eval echo configure:3175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_tm=time.h
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_tm=sys/time.h
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_struct_tm" 1>&6
+if test $ac_cv_struct_tm = sys/time.h; then
+  cat >> confdefs.h <<\EOF
+#define TM_IN_SYS_TIME 1
+EOF
+
+fi
+
+echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
+echo "configure:3196: checking for tm_zone in struct tm" >&5
+if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3201 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <$ac_cv_struct_tm>
+int main() {
+struct tm tm; tm.tm_zone;
+; return 0; }
+EOF
+if { (eval echo configure:3209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_tm_zone=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_tm_zone=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6
+if test "$ac_cv_struct_tm_zone" = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_TM_ZONE 1
+EOF
+
+else
+  echo $ac_n "checking for tzname""... $ac_c" 1>&6
+echo "configure:3229: checking for tzname" >&5
+if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3234 "configure"
+#include "confdefs.h"
+#include <time.h>
+#ifndef tzname /* For SGI.  */
+extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
+#endif
+int main() {
+atoi(*tzname);
+; return 0; }
+EOF
+if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_var_tzname=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_var_tzname=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_var_tzname" 1>&6
+  if test $ac_cv_var_tzname = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_TZNAME 1
+EOF
+
+  fi
+fi
+
+if test "$ac_cv_func_strftime" = no; then
+    cat > conftest.$ac_ext <<EOF
+#line 3267 "configure"
+#include "confdefs.h"
+
+int main() {
+extern int daylight; int i = daylight;
+; return 0; }
+EOF
+if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define HAVE_DAYLIGHT 1
+EOF
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+fi
+
+if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
+   cat >> confdefs.h <<\EOF
+#define POSIX_SIGNAL 1
+EOF
+
+else
+  echo $ac_n "checking for BSD signal semantics""... $ac_c" 1>&6
+echo "configure:3294: checking for BSD signal semantics" >&5
+if eval "test \"`echo '$''{'rb_cv_bsd_signal'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  rb_cv_bsd_signal=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3302 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#include <signal.h>
+
+void
+sig_handler(dummy)
+     int dummy;
+{
+}
+
+int
+main()
+{
+  signal(SIGINT, sig_handler);
+  kill(getpid(), SIGINT);
+  kill(getpid(), SIGINT);
+  return 0;
+}
+
+EOF
+if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  rb_cv_bsd_signal=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  rb_cv_bsd_signal=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rb_cv_bsd_signal" 1>&6
+  if test "$rb_cv_bsd_signal" = yes; then
+    cat >> confdefs.h <<\EOF
+#define BSD_SIGNAL 1
+EOF
+
+  fi
+fi
+
+echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
+echo "configure:3348: checking whether getpgrp takes no argument" >&5
+if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3356 "configure"
+#include "confdefs.h"
+
+/*
+ * If this system has a BSD-style getpgrp(),
+ * which takes a pid argument, exit unsuccessfully.
+ *
+ * Snarfed from Chet Ramey's bash pgrp.c test program
+ */
+#include <stdio.h>
+#include <sys/types.h>
+
+int     pid;
+int     pg1, pg2, pg3, pg4;
+int     ng, np, s, child;
+
+main()
+{
+        pid = getpid();
+        pg1 = getpgrp(0);
+        pg2 = getpgrp();
+        pg3 = getpgrp(pid);
+        pg4 = getpgrp(1);
+
+        /*
+         * If all of these values are the same, it's pretty sure that
+         * we're on a system that ignores getpgrp's first argument.
+         */
+        if (pg2 == pg4 && pg1 == pg3 && pg2 == pg3)
+                exit(0);
+
+        child = fork();
+        if (child < 0)
+                exit(1);
+        else if (child == 0) {
+                np = getpid();
+                /*
+                 * If this is Sys V, this will not work; pgrp will be
+                 * set to np because setpgrp just changes a pgrp to be
+                 * the same as the pid.
+                 */
+                setpgrp(np, pg1);
+                ng = getpgrp(0);        /* Same result for Sys V and BSD */
+                if (ng == pg1) {
+                        exit(1);
+                } else {
+                        exit(0);
+                }
+        } else {
+                wait(&s);
+                exit(s>>8);
+        }
+}
+
+EOF
+if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_getpgrp_void=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_getpgrp_void=no
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$ac_cv_func_getpgrp_void" 1>&6
+if test $ac_cv_func_getpgrp_void = yes; then
+  cat >> confdefs.h <<\EOF
+#define GETPGRP_VOID 1
+EOF
+
+fi
+
+echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
+echo "configure:3435: checking whether setpgrp takes no argument" >&5
+if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3443 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+/*
+ * If this system has a BSD-style setpgrp, which takes arguments, exit
+ * successfully.
+ */
+main()
+{
+    if (setpgrp(1,1) == -1)
+	exit(0);
+    else
+	exit(1);
+}
+
+EOF
+if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_setpgrp_void=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_setpgrp_void=yes
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$ac_cv_func_setpgrp_void" 1>&6
+if test $ac_cv_func_setpgrp_void = yes; then
+  cat >> confdefs.h <<\EOF
+#define SETPGRP_VOID 1
+EOF
+
+fi
+  
+
+echo $ac_n "checking for working strtod""... $ac_c" 1>&6
+echo "configure:3488: checking for working strtod" >&5
+if eval "test \"`echo '$''{'rb_cv_func_strtod'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  rb_cv_func_strtod=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3496 "configure"
+#include "confdefs.h"
+
+double strtod ();
+int
+main()
+{
+  {
+    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
+    char *string = " +69";
+    char *term;
+    double value;
+    value = strtod(string, &term);
+    if (value != 69 || term != (string + 4))
+      exit(1);
+  }
+
+  {
+    /* Under Solaris 2.4, strtod returns the wrong value for the
+       terminating character under some conditions.  */
+    char *string = "NaN";
+    char *term;
+    strtod(string, &term);
+    if (term != string && *(term - 1) == 0)
+      exit(1);
+  }
+  exit(0);
+}
+
+EOF
+if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  rb_cv_func_strtod=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  rb_cv_func_strtod=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rb_cv_func_strtod" 1>&6
+test $rb_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
+
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:3544: checking whether byte ordering is bigendian" >&5
+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+cat > conftest.$ac_ext <<EOF
+#line 3551 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
+
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:3562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat > conftest.$ac_ext <<EOF
+#line 3566 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
+
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:3577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_bigendian=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_bigendian=no
+fi
+rm -f conftest*
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+if test $ac_cv_c_bigendian = unknown; then
+if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3597 "configure"
+#include "confdefs.h"
+main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}
+EOF
+if { (eval echo configure:3610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_bigendian=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian=yes
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_c_bigendian" 1>&6
+if test $ac_cv_c_bigendian = yes; then
+  cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
+
+fi
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:3634: checking for working const" >&5
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3639 "configure"
+#include "confdefs.h"
+
+int main() {
+
+/* Ultrix mips cc rejects this.  */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this.  */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this.  */
+struct point {int x, y;};
+static struct point const zero = {0,0};
+/* AIX XL C 1.02.0.0 rejects this.
+   It does not let you subtract one const X* pointer from another in an arm
+   of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this.  */
+  char *t;
+  char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+  *t++ = 0;
+}
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying
+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+  struct s { int j; const int *ap[3]; };
+  struct s *b; b->j = 5;
+}
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  const int foo = 10;
+}
+
+; return 0; }
+EOF
+if { (eval echo configure:3688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_const=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 
+EOF
+
+fi
+
+echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
+echo "configure:3709: checking whether char is unsigned" >&5
+if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$GCC" = yes; then
+  # GCC predefines this symbol on systems where it applies.
+cat > conftest.$ac_ext <<EOF
+#line 3716 "configure"
+#include "confdefs.h"
+#ifdef __CHAR_UNSIGNED__
+  yes
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_c_char_unsigned=yes
+else
+  rm -rf conftest*
+  ac_cv_c_char_unsigned=no
+fi
+rm -f conftest*
+
+else
+if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3738 "configure"
+#include "confdefs.h"
+/* volatile prevents gcc2 from optimizing the test away on sparcs.  */
+#if !defined(__STDC__) || __STDC__ != 1
+#define volatile
+#endif
+main() {
+  volatile char c = 255; exit(c < 0);
+}
+EOF
+if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_char_unsigned=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_char_unsigned=no
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_c_char_unsigned" 1>&6
+if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
+  cat >> confdefs.h <<\EOF
+#define __CHAR_UNSIGNED__ 1
+EOF
+
+fi
+
+
+echo $ac_n "checking whether right shift preserve sign bit""... $ac_c" 1>&6
+echo "configure:3773: checking whether right shift preserve sign bit" >&5
+if eval "test \"`echo '$''{'rb_cv_rshift_sign'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  rb_cv_rshift_sign=yes
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3781 "configure"
+#include "confdefs.h"
+
+int
+main()
+{
+  if (-1==(-1>>1))
+    return 0;
+  return 1;
+}
+
+EOF
+if { (eval echo configure:3793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  rb_cv_rshift_sign=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  rb_cv_rshift_sign=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rb_cv_rshift_sign" 1>&6
+if test "$rb_cv_rshift_sign" = yes; then
+  cat >> confdefs.h <<\EOF
+#define RSHIFT(x,y) ((x)>>y)
+EOF
+
+else
+  cat >> confdefs.h <<\EOF
+#define RSHIFT(x,y) (((x)<0) ? ~((~(x))>>y) : (x)>>y)
+EOF
+
+fi
+
+echo $ac_n "checking count field in FILE structures""... $ac_c" 1>&6
+echo "configure:3821: checking count field in FILE structures" >&5
+if eval "test \"`echo '$''{'rb_cv_fcnt'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3826 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+FILE *f = stdin; f->_cnt = 0;
+; return 0; }
+EOF
+if { (eval echo configure:3833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_fcnt="_cnt"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+if test "$rb_cv_fcnt" = ""; then
+    cat > conftest.$ac_ext <<EOF
+#line 3843 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+FILE *f = stdin; f->__cnt = 0;
+; return 0; }
+EOF
+if { (eval echo configure:3850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_fcnt="__cnt"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+fi
+if test "$rb_cv_fcnt" = ""; then
+    cat > conftest.$ac_ext <<EOF
+#line 3861 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+FILE *f = stdin; f->_r = 0;
+; return 0; }
+EOF
+if { (eval echo configure:3868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_fcnt="_r"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+fi
+if test "$rb_cv_fcnt" = ""; then
+    cat > conftest.$ac_ext <<EOF
+#line 3879 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+FILE *f = stdin; f->readCount = 0;
+; return 0; }
+EOF
+if { (eval echo configure:3886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_fcnt="readCount"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+fi
+if test "$rb_cv_fcnt" = ""; then
+    cat > conftest.$ac_ext <<EOF
+#line 3897 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+FILE *f = stdin; f->_rcount = 0;
+; return 0; }
+EOF
+if { (eval echo configure:3904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_fcnt="_rcount"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  rb_cv_fcnt="not found"
+fi
+rm -f conftest*
+fi
+fi
+
+if test "$rb_cv_fcnt" = "not found"; then
+  echo "$ac_t""not found(OK if using GNU libc)" 1>&6
+else
+  echo "$ac_t""$rb_cv_fcnt" 1>&6
+  cat >> confdefs.h <<EOF
+#define FILE_COUNT $rb_cv_fcnt
+EOF
+
+fi
+
+
+# Check whether --with-default-kcode or --without-default-kcode was given.
+if test "${with_default_kcode+set}" = set; then
+  withval="$with_default_kcode"
+  case $withval in
+	utf8) cat >> confdefs.h <<\EOF
+#define DEFAULT_KCODE KCODE_UTF8
+EOF
+;;
+	euc)  cat >> confdefs.h <<\EOF
+#define DEFAULT_KCODE KCODE_EUC
+EOF
+;;
+	sjis) cat >> confdefs.h <<\EOF
+#define DEFAULT_KCODE KCODE_SJIS
+EOF
+;;
+	none) cat >> confdefs.h <<\EOF
+#define DEFAULT_KCODE KCODE_NONE
+EOF
+;;
+        *)    echo "configure: warning: $withval is not valid kcode; ignored" 1>&2;;
+	esac
+fi
+
+
+# Check whether --with-dln-a-out or --without-dln-a-out was given.
+if test "${with_dln_a_out+set}" = set; then
+  withval="$with_dln_a_out"
+  
+	case $withval in
+	yes) with_dln_a_out=yes;;
+	*)   with_dln_a_out=no;;
+	esac
+else
+  with_dln_a_out=no
+fi
+
+
+
+case "$host_os" in
+    linux*)
+  echo $ac_n "checking whether ELF binaries are produced""... $ac_c" 1>&6
+echo "configure:3970: checking whether ELF binaries are produced" >&5
+if eval "test \"`echo '$''{'rb_cv_binary_elf'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  rb_cv_binary_elf=yes
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3978 "configure"
+#include "confdefs.h"
+
+/* Test for whether ELF binaries are produced */
+#include <fcntl.h>
+#include <stdlib.h>
+main() {
+	char buffer[4];
+	int i=open("conftest",O_RDONLY);
+	if(i==-1)
+		exit(1); /* fail */
+	if(read(i,&buffer[0],4)<4)
+		exit(1); /* fail */
+	if(buffer[0] != 127 || buffer[1] != 'E' ||
+           buffer[2] != 'L' || buffer[3] != 'F')
+		exit(1); /* fail */
+	exit(0); /* succeed (yes, it's ELF) */
+}
+
+EOF
+if { (eval echo configure:3998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  rb_cv_binary_elf=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  rb_cv_binary_elf=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rb_cv_binary_elf" 1>&6
+  if test "$rb_cv_binary_elf" = no; then
+    with_dln_a_out=yes
+    host_os=${host_os}-a_out
+  else
+    LDFLAGS="-rdynamic"
+  fi;;
+esac
+
+
+
+STATIC=
+
+if test "$with_dln_a_out" != yes; then
+  rb_cv_dlopen=unknown
+  echo $ac_n "checking whether OS depend dynamic link works""... $ac_c" 1>&6
+echo "configure:4028: checking whether OS depend dynamic link works" >&5
+  if test "$GCC" = yes; then
+    case "$host_os" in
+    nextstep*)	;;
+    openstep*)	;;
+    rhapsody*)	;;
+    human*)	;;
+    bsdi3*)	;;
+    cygwin*)	;;
+    netbsd*) CCDLFLAGS=-fpic
+     case "$host_cpu" in
+     mips*) CCDLFLAGS=-fPIC ;;
+     *) ;;
+     esac ;;
+    *) CCDLFLAGS=-fPIC;;
+    esac
+  else
+    case "$host_os" in
+	hpux*)		CCDLFLAGS='+z';;
+	solaris*|irix*)	CCDLFLAGS='-K PIC' ;;
+	sunos*)		CCDLFLAGS='-PIC' ;;
+	esix*|uxpds*)   CCDLFLAGS='-KPIC' ;;
+	*)		CCDLFLAGS='' ;;
+    esac
+  fi
+
+  case "$host_os" in
+	hpux*)		DLDFLAGS="-E"
+			LDSHARED='ld -b'
+			LDFLAGS="-Wl,-E"
+			rb_cv_dlopen=yes;;
+	solaris*) 	if test "$GCC" = yes; then
+			   LDSHARED='gcc -Wl,-G'
+			   `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null && LDFLAGS="-Wl,-E"
+			else
+			   LDSHARED='ld -G'
+			fi
+			rb_cv_dlopen=yes;;
+	sunos*) 	LDSHARED='ld -assert nodefinitions'
+			rb_cv_dlopen=yes;;
+	irix*) 	 	LDSHARED='ld -ignore_unresolved'
+			rb_cv_dlopen=yes;;
+	sysv4*) 	LDSHARED='ld -G'
+			rb_cv_dlopen=yes;;
+	esix*|uxpds*) 	LDSHARED="ld -G"
+			rb_cv_dlopen=yes ;;
+	osf*) 		LDSHARED="gcc -shared"
+			rb_cv_dlopen=yes ;;
+	linux*) 	LDSHARED="gcc -shared"
+			rb_cv_dlopen=yes ;;
+	freebsd*)       LDSHARED="gcc -shared"
+			if test -x /usr/bin/objformat && \
+			   test `/usr/bin/objformat` = "elf" ; then
+			    LDFLAGS="-rdynamic"
+			    DLDFLAGS='-Wl,-soname,$(.TARGET)'
+			    rb_cv_freebsd_elf=yes
+			else
+			  test "$GCC" = yes && `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null || LDSHARED="ld -Bshareable"
+			fi
+			rb_cv_dlopen=yes ;;
+	netbsd*)  	LDSHARED="ld -shared"
+			rb_cv_dlopen=yes ;;
+	openbsd*) 	LDSHARED="ld -Bforcearchive -Bshareable"
+			rb_cv_dlopen=yes ;;
+	bsdi3*) 	case "$CC" in
+			*shlicc*)	LDSHARED="$CC -r"
+					rb_cv_dlopen=yes ;;
+			esac ;;
+	nextstep*)	LDSHARED='cc -r -nostdlib'
+			LDFLAGS="-u libsys_s"
+			DLDFLAGS="$ARCH_FLAG" 
+			rb_cv_dlopen=yes ;;
+	openstep*)	LDSHARED='cc -dynamic -bundle -undefined suppress'
+			LDFLAGS=""
+			DLDFLAGS="$ARCH_FLAG"
+			rb_cv_dlopen=yes ;;
+	rhapsody*)	LDSHARED='cc -dynamic -bundle -undefined suppress'
+			LDFLAGS=""
+			DLDFLAGS="$ARCH_FLAG"
+			rb_cv_dlopen=yes ;;
+	aix*)		LDSHARED='/usr/ccs/bin/ld'
+			XLDFLAGS='-Wl,-bE:ruby.imp'
+			DLDFLAGS='-eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 -lc'
+			rb_cv_dlopen=yes ;;
+
+	human*)		DLDFLAGS=''
+			LDSHARED=''
+			LDFLAGS=''
+			rb_cv_dlopen=yes ;;
+	beos*) 		case "$host_cpu" in
+			  powerpc*)
+			    LDSHARED="ld -xms"
+			    DLDFLAGS="-f ruby.exp -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+                            ;;
+			  i586*)
+			    LDSHARED="ld -shared"
+			    DLDFLAGS="-L/boot/develop/lib/x86 -lbe -lroot"
+			    ;;
+			  *)
+			    DLDFLAGS="ruby.def -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+			esac
+			rb_cv_dlopen=yes ;;
+	cygwin*)	LDSHARED='dllwrap --export-all -s'
+			rb_cv_dlopen=yes ;;
+	*) 		LDSHARED='ld' ;;
+  esac
+  echo "$ac_t""$rb_cv_dlopen" 1>&6
+fi
+
+dln_a_out_works=no
+if test "$ac_cv_header_a_out_h" = yes; then
+  if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
+    cat confdefs.h > config.h
+    echo $ac_n "checking whether matz's dln works""... $ac_c" 1>&6
+echo "configure:4142: checking whether matz's dln works" >&5
+if eval "test \"`echo '$''{'rb_cv_dln_a_out'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4147 "configure"
+#include "confdefs.h"
+
+#define USE_DLN_A_OUT
+#include "dln.c"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  rb_cv_dln_a_out=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  rb_cv_dln_a_out=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$rb_cv_dln_a_out" 1>&6
+    if test "$rb_cv_dln_a_out" = yes; then
+      dln_a_out_works=yes
+      cat >> confdefs.h <<\EOF
+#define USE_DLN_A_OUT 1
+EOF
+
+    fi
+  fi
+fi
+
+if test "$dln_a_out_works" = yes; then
+  if test "$GCC" = yes; then
+    STATIC=-static
+  else
+    STATIC=-Bstatic
+  fi
+  DLEXT=so
+  cat >> confdefs.h <<\EOF
+#define DLEXT ".so"
+EOF
+
+  CCDLFLAGS=
+else
+  case "$host_os" in
+    hpux*)	DLEXT=sl
+	 	cat >> confdefs.h <<\EOF
+#define DLEXT ".sl"
+EOF
+;;
+    nextstep*)	DLEXT=bundle
+	 	cat >> confdefs.h <<\EOF
+#define DLEXT ".bundle"
+EOF
+;;
+    openstep*)	DLEXT=bundle
+	 	cat >> confdefs.h <<\EOF
+#define DLEXT ".bundle"
+EOF
+;;
+    rhapsody*)	DLEXT=bundle
+	 	cat >> confdefs.h <<\EOF
+#define DLEXT ".bundle"
+EOF
+;;
+    cygwin*)	DLEXT=dll
+	 	cat >> confdefs.h <<\EOF
+#define DLEXT ".dll"
+EOF
+;;
+    os2_emx)	DLEXT=o
+	 	cat >> confdefs.h <<\EOF
+#define DLEXT ".so"
+EOF
+;;
+    *)		DLEXT=so
+    		cat >> confdefs.h <<\EOF
+#define DLEXT ".so"
+EOF
+;;
+  esac
+fi
+
+if test "$with_dln_a_out" = yes; then
+  STRIP=true
+else
+  STRIP=strip
+fi
+
+case "$host_os" in
+  linux*)
+	STRIP='strip -S -x';;
+  nextstep*)
+	STRIP='strip -A -n';;
+  openstep*)
+	STRIP='strip -A -n';;
+  rhapsody*)
+	STRIP='strip -A -n';;
+esac
+
+EXTSTATIC=
+# Check whether --with-static-linked-ext or --without-static-linked-ext was given.
+if test "${with_static_linked_ext+set}" = set; then
+  withval="$with_static_linked_ext"
+  case $withval in
+	     yes) STATIC=
+		  EXTSTATIC=static;;
+	     *)	;;
+	     esac
+fi
+
+
+case "$host_os" in
+  human*)
+    echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6
+echo "configure:4264: checking for _harderr in -lsignal" >&5
+ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lsignal  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4272 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char _harderr();
+
+int main() {
+_harderr()
+; return 0; }
+EOF
+if { (eval echo configure:4283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo signal | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lsignal $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6
+echo "configure:4311: checking for hmemset in -lhmem" >&5
+ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lhmem  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4319 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char hmemset();
+
+int main() {
+hmemset()
+; return 0; }
+EOF
+if { (eval echo configure:4330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo hmem | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lhmem $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    for ac_func in select
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:4360: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4365 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:4388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+    echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6
+echo "configure:4413: checking whether PD libc _dtos18 fail to convert big number" >&5
+if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  rb_cv_missing__dtos18=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4421 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+main ()
+{
+   char buf[256];
+   sprintf (buf, "%g", 1e+300);
+   exit (strcmp (buf, "1e+300") ? 0 : 1);
+}
+
+EOF
+if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  rb_cv_missing__dtos18=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  rb_cv_missing__dtos18=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rb_cv_missing__dtos18" 1>&6
+    if test "$rb_cv_missing__dtos18" = yes; then
+      cat >> confdefs.h <<\EOF
+#define MISSING__DTOS18 1
+EOF
+
+    fi
+    echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6
+echo "configure:4455: checking whether PD libc fconvert fail to round" >&5
+if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  rb_cv_missing_fconvert=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4463 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#include <math.h>
+main ()
+{
+  char buf[256];
+  sprintf (buf, "%f", log(exp(1.0)));
+  exit (strcmp (buf, "1.000000") ? 0 : 1);
+}
+
+EOF
+if { (eval echo configure:4476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  rb_cv_missing_fconvert=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  rb_cv_missing_fconvert=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rb_cv_missing_fconvert" 1>&6
+    if test "$rb_cv_missing_fconvert" = yes; then
+      cat >> confdefs.h <<\EOF
+#define MISSING_FCONVERT 1
+EOF
+
+    fi
+    LIBOBJS="$LIBOBJS x68.o"
+    CFLAGS="$CFLAGS -fansi-only -cc1-stack=196608 -cpp-stack=2694144"
+    binsuffix=.x
+    setup=Setup.x68
+    ;;
+    os2_emx)
+    LIBOBJS="$LIBOBJS os2.o"
+    binsuffix=.exe
+    setup=Setup.emx
+    ;;
+  cygwin*)
+    binsuffix=.exe
+    setup=Setup
+    ;;
+  *)
+    binsuffix=
+    setup=Setup
+    ;;
+esac
+
+
+
+
+
+
+if test "$prefix" = NONE; then
+  prefix=$ac_default_prefix
+fi
+
+if test "$fat_binary" = yes ; then
+  CFLAGS="$CFLAGS $ARCH_FLAG"
+fi
+
+LIBRUBY_A='lib$(RUBY_INSTALL_NAME).a'
+LIBRUBY='$(LIBRUBY_A)'
+LIBRUBYARG='$(LIBRUBY_A)'
+SOLIBS=
+if test "$host_os" = "beos"; then
+  LIBRUBY='$(LIBRUBY_SO)'
+  LIBRUBYARG='-l$(RUBY_INSTALL_NAME)'
+  SOLIBS='-lnet'
+  echo creating ruby.def
+  case "$host_cpu" in
+    powerpc*)
+      cp beos/ruby.def.in ruby.exp
+      CFLAGS="$CFLAGS -relax_pointers"
+      ;;
+    i586*)
+      LDFLAGS="$LDFLAGS -L."
+      ;;
+    *)
+      echo EXPORTS > ruby.def
+      cat beos/ruby.def.in >> ruby.def
+      ;;
+  esac
+fi
+
+FIRSTMAKEFILE=""
+LIBRUBY_LDSHARED=$LDSHARED
+LIBRUBY_DLDFLAGS=$DLDFLAGS
+LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
+LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so'
+# Check whether --enable-enable-shared or --disable-enable-shared was given.
+if test "${enable_enable_shared+set}" = set; then
+  enableval="$enable_enable_shared"
+  enable_shared=$enableval
+fi
+
+if test "$enable_shared" = 'yes'; then
+  LIBRUBY='$(LIBRUBY_SO)'
+  LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)'
+  CFLAGS="$CFLAGS $CCDLFLAGS"
+  case "$host_os" in
+    sunos4*)
+	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so'
+	;;
+    linux*)
+	XLDFLAGS='-Wl,-rpath,${prefix}/lib':/usr/lib:/lib
+	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so'
+	;;
+    freebsd*)
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)'
+	if test "$rb_cv_freebsd_elf" != "yes" ; then
+	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
+	    LIBRUBY_ALIASES=''
+	fi
+	;;
+    netbsd*)
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
+ 	case "$host_cpu" in
+	alpha|mipsel|mipseb|powerpc|sparc64)  # ELF platforms
+	   LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' ;;
+ 	*) LIBRUBY_ALIASES= ;;  # a.out platforms
+	esac
+ 	;;
+    solaris*)
+	XLDFLAGS='-R${prefix}/lib'
+ 	;;
+    hpux*)
+	XLDFLAGS='-Wl,+s,+b,$(prefix)/lib'
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
+	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).sl'
+	;;
+    aix*)
+	if test "$GCC" = yes; then
+	    LIBRUBY_LDSHARED='$(CC) -shared'
+	    LIBRUBY_DLDFLAGS='-Wl,-bE:ruby.imp'
+	else
+	    LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
+	    LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
+	fi
+	LIBRUBYARG='-L${prefix}/lib -Wl,lib$(RUBY_INSTALL_NAME).so'
+	SOLIBS='-lm -lc'
+	;;
+    cygwin*)
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).a'
+	LIBRUBY_ALIASES=''
+	LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a'
+	LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)'
+	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
+	LIBOBJS="$LIBOBJS strftime.o"
+	CCDLFLAGS=-DUSEIMPORTLIB
+	    ;;
+    *)
+	;;
+  esac
+fi
+
+case "$host_os" in
+	nextstep*)
+    	CFLAGS="$CFLAGS -pipe"
+		;;
+	openstep*)
+    	CFLAGS="$CFLAGS -pipe"
+		;;
+	rhasody*)
+    	CFLAGS="$CFLAGS -pipe -no-precomp"
+		;;
+	*)
+		;;	
+esac
+
+
+
+
+
+
+
+
+
+
+
+ri_prefix=
+test "$program_prefix" != NONE &&
+  ri_prefix=$program_prefix
+
+ri_suffix=
+test "$program_suffix" != NONE &&
+  ri_suffix=$program_suffix
+
+RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
+RUBY_LIB_PATH="${prefix}/lib/ruby/${MAJOR}.${MINOR}"
+cat >> confdefs.h <<EOF
+#define RUBY_LIB "${RUBY_LIB_PATH}"
+EOF
+
+RUBY_SITE_LIB_PATH="${RUBY_LIB_PATH}/site_ruby"
+cat >> confdefs.h <<EOF
+#define RUBY_SITE_LIB "${RUBY_SITE_LIB_PATH}"
+EOF
+
+
+configure_args=$ac_configure_args
+
+if test "$fat_binary" = yes ; then
+    arch="fat-${host_os}"
+
+    cat >> confdefs.h <<EOF
+#define RUBY_THIN_ARCHLIB "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${host_os}"
+EOF
+
+
+    cat >> confdefs.h <<EOF
+#define RUBY_SITE_THIN_ARCHLIB "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${host_os}"
+EOF
+
+    cat >> confdefs.h <<EOF
+#define RUBY_PLATFORM __ARCHITECTURE__ "-${host_os}"
+EOF
+
+else
+    arch="${host_cpu}-${host_os}"
+    cat >> confdefs.h <<EOF
+#define RUBY_PLATFORM "${arch}"
+EOF
+
+fi
+cat >> confdefs.h <<EOF
+#define RUBY_ARCHLIB "${RUBY_LIB_PATH}/${arch}"
+EOF
+
+cat >> confdefs.h <<EOF
+#define RUBY_SITE_ARCHLIB "${RUBY_SITE_LIB_PATH}/${arch}"
+EOF
+
+
+# Check whether --with-search-path or --without-search-path was given.
+if test "${with_search_path+set}" = set; then
+  withval="$with_search_path"
+  search_path=$withval
+fi
+
+if test "$search_path" != ""; then
+    cat >> confdefs.h <<EOF
+#define RUBY_SEARCH_PATH "$search_path"
+EOF
+
+fi
+
+echo "creating config.h"
+cat confdefs.h > config.h
+
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
+
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+
+trap 'rm -fr `echo "$FIRSTMAKEFILE Makefile ext/extmk.rb" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@SHELL@%$SHELL%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@MAJOR@%$MAJOR%g
+s%@MINOR@%$MINOR%g
+s%@TEENY@%$TEENY%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@CC@%$CC%g
+s%@CPP@%$CPP%g
+s%@YACC@%$YACC%g
+s%@RANLIB@%$RANLIB%g
+s%@AR@%$AR%g
+s%@LN_S@%$LN_S%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@EXEEXT@%$EXEEXT%g
+s%@OBJEXT@%$OBJEXT%g
+s%@LIBOBJS@%$LIBOBJS%g
+s%@ALLOCA@%$ALLOCA%g
+s%@DEFAULT_KCODE@%$DEFAULT_KCODE%g
+s%@XLDFLAGS@%$XLDFLAGS%g
+s%@DLDFLAGS@%$DLDFLAGS%g
+s%@STATIC@%$STATIC%g
+s%@CCDLFLAGS@%$CCDLFLAGS%g
+s%@LDSHARED@%$LDSHARED%g
+s%@DLEXT@%$DLEXT%g
+s%@STRIP@%$STRIP%g
+s%@EXTSTATIC@%$EXTSTATIC%g
+s%@binsuffix@%$binsuffix%g
+s%@setup@%$setup%g
+s%@LIBRUBY_LDSHARED@%$LIBRUBY_LDSHARED%g
+s%@LIBRUBY_DLDFLAGS@%$LIBRUBY_DLDFLAGS%g
+s%@RUBY_INSTALL_NAME@%$RUBY_INSTALL_NAME%g
+s%@LIBRUBY_A@%$LIBRUBY_A%g
+s%@LIBRUBY_SO@%$LIBRUBY_SO%g
+s%@LIBRUBY_ALIASES@%$LIBRUBY_ALIASES%g
+s%@LIBRUBY@%$LIBRUBY%g
+s%@LIBRUBYARG@%$LIBRUBYARG%g
+s%@SOLIBS@%$SOLIBS%g
+s%@arch@%$arch%g
+s%@configure_args@%$configure_args%g
+
+CEOF
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"$FIRSTMAKEFILE Makefile ext/extmk.rb"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
diff --git a/configure.bat b/configure.bat
new file mode 100644
index 0000000000..34d61a9071
--- /dev/null
+++ b/configure.bat
@@ -0,0 +1,20 @@
+@echo off
+sed -n "/VERSION/s/[^0-9.]\+//gp" < version.h > version.out
+cut -d. -f1 version.out > major.out
+cut -d. -f2 version.out > minor.out
+cut -d. -f3 version.out > teeny.out
+sed "s/^/s,@MAJOR@,/;s/$/,/g" major.out >> top.sed
+sed "s/^/s,@MINOR@,/;s/$/,/g" minor.out >> top.sed
+sed "s/^/s,@TEENY@,/;s/$/,/g" teeny.out >> top.sed
+rm version.out major.out minor.out teeny.out
+sed -f top.sed < Makefile.in > Makefile
+sed -f top.sed < ext\extmk.rb.in > ext\extmk.rb
+copy ext\Setup.dj ext\Setup
+copy config_h.dj config.h
+if not (%OS%) == (Windows_NT) goto LFN
+    copy missing\vsnprintf.c missing\vsnprint.c
+    copy config_s.dj config.sta
+goto end
+:LFN
+    copy config_s.dj config.status
+:end
diff --git a/configure.in b/configure.in
index e4356d9a65..b07e76fd45 100644
--- a/configure.in
+++ b/configure.in
@@ -1,48 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT()
-
-AC_PREREQ(2.50)
-
-AC_DEFUN(RUBY_MINGW32,
-[case "$host_os" in
-cygwin*)
-AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
-[AC_TRY_CPP([
-#ifndef __MINGW32__
-# error
-#endif
-], rb_cv_mingw32=yes,rb_cv_mingw32=no)
-rm -f conftest*])
-test "$rb_cv_mingw32" = yes && target_os="mingw32"
-  ;;
-esac])
-
-AC_DEFUN(RUBY_CPPOUTFILE,
-[AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
-[cppflags=$CPPFLAGS
-CPPFLAGS='-o conftest.i'
-AC_TRY_CPP([], rb_cv_cppoutfile=yes, rb_cv_cppoutfile=no)
-CPPFLAGS=$cppflags
-rm -f conftest*])
-if test "$rb_cv_cppoutfile" = yes; then
-  CPPOUTFILE='-o conftest.i'
-elif test "$rb_cv_cppoutfile" = no; then
-  CPPOUTFILE='> conftest.i'
-elif test -n "$rb_cv_cppoutfile"; then
-  CPPOUTFILE="$rb_cv_cppoutfile"
-fi
-AC_SUBST(CPPOUTFILE)])
-
-AC_DEFUN(RUBY_PROG_GNU_LD,
-[AC_CACHE_CHECK(whether the linker is GNU ld, rb_cv_prog_gnu_ld,
-[if `$CC $CFLAGS $CPPFLAGS $LDFLAGS --print-prog-name=ld 2>&1` -v 2>&1 | grep "GNU ld" > /dev/null; then
-  rb_cv_prog_gnu_ld=yes
-else
-  rb_cv_prog_gnu_ld=no
-fi
-])
-GNU_LD=$rb_cv_prog_gnu_ld
-AC_SUBST(GNU_LD)])
+AC_INIT(ruby.h)
 
 rb_version=`grep RUBY_VERSION $srcdir/version.h`
 MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'`
@@ -52,37 +9,34 @@ AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
 AC_SUBST(TEENY)
 dnl checks for alternative programs
-AC_ARG_WITH(gcc, [  --without-gcc           never use gcc], [
+AC_ARG_WITH(gcc, [--without-gcc             never use gcc], [
 	case $withval in
-	no)	: ${CC=cc}
-		;;
-	yes)	: ${CC=gcc}
-		;;
+	no)	CC=cc
+		without_gcc=yes;;
+	yes)	CC=gcc
+		without_gcc=no;;
 	*)	CC=$withval
-		;;
-	esac])
+		without_gcc=$withval;;
+	esac], [without_gcc=no])
 dnl If the user switches compilers, we can't believe the cache
 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
 then
-  AC_MSG_ERROR(cached CC is different -- throw away $cache_file
+  AC_ERROR(cached CC is different -- throw away $cache_file
 (it is also a good idea to do 'make clean' before compiling))
 fi
 
-if test "$program_prefix" = NONE; then
-  program_prefix=
-fi
-AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 
 dnl checks for fat-binary
 fat_binary=no
 AC_ARG_ENABLE(fat-binary,
-       [  --enable-fat-binary     build a NeXT/Apple Multi Architecture Binary. ],
+       [--enable-fat-binary       build a NeXT/Apple Multi Architecture Binary. ],
        [fat_binary=$enableval])
  if test "$fat_binary" = yes ; then
 
     AC_MSG_CHECKING(target architecture)
 
-    case "$target_os" in
+    case "$host_os" in
     rhapsody*)
         echo -n "MacOS X Server: "
 	  	if test "$TARGET_ARCHS" = "" ; then
@@ -98,15 +52,7 @@ AC_ARG_ENABLE(fat-binary,
 		   TARGET_ARCHS="m68k `/usr/bin/arch`"
 	       fi
 	    fi
-	# to ensure AC_HEADER_SYS_WAIT works
-	AC_DEFINE(_POSIX_SOURCE)
         ;;
-    macos*|darwin*)
-        echo -n "MacOS X (Darwin): "
-            if test "$TARGET_ARCHS" = "" ; then
-                TARGET_ARCHS="ppc i386"
-            fi
-	;;
     esac
     # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
     for archs in $TARGET_ARCHS 
@@ -118,83 +64,31 @@ AC_ARG_ENABLE(fat-binary,
     echo "."
 fi 
 
-case $target_cpu in
-  i?86) frame_address=yes;;
-  *)    frame_address=no;;
-esac
-AC_ARG_ENABLE(frame-address,
-       [  --enable-frame-address  use GCC __builtin_frame_address(). ],
-       [frame_address=$enableval])
-if test $frame_address = yes; then
-    AC_DEFINE(USE_BUILTIN_FRAME_ADDRESS)
-fi
-
 AC_ARG_PROGRAM
 
 dnl Checks for programs.
-
-if test x"${build}" != x"${host}"; then
-  AC_CHECK_TOOL(CC, gcc)
-fi
 AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
-
-RUBY_PROG_GNU_LD
-RUBY_CPPOUTFILE
-
-OUTFLAG='-o '
-AC_SUBST(OUTFLAG)
-
-RUBY_MINGW32
-
 AC_PROG_YACC
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(AR, ar)
-if test -z "$AR"; then
-  AC_CHECK_PROGS(AR, aal, ar)
-fi
-
-case "$target_os" in
-cygwin*|mingw*)
-    AC_CHECK_TOOL(NM, nm)
-    AC_CHECK_TOOL(WINDRES, windres)
-    AC_CHECK_TOOL(DLLWRAP, dllwrap)
-    target_cpu=`echo $target_cpu | sed s/i.86/i386/`
-    : ${enable_shared=yes}
-    ;;
-aix*)
-    AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)
-    ;;
-esac
-
-# by TOYODA Eizi <toyoda@npd.kishou.go.jp>
-case "$target_os" in
-hiuxmpp*)
-    AC_DEFINE(__HIUX_MPP__)
-    ;;
-esac
+AC_PROG_RANLIB
+AC_SUBST(AR)
+AC_CHECK_PROGS(AR, ar aal, ar)
 
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
+AC_EXEEXT
+AC_OBJEXT
+
 # checks for UNIX variants that set C preprocessor variables
-AC_AIX
 AC_MINIX
 
-dnl check for large file stuff
-AC_SYS_LARGEFILE
-
-AC_CHECK_TYPES([long long, off_t])
-
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 0)
-AC_CHECK_SIZEOF(__int64, 0)
-AC_CHECK_SIZEOF(off_t, 0)
-AC_CHECK_SIZEOF(void*, 4)
-AC_CHECK_SIZEOF(float, 4)
-AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(void*)
+AC_CHECK_SIZEOF(float)
+AC_CHECK_SIZEOF(double)
 
 AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
   [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
@@ -233,113 +127,28 @@ if test "$rb_cv_stdarg" = yes; then
   AC_DEFINE(HAVE_STDARG_PROTOTYPES)
 fi
 
-AC_CACHE_CHECK([for noreturn], rb_cv_noreturn,
-[rb_cv_noreturn=no
-for mac in "x __attribute__ ((noreturn))" "__declspec(noreturn) x" x; do
-  AC_TRY_COMPILE(
-    [#define NORETURN(x) $mac
-NORETURN(void exit(int x));],
-    [],
-    [rb_cv_noreturn="$mac"; break])
-done])
-AC_DEFINE_UNQUOTED([NORETURN(x)], $rb_cv_noreturn)
-
-dnl Check whether we need to define sys_nerr locally
-AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
-#include <errno.h>])
-
-dnl whether link libc_r or not
-AC_ARG_WITH(libc_r, 
-	[  --with-libc_r           link libc_r if possible (FreeBSD only)], [
-	case $withval in
-	yes) with_libc_r=yes;;
-	*)   with_libc_r=no;;
-	esac], [with_libc_r=no])
+AC_CACHE_CHECK(for gcc attribute noreturn, rb_cv_have_attr_noreturn,
+  [AC_TRY_COMPILE([void exit(int x) __attribute__ ((noreturn));], [],
+	rb_cv_have_attr_noreturn=yes,
+	rb_cv_have_attr_noreturn=no)])
+if test "$rb_cv_have_attr_noreturn" = yes; then
+  AC_DEFINE(HAVE_ATTR_NORETURN)
+fi
 
 dnl Checks for libraries.
-case "$target_os" in
+case "$host_os" in
 nextstep*)	;;
 openstep*)	;;
 rhapsody*)	;;
-darwin*)	LIBS="-lobjc $LIBS";;
-hpux*)		LIBS="-lm $LIBS"
-		ac_cv_c_inline=no;;
-human*)		ac_cv_func_getpgrp_void=yes;;
+human*)		;;
 beos*)		;;
-cygwin*)	rb_cv_have_daylight=no
-		ac_cv_var_tzname=no
-		ac_cv_func__setjmp=no
-		ac_cv_func_setitimer=no
-		;;
-mingw*)		LIBS="-lwsock32 $LIBS"
-		ac_cv_header_a_out_h=no
-		ac_cv_header_pwd_h=no
-		ac_cv_header_utime_h=no
-		ac_cv_header_sys_ioctl_h=no
-		ac_cv_header_sys_param_h=no
-		ac_cv_header_sys_resource_h=no
-		ac_cv_header_sys_select_h=no
-		ac_cv_header_sys_times_h=no
-		ac_cv_func_times=yes
-		ac_cv_func_waitpid=yes
-		ac_cv_func_fsync=yes
-		ac_cv_func_vsnprintf=yes
-		ac_cv_func_seekdir=yes
-		ac_cv_func_telldir=yes
-		ac_cv_lib_crypt_crypt=no
-		;;
-os2-emx*)	LIBS="-lm $LIBS"
-		ac_cv_lib_dir_opendir=no;;
-msdosdjgpp*)	LIBS="-lm $LIBS"
-		ac_cv_func_getpgrp_void=yes;;
-freebsd*)	LIBS="-lm $LIBS"
-		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
-		  rb_cv_lib_xpg4_needed,
-		  [AC_TRY_CPP([
-#include <osreldate.h>
-#if __FreeBSD_version < 400020 || \
-   (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
-#error needs libxpg4
-#endif
-		   ],
-		   rb_cv_lib_xpg4_needed=no,
-		   rb_cv_lib_xpg4_needed=yes,
-		   rb_cv_lib_xpg4_needed=yes)])
-		if test "$rb_cv_lib_xpg4_needed" = yes; then
-			AC_CHECK_LIB(xpg4, setlocale)
-		fi
-		if test "$with_libc_r" = yes; then
-			AC_CACHE_CHECK([whether libc_r is supplementary to libc],
-			  rb_cv_supplementary_lib_c_r,
-			  [AC_TRY_CPP([
-#include <osreldate.h>
-#if 500016 <= __FreeBSD_version
-#error libc_r is supplementary to libc
-#endif
-			   ],
-			   rb_cv_supplementary_lib_c_r=no,
-			   rb_cv_supplementary_lib_c_r=yes,
-			   rb_cv_supplementary_lib_c_r=yes)])
-			if test "$rb_cv_supplementary_lib_c_r" = yes; then
-				MAINLIBS="-lc_r $MAINLIBS"			
-			else
-				MAINLIBS="-pthread $MAINLIBS"			
-				CFLAGS="-D_THREAD_SAFE $CFLAGS"
-			fi
-		fi
-		;;
+cygwin*)	;;
 *) LIBS="-lm $LIBS";;
 esac
 AC_CHECK_LIB(crypt, crypt)
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
-
-case "$target_cpu" in
-alpha*)		case "$target_os"::"$GCC" in
-		*::yes)	CFLAGS="-mieee $CFLAGS" ;;   # gcc
-		osf*)   CFLAGS="-ieee $CFLAGS" ;;    # ccc
-		esac ;;
-esac
+AC_CHECK_LIB(xpg4, setlocale)	# FreeBSD needs this
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -347,95 +156,35 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\
 		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
-		 syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
-		 sys/mkdev.h sys/utime.h float.h)
+		 syscall.h pwd.h a.out.h utime.h memory.h direct.h fnmatch.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_UID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_ST_BLKSIZE
+save_LIBOJBS="$LIBOBJS"
 AC_STRUCT_ST_BLOCKS
+LIBOBJS="$save_LIBOBJS"
 AC_STRUCT_ST_RDEV
 
 dnl Checks for library functions.
 AC_TYPE_GETGROUPS
 AC_TYPE_SIGNAL
 AC_FUNC_ALLOCA
+AC_FUNC_VFORK
 AC_FUNC_MEMCMP
-AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(ftello)
 AC_REPLACE_FUNCS(dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\
-		 strchr strstr strtoul crypt flock vsnprintf\
-		 isinf isnan finite hypot acosh erf)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync\
-	      truncate chsize times utimes fcntl lockf lstat symlink readlink\
-	      setitimer setruid seteuid setreuid setresuid setproctitle\
-	      setrgid setegid setregid setresgid issetugid pause lchown lchmod\
-	      getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
-	      getpriority getrlimit dlopen sigprocmask sigaction _setjmp\
-	      setsid telldir seekdir fchmod mktime timegm cosh sinh tanh\
-	      setuid setgid)
-AC_ARG_ENABLE(setreuid,
-       [  --enable-setreuid       use setreuid()/setregid() according to need even if obsolete.],
-       [use_setreuid=$enableval])
-if test "$use_setreuid" = yes; then
-    AC_DEFINE(USE_SETREUID)
-    AC_DEFINE(USE_SETREGID)
-fi
+		 strchr strstr strtoul strdup crypt flock vsnprintf\
+		 fnmatch isinf isnan finite)
+AC_CHECK_FUNCS(fmod killpg drand48 random wait4 waitpid syscall getcwd\
+	      truncate chsize times utimes fcntl lockf setitimer\
+	      setruid seteuid setreuid setrgid setegid setregid\
+	      getpgrp setpgrp getpgid setpgid getgroups getpriority\
+	      dlopen sigprocmask sigaction _setjmp setsid)
 AC_STRUCT_TIMEZONE
-AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
-  [AC_TRY_COMPILE([#include <time.h>],
-    [struct tm t; t.tm_gmtoff = 3600;],
-  [rb_cv_member_struct_tm_tm_gmtoff=yes],
-  [rb_cv_member_struct_tm_tm_gmtoff=no])])
-if test "$rb_cv_member_struct_tm_tm_gmtoff" = yes; then
-  AC_DEFINE(HAVE_STRUCT_TM_TM_GMTOFF)
-fi
-AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
-  [AC_TRY_LINK([#include <time.h>
-  int i;],
-  	[i = daylight;],
-	rb_cv_have_daylight=yes,
-	rb_cv_have_daylight=no)])
-if test "$rb_cv_have_daylight" = yes; then
-  AC_DEFINE(HAVE_DAYLIGHT)
-fi
-AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
-  [AC_TRY_RUN([
-#include <time.h>
-
-void
-check(tm, y, m, d, h, s)
-    struct tm *tm;
-    int y, m, d, h, s;
-{
-    if (!tm ||
-	tm->tm_year != y ||
-	tm->tm_mon  != m-1 ||
-	tm->tm_mday != d ||
-	tm->tm_hour != h ||
-	tm->tm_sec  != s) {
-	exit(1);
-    }
-}
-
-int
-main()
-{
-   time_t t = -1;
-   struct tm *tm;
-
-   check(gmtime(&t), 69, 12, 31, 23, 59);
-   t = ~(time_t)0 << 31;
-   check(gmtime(&t), 1, 12, 13, 20, 52);
-   return 0;
-}
-],
-	rb_cv_negative_time_t=yes,
-	rb_cv_negative_time_t=no,
-	rb_cv_negative_time_t=yes)])
-if test "$rb_cv_negative_time_t" = yes; then
-  AC_DEFINE(NEGATIVE_TIME_T)
+if test "$ac_cv_func_strftime" = no; then
+    AC_TRY_LINK([],
+	 [extern int daylight; int i = daylight;], AC_DEFINE(HAVE_DAYLIGHT))
 fi
 
 if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
@@ -472,11 +221,39 @@ fi
 AC_FUNC_GETPGRP
 AC_FUNC_SETPGRP  
 
+AC_CACHE_CHECK(for working strtod, rb_cv_func_strtod,
+[AC_TRY_RUN([
+double strtod ();
+int
+main()
+{
+  {
+    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
+    char *string = " +69";
+    char *term;
+    double value;
+    value = strtod(string, &term);
+    if (value != 69 || term != (string + 4))
+      exit(1);
+  }
+
+  {
+    /* Under Solaris 2.4, strtod returns the wrong value for the
+       terminating character under some conditions.  */
+    char *string = "NaN";
+    char *term;
+    strtod(string, &term);
+    if (term != string && *(term - 1) == 0)
+      exit(1);
+  }
+  exit(0);
+}
+], rb_cv_func_strtod=yes, rb_cv_func_strtod=no, rb_cv_func_strtod=no)])
+test $rb_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
+
 AC_C_BIGENDIAN
 AC_C_CONST
-AC_C_CHAR_UNSIGNED
-AC_C_INLINE
-AC_C_VOLATILE
+AC_CHAR_UNSIGNED
 
 AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
     [AC_TRY_RUN([
@@ -492,26 +269,34 @@ main()
 	rb_cv_rshift_sign=no,
 	rb_cv_rshift_sign=yes)])
 if test "$rb_cv_rshift_sign" = yes; then
-  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)y))
+  AC_DEFINE(RSHIFT(x,y), ((x)>>y))
 else
   AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>y) : (x)>>y))
 fi
 
-AC_MSG_CHECKING(read count field in FILE structures)
+AC_MSG_CHECKING(count field in FILE structures)
 AC_CACHE_VAL(rb_cv_fcnt,
-[for fcnt in	dnl
-     _cnt	dnl
-     __cnt	dnl
-     _r		dnl
-     readCount	dnl
-     _rcount	dnl for emx0.9c
-; do
-    AC_TRY_COMPILE([#include <stdio.h>
-],
-	[FILE *f = stdin; f->$fcnt = 0;],
-	rb_cv_fcnt="$fcnt"; break,
-	rb_cv_fcnt="not found")
-done])
+[AC_TRY_COMPILE([#include <stdio.h>],
+	[FILE *f = stdin; f->_cnt = 0;], rb_cv_fcnt="_cnt", )
+if test "$rb_cv_fcnt" = ""; then
+    AC_TRY_COMPILE([#include <stdio.h>],
+	[FILE *f = stdin; f->__cnt = 0;], rb_cv_fcnt="__cnt", )
+fi
+if test "$rb_cv_fcnt" = ""; then
+    AC_TRY_COMPILE([#include <stdio.h>],
+	[FILE *f = stdin; f->_r = 0;], rb_cv_fcnt="_r", )
+fi
+if test "$rb_cv_fcnt" = ""; then
+    AC_TRY_COMPILE([#include <stdio.h>],
+	[FILE *f = stdin; f->readCount = 0;],
+	rb_cv_fcnt="readCount", )
+fi
+dnl for emx0.9c
+if test "$rb_cv_fcnt" = ""; then
+    AC_TRY_COMPILE([#include <stdio.h>],
+	[FILE *f = stdin; f->_rcount = 0;],
+	rb_cv_fcnt="_rcount", rb_cv_fcnt="not found")
+fi])
 if test "$rb_cv_fcnt" = "not found"; then
   AC_MSG_RESULT([not found(OK if using GNU libc)])
 else
@@ -519,175 +304,32 @@ else
   AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)
 fi
 
-AC_MSG_CHECKING(read buffer ptr field in FILE structures)
-AC_CACHE_VAL(rb_cv_frptr,
-[for frptr in	dnl
-     _IO_read_ptr dnl
-     _ptr	dnl
-     __ptr	dnl
-     bufpos	dnl
-     _p	dnl
-; do
-    AC_TRY_COMPILE([#include <stdio.h>
-],
-	[FILE *f = stdin; char buf[256]; f->$frptr = buf;],
-	rb_cv_frptr="$frptr"; break,
-	rb_cv_frptr="not found")
-done])
-if test "$rb_cv_frptr" = "not found"; then
-  AC_MSG_RESULT([not found])
-else
-  AC_MSG_RESULT($rb_cv_frptr)
-  AC_DEFINE_UNQUOTED(FILE_READPTR, $rb_cv_frptr)
-
-  if test "$rb_cv_fcnt" = "not found"; then
-    AC_MSG_CHECKING(read buffer end field in FILE structures)
-    AC_CACHE_VAL(rb_cv_frend,
-    [for frend in	dnl
-         _IO_read_end	dnl
-         bufread 	dnl
-    ; do
-        AC_TRY_COMPILE([#include <stdio.h>
-    ],
-  	[FILE *f = stdin; char buf[256]; f->$frend = buf;],
-  	rb_cv_frend="$frend"; break,
-  	rb_cv_frend="not found")
-    done])
-    if test "$rb_cv_frend" = "not found"; then
-      AC_MSG_RESULT([not found])
-    else
-      AC_MSG_RESULT($rb_cv_frend)
-      AC_DEFINE_UNQUOTED(FILE_READEND, $rb_cv_frend)
-    fi
-  fi
-fi
-
-AC_DEFUN(RUBY_CHECK_IO_NEED,
-[AC_CACHE_CHECK(whether need to [$1], [$2],
-    [AC_TRY_RUN([
-#include <stdio.h>
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-#define before_seek(f) ]ifelse(index($2,flush_before_seek),-1,[fflush(f)],[(f,0)])[
-#define reset_rw(f) ]ifelse(index($2,seek_between_rw),-1,[do_seek(f,SEEK_CUR)],[(f,0)])[
-#define do_seek(f, w) (before_seek(f), fseek(f,0,w))
-
-char *fn = "conftest.dat";
-char *wombat = "wombat\n";
-char *koara = "koara\n";
-char *kangaroo = "kangaroo\n";
-
-int main()
-{
-    char buf[BUFSIZ];
-    FILE *f;
-    int r = 1;
-
-    if (!(f = fopen(fn, "w+"))) return 1;
-    fputs(wombat, f);
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    reset_rw(f);
-    fputs(koara, f);
-    fputs(kangaroo, f);
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    reset_rw(f);
-    fputc('X', f);
-    reset_rw(f);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara+1)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || buf[0] != 'X' || strcmp(buf+1, koara+1)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    r = 0;
-  fail:
-    fclose(f);
-    unlink(fn);
-    return r;
-}
-], [$2]=no, [$2]=yes, [$2]=[$3])])])
-RUBY_CHECK_IO_NEED(seek between R/W, rb_cv_need_io_seek_between_rw, yes)
-if test "$rb_cv_need_io_seek_between_rw" = yes; then
-  AC_DEFINE(NEED_IO_SEEK_BETWEEN_RW, 1)
-fi
-RUBY_CHECK_IO_NEED(flush before seek, rb_cv_need_io_flush_before_seek, no)
-if test "$rb_cv_need_io_flush_before_seek" = yes; then
-  AC_DEFINE(NEED_IO_FLUSH_BEFORE_SEEK, 1)
-fi
-
-AC_CACHE_CHECK([whether st_ino is huge], rb_cv_huge_st_ino,
-[AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([
-#include <sys/stat.h>
-struct stat test_stat;
-], [sizeof(test_stat.st_ino)>sizeof(long)])],
-rb_cv_huge_st_ino=yes,
-rb_cv_huge_st_ino=no)
-])
-if test $rb_cv_huge_st_ino = yes; then
-  AC_DEFINE(HUGE_ST_INO)
-fi
-
-case "$target_cpu" in
-m68*|i?86|sparc) rb_cv_stack_grow_dir=-1;;
-esac
-AC_CACHE_CHECK(stack growing direction, rb_cv_stack_grow_dir,
-  [AC_TRY_RUN([
-/* recurse to get rid of inlining */
-static int
-stack_growup_p(addr, n)
-    volatile int *addr, n;
-{
-    volatile int end;
-    if (n > 0)
-	return *addr = stack_growup_p(addr, n - 1);
-    else
-	return (&end > addr);
-}
-int main()
-{
-    int x;
-    return stack_growup_p(&x, 10);
-}
-], rb_cv_stack_grow_dir=-1, rb_cv_stack_grow_dir=+1, rb_cv_stack_grow_dir=0)])
-AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
-
 dnl default value for $KANJI
-DEFAULT_KCODE="KCODE_NONE"
-
+AC_SUBST(DEFAULT_KCODE)
 AC_ARG_WITH(default-kcode, 
-	[  --with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)], 
+	[--with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)], 
 	[case $withval in
-	utf8) DEFAULT_KCODE="KCODE_UTF8";;
-	euc)  DEFAULT_KCODE="KCODE_EUC";;
-	sjis) DEFAULT_KCODE="KCODE_SJIS";;
-	none) DEFAULT_KCODE="KCODE_NONE";;
+	utf8) AC_DEFINE(DEFAULT_KCODE, KCODE_UTF8);;
+	euc)  AC_DEFINE(DEFAULT_KCODE, KCODE_EUC);;
+	sjis) AC_DEFINE(DEFAULT_KCODE, KCODE_SJIS);;
+	none) AC_DEFINE(DEFAULT_KCODE, KCODE_NONE);;
         *)    AC_MSG_WARN($withval is not valid kcode; ignored);;
 	esac])
-AC_DEFINE_UNQUOTED(DEFAULT_KCODE, $DEFAULT_KCODE)
 
-dnl wheather use dln_a_out or not
+dnl wheather use dln_a_out ot not
 AC_ARG_WITH(dln-a-out, 
-	[  --with-dln-a-out        use dln_a_out if possible], [
+	[--with-dln-a-out          use dln_a_out if possible], [
 	case $withval in
 	yes) with_dln_a_out=yes;;
 	*)   with_dln_a_out=no;;
 	esac], [with_dln_a_out=no])
 
-AC_SUBST(XCFLAGS)dnl
 AC_SUBST(XLDFLAGS)dnl
 
-AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_TRY_RUN([
+case "$host_os" in
+    linux*)
+  AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
+  [AC_TRY_RUN([
 /* Test for whether ELF binaries are produced */
 #include <fcntl.h>
 #include <stdlib.h>
@@ -704,32 +346,16 @@ main() {
 	exit(0); /* succeed (yes, it's ELF) */
 }
 ],
-rb_cv_binary_elf=yes,
-rb_cv_binary_elf=no,
-rb_cv_binary_elf=yes)])
-
-if test "$rb_cv_binary_elf" = yes; then
-  AC_DEFINE(USE_ELF)
-fi
-
-case "$target_os" in
-linux*)
-    if test "$rb_cv_binary_elf" = no; then
-	with_dln_a_out=yes
-	target_os=${target_os}-a_out
-    else
-	LDFLAGS="-rdynamic"
-    fi;;
-netbsd*|openbsd*)
-    if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
-    then
-	netbsd_elf=yes
-    else
-	netbsd_elf=no
-    fi
-    ;;
+	rb_cv_binary_elf=yes,
+	rb_cv_binary_elf=no,
+	rb_cv_binary_elf=yes)])
+  if test "$rb_cv_binary_elf" = no; then
+    with_dln_a_out=yes
+    host_os=${host_os}-a_out
+  else
+    LDFLAGS="-rdynamic"
+  fi;;
 esac
-LIBEXT=a
 
 AC_SUBST(DLDFLAGS)dnl
 
@@ -737,98 +363,79 @@ AC_SUBST(STATIC)dnl
 AC_SUBST(CCDLFLAGS)dnl
 AC_SUBST(LDSHARED)dnl
 AC_SUBST(DLEXT)dnl
-AC_SUBST(DLEXT2)dnl
-AC_SUBST(LIBEXT)dnl
 
 STATIC=
-LIBPATHFLAG=' -L%s'
 
 if test "$with_dln_a_out" != yes; then
   rb_cv_dlopen=unknown
   AC_MSG_CHECKING(whether OS depend dynamic link works)
   if test "$GCC" = yes; then
-    case "$target_os" in
+    case "$host_os" in
     nextstep*)	;;
     openstep*)	;;
     rhapsody*)	;;
-    darwin*)	CCDLFLAGS=-fno-common;;
     human*)	;;
-    bsdi*)	;;
-    beos*)	;;
+    bsdi3*)	;;
     cygwin*)	;;
-    mingw*)	;;
-    aix*)	;;
-    netbsd*) CCDLFLAGS=-fPIC;;
+    netbsd*) CCDLFLAGS=-fpic
+     case "$host_cpu" in
+     mips*) CCDLFLAGS=-fPIC ;;
+     *) ;;
+     esac ;;
     *) CCDLFLAGS=-fPIC;;
     esac
   else
-    case "$target_os" in
-	hpux*)		CCDLFLAGS='+Z';;
-	solaris*|irix*)	CCDLFLAGS='-KPIC' ;;
+    case "$host_os" in
+	hpux*)		CCDLFLAGS='+z';;
+	solaris*|irix*)	CCDLFLAGS='-K PIC' ;;
 	sunos*)		CCDLFLAGS='-PIC' ;;
 	esix*|uxpds*)   CCDLFLAGS='-KPIC' ;;
 	*)		CCDLFLAGS='' ;;
     esac
   fi
 
-  case "$target_os" in
+  case "$host_os" in
 	hpux*)		DLDFLAGS="-E"
 			LDSHARED='ld -b'
-			XLDFLAGS="-Wl,-E"
+			LDFLAGS="-Wl,-E"
 			rb_cv_dlopen=yes;;
 	solaris*) 	if test "$GCC" = yes; then
-			   LDSHARED='$(CC) -Wl,-G'
-			   if test "$rb_cv_prog_gnu_ld" = yes; then
-	 		       LDFLAGS="-Wl,-E"
-			       LDSHARED="$LDSHARED -shared"
-			   fi
+			   LDSHARED='gcc -Wl,-G'
+			   `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null && LDFLAGS="-Wl,-E"
 			else
 			   LDSHARED='ld -G'
 			fi
 			rb_cv_dlopen=yes;;
 	sunos*) 	LDSHARED='ld -assert nodefinitions'
 			rb_cv_dlopen=yes;;
-	irix*)		LDSHARED='ld -shared'
+	irix*) 	 	LDSHARED='ld -ignore_unresolved'
 			rb_cv_dlopen=yes;;
 	sysv4*) 	LDSHARED='ld -G'
 			rb_cv_dlopen=yes;;
-        nto-qnx*)       LDSHARED="qcc -shared"
-                        rb_cv_dlopen=yes ;;
 	esix*|uxpds*) 	LDSHARED="ld -G"
 			rb_cv_dlopen=yes ;;
-	osf*) 		LDSHARED="ld -shared -expect_unresolved \"*\""
+	osf*) 		LDSHARED="gcc -shared"
 			rb_cv_dlopen=yes ;;
-	linux*) 	LDSHARED="$CC -shared"
+	linux*) 	LDSHARED="gcc -shared"
 			rb_cv_dlopen=yes ;;
-	gnu*)   	LDSHARED="$CC -shared"
-			rb_cv_dlopen=yes
-			LDFLAGS="-rdynamic" ;;
-	freebsd*)       LDSHARED="$CC -shared"
-			if test "$rb_cv_binary_elf" = yes; then
+	freebsd*)       LDSHARED="gcc -shared"
+			if test -x /usr/bin/objformat && \
+			   test `/usr/bin/objformat` = "elf" ; then
 			    LDFLAGS="-rdynamic"
 			    DLDFLAGS='-Wl,-soname,$(.TARGET)'
+			    rb_cv_freebsd_elf=yes
 			else
-			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+			  test "$GCC" = yes && `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null || LDSHARED="ld -Bshareable"
 			fi
 			rb_cv_dlopen=yes ;;
-	netbsd*)	LDSHARED='${CC} -shared'
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="-Wl,-export-dynamic"
-			    LIBPATHFLAG=' -L%1$-s -Wl,-R%1$-s'
-			fi
+	netbsd*)  	LDSHARED="ld -shared"
 			rb_cv_dlopen=yes ;;
-	openbsd*) 	LDSHARED="\$(CC) -shared ${CCDLFLAGS}"
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="-Wl,-E"
-			fi
+	openbsd*) 	LDSHARED="ld -Bforcearchive -Bshareable"
 			rb_cv_dlopen=yes ;;
 	bsdi3*) 	case "$CC" in
 			*shlicc*)	LDSHARED="$CC -r"
 					rb_cv_dlopen=yes ;;
 			esac ;;
-	bsdi*)		LDSHARED="ld -shared"
-			LDFLAGS='-rdynamic -Wl,-rpath,$(libdir)/ruby/$(MAJOR).$(MINOR)/i386-bsdi4.0'
-			rb_cv_dlopen=yes ;;
 	nextstep*)	LDSHARED='cc -r -nostdlib'
 			LDFLAGS="-u libsys_s"
 			DLDFLAGS="$ARCH_FLAG" 
@@ -841,52 +448,34 @@ if test "$with_dln_a_out" != yes; then
 			LDFLAGS=""
 			DLDFLAGS="$ARCH_FLAG"
 			rb_cv_dlopen=yes ;;
-	darwin*)	LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'
-			LDFLAGS=""
-			DLDFLAGS="$ARCH_FLAG"
-			rb_cv_dlopen=yes ;;
 	aix*)		LDSHARED='/usr/ccs/bin/ld'
 			XLDFLAGS='-Wl,-bE:ruby.imp'
-			DLDFLAGS='-brtl -eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 -lc'
-			LDFLAGS="-brtl"
-			ARCHFILE="ruby.imp"
+			DLDFLAGS='-eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 -lc'
 			rb_cv_dlopen=yes ;;
 
 	human*)		DLDFLAGS=''
 			LDSHARED=''
 			LDFLAGS=''
-			LINK_SO='ar cru $@ $(OBJS)'
 			rb_cv_dlopen=yes ;;
-	beos*) 		case "$target_cpu" in
+	beos*) 		case "$host_cpu" in
 			  powerpc*)
 			    LDSHARED="ld -xms"
-			    DLDFLAGS='-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+			    DLDFLAGS="-f ruby.exp -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
                             ;;
 			  i586*)
 			    LDSHARED="ld -shared"
 			    DLDFLAGS="-L/boot/develop/lib/x86 -lbe -lroot"
 			    ;;
+			  *)
+			    DLDFLAGS="ruby.def -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
 			esac
 			rb_cv_dlopen=yes ;;
-	nto-qnx*)	DLDFLAGS="-L/lib -L/usr/lib -L/usr/local/lib"
-			LDSHARED='ld -Bshareable -x'
-			LDFLAGS="-L/lib -L/usr/lib -L/usr/local/lib"
-			rb_cv_dlopen=yes;;
-	cygwin*|mingw*)	: ${LDSHARED="${CC} -shared -s"}
-			XLDFLAGS='-Wl,--stack,0x02000000'
-			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-import,--export-all"
-			rb_cv_dlopen=yes ;;
-	hiuxmpp)	LDSHARED='ld -r' ;;
-	atheos*) 	LDSHARED="$CC -shared"
+	cygwin*)	LDSHARED='dllwrap --export-all -s'
 			rb_cv_dlopen=yes ;;
-	os2-emx*)	LDFLAGS="$LDFLAGS -Zbsd-signals"
-			;;
 	*) 		LDSHARED='ld' ;;
   esac
   AC_MSG_RESULT($rb_cv_dlopen)
 fi
-AC_SUBST(LINK_SO)
-AC_SUBST(LIBPATHFLAG)
 
 dln_a_out_works=no
 if test "$ac_cv_header_a_out_h" = yes; then
@@ -917,7 +506,7 @@ if test "$dln_a_out_works" = yes; then
   AC_DEFINE(DLEXT, ".so")
   CCDLFLAGS=
 else
-  case "$target_os" in
+  case "$host_os" in
     hpux*)	DLEXT=sl
 	 	AC_DEFINE(DLEXT, ".sl");;
     nextstep*)	DLEXT=bundle
@@ -926,14 +515,10 @@ else
 	 	AC_DEFINE(DLEXT, ".bundle");;
     rhapsody*)	DLEXT=bundle
 	 	AC_DEFINE(DLEXT, ".bundle");;
-    darwin*)	DLEXT=bundle
-	 	AC_DEFINE(DLEXT, ".bundle");;
-    os2-emx*)	DLEXT=dll
+    cygwin*)	DLEXT=dll
 	 	AC_DEFINE(DLEXT, ".dll");;
-    cygwin*|mingw*)	DLEXT=so
-	 	AC_DEFINE(DLEXT, ".so")
-		DLEXT2=dll
-	 	AC_DEFINE(DLEXT2, ".dll");;
+    os2_emx)	DLEXT=o
+	 	AC_DEFINE(DLEXT, ".so");;
     *)		DLEXT=so
     		AC_DEFINE(DLEXT, ".so");;
   esac
@@ -946,36 +531,32 @@ else
   STRIP=strip
 fi
 
-case "$target_os" in
+case "$host_os" in
   linux*)
 	STRIP='strip -S -x';;
-  gnu*)
-	STRIP='strip -S -x';;
   nextstep*)
 	STRIP='strip -A -n';;
   openstep*)
 	STRIP='strip -A -n';;
   rhapsody*)
 	STRIP='strip -A -n';;
-  darwin*)
-	STRIP='strip -A -n';;
 esac
 
 EXTSTATIC=
 AC_SUBST(EXTSTATIC)dnl
 AC_ARG_WITH(static-linked-ext,
-	    [  --with-static-linked-ext link external modules statically],
+	    [--with-static-linked-ext  link external modules statically],
             [case $withval in
 	     yes) STATIC=
 		  EXTSTATIC=static;;
 	     *)	;;
 	     esac])
 
-case "$target_os" in
+case "$host_os" in
   human*)
     AC_CHECK_LIB(signal, _harderr)
     AC_CHECK_LIB(hmem, hmemset)
-    AC_CHECK_FUNCS(select gettimeofday)
+    AC_CHECK_FUNCS(select)
     AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
 		   rb_cv_missing__dtos18,
     [AC_TRY_RUN(
@@ -1013,26 +594,30 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no
     if test "$rb_cv_missing_fconvert" = yes; then
       AC_DEFINE(MISSING_FCONVERT)
     fi
-    AC_LIBOBJ([x68.o])
-    CFLAGS="$CFLAGS -fansi-only"
-    XCFLAGS="-cc1-stack=262144 -cpp-stack=2694144"
-    EXEEXT=.x
-    OBJEXT=o
+    LIBOBJS="$LIBOBJS x68.o"
+    CFLAGS="$CFLAGS -fansi-only -cc1-stack=196608 -cpp-stack=2694144"
+    binsuffix=.x
     setup=Setup.x68
     ;;
   dnl OS/2 environment w/ Autoconf 2.1x for EMX
-  os2-emx)
-    AC_LIBOBJ([os2])
+  os2_emx)
+    LIBOBJS="$LIBOBJS os2.o"
+    binsuffix=.exe
     setup=Setup.emx
     ;;
-  *djgpp*)
-    setup=Setup.dj
+  cygwin*)
+    binsuffix=.exe
+    setup=Setup
     ;;
   *)
+    binsuffix=
     setup=Setup
     ;;
 esac
 
+
+
+AC_SUBST(binsuffix)
 AC_SUBST(setup)
 
 if test "$prefix" = NONE; then
@@ -1040,96 +625,75 @@ if test "$prefix" = NONE; then
 fi
 
 if test "$fat_binary" = yes ; then
-  XCFLAGS="$ARCH_FLAG"
-fi
-
-if test x"$cross_compiling" = xyes; then
-  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
-  PREP=fake.rb
-else
-  MINIRUBY='./miniruby$(EXEEXT)'
-  PREP=''
+  CFLAGS="$CFLAGS $ARCH_FLAG"
 fi
-AC_SUBST(MINIRUBY)
-AC_SUBST(PREP)
 
-FIRSTMAKEFILE=""
-LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
+LIBRUBY_A='lib$(RUBY_INSTALL_NAME).a'
 LIBRUBY='$(LIBRUBY_A)'
-LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
-LIBRUBYARG='$(LIBRUBYARG_STATIC)'
+LIBRUBYARG='$(LIBRUBY_A)'
 SOLIBS=
+if test "$host_os" = "beos"; then
+  LIBRUBY='$(LIBRUBY_SO)'
+  LIBRUBYARG='-l$(RUBY_INSTALL_NAME)'
+  SOLIBS='-lnet'
+  echo creating ruby.def
+  case "$host_cpu" in
+    powerpc*)
+      cp beos/ruby.def.in ruby.exp
+      CFLAGS="$CFLAGS -relax_pointers"
+      ;;
+    i586*)
+      LDFLAGS="$LDFLAGS -L."
+      ;;
+    *)
+      echo EXPORTS > ruby.def
+      cat beos/ruby.def.in >> ruby.def
+      ;;
+  esac
+fi
 
-case "$target_os" in
-  cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*)
-    DLDLIBS=""
-    ;;
-  *)
-    DLDLIBS="-lc"
-    ;;
-esac
-
-RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'
+FIRSTMAKEFILE=""
 LIBRUBY_LDSHARED=$LDSHARED
 LIBRUBY_DLDFLAGS=$DLDFLAGS
-LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
-LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
-ENABLE_SHARED=no
-
-AC_ARG_ENABLE(shared,
-       [  --enable-shared         build a shared library for Ruby. ],
+LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
+LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so'
+AC_ARG_ENABLE(enable-shared,
+       [--enable-shared           build a shared library for Ruby. ],
        [enable_shared=$enableval])
 if test "$enable_shared" = 'yes'; then
   LIBRUBY='$(LIBRUBY_SO)'
-  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
-  LIBRUBYARG='$(LIBRUBYARG_SHARED)'
+  LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)'
   CFLAGS="$CFLAGS $CCDLFLAGS"
-  ENABLE_SHARED=yes
-  if test "$rb_cv_binary_elf" = yes; then
-    SOLIBS='$(LIBS)'
-  fi
-  case "$target_os" in
+  case "$host_os" in
     sunos4*)
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so'
 	;;
     linux*)
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	;;
-    gnu*)
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+	XLDFLAGS='-Wl,-rpath,${prefix}/lib':/usr/lib:/lib
+	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so'
 	;;
     freebsd*)
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-	if test "$rb_cv_binary_elf" != "yes" ; then
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)'
+	if test "$rb_cv_freebsd_elf" != "yes" ; then
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
 	    LIBRUBY_ALIASES=''
 	fi
 	;;
     netbsd*)
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
-	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
-	   LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
-	else	# a.out platforms
-	   LIBRUBY_ALIASES=""
-	fi
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
+ 	case "$host_cpu" in
+	alpha|mipsel|mipseb|powerpc|sparc64)  # ELF platforms
+	   LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' ;;
+ 	*) LIBRUBY_ALIASES= ;;  # a.out platforms
+	esac
  	;;
-    openbsd*)
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-	;;
     solaris*)
-	XLDFLAGS='-R${libdir}'
+	XLDFLAGS='-R${prefix}/lib'
  	;;
     hpux*)
-	XLDFLAGS='-Wl,+s,+b,$(libdir)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
+	XLDFLAGS='-Wl,+s,+b,$(prefix)/lib'
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
+	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).sl'
 	;;
     aix*)
 	if test "$GCC" = yes; then
@@ -1139,151 +703,46 @@ if test "$enable_shared" = 'yes'; then
 	    LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
 	    LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
 	fi
-	LIBRUBYARG_SHARED='-L${libdir} -Wl,lib$(RUBY_SO_NAME).so'
+	LIBRUBYARG='-L${prefix}/lib -Wl,lib$(RUBY_INSTALL_NAME).so'
 	SOLIBS='-lm -lc'
 	;;
-    beos*)
-	case "$target_cpu" in
-	powerpc*)
-	    LIBRUBY_DLDFLAGS='-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+    cygwin*)
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).a'
+	LIBRUBY_ALIASES=''
+	LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a'
+	LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)'
+	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
+	LIBOBJS="$LIBOBJS strftime.o"
+	CCDLFLAGS=-DUSEIMPORTLIB
 	    ;;
-	esac
-	;;
-    darwin*)
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
-	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
-	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
-	;;
-    atheos*)
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	;;
     *)
 	;;
   esac
 fi
-XLDFLAGS="$XLDFLAGS -L."
-AC_SUBST(ARCHFILE)
 
-case "$target_os" in
-    netbsd*)
-    	CFLAGS="$CFLAGS -pipe"
-	;;
-    nextstep*)
+case "$host_os" in
+	nextstep*)
     	CFLAGS="$CFLAGS -pipe"
-	;;
-    openstep*)
+		;;
+	openstep*)
     	CFLAGS="$CFLAGS -pipe"
-	;;
-    rhapsody*)
+		;;
+	rhasody*)
     	CFLAGS="$CFLAGS -pipe -no-precomp"
-	;;
-    darwin*)
-    	CFLAGS="$CFLAGS -pipe"
-	;;
-    os2-emx)
-    	CFLAGS="$CFLAGS -DOS2 -Zmts"
-	LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
-	LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'`
-	LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
-	;;
-    osf*)
-	if test "$GCC" != "yes" ; then
-	  # compile something small: taint.c is fine for this.
-	  # the main point is the '-v' flag of 'cc'.
-	  case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
-	  */gemc_cc*)   # we have the new DEC GEM CC
-                        CFLAGS="$CFLAGS -oldc"
-                        ;;
-          *)            # we have the old MIPS CC
-                        ;;
-          esac
-	  # cleanup
-	  rm -f /tmp/main.o
-	  CFLAGS="$CFLAGS -std"
-	fi
 		;;
-    beos*)
-	case "$target_cpu" in
-	powerpc*)
-	    CFLAGS="$CFLAGS -relax_pointers"
-	    ;;
-	esac
-	;;
-    cygwin*|mingw*)
-	case "$target_os" in
-	cygwin*)
-	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
-		LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
-	    fi
-	    AC_LIBOBJ([strftime])
-	    ;;
-	mingw*)
-	    RUBY_SO_NAME=msvcrt-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
-	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
-		LIBRUBY='lib$(LIBRUBY_SO).a'
-	    fi
-	    AC_LIBOBJ([win32])
-	    COMMON_LIBS=m
-	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
-	    COMMON_HEADERS="windows.h winsock.h"
-	    ;;
-	esac
-	XCFLAGS="$XCFLAGS"
-	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
-	LIBRUBY_ALIASES=''
-	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
-	SOLIBS='$(LIBS)'
-	if test x"$enable_shared" = xno; then
-	    LIBRUBY_SO=dummy
-	    LIBRUBY='lib$(RUBY_SO_NAME).a'
-	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
-	fi
-	;;
-    hpux*)
-	case "$YACC" in
-	  *yacc*)
-	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
-	    YACC="$YACC -Nl40000 -Nm40000"
-	    ;;
-	esac
-	;;
-    *)
-	;;
-esac
-
-case "$build_os" in
-  *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
+	*)
+		;;	
 esac
 
 AC_SUBST(LIBRUBY_LDSHARED)
 AC_SUBST(LIBRUBY_DLDFLAGS)
 AC_SUBST(RUBY_INSTALL_NAME)
-AC_SUBST(rubyw_install_name)
-AC_SUBST(RUBYW_INSTALL_NAME)
-AC_SUBST(RUBY_SO_NAME)
 AC_SUBST(LIBRUBY_A)
 AC_SUBST(LIBRUBY_SO)
 AC_SUBST(LIBRUBY_ALIASES)
 AC_SUBST(LIBRUBY)
 AC_SUBST(LIBRUBYARG)
-AC_SUBST(LIBRUBYARG_STATIC)
-AC_SUBST(LIBRUBYARG_SHARED)
 AC_SUBST(SOLIBS)
-AC_SUBST(DLDLIBS)
-AC_SUBST(ENABLE_SHARED)
-AC_SUBST(MAINLIBS)
-AC_SUBST(COMMON_LIBS)
-AC_SUBST(COMMON_MACROS)
-AC_SUBST(COMMON_HEADERS)
-AC_SUBST(EXPORT_PREFIX)
-
-MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
-MAKEFILES="`echo $MAKEFILES`"
-AC_SUBST(MAKEFILES)
 
 ri_prefix=
 test "$program_prefix" != NONE &&
@@ -1294,105 +753,39 @@ test "$program_suffix" != NONE &&
   ri_suffix=$program_suffix
 
 RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
-case "$target_os" in
-  cygwin*|mingw*)
-    RUBYW_INSTALL_NAME="${ri_prefix}rubyw${ri_suffix}"
-    rubyw_install_name="$RUBYW_INSTALL_NAME"
-    ;;
-esac
-case "$target_os" in
-  cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_LIB_PREFIX="/lib/ruby"
-    ;;
-  *)
-    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-    ;;
-esac
-RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-
-AC_ARG_WITH(sitedir,
-	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
-            [sitedir=$withval],
-            [sitedir='${prefix}/lib/ruby/site_ruby'])
-SITE_DIR="`eval \"echo ${sitedir}\"`"
-case "$target_os" in
-  cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
-  *)
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
-esac
-RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
-
+RUBY_LIB_PATH="${prefix}/lib/ruby/${MAJOR}.${MINOR}"
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
+RUBY_SITE_LIB_PATH="${RUBY_LIB_PATH}/site_ruby"
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
-
 AC_SUBST(arch)dnl
-AC_SUBST(sitearch)dnl
-AC_SUBST(sitedir)dnl
 
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
 
 if test "$fat_binary" = yes ; then
-    arch="fat-${target_os}"
+    arch="fat-${host_os}"
 
     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${host_os}")
 
     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
-                 "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
+                 "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${host_os}")
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${host_os}")
 else
-    arch="${target_cpu}-${target_os}"
+    arch="${host_cpu}-${host_os}"
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
 fi
-
-case "$target_os" in
-  mingw*) sitearch="i386-msvcrt" ;;
-  *) sitearch="${arch}" ;;
-esac
-
 AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH}/${arch}")
 
 AC_ARG_WITH(search-path,
-		[  --with-search-path=DIR specify the additional search path],
+		[--with-search-path	  specify the additional search path],
 		[search_path=$withval])
 if test "$search_path" != ""; then
     AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
 fi
 
-AC_ARG_WITH(mantype,
-		[  --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
-		[
-			case "$withval" in
-			man|doc)
-				MANTYPE=$withval
-				;;
-			*)
-				AC_MSG_ERROR(invalid man type: $withval)
-				;;
-			esac
-		])
-if test -z "$MANTYPE"; then
-	AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
-	if ${NROFF} -mdoc ${srcdir}/ruby.1 >/dev/null 2>&1; then
-		MANTYPE=doc
-	else
-		MANTYPE=man
-	fi
-fi
-AC_SUBST(MANTYPE)
-
-if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
-  echo "config.h unchanged"
-else
-  echo "creating config.h"
-  tr -d '\015' < confdefs.h > config.h
-fi
-: > confdefs.h
+echo "creating config.h"
+cat confdefs.h > config.h
 
-AC_CONFIG_FILES([$FIRSTMAKEFILE Makefile])
-AC_OUTPUT
+AC_OUTPUT($FIRSTMAKEFILE Makefile ext/extmk.rb)
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index da9efaab47..970e90e24a 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,65 +1,9 @@
 include Makefile
 
-ENABLE_SHARED=@ENABLE_SHARED@
+RUBYCWDLL=rubycw.dll
 
-ifeq (@target_os@,cygwin)
-  DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
-else
-  DLL_BASE_NAME := $(RUBY_SO_NAME)
-endif
+miniruby$(EXEEXT): $(RUBYCWDLL)
 
-ifneq ($(ENABLE_SHARED),yes)
-  RUBY_EXP = $(RUBY_INSTALL_NAME).exp
-  EXTOBJS = $(RUBY_EXP)
-  LIBRUBYARG = $(LIBRUBY_A)
-  LIBRUBY_SO =
-endif
-
-ifeq ($(RUBY_INSTALL_NAME),ruby)
-  RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
-else
-  RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME))
-endif
-
-WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
-SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
-
-$(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
-$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
-
-%.res.@OBJEXT@: %.rc
-	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
-
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc: rbconfig.rb
-	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
-	  -so_name=$(DLL_BASE_NAME) \
-	  . $(icondirs) $(srcdir)/win32
-
-$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
-$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
-	@rm -f $@
-	$(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
-	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
-
-$(RUBY_EXP): $(LIBRUBY_A)
-	@DLLWRAP@ --target=@target_os@ --driver-name=$(CC) \
-	  --output-exp=$(RUBY_EXP) \
-	  --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
-	$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
-	@rm -f $(PROGRAM)
-
-GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
-
-ifeq (@target_os@,mingw32)
-$(OBJS) $(MAINOBJ): win32/win32.h
-endif
-
-ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
-	@NM@ --extern --defined $(LIBRUBY_A) | \
-	  $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=cyg$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
-	@DLLWRAP@ -s --def=rubydll.def -o $@
-	@rm -f rubydll.def
-endif
+$(RUBYCWDLL): $(OBJS) dmyext.o
+	dllwrap -o $(RUBYCWDLL) --export-all --output-lib=$(LIBRUBY_SO) --dllname=$(RUBYCWDLL) -Wl,-e,__cygwin_noncygwin_dll_entry@12 --add-stdcall-alias -s $(OBJS) dmyext.o
+	nm --extern-only $(OBJS) dmyext.o | sed -n '/^........ [CD] _\(.*\)$$/s//#define \1 (*__imp_\1)/p' >import.h 
diff --git a/defines.h b/defines.h
index 1cc659a8c6..21d589b55d 100644
--- a/defines.h
+++ b/defines.h
@@ -12,86 +12,9 @@
 
 #define RUBY
 
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
-
-#undef __
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
-
-#ifdef __cplusplus
-#define ANYARGS ...
-#else
-#define ANYARGS
-#endif
-
-#define xmalloc ruby_xmalloc
-#define xcalloc ruby_xcalloc
-#define xrealloc ruby_xrealloc
-#define xfree ruby_xfree
-
-void *xmalloc _((long));
-void *xcalloc _((long,long));
-void *xrealloc _((void*,long));
-void xfree _((void*));
-
-#if SIZEOF_LONG_LONG > 0
-# define LONG_LONG long long
-#elif SIZEOF___INT64 > 0
-# define HAVE_LONG_LONG 1
-# define LONG_LONG __int64
-# undef SIZEOF_LONG_LONG
-# define SIZEOF_LONG_LONG SIZEOF___INT64
-#endif
-
-#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned LONG_LONG
-# define BDIGIT_DBL_SIGNED LONG_LONG
-#elif SIZEOF_INT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS SIZEOF_SHORT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#else
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#endif
-
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
-#define DOSISH 1
-#ifndef _WIN32_WCE
-# define DOSISH_DRIVE_LETTER
-#endif
-#endif
-
 /* define RUBY_USE_EUC/SJIS for default kanji-code */
 #ifndef DEFAULT_KCODE
-#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
+#if defined(MSDOS) || defined(__CYGWIN32__) || defined(__human68k__) || defined(__MACOS__) || defined(__EMX__) || defined(OS2)
 #define DEFAULT_KCODE KCODE_SJIS
 #else
 #define DEFAULT_KCODE KCODE_EUC
@@ -105,86 +28,33 @@ void xfree _((void*));
 #endif
 #define S_IXGRP 0000010         /* execute/search permission, group */
 #define S_IXOTH 0000001         /* execute/search permission, other */
-
-#define HAVE_SYS_WAIT_H         /* configure fails to find this */
 #endif /* NeXT */
 
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
-#ifdef _WIN32
+#ifdef NT
 #include "win32/win32.h"
 #endif
 
-#if defined(__VMS)
-#include "vms/vms.h"
-#endif
-
-#undef RUBY_EXTERN
-#if defined _WIN32 && !defined __GNUC__
-# ifndef RUBY_EXPORT
-#  define RUBY_EXTERN extern __declspec(dllimport)
-# endif
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
-#endif
-
 #ifndef EXTERN
-#define EXTERN RUBY_EXTERN	/* deprecated */
+#define EXTERN extern
 #endif
 
-#if defined(sparc) || defined(__sparc__)
-static inline void
-flush_register_windows(void)
-{
-    asm
-#ifdef __GNUC__
-	volatile
-#endif
-# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
-	("flushw")
-# elif defined(linux) || defined(__linux__)
-	("ta  0x83")
-# else /* Solaris, OpenBSD, NetBSD, etc. */
-	("ta  0x03")
-# endif /* trap always to flush register windows if we are on a Sparc system */
-	;
-}
-#  define FLUSH_REGISTER_WINDOWS flush_register_windows()
+#ifdef sparc
+#define FLUSH_REGISTER_WINDOWS asm("ta 3")
 #else
-#  define FLUSH_REGISTER_WINDOWS ((void)0)
-#endif 
-
-#if defined(DOSISH)
-#define PATH_SEP ";"
-#elif defined(riscos)
-#define PATH_SEP ","
-#else
-#define PATH_SEP ":"
+#define FLUSH_REGISTER_WINDOWS /* empty */
 #endif
-#define PATH_SEP_CHAR PATH_SEP[0]
 
-#if defined(__human68k__)
-#define PATH_ENV "path"
+#if defined(MSDOS) || defined(NT) || defined(__human68k__)
+#define RUBY_PATH_SEP ";"
 #else
-#define PATH_ENV "PATH"
+#define RUBY_PATH_SEP ":"
 #endif
 
-#if defined(DOSISH) || !defined(__human68k__)
-#define ENV_IGNORECASE
-#endif
-
-#if defined(__human68k__)
+#if defined(__human68k__) || defined(__CYGWIN32__)
 #undef HAVE_RANDOM
 #undef HAVE_SETITIMER
 #endif
 
-#if defined(DJGPP) || defined(__BOW__)
-#undef HAVE_SETITIMER
-#endif
-
 #ifndef RUBY_PLATFORM
 #define RUBY_PLATFORM "unknown-unknown"
 #endif
diff --git a/dir.c b/dir.c
index b31096f515..e5b8ca779a 100644
--- a/dir.c
+++ b/dir.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   dir.c -
 
@@ -6,25 +6,28 @@
   $Date$
   created at: Wed Jan  5 09:51:01 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#else
+# define MAXPATHLEN 1024
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#if defined HAVE_DIRENT_H && !defined _WIN32
+#if HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
-#elif defined HAVE_DIRECT_H && !defined _WIN32
+#elif HAVE_DIRECT_H
 # include <direct.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
@@ -39,12 +42,21 @@
 # if HAVE_NDIR_H
 #  include <ndir.h>
 # endif
-# ifdef _WIN32
-#  include "win32/dir.h"
+# if defined(NT) && defined(_MSC_VER)
+#  include "missing/dir.h"
 # endif
 #endif
 
+#ifdef HAVE_FNMATCH_H
+#include <fnmatch.h>
+#else
+#include "missing/fnmatch.h"
+#endif
+
 #include <errno.h>
+#ifdef USE_CWGUSI
+# include <sys/errno.h>
+#endif
 
 #ifndef HAVE_STDLIB_H
 char *getenv();
@@ -54,254 +66,44 @@ char *getenv();
 char *strchr _((char*,char));
 #endif
 
-#include <ctype.h>
-
-#include "util.h"
-
-#ifndef HAVE_LSTAT
-#define lstat(path,st) stat(path,st)
-#endif
-
-#define FNM_NOESCAPE	0x01
-#define FNM_PATHNAME	0x02
-#define FNM_DOTMATCH	0x04
-#define FNM_CASEFOLD	0x08
-
-#define FNM_NOMATCH	1
-#define FNM_ERROR	2
-
-#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
-
-#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
-# if defined(DJGPP)
-#   define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
-# else
-#   define CharNext(p) ((p) + 1)
-# endif
-#endif
-
-#if defined DOSISH
-#define isdirsep(c) ((c) == '/' || (c) == '\\')
-static const char *
-find_dirsep(s)
-    const char *s;
-{
-    while (*s) {
-	if (isdirsep(*s))
-	    return s;
-	s = CharNext(s);
-    }
-    return 0;
-}
-#else
-#define isdirsep(c) ((c) == '/')
-#define find_dirsep(s) strchr(s, '/')
-#endif
-
-static char *
-range(pat, test, flags)
-    char *pat;
-    char test;
-    int flags;
-{
-    int not, ok = 0;
-    int nocase = flags & FNM_CASEFOLD;
-    int escape = !(flags & FNM_NOESCAPE);
-
-    not = *pat == '!' || *pat == '^';
-    if (not)
-	pat++;
-
-    test = downcase(test);
-
-    while (*pat) {
-	int cstart, cend;
-	cstart = cend = *pat++;
-	if (cstart == ']')
-	    return ok == not ? 0 : pat;
-        else if (escape && cstart == '\\')
-	    cstart = cend = *pat++;
-	if (*pat == '-' && pat[1] != ']') {
-	    if (escape && pat[1] == '\\')
-		pat++;
-	    cend = pat[1];
-	    if (!cend)
-		return 0;
-	    pat += 2;
-	}
-	if (downcase(cstart) <= test && test <= downcase(cend))
-	    ok = 1;
-    }
-    return 0;
-}
-
-#define ISDIRSEP(c) (pathname && isdirsep(c))
-#define PERIOD(s) (period && *(s) == '.' && \
-		  ((s) == string || ISDIRSEP((s)[-1])))
-static int
-fnmatch(pat, string, flags)
-    const char *pat;
-    const char *string;
-    int flags;
-{
-    int c;
-    int test;
-    const char *s = string;
-    int escape = !(flags & FNM_NOESCAPE);
-    int pathname = flags & FNM_PATHNAME;
-    int period = !(flags & FNM_DOTMATCH);
-    int nocase = flags & FNM_CASEFOLD;
-
-    while (c = *pat++) {
-	switch (c) {
-	case '?':
-	    if (!*s || ISDIRSEP(*s) || PERIOD(s))
-		return FNM_NOMATCH;
-	    s++;
-	    break;
-	case '*':
-	    while ((c = *pat++) == '*')
-		;
-
-	    if (PERIOD(s))
-		return FNM_NOMATCH;
-
-	    if (!c) {
-		if (pathname && find_dirsep(s))
-		    return FNM_NOMATCH;
-		else
-		    return 0;
-	    }
-	    else if (ISDIRSEP(c)) {
-		s = find_dirsep(s);
-		if (s) {
-                    s++;
-		    break;
-                }
-		return FNM_NOMATCH;
-	    }
-
-	    test = escape && c == '\\' ? *pat : c;
-	    test = downcase(test);
-	    pat--;
-	    while (*s) {
-		if ((c == '[' || downcase(*s) == test) &&
-		    !fnmatch(pat, s, flags | FNM_DOTMATCH))
-		    return 0;
-		else if (ISDIRSEP(*s))
-		    break;
-		s++;
-	    }
-	    return FNM_NOMATCH;
-      
-	case '[':
-	    if (!*s || ISDIRSEP(*s) || PERIOD(s))
-		return FNM_NOMATCH;
-	    pat = range(pat, *s, flags);
-	    if (!pat)
-		return FNM_NOMATCH;
-	    s++;
-	    break;
-
-	case '\\':
-	    if (escape
-#if defined DOSISH
-		&& *pat && strchr("*?[\\", *pat)
-#endif
-		) {
-		c = *pat;
-		if (!c)
-		    c = '\\';
-		else
-		    pat++;
-	    }
-	    /* FALLTHROUGH */
-
-	default:
-#if defined DOSISH
-	    if (ISDIRSEP(c) && isdirsep(*s))
-		;
-	    else
-#endif
-	    if(downcase(c) != downcase(*s))
-		return FNM_NOMATCH;
-	    s++;
-	    break;
-	}
-    }
-    return !*s ? 0 : FNM_NOMATCH;
-}
-
 VALUE rb_cDir;
 
-struct dir_data {
-    DIR *dir;
-    char *path;
-};
-
 static void
 free_dir(dir)
-    struct dir_data *dir;
+    DIR *dir;
 {
-    if (dir && dir->dir) closedir(dir->dir);
+    if (dir) closedir(dir);
 }
 
 static VALUE dir_close _((VALUE));
 
-static VALUE dir_s_alloc _((VALUE));
 static VALUE
-dir_s_alloc(klass)
-    VALUE klass;
+dir_s_open(dir_class, dirname)
+    VALUE dir_class, dirname;
 {
-    struct dir_data *dirp;
-    VALUE obj = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dirp);
-
-    dirp->dir = NULL;
-    dirp->path = NULL;
+    VALUE obj;
+    DIR *dirp;
 
-    return obj;
-}
+    Check_SafeStr(dirname);
 
-static VALUE
-dir_initialize(dir, dirname)
-    VALUE dir, dirname;
-{
-    struct dir_data *dp;
-
-    SafeStringValue(dirname);
-    Data_Get_Struct(dir, struct dir_data, dp);
-    if (dp->dir) closedir(dp->dir);
-    if (dp->path) free(dp->path);
-    dp->dir = NULL;
-    dp->path = NULL;
-    dp->dir = opendir(RSTRING(dirname)->ptr);
-    if (dp->dir == NULL) {
+    dirp = opendir(RSTRING(dirname)->ptr);
+    if (dirp == NULL) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
-	    dp->dir = opendir(RSTRING(dirname)->ptr);
+	    dirp = opendir(RSTRING(dirname)->ptr);
 	}
-	if (dp->dir == NULL) {
+	if (dirp == NULL) {
 	    rb_sys_fail(RSTRING(dirname)->ptr);
 	}
     }
-    dp->path = strdup(RSTRING(dirname)->ptr);
 
-    return dir;
-}
-
-static VALUE
-dir_s_open(klass, dirname)
-    VALUE klass, dirname;
-{
-    struct dir_data *dp;
-    VALUE dir = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dp);
+    obj = Data_Wrap_Struct(dir_class, 0, free_dir, dirp);
 
-    dir_initialize(dir, dirname);
-    if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, dir, dir_close, dir);
+    if (rb_iterator_p()) {
+	return rb_ensure(rb_yield, obj, dir_close, obj);
     }
 
-    return dir;
+    return obj;
 }
 
 static void
@@ -310,35 +112,23 @@ dir_closed()
     rb_raise(rb_eIOError, "closed directory");
 }
 
-#define GetDIR(obj, dirp) do {\
-    Data_Get_Struct(obj, struct dir_data, dirp);\
-    if (dirp->dir == NULL) dir_closed();\
-} while (0)
-
-static VALUE
-dir_path(dir)
-    VALUE dir;
-{
-    struct dir_data *dirp;
-
-    GetDIR(dir, dirp);
-    if (!dirp->path) return Qnil;
-    return rb_str_new2(dirp->path);
+#define GetDIR(obj, dirp) {\
+    Data_Get_Struct(obj, DIR, dirp);\
+    if (dirp == NULL) dir_closed();\
 }
 
 static VALUE
 dir_read(dir)
     VALUE dir;
 {
-    struct dir_data *dirp;
+    DIR *dirp;
     struct dirent *dp;
 
     GetDIR(dir, dirp);
     errno = 0;
-    dp = readdir(dirp->dir);
-    if (dp) {
+    dp = readdir(dirp);
+    if (dp)
 	return rb_tainted_str_new(dp->d_name, NAMLEN(dp));
-    }
     else if (errno == 0) {	/* end of stream */
 	return Qnil;
     }
@@ -352,13 +142,14 @@ static VALUE
 dir_each(dir)
     VALUE dir;
 {
-    struct dir_data *dirp;
+    DIR *dirp;
     struct dirent *dp;
+    VALUE file;
 
     GetDIR(dir, dirp);
-    for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
-	rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
-	if (dirp->dir == NULL) dir_closed();
+    for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
+	file = rb_tainted_str_new(dp->d_name, NAMLEN(dp));
+	rb_yield(file);
     }
     return dir;
 }
@@ -367,12 +158,12 @@ static VALUE
 dir_tell(dir)
     VALUE dir;
 {
-#ifdef HAVE_TELLDIR
-    struct dir_data *dirp;
+#if !defined(__CYGWIN32__) && !defined(__BEOS__)
+    DIR *dirp;
     long pos;
 
     GetDIR(dir, dirp);
-    pos = telldir(dirp->dir);
+    pos = telldir(dirp);
     return rb_int2inum(pos);
 #else
     rb_notimplement();
@@ -383,11 +174,11 @@ static VALUE
 dir_seek(dir, pos)
     VALUE dir, pos;
 {
-    struct dir_data *dirp;
+    DIR *dirp;
 
-#ifdef HAVE_SEEKDIR
+#if !defined(__CYGWIN32__) && !defined(__BEOS__)
     GetDIR(dir, dirp);
-    seekdir(dirp->dir, NUM2INT(pos));
+    seekdir(dirp, NUM2INT(pos));
     return dir;
 #else
     rb_notimplement();
@@ -395,21 +186,13 @@ dir_seek(dir, pos)
 }
 
 static VALUE
-dir_set_pos(dir, pos)
-    VALUE dir, pos;
-{
-    dir_seek(dir, pos);
-    return pos;
-}
-
-static VALUE
 dir_rewind(dir)
     VALUE dir;
 {
-    struct dir_data *dirp;
+    DIR *dirp;
 
     GetDIR(dir, dirp);
-    rewinddir(dirp->dir);
+    rewinddir(dirp);
     return dir;
 }
 
@@ -417,74 +200,39 @@ static VALUE
 dir_close(dir)
     VALUE dir;
 {
-    struct dir_data *dirp;
+    DIR *dirp;
 
-    GetDIR(dir, dirp);
-    closedir(dirp->dir);
-    dirp->dir = NULL;
+    Data_Get_Struct(dir, DIR, dirp);
+    if (dirp == NULL) dir_closed();
+    closedir(dirp);
+    DATA_PTR(dir) = NULL;
 
     return Qnil;
 }
 
-static void
-dir_chdir(path)
-    const char *path;
-{
-    if (chdir(path) < 0)
-	rb_sys_fail(path);
-}
-
-static int chdir_blocking = 0;
-static VALUE chdir_thread = Qnil;
-
-static VALUE
-chdir_restore(path)
-    char *path;
-{
-    chdir_blocking--;
-    if (chdir_blocking == 0)
-	chdir_thread = Qnil;
-    dir_chdir(path);
-    free(path);
-    return Qnil;
-}
-
 static VALUE
 dir_s_chdir(argc, argv, obj)
     int argc;
     VALUE *argv;
     VALUE obj;
 {
-    VALUE path = Qnil;
+    VALUE path;
     char *dist = "";
 
     rb_secure(2);
     if (rb_scan_args(argc, argv, "01", &path) == 1) {
-	SafeStringValue(path);
+	Check_SafeStr(path);
 	dist = RSTRING(path)->ptr;
     }
     else {
 	dist = getenv("HOME");
 	if (!dist) {
 	    dist = getenv("LOGDIR");
-	    if (!dist) rb_raise(rb_eArgError, "HOME/LOGDIR not set");
 	}
     }
 
-    if (chdir_blocking > 0) {
-	if (!rb_block_given_p() || rb_thread_current() != chdir_thread)
-	    rb_warn("conflicting chdir during another chdir block");
-    }
-
-    if (rb_block_given_p()) {
-	char *cwd = my_getcwd();
-	chdir_blocking++;
-	if (chdir_thread == Qnil)
-	    chdir_thread = rb_thread_current();
-	dir_chdir(dist);
-	return rb_ensure(rb_yield, path, chdir_restore, (VALUE)cwd);
-    }
-    dir_chdir(dist);
+    if (chdir(dist) < 0)
+	rb_sys_fail(dist);
 
     return INT2FIX(0);
 }
@@ -493,24 +241,25 @@ static VALUE
 dir_s_getwd(dir)
     VALUE dir;
 {
-    char *path;
-    VALUE cwd;
+    char path[MAXPATHLEN];
 
-    rb_secure(4);
-    path = my_getcwd();
-    cwd = rb_tainted_str_new2(path);
+#ifdef HAVE_GETCWD
+    if (getcwd(path, sizeof(path)) == 0) rb_sys_fail(path);
+#else
+    extern char *getwd();
+    if (getwd(path) == 0) rb_sys_fail(path);
+#endif
 
-    free(path);
-    return cwd;
+    return rb_tainted_str_new2(path);
 }
 
 static VALUE
 dir_s_chroot(dir, path)
     VALUE dir, path;
 {
-#if defined(HAVE_CHROOT) && !defined(__CHECKER__)
+#if !defined(DJGPP) && !defined(NT) && !defined(__human68k__) && !defined(USE_CWGUSI) && !defined(__BEOS__) && !defined(__EMX__)
     rb_secure(2);
-    SafeStringValue(path);
+    Check_SafeStr(path);
 
     if (chroot(RSTRING(path)->ptr) == -1)
 	rb_sys_fail(RSTRING(path)->ptr);
@@ -531,6 +280,7 @@ dir_s_mkdir(argc, argv, obj)
     VALUE path, vmode;
     int mode;
 
+    rb_secure(2);
     if (rb_scan_args(argc, argv, "11", &path, &vmode) == 2) {
 	mode = NUM2INT(vmode);
     }
@@ -538,9 +288,8 @@ dir_s_mkdir(argc, argv, obj)
 	mode = 0777;
     }
 
-    SafeStringValue(path);
-    rb_secure(2);
-#ifndef _WIN32
+    Check_SafeStr(path);
+#if !defined(NT) && !defined(USE_CWGUSI)
     if (mkdir(RSTRING(path)->ptr, mode) == -1)
 	rb_sys_fail(RSTRING(path)->ptr);
 #else
@@ -555,24 +304,22 @@ static VALUE
 dir_s_rmdir(obj, dir)
     VALUE obj, dir;
 {
-    SafeStringValue(dir);
     rb_secure(2);
+    Check_SafeStr(dir);
     if (rmdir(RSTRING(dir)->ptr) < 0)
 	rb_sys_fail(RSTRING(dir)->ptr);
 
-    return INT2FIX(0);
+    return Qtrue;
 }
 
 /* Return nonzero if S has any special globbing chars in it.  */
 static int
-has_magic(s, send, flags)
+has_magic(s, send)
      char *s, *send;
-     int flags;
 {
     register char *p = s;
     register char c;
     int open = 0;
-    int escape = !(flags & FNM_NOESCAPE);
 
     while ((c = *p++) != '\0') {
 	switch (c) {
@@ -580,8 +327,8 @@ has_magic(s, send, flags)
 	  case '*':
 	    return Qtrue;
 
-	  case '[':	/* Only accept an open brace if there is a close */
-	    open++;	/* brace to match it.  Bracket expressions must be */
+	  case '[':		/* Only accept an open brace if there is a close */
+	    open++;		/* brace to match it.  Bracket expressions must be */
 	    continue;	/* complete, according to Posix.2 */
 	  case ']':
 	    if (open)
@@ -589,7 +336,7 @@ has_magic(s, send, flags)
 	    continue;
 
 	  case '\\':
-	    if (escape && *p++ == '\0')
+	    if (*p++ == '\0')
 		return Qfalse;
 	}
 
@@ -608,11 +355,7 @@ extract_path(p, pend)
     len = pend - p;
     alloc = ALLOC_N(char, len+1);
     memcpy(alloc, p, len);
-    if (len > 1 && pend[-1] == '/'
-#if defined DOSISH_DRIVE_LETTER
-    && pend[-2] != ':'
-#endif
-    ) {
+    if (len > 0 && pend[-1] == '/') {
 	alloc[len-1] = 0;
     }
     else {
@@ -634,280 +377,112 @@ extract_elem(path)
     return extract_path(path, pend);
 }
 
-static void
-remove_backslashes(p)
-    char *p;
-{
-    char *pend = p + strlen(p);
-    char *t = p;
-
-    while (p < pend) {
-	if (*p == '\\') {
-	    if (++p == pend) break;
-	}
-	*t++ = *p++;
-    }
-    *t = '\0';
-}
-
 #ifndef S_ISDIR
 #   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
 #endif
 
-struct glob_args {
-    void (*func) _((const char*, VALUE));
-    const char *c;
-    VALUE v;
-};
-
-static VALUE glob_func_caller _((VALUE));
-
-static VALUE
-glob_func_caller(val)
-    VALUE val;
-{
-    struct glob_args *args = (struct glob_args *)val;
-    (*args->func)(args->c, args->v);
-    return Qnil;
-}
-
-static int
-glob_call_func(func, path, arg)
-    void (*func) _((const char*, VALUE));
-    const char *path;
-    VALUE arg;
-{
-    int status;
-    struct glob_args args;
-
-    args.func = func;
-    args.c = path;
-    args.v = arg;
-
-    rb_protect(glob_func_caller, (VALUE)&args, &status);
-    return status;
-}
-
-static int
-glob_helper(path, sub, flags, func, arg)
+static void
+glob(path, func, arg)
     char *path;
-    char *sub;
-    int flags;
-    void (*func) _((const char*, VALUE));
+    void (*func)();
     VALUE arg;
 {
     struct stat st;
     char *p, *m;
-    int status = 0;
 
-    p = sub ? sub : path;
-    if (!has_magic(p, 0, flags)) {
-#if defined DOSISH
-	remove_backslashes(path);
-#else
-	if (!(flags & FNM_NOESCAPE)) remove_backslashes(p);
-#endif
-	if (lstat(path, &st) == 0) {
-	    status = glob_call_func(func, path, arg);
-	    if (status) return status;
-	}
-	else if (errno != ENOENT) {
-	    /* In case stat error is other than ENOENT and
-	       we may want to know what is wrong. */
-	    rb_sys_warning(path);
+    if (!has_magic(path, 0)) {
+	if (stat(path, &st) == 0) {
+	    (*func)(path, arg);
 	}
-	return 0;
+	return;
     }
 
-    while (p && !status) {
+    p = path;
+    while (p) {
 	if (*p == '/') p++;
 	m = strchr(p, '/');
-	if (has_magic(p, m, flags)) {
-	    char *dir, *base, *magic, *buf;
+	if (has_magic(p, m)) {
+	    char *dir, *base, *magic;
 	    DIR *dirp;
 	    struct dirent *dp;
-	    int recursive = 0;
 
 	    struct d_link {
 		char *path;
 		struct d_link *next;
-	    } *tmp, *link, **tail = &link;
+	    } *tmp, *link = 0;
 
 	    base = extract_path(path, p);
 	    if (path == p) dir = ".";
 	    else dir = base;
 
-	    magic = extract_elem(p);
-	    if (stat(dir, &st) < 0) {
-	        if (errno != ENOENT) rb_sys_warning(dir);
-	        free(base);
-	        free(magic);
-	        break;
-	    }
-	    if (S_ISDIR(st.st_mode)) {
-		if (m && strcmp(magic, "**") == 0) {
-		    int n = strlen(base);
-		    recursive = 1;
-		    buf = ALLOC_N(char, n+strlen(m)+3);
-		    sprintf(buf, "%s%s", base, *base ? m : m+1);
-		    status = glob_helper(buf, buf+n, flags, func, arg);
-		    free(buf);
-		    if (status) goto finalize;
-		}
-		dirp = opendir(dir);
-		if (dirp == NULL) {
-		    rb_sys_warning(dir);
-		    free(base);
-		    free(magic);
-		    break;
-		}
-	    }
-	    else {
+	    dirp = opendir(dir);
+	    if (dirp == NULL) {
 		free(base);
-		free(magic);
 		break;
 	    }
-
-#if defined DOSISH_DRIVE_LETTER
-#define BASE (*base && !((isdirsep(*base) && !base[1]) || (base[1] == ':' && isdirsep(base[2]) && !base[3])))
-#else
-#define BASE (*base && !(isdirsep(*base) && !base[1]))
-#endif
-
+	    magic = extract_elem(p);
 	    for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
-		if (recursive) {
-		    if (strcmp(".", dp->d_name) == 0 || strcmp("..", dp->d_name) == 0)
-			continue;
-		    buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+strlen(m)+6);
-		    sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
-		    if (lstat(buf, &st) < 0) {
-			if (errno != ENOENT) rb_sys_warning(buf);
-			free(buf);
-			continue;
-		    }
-		    if (S_ISDIR(st.st_mode)) {
-			char *t = buf+strlen(buf);
-		        strcpy(t, "/**");
-			strcpy(t+3, m);
-			status = glob_helper(buf, t, flags, func, arg);
-			free(buf);
-			if (status) break;
-			continue;
-		    }
-		    free(buf);
-		    continue;
-		}
-		if (fnmatch(magic, dp->d_name, flags) == 0) {
-		    buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
-		    sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
+		if (fnmatch(magic, dp->d_name, FNM_PERIOD|FNM_PATHNAME) == 0) {
+		    char *fix = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
+
+		    sprintf(fix, "%s%s%s", base, (*base)?"/":"", dp->d_name);
 		    if (!m) {
-			status = glob_call_func(func, buf, arg);
-			free(buf);
-			if (status) break;
+			(*func)(fix, arg);
+			free(fix);
 			continue;
 		    }
 		    tmp = ALLOC(struct d_link);
-		    tmp->path = buf;
-		    *tail = tmp;
-		    tail = &tmp->next;
+		    tmp->path = fix;
+		    tmp->next = link;
+		    link = tmp;
 		}
 	    }
 	    closedir(dirp);
-	  finalize:
-	    *tail = 0;
 	    free(base);
 	    free(magic);
-	    if (link) {
-		while (link) {
-		    if (status == 0) {
-			if (stat(link->path, &st) == 0) {
-			    if (S_ISDIR(st.st_mode)) {
-				int len = strlen(link->path);
-				int mlen = strlen(m);
-				char *t = ALLOC_N(char, len+mlen+1);
-
-				sprintf(t, "%s%s", link->path, m);
-				status = glob_helper(t, t+len, flags, func, arg);
-				free(t);
-			    }
-			}
-			else {
-			    rb_sys_warning(link->path);
-			}
-		    }
-		    tmp = link;
-		    link = link->next;
-		    free(tmp->path);
-		    free(tmp);
+	    while (link) {
+		stat(link->path, &st); /* should success */
+		if (S_ISDIR(st.st_mode)) {
+		    int len = strlen(link->path);
+		    int mlen = strlen(m);
+		    char *t = ALLOC_N(char, len+mlen+1);
+
+		    sprintf(t, "%s%s", link->path, m);
+		    glob(t, func, arg);
+		    free(t);
 		}
-		break;
+		tmp = link;
+		link = link->next;
+		free(tmp->path);
+		free(tmp);
 	    }
 	}
 	p = m;
     }
-    return status;
-}
-
-static void
-rb_glob2(path, flags, func, arg)
-    char *path;
-    int flags;
-    void (*func) _((const char*, VALUE));
-    VALUE arg;
-{
-    int status = glob_helper(path, 0, flags, func, arg);
-    if (status) rb_jump_tag(status);
-}
-
-void
-rb_glob(path, func, arg)
-    char *path;
-    void (*func) _((const char*, VALUE));
-    VALUE arg;
-{
-    rb_glob2(path, 0, func, arg);
-}
-
-void
-rb_globi(path, func, arg)
-    char *path;
-    void (*func) _((const char*, VALUE));
-    VALUE arg;
-{
-    rb_glob2(path, FNM_CASEFOLD, func, arg);
 }
 
 static void
 push_pattern(path, ary)
-    const char *path;
+    char *path;
     VALUE ary;
 {
-    VALUE str = rb_tainted_str_new2(path);
-
-    if (ary) {
-	rb_ary_push(ary, str);
-    }
-    else {
-	rb_yield(str);
-    }
+    rb_ary_push(ary, rb_tainted_str_new2(path));
 }
 
 static void
-push_globs(ary, s, flags)
+push_globs(ary, s)
     VALUE ary;
     char *s;
-    int flags;
 {
-    rb_glob2(s, flags, push_pattern, ary);
+    glob(s, push_pattern, ary);
 }
 
 static void
-push_braces(ary, s, flags)
+push_braces(ary, s)
     VALUE ary;
     char *s;
-    int flags;
 {
-    char *buf;
+    char buffer[MAXPATHLEN], *buf = buffer;
     char *p, *t, *b;
     char *lbrace, *rbrace;
     int nest = 0;
@@ -930,9 +505,10 @@ push_braces(ary, s, flags)
 	p++;
     }
 
-    if (lbrace && rbrace) {
+    if (lbrace) {
 	int len = strlen(s);
-	buf = xmalloc(len + 1);
+	if (len >= MAXPATHLEN)
+	    buf = xmalloc(len + 1);
 	memcpy(buf, s, lbrace-s);
 	b = buf + (lbrace-s);
 	p = lbrace;
@@ -944,100 +520,71 @@ push_braces(ary, s, flags)
 	    }
 	    memcpy(b, t, p-t);
 	    strcpy(b+(p-t), rbrace+1);
-	    push_braces(ary, buf, flags);
+	    push_braces(ary, buf);
 	}
-	free(buf);
+	if (buf != buffer)
+	    free(buf);
     }
     else {
-	push_globs(ary, s, flags);
+	push_globs(ary, s);
     }
 }
 
-#define isdelim(c) ((c)=='\0')
+#define isdelim(c) ((c)==' '||(c)=='\t'||(c)=='\n'||(c)=='\0')
 
 static VALUE
-rb_push_glob(str, flags)
-    VALUE str;
-    int flags;
+dir_s_glob(dir, str)
+    VALUE dir, str;
 {
     char *p, *pend;
-    char *buf;
-    char *t;
-    int nest, maxnest;
-    int noescape = flags & FNM_NOESCAPE;
+    char buffer[MAXPATHLEN], *buf = buffer;
+    char *t, *t0;
+    int nest;
     VALUE ary;
 
-    if (rb_block_given_p())
-	ary = 0;
-    else
-	ary = rb_ary_new();
-
-    SafeStringValue(str);
-    buf = xmalloc(RSTRING(str)->len + 1);
+    Check_SafeStr(str);
+    ary = rb_ary_new();
+    if (RSTRING(str)->len >= MAXPATHLEN)
+	buf = xmalloc(RSTRING(str)->len + 1);
 
     p = RSTRING(str)->ptr;
     pend = p + RSTRING(str)->len;
 
     while (p < pend) {
 	t = buf;
-	nest = maxnest = 0;
 	while (p < pend && isdelim(*p)) p++;
 	while (p < pend && !isdelim(*p)) {
-	    if (*p == '{') nest++, maxnest++;
-	    if (*p == '}') nest--;
-	    if (!noescape && *p == '\\') {
-		*t++ = *p++;
-		if (p == pend) break;
-	    }
 	    *t++ = *p++;
 	}
 	*t = '\0';
-	if (maxnest == 0) {
-	    push_globs(ary, buf, flags);
+	t0 = buf;
+	nest = 0;
+	while (t0 < t) {
+	    if (*t0 == '{') nest+=2;
+	    if (*t0 == '}') nest+=3;
+	    t0++;
 	}
-	else if (nest == 0) {
-	    push_braces(ary, buf, flags);
+	if (nest == 0) {
+	    push_globs(ary, buf);
+	}
+	else if (nest % 5 == 0) {
+	    push_braces(ary, buf);
 	}
 	/* else unmatched braces */
     }
-    free(buf);
-
+    if (buf != buffer)
+	free(buf);
     return ary;
 }
 
 static VALUE
-dir_s_aref(obj, str)
-    VALUE obj, str;
-{
-    return rb_push_glob(str, 0);
-}
-
-static VALUE
-dir_s_glob(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE str, rflags;
-    int flags;
-
-    if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2)
-	flags = NUM2INT(rflags);
-    else
-	flags = 0;
-
-    return rb_push_glob(str, flags);
-}
-
-static VALUE
 dir_foreach(io, dirname)
     VALUE io, dirname;
 {
     VALUE dir;
 
     dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
-    rb_ensure(dir_each, dir, dir_close, dir);
-    return Qnil;
+    return rb_ensure(dir_each, dir, dir_close, dir);
 }
 
 static VALUE
@@ -1050,30 +597,6 @@ dir_entries(io, dirname)
     return rb_ensure(rb_Array, dir, dir_close, dir);
 }
 
-static VALUE
-file_s_fnmatch(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE pattern, path;
-    VALUE rflags;
-    int flags;
-
-    if (rb_scan_args(argc, argv, "21", &pattern, &path, &rflags) == 3)
-	flags = NUM2INT(rflags);
-    else
-	flags = 0;
-
-    StringValue(pattern);
-    StringValue(path);
-
-    if (fnmatch(RSTRING(pattern)->ptr, RSTRING(path)->ptr, flags) == 0)
-	return Qtrue;
-
-    return Qfalse;
-}
-
 void
 Init_Dir()
 {
@@ -1081,20 +604,16 @@ Init_Dir()
 
     rb_include_module(rb_cDir, rb_mEnumerable);
 
-    rb_define_alloc_func(rb_cDir, dir_s_alloc);
+    rb_define_singleton_method(rb_cDir, "new", dir_s_open, 1);
     rb_define_singleton_method(rb_cDir, "open", dir_s_open, 1);
     rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, 1);
     rb_define_singleton_method(rb_cDir, "entries", dir_entries, 1);
 
-    rb_define_method(rb_cDir,"initialize", dir_initialize, 1);
-    rb_define_method(rb_cDir,"path", dir_path, 0);
     rb_define_method(rb_cDir,"read", dir_read, 0);
     rb_define_method(rb_cDir,"each", dir_each, 0);
     rb_define_method(rb_cDir,"rewind", dir_rewind, 0);
     rb_define_method(rb_cDir,"tell", dir_tell, 0);
     rb_define_method(rb_cDir,"seek", dir_seek, 1);
-    rb_define_method(rb_cDir,"pos", dir_tell, 0);
-    rb_define_method(rb_cDir,"pos=", dir_set_pos, 1);
     rb_define_method(rb_cDir,"close", dir_close, 0);
 
     rb_define_singleton_method(rb_cDir,"chdir", dir_s_chdir, -1);
@@ -1106,14 +625,6 @@ Init_Dir()
     rb_define_singleton_method(rb_cDir,"delete", dir_s_rmdir, 1);
     rb_define_singleton_method(rb_cDir,"unlink", dir_s_rmdir, 1);
 
-    rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
-    rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, 1);
-
-    rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
-    rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
-
-    rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE));
-    rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
-    rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
-    rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
+    rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, 1);
+    rb_define_singleton_method(rb_cDir,"[]", dir_s_glob, 1);
 }
diff --git a/djgpp/GNUmakefile.in b/djgpp/GNUmakefile.in
deleted file mode 100644
index 0a7e1fb131..0000000000
--- a/djgpp/GNUmakefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include Makefile
-VPATH = $(srcdir) $(srcdir)/missing
diff --git a/djgpp/README.djgpp b/djgpp/README.djgpp
deleted file mode 100644
index f1f413a478..0000000000
--- a/djgpp/README.djgpp
+++ /dev/null
@@ -1,21 +0,0 @@
-* How to compile and install on djgpp
-
-This is what you need to do to compile and install Ruby:
-
-  1. Run configure.bat, which will generate config.h and Makefile
-     (GNU sed required).
-     Message like this is normal:
-       sed.exe: can't read 123456789: No such file or directory (ENOENT)
-
-  2. Edit defines.h if you need.  Probably this step will not need.
-
-  3. Remove comment mark(#) before the module names from ext/Setup.dj (or
-     add module names if not present).
-
-  4. Run make.
-
-  5. Optionally, run 'make test' to check whether the compiled Ruby
-     interpreter works well.  If you see the message "test succeeded",
-     your ruby works as it should (hopefully).
-
-  6. Run 'make install'
diff --git a/djgpp/config.hin b/djgpp/config.hin
deleted file mode 100644
index 8ee427c92f..0000000000
--- a/djgpp/config.hin
+++ /dev/null
@@ -1,114 +0,0 @@
-
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
-#define PACKAGE_BUGREPORT ""
-#define USE_BUILTIN_FRAME_ADDRESS 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_LONG_LONG 1
-#define HAVE_OFF_T 1
-#define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
-#define SIZEOF_LONG 4
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF___INT64 0
-#define SIZEOF_OFF_T 4
-#define SIZEOF_VOIDP 4
-#define SIZEOF_FLOAT 4
-#define SIZEOF_DOUBLE 8
-#define HAVE_PROTOTYPES 1
-#define TOKEN_PASTE(x,y) x##y
-#define HAVE_STDARG_PROTOTYPES 1
-#define NORETURN(x) x __attribute__ ((noreturn))
-#define HAVE_DECL_SYS_NERR 1
-#define HAVE_DIRENT_H 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_WAIT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_SYS_FILE_H 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_FCNTL_H 1
-#define HAVE_SYS_FCNTL_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TIMES_H 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_PWD_H 1
-#define HAVE_UTIME_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_DIRECT_H 1
-#define HAVE_SYS_RESOURCE_H 1
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-#define HAVE_ST_BLKSIZE 1
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-#define HAVE_ST_RDEV 1
-#define GETGROUPS_T gid_t
-#define RETSIGTYPE void
-#define HAVE_ALLOCA 1
-#define HAVE_DUP2 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MKDIR 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_STRERROR 1
-#define HAVE_STRFTIME 1
-#define HAVE_STRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOUL 1
-#define HAVE_ISINF 1
-#define HAVE_ISNAN 1
-#define HAVE_FINITE 1
-#define HAVE_HYPOT 1
-#define HAVE_ACOSH 1
-#define HAVE_FMOD 1
-#define HAVE_WAITPID 1
-#define HAVE_FSYNC 1
-#define HAVE_TRUNCATE 1
-#define HAVE_CHSIZE 1
-#define HAVE_TIMES 1
-#define HAVE_UTIMES 1
-#define HAVE_FCNTL 1
-#define HAVE_SYMLINK 1
-#define HAVE_SETITIMER 1
-#define HAVE_PAUSE 1
-#define HAVE_GETPGRP 1
-#define HAVE_SETPGID 1
-#define HAVE_GETGROUPS 1
-#define HAVE_GETRLIMIT 1
-#define HAVE_SIGPROCMASK 1
-#define HAVE_SIGACTION 1
-#define HAVE_SETSID 1
-#define HAVE_TELLDIR 1
-#define HAVE_SEEKDIR 1
-#define HAVE_MKTIME 1
-#define HAVE_COSH 1
-#define HAVE_SINH 1
-#define HAVE_TANH 1
-#define HAVE_STRUCT_TM_TM_ZONE 1
-#define HAVE_TM_ZONE 1
-#define HAVE_STRUCT_TM_TM_GMTOFF 1
-#define POSIX_SIGNAL 1
-#define GETPGRP_VOID 1
-#define SETPGRP_VOID 1
-#define RSHIFT(x,y) ((x)>>(int)y)
-#define FILE_COUNT _cnt
-#define FILE_READPTR _ptr
-#define NEED_IO_FLUSH_BETWEEN_RW 1
-#define DEFAULT_KCODE KCODE_NONE
-#define DLEXT ".so"
-#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@"
-#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@"
-#define RUBY_PLATFORM "i386-msdosdjgpp"
-#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
-#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
diff --git a/djgpp/config.sed b/djgpp/config.sed
deleted file mode 100644
index 1805789520..0000000000
--- a/djgpp/config.sed
+++ /dev/null
@@ -1,128 +0,0 @@
-/^SHELL/s,/bin/sh,$(COMSPEC),
-;s%/bin/rm%rm%
-;s%|| true%%
-;/\/dev\/null/ {
-;s,/dev/null 2>&1, nul,
-;s,2> /dev/null,,
-;}
-;/^config.status/ {
-;    N;N;N;N;N;d
-;}
-:t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@srcdir@,.,g;t t
-s,@top_srcdir@,..,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,,;t t
-s,@PACKAGE_TARNAME@,,;t t
-s,@PACKAGE_VERSION@,,;t t
-s,@PACKAGE_STRING@,,;t t
-s,@PACKAGE_BUGREPORT@,,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/dev/env/DJDIR,;t t
-s%@program_transform_name@%s,^,,%;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,i586-pc-msdosdjgpp,;t t
-s,@host_alias@,i586-pc-msdosdjgpp,;t t
-s,@target_alias@,i386-msdosdjgpp,;t t
-s,@DEFS@,,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,-lm ,;t t
-s,@MAJOR@,1,;t t
-s,@MINOR@,7,;t t
-s,@TEENY@,3,;t t
-s,@build@,i586-pc-msdosdjgpp,;t t
-s,@build_cpu@,i586,;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,msdosdjgpp,;t t
-s,@host@,i586-pc-msdosdjgpp,;t t
-s,@host_cpu@,i586,;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,msdosdjgpp,;t t
-s,@target@,i386-pc-msdosdjgpp,;t t
-s,@target_cpu@,i386,;t t
-s,@target_vendor@,pc,;t t
-s,@target_os@,msdosdjgpp,;t t
-s,@CC@,gcc,;t t
-s,@ac_ct_CC@,,;t t
-s,@CFLAGS@,-Os,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@EXEEXT@,.exe,;t t
-s,@OBJEXT@,o,;t t
-s,@CPP@,gcc -E,;t t
-s,@EGREP@,grep -E,;t t
-s,@GNU_LD@,yes,;t t
-s,@CPPOUTFILE@,-o conftest.i,;t t
-s,@OUTFLAG@,-o ,;t t
-s,@YACC@,bison -y,;t t
-s,@RANLIB@,ranlib,;t t
-s,@ac_ct_RANLIB@,,;t t
-s,@AR@,ar,;t t
-s,@ac_ct_AR@,,;t t
-s,@NM@,,;t t
-s,@ac_ct_NM@,,;t t
-s,@WINDRES@,,;t t
-s,@ac_ct_WINDRES@,,;t t
-s,@DLLWRAP@,,;t t
-s,@ac_ct_DLLWRAP@,,;t t
-s,@LN_S@,ln -s,;t t
-s,@SET_MAKE@,,;t t
-s,@LIBOBJS@,crypt.o flock.o vsnprintf.o,;t t
-s,@ALLOCA@,,;t t
-s,@XCFLAGS@,,;t t
-s,@XLDFLAGS@, -L.,;t t
-s,@DLDFLAGS@,,;t t
-s,@STATIC@,,;t t
-s,@CCDLFLAGS@,,;t t
-s,@LDSHARED@,ld,;t t
-s,@DLEXT@,so,;t t
-s,@DLEXT2@,,;t t
-s,@LIBEXT@,a,;t t
-s,@LINK_SO@,,;t t
-s,@LIBPATHFLAG@, -L%s,;t t
-s,@STRIP@,strip,;t t
-s,@EXTSTATIC@,,;t t
-s,@setup@,Setup.dj,;t t
-s,@MINIRUBY@,./miniruby,;t t
-s,@PREP@,,;t t
-s,@ARCHFILE@,,;t t
-s,@LIBRUBY_LDSHARED@,ld,;t t
-s,@LIBRUBY_DLDFLAGS@,,;t t
-s,@RUBY_INSTALL_NAME@,ruby,;t t
-s,@rubyw_install_name@,,;t t
-s,@RUBYW_INSTALL_NAME@,,;t t
-s,@RUBY_SO_NAME@,$(RUBY_INSTALL_NAME),;t t
-s,@LIBRUBY_A@,lib$(RUBY_INSTALL_NAME).a,;t t
-s,@LIBRUBY_SO@,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY),;t t
-s,@LIBRUBY_ALIASES@,lib$(RUBY_SO_NAME).so,;t t
-s,@LIBRUBY@,$(LIBRUBY_A),;t t
-s,@LIBRUBYARG@,-l$(RUBY_INSTALL_NAME),;t t
-s,@SOLIBS@,,;t t
-s,@DLDLIBS@,-lc,;t t
-s,@ENABLE_SHARED@,no,;t t
-s,@MAINLIBS@,,;t t
-s,@COMMON_LIBS@,,;t t
-s,@COMMON_MACROS@,,;t t
-s,@COMMON_HEADERS@,,;t t
-s,@EXPORT_PREFIX@,,;t t
-s,@MAKEFILES@,Makefile,;t t
-s,@arch@,i386-msdosdjgpp,;t t
-s,@sitearch@,i386-msdosdjgpp,;t t
-s,@sitedir@,${prefix}/lib/ruby/site_ruby,;t t
-s,@configure_args@,,;t t
-/^,THIS_IS_DUMMY_PATTERN_/i\
-ac_given_srcdir=.
diff --git a/djgpp/configure.bat b/djgpp/configure.bat
deleted file mode 100644
index e6a5d79d4a..0000000000
--- a/djgpp/configure.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-if exist configure.bat cd ..
-if exist djgpp\version.sed goto exist
-  sed -n -f djgpp\mkver.sed < version.h > djgpp\version.sed
-:exist
-set _conv_=-f djgpp\config.sed -f djgpp\version.sed
-sed %_conv_% < Makefile.in > Makefile
-sed %_conv_% < djgpp\config.hin > config.h
-echo LFN check > 12345678
-sed -n /LFN/d 123456789 > nul
-if errorlevel 2 goto LFN
-    copy missing\vsnprintf.c missing\vsnprint.c > nul
-    copy djgpp\config.sed config.sta > nul
-goto end
-:LFN
-    copy djgpp\config.sed config.status > nul
-:end
-set _conv_=
-del 12345678
-echo Now you must run a make.
diff --git a/djgpp/mkver.sed b/djgpp/mkver.sed
deleted file mode 100644
index f29b9ddd3e..0000000000
--- a/djgpp/mkver.sed
+++ /dev/null
@@ -1 +0,0 @@
-/RUBY_VERSION /s/^.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/s,@MAJOR@,\1,;s,@MINOR@,\2,;s,@TEENY@,\3,/p
diff --git a/dln.c b/dln.c
index eb907cbef2..daf3a9d60a 100644
--- a/dln.c
+++ b/dln.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   dln.c -
 
@@ -6,32 +6,21 @@
   $Date$
   created at: Tue Jan 18 17:05:06 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
-#include "ruby.h"
+#include "config.h"
+#include "defines.h"
 #include "dln.h"
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef __CHECKER__
-#undef HAVE_DLOPEN
-#undef USE_DLN_A_OUT
-#undef USE_DLN_DLOPEN
-#endif
-
-#ifdef USE_DLN_A_OUT
 char *dln_argv0;
-#endif
 
 #ifdef _AIX
 #pragma alloca
 #endif
 
-#if defined(HAVE_ALLOCA_H)
+#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
 #include <alloca.h>
 #endif
 
@@ -48,20 +37,19 @@ void *xrealloc();
 #endif
 
 #include <stdio.h>
-#if defined(_WIN32) || defined(__VMS)
+#ifndef NT
+# ifndef USE_CWGUSI
+#  include <sys/file.h>
+# endif
+#else
 #include "missing/file.h"
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifndef S_ISDIR
-#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
-#endif
-
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
-#endif
-#ifndef MAXPATHLEN
+#else
 # define MAXPATHLEN 1024
 #endif
 
@@ -69,15 +57,10 @@ void *xrealloc();
 # include <unistd.h>
 #endif
 
-#ifndef _WIN32
+#ifndef NT
 char *getenv();
 #endif
 
-#if defined(__VMS)
-#pragma builtins
-#include <dlfcn.h>
-#endif
-
 #ifdef __MACOS__
 # include <TextUtils.h>
 # include <CodeFragments.h>
@@ -91,59 +74,42 @@ char *getenv();
 
 int eaccess();
 
-#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__)
+#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(__CYGWIN32__) && !defined(_AIX)
 /* dynamic load with dlopen() */
 # define USE_DLN_DLOPEN
 #endif
 
 #ifndef FUNCNAME_PATTERN
-# if defined(__hp9000s300) ||  (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__)
-#  define FUNCNAME_PATTERN "_Init_%s"
+# if defined(__hp9000s300) ||  (defined(__NetBSD__) && (!defined(__alpha__) && !defined(__mips__))) || defined(__BORLANDC__) || (defined(__FreeBSD__) && __FreeBSD__ < 3) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__)
+#  define FUNCNAME_PATTERN "_Init_%.200s"
 # else
-#  define FUNCNAME_PATTERN "Init_%s"
+#  define FUNCNAME_PATTERN "Init_%.200s"
 # endif
 #endif
 
-static int
-init_funcname_len(buf, file)
-    char **buf;
-    const char *file;
+static void
+init_funcname(buf, file)
+    char *buf;
+    char *file;
 {
-    char *p;
-    const char *slash;
-    int len;
+    char *p, *slash;
 
     /* Load the file as an object one */
-    for (slash = file-1; *file; file++) /* Find position of last '/' */
+    for (p = file, slash = p-1; *p; p++) /* Find position of last '/' */
 #ifdef __MACOS__
-	if (*file == ':') slash = file;
+	if (*p == ':') slash = p;
 #else
-	if (*file == '/') slash = file;
+	if (*p == '/') slash = p;
 #endif
 
-    len = strlen(FUNCNAME_PATTERN) + strlen(slash + 1);
-    *buf = xmalloc(len);
-    snprintf(*buf, len, FUNCNAME_PATTERN, slash + 1);
-    for (p = *buf; *p; p++) {         /* Delete suffix if it exists */
+    sprintf(buf, FUNCNAME_PATTERN, slash + 1);
+    for (p = buf; *p; p++) {         /* Delete suffix it it exists */
 	if (*p == '.') {
 	    *p = '\0'; break;
 	}
     }
-    return p - *buf;
 }
 
-#define init_funcname(buf, file) do {\
-    int len = init_funcname_len(buf, file);\
-    char *tmp = ALLOCA_N(char, len+1);\
-    if (!tmp) {\
-	free(*buf);\
-	rb_memerror();\
-    }\
-    strcpy(tmp, *buf);\
-    free(*buf);\
-    *buf = tmp;\
-} while (0)
-
 #ifdef USE_DLN_A_OUT
 
 #ifndef LIBC_NAME
@@ -159,15 +125,16 @@ init_funcname_len(buf, file)
 static int dln_errno;
 
 #define DLN_ENOEXEC	ENOEXEC	/* Exec format error */
-#define DLN_ECONFL	1201	/* Symbol name conflict */
-#define DLN_ENOINIT	1202	/* No inititalizer given */
-#define DLN_EUNDEF	1203	/* Undefine symbol remains */
-#define DLN_ENOTLIB	1204	/* Not a library file */
-#define DLN_EBADLIB	1205	/* Malformed library file */
-#define DLN_EINIT	1206	/* Not initialized */
+#define DLN_ECONFL	201	/* Symbol name conflict */
+#define DLN_ENOINIT	202	/* No inititalizer given */
+#define DLN_EUNDEF	203	/* Undefine symbol remains */
+#define DLN_ENOTLIB	204	/* Not a library file */
+#define DLN_EBADLIB	205	/* Malformed library file */
+#define DLN_EINIT	206	/* Not initialized */
 
 static int dln_init_p = 0;
 
+#include "st.h"
 #include <ar.h>
 #include <a.out.h>
 #ifndef N_COMM
@@ -179,9 +146,6 @@ static int dln_init_p = 0;
 
 #define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
 
-#include "util.h"
-#include "st.h"
-
 static st_table *sym_tbl;
 static st_table *undef_tbl;
 
@@ -407,10 +371,6 @@ dln_init(prog)
 	while (read(fd, p, 1) == 1) {
 	    if (*p == '\n' || *p == '\t' || *p == ' ') break;
 	    p++;
-	    if (p-buf >= MAXPATHLEN) {
-		dln_errno = ENAMETOOLONG;
-		return -1;
-	    }
 	}
 	*p = '\0';
 
@@ -649,6 +609,7 @@ load_1(fd, disp, need_init)
     struct nlist *sym;
     struct nlist *end;
     int init_p = 0;
+    char buf[256];
 
     if (load_header(fd, &hdr, disp) == -1) return -1;
     if (INVALID_OBJECT(hdr)) {
@@ -657,12 +618,8 @@ load_1(fd, disp, need_init)
     }
     reloc = load_reloc(fd, &hdr, disp);
     if (reloc == NULL) return -1;
-
     syms = load_sym(fd, &hdr, disp);
-    if (syms == NULL) {
-	free(reloc);
-	return -1;
-    }
+    if (syms == NULL) return -1;
 
     sym = syms;
     end = syms + (hdr.a_syms / sizeof(struct nlist));
@@ -675,7 +632,7 @@ load_1(fd, disp, need_init)
 	    char *key = sym->n_un.n_name;
 
 	    if (st_lookup(sym_tbl, sym[1].n_un.n_name, &old_sym)) {
-		if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {
+		if (st_delete(undef_tbl, &key, NULL)) {
 		    unlink_undef(key, old_sym->n_value);
 		    free(key);
 		}
@@ -688,7 +645,7 @@ load_1(fd, disp, need_init)
 		st_foreach(reloc_tbl, reloc_repl, &data);
 
 		st_insert(undef_tbl, strdup(sym[1].n_un.n_name), NULL);
-		if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {
+		if (st_delete(undef_tbl, &key, NULL)) {
 		    free(key);
 		}
 	    }
@@ -756,7 +713,7 @@ load_1(fd, disp, need_init)
 	    }
 
 	    key = sym->n_un.n_name;
-	    if (st_delete(undef_tbl, (st_data_t*)&key, NULL) != 0) {
+	    if (st_delete(undef_tbl, &key, NULL) != 0) {
 		unlink_undef(key, sym->n_value);
 		free(key);
 	    }
@@ -865,13 +822,12 @@ load_1(fd, disp, need_init)
     if (need_init) {
 	int len;
 	char **libs_to_be_linked = 0;
-	char *buf;
 
 	if (undef_tbl->num_entries > 0) {
 	    if (load_lib(libc) == -1) goto err_exit;
 	}
 
-	init_funcname(&buf, need_init);
+	init_funcname(buf, need_init);
 	len = strlen(buf);
 
 	for (sym = syms; sym<end; sym++) {
@@ -924,7 +880,7 @@ search_undef(key, value, lib_tbl)
     int value;
     st_table *lib_tbl;
 {
-    long offset;
+    int offset;
 
     if (st_lookup(lib_tbl, key, &offset) == 0) return ST_CONTINUE;
     target_offset = offset;
@@ -1146,19 +1102,10 @@ dln_sym(name)
 #endif
 
 
-#if defined _WIN32 && !defined __CYGWIN__
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
-#ifdef _WIN32_WCE
-#undef FormatMessage
-#define FormatMessage FormatMessageA
-#undef LoadLibrary
-#define LoadLibrary LoadLibraryA
-#undef GetProcAddress
-#define GetProcAddress GetProcAddressA
-#endif
-
 static const char *
 dln_strerror()
 {
@@ -1187,13 +1134,13 @@ dln_strerror()
     return (char*)dlerror();
 #endif
 
-#if defined _WIN32 && !defined __CYGWIN__
+#ifdef _WIN32
     static char message[1024];
     int error = GetLastError();
     char *p = message;
     p += sprintf(message, "%d: ", error);
     FormatMessage(
-	FORMAT_MESSAGE_FROM_SYSTEM	 | FORMAT_MESSAGE_IGNORE_INSERTS,
+	FORMAT_MESSAGE_FROM_SYSTEM,
 	NULL,
 	error,
 	MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
@@ -1210,7 +1157,7 @@ dln_strerror()
 }
 
 
-#if defined(_AIX) && ! defined(_IA64)
+#if defined(_AIX)
 static void
 aix_loaderror(const char *pathname)
 {
@@ -1238,7 +1185,7 @@ aix_loaderror(const char *pathname)
 #define LOAD_ERRTAB_LEN	(sizeof(load_errtab)/sizeof(load_errtab[0]))
 #define ERRBUF_APPEND(s) strncat(errbuf, s, sizeof(errbuf)-strlen(errbuf)-1)
 
-    snprintf(errbuf, 1024, "load failed - %s ", pathname);
+    sprintf(errbuf, "load failed - %.200s ", pathname);
 
     if (!loadquery(1, &message[0], sizeof(message))) 
 	ERRBUF_APPEND(strerror(errno));
@@ -1258,53 +1205,57 @@ aix_loaderror(const char *pathname)
 }
 #endif
 
-void*
+void
 dln_load(file)
     const char *file;
 {
-#if !defined(_AIX) && !defined(NeXT)
-    const char *error = 0;
-#define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
-#endif
-
-#if defined _WIN32 && !defined __CYGWIN__
+#ifdef _WIN32
     HINSTANCE handle;
-    char winfile[MAXPATHLEN];
+    char winfile[255];
     void (*init_fct)();
-    char *buf;
-
-    if (strlen(file) >= MAXPATHLEN) rb_loaderror("filename too long");
+    char buf[MAXPATHLEN];
 
     /* Load the file as an object one */
-    init_funcname(&buf, file);
+    init_funcname(buf, file);
 
+#ifdef __CYGWIN32__
+    cygwin32_conv_to_win32_path(file, winfile);
+#else
     strcpy(winfile, file);
+#endif
 
     /* Load file */
-    if ((handle = LoadLibrary(winfile)) == NULL) {
-	error = dln_strerror();
+    if ((handle =
+	LoadLibraryExA(winfile, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)) == NULL) {
+        printf("LoadLibraryExA: %s\n", winfile);
 	goto failed;
     }
 
+#ifdef __CYGWIN32__
+    init_fct = (void(*)())GetProcAddress(handle, "impure_setup");
+
+    if (init_fct)
+	init_fct(_impure_ptr);
+#endif
+
     if ((init_fct = (void(*)())GetProcAddress(handle, buf)) == NULL) {
-	rb_loaderror("%s - %s\n%s", dln_strerror(), buf, file);
+        printf("GetProcAddress %s\n", buf);
+	goto failed;
     }
-
     /* Call the init code */
     (*init_fct)();
-    return handle;
+    return;
 #else
 #ifdef USE_DLN_A_OUT
     if (load(file) == -1) {
-	error = dln_strerror();
 	goto failed;
     }
-    return 0;
+    return;
 #else
 
-    char *buf;
+    char buf[MAXPATHLEN];
     /* Load the file as an object one */
-    init_funcname(&buf, file);
+    init_funcname(buf, file);
 
 #ifdef USE_DLN_DLOPEN
 #define DLN_DEFINED
@@ -1321,20 +1272,15 @@ dln_load(file)
 
 	/* Load file */
 	if ((handle = (void*)dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) {
-	    error = dln_strerror();
 	    goto failed;
 	}
 
-	init_fct = (void(*)())dlsym(handle, buf);
-	if (init_fct == NULL) {
-	    error = DLN_ERROR();
-	    dlclose(handle);
+	if ((init_fct = (void(*)())dlsym(handle, buf)) == NULL) {
 	    goto failed;
 	}
 	/* Call the init code */
 	(*init_fct)();
-
-	return handle;
+	return;
     }
 #endif /* USE_DLN_DLOPEN */
 
@@ -1360,11 +1306,11 @@ dln_load(file)
 	    }
 	}
 	(*init_fct)();
-	return (void*)lib;
+	return;
     }
 #endif /* hpux */
 
-#if defined(_AIX) && ! defined(_IA64)
+#if defined(_AIX)
 #define DLN_DEFINED
     {
 	void (*init_fct)();
@@ -1377,7 +1323,7 @@ dln_load(file)
 	    aix_loaderror(file);
 	}
 	(*init_fct)();
-	return (void*)init_fct;
+	return;
     }
 #endif /* _AIX */
 
@@ -1413,16 +1359,17 @@ dln_load(file)
 
 	 /* Cannot call *init_address directory, so copy this value to
 	    funtion pointer */
+
 	init_fct = (void(*)())init_address;
 	(*init_fct)();
-	return (void*)init_address;
+	return;
     }
 #else/* OPENSTEP dyld functions */
     {
 	int dyld_result;
 	NSObjectFileImage obj_file; /* handle, but not use it */
 	/* "file" is module file name .
-	   "buf" is pointer to initial function name with "_" . */
+	   "buf" is initial function name with "_" . */
 
 	void (*init_fct)();
 
@@ -1433,16 +1380,19 @@ dln_load(file)
 	    rb_loaderror("Failed to load %.200s", file);
 	}
 
-	NSLinkModule(obj_file, file, NSLINKMODULE_OPTION_BINDNOW);
+	NSLinkModule(obj_file, file, TRUE);
 
 	/* lookup the initial function */
-	if(!NSIsSymbolNameDefined(buf)) {
+	/*NSIsSymbolNameDefined require function name without "_" */
+	if(NSIsSymbolNameDefined(buf + 1)) {
 	    rb_loaderror("Failed to lookup Init function %.200s",file);
-	}	
+	}
+
+	/* NSLookupAndBindSymbol require function name with "_" !! */
 	init_fct = NSAddressOfSymbol(NSLookupAndBindSymbol(buf));
 	(*init_fct)();
 
-	return (void*)init_fct;
+	return;
     }
 #endif /* rld or dyld */
 #endif
@@ -1461,21 +1411,20 @@ dln_load(file)
       }
       
       /* find symbol for module initialize function. */
-      /* The Be Book KernelKit Images section described to use
-	 B_SYMBOL_TYPE_TEXT for symbol of function, not
-	 B_SYMBOL_TYPE_CODE. Why ? */
-      /* strcat(init_fct_symname, "__Fv"); */  /* parameter nothing. */
-      /* "__Fv" dont need! The Be Book Bug ? */
+	  /* The Be Book KernelKit Images section described to use
+		 B_SYMBOL_TYPE_TEXT for symbol of function, not
+		 B_SYMBOL_TYPE_CODE. Why ? */
+	  /* strcat(init_fct_symname, "__Fv"); */  /* parameter nothing. */
+	  /* "__Fv" dont need! The Be Book Bug ? */
       err_stat = get_image_symbol(img_id, buf,
 				  B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
 
       if (err_stat != B_NO_ERROR) {
-	char real_name[MAXPATHLEN];
-
-	strcpy(real_name, buf);
-	strcat(real_name, "__Fv");
+	    char real_name[1024];
+	    strcpy(real_name, buf);
+	    strcat(real_name, "__Fv");
         err_stat = get_image_symbol(img_id, real_name,
-				    B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
+				  B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
       }
 
       if ((B_BAD_IMAGE_ID == err_stat) || (B_BAD_INDEX == err_stat)) {
@@ -1490,7 +1439,7 @@ dln_load(file)
 
       /* call module initialize function. */
       (*init_fct)();
-      return (void*)img_id;
+      return;
     }
 #endif /* __BEOS__*/
 
@@ -1535,52 +1484,23 @@ dln_load(file)
       if (err) {
 	  rb_loaderror("Unresolved symbols - %s" , file);
       }
+	
       init_fct = (void (*)())symAddr;
       (*init_fct)();
-      return (void*)init_fct;
+      return;
     }
 #endif /* __MACOS__ */
 
-#if defined(__VMS)
-#define DLN_DEFINED
-    {
-	void *handle, (*init_fct)();
-	char *fname, *p1, *p2;
-
-	fname = (char *)__alloca(strlen(file)+1);
-	strcpy(fname,file);
-	if (p1 = strrchr(fname,'/'))
-	    fname = p1 + 1;
-	if (p2 = strrchr(fname,'.'))
-	    *p2 = '\0';
-
-	if ((handle = (void*)dlopen(fname, 0)) == NULL) {
-	    error = dln_strerror();
-	    goto failed;
-	}
-
-	if ((init_fct = (void (*)())dlsym(handle, buf)) == NULL) {
-	    error = DLN_ERROR();
-	    dlclose(handle);
-	    goto failed;
-	}
-	/* Call the init code */
-	(*init_fct)();
-	return handle;
-    }
-#endif /* __VMS */
-
 #ifndef DLN_DEFINED
-    rb_notimplement();
+    rb_notimplement("dynamic link not supported");
 #endif
 
 #endif /* USE_DLN_A_OUT */
 #endif
 #if !defined(_AIX) && !defined(NeXT)
   failed:
-    rb_loaderror("%s - %s", error, file);
+    rb_loaderror("%s - %s", dln_strerror(), file);
 #endif
-    return 0;			/* dummy return */
 }
 
 static char *dln_find_1();
@@ -1591,11 +1511,15 @@ dln_find_exe(fname, path)
     const char *path;
 {
     if (!path) {
-	path = getenv(PATH_ENV);
+#if defined(__human68k__)
+	path = getenv("path");
+#else
+	path = getenv("PATH");
+#endif
     }
 
     if (!path) {
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__MACOS__)
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__MACOS__)
 	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
 #else
 	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
@@ -1657,21 +1581,19 @@ dln_find_1(fname, path, exe_flag)
     register char *dp;
     register char *ep;
     register char *bp;
+#ifndef __MACOS__
     struct stat st;
-#ifdef __MACOS__
+#else
     const char* mac_fullpath;
 #endif
 
-    if (!fname) return fname;
     if (fname[0] == '/') return fname;
     if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
       return fname;
     if (exe_flag && strchr(fname, '/')) return fname;
-#ifdef DOSISH
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__)
     if (fname[0] == '\\') return fname;
-# ifdef DOSISH_DRIVE_LETTER
     if (strlen(fname) > 2 && fname[1] == ':') return fname;
-# endif
     if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0)
       return fname;
     if (exe_flag && strchr(fname, '\\')) return fname;
@@ -1683,7 +1605,7 @@ dln_find_1(fname, path, exe_flag)
 	int fspace;
 
 	/* extract a component */
-	ep = strchr(dp, PATH_SEP[0]);
+	ep = strchr(dp, RUBY_PATH_SEP[0]);
 	if (ep == NULL)
 	    ep = dp+strlen(dp);
 
@@ -1701,7 +1623,7 @@ dln_find_1(fname, path, exe_flag)
 	    */
 
 	    if (*dp == '~' && (l == 1 ||
-#if defined(DOSISH)
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__)
 			       dp[1] == '\\' || 
 #endif
 			       dp[1] == '/')) {
@@ -1738,7 +1660,7 @@ dln_find_1(fname, path, exe_flag)
 	    *bp = '\0';
 	    fprintf(stderr, "\tDirectory \"%s\"\n", fbuf);
 	    fprintf(stderr, "\tFile \"%s\"\n", fname);
-	    goto next;
+	    continue;
 	}
 	memcpy(bp, fname, i + 1);
 
@@ -1746,20 +1668,16 @@ dln_find_1(fname, path, exe_flag)
 	if (stat(fbuf, &st) == 0) {
 	    if (exe_flag == 0) return fbuf;
 	    /* looking for executable */
-	    if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
-		return fbuf;
+	    if (eaccess(fbuf, X_OK) == 0) return fbuf;
 	}
 #else
 	if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) {
 	    if (exe_flag == 0) return mac_fullpath;
 	    /* looking for executable */
-	    if (stat(mac_fullpath, &st) == 0) {
-		if (!S_ISDIR(st.st_mode) && eaccess(mac_fullpath, X_OK) == 0)
-		    return mac_fullpath;
-	    }
+	    if (eaccess(mac_fullpath, X_OK) == 0) return mac_fullpath;
 	}
 #endif
-#if defined(DOSISH)
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__)
 	if (exe_flag) {
 	    static const char *extension[] = {
 #if defined(MSDOS)
@@ -1767,9 +1685,9 @@ dln_find_1(fname, path, exe_flag)
 #if defined(DJGPP)
 		".btm", ".sh", ".ksh", ".pl", ".sed",
 #endif
-#elif defined(__EMX__) || defined(_WIN32)
+#elif defined(__EMX__) || defined(NT)
 		".exe", ".com", ".cmd", ".bat",
-/* end of __EMX__ or _WIN32 */
+/* end of __EMX__ or NT*/
 #else
 		".r", ".R", ".x", ".X", ".bat", ".BAT",
 /* __human68k__ */
@@ -1792,13 +1710,10 @@ dln_find_1(fname, path, exe_flag)
 #else
 		if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf))
 		    return mac_fullpath;
-
 #endif
 	    }
 	}
-#endif /* MSDOS or _WIN32 or __human68k__ or __EMX__ */
-
-      next:
+#endif /* MSDOS or NT or __human68k__ or __EMX__ */
 	/* if not, and no other alternatives, life is bleak */
 	if (*ep == '\0') {
 	    return NULL;
diff --git a/dln.h b/dln.h
index 182cf9f9f4..b9b7a67eab 100644
--- a/dln.h
+++ b/dln.h
@@ -1,32 +1,23 @@
-/**********************************************************************
+/************************************************
 
   dln.h -
 
   $Author$
+  $Revision$
   $Date$
   created at: Wed Jan 19 16:53:09 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-
-**********************************************************************/
-
+************************************************/
 #ifndef DLN_H
 #define DLN_H
 
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
+#ifndef _
+#ifndef __STDC__
 # define _(args) ()
+# define const
+#else
+# define _(args) args
+#endif
 #endif
 
 char *dln_find_exe _((const char*,const char*));
@@ -36,5 +27,5 @@ char *dln_find_file _((const char*,const char*));
 extern char *dln_argv0;
 #endif
 
-void *dln_load _((const char*));
+void dln_load _((const char*));
 #endif
diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0
deleted file mode 100644
index d168a50f80..0000000000
--- a/doc/ChangeLog-1.8.0
+++ /dev/null
@@ -1,24345 +0,0 @@
-Mon Aug  4 17:21:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (class_instance_method_list): methods defined in
-	  singleton class and extended modules should be included.
-	  [ruby-dev:21119]
-
-Mon Aug  4 13:05:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_proc): should specify YIELD_FUNC_SVALUE.
-	  [ruby-dev:21107]
-
-	* marshal.c (w_object): should not call w_extended for USRMARSHAL
-	  dump. [ruby-dev:21106]
-
-Mon Aug  4 10:42:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit/ui/console/testrunner.rb: Flushed io in the
-	  Console::TestRunner so that it will output immediately.
-
-Mon Aug  4 10:27:22 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.h: remove unnecessary parentheses.  [ruby-dev:20879]
-
-Mon Aug  4 10:00:47 2003  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (receive_responses): raise exception to
-	client_thread. Thanks to William Webber.
-
-Mon Aug  4 09:22:53 2003  William Webber <wew@williamwebber.com>
-
-	* lib/net/imap.rb: convert RD to RDoc.
-
-Mon Aug  4 02:34:05 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_utime): never use utime() of C runtime.
-	  [ruby-talk:77782]
-
-Sun Aug  3 23:56:50 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_call_super): should propagate previous block for
-	  super call.  [ruby-talk:77884]
-
-Sun Aug  3 22:07:47 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkentry.rb: support 'validatecommand' option of 
-	  TkEntry/TkSpinbox widget
-
-	* ext/tk/sample/{demos-en,demos-jp}/spin.rb: add
-
-Sun Aug  3 19:25:28 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (call_trace_func): clear exception flag temporarily.
-	  [ruby-dev:21090]
-
-Sun Aug  3 18:03:44 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* regex.h (re_mbctab): should refer to RUBY_EXPORT.  [ruby-ext:02199]
-
-	* lib/un.h (help): new.  % ruby -run -e help cp
-
-Sun Aug  3 08:53:06 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/{demos-en,demos-jp}/image3.rb: add 
-
-	* ext/tk/lib/tkcanvas.rb: bug fix on Tk object ID management
-
-	* ext/tk/lib/tktext.rb: ditto
-
-Sun Aug  3 02:55:52 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* process.c: modify macro to detect 'MacOS X' [ruby-talk:77849]
-
-	* ext/tcltklib/lib/tcltk.rb: bug fix ( NOT MAINTAINED : only
-	  for running 'line2.rb' demo. )
-
-Sun Aug  3 02:45:06 2003  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* numeric.c (flo_to_s): get rid of buffer overflow.
-
-Sat Aug  2 23:51:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (appendline): clearerr(3) before raising exception, since
-	  exception may be captured by rescue. [ruby-talk:77794]
-
-Sat Aug  2 09:58:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bug fix --- TkGrid failed to treat 
-	  RELATIVE PLACEMENT
-
-	* ext/tk/sample/demos-en/, demos-jp/: add or modify some
-	  widget demo scripts
-
-Sat Aug  2 20:59:38 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/https.rb: change an option name.
-	  :SSLCertStore -> :SSLCertificateStore.
-
-Sat Aug  2 19:18:40 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: respond_to? needs 2nd argument.
-	  Thanks Jim Bob.  [ruby-talk:77796]
-
-Sat Aug  2 15:11:54 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb (--no-undefined): annoying option removed.
-
-Sat Aug  2 14:53:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (pkg_config): get configuration by pkg-config.  [new]
-
-	* ext/openssl/extconf.rb: use pkg_config.
-
-Sat Aug  2 13:45:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c: add "#pragma weak" for __libc_ia64_register_backing_store_base.
-	  [ruby-dev:21072]
-
-Sat Aug  2 14:02:39 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (classname): find regular class name if not set.
-	  [ruby-dev:20496]
-
-Sat Aug  2 09:58:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bug fix --- forgot to entry a widget class 
-	  name of 'labelframe' widget
-
-	* ext/tk/sample/{demos-en,demos-jp}/{labelframe.rb,paned1.rb,
-	  paned2.rb,spin.rb}: add demo-scripts to the JP/EN widget demos
-
-Sat Aug  2 05:04:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkentry.rb: bug fix of TkEntry#delete
-
-	* ext/tk/samples/: bug fix of some widget demos
-
-	* ext/tk/lib/tk.rb: support <TkVariable object> == <Symbol>
-
-	* ext/tk/lib/*.rb: freeze some object for security reason
-
-Sat Aug  2 03:30:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_obj_singleton_methods): should not go up to
-	  ancestors unless the recursive flag is set. [ruby-list:38007]
-
-	* eval.c (rb_yield_0): expand [] to nil if avalue is set.
-	   [ruby-dev:21058]
-
-	* hash.c (env_each_key): use env_keys to avoid environment modify
-	  on the fly.
-
-	* hash.c (env_each_value): use env_values for safety.
-
-	* hash.c (env_each): allocate environment array first.
-
-Fri Aug  2 03:20:00 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* lib/yaml/store.rb (YAML::Store#initialize): filename is first
-	  argument.  Thanks Kent Dahl.
-
-Sat Aug  2 00:49:31 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: refine document.
-
-Fri Aug  1 23:57:45 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_gc_mark_locations): no need to swap arguments.
-
-	* gc.c (STACK_LENGTH): insufficient for growing up stack
-	  architectures.
-
-	* gc.c (rb_gc, Init_stack) ditto.
-
-Fri Aug  1 23:33:36 2003  Masatoshi Seki  <mas@snow.local.>
-
-	* rubytest.rb: set dldpath on darwin.
-
-Fri Aug  1 23:07:38 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: convert RD to RDoc. Thanks William Webber.
-	  [ruby-doc:456]
-
-Fri Aug  1 19:48:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_emitter_write_m): forgot to declare
-	  "self", making it default to "int".
-
-	* ext/syck/rubyext.c (syck_emitter_simple_write): ditto.
-
-	* gc.c (rb_gc): should mark backing store region on IA64.
-
-Fri Aug  1 18:51:10 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* process.c: bug fix --- preprocessor errors occur on OpenBSD-current
-
-Fri Aug  1 17:13:23 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/extconf.rb: should replace literally.
-
-Fri Aug  1 16:22:57 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_check_readable, rb_io_check_writable): ensure not
-	  closed at first.
-
-	* io.c (rb_io_getline): check readable always.  (ruby-bugs:PR#1069)
-
-	* io.c (rb_io_each_byte): ditto.
-
-Fri Aug  1 16:02:46 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (READ_DATA_PENDING_PTR): cast to get rid of warnings.
-
-	* ext/socket/socket.c (unix_send_io, unix_recv_io): ditto.
-
-Fri Aug  1 15:53:24 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (isInternalCmd): shouldn't return if find end of str.
-	  [ruby-talk:77678]
-
-Fri Aug  1 13:45:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_call_super): propagate previous block if a block is
-	  given.  [ruby-talk:77577]
-
-Fri Aug  1 09:54:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_fill): array length may be changed during the
-	  block execution. [ruby-talk:77579]
-
-	* array.c (rb_ary_zip): ditto.
-
-	* array.c (rb_ary_fill): ditto.
-
-	* hash.c (env_reject_bang): length may be changed during the block
-	  execution.
-
-	* hash.c (env_clear): ditto.
-
-Fri Aug  1 04:58:55 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bug fix --- forget to eval given block to 
-	  TkRoot.new method
-
-	* ext/tk/sample/tkoptdb-safeTk.rb: new sample script
-
-Fri Aug  1 00:52:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (Init_stack): IA64 requires STACK_LEVEL_MAX to be less than
-	  magic number when optimizer turned on, regardless of rlimit
-	  values.
-
-Thu Jul 31 23:44:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb: import erb-2.0.4b4.
-
-Thu Jul 31 23:04:45 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/resource.en, ext/tk/sample/resource.jp: 
-	  wrong resource file format
-
-	* ext/tk/lib/tk.rb: add Tk::Encoding.{encoding_convertfrom, 
-	  encoding_convertto}
-
-	* ext/tk/lib/tk.rb: add TkOptionDB.read_with_encoding to read 
-	  non-utf8 resource file
-
-Thu Jul 31 23:02:47 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/etc/etc.c: revert getenv()'s prototype. use it only when _WIN32
-	  is not defined.
-
-Thu Jul 31 20:52:40 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: (IMPORTANT BUG FIX) scan of event keywords
-	  doesn't work on recent versions of Tck/Tk
-
-	* ext/tk/lib/tk.rb: initialize error of instance variable on 
-	  TkComposite
-
-	* ext/tk/lib/multi-tk.rb: initialize error on encoding-system on 
-	  MultiTkIp
-
-	* ext/tk/lib/tk.rb: trouble on destroying widgets
-
-	* ext/tk/sample/demos-en/, demos-jp/: add JP and EN version of 
-	  Ruby/Tk widget demos
-
-Thu Jul 31 15:25:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* array.c (rb_ary_collect): must get length of array for each
-	  iteration. reported on [ruby-talk:77500], and fixed by
-	  K.Sasada <ko1@namikilab.tuat.ac.jp> on [ruby-talk:77504]
-
-Thu Jul 31 14:11:54 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: move gmake specific features
-	  into GNUmakefile.
-
-Thu Jul 31 12:36:11 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* bin/erb, lib/erb.rb: add explicit trim mode.
-
-Thu Jul 31 04:59:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (rb_num_coerce_relop): export function.
-
-Thu Jul 31 08:18:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit.rb: A useful return code is now set if tests fail when
-	  running automatically using the Console::TestRunner.
-
-Thu Jul 31 07:59:18 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: wrap the command-proc of TkScale --- pass 
-	  the numeric object to the proc
-
-	* ext/tk/lib/tk.rb: better support for widgets created on 
-	  Tk interpreter (without Ruby)
-
-	* ext/tk/lib/multi-tk.rb: a little more stable on Multiple Tk 
-	  interpreters running
-
-Thu Jul 31 00:17:19 2003  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (return_code): obsolete.
-
-	* lib/net/ftp.rb (last_response_code): new method. lastresp is now
-	  alias to last_response_code.
-
-	* lib/net/ftp.rb (last_response): new method.
-
-Wed Jul 30 23:55:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): check has been dropped. "_dump must return
-	  string." [ruby-dev:21024]
-
-Wed Jul 30 22:35:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb (dir_config): allow multiple directories separated
-	  by File::PATH_SEPARATOR.
-
-	* lib/mkmf.rb (create_makefile): DLDFLAGS include $LDFLAGS again.
-	  [ruby-talk:76894]
-
-	* lib/mkmf.rb (init_mkmf): not default $LDFLAGS to LDFLAGS for
-	  ruby itself, but default $DLDFLAGS to DLDFLAGS.
-
-Wed Jul 30 16:17:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): marshal_dump should not take any
-	  argument.
-
-Wed Jul 30 15:54:04 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): should initialize
-	  instance variables. [ruby-talk:77362]
-
-Wed Jul 30 15:39:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (proc_options): -F set compiled regular expression to $;.
-	  [ruby-talk:77381]
-
-	* string.c (Init_String): no setter type check for $;
-
-Wed Jul 30 15:10:02 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* error.c (rb_raise): snprintf() termination moved to
-	  win32/win32.c.
-
-	* win32/win32.c (valid_filename, str_grow): unused.
-
-	* win32/win32.c (NTLoginName, ChildRecord): make static.
-
-	* win32/win32.c (CreateChild): argument check.
-
-	* win32/win32.c (kill): should not call CloseHandle() when
-	  OpenProcess() failed.
-
-	* win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): ensure buffer
-	  terminated.  [ruby-talk:69672]
-
-Wed Jul 30 10:54:10 2003  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (get): fix wrong argument name. Thanks to William
-	  Webber.
-
-Wed Jul 30 10:31:37 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/iconv/iconv.c (iconv_convert): append unchanged portion
-	  after overflow.  [ruby-dev:21006]
-
-	* ext/iconv/extconf.rb: check if iconv() 2nd argument is const.
-
-Wed Jul 30 09:31:55 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (os2-emx): renamed from os2_emx, add flags to
-	  CFLAGS and LDFLAGS, and remove lib prefix.  [ruby-dev:20993]
-
-	* file.c (rb_file_s_rename): retry with removing new file on
-	  DOSISH.  [ruby-dev:21007]
-
-	* ext/socket/extconf.rb (sendmsg, recvmsg): check functions.
-
-	* ext/socket/socket.c (unix_send_io, unix_recv_io): raise
-	  NotImplementedError unless system calls are available.
-
-	* ext/socket/socket.c (sock_initialize): rename from sock_init()
-	  to get rid of conflict with OS/2 socket library.
-
-Wed Jul 30 07:23:14 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkentry.rb: fix lack of methods for TkEntry
-
-	* ext/tk/lib/multi-tk.rb, ext/tk/lib/tk.rb, 
-	  ext/tk/lib/tkdialog.rb, ext/tk/lib/tkentry.rb, 
-	  ext/tk/sample/safe-tk.rb, ext/tk/sample/tktimer2.rb: bug fix
-
-	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_* accept a block to 
-	  eval under the new interpreter
-
-Wed Jul 30 04:36:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c, 
-	  ext/tk/lib/tk.rb, ext/tk/lib/tkafter.rb: additional check of 
-	  Tk interpreters' status for a little more safety
-
-Wed Jul 30 02:37:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): if object responds to 'marshal_dump',
-	  Marshal.dump uses it to dump object.  unlike '_dump',
-	  marshal_dump returns any kind of object.
-
-	* marshal.c (r_object0): restore instance by calling
-	  'marshal_load' method.  unlike '_load', it's an instance
-	  method, to handle cyclic reference.
-
-	* marshal.c (marshal_load): all objects read from file should be
-	  tainted. [ruby-core:01325]
-
-Wed Jul 30 01:47:51 2003  Hugh Sasse  <hgs@dmu.ac.uk>
-
-	* lib/timeout.rb (Timeout::timeout): execute immediately if sec is
-	  zero.
-
-Wed Jul 30 01:36:18 2003  Aron Griffis  <ruby-talk@griffis1.net>
-
-	* ext/socket/socket.c (socks_init): typo fixed. [ruby-talk:77232]
-
-Wed Jul 30 00:48:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/extconf.rb: the default value for --enable-socks is
-	  taken from ENV["SOCKS_SERVER"]. [ruby-talk:77232]
-
-	* ruby.c (proc_options): add -W option. -W0 to shut up all warning
-	  messages. [ruby-talk:77227]
-
-	* error.c (rb_warn): no message will be printed if the value of
-	  $VERBOSE is "nil", i.e. perfect silence.
-
-	* ruby.c (verbose_setter): $VERBOSE value is either true, false,
-	  or nil.
-
-	* io.c (Init_IO): no "read" check for $stdin.  in addition some
-	  function names has been changed.
-
-Tue Jul 29 23:10:19 2003  Yoshida Masato  <yoshidam@yoshidam.net>
-
-	* regex.c (re_match_exec): incorrect multibyte match.
-
-Tue Jul 29 22:36:50 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb (send0): do taint check only when $SAFE > 0
-
-Tue Jul 29 19:20:34 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/fileutils.rb (install): support preserve timestamp.
-
-	* instruby.rb (install): use FileUtils::install preserve mode.
-
-	* lib/un.rb: new.  % ruby -run -e cp -- -p foo bar
-
-	* lib/mkmf.rb: use un.rb instead of ftools.rb.
-
-	* MANIFEST: add lib/un.rb.
-
-	* ext/extmk.rb (INSTALL_PROG, INSTALL_DATA): modify verbose messages.
-
-Tue Jul 29 18:55:22 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: unify coding style.
-
-	* lib/net/http.rb: ditto.
-
-Tue Jul 29 17:27:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ruby.h (LLONG_MIN): fix typo.
-
-Tue Jul 29 16:38:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/smtp.rb (Net::SMTP::send0): add taint check.
-
-Tue Jul 29 15:41:02 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* instruby.rb (install): preserve the timestamp for Mac OS X ranlib
-	  problem.
-
-Tue Jul 29 01:14:51 2003  Rick Ohnemus  <rick_ohnemus@acm.org>
-
-	* ruby.h (LLONG_MIN): wrong value.
-
-Mon Jul 28 22:57:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_getc): $stdin may not be IO. [ruby-dev:20973]
-
-Tue Jul 29 16:20:36 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: bug fix and 
-	  change mainloop_abort_on_no_widget_cmd => mainloop_abort_on_exception
-	  ( to avoid thread timing trouble on accessing destroyed widgets )
-
-	* ext/tk/lib/multi-tk.rb: change default mode of 
-	  mainloop_abort_on_exception on multi-tk.rb
-
-	* ext/tk/lib/multi-tk.rb: fix a bug of the procedure for 
-	  'Delete' button on the safe-Tk frmae
-
-Tue Jul 29 12:22:28 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/token.c: prefixed many constants and definitions
-	  with YAML_ to avoid name clash.
-
-	* ext/syck/gram.c: ditto.
-
-	* ext/syck/gram.h: ditto.
-
-Tue Jul 29 12:15:37 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/etc/etc.c: add real prototype to getenv().
-
-	* win32/win32.h: add arguments to definitions of functions if possible.
-
-Tue Jul 29 08:05:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tkdialog.rb, ext/tk/lib/tktext.rb, 
-	  ext/tk/sample/tkbiff.rb, ext/tk/sample/tkdialog.rb, 
-	  ext/tk/sample/tkform.rb: bug fix ( tested with Ruby/Tk widget demo )
-
-Tue Jul 29 04:22:08 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/syck.h: Added 'syck' yacc prefixes.
-
-	* ext/syck/gram.c: ditto.
-
-	* ext/syck/token.c: ditto.
-
-	* ext/syck: Added ruby.h reference to source files.
-
-Tue Jul 29 03:53:28 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/net/https.rb (use_ssl=): raise ProtocolError if
-	  connection is set up already.
-
-Tue Jul 29 01:45:32 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: use RTEST()
-
-Tue Jul 29 01:24:32 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: bug fix
-
-	* ext/tk/lib/multi-tk.rb: bug fix and pack options are pssed
-	  to the safeTk container
-
-	* ext/tk/sample/safe-tk.rb: add example for pack options of 
-	  safeTk container
-
-Mon Jul 28 23:23:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (Init_File): IO should include File::Const.
-	  [ruby-dev:20964]
-
-Mon Jul 28 18:53:03 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/openssl/extconf.rb: check again after pkg-config for MinGW on
-	  Cygwin.
-
-Mon Jul 28 15:32:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.
-
-	* ext/stringio/stringio.c (strio_getline): should not set $_ here.
-
-	* io.c (argf_to_s): argf.to_s returns "ARGF".
-
-	* io.c (set_defout_var, set_deferr_var): make $defout and $deferr
-	  obsolete.
-
-	* io.c (set_input_var, set_output_var): allow $stdin, $stdout,
-	  $stderr not to be instance of IO.
-
-	* io.c (rb_f_readline): forward method to current_file. gets,
-	  readline, readlines, getc, readchar, tell, seek, pos=, rewind,
-	  fileno, to_io, eof, each_line, each_byte, binmode, and closed?
-	  as well.
-
-	* io.c (argf_forward): utility function to forward method to
-	  current_file.
-
-Mon Jul 28 06:10:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: bug fix
-
-	* ext/lib/tk/multi-tk.rb: bug fix
-
-	* ext/lib/tk/multi-tk.rb: add methods depend on Tcl's 'interp' command
-
-	* ext/lib/tk/multi-tk.rb: suppot safe-level control of each interpreter
-
-Mon Jul 28 03:08:47 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: each() should return self.
-
-Mon Jul 28 01:35:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_chomp_bang): defer rb_str_modify() to actual
-	  modify point.  other methods, replace, tr, delete, squeeze,
-	  lstrip, and rstrip as well.
-
-	* string.c (rb_str_rstrip_bang): remove trailing '\0' at the end
-	  of string.
-
-	* string.c (rb_str_lstrip_bang): do not strip '\0' from the left.
-
-Sun Jul 27 21:16:30 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/openssl/extconf.rb: better support MinGW.  add
-	  dir_config("kerberos") and with_config("pkg-config").
-
-	* mkconfig.rb: initialize global variables to avoid warnings.
-
-Sun Jul 27 19:35:06 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: add some methods to support
-	  multiple interpreters (low level)
-
-	* ext/tk/lib/multi-tk.rb: new library to support multiple Tk 
-	  interpreters (high level)
-
-	* ext/tcltklib/demo/safeTk.rb: new sample of safeTk interpreter
-
-	* ext/tk/sample/safe-tk.rb: new sample of multi-tk.rb
-
-	* ext/tk/lib/tk.rb: bug fix and add feature to supprt multi-tk
-
-	* ext/tk/lib/tkafter.rb: ditto
-
-Sun Jul 27 14:43:37 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/debug.rb: fix breakpoint parameter parsing/checking.
-	  (?:(file|class):)(line_number|method)
-
-Sun Jul 27 10:21:28 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/unix.rb: add UNIXFileOwner, UNIXFileGroup.
-
-Sun Jul 27 03:10:43 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (io_reopen): avoid dup2() equal handles not to close itself and
-	  to get rid of a msvcrt bug.  [ruby-dev:20919]
-
-Sun Jul 27 00:37:16 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/tmpdir.rb: use GetWindowsDirectory, not GetSystemDirectory.
-	  [ruby-talk:77073]
-
-Sat Jul 26 21:25:21 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* io.c (rb_fdopen): set errno if it's zero on win32 platforms.
-
-	* ext/openssl/ossl_ssl.c (TO_SOCKET): define special version when
-	  _WIN32 is defined. this is ruby's problem, not OpenSSL.
-
-	* win32/win32.c: remove some old comments.
-
-Sat Jul 26 14:26:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/tk/lib/tk.rb (TkCore::chooseDirectory): back up wrongly
-	  removed method.
-
-Sat Jul 26 14:14:12 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/stringio/stringio.c: includes Enumerable as well as IO.
-	  [ruby-talk:77058]
-
-Sat Jul 26 07:00:53 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb: fix % line.
-
-Sat Jul 26 05:31:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.h: fix comment.
-
-	* ext/openssl/ossl.c (ossl_debug): should enable if no va-args
-	  macro supplied.
-
-Sat Jul 26 04:04:36 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: refine va-args macro detection.
-	  [ruby-talk:76983]
-
-Sat Jul 26 01:33:51 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_setup): need to pass the real
-	  socket to SSL_get_fd on native win32 platforms.
-
-Sat Jul 26 01:20:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_mod_const_missing): "const_missing" should not
-	  appear in the caller(); add call frame adjustment.
-
-	* eval.c (rb_method_missing): simplify call frame adjustment.
-
-Fri Jul 26 00:04:25 2003  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
-
-	* ext/openssl/sample: add samples.
-	  - cert2text.rb: dump certificate file as text.
-	  - crlstore.rb: CRL store implementation.  Fetch CRL via HTTP when
-	    http-access2 is installed.
-	  - certstore.rb: certificate store implementation.
-	  - cert_store_view.rb: certificate store viewer with FXRuby.  Uses
-	    c_rehash.rb, crlstore.rb and certstore.rb.
-
-Fri Jul 25 16:43:03 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: add TclTkIp#create_slave, 
-	  TclTkIp#_make_safe and TclTkIp#safe?
-
-	* ext/tcltklib/MANUAL.euc: modify descriptions
-
-	* ext/tk/lib/tk.rb: bug fix [ruby-talk:76980] and modify to 
-	  support multi Tk IPs
-
-	* ext/tk/lib/tkafter.rb: modify to support multi Tk IPs
-
-Fri Jul 25 15:47:39 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: add check for BN_rand_range() and
-	  BN_pseudo_rand_range().
-
-	* ext/openssl/ossl_bn.c (ossl_bn_s_rand_range): should raise 
-	  NotImplementedError if BN_rand_range() wan not defined.
-
-	* ext/openssl/ossl_bn.c (ossl_bn_s_pseudo_rand_range): should raise 
-	  NotImplementedError if BN_pseudo_rand_range() wan not defined.
-
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_s_encrypt): avoid compiler
-	  warning for OpenSSL-0.9.6.
-
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7si_initialize): ditto.
-
-Fri Jul 25 14:34:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (tcp_s_gethostbyname): was using
-	  uninitialized size_t value. [ruby-talk:76946]
-
-Fri Jul 25 13:38:38 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* re.c (rb_reg_options_m): use rb_reg_options() to mask internal
-	  flags.
-
-	* re.c (rb_reg_initialize_m): allow nil as third argument and
-	  ignore, and mask code flags if the argument is given.
-	  [ruby-dev:20885]
-
-	* re.c (rb_reg_options): get common flags directly.
-
-Fri Jul 25 03:52:21 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* lib/yaml/dbm.rb: replace indexes with values_at.
-
-Fri Jul 25 02:55:59 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: add check for libsocket and libnsl.
-
-	* ext/openssl/extconf.rb: use pkg-config to build CFLAGS and LDFLAGS.
-
-Fri Jul 25 01:27:59 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/emitter.c (syck_emitter_flush): accepts count
-	  of bytes to flush.  anchor offsets now functional.
-
-	* ext/syck/syck.h (syck_emitter_flush): ditto.
-
-	* ext/syck/rubyext.c: ditto.
-
-	* ext/syck/token.c: URI escaping now supported.
-
-Thu Jul 24 16:41:31 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb (have_type): check if a type is defined.
-
-	* lib/mkmf.rb (check_sizeof): check size of a type.
-
-	* ext/dbm/extconf.rb: check if type DBM is defined.
-	  [ruby-talk:76693]
-
-Thu Jul 24 16:18:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ChangeLog (add-log-time-format): "%c" contains timezone on
-	  XEmacs.
-
-Thu Jul 24 16:05:22 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (AC_C_VOLATILE): check if volatile works.
-
-	* defines.h (volatile): removed.
-
-	* eval.c (rb_thread_group): Thread#group.  [new]
-
-Thu Jul 24 15:50:42 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: add check for win32 OpenSSL libraries.
-
-	* ext/openssl/extconf.rb: add check for __VA_ARGS__.
-
-	* ext/openssl/ossl.h: avoid non C99 compiler errors.
-
-Thu Jul 24 13:32:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (thgroup_add): no warning for terminated threads.
-
-Thu Jul 24 13:09:26 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb: added.
-
-Thu Jul 24 11:21:10 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/io/wait/extconf.rb: removed unnecessary backward
-	  compatibility stuff.
-
-Thu Jul 24 11:09:10 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/openssl/extconf.rb: revert use of dir_config.
-
-Thu Jul 24 09:58:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/Win32API/lib/win32/resolv.rb: added.
-
-	* lib/resolv.rb: support Win32 platforms. based on Tietew's work
-	  [ruby-dev:15573].
-
-Thu Jul 24 04:05:46 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ssl.h: undef X509_NAME and PKCS7_SIGNER_INFO to
-	  avoid name confliction on mswin32.
-
-	* ext/openssl/ssl.c (ossl_protect_obj2bio): avoid VC++ warnings
-	  in function prototype.
-
-	* ext/openssl/ssl.c (ossl_protect_membio2str): ditto.
-
-	* ext/openssl/ssl.c (ossl_protect_x509_ary2sk): ditto.
-
-Thu Jul 24 03:44:04 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
-
-	* ext/openssl/extconf.rb: cut check for OpenSSL version
-
-Thu Jul 24 03:41:30 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/tcltklib/tcltklib.c (ip_init): need at least one statement after
-	  label.
-
-Thu Jul 24 01:48:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::[]): should return StringIO (or
-	  Tempfile) for multipart/form.
-
-	* variable.c (rb_define_const): give warning for non constant
-	  name. [ruby-core:01287]
-
-Thu Jul 24 01:51:08 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick: imported.
-
-	* MANIFEST: added webrick files.
-
-Thu Jul 24 01:32:04 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/tmpdir.rb (tmpdir): new method.  remove TMPDIR.
-	  use GetSystemWindowsDirectory(GetSystemDirectory), not GetTempPath.
-
-Thu Jul 24 01:08:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl: imported.
-
-Wed Jul 23 23:06:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* file.c (DOSISH): better Cygwin support.
-
-Wed Jul 23 19:13:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_split_m): the receiver may be empty string.
-
-Wed Jul 23 18:43:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb: import erb-2.0.4b1.
-
-Wed Jul 23 18:21:52 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/io/wait: imported.
-
-Wed Jul 23 16:07:35 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* process.c: unify indentation
-
-	* configure.in: add --enable-setreuid option
-
-	* ext/tcltklib/tcltklib.c: TclTkIp.new accepts 'ip-name' and 'options'
-
-	* ext/tk/lib/tk.rb: support arguments of TclTkIp.new
-
-	* ext/tk/lib/tk*.rb: preparations for multi-Tk interpreter support
-
-Wed Jul 23 15:49:01 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_lstrip_bang): strip NUL along with white
-	  spaces. [ruby-talk:76659]
-
-	* string.c (rb_str_rstrip_bang): ditto.
-
-Wed Jul 23 14:19:17 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb (log_src, checking_for, create_header):
-	  Logging.message is printf like format.
-
-Wed Jul 23 10:11:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/iconv/iconv.c (check_iconv): check if Iconv instance.
-
-	* ext/iconv/iconv.c (iconv_convert): stringify argument.
-
-Wed Jul 23 02:39:46 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* process.c: add a module for raw syscalls to control UID/GID
-
-	* process.c: add modules for portable UID/GID control
-
-Tue Jul 22 19:16:40 2003  Tanaka Akira  <akr@m17n.org>
-
-	* ext/iconv/iconv.c (iconv_failure_initialize): limit
-	  inspect message.  [ruby-dev:20785]
-
-	* ext/iconv/iconv.c (rb_str_derive): share with original
-	  string if possible.  [ruby-dev:20785]
-
-Tue Jul 22 17:22:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_mod_const_missing): new method. [ruby-core:00441]
-
-	* variable.c (rb_const_get_at): allow "const_missing" hook.
-
-	* variable.c (rb_const_get_0): ditto.
-
-	* eval.c (method_missing): rename from rb_undefined to clarify.
-
-	* eval.c (ruby_finalize_0): update exit status if any of END proc
-	  raises SystemExit. [ruby-core:01256]
-
-	* signal.c (rb_trap_exit): wrap rb_eval_cmd
-
-	* eval.c (rb_exec_end_proc): reduce rb_protect().
-
-Tue Jul 22 17:15:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* MANIFEST (lib/cgi/session/pstore.rb, lib/yaml/baseemitter.rb):
-	  added.
-
-Tue Jul 22 10:52:19 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* lib/tmpdir.rb: remove charcters after "\000" and regularize path.
-
-Tue Jul 22 02:22:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_equal): should not use rb_equal().
-
-	* string.c (rb_str_equal): should return nil for non string
-	  operand to conform comparable convention. [ruby-dev:20759]
-
-Tue Jul 22 00:19:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tmpdir.rb: new library to get temporary directory path,
-	  using GetTempPath on Win32 environment.
-
-	* lib/tempfile.rb: now uses tmpdir.rb.
-
-	* lib/cgi/session.rb, ib/drb/unix.rb: ditto.
-
-Mon Jul 21 01:53:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_string_value_cstr): check null byte in the string
-	  before retrieving C ptr.  accessed via macro StringValueCStr.
-
-	* file.c: use StringValueCStr to retrieve paths to system calls.
-
-	* file.c (sys_fail2): raise error for two operand system calls
-	  such as rename, link, symlink.  (ruby-bugs PR#1047)
-
-Sun Jul 20 11:03:25 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
-
-	* ext/zlib/zlib.c (gzfile_read_header): gz->z.input may be nil after
-	  finishing reading a gzip header.
-
-Sat Jul 19 22:25:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_match2): add warning to "~string".
-	  [ruby-list:37751]
-
-	* lib/net/ftp.rb (Net::FTP::open): takes block.  suggested by Gavin
-	  Sinclair in [ruby-core:01237].
-
-Sat Jul 19 19:03:24 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
-
-	* wince/stdlib.c: add bsearch().
-
-Sat Jul 19 12:34:45 2003  David Black  <dblack@superlink.net>
-
-	* lib/scanf.rb: import.
-
-Sat Jul 19 11:27:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/xmlrpc: import.
-
-	* eval.c (thgroup_add): should return group for terminated thread
-	  case.
-
-	* eval.c (thgroup_add): do not raise ThreadError on terminated
-	  thread addition for compatibility.  just warning.
-
-Sat Jul 19 04:50:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/iconv/charset_alias.rb, ext/iconv/extconf.rb: make wrapper
-	  script which maps charset names.  [ruby-dev:20625]
-
-	* ext/iconv/iconv.c (charset_map): charset name map.
-
-	* ext/iconv/iconv.c (iconv_dfree): no exception while
-	  finalization.
-
-	* ext/iconv/iconv.c (iconv_s_conv): new method Iconv.conv.
-	  [ruby-dev:20588]
-
-Sat Jul 19 03:09:18 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/Win32API/lib/win32/registry.rb (Win32::Registry::Error):
-	  inherit StandardError instead of SystemCallError.
-
-Sat Jul 19 02:00:39 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_attr): extra calls of method_added.  [ruby-talk:76361]
-
-Fri Jul 18 18:44:22 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb (init_mkmf): clear $INSTALLFILES.  [ruby-dev:20727]
-
-Fri Jul 18 17:34:39 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb (rm_f): use FileUtils.
-
-	* lib/mkmf.rb (modified?): return mtime of the target if
-	  it exists and newer than times.
-
-	* lib/mkmf.rb (install_files): add a current directory
-	  file even if it does not exist yet.
-
-	* lib/mkmf.rb (configuration): do not add $LDFLAGS to
-	  DLDFLAGS.
-
-	* ext/extmk.rb (extmake): check whether Makefile is newer
-	  than depend and MANIFEST.
-
-Fri Jul 18 14:57:19 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (make_cmdvector): recognize quote within string.
-	  based on Nobu's patch ([ruby-win32:450]). [ruby-talk:75853]
-
-Fri Jul 18 13:04:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_missing): VCALL is called only for LOCAL_ID.  no
-	  check required.
-
-	* parse.y (primary): primary:tFID generates NODE_FCALL.
-	  [ruby-dev:20641]
-
-Thu Jul 17 18:50:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (match_captures): rename from "groups".
-
-Thu Jul 17 17:57:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_clear_cache_by_class): check both klass and origin.
-
-Thu Jul 17 13:46:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ruby_init): set ruby_running to true after
-	  initialization.
-
-Thu Jul 17 13:42:53 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/ftools.rb (File::makedirs): do not handle "//" as a directory.
-
-Thu Jul 17 06:40:28 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: recover and fix typo : Tk.chooseDirectory 
-	  (Tk8.4 feature)
-
-Wed Jul 16 16:23:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_proc_new): call svalue_to_avalue for yield argument.
-
-Wed Jul 16 00:31:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_disable_super, rb_enable_super): deprecate.
-
-	* eval.c (thgroup_s_alloc): re-implement group struct.
-
-	* eval.c (thgroup_add): add check for enclose and frozen status.
-
-Tue Jul 15 19:50:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_add_method, rb_alias): need to clear cache by
-	  ID when method defined in parent class is cached for
-	  grand child classes.  [ruby-dev:20672]
-
-Tue Jul 15 14:38:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/matrix.rb: remove elements conversion to_f, to_i, to_r.
-
-	* lib/cgi/session/pstore.rb: add new file.
-
-Tue Jul 15 03:30:41 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/rubyext.c (syck_mark_emitter): forgot to rb_gc_mark the 
-	  outgoing IO object.
-
-Sun Jul 13 14:55:36 2003  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* process.c (proc_getgroups, proc_setmaxgroups): fix typo.
-
-Sat Jul 12 17:01:28 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* struct.c (struct_entry): add prototype to avoid VC++ warnings.
-
-Sat Jul 12 04:43:57 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/emitter.c: new emitter code.
-
-	* ext/syck/rubyext.c: Emitter class.
-
-	* lib/yaml.rb: Load Syck emitter, if available.
-
-	* lib/yaml/stream.rb: ditto.
-
-	* lib/yaml/baseemitter.rb: underlying class for all emitters.
-
-	* lib/yaml/rubytypes.rb: use BaseEmitter abstraction.
-
-	* lib/yaml/emitter.rb: ditto.
-
-Sat Jul 12 04:23:13 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_undef): need to clear cache for inherited class.
-	  (rubicon/builtin/TestModulePrivate.rb:test_undef_method)
-
-Sat Jul 12 01:21:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (avalue_to_svalue): typo.
-
-	* eval.c (rb_load): rb_prohibit_interrupt must not underflow.
-
-	* parse.y (NODE_STRTERM, tokadd_string, parse_string): moved
-	  string nest level from a static variable to NODE_STRTERM, to
-	  preserve it from word to word in %W/%w.
-
-Fri Jul 11 22:37:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (aix): needs ruby.imp even with gcc.
-	  (ruby-bugs:PR#1007)
-
-Fri Jul 11 18:37:37 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* instruby.rb: do not handle directories. [ruby-dev:20613]
-
-Fri Jul 11 16:09:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): exp should be less than MDMAXEXPT.
-
-Fri Jul 11 07:17:47 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: not create a Tcl/Tk interpreter if already 
-	  defined TkCore::INTERP
-
-	* ext/tk/lib/tk.rb: bugfix on TkWindow#configure
-
-Thu Jul 10 14:42:02 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* math.c (math_log): nan takes a dummy argument on Cygwin 1.5.0.
-
-Wed Jul  9 23:50:46 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* regex.c (mbctab_sjis): 0x80 is not shift jis first byte.
-	  [ruby-dev:20516]
-
-Wed Jul  9 15:38:28 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* instruby.rb: do not install shared libraries as man pages.
-
-	* mkconfig.rb: support text-mount on Cygwin.
-
-Wed Jul  9 11:09:57 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* re.c (match_entry): add prototype to avoid VC++ warnings.
-
-Wed Jul  9 03:48:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_load): put rb_load_file() in a thread critical
-	  section. [ruby-dev:20490]
-
-	* eval.c (compile): put rb_compile_string() in a thread critical
-	  section.
-
-Tue Jul  8 02:35:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_const_get_0): should not warn if constant is not
-	  defined. (ruby-bugs-ja PR#509)
-
-	* bignum.c (rb_big2dbl): give a warning on overflow.
-	  (ruby-bugs-ja PR#510)
-
-	* util.c (ruby_strtod): change MDMAXEXPT from 511 to 308.
-
-	* pack.c (utf8_to_uv): long is sufficient.  LONG_LONG is not
-	  required.
-
-Tue Jul  8 01:43:16 2003  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* bignum.c (rb_big2str): support 32 bit (without `long long' type)
-	  machines. (ruby-bugs-ja PR#512)
-
-Mon Jul  7 10:22:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/dbm/extconf.rb (gdbm_compat, qdbm): add check for gdbm_compat
-	  and qdbm.
-
-Mon Jul  7 01:34:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call_super): k->super maybe NULL if klass is Kernel.
-	   [ruby-dev:20519]
-
-	* gc.c (obj_free): clear method cache when freeing class/module.
-
-Sat Jul  5  23:32:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_remove_method): allow "remove_method" to accept
-	  multiple arguments.
-
-Sat Jul  5 00:22:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* node.h (NEW_NODE): cast arguments to rb_node_newnode().
-
-Fri Jul  4 21:48:44 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/syck/rubyext.c, ext/syck/syck.c, ext/syck/syck.h,
-	  ext/syck/token.c: C++ style comments are not allowed.
-	  (ruby-bugs:PR#1008)
-
-Thu Jul  3 23:41:30 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/timeout.rb: add optional exception argument for compatibility
-	  function.
-
-Thu Jul  3 14:22:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_values_at): extract common procedure from
-	  rb_ary_values_at.  follow DRY principle.
-
-	* re.c (match_values_at): values_at should understand ranges.
-
-	* struct.c (rb_struct_values_at): ditto.
-
-	* struct.c (inspect_struct): inspect format changed; add "struct "
-	  at the top.
-
-	* sprintf.c (rb_f_sprintf): "%p" specifier for inspect output.
-	  (RCR#69)
-
-	* eval.c (rb_mod_undef_method): allow "undef_method" to accept
-	  multiple arguments. (RCR#146)
-
-	* lib/timeout.rb: put timeout in Timeout module. (RCR#121)
-	  [ruby-talk:61028]
-
-	* re.c (match_groups): new method added. (RCR#139)
-
-	* variable.c (rb_mod_const_of): should exclude constant defined
-	  in Object, unless retrieving constants of Object.
-
-Thu Jul  3 12:13:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (VPATH): convert from Windows form to Unix form on 
-	  MinGW.  This fixes the build with GNU make 3.80-1 for Cygwin.
-
-Wed Jul  2 23:27:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_new4): do not allocate new string if original
-	  is frozen or already have copy-on-write entry. [ruby-talk:74940]
-
-Wed Jul  2 13:22:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_shared_replace): clear flags before copy.
-
-	* string.c (rb_str_replace): ditto.
-
-	* eval.c (rb_yield_0): override visibility mode for module_eval
-	  etc. (ruby-bugs-ja PR#505)
-
-Wed Jul  2 11:45:34 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: synchronize document with source code.
-
-	* lib/net/pop.rb: ditto.
-
-Wed Jul  2 11:39:50 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: unify SMTP and SMTPCommand.
-
-	* lib/net/smtp.rb: new exception class SMTPError.
-
-	* lib/net/smtp.rb: new exception class SMTPAuthenticationError.
-
-	* lib/net/smtp.rb: new exception class SMTPServerBusy.
-
-	* lib/net/smtp.rb: new exception class SMTPSyntaxError.
-
-	* lib/net/smtp.rb: new exception class SMTPFatalError.
-
-	* lib/net/smtp.rb: new exception class SMTPUnknownError.
-
-	* lib/net/smtp.rb: change critical section protect algorithm.
-
-	* lib/net/smtp.rb (SMTP#do_start): check authentication args
-	  before all.
-
-	* lib/net/smtp.rb: new method send_message (alias send_mail).
-
-	* lib/net/smtp.rb: new method open_message_stream (alias ready).
-
-	* lib/net/pop.rb: POPBadResponse is a POPError.
-
-	* lib/net/pop.rb (POPMail#pop): ban ReadAdapter.
-
-	* lib/net/pop.rb (POPMail#top): ditto.
-
-	* lib/net/pop.rb (POP3Command): change critical section protect
-	  algorithm.
-
-	* lib/net/pop.rb (POP3Command#auth): USER and PASS should be one
-	  critical block.
-
-	* lib/net/pop.rb (POP3Command#retr): ban `dest' argument using
-	  iterator.
-
-	* lib/net/pop.rb (POP3Command#top): ditto.
-
-	* lib/net/protocol.rb: #read_message_to -> #each_message_chunk
-
-	* lib/net/protocol.rb: #D -> #LOG
-
-	* lib/net/protocol.rb: #D_off -> #LOG_off
-
-	* lib/net/protocol.rb: #D_on -> #LOG_on
-
-Wed Jul  2 11:10:47 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: set old class aliases for backward
-	  compatibility. [ruby-talk:74863]
-
-	* lib/net/protocol.rb: ditto.
-
-Wed Jul  2 01:32:40 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/net/pop.rb (Net::POP3#start): typofix.
-
-Tue Jul  1 22:08:19 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: TkWindow include TkWinfo
-
-	* ext/tk/lib/tk.rb: treat unknown widget classes as subclasses
-	  of TkWindow
-
-Tue Jul  1 19:02:12 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* parse.y (rb_intern): should use mbclen instead of mblen.
-
-Tue Jul  1 10:36:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* class.c (rb_define_class, rb_define_module): also set constant under
-	  Object.  [ruby-dev:20445]
-
-	* object.c (boot_defclass): ditto.
-
-	* variable.c (rb_const_get_at, rb_const_get_0, rb_mod_const_at,
-	  rb_const_defined, mod_av_set, rb_const_assign): toplevel constants
-	  are now under Object, rb_class_tbl remains for GC.
-
-Mon Jun 30 17:53:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (mnew): ignore metaclasses have no influence, for rklass.
-	  [ruby-talk:74706]
-
-Sun Jun 29 06:59:07 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb, lib/drb/invokemethod.rb: import drb-2.0.4
-	  (use LocalJumpError#reason)
-
-Sat Jun 28 12:28:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (rb_cv_stack_grow_dir): check stack growing direction.
-
-	* eval.c (rb_thread_restore_context): prior configuration macro.
-
-	* gc.c (ruby_stack_length): always return the address of lower edge.
-
-	* gc.c (rb_gc_mark_locations): remove margin.  [ruby-dev:20462]
-
-	* gc.c (rb_gc, Init_stack): prior configuration macro.
-
-	* gc.c (Init_stack): add safety margin.
-
-Fri Jun 27 14:41:22 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* string.c (rb_str_split_m): remove white spaces on the head of
-	  the last element, when limit is specified.  [ruby-talk:74506]
-
-Fri Jun 27 03:24:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (io_fflush): need to check if closed after thread switch.
-	  [ruby-dev:20351]
-
-	* io.c (fptr_finalize): ditto.
-
-	* string.c (rb_str_rindex_m): fixed wrong fix.  should move backward
-	  first only when matching from the end.
-
-Thu Jun 26 21:34:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* class.c (class_instance_method_list): get rid of warning about
-	  arguement type mismatch, and inline method_list().
-	  [ruby-core:01198]
-
-Wed Jun 25 14:40:33 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add and modify methods --- 
-	  TkWidget.database_class, TkWidget.database_classname, 
-          TkWidget#database_class, TkWidget#database_classname 
-
-	* ext/tk/lib/tk.rb: instances of a subclass of TkToplevel or 
-	  TkFrame are created with ":class=>subclass" option as default.
-
-	* ext/tk/sample/tkoptdb.rb: add a new part
-
-Wed Jun 25 12:52:58 2003  Matthew Dempsky  <jivera@flame.org>
-
-	* class.c (rb_generic_class_instance_methods): merge argument
-	  check (and warning) into one function; following DRY principle.
-	  [ruby-core:01193]
-
-Wed Jun 25 05:49:10 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add widget destroy hook binding to TkBindTag::ALL
-
-	* ext/tk/lib/tkcanvas.rb: Although requiring manual control of GC, 
-	  memory eating problem of TkCanvas Items is fixed.
-
-	* ext/tk/lib/tktext.rb: add some methods and bug fix
-
-Wed Jun 25 00:14:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (autoload_delete): should delete Qundef from iv_tbl.
-	  (ruby-bugs-ja PR#504)
-
-Tue Jun 24 16:46:07 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bug fix on TkToplevel, TkFrame,
-	  TkPanedwindow, TkOptionDB
-
-	* ext/tk/lib/tk.rb: TkOptionDB --- make it more secure to use procs 
-	  defined on resourceDB
-
-	* ext/tk/sample/tkoptdb.rb, resource.ja, resource.en: 
-	  sample script how to use TkOptionDB.
-
-Tue Jun 24 14:22:41 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* lib/yaml/types.rb: replaced Kernel::Hash reference with Object::Hash
-	  from [ruby-talk:74270]
-
-Tue Jun 24 17:59:30 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_yield_0): show yielded block position not only yielding
-	  point.  [ruby-dev:20441]
-
-Tue Jun 24 16:47:07 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (HTTPHeader#proxy_basic_auth): missing `@'.
-	  Thanks Douglas Koszerek. (ruby-bugs:PR975)
-
-Tue Jun 24 14:31:17 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* config.guess: have wrongly returned "alphaev56-unknown-linux-"
-	  on Linux/Alpha. [ruby-dev:20434]
-
-Tue Jun 24 04:54:46 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* configure.in: always add -mieee for gcc/alpha. [ruby-dev:20429]
-
-Tue Jun 24 02:40:09 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* array.c (rb_ary_unshift_m): need to check number of arguments.
-	  [ruby-talk:74189]
-
-Mon Jun 23 23:59:56 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* io.c (io_close): missing prototype. [ruby-dev:20422]
-
-	* ext/socket/socket.c (bsock_do_not_rev_lookup_set): ditto.
-
-	* ext/win32ole/win32ole.c (foletype_guid, foletype_progid): ditto.
-
-	* error.c (syserr_initialize): length argument of sprintf() is an
-	  int.
-
-Mon Jun 23 23:28:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* MANIFEST: add wince files.
-
-	* ext/tk/MANIFEST: add sample/tkmenubutton.rb.
-
-Mon Jun 23 17:40:58 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* dir.c (find_dirsep): get rid of warnings.
-
-	* eval.c (error_print): temporary value might be disposed by GC.
-
-	* hash.c (env_has_value, env_index): should not increment NULL.
-
-	* io.c (io_read, rb_io_sysread): not read when length is 0.
-
-	* io.c (rb_io_reopen): ensure initialized IO.
-
-	* io.c (rb_io_init_copy): sychronize file pointer.
-
-	* io.c (rb_io_s_pipe): make exception proof.
-
-	* string.c (rb_str_rindex_m): Fixnum 0 matched end of string.
-
-Mon Jun 23 16:18:12 2003  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_open_file): initialize flags.
-
-	* time.c (time_arg): initialize v[6] even when argc is 10 to
-	  avoid valgrind error.
-
-Mon Jun 23 14:22:44 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bug fix on TkRoot and TkToplevel
-
-Mon Jun 23 08:24:01 2003  Florian Frank  <flori@nixe.ping.de>
-
-	* string.c (rb_str_upto): generate sequence according to "succ"
-	  order.  formerly check was done by dictionary order.
-	  [ruby-talk:74138]
-
-Mon Jun 23 00:27:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_string_value): fill constant empty string along
-	  with setting ELTS_SHARED if str->ptr is NULL. [ruby-core:01179]
-
-	* string.c (rb_string_value_ptr): ditto.
-
-	* string.c (rb_check_string_type): ditto.
-
-Sun Jun 22 23:42:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* string.c (str_gsub): move END(0) check before mbclen2().
-
-	* string.c (scan_once): reduce END(0) check.
-
-	* io.c (rb_io_initialize): accept fixnum mode.
-
-	* eval.c (error_print): replace strchr() by memchr(), einfo may
-	  contain "\0".
-
-	* pack.c (pack_unpack): range check for "@" move; initialize check
-	  for "m".
-
-	* error.c (syserr_initialize): avoid buffer overflow.
-
-	* file.c (rb_file_s_readlink): expand buffer until readlink
-	  succeed.
-
-Sun Jun 22 16:17:02 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm 
-	  commands as elements
-
-	* ext/tk/lib/tk.rb: TkMenu --- add some methods
-
-	* ext/tk/lib/tk.rb: TkOptionMenubutton --- bug fix
-
-	* ext/tk/sample/tkmenubutton.rb: sample of TkMenubutton and 
-	  TkOptionMenubutton
-
-Sat Jun 21 23:15:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): should not propagate distination tag if
-	  tag is already handled in this level. (ruby-bugs-ja PR#501)
-
-	* object.c (str_to_id): check for empty string before intern. 
-	  [ruby-talk:74006]
-
-Sat Jun 21 13:56:09 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
-
-	* wince/Makefile.sub: undefine HAVE__SETJMP.
-
-	* wince/resource.rb: include winver.h in wince3.0.
-
-Sat Jun 21 12:55:17 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm commands 
-	  as elements of a hash argument. 
-
-	* ext/tk/sample/tktimer2.rb: add comments about the usage of a 
-	  TkTimer object.
-
-Sat Jun 21 08:47:22 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk*.rb: remove direct-accesses to TkComm::INTERP and
-	  TkComm::INITIALIZE_TARGETS
-
-	* ext/tk/lib/tk*.rb: use TkINTERP_SETUP_SCRIPTS constant for setting 
-	  up the interpreter
-
-	* ext/tcltklib/tcltklib.c: support to create a safe interpreter 
-	  with safe-Tk
-
-Fri Jun 20 23:28:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): should not propagate TAG_BREAK and
-	  TAG_RETURN from orphan Proc object. [ruby-core:01148]
-
-Fri Jun 20 15:04:28 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* defines.h (PATH_ENV): name of PATH environment. [new]. 
-
-	* defines.h (ENV_IGNORECASE): define for case insensitive platforms
-	  to access environment variables.
-
-	* dln.c (dln_find_exe): use PATH_ENV instead of "PATH".
-
-	* hash.c (env_delete, rb_f_getenv, env_fetch, rb_env_path_tainted,
-	  env_aset): ditto.
-
-	* ruby.c (proc_options): ditto.
-
-Fri Jun 20 14:52:46 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: Tk interpreter returns TAINTED strings.
-
-Fri Jun 20 03:09:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (new_yield): distinguish "yield 1,2" and "yield [1,2]". 
-	  [ruby-dev:20360]
-
-	* eval.c (rb_eval): support new_yield() change.
-
-	* variable.c (rb_const_get_0): warn for Foo::BAR when BAR is a
-	  toplevel constant (i.e. a constant defined under Object).
-	  [ruby-list:36935]
-
-	* parse.y (no_blockarg): separate no block argument check and
-	  ret_args argument processing. 
-
-Fri Jun 20 00:45:19 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
-	* lib/csv.rb: import csv module.
-
-Thu Jun 19 22:51:41 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb.rb, lib/drb/drb.rb, lib/drb/eq.rb, 
-	  lib/drb/extserv.rb, lib/drb/extservm.rb, lib/drb/gw.rb, 
-	  lib/drb/invokemethod.rb, lib/drb/observer.rb, 
-	  lib/drb/timeridconv.rb, lib/drb/unix.rb: import drb-2.0.4b3
-
-Thu Jun 19 16:14:43 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (lib_do_one_event): change default
-	  value of the argument
-
-	* ext/tcltklib/tcltklib.c (lib_do_one_event): returns true/false
-
-	* ext/tcltklib/tcltklib.c: add TclTkLib::EventFlag::NONE ( == 0 )
-
-	* ext/tcltklib/tcltklib.c: add set_no_event_wait() and 
-	  get_no_event_wait()
-
-	* ext/tcltklib/MANUAL.euc: modify
-
-	* ext/tcltklib/README.euc: ditto
-
-	* ext/tk/lib/tk.rb: change default value of TkCore.do_one_event 
-	  argument
-
-	* ext/tk/lib/tk.rb: add TkCore.set_no_event_wait(wait) and 
-	  TkCore.get_no_event_wait
-
-	* ext/tk/lib/tk.rb: add Tk.exit ( == destroy root widget )
-
-	* ext/tk/lib/tkafter.rb: rename TkAfter => TkTimer (TkAfter is
-	  an alias name)
-
-	* ext/tk/lib/tkafter.rb: set_callback returns self
-
-	* ext/tk/lib/tkafter.rb: continue() raises an exception, if already 
-	  running or no procedure.
-
-	* ext/tk/lib/tkafter.rb: skip() raises an exception, if not running.
-
-	* ext/tk/sample/tktimer2.rb: new sample for TkTimer class.
-
-Thu Jun 19 16:13:54 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* rubytest.rb: add library path to include standard libraries.
-
-Thu Jun 19 13:13:10 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* hash.c (env_delete, rb_f_getenv, env_fetch): case insensitive to
-	  access environment variables on DOSISH platforms.
-
-Thu Jun 19 00:51:47 2003  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
-
-	* range.c (rb_range_beg_len): out_of_range check after adjusting
-	  end point. [ruby-dev:20370]
-
-Wed Jun 18 23:59:11 2003  Guy Decoux  <ts@moulon.inra.fr>
-
-	* parse.y (call_args): the first argument to arg_cancat() should
-	  be NODE_LIST. [ruby-core:01151]
-
-Wed Jun 18 23:41:27 2003  Marc Cartright  <marc@isri.unlv.edu>
-
-	* ext/zlib/zlib.c (zstream_run): In a particular situation,
-	  deflate/inflate will return Z_BUF_ERROR, even though another call
-	  is required by the zlib library.
-
-Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bug fix
-
-	* ext/tk/lib/tk.rb: rename 'no_create' option to 'without_creating'
-
-	* ext/tk/lib/tk.rb: add TkWindow#pack_in, TkWindow#grid_in, 
-	  TkWindow#place_in
-
-	* ext/tk/lib/tk.rb: add TkWindow#bind_class and TkWindow#database_class
-
-	* ext/tk/lib/tk.rb: add TkBindTag.new_by_name and TkDatabaseClass 
-	  for binding to database class
-
-	* ext/tk/lib/tk.rb: check varname whether already exsist or not. 
-	  (TkVarAccess.new)
-
-	* ext/tk/lib/tk.rb: TkTextWin#bbox returns an array of four numbers
-
-	* ext/tk/lib/tk.rb: autoload TkDialog2, TkWarning2
-
-	* ext/tk/lib/tk.rb: scan event callback arguments and convert
-	  to proper type
-
-	* ext/tk/lib/tk.rb: TkBindTag.new accepts a block
-
-	* ext/tk/lib/tk.rb: If given taglist, TkWindow#bindtags(taglist) 
-	  returns taglist
-
-	* ext/tk/lib/tk.rb: add TkWindow#bindtags=(taglist)
-
-	* ext/tk/lib/tk.rb: Tk.focue and Tk.focus_lastfor return nil 
-	  if there is no target widget.
-
-	* ext/tk/lib/tk.rb: Tk::Wm.client returns the argument string 
-	  when setting name
-
-	* ext/tk/lib/tk.rb: TkGrid.columnconfiginfo and rowconfiginfo 
-	  given a slot return a number.
-
-	* ext/tk/lib/tk.rb: TkWindow.grid_columnconfiginfo and 
-	  grid_rowconfiginfo --- ditto
-
-	* ext/tk/lib/tk.rb: rename and define alias :: TkOption ==> TkOptionDB
-
-	* ext/tk/lib/tk.rb: define alias :: TkTimer ==> TkAfter
-
-	* ext/tk/lib/tk.rb: some instance methods change from public to private
-
-	* ext/tk/lib/tk.rb: some TkComm methods change to module functions
-
-	* ext/tk/lib/tk.rb: add support for -displayof option to some 
-	  TkWinfo methods
-
-	* ext/tk/lib/tk.rb: bind, bind_append and bind_remove --- 
-	  returns the target of event-binding
-
-	* ext/tk/lib/tk.rb: add Tk8.4 features
-
-	* ext/tk/lib/tk.rb: add TkPaneWindow
-
-	* ext/tk/lib/tkdialog.rb: bug fix
-
-	* ext/tk/lib/tkdialog.rb: some methods return self
-
-	* ext/tk/lib/tkdialog.rb: add TkTextMark#+(mod) and TkTextMark#-(mod)
-
-	* ext/tk/lib/tkdialog.rb: add some methods
-
-	* ext/tk/lib/tkcanvas.rb: bug fix and some methods return self
-
-	* ext/tk/lib/tkentry.rb: some methods return self
-
-	* ext/tk/lib/tkentry.rb: TkEntry#bbox returns an array of four numbers
-
-	* ext/tk/lib/tkentry.rb: scan validatecommand arguments and 
-	  convert to proper type
-
-	* ext/tk/lib/tkbgerror.rb: support to define a error handler by user
-
-	* ext/tcltklib/tcltklib.c: [ruby-talk:60759]
-
-Wed Jun 18 13:50:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should dispatch based on ID type.
-
-Wed Jun 18 12:53:42 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (rb_yield_0): should restore scope_vmode during yield.
-	  [ruby-dev:20361]
-
-Wed Jun 18 01:13:36 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/rubyext.c (rb_syck_load_handler): merge key implemented.
-
-	* ext/syck/rubyext.c (transfer_find_i): removed use of String#=~ in favor
-	    of Regexp#match.
-
-	* lib/yaml.rb: YAML::try_implicit returns.
-
-	* lib/yaml/rubytypes.rb: Regexps added for type matching.
-
-	* lib/yaml/emitter.rb: fix String + nil error.
-
-Tue Jun 17 17:01:08 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/gram.c: added grammar for certain empty sequence entries.
-
-	* ext/syck/handler.c, ext/syck/syck.c, ext/syck/syck.h: track bad anchors.
-
-	* ext/syck/token.c: added pause token, tag possible circular references.
-
-	* lib/yaml/rubytypes.rb: parsing YMD time as Date instance.
-
-	* ext/syck/rubyext.c: ditto. DomainType, PrivateType, BadAlias classes.
-
-Tue Jun 17 21:28:27 2003  Ariff Abdullah <skywizard@time.net.my>
-
-	* win32/win32.c (rb_w32_opendir): need to set errno. [ruby-talk:73761]
-
-Mon Jun 16 19:01:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: remove rb_cBlock.
-
-Mon Jun 16 18:06:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* numeric.c (rb_fix2uint): renamed from rb_fix2int on IA64.
-
-Mon Jun 16 17:02:57 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (proc_invoke): format the message for localjump_error().
-
-Mon Jun 16 16:23:56 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/dl/dl.c (rb_dl_callback): use rb_block_proc() instead of
-	  rb_block_new().
-
-	* ext/win32ole/win32ole.c (ev_on_event): ditto.
-
-Mon Jun 16 16:06:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_alloc): re-unification of Block and Proc.  Block
-	  class is no longer available.
-
-Mon Jun 16 14:43:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* bcc32/Makefile.sub: undefine HAVE_GETGROUPS.
-
-Sat Jun 14 16:58:41 2003  Guy Decoux  <ts@moulon.inra.fr>
-
-	* regex.c (calculate_must_string): should handle option_set
-	  properly. [ruby-talk:73481]
-
-	* regex.c (re_compile_fastmap): a bug in flag manipulation.
-	  [ruby-talk:73549]
-
-Sat Jun 14 17:59:59 2003  Guy Decoux  <ts@moulon.inra.fr>
-
-	* eval.c (method_arity): should handle NODE_BMETHOD and
-	  NODE_DMETHOD. [ruby-core:01138]
-
-Fri Jun 13 09:24:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (storebinary): seek correctly. Thanks, William Webber.
-
-	* lib/net/ftp.rb (putbinaryfile): rescue FTPPermError.
-
-Thu Jun 12 22:13:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb : add 'no_create' option to widget
-	  initialize method. 
-
-	* ext/tk/MANIFEST : forgot to commit when added tkmacpkg.rb
-	  and tkwinpkg.rb
-
-	* ext/tk/lib/README : ditto.
-
-Thu Jun 12 21:14:11 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb : widget configure returns self (for method
-	  call chain)
-
-	* ext/tk/lib/tkmacpkg.rb : Mac resource (not new but not
-	  included until now)
-
-	* ext/tk/lib/tkwinpkg.rb : Win DDE and registry (not new but not 
-	  included until now)
-
-Tue Jun 10 14:26:30 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/token.c: preserve newlines prepended to a block.
-
-	* ext/syck/implicit.c (syck_match_implicit): added !merge and !default.
-
-	* lib/yaml/constants.rb: remove '\z' escape.
-
-	* lib/yaml/emitter.rb: ensure reset of @seq_map shortcut flag.
-
-	* lib/yaml/encoding.rb: remove Unicode translation methods.
-
-	* lib/yaml/rubytypes.rb: improved round-tripping of Strings.
-	  [ruby-core:1134]
-
-Tue Jun 10 01:07:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb.rb (IRB::Irb::eval_input): warn and exit if $SAFE >=3
-	  after input evaluation.
-
-	* lib/irb.rb (IRB::Irb::eval_input): untaint input string.  now
-	  irb works for levels 1 and 2.
-
-Mon Jun  9 19:02:33 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in: checks presence of grp.h and setgroups().
-
-	* process.c (proc_getgroups, proc_setgroups): raise
-	  NotImplementedError unless available.  [ruby-talk:73014]
-
-Mon Jun  9 18:09:11 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fixed 100% CPU problem of Tk.mainloop
-
-Mon Jun  9 15:50:24 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: renewal Tk.mainloop
-
-Sun Jun  8 13:37:21 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
-
-	* wince/setup.mak: set SUBSYSTEM in each platform.
-
-	* wince/stdlib.c: fix mblen() bug.
-
-Sat Jun  7 22:22:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_loader_transfer): should not use
-	  rb_cProc directly, since type_proc may be Proc, Block, or
-	  Method.
-
-	* parse.y (value_expr0): class and module statements should not be
-	  warned for "void value expression". [ruby-talk:72989]
-
-Sat Jun  7 01:46:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (add_final): should determine type by respond_to?
-
-	* gc.c (define_final): ditto.
-
-	* io.c (rb_io_ctl): should not depend on respond_to?
-
-	* range.c (range_step): rb_check_string_type().
-
-Fri Jun  6 20:29:14 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (error_print): needs to be exception proof.
-
-	* eval.c (error_handle, rb_longjmp): bails out when exception
-	  reentered.  (ruby-bugs-ja:PR#487), [ruby-core:01119],
-	  [ruby-core:01122]
-
-	* eval.c (Init_Proc): pre-allocates critical error objects.
-
-Fri Jun  6 20:29:14 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (cmd_brace_block, do_block, brace_block): initialize block
-	  variables at the beginning of the block.  [ruby-talk:72521]
-
-Fri Jun  6 18:49:11 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_setgroups): new functions.
-
-Fri Jun  6 18:33:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (define_final): eliminate rb_f_lambda() call.
-
-	* class.c (rb_scan_args): ditto.
-
-	* signal.c (sig_trap): ditto.
-
-	* hash.c (rb_hash_initialize): ditto.
-
-	* variable.c (rb_f_trace_var): ditto.
-
-	* ext/dl/dl.c (rb_dl_callback): ditto.
-
-	* ext/win32ole/win32ole.c (ev_on_event): ditto.
-
-Fri Jun  6 16:10:01 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: define Net::HTTPResponse#to_ary for backward
-	  compatibility.  [ruby-talk:72927]
-
-	* lib/net/protocol.rb: add warning.
-
-Fri Jun  6 13:30:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ruby_cleanup): $SAFE is turned off in the finalization.
-	  Each END proc should preserve its own $SAFE level. [ruby-core:01119]
-
-	* marshal.c (marshal_load): remove unused variable "hash".
-	  [ruby-core:01120]
-
-	* hash.c (env_str_new): freeze strings from ENV. [ruby-talk:72860]
-
-	* array.c (rb_ary_first): optional argument to retrieve first n
-	  elements.
-
-	* array.c (rb_ary_last): optional argument to retrieve last n
-	  elements.
-
-Thu Jun  5 21:31:55 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
-	* wince/stdlib.c: add mblen().
-
-Thu Jun  5 18:33:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/curses/curses.c (window_s_allocate,curses_finalize):
-	  avoid VC++ warnings.
-
-Thu Jun  5 17:44:11 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/rubyext.c (syck_parser_mark): was a bit heavy on the GC.
-
-	* lib/yaml.rb (YAML::transfer): added.
-
-Thu Jun  5 16:11:50 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (MISSING): link with missing/erf.c.
-
-	* missing.h (erf, erfc): fix prototype.
-
-	* missing/erf.c: new. [ruby-list:37753]
-
-Thu Jun  5 15:09:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* math.c (math_erf,math_erfc): new function. [ruby-list:37753]
-
-Thu Jun  5 14:49:43 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/rubyext.c: using GC nodes caused segfault. [ruby-core:1071]
-
-Thu Jun  5 13:48:57 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/token.c: directives choked on a period.
-
-	* ext/syck/gram.y: anchors work above a collection. [ruby-core:1071]
-
-	* ext/syck/handler.c, ext/syck/syck.c: ensure a fresh strtable between
-	  parser iterations.
-
-Wed Jun  4 12:06:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ruby_finalize): no longer need to turn off $DEBUG in the
-	  finalizer. (ruby-bugs-ja PR#473)
-
-Tue Jun  3 22:20:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call_super): should search superclass method based on
-	  orig_func, not last_func.
-
-Tue Jun  3 09:59:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call_super): inheritance line adjustment moved from
-	  rb_call(). [ruby-core:01113]
-
-	* eval.c (rb_eval): use rb_call_super() to follow DRY principle.
-
-Mon Jun  2 02:20:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (push_values_at): Array#values_at should work with
-	  ranges too.
-
-	* range.c (rb_range_beg_len): length calculation was wrong.
-
-	* eval.c (rb_call): should set T_ICLASS in the frame->last_class.
-	  [ruby-core:01110]
-
-Sun Jun  1 21:50:01 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: should not use def file, use ld with
-	  --export-all-symbols option on Cygwin/MinGW.
-
-	* defines.h: ditto.
-
-	* cygwin/GNUmakefile.in: ditto.
-
-	* ext/digest/defs.h: avoid warnings on Cygwin.
-
-Sun Jun 01 13:33:49 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
-	* wince/string_wce.c: add strpbrk() for hpcpro support.
-
-	* wince/setup.mak: add hpcpro(CE2.11) & armv4t(CE.NET) support.
-
-	* wince/resource.rb: ditto.
-
-	* wince/Makefile.sub: ditto.
-
-Sun Jun  1 10:38:28 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* variable.c (rb_autoload_load): autoloaded constants under a module
-	  belong to the module.  [ruby-core:01094], [ruby-dev:20309]
-
-Sat May 31 04:36:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (rb_intern): should handle multibyte name.
-
-Fri May 30 23:18:01 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/rubyext.c (rb_syck_mktime): seconds calculated wrong.
-
-	* ext/syck/gram.c: flexibility to anchors and transfer methods on
-	  collections.
-
-	* ext/syck/token.c: hex escapes.
-
-	* lib/yaml/basenode.rb: YamlNode references changed to YAML::BaseNode.
-
-Fri May 30 22:28:04 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* numeric.c (rb_num2uint, rb_fix2int): new function to convert
-	  values over INT_MAX.  [ruby-core:01099]
-
-	* ruby.h (NUM2UINT, FIX2INT): ditto.
-
-Fri May 30 15:01:05 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/token.c: preserve any indentation past an explicit
-	  indentation.
-
-Fri May 30 14:55:44 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_Array): exclude Kernel#to_a instead of Object#to_a.
-	 (ruby-bugs-ja:PR#483)
-
-	* lib/optparse.rb (OptionParser::Switch#parse_arg): not splat.
-
-	* lib/optparse.rb (OptionParser::Switch#conv_arg): splat if no
-	  conversion supplied.
-
-	* lib/optparse.rb (OptionParser::Switch::PlacedArgument#parse):
-	  override next switch after argument conversion.
-
-Fri May 30 14:41:34 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/handler.c, ext/syck/syck.h: removed syck_fold_format().
-
-	* ext/syck/gram.c: flexibility for aliases and anchors.
-
-	* ext/syck/token.c: folding now handled in the tokenizer.
-
-Fri May 30 06:21:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* variable.c (rb_autoload_load): should delete autoloaded
-	  symbol itself before load.  [ruby-core:01097]
-
-	* variable.c (rb_mod_remove_const): must not return Qundef.
-
-Thu May 29 14:59:10 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (_CRTIMP): redefine _CRTIMP on MinGW.
-
-	* configure.in: remove '-D__USE_CRTIMP' from XCFLAGS on MinGW.
-
-	* win32/win32.c (NtMakeCmdVector): handle quotes only if not instring.
-
-Thu May 29 09:11:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (ev_const_defined, ev_const_get), variable.c
-	  (rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
-	  as autoload marker.  [ruby-dev:18103], [ruby-dev:18184]
-
-	* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
-	  Module#autoload, Module#autoload?.
-
-	* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
-	  manage autoload constants per classes/modules.
-
-	* variable.c (rb_const_defined_at, rb_const_defined): return false
-	  for autoloading constants.
-
-	* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
-	  variable.c (rb_mod_const_at, rb_const_assign): removed autoload
-	  stuff.
-
-	* intern.h: prototypes; rb_autoload, rb_autoload_load,
-	  rb_autoload_p.
-
-	* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
-	  do not treat unmatched argument as an option.
-
-Wed May 28 08:44:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_syscall): type dispatch should be based on
-	  rb_check_string_type(), not FIXNUM_P(), because values may be a
-	  bignum.  [ruby-talk:72257]
-
-Tue May 27 20:33:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c, util.c: removed duplicated includes/defines.
-
-	* ext/socket/socket.c (sock_addrinfo): get rid of SEGV at NULL ptr
-	  String.  increase buffer size for 64bit platforms.
-
-Tue May 27 02:34:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): should pass the current klass value to
-	  block_invoke, which may be called via "super". [ruby-core:01077]
-
-	* eval.c (block_invoke): now takes 4th argument "klass".
-
-	* eval.c (block_alloc): should propagate BLOCK_PROC to
-	  ruby_block.
-
-Mon May 26 23:51:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_object0): should not use "yield" method, use "call"
-	  instead. (ruby-bugs-ja PR#476)
-
-Mon May 26 21:39:46 2003  MoonWolf  <moonwolf@moonwolf.com>
-
-	* lib/mkmf.rb, lib/optparse.rb, lib/tracer.rb: use Method#to_block
-	  instead of deprecated Method#to_proc.  (ruby-bugs-ja:PR#477)
-
-Mon May 26 21:21:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/optparse.rb (OptionParser::Switch::parse,
-	  OptionParser::order): use {Block,Proc}#call instead of deprecated
-	  #yield.
-
-Mon May 26 16:39:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (Init_Proc): Block/Proc separation. [huge change]
-
-	* eval.c (block_arity): returns exact arity number for Procs out
-	  of methods. also gives 1 for {|a|..}.
-
-	* string.c (rb_str_match): revert use of String#index for
-	  invocation like string =~ string.
-
-	* eval.c (rb_Array): move Object#to_a exclusion hack from
-	  splat_value().  need to be in eval.c for a while.
-
-Sun May 25 23:48:21 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bignum.c (rb_quad_pack): should negate negative bignum.
-	  (ruby-bugs-ja:PR#474)
-
-Sun May 25 03:27:25 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: support LOGIN authentication, based on
-	  the patch by Kazuhiko Izawa. [ruby-talk:78981]
-
-Sat May 24 18:19:51 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
-
-	* wince/Makefile.sub: add eMbedded Visual C++ 4.0 support.
-
-	* wince/resource.rb: ditto.
-
-	* wince/setup.mak: ditto.
-
-	* wince/configure.bat: ditto.
-
-	* wince/mkexports.rb: delete japanese comments.
-
-Fri May 23 18:34:05 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_longjmp): get rid of reentering while debug warning.
-	  (ruby-bugs-ja:PR473)
-
-Fri May 23 15:16:16 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* pack.c (pack_unpack): sign-extend if sizeof long is bigger than
-	  32.  (ruby-bugs-ja:PR#472)
-
-Fri May 23 14:19:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ruby_finalize): turn off ruby_debug flag before calling
-	  at_exit procs and finalizers. (ruby-bugs-ja:PR473)
-
-	* ext/tcltklib/tcltklib.c (lib_mainloop_core): OK to block if
-	  there's no other thread. (ruby-bugs:PR#861)
-
-Thu May 22 18:07:46 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/token.c: single- and double-quoted root-level fix.
-
-	* lib/yaml.rb (YAML::object_maker): can create object attributes (such as
-	  found in Exception class)
-
-	* lib/yaml/rubytypes.rb: roundtripping of Exception and subclasses.
-
-Fri May 23 01:26:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_clone): defer copying freezing state after
-	  calling initialize_copy().  [ruby-dev:20276]
-
-Thu May 22 17:12:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (run_final): use rb_thread_critical instead of DEFER_INTS.
-	  [ruby-dev:20272]
-
-	* marshal.c: try to make ArgumentError and TypeError consistent.
-	  [ruby-core:01068]
-
-Thu May 22 15:46:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_define_alloc_func): need not to disable
-	  rb_call_super() for allocation functions. [ruby-core:1065]
-
-Thu May 22 06:21:33 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/rubyext.c (rb_syck_err_handler): raise ArgumentError on
-	  malformed YAML.
-
-	* lib/yaml/rubytypes.rb: String#to_yaml was missing space indicators at
-	  the end of a line.
-
-Thu May 22 05:43:24 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/rubyext.c (syck_parser_load): root-level false was returning
-	  nil.
-
-	* ext/syck/token.c: root-level transfer method bug.
-
-	* ext/syck/gram.c: root-level empty gave a parse error.
-
-	* lib/yaml/rubytypes.rb: Symbol#to_yaml generating method call error.
-
-Thu May 22 02:46:38 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_eval): splat NODE_RESTARY.  [ruby-dev:20268]
-
-	* eval.c (rb_thread_fd_close): raise for writing threads.
-	  [ruby-dev:20269]
-
-	* io.c (rb_io_close, io_reopen): ditto.
-
-	* io.c (io_reopen): keep stdio objects for stdin, stdout,
-	  and stderr.  [ruby-dev:19442]
-
-Thu May 22 01:11:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (strings, word_list): must create new instance always.
-	  http://yowaken.dip.jp/tdiary/20030521.html#p02
-
-	* parse.y (yylex): slight optimization.
-
-Wed May 21 23:07:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (rb_sys_fail): should not specify errno explicitly.
-	  [ruby-dev:20264]
-
-Wed May 21 20:51:47 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
-	  wince/Makefile.sub: update dependencies.
-
-Wed May 21 17:44:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (syserr_initialize): prohibit specifying errno for
-	  subclasses of SystemCallError.  in addition, if initialize is
-	  called for SystenCallError instance, its class be changed.
-	  [ruby-dev:20257]
-
-	* gc.c (run_final): to protect thread context switch, finalizers
-	  are wrapped in DEFER_INTS/ENABLE_INTS.
-
-Wed May 21 13:26:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/optparse.rb: get rid of warnings.
-
-Tue May 20 18:59:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_save_context): prohibit rb_gc_force_recycle()
-	  on thread saved ruby_dyna_vars. [ruby-dev:20236]
-
-Tue May 20 17:39:15 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (init_copy): call initialize_copy at the end of copy
-	  process.
-
-Tue May 20 17:15:55 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* error.c (syserr_initialize): use Errno constants as default
-	  errno for subclasses.  [ruby-dev:20241]
-
-Tue May 20 15:26:25 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* st.h: define ST_DATA_T_DEFINED for portability.
-
-	* ext/syck/syck.h: add typedef, st_data_t for Ruby 1.6.
-
-	* ext/syck/syck.c (syck_st_free_nodes): return int.
-
-	* ext/syck/syck.c (syck_add_sym): cast the data to st_data_t
-	  to avoid error on bcc32.
-
-	* ext/syck/syck.c (syck_lookup_sym): ditto.
-
-	* ext/syck/syck.c (syck_free_parser): NULL is not integer.
-
-Tue May 20 13:29:04 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (kill): set errno after calling raise().
-
-Tue May 20 10:51:26 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_f_missing): create exception instance by ordinal
-	  method.  [ruby-dev:20033]
-
-	* error.c (rb_name_error, rb_sys_fail): ditto.
-
-	* error.c (exc_to_s, exit_status, name_err_name,
-	  nometh_err_args, syserr_errno, syserr_eqq): access
-	  attributes.
-
-	* error.c (name_err_initialize, nometh_err_initialize,
-	  syserr_initialize): initialize attributes.
-
-Tue May 20 10:26:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): give warning for multiple values for a
-	  block parameter.
-
-	* eval.c (rb_yield_values): a function to yield multiple values.
-
-	* array.c (sort_1): use rb_yield_values.
-
-	* enum.c (min_ii, max_ii): ditto.
-
-	* hash.c (rb_hash_update_block_i, delete_if_i, select_i,
-	  each_pair_i, env_each, env_reject_bang, env_select,
-	  env_update_i): ditto.
-
-	* struct.c (rb_struct_each_pair): ditto.
-
-	* eval.c (top_include): should include module in the current self,
-	  not ruby_top_self. [ruby-dev:20198]
-
-	* eval.c (top_include): stop inclusion to ruby_wrapper; give
-	  warning.
-
-Mon May 19 18:54:30 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/token.c, ext/syck/implicit.c: expanded character set to
-	  allow UTF-8, other Ruby encodings.
-
-Mon May 19 16:47:00 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/syck.c, ext/syck/syck.h, ext/syck/token.c, ext/syck/gram.c:
-	  count line numbers only if line pointer has increased.
-
-Tue May 20 00:45:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (push_braces): do not push_braces() unless rbrace is found.
-	  (ruby-bugs-ja:PR#469)
-
-Tue May 20 00:09:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/pty/pty.c (pty_finalize_syswait): join (using Thread#value)
-	  before detach pid. [ruby-talk:71519]
-
-Mon May 19 23:02:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (PUSH_FRAME): save outer ruby_block. [ruby-list:37677],
-	  [ruby-dev:20202]
-
-	* eval.c (BEGIN_CALLARGS): restore outer block by using
-	  ruby_block->outer.
-
-	* eval.c (block_pass): do not alter block->prev, but block->outer.
-
-	* array.c (get_inspect_tbl): warning on wrong condition.
-
-Mon May 19 16:13:57 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* class.c: add #include "version.h".
-
-	* hash.c: ditto.
-
-	* string.c: ditto.
-
-Mon May 19 15:33:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (localjump_xvalue): renamed exitstatus to exit_value
-	  since it's not exit "status" after all.
-
-	* eval.c (localjump_error): add reason to LocalJumpError.
-
-	* compar.c (rb_cmpint): raise error via rb_cmperr(), if cmp value
-	  is nil. now take new 2 arguments.
-
-	* time.c (time_cmp): 2003-05-16 fix was incomplete.
-	  (ruby-bugs-ja:PR#458)
-
-Mon May 19 14:42:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_cmp): stupid comparison fixed.
-
-	* io.c (Init_IO): ARGF.path added (alias to ARGF.filename).
-	  [ruby-dev:20197]
-
-Mon May 19 13:58:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (init_copy): rename copy_object as initialize_copy,
-	  since it works as copy constructor.
-
-	* eval.c (rb_add_method): initialize_copy should always be
-	  private, like initialize.
-
-Mon May 19 13:51:50 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* re.c (rb_reg_quote): \n \r \f \v quoting was wrong.
-	  [ruby-dev:20203]
-
-	* re.c (rb_reg_quote): rb_reg_quote(" ") should be "\\ ", not
-	  "\\s".
-
-Mon May 19 08:08:51 2003  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: use warn() instead of $stderr.puts().
-
-	* sample/cal.rb: ditto.
-
-Sat May 17 12:02:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (get_inspect_tbl): check whether inspect_tbl value is a
-	  valid array. (ruby-bugs-ja PR#65)
-
-	* array.c (inspect_ensure,rb_protect_inspect,rb_inspecting_p):
-	  use get_inspect_tbl().
-
-Sat May 17 11:50:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_abort): call exit(1) if exception is raised.  This
-	  patch was made by Nobuyoshi Nakada <nobu.nokada@softhome.net> on
-	  2002-05-30.  (ruby-bugs-ja PR#236)
-
-	* signal.c: disable Ruby's interrupt handler at the beginning.
-	  (ruby-bugs-ja PR#236)
-
-Sat May 17 02:17:42 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/rational.rb (Integer::denominator): fixed typo.
-	  (ruby-bugs-ja:PR#466)
-
-Sat May 17 00:18:11 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/socket/socket.c (ruby_connect): connect() after EINPROGRESS
-	  returns EINVAL on some platforms, need to check true error
-	  status.  [ruby-core:01037]
-
-Sat May 17 00:21:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_class_allocate_instance): singleton class check
-	  moved to rb_obj_alloc(). (ruby-bugs-ja PR#345)
-
-Fri May 16 23:55:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_quote): should escape white space characters,
-	  \t, \f, \n, \r. (ruby-bugs-ja PR#231)
-
-Fri May 16 12:40:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (block_pass): chain previous block to the pushing block.
-	  [ruby-list:37677]
-
-	* time.c (time_cmp): does not compare with numbers for
-	  interchangeability. (ruby-bugs-ja:PR#458)
-
-Thu May 15 21:55:54 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/gram.c: fixes to one-line documents and end of stream
-	  documents.
-
-	* ext/syck/syck.c, ext/syck/syck.h: add root_on_error to parser
-	  struct, specifying the symbol to be returned on a parse error.
-
-Thu May 15 18:44:31 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (OpenURI::Redirect#initialize): call super to
-	  initialize mesg.
-
-	* lib/open-uri.rb (OpenURI::Meta#charset): call block to guess charset
-	  if block is given and charset is not given.
-
-Thu May 15 16:55:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_le): returns nil if two classes/modules are not
-	  in class-superclass relationship.
-
-	* object.c (rb_mod_cmp): uses new rb_mod_le() behavior.
-
-Thu May 15 07:45:30 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/rubyext.c, ext/syck/implicit.c: timestamp repairs to
-	  timezone and milliseconds.
-
-	* ext/syck/syck.c (syck_parser_reset_levels): duplicate string literal
-	  to avoid warning.
-
-Thu May 15 13:26:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_class_instance_methods): default will be changed in
-	  1.8.1.
-
-	* io.c (set_stdio): better message.
-
-Thu May 15 13:18:11 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (set_stdio): $stdin, $stdout, $stderr now became read-only.
-
-	* variable.c (readonly_setter): message changed.
-
-Thu May 15 09:50:51 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/syck/syck.c (syck_parser_pop_level): add prototype.
-
-	* ext/syck/syck.c (syck_strndup): should return value.
-
-Thu May 15 09:32:25 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (kill): fix typo and add signal 0 support.
-
-Wed May 14 20:09:26 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/gram.c: sequence-in-map shortcut, transfer methods on
-	  sequence-in-sequence, memory leak in mapping merge.
-
-	* ext/syck/syck.c: memory leak in domain anchoring.
-
-	* lib/yaml/rubytypes.rb, lib/yaml/types.rb: eliminated 1.6.x code.
-
-Wed May 14 19:56:43 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/syck/rubyext.c: add prototypes to avoid VC++ warnings.
-
-Wed May 14 12:23:46 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (Net::HTTP#start): should check whether HTTP
-	  session is opened before finishing. (ruby-bugs-ja:PR#463)
-
-Wed May 14 09:12:55 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: reduce warning. (ruby-bugs-ja:PR#462)
-
-Tue May 13 22:31:04 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* lib/yaml/rubytypes.rb, lib/yaml/types.rb: using Object#object_id
-	  rather than deprecated Object#id.
-
-	* ext/syck/token.c: changed ASCII escapes to octal notation.
-
-	* ext/Setup*: added entries for static linking of Syck extension.
-
-Tue May 13 20:31:58 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: add '--Wl,--enable-auto-import' to DLDFLAGS
-	  on Cygwin/MinGW.
-
-	* configure.in: add '-D__USE_CRTIMP' to XCFLAGS on MinGW.
-
-	* ext/syck/handler.c: add proper casts.
-
-	* ext/syck/syck.c: ditto.
-
-Tue May 13 17:58:08 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
-	  HAVE_FSYNC.
-
-	* win32/win32.h (fsync): define as _commit().
-
-Tue May 13 15:35:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_match_exec): \Z changed to be consistent with new $
-	  (endbuf) behavior.
-
-Tue May 13 14:48:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (error_pos): use $deferr for output instead of stderr
-	  directly.
-
-	* eval.c (error_print,error_handle,rb_longjmp,rb_thread_schedule):
-	  ditto.
-
-Tue May 13 06:34:19 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* lib/yaml/rubytypes.rb: object and struct loading
-
-	* lib/yaml.rb: YAML::detect_implicit will discover typing for a Ruby
-	  string
-
-	* ext/syck/: Fixed portable comments, misuse of NULL and methods without
-	  return VALUEs.
-
-Mon May 12 18:08:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (Init_IO): new variable $deferr which is default output
-	  port of error messages.
-
-	* io.c (rb_warn_m): new method "warn". [new]
-
-	* error.c (warn_print): use $deferr.
-
-	* error.c (rb_bug): ditto.
-
-	* error.c (err_append): ditto.
-
-Sun May 11 13:50:12 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb: refine to_s test.
-
-	* lib/pp.rb (PP::ObjectMixin#pretty_print): refine to_s handling.
-
-Sun May 11 06:32:13 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/implicit.c, ext/syck/rubyext.c: transfer methods applied to
-	  native loading
-
-	* ext/syck/token.c: fix for transfer methods on same indentation as nested
-	  mapping
-
-	* lib/yaml/rubytypes.rb: all type names in lowercase
-
-Sat May 10 19:55:18 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ext/syck/gram.c ext/syck/handler.c ext/syck/implicit.c
-	  ext/syck/node.c ext/syck/rubyext.c ext/syck/syck.c
-	  ext/syck/syck.h ext/syck/token.c: updated to Syck 0.27
-
-	* lib/yaml/loader.rb: new YAML::Loader class
-
-	* lib/yaml.rb: loading of type families leverages YAML::DefaultLoader
-
-Sat May 10 19:00:08 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
-
-	* wince/string.c: file removed.
-
-	* wince/stdlib.c: file added.
-
-Sat May 10 16:17:02 2003  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (decode_utf7): new method.
-
-	* lib/net/imap.rb (encode_utf7): new method.
-
-Fri May  9 21:25:50 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
-	* ruby/ext/syck, ruby/lib/yaml: Initial checkin of YAML substances.
-
-Fri May  9 16:38:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_reopen): It should be possible to reopen closed IO.
-	  [ruby-talk:70941]
-
-	* io.c (rb_io_reopen): inherit original file mode unless specified.
-
-Thu May  8 18:44:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc): check odd alignment stack on m68k machines.
-
-Thu May  8 12:56:04 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* compar.c (rb_cmperr): raise comparison failure.
-
-	* intern.h: prototype; rb_cmperr
-
-	* numeric.c (flo_gt, flo_ge, flo_lt, flo_le, fix_gt, fix_ge,
-	  fix_lt, fix_le): should fail unless the argument is comparable.
-	  (ruby-bugs-ja:PR#456)
-
-	* numeric.c (int_upto, int_downto): should fail unless the
-	  argument is comparable.  (ruby-bugs-ja:PR#454)
-
-Wed May  7 13:30:11 2003  Masahiro TANAKA  <masa@ir.isas.ac.jp>
-
-	* numeric.c (num_step): better error treatment of float values.
-
-Tue May  6 17:51:54 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb: rename method: POP3#mail_size -> n_mails
-
-	* lib/net/pop.rb: rename method: POP3#bytes -> n_bytes
-
-Tue May  6 17:21:01 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/bigdecimal/.cvsignore: new file.
-
-	* ext/zlib/.cvsignore: new file.
-
-Tue May  6 14:39:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_methods): list singleton methods if recur
-	  argument is false;  list all methods otherwise.
-
-Mon May  5 21:19:25 2003  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* ext/gdbm/gdbm.c (fgdbm_values_at): new method to replace
-	  select(index..).
-
-	* ext/sdbm/init.c (fsdbm_values_at): ditto.
-
-	* ext/dbm/dbm.c (fdbm_values_at): ditto.
-
-	* ext/dbm/dbm.c (DBM::VERSION): defined.
-
-	* ext/gdbm/testgdbm.rb: replace select with values_at.
-
-	* ext/sdbm/testsdbm.rb: ditto.
-
-	* ext/dbm/testdbm.rb: ditto.
-
-	* ext/dbm/testdbm.rb (setup): DBM.open(path, 0400) cause EACCESS
-	  on Berkeley DB[234].
-
-Mon May  5 22:57:07 2003  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* sample/cal.rb: use values_at instead of select.
-
-	* sample/biorhythm.rb: ditto.
-
-Mon May  5 18:59:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* sample/test.rb: substitute 'select' with 'values_at'.
-
-	* lib/date.rb: ditto.
-
-	* lib/parsedate.rb: ditto.
-
-Mon May  5 00:46:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_values_at): new method to replace select(index..).
-
-	* hash.c (rb_hash_values_at,env_values_at): ditto.
-
-	* re.c (match_values_at): ditto.
-
-	* struct.c (rb_struct_values_at): ditto.
-
-	* re.c (match_select): add iterator behavior.
-
-Sun May  4 19:08:53 2003  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb: synchronized with date2 3.3.2.
-
-Sun May  4 15:21:18 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: ESMTP -> SMTP transition wrongly fails.
-
-Sun May  4 15:06:37 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb: APOP did not work.  [ruby-dev:20149]
-
-Sat May  3 21:14:29 2003  Johan Holmberg  <holmberg@iar.se>
-
-	* ext/curses/curses.c, ext/digest/sha2/sha2.c, ext/iconv/iconv.c,
-	  ext/racc/cparse/cparse.c: include "ruby.h" at the top to shut up
-	  "_FILE_OFFSET_BITS redefined" warning on Solaris.
-
-Sat May  3 11:00:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_class_protected_instance_methods): now gives
-	  warnings to show migration path.  The default will be reversed
-	  on Jan 2004.
-
-Sat May  3 00:58:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_methods): now accepts recurse parameter.
-
-	* lib/delegate.rb (Delegator::initialize): instance_methods
-	  etc. now recurse by default.  need to specify false.
-
-Sat May  3 00:22:00 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: reintroduce Protocol.protocol_param.
-
-	* lib/net/http.rb: ditto.
-
-	* lib/net/pop.rb: ditto.
-
-	* lib/net/smtp.rb: ditto.
-
-Fri May  2 23:29:53 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: remove Protocol class.
-
-	* lib/net/smtp.rb (SMTP): ditto.
-
-	* lib/net/pop.rb (POP3): ditto.
-
-	* lib/net/http.rb (HTTP): ditto.
-
-	* lib/net/protocol.rb: remove Command class.
-
-	* lib/net/smtp.rb (SMTPCommand): ditto.
-
-	* lib/net/pop.rb (POP3Command): ditto.
-
-	* lib/net/pop.rb: remove APOPCommand class.
-
-	* lib/net/protocol.rb: remove Code class and its all subclasses.
-
-	* lib/net/protocol.rb: remove Response class and its all
-	  subclasses.
-
-	* lib/net/pop.rb (POPMail): new method unique_id (alias uidl).
-
-Fri May  2 18:17:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* compar.c (cmp_gt): raises ArgumentError when "<=>" give nil.
-	  inspired by discussion on comp.lang.python.
-
-Fri May  2 17:37:01 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session::initialize): updated to
-	  support 2003-04-23 change in cgi.rb [ruby-core:1002]
-
-Fri May  2 17:21:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (method_list): classify methods based on nearest
-	  visibility. [ruby-dev:20127]
-
-	* class.c (rb_class_instance_methods): recurse by default.  other
-	  method listing methods as well.
-
-Fri May  2 09:38:06 2003  Warren Brown  <wkb@airmail.net>
-
-	* string.c (rb_str_ljust): now takes optional argument to specify
-	  pad string. [ruby-talk:70482]
-
-	* string.c (rb_str_rjust): ditto.
-
-	* string.c (rb_str_center): ditto.
-
-	* string.c (rb_str_justify): utility function.
-
-Fri May  2 04:10:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_add_method): call singleton_method_added or
-	  method_added for every method definition (after ruby_running).
-	  [ruby-talk:70471]
-
-	* array.c (rb_ary_reverse_bang): Array#reverse! should not return
-	  nil even for arrays sized less than 2.
-
-Thu May  1 23:18:01 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_eof): should not block after reading all argument
-	  files. (ruby-bugs-ja PR#449)
-
-Fri May  2 15:10:41 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: use hashes to pass options.
-
-	* lib/fileutils.rb: new option mkdir(:mode), mkdir_p(:mode).
-
-	* instruby.rb: follow fileutils.rb feature change.
-
-Thu May  1 08:24:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_match_exec): $ _always_ matches at the end of string.
-
-Wed Apr 30 14:12:00 2003  wanowa.kimura@nifty.ne.jp (kimura wataru)
-
-	* net/imap.rb: support THREAD extension.
-
-Sun Apr 27 23:13:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* string.c (rb_str_to_i): disallow negative radix.
-	  [ruby-dev:20087]
-
-Sat Apr 26 23:34:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (open_args): warning message changed to "don't put space
-	  before argument parentheses".
-
-Sat Apr 26 14:25:00 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
-
-	* wince/ : files removed.
-	           (config, dll.mak, exe.mak, mswince-ruby17.def,
-	            io.c, process.c, signal.c, string.c, time.c)
-
-	* wince/ : files added.
-	           (assert.c, Makefile.sub, mkexports.rb, io_wce.c,
-	            process_wce.c, signal_wce.c, string_wce.c,
-	            time_wce.c)
-
-	* wince/configure.bat : like mswin32 style.
-
-	* wince/direct.c : remove "static" at _currentdir.
-
-	* wince/io.h : change definition.
-
-	* wince/stdio.c : _fdopen -> fdopen.
-
-	* wince/process.h : add _P_OVERLAY.
-
-	* wince/time.h : change definition.
-
-	* wince/wincemain.c : add wce_SetCurrentDir.
-
-	* wince/wince.c : add wce_SetCurrentDir and wce_fopen.
-	                  fix GetModuleFileNameA to return correct "lpFileName".
-
-	* wince/wince.h : remove #ifdef.
-
-	* wince/sys/utime.h, utime.c : rename _utime to utime.
-
-	* wince/sys/stat.c : expand relative directory in stat.
-
-Sat Apr 26 06:33:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_read): ARGF.read() should read all argument files.
-
-Fri Apr 25 18:46:00 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
-
-	* gc.c: STACK_LEVEL_MAX=65535 on mswince.
-
-Fri Apr 25 18:40:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_read): read should not span two files. [ruby-dev:20073]
-
-Fri Apr 25 18:19:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (splat_value): split splat_value() and avalue_splat().
-
-	* io.c: there's no way to set non-IO value to current_file, thus
-	  no need for argf_forward().
-
-Fri Apr 25 02:03:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): Proc#yield should pass through retry and
-	  break like keyword yield. [ruby-talk:70034]
-
-	* eval.c (proc_invoke): orphan Proc now raises LocalJumpError for
-	  break and retry again.
-
-	* eval.c (rb_eval): ARGSCAT should splat the argument.
-
-	* eval.c (splat_value): splat operation function.
-
-Thu Apr 24 23:37:02 2003  Dave Thomas  <dave@thomases.com>
-
-	* lib/matrix.rb (Matrix#minor):  Used Range#size, which no longer
-	  exists.
-
-	* lib/complex.rb (new!): Complex.new had been made private, but
-	  Kernel#Complex called it. Re-exposed as new!.
-
-	* lib/matrix.rb (Matrix.row_vector): Fix method name typo
-
-Thu Apr 24 19:40:02 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb: add -Wl,--no-undefined to LDSHARED only
-	  if GNU ld is 2.11 or later.
-
-Wed Apr 23 14:05:40 2003  Dave Thomas <dave@pragprog.com>
-
-	* lib/ipaddr.rb (include?): Support non-IPAddr parameters.
-	  [ruby-core:00980]
-
-Wed Apr 23 13:31:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::[]): always return Value
-	  object.
-
-Wed Apr 23 08:39:27 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/zlib/extconf.rb: bccwin32 is win32 too.
-
-Tue Apr 22 20:58:00 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
-
-	* ruby.c: don't call VirtualQuery in ruby_init_loadpath()
-	  on mswince.
-
-Tue Apr 22 19:08:53 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* marshal.c (save_mantissa, load_mantissa): for interoperability
-	  should count cut-down bit from topmost.
-
-Tue Apr 22 09:20:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg_ambiguous): hopefully better message.
-
-	* lib/cgi.rb (CGI::QueryExtension::initialize_query): to_ary
-	  removed.
-
-Tue Apr 22 06:06:22 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Resource#hash): use XOR to accumulate
-	  hash value.
-
-	* lib/tsort.rb (TSort#each_strongly_connected_component): don't use
-	  block argument.
-	  (each_strongly_connected_component_from): ditto.
-
-Mon Apr 21 21:59:48 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* marshal.c: one more digit for decimal point.  [ruby-talk:69808]
-
-Mon Apr 21 21:25:59 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* numeric.c (flo_is_finite_p): use finite() if available.
-
-	* win32/win32.h (isinf, isnan): define as macro.
-	  [ruby-win32:00533]
-
-	* bcc32/Makefile.sub, win32/Makefile.sub: no longer use
-	  missing/isinf.c, missing/isnan.c.
-
-Mon Apr 21 18:36:28 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bignum.c (rb_cstr_to_inum): unnecessarily long buffer was used
-	  for radix 9.  [ruby-dev:20057]
-
-Mon Apr 21 17:44:34 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (block_append, value_expr0, assign_in_cond,
-	  warn_unless_e_option, warning_unless_e_option, range_op,
-	  cond0): adjust line number in warning.
-
-Mon Apr 21 00:47:42 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* sample/test.rb: avoid the MSVCRT *printf problem(float).
-	  [ruby-dev:20037]
-
-Mon Apr 21 00:11:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* marshal.c (w_float): append least mantissa bits to get rid
-	  of roundoff problem.  [ruby-talk:69518]
-
-	* marshal.c (r_object0): load least mantissa bits.
-
-Sun Apr 20 23:24:25 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (NtInitialize): set the floating-point control word
-	  on bcc32.
-
-	* win32/win32.h, bcc32/Makefile.sub: use missing/isinf.c, should not
-	  use _finite() because it returns 0 if NaN.
-
-Sun Apr 20 03:09:30 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* parse.y (void_expr0): node might become NULL after calling
-	  remove_begin().
-
-Sat Apr 19 21:55:10 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/Setup*: Add zlib and remove bogus and obsolete entries.
-
-Sat Apr 19 14:47:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc): use rb_gc_mark_maybe() to mark registered C
-	  addresses.  C variables may not hold valid reference to Ruby
-	  objects. [ruby-core:00975]
-
-Sat Apr 19 00:56:13 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_eql): should compare values with "eql?".
-
-Fri Apr 18 23:29:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_check): <=> returns nil for invalid values;
-	  should check.
-
-Fri Apr 18 15:26:50 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* error.c (rb_raise): workaround for some implementations of
-	  vsnprintf.
-
-Fri Apr 18 02:23:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): should not set RE_OPTIMIZE_ANCHOR,
-	  if anychar_repeat is enclosed by parentheses.
-
-Fri Apr 18 01:49:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* util.c (ruby_strtod): improved conversion accuracy.
-
-Thu Apr 17 14:39:23 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/dbm/dbm.c (each_pair): add prototype to avoid VC++ warnings.
-
-	* ext/readline/readline.c (Init_readline): follow readline 4.2
-	  prototype.
-
-Thu Apr 17 14:22:36 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (cond0): warn only range literals whose both side are
-	  literals.  [ruby-core:00964]
-
-Thu Apr 17 11:10:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/readline/readline.c: add the defined operator for bcc32.
-
-Wed Apr 16 00:14:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-special-char-p): should test at the
-	  point if no argument.  fixed by Michael Scholz
-	  <scholz-micha@gmx.de>.
-
-Tue Apr 15 19:35:08 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: rm_r should raise Errno::ENOENT if file
-	  does not exist ([ruby-core:958]).  Thanks Johan Holmberg.
-
-Tue Apr 15 19:12:21 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* struct.c (rb_struct_hash): new methods Struct#hash, Struct#eql?.
-	  (ruby-bugs:PR#758)
-
-Tue Apr 15 16:05:11 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* numeric.c (rb_fix2str): buffer was insufficient.
-	  (ruby-bugs-ja:PR#431)
-
-Mon Apr 14 19:45:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (file_expand_path): root must follow buf when
-	  reallocated.  [ruby-talk:69339], [ruby-dev:20025]
-
-Mon Apr 14 03:22:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* rubyio.h (struct OpenFile): add noraise flag to finalizer.
-
-	* io.c (Init_IO): define $/, $-0, and $\ as string-only
-	  variables.
-
-	* string.c (rb_str_split_m): does not generate empty string if
-	  the receiver is empty.
-
-	* io.c (fptr_finalize): should raise error on EBADF for readable
-	  IOs as well.
-
-Mon Apr 14 15:54:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bignum.c (rb_cstr_to_inum, rb_big2str): allow 2-36 as radix.
-
-	* numeric.c (rb_fix2str): ditto.
-
-	* string.c (rb_str_to_i): ditto.
-
-Sun Apr 13 03:20:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (try_func): remove COMMON_HEADERS at first for
-	  performance.
-
-Sat Apr 12 20:59:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-beginning-of-arg): substitute
-	  ruby-backward-arg.
-
-	* misc/ruby-mode.el (ruby-calculate-indent): fixed wrong
-	  indentation in brace block and parentheses.
-
-	* misc/ruby-mode.el (ruby-forward-sexp, ruby-backward-sexp):
-	  support special char literal, and negative arguments.
-
-Sat Apr 12 17:52:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_stat): use rb_check_convert_type() to retrieve IO.
-
-Fri Apr 11 19:00:14 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* win32/win32.c (rb_w32_stat): check arguments.  [ruby-dev:20007]
-	  [ruby-win32:535]
-
-Fri Apr 11 15:56:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* numeric.c (coerce_rescue): prevent inspected String from GC.
-
-	* numeric.c (flo_eq, rb_dbl_cmp, flo_gt, flo_ge, flo_lt, flo_le,
-	  flo_eql): correct NaN comparison.  (ruby-bugs:PR#744)
-
-	* sample/test.rb: NaN comparison test.
-
-Fri Apr 11 14:48:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_stat): dereference using StringValuePtr().
-
-	* file.c (rb_file_s_stat): use rb_stat(). [ruby-dev:20007]
-
-Fri Apr 11 10:51:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/benchmark.rb (Benchmark::bm): get rid of warning.
-	  [ruby-talk:69124]
-
-Fri Apr 11 02:41:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (set_stdin): assigned value must respond to "read" and
-	  "getc".
-
-	* io.c (set_outfile): assigned value must respond to "write".
-	  (ruby-bugs-ja:PR#425)
-
-Thu Apr 10 21:12:19 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb: Exception line was accidentaly removed.
-	  [ruby-dev:19989]
-
-Thu Apr 10 18:42:13 2003  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* array.c (rb_ary_times): added some checks for request size.
-
-Thu Apr 10 03:22:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_mod_name): always return empty string for
-	  anonymous class/module.  (ruby-bugs-ja PR#424)
-
-	* config.sub: stop forcing addition of -gnu to -linux.
-
-	* variable.c (classname): refactoring.
-
-	* variable.c (rb_class_path): __tmp__classpath__ handling moved
-	  from classname().
-
-Thu Apr 10 01:52:24 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_obj_is_method): indefinite return value.
-
-Thu Apr 10 00:39:32 2003  Tanaka Akira  <akr@m17n.org>
-
-	* regex.c (re_compile_pattern): /[\--\-]/ was warned.  warn /]/.
-
-	* mkconfig.rb: escape `]' in regexp.
-
-Thu Apr 10 00:27:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* time.c (time_strftime): RSTRING(format)->ptr might become NULL.
-
-Wed Apr  9 23:54:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_obj_remove_instance_variable): better message.
-	  [ruby-talk:68987]
-
-	* variable.c (rb_mod_remove_const): ditto.
-
-	* object.c (rb_obj_ivar_get): ditto.
-
-	* object.c (rb_obj_ivar_set): ditto.
-
-	* parse.y (yylex): ditto.
-
-Wed Apr  9 21:51:20 2003  Dave Thomas  <Dave@Thomases.com>
-
-	* eval.c (rb_mod_define_method): Allow UnboundMethod as
-	  parameter.
-
-Wed Apr  9 18:30:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (top_include): include module to wrapper module if
-	  wrapper is present. experimental.  [ruby-list:37539]
-
-Wed Apr  9 17:24:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_mark_children): introduce this function again; this
-	  is required when stack was very tight. [ruby-talk:68916]
-
-Wed Apr  9 15:49:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bigdivmod): small typo.
-
-Wed Apr  9 15:35:04 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/readline/readline.c: include <unistd.h> only when
-	  HAVE_UNISTD_H is defined.
-
-Wed Apr  9 14:05:00 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* marshal.c (w_object): preserve extended module on struct.
-	  (ruby-bugs-ja:PR#422)
-
-Wed Apr  9 03:43:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (BIGZEROP): macro to determine if x is a bignum zero.
-
-Tue Apr  8 11:49:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (Init_Proc): make Method and UnboundMethod independent.
-	  They are like instance and its class. [ruby-core:00941]
-
-	* parse.y (yylex): disallow global variables like "$1ve".
-	  [ruby-core:00945]
-
-	* marshal.c (marshal_dump): Marshal.dump(0, false) should cause an
-	  error. (ruby-bugs-ja PR#421)
-
-	* regex.c (re_compile_pattern): warn if '-' is the edge of
-	  character range.
-
-Mon Apr  7 15:49:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): remove struct
-	  size check.  getnameinfo(3) can handle. [ruby-dev:19967]
-
-Mon Apr  7 01:33:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_read): do not call rb_sys_fail() when required data
-	  length is zero. (ruby-bugs-ja PR#420)
-
-	* eval.c (umethod_proc): should raise TypeError, instead of
-	  returning error causing Proc.  Following the principle of "fail
-	  early".  [ruby-core:00927]
-
-Sun Apr  6 18:29:21 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
-
-	* ext/zlib/zlib.c: the return value of GzipReader#getc must be
-	  unsigned.
-
-Sun Apr  6 00:35:37 2003  Tanaka Akira  <akr@m17n.org>
-
-	* sample/exyacc.rb: use Regexp in gsub!.
-
-Sat Apr  5 23:41:28 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): small but serious typo.
-
-Sat Apr  5 04:23:05 2003  Warren Brown  <wkb@airmail.net>
-
-	* sprintf.c (rb_f_sprintf): was decrementing width even if there
-	  is no sign character.
-
-Sat Apr  5 01:41:28 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (backtrace): skip internal allocator frame.
-	  (ruby-bugs-ja PR#416)
-
-Fri Apr  4 10:53:22 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (assign): should prepare mrhs by svalue_to_mrhs().
-
-Wed Apr  2 15:11:23 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* README.EXT, README.EXT.ja (3.3): clarified -1 as free for
-	  Data_Wrap_Struct().  [ruby-dev:19881]
-
-Mon Mar 31 11:11:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_missing): use "inspect" for T_OBJECT as well.
-
-Mon Mar 31 10:50:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (env_reject_bang): untaint key string.
-
-	* hash.c (env_delete_m): execute block only if deleting key does
-	  not exist.
-
-Sat Mar 29 17:54:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): do not call rb_str_buf_cat() with NULL ptr,
-	  which causes SEGV; jump to grow instead. [ruby-dev:19944]
-
-Sat Mar 29 15:19:48 2003  Tanaka Akira  <akr@m17n.org>
-
-	* instruby.rb, ext/extmk.rb, lib/benchmark.rb, lib/cgi.rb,
-	  lib/debug.rb, lib/getoptlong.rb, lib/optparse.rb, lib/time.rb,
-	  lib/date/format.rb, lib/irb/ruby-lex.rb lib/uri/common.rb: revert
-	  escape for `-' in character class.
-
-Sat Mar 29 09:48:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (avalue_to_svalue): use rb_check_array_type() again.
-	  Clarify how "to_ary" and "to_a" work. [ruby-talk:68155]
-
-	* eval.c (svalue_to_avalue): ditto.
-
-	* eval.c (svalue_to_mrhs): ditto.
-
-	* eval.c (rb_eval): unary splat to use to_a, but we need a hack to
-	  exclude Object#to_a until it's removed.
-
-	* object.c (rb_Array): check obj.respond_to?("to_a").  Currently
-	  all object respond_to "to_a", but Object#to_a will be removed.
-
-	* range.c (Init_Range): undefine to_ary.
-
-	* re.c (Init_Regexp): ditto.
-
-Sat Mar 29 09:47:52 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* MANIFEST (ext/aix_mksym.rb): remove obsolete file.
-
-Fri Mar 29 06:21:24 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
-
-	* ext/zlib: merge from rough.
-
-Fri Mar 28 19:33:39 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* variable.c (rb_class_path): hold temporary class path in a
-	  instance variable to get rid of GC.  [ruby-dev:19932]
-
-	* variable.c (classname): remove temporary class path when exact
-	  name found.
-
-Fri Mar 28 18:29:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): do not warn if "-" is at the top
-	  or last of character class.
-
-Thu Mar 27 12:10:15 2003  Tanaka Akira  <akr@m17n.org>
-
-	* regex.c (re_compile_pattern): fix [:name:] handling.
-	  /[\[:digit:]]/ was treated as /[[:digit:]]/.
-	  /[[:-@]/ was treated as /[\[:\-@]/.
-	  /[%-[:digit:]]/ was treated as /[%-\[:digit:]\]/.
-
-Thu Mar 27 03:26:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* string.c (rb_str_capitalize_bang): check length before upcase
-	  first character.  (ruby-bugs:PR#697)
-
-Wed Mar 26 20:25:10 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* dln.c (dln_find_1): break if path list end, even for too long
-	  path names.  (ruby-bugs-ja:PR#412)
-
-Wed Mar 26 13:19:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (avalue_splat): new function to do unary * (splat)
-	  operator.
-
-	* eval.c (avalue_to_svalue,svalue_to_avalue,svalue_to_mrhs): do
-	  not use implicit "to_ary" conversion.
-
-	* ext/curses/curses.c (GetWINDOW,GetMOUSE): add taint check.
-
-	* ext/curses/curses.c (curses_init_screen): ditto.
-
-	* ext/curses/curses.c (window_initialize): ditto.
-
-	* gc.c (os_each_obj): prohibit ObjectSpace#each_object in safe
-	  mode ($SAFE >= 4).
-
-Tue Mar 25 23:26:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (trap): return "DEFAULT" and "IGNORE" respectively for
-	  previous sighandler SIG_DFL and SIG_IGN. [ruby-talk:67860]
-
-Tue Mar 25 12:24:15 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): call avalue_to_mrhs() to assign block
-	  parameter |a|. [ruby-dev:19897]
-
-	* ruby.c (ruby_set_argv): freeze argument strings.
-
-Tue Mar 25 12:01:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_initialize): should check rb_secure(4).
-
-	* dir.c (dir_s_getwd): should check rb_secure(4).
-
-	* object.c (rb_obj_infect): function version of OBJ_INFECT().
-
-	* eval.c (rb_secure_update): new function to check object update.
-
-Tue Mar 25 10:18:05 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: should infect also return values of
-	  #inspect.
-
-	* ext/strscan/strscan.c: use snprintf() instead of sprintf().
-
-Mon Mar 24 16:55:04 2003  Takaaki Tateishi <ttate@ttsky.net>
-
-	* ext/dl/dl.c: added rb_secure(4). (Thanks to Minero Aoki)
-
-	* ext/dl/sym.c: ditto.
-
-	* ext/dl/ptr.c: ditto.
-
-Mon Mar 24 00:09:02 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (block_append): warn unused literal.
-
-Sun Mar 23 22:22:04 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/jcode.rb (tr!, delete!, szueeze!): add empty string checking.
-
-Sun Mar 23 19:54:53 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1.
-
-Sat Mar 22 15:50:29 2003  Tanaka Akira  <akr@m17n.org>
-
-	* time.c (make_time_t): try search_time_t if mktime/timegm is failed.
-
-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 /[\[\]]/ for readability.
-
-Sat Mar 22 12:44:15 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/date/format.rb, lib/uri/common.rb: escape `[', `]', `-' in
-	  character class in regexp to avoid warning.
-
-Sat Mar 22 07:39:32 2003  Ulf Betlehem  <flu@iki.fi>
-
-	* io.c (rb_io_fread): may lose data on nonblocking read.
-
-Fri Mar 21 23:40:41 2003  Tanaka Akira  <akr@m17n.org>
-
-	* regex.c (re_compile_pattern): fix previous change.
-
-	* instruby.rb, ext/extmk.rb, ext/tk/lib/tk.rb, lib/benchmark.rb,
-	  lib/cgi.rb, lib/debug.rb, lib/getoptlong.rb, lib/jcode.rb,
-	  lib/optparse.rb, lib/time.rb, lib/date/format.rb,
-	  lib/irb/ruby-lex.rb: escape `[', `]', `-' in character class in
-	  regexp to avoid warning.
-
-Fri Mar 21 23:23:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): give warning for unescaped square
-	  brackets and minus in character class. [ruby-dev:19868]
-
-Fri Mar 21 18:12:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (bmcall): missing type.
-
-Fri Mar 21 01:29:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): copy sign bits only if value is
-	  negative.
-
-	* missing.h: include <stdarg.h> or <varargs.h> if HAVE_VSNPRINTF
-	  is not defined.
-
-Thu Mar 20 18:31:37 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/optparse.rb (OptionParser#order!): follow recent change
-	  of proc argument.
-
-Thu Mar 20 16:12:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (flo_to_s): change format specifier to "%.15g" to
-	  avoid unnecessary 9s (e.g. 99.59999999999999). (ruby-bugs-ja PR#406)
-
-Thu Mar 20 16:03:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (stmt, primary): get rid of SEGV at empty or invalid
-	  condition.  (ruby-bugs-ja:PR#410)
-
-	* parse.y (cond_negative): negate condition node when NODE_NOT.
-
-Thu Mar 20 10:45:29 2003  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (bmcall): add volatile to avoid GC problem.
-
-Thu Mar 20 10:10:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (load_dyna): clear ruby_errinfo. (ruby-bugs-ja PR#409)
-
-Wed Mar 19 23:05:30 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
-	* lib/tracer.rb (trace_func): save and recover Thread.critical state.
-	  Fixed by Fukumoto Atsushi <fukumoto@imasy.or.jp> [ruby-dev:19830]
-
-Wed Mar 19 02:55:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (read_all): make str empty if given. (ruby-bugs-ja PR#408)
-
-	* io.c (io_read): ditto.
-
-	* io.c (rb_io_sysread): ditto.
-
-Tue Mar 18 18:24:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c: do not override min and max.
-
-Sun Mar 16 12:29:55 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (object_address_group): use to_s instead of name
-	  to get name of class.
-
-Fri Mar 14 08:53:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (remove_sign_bits): octal left most digit for negative
-	  numbers may be '3'. (ruby-bugs-ja PR#407)
-
-	* sprintf.c (rb_f_sprintf): should prefix sign bits if bignum is
-	  negative, using sign_bits().
-
-Wed Mar 12 16:48:19 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (prep_stdio): set binmode only if the file descriptor
-	  is not connected to a terminal on Cygwin.
-
-Wed Mar 12 11:23:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (avalue_to_mrhs): split argument passing and assignment
-	  conversion.
-
-	* eval.c (svalue_to_mrhs): ditto.
-
-	* eval.c (avalue_to_svalue): avalue_to_svalue([[1,2]]) should be
-	  [[1,2]], not [1,2] to wrap-around.
-
-Tue Mar 11 21:00:59 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: Digest string wrongly included '\n' when user
-	  name is too long (ruby-bugs-ja:PR#404).
-
-Tue Mar 11 20:07:01 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: speeding up by avoiding extra flush.
-	  (suggested by Brian Candler <B.Candler@pobox.com> [ruby-talk:66516])
-
-Tue Mar 11 04:30:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (massign): remove unnecessary array unpacking; it should
-	  be handled before massign() by svalue_to_mrhs().
-
-	* eval.c (svalue_to_mrhs): '*a = v' value conversion to avalue
-	  (i.e. [1] => [[1]], [1,2] => [1,2]).
-
-	* eval.c (rb_eval): use svalue_to_mrhs.
-
-	* eval.c (rb_yield_0): ditto.
-
-	* eval.c (proc_invoke): break from "Proc#yield" is legal.
-
-Mon Mar 10 23:19:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_find_file): need world writable directory check for
-	  relative paths too.
-
-Mon Mar 10 11:23:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_find_file): world writable directory check if
-	  $SAFE >= 1 (was $SAFE >= 2).
-
-Mon Mar 10 01:59:47 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb: do not dispatch LIST when a mailbox is empty.
-
-	* lib/net/pop.rb: merge the 'STAT' patch from Frank S.Fejes
-	  <frank@oopdreams.com>, with modifications (listed below).
-
-	* lib/net/pop.rb: new method Net::POP#mail_size.
-
-	* lib/net/pop.rb: new method Net::POP#bytes.
-
-	* lib/net/pop.rb: new method Net::POPCommand#stat.
-
-Sun Mar  9 19:30:25 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/fileutils.rb (mkdir, mkdir_p): revert.
-
-	* instruby.rb (umask): umask 0022, not 0.
-
-Sun Mar  9 17:09:40 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/fileutils.rb (mkdir, mkdir_p): set mode to 0755.
-
-	* Makefile.in (fake.rb): set ALT_SEPARATOR to the default value.
-
-Sat Mar  8 11:30:59 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (massign): fix a bug not to expand in assignment to sole
-	  lhs.  [ruby-dev:19766]
-
-Fri Mar  7 21:57:25 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (Kernel.pp): module function.
-	  (MatchData#pretty_print): new method.
-
-Fri Mar  7 20:27:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/tcltklib/extconf.rb (find_tcl, find_tk): return true if
-	  non-versioned found.  [ruby-dev:19759]
-
-Fri Mar  7 15:05:35 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/dbm/extconf.rb: add QDBM support.
-
-Fri Mar  7 12:59:39 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (massign): deal with sole lhs, assign rest args from
-	  converted array.  [ruby-dev:19751]
-
-Fri Mar  7 03:31:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (dsym): :"symbol string" style should not contain `\0'.
-
-	* process.c (proc_detach): new method Process.detach(pid) which
-	  create background watcher thread to issue waitpid. [new]
-
-	* process.c (rb_detach_process): utility function to detach
-	  process from C code.
-
-	* ext/pty/pty.c (pty_finalize_syswait): terminate watcher thread,
-	  and detach child process (by creating new idle waitpid watcher
-	  thread).
-
-	* ext/pty/pty.c (pty_syswait): may lost signal stopped child.
-
-Fri Mar  7 00:30:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/Win32API/Win32API.c: no longer use inline-asms.
-
-	* ext/Win32API/extconf.rb: no need to add gcc options.
-
-Thu Mar  6 13:02:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (reswords): fix reswords list.
-
-Wed Mar  5 12:13:21 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: better YACC support on HP-UX.
-
-Wed Mar  5 05:55:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cat): remove ptr NULL check and MEMZERO(). ptr
-	  must be non NULL.
-
-Tue Mar  4 23:12:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
-	  RUBY_EXPORT to export symbols.
-
-	* defines.h: use RUBY_EXTERN instead of EXTERN.
-
-	* intern.h, re.h, ruby.h, rubysig.h: ditto.
-
-	* win32/win32.h: remove EXTERN definition.
-
-Tue Mar  4 17:54:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_aref): raise TypeError if index is a symbol.
-	  [ruby-list:37217]
-
-	* array.c (rb_ary_aset): ditto.
-
-Tue Nov 13 14:39:11 2001  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* missing/strftime.c: HP-UX support.
-
-Tue Mar  4 15:08:08 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: better HP-UX support.
-
-	* missing/strftime.c: ditto.
-
-Tue Mar  4 10:11:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_popen): do not call rb_io_close() directly, call
-	  "close" method instead. [ruby-dev:19717]
-
-	* io.c (rb_io_s_open): ditto.
-
-	* hash.c (rb_any_hash): remove DEFER_INTS.  all do_hash() calls in
-	  st.c are at the top of functions.  No reentrant problem.
-
-Tue Mar  4 01:19:21 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/dl/MANIFEST: Exclude .cvsignore. [found by: eban]
-
-Tue Mar  4 01:17:08 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/Win32API/MANIFEST: Belatedly add lib/win32/registry.rb.
-	  [found by: eban]
-
-Tue Mar  4 00:33:04 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* MANIFEST: Belatedly add Test::Unit files.  D'oh!
-
-Sun Mar  2 09:51:47 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* marshal.c (w_nbyte): should output always via rb_io_write().
-
-	* marshal.c (dump_ensure): ditto.
-
-	* marshal.c (marshal_dump): should call "binmode" method, if it
-	  responds to.
-
-	* marshal.c (r_byte): should input always via "getc" method.
-
-	* marshal.c (r_bytes0): should input always via "read" method.
-
-	* marshal.c (marshal_load): need not to set up FILE* fp;
-
-Mon Mar  3 11:29:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): parse 'lhs = a rescue b' as 'lhs=(a rescue b)'.
-
-Mon Mar  3 02:53:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_fread): should not clearerr() if there's no filled
-	  buffer (i.e. rb_io_fread() returning zero).
-
-Mon Mar  3 01:42:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-expr-beg): escaped char syntax.
-
-	* misc/ruby-mode.el (ruby-parse-partial): ditto.
-
-	* misc/ruby-mode.el (ruby-parse-partial): no deep indent for
-	  block.
-
-	* misc/ruby-mode.el (ruby-backward-arg): skip arguments backward.
-
-	* misc/ruby-mode.el (ruby-calculate-indent): too deep indentation.
-
-Fri Feb 28 23:50:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (map_errno): map OS error to errno. [new]
-
-	* win32/win32.c (pipe_exec, CreateChild, poll_child_status, waitpid,
-	  kill, link, rb_w32_rename, unixtime_to_filetime, rb_w32_utime): use
-	  map_errno() instead of using GetLastError() directly.
-
-	* win32/win32.c (rb_w32_select, rb_w32_accept, rb_w32_bind,
-	  rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
-	  rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
-	  rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
-	  rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
-	  rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
-	  rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport,
-	  rb_w32_fclose, rb_w32_close): map winsock error to errno.
-
-Fri Feb 28 22:54:10 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* win32/win32.c (flock): supports larger files, and maps error
-	  code.
-
-	* win32/win32.c (rb_w32_asynchronize): returns errno from child
-	  thread.
-
-	* win32/win32.c (rb_w32_fclose, rb_w32_close): ensures unlocked.
-
-Wed Feb 26 17:38:16 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: replace Kernel.open as well.
-
-Tue Feb 25 23:03:08 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/debug.rb (DEBUGGER__::Context#debug_command): bp filename must
-	  be the basename of it.  [ruby-talk:65644]
-
-Mon Feb 24 17:49:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (yycompile): zero clear ruby_eval_tree_begin if
-	  compilation failed.
-
-Mon Feb 24 08:06:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_new): need no MEMZERO().
-
-Sun Feb 23 17:57:06 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/fileutils (fu_stream_blksize): wrong logical condition.
-	  (and -> or).
-
-Sat Feb 22 03:12:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_gt): use rb_num_coerce_cmp() instead of
-	  rb_num_coerce_bin.
-
-	* numeric.c (fix_ge, fix_lt, fix_le): ditto.
-
-	* numeric.c (flo_gt, flo_ge, flo_lt, flo_le): ditto.
-
-Sat Feb 22 02:45:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_create): may called from place higher than
-	  rb_gc_stack_start.
-
-	* gc.c (Init_stack): update rb_gc_stack_start if it is lower (or
-	  higher if stack grows down) than the previous value.
-
-Fri Feb 21 21:03:41 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: new method FileUtils#copy_stream.
-
-	* lib/fileutils.rb: new method FileUtils#compare_file.
-
-	* lib/fileutils.rb: new method FileUtils#compare_stream.
-
-	* lib/fileutils.rb: new method FileUtils#rmtree (alias of rm_rf).
-
-Fri Feb 21 17:19:27 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* eval.c (rb_f_require): do not need to abort if a DLEXT file
-	  is not found.
-
-Fri Feb 21 13:39:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cmp_m): should use LONG2NUM().
-
-Fri Feb 21 12:45:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cmp_m): two small bugs fixed.
-
-Fri Feb 21 08:03:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_mark): inline rb_gc_mark_children().
-
-	* gc.c (gc_sweep): new tactics to increase malloc_limit mildly.
-
-Fri Feb 21 05:16:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cmp_m): return nil if str2 does not respond to
-	  both "to_str" and "<=>".
-
-	* compar.c (cmp_gt): return nil if "<=>" returns nil (means
-	  incomparable).
-
-	* compar.c (cmp_ge, cmp_lt, cmp_le): ditto.
-
-	* compar.c (cmp_between): use RTEST(), since cmp_lt and cmp_gt may
-	  return nil.
-
-Thu Feb 20 19:05:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_start_0): main thread swapped by fork() may
-	  terminate rb_thread_start_0() successfully. call ruby_stop(0);
-	  this change was suggested by Rudi Cilibrasi
-	  <cilibrar@drachma.ugcs.caltech.edu>.
-
-Thu Feb 20 18:44:51 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (file_expand_path): fix wrong behavior for root file.
-	  expand_path("..", "//machine/share") => "//machine/share"
-	  expand_path("..", "c:/a") => "c:/"
-	  expand_path("..", "/a") => "/"
-
-Thu Feb 20 18:11:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (file_expand_path): should not upward beyond share name.
-
-Thu Feb 20 15:45:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* missing.h (strtoul): fix prototype of strtoul.
-
-Thu Feb 20 10:11:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (clhs): allow "Foo::Bar = x".
-
-Thu Feb 20 04:07:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (primary): "self[n]=x" can be legal even when "[]=" is
-	  private.  changes submitted in [ruby-talk:63982]
-
-	* parse.y (aryset): ditto.
-
-	* parse.y (attrset): "self.foo=x" can be legal even when "foo="
-	  is private.
-
-	* eval.c (is_defined): private "[]=" and "foo=" support.
-
-	* eval.c (rb_eval, assign): ditto.
-
-Thu Feb 20 03:58:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): "foo=" should not always be public.
-
-Thu Feb 20 01:23:59 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_restore_context): inhibit interrupts in
-	  critical section while context switching.  [ruby-talk:64785]
-
-Wed Feb 19 18:27:42 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* node.h (nd_cpath): nested class/module declaration.
-	  [EXPERIMENTAL]
-
-	* eval.c (rb_eval): ditto.
-
-	* gc.c (rb_gc_mark_children): ditto.
-
-	* parse.y (cpath): ditto.
-
-Tue Feb 18 21:39:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): should not report uninitialized warning by
-	  attribute reader method.
-
-	* variable.c (rb_attr_get): new function to get instance variable
-	  without uninitialized warning.
-
-	* io.c (argf_to_io): should prefetch argv.
-
-Tue Feb 18 00:13:50 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-comment-column): customize comment
-	  column.  [new]
-
-	* misc/ruby-mode.el (ruby-deep-indent-paren): deep indentation
-	  parentheses.  [new]
-
-	* misc/ruby-mode.el (ruby-expr-beg): fix for / after $?.
-
-	* misc/ruby-mode.el (ruby-parse-partial, ruby-calculate-indent):
-	  deep indentation support.
-
-	* misc/ruby-mode.el (ruby-forward-sexp, ruby-backward-sexp):
-	  move forward/backward across one balanced expression.  [new]
-
-	* misc/ruby-mode.el (ruby-indent-exp): indent balanced
-	  expression.  [new]
-
-	* misc/ruby-mode.el (ruby-electric-brace): indent before
-	  show matching parenthesis.  (contributed by NABEYA Kenichi)
-
-Mon Feb 17 14:36:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* win32/win32.c (rb_w32_opendir, rb_w32_utime): need parens.
-
-Mon Feb 17 14:13:25 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (link): implement with CreateHardLink().
-
-	* win32/win32.c, win32/win32.h (rb_w32_utime): enable utime() to
-	  directory if on NT. [new] (ruby-bugs-ja:PR#393)
-
-Mon Feb 17 13:28:51 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (file_expand_path): strip last slash when path is
-	  root.
-
-Sun Feb 16 19:22:31 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (file_expand_path): buffer might be reallocated while
-	  expanding default directory.
-
-	* file.c (file_expand_path): default directory was being
-	  ignored if path was full path with no drive letter, under
-	  DOSISH.
-
-Sun Feb 16 03:14:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (prep_stdio, Init_io): always set binmode on Cygwin.
-
-Sat Feb 15 01:01:45 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (file_expand_path): fix surplus path separators while
-	  expanding at root directory.  [ruby-dev:19572]
-
-Fri Feb 14 14:25:24 2003  akira yamada  <akira@arika.org>
-
-	* lib/uri/generic.rb, lib/uri/ldap.rb, lib/uri/mailto.ldap: all foo=()
-	  returns arguments passed by caller.
-
-	* lib/uri/generic.rb (Generic#to_str, Generic#to_s): removed to_str.
-	  Suggested by Tanaka Akira <akr@m17n.org> at [ruby-dev:19475].
-
-	* lib/uri/generic.rb (Generic#==): should not generate an URI object
-	  from argument. Suggested by Tanaka Akira <akr@m17n.org> at
-	  [ruby-dev:19475].
-
-Thu Feb 13 11:54:50 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ruby.c (ruby_init_loadpath): ensures buffer terminated
-	  before use strncpy().
-
-	* ruby.c (proc_options): avoid SEGV at -S with no arguments.
-	  script argument is in effect only when -e is not given.
-	  (ruby-bugs-ja:PR#391)
-
-Thu Feb 13 01:30:10 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_schedule): current thread may be dead when
-	  deadlock.  (ruby-bugs:PR#588)
-
-Thu Feb 13 00:28:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): step might be float 0 < x < 1.
-
-	* eval.c (rb_thread_schedule): pause if no runnable thread when
-	  there's only one thread.
-
-Thu Feb 13 00:09:47 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (strrdirsep): ignore trailing directory separators.
-
-	* file.c (rb_file_s_expand_path): File.expand_path(".","/") should
-	  return "/".  (ruby-bugs-ja:PR#389)
-
-	* file.c (rb_file_s_basename): also ignore trailing directory
-	  separators, in compliance with SUSv3.  (ruby-bugs-ja:PR#390)
-
-	* file.c (rb_file_s_dirname, rb_file_s_extname): ditto.
-
-	* file.c (rb_file_s_dirname): append "." if drive only.
-
-	* file.c (rb_file_s_split): get rid of converting twice.
-
-Mon Feb 10 20:55:15 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb (parse_args): add '-n' to $mflags BEFORE "--".
-	  do not add DESTDIR if already included in $mflags.
-
-Mon Feb 10 19:54:30 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (FileUtils#uptodate?): use mtime for
-	  comparison.
-
-Mon Feb 10 10:14:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_to_a): return value should be an Array if the
-	  receiver is an instance of subclass of Array.
-
-	* string.c (rb_str_to_s): return value should be a String if the
-	  receiver is an instance of subclass of String.
-
-Mon Feb 10 03:33:42 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (rb_file_sysopen): rb_file_sysopen_internal() needs four
-	  arguments.
-
-Sun Feb  9 15:16:04 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* intern.h (HAVE_RB_DEFINE_ALLOC_FUNC, RB_CVAR_SET_4ARGS):
-	  define to 1.
-
-	* ruby.h (NORETURN_STYLE_NEW): ditto.
-
-Sun Feb  9 12:28:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb (init_mkmf): add libdir to LIBPATH unless cross
-	  compiling.
-
-Sun Feb  9 08:34:45 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: 4xx raises Net::ProtoServerError, 5xx raises
-	  Net::ProtoFatalError (for backward compatibility).
-
-Sun Feb  9 07:07:26 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: new method FileUtils.pwd (really).
-
-	* lib/fileutils.rb: FileUtils.pwd, cmp, identical?, uptodate? does
-	  not accept any option.
-
-Sat Feb  8 18:35:30 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-forward-string): fixed void variable
-	  error.
-
-Sat Feb  8 16:23:11 2003  NABEYA Kenichi  <kenichi@nabeya.com>
-
-	* misc/ruby-mode.el (ruby-font-lock-keywords): method name can
-	  be delimited by tab.
-
-Sat Feb  8 03:57:32 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/irb/workspace.rb, lib/irb/ext/math-mode.rb,
-	  lib/irb/ext/multi-irb.rb, lib/irb/lc/error.rb,
-	  lib/irb/lc/help-message, lib/irb/lc/ja/error.rb,
-	  lib/shell/command-processor.rb, lib/shell/error.rb,
-	  lib/shell/filter.rb: Fix typos and grammos. [approved by: keiju]
-
-Sat Feb  8 03:34:28 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* intern.h (HAVE_RB_DEFINE_ALLOC_FUNC): New boolean macro to make
-	  it easier to write extensions that work with both ~1.6 and 1.8~.
-
-	* intern.h (RB_CVAR_SET_4ARGS): Ditto.
-
-	* ruby.h (NORETURN_STYLE_NEW): Ditto.
-
-Sat Feb  8 00:47:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call): calls method_missing when superclass method
-	  does not exist.
-
-	* eval.c (rb_f_missing): now handles "no super" case.
-
-	* object.c (rb_obj_ivar_get): Object#instance_variable_get: new
-	  method to get instance variable value without eval(). [new]
-
-	* object.c (rb_obj_ivar_set): Object#instance_variable_set: new
-	  method to set instance variable value without eval(). [new]
-
-Fri Feb  7 15:35:21 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* intern.h, re.c (rb_memsearch): returns long.
-
-	* string.c (rb_str_index): should return offset position.
-
-Fri Feb  7 15:30:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (proc_invoke): should propagate self to super
-	  methods.  [ruby-dev:19510]
-
-Thu Feb  6 19:04:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize_m): should not preset "kcode" unless
-	  encoding is explicitly specified.
-
-Thu Feb  6 19:01:32 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: new method FileUtils.pwd.
-
-	* lib/fileutils.rb: default label is ''.
-
-	* lib/fileutils.rb: using module_eval again, to avoid ruby's bug.
-
-	* lib/fileutils.rb: fix wrong examples in rdoc.
-
-Thu Feb  6 17:43:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/complex.rb (Complex#==): should not raise error by type
-	  mismatch.
-
-	* lib/rational.rb (Rational#==): ditto.
-
-Thu Feb  6 11:44:40 2003  MoonWolf  <moonwolf@moonwolf.com>
-
-	* re.c (rb_reg_initialize_m): 3rd argument was ignored.
-
-Thu Feb  6 01:09:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_count): return 0 for empty string (was
-	  returning nil).
-
-Wed Feb  5 19:41:37 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: dispatch code restructured to make it openable
-	  that has `open' method.
-
-	* lib/open-uri.rb: Location: field may has a relative URI.
-	  pointed out by erik eriksson <ee@opera.com>.
-
-Wed Feb  5 17:11:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): no .<digit> float literal anymore.
-
-Tue Feb  4 16:11:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_equal): a == b is true when b is non T_ARRAY
-	  object, if b has "to_ary" and b == a.
-
-	* hash.c (rb_hash_equal): a == b is true when b is non T_HASH
-	  object, if b has "to_hash" and b == a.
-
-	* string.c (rb_str_equal): a == b is true when b is non T_STRING
-	  object, if b has "to_str" and b == a.
-
-Mon Feb  3 23:46:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_getline): should not increment lineno at EOF.
-
-Mon Feb  3 16:49:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): default Object#=== now calls "=="
-	  internally.
-
-	* re.c (rb_reg_initialize_m): should honor option status of
-	  original regexp.
-
-	* array.c (rb_ary_equal): ary2 should be T_ARRAY (no to_ary
-	  conversion).
-
-	* array.c (rb_ary_eql): ditto.
-
-	* string.c (rb_str_equal): str2 should be T_STRING (no to_str
-	  conversion).
-
-Mon Feb  3 16:32:52 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* re.c (rb_memsearch): a little improvement.
-
-Mon Feb  3 13:18:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_memsearch): algorithm body of String#index.
-
-	* error.c (Init_Exception): "to_str" removed.
-
-	* eval.c (eval): should not rely on Exception#to_str
-
-	* eval.c (compile_error): ditto.
-
-	* error.c (err_append): ditto.
-
-Sat Feb  1 23:56:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_merge): Hash#merge, non destructive "update".
-	  now there's also Hash#merge! which is an alias to "update".
-
-Fri Jan 31 14:16:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_index): search using Karp-Rabin algorithm.
-
-Fri Jan 31 12:45:11 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_obj_classname): new function.
-
-	* string.c (rb_str_dup): should preserve original's class (but not
-	  hidden singleton class).
-
-	* string.c (rb_str_substr): ditto.
-
-	* parse.y: backout EXPR_CMDARG removal.
-
-Fri Jan 31 09:40:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/optparse.rb (OptionParser::List::accept): default
-	  pattern must not be nil.
-
-	* lib/optparse.rb (OptionParser::make_switch): NoArgument doesn't
-	  override other styles.
-
-Thu Jan 30 16:46:43 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/optparse.rb (OptionParser::Switch::PlacedArgument): added.
-	  if the next argument doesn't start with '-', use it as the
-	  value.
-
-	* lib/optparse.rb (OptionParser::make_switch): fixed a bug of
-	  pattern.
-
-	* lib/optparse.rb (Array): no need to guard.
-
-Thu Jan 30 08:27:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (rb_file_s_expand_path): removed a sludge.
-
-Wed Jan 29 03:24:39 2003  Michal Rokos  <michal@rokos.homeip.net>
-
-	* dir.c (glob_helper): memory leak fixed.
-
-Tue Jan 28 04:45:03 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* instruby.rb (parse_args), ext/extmk.rb (parse_args): Prepend a
-	  hyphen to the first argument of MAKEFLAGS only if appropriate.
-	  Remove wrong comments.
-
-Mon Jan 27 03:30:06 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* error.c (get_syserror): use snprintf() instead of sprintf(). pointed
-	  out by knu.
-
-Mon Jan 27 02:06:38 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* error.c (get_syserror): some Windows' errno have 5 digits. pointed
-	  out by znz.
-
-Sun Jan 26 19:23:10 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* instruby.rb ($mflags.set?): Check $make instead of $nmake, since
-	  there is no such a variable.
-
-	* instruby.rb ($mflags.set?), ext/extmk.rb ($mflags.set?): Return
-	  false if unmatched.
-
-Sun Jan 26 19:08:30 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/shellwords.rb: Embed rdoc style comments.
-
-	* lib/shellwords.rb (shellwords): Use String#lstrip!.
-
-	* lib/shellwords.rb (shellwords): Recognize an object that
-	  responds to to_str() by using String.new().
-
-Sun Jan 26 17:53:04 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* instruby.rb (parse_args), ext/extmk.rb (parse_args): Detect -n
-	  and emulate a dry run.  Use 'make' in case no --make argument is
-	  given.
-
-Sun Jan 26 07:18:42 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* instruby.rb: re-define individual methods verbosely rather than
-	  including FileUtils::Verbose, in order to suppress messages from
-	  FileUtils#cmp.
-
-	* instruby.rb (makedirs): make same directory only once even if
-	  dryrun.
-
-	* lib/fileutils.rb (FileUtils::Verbose, FileUtils::NoWrite):
-	  re-define methods with define_method instead of module_eval.
-
-Sun Jan 26 03:37:18 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* instruby.rb, ext/extmk.rb, Makefile.in, win32/Makefile.sub,
-	  bcc32/Makefile.sub: Replace the complicated MFLAGS/MAKEFLAGS
-	  parser with something plain and comprehensible.  This fixes a
-	  bug where make flags were wrongly reordered and the resulted
-	  command line often did not make sense especially when BSD make
-	  is used with extra arguments given.  Tested with FreeBSD and
-	  Linux by me and mswin32, bccwin32 and mingw by usa.
-
-Fri Jan 24 18:15:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: tMINUS should have lower precedence than tPOW.
-
-Fri Jan 24 05:12:55 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): deal
-	  with escaped $ and ? at the end of strings.  [ruby-talk:62297]
-
-	* misc/ruby-mode.el (ruby-font-lock-keywords): added defined?.
-
-Thu Jan 23 17:25:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): do not warn discarding already undefined
-	  method.
-
-	* lib/rational.rb: undef quo before replacing.
-
-Thu Jan 23 15:49:57 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (arg): missing arguments.
-
-Thu Jan 23 14:56:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rational.rb: modified to support "quo".
-
-	* numeric.c (num_quo): should return most exact quotient value,
-	  i.e. float by default, rational if available.
-
-	* numeric.c (num_div): "div" should return x.divmod(x)[0].
-
-Thu Jan 23 13:24:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_arg): was accessing garbage argv value.
-
-Thu Jan 23 06:37:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* instruby.rb: should not contain destdir in shebang line.
-
-Wed Jan 22 23:19:57 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (pipe_exec): remove unnecessary SetStdHandle().
-
-Wed Jan 22 20:20:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): syntaxify tPOW negative number hack.
-
-	* parse.y (negate_lit): new function to negate literal numeric
-	  values in compile time.
-
-Wed Jan 22 15:36:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_match_exec): charset info may be stored in MBC
-	  region when $KCODE != NONE.
-
-Wed Jan 22 14:22:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (set_syserr): should preserve duplicated error names.
-
-Tue Jan 21 20:29:31 2003  Michal Rokos  <michal@rokos.homeip.net>
-
-	* mkmf.rb: make possible to add files to clean and distclean targets
-
-Tue Jan 21 18:05:25 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bcc32/Makefile.sub (LIBRUBY_A): link dmyext.
-
-Tue Jan 21 16:59:18 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* instruby.rb: use real interpreter pathname at shebang line.
-	  [ruby-dev:19370]
-
-Tue Jan 21 16:22:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): put back old ** behavior for negative number
-	  right operand.
-
-Tue Jan 21 14:46:12 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb: Use Test::Unit.
-
-	* lib/prettyprint.rb: Ditto
-
-	* lib/time.rb: Ditto
-
-	* lib/tsort.rb: Ditto
-
-Tue Jan 21 04:15:50 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb: Use redefined `to_s' as well as `inspect'.
-	  Useless `pretty_print' methods removed.
-	  (PP::ObjectMixin#pretty_print_inspect): new method.
-
-Mon Jan 20 21:48:43 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in (MANTYPE): Detect if the system's nroff(1) groks
-	  mdoc.  Provide a new option --with-mantype={doc|man} in case the
-	  check does not work as expected.
-
-	* Makefile.in (MANTYPE): Define MANTYPE and pass it to
-	  instruby.rb.
-
-	* instruby.rb: Convert mdoc manpages to man for systems which
-	  nroff(1) does not grok mdoc.
-
-Mon Jan 20 21:25:18 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/tempfile.rb (self.open): If a block is given, call it with
-	  tempfile as an argument and automatically close the tempfile
-	  when the block terminates.
-
-Mon Jan 20 21:02:50 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* mdoc2man.rb: Properly put nested braces, parentheses and angles.
-
-	* mdoc2man.rb: Add support for .An and .Aq/.Ao/.Ac.
-
-	* mdoc2man.rb: Add support for .Dl.
-
-	* mdoc2man.rb: Make .Pf macro actually work.
-
-	* mdoc2man.rb: Properly handle .Os.
-
-	* mdoc2man.rb: Correctly omit spaces around punctuation
-	  characters.
-
-Mon Jan 20 19:43:41 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* mdoc2man.rb: Make this work as a library.
-
-Mon Jan 20 18:22:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_f_require): purge too many goto's.
-
-Mon Jan 20 17:50:05 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* mdoc2man.rb (parse_macro): Understand .Ux.
-
-Mon Jan 20 17:32:56 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* mdoc2man.rb: New file.  A mdoc to man converter ported from
-	  Perl.
-
-Mon Jan 20 15:40:15 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ruby.1: Properly close .Bl with .El.
-
-Mon Jan 20 04:14:17 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb (egrep_cpp): use inspect to show options.
-
-	* lib/mkmf.rb (dir_config): prior configured directories to
-	  defaults.
-
-	* lib/mkmf.rb (dir_config): extract first word to determine
-	  make command type.
-
-Mon Jan 20 02:15:53 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/aix_mksym.rb: no longer used.
-
-Mon Jan 20 00:17:16 2003  Matt Armstrong  <matt@lickey.com>
-
-	* file.c (eaccess): under windows, make eaccess() just call
-	  access(). [ruby-core:716], [ruby-bugs:PR#556]
-
-Sun Jan 19 23:08:18 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/shellwords.rb (shellwords): A backslash ('\') in single
-	  quotes should not be regarded as meta character.  This bug or
-	  maybe feature was inherited from Perl's shellwords.pl.
-
-Sun Jan 19 14:01:12 2003  UENO Katsuhiro  <unnie@blue.sky.or.jp>
-
-	* regex.c (is_in_list): should work well with UTF-8.
-
-	* regex.c (re_match_exec): ditto.
-
-Sat Jan 18 14:53:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bignum.c (rb_cstr_to_inum): should not erase all 0s, but
-	  squeeze into one.  [ruby-dev:19377]
-
-Fri Jan 17 03:33:42 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* sprintf.c (rb_f_sprintf): Fix a bug caused by an uninitialized
-	  variable v, that a bignum unexpectedly gets converted into a
-	  string with its higher figures all filled with ./f/7/1,
-	  depending on the base.  This bug seems to have been introduced
-	  in rev.1.27.
-
-	* sprintf.c (rb_f_sprintf): Use switch instead of a sequence of
-	  else-if's.
-
-Wed Jan 15 15:18:38 2003  moumar  <moumar@netcourrier.com>
-
-	* configure.in (ARCHFILE): set even unless --enable-shared on
-	  AIX.  [ruby-talk:61466]
-
-	* marshal.c (math.h): should be included after ruby.h on AIX.
-	  [ruby-talk:61366]
-
-Tue Jan 14 21:47:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_f_require): do not search adding .rb/.so suffixes if
-	  the suffix specified.  [ruby-dev:18702]
-	  http://moonrock.jp/~don/d/200211.html#d08_t1
-
-Tue Jan 14 18:36:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_all): now works without block.
-
-	* enum.c (enum_any): ditto.
-
-Tue Jan 14 01:21:32 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (next_argv): not always set binmode.
-
-Mon Jan 13 20:45:19 2003  Guy Decoux  <ts@moulon.inra.fr>
-
-	* parse.y (list_append): avoid O(n) search using node->nd_next->nd_end.
-
-	* parse.y (list_concat): ditto.
-
-	* eval.c (rb_eval): NODE_ARRY nd_end adoption.
-
-Mon Jan 13 02:22:11 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/dl/lib/dl/win32.rb: eliminate unnecessary "A" adding.
-
-Sun Jan 12 16:07:17 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (next_argv): inherit binmode from $defout.
-
-Sat Jan 11 22:50:47 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/dl/lib/dl/win32.rb: compatibility improvement.
-
-Sat Jan 11 01:44:16 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (RUBY_CHECK_IO_NEED): added more tests.
-
-	* io.c (rb_io_check_readable): seek after synchronized write.
-
-Fri Jan 10 01:23:45 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): syntax
-	  classes are not allowed inside character classes.
-	  [ruby-talk:60996]
-
-Thu Jan  9 23:28:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in: AC_MSG_FAILURE is a new macro in 2.54b or later.
-
-Thu Jan  9 17:05:24 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (RUBY_CHECK_IO_NEED): check whether fseek() and
-	  fflush() are needed.
-
-	* io.c (flush_before_seek): flush write stream only.
-
-	* io.c (rb_io_check_readable): seek instead of flush if the last
-	  operation was write.
-
-	* io.c (rb_io_check_writable): seek instead of flush if the last
-	  operation was read.
-
-	* bcc32/Makefile.sub, win32/Makefile.sub: needs to seek between
-	  R/W.
-
-Thu Jan  9 16:31:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should not discard nested NODE_BLOCK.
-
-Thu Jan  9 15:12:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (stmt): NODE_NOT elimination for if/unless/while/until node.
-
-	* parse.y (primary): ditto.
-
-Thu Jan  9 13:26:18 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* st.h, st.c: Back out the introduction of st_*_func_t.  Some
-	  compilers complain about function type mismatch.
-
-Thu Jan  9 02:10:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): reduce recursive rb_eval() call by using sort
-	  of continuation passing style.
-
-Wed Jan  8 17:10:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/Win32API/lib/win32/registry.rb: added. [new]
-
-Wed Jan  8 15:54:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: remove ruby_last_node and assignments seems to be
-	  unnecessary
-
-	* intern.h: debug does not run if ID_ALLOCATOR is zero.
-
-Wed Jan  8 15:04:11 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_each): treat fixnums specially to boost.
-
-	* numeric.c (num_step): remove rb_scan_args() for small speedup.
-
-Tue Jan  7 17:56:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (svalue_to_avalue): should return converted array.
-
-Tue Jan  7 07:48:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_f_local_variables): skip $_, $~ and flip states in
-	  dynamic variables.  [ruby-core:00681]
-
-Tue Jan  7 02:46:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (env_clear): new Hash compatible method.
-
-	* hash.c (env_shift, env_invert, env_replace, env_update): ditto.
-
-Mon Jan  6 23:36:29 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* st.h, st.c: Introduce new conventional typedef's, st_data_t,
-	  st_compare_func_t, st_hash_func_t and st_each_func_t.
-
-	* st.h, st.c: Do explicit function declarations and do not rely on
-	  implicit declarations.
-
-	* class.c, eval.c, gc.c, hash.c, marshal.c, parse.y, variable.c:
-	  Add proper casts to avoid warnings.
-
-Mon Jan  6 20:44:43 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* intern.h (rb_check_array_type): Declare rb_check_array_type().
-
-	* ext/digest/md5/md5ossl.c: Include stdio.h for sprintf() and
-	  string.h for memcmp().
-
-	* ext/dl/ptr.c: Include ctype.h for isdigit().
-
-Mon Jan  6 18:43:17 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* file.c: improve DOSISH drive letter support.
-
-Mon Jan  6 18:31:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/fileutils.rb (ln): add ' -f' in the verbose message.
-
-	* lib/fileutils.rb (cp_r): add 'p' in the verbose message.
-
-Mon Jan  6 16:44:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_join): dispatch based on "to_str".
-
-	* array.c (rb_ary_times, rb_ary_equal): ditto.
-
-Mon Jan  6 13:26:35 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* process.c (proc_exec_v): follow to proc_spawn_v(). call do_aspawn()
-	  on Win32.
-
-	* process.c (rb_proc_exec): call do_spawn() on Win32.
-
-	* win32/win32.c, win32/win32.h (do_spawn, do_aspawn): add mode flag.
-
-	* process.c (proc_spawn_v, rb_f_system): follow above change.
-
-Mon Jan  6 05:11:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/extmk.rb: make $0 normal variable.
-
-Mon Jan  6 02:32:46 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* struct.c (make_struct): needs meta class.
-
-Sun Jan  5 22:54:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/fileutils.rb (ln): `argv' is not a argument.
-
-Sun Jan  5 17:44:37 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/extmk.rb (extmake): set $0 temporarily while loading
-	  extconf.rb.
-
-Sun Jan  5 14:46:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* instruby.rb: need paren in regexp(make -n install).
-
-	* ext/extmk.rb (sysquote): do not need to quote on mswin/bccwin/mingw.
-
-	* ext/extmk.rb ($mflags): uniq items and remove '-' and '--'.
-	  move options to the lead.
-
-	* lib/fileutils.rb (install): model on the real install
-	  command(message).
-
-Sun Jan  5 09:36:46 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ruby.c (ruby_init_loadpath): under Windows, get the module
-	  path from an internal address instead of hard coded library
-	  name.
-
-	* cygwin/GNUmakefile.in, bcc32/Makefile.sub,
-	  win32/Makefile.sub (CPPFLAGS): removed LIBRUBY_SO macro.
-
-	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): no longer
-	  depends on makefiles.
-
-Sun Jan  5 04:17:05 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* gc.c (SET_STACK_END): Issue a FLUSH_REGISTER_WINDOWS here too.
-	  This fixes make test on FreeBSD/sparc64.
-
-Sun Jan  5 03:43:47 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* defines.h (FLUSH_REGISTER_WINDOWS): Make the flushw call an
-	  inline function so it can be used as an expression.
-
-	* eval.c (EXEC_TAG, THREAD_SAVE_CONTEXT): Consistently call
-	  FLUSH_REGISTER_WINDOWS before calling setjmp(). (I suspect that
-	  every setjmp() implementation should take care of register
-	  windows, though)
-
-Sun Jan  5 03:12:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* file.c (utimbuf): use utimbuf instead of _utimbuf if defined _WIN32.
-
-	* win32/Makefile.sub (LIBS): use oldnames.lib.
-
-	* win32/win32.c (rb_w32_getcwd): follow above change.
-
-	* win32/win32.h: ditto.
-
-	* wince/direct.c, wince/direct.h (getcwd): ditto.
-
-	* wince/io.h: ditto.
-
-	* wince/string.c, wince/wince.h (stricmp, strnicmp): ditto.
-
-Sat Jan  4 15:18:50 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* process.c (rb_proc_exec): use same logic as DJGPP on win32 ports.
-
-	* process.c (rb_f_system): ditto.
-
-	* win32/win32.c, win32/win32.h (do_aspawn): [new]. for arrayed
-	  arguments.
-
-	* win32/win32.c (CreateChild): add new argument for real filename of
-	  executing process.
-
-	* win32/win32.c (NtHasRedirection, pipe_exec): follow above change.
-
-Sat Jan  4 14:29:52 2003  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* configure.in: set rb_cv_need_io_flush_between_seek=yes.
-
-	* win32/Makefile.sub (config.h): define NEED_IO_FLUSH_BETWEE_SEEK.
-	  (pointed out by moriq [ruby-dev:19299])
-
-Sat Jan  4 03:12:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (umethod_bind): exact class match is not required.  relax
-	  the restriction to subclasses.
-
-Sat Jan  4 01:33:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (rb_file_s_lchmod): get rid of gcc-3 -O3 warning.
-
-Fri Jan  3 22:26:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* process.c (rb_proc_times): need to initialize first.
-
-Fri Jan  3 01:10:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): call "inherited" before executing class body.
-
-	* class.c (rb_define_class): call "inherited" after defining the
-	  constant.
-
-	* class.c (rb_define_class_under): ditto.
-
-Thu Jan  2 19:37:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (massign): expand first element if RHS is an array and
-	  its size is 1, and LHS has concrete assignment target (i.e. LHS
-	  has target(s) other than *var).
-
-	* eval.c (massign): avoid unnecessary avalue/svalue conversion.
-
-	* eval.c (rb_yield_0): ditto
-
-	* array.c (rb_ary_update): do not allocate unused array if rpl is
-	  nil (i.e. merely removing elements).
-
-Thu Jan  2 13:55:08 2003  Mathieu Bouchard  <matju@sympatico.ca>
-
-	* io.c (io_read): should resize supplied string if it's shorter
-	  than expected.
-
-Thu Jan  2 11:01:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (bmcall): arguments should be an array.
-
-Wed Jan  1 18:18:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: better DJGPP support. add GNUmakefile.
-
-	* djgpp/GNUmakefile: new.
-
-Wed Jan  1 04:16:18 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* node.h (struct RNode): Change argc from int to long.  Otherwise
-	  NEW_CFUNC() sets argc to a wrong value on platforms where
-	  sizeof(int) != sizeof(long) and the byte order is big-endian.
-	  This fixes breakage on FreeBSD/sparc64.
-
-Tue Dec 31 23:22:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (massign): removed awkward conversion between yvalue,
-	  mvalue, etc.
-
-	* eval.c (rb_yield_0): new parameter added to tell whether val is
-	  an array value or not.
-
-	* parse.y (yield_args): restructuring: new nodes: NODE_RESTARY2,
-	  NODE_SVALUE; removed node: NODE_RESTARGS.
-
-Tue Dec 31 21:13:51 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* Makefile.in, {win32,bcc32}/Makefile.sub: add new target:
-	  what-where, no-install.
-
-	* mkconfig.rb: add const: CROSS_COMPILING.
-
-	* ext/extmk.rb: no-install support.  add MAKEDIRS macro.
-
-	* lib/mkmf.rb: add !ifdef .. !endif for Borland make.
-
-	* process.c: improve DJGPP support.  system "ls", "-l".
-
-Tue Dec 31 20:16:37 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/socket/addrinfo.h (NI_MAXHOST): Define NI_MAXHOST and
-	  NI_MAXSERV only if they are not defined yet.  This fixes build
-	  on such platforms as OpenBSD.
-
-Tue Dec 31 20:07:49 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/tcltklib/extconf.rb (find_tcl, find_tk): Look for both
-	  lib{tcl,tk}M.N and lib{tcl,tk}MN on all platforms.  *BSD have
-	  Tcl/Tk libraries named this way.
-
-Tue Dec 31 19:48:21 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in: Improve OpenBSD support. [obtained from: OpenBSD
-	  ports]
-
-	* dln.c (FUNCNAME_PATTERN): Ditto.
-
-Tue Dec 31 19:21:02 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_transpose): Properly declare ary as a VALUE.
-
-	* file.c (rb_file_s_chmod): Do not directly cast an int to void *
-	  to avoid a warning.
-
-	* defines.h (FLUSH_REGISTER_WINDOWS): Add support for
-	  FreeBSD/sparc64.  miniruby still coredumps in a different place,
-	  though.
-
-Tue Dec 31 07:47:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (parse_string): readjusted.
-
-	* parse.y (heredoc_identifier): readjusted.
-
-	* parse.y (here_document): make EOL codes of single-quoted
-	  here-documents consistent.
-
-	* parse.y (yylex): reduced unnecessary conditionals.
-
-Tue Dec 31 04:49:51 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ruby.1: mdoc'ify.
-
-Tue Dec 31 01:30:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* parse.y (yylex): do not accept " __END__\n".  ([ruby-dev:19245])
-
-Mon Dec 30 21:10:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* parse.y (yylex): use strncmp instead of strcmp.
-	  accept "__END__\r\n".  ([ruby-dev:19241])
-
-Mon Dec 30 20:32:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_mark_frame): should mark frame->node.
-
-Mon Dec 30 19:10:30 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/extmk.rb: split --make argument contains options, assume
-	  the first word of --make-flags is always options even unless
-	  preceded by -, and ignore letter-case of options if nmake.
-
-	* instruby.rb: extract -n option also from --make and
-	  --make-flags.
-
-	* bcc32/Makefile.sub, win32/Makefile.sub: not prepend - to
-	  $(MFLAGS)
-
-Mon Dec 30 16:44:14 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* string.c (rb_str_substr): should share the shared string if
-	  present, instead of the original string.  (ruby-bugs:PR#528)
-
-Mon Dec 30 05:10:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/socket/socket.c (tcp_svr_init): local host to
-	  init_inetsock() is VALUE but not pointer.
-
-	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): get rid of
-	  gcc-3 -O3 warning.
-
-Sun Dec 29 23:45:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* gc.c (gc_sweep): adjust GC trigger.
-
-	* dln.c (init_funcname_len): get rid of gcc-3 -O3 warning.
-
-	* eval.c (copy_node_scope): ditto.
-
-	* hash.c (rb_hash_foreach, delete_if_i, select_i, each_value_i,
-	  each_key_i, each_pair_i, envix): ditto.
-
-	* range.c (range_each_func): ditto.
-
-	* file.c (rb_file_s_chmod): ditto.
-
-Sun Dec 29 15:30:37 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (fu_parseargs): should not inherit ftools.rb's
-	  misfeature.
-
-Sun Dec 29 05:08:13 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* lib/fileutils.rb (cmp): return false if file size differs.
-
-Sat Dec 28 19:21:24 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* instruby.rb: remove junk args.
-
-	* lib/mkmf.rb (create_makefile): remove a trouble library
-	  before making a shared library.
-
-	* win32/Makefile.sub: invoke instruby.rb with the --make-flags option.
-
-Sat Dec 28 03:09:58 2002  Wakou Aoyama  <wakou@ruby-lang.org>
-
-	* lib/cgi.rb (CGI#[]): improvement. thanks to Kazuhiro NISHIYAMA
-	  <zn@mbf.nifty.com>
-
-Sat Dec 28 00:34:03 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* {win32,bcc32}/Makefile.sub: remove `=' from --make-flags options.
-	  nmake quotes args if included `=' in args.
-
-	* instruby.rb: use getopts.rb.
-
-	* ext/dbm/extconf.rb (-DDBM_HDR): substitute ' with " to avoid
-	  a error on Win32.
-
-	* ext/gdbm/gdbm.c: add prototypes to avoid VC++ warnings.
-
-Fri Dec 27 21:41:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bcc32/setup.mak, win32/setup.mak(-prologue-): move srcdir from
-	  CPP input or UNC path will be removed as a comment.
-
-Fri Dec 27 17:55:00 2002  Takaaki Uematsu  <mail@uema2.cjb.net>
-
-	* wince/config, wince/configure.bat: replace 1.7 with 1.8
-	  in macros.
-
-Fri Dec 27 13:28:14 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* instruby.rb: fileutils.rb accepts only one argument.
-
-Fri Dec 27 13:23:29 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (fu_parseargs): reject illegal options
-	  correctly.
-
-	* lib/fileutils.rb (uptodate?): parameter declaration was wrong.
-
-	* lib/fileutils.rb: change coding styles.
-
-Fri Dec 27 09:25:22 2002  ABE Shigeru  <shiger-a@nifty.com>
-
-	* process.c (rb_proc_times): avoid WindowsXP crash using volatile
-	  variables.
-
-Fri Dec 27 02:56:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* instruby.rb: check only `-' option, and use fileutils instead of
-	  ftools.
-
-Fri Dec 27 02:45:17 2002  Wakou Aoyama  <wakou@ruby-lang.org>
-
-	* lib/net/telnet.rb: Telnet#print not add "\n".
-
-	* lib/cgi.rb: cgi['key'] is equal cgi['key'][0]
-
-Thu Dec 26 22:33:18 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb (create_makefile): check only `-' option.
-
-	* configure.in: cleanups for MinGW. remove -D__NO_ISOCEXT in $CFLAGS.
-
-	* win32/win32.h: prototypes for isinf, isnan are not needed on MinGW.
-
-Thu Dec 26 19:22:00 2002  YOSHIDA Kazuhiro <moriq@moriq.com>
-
-	* win32/setup.mak (-prologue-): moved srcdir macro definition.
-	  [ruby-win32:420].
-
-Wed Dec 25 18:26:44 2002  K.Kosako  <kosako@sofnec.co.jp>
-
-	* regex.c (re_match): fixed wrong \G behavior.  (ruby-bugs-ja:PR#377)
-
-Wed Dec 25 16:41:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_match_exec): fix odd \G behavior based on the patch
-	  from Nobu.
-
-Wed Dec 25 11:05:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bcc32/setup.mak (-generic-): removed garbages.
-
-Wed Dec 25 10:36:20 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* bcc32/Makefile.sub, win32/Makefile.sub (RUBY_SO_NAME, config.h):
-	  use $(MAJOR) and $(MINOR). based on Nobu's patch. [ruby-win32:413]
-
-	* bcc32/setup.mak, win32/setup.mak (-prologue-): define MAJOR, MINOR
-	  and TEENY from version.h. based on Nobu's patch. [ruby-win32:413]
-
-	* win32/Makefile.sub (config.h): add HAVE_FLOAT_H.
-
-	* win32/Makefile.sub (parse.obj): depend on win32/win32.h.
-
-Tue Dec 24 23:49:16 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/irb/completion.rb: Use Object#class rather than Object#type.
-
-Tue Dec 24 23:37:40 2002  TADA Tadashi <sho@spc.gr.jp>
-
-	* lib/cgi.rb (Cookie::parse), lib/cgi-lib.rb (initialize): Do not
-	  pass to split() a bare string longer than 2 characters as
-	  separator.
-
-Tue Dec 24 19:19:24 2002  Tietew <tietew@tietew.net>
-
-	* numeric.c (DBL_MAX_10_EXP): fix typo. [ruby-dev:19175]
-
-Tue Dec 24 17:02:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_undefined): use NoMethodError instead of fatal.
-
-Tue Dec 24 02:12:45 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/README: Synchronize with reality.
-
-Tue Dec 24 02:05:51 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* MANIFEST, lib/README, lib/ipaddr.rb: Add ipaddr.rb from rough.
-
-Sun Dec 22 04:07:47 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/dbm/dbm.c (fdbm_alloc): allocator takes only one argument.
-
-Sun Dec 22 02:49:25 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* array.c (ary_alloc), dir.c (dir_s_alloc), eval.c (thgroup_s_alloc),
-	  file.c (rb_stat_s_alloc), hash.c (hash_alloc), io.c (io_alloc),
-	  object.c (rb_module_s_alloc, rb_class_allocate_instance),
-	  re.c (match_alloc, rb_reg_s_alloc), string.c (str_alloc),
-	  time.c (time_s_alloc), ext/digest/digest.c (rb_digest_base_alloc),
-	  ext/tcltklib/tcltklib.c (ip_alloc),
-	  ext/win32ole/win32ole.c (fole_s_allocate, fev_s_allocate)
-	  : add prototype to get rid of VC++ warnings.
-
-	* ext/sdbm/init.c (fsdbm_alloc): allocator takes only one argument.
-
-Sun Dec 22 00:36:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): accept pure ruby libraries.
-
-Sat Dec 21 23:59:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (ins_methods_i): should not show ID_ALLOCATOR.
-
-	* class.c (ins_methods_prot_i): ditto.
-
-	* class.c (ins_methods_priv_i): ditto.
-
-	* class.c (ins_methods_pub_i): ditto.
-
-	* eval.c (call_trace_func): ditto.
-
-	* eval.c (rb_undefined): ditto.
-
-Sat Dec 21 07:27:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-parse-partial): keywords must not be
-	  preceded by @ or $.
-
-Fri Dec 20 20:29:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
-	  ext/dl/handle.c, ext/dl/ptr.c, ext/dl/sym.c, ext/gdbm/gdbm.c,
-	  ext/iconv/iconv.c, ext/sdbm/init.c, ext/stringio/stringio.c,
-	  ext/strscan/strscan.c, ext/tcltklib/tcltklib.c,
-	  ext/win32ole/win32ole.c: use rb_define_alloc_func().
-
-Fri Dec 20 18:29:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (rb_io_fwrite): separated from io_write().
-
-	* marshal.c (w_byten): use rb_io_fwrite() to support non-blocking
-	  IO, and added error check.
-
-	* rubyio.h: prototypes; rb_io_fwrite
-
-Fri Dec 20 17:40:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): should not remove Class#allocate.
-
-	* lib/profiler.rb: separate profiling functions, without
-	  trace_func and at_exit setting.
-
-Fri Dec 20 16:20:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (do_block): split "do" block and tLBRACE_ARG block.
-
-	* parse.y (cmd_brace_block): new tLBRACE_ARG block rule
-
-	* parse.y (command): can take optional cmd_brace_block; use %prec
-	  to resolve shift/reduce conflict. (ruby-bugs-ja PR#372)
-
-	* eval.c (ruby_finalize): trace_func should be cleared here (after
-	  executing exit procs and finalizers).
-
-	* eval.c (rb_define_alloc_func): new allocation framework, based
-	  on Nobu's work [ruby-dev:19116].  "allocate" method is no longer
-	  used for object allocation.
-
-Fri Dec 20 05:06:49 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/README, lib/cgi/ftplib.rb, lib/telnet.rb: Delete ftplib.rb
-	  and telnet.rb.  It has been quite some time sinc they were
-	  obsoleted and made to emit warnings.
-
-Fri Dec 20 04:58:22 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/tempfile.rb: Embed Rdoc style comments.
-
-	* lib/tempfile.rb: Add length as an alias for size.
-
-Fri Dec 20 03:57:32 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/tempfile.rb: Add Tempfile#close!() as a shorthand for
-	  Tempfile#close(true).
-
-	* lib/tempfile.rb: Add Tempfile#{unlink,delete}().
-
-Fri Dec 20 03:53:01 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/README, lib/cgi/final.rb, lib/cgi/session.rb: Delete
-	  final.rb, which was obsoleted long ago.
-
-Fri Dec 20 00:16:06 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* re.c (rb_reg_match_pre, rb_reg_match_post, match_to_a,
-	  match_select): return instances of same class as the original
-	  string.  [ruby-dev:19119]
-
-Thu Dec 19 22:55:49 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* numeric.c (DBL_EPSILON): fix typo.
-
-Thu Dec 19 22:35:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (assign): avoid [BUG] at multiple attribute assignment.
-
-Thu Dec 19 01:00:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_step): use DBL_EPSILON.
-
-	* array.c (rb_check_array_type): new function: return an array
-	  (convert if possible), or nil.
-
-	* string.c (rb_check_string_type): new function: return a string
-	  (convert if possible), or nil.
-
-	* numeric.c (rb_dbl_cmp): returns nil if values are not
-	  comparable.
-
-	* numeric.c (fix_cmp,flo_cmp): use rb_num_coerce_cmp()
-
-	* bignum.c (rb_big_cmp): ditto.
-
-	* numeric.c (rb_num_coerce_cmp): new coercing function for "<=>",
-	  which does not raise TypeError.
-
-	* numeric.c (do_coerce): can be suppress exception now.
-
-	* object.c (rb_mod_cmp): should return nil for non class/module
-	  objects.
-
-Thu Dec 19 04:21:10 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/open-uri.rb: add a missing ||. (found by: ruby -wc)
-
-Wed Dec 18 17:53:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_eqq): return false if the argument is not a
-	  string.  now returns boolean value.
-
-	* class.c (rb_include_module): argument should be T_MODULE, not
-	  T_class, nor T_ICLASS.
-
-Wed Dec 18 03:52:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* string.c (rb_str_new4): handle tail shared string.
-	  (ruby-bugs-ja:PR#370)
-
-	* string.c (rb_str_dup_frozen): ditto.
-
-Tue Dec 17 21:08:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* node.h (NODE_ATTRASGN): new node, assignment to attribute.
-	  [ruby-core:00637].
-
-	* eval.c (is_defined, rb_eval): ditto.
-
-	* parse.y (attrset, node_assign): ditto.
-
-	* string.c (rb_str_substr): tail sharing.  [ruby-core:00650]
-
-	* re.c (rb_reg_nth_match): ditto.
-
-Tue Dec 17 16:52:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): "defined?" should return "assignment" for
-	  attribute assignment (e.g. a.foo=b) and indexed assignment
-	  (e.g. a[2] = 44).
-
-	* parse.y (aryset): use NODE_ATTRASGN.
-
-Tue Dec 17 04:03:45 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: new file.
-
-Tue Dec 17 00:28:19 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* file.c (utimbuf): need to define for VC++.
-
-Mon Dec 16 15:53:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (nextc): get rid of overrun.  (pointed out by akr
-	  [ruby-list:36773])
-
-Sun Dec 15 21:16:44 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
-	  remove adding $(archdir) to $LIBPATH.
-
-Sat Dec 15 12:15:00 2002  Takaaki Uematsu <mail@uema2.cjb.net>
-
-	* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
-	  eval.c, file.c, hash.c, io.c, main.c, missing.c,
-	  process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
-	  bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
-	  ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
-	  ext/socket/getnameinfo.c, ext/socket/socket.c,
-	  ext/tcltklib/stubs.c
-	  : replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
-	* wince/exe.mak : delete \r at the end of lines.
-	* wince/mswince-ruby17.def : delete rb_obj_become
-
-Sun Dec 15 11:43:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (dispose_string): dispose String object.
-
-	* parse.y (heredoc_restore, here_document): fix memory leak.
-
-Sat Dec 14 14:25:00 2002  Takaaki Uematsu <mail@uema2.cjb.net>
-
-	* wince/sys : add stat.c, stat.h, timeb.c, timeb.h,
-		      types.h, utime.c, utime.h
-	* wince/dll.mak : object file name changed.
-	* wince/io.c : add empty dup2().
-	* wince/io.h : add dup2 definition.
-
-Sat Dec 14 01:51:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/dbm/extconf.rb (rb_check): support for GNU dbm 1.8.3.
-	  (-with-dbm-type=gdbm_compat). link against -lgdbm_compat
-	  and -lgdbm.
-
-Fri Dec 13 23:42:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/dbm/extconf.rb (db_check): check existence of the function
-	  in the specified library before checking it in libc.
-
-Fri Dec 13 17:15:49 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (generic_ivar_get): should always warn uninitialized
-	  instance variables.
-
-Fri Dec 13 12:33:22 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (expr): rescue clause was ignored.
-
-Thu Dec 12 18:19:14 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (RUBY_PROG_GNU_LD): add $CFLAGS, $CPPFLAGS, $LDFLAGS
-	  to the option of $CC.
-
-	* configure.in: set LIBRUBYARG to '-l$(RUBY_SO_NAME)' if the
-	  target os is cygwin and --disable-shared option is supplied.
-
-	* lib/mkmf.rb (init_mkmf): expand config["LIBRUBY"] and
-	  config["LIBRUBY_A"].  don't link $LIBRUBYARG_STATIC if
-	  --disable-shared option is supplied.
-
-	* configure.in (RUBY_CPPOUTFILE): should be a better message.
-
-	* ext/Win32API/extconf.rb: join with a space.
-
-Thu Dec 12 17:27:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_hash): define Regexp#hash to make regexps to be
-	  hash keys.
-
-	* re.c (Init_Regexp): define Regexp#eql? (alias to Regexp#==).
-
-Thu Dec 12 16:26:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* marshal.c (r_object0): singleton class instance can't be loaded.
-	  (ruby-bugs-ja:PR#366)
-
-Wed Dec 11 23:35:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb (create_makefile): -no-undefined -> --no-undefined.
-
-Wed Dec 11 17:54:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_read): takes optional second argument to specify a
-	  string to be written.  the string should not be frozen.
-
-	* io.c (rb_io_sysread): ditto.
-
-Wed Dec 11 11:30:28 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/digest/digest.c (rb_digest_base_copy): renamed "become".
-
-	* ext/stringio/stringio.c (strio_copy): ditto.
-
-Wed Dec 11 00:45:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/getoptlong.rb (GetoptLong::Error): provide a common ancestor
-	  for GetoptLong error classes (RCR#129).
-
-Tue Dec 10 17:42:39 2002  K.Kosako  <kosako@sofnec.co.jp>
-
-	* re.c (rb_reg_copy_object): fixed memory leak.
-
-Tue Dec 10 17:30:35 2002  Tanaka Akira  <akr@m17n.org>
-
-	* pack.c (utf8_limits): fix the limit of 4 bytes UTF-8 sequence.
-
-Tue Dec 10 12:01:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (mnew): original class of method defined in module should
-	  be the module not intermediate class.  [ruby-dev:19040]
-
-Tue Dec 10 01:16:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): preceding ".." for negative numbers
-	  still left;  removed.
-
-	* sprintf.c (rb_f_sprintf): should not prepend '0' if width > prec
-	  for example "%5.3d".
-
-Sat Dec  7 18:14:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (Init_process): add Process.exit and Process.abort
-
-	* pack.c (utf8_to_uv): raise ArgumentError for malformed/redundant
-	  UTF-8 sequences.
-
-Fri Dec  6 03:46:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (last_status_set): add pid attribute to Process::Status.
-
-Wed Dec  4 17:31:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (uv_to_utf8): limit maximum length of the encoded string
-	  to 6 bytes, even when the platform supports 8 bytes long integers.
-
-	* pack.c (utf8_to_uv): do not decode sequences longer than 6 bytes.
-
-	* object.c (copy_object): use "copy_object" method, not "become".
-
-Wed Dec  4 16:37:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (copy_object): copy finalizers as well if any.
-
-	* gc.c (rb_gc_copy_finalizer): new function to copy finalizers.
-
-Tue Dec  3 01:13:41 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (PP.singleline_pp): new method.
-
-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
-	  ENOENT rather than EBADF in such case.  [ruby-talk:57177]
-
-Fri Nov 29 18:01:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (utf8_to_uv): added checks for malformed or redundant
-	  UTF-8 sequences.
-
-Thu Nov 28 12:08:30 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb: Avoid the use of "clean::" in favor of "clean:" in
-	  order not to let make(1) choke if there is another dependency on
-	  the target added in a depend file.
-
-Thu Nov 28 02:40:42 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb: Make sure to dig the destination directory before
-	  installing a file there.  Formerly "make install" could fail
-	  depending on make(1)'s mood of the moment, especially when -jN
-	  is given.
-
-Wed Nov 27 17:39:38 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syslog/syslog.c: Cut redundancy.
-
-	* ext/syslog/syslog.c: Do not leak ident.
-
-Wed Nov 27 17:25:29 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syslog/syslog.c, ext/syslog/test.rb: Syslog.close should
-	  raise RuntimeError when not opened.
-
-	* ext/syslog/syslog.c, ext/syslog/test.rb:
-	  Syslog.{ident,options,facility,mask} should all return nil when
-	  not opened.
-
-	* ext/syslog/syslog.c, ext/syslog/test.rb: Change back the output
-	  format of inspect().
-
-Wed Nov 27 16:25:43 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/test.rb: Switch from RUnit to Test::Unit.
-
-Wed Nov 27 16:14:12 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syslog/syslog.c: Fix a problem where Syslog.ident was not
-	  marked and could thus be GC'd.
-
-Wed Nov 27 16:11:53 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syslog/test.rb: Switch from RUnit to Test::Unit.
-
-	* ext/syslog/test.rb: The output format of inspect() is slightly
-	  altered.
-
-Wed Nov 27 06:43:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* error.c (exit_initialize): add SystemExit#initialize to set
-	  instance variable status.  (ruby-bugs-ja:PR#362)
-	  Now accepts status as optional first argument.
-
-	* eval.c (error_handle): now SystemExit have status always.
-
-	* eval.c (system_exit): just instantiate SystemExit without raise.
-
-	* eval.c (rb_thread_start_0): initialize SystemExit properly.
-
-Tue Nov 26 10:17:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dln.c (init_funcname_len): remove MAXPATHLEN dependency.
-
-Mon Nov 25 19:55:38 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): return true if not dynamic and not static.
-
-Mon Nov 25 01:08:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dln.c: revert and add the MAXPATHLEN definition on mswin32/mingw32.
-
-Sun Nov 24 20:36:53 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dln.c: move the MAXPATHLEN definition in front.
-
-Fri Nov 22 22:55:01 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): preceding ".." for negative
-	  hexadecimal numbers should not appear if prec (e.g. %.4) is
-	  specified.
-
-	* pack.c (NUM2I32): support platforms which does not have 32bit
-	  integers (e.g. Cray).
-
-Fri Nov 22 19:20:36 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* instruby.rb: Install batch files on Windows. [Submitted by usa]
-
-Fri Nov 22 18:31:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_add_method): node may be NULL.
-
-Thu Nov 21 20:53:06 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: changes coding style.
-
-	* lib/net/pop.rb: ditto.
-
-	* lib/net/protocol.rb: ditto.
-
-Thu Nov 21 20:17:08 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: changes coding style.
-
-Thu Nov 21 20:04:06 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: should not overwrite Host: header.
-	  (This patch is contributed by sean@ruby-lang.org)
-
-Thu Nov 21 20:01:33 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: support Proxy-Authorization.
-	  (This patch is contributed by Alexander Bokovoy)
-
-Thu Nov 21 11:03:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_find_file_ext): should not terminate searching with
-	  empty path, just ignore.
-
-	* dir.c: remove <sys/parm.h> inclusion.
-
-Wed Nov 20 02:07:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* compar.c (cmp_eq,cmp_gt,cmp_ge,cmp_lt,cmp_le): check using
-	  rb_cmpint().
-
-	* error.c (init_syserr): remove sys_nerr dependency.
-
-Wed Nov 20 01:52:21 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_cmp): added to satisfy Comparable assumption.
-
-	* eval.c (rb_add_method): "initialize" should be public if it is a
-	  singleton method.
-
-Tue Nov 19 22:37:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_match): avoid dereferencing if size == 0.
-	  (ruby-bugs-ja:PR#360)
-
-Tue Nov 19 20:40:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_cmp): should return nil if an operand is not a
-	  number nor time. (ruby-bugs-ja:PR#359)
-
-	* file.c (rb_stat_cmp): should return nil if an operand is not
-	  File::Stat.
-
-Tue Nov 19 14:35:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_zip): iterates over items in the receiver.
-	  zipped with nil if argument arrays are shorter.  if arrays are
-	  longer, left items are ignored.  now works with blocks.
-
-	* enum.c (zip_i): changed for new behavior.
-
-	* array.c (rb_ary_transpose): added. [new]
-
-Tue Nov 19 05:12:21 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* instruby.rb: Do not install various working files under bin/.
-
-Tue Nov 19 05:07:39 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* instruby.rb: not rewrite installed scripts when dry-run mode.
-
-	* lib/ostruct.rb (OpenStruct::initialize): should symbolize keys
-	  instead of values.
-
-Tue Nov 19 02:24:10 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* instruby.rb: Rewrite installed scripts' shebang lines.
-
-	* instruby.rb: Use File.join() where appropriate.
-
-Tue Nov 19 01:53:35 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* bin/irb: Moved from sample/irb.rb.
-
-	* instruby.rb: Install script files under bin/ with ruby's program
-	  prefix and suffix.
-
-Mon Nov 18 02:13:36 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/tempfile.rb: Make this library thread safe.
-
-	* lib/tempfile.rb: Do not pick a name which was once used and is
-	  still scheduled for removal.
-
-	* lib/tempfile.rb: A lock file need not and must not be scheduled
-	  for removal.
-
-	* lib/tempfile.rb: Compare Max_try with the number of mkdir
-	  failures instead of the suffix counter.
-
-	* lib/tempfile.rb: Overall cleanup and add some important notices.
-
-Sun Nov 17 22:57:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (dsym): garbage returned.  (ruby-bugs-ja:PR#358)
-
-Fri Nov 15 07:40:08 2002  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
-
-	* observer.rb: raise NoMethodError instead of NameError.
-	  [ruby-dev:18788]
-
-	* ostruct.rb: ditto.  fix a bug in inspect which called String#+ with
-	  Symbol.  [ruby-dev:18788]
-
-	* profile.rb: illegal use of Array#sort!.  replaced it with non-bang
-	  method.  [ruby-dev:18792]
-
-Thu Nov 14 22:40:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (LIBRUBY_A): append -static.  [ruby-dev:18689]
-
-	* configure.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): linker
-	  argument to link static/shared library respectively.
-
-	* Makefile.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): added.
-
-	* bcc32/Makefile.sub, win32/Makefile.sub: ditto.
-
-	* instruby.rb (LIBRUBY_A): install to libdir.
-
-	* lib/mkmf.rb (link_command): link static library of ruby, or
-	  try_run fails unless LIBRUBY_SO is installed.  [ruby-dev:18646]
-
-	* eval.c (call_trace_func): toplevel caller was missing.
-	  [ruby-dev:18754]
-
-	* eval.c (proc_to_s): adjust created line number.
-
-	* parse.y (primary, do_block, brace_block): adjust line number of
-	  block to beginning line, instead of the first statement inside
-	  the block.
-
-Thu Nov 14 08:23:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* math.c (math_acos): check errno after operation.  ditto for
-	  asin, acosh, atanh, log, log10 and sqrt.
-
-	* eval.c (rb_add_method): initialize should always be private.
-
-	* parse.y (expr): add rescue modifier rule.
-
-	* parse.y (command_call): return, break and next with argument is
-	  now part of this rule.
-
-Wed Nov 13 16:22:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (DLDFLAGS): removed -Wl,-no-undefined to
-	  ext/extmk.rb, in order to allow references to symbols in other
-	  extension libraries for mkmf.rb.  [ruby-dev:18724]
-
-	* ext/extmk.rb (extmake): ditto.
-
-	* ext/extmk.rb (extmake): exit when make failed.
-
-Sun Nov 10 03:46:18 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: retire contain?() and add superset?(),
-	  proper_superset?() subset?(), and proper_subset?().
-	  [obtained from: Jason Voegele's set.rb]
-
-	* lib/set.rb: define several aliases: union() for |(),
-	  difference() for -(), and intersection() for &().
-	  [obtained from: Jason Voegele's set.rb]
-
-	* lib/set.rb: deal with a s/id/object_id/ leftover.
-
-Sat Nov  9 16:06:57 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/tcltklib/stubs.c: should include "util.h" for ruby_strdup.
-
-Sat Nov  9 11:39:45 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c: remove ENABLE_TRACE/DISABLE_TRACE to trace child nodes of
-	  c-call. [ruby-dev:18699]
-
-Fri Nov  8 04:16:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): "a" in "a /5" should be considered as a local
-	  variable. [experimental]
-
-Thu Nov  7 09:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_yield_0): should enable trace for non-cfunc nodes.
-	  [ruby-dev:18645]
-
-	* eval.c (blk_orphan): a block created in a different thread is
-	  orphan.  [ruby-dev:17471]
-
-Wed Nov  6 16:57:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_define_method): do not set NOEX_CFUNC if klass is
-	  really a module, whose methods must be safe for reciever's type.
-
-	* eval.c (rb_eval): nosuper should not be inherited unless the
-	  overwritten method is an undef placeholder.
-
-Tue Nov  5 00:46:04 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb: Properly pass the given target to
-	  make(1). [pointed out by eban]
-
-Mon Nov  4 20:03:53 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* instruby.rb, lib/mkmf.rb: use CONFIG["ENABLE_SHARED"] instead of
-	  checking whether CONFIG["configure-args"] includes "--enable-shared".
-
-Mon Nov  4 16:49:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): allow 'when'-less case statement; persuaded
-	  by Sean Chittenden.
-
-Mon Nov  4 06:28:09 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* Makefile.in, ext/extmk.rb, bcc32/Makefile.sub,
-	  win32/Makefile.sub: Introduce better command line syntax
-	  (--make/--make-flags/--extstatic) to extmk.rb and instruby.rb.
-	  Previously such command as 'make -j3 install' with pmake doesn't
-	  fail.  Formerly extmk.rb was receiving "make -j 3 -j 3" via the
-	  command line arguments and just ended up recognizing the first
-	  "3" as destdir. [with help of usa]
-
-Mon Nov  4 03:59:51 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/getopts.rb: Do not choke on characters that cannot be used
-	  in a variable name.  Replace them with `_'.  Define a hash named
-	  $OPT for convenience.
-
-Sat Nov  2 00:38:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): added Object#object_id, new name for
-	  Object#id. [new]
-
-	* object.c (rb_obj_id_obsolete): give warning for Object#id.
-
-	* numeric.c (fix_intern): added Fixnum#to_sym. [new]
-
-	* object.c (sym_to_sym): rename from Symbol#intern
-
-Fri Nov  1 14:21:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_zip): added Enumerable#zip. [new]
-
-	* array.c (rb_ary_zip): added Array#zip.
-
-Thu Oct 31 20:10:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (init_syserr): remove sys_nerr dependency.
-
-Thu Oct 31 09:31:51 2002  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (rb_export_method): undef'ed method visibility should not
-	  be changed.
-
-Wed Oct 30 17:00:47 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_public_method_defined, etc.): new methods:
-	  public_method_defined?, private_method_defined?,
-	  protected_method_defined?
-
-	* object.c (rb_obj_public_methods): new method
-	  Object#public_methods.
-
-	* class.c (ins_methods_i): Object#methods should list both public
-	  and protected methods.
-
-	* class.c (rb_class_public_instance_methods): new method
-	  Module#public_instance_methods.
-
-Wed Oct 30 06:29:00 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c, file.c, gc.c, io.c, object.c, ruby.c, ruby.h, struct.c,
-	  ext/socket/socket.c: differentiate long and int; use proper
-	  printf type specifiers and do casts where appropriate.
-
-Wed Oct 30 04:07:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (error_print, rb_longjmp, rb_thread_schedule): flush
-	  error message.  [ruby-dev:18582]
-
-	* eval.c (ruby_cleanup): added.  just clean up without exit.
-	  [ruby-dev:18582]
-
-	* eval.c (ruby_exec): added.  execute main evaluation tree without
-	  exit.  [ruby-dev:18582]
-
-	* intern.h: prototypes; ruby_cleanup, ruby_exec
-
-Tue Oct 29 02:00:08 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/extmk.rb (extmake): use dummy_makefile to create dummy
-	  Makefile.
-
-	* lib/mkmf.rb (find_executable0): EXEEXT is optional.
-
-	* lib/mkmf.rb (dummy_makefile): make dummy Makefile content.
-
-	* lib/mkmf.rb (create_makefile): define EXTLIB replacing -l.
-
-	* lib/mkmf.rb ($bccwin): detect Borland make by help message.
-
-	* lib/mkmf.rb (CLEANINGS): common rules to clean.
-
-Mon Oct 28 01:27:17 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* djgpp/config.sed (@program_transform_name@): use `%', not `,'.
-
-Sun Oct 27 22:59:50 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* ext/extmk.rb(78) : The unnecessary error when installing by bccwin32
-	                     is controlled.
-
-	* lib/mkmf.rb(773) : Also in the case of bccwin32, the path was added.
-
-Sun Oct 27 17:07:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* djgpp/*: sync with the latest.
-
-	* ext/extmk.rb, lib/mkmf.rb: flush $stdout.
-
-	* io.c (READ_DATA_PENDING_COUNT, READ_DATA_PENDING_PTR):
-	  undef these macros on DJGPP.
-
-Sat Oct 26 10:11:47 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* node.h (nd_type): cast the value to int.
-
-Sat Oct 26 04:27:35 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/dbm/dbm.c (fdbm_indexes, fdbm_select): add a missing
-	  argument and prevent coredump when a nonexistent key is
-	  specified.
-
-	* ext/sdbm/init.c (fsdbm_indexes, fsdbm_select): ditto.
-
-Sat Oct 26 03:28:43 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c, gc.c: use a common set of alloca() #ifdef's.  This fixes
-	  the build with Intel C Compiler for Linux.
-
-	* eval.c (rb_f_require): declare old_func with a real type, not
-	  just type modifiers.
-
-Fri Oct 25 02:55:01 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* string.c (rb_str_split_m): RSTRING(str)->ptr might become NULL.
-	  [ruby-dev:18581]
-
-Thu Oct 24 21:57:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (LIBPATHFLAG): avoid $ substitution.
-	  [ruby-dev:18577]
-
-	* ext/extmk.rb (extmake): expand $srcdir.
-
-	* ext/win32ole/extconf.rb: should not override $CFLAGS, but
-	  append.
-
-	* lib/mkmf.rb (config_string): use given config hash.
-
-	* bcc32/Makefile.sub (.rc.res): directory part may be empty in
-	  Borland make.
-
-Thu Oct 24 03:38:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb (create_makefile): site-install target for backward
-	  compatibility.
-
-	* lib/mkmf.rb (init_mkmf): libdir prior to topdir.
-
-	* configure.in (LIBPATHFLAG): should escape $.  [ruby-dev:18572]
-
-	* mkconfig.rb: never substitute escaped $$.
-
-	* instruby.rb: not install LIBRUBY_SO unless enable-shared.
-	  [ruby-dev:18569]
-
-Wed Oct 23 19:16:06 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_eval): added NODE_DSYM, symbol literal with
-	  interpolation.
-
-	* node.h: ditto.
-
-	* intern.h: prototypes; rb_is_junk_id, rb_str_dump, rb_str_intern
-
-	* object.c (sym_inspect): escape and quote for non-alphanumeric
-	  symbols.
-
-	* parse.y (dsym, tokadd_string, yylex): extended symbol literals.
-
-	* parse.y (rb_is_junk_id): added.
-
-	* string.c (rb_str_dump, rb_str_intern) : make extern.
-
-	* lib/mkmf.rb (create_makefile): deffile should be removed by
-	  distclean, not clean.
-
-Tue Oct 22 23:56:41 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (init_mkmf): add dir_config("opt").
-
-Tue Oct 22 19:44:03 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* bcc32/configure.bat : The command line when calling setup.mak is
-	                        corrected.
-
-	* bcc32/readme.bcc32 : It follows up about the option of configure.bat.
-
-Tue Oct 22 15:23:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* instruby.rb: add dryrun mode.
-
-	* ext/extmk.rb (extmake): add install: target to dummy Makefile.
-
-	* ext/extmk.rb (extmake): avoid Borland make's quirk behavior.
-
-	* lib/mkmf.rb (link_command): opt is not a makefile macro.
-
-	* bcc32/Makefile.sub ($(LIBRUBY_SO) $(LIBRUBY)): EXTOBJS were not
-	  linked.
-
-	* bcc32/Makefile.sub (ext/extinit.obj): missing.
-
-	* bcc32/Makefile.sub (TRY_LINK): options have to place before any
-	  non-option arguments.
-
-	* win32/Makefile.sub (TRY_LINK): need -link and -libpath options.
-
-	* bcc32/Makefile.sub, win32/Makefile.sub (RANLIB): logical
-	  operator never work with command.com.
-
-Tue Oct 22 00:59:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (RUBY_CPPOUTFILE): fix cache file bug.
-
-	* lib/mkmf.rb (link_command): put 'opt' after conftest.c for
-	  static linking.
-
-Mon Oct 21 22:53:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (XCFLAGS): CFLAGS to compile ruby itself.
-
-	* configure.in (LIBEXT): suffix for static libraries.
-
-	* configure.in (LIBPATHFLAG): switch template to specify library
-	  path.
-
-	* configure.in (LINK_SO): command to link shared objects.
-
-	* configure.in (DEFFILE, ARCHFILE): miscellaneous system dependent
-	  files.
-
-	* configure.in (EXPORT_PREFIX): prefix to exported symbols on
-	  Windows.
-
-	* configure.in (COMMON_LIBS, COMMON_MACROS, COMMON_HEADERS):
-	  libraries, macros and headers used in common.
-
-	* configure.in (RUBYW_INSTALL_NAME, rubyw_install_name): GUI mode
-	  executable name.
-
-	* Makefile.in (CFLAGS): append XCFLAGS.
-
-	* Makefile.in (PREP): miscellaneous system dependent files.
-
-	* Makefile.in (ruby.imp, ext/extinit.o): moved from ext/extmk.rb.
-
-	* Makefile.in (fake.rb): CROSS_COMPILING keeps building platform.
-
-	* Makefile.in (MAKEFILES): depend on *.in and config.status.
-
-	* Makefile.in (parse.c): replace "y.tab.c" with actual name for
-	  byacc.
-
-	* ext/extmk.rb, lib/mkmf.rb: integrated.
-
-	* ext/extmk.rb: propagate MFLAGS.
-
-	* ext/extmk.rb (extmake): make dummy Makefile to clean even if no
-	  Makefile is made.
-
-	* lib/mkmf.rb (older): accept multiple file names and Time
-	  objects.
-
-	* lib/mkmf.rb (xsystem): split and quote.
-
-	* lib/mkmf.rb (cpp_include): make include directives.
-
-	* lib/mkmf.rb (try_func): try whether specified function is
-	  available.
-
-	* lib/mkmf.rb (install_files): default to site-install.
-
-	* lib/mkmf.rb (checking_for): added.
-
-	* lib/mkmf.rb (find_executable0): just find executable file with
-	  no message.
-
-	* lib/mkmf.rb (create_header): output header file is variable.
-
-	* lib/mkmf.rb (create_makefile): separate sections.
-
-	* lib/mkmf.rb (init_mkmf): initialize global variables.
-
-	* win32/Makefile.sub, bcc32/Makefile.sub (CPP, AR): added.
-
-	* bcc32/Makefile.sub (ARCH): fixed to i386.
-
-	* win32/Makefile.sub, bcc32/Makefile.sub (miniruby): should not
-	  link EXTOBJS.
-
-	* ext/dl/extconf.rb: use try_cpp to cross compile.
-
-	* ext/dl/extconf.rb: not modify files in source directory.
-
-Fri Oct 18 23:11:21 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (value_expr0): allow return/break/next/redo/retry in rhs
-	  of logical operator.  [ruby-dev:18534]
-
-	* parse.y (remove_begin): eliminate useless NODE_BEGIN.
-	  [ruby-dev:18535]
-
-Fri Oct 18 01:02:44 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* hash.c, eval.c: Use (*_NSGetEnviron()) instead of environ on
-	  Darwin for namespace cleanness.  [ruby-core:00537]
-
-	* dln.c (dln_load): Fix Darwin support that has been disabled and
-	  switch to using it on Darwin instead of the system dlopen().
-	  [ruby-core:00541]
-
-Thu Oct 17 19:17:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* marshal.c (w_byten): added; write n bytes from s to arg.
-
-	* marshal.c (dump): flush buffered data.
-
-	* marshal.c (marshal_dump, r_byte, r_bytes0, marshal_load): unify
-	  marshaling I/O.  [ruby-talk:53368]
-
-Thu Oct 17 12:58:24 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: stat.blksize might be 0/nil.
-
-	* lib/fileutils.rb: change coding style.
-
-Wed Oct 16 22:35:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* sprintf.c (rb_f_sprintf): disallow mixed usage of numbered and
-	  unnumbered arguments.  [ruby-dev:18531]
-	  get rid of memory leak at exception.  [ruby-core:00460]
-
-Wed Oct 16 13:36:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* variable.c (rb_global_entry): not add global entry until
-	  initialized to avoid accessing it while GC.  [ruby-dev:18514]
-
-	* variable.c (rb_alias_variable): ditto.
-
-Wed Oct 16 01:03:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_str_to_dbl): RString ptr might be NULL.
-
-	* object.c (rb_cstr_to_dbl): p pointer might be NULL.
-
-	* bignum.c (rb_str_to_inum): RString ptr might be NULL.
-
-	* bignum.c (rb_cstr_to_inum): str pointer might be NULL.
-
-Sat Oct 12 23:44:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* win32/win32.c (rb_w32_putc): wrong condition to fill or flush on
-	  bccwin32.  [ruby-win32:408]
-
-Fri Oct 11 15:58:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): rescue modifier is now an operator with
-	  precedence right below assignments. i.e. "a = b rescue c" now
-	  parsed as "a = (b rescue c)", not as "(a = b) rescue c". [new]
-	  [experimental]
-
-Fri Oct 11 06:05:30 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* win32/win32.c (rb_w32_fclose, rb_w32_close): use closesocket()
-	  for socket.  [ruby-win32:382]
-
-	* win32/win32.c (StartSockets): set NtSocketsInitialized.
-
-	* win32/win32.h: prototypes; rb_w32_fclose, rb_w32_close
-
-Fri Oct 11 00:24:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* gc.c (ruby_xmalloc, ruby_xrealloc): restrict total allocation
-	  size according to memories consumed by live objects.
-	  [ruby-dev:18482]
-
-	* gc.c (gc_sweep): estimate how live objects consume memories.
-
-Thu Oct 10 17:26:12 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): fix memory leak.
-	  [ruby-dev:18478]
-
-Thu Oct 10 15:20:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/weakref.rb (WeakRef::@@final): use Hash#delete.
-
-	* lib/weakref.rb (WeakRef::__getobj__): examine if alive or not by
-	  ID_REV_MAP to deal with recycled object.  [ruby-dev:18472]
-
-	* lib/weakref.rb (WeakRef::weakref_alive?): ditto.
-
-Wed Oct  9 07:11:25 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* gc.c (gc_sweep): also adjust heaps_limits when free unused heap
-	  page.  [ruby-core:00526]
-
-	* io.c (io_fflush): condition to retry can occur.
-
-	* io.c (io_write): returned 0 wrongly if no error occurred.
-
-Tue Oct  8 14:19:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (io_write): must check returned value from fwrite() before
-	  test with ferror().  (ruby-bugs-ja:PR#350)
-
-Tue Oct  8 10:55:23 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/prettyprint.rb (PrettyPrint.singleline_format): new method.
-
-Mon Oct  7 16:43:07 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bigdivrem): bignum zero's len should not be 0.
-
-Mon Oct  7 15:36:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bigdivmod): wrong condition check for Bignum zero.
-
-	* bignum.c (Init_Bignum): need to add Bignum#div.
-
-Sun Oct  6 00:49:15 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (rb_load): should not pass blocks to the loaded file.
-	  [ruby-dev:18458]
-
-Fri Oct  4 20:25:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_interrupt, rb_thread_signal_raise): no need to
-	  save dead thread context. (same as [ruby-dev:18322])
-	  (ruby-bugs-ja:PR#349)
-
-Fri Oct  4 13:05:58 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (RUBY_PROG_GNU_LD): check whether the linker is GNU ld.
-
-	* ext/extmk.rb (create_makefile): add -Wl,-no-undefined to $DLDFLAGS
-	  on Linux if GNU ld is used and --enable-shared is specified.
-
-Fri Oct  4 02:21:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_rshift): num should be initialized by carry
-	  bits if x is negative.
-
-	* bignum.c (bigdivmod): len for bignum zero is 1, not 0.
-
-Thu Oct  3 20:22:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bcc32/mkexports.rb: to work on cygwin via telnet.
-	  [ruby-win32:358]
-
-	* ext/tcltklib/tcltklib.c (ip_invoke): requires command name
-	  argument.  [ruby-dev:18438]
-
-	* eval.c (ruby_init, ruby_options): Init_stack() with local
-	  location.  (ruby-bugs-ja:PR#277)
-
-	* eval.c (rb_call0): disable trace call.  [ruby-dev:18074]
-
-	* eval.c (eval, rb_load): enable trace call.  [ruby-dev:18074]
-
-	* eval.c (rb_f_require): set source file name for extension
-	  libraries.  [ruby-dev:18445]
-
-	* gc.c (Init_stack): prefer address of argument rather than local
-	  variable to initialize rb_gc_stack_start.
-
-	* ruby.c (translate_char): translate a character in a string;
-	  DOSISH only.  [ruby-dev:18274]
-
-	* ruby.c (ruby_init_loadpath): added argv[0] handling under
-	  Human68K.  [ruby-dev:18274]
-
-	* ruby.c (proc_options): translate directory separator in $0 to
-	  '/'.  [ruby-dev:18274]
-
-Thu Oct  3 00:27:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/delegate.rb (Delegator::initialize): use Object#class
-	  instead of deprecated Object#type.
-
-Wed Oct  2 23:32:48 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* configure.in (RUBY_CHECK_IO_NEED_FLUSH): check whether fflush()
-	  is needed.
-
-	* io.c (flush_before_seek): flush before seek if buffered data
-	  may remain.
-
-	* io.c (rb_io_check_readable): flush if the last operation was
-	  write.
-
-	* io.c (rb_io_check_writable): flush if the last operation was
-	  read.
-
-	* rubyio.h (FMODE_RBUF): added.
-
-Wed Oct  2 23:09:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (rb_io_wait_readable): handle retryable errors.
-
-	* io.c (rb_io_wait_writable): ditto.
-
-	* ext/socket/socket.c (bsock_send): ditto.
-
-	* ext/socket/socket.c (s_recvfrom): ditto.
-
-	* ext/socket/socket.c (s_accept): ditto.
-
-	* ext/socket/socket.c (udp_send): ditto.
-
-	* ext/socket/getaddrinfo.c (afdl): made private structures constant.
-
-	* rubyio.h: prototype; rb_io_wait_readable(), rb_io_wait_writable().
-
-Wed Oct  2 13:03:58 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: set ac_cv_func_setitimer to "no" on Cygwin.
-
-Wed Oct  2 10:59:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_sweep): free unused heap page to reduce process size if
-	  possible.
-
-	* object.c (rb_obj_type): deprecated Object#type; use Object#class.
-
-Tue Oct  1 23:48:32 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/socket/socket.c (init_sock): no need for special finalizer,
-	  socket descriptor is no longer duplicated in 1.7.
-	  [ruby-talk:50732]
-
-	* win32/win32.c, win32/win32.h (rb_w32_fddup, rb_w32_fdclose):
-	  delete.
-
-Mon Sep 30 20:29:10 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (rb_io_inspect): not need to raise IOError for closed
-	  stream.  [ruby-talk:51871]
-
-Mon Sep 30 03:48:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_check): need no Fixnum check.
-
-Sun Sep 29 18:30:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* win32/win32.c (rb_w32_open_osfhandle): adjust
-	  rb_w32_open_osfhandle() with _open_osfhandle().
-
-	* win32/win32.c (rb_w32_accept, rb_w32_socket): return -1 on
-	  error.
-
-	* win32/win32.h: should use file descriptor instead of SOCKET.
-
-Sun Sep 29 06:33:03 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (is_socket, rb_w32_select, rb_w32_accept, rb_w32_bind,
-	  rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
-	  rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
-	  rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
-	  rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
-	  rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
-	  rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport):
-	  need to protect WSAGetLastError() by RUBY_CRITICAL. [ruby-talk:51778]
-
-Sat Sep 28 20:06:36 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* keywords: add braces around initializers.
-
-Sat Sep 28 13:19:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* hash.c (rb_hash_become): should check self-assignment after
-	  conversion.
-
-Sat Sep 28 10:40:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_become): Hash#become should check added
-	  self-assignment.
-
-	* class.c (rb_make_metaclass): metaclass of a superclass may be
-	  NULL at boot time.
-
-Sat Sep 28 09:50:03 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* ext/extmk.rb: The condition judgment without necessity was deleted.
-
-Fri Sep 27 18:40:42 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_deadlock): more verbose message at deadlock.
-
-	* eval.c (rb_thread_schedule): ditto.
-
-	* eval.c (rb_thread_join): ditto.
-
-Fri Sep 27 13:24:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): Class#inherited should be called after the
-	  execution of the class body.
-
-Fri Sep 27 02:41:53 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/sha1: Use OpenSSL's SHA1 engine if available.  It is
-	  much faster than what we have now (sha1.[ch]).  Add a knob
-	  (--with-bundled-sha1) to extconf.rb which makes it use the
-	  bundled one anyway.
-
-Fri Sep 27 02:25:14 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/rmd160: Use OpenSSL's RMD160 engine if available.  It
-	  is much faster than what we have now (rmd160.[ch]).  Add a knob
-	  (--with-bundled-rmd160) to extconf.rb which makes it use the
-	  bundled one anyway.
-
-Fri Sep 27 01:23:39 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/md5: Use OpenSSL's MD5 engine if available.  It is
-	  much faster than what we have now (md5.[ch]).  Add a knob
-	  (--with-bundled-md5) to extconf.rb which makes it use the
-	  bundled one anyway.
-
-Thu Sep 26 22:44:21 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_base_s_digest): Fix a double
-	  free() bug mingled with allocation framework deployment.
-
-	* ext/digest/digest.c (rb_digest_base_s_hexdigest): Get rid of
-	  redundant struct allocation.
-
-Thu Sep 26 09:52:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): remove "return outside of method" check at
-	  compile time.
-
-Wed Sep 25 23:51:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* dir.c (glob_helper): must not closedir() when exception raised
-	  while globbing "**".
-
-	* marshal.c (w_uclass): unused variable.
-
-	* re.c (match_clone): unused.
-
-	* regex.c (re_compile_pattern): get rid of implicit promotion from
-	  plain char to int.
-
-Wed Sep 25 17:46:46 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (libpathflag): restore ENV['LIB'] when some error
-	  occurred.
-
-Wed Sep 25 16:14:51 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_match): p1 may exceed pend limit.
-
-Mon Sep 23 23:22:43 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_call0): must not clear ruby_current_node, or
-	  backtrace cannot be generated.
-
-	* intern.h (ruby_yyparse): rather than yyparse().
-
-	* parse.y (yylex): nextc() returns -1 at end of input, not 0.
-
-	* parse.y (newline_node): reduce duplicated newline node.
-
-	* parse.y (literal_concat): get rid of warning.
-
-	* parse.y (new_evstr): fixed junk code.
-
-Mon Sep 23 19:57:52 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (RUBY_MINGW32): new macro. check for the MinGW
-	  compiler environment.
-
-	* lib/mkmf.rb: refactoring.
-
-Mon Sep 23 08:27:11 2002  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (appendline): forget to terminate with nul.
-
-Mon Sep 23 02:46:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ruby_run): should set toplevel visibility again here.
-
-	* eval.c (rb_eval): should not rely on ruby_class == rb_cObject
-	  check.   Besides allow implicit publicity for attribute set
-	  methods.
-
-	* parse.y (primary): need not to check class_nest, just set
-	  whether method is an attrset or not.
-
-Sun Sep 22 21:49:42 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (call_trace_func): should not call trace function while
-	  compilation.
-
-	* eval.c (rb_call0): also inside c-func.
-
-	* parse.y (yycompile): ditto.
-
-	* ruby.c (require_libraries): preserve source file/line for each
-	  require.
-
-Sun Sep 22 17:08:11 2002  Tanaka Akira  <akr@m17n.org>
-
-	* string.c (rb_str_each_line): p might be at the top of the
-	  string.
-
-Sat Sep 21 23:28:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_make_metaclass): class of metaclass should be
-	  metaclass of superclass, unless class itself is a metaclass;
-	  class of metaclass of metaclass should point back to self.
-	  eh, confusing, isn't it.
-
-	* class.c (rb_singleton_class): check if its class is singleton
-	  AND attached to self.
-
-Sat Sep 21 22:23:41 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_raise): no need to save dead thread context.
-	  [ruby-dev:18322]
-
-Fri Sep 20 23:02:01 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (block_append): eliminate unused literal nodes.
-
-	* parse.y (literal_concat): refined literal concatenation.
-
-Fri Sep 20 19:43:40 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: Merge rough/lib/set.rb rev.1.5-1.15.
-
-Wed Sep 18 12:41:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should define class/module under ruby_cbase.
-
-	* eval.c (rb_eval): should set class/module path based on
-	  ruby_cbase, not ruby_class.
-
-	* eval.c (module_setup): use ruby_cbase instead of ruby_class.
-
-Tue Sep 17 21:06:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_die): put thread dead state.
-
-	* eval.c (rb_thread_atfork): free stack buffer at fork too.
-
-Tue Sep 17 01:13:31 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_nesting): load wrapping module should appear in
-	  Module#nesting list. (ruby-bugs-ja:PR#328)
-
-	* eval.c (rb_thread_remove): free stack buffer on remove.
-
-Tue Sep 17 00:58:35 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* io.c: add parameter prototype.
-
-	* re.c: ditto.
-
-Sun Sep 15 21:14:22 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* win32/win32.c (rb_w32_opendir, rb_w32_stat): Corresponds to
-	  the unjust path containing ".
-
-Sun Sep 15 19:48:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (OUTFLAG, CPPOUTFILE): moved from lib/mkmf.rb.
-	  check whether ${CPP} accepts the -o option.
-
-	* win32/Makefile.sub (OUTFLAG, CPPOUTFILE): ditto.
-
-	* bcc32/Makefile.sub (OUTFLAG, CPPOUTFILE): ditto.
-
-	* djgpp/config.sed (OUTFLAG, CPPOUTFILE): ditto.
-
-	* lib/mkmf.rb (OUTFLAG, CPPOUTFILE): use CONFIG.
-	  make easy to understand log.
-
-	* mkconfig.rb (val): should not strip.
-
-Sat Sep 14 20:13:42 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* error.c(rb_sys_fail): remove case EPIPE on bcc32 .
-
-Fri Sep 13 23:39:49 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* dir.c (glob_func_caller): add prototype to get rid of warning.
-
-Fri Sep 13 18:35:12 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_eval): avoid uninitialized global/class variable
-	  warnings at `||='.  [ruby-dev:18278]
-
-	* parse.y (stmt, arg): ditto
-
-Fri Sep 13 13:28:04 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb ($INSTALLFILES): avoid warning when $VERBOSE mode.
-
-Thu Sep 12 23:20:10 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* bcc32/setup.mak    : Control of a message.
-
-	* bcc32/makefile.sub : include resource.
-
-Thu Sep 12 18:10:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* dir.c (glob_helper): fixed freeing buffer.  (ruby-bugs-ja:PR#332)
-
-	* dir.c (glob_helper): should pass matched path.  (ruby-bugs-ja:PR#333)
-
-Thu Sep 12 00:09:32 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_trap_eval): preserve thread status and so on.
-	  [ruby-talk:40337], [ruby-core:00019]
-
-Wed Sep 11 21:25:52 2002  Tanaka Akira  <akr@m17n.org>
-
-	* pp.rb (ARGF.pretty_print): implemented.
-	  (PP.pp): arguments reordered.
-
-Wed Sep 11 18:55:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (proc_to_s): refined format.  [ruby-dev:18215]
-
-Wed Sep 11 17:47:17 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c, win32/win32.h (rb_w32_getpid): negate pid under Win9x.
-	  [ruby-dev:18262]
-
-Wed Sep 11 12:58:57 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* string.c (get_pat): Add an extra argument "quote".
-
-	* string.c (rb_str_match_m): Do not bother to convert if a regexp
-	  is given.
-
-Wed Sep 11 11:33:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* bcc32/Makefile.sub: remove unnecessary `.dll' from filename of
-	  dll's resource file.
-
-	* cygwin/GNUmakefile.in: ditto. [ruby-dev:17103]
-
-	* win32/Makefile.sub: ditto. [ruby-dev:17103]
-
-	* win32/resource.rb: ditto. [ruby-dev:17103]
-
-Wed Sep 11 09:59:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (rb_io_wait_readable): added.
-
-	* io.c (rb_io_wait_writable): added.
-
-	* io.c (io_read_retryable): added.
-
-	* io.c (io_write): retry on EINTR, ERESTART and EWOULDBLOCK.
-	  [ruby-dev:17855], [ruby-dev:17878], [ruby-core:00444]
-
-	* io.c (rb_io_fread): ditto.
-
-	* io.c (read_all): ditto.
-
-	* io.c (appendline): ditto.
-
-	* io.c (rb_io_each_byte): ditto.
-
-	* io.c (rb_io_getc): ditto.
-
-Wed Sep 11 09:29:24 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (ext): make directory `ext' on compile dir.
-	  [ruby-dev:18255]
-
-Wed Sep 11 00:41:10 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_mod_define_method): initialize orig_func too.
-	  (ruby-bugs-ja:PR#330)
-
-Wed Sep 11 00:01:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (glob_helper): prevent memory leak using rb_protect().
-
-	* string.c (rb_str_associate): no need to check freeze flag.
-
-	* string.c (rb_str_resize): should honor STR_ASSOC flag on
-	  resize.
-
-	* string.c (rb_str_resize): proper STR_ASSOC handling.  pointed
-	  out by Michal Rokos.
-
-	* string.c (rb_str_buf_cat): ditto.
-
-	* string.c (rb_str_cat): ditto.
-
-	* string.c (rb_str_buf_append): ditto.
-
-	* string.c (rb_str_append): ditto.
-
-Tue Sep 10 23:35:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (nextc): restore line number after here documents.
-	  (ruby-bugs-ja:PR#331)
-
-	* parse.y (heredoc_restore): ditto.
-
-Tue Sep 10 18:26:52 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb, lib/mkmf.rb ($INCFLAGS): new var for -I$(topdir).
-
-	* lib/mkmf.rb: add #define WIN32_LEAN_AND_MEAN to improve compile
-	  times.
-
-Tue Sep 10 17:16:14 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (miniruby): shouldn't link $(EXTOBJS).
-	  [ruby-dev:17059]
-
-	* win32/Makefile.sub ($(LIBRUBY_A), $(LIBRUBY)): avoid lib.exe's
-	  warning. [ruby-dev:17059]
-
-	* win32/Makefile.sub: remove unnecessary rules. [ruby-dev:17059]
-
-	* win32/configure.bat, win32/setup.mak, win32/README.win32: enable to
-	  pass some arguments to configure. [ruby-dev:17059]
-
-Mon Sep  9 23:43:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.h (S_I?USR): define only if not mingw32.
-
-Mon Sep  9 11:21:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/stringio/stringio.c (strio_set_string): reinitialize
-	  properly.
-
-	* ext/stringio/stringio.c (strio_become): added self-assign check
-	  and experimental auto-conversion to StringIO.
-
-	* ext/stringio/stringio.c (strio_reopen): added.
-
-
-Sun Sep  8 21:29:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* time.c (time_free): prototype; struct time_object -> void *.
-	  avoid GCC warnings.
-
-	* lib/mkmf.rb, ext/extmk.rb ($LINK, $CPP): move to lib/mkmf.rb.
-
-Sun Sep  8 19:02:28 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* time.c: prototype; time_free() to avoid VC++ warnings.
-
-	* ext/tcltklib/tcltklib.c: prototype; invoke_queue_handler() to avoid
-	  VC++ warning.
-
-	* win32/win32.c (rb_w32_stat): remove S_IWGRP and S_IWOTH bits from
-	  st_mode.
-
-	* win32/win32.h (S_I*): define if not defined.
-
-Sun Sep  8 14:38:31 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: modify program_prefix only if specified
-	  --program-prefix.
-
-	* configure.in: don't generate ext/extmk.rb.
-
-	* Makefile.in: execute directly $(srcdir)/ext/extmk.rb.
-	  remove -Cext option, "Dir::chdir 'ext'" in ext/extmk.rb.
-
-	* {win32,bccwin32}/Makefile.sub: ditto.
-
-	* instruby.rb: ditto.
-
-	* ext/extmk.rb: renamed from ext/extmk.rb.in.
-
-	* lib/mkmf.rb (module Logging): create log files (mkmf.log)
-	  in each extension module directories.
-
-	* ext/extmk.rb: ditto.
-
-	* lib/mkmf.rb (macro_defined?): new method.
-
-	* ext/.cvsignore: remove extmk.rb.
-
-	* ext/*/.cvsignore: add "*.def".
-
-	* lib/mkmf.rb (have_struct_member): moved from ext/socket/extconf.rb.
-
-	* ext/socket/extconf.rb: use macro_defined? instead of egrep_cpp.
-
-	* ext/etc/extconf.rb: use have_struct_member.
-
-	* ext/etc/etc.c: add prefix HAVE_ST_ to PW_ macros.
-
-Sun Sep  8 14:36:40 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* bcc32/configure.bat : Control of a message.
-	* bcc32/makefile.sub  : @(sitearch) typo.
-	* ext/extmk.rb.in     : [bccwin32] libdir is added to a library path.
-	* lib/mkmf.rb         : ditto.
-
-Sat Sep  7 23:32:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp
-	  alist for error message from ruby.
-
-	* misc/inf-ruby.el (inferior-ruby-mode): fixed for Emacs.
-
-	* misc/inf-ruby.el (ruby-send-region): compilation-parse-errors
-	  doesn't parse first line, so insert separators before each
-	  evaluations.
-
-Sat Sep  7 19:46:57 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: Disallow Set.new(false).  Add even more tests.
-	  [Submitted by: "Christoph" <chr_news@gmx.net>]
-
-Sat Sep  7 19:23:56 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: Fix a bug in flatten()'s recursive set detection.
-	  [Submitted by: "Christoph" <chr_news@gmx.net>]  Some tests
-	  against the bug are added.
-
-	* lib/set.rb: Resurrect the test suite by putting it after
-	  __END__ and executing `eval DATA.read'.
-
-Sat Sep  7 08:41:39 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (rb_gc_mark_parser): ruby_eval_tree is marked in eval.c.
-
-Fri Sep  6 20:01:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/mkmf.rb ($CC): command to compile C source.
-
-	* lib/mkmf.rb (logging): added.
-
-	* lib/mkmf.rb (try_compile): added.
-
-	* lib/mkmf.rb (egrep_cpp): use internal grep when pattern is
-	  Regexp, otherwise use external egrep command but get rid of
-	  pipe of command.com.
-
-	* lib/mkmf.rb (have_func): local variable should be volatile not
-	  to be eliminated by optimization.
-
-	* lib/mkmf.rb (create_makefile): link with CONFIG["LIBS"].
-
-	* lib/mkmf.rb (create_makefile): emit .SUFFIXES:.
-
-Fri Sep  6 12:11:22 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (rb_gc_mark_parser): should mark ALL global variables
-	  defined in parse.y.
-
-Fri Sep  6 01:15:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (ruby_xmalloc): remove MALLOC_LIMIT to avoid frequent
-	  garbage collection.
-
-Fri Sep  6 11:47:37 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (rb_gc_mark_parser): should mark global variables
-	  defined in parse.y.
-
-Fri Sep  6 10:34:32 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* io.c (rb_io_puts): RSTRING(line)->ptr might be NULL.
-
-Fri Sep  6 10:26:37 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y: should not put non-NODE-VALUEs in the semantic stack.
-
-Fri Sep  6 05:48:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* file.c (rb_path_check): nothing to check under DOSISH.
-	  [ruby-list:35772]
-
-Fri Sep  6 05:03:50 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* gc.c (rb_gc): should mark parser.
-
-	* parse.y (rb_gc_mark_parser): new function.
-
-	* intern.h (rb_gc_mark_parser): added.
-
-Thu Sep  5 18:32:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_path2class): should not use rb_eval_string().
-
-Thu Sep  5 17:18:22 2002  Michal Rokos  <michal@ruby-lang.org>
-
-	* dln.c: fix memory leak in dln_load (ruby-core:405) and
-	  in load_1 (ruby-core:407)
-
-Thu Sep  5 15:43:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_extended): should allow marshaling of object which
-	  is extended by named module.
-
-	* class.c (rb_make_metaclass): super may be T_ICLASS, need to skip.
-
-Thu Sep  5 13:09:22 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_eval): overriding false constant with class/module
-	  definition should be error.  (PR#327)
-
-Thu Sep  5 01:24:26 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* extmk.rb (create_makefile): add macro MAKEDIRS, INSTALL_PROG,
-	  INSTALL_DATA.
-
-	* extmk.rb (create_makefile): support for building to any directory.
-
-	* extmk.rb (xsystem): move to mkmf.rb.
-
-	* mkmf.rb (xsystem): support for extmk.rb
-
-	* mkmf.rb ($CPP): remove '-E' option.  add CPPFLAGS.
-
-Wed Sep  4 16:15:17 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: ==(o) should be aware of all the Set variant
-	  instances, not just those of its subclasses. [Submitted by:
-	  "Christoph" <chr_news@gmx.net>]
-
-	* lib/set.rb: - Fix eql?(). [ditto]
-
-Wed Sep  4 15:23:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_make_metaclass): obj.meta.super.meta should be equal
-	  to obj.meta.meta.super (ruby-bugs-ja:PR#324).
-
-Wed Sep  4 05:10:16 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* parse.y (yylex): the warning message "invalid
-	  character syntax" was never issued (ruby-bugs-ja:PR#323).
-
-Wed Sep  4 01:08:45 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_bytes): do not use alloca (ruby-bugs:PR#382).
-
-Tue Sep  3 17:12:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* extmk.rb: require mkmf.rb.  remove duplicate methods.
-	  use Config::CONFIG["FOO"] instead of @FOO@.
-
-	* mkmf.rb: support for extmk.rb.
-
-Mon Sep  2 23:01:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* re.c (rb_reg_search): MatchData must be rb_cMatch.
-	  (ruby-bugs-ja:PR#319)
-
-Mon Sep  2 21:21:46 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* gc.c (gc_sweep): does reclaim nodes in also compile time, if we
-	  can.
-
-	* ruby.c (load_file): omit GC if we can.
-
-	* parse.y (ruby_parser_stack_on_heap): new function.
-
-	* intern.h (ruby_parser_stack_on_heap): added.
-
-Mon Sep  2 18:45:07 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_copy_generic_ivar): remove old generic instance
-	  variable table if it exists.
-
-Sun Sep  1 15:54:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* config.guess: fixed for Linux/PPC.
-
-Sat Aug 31 09:38:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_make_metaclass): metaclass of a metaclass is a
-	  metaclass itself.
-
-Fri Aug 30 22:45:16 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: Added.
-
-Fri Aug 30 20:58:54 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* ext/Win32API/Win32API.c (Win32API_Call): typo.
-
-Fri Aug 30 19:45:52 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* variable.c (rb_const_assign): st_delete() takes pointer to key.
-
-Fri Aug 30 19:40:28 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/Win32API/Win32API.c (Win32API_Call): RSTRING()->ptr may be
-	  NULL.
-
-	* ext/nkf/nkf.c (rb_nkf_guess): ditto.
-
-	* ext/readline/readline.c (readline_s_set_completion_append_character):
-	  ditto.
-
-	* ext/socket/socket.c (sock_s_getaddrinfo, sock_s_getnameinfo):
-	  ditto.
-
-	* ext/tcltklib/tcltklib.c (ip_toUTF8, ip_fromUTF8): ditto.
-
-Fri Aug 30 01:32:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_singleton_class): superclass of a metaclass
-	  should be a metaclass of superclass.
-
-	* range.c (range_eq): two instances must belong to a same class to
-	  be equal.
-
-	* range.c (range_eql): ditto.
-
-	* io.c (rb_io_taint_check): frozen check added.
-
-	* file.c (rb_stat_become): frozen check added.
-
-	* object.c (rb_obj_become): ditto.
-
-	* re.c (rb_reg_become): ditto.
-
-	* struct.c (rb_struct_become): ditto.
-
-	* time.c (time_become): ditto.
-
-	* array.c (rb_ary_become): should call rb_ary_modify().
-
-	* hash.c (rb_hash_become): should call rb_hash_modify().
-
-	* compar.c (cmp_equal): should not use NUM2LONG(), since <=> may
-	  return bignum.
-
-	* compar.c (cmp_gt, cmp_ge, cmp_lt, cmp_le, cmp_between): ditto.
-
-Thu Aug 29 23:34:42 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* bcc32/MakeFile.sub (sitearch): add.
-
-Thu Aug 29 13:36:42 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (read_all): should use off_t instead of long.
-
-Thu Aug 29 00:55:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* marshal.c (r_object): yield loaded objects, not intermediates.
-	  (ruby-bugs-ja:PR#296)
-
-Thu Aug 29 00:06:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_become): should not free ptr if it's shared.
-
-	* eval.c (rb_alias): prohibit making an alias named "allocate" if
-	  klass is a metaclass.
-
-Wed Aug 28 23:59:15 2002  Michal Rokos  <michal@ruby-lang.org>
-
-	* signal.c: remove #ifdef SIGINT for struct signals.
-
-	* variable.c: get rid of fix length buffer in rb_class_path.
-
-Wed Aug 28 23:34:32 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (appendline): data was lost when raw mode.
-
-Wed Aug 28 22:57:34 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_string_value_ptr): StringValuePtr() should never
-	  return NULL pointer.
-
-Wed Aug 28 19:12:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/stringio/stringio.c (strio_initialize): RSTRING(mode)->ptr
-	  can be NULL.
-
-	* ext/stringio/stringio.c (strio_ungetc): fix buffer overflow.
-
-Wed Aug 28 18:19:55 2002  Michal Rokos  <michal@ruby-lang.org>
-
-	* file.c: fix memory leak in rb_stat_init.
-
-Wed Aug 28 17:45:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* win32/win32.c (kill): negate pid under Win9x.
-
-Wed Aug 28 16:36:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (ar): don't check ar twice.
-
-Wed Aug 28 15:00:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_delete_bang): should check if str->ptr is 0.
-
-	* string.c (rb_str_squeeze_bang): ditto.
-
-	* string.c (rb_str_count): ditto.
-
-	* string.c (rb_str_lstrip_bang): ditto.
-
-	* string.c (rb_str_rstrip_bang): ditto.
-
-	* string.c (rb_str_intern): ditto.
-
-Wed Aug 28 11:37:35 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.h: define SIGINT and SIGKILL if not defined.
-
-	* win32/win32.c: remove definition of SIGINT and SIGKILL.
-
-Tue Aug 27 19:50:27 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ruby.c (require_libraries): prevent ruby_sourcefile from GC.
-
-Tue Aug 27 15:03:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_find_file): $LOAD_PATH must not be empty.
-
-	* file.c (rb_find_file_ext): ditto.
-
-Tue Aug 27 02:35:21 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_eq): class check should be based on range.class,
-	  instead of Range to work with Range.dup.
-
-	* range.c (range_eql): ditto.
-
-Mon Aug 26 18:17:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_mod_dup): need to preserve metaclass and flags.
-
-Mon Aug 26 10:44:18 2002  Tanaka Akira  <akr@m17n.org>
-
-	* object.c (rb_cstr_to_dbl): had a buffer overrun.
-
-Sun Aug 25 20:10:32 2002  Wakou Aoyama  <wakou@ruby-lang.org>
-
-	* lib/cgi.rb (CGI#form): fix ruby-bugs-ja:PR#280, add default action.
-
-Sat Aug 24 15:32:16 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (call_trace_func): restore source file/line, as trace
-	  function installed in required library with -r option can be
-	  called while parsing.  (ruby-bugs:PR#372)
-
-	* eval.c (module_setup): unused variable.  [ruby-core:00358]
-
-Sat Aug 24 14:59:02 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_class): integrate singleton check into a function
-	  to follow DRY principle.
-
-	* marshal.c (w_uclass): should check singleton method.
-
-	* object.c (rb_obj_dup): dmark and dfree functions must be match
-	  for T_DATA type.
-
-	* object.c (rb_obj_dup): class of the duped object must be match
-	  to the class of the original.
-
-Sat Aug 24 13:57:28 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb (Time.rfc2822, Time#rfc2822): preserve localtimeness.
-
-	* lib/pp.rb: pretty_print_cycled is renamed to pretty_print_cycle.
-
-Fri Aug 23 23:59:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (method_call): check receiver is defined.
-
-	* eval.c (umethod_call): removed.
-
-Fri Aug 23 23:39:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_quote): do not escape \t, \f, \r, \n, for they are
-	  not regular expression metacharacters.
-
-	* time.c (time_s_alloc): use time_free instead of free (null check,
-	  also serves for type mark).
-
-	* time.c (time_s_at): check dfree function too.
-
-Fri Aug 23 17:06:48 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: RUBY_SO_NAME is msvcrt-rubyXX on mswin32/mingw32.
-
-	* configure.in (sitearch): new var.
-
-	* mkconfig.rb, lib/mkmf.rb (sitearch): ditto.
-
-	* win32/Makefile.sub, win32/setup.mak (sitearch): ditto.
-
-	* instruby.rb: ditto.
-
-Wed Aug 21 16:53:00 2002  Michal Rokos  <michal@ruby-lang.org>
-
-	* *.c: int, long types cleanup.
-
-	* parse.y: ditto.
-
-	* re.h, regex.h, ruby.h: ditto.
-
-Wed Aug 21 16:43:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_cleanup): should not modify the global
-	  variable curr_thread.
-
-Wed Aug 21 16:14:26 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: set ac_cv_func__setjmp to "no" on Cygwin.
-
-	* configure.in: set ac_cv_func_crypt to "no" on MinGW.
-
-Tue Aug 20 21:47 2002  KONISHI Hiromasa  <konishih@fd6.so-net.ne.jp>
-
-	* io.c          (rb_io_fread): remove case EPIPE on bcc32 .
-
-	* win32/win32.c (rb_w32_getc): clear EPIPE error on bcc32.
-
-Tue Aug 20 19:39:03 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* file.c (rb_file_s_expand_path): accept drive letter on Cygwin.
-
-	* file.c (is_absolute_path): ditto.
-
-Tue Aug 20 12:12:25 2002  Tietew <tietew@tietew.net>
-
-	* io.c (rb_io_putc): output via rb_io_write().
-
-Mon Aug 19 19:01:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/inf-ruby.el (inf-ruby-keys): ruby-send-definition
-	  conflicted with ruby-insert-end.
-
-	* misc/inf-ruby.el (inferior-ruby-mode): compilation-minor-mode.
-
-	* misc/inf-ruby.el (ruby-send-region): send as here document to
-	  adjust source file/line.  [ruby-talk:47113], [ruby-dev:17965]
-
-	* misc/inf-ruby.el (ruby-send-terminator): added to make unique
-	  terminator.
-
-Mon Aug 19 17:08:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize_m): frozen check should be moved here
-	  from rb_reg_initialize().
-
-Mon Aug 19 15:38:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (sort_2): comparison should be done as signed long.
-
-	* array.c (sort_2): should return int, not VALUE.
-
-Mon Aug 19 12:38:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_save_context, rb_thread_restore_context):
-	  save/restore SEH chain on MS-Windows at thread switch.
-	  [ruby-win32:273]
-
-	* eval.c (win32_get_exception_list, win32_set_exception_list):
-	  added.
-
-Sat Aug 17 23:01:25 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (sort_2): *a - *b may overflow.
-
-Sat Aug 17 00:25:08 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (ary_new): len*sizeof(VALUE) may be a positive value.
-
-	* array.c (rb_ary_initialize): ditto.
-
-Fri Aug 16 15:58:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (NOFILE): define NOFILE as 64 if not defined.
-
-	* signal.c (sighandler_t): rename to sh_t on dietlibc.
-
-Fri Aug 16 15:37:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bignum.c (rb_cstr_to_inum): new decimal and octal string.
-
-Fri Aug 16 13:17:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_class_allocate_instance): move singleton class
-	  check from rb_obj_alloc().
-
-Fri Aug 16 11:47:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (rb_io_fread): renamed from io_fread and made extern.
-
-	* marshal.c (r_bytes0): check if successfully read, use
-	  rb_io_fread() instead of fread() to be preemptive.
-	  (ruby-bugs-ja:PR#294, 295)
-
-	* rubyio.h (rb_io_fread): added.
-
-Fri Aug 16 07:57:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (compile_error): must not clear ruby_sourcefile here.
-	  (ruby-bugs:PR#364).
-
-	* eval.c (rb_longjmp): set ruby_sourcefile before making
-	  backtrace.
-
-Thu Aug 15 20:38:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (ruby_current_node) : added to set sourceline on demand.
-
-	* eval.c (error_pos, error_print, rb_longjmp, assign): set source
-	  file/line.
-
-	* eval.c (rb_eval): store current node instead of file/line, and
-	  preserve it at return.
-
-	* eval.c (module_setup): ditto.
-
-	* eval.c (struct thread): store node instead of file/line.
-
-	* eval.c (rb_thread_raise): ditto.
-
-	* intern.h (ruby_current_node): added.
-
-	* intern.h (ruby_set_current_source): added.
-
-	* parse.y (stmt, arg): not fix position of assignment.
-
-	* parse.y (node_assign): ditto.
-
-	* parse.y (yycompile): clear current node.
-
-Thu Aug 15 00:48:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): should not modify frozen Regexp.
-
-Tue Aug 13 18:33:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/tcltklib/tcltklib.c (ip_init): allocation framework.
-
-Tue Aug 13 15:32:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_replace): should copy ifnone.
-
-	* hash.c (rb_hash_dup): should preserve HASH_PROC_DEFAULT and
-	  HASH_DELETED flags.
-
-	* hash.c (rb_hash_shift): shift from empty hash should not return
-	  its default proc.
-
-	* hash.c (rb_hash_default_proc): new method. [new]
-
-Tue Aug 13 00:37:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_aref): no need for Bignum check.
-
-	* array.c (rb_ary_aset): explicit Bignum check removed.
-
-	* numeric.c (fix_aref): normalize bignum before bit-op.
-
-	* bignum.c (rb_big_rand): max may be Bignum zero.
-
-	* bignum.c (rb_cstr_to_inum): should normalize bignums, to avoid
-	  returning fixable bignum value.
-
-	* bignum.c (rb_uint2big): there should be no zero sized bignum.
-
-Mon Aug 12 23:45:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/extmk.rb.in: extmake() that works properly for both tkutil
-	  (tk/tkutil.so) and digest/sha1.
-
-Mon Aug 12 22:29:35 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ruby.c (set_arg0): Correct the position of #endif.
-
-Mon Aug 12 17:25:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_equal): should check HASH_PROC_DEFAULT too.
-
-Mon Aug 12 16:15:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* bignum.c (rb_big_cmp): raise for NaN.  (ruby-bugs-ja:PR#284).
-
-Sun Aug 11 09:34:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_eval): set line number from all nodes.
-
-	* eval.c (proc_to_s): show source file/line if available.
-
-	* marshal.c (r_object): register TYPE_BIGNUM regardless real type.
-
-Sat Aug 10 23:47:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_cmp): use dbl2big() for Floats, instead of
-	  big2dbl().
-
-	* bignum.c (Init_Bignum): rb_big_zero_p() removed.  There may be
-	  Bignum zero.
-
-Fri Aug  9 13:31:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/Win32API/extconf.rb: check existence of <windows.h>.
-
-Thu Aug  8 09:37:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/optparse.rb (NilClass): must provide conversion block.
-
-	* lib/optparse.rb (String): ditto.
-
-Thu Aug  8 00:45:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): new argument added for original method name.
-	  preserve original method name in frame->orig_func.
-
-	* eval.c (is_defined): use frame->orig_func, not last_func.
-
-	* eval.c (rb_eval): ditto.
-
-	* eval.c (method_call): supply data->oid also to rb_call0().
-
-	* object.c (rb_class_allocate_instance): call rb_obj_alloc() when
-	  called from alias, thus invoke original "allocate".
-
-	* eval.c (remove_method): removing allocate from classes should
-	  cause NameError.
-
-Wed Aug  7 22:12:54 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/optparse.rb (OptionParser::Completion::convert): returned
-	  all values not first one.
-
-	* lib/optparse.rb (OptionParser::Switch::parse): return values as
-	  is.
-
-	* lib/optparse.rb (OptionParser::order): ditto.
-
-	* lib/optparse/time.rb: prior time.rb.
-
-	* lib/optparse/uri.rb: require standard uri module.  thanks to
-	  Minero Aoki.
-
-Wed Aug  7 09:51:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_equal): should check default values.
-
-Wed Aug  7 08:44:32 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/racc/cparse/cparse.c: reduce goto.
-
-Tue Aug  6 15:19:39 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* string.c (rb_str_rindex): must return -1 if unmatched.
-
-Mon Aug  5 22:41:18 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* MANIFEST: add lib/racc/parser.rb.
-
-	* ext/racc/cparse/cparse.c: code refine.
-
-	* ext/racc/cparse/MANIFEST: add depend.
-
-Sun Aug  4 22:30:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/curses/curses.c: follow allocation framework.
-
-Sat Aug  3 21:23:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_eval): set constant in cbase scope.
-
-	* eval.c (assign): ditto.
-
-Fri Aug  2 09:12:32 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: follow allocation framework.
-
-Fri Aug  2 01:21:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (s_recvfrom): update RSTRING len.
-
-Thu Aug  1 17:47:15 2002  Tachino Nobuhiro <tachino@jp.fujitsu.com>
-
-	* parse.y (tokadd_string): ignore backslashed spaces in %w.
-
-Thu Aug  1 14:14:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_find): do not use rb_eval_cmd(); should not accept
-	  a string for if_none.
-
-Wed Jul 31 14:11:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_undef): undef should be done for klass, not ruby_class.
-
-Tue Jul 30 19:48:51 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-accurate-end-of-block): restrict search
-	  region.
-
-	* misc/ruby-mode.el (ruby-parse-partial): reversed wrong patch.
-
-Tue Jul 30 17:21:13 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-accurate-end-of-block): incomplete block
-	  caused infinite loop.
-
-	* misc/ruby-mode.el (ruby-parse-partial): returns nil unless
-	  delimiters found.
-
-Tue Jul 30 15:24:07 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): win32_getenv returns
-	  the same address always, so allocate string by ruby_strdup.
-
-	* win32/win32.c: prototype; rb_w32_open_osfhandle().
-
-Tue Jul 30 09:11:07 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (rb_thread_join_m): add parameter type declaration.
-
-Tue Jul 30 08:37:11 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (localjump_error): add parameter type declaration.
-
-Mon Jul 29 16:00:54 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb.in: always use File.expand_path for $top_srcdir.
-
-Sat Jul 27 23:07:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_to_int): default to_int implementation for every
-	  numeric class.
-
-Sat Jul 27 08:09:03 2002  Booker C. Bense  <bbense@slac.stanford.edu>
-
-	* re.c (rb_reg_quote): initial part of the string was never copied
-	  to the quoted string.
-
-Fri Jul 26 23:03:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_eval): no need to convert to string twice.
-
-Fri Jul 26 18:32:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-expr-beg): wrong indent at modifiers
-	  after ?.
-
-Fri Jul 26 16:01:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb.in (create_makefile): use Regexp in gsub.
-
-	* sample/mkproto.rb: ditto and fix bug.
-
-Fri Jul 26 14:31:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* random.c: replace with Mersenne Twister RNG.
-
-Fri Jul 26 12:14:48 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (yylex): modify to accept a code like "m (a){...}".
-
-Thu Jul 25 09:05:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-delimiter): include here document.
-
-	* misc/ruby-mode.el (ruby-deep-arglist): skips spaces after
-	  parenthesis when 'space.
-
-	* misc/ruby-mode.el (ruby-imenu-create-index): fix for nested
-	  classes.
-
-	* misc/ruby-mode.el (ruby-accurate-end-of-block): added.  scan a
-	  block in the order.
-
-	* misc/ruby-mode.el (ruby-expr-beg): support for here document.
-
-	* misc/ruby-mode.el (ruby-parse-partial): splitted from
-	  ruby-parse-region.
-
-	* misc/ruby-mode.el (ruby-move-to-block): skips RD style comments.
-
-Wed Jul 24 09:47:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (jump_tag_but_local_jump): preserve retval in
-	  LocalJumpError exceptions.
-
-	* parse.y (command): no more check for "super outside of method".
-
-	* eval.c (rb_mod_define_method): should set last_class and
-	  last_func in the block->frame.
-
-Mon Jul 22 17:23:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (error_handle): should handle TAG_THROW as well.
-
-Fri Jul 19 10:52:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): new decimal notation '0d4567'.
-
-Thu Jul 18 11:52:02 2002  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (set_socket): new method.
-
-Thu Jul 18 06:51:24 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (yylex): fix typo.
-
-Wed Jul 17 18:41:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): new octal notation '0o777'.
-
-Mon Jul 15 18:36:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (string_content): every string_content node should
-	  return string only.  use NODE_EVSTR to coercing.
-
-	* eval.c (rb_eval): NODE_EVSTR support.
-
-Mon Jul 15 10:35:35 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (heredoc_identifier): fix typo.
-
-Sat Jul 13 09:30:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (literal_concat_string): wrong optimization.
-
-Sat Jul 13 01:25:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/resolv.rb (Resolv::DNS::open, close): new.
-
-	* lib/optparse.rb, lib/optparse: import.
-
-Fri Jul 12 06:34:05 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: rename HTTP.get_uri get_response.
-
-	* lib/net/http.rb: HTTP.get_print accepts URI objects.
-
-	* lib/net/http.rb: HTTP.get had not work with URI objects.
-
-Fri Jul 12 02:15:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* string.c (rb_str_match): fix for string match.
-
-Fri Jul 12 00:02:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/stringio/stringio.c (strio_gets_internal): fixed for record
-	  separator longer than 1.
-
-Thu Jul 11 17:59:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_quote): avoid unnecessary string allocation.
-
-	* string.c (get_pat): quote metacharacters before compiling a
-	  string into a regex.
-
-	* string.c (rb_str_split_m): special treatment of strings of size
-	  1, but AWK emulation.  now uses get_pat().
-
-	* string.c (rb_str_match_m): quote metacharacters.
-
-	* string.c (rb_str_match2): ditto.
-
-Thu Jul 11 12:59:23 2002  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/resolv.rb: untaint strings read from /etc/hosts and
-	  /etc/resolv.conf to prevent SecurityError when $SAFE==1.
-
-Thu Jul 11 09:00:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_slice_bang): if there's no corresponding
-	  substring, slice! should return nil without exception.
-
-Tue Jul  9 20:03:55 2002 Keiju Ishitsuka <keiju@ishitsuka.com>
-
-	* irb 0.9
-
-Sat Jul  6 07:35:02 2002  Jamie Herre  <jfh@gettysgroup.com>
-
-	* array.c (rb_ary_insert): type fixed.
-
-Fri Jul  5 09:17:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_split_m): accept separator value nil as well.
-
-Fri Jul  5 08:59:15 2002  Michal Rokos <michal@ruby-lang.org>
-
-	* enum.c: Fix bug in enum_sort_by and some code indents
-
-Fri Jul  5 05:00:40 2002  Wakou Aoyama  <wakou@ruby-lang.org>
-
-	* lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
-	  thanks to Sean Chittenden <sean@ruby-lang.org>, Shugo Maeda
-	  <shugo@modruby.net>
-
-Fri Jul  5 00:10:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_become): was leaking memory.
-
-Thu Jul  4 23:43:26 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y: remove useless function str_extend_p().
-
-Wed Jul  3 14:26:40 2002  Sean Chittenden  <sean@ruby-lang.org>
-
-	* lib/net/ftp.rb (get): new method.
-
-	* lib/net/ftp.rb (putt): ditto.
-
-	* lib/net/ftp.rb (binary): ditto.
-
-	* lib/net/ftp.rb (binary=): ditto.
-
-Wed Jul  3 13:57:53 2002  Sean Chittenden  <sean@ruby-lang.org>
-
-	* lib/net/ftp.rb (getbinaryfile): the second argument (localfile)
-	  is now optional.
-
-	* lib/net/ftp.rb (gettextfile): ditto.
-
-Wed Jul  3 13:45:42 2002  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb: use &block and yield for speed.
-
-Wed Jul  3 02:32:31 2002  Wakou Aoyama  <wakou@ruby-lang.org>
-
-	* lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
-
-Tue Jul  2 14:53:10 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_include_module): should not alter other
-	  classes/modules by inclusion.  by this fix, local order may not
-	  be preserved for some cases.
-
-	* class.c (include_class_new): module may be T_ICLASS; retrieve
-	  original module information.
-
-Tue Jul  2 14:13:11 2002  Wakou Aoyama  <wakou@ruby-lang.org>
-
-	* lib/cgi.rb (CGI#header): accept any type as value.
-
-Sun Jun 30 17:05:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (seekdir, telldir): add ac_cv_func_telldir=yes,
-	  ac_cv_func_seekdir=yes for MinGW.
-
-Sat Jun 29 01:43:32 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* io.c (pipe_finalize, pipe_popen): two-way pipe support for win32.
-
-	* win32/win32.c (ChildRecord, FindFreeChildSlot): ditto.
-
-	* win32/win32.c, win32/win32.h (pipe_exec): new function for two-way
-	  pipe support for win32.
-
-	* win32/win32.c, win32/win32.h (FindPipedChildSlot, rb_w32_popen,
-	  rb_w32_pclose): removed functions for two-way pipe support for win32.
-
-Fri Jun 28 23:49:34 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* pack.c (pack_unpack): change names of local variables because their
-	  names are overlapped.
-
-Fri Jun 28 17:54:07 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb: fix object address.
-
-Thu Jun 27 23:55:50 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_stat): fix buffer overflow. (ruby-bugs:PR#329)
-
-Thu Jun 27 20:57:45 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/prettyprint.rb, lib/pp.rb: convenience methods added.
-
-Thu Jun 27 15:22:18 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/prettyprint.rb: re-implemented for incremental output to handle
-	  huge data.  API is changed a bit.
-
-	* lib/pp.rb: adapt new pretty printing API.
-
-Thu Jun 27 08:28:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (literal_concat_string): non-string last expression in
-	  #{} was ignored when followed by literal.
-
-Thu Jun 27 03:42:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_expr_str): need to process backslashes properly.
-
-Wed Jun 26 17:33:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_any_to_a): declare Object#to_a to be obsolete.
-
-	* object.c (rb_Array): do not convert nil into [] automagically.
-
-Wed Jun 26 15:40:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (words, qwords): word list literal rules.
-
-	* parse.y (parse_string): ditto.
-
-	* parse.y (yylex): %W: word list literal with interpolation. [new]
-
-Tue Jun 25 18:53:34 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (string1, xstring, regexp): moved lex_strnest
-	  initialization to string_contents/xstring_contents.
-
-Tue Jun 25 19:24:38 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* dln.c: remove definition rb_loaderror().
-
-Tue Jun 25 00:34:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_Integer): use "to_int" instead of
-	  "to_i". [experimental]
-
-	* object.c (nil_to_f): new method.
-
-	* object.c (rb_Integer): Symbols and nil should cause error.
-
-	* object.c (rb_Float): nil should cause error.
-
-Tue Jun 25 00:21:00 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* dln.c: remark definition rb_loaderror().
-
-Tue Jun 25 00:14:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (string_dvar): allow back references in interpolation.
-
-Mon Jun 24 16:32:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_eval): NODE_EVSTR is no longer used.
-
-	* eval.c (eval): not enforce to make assigned variables dynamic.
-
-	* parse.y (string): split rules to strings/xstring/regexp to allow
-	  arbitrary statements inside string interpolation.
-
-	* parse.y (here_document): splitted into three phases.
-
-	* parse.y (literall_append, literal_concat): added.
-	  append/concatenate string literals.
-
-	* sample/test.rb (valid_syntax): adjust line number for BEGIN.
-
-	* lib/mkmf.rb (create_makefile): get rid of nested string.
-
-	* lib/mkmf.rb (install_rb): site-install didn't work properly.
-
-Sun Jun 23 00:19:10 2002  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb, lib/date/format.rb, sample/cal.rb, sample/goodfriday.rb:
-	  updated to the new version (based on date2 3.3).
-
-Sat Jun 22 14:41:33 2002  Guy Decoux  <ts@moulon.inra.fr>
-
-	* ext/socket/socket.c (sock_addrinfo): make all 3 versions of
-	  getaddrinfo happy.  [ruby-core:00184]
-
-Fri Jun 21 18:49:58 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): __END__ should not be effective within
-	  string literals.
-
-Thu Jun 20 21:09:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/readline/readline.c (readline_readline): get rid of
-	  libreadline's bug. (ruby-bugs-ja:PR#268)
-
-Thu Jun 20 17:10:27 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/ftool.rb (BUFSIZE): tuning, set buffer length to 8192.
-
-	* configure.in (__NO_ISOCEXT): add for mingw-runtime 2.0-2.
-
-	* configure.in (__MSVCRT__): removed because it is defined
-	  in the GCC specs.
-
-Wed Jun 19 14:46:18 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb, lib/mkmf.rb (xsystem): open the log file if xsystem
-	  is called.
-
-Wed Jun 19 01:01:13 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (here_document): should be aware of __END__ within here
-	  documents.
-
-Wed Jun 19 00:50:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (yylex): ? followed by successive word characters is
-	  ternary operator not numeric literal.
-
-	* parse.y (yylex): commands after break/next/rescue can take
-	  arguments.  (ruby-bugs-ja:PR#265)
-
-Tue Jun 18 19:20:16 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/mkexports.rb: remove unnecessary exports. (ruby-dev:17418)
-
-Tue Jun 18 12:50:17 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (yylex): should pushback proper char after '<<'.
-
-	* parse.y (range_op, cond0, cond): get rid of doubled warnings.
-
-	* parse.y (value_expr): reduce recursion level.
-
-	* parse.y (logop): ditto.
-
-Mon Jun 17 11:11:34 2002  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* string.c (rb_str_crypt): result need not be tainted always.
-
-Mon Jun 17 10:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* dln.c (dln_load): need to preserve dln_strerror() result,
-	  calling other dl family can clear it.
-
-Sat Jun 15 22:56:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): obsolete '?<whitespace>'; use '?\s', '?\n',
-	  etc, instead.
-
-Sat Jun 15 18:51:13 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c (glob_helper): Use lstat() instead of stat() so it catches
-	  a dead symlink.  Given a dead symlink named "a", Dir.glob("?")
-	  did catch it but Dir.glob("a") somehow didn't.
-
-Sat Jun 15 01:59:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): no here document after a dot.
-
-	* parse.y (yylex): should have set lex_state after '`'.
-
-	* parse.y (yylex): should have set lex_state properly after
-	  tOP_ASGN.
-
-Fri Jun 14 21:01:48 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* bcc32/mkexports.rb: insert sleep(1) for win9x.
-
-	* bcc32/configure.bat: change return code LF -> CRLF for win9x.
-
-	* win32/win32.c: fix rb_w32_open_osfhandle()
-
-Fri Jun 14 15:22:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (read_escape): deny zero-width hexadecimal character.
-	  (ruby-bugs-ja:PR#260)
-
-	* parse.y (tokadd_escape): ditto.
-
-	* regex.c (re_compile_pattern): ditto.
-
-Fri Jun 14 00:49:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big2dbl): return canonical HUGE_VAL for infinity.
-
-Thu Jun 13 09:43:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (svalue_to_avalue): v may be Qundef.  This fix was
-	  suggested by Guy Decoux.
-
-Thu Jun 13 00:33:49 2002  takuma ozawa  <metal@mine.ne.jp>
-
-	* hash.c (rb_hash_s_create): use rb_hash_aset() instead of calling
-	  st_insert() directly, to dup&freeze string keys.
-
-Thu Jun 13 00:12:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): proper error message for "@@0".
-
-	* parse.y (yylex): paren to parse_string() must be zero for
-	  unparenthesized strings.
-
-	* parse.y (str_extend): broken string when unterminated "#{".
-
-	* enum.c (enum_sort_by): had a bug in 1 element enumeration.
-
-Wed Jun 12 18:04:44 2002  akira yamada  <akira@arika.org>
-
-	* uri/common.rb (REGEXP::PATTERN::X_ABS_URI): 'file:/foo' is valid.
-
-	* uri/generic.rb (Generic#xxx=): should return substituted value.
-	  (ruby-dev:16728.)
-
-	* test/generic.rb (test_set_component): added tests for the above
-	  change.
-
-Wed Jun 12 02:38:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (stmt): fix typo.
-
-Wed Jun 12 01:10:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): 'do' should return kDO_BLOCK on EXPR_ENDARG.
-
-	* parse.y (singleton): "def (()).a end" dumped core.
-
-	* parse.y (range_op): node may be null.
-
-	* parse.y (match_gen): ditto.
-
-Tue Jun 11 19:20:34 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (LIBRUBY): rename to lib$(LIBRUBY_SO).a on Cygwin/MinGW.
-
-	* configure.in, cygwin/GNUmakefile: use dllwrap when --disable-shared
-	  is specified.
-
-Tue Jun 11 17:12:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): void value check for "..", "...", "!", and "not".
-
-	* parse.y (match_gen): void value check for "=~".
-
-	* parse.y (value_expr): check NODE_AND and NODE_OR recursively.
-
-	* parse.y (cond0): void value check added for conditionals.
-
-Tue Jun 11 13:18:47 2002  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (noop): new method.
-
-	* lib/net/ftp.rb (site): ditto.
-
-Tue Jun 11 13:15:41 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* bcc32/Makefile.sub: set PROCESSOR_LEVEL to 6 if it's too big value.
-
-	* win32/Makefile.sub: ditto.
-
-Tue Jun 11 12:37:46 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* bcc32/configure.bat fix.
-
-Tue Jun 11 10:18:23 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
-	* new platform [bccwin32] merged.
-	  - create new folder bcc32
-	  - modify any files for bccwin32
-	      error.c, file.c, hash.c, io.c, instruby.rb,
-	      ext/extmk.rb.in,
-	      lib/mkmf.rb, lib/ftools.rb,
-	      ext/digest/defs.h,
-	      ext/dl/depend, ext/dl/dl.c, ext/dl/sym.c, ext/dl/extconf.rb,
-	      ext/socket/extconf.rb,
-	      ext/pty/extconf.rb,
-	      ext/tcltklib/extconf.rb
-	      ext/Win32API/Win32API.c,
-	      win32/dir.h, win32/win32.c, win32/win32.h, win32/resource.rb
-
-Mon Jun 10 19:02:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* numeric.c (fix_lshift): negative shift count means right shift.
-	  (ruby-bugs-ja:PR#248)
-
-	* numeric.c (fix_rshift): return -1 when left side operand is
-	  negative. (ruby-bugs-ja:PR#247)
-
-	* parse.y (yylex): `0_' should be an error. (ruby-bugs-ja:PR#249)
-
-Mon Jun 10 01:53:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): ruby_frame->last_func may be null, if it's
-	  called outside of a method.
-
-	* parse.y (arg): use INT2NUM, not INT2FIX for tUMINUS.
-
-	* parse.y (arg): unnecessary negative tPOW treatment.
-
-	* parse.y (tokadd_escape): wrong backslash escapement.
-
-Sun Jun  9 17:40:41 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl: change the callback mechanism.
-
-Sat Jun  8 00:48:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (stmt,arg): too much void value check.
-
-	* parse.y (stmt,arg): need to check void value on rules which does
-	  not use node_assign().
-
-Thu Jun  6 19:50:39 2002  KONISHI Hiromasa <H_Konishi@ruby-lang.org>
-
-	* sample/biorhythm.rb (getPosiiton,etc)
-	  fix at changing Date module ( Date is changed Fixnum to Rational )
-
-Thu Jun  6 17:42:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (ipaddr): need not to taint hostnames.
-
-Thu Jun  6 12:04:30 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): use sub! instead of []= because
-	  []= causes exception.
-
-Thu Jun  6 11:42:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/thread.rb (Queue::pop): get rid of race condition.
-
-Wed Jun  5 01:56:47 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: Stop the running zombi-eventloop when
-	  mainloop_watchdog is killed.
-
-Tue Jun  4 23:09:24 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_include): should be based on "<=>", whereas
-	  member? still is based on "each".
-
-	* range.c (range_min,range_max): redefine methods based on "<=>".
-
-Tue Jun  4 18:28:37 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/socket/extconf.rb: The IPv6 stack of Cygwin is still incomplete.
-
-	* ext/Win32API/extconf.rb: refactoring.
-
-Tue Jun  4 07:03:33 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkfont.rb:  Fix bugs on TkFont.init_widget_font for Tk8.x.
-
-	* ext/tk/lib/tkafter.rb: Add self to 1st argument of interval- 
-	  and loop-proc
-	  TkAfter#current_interval returns an interval (sleep) time value
-	  TkAfter#current_args returns an array of arguments
-	  TkAfter#return_value returns a return value of last loop-proc
-
-	* ext/tk/lib/tk*.rb: Allow to use Symbols for parameters.
-
-	* ext/tk/lib/tkcanvas.rb: (TkcItem) Add 'coords' parameter to the 
-	  canvas item constructor (for new notation of constructor).
-
-	* ext/tcltklib/tcltklib.c: New 'mainloop' and 'mainloop_watchdog'.
-
-	* ext/tk/lib/tk.rb: (Tk.restart) Add 'app-name' paramater and
-	  'use' parameter.
-
-	* ext/tk/lib/tk.rb: Add new parameter 'widgetname' to the widget
-	  constructor to support effective use of Resource Database. 
-
-	* ext/tk/lib/tk.rb: TkOption::get always returns a tainted string.
-
-Tue Jun  4 00:45:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/socket/addrinfo.h: typo.
-
-	* ext/socket/getaddrinfo.c (gai_strerror): make literals const.
-
-	* ext/socket/socket.c (init_inetsock): ensures resources are
-	  freed at exceptions.
-
-	* ext/socket/socket.c (init_unixsock): ditto.
-
-	* ext/socket/socket.c (udp_connect): ditto.
-
-Mon Jun  3 20:39:51 2002  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/extconf.rb : change PLATFORM with RUBY_PLATFORM.
-
-Mon Jun  3 07:07:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (here_document): check if identifier is terminated.
-	  (ruby-bugs-ja:PR#239)
-
-	* parse.y (yylex): should pushback proper char after '**'.
-	  (ruby-bugs-ja:PR#240)
-
-Mon Jun  3 05:56:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_aset): should raise error if an indexing string
-	  is not found in the receiver.
-
-	* sprintf.c (rb_f_sprintf): "%d" should convert objects into
-	  integers using Integer().
-
-Sat Jun  1 19:20:07 2002  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole: merge from rough.
-
-Fri May 31 17:11:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile::size): added.
-
-Thu May 30 12:52:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): iteration done using "+" if elements are
-	  Numeric.  Otherwise using "succ".
-
-	* range.c (range_each): iteration done using "succ".  If the
-	  elements does not respond to "succ", raise TypeError.  As a
-	  result, all Enumerable methods, e.g. collect, require elements
-	  to respond to "succ".
-
-	* range.c (range_member): comparison done using "each", if
-	  elements are non-Numeric or no-"succ" objects.  Otherwise
-	  compare using "<=>".
-
-	* range.c (Init_Range): remove "size" and "length".
-
-Thu May 30 09:16:36 2002  Wakou Aoyama  <wakou@ruby-lang.org>
-
-	* lib/cgi.rb: if StringIO is usable then use it.
-
-Wed May 29 18:55:47 2002  KONISHI Hiromasa <H_Konishi@ruby-lang.org>
-
-	* function renames my* and win32_* to rb_w32_* in win32/win32.c
-	  fixed files win32/win32.c, win32/win32.h, win32/dir.h,
-	              hash.c, rubysig.h, signal.c, ext/socket/socket.c
-
-Wed May 29 17:32:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* time.c (tmcmp, search_time_t): activate unless HAVE_TIMEGM.
-
-Wed May 29 13:45:15 2002  Wakou Aoyama  <wakou@ruby-lang.org>
-
-	* lib/cgi.rb: not use const if GET, HEAD. check multipart form head.
-
-Tue May 28 17:56:02 2002  Sean Chittenden  <sean@ruby-lang.org>
-
-	* parse.y: yyparse #defines moved from intern.h
-
-	* ruby.c (proc_options): access prefixed "ruby_yydebug".
-
-	* applied modifies to pacify some of gcc -Wall warnings.
-
-Tue May 28 14:07:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): no more ugly hack for "**", so that "-2**2" to be
-	  parsed as "(-2)**2", whereas "- 2**2" or "-(2)**2" to be parsed
-	  as "-(2**2)".
-
-	* parse.y (yylex): '-2' to be literal fixnum. [new]
-
-Tue May 28 12:13:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (scope_node): trick to keep the node has a scope.
-
-	* eval.c (rb_eval): NODE_EVSTR: write back local_tbl to the node.
-
-	* eval.c (rb_eval): NODE_SCOPE: hold the scope node in ruby_scope.
-
-	* eval.c (module_setup): ditto.
-
-	* eval.c (rb_call0): ditto.
-
-	* node.h (NEW_DASGN, NEW_DASGN_CURR): remove surplus semicolons.
-
-Fri May 24 09:06:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_arg): nil test against v[6] (usec).
-
-Thu May 23 16:39:21 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ruby.c (proc_options): option parsing problem.
-	  (ruby-bugs-ja:PR#233)
-
-Thu May 23 09:13:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (proc_options): removed "-*-" support for #! line.
-
-	* io.c (rb_io_s_sysopen): new method to get a raw file
-	  descriptor. [new]
-
-	* ext/socket/socket.c (tcp_sysaccept): new method to return an
-	  accepted socket fd (integer). [new]
-
-	* ext/socket/socket.c (unix_sysaccept,sock_sysaccept): ditto.
-
-Wed May 22 21:26:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ruby.c (proc_options): -T consumes digits only.
-
-Wed May 22 20:18:31 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: need not link vsnprintf.o on MinGW.
-
-Wed May 22 18:34:23 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (yylex): Here-document label ate '-'.
-
-Tue May 21 13:25:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-font-lock-keywords): symbols end with
-	  '_'.
-
-Tue May 21 04:48:37 2002  Sean Chittenden <sean@chittenden.org>
-
-	* lib/cgi-lib.rb: Checking for constant MOD_RUBY instead of
-	  environment variable. Remove a mod_ruby warning and use
-	  Apache::request.headers_out[] instead.
-
-Tue May 21 01:16:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (bodystmt): ensure clause was executed on else clause
-	  without rescue clause.
-
-Tue May 21 00:20:25 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl/ptr.c: rename PtrData::alloc to PtrData::malloc.
-
-	* ext/dl/lib/dl/struct.c: rename Struct#alloc to Struct#malloc.
-
-Mon May 20 14:29:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): should do exact match for Module#==.
-
-	* compar.c (cmp_eq): returns 'false' if <=> returns 'nil'.
-
-	* compar.c (cmp_gt,cmp_ge,cmp_lt,cmp_le,cmp_between): ditto.
-
-Mon May 20 13:28:52 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* io.c (rb_io_clone): writing stream was not copied properly.
-
-Sat May 18 21:38:11 2002  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb, lib/date/format.rb, lib/parsedate.rb:
-	  updated to the new version (based on date2 3.2.1).
-
-Sat May 18 21:18:00 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.h): add VC++4/5 support about noreturn
-	  directive.
-
-Sat May 18 02:16:41 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): should propagate taintedness.
-
-	* pack.c (pack_unpack): ditto.
-
-Fri May 17 16:16:19 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* sample/test.rb: use eval instead of './miniruby -c',
-	  in order to check a syntax error.
-
-Thu May 16 14:46:34 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_select): cleanup conditional compilation.
-
-Wed May 15 06:13:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_schedule): need to preserve errno before
-	  calling rb_trap_exec().
-
-	* regex.c (calculate_must_string): a bug in charset/charset_not
-	  parsing.
-
-Tue May 14 18:17:44 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* win32/Makefile.sub: config.h inlined.  and catch up with the
-	  latest change.
-
-	* win32/config.h.in: no longer used.
-
-Tue May 14 14:49:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* gc.c (is_pointer_to_heap): avoid GCC 3.1 warnings.
-
-	* missing/strftime.c (timezone): it should take no argument on Cygwin.
-
-Tue May 14 03:07:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_clear_cache_by_class): new function.
-
-	* eval.c (set_method_visibility): should have clear cache for
-	  updated visibility.
-
-Mon May 13 14:38:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* djgpp/config.hin, djgpp/config.sed: catch up with the latest change.
-
-Mon May 13 01:59:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (flo_to_s): default format precision to be "%.16g".
-
-	* util.c (ruby_strtod): use own strtod(3) implementation to avoid
-	  locale hell.  Due to this change "0xff".to_f no longer returns 255.0
-
-Sun May 12 03:01:08 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* missing.h: add for missing/*.c.
-
-	* ruby.h: add `#include "missing.h"'.
-
-	* Makefile.in: add the dependency of missing.h by gcc -MM.
-
-	* MANIFEST: add missing.h
-
-Sat May 11 23:24:52 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl: enable dl's stack emulation for constructing function call.
-
-Sat May 11 10:52:09 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* dir.c (glob_helper): remove escaping backslashes.
-
-Sat May 11 02:46:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (avalue_to_yvalue): new function to distinguish yvalue
-	  (no-arg == Qundef) from svalue (no-arg == Qnil).
-
-	* eval.c (rb_yield_0): use avalue_to_yvalue().
-
-	* eval.c (assign): warn if val == Qundef where it means rhs is
-	  void (e.g. yield without value or call without argument).
-
-Fri May 10 19:00:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* parse.y (here_document): preserve line number begins here
-	  document.
-
-Fri May 10 01:55:44 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_thread_join): added an argument to limit time to wait
-	  the thread.
-
-	* eval.c (rb_thread_join_m): new. and added optional argument.
-
-Wed May  8 23:48:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (value_expr): need not to warn for WHILE and UNTIL,
-	  since they can have return value (via valued break).
-
-Tue May  7 17:13:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: forgot to add '-Wl,' to the gcc option on Cygwin/MinGW.
-
-Tue May  7 15:41:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/iconv/iconv.c (iconv_try): should initialize exceptions
-	  properly. (ruby-bugs-ja:PR#232)
-
-Tue May  7 15:28:03 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (rb_yield_0): The destination of the goto jump was wrong.
-
-Tue May  7 09:17:51 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (superclass): undesirable "unexpected return" when the
-	  superclass is not a Class.
-
-Sun May  5 06:53:45 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb: exclude topdir from the system configuration
-	  section and prevent it from being overridden.
-
-Fri May  3 20:19:00 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: add #include <errno.h> in AC_CHECK_DECLS().
-
-	* win32/config.h.in: define HAVE_DECL_SYS_NERR.
-
-Thu May  2 23:42:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_s_quote): # also should be quoted.
-
-Thu May  2 18:27:13 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb.in, lib/mkmf.rb: use 'do...end' instead of '{}' for
-	  Borland make.
-
-Thu May  2 08:01:56 2002  Chris Thomas  <kenshin@apple.com>
-
-	* error.c: use HAVE_DECL_SYS_NERR instead of platform names.
-
-Tue Apr 30 09:23:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_step): better iteration condition for float
-	  values;  suggested by Masahiro TANAKA <masa@ir.isas.ac.jp>.
-
-Tue Apr 30 05:59:42 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
-
-	* range.c (range_step): step (for Range#step method) <= 0 makes no
-	  sense, thus ArgError will be raised.
-
-	* range.c (range_each): Range#each method is special case for
-	  Range#step(1)
-
-Mon Apr 29 18:46:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_find_file): load must be done from an absolute path if
-	  $SAFE >= 4.
-
-Sun Apr 28 17:01:56 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (insert): fix prototype for ANSI C.
-
-Fri Apr 26 13:47:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_partition): new method. [new]
-
-Fri Apr 26 13:41:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_s_quote): quote whitespaces for /x cases.
-
-Fri Apr 26 06:48:23 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl/ptr.c (cary2ary): missing break in switch statements.
-
-Fri Apr 26 09:35:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_proc_new): make Proc from C function. [new]
-
-	* intern.h (rb_proc_new): prototype.
-
-Wed Apr 24 14:56:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (proc_to_proc): return self. [new]
-
-	* eval.c (block_pass): no need to convert if block is Proc.
-
-Wed Apr 24 14:21:41 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: set size of the initial stack from
-	  2MB to 32MB on MinGW/Cygwin.
-
-Wed Apr 24 14:06:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_step): try to reduce residual on Float operations.
-
-Wed Apr 24 06:48:31 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed.
-
-	* io.c (rb_io_mode_modenum): ditto.
-
-Wed Apr 24 01:16:14 2002  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_mark): must check if ptr is NULL
-	  first.  [ruby-talk:38873]
-
-	* lib/mkmf.rb (create_makefile): should print depend file when
-	  make is other than nmake.
-
-Wed Apr 24 00:37:12 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/extmk.rb.in (create_makefile): use `{$(srcdir)}' directive instead
-	  of `$(srcdir)/' when including depend file.
-
-	* lib/mkmf.rb (create_makefile): add `{$(srcdir)}' when including depend
-	  file.
-
-Tue Apr 23 12:58:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_memerror): rename from mem_error, and exported.
-
-	* gc.c (Init_GC): pre-allocate NoMemoryError instance.
-
-	* object.c (convert_type): error message changed from "failed to
-	  convert" to "cannot convert", since it does not try to convert
-	  if an object does not respond to the converting method.
-
-Mon Apr 22 09:31:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (block_pass): convert Method to Proc using
-	  rb_check_convert_type().
-
-	* object.c (rb_check_convert_type): always convert T_DATA
-
-	* eval.c (rb_thread_cleanup): should not terminate main_thread by
-	  Fatal error.
-
-	* regex.c (is_in_list): need to not exclude NUL and NEWLINE.
-
-Sat Apr 20 00:19:13 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_expr_str): wrong backslash escapement.
-
-	* re.c (rb_reg_expr_str): do not escape embedded space
-	  characters.
-
-Fri Apr 19 22:03:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/Makefile.sub: add -DNT to $CFLAGS instead of $CPPFLAGS.
-
-	* win32/setup.mak: ditto.
-
-Fri Apr 19 17:24:22 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): T_DATA process patch from Joel VanderWerf
-	  <vjoel@PATH.Berkeley.EDU>.  This is temporary hack; it remains
-	  undocumented, and it will be removed when marshaling is
-	  re-designed.
-
-	* marshal.c (r_object): ditto.
-
-Fri Apr 19 17:10:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_step): Integer#step is moved to Numeric#step;
-	  Fixnum#step is merged into this method.
-
-	* numeric.c (int_dotimes): Fixnum#times is merged.
-
-	* numeric.c (int_upto): Fixnum#upto is merged.
-
-	* numeric.c (int_downto): Fixnum#downto is merged.
-
-Fri Apr 19 16:22:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/socket/extconf.rb: include <windows.h>, <winsock.h> on _WIN32.
-
-	* win32/win32.c: include <mswsock.h> on __MINGW32__.
-
-	* configure.in: cleanup for autoconf 2.5x.
-
-	* configure.in: use gcc -shared instead of dllwrap on Cygwin/MinGW.
-
-	* ext/extmk.rb, lib/mkmf.rb: get rid of "--def=".
-
-Fri Apr 19 14:57:44 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* re.c (rb_reg_to_s): remove redundant shy group.
-
-Fri Apr 19 01:08:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_cleanup): current thread may be THREAD_STOPPED,
-	  for example when terminated from signal handler.
-
-Thu Apr 18 19:03:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): remove /p support.
-
-	* regex.h: ditto.
-
-	* parse.y (parse_regx): ditto.
-
-Thu Apr 18 17:01:43 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl/ptr.c (rb_dlptr_cast): removed.
-
-Thu Apr 18 17:01:43 2002  Tanaka Akira  <akr@m17n.org>
-
-	* re.c (rb_reg_to_s): new function for Regexp#to_s.
-
-Wed Apr 17 23:55:34 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/Setup*, ext/bigfloat/*: Back out the import of BigFloat in
-	  favor of its forthcoming successor, BigDecimal.
-
-Wed Apr 17 16:53:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_expr_str): should treat backslash specially in
-	  escaping.
-
-Wed Apr 17 08:16:41 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
-
-	* io.c: complete off_t handling; missing argument for
-	  fptr_finalize(); polished rb_scan_args call.
-
-Wed Apr 17 00:01:59 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
-
-	* dir.c: wrap multi-statement macro by do { } while (0)
-
-	* eval.c, numeric,c, sprintf.c, util.c: ditto.
-
-Tue Apr 16 08:59:50 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (assign): convert mrhs to mvalue.
-
-Mon Apr 15 18:12:57 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_eq): check `y == x' if y is neither Fixnum,
-	  Bignum, nor Float.
-
-Mon Apr 15 09:27:31 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): should treat 'U' in character unit, not in
-	  byte unit.
-
-	* error.c (exc_initialize): should clear backtrace information.
-
-Sat Apr 13 23:42:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_fptr_cleanup): should close IO created by IO.new(fd).
-
-	* rubyio.h: remove FMODE_FDOPEN
-
-Fri Apr 12 12:54:04 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* win32/Makefile.sub: use missing/acosh.c.
-
-	* win32/config.h.in: define HAVE_COSH, HAVE_SINH, and HAVE_TANH.
-
-Fri Apr 12 02:58:55 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* struct.c (rb_struct_select): fix typo.
-
-Fri Apr 12 00:34:17 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* MANIFEST (missing/acosh.c): added.
-
-	* Makefile.in (missing/acosh.c): ditto.
-
-	* Makefile.in (missing/fileblocks.c): ditto.
-
-	* configure.in (AC_REPLACE_FUNCS): check acosh() on behalf of
-	  inverse hyperbolic functions, asinh() and atanh().
-
-	* missing/acosh.c: added for acosh(), asinh() and atanh().
-
-Thu Apr 11 20:01:44 2002  Masahiro Tomita  <tommy@tmtm.org>
-
-	* io.c (io_write): check error if written data is less than
-	  specified size to detect EPIPE.
-
-Thu Apr 11 19:10:37 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (remain_size): IO#read returns "" if file.size == 0.
-
-	* random.c (rand_init): add check for initstate(3).
-
-	* configure.in: ditto.
-
-Thu Apr 11 09:31:19 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl/ptr.c: raise() -> rb_raise(). (Thanks Tetsuya Watanabe)
-
-	* ext/dl/sym.c: ditto.
-
-Thu Apr 11 07:57:48 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
-
-	* eval.c (assign): ruby_verbose should be surrounded by RTEST().
-
-	* object.c (rb_str2cstr): ditto.
-
-	* parse.y (void_expr): ditto.
-
-	* parse.y (void_stmts): ditto.
-
-	* variable.c (rb_ivar_get): ditto.
-
-	* variable.c (rb_cvar_set): ditto.
-
-	* variable.c (rb_cvar_get): ditto.
-
-Thu Apr 11 07:02:31 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl: Add dl.txt instead of README and README.html.
-
-Thu Apr 11 01:55:52 2002  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi/session.rb: support for multipart form.
-
-Wed Apr 10 18:42:23 2002  Tachino Nobuhiro <tachino@jp.fujitsu.com>
-
-	* dir.c (glob_helper): should have proceed link when link->path
-	  was non existing symbolic link.
-
-Wed Apr 10 17:30:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_obj_remove_instance_variable): raise NameError if
-	  specified instance variable is not defined.
-
-	* variable.c (generic_ivar_remove): modified to check ivar
-	  existence.
-
-Wed Apr 10 14:16:45 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* misc/ruby-mode.el (ruby-font-lock-keywords): fontify symbols for
-	  unary operators and aset.
-
-Tue Apr  9 13:40:31 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* lib/mkmf.rb (try_link0): need expand macro in command, sync with
-	  ext/extmk.rb.in.
-
-	* lib/mkmf.rb (try_cpp): ditto.
-
-	* lib/mkmf.rb (egrep_cpp): ditto.
-
-Tue Apr  9 12:44:59 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/stringio/stringio.c (check_modifiable): performance
-	  improvement.  avoid calling rb_str_modify() twice.
-
-	* ext/stringio/stringio.c (strio_ungetc): ditto.
-
-	* ext/stringio/stringio.c (strio_putc): ditto.
-
-	* ext/stringio/stringio.c (strio_write): ditto, and use
-	  rb_str_cat() as possible.
-
-Tue Apr  9 05:17:48 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* re.c (match_select): fix index references and make
-	  MatchData#select actually work.
-
-Tue Apr  9 00:20:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_s_extname): new method based on the proposal
-	  (and patch) from Mike Hall. [new]
-
-Mon Apr  8 04:50:51 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (error_handle): default to 1 unless status is set.
-
-	* eval.c (ruby_options): guard error_handle() with PROT_NONE.
-
-	* eval.c (ruby_stop): ditto.
-
-Mon Apr  8 01:22:24 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* math.c (math_acosh): added. [new]
-
-	* math.c (math_asinh): ditto.
-
-	* math.c (math_atanh): ditto.
-
-	* struct.c (rb_struct_each_pair): method added. [new]
-
-Sat Apr  6 02:04:49 2002  Guy Decoux  <ts@moulon.inra.fr>
-
-	* class.c (rb_singleton_class): wrong condition; was creating
-	  unnecessary singleton class.
-
-Sat Apr  6 01:09:41 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (remove_sign_bits): simplifies the condition.
-
-	* bignum.c (get2comp): calculate proper carry over.
-
-Fri Apr  5 05:07:28 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl: Add dl/struct.rb.
-
-Thu Apr  4 14:08:52 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl/lib/dl/import.rb: Get rid of ineffective
-	  encoding/decoding procedures.
-
-Thu Apr  4 01:08:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (int_step): step may be a float less than 1.
-
-Wed Apr  3 20:42:34 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl: Merge Nakada's patch.
-
-	* ext/dl/dl.h: define StringValuePtr for ruby-1.6.
-
-Wed Apr  3 15:37:24 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl: Add dl/types.rb.
-
-Wed Apr  3 01:54:10 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/extmk.rb.in (enable_config): follow lib/mkmf.rb.
-
-Tue Apr  2 19:59:13 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* ext/dl: Merge from rough.
-
-Tue Apr  2 15:17:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* Makefile.in (CPPFLAGS): remove @includedir@.
-
-	* lib/mkmf.rb (create_makefile): ditto.
-
-	* ext/extmk.rb.in (create_makefile): ditto.
-
-Tue Apr  2 15:09:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_addrinfo): should clear addrinfo hints.
-
-Mon Apr  1 23:48:12 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
-	* lib/mkmf.rb: install any files using $INSTALLFILES.
-	  (see also [ruby-dev:16683])
-
-Mon Apr  1 17:25:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_fptr_cleanup): need flush even when io will not be
-	  closed.
-
-	* io.c (rb_io_initialize): was calling wrong function
-	  rb_io_mode_flags().
-
-Mon Apr  1 16:52:00 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/sdbm/init.c (each_pair): moved prototype before the
-	  definition.
-
-	* ext/racc/cparse/cparse.c (call_scaniter): ditto.
-
-Mon Apr  1 15:11:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
-
-	* ext/racc/cparse/cparse.c: prototype; call_scaniter().
-
-	* ext/sdbm/init.c: prototype; each_pair().
-
-	* ext/tcltklib/tcltklib.c: prototypes; _timer_for_tcl() and ip_ruby(),
-	  Nobu's patch at [ruby-dev:14483].
-
-Mon Apr  1 10:56:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (match_setter): it's OK to assign nil to $~.
-
-Mon Apr  1 03:55:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_fptr_cleanup): do not close IO created by for_fd().
-
-	* io.c (rb_io_initialize): mark IO created by for_fd
-
-	* ext/socket/socket.c (bsock_s_for_fd): ditto.
-
-Fri Mar 29 20:21:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* lib/mkmf.rb (create_makefile): default FLAGS to empty strings.
-
-Fri Mar 29 16:36:52 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* lib/mkmf.rb (arg_config): should use Shellwords::shellwords like
-	  ext/extmk.rb.in.
-
-	* lib/mkmf.rb (enable_config): default had priority over command
-	  line options and configure_args.
-
-	* lib/mkmf.rb: support autoconf 2.53 style variables from
-	  environment.
-
-	* lib/mkmf.rb: add directory options.
-
-Fri Mar 29 15:49:29 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/README.win32: follow recent changes.
-
-Fri Mar 29 14:44:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fflush): DRY patch from /Christoph applied.
-
-Thu Mar 28 18:58:13 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): reflect user defined $CC in
-	  config.status.
-
-Thu Mar 28 18:03:51 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: add taint check.
-
-	* ext/strscan/strscan.c: #getch/#get_byte should set regexp
-	  registers.
-
-	* ext/strscan/strscan.c: remove useless #include directive.
-
-	* ext/strscan/strscan.c: refactor struct strscanner.
-
-Thu Mar 28 14:51:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_addrinfo): should specify socktype
-	  from outside.
-
-Wed Mar 27 17:04:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_binmode): should call next_argv() to initialize ARGF.
-
-	* io.c (argf_filename): ditto.
-
-	* io.c (argf_file): ditto.
-
-Wed Mar 27 14:47:32 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (READ_DATA_PENDING): configure.in has supported for uClibc,
-	  so remove uClibc stuff.
-
-Wed Mar 27 13:14:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_sysseek): new method based on a patch from Aristarkh
-	  A Zagorodnikov <xm@bolotov-team.ru>. [new]
-
-	* io.c (READ_DATA_PENDING): use !feof(fp) for default behavior.
-
-Tue Mar 26 20:28:50 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: HTTP.get accepts URI.
-
-	* lib/net/http.rb: new method HTTP.get_uri.
-
-	* lib/net/http.rb: add some HTTP 1.1 response codes.
-
-Tue Mar 26 20:25:28 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* doc/net/protocol.rd.ja, smtp.rd.ja, pop.rd.ja: removed.
-
-	* MANIFEST: remove doc/net/* entries.
-
-Tue Mar 26 18:45:15 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (FILE_READPTR): check bufread instead of bufend
-	  for uClibc.
-
-	* ext/extmk.rb.in (arg_config): should use Shellwords::shellwords.
-
-Tue Mar 26 01:56:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): while/until statement modifiers to "begin"
-	  statement now work as "do .. while" even when begin statement
-	  has "rescue" or "ensure" [new].
-
-	* parse.y (bodystmt): rescue/ensure is allowed at every bodies,
-	  i.e. method bodies, begin bodies, class bodies[new], and module
-	  bodies[new].
-
-Mon Mar 25 22:10:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_addrinfo): should specify ai_socktype
-	  for getaddrinfo hints.
-
-Mon Mar 25 17:18:48 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* dir.c (rb_push_glob): local variable 'maxnest' was
-	  uninitialized.
-
-Mon Mar 25 16:53:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_abort): embed aborting message into exception
-	  object [new].
-
-	* eval.c (terminate_process): utility function for exit and abort.
-
-Tue Mar 26 14:04:47 2002  okabe katsuyuki <HGC02147@nifty.ne.jp>
-
-	* win32/mkexports.rb: support VC++.NET.
-
-Tue Mar 26 14:00:17 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/bigfloat/bigfloat.c: Fix the initializer's function name
-	  according to the new library name. (pointed out by nobu)
-
-Tue Mar 26 11:12:01 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: new file.
-
-Tue Mar 26 03:23:50 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (pp): return nil like p.
-
-Tue Mar 26 01:48:01 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/bigfloat/extconf.rb: Downcase the library name. (BigFloat.so
-	  -> bigfloat.so)
-
-	* ext/bigfloat/bigfloat.c (BigFloat_inspect): Alter the inspect
-	  format not to look like an array. (pointed out by akr)
-
-	* ext/bigfloat/bigfloat.c (BigFloat_hash): Implement BigFloat#hash.
-
-	* ext/bigfloat/bigfloat.c (BigFloat_dump, BigFloat_load):
-	  Support marshaling.
-
-Tue Mar 26 00:38:11 2002  Tanaka Akira  <akr@m17n.org>
-
-	* configure.in (FILE_READPTR): check _p for 4.4BSD.
-
-Mon Mar 25 23:39:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* configure.in (FILE_READPTR): new.  for IO#gets improvement.
-
-	* io.c (READ_DATA_PENDING_PTR): ditto.
-
-	* io.c (remain_size): separated from read_all().
-
-	* io.c (read_all): argument changed.
-
-	* io.c (appendline): new.  get a line and append to string.
-
-	* io.c (swallow): new.  swallow continuous line delimiters.
-
-	* io.c (rb_io_getline_fast): add delimiter argument.
-
-	* io.c (rb_io_getline): performance improvement.
-
-Mon Mar 25 19:30:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb.in (arg_config): get rid of single quotes
-	  for autoconf 2.53.
-
-Mon Mar 25 17:49:41 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* regex.c (mbc_startpos_func): VC6 seems to be unable to
-	  understand forward declaration for static variables.
-
-	* dir.c (rb_push_glob): local variable 'maxnest' was
-	  uninitialized.
-
-Mon Mar 25 13:24:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (bsock_do_not_rev_lookup_set): should not be
-	  allowed when $SAFE > 3.
-
-	* eval.c (rb_thread_ready): THREAD_TO_KILL threads should not turn
-	  into THREAD_RUNNABLE on wakeup.
-
-	* eval.c (rb_thread_list): THREAD_TO_KILL threads should be in the
-	  list.
-
-	* eval.c (thgroup_list): ditto; by moving gid clearance from
-	  rb_thread_cleanup().
-
-Mon Mar 25 11:06:19 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* dln.c (dln_argv0): unused unless USE_DLN_A_OUT.
-
-	* regex.c (mbc_startpos_func): should be static.
-
-Sun Mar 24 12:19:09 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* dir.c (fnmatch): "*/bar" (with FNM_PATHNAME flag) does not
-	  match "foo/bar".
-
-Sun Mar 24 00:46:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* util.c (push_element): avoid warning for djgpp.
-
-Sat Mar 23 01:50:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (read_all): files on /proc filesystem with zero stat size,
-	  may have contents.
-
-Fri Mar 22 18:07:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (tcp_s_gethostbyname): refactored.
-
-	* ext/socket/socket.c (sock_s_gethostbyname): ditto.
-
-Fri Mar 22 16:46:54 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/extmk.rb.in: replace mkdir with mkpath to compile racc/cparse.
-
-Fri Mar 22 16:22:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* the VMS support patch submitted by Akiyoshi, Masamichi
-	  <Masamichi.Akiyoshi@jp.compaq.com> is merged.
-
-Fri Mar 22 16:27:24 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/racc/parser.rb: new file.
-
-	* ext/racc/MANIFEST, cparse.c, depend, extconf.rb: new files.
-
-	* lib/README: add racc/parser.rb.
-
-	* ext/Setup*: add racc/cparse.
-
-Fri Mar 22 15:04:03 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (exec_under): changing ruby_class is OK, but should not
-	  alter cbase.
-
-	* eval.c (yield_under_i): ditto.
-
-Fri Mar 22 15:44:38 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/MANIFEST, strscan.c, depend, extconf.rb: new files.
-
-	* ext/Setup*: add strscan entry.
-
-Fri Mar 22 14:32:14 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: Protocol#start should return self.
-
-Fri Mar 22 14:14:21 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb: fix arguments to create exceptions.
-	  Patch from matt@lickey.com.  (ruby-bugs:PR#278)
-
-Fri Mar 22 13:51:11 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/bigfloat/.cvsignore, ext/bigfloat/MANIFEST: BigFloat 1.1.8
-	  has been imported.  Add .cvsignore and MANIFEST.
-
-Fri Mar 22 04:07:55 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* sprintf.c (rb_f_printf): discard meaningless prefix ".." for '%u'.
-
-Thu Mar 21 01:11:37 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): fix install path (prefix).
-
-Thu Mar 21 01:03:05 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/configsub.rb: latest autoconf style support.
-
-Wed Mar 20 22:16:25 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* mkconfig.rb: close duplicated $stdout before renaming rbconfig.rb.
-
-Wed Mar 20 21:54:17 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* win32/Makefile.sub: made variables configurable.
-
-	* win32/Makefile.sub (config.h): updates RUBY_PLATFORM from
-	  Makefile.
-
-	* win32/Makefile.sub (config.status): ditto. and use recent
-	  autoconf format.
-
-	* win32/Makefile.sub (clean): separate ext and local clean up.
-
-	* win32/Makefile.sub (distclean): ditto.
-
-	* win32/config.status.in: no longer used.
-
-Wed Mar 20 20:12:35 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* variable.c (rb_const_list): a temporary table must be freed.
-
-Wed Mar 20 19:44:09 2002  Tanaka Akira  <akr@m17n.org>
-
-	* mkconfig.rb: don't touch rbconfig.rb if there is a trouble.
-
-Wed Mar 20 16:05:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): should check receiver only once.
-
-	* eval.c (is_defined): should handle NODE_NEWLINE.
-
-Wed Mar 20 11:29:25 2002  Aristarkh A Zagorodnikov  <xm@xml-objects.com>
-
-	* file.c (rb_file_s_expand_path): memory leak fixed.
-
-Wed Mar 20 00:36:43 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* util.c (ruby_getcwd): the content of buf is uncertain and must
-	  not be printed when getcwd(buf, size) has failed.
-
-Mon Mar 18 22:19:52 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/stringio/stringio.c (check_modifiable): wrong declaration.
-
-Mon Mar 18 18:04:05 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/digest: add depend file.
-
-	* ext/digest/md5: ditto.
-
-	* ext/digest/rmd160: ditto.
-
-	* ext/digest/sha1: ditto.
-
-	* ext/digest/sha2: ditto.
-
-	* ext/iconv/MANIFEST: ditto.
-
-	* ext/stringio/MANIFEST: ditto.
-
-	* ext/syslog: ditto.
-
-Mon Mar 18 17:18:06 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_f_abort): should not bypass cleanup.
-
-	* ext/stringio/stringio.c (check_modifiable): void function.
-
-Mon Mar 18 12:52:01 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/iconv/extconf.rb: workaround for GNU libiconv.
-
-Mon Mar 18 10:55:03 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (parse_string): part of multi-byte sequence must not
-	  match to paren.
-
-	* parse.y (parse_qstring): ditto.
-
-	* parse.y (parse_quotedwords): ditto.
-
-	* parse.y (str_extend): handle multi-byte characters.
-
-Mon Mar 18 10:31:20 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* enum.c (enum_find): catch a value before recycle.
-
-	* enum.c (enum_all): ditto.
-
-	* enum.c (enum_any): ditto.
-
-	* enum.c (enum_min): ditto.
-
-	* enum.c (enum_max): ditto.
-
-Sun Mar 17 20:08:04 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/iconv/depend: added.
-
-	* ext/stringio/depend: added.
-
-Sat Mar 16 22:43:53 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* missing/fileblocks.c: add for autoconf.
-
-Sat Mar 16 15:30:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_search): should clear last_match if pos is out of
-	  string range.
-
-	* string.c (rb_str_index_m): ditto.
-
-	* string.c (rb_str_rindex): ditto.
-
-Sat Mar 16 09:04:58 2002  Koji Arai <JCA02266@nifty.ne.jp>
-
-	* enum.c (enum_inject): use the first iterated element as the
-	  initial value when omitted.
-
-	* enum.c (inject_i): ditto.
-
-	* enum.c (Init_Enumerable): Enumerable#inject now takes variable
-	  count arguments.
-
-Fri Mar 15 19:47:31 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* win32/win32.c (StartSockets): remove duplicated lines.
-
-Fri Mar 15 17:44:08 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* bignum.c, intern.h (rb_ull2big, rb_ll2big, rb_ull2inum, rb_ll2inum,
-	  big2ull, rb_big2ull, rb_big2ll): use LONG_LONG macro instead of
-	  long long.
-
-	* numeric.c, intern.h, ruby.h (rb_num2ll, rb_num2ull): ditto.
-
-	* ruby.h: use _I64_MAX and _I64_MIN if they are defined (for VC++).
-
-Fri Mar 15 14:02:43 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/iconv/iconv.c: fixed document, Iconv#new is no longer an
-	  iterator. thanks to Tanaka Akira <akr@m17n.org>.
-
-Thu Mar 14 22:17:45 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/iconv: imported.
-
-Thu Mar 14 16:42:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_define_class): should handle autoload.
-
-	* class.c (rb_define_module): ditto.
-
-Thu Mar 14 16:18:12 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: autoconf 2.53 support. use AC_LIBOBJ.
-
-Thu Mar 14 00:29:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_match): should clear $~ if operand is nil.
-
-	* re.c (rb_reg_match2): ditto.
-
-Thu Mar 14 12:32:59 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/stringio/stringio.c: fixed frozen string bug.  ungetc no
-	  longer raises on readonly stream unless modifies actually.
-
-Thu Mar 14 08:57:41 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* dir.c (rb_push_glob): avoid SEGV when a block given.
-
-Thu Mar 14 00:16:02 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* string.c (rb_str_subpat_set): must make str independent after
-	  rb_reg_search() matched.
-
-Wed Mar 13 19:05:15 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c: FNM_PERIOD is obsoleted and FNM_DOTMATCH is introduced
-	  instead, which has the opposite meaning of FNM_PERIOD.
-
-	* dir.c: Dir::glob now accepts optional FNM_* flags via the second
-	  argument, whereas Dir::[] doesn't.
-
-Wed Mar 13 18:36:55 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/getopts.rb: single_options can be nil[*], and is not not
-	  optional. ([*]Pointed out by gotoken)
-
-Wed Mar 13 17:23:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure: merge Jonathan Baker's large file support patch
-	  [ruby-talk:35316], with read_all patch in [ruby-talk:35470].
-
-Wed Mar 13 04:06:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_abort): optional message argument that be printed
-	  on termination.
-
-Tue Mar 12 17:12:06 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb: don't complete domains for absolute FQNs.
-
-Mon Mar 11 23:08:48 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/tsort.rb: new file.
-
-Mon Mar 11 21:03:37 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/stringio: new.
-
-Mon Mar 11 18:03:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): '\0111' should be '\011' plus '1',
-	  since octal literals are formed by three digits at most.
-
-Mon Mar 11 14:44:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): module inclusion using extend() should
-	  also be detected.
-
-	* eval.c (rb_eval_cmd): cbase should not be NULL; it should be
-	  either ruby_wrapper or Object.
-
-Sun Mar 10 02:18:22 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* enum.c (enum_each_with_index): should return self.
-
-	* process.c (proc_setpgrp): should return value for non-void function.
-
-	* process.c (proc_getpgid): should raise exception if getpgid() return -1.
-
-	* string.c (rb_str_ljust): should return a duplicated string.
-
-	* string.c (rb_str_rjust): ditto.
-
-	* string.c (rb_str_center): ditto.
-
-Sat Mar  9 08:45:58 2002  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/extconf.rb (have_struct_member): don't print checked
-	  result.
-
-Fri Mar  8 12:19:15 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb: use its own thread group for background threads.
-
-Fri Mar  8 02:21:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (cvar_cbase): utility function to find innermost non
-	  singleton cbase.
-
-	* eval.c (is_defined): adopt new cvar behavior.
-
-	* eval.c (rb_eval): ditto.
-
-	* eval.c (assign): ditto.
-
-Thu Mar  7 20:08:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* gc.c (rb_source_filename): added. holds unique strings for file
-	  names with GC space.
-
-	* gc.c (rb_gc_mark): mark source file name.
-
-	* gc.c (gc_sweep): ditto.
-
-	* gc.c (Init_GC): initialize source file name table.
-
-	* intern.h (rb_source_filename): added.
-
-	* eval.c (rb_eval_string): use rb_source_filename().
-
-	* parse.y (yycompile): ditto.
-
-	* ruby.c (proc_options): ditto.
-
-	* ruby.c (load_file): ditto.
-
-	* ruby.c (ruby_script): ditto.
-
-	* ruby.c (ruby_prog_init): ditto.
-
-Wed Mar  6 17:58:08 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dln.c (dln_load): use LoadLibrary instead of LoadLibraryEx.
-
-Wed Mar  6 16:50:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_mod_clone): should not call rb_obj_clone(), since
-	  Module does not provide "allocate".
-
-	* class.c (rb_singleton_class): should create new singleton class
-	  if obj is a class or module and attached object is different,
-	  which means metaclass of singleton class is sought.
-
-	* time.c (time_s_alloc): now follows allocation framework.
-
-Tue Mar  5 05:56:29 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/getopts.rb: Rewrite to fix some bugs and complete features.
-	  - Accept options with the colon in the first argument;
-	    getopts("a:bcd:") is equivalent to getopts("bc", "a:", "d:").
-	  - Do not discard the argument that caused an error.
-	  - Do not discard '-', which commonly stands for stdin or stdout.
-	  - Allow specifying a long option with a value using '='.
-	    (command --long-option=value)
-	  - Stop reading options when it meets a non-option argument.
-
-Mon Mar  4 13:19:18 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb.in (dir_config): Sync with mkmf.rb: Fix a bug where
-	  --with-xx-{include,lib} is ignored when --with-xx-dir is
-	  specified.
-
-Mon Mar  4 00:09:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should initialize outer class variables from
-	  methods in singleton class definitions.
-
-	* eval.c (assign): ditto.
-
-Fri Mar  1 11:29:10 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): add const
-	  qualifier only for uClibc.
-
-Fri Mar  1 11:22:51 2002  Amos Gouaux  <amos+ruby@utdallas.edu>
-
-	* lib/net/imap.rb: added document.
-
-	* lib/net/imap.rb (getquotaroot): new method.
-
-	* lib/net/imap.rb (setacl): remove the rights if the rights
-	  parameter is nil.
-
-	* lib/net/imap.rb (getacl): return an array of MailboxACLItem.
-
-Fri Mar  1 06:25:49 2002  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/extconf.rb (have_struct_member): new method.
-	  check msg_control and msg_accrights in struct msghdr.  check
-	  sys/uio.h.
-
-	* ext/socket/socket.c: include sys/uio.h if available.
-	  (thread_read_select): new function.
-	  (unix_send_io): ditto.
-	  (unix_recv_io): ditto.
-	  (unix_s_socketpair): ditto.
-	  (Init_socket): define UNIXSocket#send_io, UNIXSocket#recv_io,
-	  UNIXSocket.socketpair and UNIXSocket.pair.
-
-	* dln.c (dln_load): fix typo.
-
-Wed Feb 27 16:30:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_include): load modules in argument order.
-
-	* st.c (st_init_table_with_size): num_bins should be prime numbers
-	  (no decrement).
-
-	* st.c (rehash): ditto.
-
-Wed Feb 27 13:18:49 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (READ_DATA_PENDING): uClibc support.
-
-	* random.c (rand_init): ditto.
-
-	* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): ditto.
-
-Wed Feb 27 07:05:17 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/sha2/sha2.c: Merge from rough.  Fix a couple of
-	  off-by-one errors in Aaron Gifford's code.
-
-	  Obtained from:  KAME via FreeBSD
-	  KAME PR:        393
-	  FreeBSD PR:     kern/34242
-
-Wed Feb 27 03:36:47 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* ext/dbm/dbm.c (fdbm_select): 1.7 behavior.
-
-	* ext/gdbm/gdbm.c (fgdbm_select): ditto.
-
-	* ext/sdbm/sdbm.c (fsdbm_select): ditto.
-
-	* ext/dbm/dbm.c (fdbm_delete): adopt Hash#delete behavior.
-
-	* ext/sdbm/sdbm.c (fsdbm_delete): ditto.
-
-	* ext/gdbm/gdbm.c: need not to dup key to the block.
-
-	* ext/sdbm/sdbm.c : replace RuntimeError with SDBMError.
-
-Tue Feb 26 21:34:07 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* bignum.c (rb_big_2comp): void function cannot return any value.
-
-Tue Feb 26 16:52:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_missing): NoMethod error messages for true, false,
-	  nil must respond visibility like for other objects.
-
-Tue Feb 26 15:41:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): call trace_func for if/while conditions.
-
-	* marshal.c (r_object): separate r_regist from proc calling.
-
-Tue Feb 26 11:25:50 2002  akira yamada  <akira@arika.org>
-
-	* lib/uri/generic.rb: merge0 should return [oth, oth] if oth is
-	  absolute URI.
-
-	* lib/uri/generic.rb: registry part must not be allowed for any
-	  schemes for the Internet. (RFC2396, section 3.2.2 and 3.2.1.)
-
-Mon Feb 25 21:22:41 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syslog/syslog.c: Merge from rough.  Use SafeStringValue().
-
-Mon Feb 25 21:12:08 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syslog/syslog.c: Merge from rough.  Turn Syslog into a
-	  module keeping backward compatibility intact.
-
-Mon Feb 25 19:35:48 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* sample/test.rb (system): test with scripts under the source
-	  directory.
-
-Mon Feb 25 15:14:01 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_inspect): should not dump core for unbound
-	  singleton methods.
-
-	* object.c (rb_mod_to_s): better description.
-
-Mon Feb 25 13:32:13 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* lib/shell.rb (Shell::expand_path): relative to @cwd.
-
-Mon Feb 25 06:30:11 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* hash.c (env_select): should path the assoc list.
-
-Sun Feb 24 17:20:22 2002  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/*/*.h: Merge from rough.
-	  - Avoid namespace pollution. (MD5_* -> rb_Digest_MD5_*, etc.)
-
-Sat Feb 23 21:12:13 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_syswait): thread kludge; should be fixed to
-	  support native thread.
-
-Fri Feb 22 21:20:53 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: set read_timeout dynamically.
-
-	* lib/net/http.rb: @@newimpl is always true in the main trunk.
-
-	* lib/net/http.rb: HTTP.port -> default_port
-
-	* lib/net/http.rb: HTTPResponse.read_response_status ->
-	  read_status_line
-
-Fri Feb 22 19:56:15 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/config.status.in: set LIBRUBY_SO.
-
-Fri Feb 22 03:34:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (get2comp): need to specify to carry or not.
-
-	* io.c (rb_io_inspect): embed path info.
-
-Fri Feb 22 11:30:01 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/prettyprint.rb: FillGroup implemented.
-
-Thu Feb 21 21:40:18 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* ext/extmk.rb.in (create_makefile): remove unnecessary -L option from
-	  LIBS macro.
-
-Thu Feb 21 02:49:12 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* pack.c (pack_pack): wrong # comment treatment.
-
-	* pack.c (pack_unpack): ditto.
-
-Wed Feb 20 15:15:03 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* intern.h: prototypes; rb_io_addstr(), rb_io_printf(),
-	  rb_io_print(), rb_io_puts()
-
-	* io.c (rb_io_addstr): make extern.
-
-	* io.c (rb_io_printf): ditto.
-
-	* io.c (rb_io_print): ditto.
-
-	* io.c (rb_io_puts): ditto.
-
-Wed Feb 20 13:41:35 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* io.c (rb_io_close): return Qnil.
-
-Wed Feb 20 12:41:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_any_cmp): should handle Qundef in keys.
-
-	* eval.c (remove_method): should not remove a empty method to
-	  implement "undef".
-
-	* eval.c (rb_eval): should allow singleton class def for
-	  true/false/nil.
-
-Tue Feb 19 21:43:32 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: rename Protocol.port to default_port.
-
-	* lib/net/smtp.rb: ditto.
-
-	* lib/net/pop.rb: ditto.
-
-	* lib/net/http.rb: ditto.
-
-	* lib/net/protocol.rb: rename BufferedSocket class to
-	  InternetMessageIO.
-
-	* lib/net/smtp.rb: ditto.
-
-	* lib/net/pop.rb: ditto.
-
-	* lib/net/http.rb: ditto.
-
-	* lib/net/protocol.rb: rename InternetMessageIO#write_pendstr to
-	  write_message.
-
-	* lib/net/smtp.rb: ditto.
-
-	* lib/net/protocol.rb: new method
-	  InternetMessageIO#through_message.
-
-	* lib/net/smtp.rb: ditto.
-
-	* lib/net/protocol.rb: rename InternetMessageIO#read_pendstr to
-	  read_message_to.
-
-	* lib/net/pop.rb: ditto.
-
-	* lib/net/protocol.rb: rename InternetMessageIO#read_pendlist to
-	  each_list_item
-
-	* lib/net/pop.rb: ditto.
-
-	* lib/net/protocol.rb: Now block size is 1024.
-
-	* lib/net/smtp.rb: new methods SMTP#esmtp? and #esmtp=.
-
-	* lib/net/http.rb: Using singleton method syntax instead of
-	  singleton class clause, to avoid behavior change of class
-	  variables in ruby 1.7.
-
-	* lib/net/http.rb: HTTPResponse class does not inherit from
-	  Net::Response.
-
-	* lib/net/http.rb: divide HTTP#connecting into
-	  {begin,end}_transport.
-
-	* lib/net/http.rb: unused class Accumulator removed.
-
-	* lib/net/http.rb: Net::HTTP reads response. not HTTPRequest.
-
-	* lib/net/http.rb: proxy related class-instance-variables are not
-	  initialized correctly.
-
-Tue Feb 19 20:20:12 2002  Ed Sinjiashvili  <edsin@swes.saren.ru>
-
-	* parse.y (str_extend): backslash escape was done wrong.
-
-Tue Feb 19 17:10:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (path_check_1): do not fail on world writable *parent*
-	  directories too.
-
-Tue Feb 19 15:51:41 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (path_check_1): do not warn on world writable *parent*
-	  directories.
-
-	* class.c (rb_include_module): should preserve ancestor order in
-	  the included class/module.
-
-Tue Feb 19 14:45:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (path_check_1): should check directory sticky bits.
-
-	* process.c (security): need not to warn twice.
-
-	* marshal.c (r_object): complete restoration before calling
-	  r_regist().
-
-Tue Feb 19 14:24:36 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): operators in the "op" rule should make
-	  lex_state EXPR_ARG on EXPR_FNAME and EXPR_DOT.
-
-Tue Feb 19 13:38:10 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval_string_wrap): should hide the toplevel local
-	  variable bindings by PUSH_SCOPE().
-
-Tue Feb 19 13:21:51 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* regex.c: fix prototypes of xmalloc(), xcalloc() and xrealloc().
-
-Tue Feb 19 13:16:08 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* io.c (rb_io_ungetc): don't fail pushed EOF back.
-
-Mon Feb 18 20:48:40 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* pack.c (pack_pack): avoid infinite loop at comment.
-
-	* pack.c (pack_unpack): ditto.
-
-Mon Feb 18 14:06:28 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* misc/ruby-mode.el (ruby-block-hanging-re): rescue block was too
-	  indented.
-
-Mon Feb 18 13:56:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (expr_value, arg_value, primary_value): value_expr()
-	  check in place.
-
-	* eval.c (block_pass): "&nil" should clear block given.
-
-Mon Feb 18 02:05:56 2002  Wolfgang Jahrling <wolfgang@pro-linux.de>
-
-	* dir.c (push_braces): remove MAXPATHLEN dependency.
-
-	* dir.c (dir_s_globd): ditto.
-
-	* dln.c (init_funcname): ditto.
-
-	* dln.c (load_1): ditto.
-
-	* dln.c (dln_load): ditto.
-
-	* configure.in: add GNU/Hurd switches.
-
-Fri Feb 15 17:44:26 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): allows comment in template strings.
-
-	* pack.c (pack_unpack): ditto.
-
-Sun Feb 17 23:41:37 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* mkconfig.rb (Config::expand): expand ${} too.
-
-	* ext/extmk.rb.in (try_link0): expand command.
-
-	* ext/extmk.rb.in (try_cpp): ditto.
-
-	* ext/extmk.rb.in (extmake): default $LIBPATH to $libdir
-
-Sun Feb 17 21:39:24 2002  Tetsuya Watanabe  <tetsuya.watanabe@nifty.com>
-
-	* ext/digest/md5/md5init.c (Init_md5): rb_cvar_declare() is
-	  replaced by rb_cvar_set().
-
-	* ext/digest/rmd160/rmd160init.c (Init_rmd160): ditto.
-
-	* ext/digest/sha1/sha1init.c (Init_sha1): ditto.
-
-	* ext/digest/sha2/sha2init.c (Init_sha2): ditto.
-
-Sun Feb 17 18:10:09 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* class.c (rb_define_class): warn unless superclass is specified
-	  explicitly.
-
-	* class.c (rb_define_class_under): ditto.
-
-Thu Feb 16 02:11:08 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* misc/ruby-mode.el (ruby-font-lock-keywords): fontify
-	  instance/class/global variables start with '_'.
-
-Fri Feb 15 14:40:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): replace rb_cvar_declare() by rb_cvar_set().
-
-	* eval.c (assign): ditto.
-
-	* variable.c (rb_cvar_set): 4th argument (warn) added; define new
-	  class variable if it's not defined yet.
-
-	* variable.c (rb_cvar_declare): removed.
-
-Fri Feb 15 13:36:58 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_rshift): should properly convert the negative
-	  value to 2's compliment.
-
-Thu Feb 14 17:38:35 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y: avoid SEGV at OP_ASIGN to pseudo variable.
-
-Thu Feb 14 14:13:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (Init_Struct): should undefine "allocate" for Struct
-	  class (it's redefined in the subclasses).
-
-Wed Feb 13 17:58:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (stmt): local variable declaration order was changed
-	  since 1.6
-
-	* parse.y (arg): ditto.
-
-	* pack.c (pack_pack): add templates 'q' and 'Q'.
-
-	* pack.c (pack_unpack): ditto.
-
-	* bignum.c (rb_quad_pack): new utility function.
-
-	* bignum.c (rb_quad_unpack): ditto.
-
-Tue Feb 12 01:21:34 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (assignable): should emit CVASGN within the method
-	  body.
-
-Mon Feb 11 06:13:53 2002  Matt Armstrong  <matt@lickey.com>
-
-	* dir.c (dir_s_glob): should not warn even if no match found.
-
-Mon Feb 11 04:25:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): clean up class variable behavior.
-
-	* eval.c (assign): ditto.
-
-	* eval.c (is_defined): ditto.
-
-	* variable.c (rb_mod_class_variables): need not to call rb_cvar_singleton().
-
-	* variable.c (rb_cvar_singleton): removed.
-
-Mon Feb 11 00:10:41 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* regex.c (re_compile_fastmap): skip begpos.
-
-Sun Feb 10 16:52:53 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ruby.c (load_file): avoid SEGV on '#' only input.
-
-Fri Feb  8 23:07:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): singleton check should be moved from yycompile
-	  to here.
-
-	* eval.c (is_defined): check should be added here too.
-
-Fri Feb  8 05:31:48 2002  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: HTTP.Proxy should use self for proxy-class's
-	  super class.
-
-	* lib/net/http.rb: initialize HTTP.proxy_port by HTTP.port.
-
-Fri Feb  8 01:27:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yycompile): should inherit "in_single" if eval happened
-	  in a singleton method.
-
-	* eval.c (rb_eval): class variables from singleton methods defined
-	  within singleton class statement should work like ones defined
-	  by singleton def statements.
-
-Thu Feb  7 13:44:08 2002  akira yamada  <akira@arika.org>
-
-	* uri/common.rb (URI::join): new method.
-
-	* uri/generic.rb (Generic#merge): URI.parse("http://a/")+"b" should
-	  return "http://a/b" but it returned "http://a//b".
-
-	* uri/generic.rb (Generic#check_path): corrected error message,
-	  @path -> v
-
-Thu Feb  7 00:18:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_write): flag when buffered write is done.
-
-	* io.c (fptr_finalize): do not raise error on EBADF if write
-	  buffer is empty.
-
-Wed Feb  6 17:18:54 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* configure.in: keep old config.h unless changed.
-
-Wed Feb  6 13:28:53 2002  Amos Gouaux  <amos+ruby@utdallas.edu>
-
-	* lib/net/imap.rb: OpenSSL support.
-
-	* lib/net/imap.rb (setquota): unset quota if the second argument
-	  is nil.
-
-Wed Feb  6 13:05:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_readlines): avoid calling GetOpenFile() repeatedly.
-
-	* io.c (rb_io_each_line): ditto.
-
-	* io.c (argf_getline): ditto.
-
-	* process.c: should include <time.h> to get proper CLK_TCK.
-
-Wed Feb  6 02:10:30 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* io.c (fptr_finalize): ignore EBADF when f and f2 use same
-	  descriptor.
-
-Tue Feb  5 16:17:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (fptr_finalize): should raise error when fclose fails.
-
-	* eval.c (method_inspect): proper output format to distinguish
-	  methods and singleton methods.
-
-Mon Feb  4 22:44:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (rb_file_s_expand_path): should terminate.
-
-Mon Feb  4 15:38:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_class_real): should not follow ICLASS link
-
-	* variable.c (classname): should follow ICLASS link explicitly.
-
-	* eval.c (rb_call): ditto.
-
-Fri Feb  1 19:10:04 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* intern.h: prototypes for new functions; rb_cstr_to_inum(),
-	  rb_str_to_inum(), rb_cstr_to_dbl(), rb_str_to_dbl()
-
-	* bignum.c (rb_cstr_to_inum): changed from rb_cstr2inum(), and
-	  added argument badcheck to be consistent with parser. [new]
-
-	* bignum.c (rb_str_to_inum): ditto.
-
-	* bignum.c (rb_cstr2inum): wrapper of rb_cstr_to_inum() now.
-
-	* bignum.c (rb_str2inum): ditto.
-
-	* object.c (rb_cstr_to_dbl): float number parser. [new]
-
-	* object.c (rb_str_to_dbl): ditto.
-
-	* object.c (rb_Float): use rb_cstr_to_dbl() for strict check.
-
-	* object.c (rb_Integer): use rb_str_to_inum() for strict check.
-
-	* string.c (rb_str_to_f): use rb_str_to_dbl() with less check.
-
-	* string.c (rb_str_to_i): use rb_str_to_inum() with less check.
-
-	* string.c (rb_str_hex): ditto.
-
-	* string.c (rb_str_oct): ditto.
-
-	* sprintf.c (rb_f_sprintf): ditto.
-
-	* time.c (obj2long): ditto.
-
-	* parse.y (yylex): use rb_cstr_to_inum() for strict check.
-
-Fri Feb  1 17:46:39 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* regex.c (mbc_startpos): become macro.
-
-	* regex.c (euc_startpos): added for improvement.
-
-	* regex.c (sjis_startpos): ditto.
-
-	* regex.c (utf8_startpos): ditto.
-
-Fri Feb  1 00:03:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_stat_inspect): print dev, rdev in hexadecimal.
-
-Thu Jan 31 20:45:33 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* lib/mkmf.rb (dir_config): prior --with flag.
-
-	* lib/mkmf.rb (arg_config): avoid special variables for
-	  font-lock-mode.
-
-Thu Jan 31 13:22:36 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (File::Stat#pretty_print): print rdev_major and rdev_minor.
-
-Wed Jan 30 15:58:04 2002  K.Kosako  <kosako@sofnec.co.jp>
-
-	* regex.c (re_adjust_startpos): fix for SJIS and UTF-8.
-
-	* regex.c (mbc_startpos): ditto.
-
-Wed Jan 30 13:37:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_search): should set regs.allocated.
-
-Wed Jan 30 02:25:38 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* regex.c (re_adjust_startpos): search start of multibyte
-	  backward.
-
-	* regex.c (mbc_startpos): ditto.
-
-Tue Jan 29 17:59:20 2002  Tanaka Akira  <akr@m17n.org>
-
-	* file.c: `major' and `minor' macro needs sys/mkdev.h on SunOS 5.x.
-
-	* configure.in: add check for `sys/mkdev.h'.
-
-	* lib/pp.rb: don't print a mode File::Stat as decimal number.
-
-Mon Jan 28 19:16:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* array.c (rb_ary_fill): shouldn't yield unless block given.
-
-Mon Jan 28 18:33:18 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (yylex): strict check for numbers.
-
-Mon Jan 28 18:01:01 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_stat_rdev_major): added. [new]
-
-	* file.c (rb_stat_rdev_minor): added. [new]
-
-	* file.c (rb_stat_inspect): print mode in octal.
-
-Mon Jan 28 13:29:41 2002  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (is_defined): defined?(Foo::Baz) should check constants
-	  only, no methods.
-
-	* eval.c (is_defined): should not dump core on defined?(a::b)
-	  where a is not a class nor a module.
-
-Mon Jan 28 02:50:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): remove dup and clone from TrueClass,
-	  FalseClass, and NilClass.
-
-	* array.c (rb_ary_fill): Array#fill takes block to get the value to
-	  fill.
-
-Sat Jan 26 20:05:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_to_i): to_i(0) auto-detects base radix.
-
-	* array.c (rb_ary_initialize): fill by the block evaluation value
-	  if block is given.
-
-Fri Jan 25 17:48:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (solaris): add '-shared' only for GNU ld.
-
-Fri Jan 25 17:16:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_include_module): detect cyclic module inclusion.
-
-Fri Jan 25 02:17:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_cleanup): need not to free thread stacks at
-	  process termination.
-
-	* array.c (rb_ary_fetch): use the block to get the default value
-	  if the block is given.
-
-	* eval.c (rb_thread_schedule): should check time only if BOTH
-	  WAIT_SELECT and WAIT_TIME.
-
-Thu Jan 24 11:49:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (umethod_bind): should update rklass field.
-
-	* hash.c (rb_hash_update): if a block is given, yields [key,
-	  value1, value2] to the block to resolve conflict.
-
-Thu Jan 24 05:42:01 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* string.c (rb_str_split_m): no need to consider KANJI
-	  characters, if the length of separator is 1 (byte).
-
-Wed Jan 23 16:07:31 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (Init_Array): remove Array#filter.
-
-Wed Jan 23 13:27:44 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_yield_0): restore source file/line after yield.
-
-Wed Jan 23 02:00:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_initialize): should accept zero argument.
-
-	* object.c (rb_mod_cmp): should raise ArgumentError if
-	  inheritance/inclusion relation between two classes/modules is
-	  not defined. [new]
-
-Tue Jan 22 17:45:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_fsync): new method. [new]
-
-Mon Jan 21 22:57:18 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* signal.c (ruby_signal): must define sighandler_t for every
-	  occasion.
-
-Mon Jan 21 08:25:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ruby_stop): should not trace error handler.
-
-	* signal.c (install_sighandler): do not install sighandler unless
-	  the old value is SIG_DFL.
-
-	* io.c (io_write): should not raise exception on O_NONBLOCK io.
-
-	* dir.c (dir_set_pos): seek should return dir, pos= should not.
-
-Sat Jan 19 02:31:45 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): need not to clear method cache for NODE_CLASS,
-	  NODE_SCLASS.
-
-	* gc.c (obj_free): need not to clear method cache on class/module
-	  finalization.
-
-Fri Jan 18 23:38:03 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_fetch): index out of range raises exception
-	  unless optional second argument is specified.
-
-Fri Jan 18 17:32:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_s_new): block check moved from initialize to this
-	  method.
-
-	* io.c (rb_io_s_open): open should call initialize too. IO#for_fd
-	  also calls initialize. [new]
-
-Fri Jan 18 10:26:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (rb_sys_fail): replace INT2FIX() by INT2NUM() since
-	  errno value may not fit in Fixnum size on Hurd.
-
-	* error.c (set_syserr): ditto.
-
-Fri Jan 18 10:12:00 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (tcp_svr_s_open): fix typo.
-
-Fri Jan 18 02:27:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_s_glob): returns nil if block given.
-
-	* io.c (rb_io_each_byte): should return self.
-
-	* io.c (rb_io_close_m): close check added.
-
-	* dir.c (dir_seek): should return pos.
-
-Fri Jan 18 01:21:53 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (fixpos): orig may be (NODE*)1, which should not be
-	  dereferenced.
-
-Thu Jan 17 16:21:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (block_pass): allow "retry" from within argument passed
-	  block. [new]
-
-	* eval.c (localjump_error): should preserve exit status in the
-	  exception object. [new]
-
-	* eval.c (proc_invoke): should raise exception for "break" if it's
-	  yielding, not calling. [new]
-
-	* eval.c (block_pass): should NOT raise exception for "break". [new]
-
-	* eval.c (block_pass): should allow block argument relay even in
-	  the tainted mode.
-
-Thu Jan 17 04:51:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c: support subclassing by proper "initialize"
-	  calling convention. [new]
-
-Wed Jan 16 18:25:08 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c: primes should be primes.
-
-Wed Jan 16 12:29:14 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/timeout.rb (timeout): new optional argument to specify an
-	  exception class.
-
-	* lib/resolv.rb: use Resolv::ResolvTimeout for internal timeout to
-	  avoid problem with timeout of application.
-
-Wed Jan 16 11:12:30 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* object.c (rb_Float): remove underscores between digits.
-
-	* bignum.c (rb_cstr2inum): reject prefix followed by spaces only.
-
-	* class.c (rb_class_inherited): should use Object when no super
-	  class.
-
-Tue Jan 15 01:11:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): method defined? check should honor
-	  protected too.
-
-Mon Jan 14 13:06:02 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (block_pass): should not pass tainted block, if $SAFE > 0.
-
-Sun Jan 13 09:31:41 2002  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* variable.c (rb_mod_remove_cvar): should pass the char*.
-
-Fri Jan 11 05:06:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* class.c (rb_make_metaclass): [new]
-
-	* class.c (rb_define_class_id): use rb_make_metaclass(), don't
-	  call Class#inherited hook.
-
-	* class.c (rb_class_inherited): [new]
-
-	* class.c (rb_define_class): call Class#inherited hook here.
-
-	* class.c (rb_define_class_under): ditto after class path is set.
-
-	* class.c (rb_singleton_class): use rb_make_metaclass().
-
-	* eval.c (rb_eval): same as rb_define_class_under().
-
-	* intern.h: prototypes of rb_make_metaclass() and
-	  rb_class_inherited().
-
-	* object.c (rb_class_s_new): use rb_make_metaclass() and
-	  rb_class_inherited().
-
-	* object.c (Init_Object): use rb_make_metaclass().
-
-	* struct.c (make_struct): use rb_class_inherited().
-
-Thu Jan 10 19:15:15 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_add_method): should clear cache by id always.
-
-	* eval.c (rb_disable_super): no longer need to clear cache before
-	  rb_add_method().
-
-	* eval.c (rb_export_method): ditto.
-
-	* eval.c (rb_attr): ditto.
-
-	* eval.c (rb_undef): ditto.
-
-	* eval.c (rb_eval): ditto.
-
-	* eval.c (rb_mod_modfunc): ditto.
-
-	* eval.c (rb_mod_define_method): ditto.
-
-Thu Jan 10 11:42:47 2002  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/resource.rb: Modify copyright in resource script.
-
-Thu Jan 10 07:15:44 2002  takuma ozawa  <metal@mine.ne.jp>
-
-	* re.c (match_select): should propagate taintness.
-
-Thu Jan 10 00:54:57 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_set_default): Hash#default= should return the
-	  new value.
-
-Wed Jan  9 20:21:09 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* misc/ruby-mode.el (ruby-calculate-indent): indentation after
-	  comment at beginning of buffer failed.
-
-	* misc/ruby-mode.el (font-lock-defaults): unless XEmacs, set
-	  font-lock variables in ruby-mode-hook.
-
-Tue Jan  8 15:56:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_to_i): accepts optional base argument. [new]
-
-	* numeric.c (rb_fix2str): should not handle negative fixnum values
-	  int32 via calling sprintf() directly.
-
-Tue Jan  8 15:54:02 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_add_method): clear replaced method from the cache.
-
-Mon Jan  7 12:38:47 2002  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb (Time#xmlschema): new optional argument
-	  fractional_seconds to specify a number of digits of
-	  fractional part of the time.
-
-Sat Jan  5 13:18:11 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* range.c (range_member): beginning check was
-	  wrong. [ruby-talk:30252]
-
-Sat Jan  5 03:07:34 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_new2): NULL pointer check added.
-
-Sat Jan  5 00:19:12 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (yycompile): strdup()'ed twice.
-
-Fri Jan  4 18:29:10 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
-
-	* class.c (rb_define_module_under): should locate predefined
-	  module using rb_const_defined_at().
-
-Fri Jan  4 17:23:49 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* misc/ruby-mode.el (ruby-forward-string): forward a string. [new]
-
-	* misc/ruby-mode.el (ruby-parse-region): handle nested parentheses
-	  in a string and terminators in #{}.
-
-	* misc/ruby-mode.el (ruby-calculate-indent): ditto.
-
-Wed Jan  2 23:34:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): add -I. to CPPFLAGS.
-
-	* lib/mkmf.rb (create_makefile): srcdir support(.def and depend file).
-
-Wed Jan  2 11:51:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_system): abandon vfork.
-
-	* io.c (pipe_open): ditto.
-
-Tue Jan  1 02:16:48 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/curses/extconf.rb: add dir_config.
-
-	* Makefile.in (fake.rb): set RUBY_VERSION.
-
-Mon Dec 31 14:20:46 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (yycompile): always store copy of filename.
-
-	* parse.y (rb_compile_file): no longer need to strdup() here.
-
-Mon Dec 31 05:26:40 2001  Ferris McCormick  <fmccor@inforead.com>
-
-	* defines.h: sparc linux needs different FLUSH_REGISTER_WINDOWS
-
-Mon Dec 31 04:27:28 2001  Minero Aoki  <aamine@mx.edit.ne.jp>
-
-	* lib/net/protocol.rb: Protocol#start returns the return value of
-	  block.
-
-	* lib/net/protocol.rb: set timeout limit by default.
-
-	* lib/net/protocol.rb: new methods WriteAdapter#write, puts,
-	  print, printf.
-
-	* lib/net/http.rb: rename HTTP#get2 to request_get, post2 to
-	  request_post ...
-
-	* lib/net/smtp.rb: should not resolve HELO domain automatically.
-
-Sun Dec 30 00:59:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb.in, lib/mkmf.rb (have_library): accept -lm
-	  unconditionally on mswin32/mingw32.
-
-Sat Dec 29 01:55:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_search): abandon stclass optimization.
-
-Fri Dec 28 14:39:05 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* array.c (rb_cmpint): fixed typo.
-
-Thu Dec 27 18:43:04 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* bignum.c (rb_cstr2inum): deny "0_".
-
-Thu Dec 27 01:54:02 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* bignum.c (rb_cstr2inum): allow "0\n" and so on.
-
-Wed Dec 26 19:24:21 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (rb_invalid_str): utility function to show inspect()'ed
-	  string.
-
-	* bignum.c (rb_cstr2inum): prints invalid strings in inspect()'ed
-	  format.
-
-	* object.c (rb_Float): ditto.
-
-Wed Dec 26 02:41:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_convert_type): no longer use rb_rescue().
-
-Tue Dec 25 18:32:16 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* re.c (rb_reg_search): initialize taint status of match object.
-
-Tue Dec 25 02:37:49 2001  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb, lib/prettyprint.rb: new files.
-
-Tue Dec 25 02:11:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_convert_type): check method response check before
-	  invoking rb_rescue().
-
-	* object.c (rb_check_convert_type): ditto.
-
-Mon Dec 24 02:37:40 2001  Le Wang  <lewang@bigfoot.com>
-
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords):
-	  fix font-lock problem [ruby-talk:29296].
-
-Sat Dec 22 22:52:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_timeval): wrong cast to time_t.
-
-	* time.c (time_plus): ditto.
-
-Fri Dec 21 20:33:34 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* parse.y (str_extend): make up "#$;" handling.
-
-Fri Dec 21 16:18:17 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* dln.h, ruby.h, util.h: enable prototypes in C++.
-
-Fri Dec 21 15:12:41 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_plus): result should not be negative unless
-	  NEGATIVE_TIME_T is defined.
-
-	* time.c (time_new_internal): should check tv_sec overflow too.
-
-	* time.c (time_timeval): should check time_t range when time is
-	  initialized from float.
-
-	* time.c (time_plus): uses modf(3).
-
-Fri Dec 21 03:15:52 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_mod_define_method): must not convert Method to Proc.
-
-Fri Dec 21 01:17:57 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* lib/mkmf.rb (with_destdir): new.
-
-	* lib/mkmf.rb: prefix target directories with $(DESTDIR) all.
-
-	* lib/mkmf.rb: no need to mkdir $(libdir)
-
-Thu Dec 20 14:08:20 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: rename Net::Socket to Net::BufferedSocket
-
-Thu Dec 20 13:51:52 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* variable.c (rb_cvar_set): add frozen class/module check.
-
-	* variable.c (rb_cvar_declare): add frozen class/module check.
-
-Thu Dec 20 01:01:50 2001  takuma ozawa  <metal@mine.ne.jp>
-
-	* re.c (match_to_a): should propagate taint.
-
-	* re.c (rb_reg_s_quote): ditto.
-
-Wed Dec 19 16:58:29 2001  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c: new methods
-	  Readline::basic_word_break_characters,
-	  Readline::basic_word_break_characters=,
-	  Readline::completer_word_break_characters,
-	  Readline::completer_word_break_characters=,
-	  Readline::basic_quote_characters,
-	  Readline::basic_quote_characters=,
-	  Readline::completer_quote_characters,
-	  Readline::completer_quote_characters=,
-	  Readline::filename_quote_characters,
-	  Readline::filename_quote_characters=.
-
-Wed Dec 19 14:05:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_define_method): define_method should follow
-	  default method visibility.
-
-	* eval.c (rb_attr): should warn if the default method visibility
-	  is "module_function" (can be error).
-
-	* eval.c (rb_mod_define_method): should define class/module method
-	  also if the visibility is "module_function".
-
-	* eval.c (rb_mod_define_method): should call hook method
-	  "method_added", and "singleton_method_added".
-
-Wed Dec 19 11:42:13 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* string.c: use RESIZE_CAPA for capacity change.
-
-Wed Dec 19 03:08:40 2001  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb: date.rb is not required anymore.
-
-	* lib/resolv.rb: fix document.  refine IPv6 regex.
-
-Tue Dec 18 23:24:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (Init_socket): add listen method to
-	  TCPServer and UNIXServer.
-
-Tue Dec 18 17:54:53 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* sample/test.rb: Hash#indexes -> Hash#select.
-
-Tue Dec 18 01:02:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_schedule): should not select a thread which is
-	  not yet initialized.
-
-Mon Dec 17 18:53:49 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* string.c (rb_str_replace): swap arguments of OBJ_INFECT.
-
-Mon Dec 17 16:52:20 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* intern.h: add prototypes.
-	  rb_gc_enable(), rb_gc_disable(), rb_gc_start(), rb_str_new5()
-	  rb_str_buf_append(), rb_str_buf_cat(), rb_str_buf_cat2(),
-	  rb_str_dup_frozen()
-
-	* ruby.h: added declaration.
-	  rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo
-
-	* rubyio.h: changed double include guard macro to RUBYIO_H.
-
-	* array.c (inspect_call): make static.
-
-	* eval.c (dvar_asgn): ditto.
-
-	* io.c (rb_io_close_read): ditto.
-
-	* lex.c (rb_reserved_word): ditto.
-
-	* ruby.c: (req_list_head, req_list_last): ditto.
-
-	* ruby.c (require_libraries): ditto.
-
-Mon Dec 17 15:41:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_plus): wrong boundary check.
-
-	* time.c (time_minus): ditto.
-
-Mon Dec 17 15:19:32 2001  Tanaka Akira  <akr@m17n.org>
-
-	* time.c: new method `gmtoff', `gmt_offset' and `utc_offset'.
-	  (time_utc_offset): new function.
-	  (Init_Time): bind above methods to `time_utc_offset'.
-
-	* time.c: 64bit time_t support.
-	  (time_s_at): use NUM2LONG instead of NUM2INT for tv_sec.
-	  (time_arg): initialize tm_isdst correctly.
-	  use long to initialize tm_year.
-	  (search_time_t): renamed from `make_time_t'.
-	  (make_time_t): call `timegm' and `mktime' instead of `search_time_t'
-	  if available.
-	  (time_to_i): use LONG2NUM instead of INT2NUM.
-	  (time_localtime): check localtime failure.
-	  (time_gmtime): check gmtime failure.
-	  (time_year): use LONG2NUM instead of INT2FIX.
-	  (time_to_a): use long for tm_year.
-	  (time_dump): check tm_year which is not representable with 17bit.
-	  (time_load): initialize tm_isdst.
-
-	* configure.in: check existence of `mktime' and `timegm'.
-	  check existence of tm_gmtoff field of struct tm.
-	  fix negative time_t for 64bit time_t.
-
-	* missing/strftime.c: fix overflow by tm_year + 1900.
-
-	* lib/time.rb: use Time#utc_offset.
-
-Mon Dec 17 00:02:04 2001  Guy Decoux  <ts@moulon.inra.fr>
-
-	* variable.c (find_class_path): should initialize iv_tbl if it's
-	  NULL.
-
-Fri Dec 14 04:23:36 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb: new method Net::POP3.APOP
-
-	* lib/net/http.rb: set default Content-Type to
-	  x-www-form-urlencoded (causes warning)
-
-	* lib/net/protocol.rb: remove Net::NetPrivate module.
-
-	* lib/net/smtp.rb: ditto.
-
-	* lib/net/pop.rb: ditto.
-
-	* lib/net/http.rb: ditto.
-
-Fri Dec 14 00:16:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_define_class): should return the existing class if
-	  the class is already defined and its superclass is identical to
-	  the specified superclass.
-
-	* class.c (rb_define_class_under): ditto.
-
-	* class.c (rb_define_module): should return the existing module if
-	  the module is already defined.
-
-Thu Dec 13 09:52:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_new_internal): avoid loop to calculate negative
-	  div, mod.
-
-	* time.c (time_cmp): should handle Bignums.
-
-Tue Dec 11 17:39:16 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* array.c (rb_ary_pop): should ELTS_SHARED flag check before
-	  REALLOC.
-
-Tue Dec 11 12:45:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_match_m): should convert an argument into
-	  regexp if it's a string.
-
-Tue Dec 11 03:40:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_select): Array#select(n,m,...) now works like
-	  Array#indexes(n,m,..). [new, experimental]
-
-	* hash.c (rb_hash_select): ditto.
-
-	* hash.c (env_select): ditto.
-
-	* re.c (match_select): ditto.
-
-	* struct.c (rb_struct_select): ditto.
-
-Tue Dec 11 03:17:19 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* object.c (rb_class_real): follow included modules.
-
-Mon Dec 10 23:37:51 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* util.h: change prototype of ruby_qsort() to accord with its
-	  definition.
-
-Mon Dec 10 20:30:01 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* gc.c (STR_ASSOC): use FL_USER3 instead of FL_USER2.
-
-Mon Dec 10 17:40:02 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* parse.y (str_extend): make up pushback call.
-
-Mon Dec 10 02:09:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_modify): should copy the internal buffer if the
-	  modifying buffer is shared.
-
-	* array.c (ary_make_shared): make an internal buffer of an array
-	  to be shared.
-
-	* array.c (rb_ary_shift): avoid sliding an internal buffer by
-	  using shared buffer.
-
-	* array.c (rb_ary_subseq): avoid copying the buffer.
-
-Mon Dec 10 01:06:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (gettable): should freeze __FILE__ string.
-
-Sun Dec  9 18:06:26 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: calls on_connect before conn_command
-
-Sat Dec  8 23:27:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_puts): old behavior restored.  rationale: a) if you
-	  want to call to_s for arrays, you can just call print a, "\n".
-	  b) to_s wastes memory if array (and sum of its contents) is
-	  huge.  c) now any object that has to_ary is treated as an array,
-	  using rb_check_convert_type().
-
-Sat Dec  8 22:40:38 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_initialize): now accepts a block to calculate
-	  the default value. [new]
-
-	* hash.c (rb_hash_aref): call "default" method to get the value
-	  corresponding to the non existing key.
-
-	* hash.c (rb_hash_default): get the default value based on the
-	  block given to 'new'.  Now it takes an optional "key" argument.
-	  "default" became the method to get the value for non existing
-	  key.  Users may override "default" method to change the hash
-	  behavior.
-
-	* hash.c (rb_hash_set_default): clear the flag if a block is given
-	  to 'new'
-
-Sat Dec  8 02:29:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): undef Data.allocate, left Data.new.
-
-Fri Dec  7 19:12:14 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: SMTP.new requires at least one arg.
-
-	* lib/net/pop.rb: POP.new requires at least one arg.
-
-	* lib/net/pop.rb: uses "raise *Error.new" instead of simple raise.
-
-	* lib/net/http.rb: HTTP.new requires at least one arg.
-
-	* lib/net/http.rb: changes implicit start algorithm.
-
-Fri Dec  7 15:49:39 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* ext/extmk.rb.in: ignore adding -Wl,-R to DLDFLAGS when the directory
-	  is $topdir.
-
-Fri Dec  7 13:58:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/curses/curses.c (window_scrollok): use RTEST().
-
-	* ext/curses/curses.c (window_idlok): ditto.
-
-	* ext/curses/curses.c (window_keypad): ditto.
-
-	* ext/curses/curses.c (window_idlok): idlok() may return void on
-	  some platforms; so don't use return value.
-
-	* ext/curses/curses.c (window_scrollok): ditto for consistency.
-
-	* ext/curses/curses.c: replace FIX2INT() by typechecking NUM2INT().
-
-Fri Dec  7 09:51:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (str_extend): should not process immature #$x and
-	  #@x interpolation, e.g #@#@ etc.
-
-Fri Dec  7 03:21:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_sort_by): sort_by does not have to be stable always.
-
-	* enum.c (enum_sort_by): call qsort directly to gain performance.
-
-Thu Dec  6 18:52:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* ext/extmk.rb.in: add -Wl,-R flags to DLDFLAGS on netbsdelf.
-
-	* lib/mkmf.rb: ditto.
-
-Thu Dec  6 09:15:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_qsort): ruby_qsort(qs6) is now native thread safe.
-
-	* error.c (rb_sys_fail): it must be a bug if it's called when
-	  errno == 0.
-
-Wed Dec  5 23:36:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (WC2MBC1ST): should not pass through > 0x80 number in UTF-8.
-
-Wed Dec  5 20:05:18 2001  Florian Frank  <flori@ping.de>
-
-	* ext/socket/socket.c (bsock_send): should raise EWOULDBLOCK
-	  exception.
-
-	* ext/socket/socket.c (s_recvfrom): ditto.
-
-	* ext/socket/socket.c (s_accept): ditto.
-
-	* ext/socket/socket.c (udp_send): ditto.
-
-Tue Dec  4 17:43:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (DUPSETUP): new SETUP macro for duplication.
-
-	* time.c (time_dup): implement in Time class using DUPSETUP.
-
-	* time.c (time_getlocaltime): new method;  probably requires
-	  better name than getlocaltime. [new,experimental]
-
-	* time.c (time_getgmtime): ditto.
-
-	* array.c (rb_ary_dup): uses DUPSETUP.
-
-	* string.c (rb_str_dup): uses DUPSETUP.  now properly copies
-	  instance variables too.
-
-Tue Dec  4 03:49:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fread): EAGAIN/EWOULDBLOCK should not terminate and
-	  throw away the input.
-
-	* time.c (time_new_internal): underflow adjustment must not use
-	  negative div/mod.
-
-	* time.c (time_cmp): should consider tv_usec on non Fixnum number
-	  comparison.
-Sun Dec  9 23:00:54 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
-	* matrix.rb: Vector#* bug. reported from Massimiliano Mirra
-	  <info@chromatic-harp.com>.
-
-Sun Dec  9 22:15:59 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* enum.c (enum_sort_by): should replace with last elements.
-
-Mon Dec  3 16:06:57 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/socket/extconf.rb: remove -L/usr/local/lib.
-
-	* configure.in: add -Wl,-export-dynamic on NetBSD.
-
-Mon Dec  3 16:04:16 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* configure.in: not use X11BASE, since it's not always set.
-
-Mon Dec  3 13:53:49 2001  Tanaka Akira  <akr@m17n.org>
-
-	* time.c (rb_strftime): buffer length condition was wrong.
-
-	* time.c (time_strftime): should backup buf to the original
-	  buffer.
-
-Mon Dec  3 09:59:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_plus): must detect result overflow.
-
-	* time.c (time_minus): ditto.
-
-	* time.c (time_new_internal): round usec overflow and underflow
-	  here.
-
-	* time.c (time_plus): move operand overflow/underflow check to
-	  time_new_internal().
-
-	* time.c (time_minus): ditto.
-
-	* time.c (time_cmp): should consider tv_usec too.
-
-Mon Dec  3 03:32:22 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* configure.in: apply patch from NetBSD's pkgsrc (patch-aa).
-
-Sun Dec  2 22:01:52 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: use GCC, not without_gcc. remove without_gcc.
-
-	* ext/curses/extconf.rb: check for curses.h.
-
-	* ext/dbm/extconf.rb: check if $CFLAGS includes DBM_HDR.
-
-Sat Dec  1 12:13:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_gmtime): time_modify() should be called even if tm
-	  struct is not calculated yet.
-
-Fri Nov 30 17:02:55 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: set target_cpu to i386 on cygwin and mingw32.
-
-	* configure.in: default --enable-shared to yes on cygwin and mingw32.
-
-Fri Nov 30 00:25:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* README.EXT: Appendix B is duplicated.
-
-	* README.EXT.ja: ditto.
-
-Thu Nov 29 00:28:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_equal): object with to_str must be treated as a
-	  string.
-
-Wed Nov 28 18:46:28 2001  Ville Mattila  <mulperi@iki.fi>
-
-	* eval.c (rb_thread_select): should subtract timeofday() from
-	  limit, not reverse.
-
-Wed Nov 28 16:03:28 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* util.c (scan_hex): x is not a hexadecimal digit.
-
-Wed Nov 28 13:38:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_schedule): should treat the case that
-	  select(2) returns 0, if a thread is under both WAIT_SELECT and
-	  WAIT_TIME.  Jakub Travnik <J.Travnik@sh.cvut.cz> actually fixed
-	  this bug.
-
-Tue Nov 27 02:15:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_float): must distinguish -0.0 from 0.0.
-
-Mon Nov 26 20:57:24 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/Setup*, ext/syslog/*: import the "syslog" module from the
-	  rough ruby project.
-
-Mon Nov 26 16:14:42 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* gc.c (gc_mark_all): tweak mark order for little bit better scan.
-
-	* gc.c (rb_gc_mark): ditto.
-
-	* gc.c (rb_gc): ditto.
-
-Mon Nov 26 16:54:59 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/win32.c (mypopen): fixed that mypclose() didn't really close
-	  pipe.
-
-	* win32/win32.c (CreateChild): set STARTF_USESTDHANDLES flag only
-	  when some handles are passed.
-
-Mon Nov 26 16:31:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (sort_by_i): slight performance boost.
-
-Sun Nov 25 21:02:18 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* parse.y (str_extend): change types of second and third arguments
-	  from char to int.
-
-Thu Nov 22 20:15:28 2001  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
-
-	* gc.c (gc_mark_rest): should call gc_mark_children(), not gc_mark().
-
-	* gc.c (rb_gc_mark): may cause infinite loop.
-
-Thu Nov 22 00:28:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (str_extend): should check nesting parentheses in #{}.
-
-Wed Nov 21 12:22:52 2001  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/cgi.rb: CGI#header: do not set Apache.request.status for
-	  Location: if Apache.request.status is already set.
-
-Wed Nov 21 02:24:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (pst_wstopsig): returns nil unless WIFSTOPPED() is
-	  non-zero.
-
-	* process.c (pst_wtermsig): returns nil unless WIFSIGNALED() is
-	  non-zero.
-
-	* process.c (pst_wexitstatus): returns nil unless WIFEXITED() is
-	  non-zero.
-
-Wed Nov 21 00:17:54 2001  Ville Mattila  <mulperi@iki.fi>
-
-	* eval.c (rb_thread_select): tv_sec and tv_usec should not be
-	  negative.
-
-	* signal.c (posix_signal): do not set SA_RESTART for SIGVTALRM.
-
-Tue Nov 20 21:09:22 2001  Guy Decoux  <ts@moulon.inra.fr>
-
-	* parse.y (call_args2): block_arg may follow the first argument in
-	  call_args2.
-
-Tue Nov 20 02:01:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (stack_check): should avoid stack length check during
-	  raising SystemStackError exception.
-
-Tue Nov 20 01:07:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (str_extend): should not terminate string interpolation
-	  with newlines in here-docs and newline terminated strings.
-
-Mon Nov 19 17:58:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_modfunc): should follow NODE_ZSUPER link; based
-	  on Guy Decoux's patch in [ruby-talk:25478].
-
-Mon Nov 19 16:09:33 2001  Tanaka Akira  <akr@m17n.org>
-
-	* string.c (rb_str_succ): there was buffer overrun.
-
-Mon Nov 19 14:14:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (str_extend): term can be any character.
-
-Mon Nov 19 04:58:42 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb (header): support for Apache. thanks to
-	  Shugo Maeda <shugo@ruby-lang.org>.
-
-Sun Nov 18 19:37:55 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y: needless conditionals.
-
-	* parse.y (parse_regx): parse error at unterminated regex /#{.
-	  (ruby-bugs-ja:PR#142)
-
-Sat Nov 17 12:37:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): should give length to utf8_to_uv().
-
-	* pack.c (utf8_to_uv): add length check.
-
-Sat Nov 17 01:41:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* massages: replace "wrong #" by "wrong number".
-
-	* marshal.c (w_float): output Infinity and NaN explicitly.
-
-	* marshal.c (r_object): support new explicit float format.
-
-	* eval.c (rb_thread_wait_for): select may cause ERESTART on
-	  Solaris.
-
-	* eval.c (rb_thread_select): ditto.
-
-Thu Nov 15 15:29:39 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* array.c (rb_ary_join): non-nil separator must be converted to
-	  String.  and separators' total length was wrong.
-
-Thu Nov 15 03:37:17 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* hash.c (ruby_setenv): remove USE_WIN32_RTL_ENV block since it's
-	  obsoleted.
-
-	* win32/win32.c, win32/win32.h: sort out #if 0 - #endif or others.
-
-Thu Nov 15 00:07:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_to_s): if rb_output_fs is nil, insert newlines
-	  between array elements (use rb_default_rs as newline literal)
-	  [experimental].
-
-Wed Nov 14 15:16:23 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* gc.c (init_mark_stack): no need to clear mark_stack.
-
-	* gc.c (gc_mark_all): need to handle finalizer mark.
-
-	* gc.c (gc_mark_rest): use MEMCPY instead of memcpy.
-
-	* gc.c (rb_gc_mark): earlier const check to avoid pusing special
-	  constants into mark stack.
-
-Wed Nov 14 01:12:07 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* win32/win32.c (waitpid): fix wait count.
-
-	* win32/win32.c (poll_child_status): rename from wait_child().
-
-Wed Nov 14 01:33:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_to_s): 'to_s' now takes optional argument to
-	  specify radix. [new]
-
-	* bignum.c (rb_big_to_s): ditto. [new]
-
-Tue Nov 13 19:50:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: do not override CC if set.
-
-Tue Nov 13 16:49:16 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/win32.c (mypopen): return error status instead of calling
-	  rb_sys_fail().
-
-	* win32/win32.c (do_spawn): ditto.
-
-Tue Nov 13 14:39:11 2001  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* signal.c (sighandle): should not re-register sighandler if
-	  POSIX_SIGNAL is defined.
-
-Tue Nov 13 12:55:59 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/win32.c (do_spawn): use CreateChild() instead of calling
-	  CreateProcess() directly. Original patches comes from Patrick Cheng.
-
-	* win32/win32.c (mypopen): ditto.
-
-	* win32/win32.c (mypclose): use rb_syswait() instead of waiting in this
-	  function.
-
-	* win32/win32.c (waitpid): use wait_child() instead of _cwait().
-
-	* win32/win32.c (CreateChild): added. [new]
-
-	* win32/win32.c (wait_child): added. [new]
-
-	* win32/win32.c (FindFirstChildSlot): added. [new]
-
-	* win32/win32.c (FindChildSlot): added. [new]
-
-	* win32/win32.c (FindPipedChildSlot): added. [new]
-
-	* win32/win32.c (CloseChildHandle): added. [new]
-
-	* win32/win32.c (FindFreeChildSlot): added. [new]
-
-Tue Nov 13 12:38:12 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* hash.c (envix): use GET_ENVIRON and FREE_ENVIRON to get environment
-	  variables list.
-
-	* hash.c (env_keys): ditto.
-
-	* hash.c (env_each_key): ditto.
-
-	* hash.c (env_values): ditto.
-
-	* hash.c (env_keys): ditto.
-
-	* hash.c (env_each_value): ditto.
-
-	* hash.c (env_each): ditto.
-
-	* hash.c (env_inspect): ditto.
-
-	* hash.c (env_to_a): ditto.
-
-	* hash.c (env_size): ditto.
-
-	* hash.c (env_empty_p): ditto.
-
-	* hash.c (env_has_value): ditto.
-
-	* hash.c (env_index): ditto.
-
-	* hash.c (env_to_hash): ditto.
-
-	* win32/win32.c (win32_getenv): use static buffer.
-
-	* win32/win32.c, win32/win32.h (win32_get_environ): get environment
-	  variables list. [new]
-
-	* win32/win32.c, win32/win32.h (win32_free_environ): free environment
-	  variables list. [new]
-
-Mon Nov 12 16:48:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (error_print): errat array may be empty.
-
-Mon Nov 12 01:30:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval_cmd): should not upgrade safe level unless
-	  explicitly specified by argument newly added.
-
-	* signal.c (sig_trap): should not allow tainted trap closure.
-
-	* variable.c (rb_f_trace_var): should not allow trace_var on safe
-	  level higher than 3.
-
-	* variable.c (rb_f_trace_var): should not allow tainted trace
-	  closure.
-
-Sun Nov 11 00:12:23 2001  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
-
-	* gc.c: do not use static stack until system stack overflows.
-
-Sat Nov 10 03:57:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): should call Exception#exception instead of
-	  calling rb_exc_new3() directly.
-
-	* error.c (exc_exception): set "mesg" directly to the clone.  it
-	  might be better to set mesg via some method for flexibility.
-
-Sat Nov 10 00:14:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (cvar_override_check): should print original module
-	  name, if 'a' is T_ICLASS.
-
-	* parse.y (yylex): float '1_.0' should not be allowed.
-
-	* variable.c (var_getter): should care about var as Qfalse
-	  (ruby-bugs#PR199).
-
-Fri Nov  9 13:50:06 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/config.status.in: make CFLAGS same as Makefile's one.
-
-Thu Nov  8 20:20:37 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_trap_eval): avoid annoying warning with signal.
-	  [ruby-talk:23225]
-
-	* eval.c (rb_call0): adjust caller source file/line while
-	  evaluating optional arguments.
-
-Thu Nov  8 18:41:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (cmpint): <=> or block for {min,max} may return bignum.
-
-	* array.c (sort_1): use rb_compint.
-
-	* array.c (sort_2): ditto.
-
-	* enum.c (min_ii): ditto.
-
-	* enum.c (min_ii): ditto.
-
-	* enum.c (max_i): ditto.
-
-	* enum.c (max_ii): ditto.
-
-Thu Nov  8 18:21:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (path_check_1): forgot to initialize 'p'.
-
-Thu Nov  8 14:52:15 2001  Tanaka Akira  <akr@m17n.org>
-
-	* mkconfig.rb: use String#dump to generate Ruby string literal.
-
-Thu Nov  8 15:46:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_eql): should override 'eql?'
-
-	* array.c (rb_ary_hash): should override 'hash' too.
-
-Tue Nov  6 14:38:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (security): always give warning for insecure PATH.
-
-	* dir.c (my_getcwd): do not rely on MAXPATHLEN.
-
-	* file.c (rb_file_s_readlink): ditto.
-
-	* file.c (path_check_1): ditto.
-
-Tue Nov  6 14:17:14 2001  Amos Gouaux <amos+ruby@utdallas.edu>
-
-	* lib/net/imap.rb (getquota_response): use astring for mailbox
-	  names.
-
-	* lib/net/imap.rb (getacl_response): ditto.
-
-Mon Nov  5 17:09:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): should not call rb_f_block_given_p().
-
-Sat Nov  3 23:33:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_chomp_bang): should terminate string by NUL.
-
-Sat Nov  3 22:28:51 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
-
-	* matrix.rb (Matrix#column_vectors, Matrix#row_vectors): ditto bug.
-	  this bug report and fix by tsutomu@nucba.ac.jp.
-
-	* forwardable.rb: change raise to Kernel::raise
-
-Sat Nov  3 10:11:57 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): better error message.
-
-Thu Nov  1 14:08:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_aref): idx may be a Bignum.
-
-	* numeric.c (fix_aref): negative index must return zero.
-
-Thu Nov  1 13:23:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_mark_children): should NOT treat last element of
-	  structs and arrays specially.
-
-Wed Oct 31 16:59:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (exec_under): should initialize ruby_frame->self;
-
-Wed Oct 31 15:09:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (POP_VARS): should not set DVAR_DONT_RECYCLE if _old
-	  ruby_vars is already force_recycled.
-
-Wed Oct 31 10:28:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc): handles mark stack overflow.
-
-	* gc.c (PUSH_MARK): use static mark stack, no more recursion.
-
-Wed Oct 31 02:44:06 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: CGI::Cookie::parse(): Ignore duplicate keys caused by
-	  Netscape bug.
-
-Tue Oct 30 18:21:51 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* win32/mkexports.rb: follow the change of rb_io_puts().
-
-Tue Oct 30 14:04:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_chomp_bang): do smart chomp if $/ == '\n'. [new]
-
-	* io.c (rb_io_puts): don't treat Array specially.
-
-	* bignum.c (rb_big_cmp): should convert bignum to float.
-
-	* eval.c (rb_f_eval): can't modify untainted binding.
-
-Mon Oct 29 16:08:30 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): should preserve p0 value.
-
-Mon Oct 29 14:56:44 2001  Usaku Nakamura <usa@ruby-lang.org>
-
-	* intern.h (rb_protect_inspect): follow the change of array.c.
-
-	* eval.c (rb_exec_end_proc): follow the change of rb_protect().
-
-	* eval.c (method_proc, umethod_proc, rb_catch): cast the first
-	  parameter of rb_iterate() to avoid VC++ warning.
-
-	* range.c (range_step): ditto.
-
-	* ext/sdbm/init.c (fsdbm_update, fsdbm_replace): ditto.
-
-Mon Oct 29 07:57:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (str_extend): should allow interpolation of $-x.
-
-	* variable.c (rb_cvar_set): empty iv_tbl may cause infinite loop.
-
-	* variable.c (rb_cvar_get): ditto.
-
-	* variable.c (cvar_override_check): ditto.
-
-Sat Oct 27 23:01:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_eq): convert Bignum to Float, instead of
-	  reverse.
-
-Fri Oct 26 06:19:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_localtime): getting tm should not be prohibited for
-	  frozen time objects.
-
-	* time.c (time_gmtime): ditto.
-
-	* version.c (Init_version): freeze RUBY_VERSION,
-	  RUBY_RELEASE_DATE, and RUBY_PLATFORM.
-
-	* file.c (Init_File): freeze File::SEPARATOR, ALT_SEPARATOR and
-	  PATH_SEPARATOR.
-
-	* file.c (rb_stat_cmp): should check operand type before calling
-	  get_stat().
-
-Thu Oct 25 10:28:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval_cmd): should not invoke "call" with a block on
-	  any occasion.
-
-Wed Oct 24 03:25:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_aref): idx may be a Bignum.
-
-Tue Oct 23 01:21:19 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (proc_invoke): fix self switching in Proc#call
-	  (ruby-bugs-ja#PR108) and GC failure.  use Qundef instead of 0
-	  to direct not switching self.
-
-	* eval.c (call_trace_func): ditto.
-
-	* eval.c (call_end_proc): ditto.
-
-	* eval.c (proc_call): ditto.
-
-	* eval.c (proc_yield): ditto.
-
-Tue Oct 23 01:15:43 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* variable.c (rb_global_entry): reconstruct global variable
-	  aliasing (sharing global_entry->var with other global_entry).
-
-	* variable.c (undef_getter): ditto.
-
-	* variable.c (undef_setter): ditto.
-
-	* variable.c (val_setter): ditto.
-
-	* variable.c (mark_global_entry): ditto.
-
-	* variable.c (rb_define_hooked_variable): ditto.
-
-	* variable.c (rb_f_trace_var): ditto.
-
-	* variable.c (remove_trace): ditto.
-
-	* variable.c (rb_f_untrace_var): ditto.
-
-	* variable.c (rb_gvar_get): ditto.
-
-	* variable.c (trace_en): ditto.
-
-	* variable.c (rb_gvar_set): ditto.
-
-	* variable.c (rb_gvar_defined): ditto.
-
-	* variable.c (rb_alias_variable): ditto.
-
-Mon Oct 22 18:53:55 2001  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
-
-	* numeric.c (num_remainder): a bug in Numeric#remainder.
-
-Mon Oct 22 15:21:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_exec_end_proc): END might be called within END
-	  block.
-
-	* class.c (rb_mod_clone): should not copy class name, since clone
-	  should remain anonymous.
-
-Fri Oct 19 23:40:37 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* variable.c (remove_trace): should not access already freed area.
-
-	* variable.c (rb_f_untrace_var): fix memory leak.
-
-Fri Oct 19 17:55:14 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* marshal.c (w_uclass): cloned class is not user
-	  class. (ruby-bugs-ja#PR103)
-
-	* marshal.c (r_object): Struct subclass couldn't
-	  load. (ruby-bugs-ja#PR104)
-
-Wed Oct 17 14:12:50 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* variable.c (alias_fixup): added. ad hoc support for ordinary
-	  global variable aliasing. when original entry is set, make the
-	  alias to refer directly as possible.
-
-	* variable.c (alias_getter, alias_setter): ditto.
-
-	* variable.c (rb_alias_variable): ditto. and no need to mark alias
-	  variables.
-
-	* variable.c (rb_gvar_defined): refer the original entry of an alias.
-
-Tue Oct 16 23:29:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): self in a block given to define_method now be
-	  switched to the receiver of the method.
-
-	* eval.c (proc_invoke): added new parameter to allow self
-	  switching.
-
-Tue Oct 16 21:38:15 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_f_missing): check stack level with rb_stack_check().
-
-	* eval.c (rb_call0): ditto.
-
-	* eval.c, intern.h (rb_stack_check): added. [new]
-
-Tue Oct 16 13:18:47 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* object.c (rb_mod_initialize): optional block with
-	  Module.new. [new] (from 2001-10-10)
-
-Tue Oct 16 00:07:06 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (yylex): disallow alpha-numeric and mbchar for
-	  terminator of %string.
-
-Mon Oct 15 18:00:05 2001  Pit Capitain  <pit@capitain.de>
-
-	* string.c (rb_str_index): wrong increment for non alphanumeric
-	  string.
-
-Mon Oct 15 05:23:02 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* sprintf.c (rb_f_sprintf): support "%B".
-
-Wed Oct 10 03:11:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_stat_clone): should copy internal data too.
-
-	* numeric.c (num_clone): Numeric should not be copied by clone.
-
-	* object.c (rb_obj_clone): should check immediate values.
-
-	* parse.y (command): `yield' should take command_args.
-
-	* parse.y (parse_quotedwords): %w(...) is not a string.
-
-Tue Oct  9 18:40:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* process.c (Init_process): activate the case NT.
-
-Tue Oct  9 17:08:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (thread_status_name): separated from
-	  rb_thread_inspect(). return string expression for thread status.
-
-	* eval.c (rb_thread_status, rb_thread_inspect): use
-	  thread_status_name().
-
-	* eval.c (rb_thread_priority_set): return the priority not but
-	  self.
-
-Sat Oct  6 23:07:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): NODE_MATCH3 was confusing left and right. sigh.
-
-Fri Oct  5 15:19:46 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_unique): should not dump anonymous class.
-
-Fri Oct  5 11:59:13 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (proc_s_new): revived.
-
-	* eval.c (Init_Proc): define Proc.new instead of Proc.allocate to
-	  inhibit from creating uninitialized Proc.
-
-Thu Oct  4 14:11:03 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_connect): EALREADY is the equivalent
-	  for EINPROGRESS in ws2_32.lib.
-
-Wed Oct  3 20:11:06 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* re.c (rb_reg_s_alloc): avoid infinite recursion.
-
-Wed Oct  3 16:49:49 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/gdbm/gdbm.c (rb_gdbm_fetch): str is a VALUE now.
-
-Wed Oct  3 13:32:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_object): better allocation type check for
-	  TYPE_UCLASS. usage of allocation framework is disabled for now.
-
-	* variable.c (rb_class_path): Module may have subclass.
-
-	* string.c (rb_str_update): should maintain original negative
-	  offset.
-
-	* string.c (rb_str_subpat_set): ditto
-
-	* string.c (rb_str_aset): ditto.
-
-	* re.c (rb_reg_nth_match): should check negative nth.
-
-	* re.c (rb_reg_nth_defined): ditto.
-
-Tue Oct  2 19:12:47 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/ftools.rb (catname): allow trailing '/' for the destination.
-
-Tue Oct  2 18:31:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should override existing class.
-
-Tue Oct  2 17:08:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_alloc): general instance allocation framework.
-	  use of NEWOBJ() is deprecated except within 'allocate' method.
-
-Tue Oct  2 08:04:52 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* marshal.c (r_object): TYPE_UCLASS check should be inversed.
-
-Mon Oct  1 19:18:54 2001  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (unix_addr): getsockname(2) may result len = 0.
-
-	* ext/socket/socket.c (unix_peeraddr): getpeername(2) may result
-	  len = 0.
-
-Mon Oct  1 09:59:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_subpat_set): support function for new argument
-	  pattern String#[re,offset] = val. [new]
-
-Sat Sep 29 02:30:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (POP_BLOCK): rb_gc_force_recycle() was called too much.
-	  Should not be called if SCOPE_DONT_RECYCLE is set.
-
-Wed Sep 26 22:21:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_aref_m): new argument pattern
-	  String#[re,offset]. [new]
-
-Wed Sep 26 19:02:39 2001  Guy Decoux  <ts@moulon.inra.fr>
-
-	* parse.y: allow 'primary[] = arg'
-
-Tue Sep 25 10:46:42 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* win32/win32.c (isInternalCmd): check return value of NtMakeCmdVector
-	  (Tietew <tietew@tietew.net>'s patch).
-
-Mon Sep 24 00:55:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_substr): should return an instance of
-	  receiver's class.
-
-	* string.c (rb_str_succ): ditto.
-
-	* array.c (rb_ary_subseq): ditto.
-
-	* array.c (rb_ary_initialize): Array.new([1,2,3]) => [1,2,3]. [new]
-
-Sat Sep 22 22:16:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_reverse): should return an instance of
-	  receiver's class.
-
-	* string.c (rb_str_times): ditto.
-
-	* array.c (rb_ary_times): ditto
-
-	* string.c (str_gsub): ditto.
-
-	* string.c (rb_str_ljust): ditto.
-
-	* string.c (rb_str_rjust): ditto.
-
-	* string.c (rb_str_center): ditto.
-
-Sat Sep 22 12:13:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): retrieves file, line information from binding.
-
-Thu Sep 20 21:25:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (MATCH_DATA): access via rb_svar().
-
-Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c, intern.h (rb_svar): return reference to special variable
-	  from local variable index. [new]
-
-	* eval.c (rb_eval): use rb_svar() for NODE_FLIP{2,3}.
-
-	* parse.y (rb_(backref|lastline)_(get|set)): access via rb_svar().
-
-	* eval.c (proc_invoke): push dynamic variables.
-
-	* eval.c (rb_thread_yield): push special variables as dynamic
-	  variables($_, $~ and FLIP states).
-
-Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* intern.h, parse.y (rb_is_local_id): return true if the ID is
-	  local symbol. [new]
-
-	* parse.y (internal_id): make new ID for internal use. [new]
-
-	* parse.y (cond0): allocate internal ID for NODE_FLIP{2,3}.
-
-	* eval.c (rb_f_local_variables): use rb_is_local_id() to select
-	  visible local variables.
-
-Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_thread_start_0): SCOPE_SHARED is removed.
-
-	* eval.c, intern.h (rb_thread_scope_shared_p): removed. special
-	  variables are no longer shared by threads.
-
-	* re.c (rb_reg_search): MATCHDATA is no longer shared by threads.
-
-Tue Sep 18 11:44:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_init): String.new() => "" [new]
-
-Tue Sep 11 20:53:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_path): new method.
-
-	* dir.c (dir_initialize): wrap DIR into struct, along with path
-	  information.
-
-Sat Sep  8 07:13:42 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/net/telnet.rb: waitfor(): improvement. thanks to
-	  nobu.nakada@nifty.ne.jp
-
-Sat Sep  8 04:34:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_restore_context): save current value of
-	  lastline and lastmatch in the thread struct for later restore.
-
-	* eval.c (rb_thread_save_context): restore lastline and lastmatch.
-
-Fri Sep  7 11:27:56 2001  akira yamada  <akira@ruby-lang.org>
-
-	* numeric.c (flo_to_s): should handle negative float value.
-
-Fri Sep  7 09:44:44 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/net/telnet.rb: waitfor(): bug fix.
-
-Fri Sep  7 07:11:34 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: CGI#doctype(): bug fix (html4Fr).
-
-	* lib/net/telnet.rb, lib/cgi.rb: remove VERSION, RELEASE_DATE,
-	  VERSION_CODE, RELEASE_CODE. please use REVISION.
-
-	* lib/cgi.rb: CGI#header(): bug fix.
-
-	* lib/net/telnet.rb, lib/cgi.rb: concat --> +=
-
-Thu Sep  6 17:38:18 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* dir.c (dir_s_chdir): raise if environment variable HOME/LOGDIR
-	  not set.
-
-	* dir.c (glob_helper): avoid infinite loop on a file name with
-	  wildcard characters. (ruby-bugs#PR177)
-
-Thu Sep  6 14:25:15 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_base_s_hexdigest): remove a debug
-	  print.
-
-Thu Sep  6 13:56:14 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_base_s_digest,
-	  rb_digest_base_s_hexdigest): ensure that a string is given.
-
-Thu Sep  6 13:28:51 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/jcode.rb (_regexp_quote): fix quote handling, again.
-
-Thu Sep  6 07:28:56 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (rb_find_file_ext): add const qualifiers to ext.
-
-	* intern.h (rb_find_file_ext): ditto.
-
-Thu Sep  6 07:16:14 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/socket/socket.c (Init_socket): remove duplicating constants.
-
-Thu Sep  6 03:15:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_include_module): should check whole ancestors to
-	  avoid duplicate module inclusion.
-
-Wed Sep  5 20:02:27 2001  Shin'ya Adzumi  <adzumi@denpa.org>
-
-	* string.c (trnext): should check backslash before updating "now"
-	  position.
-
-Wed Sep  5 17:41:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/jcode.rb (_regexp_quote): fix quote handling.
-
-Tue Sep  4 01:03:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (Init_Regexp): to_s to be alias to inspect.
-
-Mon Sep  3 22:46:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): should support 'keyword='.
-
-Mon Sep  3 20:26:08 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* intern.h (rb_find_file_ext): changed from rb_find_file_noext().
-
-Mon Sep  3 15:12:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (proc_options): should not adjust argc/argv if -e option
-	  is supplied.
-
-Mon Sep  3 14:11:17 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* error.c: unbreak the build on *BSD with gcc 3.0.1 by removing
-	  the conflicting declaration of sys_nerr for *BSD.
-
-Sat Sep  1 18:50:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (proc_options): should not alter origargv[].
-
-	* ruby.c (set_arg0): long strings for $0 dumped core.
-
-Sat Sep  1 09:50:54 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ruby.c (set_arg0): prevent SEGV when val is longer than the
-	  original arguments.
-
-	* ruby.c (ruby_process_options): initialize total length of
-	  original arguments at first.
-
-Sat Sep  1 14:05:28 2001  Brian F. Feldman  <green@FreeBSD.org>
-
-	* ruby.c (set_arg0): use setprogtitle() if it's available.
-
-Sat Sep  1 03:49:11 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_popen): accept integer flags as mode.
-
-Fri Aug 31 19:46:05 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (rb_find_file_ext): extension table can be supplied from
-	  outside.  renamed.
-
-	* eval.c (rb_f_require): replace rb_find_file_noext by
-	  rb_find_file_ext.
-
-Fri Aug 31 19:26:55 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_provided): should also check feature without
-	  extension.
-
-Fri Aug 31 13:06:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (flo_to_s): do not rely on decimal point to be '.'
-
-Wed Aug 29 02:18:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): ternary ? can be followed by newline.
-
-Tue Aug 28 00:40:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_require): should check static linked libraries
-	  before raising exception.
-
-Fri Aug 24 15:17:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_equal): check identity equality first.
-
-	* string.c (rb_str_equal): ditto.
-
-	* struct.c (rb_struct_equal): ditto.
-
-Fri Aug 24 14:38:17 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* dln.c (dln_strerror): fix a bug that sometimes made null message on
-	  win32 (Tietew <tietew@tietew.net>'s patch).
-
-	* win32/win32.c (mystrerror): ditto.
-
-Fri Aug 24 03:15:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (Init_Numeric): undef Integer::new.
-
-Fri Aug 24 00:46:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): NODE_WHILE should update result for each
-	  conditional evaluation.
-
-	* eval.c (rb_eval): NODE_UNTIL should return last evaluated value
-	  (or value given to break).
-
-Thu Aug 23 21:59:38 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* enum.c (sort_by_i): fix typo.
-
-Thu Aug 23 10:10:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): should not dump core for "defined?(())".
-
-	* eval.c (umethod_bind): recv can be an instance of descender of
-	  oklass if oklass is a Module.
-
-Wed Aug 22 23:20:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_equal): check identity equality first.
-
-Wed Aug 22 19:58:59 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (intersect_fds): counts intersecting fds.
-
-	* eval.c (rb_thread_schedule): only fds requested by
-	  each thread count as select_value.
-
-Tue Aug 21 22:28:09 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (group_member): should check real gid only.
-
-	* file.c (eaccess): do not cache euid, since effective euid may be
-	  changed via Process.euid=().
-
-	* file.c (eaccess): return -1 unless every specified access mode
-	  is permitted.
-
-Tue Aug 21 16:09:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): while/until returns the value which is given
-	  to break.
-
-	* parse.y (value_expr): using while/until/class/def as an
-	  expression is now gives a warning, not an error.
-
-Tue Aug 21 11:56:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_eqq): should compare strings based on magical
-	  increment (using String#upto), not dictionary order.
-
-Mon Aug 20 19:53:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/digest/sha2/extconf.rb: fix support for cross-compiling.
-
-	* mkconfig.rb: fix support for autoconf 2.52.
-
-Mon Aug 20 17:24:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_sort_by): new method for Schewartzian transformed
-	  stable sort.
-
-Mon Aug 20 16:09:05 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (mod_av_set): detect constant overriding for built-in
-	  classes/modules.
-
-Mon Aug 20 15:14:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (tokadd_escape): escaped backslashes too much.
-
-Mon Aug 20 13:24:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): 'iter' here should be an array.
-
-Mon Aug 20 12:43:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): should retrieve __member__ data from
-	  non-singleton class.
-
-Sat Aug 18 23:11:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_cvar_get): class variable override check added.
-
-	* variable.c (rb_cvar_set): ditto
-
-	* variable.c (rb_cvar_declare): ditto.
-
-Fri Aug 17 12:13:48 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: Protocol.new requires at least one arg.
-
-	* lib/net/smtp.rb: ditto.
-
-	* lib/net/pop.rb: ditto.
-
-	* lib/net/http.rb: ditto.
-
-Fri Aug 17 00:49:51 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parse_regx): handle backslash escaping of delimiter here.
-
-Thu Aug 16 23:03:40 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* io.c: prevent recursive malloc calls on NEC UX/4800.
-
-	* ext/socket/socket.c: ditto.
-
-Thu Aug 16 13:54:04 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (s_recvfrom): fix typo.
-
-Thu Aug 16 09:53:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (s_recvfrom): avoid VC++6 warning.
-
-Thu Aug 16 03:50:33 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* win32/win32.c (NtCmdGlob): avoid VC++ warning.
-
-	* lib/mkmf.rb: add -I$(srcdir) to CPPFLAGS.
-
-Wed Aug 15 04:59:15 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/*/extconf.rb: really fix so that they build from any
-	  directory.
-
-Wed Aug 15 04:04:02 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/sha2/extconf.rb: fix so that they build from any
-	  directory.
-
-Wed Aug 15 01:59:19 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/defs.h: Define NO_UINT64_T instead of emitting an
-	  error to fail.
-
-	* ext/digest/sha2/extconf.rb: Do not exit on error, and utilize
-	  NO_UINT64_T to detect if the system has a 64bit integer type.
-
-Tue Aug 14 21:14:07 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/sha2/extconf.rb: do not create Makefile when no 64bit
-	  integer type is detected.
-
-Tue Aug 14 17:09:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): new method.
-
-Tue Aug 14 11:49:00 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
-
-	* string.c (rb_str_cmp): remove needless conditional.
-
-Tue Aug 14 03:23:25 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* string.c (rb_str_lstrip_bang) `return Qnil' was missing.
-
-Mon Aug 13 14:16:46 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* bignum.c, marshal.c: Detypo: s/SIZEOF_ING/SIZEOF_INT/.
-
-Sun Aug 12 15:01:58 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* string.c (rb_str_cat): fix buffer overflow.
-
-	* string.c (rb_str_append): nothing to append actually when `str2'
-	  is empty.
-
-Sat Aug 11 14:43:47 2001  Tanaka Akira  <akr@m17n.org>
-
-	* array.c (rb_inspecting_p): initialize inspect_key if it is
-	  not initialized yet.
-
-Fri Aug 10 22:14:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (cond0): operands of logical operators are not treated
-	  as conditional expression anymore, but propagate conditional
-	  status if used in conditionals.
-
-Tue Aug  7 09:10:32 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* win32/win32.h: fix problems with BC++ (ruby-bugs#PR161).
-
-Mon Aug  6 23:47:46 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* pack.c (pack_pack): associates p/P strings once at last
-	  (reverted to 1.26).
-
-	* string.c (rb_str_associate): associates an Array at once, not
-	  but a String. realloc's when str_buf.
-
-Mon Aug  6 17:01:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_gc_mark_threads): should mark ruby_cref.
-
-Mon Aug  6 14:31:37 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* numeric.c (num_divmod): fix typo.
-
-Mon Aug  6 03:29:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_lstrip_bang): new method.
-
-	* string.c (rb_str_rstrip_bang): new method.
-
-Mon Aug  6 00:35:03 2001  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* struct.c (rb_struct_modify): should check frozen and taint
-	  status.
-
-Sun Aug  5 19:28:39 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
-	* string.c (rb_str_associate): should consider STR_ASSOC too.
-
-Sun Aug  5 07:46:18 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_undefined): do not recurse if method_missing is
-	  undefined.
-
-Thu Aug  2 21:37:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_waitpid): now all arguments are optional.
-
-	* process.c (Init_process): waitpid is now alias to wait.
-
-	* process.c (Init_process): waitpid2 is now alias to wait2.
-
-	* process.c (rb_waitpid): made public.
-
-	* ext/pty/pty.c (pty_getpty): avoid disturbing SIGCHLD using
-	  thread and rb_waitpid.
-
-Thu Aug  2 11:23:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_getpgrp): now takes no argument on all
-	  platforms.
-
-	* process.c (proc_setpgrp): ditto.
-
-Thu Aug  2 01:29:42 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (strrdirsep): removed meaningless code.
-
-	* file.c (rb_file_s_expand_path): reverted to 1.66.
-
-Wed Aug  1 16:17:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_s_pack_sockaddr_in): added
-	  Socket::pack_sockaddr_in(). [new]
-
-	* ext/socket/socket.c (sock_s_pack_sockaddr_un): added
-	  Socket::pack_sockaddr_un(). [new]
-
-	* ext/socket/socket.c (sock_s_pack_sockaddr_in): added
-	  Socket::unpack_sockaddr_in(). [new]
-
-	* ext/socket/socket.c (sock_s_pack_sockaddr_un): added
-	  Socket::unpack_sockaddr_un(). [new]
-
-Wed Aug  1 15:42:16 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* eval.c (ruby_run): avoid VC++ warning.
-
-Tue Jul 31 17:30:53 2001  Usaku Nakamura  <usa@ruby-lang.org>
-
-	* marshal.c (Init_marshal): fix typos.
-
-Tue Jul 31 15:16:39 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
-	* process.c (last_status_set): nothing returned, should be void.
-
-	* ext/socket/socket.c (load_addr_info): ditto.
-
-Tue Jul 31 12:11:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (Init_marshal): new constant Marshal::MAJOR_VERSION
-	  and Marshal::MINOR_VERSION.
-
-Tue Jul 31 07:18:04 2001  Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
-	* file.c (rb_file_s_expand_path): scans per path element not per
-	  byte/character, including fix of [ruby-talk:18152] and
-	  multi-byte pathname support.
-
-Tue Jul 31 11:52:10 2001  akira yamada  <akira@ruby-lang.org>
-
-	* marshal.c (marshal_load): ruby_verbose test should be wrapped by
-	  RTEST().
-
-Mon Jul 30 17:54:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_index): should return nil (not the default
-	  value) if value is not in the hash.
-
-Mon Jul 30 12:55:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_div): new method added.  alias to '/' which
-	  should be preserved even if '/' is redefined (e.g. by
-	  mathn). [new]
-
-Mon Jul 30 11:12:14 2001  Amos Gouaux <amos+ruby@utdallas.edu>
-
-	* lib/net/imap.rb: added new commands for managing folder quotas
-	  and folder ACLs.
-
-Mon Jul 30 03:19:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_cstr2inum): "0 ff".hex should return 0, not 255.
-
-Fri Jul 27 22:29:41 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (rb_file_s_expand_path): fixed using CharNext().
-
-Fri Jul 27 18:07:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_provided): extension should be guessed using
-	  rb_find_file_noext().
-
-	* eval.c (rb_f_require): should call rb_feature_p() after
-	  extension completion.
-
-Fri Jul 27 16:25:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): add CHECK_INTS before next, redo, retry to
-	  avoid potential uninterruptable infinite loop.
-
-Thu Jul 26 11:27:12 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* file.c (rb_find_file_noext, rb_find_file): fix tilde expansion
-	  problem.
-
-Wed Jul 25 17:54:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_s_expand_path): use CharNext() to expand.
-
-Wed Jul 25 17:16:26 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* intern.h: add some missing function prototypes.
-
-Wed Jul 25 15:50:05 2001  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* file.c (rb_file_s_expand_path): should not expand "." and ".."
-	  not following dirsep.
-
-Wed Jul 25 12:15:32 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* file.c (rb_find_file_noext): should update f by expanded path.
-
-	* file.c (rb_find_file): ditto.
-
-Tue Jul 24 23:10:47 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (strrdirsep): multi-byte pathname and DOSish separator
-	  support. originally comes from Patrick Cheng. [new]
-
-	* file.c (rb_file_s_basename, rb_file_s_dirname): use
-	  strrdirsep(). comes from Patrick Cheng.
-
-	* file.c (is_absolute_path): restricted in DOSish absolute path
-	  with drive letter, and UNC support. originally comes from
-	  Patrick Cheng.
-
-	* file.c (getcwd): define macro using getwd() unless provided.
-
-Tue Jul 24 19:23:15 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb.in, lib/mkmf.rb: dig the target subdirectory for
-	  lib/* files properly in case of create_makefile("dir/name").
-
-Mon Jul 23 00:26:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_provide_feature): should not tweak extension used for
-	  loading.
-
-Sun Jul 22 21:16:43 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb.in, lib/mkmf.rb: introduce a couple of new make
-	  variables: CLEANFILES and DISTCLEANFILES.  They'd typically be
-	  defined in a file "depend".
-
-Sat Jul 21 09:40:10 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* io.c (io_fread): use fread(3) if PENDING_COUNT is available.
-
-Fri Jul 20 22:55:01 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* gc.c (ruby_xrealloc): fix a dangling bug which led memory
-	  reallocation to fail even though the second try after a GC
-	  succeeds.
-
-Fri Jul 20 03:00:46 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* class.c (rb_mod_include_p): Module#include? added. [new]
-
-Fri Jul 20 01:05:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (ignorecase_setter): give warning on modifying $=.
-
-	* string.c (rb_str_casecmp): new method. [new]
-
-	* string.c (rb_str_eql): separated from rb_str_equal(), make it
-	  always be case sensitive. [new]
-
-	* string.c (rb_str_hash): made it always be case sensitive.
-
-Thu Jul 19 13:03:15 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_f_require): should not include path in $" value
-
-	* file.c (rb_find_file): should return 0 explicitly on failure.
-
-Tue Jul 17 11:44:40 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* ruby.h: enable volatile directive with VC++.
-
-	* regex.c: ditto.
-
-Tue Jul 17 06:01:12 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* doc/net/smtp.rd.ja, pop.rd.ja, http.rd.ja: new files.
-
-	* MANIFEST: add doc/net/{http,pop,smtp}.rd.ja.
-
-Tue Jul 17 11:22:01 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (NUM_FAILURE_ITEMS): was confusing NUM_REG_ITEMS and
-	  NUM_NONREG_ITEMS, which have happened to be same value.
-
-Tue Jul 17 11:08:34 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* ext/extmk.rb.in: modify RM macro because command.com/cmd.exe don't
-	  recognize single quotation as quote character.
-
-	* lib/mkmf.rb: ditto.
-
-Tue Jul 17 01:38:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_class_new): subclass check moved to this function.
-
-	* class.c (rb_class_boot): check less version of rb_class_new().
-
-Man Jul 16 13:21:30 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* file.c (file_load_ok): fix typo.
-
-Mon Jul 16 12:58:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): should preserve iter status for embedded
-	  frame in the block.
-
-Mon Jul 16 00:04:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_s_expand_path): may overrun buffer on stack.
-
-Sun Jul 15 01:38:28 2001  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* string.c (rb_str_insert): forgot to call rb_str_modify().
-
-Sat Jul 14 12:26:30 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/digest/*/extconf.rb: fix so that they build from any
-	  directory.
-
-Sat Jul 14 06:20:17 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/net/http.rb: HTTP#proxy? did not worked.
-
-Sat Jul 14 02:56:19 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb.in: support multi-level ext/ directories.
-	  (e.g. you can have ext/foo, ext/foo/bar and ext/foo/baz)
-
-Sat Jul 14 02:55:02 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/.cvsignore: let cvs ignore extinit.c.
-
-Fri Jul 13 23:47:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_search): should consider reverse search.
-
-Fri Jul 13 22:26:09 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb: use File::split to split a target into a prefix and
-	  a module name.  This also works around a just found bug of
-	  String#rindex.
-
-	* ext/extmk.rb.in: ditto.
-
-Fri Jul 13 02:36:10 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* dir.c (dir_s_chdir): warn only when invoked from multiple
-	  threads or block is not given.
-
-Thu Jul 12 15:11:48 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_connect): workaround for the setup of
-	  Cygwin socket(EALREADY).
-
-Mon Jul  9 16:49:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb.in: modify RM macro.
-
-	* lib/mkmf.rb: ditto.
-
-Sun Jul  8 20:52:02 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ruby.h: fix a wrong function name: rb_iglob() -> rb_globi().
-
-Sun Jul  8 16:04:35 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: rename HTTP#request_by_name to send_request.
-
-	* lib/net/protocol.rb (ProtoSocket#read): modify typo.
-
-Sat Jul  7 17:45:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_convert_type): should use rb_rescue(), not rb_rescue2().
-
-	* range.c (range_init): ditto.
-
-Fri Jul  6 18:01:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_dup): copies (actually does not free)
-	  generic_ivar on dupif original owns them.
-
-Fri Jul  6 02:15:06 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/tempfile.rb: a tempfile must be created with mode 0600.
-
-Thu Jul  5 20:28:53 2001  Tietew <tietew@tietew.net>
-
-	* string.c (rb_str_each_line): should propagate taint mark.
-
-	* ext/nkf/nkf.c (rb_nkf_kconv): ditto.
-
-Fri Jul  6 14:54:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_require): revamp for simpler implementation.
-
-	* file.c (rb_find_file_noext): use String object, instead of
-	  passing char* around.
-
-	* file.c (rb_find_file): ditto.
-
-Thu Jul  5 22:01:02 2001  Mitsuhiro Kondo  <kondo@nik-prt.co.jp>
-
-	* dln.c (dln_load): should use NSLINKMODULE_OPTION_BINDNOW.
-
-Thu Jul  5 13:44:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (load_file): local variables 'c' remain uninitialized on
-	  xflag.
-
-Thu Jul  5 10:00:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_match): prefetched escaped character too early.
-
-Wed Jul  4 08:58:30 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): add argument check for attr_readers.
-
-Wed Jul  4 04:22:44 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (HTTP#request_by_name): arg order changes.
-
-Wed Jul  4 04:07:36 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (HTTP#request_by_name): bug fix.
-
-	* lib/net/http.rb: does not write Connection: by default.
-
-	* lib/net/protocol.rb: "start" for started protocol is an error.
-
-	* lib/net/protocol.rb: "finish" for finished protocol is an error.
-
-Wed Jul  4 03:17:31 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: new method HTTP#request_by_name (test)
-
-	* lib/net/http.rb: new class HTTPGenericRequest
-
-Tue Jul  3 23:58:29 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb: distclean should remove mkmf.log as well.
-
-Tue Jul  3 18:35:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval_string_wrap): should push frame (and adjust
-	  cbase) before wrapped eval.
-
-	* eval.c (rb_eval_cmd): ditto.
-
-	* eval.c (eval): should update ruby_class always after all.
-
-Tue Jul  3 14:56:27 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* eval.c (block_pass): do not change wrapper information.
-
-	* eval.c (rb_yield_0):  preserve wrapper information.
-
-Tue Jul  3 08:59:50 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* error.c (rb_name_error): raise NameError instead of LoadError.
-
-Mon Jul  2 17:22:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (exc_exception): clone the receiver exception instead of
-	  creating brand new exception object of the receiver.
-
-Mon Jul  2 09:53:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval_string_wrap): extend new ruby_top_self, not
-	  original self.
-
-	* eval.c (rb_eval_cmd): respect ruby_wrapper if set.
-
-	* eval.c (eval): do not update ruby_class unless scope is not
-	  provided.
-
-Sun Jul  1 10:51:15 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* eval.c (eval): preserve wrapper information.
-
-	* eval.c (proc_invoke): ditto.
-
-	* eval.c (block_pass): ditto.
-
-Sat Jun 30 02:55:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (void_expr): too much warnings for void context
-	  (e.g. foo[1] that can be mere Proc call).
-
-Fri Jun 29 17:23:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (rb_name_error): new function to raise NameError with
-	  name attribute set.
-
-	* eval.c (rb_f_missing): set name and args in the exception
-	  object. [new]
-
-	* error.c (name_name): NameError#name - new method.
-
-	* error.c (nometh_args): NoMethodError#args - new method.
-
-Fri Jun 29 15:29:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lex.c (rb_reserved_word): lex_state after tRESCUE should be
-	  EXPR_MID.
-
-Thu Jun 28 00:21:28 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
-
-	* lib/matrix.rb: resolve 'ruby -w' warnings.
-
-	* lib/irb/locale.rb: resolve 'ruby -w' warnings.
-
-	* lib/irb/multi-irb.rb: resolve 'ruby -w' warnings.
-
-	* lib/irb/ruby-lex.rb: fix problem for "\\M-\\..." and "\\C-\\..."
-	  and resolve 'ruby -w' warnings.
-
-	* lib/irb/ruby-token.rb: fix typo
-
-	* lib/shell/command-processor.rb: resolve 'ruby -w' warnings.
-
-Wed Jun 27 08:53:26 2001  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb: new methods POP3.auth_only, POP3#auth_only
-
-	* lib/net/http.rb: HTTP.Proxy returns self if ADDRESS is nil.
-
-	* lib/net/protocol.rb: new method ProtocolError#response
-
-	* lib/net/protocol.rb,smtp.rb,pop.rb,http.rb: add document.
-
-Tue Jun 26 18:42:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (add_heap): allocation size of the heap unit is doubled for
-	  each allocation.
-
-Mon Jun 25 09:54:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (isdelim): space, tab, and newline are no longer
-	  delimiters for glob patterns.
-
-Sat Jun 23 22:28:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (svalue_to_avalue): new conversion scheme between single
-	  value and array values.
-
-	* eval.c (avalue_to_svalue): ditto.
-
-	* eval.c (rb_eval): REXPAND now uses avalue_to_svalue(), return
-	  and yield too.
-
-	* eval.c (rb_yield_0): use avalue_to_svalue().
-
-	* eval.c (proc_invoke): Proc#call gives avaules, whereas
-	  Proc#yield gives mvalues.
-
-	* eval.c (bmcall): convert given value (svalue) to avalue.
-
-Sat Jun 23 18:28:52 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/readline/readline.c (readline_event): a non-void function
-	  should return a value.
-
-Fri Jun 22 23:17:28 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_connect): workaround for the setup of
-	  Cygwin socket.
-
-Fri Jun 22 23:11:17 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
-
-	* lib/irb/locale.rb: fix for require "kconv" problem
-
-Fri Jun 22 18:08:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): no mvalue_to_svalue conversion here.
-
-	* eval.c (massign): takes svalue, convert it to mvalue inside.
-
-	* eval.c (rb_eval): parameters for yield/return are always
-	  svalues now.
-
-	* eval.c (svalue_to_mvalue): more strict conversion.
-
-	* eval.c (mvalue_to_svalue): ditto.
-
-Fri Jun 22 17:12:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c (new_size): prime hash size enabled.
-
-	* ext/socket/socket.c (Init_socket): SO_* constants added.
-
-Tue Jun 19 22:24:07 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* gc.c (rb_setjmp): avoid GCC 3.0 warnings.
-
-Tue Jun 19 18:19:30 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/readline/readline.c: add new methods:
-	  Readline::completion_append_character and
-	  Readline::completion_append_character=.
-
-Tue Jun 19 16:29:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (svalue_to_mvalue): new function to convert from svalue
-	  to mvalue. [experimental]
-
-	* eval.c (mvalue_to_svalue): new function to convert from mvalue
-	  to svalue.
-
-	* eval.c (rb_eval): use mvalue_to_svalue().
-
-	* eval.c (rb_yield_0): use mvalue_to_svalue().
-
-	* eval.c (proc_invoke): proper mvalue handling.
-
-Mon Jun 18 17:38:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_require): searches ".rb" and ".so" at the same
-	  time.  previous behavior (search ".rb", then ".so") has a
-	  security risk (ruby-bugs#PR140).
-
-	* array.c (rb_ary_to_ary): new function to replace internal
-	  rb_Array(), which never calls to_a, but to_ary (rb_Array() might
-	  call both). [new]
-
-Mon Jun 18 00:43:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (PUSH_FAILURE_POINT): push option status again.
-
-	* regex.c (re_compile_pattern): avoid pushing unnecessary
-	  option_set.
-
-Sat Jun 16 10:58:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_load): tainted string is OK if wrapped *and*
-	  $SAFE >= 4.
-
-Thu Jun 14 16:27:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_start_0): should not nail down higher blocks
-	  before preserving original context (i.e. should not alter
-	  original context).
-
-Wed Jun 13 19:34:59 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c (Init_Dir): add a new method File::fnmatch? along with
-	  File::Constants::FNM_*.  While I am here, FNM_NOCASE is renamed
-	  to FNM_CASEFOLD which is commonly used by *BSD and GNU libc.
-
-Wed Jun 13 09:33:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_yield): new method equivalent to Proc#call but no
-	  check for number of arguments. [new]
-
-Tue Jun 12 14:21:28 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* lib/mkmf.rb: target_prefix is only for installation, not for
-	  build.
-
-Tue Jun 12 00:41:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_eq): new method Method#==. [new]
-
-Mon Jun 11 14:29:41 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* confgure.in: add RUBY_CANONICAL_BUILD.
-
-Sun Jun 10 17:31:47 2001  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* gc.c (STR_NO_ORIG): STR_NO_ORIG value was different between
-	  string.c and gc.c
-
-Sat Jun  9 22:10:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should convert *non-array at the end of
-	  arguments by using Array().
-
-Sat Jun  9 17:04:30 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* hash.c (ruby_setenv): readline library leaves their environment
-	  strings uncopied.  "free" check revised.
-
-Sat Jun  9 16:31:03 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* ext/extmk.rb.in: Use -F and -T for mswin32 because cl.exe doesn't
-	  support -o officially and cl.exe considers that *.cc and *.cxx are
-	  OBJs.
-
-	* lib/mkmf.rb: ditto.
-
-	* win32/Makefile.sub: Use del instead of rm.
-	  All these changes are derived from Nobuyoshi Nakada's patch.
-	  Thanks.
-
-Fri Jun  8 22:37:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (Init_stack): avoid __builtin_frame_address(2) to retrieve
-	  stack bottom line.
-
-Fri Jun  8 18:14:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c (numhash): should shuffle bits by dividing by prime number.
-
-Fri Jun  8 17:05:21 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): multiple assignment behavior fixed, which
-	  results "*a = nil" makes "a == []" now.
-
-Fri Jun  8 15:25:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_require): should set SCOPE_PUBLIC before calling
-	  dln_load().
-
-Thu Jun  7 17:28:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): exclude kDO_BLOCK too much by false condition.
-
-Wed Jun  6 23:02:36 2001  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/sync.rb: bug fix if obj.initialize has parameters when
-	  obj.extend(Sync_m)
-
-	* lib/mutex_m.rb: modified bit
-
-Wed Jun  6 16:11:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_load): should check if tainted even when wrap is
-	  specified.
-
-Wed Jun  6 14:34:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (mrhs_basic): "*arg" should always be expanded by REXPAND.
-
-	* regex.c (re_compile_pattern): too much optimization for the
-	  cases like /(.|a)b/.
-
-Tue Jun  5 23:58:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (fc_i): removed vast string allocation.
-
-Tue Jun  5 16:45:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (Init_Exception): NameError went under StandardError,
-	  and NoMethodError went under NameError.
-
-Tue Jun  5 16:40:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (rb_intern): non identifier symbols should be
-	  categorized as ID_JUNK. [new]
-
-Tue Jun  5 16:15:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_mod_const_at): use hash table as internal
-	  data. [new]
-
-	* variable.c (rb_mod_const_of): ditto.
-
-	* variable.c (rb_const_list): new function to convert internal
-	  data (hash table) to array of strings.
-
-	* eval.c (rb_mod_s_constants): data handling scheme has changed.
-
-Tue Jun  5 15:16:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_add_method): should not call rb_secure(), for
-	  last_func may not be set.
-
-	* io.c (rb_io_ctl): ioctl should accept any integer within C long
-	  range.
-
-Tue Jun  5 13:41:13 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/etc/extconf.rb: use egrep_cpp.
-
-Tue Jun  5 12:44:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_object): wrong type check for modules.
-
-	* marshal.c (w_object): should not dump anonymous classes/modules.
-
-Tue Jun  5 01:19:34 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_open_file): use rb_file_sysopen_internal() if the 3rd
-	  argument (permission flags) is given. [new, should be backported?]
-
-	* io.c (rb_io_mode_binmode): mode string (e.g. "r+") to flags to
-	  open(2).
-
-Mon Jun  4 23:55:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): NODE_REXPAND expand an array of 1 element as
-	  the element itself. [new, should be backported?]
-
-	* parse.y (ret_args): should treat "*[a]" in rhs expression as
-	  "a", not "[a]".
-
-Mon Jun  4 04:14:53 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/shellwords.rb: don't destroy argument.
-
-Sat Jun  2 23:23:05 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): should push option modifier at the
-	  right place.
-
-Sat Jun  2 23:05:20 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* lib/cgi/session.rb: don't use module_function for Class.
-
-Sat Jun  2 00:02:22 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
-
-	* irb messages: fix typos.
-
-Fri Jun  1 17:26:24 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* hash.c (replace_i): ignore when key == Qundef.
-
-Fri Jun  1 16:50:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (call_args2): confusion with list_append() and
-	  list_concat() was fixed.
-
-Fri Jun  1 15:01:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): fixed 'print CGI::bar() {}, "\n"' syntax
-	  breakage, adding new lex_state status.  sigh. [new]
-
-Fri Jun  1 11:21:04 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: use waitpid on mingw32.
-
-	* ext/dbm/extconf.rb: include <ndbm.h>, not <gdbm.h>.
-
-Thu May 31 18:34:57 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* file.c (rb_file_s_unlink): should not allow if $SAFE >= 2.
-
-Thu May 31 17:23:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (Init_Range): define "to_ary".
-
-Thu May 31 13:30:25 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* mkconfig.rb, ext/configsub.rb: VERSION -> RUBY_VERSION.
-
-Thu May 31 08:00:58 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* win32/dir.h: re-add.
-
-Thu May 31 01:25:59 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in: default --with-libc_r to `no' until the problem is
-	  fixed. (FreeBSD only)
-
-Tue May 29 17:24:23 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* ruby.c (proc_options): unexpected SecurityError happens when -T4.
-
-Tue May 29 18:46:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): * \1 .. \9 should be
-	  backreferences always.
-
-	* regex.c (re_match): backreferences corresponding to
-	  unclosed/unmatched parentheses should fail always.
-
-Tue May 29 16:35:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cat): use rb_str_buf_cat() if possible. [new]
-
-	* string.c (rb_str_append): ditto.
-
-	* string.c (rb_str_buf_cat): remove unnecessary check (type,
-	  taint, modify) to gain performance.
-
-	* string.c (rb_str_buf_append): ditto.
-
-	* string.c (rb_str_buf_finish): removed.
-
-Tue May 29 02:05:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_buf_new): buffering string function. [new]
-
-	* string.c (rb_str_buf_append): ditto.
-
-	* string.c (rb_str_buf_cat): ditto.
-
-	* string.c (rb_str_buf_finish): ditto.
-
-Mon May 28 23:20:43 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: remove unnecessary AC_CANONICAL_BUILD
-
-	* defines.h: #define HAVE_SETITIMER on Cygwin(bug fixed).
-
-	* ruby.c: use relative path from LIBRUBY_SO.
-
-	* ruby.c: don't use -mwin32 option on Cygwin.
-
-	* cygwin/GNUmakefile.in: ditto.
-
-	* ext/sdbm/_sdbm: ditto.
-
-	* ext/tcltklib/extconf.rb: ditto.
-
-	* ext/tcltklib/stubs.c: ditto.
-
-Mon May 28 22:12:01 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/extconf.rb.in: make the priority of the make rule of .c
-	  higher than .C .
-
-Mon May 28 13:22:19 2001  Tanaka Akira  <akr@m17n.org>
-
-	* time.c (make_time_t): local time adjustment revised.
-
-Mon May 28 02:20:38 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c (glob_helper): teach has_magic() to handle flags and get
-	  glob_helper to properly support FNM_NOESCAPE.
-
-	* dir.c (fnmatch): fix a bug when FNM_PATHNAME and FNM_PERIOD are
-	  specified at the same time.
-
-Sat May 26 09:55:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: accomplish extended syntax described in [ruby-talk:14525]
-	  using tSPC token. [new, experimental]
-
-Sat May 26 07:05:45 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* MANIFEST: add win32/dir.h .
-
-Fri May 25 20:03:51 2001  Pascal Rigaux  <pixel@mandrakesoft.com>
-
-	* dln.c (dln_find_1): should exclude directories in executable
-	  file lookup.
-
-Fri May 25 18:00:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_obj_singleton_methods): list methods in extended
-	  modules if optional argument is true. [new]
-
-Fri May 25 14:19:25 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* string.c (rb_str_replace): add taint status infection
-	  (OBJ_INFECT()).
-
-	* string.c (rb_str_crypt): ditto.
-
-	* string.c (rb_str_ljust): ditto.
-
-	* string.c (rb_str_rjust): ditto.
-
-	* string.c (rb_str_center): ditto.
-
-Fri May 25 05:39:03 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/sha1/sha1-ruby.c (sha1_hexdigest): fix buffer overflow.  The
-	  buffer for a SHA-1 hexdigest needs to be 41 bytes in length.
-
-Fri May 25 01:47:39 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* MANIFEST: update the entries I forgot to add or remove.
-
-Fri May 25 00:57:25 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/sha1/sha1-ruby.c (sha1_new): separate initialize() from
-	  new().
-
-	* ext/md5/md5init.c (md5i_new): ditto.
-
-Fri May 25 00:53:41 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/dbm/extconf.rb: fix support for *BSD and set $CFLAGS
-	  properly.
-
-Thu May 24 16:10:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_member): check based on "<=>" comparison. [new]
-
-	* range.c (range_check): add "succ" check if first end is not a
-	  numeric.
-
-	* range.c (range_eqq): comparison should based on "<=>".
-
-	* range.c (range_each): ditto.
-
-Thu May 24 16:08:21 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* mkconfig.rb: autoconf 2.50 support.
-
-Thu May 24 14:23:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): need argument adjustment for C defined
-	  blocks too.
-
-Thu May 24 01:11:30 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/extconf.rb: header search added. [new]
-
-Wed May 23 02:58:21 2001  Tanaka Akira  <akr@m17n.org>
-
-	* time.c (make_time_t): fix ad-hoc local time adjustment, using
-	  binary tree search.
-
-Tue May 22 17:10:35 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* variable.c (rb_alias_variable): should not allow variable
-	  aliasing if $SAFE >= 4.
-
-Tue May 22 02:37:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (expr): "break" and "next" to take optional expression,
-	  which is used as a value for termination. [new, experimental]
-
-	* eval.c (rb_eval): "break" can give value to terminating method.
-
-	* eval.c (rb_eval): "break" and "next" to take optional expression.
-
-	* eval.c (rb_yield_0): "next" can give value to terminating "yield".
-
-	* eval.c (rb_iterate): "break" can give value to terminating method.
-
-	* eval.c (proc_call): ditto.
-
-Mon May 21 13:15:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big2str): t should be protected from GC.
-
-Sat May 19 09:29:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_proc_times): need not to check return value from
-	  times(2).
-
-Fri May 18 05:36:08 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb.in (xsystem): backout the previous fix which was
-	  bogus.
-
-Fri May 18 05:19:55 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb (xsystem): make a temporary fix to get $(...) macros
-	  properly expanded on a command execution.
-
-	* ext/extmk.rb.in (xsystem): ditto.
-
-Fri May 18 03:45:55 2001  Brian F. Feldman  <green@FreeBSD.org>
-
-	* lib/mkmf.rb: unbreak "make install".  lib/* must be installed
-	  under $rubylibdir, not under $libdir.
-
-Fri May 18 01:28:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (expr): break, next, redo, retry are moved from primary.
-
-Fri May 18 01:11:02 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* ext/sha1/sha1-ruby.c (sha1_new): get rid of an unneeded
-	  rb_obj_call_init() call.
-
-Fri May 18 01:03:55 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* ext/sha1/sha1.txt, ext/sha1/sha1.txt.jp: fix typos.
-
-Thu May 17 19:17:11 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/shell.rb, lib/shell/process-controller.rb,
-	  lib/shell/command-processor.rb: translate Japanese comments into
-	  English.
-
-Thu May 17 19:07:14 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/shell.rd.jp: RD'ify and make some fixes.
-
-	* doc/shell.rd: RD'ify, delete Japanese leftovers, make overall
-	  English fixes, and sync with doc/shell.rd.jp.
-
-Thu May 17 17:35:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): address of local_vars might change during eval.
-
-Thu May 17 07:27:09 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/md5/md5.txt.jp, ext/sha1/sha1.txt.jp:
-	  s/SuperClass/Superclass/.
-
-Thu May 17 07:21:44 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/Setup.dj, ext/Setup.emx, ext/Setup.nt, ext/Setup.x68:
-	  compile sha1 in as well as md5.
-
-	* ext/Setup: put sha1 in a comment.
-
-Thu May 17 07:16:38 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/sha1/sha1.txt.jp: add the Japanese version derived from
-	  ext/md5/md5.txt.jp.
-
-	* ext/sha1/sha1.txt: revise the copyright info and reduce the
-	  difference from ext/md5/md5.txt.
-
-	* ext/md5/md5.txt: reduce the difference from ext/sha1/sha1.txt.
-
-Thu May 17 07:11:35 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/sha1/extconf.rb, ext/sha1/sha1.c: use WORDS_BIGENDIAN to
-	  detect the platform's endian.
-
-Thu May 17 06:31:30 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/md5/md5.txt: make wording fixes, and mention the newly added
-	  method: "<<".
-
-	* ext/md5/md5.txt.jp: ditto.
-
-Wed May 16 18:05:52 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/md5/md5init.c: add an instance method "<<" as an alias for
-	  "update". (inspired by Steve Coltrin's ruby-sha1)
-
-Tue May 15 17:46:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_and): should not push frozen key string.
-
-	* array.c (rb_ary_or): ditto.
-
-Tue May 15 02:18:23 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/thread.rb: rescue ThreadError in case the thread is dead
-	  just before calling Thread#run.
-
-Mon May 14 13:50:22 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_schedule): should save context before raising
-	  deadlock, saved context for current thread might be obsolete.
-
-	* time.c (make_time_t): non DST timezone shift supported (hopefully).
-
-	* time.c (make_time_t): strict range detection for negative time_t.
-
-Mon May 14 11:54:20 2001  Tanaka Akira  <akr@m17n.org>
-
-	* signal.c: SIGINFO added.
-
-Mon May 14 08:57:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_ensure): should not SEGV when prot_tag is NULL.
-
-Sun May 13 23:51:14 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* win32/resource.rb: Modify copyright in resource script.
-
-Sun May 13 14:03:33 2001  Okada Jun  <yun@be-in.org>
-
-	* lib/thread.rb: fix Queue#pop and SizedQueue#max= to avoid
-	  deadlock.
-
-Sat May 12 15:43:55 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* win32/win32.c (kill): add support of signal 9 on mswin32/mingw32.
-
-Fri May 11 15:09:52 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ruby.h (rb_string_value): add volatile to avoid compiler warning.
-
-	* string.c (rb_string_value): ditto.
-
-Fri May 11 03:35:33 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* README.EXT: Document find_library(), with_config() and
-	  dir_config().
-
-Fri May 11 03:34:20 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* README.EXT.jp: Remove the description of find_header() because
-	  such a function does not actually exist.
-
-	* README.EXT.jp: Update the description of dir_config().
-
-Fri May 11 02:42:05 2001  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* README, README.jp: Fix CVS access and mailing lists info.
-
-Fri May 11 02:00:44 2001  Ryo HAYASAKA  <ryoh@jaist.ac.jp>
-
-	* bignum.c (bigdivrem): access boundary bug.
-
-Thu May 10 02:40:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): prohibit dumping out singleton classes.
-
-	* object.c (rb_mod_to_s): distinguish singleton classes.
-
-	* variable.c (rb_class2name): it's ok to reveal NilClass,
-	  TrueClass, FalseClass.
-
-Wed May  9 14:38:33 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (rb_yield_0): preserve and restore ruby_cref as well.
-
-Tue May  8 18:28:19 2001  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb.rb lib/irb/multi-irb.rb lib/irb/ruby-lex.rb
-	  lib/irb/version.rb resolve ctrl-c problem
-
-Tue May  8 17:12:43 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (is_defined): core dumped during instance_eval for
-	  special constants.
-
-	* eval.c (rb_eval): ditto.
-
-Tue May  8 08:52:57 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/forwardable.rd, doc/forwardable.rd.jp: Hit `=begin' and
-	  `=end' in proper places so rd2 can format them without a problem.
-
-	* doc/irb/irb-tools.rd.jp, doc/irb/irb.rd, doc/irb/irb.rd.jp:
-	  ditto.
-
-Tue May  8 08:38:53 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/forwardable.rd, doc/forwardable.rd.jp, lib/forwardable.rb:
-	  Import forwardable 1.1.
-
-Tue May  8 08:34:33 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/irb/irb-tools.rd.jp, doc/irb/irb.rd.jp: Convert from JIS to
-	  EUC.
-
-Tue May  8 03:46:39 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* sample/rbc.rb: Obsoleted by IRB.
-
-Mon May  7 15:58:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): "||=" should not warn for uninitialized instance
-	  variables.
-
-	* eval.c (rb_eval): ditto.
-
-	* eval.c (eval): preserve and restore ruby_cref as well.
-
-Mon May  7 15:45:48 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/ftools.rb (syscopy): chmod destination file only if
-	  it does not exist.
-
-Mon May  7 14:35:57 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_is_instance_of): takes only class/module as an
-	  argument.
-
-Sun May  6 16:27:29 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* eval.c (is_defined): rb_reg_nth_defined() may return Qnil.
-
-Thu May  3 03:15:06 2001  SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-
-	* configure.in: get --enable-shared to work on MacOS X.
-
-	* Makefile.in: make $(LIBRUBY_SO) depend on miniruby properly.
-	  Now `make -jN' should work without a problem.
-
-Thu May  3 02:07:45 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* win32/config.h.in: add SIZEOF___INT64 definition.
-
-Wed May  2 20:39:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dir.c (rb_glob, rb_globi): remove unnecessary FNM_PATHNAME.
-
-Wed May  2 11:46:13 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (block_pass): should not downgrade safe level.
-
-Wed May  2 03:07:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/extconf.rb: allow specifying dbm-type explicitly.
-
-	* ext/dbm/extconf.rb: avoid gdbm if possible, because it leaks
-	  memory, whereas gdbm.so doesn't.  potential incompatibility.
-
-Wed May  2 02:02:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_insert): new method.
-
-Tue May  1 17:55:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.
-
-Tue May  1 16:23:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_insert): new method.
-
-	* array.c (rb_ary_update): new utility function.
-
-Tue May  1 03:24:05 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/irb/completion.rb, lib/irb/frame.rb, lib/irb/xmp.rb,
-	  doc/irb/irb-tools.rd.jp: Merge from irb-tools 0.7.1.
-
-Tue May  1 03:07:17 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* sample/irb.rb, lib/irb.rb, lib/irb/*, doc/irb/*: Merge from irb
-	  0.7.3.
-
-	* instruby.rb: Install help-message's too.
-
-	* lib/irb/main.rb: This file is not needed anymore.
-
-Fri Apr 27 09:27:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (set_outfile): should check if closed before assignment.
-
-Thu Apr 26 22:36:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in:  don't use tzname on Cygwin 1.3.1+.
-
-	* configure.in: add -mieee/-ieee to CFLAGS on OSF1/Alpha
-	  to disable "DIVISION BY ZERO" exception.
-
-Thu Apr 26 22:30:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should preserve value of ruby_errinfo.
-
-Thu Apr 26 10:36:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_schedule): infinite sleep should not cause
-	  dead lock.
-
-Wed Apr 25 16:40:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_flatten_bang): proper recursive detection.
-
-Wed Apr 25 15:36:15 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (yield_under): need not to prohibit at safe level 4.
-
-Wed Apr 25 15:22:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): p/P packs nil into NULL.
-
-	* pack.c (pack_unpack): p/P unpacks NULL into nil.
-
-Tue Apr 24 15:35:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): size check for P template.
-
-	* ruby.c (set_arg0): wrong predicate when new $0 value is bigger
-	  than original space.
-
-Tue Apr 24 15:18:49 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) do not add the
-	  specified include directory if already included in $CPPFLAGS.
-
-	* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) return a more useful
-	  value, [include_dir, lib_dir].
-
-Mon Apr 23 14:43:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (id2ref): should use NUM2ULONG()
-
-	* object.c (rb_mod_const_get): check whether name is a class
-	  variable name.
-
-	* object.c (rb_mod_const_set): ditto.
-
-	* object.c (rb_mod_const_defined): ditto.
-
-Sat Apr 21 22:33:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_float): precision changed to "%.16g"
-
-Sat Apr 21 22:07:58 2001  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* eval.c (rb_call0): wrong retry behavior.
-
-Fri Apr 20 19:12:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_aref): a bug on long>int architecture.
-
-Fri Apr 20 14:57:15 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (rb_eval_string_wrap): should restore ruby_wrapper.
-
-Sun Apr 22 17:44:37 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: add -mieee to CFLAGS on Linux/Alpha
-	  to disable "DIVISION BY ZERO" exception.
-
-	* configure.in: remove -ansi on OSF/1.
-
-Wed Apr 18 04:37:51 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: CGI::Cookie: no use PATH_INFO.
-
-Wed Apr 18 00:24:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): char class at either edge of range
-	  should be invalid.
-
-Tue Apr 17 17:33:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (handle_rescue): use === to compare exception match.
-
-	* error.c (syserr_eqq): comparison between SytemCallErrors should
-	  based on their error numbers.
-
-Tue Apr 17 16:54:39 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (safe_getter): should use INT2NUM().
-
-Tue Apr 17 15:12:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big2long): 2**31 cannot fit in 31 bit long.
-
-Sat Apr 14 22:46:43 2001  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* regex.c (calculate_must_string): wrong length calculation.
-
-Sat Apr 14 13:37:32 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* win32/config.status.in: no longer use missing/alloca.c.
-
-	* win32/Makefile.sub: ditto.
-
-Fri Apr 13 12:40:48 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (rb_thread_start_0): fixed memory leak.
-
-Fri Apr 13 16:41:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (none): should clear cmdarg_stack too.
-
-Fri Apr 13 06:19:29 2001  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* io.c (rb_fopen): use setvbuf() to avoid recursive malloc() on
-	  some platforms.
-
-Wed Apr 11 23:36:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_stat_dev): device functions should honor stat field
-	  types (except long long such as dev_t).
-
-Wed Apr 11 18:07:53 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (rb_mod_nesting): should not push nil for nesting array.
-
-	* eval.c (rb_mod_s_constants): should not search array by
-	  rb_mod_const_at() for nil (happens for singleton class).
-
-Wed Apr 11 13:29:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_singleton_class_attached): should modify iv_tbl by
-	  itself, no longer use rb_iv_set() to avoid freeze check error.
-
-	* variable.c (rb_const_get): error message "uninitialized constant
-	  Foo at Bar::Baz" instead of "uninitialized constantBar::Baz::Foo".
-
-Tue Apr 10 17:52:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_included): new hook called from rb_mod_include().
-
-Tue Apr 10 02:24:40 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* io.c (opt_i_set): should strdup() inplace_edit string.
-
-Mon Apr  9 23:29:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (exec_under): need to push cref too.
-
-Mon Apr  9 15:20:21 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_missing): raise NameError for "undefined local
-	  variable or method".
-
-	* error.c (Init_Exception): new exception NoMethodError.
-	  NameError moved under ScriptError again.
-
-	* eval.c (rb_f_missing): use NoMethodError instead of NameError.
-
-Mon Apr  9 12:05:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (Init_File): should redefine "new" class method.
-
-Mon Apr  9 11:56:52 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: fix typo.
-
-Fri Apr  6 01:46:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (PUSH_CREF): sharing cref node was problematic.  maintain
-	  runtime cref list instead.
-
-	* eval.c (rb_eval): copy defn node before registering.
-
-	* eval.c (rb_load): clear ruby_cref before loading.
-
-Thu Apr  5 22:40:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_const_get): no recursion to show full class path
-	  for modules.
-
-	* eval.c (rb_set_safe_level): should set safe level in curr_thread
-	  as well.
-
-	* eval.c (safe_setter): ditto.
-
-Thu Apr  5 13:46:06 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* object.c (rb_obj_is_instance_of): nil belongs to false, not true.
-
-Thu Apr  5 02:19:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (make_time_t): proper (I hope) daylight saving time
-	  handling for both US and Europe.  I HATE DST!
-
-	* eval.c (rb_thread_wait_for): non blocked signal interrupt should
-	  stop the interval.
-
-Wed Apr  4 03:47:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_eq): class check added.
-
-	* eval.c (proc_eq): typo fixed ("return" was omitted).
-
-	* error.c (Init_Exception): move NameError under StandardError.
-
-	* class.c (rb_mod_clone): should copy method bodies too.
-
-	* bignum.c (bigdivrem): should trim trailing zero bdigits of
-	  remainder, even if dd == 0.
-
-	* file.c (check3rdbyte): safe string check moved here.
-
-Tue Apr  3 09:56:20 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb.in (create_makefile): create def file only if
-	  it does not yet exist.
-
-	* lib/mkmf.rb: ditto.
-
-Tue Apr  3 00:05:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (make_time_t): remove HAVE_TM_ZONE code since it
-	  sometimes reports wrong time.
-
-	* time.c (make_time_t): remove unnecessary range check for
-	  platforms where negative time_t is available.
-
-Mon Apr  2 16:52:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_waitall): should push Process::Status instead of
-	  Fixnum status.
-
-	* process.c (waitall_each): should add all entries in pid_tbl.
-	  these changes are inspired by Koji Arai.  Thanks.
-
-	* process.c (proc_wait): should not iterate if pid_tbl is 0.
-
-	* process.c (proc_waitall): ditto.
-
-Mon Apr  2 14:25:49 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* lib/monitor.rb (wait): ensure reentrance.
-
-	* lib/monitor.rb (wait): fix timeout support.
-
-Mon Apr  2 12:40:45 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (media_subtype): return subtype.
-
-Mon Apr  2 12:01:15 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (flag_list): capitalize flags.
-
-Mon Apr  2 01:32:38 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* Makefile.in: Introduce MAINLIBS.
-
-	* configure.in: Link libc_r against the ruby executable on
-	  FreeBSD, which is the first attempt to work around a certain
-	  problem regarding pthread on FreeBSD.  It should make ruby/libruby
-	  happy when it loads an extension to a library compiled and linked
-	  with -pthread.  Note, however, that libruby is _not_ linked with
-	  libc_r so as not to mess up pthread unfriendly stuff including
-	  apache+mod_ruby and vim6+ruby_interp.
-
-Mon Apr  2 01:16:24 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c: use ruby's opendir on mingw32.
-
-	* win32/dir.h, dir.c, Makefile: ditto.
-
-Sun Apr  1 23:26:14 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
-
-	* numeric.c (flodivmod): a bug in no fmod case.
-
-Sun Apr  1 18:36:14 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* process.c (pst_wifsignaled): should apply WIFSIGNALED for status
-	  (int), not st (VALUE).
-
-Sat Mar 31 04:47:55 2001  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: add document and example code.
-
-Sat Mar 31 03:24:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (Init_IO): value of $/ and $\ are no longer restricted to
-	  strings.  type checks are done on demand.
-
-	* class.c (rb_include_module): module inclusion should be check
-	  taints.
-
-	* ruby.h (STR2CSTR): replace to StringType() and StringTypePtr().
-
-	* ruby.h (rb_str2cstr): ditto.
-
-Fri Mar 30 23:37:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_load): should not copy toplevel local variables.  It
-	  cause variable/method ambiguity.  Thanks to L. Peter Deutsch.
-
-Fri Mar 30 22:56:56 2001  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: rename ContinueRequest to ContinuationRequest.
-
-Fri Mar 30 12:51:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_include_module): freeze check at first.
-
-Thu Mar 29 17:05:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_attr): sprintf() and rb_intern() moved into
-	  conditional body.
-
-Wed Mar 28 23:43:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
-	  rules for the mswin32 platforms.
-
-Wed Mar 28 19:29:21 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb.in, lib/mkmf.rb: move C++ rules to the right place.
-
-Wed Mar 28 17:39:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_str2cstr): warn if string contains \0 and length
-	  value is ignored.
-
-Wed Mar 28 15:00:31 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* class.c (rb_singleton_class_clone): should copy class constant
-	  table as well.
-
-Wed Mar 28 14:23:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (rb_include_module): sometimes cache was mistakenly left
-	  uncleared - based on the patch by K.Kosako.
-
-	* ruby.h: all Check_SafeStr()'s are replaced by SafeStr() to
-	  ensure 'to_str' be always effective.
-
-Wed Mar 28 09:52:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/Makefile.sub: disable global optimization.
-
-Tue Mar 27 15:00:54 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (rb_mod_define_method): should have clear method cache.
-
-	* eval.c (rb_mod_define_method): should have raised exception for
-	  type error.
-
-Tue Mar 27 14:48:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: changed "extern INLINE" to "static inline".
-
-Mon Mar 26 23:19:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* time.c (rb_strftime): check whether strftime returns empty string.
-
-Mon Mar 26 21:16:56 2001  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: supports response handlers and multiple commands.
-
-Mon Mar 26 17:21:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: remove TMP_PROTECT_END to prevent C_ALLOCA crash.
-
-Mon Mar 26 14:04:41 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/Win32API/Win32API.c: remove Init_win32api().
-
-Sun Mar 25 16:52:48 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* file.c (rb_file_flock): do not trap EINTR.
-
-	* missing/flock.c (flock): returns the value from lockf(2)
-	  directly.
-
-Sat Mar 24 23:44:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ev_const_defined): should ignore toplevel cbase (Object).
-
-	* eval.c (ev_const_get): ditto.
-
-Fri Mar 23 17:37:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/md5/md5.h: replace by independent md5 implementation
-	  contributed by L. Peter Deutsch (thanks).
-
-	* ext/md5/md5init.c: adopted to Deutsch's md5 implementation.
-
-Fri Mar 23 17:26:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): string from P/p should be tainted.
-
-Fri Mar 23 12:18:44 2001  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
-
-	* ext/curses/curses.c: curses on Mac OS X public beta does not
-	  have _maxx etc.
-
-Fri Mar 23 10:50:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_object): should truncate trailing zero short for
-	  bignums.
-
-Fri Mar 23 09:49:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (sym_intern): new method.
-
-Thu Mar 22 22:15:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/Win32API/extconf.rb: add -fno-omit-frame-pointer.
-
-Thu Mar 22 18:17:36 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_nesting): should not include Object at the
-	  toplevel.
-
-Thu Mar 22 17:43:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: better inline function support.
-
-	* configure.in (NO_C_INLINE): check if inline is available for the
-	  C compiler.
-
-Mon Mar 19 11:03:10 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* marshal.c (r_object): len calculation patch was wrong for
-	  machines SIZEOF_BDIGITS == SIZEOF_SHORT.
-
-	* gc.c: alloca prototype reorganized for C_ALLOCA machine.
-
-Wed Mar 21 23:07:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (win32_stat): WinNT/2k "//host/share" support.
-
-Wed Mar 21 08:05:35 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* win32/dir.h: replace missing/dir.h .
-
-	* win32/win32.h: ditto.
-
-	* win32/win32.c: ditto.
-
-Wed Mar 21 01:26:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (id2ref): sometimes confused symbol and reference.
-
-Tue Mar 20 23:09:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (win32_stat): UNC support.
-
-	* dir.c (extract_path): fix "./*" problem.
-
-Tue Mar 20 15:10:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (glob_helper): breaks loop after calling recursive
-	  glob_helper; all wild cards should be consumed; no need for
-	  further match.
-
-	* dir.c (dir_s_glob): gives warning if no match found.
-
-Tue Mar 20 14:13:45 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* object.c (sym_inspect): did allocate extra byte space.
-
-Mon Mar 19 19:14:47 2001  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* marshal.c (shortlen): shortlen should return number of bytes
-	  written.
-
-Mon Mar 19 16:52:23 2001  K.Kosako  <kosako@sofnec.co.jp>
-
-	* eval.c (ev_const_defined): need not to check if cbase->nd_class
-	  is rb_cObject.
-
-	* eval.c (ev_const_get): ditto.
-
-Mon Mar 19 17:11:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_zone): return "UTC" for UTC time objects.
-
-Mon Mar 19 16:27:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (THREAD_ALLOC): flags should be initialized.
-
-	* signal.c (rb_f_kill): should use FIX2INT, not FIX2UINT.
-
-Mon Mar 19 10:55:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (glob_helper): replace lstat() by stat() to follow symlink
-	  in the case like 'symlink/*'.
-
-	* dir.c (glob_helper): gave warning too much.
-
-Sun Mar 18 08:58:18 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: // === '' --> //.match('')
-
-	* lib/cgi.rb: cgi#header(): improvement for mod_ruby.
-
-	* lib/cgi.rb: cgi#rfc1123date(): improvement.
-	  thanks to TADA Tadashi <sho@spc.gr.jp>.
-
-	* lib/cgi.rb: cgi#rfc1123date(): document bug fix.
-	  thanks to Kazuhiro NISHIYAMA <zn@mbf.nifty.com>.
-
-	* lib/cgi.rb: cgi#header(): bug fix.
-	  thanks to IWATSUKI Hiroyuki <don@na.rim.or.jp>.
-
-Sat Mar 17 11:11:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (glob_helper): * should follow symlink, whereas ** should
-	  not follow.
-
-Thu Mar 15 01:28:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_s_chdir): block form of Dir.chdir. (RCR#U016).
-
-Fri Mar 16 17:14:17 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in: Set SOLIBS properly for all ELF and
-	  FreeBSD/NetBSD/OpenBSD a.out platforms so that the shlib
-	  dependencies are recorded in the libruby shlib.
-
-Wed Mar 14 16:41:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_schedule): raise FATAL just once to
-	  THREAD_TO_KILL.
-
-Wed Mar 14 10:41:34 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): 0 (= Qfalse) is a valid value, so that
-	  default self should be checked by klass == 0.
-
-	* bignum.c (rb_cstr2inum): should disallow '++1', '+-1', etc.
-
-Tue Mar 13 17:51:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ev_const_defined): add new parameter self for special
-	  const fallback.
-
-	* eval.c (ev_const_get): ditto.
-
-Tue Mar 13 16:39:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dir.c (rb_glob_helper): fix drive letter handling on DOSISH.
-
-Tue Mar 13 14:54:39 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: add HTTPRequest#basic_auth.
-
-	* lib/net/smtp.rb: raise if only account or password is given.
-
-	* lib/net/protocol.rb: WriteAdapter#<< returns self.
-
-Tue Mar 13 14:41:16 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_seek_m): wrong calling sequence of rb_io_seek().
-
-Tue Mar 13 09:14:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (cond0): no special treatment of string literal in
-	  condition.
-
-Mon Mar 12 18:59:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): save/restore $libs and $LIBPATH.
-
-Sun Mar 11 18:13:34 2001  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
-
-	* math.c: add acos, asin, atan, conh, sinh, tanh and hypot to Math.
-
-	* configure.in: check hypot availability.
-
-	* missing/hypot.c: public domain rewrite of hypot.
-
-Sun Mar 11 13:21:04 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* parse.y (warn_unless_e_option): warning condition was wrong.
-
-	* parse.y (warning_unless_e_option): ditto.
-
-Sun Mar 11 00:55:31 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (install_rb): fix handling of destination path.
-
-Sat Mar 10 22:56:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_all): new method 'all?', which returns true if
-	  block returns true for all elements.
-
-	* enum.c (enum_any): new method 'any?', which returns true if
-	  block returns true for any of elements.
-
-Sat Mar 10 02:34:18 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* math.c (math_log, math_log10): use nan() instead of 0.0/0.0 on Cygwin.
-
-Fri Mar  9 09:56:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (marshal_load): do not give warning unless explicitly
-	  set to verbose.
-
-Fri Mar  9 02:07:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_exit): give string value "exit" to SystemExit.
-
-	* ruby.c (proc_options): -v should not print version if
-	  proc_options called via moreswitches().
-
-Thu Mar  8 17:45:19 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb: one write(2) per one line.
-
-Wed Mar  7 14:26:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* math.c (math_log, math_log10): should return NaN if x < 0.0
-	  on Cygwin.
-
-Thu Mar  7 10:31:26 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (stmt): while/until modifier must work for empty body.
-
-Tue Mar  6 22:53:58 2001  Kazuhiro Yoshida   <moriq.kazuhiro@nifty.ne.jp>
-
-	* ruby.c (ruby_set_argv): clear ARGV contents before adding args.
-
-Tue Mar  6 10:50:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): rescue and ensure clauses should be allowed
-	  to appear in singleton method body.
-
-Mon Mar  5 17:25:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_eq): compare Procs using blocktag equality.
-
-	* eval.c (proc_to_s): stringify according to block tag address.
-
-Mon Mar  5 17:19:56 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (gettimeofday): use GetLocalTime() instead of ftime()
-	  for high-resolution timing.
-
-Sun Mar  4 17:01:09 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* string.c (trnext): support backslash escape in String#tr.
-
-Sat Mar  3 16:15:16 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): push cbase if ruby_cbase != ruby_class, for
-	  example in the case NODE_DEFN/NODE_DEFS are called within
-	  module_eval.
-
-Wed Feb 28 11:02:41 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_delete_bang): delete! should take at least 1
-	  argument.
-
-	* ruby.c (load_file): add rb_gc() after loading to avoid
-	  extraordinary memory growth.
-
-Wed Feb 28 05:01:40 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* dir.c (rb_glob_helper): "./foo" should match "foo", not "./foo".
-
-Tue Feb 27 16:38:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ev_const_get): retrieve Object's constant if no current
-	  class is available (e.g. defining singleton class for Fixnums).
-
-	* eval.c (ev_const_defined): check Object's constant if no current
-	  class is available (e.g. defining singleton class for Fixnums).
-
-	* time.c (time_timeval): negative time interval should not be
-	  allowed.
-
-	* eval.c (proc_call): ignore block to `call' always, despite of
-	  being orphan or not.
-
-Wed Feb 27 10:16:32 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_yield_0): should check based on rb_block_given_p()
-	  and rb_f_block_given_p().
-
-Tue Feb 27 04:13:45 2001 Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* configure.in (frame-address): --enable-frame-address to allow
-	  __builtin_frame_address() to be used.
-
-	* eval.c (stack_length): use __builtin_frame_address() based on
-	  the macro USE_BUILTIN_FRAME_ADDRESS.
-
-	* gc.c (rb_gc): ditto.
-
-	* gc.c (Init_stack): ditto.
-
-Mon Feb 26 16:20:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (proc_options): call ruby_show_version() just once.
-
-	* dir.c (dir_s_open): returns the value from a block (if given).
-
-Mon Feb 26 14:29:04 2001  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
-	  rules.
-
-Mon Feb 26 00:04:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_call): should not modify ruby_block->frame.iter
-	  based on ruby_frame->iter altered by PUSH_ITER().
-
-Mon Feb 26 05:27:52 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/net/telnet.rb: #telnetmode(), #binmode(): bug fix.
-	  thanks to nobu.nakada@nifty.ne.jp.
-
-Mon Feb 26 04:55:50 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: CGI#form(): bug fix.
-	  thanks to MoonWolf <moonwolf@moonwolf.com>.
-
-	* lib/cgi.rb: CGI#rfc1123_date(): improvement.
-	  thanks to Tomoyasu Akita <genzo-@dm4lab.to>.
-
-	* lib/cgi.rb: CGI#header(): improvement for mod_ruby.
-	  thanks to Shugo Maeda <shugo@ruby-lang.org>.
-
-Sun Feb 25 02:45:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* file.c (rb_file_s_rename): avoid Cygwin's bug.
-
-Sat Feb 24 23:32:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_fd_close): should save current context before
-	  raising exception.
-
-Sat Feb 24 22:14:00 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (myrename): fix error handling.
-
-Sat Feb 24 13:58:48 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: always close connection on request without
-	  body.
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: change copyright.
-
-Sat Feb 24 03:15:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (set_stdin): preserve original stdin.
-
-	* io.c (set_outfile): preserve original stdout/stderr.
-
-Fri Feb 23 08:28:58 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb: clear read buffer after reopen.
-
-	* lib/net/protocol.rb: refactoring.
-
-	* lib/net/http.rb: split module HTTPHeader from HTTPResponse.
-
-Tue Feb 20 23:45:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* process.c: add W* macro if not available.
-
-Tue Feb 20 16:37:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: add check for negative time_t for gmtime(3).
-
-	* time.c (time_new_internal): no positive check if gmtime(3) can
-	  handle negative time_t.
-
-	* time.c (time_timeval): ditto.
-
-	* bignum.c (rb_big2long): should not raise RangeError for Bignum
-	  LONG_MIN value.
-
-Mon Feb 19 17:46:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_substr): "a"[1,2] should return ""; need
-	  rubicon upgrade.
-
-Mon Feb 19 12:10:36 2001  Triet H. Lai  <thlai@mail.usyd.edu.au>
-
-	* error.c (rb_sys_warning): new function to give warning with
-	  strerror() message.
-
-	* dir.c (rb_glob_helper): better error handling, along with
-	  performance tune.
-
-Mon Feb 19 01:55:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (secure_visibility): visibility check for untainted modules.
-
-Mon Feb 19 00:29:29 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* signal.c (sigpipe): sighandler which does nothing.
-
-	* signal.c (trap): set sigpipe function for SIGPIPE.
-
-	* signal.c (Init_signal): default SIGPIPE handler should be
-	  sigpipe function.
-
-Sun Feb 18 15:42:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/curses/extconf.rb: add dir_config.
-
-	* missing/flock.c: use fcntl(2) instead of lockf(2).
-
-Sun Feb 18 05:46:03 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: Response#range_length was not debugged.
-
-Sun Feb 18 04:02:03 2001  Yasushi Shoji  <yashi@yashi.com>
-
-	* array.c (rb_ary_subseq): wrong boundary check.
-
-Sun Feb 18 00:09:50 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* win32/win32.c: make file I/O faster on mswin32/mingw32.
-
-	* win32/win32.h: ditto.
-
-	* rubysig.h: ditto.
-
-Sat Feb 17 23:32:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (cond0): integer literal in condition should not be
-	  compared to lineno ($.).
-
-Fri Feb 16 01:44:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (set_outfile): f should be the FILE* from the assigning value.
-
-	* ext/socket/socket.c (tcp_s_open): should not give default value
-	  to local_host.
-
-	* time.c (time_s_times): move to Process::times.
-
-	* file.c (rb_file_s_lchmod): new method File::lchmod.
-
-	* file.c (rb_file_s_lchown): new method File::lchown.
-
-Thu Feb 15 11:33:49 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* lib/cgi/session.rb (close): fixed reversed condition.
-
-Thu Feb 15 08:34:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_waitall): new method based on a patch from Brian
-	  Fundakowski Feldman <green@green.dyndns.org>.
-
-	* process.c (last_status_set): objectify $? value (Process::Status).
-
-Wed Feb 14 17:28:24 2001  Shugo Maeda <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: supports unknown resp_text_code.
-
-Wed Feb 14 00:44:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_s_glob): support backslash escape of metacharacters
-	  and delimiters.
-
-	* dir.c (remove_backslases): remove backslashes from path before
-	  calling stat(2).
-
-	* dir.c (dir_s_glob): call rb_yield directly (via push_pattern) if
-	  block is given to the method.
-
-	* dir.c (push_pattern): do not call rb_ary_push; yield directly.
-
-	* eval.c (blk_copy_prev): reduced ALLOC_N too much.
-
-	* eval.c (frame_dup): ditto.
-
-Tue Feb 13 23:05:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dir.c (lstat): should use rb_sys_stat if lstat(2) is not
-	  available.
-
-Tue Feb 13 08:43:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_ctl): do not call ioctl/fcntl for f2, if f and f2
-	  have same fileno.
-
-Tue Feb 13 01:13:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_load): raise LocalJumpError if unexpected local jumps
-	  appear during load.
-
-	* ext/socket/socket.c (bsock_close_read): don't call rb_thread_fd_close();
-	  it's supposed to be called by io_io_close().
-
-	* ext/socket/socket.c (bsock_close_read): do not modify f and f2.
-
-	* ext/socket/socket.c (bsock_close_write): ditto.
-
-	* ext/socket/socket.c (sock_new): avoid dup(2) on sockets.
-
-	* parse.y (primary): preserve and clear in_single and in_def using
-	  stack to prevent nested method errors in singleton class bodies.
-
-Sun Feb 11 16:00:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* eval.c (stack_length): use __builtin_frame_address() only if
-	  GCC and i386 CPU.
-
-	* gc.c (rb_gc, Init_stack): ditto.
-
-	* configure.in: add ac_cv_func_getpgrp_void=yes on DJGPP.
-
-Sat Feb 10 23:43:49 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* hash.c (rb_any_hash): dumped core on machines sizeof(int) != sizeof(long).
-
-Sat Feb 10 23:07:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_s_for_fd): IO::for_fd(fd) - new method.
-
-	* regex.c (PREV_IS_A_LETTER): should not treat c>0x7f as a word
-	  character if -Kn.
-
-Sat Feb 10 00:00:30 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* win32/win32.c (win32_stat): replace stat to enable when pathname
-	  ends with '/' or '\' for mswin32 on Win9X / Win2k.
-
-	* win32/win32.h: ditto.
-
-	* ruby.h: ditto.
-
-	* dir.c (rb_glob_helper): ditto.
-
-	* file.c (rb_stat, rb_file_s_stat, eaccess, check3rdbyte): ditto.
-
-Fri Feb  9 22:54:57 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ruby.c (ruby_init_loadpath): convert '\\' to '/'
-	  before finding executable file path.
-
-Fri Feb  9 17:41:53 2001  Triet H. Lai  <thlai@mail.usyd.edu.au>
-
-	* dir.c (rb_glob_helper): do not follow symbolic links.
-
-Thu Feb  8 21:27:24 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (install_rb): fix handling of relative path.
-
-	* lib/mkmf.rb (create_makefile): add srcdir.
-
-Thu Feb  8 02:22:09 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: join HTTPReadResponse into HTTPResponse again.
-
-	* lib/net/http.rb: move http_version() from HTTPRequest to
-	  HTTPResponse.
-
-	* lib/net/protocol.rb: refactoring.
-
-Wed Feb  7 16:27:27 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: split HTTPResponse into HTTPReadResponse
-	  module.
-
-	* lib/net/protocol.rb: add Net::net_private.
-
-	* lib/net/protocol.rb: Socket#reopen takes arg, open_timeout.
-
-Wed Feb  7 16:05:22 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (parse_quotedwords): %w should allow parenthesis escape.
-
-Wed Feb  7 00:57:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parse_qstring): %q should allow terminator escape.
-
-	* re.c (rb_reg_options): new method to give an option values.
-
-	* parse.y (cond0): disable special treating of integer literal in
-	  conditional unless option -e is supplied.  changes current
-	  behavior.  experimental.
-
-	* parse.y (cond0): give warning for string/integer literals and
-	  dot operators in conditionals unless option -e is supplied.
-
-	* re.c (rb_reg_equal): all option flags should be same to be equal.
-
-Tue Feb  6 21:30:44 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: call on_connect() on re-opening socket.
-
-	* lib/net/pop.rb: also POP3 can use APOP auth.
-
-Tue Feb  6 20:19:10 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: add HTTP#request.
-
-	* lib/net/http.rb: take HTTP 1.0 server into account (incomplete).
-
-	* lib/net/protocol.rb: timeout for open/read.
-
-	* lib/net/protocol.rb: add Protocol#on_connect,on_disconnect.
-
-Mon Feb  5 23:15:46 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (Init_Exception): make Interrupt a subclass of
-	  SignalException.
-
-Mon Feb 5 00:39:06 2001  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
-
-	* dir.c: use ISXXX() instead of isxxx().
-
-	* dln.c (aix_loaderror): ditto.
-
-	* file.c (rb_file_s_expand_path): ditto.
-
-	* string.c (rb_str_upcase_bang): ditto.
-
-	* win32/win32.c (do_spawn): ditto.
-
-	* win32/win32.c (NtMakeCmdVector): ditto.
-
-	* win32/win32.c (opendir): ditto.
-
-Sat Feb  3 14:44:53 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* configure.in (AC_C_INLINE): check inline attribute.
-
-	* gc.c (is_pointer_to_heap): use inline rather than __inline__.
-
-	* pack.c (hex2num): ditto.
-
-	* ruby.h (rb_class_of, rb_type, rb_special_const_p): ditto.
-
-	* util.c (rb_class_of, rb_type, rb_special_const_p): defined in
-	  ruby.h.
-
-Fri Feb  2 16:14:51 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang): returns self, even if its length is
-	  less than 2.
-
-	* eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
-	  SCOPE_DONT_RECYCLE of ruby_scope is set.
-
-Wed Jan 31 22:27:29 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: gcc-2.95.2-7(Cygwin) support.
-	  add -mwin32 if available.
-
-	* cygwin/GNUmakefile: ditto.
-
-Tue Jan 30 17:56:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_fetch): new method.
-
-Mon Jan 29 17:36:19 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
-
-	* eval.c (rb_eval): nd_iter evaluation should be wrapped by
-	  BEGIN_CALLARGS and END_CALLARGS.
-
-Mon Jan 29 14:25:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (block_pass): return from block jumps directory to
-	  block invoker.
-
-Mon Jan 29 01:40:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_independent): should not clear str->orig here.
-	  it's too early.
-
-Fri Jan 26 01:42:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: clarify do ambiguity, bit more complex but natural
-	  from my point of view.
-
-Wed Jan 24 14:58:08 2001  Akinori MUSHA  <knu@ruby-lang.org>
-
-	* lib/cgi.rb: fix the problem that when running under mod_ruby
-	  header() outputs only one Set-Cookie line.
-
-Wed Jan 24 01:45:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (POP_BLOCK_TAG): call rb_gc_force_recycle() if block has
-	  not been objectified.
-
-	* eval.c (rb_callcc): should nail down block->tag history to avoid
-	  rb_gc_force_recycle().
-
-Tue Jan 23 18:51:57 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_call_finalizer_at_exit): should finalize objects in
-	  deferred_final_list too.
-
-Tue Jan 23 16:10:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (os_live_obj): do not list terminated object.
-
-	* gc.c (os_obj_of): ditto.
-
-	* gc.c (rb_gc_mark): support new T_BLKTAG tag.
-
-	* gc.c (obj_free): ditto.
-
-	* eval.c (new_blktag): creation of new block tag, which holds
-	  destination of global jump and orphan status.
-
-	* eval.c (block_pass): break from orphan Proc object will raise a
-	  LocalJumpError exception.
-
-Mon Jan 22 16:33:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* mkconfig.rb: autoconf 2.49 support.
-
-Mon Jan 22 00:32:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (block_pass): behavior consistency with proc_call(). do
-	  not propagate `break'.
-
-Sat Jan 20 03:54:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): fixed serious syntax misbehavior.  do's
-	  preceding was too high.  a block in `foo bar do .. end' should
-	  be passed to `foo', not `bar'.
-
-	* parse.y (block_call): syntax restructure.
-
-Thu Jan 18 04:28:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_s_read): new method to call IO#read from
-	  pathname.  In addition, it accepts third optional argument to
-	  specify starting point.
-
-Wed Jan 17 13:28:26 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: remove DEFS definition.
-
-	* mkconfig.rb: ditto.
-
-	* win32/config.status.in: ditto.
-
-Tue Jan 16 17:00:50 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb: ignore EOFError for read.
-
-	* lib/net/http.rb: user specified header was not used.
-
-Mon Jan 15 16:00:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): should check associated pointer packed by
-	  pack("P").  Thus pointers can be retrieved only from pointer
-	  packed strings.  restriction added.
-
-Sun Jan 14 21:49:28 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* sprintf.c (rb_f_sprintf): simple typo.  binary base should be 2,
-	  not '2'.
-
-	* re.c (rb_reg_s_last_match): should explicitly return nth match.
-
-Sun Jan 14 18:21:30 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
-
-	* win32/config.status.in: add some field.
-
-	* win32/win32.c (isInternalCmd): ignore case for shell's internal
-	  command.
-
-	* win32/win32.c (do_spawn): recognize quoted command line.
-
-Sun Jan 14 04:10:27 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb (adding): too few "yield" in case of arg is
-	  not String/File.
-
-	* lib/net/http.rb: add http request object.
-
-Sat Jan 13 19:39:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* re.c (rb_reg_desc): separate RE_OPTION_MULTILINE
-
-	* re.c (rb_reg_options): add RE_OPTION_{POSIXLINE,RE_OPTION_MULTILINE,
-	  RE_OPTION_EXTENDED}
-
-Thu Jan 11 10:45:04 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.h, win32/config.h.in: move NORETURN from win32.h
-	  to config.h.in.
-
-	* win32/config.h.in (inline): renamed from INLINE.
-
-	* djgpp/config.hin (INLINE): removed.
-
-Thu Jan 11 06:45:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_dup): should propagate FL_SINGLETON.
-
-	* object.c (inspect_obj): handles the case of no instance variable.
-
-Wed Jan 10 16:15:08 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ruby.h: NORETURN macro is changed for VC++ 6.0.
-
-	* eval.c, intern.h: ditto.
-
-	* djgpp/config.hin, win32/win32.h: ditto.
-
-	* configure.in: ditto.
-
-Wed Jan 10 13:54:53 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* process.c (proc_setuid): use setresuid() if available.
-
-	* process.c (proc_setgid): use setresgid() if available.
-
-	* configure.in: ditto.
-
-Wed Jan 10 01:50:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in (AC_C_INLINE): check inline attribute.
-
-	* string.c (rb_str_reverse_bang): forgot to call rb_str_modify().
-
-Tue Jan  9 17:41:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_taint): check frozen status before modifying
-	  taint status.
-
-	* object.c (rb_obj_untaint): ditto.
-
-Tue Jan  9 16:22:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_inject): new method.
-
-Tue Jan  9 02:16:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_call_finalizer_at_exit): clear klass member of
-	  terminating object.
-
-	* eval.c (rb_call): raise exception for terminated object.
-
-Mon Jan  8 21:24:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bigdivrem): t2 might be too big for signed long; do
-	  not use rb_int2big(), but rb_uint2big().
-
-Mon Jan  8 21:35:10 2001  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* file.c (path_check_1): should restore modified path.
-
-Mon Jan  8 03:09:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (rb_load_fail): new func to report LoadError.
-
-	* ruby.c (load_file): use rb_load_fail.
-
-Sat Jan  6 00:17:18 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* pack.c (pack_pack): avoid infinite loop(pack 'm2').
-
-Fri Jan  5 01:02:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ruby_finalize): should enclosed by PUSH_TAG/POP_TAG.
-
-	* gc.c (rb_gc_mark): link 2 of NODE_IFUNC should not be explicitly
-	  marked.  it may contain non object pointer.
-
-Tue Jan  2 00:20:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (reg_s_last_match): Regexp::last_match(nth) returns nth
-	  substring of the match  (alternative for $& and $<digit>).
-
-Sun Dec 31 01:39:16 2000  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* eval.c (rb_mod_define_method): wrong comparison for blocks.
-
-Sat Dec 30 19:28:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (id2ref): should handle Symbol too.
-
-	* gc.c (id2ref): should print original ptr value
-
-Sat Dec 30 03:14:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_iterate): NODE_CFUNC does not protect its data
-	  (nd_tval), so create new node NODE_IFUNC for iteration C
-	  function.
-
-	* eval.c (rb_yield_0): use NODE_IFUNC.
-
-	* gc.c (rb_gc_mark): support NODE_IFUNC.
-
-Fri Dec 29 11:41:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (mem_error): prohibit recursive mem_error().
-	  (ruby-bugs-ja:PR#36)
-
-Fri Dec 29 11:05:41 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_fd_writable): should not switch context if
-	  rb_thread_critical is set.
-
-	* eval.c (rb_thread_wait_fd): ditto.
-
-	* eval.c (rb_thread_wait_for): ditto.
-
-	* eval.c (rb_thread_select): ditto.
-
-	* eval.c (rb_thread_join): join during critical section causes
-	  deadlock.
-
-Fri Dec 29 00:38:46 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* m17n.c: new file - core functions of M17N.
-
-Tue Dec 26 18:46:41 2000  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
-
-	* lib/debug.rb: Avoid thread deadlock in debugging stopped thread.
-
-	* lib/debug.rb: Uncleared 'finish' state.
-
-Tue Dec 26 16:53:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): remove dvar node by rb_gc_force_recycle()
-	  more eagerly.
-
-	* eval.c (rb_f_binding): recycling should be stopped for outer
-	  scope too.
-
-	* eval.c (proc_new): ditto.
-
-Tue Dec 26 15:45:35 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_inspect): should treat multibyte characters
-	  properly.
-
-Mon Dec 25 17:49:08 2000  K.Kosako  <kosako@sofnec.co.jp>
-
-	* string.c (rb_str_replace_m): unexpected string share happens if
-	  replace is done for associated (STR_NO_ORIG) string.
-
-Tue Dec 26 15:01:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_p): should not call rb_io_flush() if rb_defout is not
-	  a IO (T_FILE).
-
-Mon Dec 25 15:52:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.6.2 released.
-
-Mon Dec 25 05:11:04 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: version 2.1.2 (some bug fixes).
-
-	* lib/cgi.rb: Regexp::last_match[1] --> $1
-
-	* lib/net/telnet.rb: ditto.
-
-Mon Dec 25 04:43:02 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: does not send HEAD on closing socket.
-
-Mon Dec 25 00:44:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_any_cmp): should use rb_str_cmp() if TYPE == T_STRING
-	  and CLASS_OF == rb_cString.
-
-	* string.c (rb_str_new4): should copy class of original too.
-
-Mon Dec 25 00:04:54 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_thread_schedule): initial value of `max' changed to -1.
-
-Mon Dec 25 00:16:14 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_replace_m): copy-on-write replace.
-
-	* parse.y (yylex): should handle => after identifier as well as ==
-	  and =~.
-
-Sat Dec 23 23:55:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_cstr2inum): Integer("") should not return 0.
-
-Sat Dec 23 11:55:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_and): Array#& should preserve original order.
-
-Sat Dec 23 03:44:16 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb: set @closed false in Socket#reopen.
-
-	* lib/net/pop.rb: add POP3.foreach, delete_all.
-
-	* lib/net/pop.rb: add POP3#delete_all.
-
-	* lib/net/http.rb: add HTTP.version_1_1, version_1_2
-
-	* lib/net/http.rb: refactoring.
-
-Fri Dec 22 23:11:12 2000  Ueno Katsuhiro  <unnie@blue.sky.or.jp>
-
-	* eval.c (rb_feature_p): ext might be null.
-
-Fri Dec 22 17:04:12 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* win32/win32.c (myselect): avoid busy loop by adjusting fd_count.
-
-Fri Dec 22 15:07:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_cstr2inum): prefix like '0x' had removed too much.
-
-Thu Dec 21 13:01:46 2000  Tanaka Akira  <akr@m17n.org>
-
-	* lib/net/ftp.rb (makeport): don't use TCPsocket.getaddress.
-
-Wed Dec 20 12:00:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_lshift): should cast up to BDIGIT_DBL.
-
-	* parse.y (yylex): disallow trailing '_' for numeric literals.
-
-	* bignum.c (rb_cstr2inum): allow `_' within converting string.
-
-	* eval.c (specific_eval): should take no argument if block is
-	  supplied.
-
-Tue Dec 19 13:44:50 2000  K.Kosako  <kosako@sofnec.co.jp>
-
-	* io.c (rb_f_p): should flush rb_defout, not stdout.
-
-Tue Dec 19 00:57:10 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_minus): usec might overflow. (ruby-bugs-ja:PR#35)
-
-	* eval.c (rb_obj_extend): Object#extend should take at least one
-	  argument.
-
-	* parse.y (mrhs_basic): should check value_expr($3), not $1.
-
-Mon Dec 18 23:18:39 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* util.c (mblen, __crt0_glob_function): add for multibyte
-	  on DJGPP 2.03.
-
-Mon Dec 18 18:10:30 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_plus): usec might underflow (ruby-bugs-ja:#PR33).
-
-Mon Dec 18 08:11:20 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_set_default): should call rb_hash_modify().
-
-Sat Dec 16 02:58:26 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* eval.c (rb_eval): should clear ruby_errinfo on retry.
-
-	* eval.c (rb_rescue2): ditto.
-
-Thu Dec 14 13:06:18 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* class.c (rb_include_module): prohibit frozen class/module.
-
-	* eval.c (rb_frozen_class_p): make external.
-
-	* intern.h (rb_frozen_class_p): prototyped.
-
-	* intern.h (rb_undef): prototyped not but rb_undef_method()
-	  which is also in ruby.h.
-
-Thu Dec 14 09:20:26 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: support -T1 on ruby 1.6.2
-
-	* lib/cgi.rb: $1 --> Regexp::last_match[1]
-
-	* lib/net/telnet.rb: ditto.
-
-Wed Dec 13 23:27:06 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): handles case statement without expr, which
-	  looks for any TRUE (non nil, non false) when expression.
-
-	* parse.y (primary): case expression should not be compstmt, but
-	  mere expr.
-
-	* parse.y (primary): case without following expression is now
-	  separated rule.
-
-Wed Dec 13 12:41:27 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ruby.c (proc_options): accept "--^M" for DOS line endings.
-
-Tue Dec 12 15:45:42 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (newline_node): cancel newline unification.
-
-Mon Dec 11 23:01:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): supports cases `?' precedes EOF and newline.
-
-Mon Dec 11 12:11:25 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (call_end_proc): some frame members were left
-	  uninitialized.
-
-Mon Dec 11 01:14:58 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_fptr_finalize): do not fclose stdin, stdout and
-	  stderr at exit.
-
-Sat Dec  9 17:34:48 2000  Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
-
-	* time.c (time_cmp): should check with kind_of?, not instance_of?
-
-	* time.c (time_eql): ditto.
-
-	* time.c (time_minus): ditto.
-
-Fri Dec  8 17:23:25 2000  Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
-
-	* sprintf.c (rb_f_sprintf): proper string precision treat.
-
-Fri Dec  8 10:44:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_mod_remove_cvar): Module#remove_class_variable
-	  added.
-
-Thu Dec  7 17:35:51 2000  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (stack_length): don't use __builtin_frame_address() on alpha.
-
-Wed Dec  6 18:07:13 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* djgpp/config.sed, win32/Makefile.sub: typo.
-
-	* eval.c (rb_mod_define_method): avoid VC4.0 warnings.
-
-Wed Dec  6 13:38:08 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_and): tuning, make hash from shorter operand.
-
-Wed Dec  6 01:28:50 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
-
-	* gc.c (rb_gc): __builtin_frame_address() should not be used on
-	  MacOS X.
-
-	* gc.c (Init_stack): ditto.
-
-Mon Dec  4 13:44:01 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/jcode.rb: consider multibyte. not /n.
-
-Mon Dec  4 09:49:36 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_inspect): output whole string contents. no more `...'
-
-	* string.c (rb_str_dump): should propagate taintness.
-
-	* hash.c (env_inspect): hash like human readable output.
-
-	* variable.c (rb_ivar_get): prohibiting instance variable access
-	  is too much restriction.
-
-	* class.c (method_list): retrieving information should not be
-	  restricted where $SAFE=4.
-
-	* class.c (rb_obj_singleton_methods): ditto.
-
-	* eval.c (rb_thread_priority): ditto.
-
-	* eval.c (rb_thread_local_aref): ditto.
-
-	* variable.c (rb_obj_instance_variables): ditto.
-
-	* variable.c (rb_mod_const_at): ditto.
-
-	* variable.c (rb_mod_class_variables): ditto.
-
-	* eval.c (rb_exec_end_proc): end_proc should be preserved.
-
-Sat Dec  2 22:32:43 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): || should accept exactly zero argument.
-
-	* parse.y (stmt): multiple right hand side for single assignment
-	  (e.g. a = 1,2) is allowed.
-
-Wed Nov 29 07:55:29 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_long): dumping long should be smaller than 32bit max.
-
-	* marshal.c (w_long): shorter long format for small integers(-123..122).
-
-	* marshal.c (r_long): ditto.
-
-Tue Nov 28 18:10:51 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_define_method): quick hack to implement
-	  on-the-fly method definition.  experimental.
-
-Mon Nov 27 17:00:35 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should not redefine builtin classes/modules
-	  from within wrapped load.
-
-Mon Nov 27 08:57:33 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (call_end_proc): should be isolated from outer block.
-
-Mon Nov 27 00:10:08 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_ctl): call ioctl/fcntl for fptr->f2 too.
-
-	* process.c (rb_f_fork): call rb_thread_atfork() after creating
-	  child process.
-
-	* eval.c (rb_thread_atfork): kill all other threads immediately,
-	  then turn the current thread into the main thread.
-
-Sat Nov 25 23:12:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ruby_run): move calling point of rb_trap_exit after
-	  cleaning up threads.
-
-	* eval.c (ruby_finalize): new function to call EXIT trap, END
-	  procs and GC finalizers.
-
-	* eval.c (rb_exec_end_proc): prevent recursion.
-
-	* gc.c (rb_gc_call_finalizer_at_exit): ditto.
-
-	* signal.c (rb_trap_exit): ditto. made static.
-
-	* process.c (rb_f_fork): should swallow all exceptions from block
-	  execution.
-
-	* process.c (fork_rescue): should call ruby_finalize().
-
-	* parse.y (yycompile): rb_gc() removed.  I don't remember why I put
-	  this here.  test code?
-
-Fri Nov 24 22:03:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (EXCL): exclusive information is now stored in an
-	  instance variable.  this enables proper marshal dump.
-
-	* process.c (proc_waitpid): should clear rb_last_status ($?) if
-	  no pid was given by waitpid(2).
-
-Thu Nov 23 01:35:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_waitpid2): returns nil if no pid found.
-
-Wed Nov 22 23:45:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_eq): new method.  Compares start and end of range
-	  respectively.
-
-Wed Nov 22 11:01:32 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_mod_class_variables): should honor singleton
-	  class variable rule defined yesterday.
-
-Tue Nov 21 23:24:14 2000  Mitsuteru S Nakao  <nakao@kuicr.kyoto-u.ac.jp>
-
-	* numeric.c (flodivmod): missing second operand (typo).
-
-Tue Nov 21 03:39:41 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (marshal_load): marshal format compatibility check
-	  revised.   greater minor revision is UPWARD compatible;
-	  downward compatibility is not assured.
-
-	* eval.c (is_defined): clarify class variable behavior for
-	  singleton classes.  class variables within singleton class
-	  should be treated like within singleton method.
-
-Mon Nov 20 13:45:21 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): set ruby_sourceline before evaluating
-	  exceptions.
-
-	* gc.c (gc_sweep): defer finalization in GC during compilation or
-	  interrupt prohibit section.
-
-	* gc.c (gc_sweep): mark all nodes before sweeping if GC happened
-	  during compilation.
-
-	* eval.c (rb_eval): should treat class variables specially in a
-	  method defined in the singleton class.
-
-Mon Nov 20 10:20:21 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dir.c, win32/win32.c, ruby.h: add rb_iglob().
-
-Mon Nov 20 00:18:16 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_subseq): should return nil for outbound start
-	  index.
-
-	* marshal.c (marshal_load): show format versions explicitly when
-	  format version mismatch happens.
-
-Sun Nov 19 06:13:24 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* marshal.c: use long for string/array length.
-
-	* pack.c (swaps): use bit-or(|) instead of plus(+).
-
-	* pack.c (swapl): ditto.
-
-Sat Nov 18 15:18:16 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* array.c (rb_ary_replace): array size should be in long.
-
-	* array.c (rb_ary_concat): ditto.
-
-	* array.c (rb_ary_hash): ditto.
-
-Sat Nov 18 14:07:20 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: Socket#readline() reads until "\n", not "\r\n"
-
-Fri Nov 17 14:55:18 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* string.c (rb_str_succ): output should be NUL terminated.
-
-Fri Nov 17 02:54:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_close): need not to flush before closing.
-
-	* eval.c (rb_thread_join): should preserve last thread status when
-	  THREAD_TO_KILL.
-
-	* eval.c (rb_thread_stop): ditto.
-
-	* io.c (io_fflush): wrap fflush by TRAP_BEG, TRAP_END.
-
-	* eval.c (rb_eval): method defined within singleton class
-	  definition should behave like singleton method about class
-	  variables.
-
-	* eval.c (is_defined): ditto.
-
-Thu Nov 16 23:06:07 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: can call {old,new}_implementation any times.
-
-	* lib/net/http.rb: HTTP#connecting, receive ->
-	  common_oper, connecting.
-
-	* lib/net/http.rb: output warning if u_header includes
-	  duplicated header.
-
-	* lib/net/http.rb: not check Connection:/Proxy-Connection;
-	  always read until eof.
-
-	* lib/net/protocol.rb: detects and catches "break" from block.
-
-Thu Nov 16 16:32:45 2000  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
-
-	* bignum.c (bigdivrem): should have incremented ny first.
-
-Thu Nov 16 14:58:00 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/socket/socket.c (sock_new): duplicates file descriptor
-	  with myfddup() on mswin32/mingw32.
-
-	* win32/win32.h: uses system original fdopen().
-
-	* win32/win32.c (myfddup): newly added instead of myfdopen().
-
-	* win32/win32.c (mybind, myconnect, mygetsockname, mygetsockopt,
-	  mylisten, mysetsockopt): now accept file descriptor only, not
-	  SOCKET.
-
-	* win32/win32.c (myaccept, mysocket): return file descriptor,
-	  instead of SOCKET.
-
-Thu Nov 16 10:23:24 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (massign): too strict check for nameless rest argument.
-
-	* eval.c (method_arity): mere * should return -1.
-
-	* eval.c (intersect_fds): should check all FDs in the fd_set.
-
-Wed Nov 15 19:33:20 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_attr): should clear method cache before calling hook.
-
-	* eval.c (rb_eval): ditto.
-
-	* eval.c (rb_mod_modfunc): ditto.
-
-Mon Nov 13 22:44:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (rb_bug): print version to stderr.
-
-Mon Nov 13 19:02:08 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c, io.c, process.c: the exit status of program must be
-	  multiplied 256 on mswin32 and msdosdjgpp(system(), ``).
-
-Sat Nov 11 22:57:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): uniformed treatment of -a**b, where a is a
-	  number literal;  hacky but behavior appears more consistent.
-
-	* parse.y (newline_node): reduce newline node (one per line).
-
-	* random.c (rb_f_srand): should be prohibited in safe level
-	  greater than 4.
-
-Sat Nov 11 22:37:36 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* rubysig.h: do not use rb_trap_immediate on win32.
-
-	* rubysig.h: new macros, ATOMIC_TEST, ATOMIC_SET, ATOMIC_INC,
-	  ATOMIC_DEC, RUBY_CRITICAL and new definition of TRAP_BEG,
-	  TRAP_END.
-
-	* gc.c (ruby_xmalloc): should wrap malloc() by RUBY_CRITICAL.
-
-	* signal.c (sighandle): better win32 sig handling.
-
-	* win32/win32.c (flock): better implementation.
-
-	* win32/win32.c (myselect): ditto.
-
-	* win32/win32.c (myaccept): ditto.
-
-	* win32/win32.c (waitpid): ditto.
-
-	* win32/win32.c (myrename): ditto.
-
-	* win32/win32.c (wait_events): support function for win32 signal
-	  handling.
-
-Sat Nov 11 08:34:18 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.31.
-
-	* lib/net/http.rb: initializes header in HTTP, not HTTPCommand.
-
-	* lib/net/protocol.rb, http.rb: rewrites proxy code.
-
-Fri Nov 10 16:15:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (rb_num2long): use to_int, not to_i.
-
-	* error.c: T_SYMBOL was misplaced by T_UNDEF.
-
-	* parse.y (yylex): eval("^") caused infinite loop.
-
-Thu Nov  9 14:22:13 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_taint_check): should check IO taintness; no
-	  operation for untainted IO should be allowed in the sandbox.
-
-	* rubyio.h (GetOpenFile): check IO taintness inside using
-	  rb_io_taint_check().
-
-Wed Nov  8 03:08:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fflush): ensure fflush(3) would not block by calling
-	  rb_thread_fd_writable().
-
-Tue Nov  7 20:29:56 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.30.
-
-	* lib/net/protocol.rb, smtp.rb: Command#critical_ok -> error_ok
-
-	* lib/net/http.rb: reads header when also "100 Continue".
-
-Tue Nov  7 04:32:19 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bigdivrem): use bit shift to make y's MSB set.
-
-Mon Nov  6  1:22:49 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (warn_print): do not use err_append(), to ensure output
-	  to stderr.
-
-	* error.c (rb_warn): use warn_print() instead of err_print().
-
-	* error.c (rb_warning): ditto.
-
-	* error.c (rb_bug): ditto.
-
-	* eval.c (rb_load): re-raise exceptions during load.
-
-	* time.c (make_time_t): remove useless adjust
-
-Thu Nov  2 18:01:16 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* random.c (rb_f_rand): half-baked float support fixed.  This fix
-	  was originally proposed by K.Kosako <kosako@sofnec.co.jp>.
-
-Tue Oct 31 17:27:17 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c: change digit size to `long|int' if long long is
-	  available.
-
-	* marshal.c (w_object): support `long|int' digits.
-
-	* marshal.c (r_object): ditto.
-
-Sat Oct 28 23:54:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): allow =end at the end of file (without a
-	  newline at the end).
-
-Fri Oct 27 10:00:27 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_cstr2inum): should ignore trailing white spaces.
-
-	* bignum.c (rb_str2inum): string may not have sentinel NUL.
-
-Fri Oct 27 02:37:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_cstr2inum): wrongly assigned base to c before
-	  badcheck check.
-
-Thu Oct 26 02:42:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb: Command#critical_ok
-
-	* lib/net/smtp.rb: clear critical flag before go to SMTP
-
-Wed Oct 25 12:30:19 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_concat): replacing array might be the receiver
-	  itself.  do not call rb_ary_push_m.
-
-	* array.c (rb_ary_replace): replacing array might be the receiver
-	  itself.  use memmove.
-
-Fri Oct 20 07:56:23 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): ARGSPUSH should not modify args array.
-
-Thu Oct 19 14:58:17 2000  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* pack.c (NUM2U32): should use NUM2ULONG().
-
-Tue Oct 17 17:30:34 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* eval.c (error_print): ruby_sourcefile may be NULL.
-
-Tue Oct 17 16:36:28 2000  Wes Nakamura  <wknaka@pobox.com>
-
-	* pack.c (NATINT_U32): wrong use of sizeof.
-
-Tue Oct 17 12:48:20 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* eval.c (rb_abort): nil check against ruby_errinfo.
-
-	* eval.c (rb_thread_schedule): use FOREACH_THREAD_FROM instead of
-	  FOREACH_THREAD, since curr_thread may be removed from thread ring.
-
-	* eval.c (THREAD_ALLOC): errinfo should be Qnil.
-
-	* eval.c (rb_callcc): th->prev,th->next are now already
-	  initialized in THREAD_ALLOC.
-
-Mon Oct 16 15:37:33 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* eval.c (rb_thread_inspect): tag size was shorter than required.
-
-	* object.c (rb_obj_inspect): ditto.
-
-Mon Oct 16 14:25:18 2000  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* object.c (sym_inspect): used `name' before initialization.
-
-Mon Oct 16 14:06:00 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): use NATINT_U32 for 'l', 'L', and 'N'.
-
-	* pack.c (I32,U32): 32 bit sized integer.
-
-	* pack.c (OFF16,OFF32B): big endian offset for network byteorder.
-
-Mon Oct 16 06:39:32 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: hex-alpha is not [a-h] but [a-f].
-
-Mon Oct 16 01:02:02 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_start_0): should not abort on exception if
-	  $SAFE >= 4.
-
-	* parse.y (sym): symbols for class variable names.
-
-Sun Oct 15 01:49:18 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_flock): should accept interrupt.
-
-	* process.c (rb_waitpid): ditto.
-
-	* process.c (rb_waitpid): ditto.
-
-	* process.c (proc_wait): ditto.
-
-	* process.c (proc_waitpid2): wrong recursion.
-
-Sat Oct 14 03:32:13 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_alloc): should not link a new thread in the
-	  live thread ring before initialization.
-
-Fri Oct 13 17:08:09 2000  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: new file.
-
-Thu Oct 12 18:56:28 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/pop.rb: POP3#reset
-
-	* lib/net/http.rb: a code for "Switch Protocol" was wrongly 100.
-
-Thu Oct 12 01:23:38 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: bug fix: CGI::html(): PRETTY option didn't work.
-
-Thu Oct 12 00:03:02 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (sym_inspect): should adjust string length.
-
-	* struct.c (rb_struct_to_s): ditto.
-
-	* struct.c (rb_struct_inspect): ditto.
-
-Wed Oct 11 22:15:47 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* eval.c (rb_thread_inspect): should adjust string length.
-
-	* object.c (rb_any_to_s): ditto.
-
-	* object.c (rb_obj_inspect): ditto.
-
-Wed Oct 11 18:13:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_start_0): should check insecure exit.
-
-Wed Oct 11 14:29:51 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb: 2nd arg for ProtocolError#initialize is
-	  optional.
-
-	* lib/net/http.rb: code refining.
-
-Wed Oct 11 11:13:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): setter method (e.g. foo=) should always be
-	  public.
-
-	* eval.c (rb_thread_raise): should not raise SecurityError if
-	  exception raised by the interpreter.
-
-	* eval.c (rb_thread_cleanup): skip all THREAD_KILLED threads
-	  before FOREACH_THREAD.
-
-Tue Oct 10 16:11:54 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dln.c (dln_load): remove unused code for Cygwin.
-
-Tue Oct 10 09:49:23 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (Init_File): FileTest.size should return 0 (not nil) for
-	  empty files.
-
-Sun Oct  8 13:20:26 2000  Guy Decoux  <decoux@moulon.inra.fr>
-
-	* eval.c (POP_SCOPE): not just set SCOPE_DONT_RECYCLE, but do
-	  scope_dup().
-
-Sat Oct  7 15:10:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_reverse_bang): unnecessary ALLOCA_N() was
-	  removed.
-
-Fri Oct  6 14:50:24 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb.in, lib/mkmf.rb: remove "DESTDIR =".
-
-	* Makefile.in, win32/Makefile.sub, ruby.1: renamed -X to -C.
-
-Fri Oct  6 12:50:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_plus): use to_ary(), not Check_Type().
-
-	* array.c (rb_ary_concat): ditto.
-
-	* gc.c (rb_gc): use __builtin_frame_address() for gcc.
-
-	* eval.c (stack_length): ditto.
-
-	* parse.y (assign_in_cond): stop warning till some better warning
-	  condition will be found.
-
-Thu Oct  5 18:02:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_dup): should have propagated taint flag.
-	  (ruby-bugs:#PR64,65)
-
-Wed Oct  4 00:26:11 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_arity): proc{|a|}'s arity should be -1.
-
-Mon Oct  2 05:28:58 2000  akira yamada  <akira@ruby-lang.org>
-
-	* string.c (trnext): minus at the end of pattern.
-
-Sun Oct  1 00:43:34 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: exp-name was wrong on cygwin and mingw32.
-
-Thu Sep 28 14:57:09 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): should try must_string calculation
-	  every time.
-
-Tue Sep 19 23:47:44 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
-
-	* configure.in, config.guess, config.sub: MacOS X support.
-
-Wed Sep 27 18:40:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.6.1 released.
-
-Wed Sep 27 16:13:05 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* mkconfig.rb: variables should be expanded only if /\$\{?\w+\}?/.
-
-Tue Sep 26 18:09:51 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* string.c: include <math.h>
-
-Tue Sep 26 15:59:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_dup): metaclasses of class/module should not be
-	  cleared by rb_obj_dup.
-
-Tue Sep 26 02:44:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (GC_MALLOC_LIMIT): size extended.
-
-	* regex.c (DOUBLE_STACK): use machine's stack region for regex
-	  stack if its size is small enough.
-
-Mon Sep 25 18:13:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c: include <defines.h>.
-
-	* eval.c (rb_add_method): cache mismatch by method
-	  definition. need to clear_cache_by_id every time.
-
-Mon Sep 25 13:31:45 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* win32/win32.c (NtCmdGlob): substitute '\\' with '/'.
-
-Mon Sep 25 00:35:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* defines.h: #undef HAVE_SETITIMER on cygwin.
-
-Sun Sep 24 03:01:53 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, http.rb: typo.
-
-Sat Sep 23 07:33:20 2000  Aleksi Niemela  <aleksi.niemela@cinnober.com>
-
-	* regex.c (re_compile_pattern): nicer regexp error messages for
-	  invalid patterns.
-
-Sat Sep 23 03:06:25 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_autoload_load): should not require already
-	  provided features.
-
-Fri Sep 22 15:46:21 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/http.rb: too early parameter expansion in string.
-
-Fri Sep 22 13:58:51 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/extmk.rb.in: don't use default $:
-
-Fri Sep 22 13:42:50 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* regex.c (PUSH_FAILURE_COUNT): avoid casting warning on alpha.
-
-	* regex.c (PUSH_FAILURE_POINT): ditto.
-
-Fri Sep 22 10:16:21 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* win32/config.h.in: add HAVE_TELLDIR, HAVE_SEEKDIR
-
-Thu Sep 21 19:04:34 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/extmk.rb, lib/mkmf.rb (install_rb): check whether libdir is
-	  directory or not.
-
-Thu Sep 21 17:23:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_s_symlink): use HAVE_SYMLINK.
-
-	* file.c (rb_file_s_readlink): use HAVE_READLINK.
-
-	* dir.c (dir_tell): use HAVE_TELLDIR.
-
-	* dir.c (dir_seek): use HAVE_SEEKDIR.
-
-	* configure.in (AC_CHECK_FUNCS): lstat, symlink, readlink,
-	  telldir, seekdir checks added.
-
-	* file.c (lstat): should use stat(2) if lstat(2) is not
-	  available.
-
-Thu Sep 21 15:59:23 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.29.
-
-	* lib/net/http.rb: HTTPReadAdapter -> HTTPResponseReceiver
-
-	* lib/net/http.rb (connecting): response is got in receive()
-
-Thu Sep 21 15:49:07 2000  Wayne Scott  <wscott@ichips.intel.com>
-
-	* lib/find.rb (find): should not follow symbolic links;
-	  tuned performance too.
-
-Wed Sep 20 23:21:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (load_file): two Ctrl-D was required to stop ruby at the
-	  beginning of stdin script read.
-
-Wed Sep 20 14:01:45 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_provided): detect infinite load loop.
-
-	* eval.c (rb_provided): too weak filename comparison.
-
-	* eval.c (rb_thread_alloc): avoid recycling still referenced
-	  dvar structures.
-
-	* eval.c (rb_callcc): ditto.
-
-	* eval.c (THREAD_ALLOC): fill dyna_vars field by ruby_dyna_vars.
-
-Tue Sep 19 17:47:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.6.0 released.
-
-Tue Sep 19 16:24:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (Init_marshal): provide marshal.so no more.
-
-Tue Sep 19 14:01:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in, win32/setup.mak: include version number
-	  in RUBY_SO_NAME.
-
-Tue Sep 19 13:07:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): was confusing $~ and $_.
-
-Tue Sep 19 13:06:53 2000  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* signal.c (rb_f_kill): signum may be a negative number, should be
-	  treated by signed number.
-
-Tue Sep 19 01:14:56 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_provide): better feature handling.
-
-	* eval.c (rb_f_require): loading ruby library may be partial
-	  state.  checks in rb_thread_loading is integrated.
-
-	* eval.c (rb_provided): better thread awareness.
-
-	* lib/irb/frame.rb: 6 (not 5) parameters for trace_func proc.
-
-	* eval.c (error_print): should print error position even if
-	  get_backtrace() failed.
-
-Sat Sep 16 03:29:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_require): rb_provided() was called too early; does
-	  not work well with threads.
-
-	* parse.y (ensure): should distinguish empty ensure and non
-	  existing ensure.
-
-	* file.c (Init_File): extending File by class of FileTest was
-	  serious mistake.
-
-Thu Sep 14 02:46:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_yield): array strip should be done in this
-	  function.
-
-Wed Sep 13 17:01:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_eq): incomplete value comparison of bignums.
-
-Wed Sep 13 06:39:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_mod_class_variables): Module#class_variables added.
-
-Wed Sep 13 06:09:26 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: bug fix: CGI::header(): output status header.
-
-Wed Sep 13 01:09:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): allow global variables like '$__a'.
-
-Tue Sep 12 22:28:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/socket/extconf.rb: avoid using terrible <netinet/tcp.h>
-	  on cygwin 1.1.5.
-
-Tue Sep 12 16:01:58 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* array.c (rb_ary_unshift_m): typo.
-
-Tue Sep 12 15:37:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): stripped array too much, should remove just
-	  for proc_call().
-
-Tue Sep 12 07:05:24 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: version 2.0.0: require ruby1.5.4 or later.
-
-	* lib/net/telnet.rb: version 1.6.0
-
-Tue Sep 12 03:26:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (massign): use to_ary to get an array if available.
-
-	* object.c (rb_Array): ditto.
-
-Mon Sep 11 14:24:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (ruby_setenv): should not free the element of
-	  origenvironment.
-
-	* parse.y (command_call): kYIELD moved to this rule to allow
-	  'a = yield b'. (ruby-bugs-ja:#PR15)
-
-Mon Sep 11 01:27:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): proc#call([]) should pass single value to
-	  the block.
-
-	* eval.c (callargs): reduce array allocation.
-
-	* eval.c (massign): precise check for argument number.
-
-Fri Sep  8 10:05:17 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (STR_NO_ORIG): should be FL_USER2.
-
-Thu Sep  7 14:17:51 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cat): should work even for concatenating same
-	  string.
-
-Wed Sep  6 17:06:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_cvar_declare): should check superclass's class
-	  variable first.
-
-Wed Sep  6 10:42:02 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-calculate-indent): shift continuing line
-	  if previous line ends with modifier keyword.
-
-	* misc/ruby-mode.el (ruby-parse-region): should not give up if
-	  modifiers are at the end of line.
-
-	* misc/ruby-mode.el (ruby-expr-beg): indented wrongly if modified
-	  statement was size 1.
-
-Wed Sep  6 10:41:19 2000  Kenichi Komiya  <kom@mail1.accsnet.ne.jp>
-
-	* misc/ruby-mode.el (ruby-parse-region): modifier was not handled
-	  well on emacs19.
-
-Tue Sep  5 17:10:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_to_s): fixed zone string UTC for utc time object.
-
-Tue Sep  5 00:26:06 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_search): range worked wrongly on bm_search().
-
-Mon Sep  4 13:40:40 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: renamed libruby.a to libruby.{cygwin,mingw32}.a
-	  on cygwin and mingw32.
-
-Sun Sep  3 23:44:04 2000  Noriaki Harada  <tenmei@maoh.office.ne.jp>
-
-	* io.c (NO_SAFE_RENAME): for BeOS too.
-
-Sun Sep  3 11:31:53 2000  Takaaki Tateishi  <ttate@jaist.ac.jp>
-
-	* parse.y (rescue): no assignment was done if rescue body was
-	  empty.
-
-Sat Sep  2 10:52:21 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (call_args,aref_args): block_call can be the last
-	  argument.
-
-	* parse.y (COND_PUSH,COND_POP): maintain condition stack to allow
-	  kDO2 in parentheses in while/until/for conditions.
-
-	* parse.y (yylex): generate kDO2 for EXPR_ARG outside of
-	  while/until/for condition.
-
-Fri Sep  1 10:36:29 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (aref_args,opt_call_args): add block_call to allow a
-	  method without parentheses and with block as a last argument.
-
-	* hash.c (rb_hash_sort): should not return nil.
-
-	* re.c (match_aref): should use rb_reg_nth_match().
-
-	* eval.c (POP_SCOPE): recycled scopes too much
-
-	* eval.c (Init_eval): extend room for stack allowance.
-
-	* eval.c (POP_SCOPE): frees scope too much.
-
-Thu Aug 31 14:28:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_mark): T_SCOPE condition must be more precise.
-
-	* eval.c (scope_dup): should not make all duped scope orphan.
-
-Thu Aug 31 10:11:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (stmt): allow stmt_rhs to be right hand side of multiple
-	  assignment.
-
-	* time.c (rb_time_timeval): type error should not mention the word
-	  'interval'.
-
-Wed Aug 30 23:21:20 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (rb_num2long): use rb_Integer() instead of independent
-	  convert routine.
-
-	* eval.c (rb_rescue2): now takes arbitrary number of exception types.
-
-	* object.c (rb_convert_type): use rb_rescue2 now to handle NameError.
-
-	* object.c (rb_convert_type): better error message.
-
-Wed Aug 30 17:09:14 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/Win32API/Win32API.c (Win32API_initialize): AlphaNT support.
-
-Wed Aug 30 14:19:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (node_assign): should support NODE_CVASGN2 too.
-
-Wed Aug 30 11:31:47 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ext/Win32API/Win32API.c (Win32API_initialize): add the
-	  arguments checking.
-
-	* ext/Win32API/Win32API.c (Win32API_initialize): add taint
-	  checking. allow String object in the third argument.
-
-Wed Aug 30 10:29:40 2000  Masahiro Tomita  <tommy@tmtm.org>
-
-	* io.c (rb_f_p): flush output buffer.
-
-Tue Aug 29 16:29:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (assignable): remove NODE_CVASGN3.
-
-	* parse.y (gettable): remove NODE_CVAR3.
-
-Tue Aug 29 02:02:14 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): handles create_makefile("a/b").
-
-	* ext/extmk.rb.in (create_makefile): ditto
-
-Mon Aug 28 18:43:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): now handles class variables.
-
-	* eval.c (rb_eval): class variable behavior revisited.
-
-	* parse.y (assignable): ditto.
-
-	* parse.y (gettable): ditto.
-
-	* regex.c (PUSH_FAILURE_COUNT): push/pop interval count on failure
-	  stack.  this fix is inspired by the Emacs21 patch from Stefan
-	  Monnier <monnier@cs.yale.edu>.
-
-Fri Aug 25 15:24:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_cvar_get): should not follow __attached__.
-
-	* variable.c (rb_cvar_set): ditto.
-
-	* variable.c (rb_cvar_declare): ditto.
-
-	* variable.c (mod_av_set): second class variable assignment at the
-	  toplevel should not give warning.
-
-Fri Aug 25 01:18:36 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (next_argv): prepare path for open file.
-
-	* string.c (rb_str_setter): moved from io.c.
-
-	* io.c (next_argv): filename should be "-" for refreshed ARGF.
-
-Thu Aug 24 15:27:39 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/socket/socketport.h: use `extern int h_errno' if needed.
-
-Sat Aug 19 01:34:02 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/sdbm/_sdbm.c (sdbm_prep): flags should be or-ed by O_BINARY on
-	  Win32 too.
-
-	* ext/sdbm/_sdbm.c (makroom): fill hole with 0 on Win32 too.
-
-Fri Aug 18 13:23:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should preserve and clear $! value before
-	  compilation.
-
-	* eval.c (eval): ditto.
-
-Fri Aug 18 11:06:19 2000  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/socket/socket.c (s_accept): start GC on EMFILE/ENFILE.
-
-Thu Aug 17 16:04:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): should clear ruby_errinfo.
-
-Thu Aug 17 04:26:31 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.27.
-
-	* lib/net/protocol.rb: writing methods returns written byte size.
-
-	* lib/net/smtp.rb: send_mail accepts many destinations.
-
-Wed Aug 16 00:43:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_s_times): use CLK_TCK for HZ if it's defined.
-
-Tue Aug 15 17:30:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (frame_dup): should set flag FRAME_MALLOC after
-	  argv allocation.
-
-	* eval.c (blk_free): should not free argv if GC was called before
-	  frame_dup.
-
-Tue Aug 15 16:08:40 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: add ac_cv_func_times=yes for mingw32.
-
-	* win32/win32.c (mytimes): typo.
-
-Tue Aug 15 01:45:28 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_eof): should return true at the end of ARGF without
-	  checking stdout if arguments are given.
-
-Mon Aug 14 10:34:32 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_status): status should return false for normal
-	  termination, nil for termination by exception.
-
-Fri Aug 11 15:43:46 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_undef): give warning for undefining __id__, __send__.
-
-Thu Aug 10 08:05:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_callcc): returned current thread instead of
-	  continuation wrongly.
-
-Thu Aug 10 05:40:28 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/extmk.rb.in: $CPPFLAGS should be initialized.
-
-	* ext/tcltklib/depend: add stubs.o.
-
-	* ext/tcltklib/extconf.rb: use $CPPFLAGS instead of $CFLAGS.
-
-Wed Aug  9 16:31:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_callcc): thread status for continuations must be
-	  THREAD_KILLED, otherwise thread_free() breaks other threads.
-
-Wed Aug  9 13:24:25 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* win32/win32.[ch]: emulate rename(2).
-
-Tue Aug  8 14:01:46 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/tcltklib/tcltklib.c: support --enable-tcltk_stubs
-
-	* ext/tcltklib/extconf.rb: ditto.
-
-	* ext/tcltklib/stubs.c: created. examine candidate shared libraries.
-
-Mon Aug  7 13:59:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (CLONESETUP): should copy flags before any potential
-	  object allocation.
-
-	* regex.c (re_match): check for stack depth was needed.
-
-Sat Aug  5 16:43:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* djgpp/*: convert DOS line endings to UNIX style.
-
-	* djgpp/config.status: rename to config.sed for SFN.
-
-	* lib/ftools.rb (compare, safe_unlink, chmod): avoid warnings.
-
-	* lib/ftools.rb (move): typo. not `tpath', but `to'.
-
-Fri Aug  4 23:26:48 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (proc_call): gives warning if a block is supplied.
-
-	* eval.c (rb_eval): no warning for discarding if an alias for the
-	  method is already made.
-
-Fri Aug  4 16:32:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_reject_bang): returns nil if no element removed.
-
-	* hash.c (rb_hash_reject_bang): returns nil if no element removed.
-
-Thu Aug  3 19:44:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_fd_writable): should return integer value.
-
-	* array.c (rb_ary_assoc): search array element whose length is
-	  longer than 0 (not 1).
-
-Wed Aug  2 18:27:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_wait_fd): prohibit thread context switch
-	  during compilation.
-
-	* eval.c (rb_cont_call): prohibit Continuation#call across threads.
-
-Wed Aug  2 08:22:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c (rb_gc): clear malloc_memories to zero, to avoid potential
-	  super frequent GC invocation. (ruby-bugs:#PR48)
-
-	* gc.c (rb_gc): only add_heap() if GC trigger condition is
-	  satisfied.
-
-Tue Aug  1 16:41:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (proc_options): global load path setting moved from
-	  ruby_prog_init().
-
-	* ruby.c (incpush): renamed.  push path entry at the END of the
-	  load path array.  This makes -I directories sorted in order in
-	  the arguments.
-
-Sat Jul 29 23:42:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* dir.c (dir_each): should check whether dir is closed during the
-	  block execution. (ruby-bugs:#PR47)
-
-Sat Jul 29 21:57:30 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ruby.c (rubylib_mangle): provide another buffer for the result.
-
-Wed Jul 26 10:09:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: set SOLIBS to LIBS on Cygwin.
-
-	* configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'.$target_os.dll
-	  on cygwin and mingw32. ruby-cygwin.dll is bad. why?
-
-Wed Jul 26 10:04:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c (gc_sweep): avoid full scan during compilation.
-
-	* gc.c (rb_gc): add heap during no gc period (including
-	  compilation).
-
-Tue Jul 25 19:03:04 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* cygwin/GNUmakefile: use puts instead of print, because
-	  Cygwin DLL's behavior is changed(or bug?).
-
-	* configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'-$target_os.dll
-	  on cygwin and mingw32.
-
-	* cygwin/GNUmakefile: ditto.
-
-	* Makefile.in: $(SOLIBS) should be put after dmyext.@OBJEXT@.
-
-	* instruby.rb: install $(LIBRUBY) to libdir
-	  if $(LIBRUBY) != $(LIBRUBY_A_).
-
-Tue Jul 25 15:16:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_p): redirect to $defout.
-
-Mon Jul 24 18:52:55 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* win32/win32.c (win32_getenv): should remove `static'.
-
-	* ruby.c (rubylib_mangle): support "/hoge;/foo"
-
-Mon Jul 24 10:28:55 2000  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
-
-	* string.c (rb_str_count): raise exception if no argument is
-	  given.
-
-Sun Jul 23 12:55:04 2000  Dave Thomas  <Dave@Thomases.com>
-
-	* string.c (rb_str_rindex): Support negative end position.
-
-Fri Jul 21 17:35:01 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (aref_args): command_call now be permitted as
-	  aref_args.
-
-	* process.c (proc_getpriority): getpriority(2) may return valid
-	  negative number.  use errno to detect error.
-
-	* marshal.c (dump_ensure): dumped string should be tainted if
-	  any among target objects is tainted.
-
-	* marshal.c (r_regist): restored object should be tainted if and
-	  only if the source is a file or a tainted string.
-
-Wed Jul 19 15:14:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (bigdivrem): should use rb_int2big(), not rb_uint2big().
-
-Tue Jul 18 14:58:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (ruby_options): should treat SystemExit etc. properly.
-
-	* parse.y (yycompile): should check compile_for_eval, not
-	  ruby_in_eval.
-
-Mon Jul 17 04:29:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/mkmf.rb: converts extension of $objs into $OBJEXT.
-
-Sun Jul 16 03:02:34 2000  Dave Thomas <dave@thomases.com>
-
-	* lib/weakref.rb: Change to use new ObjectSpace calls.
-
-Sat Jul 15 21:59:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): should not redefine __id__ nor __send__.
-
-	* gc.c (define_final): integrate final.rb features into the
-	  interpreter.  define_finalizer and undefine_finalizer was
-	  added to ObjectSpace.  plus, add_finalizer, remove_finalizer,
-	  and call_finalizer are deprecated now.
-
-Sat Jul 15 01:32:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_mod_method): implements unbound method.
-
-	* eval.c (Init_eval): should prohibit `module_function' for class
-	  Class.
-
-Fri Jul 14 17:19:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* cygwin/GNUmakefile.in: use miniruby instead of sed.
-
-Fri Jul 14 12:49:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (argf_eof): need to check stdin, when next_p == -1.
-
-	* io.c (read_all): use io_fread() instead of fread(3).
-
-	* io.c (io_reopen): should clearerr FILE if fd < 3.
-
-	* re.c (rb_reg_match_m): the result is exported, so it should be
-	  declared as busy.
-
-	* eval.c (rb_eval): should preserve errinfo even if return, break,
-	  etc. is called in rescue clause.
-
-	* instruby.rb: install irb too.
-
-Wed Jul 12 15:32:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_const_get): constants for builtin classes must
-	  have higher priority than constants from included modules at
-	  Object class.
-
-	* bignum.c (bigdivrem): small embarrassing typo.
-
-Wed Jul 12 15:06:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): use rb_const_get_at().
-
-	* variable.c (top_const_get): retrieve toplevel constants only,
-	  not ones of Object (and its included modules) in general.
-
-Wed Jul 12 15:04:11 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb:
-	  add module Net::NetPrivate and its inner classes
-	  {Read,Write}Adapter, Command, Socket,
-	  SMTPCommand, POP3Command, APOPCommand, HTTPCommand
-
-Wed Jul 12 13:10:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (bigdivrem): defer bignorm().
-
-	* bignum.c (bignorm): accepts accidental fixnums.
-
-Tue Jul 11 16:54:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): `@<digit>' is no longer a valid instance
-	  variable name.
-
-Tue Jul 11 01:51:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (rb_big_divmod): should not use Integer(float) for
-	  the right operand.
-
-	* bignum.c (rb_big_remainder): ditto.
-
-	* bignum.c (rb_big_modulo): ditto.
-
-Mon Jul 10 15:27:16 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* io.c (pipe_finalize): should set rb_last_status when pclose().
-
-Mon Jul 10 09:07:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* error.c (rb_bug): print version number and such too.
-
-Sat Jul  8 23:08:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_start_0): should copy previous scopes to
-	  prevent rb_gc_force_recycle().
-
-Fri Jul  7 23:36:36 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/socket/addrinfo.h: move IN_EXPERIMENTAL and IN_LOOPBACKNET
-	  definitions to ext/socket/sockport.h.
-
-	* ext/socket/extconf.rb: add getservbyport() and arpa/inet.h check.
-
-	* ext/socket/getaddrinfo.c (getaddrinfo): SOCK_RAW may not be
-	  defined (ex. BeOS, Palm OS 2.x or before).
-
-	* ext/socket/getnameinfo.c (getnameinfo): getservbyport() may not
-	  exist (ex. BeOS, Palm OS).
-
-	* ext/socket/sockport.h: add IN_EXPERIMENTAL, IN_CLASSA_NSHIFT,
-	  IN_LOOPBACKNET, AF_UNSPEC, PF_UNSPEC and PF_INET.
-
-Fri Jul  7 03:30:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (aref_args): should allow Hash[:a=>2] etc.
-
-	* numeric.c (fix_aref): convert index by NUM2INT, not FIX2INT.
-	  (ruby-bugs:#PR37)
-
-	* time.c (time_localtime): should prohibit for frozen time.
-
-	* time.c (time_gmtime): ditto.
-
-Thu Jul  6 19:12:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_file_s_open): should not terminate fptr; just clear it.
-
-	* ruby.c (proc_options): should not call require_libraries()
-	  twice.
-
-	* ruby.c (require_libraries): clear req_list_head.next after
-	  execution.
-
-Thu Jul  6 13:51:57 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* object.c (rb_to_id): name may not be symbol nor fixnum.
-
-	* struct.c (rb_struct_s_def): name may be nil.
-
-Thu Jul  6 02:09:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (bigdivrem): new function to return remainder.
-
-	* numeric.c (fixdivmod): now returns modulo, not remainder.
-
-	* numeric.c (flodivmod): ditto.
-
-	* bignum.c (bigdivmod): ditto.
-
-	* numeric.c (num_modulo): new method; alias to '%'.
-
-Thu Jul  6 00:51:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* win32/win32.c (NtCmdGlob): patterns should be separated and
-	  NUL terminated.
-
-Wed Jul  5 22:27:56 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* cygwin/GNUmakefile: use ruby.def to make rubycw.dll.
-
-	* ext/extmk.rb.in: create target.def.
-
-	* lib/mkmf.rb: ditto.
-
-Wed Jul  5 09:47:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_arg): Time::local, Time::gm now take 7th optional
-	  argument for usec.
-
-	* numeric.c (num_ceil, etc): default ceil, floor, round, truncate
-	  implementation for Numeric, using `to_f'.
-
-	* io.c (rb_io_reopen): clear fptr->path after free() to prevent
-	  potential GC crash.
-
-	* io.c (rb_file_s_open): terminate fptr unless null.
-
-	* io.c (rb_file_initialize): ditto.
-
-	* lib/tempfile.rb: specify FILE::CREAT|File::EXCL to open for
-	  better security.
-
-	* numeric.c (flo_truncate): new method.
-
-Wed Jul  5 01:02:53 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/extmk.rb.in: join ' ' -> join(' ').
-
-	* lib/mkmf.rb: ditto.
-
-Tue Jul  4 13:51:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/dbm/dbm.c: add methods added to Hash in 1.5.x.
-
-	* ext/gdbm/gdbm.c: ditto.
-
-	* ext/sdbm/init.c: ditto.
-
-	* eval.c (proc_call): args may be Qundef (means no argument), do
-	  not call TYPE() for args.
-
-Tue Jul  4 13:20:56 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/extmk.rb.in: make command line must be single-quoted.
-	  $(RUBY_INSTALL_NAME) is command substitution in the POSIX sh.
-
-Tue Jul  4 13:16:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* util.c (rb_type): should add T_UNDEF.
-
-Tue Jul  4 09:30:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (here_document): supports EOF right after terminator.
-
-	* random.c (rb_f_rand): argument is now optional (rand(max=0)).
-
-Tue Jul  4 01:50:49 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* win32/ruby.def: remove ruby_mktemp.
-
-Tue Jul  4 01:27:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_rescue2): new function to rescue arbitrary exception.
-
-	* numeric.c (do_coerce): should catch NameError explicitly.
-
-Tue Jul  4 00:15:23 2000  Dave Thomas  <Dave@thomases.com>
-
-	* numeric.c (Init_Numeric): forgot to register Numeric#remainder.
-
-Mon Jul  3 23:46:56 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/win32.c (myselect, myaccept): disable interrupt while
-	  executing accept() or select() to avoid Ctrl-C causes
-	  "unknown software exception (0xc0000029)".
-
-Mon Jul  3 18:35:41 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* lib/mkmf.rb: use null device if it exists for cross-compiling.
-
-Mon Jul  3 18:19:51 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
-
-	* lib/net/protocol.rb (finish): do nothing unless active.
-
-	* lib/net/http.rb: HTTP#{get,post}2 again (for new impl).
-
-Mon Jul  3 16:47:22 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* cygwin/GNUmakefile: librubys.a -> lib$(RUBY_INSTALL_NAME)s.a
-
-	* configure.in: use AC_CANONICAL_{HOST,TARGET,BUILD}.
-
-Mon Jul  3 13:15:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (fix_divmod): x * d + m = y where d, m = x.divmod(y).
-
-	* bignum.c (rb_big_divmod): ditto.
-
-	* numeric.c (fixdivmod): does not depend C's undefined %
-	  behavior.  adopt to fmod(3m) behavior.
-
-	* numeric.c (flo_mod): modulo now reserves fmod(3m) behavior.
-
-	* numeric.c (num_remainder): 'deprecated' warning.
-
-Mon Jul  3 10:27:28 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: use AC_CANONICAL_SYSTEM.
-
-Sun Jul  2 21:17:37 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: support without --enable-shared for cygwin/mingw32.
-
-	* cygwin/GNUmakefile: ditto.
-
-	* ext/extmk.rb.in: use null device if it exists for cross-compiling.
-
-	* lib/mkmf.rb: ditto.
-
-	* util.c (ruby_mktemp): remove unused ruby_mktemp().
-
-Sun Jul  2 14:18:04 2000  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* eval.c (TMP_PROTECT_END): tmp__protect_tmp may be NULL.
-
-Sun Jul  2 03:37:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.25.
-
-	* lib/net/protocol.rb (each_crlf_line): beg = 0 is needed in adding{}
-
-	* lib/net/smtp.rb: allow String for to_addr of SMTP#sendmail
-
-Sat Jul  1 15:22:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (fix_rshift): should handle shift value more than
-	  sizeof(long).
-
-Sat Jul  1 15:22:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): the value from RTEST() is not valid Ruby
-	  object.  result should be either true or false.
-
-Sat Jul  1 09:30:06 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* re.c (rb_reg_initialize): was freeing invalid pointer.
-
-Sat Jul  1 03:25:56 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (call_args): command_call can be the last argument of
-	  call_args.  It had to be the only argument.
-
-	* re.c (rb_reg_s_quote): should not dump core even for unsane mbc
-	  string.
-
-Fri Jun 30 01:36:20 2000  Aleksi Niemela  <aleksi.niemela@cinnober.com>
-
-	* parse.y (f_norm_arg): better, nicer error message.
-
-Thu Jun 29 07:45:33 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (udp_send): destination may be packed
-	  struct sockaddr.
-
-	* object.c (rb_Integer): Integer(nil) should be invalid, on the
-	  other hand, nil.to_i is OK.
-
-Wed Jun 28 17:26:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (ip_recvfrom): udp_recvfrom and tcp_recvfrom
-	  is merged and moved to IPSocket#recvfrom.
-
-	* ext/socket/socket.c (sock_s_getaddrinfo): family can be a
-	  strings such as "AF_INET" etc.
-
-	* ruby.c (require_libraries): . and RUBYLIB added to $load_path
-	  just before -r procedure.
-
-	* ruby.c (proc_options): -e, - did not exec -r.
-
-Wed Jun 28 14:52:28 2000  Koga Youichirou <y-koga@mms.mt.nec.co.jp>
-
-	* config.sub: NetBSD/hpcmips support.
-
-Wed Jun 28 10:11:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c: gc trigger threshold changed; GC_NEWOBJ_LIMIT removed,
-	  FREE_MIN is increased to 4096.
-
-Tue Jun 27 22:39:28 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.24.
-
-	* lib/net/protocol.rb: modified each_crlf_line again.
-
-	* lib/net/protocol.rb: do_write_beg,do_write_end -> writing{}
-	  do_write_do -> do_write
-
-	* lib/net/http.rb: can make proxy connection by passing
-	  addresses to HTTP.new, start.
-
-	* lib/net/http.rb: HTTP.new_implementation, old_implementation:
-	  can use 1.2 implementation of head, get, post, put.
-	  (see document)
-
-Tue Jun 27 12:05:10 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32.c (myfdclr): new function.
-
-	* win32.h: add FD_CLR.
-
-Mon Jun 26 23:41:41 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ruby.h: add cast for ANSI style.
-
-	* gc.c (rb_data_object_alloc): use RUBY_DATA_FUNC.
-
-Mon Jun 26 22:20:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/win32.c (is_socket, extract_file_fd): New function.
-
-	* win32/win32.c (myfdopen): use is_socket().
-
-	* win32/win32.c (myselect): return non socket files immediately
-	  if file and socket handles are mixed.
-
-Mon Jun 26 16:21:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_schedule): wait_for cleared too early.
-
-Mon Jun 26 09:15:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c: remove obsolete 'F', 'D' specifiers.
-
-Sun Jun 25 00:55:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/socket/socket.c (sock_s_getnameinfo): `res' would not
-	  be assigned if TYPE(sa) == T_STRING.
-
-Sat Jun 24 14:36:29 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* config*.dj, configure.bat, top.sed: move to djgpp/.
-
-Sat Jun 24 02:34:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (load_file): call require_libraries() here to let
-	  debug.rb work properly.
-
-Fri Jun 23 22:34:51 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* bignum.c (rb_big_lshift): reorder xds assignment to avoid
-	  reusing `x' as `len' by VC++ 6.0 SP3 compiler with -Ox switch.
-
-Fri Jun 23 01:11:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_substr): should return empty string (""),
-	  if beg == str.size and len == zero, mostly for convenience and
-	  backward compatibility.
-
-	* parse.y (new_super): should tweak block_pass node for super too.
-
-	* string.c (rb_str_split_m): last split element should not be nil,
-	  but "" when limit is specified.
-
-Thu Jun 22 17:27:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_substr): str[n,m] now returns nil when n equals
-	  to str.size.
-
-Thu Jun 22 13:49:02 2000  Uechi Yasumasa <uechi@ryucom.ne.jp>
-
-	* lib/net/ftp.rb: support resuming.
-
-Thu Jun 22 13:37:19 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* eval.c (rb_thread_sleep_forever): merge pause() macro.
-
-Wed Jun 21 08:49:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): should not raise exception just by defining
-	  singleton class.
-
-Wed Jun 21 01:18:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.h: two macros RUBY_DATA_FUNC and RUBY_METHOD_FUNC are added
-	  to make writing C++ extensions easier.
-
-	* array.c (rb_ary_dup): internal classes should not be shared by dup.
-
-	* hash.c (rb_hash_dup): ditto.
-
-	* object.c (rb_obj_dup): ditto.
-
-	* string.c (rb_str_dup): ditto.
-
-	* error.c (Init_Exception): renamed NotImplementError to
-	  NotImplementedError.
-
-Tue Jun 20 16:22:38 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (make_time_t): bug in DST boundary.
-
-Tue Jun 20 10:54:19 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: add eval sitedir.
-
-Tue Jun 20 06:14:43 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: change: version syntax. old: x.yz, now: x.y.z
-
-	* lib/net/telnet.rb: ditto.
-
-Tue Jun 20 00:37:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_kcode_m): Regexp#kcode returns nil for code unfixed
-	  regexp object.
-
-	* bignum.c (bigdivmod): bignum zero check was wrong.
-
-Mon Jun 19 10:48:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_cvar_set): forgot to add security check for class
-	  variable assignment.
-
-Sun Jun 18 22:49:13 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: single quoted sitedir.
-
-	* mkconfig.rb: add DESTDIR for cross-compiling.
-
-	* lib/mkmf.rb: add DESTDIR.
-
-	* ruby.c (load_file): force binmode if fname includes ".exe"
-	  on DOSISH.
-
-Sat Jun 17 23:22:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sprintf.c (rb_f_sprintf): should ignore negative precision given
-	  by <%.*>.
-
-	* sprintf.c (rb_f_sprintf): should allow zero precision.
-
-Sat Jun 17 03:13:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_localtime): avoid unnecessary call of localtime.
-
-	* time.c (time_gmtime): avoid unnecessary call of gmtime.
-
-	* process.c (proc_wait2): new method.
-
-	* process.c (proc_waitpid): second argument made optional.
-
-	* process.c (proc_waitpid2): new method.
-
-Sat Jun 17 00:05:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_clone): should initialize member fields.
-
-Fri Jun 16 22:49:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_rewind): set lineno to zero.
-
-Fri Jun 16 22:47:47 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.23.
-
-	* lib/net/protocol.rb: too many CRLF in last line.
-
-Fri Jun 16 21:23:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: add pause(2) checking.
-
-	* eval.c: define pause() if missing.
-
-Fri Jun 16 18:41:58 2000  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* process.c (proc_setsid): BSD-style setpgrp() don't return
-	  process group ID, but 0 or -1.
-
-Fri Jun 16 16:23:35 2000  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* file.c (rb_stat_inspect): gives detailed information;
-	  compatibility with ruby-1.4.x.
-
-Fri Jun 16 05:18:45 2000  Yasuhiro Fukuma  <yasuf@bsdclub.org>
-
-	* configure.in: FreeBSD: do not link dummy libxpg4 which was
-	  merged into libc.
-
-Fri Jun 16 03:17:36 2000  Satoshi Nojo  <nojo@t-samukawa.or.jp>
-
-	* ext/dbm/dbm.c (fdbm_length): use GetDBM. empty?, [] too.
-
-	* ext/gdbm/gdbm.c (fgdbm_length): ditto.
-
-	* ext/sdbm/init.c (fsdbm_length): ditto.
-
-Fri Jun 16 01:57:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_sleep_forever): pause(2) instead of sleep(3).
-
-Thu Jun 15 10:46:36 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_sub_bang): should propagate taintness from
-	  replacement string.
-
-Wed Jun 14 17:01:41 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* rubytest.rb: add CONFIG['EXEEXT'] to the executable file name.
-
-Wed Jun 14 14:50:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_f_sub): assign to $_ only if modification happens.
-
-	* string.c (rb_f_gsub): ditto.
-
-	* string.c (rb_f_chop): ditto.
-
-	* string.c (rb_f_chomp): ditto.
-
-	* io.c (io_reopen): preserve file position by ftell/fseek, if io
-	  is a seekable.
-
-	* eval.c (method_arity): wrong arity number for the methods with
-	  optional arguments.
-
-	* time.c (make_time_t): opposite timezone shift (should be negative).
-
-Wed Jun 14 14:07:38 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* io.c: typo(ig/if).
-
-	* re.c: typo(re/reg). add rb_reg_check().
-
-	* time.c: remove unneeded declare(daylight, timezone).
-
-	* configure.in: add include <time.h> when daylight checking.
-
-Wed Jun 14 11:36:52 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* marshal.c (r_object): modified for symbols.
-
-	* marshal.c (w_object): ditto.
-
-Wed Jun 14 10:04:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_memcmp): should compare according to ruby_ignorecase.
-
-	* string.c (rb_str_cmp): use rb_memcmp.
-
-	* string.c (rb_str_index): ditto.
-
-	* string.c (rb_str_rindex): ditto.
-
-	* string.c (rb_str_each_line): ditto.
-
-Wed Jun 14 04:58:53 2000  Dave Thomas  <dave@thomases.com>
-
-	* io.c (rb_io_set_lineno): should have returned VALUE, not
-	  integer.
-
-Wed Jun 14 09:29:42 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_dup): dup should always propagate taintness.
-
-Wed Jun 14 00:50:14 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: read_multipart(): if no content body then raise EOFError.
-
-Tue Jun 13 11:46:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* process.c (proc_setsid): try implement it using setpgrp() and
-	  ioctl(fd, TIOCNOTTY, NULL).
-
-	* re.c (rb_reg_prepare_re): magic variable $= should affect regex
-	  pattern match.
-
-	* time.c (make_time_t): use tm.tm_gmtoff if possible.
-
-	* time.c (time_zone): use tm.tm_zone if available.
-
-Tue Jun 13 01:50:57 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.22.
-
-	* lib/net/http.rb: HTTPResponse#body returns body.
-
-Mon Jun 12 23:41:54 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in (daylight): avoid GCC optimization.
-
-Mon Jun 12 19:02:27 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: cygwin has strange timezone.
-
-	* time.c (time_zone): use tzname and daylight.
-
-Sat Jun 10 23:10:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_seek): whence is optional, default is SEEK_SET.
-
-Fri Jun  9 17:00:29 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.21.
-
-	* lib/net/http.rb: exception is raised with response object.
-
-Fri Jun  9 15:11:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (make_time_t): supports daylight saving time.
-
-	* eval.c (rb_thread_safe_level): should retrieve current $SAFE
-	  value if a thread is the current thread.
-
-Thu Jun  8 14:25:45 2000  Hiroshi Igarashi  <iga@ruby-lang.org>
-
-	* lib/mkmf.rb: add target `distclean' in Makefile for extlib.
-	  target `clean' doesn't remove Makefile.
-
-Thu Jun  8 13:34:03 2000  Dave Thomas  <dave@thomases.com>
-
-	* numeric.c: add nan?, infinite?, and finite? to Float
-
-Thu Jun  8 00:31:04 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* regex.h: export re_mbctab properly on cygwin.
-
-	* dln.c: use dlopen instead of LoadLibrary on cygwin.
-
-Thu Jun  8 13:41:34 2000  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* file.c (rb_file_s_basename): might dump core.
-
-Tue Jun  6 03:29:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* dir.c (dir_foreach): now returns nil for consistency.
-
-	* bignum.c (bigdivmod): modulo by small numbers was wrong.
-
-Mon Jun  5 00:18:08 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* bignum.c: avoid conflict with USHORT on mingw32.
-
-Mon Jun  5 00:13:35 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* eval.c (rb_thread_schedule): =/== typo.
-
-Sun Jun  4 03:17:36 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: improve: CGI::pretty()
-
-Sun Jun  4 02:01:10 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* lib/mkmf.rb: do not need to add -L$(topdir) in --enable-shared case.
-
-Sat Jun  3 13:50:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (rb_id2name): should support constant attrset
-	  identifiers.
-
-	* bignum.c (rb_big_eq): Bignum#== should not raise exception.
-
-Fri Jun  2 11:24:48 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_popen): open with a block returns the value from the
-	  block.  old behavior was back.
-
-Fri Jun  2 00:42:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-
-	* eval.c (rb_thread_cleanup): should clear priority for thread
-	  termination.
-
-Thu Jun  1 22:39:41 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.20.
-
-	* lib/net/http.rb: wrongly closed the socket twice
-	  when no Content-Length: was given.
-
-Thu Jun  1 00:59:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_yield_0): convert Qundef to [].
-
-Wed May 31 20:45:59 2000  Dave Thomas  <Dave@Thomases.com>
-
-	* string.c (rb_str_slice_bang): wrong argument number.
-
-Wed May 31 12:37:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_exec_end_proc): print error message from END procs.
-
-Wed May 31 04:06:41 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: change: CGI#out() if "HEAD" == REQUEST_METHOD then
-	  output only HTTP header.
-
-Wed May 31 01:54:21 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_schedule): set main_thread->status to
-	  THREAD_TO_KILL, before raising deadlock error.
-
-	* eval.c (rb_thread_deadlock): if curr_thread == main_thread, do
-	  not call rb_thread_restore_context()
-
-Tue May 30 23:33:41 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* lib/mkmf.rb (create_makefile): add $(TARGET).ilk and *.pdb
-	  to cleanup files for mswin32.
-
-Mon May 29 10:41:10 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (rb_file_s_basename): should propagate taintness.
-
-Sun May 28 21:37:13 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* eval.c: bug fix: DLEXT2.
-
-Sun May 28 19:21:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* win32/win32.c: use ruby's glob.
-
-	* dir.c: "glob" exported and renamed to "rb_glob".
-
-	* ruby.h: ditto.
-
-	* main.c: turn off command line mingw32's globbing.
-
-Wed May 25 22:25:13 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/extmk.rb.in: use "ftools" instead of "rm -f".
-
-	* lib/mkmf.rb: ditto.
-
-Thu May 25 22:01:32 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* defines.h: mswin32: remove obsolete USHORT definition.
-
-	* re.h: mswin32: use EXTERN instead of extern.
-
-	* regex.h: mswin32: export re_mbctab properly.
-
-	* win32/ruby.def: add ruby_ignorecase and regex.c's exports.
-
-Thu May 25 21:28:44 2000  Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
-	* re.c (rb_reg_expr_str): escape un-printable character.
-
-Thu May 25 01:35:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (tokadd_escape): forgot to add `\x' to hexadecimal
-	  escape sequences.
-
-	* object.c (rb_obj_dup): dup for normal object (T_OBJECT) copies
-	  instance variables only.
-
-Wed May 24 23:49:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (rb_mod_initialize): should provide initialize.
-
-Wed May 24 23:17:50 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/Makefile: remove unnecessary mv and rm command call.
-
-Wed May 24 21:01:04 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/pty/pty.c: use "" instead of <> to include ruby.h and rubyio.h
-	  for BeOS (PowerPC).
-
-	* file.c (rb_find_file): should check dln_find_file() result.
-
-	* win32/ruby.def: add rb_block_given_p.
-
-Wed May 24 16:32:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_popen): popen does not take 3rd argument anymore.
-
-	* re.c (rb_reg_desc): re may be zero, check before dereferencing.
-
-Wed May 24 16:03:06 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/cgi.rb: bug fix: CGI::escape(), CGI::Cookie::new()
-
-	* lib/net/telnet.rb: improve: binmode(), telnetmode() interface
-
-Wed May 24 13:12:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* misc/ruby-mode.el (ruby-parse-region): support `while .. do'
-	  etc. But corresponding keywords must be at the beginning of
-	  line.
-
-Tue May 23 23:50:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_initialize_m): wrong kcode value.
-
-	* re.c (rb_reg_s_new): forgot to initialize re->ptr.
-
-Tue May 23 08:36:24 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): forgot to restore old option
-	  status by (?ix-ix).
-
-	* regex.c (re_compile_fastmap): anychar may match newline if
-	  RE_OPTION_MULTILINE or RE_OPTION_POSIXLINE is set.
-
-Mon May 22 22:45:06 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.19.
-
-	* lib/net/http.rb: do not use Regexp "p" option.
-
-Mon May 22 21:56:43 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* struct.c (rb_struct_getmember): should use ID2SYM, not INT2NUM.
-
-Mon May 22 15:07:37 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (rb_find_file): should check if the file really exists.
-
-Mon May 22 09:08:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_popen): _exit(0) after processing block under the
-	  child process.
-
-	* io.c (rb_io_popen): flush stdout/stderr before subprocess
-	  termination.
-
-	* eval.c (rb_check_safe_str): insert rb_secure(4); operation
-	  requires untainted string should be prohibited in level 4.
-
-Sun May 21 21:17:00 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: add Setup.dj for djgpp cross-compiling.
-
-	* Setup.dj: add readline.
-
-	* instruby.rb: copy win32/win32.h to archlibdir on mingw32.
-
-Sun May 21 20:58:08 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* pack.c: fix OFF16 and OFF32 definitions for Alpha and IRIX64.
-
-Sun May 21 17:31:37 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* instruby.rb: support "make install" for cross-compiling.
-
-	* ext/extmk.rb.in: ditto.
-
-Sun May 21 14:22:49 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* Makefile.in: rename prep.rb to fake.rb.
-
-	* configure.in: ditto.
-
-Sat May 20 23:29:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* dir.c (dir_s_new): does not take block; "open" does.
-
-	* io.c (rb_io_s_new): ditto.
-
-Fri May 19 07:44:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* dir.c (dir_s_open): Dir#open does not returns closed Dir if a
-	  block is given to the method.
-
-	* re.c (rb_reg_initialize_m): Regexp::new calls initialize now.
-
-	* string.c (Init_String): String#delete_at removed.
-
-	* string.c (rb_str_aset_m): should have checked argc != 2.
-
-	* eval.c (rb_thread_schedule): select(2) was called too many.
-
-	* regex.c (re_compile_pattern): a bug in (?m) support.  Pointed
-	  out by Dave Thomas <Dave@thomases.com>.
-
-Thu May 18 23:55:26 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* dln.c (search_undef): st_lookup()'s 3rd parameter should be
-	  a pointer of the variable which has the same size and alignment
-	  as `char *'.
-
-	* marshal.c (w_symbol, w_object): ditto.
-
-	* parse.y (rb_intern): ditto.
-
-Thu May 18 18:00:35 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.18.
-
-	* lib/net/protocol.rb: Net::Version was removed.
-
-	* lib/net/smtp.rb: use Socket.gethostname to get local host name.
-
-Thu May 18 13:34:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (ruby_connect): should not have replaced
-	  thread_write_select() by rb_thread_fd_writable().
-
-Thu May 18 09:01:25 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* configure.in, ext/extmk.rb.in, lib/mkmf.rb: remove BeOS R3 support.
-	  Make a shared library (libruby.so) only if the --enable-shared
-	  option is specified.
-
-	* instruby.rb: no longer use libruby.so.LIB and import.h.
-
-	* io.c: fix READ_DATA_PENDING definition for BeOS (PowerPC).
-
-Wed May 17 14:14:23 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_new_1): use /m instead of /p.
-
-Wed May 17 02:22:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_polling): wait 0.06 second to let other
-	  processes run.
-
-	* process.c (rb_waitpid): avoid busy wait using rb_thread_polling.
-
-	* file.c (rb_thread_flock): ditto.
-
-	* parse.y (expr): avoid calling value_expr() twice.
-
-Wed May 17 00:45:57 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* io.c (rb_io_binmode): should check PLATFORMs, not O_BINARY, sigh...
-
-Wed May 17 00:40:15 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/config.h: add DLEXT2, now DLEXT on mswin32 is "so".
-
-	* win32/config.status: ditto.
-
-	* win32/ruby.def: add symbol "rb_big_divmod".
-
-Tue May 16 19:45:32 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* intern.h: use EXTERN instead of extern.
-
-	* win32/ruby.def: add rb_defout, rb_stdout, ruby_errinfo,
-	  ruby_sourceline, ruby_sourcefile to work with eruby
-	  reported by Hiroshi Saito <HiroshiSaito@pob.org>.
-	  Export both ruby_xmalloc and xmalloc etc.
-
-Tue May 16 17:00:05 2000  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
-
-	* eval.c (rb_thread_select): should check whether fds are null.
-
-Tue May 16 11:51:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (pipe_open): synchronize subprocess stdout/stderr.
-
-Mon May 15 15:38:09 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.h: exported symbols should be for xmalloc etc. are now
-	  prefixed by 'ruby_', e.g. ruby_xmalloc().
-
-	* eval.c (rb_thread_select): remove busy wait for select.
-
-	* dir.c (glob): trailing path may be null, e.g. glob("**").
-
-Mon May 15 14:48:41 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* io.c (rb_io_pid): new method; returns nil if no process attached
-	  to the IO.
-
-Mon May 15 01:18:20 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_s_popen): _exit after Proc execution.
-
-Sun May 14 18:05:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* Makefile.in: missing/nt.c -> win32/win32.c
-
-	* configure.in: bug fix; static linking on mingw32.
-
-	* cygwin/GNUmakefile.in: remove VPATH.
-
-	* ext/extmk.rb.in: Makefile set binmode with mingw32 on cygwin32.
-
-	* lib/mkmf.rb: ditto.
-
-	* win32/config.h: undef HAVE_SYS_FILE_H.
-
-Sun May 14 02:02:48 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* lib/irb/ruby-lex.rb: '/' should be escaped in character class.
-
-Sun May 14 00:54:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in, ...: support mingw32.
-
-	* defines.h: ditto. undef EXTERN for tcl/tk on cygwin.
-
-	* ext/*/extconf.rb: replace PLATFORM with RUBY_PLATFORM.
-
-	* ext/socket/sockport.h: define IN_MULTICAST for missing IN_MULTICAST.
-
-	* ext/tcltklib/tcltklib.c: remove declaration of rb_argv0.
-
-	* file.c: should check S_IXGRP, S_ISGID, not NT.
-
-	* io.c (rb_io_binmode): should check _IOBIN, O_BINARY, not PLATFORMs.
-
-Sat May 13 14:21:15 2000  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* io.c (rb_io_s_popen): should check whether a block is given.
-
-Fri May 12 17:33:44 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): charset_not should not exclude
-	  newline from matching set.
-
-Thu May 11 22:51:05 2000  Ryunosuke Ohshima  <ryu@jaist.ac.jp>
-
-	* pack.c (pack_pack): Bignum support.
-
-	* pack.c (pack_unpack): ditto.
-
-Thu May 11 21:19:29 2000  Hiroshi Igarashi  <iga@ruby-lang.org>
-
-	* intern.h: add missing declarations of ruby API functions.
-
-	* ruby.h: fix function name in declarations.
-
-Thu May 11 22:29:25 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/md5/depend: add $(topdir)/config.h dependency to md5c.o.
-
-	* ext/md5/extconf.rb: new file to add -DHAVE_CONFIG_H flag for Alpha.
-
-Thu May 11 10:55:52 2000  Ryunosuke Ohshima  <ryu@jaist.ac.jp>
-
-	* pack.c (pack_pack): packing BER compressed integer by `w'.
-
-	* pack.c (pack_unpack): unpacking BER.
-
-Thu May 11 00:37:55 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (parse_regx): remove in_brack.
-
-Wed May 10 12:51:18 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (proc_options): move adding RUBYLIB and "." to the load
-	  path after #! line parsing.
-
-	* parse.y (parse_regx): should parse backslash escape like `\c['
-	  here to avoid causing `unterminated regexp' error.
-
-Wed May 10 00:19:53 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* MANIFEST, beos/GNUmakefile.in, configure.in: no longer need
-	  beos/GNUmakefile.in to support BeOS R4.5.2 (Intel) as a result
-	  of eban's Makefile.in change.
-
-	* io.c: NOFILE is already defined on BeOS R4.5 (Intel) or later.
-
-	* lib/matrix.rb: remove debug print.
-
-	* regex.c: don't use nested comment.
-
-Tue May  9 17:08:43 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (massign): no longer convert nil into empty array.
-
-	* io.c (rb_io_s_popen): optional 3rd argument to give proc, which
-	  will be executed in spawned child process.
-
-Mon May  8 23:47:39 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* eval.c (rb_callcc): prev & next should be initialized to zero.
-
-Mon May  8 23:17:36 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* dln.c (dln_init): remove possible buffer overrun.  This is
-	  suggested by Aleksi Niemela <aleksi.niemela@cinnober.com>.
-
-	* dln.c (init_funcname): ditto.
-
-Sat May  6 23:35:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (lhs): should allow `obj.Attr = 5' type expression.
-
-Sat May  6 15:46:08 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/socket/extconf.rb: add a new configure option to force use
-	  of the WIDE Project's getaddrinfo(): --enbale-wide-getaddrinfo.
-
-Fri May  5 21:19:22 2000  MOROHOSHI Akihiko  <moro@remus.dti.ne.jp>
-
-	* parse.y (yylex): allow '$1foo' and such.
-
-Fri May  5 17:57:24 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.17.
-
-	* lib/net/http.rb: write also port number in Host: field.
-
-	* lib/net/http.rb: see Proxy-Connection: to decide socket connection.
-
-Fri May  5 03:25:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_fastmap): charset_not for multibyte
-	  characters excluded too many characters.
-
-Tue May  2 13:23:43 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_schedule): little bit more impartial context
-	  switching.
-
-Tue May  2 09:50:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* configure.in: add DLDLIBS to set platform specific library
-	  for extensions.
-
-	* ext/extmk.rb.in: use @DLDLIBS@ instead of RUBY_PLATFORM choice.
-
-	* lib/mkmf.rb: use CONFIG["DLDLIBS"] instead of RUBY_PLATFORM choice.
-
-	* config_s.dj: add @DLDLIBS@.
-
-	* win32/config.status: ditto.
-
-	* win32/ruby.def: regular maintenance.
-
-Mon May  1 23:42:44 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in, eval.c: add DLEXT2. now DLEXT on Cygwin is "so".
-
-	* defines.h: use dllimport, dllexport for Cygwin 1.1.x.
-
-	* ruby.h: ditto.
-
-	* cygwin/GNUmakefile.in: ditto.
-
-	* ext/Win32API/Win32API.c: directly "call" in asm statement for
-	  gcc 2.95.x or newer.
-
-Sat Apr 29 04:58:12 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* array.c (rb_ary_unshift_m): performance improvement.
-
-Fri Apr 28 00:19:22 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* array.c (rb_ary_unshift_m): takes items to push.
-
-Wed Apr 26 15:23:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_succ): insert carrying character just before
-	  the leftmost alpha numeric character.
-
-	* string.c (rb_str_succ): proper behavior for "".succ and "\377".succ.
-
-	* string.c (rb_str_succ): use realloc and memmove.
-
-Tue Apr 25 18:28:45 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.16.
-
-	* lib/net/smtp.rb: add SMTP AUTH
-
-Tue Apr 25 14:30:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_gets_internal): shortcut when rs == rb_default_rs.
-
-Sat Apr 22 23:14:41 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
-
-	* configure.in: MacOS X support.
-
-Sat Apr 22 16:37:10 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.15.
-
-	* lib/net/http.rb:  closing socket by watching both
-	  user header and server response
-
-Fri Apr 21 21:44:34 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* io.c (rb_io_s_pipe): should set FMODE_SYNC.
-
-Thu Apr 20 16:59:22 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (massign): `*lvalue = false' should assign `[false]' to
-	  lvalue.
-
-Wed Apr 19 08:35:08 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (rb_singleton_class): generate singleton class for
-	  special constants: nil, true, false.
-
-Wed Apr 19 02:09:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (rb_singleton_class): singleton method for nil, true,
-	  false is possible now.
-
-	* eval.c (rb_eval): ditto.
-
-Tue Apr 18 18:54:25 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.14.
-
-	* lib/net/http.rb: new method HTTP#head2.
-
-	* lib/net/http.rb: get2/post2 does not raise exceptions.
-
-Mon Apr 17 15:16:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_close): to detect some exceptional status, writable
-	  IO should be flushed before close;
-
-Sat Apr 15 18:29:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_collect_bang): Array#filter renamed.
-
-Fri Apr 14 19:47:11 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.13.
-
-	* lib/net/pop.rb: accept illegal timestamp
-
-	* lib/net/http.rb: when body was chunked, does not set Content-Length:
-
-Tue Apr 11 21:14:42 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* config_s.dj: add @sitedir@.
-	* configure.in: add --with-sitedir=DIR option.
-	* instruby.rb: use CONFIG["sitedir"].
-	* lib/mkmf.rb: support 'make site-install'.
-	* win32/config.status: add @sitedir@.
-
-Tue Apr 11 16:25:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (rb_big_2comp): unnecessary lvalue cast removed.
-
-Tue Apr 11 02:25:53 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (env_fetch): new method.
-
-	* marshal.c (marshal_dump): accepts depth = nil for unlimited depth.
-
-Sun Apr  9 20:49:19 2000  Dave Thomas  <Dave@Thomases.com>
-
-	* parse.y (str_extend): Allow class variables to be expanded.
-
-Fri Apr  7 02:03:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* error.c (rb_sys_fail): escape non-printable characters.
-
-Thu Apr  6 20:10:47 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/extmk.rb.in (create_makefile): BeOS --program-suffix support.
-	* lib/mkmf.rb (create_makefile): ditto.
-
-Thu Apr  6 09:55:26 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* error.c (rb_sys_fail): need rb_exc_new2() call on BeOS.
-
-Mon Apr  3 17:22:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_reopen): support tempfile.
-
-	* eval.c (catch_i): should supply argument.
-
-Sat Apr  1 22:50:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c (r_object): wrong symbol restoration.
-
-Sat Apr  1 21:30:53 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* io.c (rb_io_printf, rb_f_printf): should use rb_io_write.
-
-Sat Apr  1 00:16:05 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c (rb_gc_call_finalizer_at_exit): should be clear flags
-	  before calling finalizers.
-
-	* eval.c (specific_eval): can be called without SecurityError, if
-	  $SAFE >= 4.
-
-	* object.c (sym_inspect): inspect gives ":sym", to_s gives "sym".
-
-Fri Mar 31 22:07:04 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.12.
-
-	* lib/net/protocol.rb:  update Net::Protocol::Proxy#connect
-
-	* lib/net/protocol.rb:  ReplyCode is not a class
-
-	* lib/net/http.rb: header value format was change:
-	  values do not include header name
-
-	* lib/net/http.rb: header is not a Hash, but HTTPResponse
-
-Thu Mar 30 12:19:44 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* enum.c (enum_find): rb_eval_cmd() should be called with array.
-
-Tue Mar 28 13:57:05 2000  Clemens Hintze  <c.hintze@gmx.net>
-
-	* ext/dbm/dbm.c (fdbm_invert): should return new hash.
-
-	* ext/gdbm/gdbm.c (fgdbm_invert): ditto.
-
-Tue Mar 28 00:58:03 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.11.
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: does not
-	  dispatch any commands while dispatching command.
-
-	* lib/net/protocol.rb: failed to get error class of
-	  inherited ReplyCode
-
-	* lib/net/http.rb: change feature of "get2", "post2"
-
-Mon Mar 27 01:34:58 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.10.
-
-	* lib/net/http.rb: return value of 'head' was wrong.
-
-Sun Mar 26 17:47:35 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.9.
-
-	* lib/net/smtp.rb: SMTP#do_ready wrongly took no arguments
-
-Sat Mar 25 23:21:10 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c (w_object): symbols should be converted to ID before
-	  dumping out.
-
-Fri Mar 24 18:26:51 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (test_check): should have checked exact number of arguments.
-
-Fri Mar 24 21:02:11 2000  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* signal.c (trap): should treat some symbols as the signal.
-
-Fri Mar 24 06:58:03 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.8.
-
-	* lib/net/http.rb:  post, get2, post2, get_body
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: separate
-	  Command/Socket documentation.
-
-Thu Mar 23 02:26:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_fptr_finalize): fptr may be null.
-
-	* io.c (rb_io_s_new): now calls `initialize'.
-
-	* io.c (rb_io_initialize): actual open done in this method.
-
-	* io.c (rb_file_initialize): ditto.
-
-	* eval.c (rb_eval): class variables in singleton class definition
-	  is now handled properly (I hope).
-
-Wed Mar 22 21:49:36 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* st.c (st_delete_safe): skip already deleted entry.
-
-	* hash.c (rb_hash_delete): modify brace miss.
-
-Wed Mar 22 08:53:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (exec_under): do not push cbase if ruby_cbase == under.
-
-	* node.h (NEW_CREF0): preserve cbase nesting.
-
-Tue Mar 21 12:57:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (rb_class_s_new): Class::new should call `inherited'.
-
-Sat Mar 18 12:36:09 2000  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* eval.c (rb_backtrace, make_backtrace): removed unused variable
-	  `lev'.
-
-	* eval.c (rb_attr): calls `method_added' at attribute definition.
-
-	* eval.c (rb_mod_modfunc): calls `singleton_method_added' while
-	  `module_function'.
-
-	* eval.c (rb_eval): parameter to `method_added' and
-	  `singleton_method_added' is Symbol.
-
-	* eval.c (Init_eval): caches IDs for `method_added' and
-	  `singleton_method_added'.
-
-Sat Mar 18 11:25:10 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (rescue): allows `rescue Error in foo'.  experimental.
-	  which is better this or preparing alias `exception' for `$!'?
-
-Fri Mar 17 15:02:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_autoload_id): defining new autoload should be
-	  prohibited for $SAFE > 4.
-
-	* variable.c (rb_autoload_load): autoload should be possible for
-	  $SAFE > 4.
-
-	* eval.c (call_trace_func): should handle T_ICLASS properly.
-
-Fri Mar 17 14:34:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_gsub): forgot to initialize str->orig.
-
-Fri Mar 17 01:24:59 2000  Dave Thomas  <Dave@thomases.com>
-
-	* string.c (rb_str_clone): forgot to copy str->orig if STR_NO_ORIG
-	  is set by Array#pack.
-
-Wed Mar 15 21:25:04 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* array.c (rb_ary_join): 'result' is always duplicated
-	  before concat string.
-
-Wed Mar 15 17:26:05 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (rb_hash_s_create): unexpected recursive call removed.
-	  this bug was found by Satoshi Nojo <nojo@t-samukawa.or.jp>.
-
-Wed Mar 15 13:12:39 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (Init_Thread): Thread.join removed finally.
-
-	* string.c (rb_str_chomp_bang): forgot to call rb_str_modify().
-
-Mon Mar 13 16:12:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (block_pass): distinguish real orphan block and still
-	  on-stack block passed by block argument.
-
-Mon Mar 13 00:20:25 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (f_norm_arg): proper error message when constant comes
-	  in formal argument list.  this message is suggested by Muvaw
-	  Pnazte <bugathlon@yahoo.com>.
-
-	* eval.c (rb_f_raise): proper error message when the first
-	  argument is not an exception class/object.
-
-	* string.c (rb_str_dup): dup now postpone buffer copy as long as
-	  possible.  performance improved by lazy copying.
-
-Sun Mar 12 13:58:52 2000  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* signal.c (rb_f_kill): should treat some symbols as the signal.
-
-Sat Mar 11 22:03:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_gsub): performance tune by avoiding buffer copy.
-
-	* eval.c (rb_f_missing): check if argv[0] is ID.
-
-Sat Mar 11 15:49:41 2000  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* struct.c (rb_struct_aref): struct aref by symbol.
-
-Sat Mar 11 05:07:11 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* process.c (proc_setpriority): should return 0, not nil.
-
-	* process.c (proc_setpgid): ditto.
-
-Fri Mar 10 18:14:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (path_check_1): confusing buf and path.  this bug found
-	  by <decoux@moulon.inra.fr>.
-
-Fri Mar 10 09:37:49 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* MANIFEST: add beos/GNUmakefile.in.
-	* configure.in: support BeOS R4.5.2 (Intel).
-	* beos/GNUmakefile.in: new file to support BeOS R4.5.2 (Intel).
-
-Thu Mar  9 11:13:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_fastmap): fixed embarrassing brace bug.
-
-Thu Mar  9 01:36:32 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* missing/flock.c: emulate missing flock() with fcntl().
-
-Thu Mar  9 00:29:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (sym_to_s): returns ":sym".
-
-	* object.c (sym_id2name): separated from to_s; returns "sym".
-
-Wed Mar  8 19:16:19 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.7.
-
-	* lib/net/http.rb (connecting): returns header
-
-Wed Mar  8 02:08:43 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y: escape expansion too early.
-
-	* string.c (rb_f_scan): Kernel#scan added.
-
-	* regex.c (re_compile_pattern): support \cX et al.
-
-Tue Mar  7 01:44:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (set_stdin): simplified procedure, allows $stdin = DATA;
-	  experimental.
-
-	* io.c (set_outfile): ditto.
-
-	* re.c (Init_Regexp): new method Regexp#last_match added; it's an
-	  alternative for $~.
-
-	* configure.in (DEFAULT_KCODE): KCODE_NONE should be the default.
-
-	* dir.c (dir_s_rmdir): should return 0 on success.
-
-	* signal.c: remove CWGUSI support.
-
-Mon Mar  6 12:28:37 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c (w_symbol): support symbol object.
-
-	* util.c: make symbol as separated class.
-
-	* error.c (Init_Exception): new exception RangeError.
-
-	* ext/socket/socket.c (ip_addrsetup): should check length of hostname.
-
-	* ext/socket/socket.c (ip_addrsetup): check newline at the end of
-	  hostname.  These fixes suggested by Muvaw Pnazte <bugathlon@yahoo.com>.
-
-Sun Mar  5 20:35:45 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/Win32API/Win32API.c (Win32API_initialize): should call
-	  LoadLibrary() everytime and should assign the hdll to Win32API
-	  object(protect the hdll from GC).
-
-Sun Mar  5 18:49:06 2000  Nakada.Nobuyoshi  <nobu.nokada@softhome.net>
-
-	* misc/ruby-mode.el (ruby-parse-region): not treat method `begin'
-	  and `end' as reserved words.
-
-	* misc/ruby-mode.el (ruby-font-lock-docs): ignore after `=begin'
-	  and `=end'.
-
-	* misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
-	  added `yield' to keywords.
-
-	* misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
-	  matches keywords at end of buffer.
-
-Sun Mar  5 18:08:53 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.6.
-
-	* lib/net/http.rb:  allow to omit 'start'
-
-Tue Feb 29 01:08:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* range.c (range_initialize): initialization done in `initialize';
-	  `initialize' should not be called more than once.
-
-	* object.c (Init_Object): default `initialize' should take zero
-	  argument.
-
-	* time.c (time_s_new): call `initialize' in Time::new.
-
-Sat Feb 26 22:39:31 2000  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* string.c (rb_str_times): fix String#* with huge string.
-
-Sat Feb 26 00:14:59 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* dir.c (dir_s_new): call `initialize' in Dir::new.
-
-Fri Feb 25 23:01:49 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ruby.h: export ruby_safe_level by EXTERN for mswin32.
-	* win32/ruby.def: regular maintenance.
-
-Fri Feb 25 22:12:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_reopen): IO#reopen should accept path as well.
-
-	* string.c (rb_str_s_new): call `initialize' in String::new.
-
-	* hash.c (rb_hash_s_new): call `initialize' in Hash::new.
-
-	* array.c (rb_ary_s_new): call `initialize' in Array::new.
-
-Fri Feb 25 12:50:20 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_start_timer): interval changed to 10ms from 50ms.
-
-Fri Feb 25 06:42:26 2000  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/socket/socket.c (ip_addrsetup): hostp should remain NULL if
-	  host is nil.
-
-Thu Feb 24 16:53:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_schedule): priority check for sleep expired
-	  threads needed.
-
-Wed Feb 23 14:22:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_join): forgot to initialize a local variable
-	  `taint'.
-
-Tue Feb 22 07:40:55 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (Init_Regexp): renamed to MatchData, old name MatchingData
-	  remain as alias.
-
-Tue Feb 22 00:20:21 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.5.
-
-	* lib/net/session.rb: rename to protocol.rb
-
-	* lib/net/protocol.rb: ProtocolSocket -> Net::Socket
-
-	* lib/net/protocol.rb: Net::Socket#write, write_pendstr
-	  can take block
-
-	* lib/net/smtp.rb: new methods SMTP#ready SMTPCommand#write_mail
-
-	* lib/net/pop.rb: POPMail#pop can take block
-
-Sat Feb 19 23:58:51 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): pop_loop should not pop at forward jump.
-
-Fri Feb 18 17:15:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (method_clone): method objects are now clonable.
-
-Fri Feb 18 00:27:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_shared_variable_declare): shared variable (aka
-	  class/module variable) introduced.  prefix `@@'. experimental.
-
-	* class.c (rb_scan_args): new format char '&'.
-
-Thu Feb 17 19:09:05 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/win32.c (mypopen): don't close handle if it is not assigned.
-	* win32/win32.c (my_open_osfhandle): support O_NOINHERIT flag.
-	* win32/win32.c (win32_getcwd): rename getcwd to win32_getcwd
-	  in order to avoid using the C/C++ runtime DLL's getcwd.
-	  Use CharNext() to process directory name.
-	* win32/win32.h: map getcwd to win32_getcwd.
-
-Wed Feb 16 00:32:49 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (method_arity): nd_rest is -1 for no rest argument.
-
-	* process.c (proc_waitpid): returns nil when waitpid(2) returns 0.
-
-Tue Feb 15 01:47:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* process.c (rb_f_waitpid): pid_t should be signed.
-
-Mon Feb 14 13:59:01 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): yylex yields wrong tokens for `:foo=~expr'.
-
-	* ruby.c (load_file): exit if reading file is empty.
-
-Mon Feb 14 03:34:52 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): `foo.bar=1' should be <foo><.><bar><=><1>,
-	  not <foo><.><bar=><1>.
-
-	* eval.c (rb_thread_restore_context): process according to
-	  RESTORE_* is moved after longjmp().
-
-	* eval.c (thread_switch): new function to process RESTORE_*.
-
-Sun Feb 13 16:19:49 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ruby.c (require_libraries): don't access freed memory.
-
-	* ruby.c (add_modules): ditto.
-
-Fri Feb 11 12:06:22 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (parse_quotedwords): %w() need to split not only by mere
-	  spaces, but by all whitespaces.
-
-Thu Feb 10 02:12:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_index_m): did not support negative offset.
-
-Wed Feb  9 21:54:26 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/socket/getaddrinfo.c: gcc --traditional support.
-	  Rearrange headers to work AC_C_CONST.
-	* ext/socket/getnameinfo.c: ditto.
-	* ext/socket/socket.c: mswin32: use double instead of long long.
-
-Wed Feb  9 16:30:41 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (num_coerce): should return [y, x].
-
-Wed Feb  9 11:07:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (ruby_prog_init): loadpath structure changed.
-
-Tue Feb  8 02:07:33 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_search): optimize for \G at top.
-
-	* regex.c (re_compile_pattern): \G introduced.
-
-	* regex.c (re_match): ditto.
-
-	* string.c (str_sub_bang): old behavior restored: bang method
-	  returns nil if string not changed.
-
-	* regex.c (re_compile_pattern): support independent subexpression
-	  `(?>pattern)'.
-
-	* regex.c (re_match): ditto.
-
-Mon Feb  7 15:51:08 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): now understands interrupts under Ruby.
-
-Mon Feb  7 07:51:52 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_uniq_bang): always return an Array.
-
-	* array.c (rb_ary_compact_bang): ditto.
-
-	* array.c (rb_ary_flatten_bang): ditto.
-
-	* hash.c (rb_hash_reject): returns a Hash, not an Array.
-
-	* hash.c (env_reject): ditto.
-
-Fri Feb  4 10:20:25 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (scan_once): scan now leaves information about the last
-	  successful pattern match in $&.
-
-	* io.c (rb_io_close): should not check closed IO.
-
-Fri Feb  4 05:44:01 2000  Kentaro Inagaki  <inagaki@tg.rim.or.jp>
-
-	* ext/socket/socket.c (s_recv): TRAP_BEG after retry entry.
-
-Wed Feb  2 22:33:45 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (rb_thread_start): receives argument from outside, like
-	  `Thread::start(1,2,3){|a,b,c| ... }'.
-
-Wed Feb  2 22:14:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_regsub): should check regs->num_regs.
-
-	* re.c (rb_reg_search): remove matchcache, use static struct
-	  re_register instead.
-
-	* re.c (match_getter): avoid cloning match data.
-
-Wed Feb  2 17:12:15 2000  Dave Thomas  <Dave@Thomases.com>
-
-	* samples/eval.rb: Rescue new ScriptError exception
-
-Wed Feb  2 02:06:07 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_gsub_bang): gsub! now leaves information about the
-	  last successful pattern match in $&.
-
-Mon Jan 31 15:24:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_sub_bang): bang method returns string always.
-	  experimental.
-
-Sun Jan 30 17:58:09 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* eval.c: arrange to use setitimer(2) for BOW, DJGPP
-
-	* defines.h: ditto. use random(3) on cygwin b20.1.
-
-Sun Jan 30 17:20:16 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* eval.c: use getrlimit(2) on DJGPP.
-
-Thu Jan 27 01:27:10 2000  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
-
-	* dir.c (glob): glob pattern "/*" did not match.
-
-Wed Jan 26 22:30:47 2000  Shigeo Kobayashi  <shigeo@tinyforest.gr.jp>
-
-	* numeric.c (flo_modulo): wrong result for negative modulo.
-
-Wed Jan 26 02:01:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (test_c): should use S_ISCHR.
-
-	* file.c (rb_stat_c): ditto.
-
-	* string.c (rb_str_each_line): should propagate tainting.
-
-Tue Jan 25 04:01:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (rb_obj_freeze): all objects made freezable.
-
-Tue Jan 25 00:37:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: use AC_CHECK_TOOL for cross compiling.
-
-Mon Jan 24 19:01:54 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* array.c (rb_protect_inspect): should be checked by id of
-	  objects; not by object themselves.
-
-Mon Jan 24 18:48:08 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* eval.c (rb_eval): too many warnings;  warned on every method
-	  overriding.  should be on method discarding.
-
-Mon Jan 24 02:56:44 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): -2.abs should be `(-2).abs' to accomplish the
-	  principle of less surprise.  `+2' too.
-
-	* eval.c (rb_eval): when defining class is already there, and
-	  superclass differ, throw away the old class.
-
-	* variable.c (rb_const_set): gives warning again on constant
-	  redefinition.
-
-	* error.c (Init_Exception): SyntaxError, NameError, LoadError and
-	  NotImplementError are subclasses of ScriptError<Exception, not
-	  StandardError.  experimental.
-
-Sat Jan 22 00:00:41 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (parse_quotedwords): no longer use `String#split'.
-	  and enable space escape within quoted word list.
-	  e.g. %w(a\ b\ c abc) => ["a b c", "abc"].
-
-	* string.c (rb_str_slice_bang): new method `slice!'.
-
-Fri Jan 21 21:56:08 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.4.
-
-	* lib/net/http.rb: can receive messages which have
-	  no Content-Length:.
-
-Fri Jan 21 16:15:59 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (thgroup_s_new): new class ThreadGroup.
-
-Tue Jan 18 12:24:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* struct.c (Init_Struct): remove Struct's own hash and eql?.
-
-Sat Jan 15 22:21:08 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* eval.c (search_method): argument klass may be 0.
-
-Sat Jan 15 15:03:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* enum.c (enum_index): remove this method.
-
-	* enum.c: remove use of pointers to local variables. find,
-	  find_all, min, max, index, member?, each_with_index,
-
-	* eval.c (massign): multiple assignment does not use to_a anymore.
-	  experimental.
-
-Fri Jan 14 12:22:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_replace): use memmove instead of memcpy for
-	  overwrapping strings (e.g. a[1] = a).
-
-Thu Jan 13 11:12:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (arg_add): use new node, ARGSPUSH.
-
-Mon Jan 10 18:32:28 2000  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* marshal.c (w_object): forgot an argument to call w_ivar().
-
-Sun Jan  9 18:13:51 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* random.c: first was not defined unless HAVE_RANDOM.
-
-Sat Jan  8 19:02:49 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_sysread): raise IOError for buffered IO.
-
-	* ext/socket/socket.c (s_recv): ditto.
-
-Fri Jan  7 00:59:29 2000  Masahiro Tomita  <tommy@tmtm.org>
-
-	* io.c (io_fread): TRAP_BEG/TRAP_END added around getc().
-
-Thu Jan  6 00:39:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* random.c (rb_f_rand): should be initialized unless srand is
-	  called before.
-
-Wed Jan  5 16:59:34 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.3.
-
-	* lib/net/session.rb: Session -> Protocol, ...
-
-	* lib/net/http.rb: HTTPCommand implementation was changed.
-
-Wed Jan  5 02:14:46 2000  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* parse.y: Fix SEGV on empty parens with UMINUS or UPLUS.
-
-Tue Jan  4 22:25:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (stmt): `() while cond' dumped core.
-
-Tue Jan  4 06:04:14 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* configure.in: modify for cross-compiling.
-	  use target_* instead of host_*.
-	  use AC_CANONICAL_TARGET.
-
-	* Makefile.in: ditto.
-
-	* cygwin/GNUmakefile.in: ditto.
-
-Sat Jan  1 13:26:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_yield_0): force_recycle ruby_dyna_vars to gain
-	  performance.
-
-	* array.c (rb_ary_delete_at_m): takes same argument pattern with
-	  rb_ary_aref.
-
-Sat Jan  1 10:12:26 2000  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ruby.h,util.c (rb_special_const_p): peep hole optimization.
-
-	* ruby.h,util.c (rb_test_false_or_nil): removed.
-
-	* ruby.h (RTEST, SPECIAL_CONST_P): peep hole optimization.
-
-	* ruby.h (FL_ABLE, FL_SET, FL_UNSET, FL_REVERSE): made expressions
-	  not statements.
-
-	* ruby.h (OBJ_INFECT): newly added macro which copies taint from
-	  `s' to `x'.
-
-Sat Jan  1 02:04:18 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_safe_level): new method.
-
-	* eval.c (rb_yield_0): recycle dyna_var_map to reduce object
-	  allocation.
-
-Fri Dec 31 00:52:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c: thread independent trace_func not needed.
-
-Thu Dec 30 14:47:31 1999  akira yamada  <akira@ruby-lang.org>
-
-	* configure.in: specifies -soname in LIBRUBY_DLDFLAGS on linux
-	  platforms.
-
-Thu Dec 30 10:51:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c,io.c,hash,c,re.c,string.c: `_m' suffix instead of
-	  `_method' for wrapper functions to implement method,
-	  e.g. `rb_str_join_m()'.
-
-Thu Dec 30 02:08:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (rb_cstr2inum): non-numeric format check added.
-	  currently it works only with base == 0 (i.e. Integer()).
-
-	* bignum.c (rb_str2inum): now takes VALUE to 1st argument.  null
-	  byte check added.
-
-	* array.c (rb_ary_replace): unless replacement is an array,
-	  replacement shall be converted to array by `[replacement]', not
-	  by `replacement.to_a'.
-
-	* array.c (rb_ary_plus): right operand must be an array.
-
-	* array.c (rb_ary_concat): argument must be an array.
-
-Mon Dec 27 12:35:47 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/socket/socket.c (sock_finalize): mswin32: fix socket handle leak.
-
-	* win32/win32.c (myfdclose): ditto.
-
-Sun Dec 26 23:15:13 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/win32.c (mypopen): raise catchable error instead of rb_fatal.
-	* win32/win32.c (mypclose): fix process handle leak.
-
-Sun Dec 26 16:17:11 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/Win32API/Win32API.c (Win32API_initialize): use UINT2NUM
-	  instead of INT2NUM to set __dll__ and __proc__.
-
-Sat Dec 25 00:08:59 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
-
-	* ext/Win32API/Win32API.c (Win32API_Call): remove 'dword ptr'
-	  from _asm.
-
-Fri Dec 24 10:26:47 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
-
-	* win32/win32.h: use "C++" linkage.
-
-Fri Dec 24 02:00:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (THREAD_ALLOC): should initialize th->trace.
-
-Fri Dec 24 00:43:39 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
-
-	* io.c (pipe_open): check for `fptr->f == NULL'.
-	* win32/win32.c (mypopen): STDERR does not work during ` function.
-
-Wed Dec 22 22:50:40 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.2.
-
-	* lib/net/http.rb: HTTP support is enhanced a little
-
-	* lib/net/http.rb: support proxy
-
-Tue Dec 21 17:21:28 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
-
-	* ext/socket/socket.c (sock_finalize): mswin32: fix FILE* leak.
-
-Tue Dec 21 05:33:56 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.1.
-
-	* lib/net/http.rb: support HTTP chunk
-
-Mon Dec 20 19:08:12 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (rb_file_s_expand_path): handle dir separator correctly.
-
-Sun Dec 19 22:56:31 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
-
-	* lib/find.rb: support dosish root directory.
-	* win32/Makefile: ditto.
-	* win32/config.status: ditto.
-	* win32/win32.c (opendir): ditto.
-	* win32/win32.c (opendir): use CharPrev() to get last character
-	  of the directory name.
-
-Sat Dec 18 03:00:01 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (path_check_1): check should be done by absolute path.
-
-	* marshal.c (r_ivar): should restore generic_ivar too.
-
-	* marshal.c (w_ivar): should dump generic_ivar too.
-
-Fri Dec 17 22:46:46 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.0.
-
-	* lib/net/http.rb: test release
-
-	* lib/net/session.rb: support class swapping
-
-	* lib/net/session.rb: Socket#flush_rbuf
-
-	* lib/net/session.rb: doquote -> Net.quote
-
-Fri Dec 17 19:27:43 1999  IWAMURO Motonori  <iwa@mmp.fujitsu.co.jp>
-
-	* eval.c (rb_load): should initialize ruby_frame->last_class.
-
-Wed Dec 15 01:35:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (proc_options): option to change directory changed to
-	  `-C' like tar.
-
-	* ruby.c (proc_options): argv boundary check for `-X'.
-
-Mon Dec 13 15:15:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_adjust_startpos): separate startpos adjustment
-	  because of major performance drawback.
-
-	* class.c (rb_singleton_class): tainted status of the singleton
-	  class must be synchronized with the object.
-
-	* eval.c (rb_thread_schedule): implement thread priority.
-
-Sat Dec 11 03:34:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c (mark_hashentry): key should be VALUE, not ID.
-
-	* io.c (argf_eof): should check next_p too.
-
-Thu Dec  9 18:09:13 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* error.c (exc_set_backtrace): forgot to declare a VALUE argument.
-
-Thu Dec  9 14:19:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (rb_obj_taint): explicit tainting must be prohibited at
-	  level 4 to prevent polluting trusted object by untrusted code.
-
-	* file.c: file operations (stat, lstat, chmod, chown, umask,
-	  truncate, flock) are prohibited in level 2 (was level 4).
-
-Wed Dec  8 11:48:23 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_f_require): prohibiting require() in the secure mode
-	  cause serious autoloading error.
-
-	* variable.c (rb_obj_instance_variables): don't need to prohibit
-	  to get list of instance variable names of untainted objects.
-
-	* variable.c (rb_ivar_get): don't need to prohibit to get instance
-	  variables of untainted objects.
-
-	* variable.c (rb_mod_remove_const): should prohibit constant
-	  removals too.
-
-Wed Dec  8 09:23:01 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): should try autoloading before defining
-	  class/module at the toplevel.
-
-Tue Dec  7 22:15:30 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* configure.in: Modified rb_cv_rshift_sign detect routine and
-	  more simple/fast RSHIFT() for hpux-10.x.
-
-Tue Dec  7 11:16:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (Init_eval): calculate stack limit from rlimit where
-	  getrlimit(2) is available.
-
-Tue Dec  7 09:57:33 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* file.c (rb_file_ftype): should have removed mode_t.
-
-Mon Dec  6 15:55:30 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* numeric.c (fix_rshift): Fix -1 >> 32 returned 0 (should be -1).
-
-	* numeric.c (fix_rshift): Fix  1 >> -1 returned 0 (should be 2).
-
-Mon Dec  6 11:47:23 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sprintf.c (rb_f_sprintf): formatted string must be tainted if
-	  any of parameters is a tainted string.
-
-	* file.c (rb_file_s_expand_path): expanded file path need not to
-	  be tainted always.
-
-Sun Dec  5 20:25:29 1999  Katsuhiro Ueno  <unnie@blue.sky.or.jp>
-
-	* eval.c (Init_Proc): simple typo.
-
-	* gc.c (add_heap): sizeof(RVALUE*), not sizeof(RVALUE).
-
-Sat Dec  4 01:40:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_search): adjust startpos for multibyte match unless
-	  the first pattern is forced byte match.
-
-	* bignum.c (rb_big_rand): should not use rand/random where drand48
-	  may be available.  RANDOM_NUMBER should be provided from outside.
-
-Fri Dec  3 09:54:59 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (moreswitches): there may be trailing garbage at #!
-	  line.
-
-	* eval.c (rb_f_require): should check require 'feature.o' too.
-
-Thu Dec  2 11:58:15 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* eval.c (rb_thread_loading): should maintain loading_tbl.
-
-Thu Dec  2 10:21:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_loading_done): wrong parameter to st_delete().
-
-Wed Dec  1 11:24:06 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ruby.c (process_sflag): process -s properly (should not force `--').
-
-Wed Dec  1 09:47:33 1999  Kazunori NISHI  <kazunori@swlab.csce.kyushu-u.ac.jp>
-
-	* string.c (rb_str_split_method): should increment end too.
-
-Tue Nov 30 18:00:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c: MARSHAL_MINOR incremented; format version is 4.2.
-
-	* marshal.c (w_object): distinguish class and module.
-
-	* marshal.c (w_object): save hash's default value.
-
-	* marshal.c (r_object): restore hash's default value.
-
-Tue Nov 30 01:46:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_source): generated source string must be tainted if
-	  regex is tainted.
-
-	* file.c (rb_file_s_basename): basename should not be tainted
-	  unless the original path is tainted.
-
-	* file.c (rb_file_s_dirname): ditto.
-
-Mon Nov 29 20:42:13 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c (stat_new): Struct::Stat -> File::Stat; Stat is no longer
-	  a Struct.
-
-Mon Nov 29 15:28:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_path2class): evaluated value from path should be
-	  module or class.
-
-Fri Nov 26 18:12:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_exec_end_proc): should remove only end_procs defined
-	  within load wrapper.
-
-	* eval.c (rb_load): save and restore ruby_wrapper around loading.
-
-	* eval.c (rb_mark_end_proc): mark end procs registered by END{} or
-	  at_exit{}.
-
-	* eval.c (rb_set_end_proc): should not call rb_global_variable()
-	  on heap address;  it crashed mod_ruby.
-
-Mon Nov 22 14:07:24 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* ruby.c (proc_options): variable e_script should be visited by
-	  garbage collector.
-
-Sat Nov 20 10:10:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (inspect_i): value may be nil, check revised.
-
-Fri Nov 19 18:06:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* dir.c (glob): recursive wildcard match by `**' ala zsh.
-
-Fri Nov 19 11:44:26 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* variable.c: was returning void value.
-
-Fri Nov 19 03:57:22 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* file.c: add methods Stat struct class to reduce stat(2).
-
-Thu Nov 18 16:18:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/pstore.rb: mutual lock by flock(2).
-
-Thu Nov 18 11:44:13 1999  Masahiro Tomita  <tommy@tmtm.org>
-
-	* io.c (read_all): should check bytes too.
-
-Wed Nov 17 02:40:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (Init_IO): $defout (alias of $>) added.
-
-Tue Nov 16 09:47:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/pstore.rb: add mutual lock using symlink.
-
-Mon Nov 15 16:50:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* enum.c (enum_grep): non matching grep returns an empty array, no
-	  longer returns nil.
-
-	* enum.c (enum_grep): grep with block returns collection of
-	  evaluated values of block over matched elements.
-
-Mon Nov 15 04:50:33 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* re.c (rb_reg_source): should not call rb_reg_expr_str()
-	  everytime.
-
-Sat Nov 13 07:34:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_mod_constants): traverse superclasses to collect
-	  constants.
-
-	* eval.c (assign): modified for shared variables.
-
-	* eval.c (rb_eval): search nested scope, then superclasses to
-	  assign shared variables within methods.
-
-	* eval.c (rb_eval): remove warnings from constants modification,
-	  because they are no longer constants.
-
-	* parse.y (node_assign): modified for shared variables.
-
-	* parse.y (assignable): allow constant assignment in methods;
-	  constants should be called `shared variable'.
-
-Fri Nov 12 23:52:19 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* process.c (rb_f_system): argument check for NT, __EMX__, DJGPP.
-
-Wed Nov 10 21:54:11 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* hash.c (rb_any_cmp): Fixed return without value.
-
-Wed Nov 10 17:57:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sprintf.c: incorporate <yasuf@big.or.jp>'s sprintf patch at
-	  [ruby-dev:7754].
-
-Wed Nov 10 08:28:53 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_call0): supply class parameter for each invocation.
-
-Tue Nov  9 13:21:04 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* configure.in: AC_MINIX move to before AC_EXEEXT and AC_OBJEXT.
-
-Mon Nov  8 19:52:29 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* configure.in: Renamed AC_CHAR_UNSIGNED to AC_C_CHAR_UNSIGNED.
-
-	* configure.in: Added default to AC_CHECK_SIZEOF().
-
-Mon Nov  8 14:28:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (stmt): rescue modifier added to the syntax.
-
-	* keywords: kRESCUE_MOD added.
-
-	* eval.c (rb_f_eval): fake outer scope when eval() called without
-	  bindings.
-
-	* eval.c (rb_f_binding): should copy last_class in the outer frame too.
-
-Sun Nov  7 18:31:04 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
-
-	* eval.c (is_defined): last_class may be 0.
-
-Sat Nov  6 19:26:55 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* Makefile.in: Added depend entry make parse.@OBJEXT@ from parse.c
-	  for UCB make
-
-Thu Nov  4 17:41:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): \< (wordbeg), \> (wordend) disabled.
-
-Wed Nov  3 08:52:57 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
-
-	* io.c (Init_IO): forgot to use INT2FIX() around SEEK_SET, etc.
-
-Wed Nov  3 00:25:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_split_method): use mbclen2() to handle kcode
-	  option of regexp objects.
-
-Mon Nov  1 14:22:15 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* eval.c (rb_eval): reduce recursive calls to rb_eval()
-	  case of ||= and &&= .
-
-Sun Oct 31 13:12:42 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* regex.c (re_compile_pattern): wrong [\W] match.
-
-Fri Oct 29 16:57:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/nkf/lib/kconv.rb: new String methods (kconv, tojis, toeuc,
-	  tosjis).
-
-	* time.c (time_s_at): now accepts optional second argument to
-	  specify micro second.
-
-Thu Oct 28 13:35:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_split_method): should be mbchar aware with
-	  single char separators.
-
-Wed Oct 27 12:57:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* random.c (rb_f_srand): random seed should be unsigned.
-
-Tue Oct 26 23:58:15 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_collect): collect for better performance.
-
-Tue Oct 26 19:20:54 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* marshal.c (r_object): should register class/module objects.
-
-Sat Oct 23 15:59:39 1999  Takaaki Tateishi  <ttate@jaist.ac.jp>
-
-	* process.c (rb_f_system): should require at least one argument.
-
-Sat Oct 23 12:42:44 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* enum.c (enum_collect): collect without block will collect
-	  elements in enumerable.
-
-Thu Oct 21 16:14:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (moreswitches): function to process string option;
-	  the name is stolen from perl (not implementation).
-
-	* ruby.c (proc_options): use RUBYOPT environment variable to
-	  retrieve the default options.
-
-	* dir.c (fnmatch): use eban's fnmatch; do not depend on system's
-	  fnmatch (which may have portability problem) anymore.
-
-Wed Oct 20 15:14:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c (marshal_load): should protect the generated object
-	  table (arg->data) from GC.
-
-Mon Oct 18 16:15:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/nkf/nkf.c (rb_nkf_kconv): output should be NUL terminated.
-
-Mon Oct 18 09:03:01 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.3
-
-	* lib/net/pop.rb: new methods POP3Command#uidl, POPMail#uidl.
-
-Sun Oct 17 03:35:33 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
-
-	* array.c (rb_ary_pop): forgot some freeze checks.
-
-Sat Oct 16 12:57:53 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* array.c (rb_ary_sort): always returns the copied array.
-
-Fri Oct 15 22:50:41 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* error.c (sys_nerr): on CYGWIN, it is _sys_nerr.
-
-Fri Oct 15 01:32:31 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* io.c (rb_io_ctl) :need to use NUM2ULONG, not NUM2INT.
-
-	* ext/Win32API/Win32API.c (Win32API_Call): need to use NUM2ULONG,
-	  not NUM2INT.
-
-Fri Oct 15 00:22:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (Init_Regexp): super class of the MatchingData, which was
-	  Data, to be Object.
-
-	* eval.c (ruby_run): evaluate required libraries before load &
-	  compiling the script.
-
-	* parse.y (lex_getline): retrieve a line from the stream, saving
-	  lines in the table in debug mode.
-
-	* eval.c (call_trace_func): treat the case ruby_sourcefile is null.
-
-Thu Oct 14 02:00:10 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (string): compile time string concatenation.
-
-Wed Oct 13 07:28:09 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.2
-
-	* lib/net/session.rb: new method Session#set_pipe.
-
-	* lib/net/session.rb, smtp.rb, pop.rb: add RD documentation.
-
-Wed Oct 13 02:17:05 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* array.c (rb_ary_plus): remove recursion.
-
-	* array.c (rb_ary_sort_bang): detect modify attempt.
-
-Wed Oct 13 02:17:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (block_pass): should copy block to prevent modifications.
-	  tag in the structure should be updated from latest prot_tag.
-
-	* eval.c (proc_s_new): tag in struct BLOCK should not point into
-	  unused stack.
-
-	* dir.c (dir_s_glob): iterate over generated matching filenames if
-	  the block is given to the method.
-
-	* array.c (rb_ary_at): new methods; at, first, last.
-
-	* hash.c (rb_hash_fetch): raises exception unless the default
-	  value is supplied.
-
-	* hash.c (rb_hash_s_create): need not remove nil from value.
-
-	* hash.c (rb_hash_aset): setting value to nil does not remove key
-	  anymore.
-
-Tue Oct 12 22:29:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_read): length may be 0 or negative.
-
-Tue Oct 12 13:26:27 1999  Jun-ichiro itojun Hagino  <itojun@itojun.org>
-
-	* signal.c (posix_signal): RETSIGTYPE may be void.
-
-Tue Oct 12 03:28:03 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* array.c (rb_ary_delete_at): allows negative position.
-
-Mon Oct 11 17:42:25 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (rb_intern): should generate distinct ID_ATTRSET symbols
-	  for the name with multiple `='s at the end.
-
-	* Makefile.in (CPPFLAGS): separate cpp flags from CFLAGS.
-
-Mon Oct 11 07:27:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): should not execute the `else' clause on the
-	  case the exceptions are handled by the `rescue' clause.
-
-	* signal.c (Init_signal): ignore SIGPIPE by default.
-
-Wed Oct  6 17:13:19 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* ruby.c (addpath): rubylib_mangled_path() modified.
-
-Mon Oct  4 12:42:32 1999  Kazuhiko Izawa  <izawa@erec.che.tohoku.ac.jp>
-
-	* pack.c (pack_unpack): % in printf format should be %%.
-
-Mon Oct  4 10:01:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_obj_instance_variables): should always return
-	  array for all object can have instance variables now.
-
-Mon Oct  4 00:08:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (OFF16): need to adjust pointer address to pack/unpack on
-	  64bit machines.
-
-Sun Oct  3 03:05:59 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* time.c (time_arg): mktime y2k problem.
-
-Sun Sep 26 16:54:45 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* parse.y (here_document): `\r' handling for here documents.
-
-Wed Sep 22 09:20:11 1999  Masahiro Tomita  <tommy@tmtm.org>
-
-	* ext/socket/socket.c: SOCKS5 support.
-
-Wed Sep 22 07:33:23 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.1
-
-	* lib/net/pop.rb: APOP did not work.
-
-	* lib/net/pop.rb: modify the way to make APOP challenge.
-
-Wed Sep 22 00:35:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_include): should return boolean value.
-
-	* regex.c (re_compile_fastmap): wrong comparison with mbc.
-
-	* eval.c (specific_eval): default sourcefile name should be
-	  "(eval)" for module_eval etc.
-
-Wed Sep 22 00:06:07 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/Makefile: update rules.
-
-	* io.c (io_fread): should not assign in char, it maybe -1.
-
-Tue Sep 21 23:57:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (call_trace_func): should not propagate retval in
-	  trace_func.
-
-Mon Sep 20 21:35:39 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/win32.c (myselect): assume non socket files are always
-	  readable/writable.
-
-Mon Sep 20 01:08:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_fread): should not block other threads.
-
-	* io.c (rb_io_synchronized): renamed from rb_io_unbuffered(); do
-	  not call setbuf(NULL) anymore.
-
-Sat Sep 18 13:45:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* stable version 1.4.2 released.
-
-Fri Sep 17 23:24:17 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* eval.c (rb_f_missing): dumped core if no argument given.
-
-Fri Sep 17 23:21:06 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* win32/win32.c (myselect): translate WSAEINTR, WSAENOTSOCK into
-	  UNIX errno constants.
-
-Fri Sep 17 00:52:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (arg): assignable() may return 0.
-
-Thu Sep 16 20:46:23 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* eval.c (rb_eval): was doubly evaluating the return expression.
-
-Thu Sep 16 18:40:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* stable version 1.4.1 released.
-
-Thu Sep 16 11:33:22 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* string.c (rb_str_match): should return nil.
-
-Wed Sep 15 22:46:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_s_quote): should quote `-' too.
-
-Tue Sep 14 15:23:22 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
-
-	* parse.y (yylex): no need to ignore `\r' here.
-
-	* parse.y (nextc): strip `\r' from text.
-
-	* parse.y (nextc): support `__END__\r\n' type terminator.
-
-Mon Sep 13 10:49:19 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* eval.c (rb_eval): needless RTEST(ruby_verbose) removed.
-
-Mon Sep 13 09:10:11 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.0
-
-Wed Sep  8 11:37:38 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* time.c (make_time_t): bit more strict comparison.
-
-Tue Sep  7 00:50:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* range.c (range_each): use rb_str_upto() for strings.
-
-	* string.c (rb_str_upto): set upper limit by comparing curr <= end.
-
-	* range.c (range_each): should check equality to handle magic
-	  increment.
-
-Mon Sep  6 22:43:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): break/next/redo available within -n/-p loop.
-
-Fri Sep  3 11:14:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* compar.c (cmp_equal): should not raise exception; protect by
-	  rb_rescue().
-
-Thu Sep  2 05:23:05 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* file.c (rb_file_s_expand_path): use dirsep, instead of character
-	  literal '/'.
-
-	* file.c (rb_file_s_expand_path): reduce multiple dirsep at the top.
-
-Wed Sep  1 00:28:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_call): call rb_undefined() if a method appears not to
-	  be exist explicitly from cache.
-
-	* eval.c (rb_method_boundp): check method cache before calling
-	  rb_get_method_body().
-
-	* eval.c (rb_get_method_body): store method non-existence
-	  information in the cache.
-
-	* random.c (rb_f_srand): use getpid(2) to generate seed.
-
-	* regex.c (re_match): do not apply partial mbc match for
-	  charset_not.
-
-	* regex.c (re_compile_pattern): put extended literal prefix (0xff)
-	  only before numeric literals, not before all >0x80 char.
-
-	* regex.c (re_compile_pattern): put numeric literal in extended
-	  charset region, not normal charset bits.
-
-	* regex.c (re_compile_fastmap): calculate fastmap for charset and
-	  charset_not to treat numeric literal (e.g. \246) specially.
-
-Fri Aug 28 17:32:55 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
-
-	* eval.c (rb_eval): should set return value (nil) explicitly if a
-	  value is omitted for return statement.
-
-Sun Aug 26 20:26:40 2001  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* ext/readline/readline.c: restore terminal mode
-	  even if readline() interrupted.
-
-	* ext/readline/readline.c: returned string need to
-	  be tainted.
-
-	* ext/readline/readline.c: fixed memory leak.
-
-	* ext/readline/readline.c: allow negative index.
-
-	* ext/readline/readline.c: added Readline::HISTORY.size
-	  same as Readline::HISTORY.length
-
-	* ext/readline/readline.c: allow conditional parsing
-	  of the ~/.inputrc file by `$if Ruby'.
-
-	* ext/readline/extconf.rb: check whether the
-	  libreadline has the variable `rl_completion_append_character'
-	  (this feature was implemented from GNU readline 2.1).
-
-Thu Aug 26 15:06:11 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
-
-	* gc.c (rb_gc): local variables may be placed beyond stack_end, so
-	  use an address from alloca(1) on non C_ALLOCA platforms.
-
-Thu Aug 26 01:24:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sprintf.c (rb_f_sprintf): "%%" is legal, but "%3.14%" is not.
-
-Mon Aug 23 00:00:54 1999  Tsukada Takuya  <tsukada@fminn.nagano.nagano.jp>
-
-	* regex.c (re_compile_fastmap): wrong macro caused memory leak.
-
-Sat Aug 21 11:30:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (ADJ): should not adjust addresses to data on heap.
-
-Fri Aug 20 20:50:58 1999  Kenji Nagasawa  <kenn@hma.att.ne.jp>
-
-	* defines.h (PATH_SEP): path separator is ";" for OS/2.
-
-Thu Aug 19 10:50:43 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* gc.c (rb_gc): add volatile to avoid GCC optimize bug(?).
-
-Wed Aug 18 23:48:10 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* due to disk trouble, some change records were lost.  several
-	  modification made to eval.c, gc.c, io.c, pack.c,
-	  ext/extmk.rb.in, and lib/mkmf.rb.
-
-Fri Aug 13 15:41:39 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* stable version 1.4.0 released.
-
-Fri Aug 13 03:16:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (argf_forward): since $stdout may be non-IO, ARGF.file is
-	  not guaranteed to be IO.  check and forwarding added to every ARGF
-	  method.
-
-	* io.c (set_outfile): $stdout/$stderr may not be IO now.
-
-	* io.c (set_stdin): $stdin may not be IO now.
-
-	* range.c (rb_range_beg_len): round `end' to length as documented.
-
-	* io.c (Init_IO): preserve original stdin/stdout/stderr.
-
-Thu Aug 12 13:44:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (Init_load): require receives 1 argument.
-
-	* eval.c (frame_dup): should clear tmp to avoid dangling
-	  references.
-
-Wed Aug 11 13:33:13 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* eval.c (rb_eval): no automatic aggregate initialization.
-
-	* eval.c (module_setup): ditto.
-
-Wed Aug 11 18:18:41 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* eval.c (yield_under_i): automatic aggregate initialization is an
-	  ANSI feature.
-
-Wed Aug 11 10:10:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): parse `[].length==0' as `([].length)==0', not
-	  `([].length=)=0'
-
-	* parse.y (yylex): parse `[].length!=0' as `([].length)!=0', not
-	  `([].length!)=0'
-
-	* parse.y (peek): peek-in lexical buffer.
-
-Wed Aug 11 00:34:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): bug on backward jump adjustment concerning
-	  stop_paren.
-
-Tue Aug 10 14:54:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/nkf/nkf.c (rb_nkf_guess): binary detection was wrong.
-
-Tue Aug 10 00:07:36 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_clone): should use CLONESETUP().
-
-Mon Aug  9 23:57:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.h (CLONESETUP): should have copied generic instance
-	  variables too.
-
-Mon Aug  9 10:46:54 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/socket/extconf.rb: add check for <arpa/nameser.h> and
-	  <resolv.h>.
-
-Sat Aug  7 13:19:06 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* numeric.c (flo_cmp): comparing NaN should not return value.
-	  raises FloatDomainError.
-
-Sat Aug  7 03:09:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (blk_free): free copied frames too.
-
-	* eval.c (frame_dup): should copy previous frames from stack to
-	  heap to preserve frame information.
-
-Fri Aug  6 15:01:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.3.7 - version 1.4 beta
-
-	* ext/socket/socket.c (s_recv): UDPsocket#recvfrom now returns
-	  IPsocket#addr information.
-
-	* array.c (rb_ary_subary): ary[-3,3] should not return nil.
-
-Thu Aug  5 10:58:01 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (thread_mark): protect old ruby_frame from GC during it
-	  replaced by eval().
-
-	* eval.c (eval): do not modify frame.prev; binding should preserve
-	  information about calling() too.
-
-	* eval.c (rb_yield_0): no arity check for mere yield; but only for
-	  Proc#call.
-
-Tue Aug  3 22:07:13 1999  Kazuhiro HIWADA  <hiwada@kuee.kyoto-u.ac.jp>
-
-	* object.c (rb_mod_clone): should check if iv_tbl, m_tbl are
-	  initialized.
-
-Tue Aug  3 19:03:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (rb_any_cmp): use rb_with_disable_interrupt() to ensure
-	  clearance of rb_prohibit_interrupt even on failure.
-
-	* eval.c (rb_with_disable_interrupt): new function added.
-
-Sat Jul 31 23:23:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_create_0): set THREAD_RAISED flag on thread
-	  termination by exception.
-
-	* eval.c (rb_thread_join): `$!' may not be nil for the threads
-	  created in rescue clause.
-
-	* eval.c (rb_thread_status): ditto.
-
-	* eval.c (rb_thread_join): should re-raise exception for already
-	  dead threads too.
-
-Fri Jul 30 17:56:54 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
-
-	* object.c (rb_mod_ge): wrong comparison.
-
-Fri Jul 30 12:15:44 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/tcltklib/extconf.rb: win32 support.
-
-	* lib/mkmf.rb: use append_library().
-
-	* ext/extmk.rb.in: ditto.
-
-Fri Jul 30 02:11:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_delete): should return nil for deleting non
-	  existing item.
-
-	* io.c (rb_io_close): call rb_sys_wait() on explicit close.
-
-	* io.c (rb_io_fptr_close): do not call rb_sys_wait() on finalize.
-
-	* eval.c (yield_under_i): cbase context should be maintained for
-	  Module#module_eval().  suggested by <inaba@st.rim.or.jp>.
-
-Wed Jul 28 01:18:28 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* Makefile.in: add -I$(hdrdir)/lib to install using ftools.
-
-	* util.c: use HAVE_FCNTL_H, not HAVE_FCNTL
-
-Wed Jul 28 18:24:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.3.6 - version 1.4 alpha
-
-Tue Jul 27 09:38:08 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* eval.c (rb_eval): reduce recursive rb_eval() calls by
-	  NODE_BLOCKs.
-
-Tue Jul 27 01:20:40 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* file.c (rb_file_s_expand_path): drive letter patch.
-
-Mon Jul 26 02:36:31 1999  Shugo Maeda  <shugo@netlab.co.jp>
-
-	* eval.c (rb_load): should clear ruby_nerr.
-
-	* eval.c (rb_thread_join): oldbt should not be empty to unshift.
-
-Sun Jul 25 12:09:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* dir.c (push_braces): should treat nested braces.
-
-Fri Jul 23 02:49:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (rb_hash_clear): dummy argument added; suggested by
-	  <eguchi@shizuokanet.ne.jp>.  thanks.
-
-Thu Jul 22 19:37:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_join): get_backtrace() may return Qnil.
-	  typecheck added.
-
-Tue Jul 20 14:36:43 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* range.c (range_each): do not treat String specially (for future
-	  override).
-
-Tue Jul 20 02:28:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_gets): $_ should be nil, when get returns nil.
-
-	* io.c (rb_f_gets): ditto.
-
-Mon Jul 19 17:13:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_fastmap): should continue fastmap compile
-	  for anychar_repeat, for it's repeat anyway.
-
-Mon Jul 26 13:33:45 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* lib/jcode.rb: replaced by faster code.
-
-Mon Jul 19 01:57:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/mkmf.rb: no longer use install program.
-
-	* ext/extmk.rb.in: use miniruby to install programs.
-
-Sat Jul 17 00:06:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (ipaddr): don't do reverse lookup if
-	  attribute do_not_reverse_lookup is set for socket classes.
-	  Experimental.  Note this is a global attribute.
-
-Fri Jul 16 22:18:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_eof): use feof() to check EOF already met.
-
-	* io.c (read_all): should return nil at EOF.
-
-Fri Jul 16 13:39:42 1999  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/telnet.rb: version 0.231.
-
-Fri Jul 16 10:58:22 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* regex.c (re_match): debug print removed.
-
-Fri Jul 16 09:58:15 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* many files: clean up unused variables found by gcc -Wall.
-
-	* lib/mkmf.rb: better cygwin support etc.
-
-	* ext/extmk.rb.in: ditto.
-
-	* instruby.rb: ditto.
-
-Fri Jul 16 01:37:50 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* string.c (rb_str_squeeze_bang): the type of local variable `c'
-	  should be int, not char.
-
-	* string.c (rb_str_reverse): should always return copy.
-
-Thu Jul 15 23:25:57 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
-
-	* lib/debug.rb: better display & frame treatment.
-
-Thu Jul 15 21:16:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_each): returns self for normal termination;
-	  returns nil for break.
-
-	* string.c: non bang methods (e.g. String#sub) should always
-	  return copy of the receiver.
-
-Thu Jul 15 21:09:15 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
-
-	* eval.c (find_file): do not add empty string to the path.
-
-	* configure.in (with-search-path): should not add empty string if
-	  the option is not supplied.
-
-Thu Jul 15 17:49:08 1999  Ryo HAYASAKA  <hayasaka@univ21.u-aizu.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: move `#include "ruby.h"' forward.
-
-Thu Jul 15 16:54:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.3.5 - version 1.4 alpha
-
-Wed Jul 14 23:45:33 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* eval.c (ruby_init): initialize for the first time only.
-
-Tue Jul 13 00:15:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (rb_hash_index): re-defined; method to retrieve a key
-	  from the value.
-
-	* hash.c (Init_Hash): member? should be re-defined for Hash.
-
-Tue Jul 12 13:54:51 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* io.c (rb_file_sysopen): wrong number of argument.
-
-Mon Jul 12 11:52:35 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_f_missing): class name included in message.
-
-	* eval.c (print_undef): better error message.
-
-Sun Jul 11 05:36:17 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
-
-	* lib/debug.rb: patch to show proper position.
-
-Fri Jul  9 23:56:14 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* dln.c (dln_find_1): path conv. moved to conv_to_posix_path.
-
-	* dln.c (conv_to_posix_path): path conv. should be done.
-
-Fri Jul  9 10:26:47 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* random.c (RANDOM_NUMBER): should place parentheses.
-
-Fri Jul  8 11:00:51 1999  Shugo Maeda  <shugo@netlab.co.jp>
-
-	* numeric.c (fix_div): division may be out of fixnum range.
-
-	* bignum.c (bigdivmod): proper sign calculation to result.
-
-Wed Jul  7 18:27:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* st.c (st_delete_safe): was modifying wrong slot.
-
-Mon Jul  5 13:17:46 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c (rb_gc_call_finalizer_at_exit): close all files at exit.
-
-Fri Jul  2 18:00:21 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* lib/Mail/README: Mail-0.3.0 added to the distribution.
-
-Fri Jul  2 01:45:32 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_fastmap): avoid allocation of register
-	  variables for each invocation of re_match().  Suggested by
-	  Zasukhin Ruslan <ruslan@paradigmasoft.com>.  Thanks.
-
-Tue Jun 29 20:39:24 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* ext/tk/lib/tk.rb (TkVariable): bug fix; should value type check
-	  be added?
-
-	* string.c (rb_str_each_line): a bug in paragraph mode.
-
-	* ruby.c (load_file): shifted too much to skip #!.
-
-Tue Jun 29 06:50:21 1999  Wakou Aoyama  <wakou@fsinet.or.jp>
-
-	* lib/CGI.rb: 0.30 - cleanup release, incompatible.
-
-	* lib/telnet.rb: 0.22 - timeout added.
-
-Tue Jun 29 10:49:25 1999  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
-
-	* configure.in: better Rhapsody support.
-
-	* lib/mkmf.rb: Rhapsody/NEXTSTEP support.
-
-Tue Jun 29 01:42:13 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/pty/pty.c (chld_changed): should use POSIX.1 style wait.
-
-Mon Jun 28 21:07:36 1999  KIMURA Koichi  <kbk@kt.rim.or.jp>
-
-	* ext/extmk.rb.nt: wrong result for have_library().
-
-Mon Jun 28 15:24:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* missing/isinf.c: OSF/1 raises SIGFPE on one()/zero().
-
-	* regex.c (re_search): should search til EOS, for patterns may
-	  match beyond the end of range.
-
-Mon Jun 28 12:49:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_f_select): should not accept Time objects as an
-	  argument for it is time interval.
-
-	* process.c (rb_f_sleep): ditto.
-
-	* file.c (test_s): should return nil for false condition.
-
-Mon Jun 28 12:23:52 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* bignum.c (rb_dbl2big): typo.
-
-	* file.c (rb_f_test): ditto.
-
-	* string.c (rb_str_crypt): wrong message.
-
-Sun Jun 27 19:50:11 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* eval.c (rb_f_exit): should have treat signed integer status, not
-	  VALUE.
-
-	* process.c (rb_f_exit_bang): should work like exit().
-
-Sun Jun 27 16:21:32 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* string.c (rb_str_rindex): wrong position to search.
-
-Sat Jun 26 04:05:30 1999  Takaaki Tateishi  <ttate@jaist.ac.jp>
-
-	* configure.in (configure_args): --with-search-path to specify
-	  additional ruby search path.
-
-	* ruby.c (ruby_prog_init): additional search path.
-
-Fri Jun 25 13:09:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (pack_unpack): needed to initialize natint.
-
-	* regex.c (re_compile_pattern): add start_paren to avoid too much
-	  finalization on maybe_finalize_jump.
-
-Fri Jun 25 13:07:20 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
-
-	* missing/isinf.c: include "config.h" added.
-
-Fri Jun 25 07:25:05 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* lib/mkmf.rb: initialize $(topdir).
-
-	* ext/extmk.rb.in (install_rb): install lib/*.rb properly.
-
-	* configure.in (linux): specifies -rpath on --enable-shared.
-
-	* configure.in (aix): ruby.imp must reside in $(topdir).
-
-Thu Jun 24 19:11:29 1999  Yoshida Masato  <yoshidam@yoshidam.net>
-
-	* parse.y (rb_str_extend): multi-byte identifier in expression
-	  interpolation in strings.
-
-	* parse.y (yylex): support multi-byte char identifiers.
-
-Thu Jun 24 15:27:13 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (f_arg): check duplicate argument names.
-
-	* gc.c (rb_gc_mark): marking wrong member for NODE_ARGS.
-
-	* string.c (rb_str_rindex): POSITION specifies start point, not
-	  end point.
-
-Thu Jun 24 13:00:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (print_mbc): wrong boundary.
-
-	* pack.c (uv_to_utf8): raises ArgError for too big value.
-
-Thu Jun 24 11:02:51 1999  Yoshida Masato  <yoshidam@yoshidam.net>
-
-	* pack.c (uv_to_utf8): mask needed.
-
-Wed Jun 23 21:03:56 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* ruby.h (struct RFile): remove iv_tbl from struct. instance
-	  variables are handled as generic ivs.
-
-Wed Jun 23 22:06:26 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* pack.c (utf8_to_uv): pack to 7 bytes sequence.
-
-	* pack.c (uv_to_utf8): wrong boundary.
-
-	* pack.c (pack_unpack): should treat as unsigned long.
-
-Wed Jun 23 15:10:11 1999  Inaba Hiroto  <inaba@sdd.tokyo-sc.toshiba.co.jp>
-
-	* parse.y (parse_string): failed to parse nested braces.
-
-	* parse.y (parse_regx): nested braces within #{} available.
-
-Wed Jun 23 11:18:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (slow_search): wrong shift width for mbcs.
-
-	* eval.c (rb_thread_save_context): should not clear th->locals.
-
-Wed Jun 23 02:06:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): UMINUS binds too tight with digits. changed so
-	  that -2**2 => -4.
-
-	* parse.y (close_paren): `do' for expr termination now works it
-	  used to be.
-
-Wed Jun 22 18:26:42 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* pack.c (pack_pack): should initialize local variable `j'.
-
-Wed Jun 22 15:24:59 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* parse.y (here_document): a bug for multiline heredoc.
-
-Tue Jun 22 15:06:36 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/socket/socket.c (ruby_socket): forgot to return fd
-	  explicitly.
-
-Tue Jun 22 13:34:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* rubyio.h (MakeOpenFile): should initialize member `iv_tbl'.
-
-Wed Jun 22 10:35:51 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* io.c (rb_io_gets_internal): getc(3) may not set errno on
-	  interrupt.
-
-Mon Jun 21 22:39:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (call_required_libraries): ruby_sourceline should be
-	  cleared before loading libraries.
-
-	* io.c (set_stdin): do not use reopen(), so that we don't need to
-	  dup original stdin before assigning $stdin.
-
-Mon Jun 21 18:04:27 1999  Ryo HAYASAKA  <hayasaka@univ21.u-aizu.ac.jp>
-
-	* ext/dbm/dbm.c: include <cdefs.h> for solaris 2.6.
-
-Mon Jun 21 15:59:47 1999  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* ext/socket/socket.c (ip_addrsetup): forgot to put `else'.
-
-Mon Jun 21 15:38:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (fptr_finalize): remove rb_syswait() invocation to avoid
-	  wait4(2) within GC.  rb_syswait() moved to rb_io_fptr_close().
-
-Mon Jun 21 12:05:59 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* dir.c (dir_s_glob): remove MAXPATHLEN restriction.
-
-	* ext/md5/md5init.c (md5_hexdigest): should have used "%02x".
-
-Sun Jun 20 19:50:38 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* string.c (rb_str_each_line): should have checked string
-	  boundary.
-
-Sat Jun 19 22:24:12 1999  Kenji Nagasawa  <kenn@hma.att.ne.jp>
-
-	* OS/2 patch improved.
-
-Fri Jun 18 08:30:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c (r_byte): add data length check.
-
-	* ext/tcltklib/tcltklib.c (_timer_for_tcl): was doing busy-wait.
-
-Tue Jun 15 10:01:21 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* configure.in: remove trailing slash from interpreter embedded
-	  shared library path.
-
-	* configure.in (INSTALL_DLLIB): install shared lib with 0555.
-
-	* instruby.rb: changed mode for shared library into 0555.
-
-Fri Jun 11 23:27:00 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* ext/etc/etc.c (etc_passwd): should return nil, not exception for
-	  call after last passwd entry.
-
-Fri Jun 11 15:21:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c (rb_gc_mark_locations): add safety margin 1.
-
-	* eval.c (ruby_run): should protect toplevel node tree.
-
-	* ext/etc/etc.c (etc_group): dumps core if there's no more group.
-
-Fri Jun 11 01:50:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (ruby_run): Init_stack() was called too late; local
-	  variables happened to be higher (or lower) than stack_start.
-
-Thu Jun 10 16:41:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c: do not call `initialize' for IO objects.  So with Array,
-	  Hash, Range, and Time objects.
-
-	* ext/curses/curses.c (curses_getch): made thread aware using
-	  rb_read_check().
-
-	* ext/curses/curses.c (window_getch): ditto.
-
-	* ext/curses/curses.c (curses_getstr): made (partially) thread
-	  aware using rb_read_check().
-
-	* ext/curses/curses.c (window_getstr): ditto.
-
-	* io.c (rb_read_check): new function to help making something
-	  (like extension libraries) thread aware.
-
-	* eval.c (is_defined): `defined? super' should be true even for
-	  private superclass methods.
-
-Fri Jun 10 13:42:10 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* pack.c (pack_pack): template `Z' should be allowed.
-
-Wed Jun  9 13:26:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_loading): modified to avoid nested race
-	  condition of require().
-
-	* ext/tcltklib/tcltklib.c (ip_invoke): queue invocation on non
-	  main threads.
-
-	* ext/tcltklib/tcltklib.c (lib_mainloop): flush invocation
-	  queues periodically.
-
-	* version.c (ruby_show_version): now print the message to stdout.
-
-	* version.c (ruby_show_copyright): ditto.
-
-Tue Jun  8 00:00:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (pack_unpack): append sentinel (NUL) to the string.
-
-	* ext/md5/md5init.c (md5_hexdigest): new method to obtain
-	  printable hash string.
-
-	* ext/md5/md5init.c (md5_update): should return self.
-
-	* pack.c (pack_pack): undocumented template 'U' for UTF8.
-
-	* pack.c (pack_unpack): ditto.
-
-	* marshal.c (r_byte): should replace getc() with rb_getc().
-
-	* io.c (rb_getc): getc() replacement uses READ_DATA_PENDING() and
-	  rb_thread_wait_fd().
-
-Mon Jun  7 23:23:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (rb_mod_clone): should call CLOSESETUP().
-
-	* eval.c (bind_clone): should call CLONESETUP() for new clone.
-
-Sat Jun  5 10:32:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_oct): binary (e.g. 0b10111) support.
-
-	* variable.c (rb_const_set): raise warning, not exception.
-
-	* parse.y (yycompile): initialize parser internal variables.
-
-	* parse.y (close_paren): set lex_state to EXPR_PAREN after closing
-	  parenthesis.
-
-	* parse.y (yylex): returns kDO for `do' right after method_call.
-
-Thu Jun  3 11:05:30 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* regex.c (read_backslash): should decode \b within class.
-
-Thu Jun  3 01:06:18 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* dln.c (dln_load): AIX improvement (aix_findmain removed).
-
-Wed Jun  2 00:41:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (pack_unpack): new undocumented template Z which strips
-	  stuff after first null.
-
-	* pack.c (pack_pack): should preserve specified length of the
-	  resulting string.
-
-Tue Jun  1 15:29:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (ruby_socket): retry after GC, if socket(2)
-	  failed on EMFILE or ENFILE.
-
-	* ext/socket/socket.c (sock_s_socketpair): ditto.
-
-	* eval.c (module_setup): need to add PUSH_VAR/POP_VAR to clear
-	  dyna vars link list.
-
-	* version.h (RUBY_RELEASE_CODE): integer macro constant for source
-	  version detection.
-
-Sun May 30 22:19:12 1999  Kenji Nagasawa  <kenn@tcp-ip.or.jp>
-
-	* ext/socket/socket.c: emx/gcc 0.9d now fixes things about
-	  AF_UNIX.
-
-	* process.c: OS/2 EMX kludge.
-
-	* Makefile.in (strncasecmp.o): added dependency.
-
-Mon May 31 16:06:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.3.4 - preliminary release for 1.4
-
-Mon May 31 15:57:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_fptr_close): close on IO which main_thread is
-	  waiting cause serious exception, that vanishes the actual fd
-	  closing.  Invocation of rb_thread_fd_close() is deferred
-	  a little.
-
-Sat May 29 18:27:13 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* regex.c (re_match): stack boundary check needed.
-
-Sat May 29 12:27:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_invoke): proper ref count management
-	  to avoid leak.  I HATE REF COUNTING!!
-
-	* eval.c (ruby_run): moved ruby_require_libraries() to handle `-r'
-	  from ruby_options() to avoid stack corruption for threads
-	  created in libraries.
-
-Sat May 29 02:22:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_yield_0): when `for' appeared in blocks, it
-	  introduced new scope for local variables.
-
-Fri May 28 17:16:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_squeeze_bang): squeeze AND of the arguments.
-	  UNDOCUMENTED.
-
-	* string.c (rb_str_count): new UNDOCUMENTED method.
-
-	* string.c (rb_str_delete_bang): delete AND of the arg ranges.
-	  UNDOCUMENTED FEATURE for 1.3.x.
-
-	* ext/socket/socket.c (setipaddr): re-wrote using ip_addrsetup().
-
-	* ext/socket/socket.c (ip_addrsetup): decode symbolic address
-	  <broadcast>.
-
-Thu May 27 12:27:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (tr_trans): should handle NUL (\0) within strings.
-
-Tue May 25 16:45:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_f_syscall): syscall may return values other than zero
-	  on success.
-
-	* regex.c (re_match): handle empty loop properly (hopefully).
-
-	* regex.c (re_match): remove empty group check, because it does
-	  not help non-grouping parentheses (?:..).
-
-	* regex.c (re_compile_fastmap): treating try_next, finalize_push
-	  wrong way.
-
-	* regex.c: remove some obsolete functions such as
-	  group_match_null_string_p().
-
-Mon May 24 14:47:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (read_backslash): read backslash by regex.
-
-Sun May 23 19:44:58 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ext/pty/pty.c (getDevice): portability patch.
-
-Fri May 21 23:01:26 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/socket/getaddrinfo.c (GET_AI): should set error code.
-
-Thu May 20 03:43:44 1999  Jun-ichiro itojun Hagino  <itojun@itojun.org>
-
-	* ext/socket/socket.c: you should use sockaddr_storage to handle
-	  IPv6 addresses.
-
-	* ext/socket/getaddrinfo.c (getaddrinfo): prevent retrieving
-	  AF_INET6 address if hints.ai_flags == AI_PASSIVE.
-
-Wed May 19 12:27:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (exec_end_proc): should protect exceptions.
-
-	* gc.c (run_final): ditto.
-
-	* parse.y (f_rest_arg): allow just * for rest arg.
-
-	* parse.y (mlhs_basic): allow * without formal argument.
-
-	* regex.c (re_match): the variable `part' should be initialized.
-
-Tue May 18 15:25:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_search): a bug in range adjustment.
-
-Tue May 18 11:35:59 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* dln.c (conv_to_posix_path): path_len argument added.
-
-Mon May 17 12:26:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (fix_rev): should treat Fixnum as signed long.
-
-	* eval.c (massign): add strict number check for yield (and call).
-
-	* eval.c (proc_arity): new method to return number of arguments.
-
-	* eval.c (method_arity): new method to return number of arguments.
-
-	* parse.y (read_escape): char may be unsigned.
-
-	* string.c (rb_str_succ): ditto.
-
-	* string.c (tr_trans): ditto.
-
-	* object.c (Init_Object): methods `&', `|', `^' are added to nil.
-
-	* range.c (rb_range_beg_len): it should be OK for [0..-len-1].
-
-	* regex.c (re_search): search for byte literal within mbcs.
-
-	* regex.c (is_in_list): parsh
-
-	* regex.c (re_compile_fastmap): should have not alter the loop
-	  variable `j' if TRASLATE_P().
-
-	* regex.c (re_compile_pattern): escaped characters should be read
-	  by PATFETCH_RAW(c).
-
-Sat May 15 11:23:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): endline2 (\Z) should not match at the point
-	  between a newline and end-of-line, like endline ($).
-
-	* class.c (include_class_new): should initialize iv_tbl to share
-	  between module and iclass.
-
-Fri May 14 08:50:27 1999  Akira Endo  <akendo@t3.rim.or.jp>
-
-	* regex.c (re_compile_fastmap): it should be k != 0 to skip.
-
-Fri May 14 12:46:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_load): a bug in old marshal format support.
-
-	* instruby.rb: make site_ruby directory.
-
-Fri May 14 10:18:02 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* regex.c (re_match): a bug in inline `.*' etc.
-
-Fri May 14 09:58:46 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
-
-	* ruby.c (addpath): should have specified string length.
-
-Thu May 13 10:40:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval_string_wrap): new function.
-
-	* regex.c (re_compile_pattern): POSIX line match should alter
-	  behavior for `^' and `$' to begbuf and endbuf2 respectively.
-
-	* ext/pty/pty.c: un-ANSI-fy function arguments.
-
-Wed May 12 14:19:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* struct.c (iv_get): in case of inheritance of generated struct
-	  class, __member__ and __size__ should also be inherited.
-	  Thanks for Pros Yeboah <yeboah@tu-harburg.de>.
-
-	* io.c (rb_f_gets_internal): should check number of arguments
-	  before checking rb_rs == rb_default_rs.  Thanks for Koji Arai
-	  <JCA02266@nifty.ne.jp>.
-
-Tue May 11 08:29:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): .?, .+ did not work.
-
-Mon May 10 00:59:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/jcode.rb: forgot to squeeze on reverse (complement) case.
-
-	* string.c (tr_squeeze): should not set modify flag to be honest,
-	  if the string is not modified.
-
-	* signal.c (Init_signal): SIGTERM should not be handled.
-
-	* regex.c (re_match): seeking for longest match is now optional,
-	  which can be set using RE_OPTION_POSIXMATCH.  This satisfies
-	  POSIX longest match as much as Emacs's posix-* functions, which
-	  are known to be incomplete.
-
-Sun May  9 13:04:01 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/socket/socket.c (sock_s_getaddrinfo): conversion from
-	  Fixnums to C integers needed.
-
-Sun May  9 11:51:43 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* range.c (range_eqq): reverse condition.
-
-	* range.c (range_s_new): default should be end inclusive.
-
-Sat May  8 03:27:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (thread_connect): replace nasty
-	  rb_thread_fd_writable() with rb_thread_select().
-
-Fri May  7 20:49:00 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* ext/socket/getaddrinfo.c (inet_pton): wrong parameter to
-	  inet_aton().
-
-	* ext/socket/addrinfo.h (__P): silly cut and paste typo.
-
-Fri May  7 17:03:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* dir.c (glob): removed GPL'ed glob.c completely.
-
-Fri May  7 08:17:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/sdbm/extconf.rb: sdbm extension added to the distribution.
-
-Fri May  7 01:42:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (tcp_s_gethostbyname): avoid using struct
-	  sockaddr_storage.
-
-Thu May  6 13:21:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_indexes): should not use rb_ary_concat().
-
-Thu May  4 12:34:18 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* parse.y (parse_string): there should be newline escape by
-	  backslashes in strings.
-
-	* parse.y (parse_qstring): ditto.
-
-Mon May  3 04:37:20 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* ext/tcltklib/extconf.rb: better search for libX11.
-
-	* range.c (range_s_new): embarrassing =/== typo.
-
-	* re.c (Init_Regexp): failed to set default kcode.
-
-Mon May  3 02:39:55 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* ext/socket/socket.c (open_inet): typo (res and res0).
-
-Tue May  4 02:07:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* mkconfig.rb: leave undefined $(VARIABLE) unexpanded in the
-	  Config::CONFIG hash table.
-
-Mon May  3 09:37:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): expand exactn{n} at compile time.
-	  handles stop_paren specially.
-
-	* regex.c (re_compile_pattern): expand x{n} at compile time.
-
-	* regex.c (re_search): posix line match should be checked.
-
-	* regex.c (re_search): a bug in anchor condition.
-
-Fri Apr 30 18:57:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.3.3
-
-	* string.c (rb_str_rindex): position should be END point, not
-	  START point.
-
-	* re.c (rb_reg_search): pos means end point on reverse now.
-
-	* array.c (rb_ary_s_create): should clear ary->ptr to avoid
-	  potential gc crash.
-
-Fri Apr 30 15:24:58 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/addrinfo.h: compatibility hack for ipv4.
-
-	* ext/socket/socket.c: itojun's ipv6 patches applied.
-
-	* ext/socket/extconf.rb: detect ipv6 features based on itojun's
-	  ipv6 patches.
-
-	* ext/extmk.rb.in (enable_config): can handle --enable-xxx now.
-
-	* lib/mkmf.rb (enable_config): ditto.
-
-Fri Apr 30 05:22:23 1999  Shugo Maeda  <shugo@netlab.co.jp>
-
-	* string.c (rb_str_aset): last index should not append.
-
-Thu Apr 29 18:55:31 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* dln.c (conv_to_posix_path): remove const from args.
-
-	* ruby.c (rubylib_mangle): remove Fatal(), the obsolete function.
-
-Tue Apr 27 14:11:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (fname): lazy workaround for keywords did not work well.
-
-	* ext/extmk.rb.in: `--with-xxx=yyy' argument configuration.
-
-	* lib/mkmf.rb: ditto.
-
-	* misc/ruby-mode.el: forgot to handle $`.
-
-	* ext/extmk.rb.in: better AIX link support proposed by
-	  <komatsu@sarion.co.jp>.
-
-Mon Apr 26 16:46:59 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/extmk.rb.in: AIX shared library support modified.
-
-	* ext/aix_mksym.rb: ditto.
-
-	* configure.in: ditto.
-
-	* sprintf.c (rb_f_sprintf): should allocate proper sized buffer
-	  for float numbers.
-
-Sat Apr 24 00:00:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (operation): syntax like `a.[]=(1,2)' is allowed.
-
-Fri Apr 23 23:54:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (argf_binmode): binmode method added to ARGF.
-
-Fri Apr 23 13:55:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_f_chomp): should assign the result to $_.  or maybe
-	  sub/gsub/chop/chomp should NOT assign $_ altogether.
-
-Thu Apr 22 16:50:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_callcc): call scope_dup() for all scopes in
-	  the interpreter stack.
-
-Tue Apr 20 11:24:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_dump): `#' should be escaped.
-
-Tue Apr 20 02:32:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (parse_regx): option /p for posix match added.
-
-	* re.c (rb_reg_desc): did not print options properly.
-
-	* io.c (rb_file_s_open): initialize was called twice.
-
-Mon Apr 19 18:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* configure.in (DEFAULT_KCODE): can specify default code for
-	  $KCODE by --with-default-kcode=(euc|sjis|utf8|none).
-
-	* regex.c (IS_A_LETTER): a byte sequence shorter than mbc should
-	  not match with \w etc.
-
-Mon Apr 19 13:49:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (eval): should restore ruby_dyna_vars.
-
-Fri Apr 16 21:40:43 1999  Nobuyoshi Nakada  <gea02117@nifty.ne.jp>
-
-	* io.c (f_backquote): pipe_open may return nil.
-
-	* io.c (f_open): rb_io_open may return nil.
-
-	* io.c (io_s_foreach): ditto.
-
-	* io.c (io_s_readlines): ditto.
-
-	* io.c (io_defset): wrong message.
-
-Fri Apr 16 15:09:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (rb_str2inum): strtoul() returns long, not int.
-
-	* eval.c (rb_load): size of VALUE and ID may be different.
-
-	* util.c (mmprepare): int is too small to cast from pointers.
-
-	* config.guess: avoid 'linux-gnu' for alpha-unknown-linux.
-
-Thu Apr 15 23:46:20 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ruby.c (rubylib_mangle): mangle path by RUBYLIB_PREFIX.
-
-Wed Apr 14 23:52:51 1999  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
-
-	* node.h (NODE_LMASK): should be long to avoid overflow.
-
-Wed Apr 14 13:14:35 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
-
-	* dln.c: AIX dynamic link.
-
-	* ext/aix_ld.rb: ditto.
-
-Wed Apr 14 12:19:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/thread.rb: Queue#{enq,deq} added.
-
-Tue Apr 13 17:43:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (rb_hash_s_create): Hash::[] acts more like casting.
-
-Tue Apr 13 00:33:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_stdio_set): warning for assignment to the variables
-	  $std{in,out,err}.
-
-Mon Apr 12 23:12:32 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_reopen): check for reopening same IO.
-
-Fri Apr  9 17:45:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (rb_compile_string): bug for nested eval().
-
-	* regex.c (re_match): should pop non-greedy stack items on
-	  failure, after best_regs are fixed.
-
-Thu Apr  8 17:30:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (PACK_LENGTH_ADJUST): need to adjust for `*' length.
-
-Tue Apr  6 23:28:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (void_check): add void context checks.
-
-Mon Apr  5 12:23:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_s_at): should copy gmt-mode.
-
-	* eval.c (eval_node): preserve ruby_eval_tree.
-
-Fri Apr  2 14:00:34 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
-
-	* lib/debug.rb: wrong command interpreting.
-
-Fri Apr  2 11:46:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.3.2
-
-Fri Apr  2 10:40:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_s_pipe): forgot to define IO::pipe.
-
-Thu Apr  1 14:40:46 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (assign): modified for rhs change.
-
-	* parse.y (stmt): unparenthesisized method calls can be right hand
-	  side expression of the assignment.
-
-Sat Mar 27 22:42:47 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* ext/nkf/nkf.c (rb_nkf_kconv): check size output_ctr before
-	  decrement.
-
-Thu Mar 25 09:11:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_s_at): preserve gmt-mode for result.
-
-	* parse.y (rb_compile_string): do not use cur_mid, use
-	  compile_for_eval instead.
-
-	* st.c (PTR_NOT_EQUAL): wrong logical condition.
-
-Wed Mar 24 13:06:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yycompile): should clear cur_mid after compilation.
-
-	* io.c (next_argv): need to check type for ARGV.shift.
-
-	* eval.c (blk_copy_prev): need to preserve outer scope as well as
-	  outer frames.
-
-	* parse.y (rb_compile_string): return can appear within eval().
-
-Tue Mar 23 10:15:07 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* configure.in: AC_C_CONST check added.
-
-Tue Mar 23 02:07:35 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_plus): preserve gmt-mode for result.
-
-Mon Mar 22 01:32:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): adjust line numbers before expression
-	  interpolation within strings.
-
-	* eval.c (rb_eval): defined? returns nil for false condition.
-
-	* numeric.c (num_nonzero_p): returns nil for false condition.
-
-Sat Mar 20 13:07:43 1999  Keiju Ishitsuka  <keiju@rational.com>
-
-	* lib/weakref.rb: avoid leak for two weakrefs for one object.
-
-Fri Mar 19 11:26:45 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* eval.c (ruby_run): needed to eval END{} on exit.
-
-	* eval.c (rb_exit): ditto.
-
-Fri Mar 19 02:17:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* signal.c (Init_signal): handles terminating signals HUP, TERM,
-	  QUIT, PIPE, etc.
-
-Thu Mar 18 15:47:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (rb_big_and): bug in sign calculation.
-
-	* bignum.c (rb_big_or): ditto.
-
-	* io.c (rb_f_select): forgot to use to_io to retrieve IO, after
-	  calling select(2).
-
-Tue Mar 16 19:54:31 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/extmk.rb.in: static linking cause infinite make loop.
-
-Tue Mar 16 18:50:04 1999  Yoshida Masato  <yoshidam@yoshidam.net>
-
-	* ext/socket/socket.c (tcp_s_gethostbyname): typo, not NUM2INT(),
-	  but INT2NUM().
-
-	* ext/socket/socket.c (mkhostent): ditto.
-
-Tue Mar 16 12:31:44 1999  Ryo HAYASAKA  <hayasaka@cheer.u-aizu.ac.jp>
-
-	* file.c (utime_internal): suppress warning by const.
-
-	* time.c (time_gmtime): ditto.
-
-Tue Mar 16 10:23:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_clone): Time object can be cloned.
-
-Tue Mar 16 03:13:10 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* ruby.c (load_file): argv[argc] should be NULL.
-
-Mon Mar 15 22:12:08 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* sprintf.c (rb_f_sprintf): typo in arg_num check at exit.
-
-Mon Mar 15 16:42:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_dup): dup2 should copy class too.
-
-Mon Mar 15 15:12:53 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
-
-	* lib/mkmf.rb: install program relative path check.
-
-Mon Mar 15 14:05:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_s_new): 2nd argument is now option.
-	  Regexp::EXTENDED can be specified.
-
-Fri Mar 12 10:47:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_index): str.index("") should always match at
-	  offset point.
-
-	* string.c (rb_str_upto): can specify end point exclusion.
-
-	* string.c (rb_str_index): negative offset.
-
-	* regex.c (re_match): begline should not match at the point
-	  between a newline and end-of-string.  endline neither.
-
-	* regex.c (re_compile_pattern): context_indep_anchors .
-
-	* parse.y (parse_regx): need not to push backslashes before
-	  escaped characters.
-
-	* eval.c (rb_thread_join): re-raises exception within target.
-
-Fri Mar 12 01:09:36 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* ext/readline/readline.c (readline_s_vi_editing_mode): wrong
-	  number of arguments.
-
-Fri Mar 12 02:12:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (PACK_ITEM_ADJUST): "a".unpack("C3") => [97, nil, nil]
-
-Thu Mar 11 18:23:50 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* ext/socket/socket.c (Init_socket): UDPsocket was omitted.
-
-Thu Mar 11 16:43:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (PACK_LENGTH_ADJUST): push fixed number of items per
-	  template to result array.
-
-	* pack.c (pack_unpack): I/N/C etc. push nil in the array for "".
-
-Tue Mar  9 00:19:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (ruby_unsetenv): use ruby_setenv(name, 0).
-
-	* hash.c (env_delete): ditto.
-
-	* string.c (rb_str_upto): do not check `beg<end' to generate
-	  strings for the pattern like "a".upto("#a").
-
-	* range.c (range_each): treat strings as special case.
-
-	* range.c (range_each): no longer use upto for generic cases.
-
-Sun Mar  7 14:21:32 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
-
-	* string.c (rb_str_index): wrong end point calculation.
-
-Sat Mar  6 02:19:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (match_index): MatchingData#index(n) added.
-
-	* array.c (rb_ary_subseq): ary[n..-1] returns an sub-array unless
-	  n is too small negative index.
-
-	* re.c (rb_reg_match_method): Regexp#match(str) added.
-
-	* array.c (rb_ary_indexes): understands ranges as indexes.
-
-	* re.c (match_size): MatchingData#size added.
-
-Fri Mar  5 01:04:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_fill): modified for range.
-
-	* array.c (rb_ary_aset): a[n..m] revisited.
-
-Thu Mar  4 14:23:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_subseq): a[n..m] revisited.
-
-	* parse.y (method_call): allow Const::method{}.
-
-	* array.c (rb_ary_replace_method): should replace original array.
-
-Thu Mar  4 02:30:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* configure.in: remove --disable-thread, thread feature is no
-	  longer optional.
-
-Thu Mar  4 00:32:17 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
-
-	* parse.y (read_escape): wrong arguments for scan_oct,scan_hex.
-
-Wed Mar  3 11:51:53 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (Init_socket): rename class names as
-	  TCPsocket -> TCPSocket etc.
-
-Tue Mar  2 19:46:42 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* configure.in (LDSHARED): use gcc -Wl,-G for solaris with gcc.
-
-Tue Mar  2 17:04:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): backslashes do not concatenate comment lines
-	  anymore.
-
-Mon Mar  1 14:05:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_call0): adjust argv for optional arguments.  super
-	  without arguments emit superclass method with the value from
-	  optional arguments.  enabled as experiment.
-
-Sun Feb 28 14:04:07 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* parse.y (nextc): backslash at the eof cause infinite loop
-
-Sun Feb 28 11:01:26 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* time.c (make_time_t): month range check added.
-
-Sat Feb 27 02:36:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (Init_Regexp): add escape as alias of quote.
-
-	* re.c (rb_reg_s_quote): char-code can be specified now.
-
-Fri Feb 26 18:45:36 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
-
-	* eval.c (error_print): bug for error message with newlines.
-
-Fri Feb 26 12:00:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (make_time_t): future check modified to allow 1969-12-31
-	  at certain timezone.
-
-	* time.c (time_arg): year >= 1000 should be past.
-
-	* version.c (Init_version): constant RELEASE_DATE added.
-
-Fri Feb 26 01:08:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_substr): returns nil for out-of-range access.
-
-	* array.c (rb_ary_subseq): returns nil for out-of-range access.
-
-	* array.c (rb_ary_store): negative index message has changed.
-
-	* string.c (rb_str_aset): reallocation needed.
-
-	* string.c (rb_str_aset): allow char append to the string.
-
-Thu Feb 25 23:30:17 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* time.c (time_load): tm_year should be packed in 17 bits, not 18.
-
-Thu Feb 25 12:50:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* missing/dup2.c: replaced by public domain version.
-
-	* time.c (make_time_t): add `future check' in loops.
-
-	* object.c (rb_num2dbl): forbid implicit conversion from nil, or
-	  strings.  thus `Time.now + str' should raise error.
-
-	* object.c (rb_Float): convert nil into 0.0.
-
-	* object.c (rb_Integer): conversion method improved.
-
-Thu Feb 25 03:27:50 1999  Shugo Maeda  <shugo@netlab.co.jp>
-
-	* eval.c (rb_call): should handle T_ICLASS properly.
-
-Thu Feb 25 00:04:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* error.c (Init_Exception): global function Exception() removed.
-
-	* variable.c (rb_class2name): returns "nil"/"true"/"false" for them.
-
-	* time.c (time_dump): time marshaling format compressed size from
-	  11 bytes to 8 bytes.  thanx to tadf@kt.rim.or.jp.
-
-	* eval.c (rb_obj_call_init): should specify arguments explicitly.
-
-Wed Feb 24 15:43:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): comment concatenation requires preceding space
-	  before backslash at the end of line.
-
-	* io.c (rb_f_pipe): global pipe is obsolete now.
-
-	* object.c (Init_Object): remove true.to_i, false.to_i.
-
-Tue Feb 23 14:21:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): warn if identifier! immediately followed by `='.
-
-Tue Feb 23 12:32:41 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* eval.c (rb_load): tilde expansion moved to find_file.
-
-	* eval.c (find_file): tilde expansion added.
-
-Tue Feb 23 10:50:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (require_method): require can handle multiple fnames.
-
-	* hash.c (rb_hash_foreach_iter): hash key may be nil.
-
-Mon Feb 22 17:44:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): should not pop failure point on success for
-	  non-greedy matches.
-
-	* io.c (Init_IO): remove global_functions getc, readchar, ungetc,
-	  seek, tell, rewind.
-
-Sat Feb 20 22:54:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (rb_num2long): no implicit conversion from boolean.
-
-Sat Feb 20 09:58:42 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* numeric.c (flo_to_s): portable Infinity and NaN support.
-
-Sat Feb 20 07:13:31 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* io.c (rb_file_sysopen): forgot to initialize a local variable.
-
-Fri Feb 19 23:05:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_subseq): range check changed.
-
-	* marshal.c: increment MARSHAL_MINOR for Time format change.
-
-	* time.c (time_old_load): support old marshal format.
-
-	* time.c (time_load): changed for new format Y/M/D/h/m/s/usec.
-
-	* time.c (time_dump): marshal dump format has changed.
-
-Fri Feb 19 00:25:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_arg): should reject "sep\0" and such.
-
-	* time.c (time_plus): Time#+ should not receive Time object
-	  operand.
-
-	* string.c (rb_str_substr): negative length raises exception now.
-
-	* array.c (beg_len): if end == -1, it points end of the array.
-
-	* array.c (rb_ary_subseq): negative length raises exception now.
-
-Thu Feb 18 20:57:04 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* time.c (rb_strftime): strftime() may return 0 on success too.
-
-	* time.c (time_strftime): `\0' within format string should not be
-	  omitted in the result.
-
-	* time.c (rb_strftime): zero length format.
-
-	* time.c (time_to_a): yday start with 1 now.
-
-	* time.c (time_zone): support for long timezone name.
-
-	* time.c (time_yday): yday start with 1 now.
-
-	* time.c (time_minus): minus calculation was wrong.
-
-	* time.c (time_minus): sec, usec should be at least `long', maybe
-	  they should be `time_t'.
-
-	* time.c (time_plus): addition with float was wrong.
-
-	* time.c (time_to_s): support for long timezone name.
-
-	* time.c (time_gm_or_local): too far future check moved.
-
-	* time.c (time_arg): treat 2 digit year as 69-99 => 1969-1999,
-	  00-68 => 2000-2068
-
-Thu Feb 18 03:56:47 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* missing/fnmatch.c: moved to missing directory.
-
-Wed Feb 17 16:22:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* struct.c (rb_struct_alloc): actual initialization now be done in
-	  `initialize'.
-
-Wed Feb 17 09:47:15 1999  okabe katsuyuki  <hgc02147@nifty.ne.jp>
-
-	* regex.c (re_search): use mbclen() instead of ismbchar().
-
-	* re.c (rb_reg_s_quote): should handle mbchars properly.
-
-Wed Feb 17 01:25:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): stop comment concatenation by backslash follows
-	  after >= 0x80 char.  may cause problem with Latin chars.
-
-	* eval.c (error_print): exception in rb_obj_as_string() caused
-	  SEGV. protect it by PUSH_TAG/POP_TAG.
-
-	* error.c (exc_exception): `Exception#exception' should return self.
-
-Wed Feb 17 01:12:22 1999  Hirotaka Ichikawa  <hirotaka.ichikawa@tosmec.toshiba.co.jp>
-
-	* configure.in: BeOS patch.
-
-Tue Feb 16 14:25:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): should reallocate mbc space for
-	  character class unless current_mbctype is ASCII.
-
-Mon Feb 15 15:48:30 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* configure.in: specify `-Wl,-E' only for GNU ld.
-
-Mon Feb 15 11:43:22 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
-
-	* array.c (rb_inspecting_p): should return Qfalse.
-
-Sun Feb 14 22:36:40 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* sprintf.c (rb_f_sprintf): `%G' was omitted.
-
-Sun Feb 14 12:47:48 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* numeric.c (Init_Numeric): allow divide by zero on FreeBSD.
-
-	* numeric.c (Init_Numeric): FloatDomainError added.
-
-	* configure.in (AC_REPLACE_FUNCS): add checks for functions
-	  isinf, isnan, and finite.
-
-Sat Feb 13 01:24:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_create_0): should protect th->thread.
-
-Fri Feb 12 16:16:47 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
-
-	* string.c (rb_str_inspect): wrong mbc position.
-
-Fri Feb 12 16:21:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_fd_close):
-
-	* io.c (rb_io_fptr_close): tell scheduler that fd is closed.
-
-	* io.c (rb_io_reopen): ditto.
-
-	* io.c (READ_CHECK): check if closed after thread context switch.
-
-	* ext/socket/socket.c (bsock_close_read): do not check
-	  the return value from shutdown(2).
-
-	* ext/socket/socket.c (bsock_close_write): ditto.
-
-	* ext/socket/socket.c (sock_new): need to dup(fd) for close_read
-	  and close_write.
-
-	* parse.y (here_document): handle newlines within #{}.
-
-	* regex.h: should replace symbols for ruby.
-
-Fri Feb 12 00:46:28 1999  Shugo Maeda  <shugo@netlab.co.jp>
-
-	* marshal.c (r_object): should update the method name in message.
-
-	* marshal.c (w_object): limit should be converted into Fixnum.
-
-Wed Feb 10 15:20:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): empty pattern should not cause infinite
-	  pattern match loop.
-
-	* regex.c (re_compile_pattern): RE_OPTIMIZE_ANCHOR for /.*/, not
-	  for /(.|\n)/.
-
-	* numeric.c (fix_pow): `fixnum**nil' should raise TypeError.
-
-	* bignum.c (rb_big_pow): need to normalize results.
-
-Wed Feb 10 01:42:41 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* numeric.c (fix_pow): `(5**1).type' should be Integer.
-
-Tue Feb  9 01:22:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): do not ignore newlines in mbchars.
-
-	* io.c (rb_file_s_open): mode can be specified by flags like
-	  open(2), e.g. File::open(path, File::CREAT|File::WRONLY).
-
-	* io.c (rb_f_open): bit-wise mode flags for pipes
-
-	* io.c (Init_IO): bit flags for open.
-
-Sat Feb  6 22:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_sub_bang): should not overwrite match data by
-	  regexp match within the block.
-
-	* string.c (rb_str_gsub_bang): ditto.
-
-Sat Feb  6 03:06:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (match_getter): accessing $~ without matching caused SEGV.
-
-Fri Feb  5 22:11:08 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* parse.y (yylex): binary literal support, like 0b01001.
-
-	* parse.y (yylex): octal numbers can contain `_'s.
-
-	* parse.y (yylex): warns if non-octal number follows immediately
-	  after octal literal.
-
-	* parse.y (yylex): now need at least one digit after prefix such
-	  as 0x, or 0b.
-
-	* bignum.c (rb_str2inum): recognize binary numbers like 0b0101.
-
-Fri Feb  5 03:26:56 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
-
-	* ruby.c (proc_options): -e without program prints error.
-
-Fri Feb  5 00:01:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (terms): needed to clear heredoc_end.
-
-	* numeric.c (flo_div): allow float division by zero.
-
-Thu Feb  4 11:56:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* missing/strtod.c: for compatibility.
-
-	* configure.in (strtod): add strtod compatible check.
-
-	* numeric.c (rb_num2long): missing/vsnprintf.c does not support
-	  floating points.
-
-	* numeric.c (flo_to_s): ditto.
-
-Wed Feb  3 23:02:12 1999  Yoshida Masato  <yoshidam@yoshidam.net>
-
-	* regex.c (re_compile_pattern): use ismbchar() to get next char.
-
-	* regex.c (re_search): wrong mbchar shift.
-
-	* re.c (rb_reg_search): needed to reset $KCODE after match.
-
-	* regex.c (re_compile_fastmap): mbchars should match with \w.
-
-Wed Feb  3 22:35:12 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* parse.y (yylex): too big float raise warning, not error.
-
-Tue Feb  2 23:41:42 1999  Yoshida Masato  <yoshidam@yoshidam.net>
-
-	* regex.c (re_match): wrong boundary.
-
-	* regex.c (IS_A_LETTER): re_mbctab[c] may not be 1 for mbc.
-
-	* regex.c (re_search): mbchar support for shifting ranges.
-
-	* regex.c (MBC2WC): wrong conversion.
-
-Wed Feb  3 15:03:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (parse_regx): need to escape parens if terminators are
-	  not any kind of parenthesis.
-
-	* parse.y (parse_qstring): ditto.
-
-	* parse.y (parse_string): ditto.
-
-Tue Feb  2 17:11:26 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* string.c (rb_str_gsub_bang): too small realloc condition.
-
-Mon Feb  1 10:01:17 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* parse.y (yylex): range check for the float literal.
-
-Sat Jan 30 18:34:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (usage): -h option to show brief command description.
-
-Sat Jan 30 08:45:16 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
-
-	* lib/cgi-lib.rb: cookie support added.
-
-Sat Jan 30 13:38:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): mbchars should match with \w
-	  within character class.  Was matching with \W.
-
-	* regex.c (re_match): \w should match with multi byte characters,
-	  not its first byte.
-
-Sat Jan 30 10:06:41 1999  Yoshida Masato  <yoshidam@yoshidam.net>
-
-	* re.c (rb_reg_s_new): UTF-8 flag handle (/u, /U).
-
-	* re.c (rb_kcode): $KCODE handle for UTF-8.
-
-Sat Jan 30 01:51:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_delete_if): RTEST() missing.
-
-	* hash.c (delete_if_i): ditto.
-
-	* enum.c (Init_Enumerable): select (=find_all), detect (=find)
-	  added as aliases.
-
-Fri Jan 29 21:32:19 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* hash.c (rb_f_setenv): SEGV caused by small typo.
-
-Fri Jan 29 00:15:58 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/parsedate.rb (parsedate): support date format like
-	  23-Feb-93, which is required by HTTP/1.1.
-
-	* variable.c (find_class_path): avoid calling rb_iv_set().
-
-	* eval.c (backtrace): do not need to modify $SAFE internally.
-
-	* variable.c (classname): inline __classid__ access.
-
-	* eval.c (THREAD_ALLOC): needed to initialize wrapper.
-
-	* lib/ftools.rb (makedirs): allows slash at the end of the path.
-
-	* numeric.c (rb_fix_induced_from): ensure result to be Fixnum.
-
-Thu Jan 28 17:31:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (flo_to_s): float format changed to "%16.10g".
-
-Thu Jan 28 02:13:11 1999  Yoshinori Toki  <toki@freedom.ne.jp>
-
-	* array.c (rb_ary_store): expand allocated buffer by 3/2.
-
-Wed Jan 27 17:50:02 1999  Kazuhiro HIWADA  <hiwada@kuee.kyoto-u.ac.jp>
-
-	* bignum.c (dbl2big): raised error if double is too big to cast
-	  into long.  check added.
-
-Wed Jan 27 03:16:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_mod_const_at): can't list constants of the
-	  untainted objects in safe mode.
-
-	* class.c (method_list): can't list methods of untainted objects
-	  in safe mode.
-
-Tue Jan 26 02:40:41 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
-
-	* prec.c: Precision support for numbers.
-
-Thu Jan 21 19:08:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_f_raise): calls `exception' method, not `new'.
-
-	* error.c (exc_exception): renamed from `new'.
-
-Wed Jan 20 03:39:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yycompile): rb_in_compile renamed to ruby_in_compile.
-
-	* ruby.c (load_file): define DATA if __END__ appeared in script.
-
-Tue Jan 19 14:57:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (here_document): need to protect lex_lastline.
-
-	* parse.y (yylex): disable %//, %'', %``.
-
-Tue Jan 19 05:01:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* array.c (beg_len): round range value too much.
-
-Mon Jan 18 13:02:27 1999  Kuroda Jun  <jkuro@dwe.co.jp>
-
-	* hash.c (env_keys): strchr() may return NULL.
-
-Mon Jan 18 17:51:47 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* instruby.rb (wdir): install libruby.a in archdir.
-
-	* lib/ftools.rb (install): removes file before installing.
-
-Mon Jan 18 16:55:31 1999  MAEDA shugo  <shugo@aianet.ne.jp>
-
-	* eval.c (rb_callcc): experimental continuation support.
-
-Sun Jan 17 19:45:37 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* pack.c (pack_pack): nil packing caused SEGV.
-
-Sat Jan 16 13:18:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_concat): character (fixnum) can be append to
-	  strings
-
-	* array.c (rb_ary_unshift): unshift returns array.
-
-Sat Jan 16 01:39:19 1999  Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
-
-	* string.c (rb_str_split_method): UTF-8 support.
-
-	* regex.c: UTF-8 support.
-
-Thu Jan 14 00:42:55 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_gsub_bang): forget to add offset for null match.
-
-	* eval.c (rb_thread_local_aset): can't modify in tainted mode.
-
-	* hash.c (env_each_key): avoid generating temporary array.
-
-Wed Jan 13 23:58:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (rb_f_setenv): name and value can be tainted.
-
-Wed Jan  6 02:42:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (Init_Bignum): forgot to define Bignum#===.
-
-	* gc.c (gc_sweep): if add_heap() is called during GC, objects on
-	  allocated heap page(s) are not marked, should not be recycled.
-
-	* gc.c (gc_sweep): should refer latest freelist.
-
-	* gc.c (id2ref): modified to support performance patch.
-
-	* object.c (rb_obj_id): performance patch (no bignum for id).
-
-Tue Jan  5 01:56:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* config.guess: merge up-to-date from autoconf 2.12.
-
-	* array.c (rb_ary_join): avoid calling rb_protect_inspect() till
-	  it is really needed.
-
-	* object.c (rb_obj_inspect): show detailed information for the
-	  instance variables (infinite loop can avoid now).
-
-	* struct.c (rb_struct_inspect): avoid infinite loop.
-
-Sun Jan  3 01:37:58 1999  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
-
-	* misc/ruby-mode.el (ruby-end-of-defun): moved too much.
-
-	* misc/ruby-mode.el (ruby-mode-variables): set paragraph-separator
-	  for the mode.
-
-	* misc/ruby-mode.el: proper font-lock for `def' and `nil' etc.
-
-Sat Jan  2 17:09:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_jump_tag): new api to invoke JUMP_TAG.  tag values
-	  can obtained from rb_eval_string_protect()/rb_load_protect().
-
-	* eval.c (rb_rescue): now catches all exceptions but SystemExit.
-
-	* eval.c (rb_eval_string_protect): eval string with protection.
-
-	* eval.c (rb_load_protect): load file with protection.
-
-	* io.c (rb_io_puts): avoid infinite loop for cyclic arrays.
-
-	* eval.c (rb_thread_local_aref): thread local hash tables.
-
-	* object.c (rb_equal): check exact equal before calling `=='.
-
-Thu Dec 31 22:28:53 1998  MAEDA shugo  <shugo@aianet.ne.jp>
-
-	* eval.c (rb_f_require): feature names should be provided with
-	  DLEXT extension.
-
-	* marshal.c (Init_marshal): need to provide `marshal.so'.
-
-Wed Dec 30 02:29:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (classname): do not call rb_ivar_set().
-
-	* eval.c (ruby_run): finalizers were called too early.
-
-Fri Dec 25 12:19:30 1998  Fukuda Masaki  <fukuda@wni.co.jp>
-
-	* gc.c (rb_gc_mark): should not return on FL_EXIVAR.
-
-Fri Dec 25 11:56:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c (gc_mark): proper scanning for temporary region.
-
-	* eval.c (TMP_ALLOC): protection for C_ALLOCA was broken.
-
-Thu Dec 24 18:26:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* development version 1.3 released.
-
-Thu Dec 24 00:17:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_load): top self should be set properly.
-
-	* variable.c (classname): check __classpath__ if it is defined.
-
-	* variable.c (classname): invalid warning at -v with static linked
-	  ruby interpreter.
-
-	* eval.c (is_defined): modified for expr::Const support.
-
-	* eval.c (rb_eval): invoke method expr::Const if expr is not class
-	  nor module.
-
-	* parse.y (primary): enable expr::identifier as method
-	  invocation.
-
-Wed Dec 23 03:04:36 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): avoid too many loop pops for (?:..).
-
-Tue Dec 22 18:01:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental version 1.1d1 released.
-
-Mon Dec 21 01:33:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (TMP_PROTECT): add volatile to ensure GC protection.
-
-	* string.c (rb_str_gsub_bang): calculate buffer size properly.
-
-	* parse.y (lex_get_str): needed to return Qnil at EOS.
-
-	* eval.c (find_file): check policy modified, raise exception
-	  immediately for tainted load_path.
-
-	* hash.c (rb_f_setenv): do not depend on setenv() nor putenv().
-
-Thu Dec 17 06:29:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/tk/tkutil.c (tk_s_new): use rb_obj_instance_eval(), instead
-	  of rb_yield_0().
-
-	* eval.c (rb_f_require): forgot to call find_file in some cases.
-
-	* eval.c (rb_f_require): `require "feature.so"' to load dynamic
-	  libraries.  old `require "feature.o"' is still OK.
-
-	* eval.c (rb_eval): yield without value dumped core.
-
-Wed Dec 16 16:28:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental version 1.1d0 (pre1.2) released.
-
-Wed Dec 16 10:43:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_search): bound check before calling re_match().
-
-Tue Dec 15 13:59:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* error.c (exc_to_s): returns class name for unset mesg.
-
-	* error.c (exc_initialize): do not initialize @mesg by "".
-
-	* parse.y (nextc): __END__ should handle CR+LF newlines.
-
-Wed Dec  9 13:37:12 1998  MAEDA shugo  <shugo@aianet.ne.jp>
-
-	* pack.c (encodes): use buffering for B-encoding.
-
-	* pack.c (pack_pack): Q-encoding by 'M'.
-
-Tue Dec  8 14:10:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (generic_ivar_get): any object can have instance
-	  variables now.  great improvement.
-
-	* variable.c (rb_name_class): do not set __classpath__ by default,
-	  use __classid__ instead.
-
-Mon Dec  7 22:08:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.h (struct RFile): IO objects can have instance variables now.
-
-	* parse.y (primary): allows `def obj::foo; .. end'.
-
-Mon Dec  7 18:24:50 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* ruby.c (set_arg0): $0 support for HP-UX.
-
-Mon Dec  7 01:30:28 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* dln.c (dln_strerror): better error messages on win32.
-
-Sat Dec  5 23:27:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (here_document): indentable here-doc delimiter by
-	  `<<-'.  Proposed by Clemens <c.hintze@gmx.net>.  Thanks.
-
-Thu Dec  3 16:50:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/extmk.rb.in (realclean): trouble on install.
-
-Sun Nov 29 22:25:39 1998  Takaaki Tateishi  <ttate@jaist.ac.jp>
-
-	* process.c (f_exec): check number of argument.
-
-Thu Nov 26 17:27:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c9 released.
-
-Wed Nov 25 13:07:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_dup): do not copy additional data (STR_NO_ORIG).
-
-	* parse.y (yycompile): reduce known memory leak (hard to remove).
-
-Wed Nov 25 03:41:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* st.c (st_init_table_with_size): round size up to prime number.
-
-Sat Nov 21 23:27:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (rb_hash_aset): reduce copying key strings.
-
-	* gc.c (looks_pointerp): declare as inline function if possible.
-
-	* st.c (PTR_NOT_EQUAL): compare hash values first before calling
-	  comparing function.
-
-	* st.c (ADD_DIRECT): save hash value in entries to reduce hash
-	  calculation.
-
-	* string.c (rb_str_gsub_bang): avoid rb_scan_args() to speed-up.
-
-	* string.c (rb_str_sub_bang): ditto.
-
-Sat Nov 21 18:44:06 1998  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
-
-	* time.c (time_s_now): had memory leak.
-
-	* ext/md5/md5init.c (md5_new): had memory leak.
-
-	* ext/md5/md5init.c (md5_clone): ditto.
-
-Fri Nov 20 23:23:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/delegate.rb: do not propagate hash and eql?.
-
-Thu Nov 19 01:40:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sample/ruby-mode.el (ruby-expr-beg): failed to find reserved
-	  word boundary.
-
-	* eval.c (rb_eval): avoid calling `concat' method.  calls
-	  rb_ary_concat() directly for efficiency.
-
-	* eval.c (rb_eval): actual rest arguments extended arrays too much.
-
-Wed Nov 18 14:30:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (rb_define_global_function): global functions now be
-	  module function of the Kernel.
-
-Wed Nov 18 10:48:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (read_all): SEGV on large files.
-
-Tue Nov 17 18:11:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c8 released.
-
-Tue Nov 17 16:58:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (arg): assignment to attribute name start with capital
-	  should be allowed.
-
-	* eval.c (thread_alloc): needed to mark terminated threads too.
-
-Tue Nov 17 12:33:48 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
-
-	* ext/extmk.rb.in (create_makefile): Set `libdir' to `@libdir@',
-	  Set `pkglibdir' to `$libdir/$(RUBY_INSTALL_NAME)'.
-
-Tue Nov 17 10:30:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sprintf.c (f_sprintf): %l%%c -> %%l%c
-
-Tue Nov 17 01:08:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (ret_args): distinguish `a' and `*a' for the arguments
-	  of yield and return.
-
-	* eval.c (rb_eval): flip3 should work like sed.
-
-	* eval.c (rb_eval): flip{2,3} now have independent state for each
-	  scope to work fine with thread.
-
-Mon Nov 16 23:26:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (primary): exec else clause if no exception raised.
-
-Sun Nov 15 15:44:07 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* ext/extmk.rb.in (install): bug in target.
-
-Sat Nov 14 11:02:05 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
-
-	* Makefile.in (install): Give the argument `$(DESTDIR)' to
-	  `instruby.rb'.
-
-	* instruby.rb: Recognize ARG[0] as `destdir'.
-
-	* instruby.rb: Give the argument `destdir' to `extmk.rb'.
-
-	* ext/extmk.rb.in: Recognize ARG[1] as `$destdir'.
-
-	* instruby.rb: Create the installation directories (bindir, libdir,
-	  archdir, pkglibdir, archdir, and mandir) under `destdir', and
-	  install all files under there.
-
-	* ext/extmk.rb.in: Likewise.
-
-Sat Nov 14 10:56:55 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
-
-	* instruby.rb: Add the variable `pkglibdir'.
-
-	* instruby.rb: Set the variable `libdir' to `$(libdir)', not
-	  `$(libdir)/$(ruby_install_name)'. `libruby.so' and `libruby.so.LIB'
-	  are installed at `libdir'.
-
-	* instruby.rb: Set the variable `archdir' to `$(pkglibdir)/$(arch)'.
-
-Fri Nov 13 19:43:29 1998  KIMURA Koichi  <kbk@kt.rim.or.jp>
-
-	* missing/nt.c (SafeFree): wrong free offset.
-
-Thu Nov 12 20:11:53 1998  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* sample/ruby-mode.el: wrong highlight.
-
-	* parse.y (parse_regx): newline in regexp was ignored.
-
-Wed Nov 11 10:54:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (here_document): <<'FOO' should not escape anything.
-
-	* parse.y (here_document): bare << here-doc available, even though
-	  it's deprecated.
-
-	* file.c (rb_file_s_readlink): return value should be tainted.
-
-	* ext/etc/etc.c (setup_passwd): information (eg. GCOS name) should
-	  be tainted (modified at Perl Conference).
-
-Tue Nov 10 00:22:11 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* configure.in: elf support for FreeBSD 3.x
-
-Tue Nov 10 00:05:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): here document available in eval.
-
-Mon Nov  9 17:55:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c7 released.
-
-Fri Nov  6 19:25:27 1998  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
-
-	* sample/ruby-mode.el: font-lock patch.
-
-Thu Nov  5 15:42:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sample/README, lib/README: simple description for each file.
-
-Wed Nov  4 18:14:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (assign): attribute assignment should be called as public.
-
-Tue Nov  3 23:36:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_dump): dumps core for negative char value.
-
-	* regex.c (re_compile_pattern): out of boundary access for empty
-	  regexp.
-
-Mon Nov  2 22:54:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_aset): `str[str]' replaces first match.
-
-Mon Nov  2 18:24:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (thread_create): was accessing modified status.
-
-Sun Nov  1 01:18:52 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* gc.c (xrealloc): size 0 needs round up to 1.
-
-Sat Oct 31 23:18:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_split_method): negative LIMIT means number of
-	  split fields are unlimited, as in perl.
-
-	* string.c (rb_str_split_method): if LIMIT is unspecified,
-	  trailing null fields are stripped.
-
-Sat Oct 31 04:16:14 1998  Inaba Hiroto  <inaba@st.rim.or.jp>
-
-	* string.c (str_aref): regexp index SEGVed.
-
-Fri Oct 30 14:33:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (reg_match): returns nil for unmatch.
-
-	* dir.c (dir_entries): new method.
-
-	* eval.c (block_pass): do not push block, substitute it.
-
-Fri Oct 30 01:28:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* range.c (range_check): avoid <=> check for Fixnums.
-
-	* array.c (rb_ary_aset): accept negative index.
-
-Wed Oct 28 22:00:54 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): access out of boundary fixed.
-
-Wed Oct 28 11:37:42 1998  TAMITO  <tommy@valley.ne.jp>
-
-	* io.c (f_select): fd number comparison bug.
-
-Tue Oct 27 23:07:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sample/ruby-mode.el (ruby-parse-region): forgot to support %w()
-	  style array literal.
-
-	* eval.c (rb_eval): unused block raises warning.
-
-Mon Oct 26 09:37:53 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (dvar_asgn_push): dvar pushed too many times if
-	  variable-in-block first appear in loops.
-
-Sun Oct 25 22:59:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (set_list_bits): was using wrong offset.
-
-Thu Oct 22 00:07:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_obj_method): method retrieved from tainted object
-	  should be tainted too.
-
-	* eval.c (method_call): safe_level should be restored during
-	  Method#call.
-
-Wed Oct 21 14:21:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (Init_IO): new constants IO::SEEK_{SET,CUR,END}.
-
-	* io.c (rb_f_ungetc): ungetc pushes a char back into STDIN.
-
-Mon Oct 19 11:50:00 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
-
-	* ext/extmk.rb: Load '@top_srcdir@/lib/find.rb', not
-	  '../lib/find.rb'.
-
-	* ext/extmk.rb: Distinguish between `top_srcdir' and `topdir'.
-
-	* Makefile.in (CFLAGS): Add `-I.'.
-
-	* Makefile.in (lex.c): Give `@srcdir@/keywords' to gperf, not
-	  `keywords'.
-
-	* instruby.rb: Use `CONFIG["bindir"]', instead of `prefix + "/bin"'.
-
-	* instruby.rb: Use `CONFIG["libdir"]', instead of `prefix + "/lib"'.
-
-	* instruby.rb Use `CONFIG["mandir"]', instead of `prefix + "/man"'.
-
-	* instruby.rb (wdir): Add the variable to preserve the current
-	  working directory.
-
-	* instruby.rb: Chdir to wdir before install `config.h' and
-	  `rbconfig.rb'.
-
-Mon Oct 19 10:07:01 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
-
-	* eval.c (rb_eval): reduce recursive calls to rb_eval().
-
-Fri Oct 16 15:31:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_new_internal): timeval must be positive.
-
-Thu Oct 15 13:54:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (arg): local variables can be accessed within right side
-	  expression in assignment, notably in blocks.
-
-Wed Oct 14 00:18:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (Init_Array): Array#=== is now for equal check, not
-	  inclusion check.
-
-	* parse.y (when_args): `when a, *b' style new syntax for array
-	  expansion in `case'.
-
-Tue Oct 13 14:30:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (rb_obj_untaint): taint marks can be unset.
-
-	* eval.c (rb_eval): taint propagation for embedded strings.
-
-Mon Oct 12 13:27:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_call0): check stack depth more frequently.
-
-Mon Oct 12 08:08:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_p): can print even in secure mode.
-
-Sun Oct 11 22:50:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (rb_const_set): taint check for modification.
-
-	* variable.c (rb_ivar_set): taint check for modification.
-
-	* string.c (rb_str_modify): taint check for modification.
-
-	* hash.c (rb_hash_modify): taint check for modification.
-
-	* array.c (rb_ary_modify): taint check for modification.
-
-	* ruby.h (FL_TAINT): taint for all objects, not only strings.
-
-Fri Oct  9 17:01:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (read_all): read() returns "" at immediate EOF.
-
-	* io.c (io_read): read(nil) read all until EOF.
-
-Thu Oct  8 13:32:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_dump): marshal can dump Time object now.
-
-	* marshal.c (Init_marshal): rename marshal methods `_dump_to' to
-	  `_dump', `_load_from' to `_load'.
-
-	* parse.y (rb_intern): "+=".intern generates proper symbol.
-
-Mon Oct  5 18:31:53 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c6 released.
-
-Fri Oct  2 14:22:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_search): `/\s*(--)$/ =~ "- --"' did not match,
-	  because of wrong optimize condition.
-
-Mon Oct  1 01:55:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (rb_intern): should not raise exceptions.
-
-	* parse.y (yylex): symbol like `:foo?=' should not be allowed.
-
-	* ext/extmk.rb.in: makes *.a for static link modules.
-
-Wed Sep 30 14:13:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_start): supports making a subclass of the
-	  Thread class.
-
-Tue Sep 29 17:46:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_thread_join): join is now an instance method.
-
-Fri Sep 25 12:01:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): `@foo!' should be an error.
-
-Thu Sep 24 14:55:06 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* ext/etc/etc.c (Init_etc): wrong field definition.
-
-Thu Sep 17 17:09:05 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_reopen): was creating FILE* for wrong fd.
-
-Tue Sep 15 05:28:11 1998  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* regex.c (re_compile_pattern): forgot to fixup for the pattern
-	  like (?=(A)|(B)).
-
-Tue Sep 15 01:06:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (rb_io_gets_internal): do not set $_ by default, only
-	  gets/readline set the variable.
-
-	* eval.c (rb_f_load): load toplevel class is set to anonymous
-	  module if safe_level >= 5, to encapsulate modification.
-
-	* eval.c (rb_f_load): set frame properly.
-
-	* string.c (rb_str_each_line): do not set $_.
-
-Mon Sep 14 14:42:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): beginning and end of the string, do not
-	  automatically match `\b'.
-
-	* string.c (scan_once): consume at least on character.
-
-	* regex.c (re_search): wrong behavior for negative range.
-
-Sat Sep 12 21:21:26 1998  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* regex.c (re_search): range value should be maintained.
-
-Thu Sep 10 10:55:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (backref_error): yyerror does not understand formats.
-
-Tue Sep  8 18:05:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c5 released.
-
-Tue Sep  8 10:03:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_each_line): wrong line splitting with newline at
-	  top of the string.
-
-	* string.c: non bang methods return copied string.
-
-	* eval.c (f_END): needed to initialize frame->argc;
-
-Fri Sep  4 11:27:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (bigadd): proper sign combination.
-
-	* regex.c (re_search): wrong return value for \A.
-
-Thu Sep  3 14:08:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c4 released.
-
-Tue Sep  1 10:47:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (slow_search): do not compare llen and blen.  llen may
-	  be longer than blen, if little contains 0xff.
-
-	* regex.c (mbctab_euc): set 0x8e as multibyte character.
-
-	* string.c (str_inspect): mask character for octal output.
-
-Mon Aug 31 15:32:41 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_search): use calculated offset if exactn is the
-	  first opcode in the compiled regexp.
-
-	* regex.c (bm_search): use Boyer-Moore search for simple search.
-
-	* regex.c (must_instr): wrong length check if pattern includes
-	  byte escape by 0xff.
-
-	* regex.c (re_compile_pattern): need not to check current_mbctype.
-
-Sat Aug 29 16:31:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_check_safe_str): avoid calling rb_id2name() in normal
-	  cases to speed-up.
-
-	* eval.c (thread_raise): do not save context of terminated thread.
-
-	* regex.c (re_compile_pattern): mask \nnn over 256.
-
-Sat Aug 29 02:09:46 1998  Koji Arai  <JCA02266@nifty.ne.jp>
-
-	* sprintf.c (f_sprintf): wrong buffer size check.
-
-Fri Aug 28 01:57:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
-
-Fri Aug 28 12:25:33 1998  Hiroshi Igarashi  <igarashi@ueda.info.waseda.ac.jp>
-
-	* ruby.c (ruby_require_modules): load modules in appearing order.
-
-Fri Aug 28 01:57:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
-
-Thu Aug 27 12:54:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c3 released.
-
-Wed Aug 26 14:40:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): check whether ruby_class is properly set,
-	  before accessing it.
-
-	* eval.c (rb_obj_instance_eval): ruby_class should be Qnil for
-	  special objects like Fixnums.
-
-	* ext/tkutil/tkutil.c (Init_tkutil): removes calls to
-	  rb_yield_0().  used instance_eval() instead in the tk.rb.
-
-Wed Aug 26 11:47:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): pop non-greedy stack elements on success.
-
-Wed Aug 26 09:25:35 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ruby.h: add #define environ for cygwin32.
-
-Tue Aug 25 08:57:41 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (rb_ary_sort_bang): temporarily freeze sorting array.
-
-Mon Aug 24 18:46:44 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* dln.c (dln_find_1): path check was too strict.
-
-Mon Aug 24 15:28:11 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* parse.y (f_arglist): opt_nl added after f_args.
-
-Fri Aug 21 01:06:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c: grand renaming on socket.c.
-
-	* ext/socket/socket.c (inet_aton): supply inet_aton for those
-	  systems that do not have it.
-
-	* ext/socket/socket.c (setipaddr): use inet_aton instead of
-	  inet_addr.
-
-	* ext/socket/socket.c (tcp_s_gethostbyname): new method: works
-	  like Socket.gethostbyname but returning array contains ip-addrs
-	  as octet decimal string format like "127.0.0.1".
-
-	* ext/socket/socket.c (mkhostent): return format changed to
-	  [host, aliases, type, ipaddr..]  as documented.
-
-Wed Aug 19 00:31:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_ctl): forgot to place TRAP_END at right position.
-
-Fri Aug 14 11:01:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (call_trace_func): save __FILE__, __LINE__ before
-	  executing trace_func, since trace function should not corrupt
-	  line number information.
-
-Thu Aug 13 15:09:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (ary_s_new): was marking unallocated region on GC.
-
-Tue Aug 11 11:57:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c2 released.
-
-Mon Aug 10 14:05:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* process.c (f_system): removed fflush(stdin).
-
-Fri Aug  7 17:44:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* error.c (err_snprintf): replace sprintf for fixed sized buffer,
-	  with snprintf to avoid buffer over-run.  For systems which does
-	  dot provide snprintf, missing/snprintf.c added.
-
-Wed Aug  5 00:47:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (rb_reg_search): recycle match object.
-
-Mon Aug  3 09:17:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (rb_str_gsub_bang): do not allocate temporary string.
-
-	* string.c (rb_str_sub_bang): use inline replace.
-
-Wed Jul 29 00:36:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (hash_s_new): the default value can be specified.
-
-	* hash.c (hash_default): method to set the default value.
-
-	* hash.c (hash_aref): now returns the default value.
-
-Tue Jul 28 13:03:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (ary_s_new): argument to specify initial value is added.
-
-	* array.c (ary_s_new): specifies size, not capacity.
-
-Mon Jul 27 12:39:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_replace): zero fill for expansion gap.
-
-	* regex.c (mbctab_euc): set flags on for 0xA1-0xFE.  suggested by
-	  <inaba@st.rim.or.jp>.
-
-	* string.c (str_inspect): consider current_mbctype.
-
-Sun Jul 26 15:37:11 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* array.c (ary_s_new): Array.new(1<<30) dumps core.
-
-Fri Jul 24 13:40:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c1 released.
-
-Fri Jul 24 02:10:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c (r_bytes2): allocated buffer size was too short.
-
-	* marshal.c (w_object): saves all options, not only casefold flag.
-
-	* re.c (reg_clone): now copies options properly.
-
-	* re.c (reg_get_kcode): code number was wrong.
-
-Thu Jul 23 13:11:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_attr): argument should be symbol or string.
-
-Wed Jul 22 11:59:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (calculate_must_string): wrong offset added.
-
-Wed Jul 22 11:59:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* st.c (rehash): still had a GC problem.  fixed.
-
-Tue Jul 21 13:19:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (gc_mark_threads): crashed on GC before thread allocation.
-
-	* st.c (rehash): GC during rehash caused SEGV.
-
-Tue Jul 21 01:25:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sprintf.c (f_sprintf): integer formatter totally re-written.
-
-	* sprintf.c (remove_sign_bits): support uppercase hexadecimal.
-
-Sat Jul 18 00:14:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sprintf.c (f_sprintf): proper sign position for %X and %O.
-
-Fri Jul 17 14:10:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1c0 released.
-
-Fri Jul 17 08:01:49 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* process.c (f_exec): Check_SafeStr() added.
-
-	* process.c (f_system): Check_SafeStr() moved before fork().
-
-Thu Jul 16 22:58:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (scan_once): substrings to the block should not be
-	  tainted.  use reg_nth_match(), not str_substr().
-
-	* string.c (str_substr): needed to transfer taint.
-
-Thu Jul 16 16:15:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* gc.c (xmalloc): object allocation count added to GC trigger.
-
-	* eval.c (thread_save_context): avoid marking uninitialized stack
-	  in thread_mark.  GC may be triggered by REALLOC_N().
-
-Wed Jul 15 15:11:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_31.
-
-Wed Jul 15 15:05:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (thread_create): exit() and abort() in threads now
-	  forwarded to main_thread.
-
-Tue Jul 14 14:03:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (obj_instance_variables): list names that is not
-	  instance variables.
-
-	* gc.c (GC_MALLOC_LIMIT): choose smaller limit value.
-
-Mon Jul 13 12:39:38 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (str2cstr): should not return NULL.
-
-Fri Jul 10 11:51:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (gettable): needed to add dyna_in_block() check.
-
-Thu Jul  9 17:38:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_30.
-
-Thu Jul  9 16:01:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sprintf.c (fmt_setup): format specifier for long needed.
-
-	* sprintf.c (f_sprintf): ditto.
-
-	* numeric.c (fix2str): ditto.
-
-	* eval.c (thread_create): no more ITIMER_REAL.
-
-	* eval.c (thread_create): thread finalization needed before
-	  aborting thread if thread_abort is set.
-
-Wed Jul  8 18:17:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (big_pow): abandon power by bignum (too big).
-
-Tue Jul  7 13:58:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_catch): add C level catch/throw feature.
-
-Mon Jul  6 15:18:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (arg): proper return values for `||=' and `&&='.
-
-Fri Jul  3 16:05:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_29.
-
-Fri Jul  3 11:20:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c (r_byte): byte should not extend sign bit.
-
-	* numeric.c (fix_mul): use FIX2LONG() instead of FIX2INT() for
-	  64bit architectures.
-
-	* marshal.c (r_bytes): remove weird casting between pointer and int.
-
-	* process.c (proc_setsid): new method Process#setsid().
-
-Thu Jul  2 12:49:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* marshal.c (w_object): remove `write_bignum' label for 64bit
-	  architectures.
-
-	* marshal.c (r_bytes): needs int, not long.
-
-Wed Jul  1 14:21:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (flo_plus): should not allow addition with strings.
-
-Wed Jul  1 13:09:01 1998  Keiju ISHITSUKA  <keiju@rational.com>
-
-	* numeric.c (num_uminus): wrong coerce direction.
-
-Tue Jun 30 10:13:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (f_p): accepts arbitrary number of arguments.
-
-	* eval.c (rb_yield_0): there's some case that iterator_p() returns
-	  true even if the_block was not set.  check added.
-
-Tue Jun 30 01:05:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (BEGIN_CALLARGS): adjust the_block before evaluating the
-	  receiver's value and the arguments.
-
-Fri Jun 26 18:02:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_28.
-
-Fri Jun 26 11:01:26 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* string.c (str_aset_method): needed to convert to string.
-
-Thu Jun 25 02:05:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_search): optimize for `.*' at beginning of the
-	  pattern.
-
-	* regex.c (re_search): optimize for character class repeat at
-	  beginning of the pattern.
-
-	* regex.c (re_compile_pattern): detect optimization potential for
-	  the compiled patterns.
-
-Thu Jun 25 00:02:26 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* re.c (reg_s_new): flag value was wrong.
-
-Wed Jun 24 23:45:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_search): wrong anchor handling for reverse search.
-
-Wed Jun 24 02:18:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (mlhs): `((a,b)),c = [[1,2]],3' assigns a=1,b=2,c=3.
-
-Tue Jun 23 11:46:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): `&&=' and `||=' added.
-
-Sat Jun 20 02:53:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (assignable): nesting local variables should have higher
-	  priority than normal local variables for assignment too.
-
-Fri Jun 19 18:28:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_27.
-
-Fri Jun 19 14:34:49 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (assign): support hack for nested multiple assignment.
-
-	* parse.y (mlhs): nested multiple assignment.
-
-	* eval.c (rb_eval): in-block variables now honors static scope.
-
-	* configure.in: RSHIFT check moved to configure.
-
-Thu Jun 18 16:46:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_26.
-
-Thu Jun 18 13:37:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (file_s_ftype): uses lstat(2) instead of stat(2).
-
-	* dir.c (dir_s_glob): there can be buffer overrun, check added.
-
-	* eval.c (f_binding): handles in-block variables declared after
-	  binding's generation.
-
-	* numeric.c (flo_floor): floor, ceil, round added to Float.
-
-Wed Jun 17 11:20:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (gettable): nesting local variables should have higher
-	  priority than normal local variables.
-
-Tue Jun 16 12:30:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (str2inum): handles `+ddd'.
-
-	* struct.c (make_struct): name parameter can be nil for unnamed
-	  structures.
-
-Mon Jun 15 16:30:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (class_s_inherited): prohibiting to make subclass of
-	  class Class.
-
-	* object.c (module_s_new): support for making subclass of Module.
-
-	* parse.y (yycompile): clear eval_tree before compiling.
-
-Fri Jun 12 17:58:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (eval): write back the_dyna_var into the block.
-
-Thu Jun 11 18:19:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_25.
-
-	* eval.c (dvar_add_compiling): register dyna_var at compile time.
-
-	* regex.c (re_compile_pattern): RE_DUP_MAX iteration is too big.
-
-Wed Jun 10 15:12:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_eof): do not block other threads.
-
-	* signal.c (trap): reserve SIGALRM for thread.
-
-	* eval.c (thread_create): use ITIMER_REAL also to avoid system
-	  call blocking.
-
-	* io.c (f_syscall): add TRAP_BEG, TRAP_END around system calls.
-
-	* io.c (io_ctl): add TRAP_BEG, TRAP_END around system calls.
-
-	* enum.c (enum_collect): did not collect false values.
-
-	* array.c (ary_new2): forgot to initialize capa field.
-
-Tue Jun  9 18:36:15 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* string.c (str_split_method): split dumped core for "\xff".
-
-Tue Jun  9 16:22:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_24.
-
-Tue Jun  9 16:04:07 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/kconv/kconv.c (kconv_guess): more precise decision for EUC,
-	  using jless algorithm (3 sequential EUC hiragana characters).
-
-Tue Jun  9 15:12:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/kconv/kconv.c (kconv_guess): wrong guess for EUC as SJIS in
-	  some cases (0xe0 - 0xef).
-
-	* gc.c (xmalloc): insert size check for big (negative in signed)
-	  allocation size.
-
-Tue Jun  9 02:54:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/parsedate.rb: wday moved to the last in the return values.
-
-Mon Jun  8 10:40:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_split_method): split dumped core for "\0".
-
-Sat Jun  6 22:50:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (calculate_must_string): wrong condition for
-	  {start,stop}_nowidth.
-
-	* regex.c (re_match): various features imported from GNU regex.c
-	  0.12, such as nested grouping, avoiding infinite loop with empty
-	  match, etc.
-
-	* regex.c (register_info_type): now use union.
-
-	* regex.c (re_search): more precise anchor(^) check.
-
-Wed Jun  3 18:07:54 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (reg_raise): check rb_in_compile, not rb_in_eval.
-
-Mon Jun  1 05:26:06 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* string.c (trnext): casting to signed char* needed.
-
-Tue Jun  2 16:00:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c (udp_addrsetup): error check enhanced.
-
-	* ext/socket/socket.c (sock_s_getservbyaname): use strtoul(), if
-	  possible.
-
-Sat May 30 07:10:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (reg_prepare_re): no more needless regular expression
-	  recompile on casefold conditions.
-
-Thu May 28 18:02:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (nil_plus): no more `+' method for nil.
-
-Wed May 27 17:33:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (hash_fetch): new method.
-
-	* regex.c (re_search): check whether translate table is set.
-
-Tue May 26 11:39:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_23.
-
-	* parse.y (yylex): no UPLUS/UMINUS for 1st argument if
-	  parenthesises are omitted.
-
-Tue May 26 01:09:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): (?XI) for turns off the
-	  corresponding option.
-
-Mon May 25 12:38:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): inline i option (?i).
-
-	* regex.c (re_compile_pattern): inline x option (?x).
-
-	* regex.c (re_compile_pattern): x option for regexp.
-
-	* dir.c (dir_s_open): returns block's evaluated value.
-
-	* io.c (f_open): returns block's evaluated value.
-
-	* ext/curses/curses.c (curses_addstr): nil argument caused SEGV.
-
-Fri May 22 11:52:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): push mark on (?:), so that
-	  laststart check for {a,b} can be done.
-
-Thu May 21 17:31:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_match): wrong match (too non-greedy) for `{a,b}?'.
-
-	* io.c (io_lineno): new method IO#lineno, IO#lineno=.
-
-Wed May 20 06:04:43 1998  MAEDA shugo  <shugo@aianet.ne.jp>
-
-	* BeOS patch.
-
-Wed May 20 16:32:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (BIGDN): use RSHIFT(), instead of mere `>>'.
-
-Tue May 19 16:36:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_22.
-
-Tue May 19 16:31:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (assignable): specification changed for in-block
-	  variable definition.
-
-	* eval.c (dyna_var_asgn): error in in-block variables' compile
-	  time definition.
-
-	* parse.y (str_extend): wrong nesting detection.
-
-Tue May 19 09:47:55 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* numeric.c (num2int): re-defined (extensions may use this).
-
-Mon May 18 16:40:50 1998  MAEDA shugo  <shugo@aianet.ne.jp>
-
-	* error.c (get_syserr): BeOS support.
-
-	* configure.in: modified for BeOS.
-
-	* string.c (str_dump): do not call isascii().
-
-	* sprintf.c (remove_sign_bits): forgot to initialize end pointer.
-
-	* glob.c: #include <alloca.h> added.
-
-Mon May 18 14:52:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_21.
-
-Mon May 18 03:27:57 1998  MAEDA shugo  <shugo@aianet.ne.jp>
-
-	* file.c (file_s_expand_path): optional second argument
-	  `default_directory' added.
-
-Sat May 16 22:06:52 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* error.c (RAISE_ERROR): wrong error message
-
-Fri May 15 14:43:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_20.
-
-Thu May 14 14:44:21 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* sun4 cc patches for intern.h and regex.h.
-
-Thu May 14 14:03:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* random.c (RANDOM_MAX): guessing proper maximum value for random
-	  numbers.
-
-	* random.c (f_rand): use drand48 if possible.
-
-Wed May 13 19:05:20 1998  MAEDA shugo  <shugo@aianet.ne.jp>
-
-	* BeOS patches for io.c, error.c and config.guess.
-
-Wed May 13 14:56:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_19.
-
-	* most of the Mac and BeOS patches merged, except path separators.
-
-	* error.c (err_append): generated SyntaxError was String.
-
-	* ruby.h: xxx2INT, xxx2UINT checks values as int, not long.
-
-	* ruby.h: remove typedef's. INT, UINT, UCHAR, USHORT.
-
-Tue May 12 17:38:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_18.
-
-Tue May 12 11:38:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* error.c (syserr_errno): returns errno of the SystemCallError.
-
-	* error.c (rb_sys_fail): saves errno in the Exception.
-
-	* error.c (set_syserr): no need to protect syserr_list.
-
-	* error.c (rb_sys_fail): no more bufsize limit.
-
-	* error.c (set_syserr): integer value of errno can be accessed by
-	  Errno::EXXX::Errno.
-
-Sun May 10 03:10:33 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
-
-	* io.c (io_tell etc.): moved from File class to IO class.
-
-Fri May  8 12:26:37 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (pack_unpack): should be unsigned int (was signed int).
-
-Thu May  7 16:34:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* pack.c (pack_pack): `V', `N' uses newly created NUM2UINT().
-
-	* ruby.h (NUM2UINT): new macro.
-
-	* bignum.c (big2uint): try to convert bignum into UINT.
-
-	* re.c (reg_match): needed to return false for match with nil.
-
-	* gc.c (obj_free): wrong condition to free string.
-
-Wed May  6 21:08:08 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ruby.c (ruby_process_options): modified for DJGPP.
-
-Wed May  6 15:48:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_17.
-
-Wed May  6 01:37:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c: remove global variable `errat'.
-
-	* eval.c (rb_longjmp): embed error position information in the
-	  exception object.
-
-Sat May  2 12:20:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (reg_search): supports reverse search.
-
-	* string.c (str_index_method): does update $~ etc.
-
-	* eval.c (f_load): needed to clear the_dyna_vars.
-
-	* eval.c (dyna_var_asgn): do not push dyna_var, which is id == 0.
-
-	* error.c (Init_Exception): NotImplementError is no longer
-	  StandardError, which is not handled by default rescue.
-
-Fri May  1 00:35:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (proc_options): `-d' turns on verbose flag too.
-
-	* error.c (exception): last argument may be the superclass of the
-	  defining exception(s).
-
-	* io.c (Init_IO): EOFError is now subclass of the IOError.
-
-	* io.c (Init_IO): forgot to define IOError.
-
-	* error.c (Init_Exception): old Exception class renamed to
-	  StandardError.  Exception now replaces old GlobalExit.
-
-	* error.c (Init_Exception): Exception is now the root of the
-	  Global Exits.  There's no longer GlobalExit class.
-
-	* util.c (ruby_mktemp): check TMP, TMPDIR first.
-
-Thu Apr 30 01:08:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/tk.rb: call 'unknown', if proc not defined.
-
-	* eval.c (handle_rescue): default rescue handles `Exceptional' not
-	  only the instance of the `Exception's.
-
-	* eval.c (f_raise): exception can be any object.
-
-	* time.c (time_gm_or_local): call time_gmtime or time_localtime.
-
-	* eval.c (f_raise): raises TypeError if the class which is not a
-	  subclass of String is specified (checked in exc_new()).
-
-	* error.c (exc_new): need to check whether invalid class (not a
-	  subclass of String) is specified.
-
-Wed Apr 29 21:05:44 1998  WATANABE Hirofumi  <eban@os.rim.or.jp>
-
-	* ruby.c (proc_options): option '-e' via tempfile.
-
-Tue Apr 28 15:27:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_16.
-
-Tue Apr 28 00:07:38 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (obj_is_proc): type check predicate.
-
-	* eval.c (obj_is_block): ditto.
-
-Mon Apr 27 16:59:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/gtk/gtk.c (Init_gtk): use timeout, not idle to avoid
-	  consuming CPU too much.
-
-	* lib/tk.rb: use tcltklib#_invoke instead of `_eval'.
-
-Mon Apr 27 16:59:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (ary_sort): use dup, not clone.
-
-Mon Apr 27 13:46:27 1998  Tadahiro Maebashi  <maebashi@iij.ad.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_invoke): invoke tcl command
-	  directly.  need not worry about escaping tcl characters.
-
-Mon Apr 27 12:04:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* random.c (f_rand): do not call srand() implicitly.
-
-Fri Apr 24 14:35:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_15.
-
-	* parse.y (assignable): dyna_var_asgn actually defines nested
-	  local variables in outer context.
-
-	* random.c (f_rand): call srand(), if it has not called yet.
-
-	* random.c (f_srand): use tv_usec as the default seed.
-
-	* eval.c (rb_eval): values of nested local variables should be
-	  independent.
-
-	* eval.c (rb_yield_0): local variables wrong nested conditions.
-
-Wed Apr 22 23:27:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (select_get_io): get IO object by `to_io'.
-
-	* io.c (io_to_io): method to retrieve IO object, from delegating
-	  object for example.
-
-Wed Apr 22 16:52:37 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_14.
-
-	* string.c (str_modify): check for embedded pointer reference.
-
-	* gc.c (obj_free): ditto.
-
-	* pack.c (pack_pack): p/P template to embed pointers.
-
-Wed Apr 22 00:07:10 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* array.c (ary_rindex): embarrassing typo.
-
-Tue Apr 21 12:31:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_13.
-
-	* configure.in (RUBY_LIB): supports --program-{prefix,suffix}.
-
-	* array.c (ary_rindex): new method.
-
-	* io.c (io_binmode): should return self.
-
-Tue Apr 21 08:23:04 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* parse.y (here_document): calling parse_string with wrong
-	  arguments.
-
-	* struct.c (struct_aset): problem member assignment with name.
-
-Mon Apr 20 14:47:49 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_12.
-
-	* time.c (time_arg): args may be string (support for reduced
-	  implicit type conversion).
-
-	* lib/base64.rb: changed to use pack/unpack with `m' template.
-
-Mon Apr 20 06:23:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (mod_remove_const): new method.
-
-Sat Apr 18 03:53:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (hash_each_with_index): removed.  use Enumerable's
-	  each_with_index instead.
-
-	* class.c (rb_include_module): check for super modules, since
-	  module's included modules may be changed.
-
-Fri Apr 17 21:50:47 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* marshal.c (r_long): r_byte() may return signed byte.
-
-Fri Apr 17 11:58:30 1998  NAGAI Hidetoshi  <nagai@dumbo.ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (lib_mainloop): thread and interrupt check.
-
-Fri Apr 17 11:06:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (find_file): try to fopen() to check whether file exists.
-
-	* ruby.c (load_file): ditto.
-
-	* struct.c (struct_aset): struct member can be set by member name.
-
-Fri Apr 17 00:47:19 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/extmk.rb.in: added m68k-human support
-
-	* file.c (LOCK_SH): defines moved.
-
-	* array.c (ary_flatten_bang): simplified loop.
-
-Thu Apr 16 16:52:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_11.
-
-	* lib/tk.rb: thread support (experimental - maybe slow).
-
-	* eval.c (rb_longjmp): trace event on exception in raising
-	  context, just before raising exception.
-
-	* struct.c (struct_s_members): forgot to check singletons.
-
-	* struct.c (struct_aref): members can be accessed by names too.
-
-	* array.c (ary_flatten): new method.
-
-	* eval.c (rb_longjmp): prints exception information with `-d'.
-
-	* object.c (any_to_s): remove class name restriction.
-
-Thu Apr 16 01:38:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (thread_flock): do not block other threads.
-
-	* eval.c (thread_trap_eval): signals are now delivered to the
-	  current thread again.  In case that the current thread is dead,
-	  signals are forwarded to the main thread.
-
-	* string.c (str_new4): need not to duplicate frozen strings.
-
-Wed Apr 15 08:33:47 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* struct.c (struct_inspect): remove restriction for struct names.
-
-Wed Apr 15 02:55:02 1998  Kazuya 'Sharl' Masuda  <sharl@www.ufo.co.jp>
-
-	* x68 patches to config.sub, ext/extmk.rb.in
-
-Wed Apr 15 01:22:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_dup_frozen): do not duplicate frozen strings.
-
-	* parse.y (yylex): allow nested parenthesises.
-
-	* io.c (obj_displayln): prints newline after `display'ing the
-	  receiver.
-
-	* io.c (io_puts): avoid generating "\n" each time.  use RS_default
-	  instead.
-
-	* io.c (f_p): ditto.
-
-Tue Apr 14 22:18:17 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* struct.c (struct_aref): should not subtract negative index.
-
-Tue Apr 14 11:34:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_10.
-
-	* parse.y: token names prefixed by `t'.
-
-	* struct.c (struct_s_def): supports subclassing of Struct.
-
-	* io.c (io_s_new): supports subclassing of IO.
-
-Mon Apr 13 11:07:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (f_binding): need to restore method name.
-
-	* eval.c (rb_call0): raises SystemStackError, not Fatal.
-
-	* io.c (obj_display): same as `print self'.
-
-	* io.c (f_p): can now be called in the method form.
-
-	* re.c (reg_regsub): needed to be mbchar aware.
-
-Mon Apr 13 13:18:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (thread_trap_eval): all signals delivered to main_thread.
-
-Mon Apr 13 12:47:03 1998  TAKAHASHI Masayoshi  <maki@inac.co.jp>
-
-	* re.c (kcode_set_option): did not set SJIS on SJIS condition.
-
-Sun Apr 12 22:14:07 1998  Kazunori NISHI  <kazunori@swlab.csce.kyushu-u.ac.jp>
-
-	* array.c (ary_uniq_bang): should be `==', not `='. embarrassing.
-
-Sat Apr 11 02:13:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (ary_subseq): SEGVed for `[][1,1]'.
-
-Fri Apr 10 21:29:06 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* array.c (ary_subseq): add check for beg larger than array length.
-
-Wed Apr  8 17:24:11 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
-
-	* dir.c (dir_s_open): can be called with block (like IO#open).
-
-	* dir.c (dir_s_chdir): print directory path on error.
-
-	* dir.c (dir_s_chroot): ditto
-
-	* dir.c (Init_Dir): needed to override `new'.
-
-Thu Apr  9 18:24:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_09.
-
-	* string.c (str_cmp): do not depend on sentinel at the end of the
-	  strings.
-
-	* string.c (str_chomp_bang): forgot to set the sentinel.
-
-Wed Apr  8 00:59:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* bignum.c (big2int): converted int may be too big to fit in
-	  signed int.
-
-	* parse.y (arg): `foo += 1' should not cause an error.
-
-	* variable.c (rb_const_defined): returned false even if the
-	  constant is defined at the top level.
-
-	* eval.c (f_local_variables): dyna_var->id may be null.  should
-	  have checked before calling str_new2().
-
-Tue Apr  7 01:15:15 1998  Kaneko Naoshi  <wbs01621@mail.wbs.or.jp>
-
-	* re.c (reg_regsub): need to check string boundary.
-
-Tue Apr  7 19:19:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_cmp): returns either 1, 0, -1.
-
-	* array.c (ary_cmp): should check array length, too
-
-Tue Apr  7 18:50:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_08.
-
-Tue Apr  7 18:31:27 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* instruby.rb (mandir): dll installation for cygwin32
-
-Tue Apr  7 01:16:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* config.sub (maybe_os): TOWNS support?
-
-	* config.guess: too strict check for libc versions on linuxes.
-
-	* experimental release 1.1b9_07.
-
-	* array.c (ary_cmp): compare each element using `<=>'.
-
-	* hash.c (hash_each_with_index): yields [value, key] pair.
-
-	* class.c (class_protected_instance_methods): list protected
-	  method names.
-
-	* class.c (ins_methods_i): exclude protected methods.
-
-	* eval.c (PUSH_BLOCK): dynamic variables can be accessed from
-	  eval() with bindings.
-
-Mon Apr  6 14:49:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (thread_yield): must return evaluated value.
-
-Fri Apr  3 13:07:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (thread_schedule): context switch bypassed on wrong
-	  conditions.
-
-	* variable.c (rb_name_class): set classname by id before String
-	  class is initialized (1.0 behavior restored).
-
-Fri Apr  3 11:25:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (num2int): no implicit conversion from string.
-
-	* numeric.c (num2int): check whether `to_i' returns an Integer.
-
-	* numeric.c (num_zero_p): new method.
-
-	* numeric.c (num_nonzero_p): new method.  returns the receiver if
-	  it's not zero.
-
-	* eval.c (obj_instance_eval): the_class should be the object's
-	  singleton class.
-
-	* error.c (exc_s_new): message is converted into a string.
-
-Thu Apr  2 18:31:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (obj_call_init): every object call `initialize'.
-
-Wed Apr  1 08:51:53 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* parse.y (stmt): UNTIL_MOD should be for stmt, not only for expr.
-
-Wed Apr  1 01:20:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (true_and): boolean operators &, | and ^.
-
-Tue Mar 31 13:23:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (ary_compact_bang): returns nil, if it does not modify
-	  the array like String's bang methods.
-
-	* array.c (ary_uniq_bang): new method to remove duplicate items.
-
-	* eval.c (bind_s_new): new method.
-
-	* numeric.c (num2int): raise exception if Fixnums too big to
-	  convert into `int' in case that sizeof(int) < sizeof(INT).
-
-	* string.c (str_center): SEGV on negative width.
-
-	* eval.c (eval): forgot to set sourcefile.
-
-Mon Mar 30 11:12:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (f_test): raises exception for unknown command.
-
-	* eval.c (Init_eval): `class_eval': alias to the module_eval.
-
-Mon Mar 30 18:50:42 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* string.c (str_capitalize_bang): did not check string modification.
-
-	* string.c (str_delete_bang): wrong conversion.
-
-	* string.c (str_intern): typo in error message.
-
-Mon Mar 30 01:44:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (obj_instance_eval): accepts block as evaluation body.
-	  No compilation needed each time.
-
-	* eval.c (mod_module_eval): ditto
-
-	* file.c (file_s_umask): umask did not return old values, if no
-	  argument given.
-
-Sun Mar 29 00:54:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (f_throw): nil returned always.
-
-Sat Mar 28 20:40:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_06.
-
-Sat Mar 28 16:07:11 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* io.c (io_closed): should not cause exception for closed IO.
-
-	* string.c (str_tr): returned nil for success.
-
-Sat Mar 28 00:47:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (f_local_variables): new method to return an array of
-	  local variable names.
-
-	* variable.c (obj_instance_variables): now returns an array of
-	  variable names, as described in the reference.
-
-	* eval.c (rb_attr): honors default method visibility of the
-	  current scope.
-
-Fri Mar 27 13:49:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_05.
-
-	* ruby.c (ruby_prog_init): `site_ruby' added to load_path.
-
-	* ruby.c (ruby_prog_init): load-path order changed.  Paths in
-	  the RUBYLIB environment variable comes first in non-tainted
-	  mode.
-
-Thu Mar 26 11:51:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_call): new feature: `protected' methods.
-
-	* string.c (str_dump): new method.
-
-	* eval.c (block_pass): block argument can be nil, which means no
-	  block is supplied for the method.
-
-Wed Mar 25 21:20:13 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* string.c (str_reverse_bang): string copied to wrong place.
-
-Wed Mar 25 08:12:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (flo_modulo): caused SEGV if left operand is not a
-	  float value.
-
-	* eval.c (f_eval): optional third and fourth argument to specify
-	  file-name and line-number.
-
-	* eval.c (eval): file-name and line-number set properly.
-
-	* parse.y (assign_in_cond): literal assignment is now warning, not
-	  compile error.
-
-	* error.c (Warn): Warn() always print message, OTOH Waring()
-	  prints when verbose flag is set.
-
-Tue Mar 24 12:50:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (ruby_prog_init): `.' should come last in the load-path.
-
-	* eval.c (Init_eval): `__send__', alias for `send'.
-
-Mon Mar 23 12:44:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_chomp_bang): now takes `rs' as an argument.
-
-	* eval.c (thread_free): main_thread should not be freed.
-
-Fri Mar 20 16:40:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_chomp_bang): chomp! (and other ! methods) returns
-	  nil if it does not modify the string.
-
-	* string.c (str_sub_iter_s): should check last pattern since it
-	  may be matched to null.
-
-Thu Mar 19 13:48:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_04.
-
-	* parse.y (yylex): `10e0.9' should cause syntax error.
-
-Wed Mar 18 17:46:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (load_file): new file object constant DATA.  Only
-	  available for the script from the file.
-
-	* regex.c (re_match): forwarding failure point popped too much.
-
-Tue Mar 17 18:23:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* math.c (math_frexp): newly added.
-
-	* math.c (math_ldexp): ditto.
-
-	* bignum.c (bigdivmod): calculates modulo.
-
-	* numeric.c (fix_remainder): returns reminder, formerly introduced
-	  as modulo.
-
-	* numeric.c (fix_modulo): calculates proper `modulo'.
-
-	* bignum.c (bigdivmod): wrong sign for reminder.
-
-Mon Mar 16 17:07:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_03.
-
-Mon Mar 16 16:33:53 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* io.c (pipe_finalize): needed to add pipe_finalize to pipes on
-	  cygwin32.
-
-Mon Mar 16 14:11:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (ins_methods_i): needed to consider NOEX_UNDEF.
-
-Mon Mar 16 13:23:53 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* io.c (io_check_closed): check for `fptr->f2 == NULL'.
-
-	* io.c (io_fptr_close): ditto.
-
-Mon Mar 16 11:49:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (pipe_atexit): free()ing referencing pipe_list.
-
-	* range.c (range_length): returns zero, if the first is greater
-	  than the last.
-
-	* signal.c (trap_restore_mask): restore signal mask before raising
-	  exceptions and throws.
-
-Fri Mar 13 13:49:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_02.
-
-	* object.c (mod_clone): need to dups constants and instance
-	  variables.
-
-	* eval.c (rb_eval): forgot to initialize body for NODE_DEFS.
-
-	* eval.c (rb_eval): retrieve self from calling frame, since self
-	  changes sometimes.
-
-	* env.h (FRAME): need to save self in the calling frame.
-
-	* io.c (f_gets_method): rs should be initialized by RS.
-
-Thu Mar 12 15:33:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* experimental release 1.1b9_01.
-
-	* range.c (range_s_new): check values by `first <= last'.
-
-	* parse.y (lastline_set): fixed offset for $_ and $~ in the local
-	  variable space.
-
-Wed Mar 11 02:14:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_gets): handle normal case specially for speed.
-
-	* eval.c (rb_disable_super): function to disable superclass's
-	  method explicitly.
-
-	* eval.c (rb_eval): inherits previous method definition's
-	  NOEX_UNDEF-ness, if exists.
-
-	* class.c (rb_define_method): disables superclass's overriding
-	  method by default.
-
-Wed Mar 11 01:40:48 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
-
-	* numeric.c (flo_gt,etc.): do not depend on `<=>', to handle NaN.
-
-Tue Mar 10 00:03:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (load_file): understands multiple options in #! line.
-
-	* regex.c (re_compile_pattern): support for [:alpha:] etc.
-
-Mon Mar  9 16:53:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.h (GetOpenFile): embed io_check_closed in GetOpenFile.
-
-	* sprintf.c (f_sprintf): zero padding failed for negative
-	  integers.
-
-	* sprintf.c (remove_sign_bits): failed to remove some bits.
-
-Sat Mar  7 21:51:46 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
-
-	* class.c (ins_methods_i): body may be NULL for some case.
-
-Fri Mar  6 17:23:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (mbcinit): table driven mbchar detection.
-
-	* object.c (obj_alloc): check for allocating instance for the
-	  primitive classes (mostly perfect).
-
-	* ext/curses/curses.c (curses_finalize): restore original state at
-	  interpreter termination.
-
-	* ext/curses/curses.c (curses_addstr): forgot to check argument
-	  type (caused SEGV).  now uses STR2CSTR() macro.
-
-Thu Mar  5 13:47:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (block_pass): accepts method object as block args.
-
-	* eval.c (f_missing): use any_to_s() for stringify.
-
-Wed Mar  4 01:39:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (block_arg): new syntax - block argument in the
-	  calling arglist.
-
-	* eval.c (rb_call): no module search. simplified a lot.
-
-	* eval.c (rb_eval): block arg support.
-
-	* parse.y (f_block_arg): new syntax - block argument in the
-	  formal arglist.
-
-Tue Mar  3 14:20:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (obj_method): returns bound method object.
-
-	* eval.c (rb_call): argument check for empty methods.
-
-	* ruby.h (NUM2CHR): new macro, originally from curses module.
-
-Tue Mar  3 13:03:35 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
-
-	* io.c (io_putc): new method.
-
-Tue Mar  3 11:21:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_inspect): more strict charcode detection.
-
-	* eval.c (thread_stop): stopping only thread raises ThreadError
-	  exception.
-
-Tue Mar  3 08:04:56 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
-
-	* struct.c (struct_alloc): incomplete struct initialization made
-	  GC to access unallocated addresses.
-
-Mon Mar  2 16:28:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (thread_stop_method): remove Thread#stop.
-
-Fri Feb 27 18:16:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b9 released.
-
-Fri Feb 27 09:36:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (hash_delete_nil): needed to compare value to nil, since
-	  nil is the valid key for hashes.
-
-	* hash.c (hash_foreach_iter): rehashing causes IndexError.
-
-	* hash.c (hash_foreach_iter): rehash check by pointer comparison.
-
-Thu Feb 26 17:22:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (fname): convert reswords into symbols.
-
-	* parse.y (reswords): reserved words are now embedded in the
-	  syntax (sigh).
-
-	* parse.y: now reserved words can be method names safely.
-
-Wed Feb 25 15:50:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (mod_module_eval): clear the_scope's PRIVATE flag before
-	  calling eval().
-
-	* gc.c (gc_call_finalizer_at_exit): run finalizers before any data
-	  object being freed.
-
-	* eval.c (rb_eval): needed to keep prot_tag->retval before
-	  evaluating the ensure clause.
-
-Tue Feb 24 11:16:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): reserved words can be appear as method names at
-	  right after 'def' and `.'(dot), like foo.next.
-
-	* eval.c (return_check): checks for return out of thread (formerly
-	  done in return_value).
-
-	* eval.c (POP_TAG): copy retval to outer level.
-
-	* eval.c (return_value): just set retval, no check, no unwinding.
-
-	* parse.y (nextc): line continuation by backslash at end of line.
-
-	* regex.c (re_compile_pattern): forgot to clear pending_exact on
-	  closing parentheses.
-
-	* parse.y (assignable): should not assign dyna_var to true, if it
-	  is already defined.
-
-Mon Feb 23 14:35:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (obj_is_kind_of): no longer accepts true/false/nil.
-
-	* object.c ({true,false,nil}_to_i): can be converted into integers.
-
-Mon Feb 23 12:11:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (reg_s_quote): needed to be mbchar aware.
-
-	* eval.c (proc_s_new): wrong iter mark.
-
-Sat Feb 21 22:59:30 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
-
-	* io.c (f_syscall): no argument check.
-
-Fri Feb 20 10:17:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b8 released.
-
-	* ext/kconv/kconv.c (kconv_kconv): default output code now be
-	  determined according to the value of $KCODE.
-
-	* re.c (rb_get_kcode): can retrieve $KCODE from C code.
-
-	* parse.y (stmt): if/unless modifiers returns nil, if condition is
-	  not established.
-
-Thu Feb 19 11:06:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/kconv/kconv.c (kconv_kconv): charcode can be specified by
-	  code name (JIS, SJIS, EUC like value of $KCODE).
-
-	* regex.c (re_compile_pattern): forgot to fixup_jump for (?:..).
-
-	* regex.c (re_compile_pattern): needed to clear pending_exact on
-	  non-registering grouping (?:...).
-
-Wed Feb 18 19:54:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (here_document): needed to set lex_state to EXPR_END.
-
-Wed Feb 18 18:45:10 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* patches for cygwin32 applied.
-
-Wed Feb 18 00:41:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_sub_s): needed to be mbchar aware to increment one
-	  character.
-
-	* regex.c (re_match): \Z matches newline just before the end of
-	  the string.
-
-Tue Feb 17 00:04:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_arg): Time.gm and Time.local now understands
-	  Time#to_a format.
-
-	* string.c (str_sub_s): replace happened twice for null pattern.
-
-	* regex.c (re_search): null pattern should not match after newline
-	  at the end of string.
-
-	* time.c (time_isdst): now returns boolean value.
-
-	* error.c (rb_check_type): treat special constants in messages.
-
-	* parse.y (yylex): new form `::Const' to see toplevel constants.
-
-	* parse.y (cond): SEGV on `if ()'.
-
-	* gc.c (obj_free): some data needed explicit free().
-
-Mon Feb 16 23:55:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (blk_free): release duplicated block informations.
-
-	* eval.c (blk_copy_prev): duplicate outer block information into
-	  the heap, when proc/binding created.
-
-Mon Feb 16 14:38:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_mon): now 1 for January and so on.
-
-	* time.c (time_year): year in 19xx (no + 1900 needed anymore).
-
-Mon Feb 16 13:28:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): need to fetch mbchar's second byte
-	  without translation.
-
-Mon Feb 16 12:29:27 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
-
-	* eval.c (f_pass_block): pass iterator block to other method.
-
-Fri Feb 13 08:16:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (parse_regx): handle \s before read_escape().
-
-	* parse.y (read_escape): `\s' in strings as space.
-
-Tue Feb 10 17:29:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b7 released.
-
-	* string.c (str_aset): string insertion by `str[n] = str2'.
-
-	* string.c (str_oct): does recognize `0x'.
-
-	* sprintf.c (f_sprintf): use base 10 for conversion from string to
-	  integer.
-
-Mon Feb  9 14:51:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* numeric.c (do_coerce): proper error message.
-
-	* string.c (str_sum): bug - masked by wrong value. (sigh..)
-
-Sat Feb  7 15:11:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_empty): new method
-
-Fri Feb  6 01:42:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c (time_asctime): use asctime(3), not strftime(3).
-
-Thu Feb  5 18:58:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_fptr_close): do not free path on close().
-
-	* array.c (ary_filter): new method.
-
-	* enum.c (enum_each_with_index): new method.
-
-Thu Feb  5 14:10:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (primary): singleton class def can be appeared inside
-	  method bodies.
-
-	* hash.c (hash_replace): replace content.
-
-	* string.c (str_replace_method): replace content.
-
-	* array.c (ary_replace_method): replace elements.
-
-	* string.c (str_succ_bang): String#succ!
-
-Thu Feb  5 18:20:30 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* string.c (str_upcase_bang): multi byte character support.
-
-Wed Feb  4 13:55:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (ary_reverse): SEGV on empty array reverse.
-
-Tue Feb  3 12:24:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (match_to_a): non matching element should be nil.
-
-	* ruby.c (ruby_load_script): load script after all initialization.
-
-	* bignum.c (str2inum): need to interpret prefix `0' of `0x'.
-
-Tue Feb  3 10:00:18 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* numeric.c (fix_rshift): use `sizeof(INT)*8' instead of 32.
-
-Mon Feb  2 14:09:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (set_arg0): grab environment region too.
-
-Thu Jan 29 18:36:25 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* process.c (rb_proc_exec): check `sh' to be exist.
-
-Thu Jan 29 18:18:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_stdio_set): assignment to $stdin or $stdout does
-	  reopen() as well as $stderr.
-
-Thu Jan 29 14:18:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (mod_ancestors): should not include singleton classes.
-
-	* object.c (obj_type): should not return internal class.
-
-	* io.c (io_reopen): unwillingly closes stdio streams.
-
-Thu Jan 29 11:50:35 1998  Toshihiko SHIMOKAWA  <toshi@csce.kyushu-u.ac.jp>
-
-	* ext/socket/socket.c (udp_addrsetup): forgot to use htons().
-
-Tue Jan 27 23:15:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* keywords: __FILE__, __LINE__ are available again.
-
-Fri Jan 23 14:19:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b6 released.
-
-	* object.c (mod_to_s): need to duplicate classpath.
-
-	* error.c (exc_inspect): need to duplicate classpath.
-
-Thu Jan 22 00:37:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.h (STR2CSTR): new macro to retrieve char*.
-
-	* class.c (rb_define_method): `initialize' should always be
-	  private, even if it defined by C extensions.
-
-	* eval.c (rb_eval): `initialize' should always be private.
-
-Thu Jan 22 16:21:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): some singleton class def cause SEGV.
-
-	* eval.c (TMP_ALLOC): replace ALLOCA_N, where thread context
-	  switch may happen.
-
-Wed Jan 21 01:43:42 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (PUSH_FRAME): do not use ALLOCA_N().  crash on some
-	  platforms that use missing/alloca.c.
-
-	* regex.c (re_compile_pattern): too many pops for non register
-	  subexpr.
-
-	* parse.y (yylex): open parentheses after identifiers are argument
-	  list, even if whitespaces have seen.
-
-Tue Jan 20 15:19:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (terms): quoted word list by %w(a b c).
-
-	* ext/tcltklib/extconf.rb: more accurate check for tcl/tk libs.
-
-	* file.c (rb_stat): most of the FileTest methods (and function
-	  `test') accept File objects as the argument.
-
-Tue Jan 19 18:19:24 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/extmk.rb.in (install): there should be no newline after install:
-
-	* re.c (MIN): renamed from min().  there's a local variable named
-	  min in the file, so that some cpp will raise an error.
-
-Mon Jan 19 16:30:05 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b5 released.
-
-	* process.c (rb_syswait): no exception raised.
-
-Fri Jan 16 00:43:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.h (CLONESETUP): copies its singleton classes too.
-
-	* class.c (singleton_class_attached): saves binded object in the
-	  singleton classes.
-
-	* eval.c (rb_eval): calls singleton_method_added even in the
-	  singleton class clauses.
-
-Fri Jan 15 23:22:43 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ruby.c (proc_options): -S does not recognize PATH.
-
-Thu Jan 15 02:03:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_clear_cache_by_id): clear only affected cache
-	  entries.
-
-Wed Jan 14 02:14:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c: new UDP/IP socket classes.
-
-Tue Jan 13 10:00:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_cmp): ignorecase($=) works wrong.
-
-Fri Jan  9 13:19:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b4 released.
-
-	* eval.c (f_missing): class name omitted from the error message.
-
-	* error.c (exc_inspect): description changed.
-
-	* string.c (Init_String): GlobalExit's superclass did not filled,
-	  since GlobalExit created earlier than String.
-
-Thu Jan  8 12:10:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (aryset): expr in the brackets can be null.
-
-Wed Jan  7 21:13:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_reopen): keep stderr unclosed.
-
-	* io.c (io_errset): keep stderr unclosed.
-
-Tue Jan  6 00:27:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y: syntax modified for `while expr do .. end' etc.
-
-	* process.c (f_exec,f_system): can supply arbitrary name for the
-	  new process.
-
-Mon Jan  5 16:59:13 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* file.c (file_s_basename): removes any extension by ".*".
-
-Sun Jan  4 19:36:22 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* parse.y (yylex): needed to update lex_p (reading point).
-
-Sat Jan  3 19:14:14 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* class.c,object.c: duplicate defines mKernel and cFinxnum.
-
-Fri Jan  2 20:38:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/curses/curses.c (NUM2CHAR): uses the first character for
-	  string arguments.
-
-	* array.c (ary_fill): did not extend array for ranges.
-
-	* array.c (beg_len): did not return end pos bigger than size.
-
-Fri Jan  2 02:09:16 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* dir.c (dir_s_chdir): bug in nil check.
-
-	* array.c (ary_fill): bug in nil check.
-
-Tue Dec 30 11:46:23 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* hash.c (env_path_tainted): checks directories in PATH
-	  environment variable are not world writable.
-
-	* ruby.c (load_file): invoke specified interpreter if the #! line
-	  does not contain the word `ruby'.
-
-Fri Dec 26 03:26:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (uscore_get): type information included in the error
-	  message.
-
-	* variable.c (f_untrace_var): does not free trace-data within
-	  trace procedure.
-
-Thu Dec 25 02:50:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b3 released.
-
-	* ruby.h: inlining some functions on gcc 2.x
-
-Tue Dec 23 02:47:33 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): public/private information kept in the current
-	  scope, to remove undesired state from the class/module.
-
-	* time.c (time_strftime): remove hidden limit of 100 bytes of
-	  result string, using malloc'ed buffer.
-
-	* hash.c (hash_update): merges the contents of another hash,
-	  overriding existing keys.
-
-	* regex.c (must_instr): totally re-written.
-
-	* io.c (read_all): try to allocate proper sized buffer using
-	  fstat(2) for speedup.
-
-Sat Dec 20 00:27:28 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (must_instr): need to skip 2 bytes for mbchars.
-
-Fri Dec 19 01:18:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b2 released.
-
-	* eval.c (check_errat): check and convert (if necessary) traceback
-	  information before assigning to the variable $@.
-
-	* eval.c (f_raise): optional third argument to specify traceback
-	  information.
-
-	* io.c (f_open): prevent infinite recursive call.
-
-Thu Dec 18 19:33:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_rindex): now accepts regexp as index.
-
-Thu Dec 18 18:42:50 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/socket/extconf.rb: modified to detect win32 socket lib.
-
-Thu Dec 18 00:25:03 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (reg_equal): checks for source and casefold and kcode matching.
-
-	* marshal.c: became built-in module.
-
-	* ext/marshal/marshal.c (r_object): displays struct name for
-	  non-compatible struct.
-
-	* string.c (str_index_method): now searches character (fixnum) in
-	  the string.
-
-	* string.c (str_include): redefine `include?'.
-
-	* regex.c (re_match): start_nowidth saves current stack position
-	  to stop_nowidth.
-
-	* regex.c (re_compile_pattern): add space to stop_nowidth to save
-	  runtime stack position.
-
-Tue Dec 16 14:57:43 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (scan_once): wrong exception for regexp that match with
-	  null string (use substr instead of subseq).
-
-Sat Dec 13 00:13:32 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (expr): remove bare assocs from expr rule.
-
-	* rbconfig.rb: renamed from config.rb (it was too generic name).
-
-Fri Dec 12 00:50:25 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (expr): warns if BEGIN or END appear in the method
-	  bodies.
-
-	* string.c (str_match): calls y =~ x if y is neither String nor
-	  Regexp so that eregex.rb works.
-
-	* eval.c (f_at_exit): to register end proc.
-
-	* class.c (rb_define_module_function): define 'function' method
-	  for the Module, not private method.
-
-	* class.c (rb_define_function): function to define `function' method.
-
-	* eval.c (rb_eval): inherit visibility from superclass's method
-	  except when it is set to `function'
-
-	* eval.c (rb_eval): new visibility status `function'.
-
-	* parse.y (yycompile): do not clear eval_tree. thus enable multiple
-	  command line script by option `-e'.
-
-	* eval.c (rb_eval): END execute just once.
-
-	* parse.y (expr): BEGIN/END built in the syntax.
-
-Thu Dec 11 13:14:35 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (mod_le): Module (or Class) comparison.
-
-	* eval.c (rb_remove_method): raises NameError if named method does
-	  not exist.
-
-	* ext/curses/curses.c: remove CHECK macro for BSD curses.
-
-Thu Dec 11 12:44:01 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* pack.c: sun4 cc patch
-
-Wed Dec 10 15:21:36 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/marshal/marshal.c (marshal_load): can supply evolution proc
-	  object as optional second argument.
-
-	* re.c (reg_source): get source string of the regular expression.
-
-Tue Dec  9 10:05:17 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b1 released.
-
-	* parse.y (tokadd): token buffer overrun.
-
-	* ruby.c (ruby_prog_init): forgot to protect rb_argv0 from gc.
-
-	* eval.c (ruby_run): call finalizers at process termination.
-
-	* gc.c (gc_call_finalizer_at_exit): call free proc for every Data
-	  Wrapper, and finalizer for specified objects at termination.
-
-	* version.c (show_version): version format changed.
-
-	* regex.c (re_match): wrong match with non-greedy if they appear
-	  more than once in regular expressions.
-
-	* sample/ruby-mode.el (ruby-expr-beg): forgot to handle modifiers.
-
-Mon Dec  8 19:00:15 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_puts): just put a newline if no argument given.
-
-	* ext/tcltklib/tcltklib.c (lib_mainloop): thread-aware tk handle
-	  when $tk_thread_safe is set.
-
-	* ext/tcltklib/tcltklib.c (lib_mainloop): use Tcl_DoOneEvent()
-	  instead of Tk_MainLoop().
-
-Mon Dec  6 07:11:16 1997  MAEDA shugo  <shugo@po.aianet.ne.jp>
-
-	* io.c (io_puts): core dumped without any argument.
-
-Fri Dec  5 18:17:17 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (mod_remove_method): remove (not undef) a method from the
-	  class/module.
-
-	* variable.c (obj_remove_instance_variable): method to remove
-	  instance variables.
-
-Thu Dec  4 13:50:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1b0 released.
-
-	* string.c (str_aref): called str_index for regexp.
-
-Mon Dec  1 15:24:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* compar.c (cmp_between): wrong comparison made.
-
-Wed Nov 26 18:18:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* lib/mkmf.rb: generate Makefile for extension modules out of ruby
-	  source tree. use like `ruby -r mkmf extconf.rb'.
-
-	* numeric.c (fix2str): enlarge buffer to prevent overflow on some
-	  machines.
-
-	* parse.y (here_document): wrong line number generated after here-doc.
-
-Fri Nov 21 13:17:12 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (yylex): skip multibyte characters in comments.
-
-Wed Nov 19 17:19:20 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (nil_to_a): nil.to_a => [].
-
-	* parse.y (call_args): wrong node generation.
-
-Tue Nov 18 10:13:08 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* array.c (Init_Array): Array#=== works as Array#include?
-
-	* regex.c (re_compile_pattern): insert initialize code for jump_n,
-	  before entering loops.
-
-	* re.c (reg_search): does not save registers unless $& etc appear
-	  in the script.
-
-Mon Nov 17 13:01:43 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (is_defined): add defined? check for receivers and
-	  arguments for calls.
-
-	* re.c (reg_search): cache last match object.
-
-	* re.c (match_aref): $[0] etc. are available.
-
-Sat Nov 15 00:11:36 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* io.c (io_s_popen): "rb" detection
-
-Fri Nov 14 18:28:40 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (scan_once): returns whole match if the pattern does
-	  not contain any parentheses.
-
-Thu Nov 13 14:39:06 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (str_sub): returns copy of the receiver string, even if
-	  any substitution occurred.
-
-	* regex.c (re_compile_pattern): no-width match by (?=..), (?!..).
-
-Wed Nov 12 13:44:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* time.c: remove coerce from Time class.
-
-	* regex.c (re_match): non-greedy match by ??, *? +?, {n,m}?.
-
-Mon Nov 10 11:24:51 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): non-registering parens (?:..).
-
-	* regex.c (re_compile_pattern): new meta character \< (wordbeg)
-	  and \> (wordend).
-
-	* regex.c (re_compile_pattern): embedded comment for regular
-	  expression by (?#...).
-
-Fri Nov  7 16:58:24 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* regex.c (re_compile_pattern): perl5 regexp \A and \Z available.
-
-	* regex.c (re_compile_pattern): can expand compile stack dynamically.
-
-	* regex.c (PUSH_FAILURE_POINT): wrong compare condition.
-
-Wed Nov  2 16:00:00 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* string.c (str_sub_s): "".sub! "", "" => "\000"
-
-Fri Oct 31 15:52:10 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (assoc): keyword assoc like {fg->"black"}.
-
-Thu Oct 30 17:33:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_println): print with newline, which is not affected by
-	  the values of $/ and $\.
-
-Thu Oct 30 16:54:01 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* string.c (str_chop_bang): "".chop caused SEGV.
-
-	* string.c (str_chomp_bang): method to chop out last newline.
-
-Mon Oct 27 13:49:13 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/extmk.rb.in: library may have pathname contains `.'
-
-	* eval.c (rb_rescue): should not protect SystemError.
-
-Fri Oct 24 10:58:53 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_s_with_open_stream): ensures to close stream.
-
-Thu Oct 23 11:17:44 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_errset): value of $stderr can be changed (to any IO
-	  object).
-
-	* io.c (next_argv): $< can be anything that responds to `write'.
-
-	* file.c (file_s_with_open_file): ensures to close file.
-
-	* error.c (exception): create error under the current class/module.
-
-	* range.c (range_eqq): fixnum check for last needed too.
-
-Wed Oct 22 12:52:30 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/socket/socket.c: Socket::Constants added.
-
-	* file.c: File::Constants added for inclusion.
-
-	* array.c (ary_join): call ary_join() recursively for the 1st
-	  array element.
-
-Mon Oct 20 12:18:29 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ruby.c (load_file): wrong condition for #! check with -x.
-
-	* file.c (file_s_dirname): did return "" for "/a".
-
-Fri Oct 17 14:29:09 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c: now works on alpha-linux.
-
-	* bignum.c (bigadd): some undefined side effect order assumed.
-
-Wed Oct 15 17:49:24 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* intern.h: function prototypes added.
-
-Mon Oct 13 16:54:18 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (rb_define_class_id): call superclass's `inherited'
-	  method when making subclasses.
-
-	* parse.y (nextc): clear lex_lastline at the end of file.
-
-	* object.c (Init_Object): need to undef Class#append_features.
-
-	* eval.c (rb_eval): no warning on extending classes or modules.
-
-Thu Oct  9 11:17:50 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (error_print): the exception name follows after the error
-	  message.
-
-	* eval.c (compile_error): error message slightly changed.
-
-	* parse.y (nextc): script parsing will be terminated by __END__ at
-	  beginning of line.
-
-	* eval.c (compile_error): `__END__' is no longer a keyword.
-
-	* parse.y (nextc): protect lastline read from script stream.
-
-Tue Oct  7 14:06:06 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha9 released.
-
-	* eval.c (mod_append_features): renamed from extend_class.
-
-	* eval.c (rb_eval): defining method calls `method_added'.
-
-	* eval.c (ruby_options): exception while processing options must
-	  terminate the interpreter.
-
-	* error.c (Init_Exception): wrong method configuration.  `new'
-	  should have been a singleton method.
-
-Mon Oct  6 18:55:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/kconv/kconv.c (kconv_guess): code to guess character code
-	  from string.
-
-Mon Oct  6 18:38:17 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* pack.c: now encode/decode base64 by `m' template.
-
-Fri Oct  3 10:51:10 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* MANIFEST: needed to include lex.c in the distribution.
-
-	* eval.c (ruby_options): f_require() called too early.
-
-	* eval.c (rb_provide): module extensions should always be `.o'.
-
-Thu Oct  2 11:38:31 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha8 released.
-
-	* ext/marshal/marshal.c (r_object): remove temporal regist for
-	  structs. (caused problem if structs form cycles.)
-
-	* parse.y (match_gen): static binding for match(=~) calls
-	  with regexp literals.
-
-Wed Oct  1 15:26:55 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c: protect retval in struct tag from GC for C_ALLOCA.
-
-	* eval.c: no more pointer value from setjmp/longjmp.
-
-Wed Oct  1 14:01:49 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/marshal/marshal.c (w_byte): argument must be char.
-
-Wed Oct  1 10:30:22 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (mod_const_at): global constants now belongs to the
-	  class Object.
-
-	* object.c (Init_Object): new global constant NIL.
-
-	* ext/marshal/marshal.c (marshal_dump): try to set binmode.
-
-	* ext/marshal/marshal.c (r_object): forgot to re-regist structs in
-	  the object table.
-
-	* eval.c (ruby_options): call Init_ext() before any require()
-	  calls by `-r'.
-
-Fri Sep 30 14:29:22 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/marshal/marshal.c (w_object): marshal dumped core.
-
-Tue Sep 30 10:27:39 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sample/test.rb: bignum test suits added.
-
-	* eval.c (rb_eval): new pseudo variable `true' and `false'.
-
-	* parse.y: new keywords `true' and `false' added.
-
-Mon Sep 29 13:37:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (forbid_setid): forbid some options in suid mode.
-
-	* ruby.h (NUM2DBL): new macro to convert into doubles.
-
-Mon Sep 27 09:53:48 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
-
-	* bignum.c: modified for speeding.
-
-Fri Sep 26 18:27:59 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* sample/from.rb: some extensions.
-
-Mon Sep 29 13:15:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.
-
-Fri Sep 26 14:41:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (ruby_run): deferred calling Init_ext() just before eval_node.
-
-Fri Sep 26 13:27:24 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* io.c (io_isatty): forgot to return TRUE value.
-
-Fri Sep 25 11:10:58 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
-
-	* eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
-	  platforms.
-
-Wed Sep 24 17:43:13 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (Init_String): String#taint and String#taint? added.
-
-	* class.c (mod_ancestors): ancestors include the class itself.
-
-Wed Sep 24 00:57:00 1997  Katsuyuki Okabe  <HGC02147@niftyserve.or.jp>
-
-	* X68000 patch.
-
-Tue Sep 23 20:42:30 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
-
-	* parse.y (node_newnode): SEGV on null node setup.
-
-Mon Sep 22 11:22:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (ruby_prog_init): wrong safe condition check.
-
-Sun Sep 21 14:46:02 1997  MAEDA shugo  <shugo@po.aianet.ne.jp>
-
-	* error.c (exc_inspect): garbage added to classpath.
-
-Fri Sep 19 11:49:23 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (newtok): forgot to adjust buffer size when shrinking
-	  the token buffer.
-
-	* enum.c (enum_find): rb_eval_cmd() does not return value.
-
-	* io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
-	  no longer used.
-
-Tue Sep 16 17:54:25 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* file.c (f_test): problem if wrong command specified.
-
-	* ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.
-
-	* ruby.c (ruby_prog_init): should not add path from environment
-	  variable, if ruby is running under setuid.
-
-	* process.c (init_ids): check suid check for setuid/seteuid etc.
-
-Mon Sep 15 00:42:04 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* regex.c (re_compile_pattern): \w{3} and \W{3} did not work.
-
-Thu Sep 11 10:31:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha7 released.
-
-	* ext/socket/socket.c (sock_new): no setbuf() for NT.
-
-	* io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.
-
-Wed Sep 10 15:55:31 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ext/marshal/marshal.c (r_bytes0): extra big length check.
-
-Tue Sep  9 16:27:14 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (pipe_fptr_atexit): clean up popen()'ed fptr.
-
-	* error.c (set_syserr): some system has error code that is bigger
-	  than sys_nerr. grrr.
-
-Mon Sep  8 18:33:33 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_s_new): dereferenced nil for optional mode.
-
-Fri Sep  5 10:26:03 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (class_instance_methods): do not include methods which
-	  are changed to private in subclasses.
-
-Thu Sep  4 12:38:53 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (f_global_variables): list name of the global
-	  variables.
-
-	* object.c (obj_id): returns unique integer.
-
-Wed Sep  3 14:05:16 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha6 released.
-
-	* eval.c (mod_s_constants): context sensitive constant list.
-
-	* variable.c (mod_constants): no more `all' option.
-
-	* variable.c (mod_const_of): the values for autoload classes are
-	  their name strings.
-
-	* class.c (class_instance_methods): no special treatment for
-	  singleton classes.
-
-	* object.c (obj_singleton_methods): returns list of singleton
-	  method names.
-
-	* parse.y (yylex): no here document after `class' keyword.
-
-	* eval.c (f_load): expand path if fname begins with `~'.
-
-Tue Sep  2 13:19:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (ins_methods_i): do not list undef'ed methods.
-
-Mon Sep  1 13:42:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha5 released.
-
-	* object.c (mod_attr_reader): create methods to define attribute
-	  reader/write/accessor.
-
-	* class.c (rb_define_attr): always defines accessors.
-
-	* eval.c (rb_call): alias occurred in the module body caused SEGV.
-
-	* parse.y: did not generate here document strings properly.
-
-Mon Sep  1 11:43:57 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* parse.y (yylex): heredoc dropped an extra character.
-
-Fri Aug 29 11:10:21 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* class.c (class_instance_methods): same method names should not
-	  appear more than once.
-
-	* parse.y (yylex): spaces can follow =begin/=end.
-
-	* variable.c (find_class_path): look for class_tbl also for
-	  unnamed fundamental classes, such as Object, String, etc.
-
-	* variable.c (rb_name_class): can't name class before String class
-	  is initialized.
-
-	* inits.c (rb_call_inits): unrecognized dependency from GC to
-	  Array.
-
-	* variable.c (find_class_path): could not find class if Object's
-	  iv_tbl is NULL.
-
-Thu Aug 28 13:12:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha4 released.
-
-	* variable.c (mod_constants): wrong condition for singleton
-	  class.
-
-	* parse.y (yylex): revised `=begin' skip code.
-
-	* parse.y (here_document): forgot to free(eos).
-
-	* parse.y (yylex): spaces after `<<' prohibited for here
-	  documents to avoid confusing with operator `<<'.
-
-	* eval.c (is_defined): separated from rb_eval().
-
-Wed Aug 27 11:32:42 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha3 released.
-
-	* variable.c (mod_name): returns name of the class/module.
-
-	* parse.y (here_document): finally here document available now.
-
-	* variable.c (fc_i): some classes/modules does not have iv_tbl.
-
-	* variable.c (find_class_path): avoid infinite loop.
-
-Tue Aug 26 13:43:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): undef'ing non-existing method will raise
-	  NameError exception.
-
-	* object.c (class_s_new): needed to create metaclass too.
-
-	* eval.c (error_print): no class name print for anonymous class.
-
-	* eval.c (rb_longjmp): proper exception raised if raise() called
-	  without arguments, with $! or $@ set.
-
-	* object.c (Init_Object): superclass()'s method argument setting
-	  was wrong again.
-
-	* class.c (mod_ancestors): list superclasses and included modules
-	  in priority order.
-
-Mon Aug 25 11:53:11 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha2 released.
-
-	* sample/ruby-mode.el (ruby-parse-region): auto-indent now
-	  supports "\\" in the strings.
-
-	* struct.c (struct_getmember): new API to get member value from C
-	  language side.
-
-Sat Aug 23 21:39:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* parse.y (assignable): remove unnecessary local variable
-	  initialize by nil.
-
-Fri Aug 22 14:26:40 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (error_print): modified exception print format.
-
-Thu Aug 21 16:10:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
-	  calculated with keyword operators.
-
-Thu Aug 21 11:36:58 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* parse.y (arg): ary[0] += 1 cause SEGV
-
-Wed Aug 20 17:28:50 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* ruby.c (ruby_process_options): require() all modules after
-	  processing all options
-
-	* process.c (rb_proc_exec): more security checks added.
-
-	* process.c (rb_proc_exec): insecure path on exec.
-
-	* hash.c (f_getenv): PATH modification security check.
-
-Tue Aug 19 00:15:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha1 released.
-
-	* eval.c (mod_eval): work as normal eval() if second binding
-	  argument given.
-
-	* eval.c (rb_call): did not raise ArgumentError if too many
-	  arguments more than optional arguments (without rest arg).
-
-	* eval.c (rb_eval): did not work well for op_asgn2 (attribute
-	  self assignment).
-
-	* eval.c (Init_Thread): returns main thread.
-
-Mon Aug 18 09:25:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (inspect_i): did not display T_DATA instance variables.
-
-	* parse.y: provides more accurate line number information.
-
-	* eval.c (thread_value): include value's backtrace information in
-	  the variable `$@'.
-
-	* eval.c (f_abort): print backtrace and exit.
-
-Sat Aug 16 00:17:44 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (class_new_instance): do not make instance from virtual
-	  classes.
-
-	* object.c (class_s_new): do not make subclass of singleton class.
-
-Fri Aug 15 15:49:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (call_trace_func): block context switch in the trace
-	  function.
-
-	* eval.c (rb_eval): clear method cache at class extension.
-
-	* object.c (obj_type): returns object's class even if it defines
-	  singleton methods.
-
-Fri Aug 15 19:40:43 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* ext/socket/socket.c (Init_socket): small typo caused SEGV.
-
-Wed Aug 13 17:51:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* version 1.1 alpha0 released.
-
-Local variables:
-add-log-time-format: (lambda ()
-  (let* ((time (current-time))
-  	 (diff (+ (cadr time) 32400))
-	  (lo (% diff 65536))
-	  (hi  (+ (car time) (/ diff 65536))))
-    (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-end:
diff --git a/doc/NEWS b/doc/NEWS
deleted file mode 100644
index b4445fa59f..0000000000
--- a/doc/NEWS
+++ /dev/null
@@ -1,837 +0,0 @@
-= command line options
-
-: -W option
-
-  new option to specify warning level. -W0 to shut up warnings, -W1 for normal level,
-  -W2 for verbose level.  -w equals to -W2.
-
-= language syntax
-
-: arbitrary delimited string array
-
-  %W(...) notation, word list literal like %w(...) with the
-  exception that #{} interpolation is allowed.
-
-: arbitrary delimited symbol literl
-
-  :"foo", :"foo#{bar}", etc.
-
-: expression interpolation in strings
-
-  Now arbitrary statements are allowed inside #{} interpolation
-  without escapes.  In other hand, they can no longer access to
-  variables defined in eval.
-
-: negative number literals
-
-  Digits preceded minus sign is a literal integer.
-
-: array expansion
-
-  Fixed with the following behavior:
-
-    a = *[1]
-    p a #=> [1]
-
-  Now 1-element array in rhs is expanded properly.
-
-    a = *[1]
-    p a #=> 1
-
-: break and next
-
-  Extended to take an optional expression, which is used as a value
-  for termination.
-
-: direct assignment to Foo::Bar is allowed
-
-  also, you can define "class Foo::Bar; end".
-
-= language core
-
-: $stdin, $stdout, $stderr
-
-  can be assignable again.  the original stdio are preserved as STDIN,
-  STDOUT, STDERR.
-
-: $VERBOSE now has 3 levels
-
-  nil - silence, false - medium (default), true - verbose
-
-: allocation framework
-
-  any instance of class can be allocated by class.allocate,
-  (except for a few classes).
-
-: comparison of exception classes in a rescue clause
-
-  changed to use Module#=== for comparing $! with the exception
-  class specified in each rescue clause.
-
-  as the previous behavior was to use kind_of?, the effect is limited
-  to the SystemCallError case.  SystemCallError.=== has been newly
-  defined to return true when the two have the same errno.  With this
-  change, SystemCallError's with the same errno, such as Errno::EAGAIN
-  and Errno::EWOULDBLOCK, can both be rescued by listing just one of
-  them.
-
-: constants lookup
-
-  improved at the performance of searching by using an internal hash
-  table.
-
-  calls const_missing method of the class/module, if constant is not
-  found in the look up path.
-
-: expression parenthesis in the first argument
-
-  altered to get the following code (note the space after p):
-
-    p ("xx"*2).to_i
-
-  Interpreted as:
-
-    p (("xx"*2).to_i)
-
-  Instead of:
-
-    (p("xx"*2)).to_i
-
-: implicit comparison in conditional expressions
-
-  Obsoleted except when it is used in -e.
-
-  : between Range and $.
-      Use explicit comparison instead.
-
-  : between Regexp and $_
-      Use the unary method ~/re/ instead.
-
-: to_str
-
-  added to get objects which define to_str() treated as String's.
-
-  now almost all the built-in methods try each argument with to_str()
-  when they expect it to be a String.
-
-    foo = Object.new
-    class <<foo
-      def to_str
-        "foo"
-      end
-    end
-    p File.open(foo)
-    => -:7:in `open': wrong argument type Object (expected String) (TypeError)
-       ruby 1.6.4 (2001-04-19) [i586-linux]
-    => -:7:in `open': No such file or directory - "foo" (Errno::ENOENT)
-       ruby 1.7.0 (2001-05-02) [i586-linux]
-
-: multiple assignment behavior
-
-  Fixed so that "*a = nil" results in "a == []".
-
-= changes in core class library
-
-: open
-
-  Extended so that when the third argument is permission flags it
-  calls open(2) instead of fopen(3).
-
-: sprintf
-
-  new format specifier "%p" is available.
-
-: lambda and proc
-
-  Proc object returns from these methods has the following attributes:
-
-  * strict argument number check
-  * break and return terminates the proc execution.
-
-: warn(message)
-
-  a method to give warnings.
-
-: abort()
-
-  takes optional terminate message argument.
-
-: Object#initialize_copy
-
-  copy constructor for clone and dup.
-
-: Object#instance_variable_set, Object#instance_variable_get
-
-  added.
-
-: Object#singleton_method_removed
-: Object#singleton_method_undefined
-
-  Added.
-
-: Array#transpose
-
-  added.
-
-: Array#fetch(index [, default])
-
-  Added.  If a default value isn't given, raises index error if index
-  is out of range.
-
-: Array#insert(n, other, ...)
-
-  Added. [ruby-talk:14289]
-
-  This is much the same as (({ary[n,0] = [other,...]})) except
-  returing self.
-
-    ary = [0,1,2,3]
-    ary[2, 0] = [4, 5, 6]
-    p ary
-
-    ary = [0,1,2,3]
-    ary.insert(2, 4, 5, 6)
-    p ary
-
-: Array#sort!
-
-  Changed to always return self without checking whether the sequence
-  of the elements was modified or not.
-
-  Beware that this behavior is not guaranteed to continue in the
-  future.  Do not rely on its return value. [ruby-dev:12506]
-
-: Array#filter
-
-  Previously deprecated, now removed.  Use Array#collect!.
-
-: Array#pack, String#unpack
-
-  Allows comment in template strings.
-
-: Array#pack, String#unpack
-
-  New templates 'q' and 'Q' for 64bit integer (signed and unsigned respectively).
-
-: Array#new
-
-  Now takes block to fill initial values.  E.g.
-
-	Array.new(10) { |i| i + 1 }
-	=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-
-: Array#fill
-
-  Takes block to get the values to fill.
-
-: Array#fetch
-
-  Takes block to get the default value.
-
-: Array#zip
-
-  added.
-
-: Hash#update
-
-  Takes block to resolve key conflict.
-
-: Hash#merge and Hash#merge!
-
-  update hash.  Hash#merge! is a synonym of Hash#update.
-
-: String#split
-
-  if "sep" argument is a string, regular expression meta characters
-  are escaped internally.
-
-: String#rstrip
-
-  chop off NULs at the end of strings.
-
-: String#to_i
-
-  Now accepts optional base argument.
-
-	"101".to_i(10) => 101
-	"101".to_i(2)  => 5
-	"101".to_i(8)  => 65
-	"101".to_i(16) => 257
-
-  A base argument of 0 guesses at the base.
-
-	"101".to_i(0)   => 101
-	"0b101".to_i(0) => 5
-	"0101".to_i(0)  => 65
-	"0x101".to_i(0) => 257
-
-: String#[regexp, nth]
-
-  Extended to accepts optional second argument.
-
-  It tries match between self and REGEXP, then returns the
-  content of the NTH regexp register.
-
-: String#casecmp
-
-  Added.  This is a case insensitive version of String#<=>.
-
-: String#chomp
-
-  If $/ == "\n", chops off last newlines (any of \n, \r, \r\n).
-
-: String#eql?
-
-  Changed to be always case sensitive.
-
-: String#insert(n, other)
-
-  Added.
-
-  This is much the same as (({str[n, 0] = other})) except returing
-  self.
-
-: String#lstrip, rstrip, lstrip!, rstrip!
-
-  Added.  These strip only left or right part of a string.
-
-: String#match
-
-  Added.
-
-: String/Array methods
-
-  Returns an instance of receivers class.
-
-: String.new
-
-  The first argument becomes optional.
-
-: Symbol#intern
-
-  Added.
-
-: Symbol.all_symbols
-
-  Added. [ruby-dev:12921]
-
-: IO
-
-  64bit off_t support by Janathan Baker.
-
-: IO#read
-: IO#sysread
-
-  takes optinal second argument for read buffer.
-
-: IO::sysopen
-
-  New method to get a raw file descriptor.
-
-: IO#sysseek
-
-  Added.
-
-: IO#fsync
-
-  new method that copies all in-memory parts of a file to disk and
-  waits until the device reports that all parts are on stable storage.
-  Implemented with fsync(2) or equivalent.
-
-: IO.open
-
-  Made public.  Can only associate an IO object with a file number
-  like IO.new and IO.for_fd, but can take a block.
-
-: IO.for_fd
-
-  Added as a synonym for IO.new.
-
-: IO.read
-
-  Added.  Like IO.readlines, except it returns the entire file as a
-  string.  [ruby-talk:9460]
-
-: File#fnmatch, File::Constants::FNM_*
-
-  Added.  Refer to the fnmatch(3) manpage for details.
-
-  Localism is FNM_DOTMATCH which has the opposite meaning of the
-  commonly known FNM_PERIOD, which does not exist in Ruby.
-
-  e.g.
-
-    # exclude files matching "*.bak" case-insensitively.
-    files.reject! {|fn| File.fnmatch?("*.bak", fn, File::FNM_CASEFOLD) }
-
-: File.lchmod
-: File.lchown
-
-  Added.
-
-: File.open, IO.open
-
-  File mode can be specified by flags like open(2),
-  e.g. File::open(path, File::CREAT|File::WRONLY).
-
-: Regexp#options
-
-  Added.
-
-: Regexp.last_match(n)
-
-  Extended to take an optional argument.
-
-: MatchData#captures
-
-  added.
-
-: Dir#path
-
-  Added.
-
-: Dir.chdir
-
-  Extended to take a block.
-
-: Dir.glob
-
-  Made to support meta-character escaping by a backslash.  Wildcards
-  and spaces may now be escaped using a backslash.
-
-: Dir.open
-
-  Changed to return what the block returns when a block is given, just
-  as File.open does. (It always returned (({nil})) in 1.6 and
-  prior)
-
-: Dir.chdir
-
-  Changed to warn only when invoked from multiple threads or no block
-  is given. [ruby-dev:13823]
-
-    Dir.chdir('foo') {
-      Dir.chdir('bar') {   # previously warned
-        puts Dir.pwd
-      }
-    }
-
-: Dir#pos=
-
-  Returns the new position instead of self.
-
-: Dir::glob
-
-  Now accepts optional FNM_* flags via the second argument, whereas
-  Dir::[] doesn't.
-
-    Dir.glob("makefile", File::FNM_CASEFOLD) #=> ['Makefile', 'makefile']
-
-: Class#inherited
-
-  Method is called when Class is inherited by another class.
-
-	class A; end
-	def A.inherited(by)
-          puts "A inherited by #{by.inspect}"
-        end
-        class B < A; end
-
-        Prints out "A inherited by B"
-
-: Module#include?
-
-  Added. [ruby-dev:13941] 
-
-: Module#included
-
-  Added.  This is a hook called after Module#append_feature.
-
-: Module#method_removed
-: Module#method_undefined
-
-  Added.
-
-: Module.new, Class.new
-
-  Extended to take block.
-
-: Time
-
-  Extended to accept a negative time_t. (Only when the platform
-  supports it)
-
-    p Time.at(-1)
-    => Thu Jan 01 08:59:59 JST 1970
-
-: Time#to_a
-: Time#zone
-
-  Made to return "UTC" under gmtime.  It used to return a platform
-  dependent value, typically "GMT", in 1.6 and prior.
-
-: Marshal to use marshal_dump and marshal_load
-
-  if a dumping object responds to 'marshal_dump', Marshal.dump calls
-  it, and dumps object returned.  Marshal.load allocates a new instance
-  using "allocate", then calls its "marshal_load" with dumped data.
-  Marshal format version is now 4.8 (was 4.6 in 1.6.8).
-
-: Marshal
-
-  Fixed not to dump anonymous classes/modules.
-
-  Fixed with loading modules.
-
-: Thread#group
-
-  new method to get belonging  ThreadGroup.
-
-: Thread#terminate
-
-  synonym of Thread#exit
-
-: Thread#join
-
-  Optional argument limits maximum time to wait the thread in second.
-  And returns nil if timed out.
-
-: ThreagGroup#enclose
-
-  prohibits thread movement from/to enclosed groups.
-
-: Range#step([step=1])
-
-  Added.
-
-: SystemCallError
-
-  SystemCallError's "===" match (used in rescue also) is now based on its errno.
-
-: Interrupt
-
-  Made a subclass of SignalException. (It was a subclass of
-  Exception in 1.6 and prior)
-
-: NameError and NoMethodError
-
-  Moved and now NoMethodError < NameError < StandardError.
-
-: NoMethodError
-
-  Added. [ruby-dev:12763]
-
-: NotImplementError
-
-  Finally obsoleted.  Use NotImplementedError.
-
-: SystemCallError.===
-
-  Added. (See the "Comparison of exception classes in a rescue clause"
-  paragraph above) [ruby-dev:12670]
-
-: SystemExit#status
-
-  Added.
-
-: Proc#==
-
-  Added.
-
-: Method#==
-
-  Added.
-
-: UnboundMethod is no longer subclass of Method
-
-  class hierarchy changed. 
-
-: Enumerable#all?
-: Enumerable#any?
-: Enumerable#inject
-: Enumerable#sort_by
-
-  Added.
-
-: Math.acos(x)
-: Math.asin(x)
-: Math.atan(x)
-: Math.cosh(x)
-: Math.hypot(x,y)
-: Math.sinh(x)
-: Math.tanh(x)
-
-  Added.
-
-: Process.abort
-: Process.exit
-
-  synonym of Kernel#abort, and Kernel#exit respectively.
-
-: Process::detach(pid)
-
-  new method to detach child process.  child process will be "wait"ed
-  automagically.
-
-: Process.times
-
-  Moved from Time.times. (Time.times still remains but emits a
-  warning)
-
-: Process.waitall
-
-  Added.
-
-: Process::Status
-
-  Added.  (({$?})) is now an instance of this class.
-
-: Process::UID, Process::GID, Process::Sys,
-
-  Added.
-
-: Signal
-
-  Added. This module has module functions Signal.trap and Signal.list.
-
-= changes in bundled libraries
-
-: lib/cgi.rb
-
-  cgi[name] returns CGI::QueryExtension::Value that wraps string
-  value, no longer array.
-
-: lib/timeout
-
-  timeout "function" wrapped in Timeout module.
-
-: TCPServer#accept, UNIXServer#accept, Socket#accept
-
-  New methods to return an accepted socket fd.
-
-: Date and DateTime
-
-  lib/date.rb now provides both Date and DateTime.
-
-  Some methods have been renamed.  But the old names are still alive.
-
-  Some new methods have been added (Date::parse, Date#strftime, etc.).
-
-  Date#mjd now returns the chronological modified Julian day number.
-
-  All facilities about tjd have been removed.
-
-: Curses
-
-  Updated.  New methods and constants for using the mouse, character
-  attributes, colors and key codes have been added.
-
-: Net::HTTP
-
-  New version of Net::HTTP has introduced seriously incompatible
-  changes. For details, see document embedded in net/http.rb itself.
-
-: Socket.pack_sockaddr_in, Socket.unpack_sockaddr_in
-
-  Added.  Utility for direct Socket access.
-
-: Socket.pack_sockaddr_un, Socket.unpack_sockaddr_un
-
-  Added.  Utility for direct Socket access.
-
-: TCPServer#listen, UNIXServer#listen
-
-  Added.
-
-: TCPSocket.new
-: TCPSocket.open
-
-  Extended to take an address and a port number for the local side in
-  optional 3rd and 4th arguments.
-
-= newly bundled library
-
-: ext/bigdecimal
-
-  variable precision decimal number 
-
-: ext/dl
-
-  an interface to the dynamic linker.
-
-: ext/enumerator
-
-  a helper module for the Enumerable interface.
-
-: ext/io/wait
-
-  IO wait methods.
-
-: ext/iconv
-
-  wrapper library of (({iconv})).
-
-: ext/openssl
-
-  OpenSSL for Ruby
-
-: ext/racc/cparse
-
-  Racc runtime library in C. (Racc is a parser generator for ruby)
-
-: ext/stringio
-
-  Pseudo (({IO})) class from/to (({String})).
-
-: ext/strscan
-
-  Fast string scanner library.
-
-: ext/syck
-
-  fast YAML parser.
-
-: lib/abbrev
-
-  creates an abbreviation table from a list
-
-: lib/benchmark
-
-  Ruby scripts benchmarker
-
-: lib/cgi/session/pstore
-
-  cgi/session back-end using pstore 
-
-: lib/csv
-
-  reads/writes CSV files.
-
-: lib/date/format
-
-  strftime for Date class
-
-: lib/drb
-
-  dRuby or distributed Ruby
-
-: lib/fileutils
-
-  file utility library.
-
-: lib/generator
-
-  converts an internal iterator to an external iterator
-
-: lib/gserver
-
-  generic server used by xmlrpc
-
-: lib/ipaddr
-
-  manipulates IP address.
-
-: lib/multi-tk
-
-  to allow safe Tk, etc.
-
-: lib/open-uri
-
-  easy-to-use wrapper for net/http and net/ftp
-
-: lib/optparse
-
-  command line options utility library
-
-: lib/pathname
-
-  handles pathname in OO manner.
-
-: lib/pp
-
-  prettyprinter for Ruby objects
-
-: lib/prettyprint
-
-  implements prettyprint algorithm.
-
-: lib/profiler
-
-  library to implement -r "profile"
-
-: lib/racc/parser
-
-  RACC parser generator runtime in Ruby.
-
-: lib/scanf
-
-  scan string and retrieve object with format
-
-: lib/set
-
-  Set class
-
-: lib/runit
-
-  RubyUnit compatible layer for test/unit
-
-: lib/test/unit
-
-  unit testing framework for Ruby
-
-: lib/tmpdir
-
-  get temporary directory path.
-
-: lib/tsort
-
-  topological sorting library.
-
-: lib/rexml
-
-  REXML XML library
-
-: lib/webrick
-
-  generic internet server kit
-
-: lib/xmlrpc
-
-  simple RPC via XML
-
-: lib/un
-
-  used like 'ruby -run -e cp -- -p foo bar'.  neat, isn't it?
-
-: lib/win32/registry
-
-  win32/registry is registry accessor
-
-: lib/yaml
-
-  YAML Ain't Mark-up Language
-
-= removed libraries
-
-: lib/ftplib
-
-  use net/ftp instead.
-
-: lib/telnet
-
-  use net/telnet instead.
-
-= new port
-
-: WindowsCE port
-: Win32 BCC
-
-= interpreter implementation
-
-: garbage collector
-
-  faster, but uses more memory for the worst case.
-
-: string concatenation
-
-  faster by avoiding too frequent realloc(3).
diff --git a/doc/forwardable.rd b/doc/forwardable.rd
deleted file mode 100644
index 7272c374b6..0000000000
--- a/doc/forwardable.rd
+++ /dev/null
@@ -1,84 +0,0 @@
- -- forwardable.rb
-						
-                                                $Release Version: 1.1 $
-                                                $Revision$
-                                                $Date$
-						Original version by Tosh
-
-=begin
-
-= Forwardable
-
-A Module to define delegations for selected methods to a class.
-
-== Usage
-
-Using through extending the class.
-  
-  class Foo
-    extend Forwardable
-
-    def_delegators("@out", "printf", "print")
-    def_delegators(:@in, :gets)
-    def_delegator(:@contents, :[], "content_at")
-  end
-  f = Foo.new
-  f.printf ...
-  f.gets
-  f.content_at(1)
-
-== Methods
-
---- Forwardable#def_instance_delegators(accessor, *methods)
-
-      adding the delegations for each method of ((|methods|)) to
-      ((|accessor|)).
-
---- Forwardable#def_instance_delegator(accessor, method, ali = method)
-      
-      adding the delegation for ((|method|)) to ((|accessor|)). When
-      you give optional argument ((|ali|)), ((|ali|)) is used as the
-      name of the delegation method, instead of ((|method|)).
-
---- Forwardable#def_delegators(accessor, *methods)
-
-      the alias of ((|Forwardable#def_instance_delegators|)).
-
---- Forwardable#def_delegator(accessor, method, ali = method)
-      
-      the alias of ((|Forwardable#def_instance_delegator|)).
-
-= SingleForwardable
-
-a Module to define delegations for selected methods to an object.
-
-== Usage
-
-Using through extending the object.
-
-  g = Goo.new
-  g.extend SingleForwardable
-  g.def_delegator("@out", :puts)
-  g.puts ...
-
-== Methods
-
---- SingleForwardable#def_singleton_delegators(accessor, *methods)
-
-      adding the delegations for each method of ((|methods|)) to
-      ((|accessor|)).
-
---- SingleForwardable#def_singleton_delegator(accessor, method, ali = method)
-
-      adding the delegation for ((|method|)) to ((|accessor|)). When
-      you give optional argument ((|ali|)), ((|ali|)) is used as the
-      name of the delegation method, instead of ((|method|)).
-
---- SingleForwardable#def_delegators(accessor, *methods)
-
-      the alias of ((|SingleForwardable#def_instance_delegators|)).
-
---- SingleForwardable#def_delegator(accessor, method, ali = method)
-
-      the alias of ((|SingleForwardable#def_instance_delegator|)).
-=end
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
deleted file mode 100644
index d928fddc5e..0000000000
--- a/doc/forwardable.rd.ja
+++ /dev/null
@@ -1,81 +0,0 @@
-  -- forwatable.rb
-                                                $Release Version: 1.1 $
-                                                $Revision$
-                                                $Date$
-
-=begin
-= Forwardable
-
-���饹���Ф��᥽�åɤΰѾ���ǽ��������ޤ�.
-
-== �Ȥ���
-
-���饹���Ф���extend���ƻȤ��ޤ�. 
-  
-  class Foo
-    extend Forwardable
-
-    def_delegators("@out", "printf", "print")
-    def_delegators(:@in, :gets)
-    def_delegator(:@contents, :[], "content_at")
-  end
-  f = Foo.new
-  f.printf ...
-  f.gets
-  f.content_at(1)
-
-== �᥽�å�
-
---- Forwardable#def_instance_delegators(accessor, *methods)
-
-      ((|methods|))���Ϥ��줿�᥽�åɤΥꥹ�Ȥ�((|accessor��|))�Ѿ�����
-      �褦�ˤ��ޤ�.
-
---- Forwardable#def_instance_delegator(accessor, method, ali = method)
-
-      ((||method|))���Ϥ��줿�᥽�åɤ�((|accessor|))�˰Ѿ�����褦�ˤ�
-      �ޤ�. ((|ali|))�������Ȥ����Ϥ��줿�Ȥ���, �᥽�å�((|ali|))���Ƥ�
-      �줿�Ȥ��ˤ�, ((|accessor|))���Ф�((|method|))��ƤӽФ��ޤ�.
-
---- Forwardable#def_delegators(accessor, *methods)
-
-      ((|Forwardable#def_instance_delegators|))����̾�Ǥ�.
-
---- Forwardable#def_delegator(accessor, method, ali = method)
-
-      ((|Forwardable#def_instance_delegator|))����̾�Ǥ�.
-
-= SingleForwardable
-
-���֥������Ȥ��Ф�, �᥽�åɤΰѾ���ǽ��������ޤ�.
-
-== �Ȥ���
-
-���֥������Ȥ��Ф���((|extend|))���ƻȤ��ޤ�. 
-
-  g = Goo.new
-  g.extend SingleForwardable
-  g.def_delegator("@out", :puts)
-  g.puts ...
-
-== �᥽�å�
-
---- SingleForwardable#def_singleton_delegators(accessor, *methods)
-
-      ((|methods|))���Ϥ��줿�᥽�åɤΥꥹ�Ȥ�((|accessor|))�˰Ѿ�����
-      �褦�ˤ��ޤ�.
-
---- SingleForwardable#def_singleton_delegator(accessor, method, ali = method)
-
-      ((|method|))���Ϥ��줿�᥽�åɤ�((|accessor|))�˰Ѿ�����褦�ˤ���
-      ��. ((|ali|))�������Ȥ����Ϥ��줿�Ȥ���, �᥽�å�((|ali|))���ƤФ�
-      ���Ȥ��ˤ�, ((|accessor|))���Ф�((|method|))��ƤӽФ��ޤ�.
-
---- SingleForwardable#def_delegators(accessor, *methods)
-
-      ((|SingleForwardable#def_singleton_delegators|))����̾�Ǥ�.
-
---- SingleForwardable#def_delegator(accessor, method, ali = method)
-
-      ((|SingleForwardable#def_singleton_delegator|))����̾�Ǥ�.
-=end
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
deleted file mode 100644
index 64d9ab29c8..0000000000
--- a/doc/irb/irb-tools.rd.ja
+++ /dev/null
@@ -1,185 +0,0 @@
-irb��Ϣ���ޤ����ޥ�ɤȥ饤�֥��
-				$Release Version: 0.7.1 $
-			   	$Revision$
-			   	$Date$
-			   	by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
-
-=begin
-
-:���ޥ��:
-* rtags		-- ruby tags command
-
-:�ؿ��饤�֥��:
-* xmp		-- irb version of gotoken xmp-function
-
-:���饹�饤�֥��:
-* frame.rb      -- frame tracer
-* completion.rb -- irb completor
-
-= rtags
-
-rtags��emacs�ڤ�vi�Ѥ�, TAG�ե������Ĥ��륳�ޥ�ɤǤ�.
-
-== �Ȥ���
-
-   rtags [-vi] file....
-
-�����ȥǥ��쥯�ȥ��emacs�Ѥ�TAGS�ե����뤬�Ǥ��ޤ�. -vi���ץ�����
-�Ĥ������ˤ�vi�Ѥ�tags�ե������������ޤ�.
-
-emacs�ξ��, �̾��etags.el�����Τޤ޻Ȥ��ޤ�. ������ǽ�ʤΤ�,
-
-* ���饹
-* �᥽�å�
-* �ðۥ᥽�å�
-* alias
-* attr��������줿��������(�ѥ�᡼��������ܥ뤫ʸ�����ƥ��˸¤�)
-* attr_XXX��������줿��������(�ѥ�᡼��������ܥ뤫ʸ�����ƥ��˸¤�)
-
-�Ǥ�.
-
-C�ʤɤǻȤäƤ���ΤȰ㤦�Τ�, ����ץ꡼�����˴ؤ�����ʬ��,
-
-�ؿ�̾��,
-
-  �ؿ�̾(
-
-���饹��,
-
-  ::���饹̾::....::���饹̾
-
-�᥽�åɤ�,
-
-  ::���饹̾::....::���饹̾#�᥽�å�̾
-
-�ðۥ᥽�å�(���饹�᥽�å�)��
-
-  ::���饹̾::....::���饹̾.�᥽�å�̾
-
-�ǥ���ץ꡼������Ԥʤ��Ȥ����Ǥ�.
-
-= xmp.rb
-
-���Ȥ���xmp�ξ�̸ߴ��С������Ǥ�. ����, ���˽Ť��ΤǤ��Ȥ���xmp��
-���б��Ǥ��ʤ�����, ���Ѥ�����ɤ��Ǥ��礦.
-
-== �Ȥ���
-
-=== �ؿ��Ȥ��ƻȤ�.
-
-    require "irb/xmp"
-    xmp <<END
-    foo = 1
-    foo
-    END
-    ---
-    foo = 1
-        ==>1
-    foo
-	==>1
-
-=== XMP���󥹥��󥹤��Ѥ���.
-
-���ξ���, XMP������ƥ����Ⱦ������ĤΤ�, �ѿ����ͤʤɤ��ݻ����Ƥ�
-�ޤ�.
-
-  require "irb/xmp"
-  xmp = XMP.new
-  xmp.puts <<END
-  foo = 1
-  foo
-  END
-  xmp.puts <<END
-  foo
-  END
-  ===
-  foo = 1
-      ==>1
-  foo
-      ==>1
-  foo
-      ==>1
-
-== ����ƥ����Ȥ˴ؤ���
-
-XMP�᥽�åɷ��Υ���ƥ����Ȥ�, �ƤӽФ����Υ���ƥ����Ȥ�ɾ������ޤ�.
-����Ū�˥���ƥ����Ȥ���ꤹ��Ȥ��Υ���ƥ����Ȥ�ɾ�����ޤ�.
-
-��:
-
-  xmp "foo", an_binding
-
-:��:
-�ޥ������åɤˤ��б����Ƥ��ޤ���.
-
-= frame.rb
-���߼¹���Υե졼�������갷������Υ��饹�Ǥ�. 
-
-* IRB::Frame.top(n = 0)
-  �夫��n���ܤΥ���ƥ����Ȥ���Ф��ޤ�. n��0���Ǿ�̤ˤʤ�ޤ�.
-* IRB::Frame.bottom(n = 0)
-  ������n���ܤΥ���ƥ����Ȥ���Ф��ޤ�. n��0���ǲ��̤ˤʤ�ޤ�.
-* IRB::Frame.sender
-  ������ˤʤäƤ��륪�֥������Ȥ���Ф��ޤ�. ������Ȥ�, ���Υ᥽��
-  �ɤ�ƤӽФ���¦��self�Τ��ȤǤ�.
-
-:��:
-set_trace_func���Ѥ���Ruby�μ¹Ԥ�ȥ졼�����Ƥ��ޤ�. �ޥ������åɤ�
-���б����Ƥ��ޤ���.
-
-= completion.rb
-irb��completion��ǽ���󶡤����ΤǤ�. 
-
-== �Ȥ���
-
-   % irb -r irb/completion
-
-�Ȥ��뤫, ~/.irbrc ���
-
-   require "irb/completion"
-
-������Ƥ�������. irb�¹���� require "irb/completion" ���Ƥ�褤�Ǥ�.
-
-irb�¹���� (TAB) �򲡤��ȥ���ץ졼����󤷤ޤ�.
-
-�ȥåץ�٥��(TAB)�򲡤��Ȥ��٤Ƥι�ʸ����, ���饹, �᥽�åɤθ��䤬��
-�ޤ�. ���䤬ͣ��ʤ�д������䴰���ޤ�.
-
-  irb(main):001:0> in    
-  in                    inspect               instance_eval
-  include               install_alias_method  instance_of?
-  initialize            install_aliases       instance_variables
-  irb(main):001:0> inspect
-  "main"
-  irb(main):002:0> foo = Object.new
-  #<Object:0x4027146c>
-
-  ((|�ѿ�̾.|))�θ��(TAB)�򲡤���, ���Υ��֥������ȤΥ᥽�åɰ������Ǥ�
-  ��.
-
-  irb(main):003:0> foo.
-  foo.==                  foo.frozen?             foo.protected_methods
-  foo.===                 foo.hash                foo.public_methods
-  foo.=~                  foo.id                  foo.respond_to?
-  foo.__id__              foo.inspect             foo.send
-  foo.__send__            foo.instance_eval       foo.singleton_methods
-  foo.class               foo.instance_of?        foo.taint
-  foo.clone               foo.instance_variables  foo.tainted?
-  foo.display             foo.is_a?               foo.to_a
-  foo.dup                 foo.kind_of?            foo.to_s
-  foo.eql?                foo.method              foo.type
-  foo.equal?              foo.methods             foo.untaint
-  foo.extend              foo.nil?                
-  foo.freeze              foo.private_methods     
-
-=end
-
-% Begin Emacs Environment
-% Local Variables:
-% mode: text
-% comment-column: 0
-% comment-start: "%"
-% comment-end: "\n"
-% End:
-%
-
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
deleted file mode 100644
index a42cd46680..0000000000
--- a/doc/irb/irb.rd
+++ /dev/null
@@ -1,392 +0,0 @@
-irb -- interactive ruby
-		$Release Version: 0.9 $
-		$Revision$
-		$Date$
-		by Keiju ISHITSUKA(keiju@ishitsuka.com)
-		by gotoken-san who is original translater from japanese version
-
-=begin
-= What is irb?
-
-irb stands for `interactive ruby'. irb is a tool to execute interactively
-ruby expressions read from stdin. 
-
-= Invoking
-
-  % irb
-
-= Usage
-
-Use of irb is easy if you know ruby.  Executing irb, prompts are 
-displayed as follows. Then, enter expression of ruby. A input is
-executed when it is syntacticaly completed. 
-
-  dim% irb
-  irb(main):001:0> 1+2
-  3
-  irb(main):002:0> class Foo
-  irb(main):003:1>  def foo
-  irb(main):004:2>    print 1
-  irb(main):005:2>  end
-  irb(main):006:1> end
-  nil
-  irb(main):007:0> 
-
-And, Readline extesion module can be used with irb. Using Readline
-is the standard default action if Readline is installed. 
-
-= Command line option
-
-  irb.rb [options] file_name opts
-  options:
-  -f		    suppress read ~/.irbrc 
-  -m		    bc mode (fraction or matrix are available)
-  -d                set $DEBUG  to true (same as `ruby -d')
-  -Kc		    same as `ruby -Kc'
-  -r load-module    same as `ruby -r'
-  --verbose	    command input is echoed(default)
-  --noverbose	    command input isn't echoed
-  --echo	    commands are echoed immediately before execution(default)
-  --noecho	    commands aren't echoed immediately before execution
-  --inspect	    uses `inspect' for output (the default except bc mode)
-  --noinspect	    doesn't uses inspect for output
-  --readline	    uses Readline extension module
-  --noreadline	    doesn't use Readline extension module
-  --prompt prompt-mode
-  --prompt-mode prompt-mode
-		    switches prompt mode. Pre-defined prompt modes are
-		    `default', `simple', `xmp' and `inf-ruby'
-			    
-  --inf-ruby-mode   uses prompt appreciate for inf-ruby-mode on emacs. 
-		    Suppresses --readline. 
-  --simple-prompt   simple prompt mode
-  --noprompt	    no prompt
-  --tracer	    display trace for each execution of commands.
-  --back-trace-limit n
-		    displayes backtrace top n and tail n. The default
-		    value is 16. 
-  --irb_debug n	    sets internal debug level to n (It shouldn't be used)
-  -v, --version	    prints the version of irb
-
-= Configurations
-
-irb reads `~/.irbrc' when it is invoked. If `~/.irbrb' doesn't exist
-irb try to read in the order `.irbrc', `irb.rc', `_irbrc' then `$irbrc'. 
-
-The following is altanative to the command line option. To use them
-type as follows in an irb session. 
-
-  IRB.conf[:IRB_NAME]="irb"
-  IRB.conf[:MATH_MODE]=false
-  IRB.conf[:USE_TRACER]=false
-  IRB.conf[:USE_LOADER]=false
-  IRB.conf[:IGNORE_SIGINT]=true
-  IRB.conf[:IGNORE_EOF]=false
-  IRB.conf[:INSPECT_MODE]=nil
-  IRB.conf[:IRB_RC] = nil
-  IRB.conf[:BACK_TRACE_LIMIT]=16
-  IRB.conf[:USE_LOADER] = false
-  IRB.conf[:USE_READLINE] = nil
-  IRB.conf[:USE_TRACER] = false
-  IRB.conf[:IGNORE_SIGINT] = true
-  IRB.conf[:IGNORE_EOF] = false
-  IRB.conf[:PROMPT_MODE] = :DEFALUT
-  IRB.conf[:PROMPT] = {...}
-  IRB.conf[:DEBUG_LEVEL]=0
-  IRB.conf[:VERBOSE]=true
-
-== Customizing prompt
-
-To costomize the prompt you set a variable
-
-  IRB.conf[:PROMPT]
-
-For example, describe as follows in `.irbrc'. 
-
-  IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode
-    :PROMPT_I => nil,		  # normal prompt
-    :PROMPT_S => nil,		  # prompt for continuated strings
-    :PROMPT_C => nil,		  # prompt for continuated statement
-    :RETURN => "    ==>%s\n"	  # format to return value
-  }
-
-Then, invoke irb with the above prompt mode by
-
-  % irb --prompt my-prompt
-
-Or add the following in `.irbrc'. 
-
-  IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-
-Constants PROMPT_I, PROMPT_S and PROMPT_C specifies the format. 
-In the prompt specification, some special strings are available. 
-
-  %N	command name which is running
-  %m	to_s of main object (self)
-  %M	inspect of main object (self)
-  %l	type of string(", ', /, ]), `]' is inner %w[...]
-  %NNi	indent level. NN is degits and means as same as printf("%NNd"). 
-        It can be ommited
-  %NNn	line number. 
-  %%    %
-
-For instance, the default prompt mode is defined as follows:
-
-IRB.conf[:PROMPT_MODE][:DEFAULT] = {
-      :PROMPT_I => "%N(%m):%03n:%i> ",
-      :PROMPT_S => "%N(%m):%03n:%i%l ",
-      :PROMPT_C => "%N(%m):%03n:%i* ",
-      :RETURN => "%s\n"
-} 
-
-RETURN is used to printf. 
-
-== Configurating subirb
-
-The command line option or IRB.conf specify the default behavior of
-(sub)irb. On the other hand, each conf of in the next sction `6. Command' 
-is used to individually configurate (sub)irb. 
-
-If proc is set to IRB.conf[:IRB_RC], its subirb will be invoked after
-execution of that proc under giving the context of irb as its
-aregument. By this mechanism each subirb can be configurated. 
-
-= Command
-
-For irb commands, both simple name and `irb_'-prefixed name are prepared. 
-
---- exit, quit, irb_exit	
-    Quits (sub)irb. 
-
---- conf, irb_context
-    Displays current configuration. Modifing the configuration is
-    achieved by sending message to `conf'. 
-
---- conf.eval_history = N
-    Sets execution result history.
-    N is a integer or nil. If N > 0, the number of historys is N. 
-    If N == 0, the number of historys is unlimited. If N is nill,
-    execution result history isn't used(default).
-
---- conf.back_trace_limit
-    Sets display lines of backtrace as top n and tail n. 
-    The default value is 16.
-    
---- conf.debug_level = N
-    Sets debug level of irb. 
-
---- conf.ignore_eof = true/false
-    Whether ^D (control-d) will be ignored or not. 
-    If false is set, ^D means quit. 
-
---- conf.ignore_sigint= true/false
-    Whether ^C (control-c) will be ignored or not. 
-    If false is set, ^D means quit.  If true, 
-      during input:   cancel inputing then return to top level. 
-      during execute: abondon current execution. 
-
---- conf.inf_ruby_mode = true/false
-    Whether inf-ruby-mode or not. The default value is false.
-
---- conf.inspect_mode = true/false/nil
-    Specifies inspect mode. 
-    true:  display inspect
-    false: display to_s
-    nil:   inspect mode in non math mode, 
-           non inspect mode in math mode. 
-
---- conf.math_mode
-    Whether bc mode or not. 
-
---- conf.use_loader = true/false
-    Whether irb's own file reader method is used when load/require or not. 
-    This mode is globaly affected (irb wide). 
-
---- conf.prompt_c
-    prompt for a continuating statement (e.g, immediately after of `if')
-
---- conf.prompt_i
-    standard prompt
-
---- conf.prompt_s
-    prompt for a continuating string
-
---- conf.rc
-    Whether ~/.irbrc is read or not. 
-
---- conf.use_prompt = true/false
-    Prompting or not. 
-
---- conf.use_readline = true/false/nil
-    Whether readline is used or not. 
-    true: uses 
-    false: doen't use
-    nil: intends to use readline except for inf-ruby-mode (default)
-#
-#--- conf.verbose=T/F
-#    Whether verbose messages are display or not. 
-
---- cws, chws, irb_change_workspace [obj]
-    obj will be self. If obj is omitted, self will be home-object, or
-    the main object of first started irb.
-
---- pushws, irb_pushws, irb_push_workspace [obj]
-    same as UNIX-shell command pushd.
-
---- popws, irb_popws, irb_pop_workspace
-    same as UNIX-shell command popd
-
---- irb [obj]
-    Invoke subirb. If obj is given, obj will be self. 
-
---- jobs, irb_jobs
-    List of subirb
-
---- fg n, irb_fg n
-    Switch into specified subirb. The following is candidates of n:
-
-      irb number
-      thhread
-      irb object
-      self(obj which is specified of irb obj)
-
---- kill n, irb_kill n
-    Kill subirb. The means of n is as same as the case of irb_fg. 
-
---- souce, irb_source  path
-    This is a like UNIX-shell command source. evaluate script in path
-    on current context.
-
---- irb_load path, prev
-    irb-version of Ruby's load.
-
-= System variable
-
---- _  The latest value of evaluation (it is local)
---- __ The history of evaluation values.
-    __[line_no] return an evaluation value of line number<line_no>. If
-    line_no is a negative, return value before -<line_no> from latest
-    value.
-
-= Session Example
-
-  dim% ruby irb.rb
-  irb(main):001:0> irb                        # invoke subirb
-  irb#1(main):001:0> jobs                     # list of subirbs
-  #0->irb on main (#<Thread:0x400fb7e4> : stop)
-  #1->irb#1 on main (#<Thread:0x40125d64> : running)
-  nil
-  irb#1(main):002:0> fg 0                     # switch job
-  nil
-  irb(main):002:0> class Foo;end
-  nil
-  irb(main):003:0> irb Foo                    # invoke subirb which has the 
-					      #              context of Foo
-  irb#2(Foo):001:0> def foo                   # define Foo#foo
-  irb#2(Foo):002:1>   print 1
-  irb#2(Foo):003:1> end
-  nil
-  irb#2(Foo):004:0> fg 0                      # switch job
-  nil
-  irb(main):004:0> jobs                       # list of job
-  #0->irb on main (#<Thread:0x400fb7e4> : running)
-  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-  nil
-  irb(main):005:0> Foo.instance_methods       # Foo#foo is defined asurely
-  ["foo"]
-  irb(main):006:0> fg 2                       # switch job
-  nil
-  irb#2(Foo):005:0> def bar                   # define Foo#bar
-  irb#2(Foo):006:1>  print "bar"
-  irb#2(Foo):007:1> end
-  nil
-  irb#2(Foo):010:0>  Foo.instance_methods
-  ["bar", "foo"]
-  irb#2(Foo):011:0> fg 0                      
-  nil
-  irb(main):007:0> f = Foo.new
-  #<Foo:0x4010af3c>
-  irb(main):008:0> irb f                      # invoke subirb which has the
-					      #  context of f (instance of Foo)
-  irb#3(#<Foo:0x4010af3c>):001:0> jobs
-  #0->irb on main (#<Thread:0x400fb7e4> : stop)
-  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-  #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
-  nil
-  irb#3(#<Foo:0x4010af3c>):002:0> foo         # evaluate f.foo
-  1nil
-  irb#3(#<Foo:0x4010af3c>):003:0> bar         # evaluate f.bar
-  barnil
-  irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# kill job
-  nil
-  irb(main):009:0> jobs
-  #0->irb on main (#<Thread:0x400fb7e4> : running)
-  nil
-  irb(main):010:0> exit                       # exit
-  dim% 
-
-= Restrictions
-
-Because irb evaluates the inputs immediately after the imput is
-syntactically completed, irb gives slight different result than
-directly use ruby. Known difference is pointed out here. 
-
-
-== Declaration of the local variable
-
-The following causes an error in ruby:
-
-  eval "foo = 0"
-  foo
-  --
-  -:2: undefined local variable or method `foo' for #<Object:0x40283118> (NameError)
-  ---
-  NameError
-
-Though, the above will successfully done by irb. 
-
-  >> eval "foo = 0"
- => 0
- >> foo
- => 0
-
-Ruby evaluates a code after reading entire of code and determination
-of the scope of local variables. On the other hand, irb do
-immediately. More precisely, irb evaluate at first
-
-  evel "foo = 0" 
-
-then foo is defined on this timing. It is because of this
-incompatibility.
-
-If you'd like to detect those differences, begin...end can be used:
-
-  >> begin
-  ?>   eval "foo = 0"
-  >>   foo
-  >> end
-  NameError: undefined local variable or method `foo' for #<Object:0x4013d0f0>
-  (irb):3
-  (irb_local_binding):1:in `eval'
-
-== Here-document
-
-Implementation of Here-document is incomplete. 
-
-== Symbol
-
-Irb can not always recognize a symbol as to be Symbol. Concretely, an
-expression have completed, however Irb regard it as continuation line.
-
-=end
-
-% Begin Emacs Environment
-% Local Variables:
-% mode: text
-% comment-column: 0
-% comment-start: "%"
-% comment-end: "\n"
-% End:
-%
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
deleted file mode 100644
index bf8ac5d517..0000000000
--- a/doc/irb/irb.rd.ja
+++ /dev/null
@@ -1,411 +0,0 @@
-irb -- interactive ruby
-				$Release Version: 0.9 $
-			   	$Revision$
-			   	$Date$
-			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-=begin
-= irb�Ȥ�?
-
-irb��interactive ruby��ά�Ǥ�. ruby�μ���ɸ�����Ϥ����ñ������/�¹Ԥ���
-����Υġ���Ǥ�.
-
-= ��ư
-
-  % irb
-
-�ǹԤʤ��ޤ�. 
-
-= �Ȥ���
-
-irb�λȤ�����, Ruby�����ΤäƤ���Ф����äƴ�ñ�Ǥ�. ����Ū�ˤ� irb ��
-�������ޥ�ɤ�¹Ԥ�������Ǥ�. irb��¹Ԥ����, �ʲ��Τ褦�ʥץ����
-�Ȥ�ɽ��Ƥ��ޤ�. ���, ruby�μ�������Ʋ�����. �������뤷�������Ǽ¹�
-����ޤ�.
-
-  dim% irb
-  irb(main):001:0> 1+2
-  3
-  irb(main):002:0> class Foo
-  irb(main):003:1>  def foo
-  irb(main):004:2>    print 1
-  irb(main):005:2>  end
-  irb(main):006:1> end
-  nil
-  irb(main):007:0> 
-
-�ޤ�, irb��Readline�⥸�塼��ˤ��б����Ƥ��ޤ�. Readline�⥸�塼�뤬
-���󥹥ȡ��뤵��Ƥ�����ˤ�, �����Ȥ��Τ�ɸ���ư��ˤʤ�ޤ�.
-
-= ���ޥ�ɥ��ץ����
-
-  irb.rb [options] file_name opts
-  options:
-  -f		    ~/.irbrc ���ɤ߹��ޤʤ�.
-  -m		    bc�⡼��(ʬ��, ����η׻����Ǥ���)
-  -d                $DEBUG ��true�ˤ���(ruby -d ��Ʊ��)
-  -Kc		    ruby -Kc��Ʊ��
-  -r load-module    ruby -r ��Ʊ��.
-  --verbose	    ���줫��¹Ԥ���Ԥ�ɽ������(�ǥե����)
-  --noverbose	    ���줫��¹Ԥ���Ԥ�ɽ�����ʤ�
-  --echo	    �¹Է�̤�ɽ������(�ǥե����)
-  --noecho	    �¹Է�̤�ɽ�����ʤ�
-  --inspect	    ��̽��Ϥ�inspect���Ѥ���(bc�⡼�ɰʳ��ϥǥե����). 
-  --noinspect	    ��̽��Ϥ�inspect���Ѥ��ʤ�.
-  --readline	    readline�饤�֥������Ѥ���.
-  --noreadline	    readline�饤�֥������Ѥ��ʤ�. �ǥե���Ȥ�ư���,
-		    inf-ruby-mode�ʳ���readline�饤�֥������Ѥ��褦
-		    �Ȥ���. 
-  --prompt prompt-mode
-  --prompt-mode prompt-mode
-		    �ץ���ץȥ⡼�ɤ����ؤ��ޤ�. �����������Ƥ����
-		    ����ץȥ⡼�ɤ�, default, simple, xmp, inf-ruby��
-		    �Ѱդ���Ƥ��ޤ�. �ǥե���Ȥ�default�ץ���ץȥ⡼
-		    �ɤˤʤäƤ��ޤ�.
-			    
-  --inf-ruby-mode   emacs��inf-ruby-mode�ѤΥץ���ץ�ɽ����Ԥʤ�. ��
-		    �˻��꤬�ʤ��¤�, readline�饤�֥��ϻȤ�ʤ��ʤ�.
-  --simple-prompt
-		    ���˥���ץ�ʥץ���ץȤ��Ѥ���⡼�ɤǤ�.
-  --noprompt	    �ץ���ץ�ɽ����Ԥʤ�ʤ�.
-  --tracer	    ���ޥ�ɼ¹Ի��˥ȥ졼����Ԥʤ�.
-  --back-trace-limit n
-		    �Хå��ȥ졼��ɽ����Хå��ȥ졼����Ƭ���� n, ���
-		    ����n�����Ԥʤ�. �ǥե���Ȥ�16 
-  --irb_debug n	    irb�ΥǥХå��ǥХå���٥��n�����ꤹ��(���Ѥ���
-		    ������̵��Ǥ��礦).
-  -v, --version	    irb�ΥС�������ɽ������
-
-= ����ե�����졼�����
-
-irb��ư����``~/.irbrc''���ɤ߹��ߤޤ�. �⤷¸�ߤ��ʤ�����,
-``.irbrc'', ``irb.rc'', ``_irbrc'', ``$irbrc''�ν��load���ߤޤ�.
-
-���ץ��������ꤹ�������, �ʲ��Υ��ޥ�ɤǤ�ǥե���Ȥ�ư�������
-�Ǥ��ޤ�.
-
-  IRB.conf[:IRB_NAME]="irb"
-  IRB.conf[:MATH_MODE]=false
-  IRB.conf[:USE_TRACER]=false
-  IRB.conf[:USE_LOADER]=false
-  IRB.conf[:IGNORE_SIGINT]=true
-  IRB.conf[:IGNORE_EOF]=false
-  IRB.conf[:INSPECT_MODE]=nil
-  IRB.conf[:IRB_RC] = nil
-  IRB.conf[:BACK_TRACE_LIMIT]=16
-  IRB.conf[:USE_LOADER] = false
-  IRB.conf[:USE_READLINE] = nil
-  IRB.conf[:USE_TRACER] = false
-  IRB.conf[:IGNORE_SIGINT] = true
-  IRB.conf[:IGNORE_EOF] = false
-  IRB.conf[:PROMPT_MODE] = :DEFALUT
-  IRB.conf[:PROMPT] = {...}
-  IRB.conf[:DEBUG_LEVEL]=0
-  IRB.conf[:VERBOSE]=true
-
-== �ץ���ץȤ�����
-
-�ץ���ץȤ򥫥����ޥ������������ˤ�, 
-
-   IRB.conf[:PROMPT]
-
-���Ѥ��ޤ�. �㤨��, .irbrc����ǲ��Τ褦�ʼ��򵭽Ҥ��ޤ�:
-
-   IRB.conf[:PROMPT][:MY_PROMPT] = { # �ץ���ץȥ⡼�ɤ�̾��
-     :PROMPT_I => nil,		  # �̾�Υץ���ץ�
-     :PROMPT_S => nil,		  # ʸ����ʤɤη�³�ԤΥץ���ץ�
-     :PROMPT_C => nil,		  # ������³���Ƥ�����Υץ���ץ�
-     :RETURN => "    ==>%s\n"	  # �꥿������Υץ���ץ�
-   }
-
-�ץ���ץȥ⡼�ɤ���ꤷ�������ˤ�,
-
-  irb --prompt my-prompt
-
-�Ǥ��Υץ���ץȥ⡼�ɤǵ�ư����ޤ�. �ޤ���, .irbrc�˲����򵭽Ҥ��Ƥ�
-OK�Ǥ�.
-
-  IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-
-PROMPT_I, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
-
-  %N	��ư���Ƥ��륳�ޥ��̾�����Ϥ����.
-  %m	main���֥�������(self)��to_s�ǽ��Ϥ����.
-  %M	main���֥�������(self)��inspect����ƽ��Ϥ����.
-  %l	ʸ������Υ����פ�ɽ��(", ', /, ], `]'��%w����λ�)
-  %NNi	����ǥ�ȤΥ�٥��ɽ��. NN�Ͽ���������printf��%NNd��Ʊ��. ��
-	ά��ǽ
-  %NNn	���ֹ��ɽ���ޤ�.
-  %%    %
-
-�㤨��, �ǥե���ȤΥץ���ץȥ⡼�ɤ�:
-
-  IRB.conf[:PROMPT_MODE][:DEFAULT] = {
-      :PROMPT_I => "%N(%m):%03n:%i> ",
-      :PROMPT_S => "%N(%m):%03n:%i%l ",
-      :PROMPT_C => "%N(%m):%03n:%i* ",
-      :RETURN => "%s\n"
-  } 
-
-�ȤʤäƤ��ޤ�.
-
-RETURN��, ���ߤΤȤ���printf�����Ǥ�. ������ͤ��Ѥ�뤫���Τ�ޤ���.
-
-== ����irb������
-
-���ޥ�ɥ饤�󥪥ץ���󤪤��IRB.conf��(����)irb��ư���Υǥե���Ȥ�
-���������Τ�, `5. ���ޥ��'�ˤ���conf�Ǹ��̤�(����)irb�����꤬��
-����褦�ˤʤäƤ��ޤ�.
-
-IRB.conf[:IRB_RC]��proc�����ꤵ��Ƥ����, ����irb��ư������ˤ���
-proc��irb�Υ���ƥ����Ȥ�����Ȥ��ƸƤӽФ��ޤ�. ����ˤ�äƸ��̤Υ�
-��irb���Ȥ�������Ѥ��뤳�Ȥ��Ǥ���褦�ˤʤ�ޤ�.
-
-
-= ���ޥ��
-
-irb��ĥ���ޥ�ɤ�, ��ñ��̾����Ƭ��`irb_'��Ĥ���̾����ξ����������
-���ޤ�. �����, ��ñ��̾����override���줿���Τ���Ǥ�.
-
---- exit, quit, irb_exit	
-    ��λ����. 
-    ����irb�ξ��, ���Υ���irb��λ����.
-
---- conf, irb_context
-    irb�θ��ߤ������ɽ������. ������ѹ���, conf�˥�å����������뤳
-    �Ȥˤ�äƹԤʤ���. 
-
---- conf.eval_history = N
-    �¹Է�̤Υҥ��ȥ굡ǽ������.
-    nn��������nil�� nn>0 �Ǥ���Ф��ο������ҥ��ȥ�ˤ���롣nn==0�λ���
-    ̵���¤˵������롢nil���ȥҥ��ȥ굡ǽ�Ϥ���(�ǥե����). 
-
---- Conf.back_trace_limit
-    �Хå��ȥ졼��ɽ����Хå��ȥ졼����Ƭ����n, �������n�����Ԥʤ�.
-    �ǥե���Ȥ�16
-    
---- conf.debug_level = N
-    irb�ѤΥǥХå���٥������
-
---- conf.ignore_eof = true/false
-    ^D�����Ϥ��줿����ư������ꤹ��. true�λ���^D��̵�뤹��, false��
-    ����irb��λ����. 
-
---- conf.ignore_sigint= true/false
-    ^C�����Ϥ��줿����ư������ꤹ��. false����, irb��λ����. true��
-    ����ư��ϰʲ��Τ褦�ˤʤ�:
-      ������: ����ޤ����Ϥ�����Τ򥭥�󥻥뤷�ȥåץ�٥�����. 
-      �¹���: �¹Ԥ���ߤ���.
-
---- conf.inf_ruby_mode = true/false
-    inf-ruby-mode�ѤΥץ���ץ�ɽ����Ԥʤ�. �ǥե���Ȥ�false.
-
---- conf.inspect_mode = true/false/nil
-    ���󥹥ڥ��ȥ⡼�ɤ����ꤹ��.
-    true: ���󥹥ڥ��Ȥ���ɽ������.
-    false: �̾��print��ɽ������.
-    nil: �̾�⡼�ɤǤ����, inspect mode�Ȥʤ�, math�⡼�ɤλ���, non
-	 inspect mode�Ȥʤ�.   
-
---- conf.math_mode
-    ���ȤΤ�. bc�⡼��(ʬ��, ����η׻����Ǥ��ޤ�)���ɤ���?
-
---- conf.use_loader = true/false
-    load/require����irb��file�ɤ߹��ߵ�ǽ���Ѥ���⡼�ɤΥ����å�(�ǥե�
-    ��Ȥ��Ѥ��ʤ�). ���Υ⡼�ɤ�IRB���Τ�ȿ�Ǥ����.
-
---- conf.prompt_c
-    if��ľ��ʤ�, �Ԥ���³���Ƥ�����Υץ���ץ�.
-
---- conf.prompt_i
-    �̾�Υץ���ץ�.
-
---- conf.prompt_s
-    ʸ������ʤɤ�ɽ���ץ���ץ�.
-
---- conf.rc
-    ~/.irbrc���ɤ߹�������ɤ���?
-
---- conf.use_prompt = true/false
-    �ץ���ץ�ɽ�����뤫�ɤ���? �ǥե���ȤǤϥץ���ץȤ�ɽ������.
-
---- conf.use_readline = true/false/nil
-    readline��Ȥ����ɤ���?
-    true: readline��Ȥ�.
-    false: readline��Ȥ�ʤ�.
-    nil: (�ǥե����)inf-ruby-mode�ʳ���readline�饤�֥������Ѥ���
-         ���Ȥ���.  
-#
-#--- conf.verbose=T/F
-#    irb���餤�������ʥ�å���������Ϥ��뤫?
-
---- cws, chws, irb_cws, irb_chws, irb_change_workspace [obj]
-    obj��self�Ȥ���. obj����ά���줿�Ȥ���, home workspace, ���ʤ��
-    irb��ư�����Ȥ���main object��self�Ȥ���.
-
---- pushws, irb_pushws, irb_push_workspace [obj]
-    UNIX�����륳�ޥ�ɤ�pushd��Ʊ��.
-
---- popws, irb_popws, irb_pop_workspace
-    UNIX�����륳�ޥ�ɤ�popd��Ʊ��.
-
---- irb [obj]
-    ����irb��Ω��������. obj�����ꤵ�줿����, ����obj��self�Ȥ���.
-
---- jobs, irb_jobs
-    ����irb�Υꥹ��
-
---- fg n, irb_fg n
-    ���ꤷ������irb�˥����å�����. n��, ���Τ�Τ���ꤹ��.
-
-      irb�ֹ�
-      ����å�
-      irb���֥�������
-      self(irb obj�ǵ�ư��������obj)
-
---- kill n, irb_kill n
-      ����irb��kill����. n��fg��Ʊ��.
-
---- souce, irb_source  path
-    UNIX�����륳�ޥ�ɤ�source�Ȼ��Ƥ���. ���ߤδĶ����path��Υ�����
-    �ץȤ�ɾ������.
-
---- irb_load path, prev
-
-    Ruby��load��irb��.
-
-= �����ƥ��ѿ�
-
---- _  
-    ���η׻��μ¹Է�̤�Ф��Ƥ���(���������ѿ�).
---- __ 
-    �¹Է�̤������Ф��Ƥ���.
-    __[line_no]�ǡ����ιԤǼ¹Ԥ�����̤����뤳�Ȥ��Ǥ���. line_no�����
-    ���ˤϡ��ǿ��η�̤���-line_no���η�̤����뤳�Ȥ��Ǥ���.
-
-=  ������
-
-�ʲ��Τ褦�ʴ����Ǥ�.
-
-  dim% ruby irb.rb
-  irb(main):001:0> irb                        # ����irb��Ω������
-  irb#1(main):001:0> jobs                     # ����irb�Υꥹ��
-  #0->irb on main (#<Thread:0x400fb7e4> : stop)
-  #1->irb#1 on main (#<Thread:0x40125d64> : running)
-  nil
-  irb#1(main):002:0> fg 0                     # job�Υ����å�
-  nil
-  irb(main):002:0> class Foo;end
-  nil
-  irb(main):003:0> irb Foo                    # Foo�򥳥�ƥ����Ȥ���irb
-					      # Ω������
-  irb#2(Foo):001:0> def foo                   # Foo#foo�����
-  irb#2(Foo):002:1>   print 1
-  irb#2(Foo):003:1> end
-  nil
-  irb#2(Foo):004:0> fg 0                      # job�򥹥��å�
-  nil
-  irb(main):004:0> jobs                       # job�Υꥹ��
-  #0->irb on main (#<Thread:0x400fb7e4> : running)
-  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-  nil
-  irb(main):005:0> Foo.instance_methods       # Foo#foo�������������
-					      # ��Ƥ���
-  ["foo"]
-  irb(main):006:0> fg 2                       # job�򥹥��å�
-  nil
-  irb#2(Foo):005:0> def bar                   # Foo#bar�����
-  irb#2(Foo):006:1>  print "bar"
-  irb#2(Foo):007:1> end
-  nil
-  irb#2(Foo):010:0>  Foo.instance_methods
-  ["bar", "foo"]
-  irb#2(Foo):011:0> fg 0                      
-  nil
-  irb(main):007:0> f = Foo.new
-  #<Foo:0x4010af3c>
-  irb(main):008:0> irb f                      # Foo�Υ��󥹥��󥹤�irb��
-					      # Ω��������.
-  irb#3(#<Foo:0x4010af3c>):001:0> jobs
-  #0->irb on main (#<Thread:0x400fb7e4> : stop)
-  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-  #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
-  nil
-  irb#3(#<Foo:0x4010af3c>):002:0> foo         # f.foo�μ¹�
-  nil
-  irb#3(#<Foo:0x4010af3c>):003:0> bar         # f.bar�μ¹�
-  barnil
-  irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# job��kill
-  nil
-  irb(main):009:0> jobs
-  #0->irb on main (#<Thread:0x400fb7e4> : running)
-  nil
-  irb(main):010:0> exit                       # ��λ
-  dim% 
-
-= ���Ѿ������
-
-irb��, ɾ���Ǥ������(�����Ĥ�������)�Ǥ��༡�¹Ԥ�Ԥʤ��ޤ�. ��������
-��, ruby��ľ�ܻȤä�����, �㴳�ۤʤ�ư���Ԥʤ���礬����ޤ�.
-
-�������餫�ˤʤäƤ������������������ޤ�.
-
-== ���������ѿ������
-
-ruby�Ǥ�, �ʲ��Υץ������ϥ��顼�ˤʤ�ޤ�.
-
-  eval "foo = 0"
-  foo
-  --
-  -:2: undefined local variable or method `foo' for #<Object:0x40283118> (NameError)
-  ---
-  NameError
-
-�Ȥ�����, irb���Ѥ����
-
-  >> eval "foo = 0"
-  => 0
-  >> foo
-  => 0
-
-�Ȥʤ�, ���顼�򵯤����ޤ���. �����, ruby���ǽ�˥�����ץ����Τ򥳥�
-�ѥ��뤷�ƥ��������ѿ�����ꤹ�뤫��Ǥ�. ������Ф�, irb�ϼ¹Բ�ǽ��
-�ʤ�(�����Ĥ���)�ȼ�ưŪ��ɾ�����Ƥ��뤫��Ǥ�. �嵭����Ǥ�, 
-
-  evel "foo = 0" 
-
-��Ԥʤä�������ɾ����Ԥʤ�, ���λ������ѿ����������뤿��, ������ 
-�ѿ�foo���������Ƥ��뤫��Ǥ�.
-
-���Τ褦��ruby��irb��ư��ΰ㤤���褷��������, begin...end�ǳ�ä�
-�Хå�Ū�˼¹Ԥ��Ʋ�����:
-
-  >> begin
-  ?>   eval "foo = 0"
-  >>   foo
-  >> end
-  NameError: undefined local variable or method `foo' for #<Object:0x4013d0f0>
-  (irb):3
-  (irb_local_binding):1:in `eval'
-
-== �ҥ��ɥ������
-
-���ߤΤȤ����ҥ��ɥ�����Ȥμ������Դ����Ǥ�. 
-
-== ����ܥ�
-
-����ܥ�Ǥ��뤫�ɤ�����Ƚ�Ǥ�ְ㤨�뤳�Ȥ�����ޤ�. ����Ū�ˤϼ�����λ
-���Ƥ���Τ˷�³�Ԥȸ��ʤ����Ȥ�����ޤ�.
-
-=end
-
-% Begin Emacs Environment
-% Local Variables:
-% mode: text
-% comment-column: 0
-% comment-start: "%"
-% comment-end: "\n"
-% End:
-%
-
diff --git a/doc/shell.rd b/doc/shell.rd
deleted file mode 100644
index 02ee1b020a..0000000000
--- a/doc/shell.rd
+++ /dev/null
@@ -1,348 +0,0 @@
- -- shell.rb
-				$Release Version: 0.6.0 $
-			   	$Revision$
-			   	$Date$
-			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-
-=begin
-
-= What's shell.rb?
-
-It realizes a wish to do execution of commands with filters and pipes
-like sh/csh by using just native facilities of ruby.
-
-= Main classes
-
-== Shell
-
-Every shell object has its own current working directory, and executes
-each command as if it stands in the directory.
-
---- Shell#cwd
---- Shell#dir
---- Shell#getwd
---- Shell#pwd
-
-      Returns the current directory
-
---- Shell#system_path
-
-      Returns the command search path in an array
-
---- Shell#umask
-
-      Returns the umask
-
-== Filter
-
-Any result of command exection is a Filter.  Filter include
-Enumerable, therefore a Filter object can use all Enumerable
-facilities.
-
-= Main methods
-
-== Command definitions
-
-In order to execute a command on your OS, you need to define it as a
-Shell method.
-
-Alternatively, you can execute any command via Shell#system even if it
-is not defined.
-
---- Shell.def_system_command(command, path = command)
-
-      Defines a command.  Registers <path> as a Shell method
-      <command>.
-
-      ex)
-      Shell.def_system_command "ls"
-        Defines ls.
-
-      Shell.def_system_command "sys_sort", "sort"
-        Defines sys_sort as sort.
-
---- Shell.undef_system_command(command)
-
-      Undefines a commmand
-
---- Shell.alias_command(ali, command, *opts) {...}
-
-      Aliases a command.
-
-      ex)
-        Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
-        Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
-
---- Shell.unalias_command(ali)
-
-      Unaliases a command.
-
---- Shell.install_system_commands(pre = "sys_")
-
-      Defines all commands in the default_system_path as Shell method,
-      all with <pre> prefixed to their names.
-
-== Creation
-
---- Shell.new
-
-      Creates a Shell object which current directory is set to the
-      process current directory.
-
---- Shell.cd(path)
-
-      Creates a Shell object which current directory is set to
-      <path>.
-
-== Process management
-
---- Shell#jobs
-
-      Returns a list of scheduled jobs.
-
---- Shell#kill sig, job
-
-      Sends a signal <sig> to <job>.
-
-== Current directory operations
-
---- Shell#cd(path, &block)
---- Shell#chdir
-
-      Changes the current directory to <path>.  If a block is given,
-      it restores the current directory when the block ends.
-
---- Shell#pushd(path = nil, &block)
---- Shell#pushdir
-
-      Pushes the current directory to the directory stack, changing
-      the current directory to <path>.  If <path> is omitted, it
-      exchanges its current directory and the top of its directory
-      stack.  If a block is given, it restores the current directory
-      when the block ends.
-
---- Shell#popd
---- Shell#popdir
-
-      Pops a directory from the directory stack, and sets the current
-      directory to it.
-
-== File and directory operations
-
---- Shell#foreach(path = nil, &block)
-
-      Same as:
-        File#foreach (when path is a file)
-        Dir#foreach (when path is a directory)
-
---- Shell#open(path, mode)
-
-      Same as:
-        File#open (when path is a file)
-        Dir#open (when path is a directory)
-
---- Shell#unlink(path)
-
-      Same as:
-        Dir#open (when path is a file)
-        Dir#unlink (when path is a directory)
-
---- Shell#test(command, file1, file2)
---- Shell#[command, file1, file2]
-
-      Same as test().
-      ex)
-          sh[?e, "foo"]
-          sh[:e, "foo"]
-          sh["e", "foo"]
-          sh[:exists?, "foo"]
-          sh["exists?", "foo"]
-
---- Shell#mkdir(*path)
-
-      Same as Dir.mkdir (with multiple directories allowed)
-
---- Shell#rmdir(*path)
-
-      Same as Dir.rmdir (with multiple directories allowed)
-
-== Command execution
-
---- System#system(command, *opts)
-
-      Executes <command> with <opts>.
-
-      ex)
-        print sh.system("ls", "-l")
-        sh.system("ls", "-l") | sh.head > STDOUT
-
---- System#rehash
-
-      Does rehash.
-
---- Shell#transact &block
-
-      Executes a block as self.
-      ex)
-        sh.transact{system("ls", "-l") | head > STDOUT}
-
---- Shell#out(dev = STDOUT, &block)
-
-      Does transact, with redirecting the result output to <dev>.
-
-== Internal commands
-
---- Shell#echo(*strings)
---- Shell#cat(*files)
---- Shell#glob(patten)
---- Shell#tee(file)
-
-      Return Filter objects, which are results of their execution.
-
---- Filter#each &block
-
-      Iterates a block for each line of it.
-
---- Filter#<(src)
-
-      Inputs from <src>, which is either a string of a file name or an
-      IO.
-
---- Filter#>(to)
-
-      Outputs to <to>, which is either a string of a file name or an
-      IO.
-
---- Filter#>>(to)
-
-      Appends the ouput to <to>, which is either a string of a file
-      name or an IO.
-
---- Filter#|(filter)
-
-      Processes a pipeline.
-
---- Filter#+(filter)
-
-      (filter1 + filter2) outputs filter1, and then outputs filter2.
-
---- Filter#to_a
---- Filter#to_s
-
-== Built-in commands
-
---- Shell#atime(file)
---- Shell#basename(file, *opt)
---- Shell#chmod(mode, *files)
---- Shell#chown(owner, group, *file)
---- Shell#ctime(file)
---- Shell#delete(*file)
---- Shell#dirname(file)
---- Shell#ftype(file)
---- Shell#join(*file)
---- Shell#link(file_from, file_to)
---- Shell#lstat(file)
---- Shell#mtime(file)
---- Shell#readlink(file)
---- Shell#rename(file_from, file_to)
---- Shell#split(file)
---- Shell#stat(file)
---- Shell#symlink(file_from, file_to)
---- Shell#truncate(file, length)
---- Shell#utime(atime, mtime, *file)
-
-      Equivalent to the class methods of File with the same names.
-
---- Shell#blockdev?(file)
---- Shell#chardev?(file)
---- Shell#directory?(file)
---- Shell#executable?(file)
---- Shell#executable_real?(file)
---- Shell#exist?(file)/Shell#exists?(file)
---- Shell#file?(file)
---- Shell#grpowned?(file)
---- Shell#owned?(file)
---- Shell#pipe?(file)
---- Shell#readable?(file)
---- Shell#readable_real?(file)
---- Shell#setgid?(file)
---- Shell#setuid?(file)
---- Shell#size(file)/Shell#size?(file)
---- Shell#socket?(file)
---- Shell#sticky?(file)
---- Shell#symlink?(file)
---- Shell#writable?(file)
---- Shell#writable_real?(file)
---- Shell#zero?(file)
-
-      Equivalent to the class methods of FileTest with the same names.
-
---- Shell#syscopy(filename_from, filename_to)
---- Shell#copy(filename_from, filename_to)
---- Shell#move(filename_from, filename_to)
---- Shell#compare(filename_from, filename_to)
---- Shell#safe_unlink(*filenames)
---- Shell#makedirs(*filenames)
---- Shell#install(filename_from, filename_to, mode)
-
-      Equivalent to the class methods of FileTools with the same
-      names.
-
-      And also, there are some aliases for convenience:
-
---- Shell#cmp	<- Shell#compare
---- Shell#mv	<- Shell#move
---- Shell#cp	<- Shell#copy
---- Shell#rm_f	<- Shell#safe_unlink
---- Shell#mkpath	<- Shell#makedirs
-
-= Samples
-
-== ex1
-
-  sh = Shell.cd("/tmp")
-  sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
-  sh.cd("shell-test-1")
-  for dir in ["dir1", "dir3", "dir5"]
-    if !sh.exists?(dir)
-      sh.mkdir dir
-      sh.cd(dir) do
-	f = sh.open("tmpFile", "w")
-	f.print "TEST\n"
-	f.close
-      end
-      print sh.pwd
-    end
-  end
-
-== ex2
-
-  sh = Shell.cd("/tmp")
-  sh.transact do
-    mkdir "shell-test-1" unless exists?("shell-test-1")
-    cd("shell-test-1")
-    for dir in ["dir1", "dir3", "dir5"]
-      if !exists?(dir)
-	mkdir dir
-	cd(dir) do
-	  f = open("tmpFile", "w")
-	  f.print "TEST\n"
-	  f.close
-	end
-	print pwd
-      end
-    end
-  end
-
-== ex3
-
-  sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
-  sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
-
-== ex4
-
-  print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/}
-
-=end
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
deleted file mode 100644
index 073e71ea42..0000000000
--- a/doc/shell.rd.ja
+++ /dev/null
@@ -1,336 +0,0 @@
- -- shell.rb
-				$Release Version: 0.6.0 $
-			   	$Revision$
-			   	$Date$
-			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-
-=begin
-
-= ��Ū
-
-ruby���sh/csh�Τ褦�˥��ޥ�ɤμ¹Եڤӥե��륿��󥰤��ڤ˹Ԥ�.
-sh/csh������ʸ��ruby�ε�ǽ���Ѥ��Ƽ¸�����.
-
-= ��ʥ��饹����
-
-== Shell
-
-Shell���֥������Ȥϥ����ȥǥ��쥯�ȥ�����, ���ޥ�ɼ¹ԤϤ��������
-���Хѥ��ˤʤ�ޤ�.
-
---- Shell#cwd
---- Shell#dir
---- Shell#getwd
---- Shell#pwd
-
-      �����ȥǥ��쥯�ȥ���֤���
-
---- Shell#system_path
-
-      ���ޥ�ɥ������ѥ���������֤���
-
---- Shell#umask
-
-      umask���֤���
-
-== Filter
-
-���ޥ�ɤμ¹Է�̤Ϥ��٤�Filter�Ȥ��Ƥ�����ޤ�. Enumerable��include��
-�Ƥ��ޤ�.
-
-= ��ʥ᥽�åɰ���
-
-== ���ޥ�����
-
-OS��Υ��ޥ�ɤ�¹Ԥ���ˤϤޤ�, Shell�Υ᥽�åɤȤ���������ޤ�.
-
-��) ���ޥ�ɤ�������ʤ��Ȥ�ľ�ܼ¹ԤǤ���Shell#system���ޥ�ɤ⤢��ޤ�.
-
---- Shell.def_system_command(command, path = command)
-
-      Shell�Υ᥽�åɤȤ���command����Ͽ���ޤ�. 
-
-      ��)
-      Shell.def_system_command "ls"
-        ls �����
-
-      Shell.def_system_command "sys_sort", "sort"
-        sort���ޥ�ɤ�sys_sort�Ȥ������
-
---- Shell.undef_system_command(command)
-
-      command�������ޤ�.
-
---- Shell.alias_command(ali, command, *opts) {...}
-
-      command��alias�򤷤ޤ�. 
-
-      ��)
-        Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
-        Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
-
---- Shell.unalias_command(ali)
-
-      command��alias�������ޤ�.
-
---- Shell.install_system_commands(pre = "sys_")
-
-      system_path��ˤ������Ƥμ¹Բ�ǽ�ե������Shell���������. �᥽��
-      ��̾�ϸ��Υե�����̾��Ƭ��pre��Ĥ�����ΤȤʤ�.
-
-== ����
-
---- Shell.new
-
-      �ץ������Υ����ȥǥ��쥯�ȥ�򥫥��ȥǥ��쥯�ȥ�Ȥ���Shell��
-      �֥������Ȥ��������ޤ�.
-
---- Shell.cd(path)
-
-      path�򥫥��ȥǥ��쥯�ȥ�Ȥ���Shell���֥������Ȥ��������ޤ�.
-
-== �ץ���������
-
---- Shell#jobs
-
-      �������塼��󥰤���Ƥ���job�ΰ������֤�.
-
---- Shell#kill sig, job
-
-      job�˥����ʥ�sig������
-
-== �����ȥǥ��쥯�ȥ����
-
---- Shell#cd(path, &block)
---- Shell#chdir
-
-      �����ȥǥ��쥯�ȥ��path�ˤ���. ���ƥ졼���Ȥ��ƸƤФ줿�Ȥ��ˤ�
-      �֥��å��¹���Τߥ����ȥǥ��쥯�ȥ���ѹ�����.
-
---- Shell#pushd(path = nil, &block)
---- Shell#pushdir
-
-      �����ȥǥ��쥯�ȥ��ǥ��쥯�ȥꥹ���å��ˤĤ�, �����ȥǥ��쥯
-      �ȥ��path�ˤ���. path����ά���줿�Ȥ��ˤ�, �����ȥǥ��쥯�ȥ��
-      �ǥ��쥯�ȥꥹ���å��Υȥåפ�򴹤���. ���ƥ졼���Ȥ��ƸƤФ줿��
-      ���ˤ�, �֥��å��¹���Τ�pushd����.
-
---- Shell#popd
---- Shell#popdir
-
-      �ǥ��쥯�ȥꥹ���å�����ݥåפ�, ����򥫥��ȥǥ��쥯�ȥ�ˤ���.
-
-== �ե�����/�ǥ��쥯�ȥ����
-
---- Shell#foreach(path = nil, &block)
-
-      path���ե�����ʤ�, File#foreach
-      path���ǥ��쥯�ȥ�ʤ�, Dir#foreach
-
---- Shell#open(path, mode)
-
-      path���ե�����ʤ�, File#open
-      path���ǥ��쥯�ȥ�ʤ�, Dir#open
-
---- Shell#unlink(path)
-
-      path���ե�����ʤ�, File#unlink
-      path���ǥ��쥯�ȥ�ʤ�, Dir#unlink
-
---- Shell#test(command, file1, file2)
---- Shell#[command, file1, file2]
-
-      �ե�����ƥ��ȴؿ�test��Ʊ��. 
-      ��)
-          sh[?e, "foo"]
-          sh[:e, "foo"]
-          sh["e", "foo"]
-          sh[:exists?, "foo"]
-          sh["exists?", "foo"]
-
---- Shell#mkdir(*path)
-
-      Dir.mkdir��Ʊ��(ʣ����)
-
---- Shell#rmdir(*path)
-
-      Dir.rmdir��Ʊ��(ʣ����)
-
-== ���ޥ�ɼ¹�
-
---- System#system(command, *opts)
-
-      command��¹Ԥ���.
-      ��)
-        print sh.system("ls", "-l")
-        sh.system("ls", "-l") | sh.head > STDOUT
-
---- System#rehash
-
-      ��ϥå��夹��
-
---- Shell#transact &block
-
-      �֥��å���Ǥ�shell��self�Ȥ��Ƽ¹Ԥ���.
-      ��)
-        sh.transact{system("ls", "-l") | head > STDOUT}
-
---- Shell#out(dev = STDOUT, &block)
-
-      transact��ƤӽФ����η�̤�dev�˽��Ϥ���.
-
-== �������ޥ��
-
---- Shell#echo(*strings)
---- Shell#cat(*files)
---- Shell#glob(patten)
---- Shell#tee(file)
-
-      �����ϼ¹Ԥ����, ���������ƤȤ���Filter���֥������Ȥ��֤��ޤ�. 
-
---- Filter#each &block
-
-      �ե��륿�ΰ�Ԥ��Ĥ�block���Ϥ�.
-
---- Filter#<(src)
-
-      src��ե��륿�����ϤȤ���. src��, ʸ����ʤ�Хե������, IO�Ǥ���
-      �Ф���򤽤Τޤ����ϤȤ���.
-
---- Filter#>(to)
-
-      src��ե��륿�ν��ϤȤ���. to��, ʸ����ʤ�Хե������, IO�Ǥ���
-      �Ф���򤽤Τޤ޽��ϤȤ���.
-
---- Filter#>>(to)
-
-      src��ե��륿���ɲä���. to��, ʸ����ʤ�Хե������, IO�Ǥ����
-      ����򤽤Τޤ޽��ϤȤ���.
-
---- Filter#|(filter)
-
-      �ѥ��׷��
-
---- Filter#+(filter)
-
-      filter1 + filter2 �� filter1�ν��Ϥθ�, filter2�ν��Ϥ�Ԥ�.
-
---- Filter#to_a
---- Filter#to_s
-
-== �ȹ��ߥ��ޥ��
-
---- Shell#atime(file)
---- Shell#basename(file, *opt)
---- Shell#chmod(mode, *files)
---- Shell#chown(owner, group, *file)
---- Shell#ctime(file)
---- Shell#delete(*file)
---- Shell#dirname(file)
---- Shell#ftype(file)
---- Shell#join(*file)
---- Shell#link(file_from, file_to)
---- Shell#lstat(file)
---- Shell#mtime(file)
---- Shell#readlink(file)
---- Shell#rename(file_from, file_to)
---- Shell#split(file)
---- Shell#stat(file)
---- Shell#symlink(file_from, file_to)
---- Shell#truncate(file, length)
---- Shell#utime(atime, mtime, *file)
-
-      ������File���饹�ˤ���Ʊ̾�Υ��饹�᥽�åɤ�Ʊ���Ǥ�.
-
---- Shell#blockdev?(file)
---- Shell#chardev?(file)
---- Shell#directory?(file)
---- Shell#executable?(file)
---- Shell#executable_real?(file)
---- Shell#exist?(file)/Shell#exists?(file)
---- Shell#file?(file)
---- Shell#grpowned?(file)
---- Shell#owned?(file)
---- Shell#pipe?(file)
---- Shell#readable?(file)
---- Shell#readable_real?(file)
---- Shell#setgid?(file)
---- Shell#setuid?(file)
---- Shell#size(file)/Shell#size?(file)
---- Shell#socket?(file)
---- Shell#sticky?(file)
---- Shell#symlink?(file)
---- Shell#writable?(file)
---- Shell#writable_real?(file)
---- Shell#zero?(file)
-
-      ������FileTest���饹�ˤ���Ʊ̾�Υ��饹�᥽�åɤ�Ʊ���Ǥ�.
-
---- Shell#syscopy(filename_from, filename_to)
---- Shell#copy(filename_from, filename_to)
---- Shell#move(filename_from, filename_to)
---- Shell#compare(filename_from, filename_to)
---- Shell#safe_unlink(*filenames)
---- Shell#makedirs(*filenames)
---- Shell#install(filename_from, filename_to, mode)
-
-      ������FileTools���饹�ˤ���Ʊ̾�Υ��饹�᥽�åɤ�Ʊ���Ǥ�.
-
-      ����¾, �ʲ��Τ�Τ������ꥢ������Ƥ��ޤ�.
-
---- Shell#cmp	<- Shell#compare
---- Shell#mv	<- Shell#move
---- Shell#cp	<- Shell#copy
---- Shell#rm_f	<- Shell#safe_unlink
---- Shell#mkpath	<- Shell#makedirs
-
-= ����ץ�
-
-== ex1
-
-  sh = Shell.cd("/tmp")
-  sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
-  sh.cd("shell-test-1")
-  for dir in ["dir1", "dir3", "dir5"]
-    if !sh.exists?(dir)
-      sh.mkdir dir
-      sh.cd(dir) do
-	f = sh.open("tmpFile", "w")
-	f.print "TEST\n"
-	f.close
-      end
-      print sh.pwd
-    end
-  end
-
-== ex2
-
-  sh = Shell.cd("/tmp")
-  sh.transact do
-    mkdir "shell-test-1" unless exists?("shell-test-1")
-    cd("shell-test-1")
-    for dir in ["dir1", "dir3", "dir5"]
-      if !exists?(dir)
-	mkdir dir
-	cd(dir) do
-	  f = open("tmpFile", "w")
-	  f.print "TEST\n"
-	  f.close
-	end
-	print pwd
-      end
-    end
-  end
-
-== ex3
-
-  sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
-  sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
-
-== ex4
-
-  print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/}
-
-=end
diff --git a/enum.c b/enum.c
index ee0b05838f..dc7e2112a4 100644
--- a/enum.c
+++ b/enum.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   enum.c -
 
@@ -6,13 +6,11 @@
   $Date$
   created at: Fri Oct  1 15:15:19 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
-#include "node.h"
-#include "util.h"
 
 VALUE rb_mEnumerable;
 static ID id_each, id_eqq, id_cmp;
@@ -35,11 +33,11 @@ grep_i(i, arg)
 }
 
 static VALUE
-grep_iter_i(i, arg)
-    VALUE i, *arg;
+grep_iter_i(i, pat)
+    VALUE i, pat;
 {
-    if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
-	rb_ary_push(arg[1], rb_yield(i));
+    if (RTEST(rb_funcall(pat, id_eqq, 1, i))) {
+	rb_yield(i);
     }
     return Qnil;
 }
@@ -48,25 +46,34 @@ static VALUE
 enum_grep(obj, pat)
     VALUE obj, pat;
 {
-    VALUE ary = rb_ary_new();
-    VALUE arg[2];
+    if (rb_iterator_p()) {
+	rb_iterate(rb_each, obj, grep_iter_i, pat);
+	return obj;
+    }
+    else {
+	VALUE tmp, arg[2];
 
-    arg[0] = pat;
-    arg[1] = ary;
+	arg[0] = pat; arg[1] = tmp = rb_ary_new();
+	rb_iterate(rb_each, obj, grep_i, (VALUE)arg);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
-    
-    return ary;
+	if (RARRAY(tmp)->len == 0) return Qnil;
+	return tmp;
+    }
 }
 
+struct find_arg {
+    int found;
+    VALUE val;
+};
+    
 static VALUE
-find_i(i, memo)
+find_i(i, arg)
     VALUE i;
-    NODE *memo;
+    struct find_arg *arg;
 {
     if (RTEST(rb_yield(i))) {
-	memo->u2.value = Qtrue;
-	memo->u1.value = i;
+	arg->found = Qtrue;
+	arg->val = i;
 	rb_iter_break();
     }
     return Qnil;
@@ -78,29 +85,27 @@ enum_find(argc, argv, obj)
     VALUE* argv;
     VALUE obj;
 {
-    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, Qfalse, 0);
+    struct find_arg arg;
     VALUE if_none;
 
     rb_scan_args(argc, argv, "01", &if_none);
-    rb_iterate(rb_each, obj, find_i, (VALUE)memo);
-    if (memo->u2.value) {
-	VALUE result = memo->u1.value;
-	rb_gc_force_recycle((VALUE)memo);
-	return result;
+    arg.found = Qfalse;
+    rb_iterate(rb_each, obj, find_i, (VALUE)&arg);
+    if (arg.found) {
+	return arg.val;
     }
-    rb_gc_force_recycle((VALUE)memo);
     if (!NIL_P(if_none)) {
-	return rb_funcall(if_none, rb_intern("call"), 0, 0);
+	rb_eval_cmd(if_none, Qnil);
     }
     return Qnil;
 }
 
 static VALUE
-find_all_i(i, ary)
-    VALUE i, ary;
+find_all_i(i, tmp)
+    VALUE i, tmp;
 {
     if (RTEST(rb_yield(i))) {
-	rb_ary_push(ary, i);
+	rb_ary_push(tmp, i);
     }
     return Qnil;
 }
@@ -109,19 +114,20 @@ static VALUE
 enum_find_all(obj)
     VALUE obj;
 {
-    VALUE ary = rb_ary_new();
-    
-    rb_iterate(rb_each, obj, find_all_i, ary);
+    VALUE tmp;
 
-    return ary;
+    tmp = rb_ary_new();
+    rb_iterate(rb_each, obj, find_all_i, tmp);
+
+    return tmp;
 }
 
 static VALUE
-reject_i(i, ary)
-    VALUE i, ary;
+reject_i(i, tmp)
+    VALUE i, tmp;
 {
     if (!RTEST(rb_yield(i))) {
-	rb_ary_push(ary, i);
+	rb_ary_push(tmp, i);
     }
     return Qnil;
 }
@@ -130,28 +136,19 @@ static VALUE
 enum_reject(obj)
     VALUE obj;
 {
-    VALUE ary = rb_ary_new();
-    
-    rb_iterate(rb_each, obj, reject_i, ary);
+    VALUE tmp;
 
-    return ary;
-}
+    tmp = rb_ary_new();
+    rb_iterate(rb_each, obj, reject_i, tmp);
 
-static VALUE
-collect_i(i, ary)
-    VALUE i, ary;
-{
-    rb_ary_push(ary, rb_yield(i));
-    
-    return Qnil;
+    return tmp;
 }
 
 static VALUE
-collect_all(i, ary)
-    VALUE i, ary;
+collect_i(i, tmp)
+    VALUE i, tmp;
 {
-    rb_ary_push(ary, i);
-    
+    rb_ary_push(tmp, rb_yield(i));
     return Qnil;
 }
 
@@ -159,83 +156,32 @@ static VALUE
 enum_collect(obj)
     VALUE obj;
 {
-    VALUE ary = rb_ary_new();
-    
-    rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
-
-    return ary;
-}
-
-static VALUE
-enum_to_a(obj)
-    VALUE obj;
-{
-    VALUE ary = rb_ary_new();
-    
-    rb_iterate(rb_each, obj, collect_all, ary);
-
-    return ary;
-}
-
-static VALUE
-inject_i(i, memo)
-    VALUE i;
-    NODE *memo;
-{
-    if (memo->u2.value) {
-        memo->u2.value = Qfalse;
-        memo->u1.value = i;
-    }
-    else {
-        memo->u1.value = rb_yield_values(2, memo->u1.value, i);
-    }
-    return Qnil;
-}
+    VALUE tmp;
 
-static VALUE
-enum_inject(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
-{
-    NODE *memo;
-    VALUE n;
+    tmp = rb_ary_new();
+    rb_iterate(rb_each, obj, collect_i, tmp);
 
-    if (rb_scan_args(argc, argv, "01", &n) == 1) {
-        memo = rb_node_newnode(NODE_MEMO, n, Qfalse, 0);
-    }
-    else {
-        memo = rb_node_newnode(NODE_MEMO, Qnil, Qtrue, 0);
-    }
-    rb_iterate(rb_each, obj, inject_i, (VALUE)memo);
-    n = memo->u1.value;
-    rb_gc_force_recycle((VALUE)memo);
-    return n;
+    return tmp;
 }
 
 static VALUE
-partition_i(i, ary)
-    VALUE i, *ary;
+enum_all(i, ary)
+    VALUE i, ary;
 {
-    if (RTEST(rb_yield(i))) {
-	rb_ary_push(ary[0], i);
-    }
-    else {
-	rb_ary_push(ary[1], i);
-    }
+    rb_ary_push(ary, i);
     return Qnil;
 }
 
 static VALUE
-enum_partition(obj)
+enum_to_a(obj)
     VALUE obj;
 {
-    VALUE ary[2];
+    VALUE ary;
 
-    ary[0] = rb_ary_new();
-    ary[1] = rb_ary_new();
-    rb_iterate(rb_each, obj, partition_i, (VALUE)ary);
+    ary = rb_ary_new();
+    rb_iterate(rb_each, obj, enum_all, ary);
 
-    return rb_assoc_new(ary[0], ary[1]);
+    return ary;
 }
 
 static VALUE
@@ -246,236 +192,131 @@ enum_sort(obj)
 }
 
 static VALUE
-sort_by_i(i, ary)
-    VALUE i, ary;
-{
-    VALUE v, e;
-
-    v = rb_yield(i);
-    e = rb_assoc_new(v, i);
-    rb_ary_push(ary, e);
-    return Qnil;
-}
-
-static int
-sort_by_cmp(a, b)
-    VALUE *a, *b;
-{
-    VALUE retval;
-
-    retval = rb_funcall(RARRAY(*a)->ptr[0], id_cmp, 1, RARRAY(*b)->ptr[0]);
-    return rb_cmpint(retval, *a, *b);
-}
-
-static VALUE
-enum_sort_by(obj)
-    VALUE obj;
+min_i(i, min)
+    VALUE i, *min;
 {
-    VALUE ary;
-    long i;
+    VALUE cmp;
 
-    if (TYPE(obj) == T_ARRAY) {
-	ary  = rb_ary_new2(RARRAY(obj)->len);
-    }
+    if (NIL_P(*min))
+	*min = i;
     else {
-	ary = rb_ary_new();
-    }
-    rb_iterate(rb_each, obj, sort_by_i, ary);
-    if (RARRAY(ary)->len > 1) {
-	qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp);
-    }
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	VALUE e = RARRAY(ary)->ptr[i];
-	RARRAY(ary)->ptr[i] = RARRAY(e)->ptr[1];
-    }
-    return ary;
-}
-
-static VALUE
-all_iter_i(i, memo)
-    VALUE i;
-    NODE *memo;
-{
-    if (!RTEST(rb_yield(i))) {
-	memo->u1.value = Qfalse;
-	rb_iter_break();
+	cmp = rb_funcall(i, id_cmp, 1, *min);
+	if (FIX2LONG(cmp) < 0)
+	    *min = i;
     }
     return Qnil;
 }
 
 static VALUE
-all_i(i, memo)
-    VALUE i;
-    NODE *memo;
-{
-    if (!RTEST(i)) {
-	memo->u1.value = Qfalse;
-	rb_iter_break();
-    }
-    return Qnil;
-}
-
-static VALUE
-enum_all(obj)
-    VALUE obj;
-{
-    VALUE result;
-    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
-
-    memo->u1.value = Qtrue;
-    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)memo);
-    result = memo->u1.value;
-    rb_gc_force_recycle((VALUE)memo);
-    return result;
-}
-
-static VALUE
-any_iter_i(i, memo)
-    VALUE i;
-    NODE *memo;
+min_ii(i, min)
+    VALUE i, *min;
 {
-    if (RTEST(rb_yield(i))) {
-	memo->u1.value = Qtrue;
-	rb_iter_break();
-    }
-    return Qnil;
-}
+    VALUE cmp;
 
-static VALUE
-any_i(i, memo)
-    VALUE i;
-    NODE *memo;
-{
-    if (RTEST(i)) {
-	memo->u1.value = Qtrue;
-	rb_iter_break();
+    if (NIL_P(*min))
+	*min = i;
+    else {
+	cmp = rb_yield(rb_assoc_new(i, *min));
+	if (FIX2LONG(cmp) < 0)
+	    *min = i;
     }
     return Qnil;
 }
 
 static VALUE
-enum_any(obj)
+enum_min(obj)
     VALUE obj;
 {
-    VALUE result;
-    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
-
-    memo->u1.value = Qfalse;
-    rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)memo);
-    result = memo->u1.value;
-    rb_gc_force_recycle((VALUE)memo);
-    return result;
+    VALUE min = Qnil;
+
+    rb_iterate(rb_each, obj, rb_iterator_p()?min_ii:min_i, (VALUE)&min);
+    return min;
 }
 
 static VALUE
-min_i(i, memo)
-    VALUE i;
-    NODE *memo;
+max_i(i, max)
+    VALUE i, *max;
 {
     VALUE cmp;
 
-    if (NIL_P(memo->u1.value)) {
-	memo->u1.value = i;
-    }
+    if (NIL_P(*max))
+	*max = i;
     else {
-	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
-	if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
-	    memo->u1.value = i;
-	}
+	cmp = rb_funcall(i, id_cmp, 1, *max);
+	if (FIX2LONG(cmp) > 0)
+	    *max = i;
     }
     return Qnil;
 }
 
 static VALUE
-min_ii(i, memo)
-    VALUE i;
-    NODE *memo;
+max_ii(i, max)
+    VALUE i, *max;
 {
     VALUE cmp;
 
-    if (NIL_P(memo->u1.value)) {
-	memo->u1.value = i;
-    }
+    if (NIL_P(*max))
+	*max = i;
     else {
-	cmp = rb_yield_values(2, i, memo->u1.value);
-	if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
-	    memo->u1.value = i;
-	}
+	cmp = rb_yield(rb_assoc_new(i, *max));
+	if (FIX2LONG(cmp) > 0)
+	    *max = i;
     }
     return Qnil;
 }
 
 static VALUE
-enum_min(obj)
+enum_max(obj)
     VALUE obj;
 {
-    VALUE result;
-    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
+    VALUE max = Qnil;
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)memo);
-    result = memo->u1.value;
-    rb_gc_force_recycle((VALUE)memo);
-    return result;
+    rb_iterate(rb_each, obj, rb_iterator_p()?max_ii:max_i, (VALUE)&max);
+    return max;
 }
 
-static VALUE
-max_i(i, memo)
-    VALUE i;
-    NODE *memo;
-{
-    VALUE cmp;
-
-    if (NIL_P(memo->u1.value)) {
-	memo->u1.value = i;
-    }
-    else {
-	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
-	if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
-	    memo->u1.value = i;
-	}
-    }
-    return Qnil;
-}
+struct i_v_pair {
+    int i;
+    VALUE v;
+    int found;
+};
 
 static VALUE
-max_ii(i, memo)
-    VALUE i;
-    NODE *memo;
+index_i(item, iv)
+    VALUE item;
+    struct i_v_pair *iv;
 {
-    VALUE cmp;
-
-    if (NIL_P(memo->u1.value)) {
-	memo->u1.value = i;
+    if (rb_equal(item, iv->v)) {
+	iv->found = 1;
+	rb_iter_break();
     }
     else {
-	cmp = rb_yield_values(2, i, memo->u1.value);
-	if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
-	    memo->u1.value = i;
-	}
+	iv->i++;
     }
     return Qnil;
 }
 
 static VALUE
-enum_max(obj)
-    VALUE obj;
+enum_index(obj, val)
+    VALUE obj, val;
 {
-    VALUE result;
-    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
+    struct i_v_pair iv;
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)memo);
-    result = memo->u1.value;
-    rb_gc_force_recycle((VALUE)memo);
-    return result;
+    iv.i = 0;
+    iv.v = val;
+    iv.found = 0;
+    rb_iterate(rb_each, obj, index_i, (VALUE)&iv);
+    if (iv.found) return INT2FIX(iv.i);
+    return Qnil;		/* not found */
 }
 
 static VALUE
-member_i(item, memo)
+member_i(item, iv)
     VALUE item;
-    NODE *memo;
+    struct i_v_pair *iv;
 {
-    if (rb_equal(item, memo->u1.value)) {
-	memo->u2.value = Qtrue;
+    if (rb_equal(item, iv->v)) {
+	iv->i = 1;
 	rb_iter_break();
     }
     return Qnil;
@@ -485,79 +326,63 @@ static VALUE
 enum_member(obj, val)
     VALUE obj, val;
 {
-    VALUE result;
-    NODE *memo = rb_node_newnode(NODE_MEMO, val, Qfalse, 0);
+    struct i_v_pair iv;
 
-    rb_iterate(rb_each, obj, member_i, (VALUE)memo);
-    result = memo->u2.value;
-    rb_gc_force_recycle((VALUE)memo);
-    return result;
+    iv.i = 0;
+    iv.v = val;
+    rb_iterate(rb_each, obj, member_i, (VALUE)&iv);
+    if (iv.i) return Qtrue;
+    return Qfalse;
 }
 
 static VALUE
-each_with_index_i(val, memo)
-    VALUE val;
-    NODE *memo;
+length_i(i, length)
+    VALUE i;
+    int *length;
 {
-    rb_yield_values(2, val, INT2FIX(memo->u3.cnt));
-    memo->u3.cnt++;
+    (*length)++;
     return Qnil;
 }
 
 static VALUE
-enum_each_with_index(obj)
+enum_length(obj)
     VALUE obj;
 {
-    NODE *memo = rb_node_newnode(NODE_MEMO, 0, 0, 0);
+    int length = 0;
 
-    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)memo);
-    rb_gc_force_recycle((VALUE)memo);
-    return obj;
+    rb_iterate(rb_each, obj, length_i, (VALUE)&length);
+    return INT2FIX(length);
 }
 
-static VALUE
-zip_i(val, memo)
-    VALUE val;
-    NODE *memo;
+VALUE
+rb_enum_length(obj)
+    VALUE obj;
 {
-    VALUE result = memo->u1.value;
-    VALUE args = memo->u2.value;
-    int idx = memo->u3.cnt++;
-    VALUE tmp;
-    int i;
+    return enum_length(obj);
+}
 
-    tmp = rb_ary_new2(RARRAY(args)->len + 1);
-    rb_ary_store(tmp, 0, val);
-    for (i=0; i<RARRAY(args)->len; i++) {
-	rb_ary_push(tmp, rb_ary_entry(RARRAY(args)->ptr[i], idx));
-    }
-    if (rb_block_given_p()) {
-	rb_yield(tmp);
-    }
-    else {
-	rb_ary_push(result, tmp);
-    }
+static VALUE
+each_with_index_i(val, indexp)
+    VALUE val;
+    int *indexp;
+{
+#if 1
+    rb_yield(rb_assoc_new(val, INT2FIX(*indexp)));
+#else
+    rb_yield(rb_ary_concat(rb_Array(val), INT2FIX(*indexp)));
+#endif
+    (*indexp)++;
     return Qnil;
 }
 
 static VALUE
-enum_zip(argc, argv, obj)
-    int argc;
-    VALUE *argv;
+enum_each_with_index(obj)
     VALUE obj;
 {
-    int i;
-    VALUE result;
-    NODE *memo;
-
-    for (i=0; i<argc; i++) {
-	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_ary");
-    }
-    result = rb_block_given_p() ? Qnil : rb_ary_new();
-    memo = rb_node_newnode(NODE_MEMO, result, rb_ary_new4(argc, argv), 0);
-    rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
+    int index = 0;
 
-    return result;
+    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&index);
+    return Qnil;
 }
 
 void
@@ -569,7 +394,6 @@ Init_Enumerable()
     rb_define_method(rb_mEnumerable,"entries", enum_to_a, 0);
 
     rb_define_method(rb_mEnumerable,"sort", enum_sort, 0);
-    rb_define_method(rb_mEnumerable,"sort_by", enum_sort_by, 0);
     rb_define_method(rb_mEnumerable,"grep", enum_grep, 1);
     rb_define_method(rb_mEnumerable,"find", enum_find, -1);
     rb_define_method(rb_mEnumerable,"detect", enum_find, -1);
@@ -577,20 +401,16 @@ Init_Enumerable()
     rb_define_method(rb_mEnumerable,"select", enum_find_all, 0);
     rb_define_method(rb_mEnumerable,"reject", enum_reject, 0);
     rb_define_method(rb_mEnumerable,"collect", enum_collect, 0);
-    rb_define_method(rb_mEnumerable,"map", enum_collect, 0);
-    rb_define_method(rb_mEnumerable,"inject", enum_inject, -1);
-    rb_define_method(rb_mEnumerable,"partition", enum_partition, 0);
-    rb_define_method(rb_mEnumerable,"all?", enum_all, 0);
-    rb_define_method(rb_mEnumerable,"any?", enum_any, 0);
     rb_define_method(rb_mEnumerable,"min", enum_min, 0);
     rb_define_method(rb_mEnumerable,"max", enum_max, 0);
+    rb_define_method(rb_mEnumerable,"index", enum_index, 1);
     rb_define_method(rb_mEnumerable,"member?", enum_member, 1);
     rb_define_method(rb_mEnumerable,"include?", enum_member, 1);
+    rb_define_method(rb_mEnumerable,"length", enum_length, 0);
+    rb_define_method(rb_mEnumerable,"size", enum_length, 0);
     rb_define_method(rb_mEnumerable,"each_with_index", enum_each_with_index, 0);
-    rb_define_method(rb_mEnumerable, "zip", enum_zip, -1);
 
     id_eqq  = rb_intern("===");
     id_each = rb_intern("each");
     id_cmp  = rb_intern("<=>");
 }
-
diff --git a/env.h b/env.h
index c47c01d9db..bdaac91950 100644
--- a/env.h
+++ b/env.h
@@ -1,15 +1,13 @@
-/**********************************************************************
+/************************************************
 
   env.h -
 
   $Author$
+  $Revision$
   $Date$
   created at: Mon Jul 11 11:53:03 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-
-**********************************************************************/
-
+************************************************/
 #ifndef ENV_H
 #define ENV_H
 
@@ -18,32 +16,26 @@ extern struct FRAME {
     int argc;
     VALUE *argv;
     ID last_func;
-    ID orig_func;
     VALUE last_class;
+    VALUE cbase;
     struct FRAME *prev;
-    struct FRAME *tmp;
-    struct RNode *node;
+    char *file;
+    int line;
     int iter;
-    int flags;
-    unsigned long uniq;
 } *ruby_frame;
 
 void rb_gc_mark_frame _((struct FRAME *));
 
-#define FRAME_ALLOCA 0
-#define FRAME_MALLOC 1
-
 extern struct SCOPE {
     struct RBasic super;
     ID *local_tbl;
     VALUE *local_vars;
-    int flags;
+    int flag;
 } *ruby_scope;
 
 #define SCOPE_ALLOCA  0
 #define SCOPE_MALLOC  1
 #define SCOPE_NOSTACK 2
-#define SCOPE_DONT_RECYCLE 4
 
 extern int ruby_in_eval;
 
diff --git a/error.c b/error.c
index f2a3c8ba5f..300c09fed0 100644
--- a/error.c
+++ b/error.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   error.c -
 
@@ -6,15 +6,12 @@
   $Date$
   created at: Mon Aug  9 16:11:34 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
 #include "env.h"
-#include "version.h"
-#include "st.h"
-
 #include <stdio.h>
 #ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
@@ -24,37 +21,27 @@
 #define va_init_list(a,b) va_start(a)
 #endif
 
-int ruby_nerrs;
+#ifdef USE_CWGUSI
+#include <sys/errno.h>
+int sys_nerr = 256;
+#endif
 
-static int
-err_position(buf, len)
-    char *buf;
-    long len;
-{
-    ruby_set_current_source();
-    if (!ruby_sourcefile) {
-	return 0;
-    }
-    else if (ruby_sourceline == 0) {
-	return snprintf(buf, len, "%s: ", ruby_sourcefile);
-    }
-    else {
-	return snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
-    }
-}
+int ruby_nerrs;
 
 static void
 err_snprintf(buf, len, fmt, args)
-    char *buf;
-    long len;
-    const char *fmt;
+    char *buf, *fmt;
+    int len;
     va_list args;
 {
-    long n;
-
-    n = err_position(buf, len);
-    if (len > n) {
-	vsnprintf((char*)buf+n, len-n, fmt, args);
+    if (!ruby_sourcefile) {
+	vsnprintf(buf, len, fmt, args);
+    }
+    else {
+	int n = snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
+	if (len > n) {
+	    vsnprintf((char*)buf+n, len-n, fmt, args);
+	}
     }
 }
 
@@ -105,20 +92,6 @@ rb_compile_error_append(fmt, va_alist)
     err_append(buf);
 }
 
-static void
-warn_print(fmt, args)
-    const char *fmt;
-    va_list args;
-{
-    char buf[BUFSIZ];
-    int len;
-
-    err_snprintf(buf, BUFSIZ, fmt, args);
-    len = strlen(buf);
-    buf[len++] = '\n';
-    rb_write_error2(buf, len);
-}
-
 void
 #ifdef HAVE_STDARG_PROTOTYPES
 rb_warn(const char *fmt, ...)
@@ -131,12 +104,10 @@ rb_warn(fmt, va_alist)
     char buf[BUFSIZ];
     va_list args;
 
-    if (NIL_P(ruby_verbose)) return;
-
     snprintf(buf, BUFSIZ, "warning: %s", fmt);
 
     va_init_list(args, fmt);
-    warn_print(buf, args);
+    err_print(buf, args);
     va_end(args);
 }
 
@@ -158,21 +129,10 @@ rb_warning(fmt, va_alist)
     snprintf(buf, BUFSIZ, "warning: %s", fmt);
 
     va_init_list(args, fmt);
-    warn_print(buf, args);
+    err_print(buf, args);
     va_end(args);
 }
 
-static VALUE
-rb_warn_m(self, mesg)
-    VALUE self, mesg;
-{
-    if (!NIL_P(ruby_verbose)) {
-	rb_io_write(rb_stderr, mesg);
-	rb_io_write(rb_stderr, rb_default_rs);
-    }
-    return Qnil;
-}
-
 void
 #ifdef HAVE_STDARG_PROTOTYPES
 rb_bug(const char *fmt, ...)
@@ -184,18 +144,13 @@ rb_bug(fmt, va_alist)
 {
     char buf[BUFSIZ];
     va_list args;
-    FILE *out = stderr;
-    int len = err_position(buf, BUFSIZ);
-
-    if (fwrite(buf, 1, len, out) == len ||
-	fwrite(buf, 1, len, (out = stdout)) == len) {
-	fputs("[BUG] ", out);
-	va_init_list(args, fmt);
-	vfprintf(out, fmt, args);
-	va_end(args);
-	fprintf(out, "\nruby %s (%s) [%s]\n\n",
-		RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_PLATFORM);
-    }
+
+    snprintf(buf, BUFSIZ, "[BUG] %s", fmt);
+    ruby_in_eval = 0;
+
+    va_init_list(args, fmt);
+    err_print(buf, args);
+    va_end(args);
     abort();
 }
 
@@ -203,30 +158,28 @@ static struct types {
     int type;
     const char *name;
 } builtin_types[] = {
-    {T_NIL,	"nil"},
-    {T_OBJECT,	"Object"},
-    {T_CLASS,	"Class"},
-    {T_ICLASS,	"iClass"},	/* internal use: mixed-in module holder */
-    {T_MODULE,	"Module"},
-    {T_FLOAT,	"Float"},
-    {T_STRING,	"String"},
-    {T_REGEXP,	"Regexp"},
-    {T_ARRAY,	"Array"},
-    {T_FIXNUM,	"Fixnum"},
-    {T_HASH,	"Hash"},
-    {T_STRUCT,	"Struct"},
-    {T_BIGNUM,	"Bignum"},
-    {T_FILE,	"File"},
-    {T_TRUE,	"true"},
-    {T_FALSE,	"false"},
-    {T_SYMBOL,	"Symbol"},	/* :symbol */
-    {T_DATA,	"Data"},	/* internal use: wrapped C pointers */
-    {T_MATCH,	"MatchData"},	/* data of $~ */
-    {T_VARMAP,	"Varmap"},	/* internal use: dynamic variables */
-    {T_SCOPE,	"Scope"},	/* internal use: variable scope */
-    {T_NODE,	"Node"},	/* internal use: syntax tree node */
-    {T_UNDEF,	"undef"},	/* internal use: #undef; should not happen */
-    {-1,	0}
+    T_NIL,	"nil",
+    T_OBJECT,	"Object",
+    T_CLASS,	"Class",
+    T_ICLASS,	"iClass",	/* internal use: mixed-in module holder */
+    T_MODULE,	"Module",
+    T_FLOAT,	"Float",
+    T_STRING,	"String",
+    T_REGEXP,	"Regexp",
+    T_ARRAY,	"Array",
+    T_FIXNUM,	"Fixnum",
+    T_HASH,	"Hash",
+    T_STRUCT,	"Struct",
+    T_BIGNUM,	"Bignum",
+    T_FILE,	"File",
+    T_TRUE,	"TRUE",
+    T_FALSE,	"FALSE",
+    T_DATA,	"Data",		/* internal use: wrapped C pointers */
+    T_MATCH,	"Match",	/* data of $~ */
+    T_VARMAP,	"Varmap",	/* internal use: dynamic variables */
+    T_SCOPE,	"Scope",	/* internal use: variable scope */
+    T_NODE,	"Node",		/* internal use: syntax tree node */
+    -1,		0,
 };
 
 void
@@ -235,12 +188,9 @@ rb_check_type(x, t)
     int t;
 {
     struct types *type = builtin_types;
+    int tt = TYPE(x);
 
-    if (x == Qundef) {
-	rb_bug("undef leaked to the Ruby space");
-    }
-
-    if (TYPE(x) != t) {
+    if (tt != t) {
 	while (type->type >= 0) {
 	    if (type->type == t) {
 		char *etype;
@@ -255,7 +205,7 @@ rb_check_type(x, t)
 		    etype = RSTRING(rb_obj_as_string(x))->ptr;
 		}
 		else {
-		    etype = rb_obj_classname(x);
+		    etype = rb_class2name(CLASS_OF(x));
 		}
 		rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
 			 etype, type->name);
@@ -276,19 +226,14 @@ VALUE rb_eSignal;
 VALUE rb_eFatal;
 VALUE rb_eStandardError;
 VALUE rb_eRuntimeError;
+VALUE rb_eSyntaxError;
 VALUE rb_eTypeError;
 VALUE rb_eArgError;
-VALUE rb_eIndexError;
-VALUE rb_eRangeError;
 VALUE rb_eNameError;
-VALUE rb_eNoMethodError;
+VALUE rb_eIndexError;
+VALUE rb_eLoadError;
 VALUE rb_eSecurityError;
 VALUE rb_eNotImpError;
-VALUE rb_eNoMemError;
-
-VALUE rb_eScriptError;
-VALUE rb_eSyntaxError;
-VALUE rb_eLoadError;
 
 VALUE rb_eSystemCallError;
 VALUE rb_mErrno;
@@ -299,7 +244,10 @@ rb_exc_new(etype, ptr, len)
     const char *ptr;
     long len;
 {
-    return rb_funcall(etype, rb_intern("new"), 1, rb_str_new(ptr, len));
+    VALUE exc = rb_obj_alloc(etype);
+
+    rb_iv_set(exc, "mesg", rb_str_new(ptr, len));
+    return exc;
 }
 
 VALUE
@@ -314,8 +262,11 @@ VALUE
 rb_exc_new3(etype, str)
     VALUE etype, str;
 {
-    StringValue(str);
-    return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len);
+    char *s;
+    int len;
+
+    s = str2cstr(str, &len);
+    return rb_exc_new(etype, s, len);
 }
 
 static VALUE
@@ -324,14 +275,12 @@ exc_initialize(argc, argv, exc)
     VALUE *argv;
     VALUE exc;
 {
-    VALUE arg;
+    VALUE mesg;
 
-    if (rb_scan_args(argc, argv, "01", &arg) == 1) {
-	VALUE mesg = arg;
-	StringValue(mesg);	/* ensure mesg can be converted to String */
+    if (rb_scan_args(argc, argv, "01", &mesg) == 1) {
+	STR2CSTR(mesg);		/* ensure mesg can be converted to String */
     }
-    rb_iv_set(exc, "mesg", arg);
-    rb_iv_set(exc, "bt", Qnil);
+    rb_iv_set(exc, "mesg", mesg);
 
     return exc;
 }
@@ -342,12 +291,16 @@ exc_exception(argc, argv, self)
     VALUE *argv;
     VALUE self;
 {
-    VALUE exc;
+    VALUE etype, exc;
 
     if (argc == 0) return self;
     if (argc == 1 && self == argv[0]) return self;
-    exc = rb_obj_clone(self);
-    exc_initialize(argc, argv, exc);
+    etype = CLASS_OF(self);
+    while (FL_TEST(etype, FL_SINGLETON)) {
+	etype = RCLASS(etype)->super;
+    }
+    exc = rb_obj_alloc(etype);
+    rb_obj_call_init(exc, argc, argv);
 
     return exc;
 }
@@ -356,10 +309,9 @@ static VALUE
 exc_to_s(exc)
     VALUE exc;
 {
-    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
+    VALUE mesg = rb_iv_get(exc, "mesg");
 
     if (NIL_P(mesg)) return rb_class_path(CLASS_OF(exc));
-    if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
     return mesg;
 }
 
@@ -375,12 +327,12 @@ exc_inspect(exc)
 	return rb_str_dup(rb_class_path(klass));
     }
 
-    str = rb_str_buf_new2("#<");
+    str = rb_str_new2("#<");
     klass = rb_class_path(klass);
-    rb_str_buf_append(str, klass);
-    rb_str_buf_cat(str, ": ", 2);
-    rb_str_buf_append(str, exc);
-    rb_str_buf_cat(str, ">", 1);
+    rb_str_concat(str, klass);
+    rb_str_cat(str, ":", 1);
+    rb_str_concat(str, exc);
+    rb_str_cat(str, ">", 1);
 
     return str;
 }
@@ -399,7 +351,7 @@ static VALUE
 check_backtrace(bt)
     VALUE bt;
 {
-    long i;
+    int i;
     static char *err = "backtrace must be Array of String";
 
     if (!NIL_P(bt)) {
@@ -421,217 +373,127 @@ check_backtrace(bt)
 static VALUE
 exc_set_backtrace(exc, bt)
     VALUE exc;
-    VALUE bt;
 {
     return rb_iv_set(exc, "bt", check_backtrace(bt));
 }
 
-static VALUE
-exit_initialize(argc, argv, exc)
-    int argc;
-    VALUE *argv;
-    VALUE exc;
-{
-    VALUE status = INT2NUM(0);
-    if (argc > 0 && FIXNUM_P(argv[0])) {
-	status = *argv++;
-	--argc;
-    }
-    exc_initialize(argc, argv, exc);
-    rb_iv_set(exc, "status", status);
-    return exc;
-}
-
-static VALUE
-exit_status(exc)
-    VALUE exc;
-{
-    return rb_attr_get(exc, rb_intern("status"));
-}
+#ifdef __BEOS__
+typedef struct {
+   VALUE *list;
+   int n;
+} syserr_list_entry;
+
+typedef struct {
+   int ix;
+   int n;
+} syserr_index_entry;
+
+static VALUE syserr_list_b_general[16+1];
+static VALUE syserr_list_b_os0[2+1];
+static VALUE syserr_list_b_os1[5+1];
+static VALUE syserr_list_b_os2[2+1];
+static VALUE syserr_list_b_os3[3+1];
+static VALUE syserr_list_b_os4[1+1];
+static VALUE syserr_list_b_app[15+1];
+static VALUE syserr_list_b_interface[0+1];
+static VALUE syserr_list_b_media[8+1];
+static VALUE syserr_list_b_midi[0+1];
+static VALUE syserr_list_b_storage[15+1];
+static VALUE syserr_list_b_posix[38+1];
+static VALUE syserr_list_b_mail[8+1];
+static VALUE syserr_list_b_print[1+1];
+static VALUE syserr_list_b_device[14+1];
+
+# define SYSERR_LIST_B(n) {(n), sizeof(n)/sizeof(VALUE)}
+static const syserr_list_entry syserr_list[] = {
+   SYSERR_LIST_B(syserr_list_b_general),
+   SYSERR_LIST_B(syserr_list_b_os0),
+   SYSERR_LIST_B(syserr_list_b_os1),
+   SYSERR_LIST_B(syserr_list_b_os2),
+   SYSERR_LIST_B(syserr_list_b_os3),
+   SYSERR_LIST_B(syserr_list_b_os4),
+   SYSERR_LIST_B(syserr_list_b_app),
+   SYSERR_LIST_B(syserr_list_b_interface),
+   SYSERR_LIST_B(syserr_list_b_media),
+   SYSERR_LIST_B(syserr_list_b_midi),
+   SYSERR_LIST_B(syserr_list_b_storage),
+   SYSERR_LIST_B(syserr_list_b_posix),
+   SYSERR_LIST_B(syserr_list_b_mail),
+   SYSERR_LIST_B(syserr_list_b_print),
+   SYSERR_LIST_B(syserr_list_b_device),
+};
+# undef SYSERR_LIST_B
 
-void
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_name_error(ID id, const char *fmt, ...)
+static const syserr_index_entry syserr_index[]= {
+     {0, 1},  {1, 5},  {6, 1},  {7, 1}, {8, 1}, {9, 1}, {10, 1}, {11, 1},
+     {12, 1}, {13, 1}, {14, 1}, {0, 0},
+};
 #else
-rb_name_error(id, fmt, va_alist)
-    ID id;
-    const char *fmt;
-    va_dcl
+static VALUE *syserr_list;
 #endif
-{
-    VALUE exc, argv[2];
-    va_list args;
-    char buf[BUFSIZ];
-
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
-    va_end(args);
-
-    argv[0] = rb_str_new2(buf);
-    argv[1] = ID2SYM(id);
-    exc = rb_class_new_instance(2, argv, rb_eNameError);
-    rb_exc_raise(exc);
-}
-
-static VALUE
-name_err_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE name = (argc > 1) ? argv[--argc] : Qnil;
-    exc_initialize(argc, argv, self);
-    rb_iv_set(self, "name", name);
-    return self;
-}
-
-static VALUE
-name_err_name(self)
-    VALUE self;
-{
-    return rb_attr_get(self, rb_intern("name"));
-}
 
-static VALUE
-nometh_err_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE args = (argc > 2) ? argv[--argc] : Qnil;
-    name_err_initialize(argc, argv, self);
-    rb_iv_set(self, "args", args);
-    return self;
-}
-
-static VALUE
-nometh_err_args(self)
-    VALUE self;
-{
-    return rb_attr_get(self, rb_intern("args"));
-}
-
-void
-rb_invalid_str(str, type)
-    const char *str, *type;
-{
-    VALUE s = rb_str_inspect(rb_str_new2(str));
-
-    rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING(s)->ptr);
-}
-
-static st_table *syserr_tbl;
+#ifndef NT
+extern int sys_nerr;
+#endif
 
 static VALUE
-set_syserr(n, name)
-    int n;
+set_syserr(i, name)
+    int i;
     const char *name;
 {
-    VALUE error;
-
-    if (!st_lookup(syserr_tbl, n, &error)) {
-	error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
-	rb_define_const(error, "Errno", INT2NUM(n));
-	st_add_direct(syserr_tbl, n, error);
-    }
-    else {
-	rb_define_const(rb_mErrno, name, error);
-    }
-    return error;
-}
-
-static VALUE
-get_syserr(n)
-    int n;
-{
-    VALUE error;
-
-    if (!st_lookup(syserr_tbl, n, &error)) {
-	char name[8];	/* some Windows' errno have 5 digits. */
-
-	snprintf(name, sizeof(name), "E%03d", n);
-	error = set_syserr(n, name);
+#ifdef __BEOS__
+   VALUE *list;
+   int ix, offset;
+#endif
+    VALUE error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
+    rb_define_const(error, "Errno", INT2FIX(i));
+#ifdef __BEOS__
+   i -= B_GENERAL_ERROR_BASE;
+   ix = (i >> 12) & 0xf;
+   offset = (i >> 8) & 0xf;
+   if (offset < syserr_index[ix].n) {
+      ix = syserr_index[ix].ix;
+      if ((i & 0xff) < syserr_list[ix + offset].n) {
+	 list = syserr_list[ix + offset].list;
+	 list[i & 0xff] = error;
+	 rb_global_variable(&list[i & 0xff]);
+      }
+   }
+#else
+    if (i <= sys_nerr) {
+	syserr_list[i] = error;
     }
-    return error;
-}
-
-static VALUE
-syserr_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-#if !defined(_WIN32) && !defined(__VMS)
-    char *strerror();
 #endif
-    char *err;
-    char *buf;
-    VALUE mesg, error;
-    VALUE klass = rb_obj_class(self);
-
-    if (klass == rb_eSystemCallError) {
-	rb_scan_args(argc, argv, "11", &mesg, &error);
-	if (argc == 1 && FIXNUM_P(mesg)) {
-	    error = mesg; mesg = Qnil;
-	}
-	if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &klass)) {
-	    /* change class */
-	    if (TYPE(self) != T_OBJECT) { /* insurance to avoid type crash */
-		rb_raise(rb_eTypeError, "invalid instance type");
-	    }
-	    RBASIC(self)->klass = klass;
-	}
-    }
-    else {
-	rb_scan_args(argc, argv, "01", &mesg);
-	error = rb_const_get_at(klass, rb_intern("Errno"));
-    }
-    if (!NIL_P(error)) err = strerror(NUM2LONG(error));
-    else err = "unknown error";
-    if (!NIL_P(mesg)) {
-	StringValue(mesg);
-	buf = ALLOCA_N(char, strlen(err)+RSTRING(mesg)->len+4);
-	sprintf(buf, "%s - %.*s", err, (int)RSTRING(mesg)->len, RSTRING(mesg)->ptr);
-	mesg = rb_str_new2(buf);
-    }
-    else {
-	mesg = rb_str_new2(err);
-    }
-    exc_initialize(1, &mesg, self);
-    rb_iv_set(self, "errno", error);
-    return self;
+    return error;
 }
 
 static VALUE
 syserr_errno(self)
     VALUE self;
 {
-    return rb_attr_get(self, rb_intern("errno"));
+    return rb_iv_get(self, "errno");
 }
 
+#ifdef __BEOS__
 static VALUE
-syserr_eqq(self, exc)
-    VALUE self, exc;
+get_syserr(int i)
 {
-    VALUE num, e;
-
-    if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) return Qfalse;
-    if (self == rb_eSystemCallError) return Qtrue;
-
-    num = rb_attr_get(exc, rb_intern("errno"));
-    if (NIL_P(num)) {
-	VALUE klass = CLASS_OF(exc);
-
-	while (TYPE(klass) == T_ICLASS || FL_TEST(klass, FL_SINGLETON)) {
-	    klass = (VALUE)RCLASS(klass)->super;
-	}
-	num = rb_const_get(klass, rb_intern("Errno"));
-    }
-    e = rb_const_get(self, rb_intern("Errno"));
-    if (FIXNUM_P(num) ? num == e : rb_equal(num, e))
-	return Qtrue;
-    return Qfalse;
+   VALUE *list;
+   int ix, offset;
+   
+   i -= B_GENERAL_ERROR_BASE;
+   ix = (i >> 12) & 0xf;
+   offset = (i >> 8) & 0xf;
+   if (offset < syserr_index[ix].n) {
+      ix = syserr_index[ix].ix;
+      if ((i & 0xff) < syserr_list[ix + offset].n) {
+	 list = syserr_list[ix + offset].list;
+	 return list[i & 0xff];
+      }
+   }
+   return 0;
 }
+#endif /* __BEOS__ */
 
 static void init_syserr _((void));
 
@@ -650,43 +512,23 @@ Init_Exception()
     rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
 
     rb_eSystemExit  = rb_define_class("SystemExit", rb_eException);
-    rb_define_method(rb_eSystemExit, "initialize", exit_initialize, -1);
-    rb_define_method(rb_eSystemExit, "status", exit_status, 0);
-
     rb_eFatal  	    = rb_define_class("fatal", rb_eException);
+    rb_eInterrupt   = rb_define_class("Interrupt", rb_eException);
     rb_eSignal      = rb_define_class("SignalException", rb_eException);
-    rb_eInterrupt   = rb_define_class("Interrupt", rb_eSignal);
 
     rb_eStandardError = rb_define_class("StandardError", rb_eException);
-    rb_eTypeError     = rb_define_class("TypeError", rb_eStandardError);
-    rb_eArgError      = rb_define_class("ArgumentError", rb_eStandardError);
-    rb_eIndexError    = rb_define_class("IndexError", rb_eStandardError);
-    rb_eRangeError    = rb_define_class("RangeError", rb_eStandardError);
-    rb_eNameError     = rb_define_class("NameError", rb_eStandardError);
-    rb_define_method(rb_eNameError, "initialize", name_err_initialize, -1);
-    rb_define_method(rb_eNameError, "name", name_err_name, 0);
-    rb_eNoMethodError = rb_define_class("NoMethodError", rb_eNameError);
-    rb_define_method(rb_eNoMethodError, "initialize", nometh_err_initialize, -1);
-    rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
-
-    rb_eScriptError = rb_define_class("ScriptError", rb_eException);
-    rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
-    rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
-    rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
+    rb_eSyntaxError = rb_define_class("SyntaxError", rb_eStandardError);
+    rb_eTypeError   = rb_define_class("TypeError", rb_eStandardError);
+    rb_eArgError    = rb_define_class("ArgumentError", rb_eStandardError);
+    rb_eNameError   = rb_define_class("NameError", rb_eStandardError);
+    rb_eIndexError  = rb_define_class("IndexError", rb_eStandardError);
+    rb_eLoadError   = rb_define_class("LoadError", rb_eStandardError);
 
     rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
     rb_eSecurityError = rb_define_class("SecurityError", rb_eStandardError);
-    rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
-
-    syserr_tbl = st_init_numtable();
-    rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
-    rb_define_method(rb_eSystemCallError, "initialize", syserr_initialize, -1);
-    rb_define_method(rb_eSystemCallError, "errno", syserr_errno, 0);
-    rb_define_singleton_method(rb_eSystemCallError, "===", syserr_eqq, 1);
-
-    rb_mErrno = rb_define_module("Errno");
+    rb_eNotImpError = rb_define_class("NotImplementError", rb_eException);
 
-    rb_define_global_function("warn", rb_warn_m, 1);
+    init_syserr();
 }
 
 void
@@ -758,69 +600,83 @@ void
 rb_sys_fail(mesg)
     const char *mesg;
 {
+#ifndef NT
+    char *strerror();
+#endif
+    char *err;
+    char *buf;
     extern int errno;
     int n = errno;
-    VALUE arg;
+    VALUE ee;
 
-    errno = 0;
-    if (n == 0) {
-	rb_bug("rb_sys_fail(%s) - errno == 0", mesg ? mesg : "");
+    err = strerror(errno);
+    if (mesg) {
+	buf = ALLOCA_N(char, strlen(err)+strlen(mesg)+4);
+	sprintf(buf, "%s - %s", err, mesg);
+    }
+    else {
+	buf = ALLOCA_N(char, strlen(err)+1);
+	strcpy(buf, err);
     }
 
-    arg = mesg ? rb_str_new2(mesg) : Qnil;
-    rb_exc_raise(rb_class_new_instance(1, &arg, get_syserr(n)));
-}
-
-void
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_sys_warning(const char *fmt, ...)
+    errno = 0;
+#ifdef __BEOS__
+    ee = get_syserr(n);
+    if (!ee) {
+	char name[6];
+      
+	sprintf(name, "E%03d", n);
+	ee = set_syserr(n, name);
+   }
 #else
-rb_sys_warning(fmt, va_alist)
-     const char *fmt;
-     va_dcl
-#endif
-{
-     char buf[BUFSIZ];
-     va_list args;
-     int errno_save;
-     
-     errno_save = errno;
-
-     if (!RTEST(ruby_verbose)) return;
-
-     snprintf(buf, BUFSIZ, "warning: %s", fmt);
-     snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
-     
-     va_init_list(args, fmt);
-     warn_print(buf, args);
-     va_end(args);
-     errno = errno_save;
-}
+# ifdef USE_CWGUSI
+    if (n < 0) {
+	int macoserr_index = sys_nerr - 1;
+	if (!syserr_list[macoserr_index]) {
+	    char name[6];
+	    sprintf(name, "E%03d", macoserr_index);
+	    ee = set_syserr(macoserr_index, name);
+	}
+    }
+    else
+#endif /* USE_CWGUSI */
+    if (n > sys_nerr || !syserr_list[n]) {
+	char name[6];
 
-void
-rb_load_fail(path)
-    char *path;
-{
-    rb_loaderror("%s -- %s", strerror(errno), path);
+	sprintf(name, "E%03d", n);
+	ee = set_syserr(n, name);
+    }
+    else {
+	ee = syserr_list[n];
+    }
+    ee = rb_exc_new2(ee, buf);
+#endif
+    rb_iv_set(ee, "errno", INT2FIX(n));
+    rb_exc_raise(ee);
 }
 
-void
-rb_error_frozen(what)
-    char *what;
+static void
+init_syserr()
 {
-    rb_raise(rb_eTypeError, "can't modify frozen %s", what);
-}
+#ifdef __BEOS__
+   int i, ix, offset;
+#endif
+    rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
+    rb_define_method(rb_eSystemCallError, "errno", syserr_errno, 0);
 
-void
-rb_check_frozen(obj)
-    VALUE obj;
-{
-    if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
-}
+    rb_mErrno = rb_define_module("Errno");
+#ifdef __BEOS__
+   for (i = 0; syserr_index[i].n != 0; i++) {
+      ix = syserr_index[i].ix;
+      for (offset = 0; offset < syserr_index[i].n; offset++) {
+	 MEMZERO(syserr_list[ix + offset].list, VALUE, syserr_list[ix + offset].n);
+      }
+   }
+#else
+    syserr_list = ALLOC_N(VALUE, sys_nerr+1);
+    MEMZERO(syserr_list, VALUE, sys_nerr+1);
+#endif
 
-void
-Init_syserr()
-{
 #ifdef EPERM
     set_syserr(EPERM, "EPERM");
 #endif
@@ -1200,15 +1056,16 @@ err_append(s)
 	    ruby_errinfo = rb_exc_new2(rb_eSyntaxError, s);
 	}
 	else {
-	    VALUE str = rb_obj_as_string(ruby_errinfo);
+	    VALUE str = rb_str_to_str(ruby_errinfo);
 
-	    rb_str_cat2(str, "\n");
-	    rb_str_cat2(str, s);
+	    rb_str_cat(str, "\n", 1);
+	    rb_str_cat(str, s, strlen(s));
 	    ruby_errinfo = rb_exc_new3(rb_eSyntaxError, str);
 	}
     }
     else {
-	rb_write_error(s);
-	rb_write_error("\n");
+	fputs(s, stderr);
+	fputs("\n", stderr);
+	fflush(stderr);
     }
 }
diff --git a/eval.c b/eval.c
index 56e6614c60..0a558769aa 100644
--- a/eval.c
+++ b/eval.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   eval.c -
 
@@ -6,66 +6,20 @@
   $Date$
   created at: Thu Jun 10 14:22:17 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
 #include "node.h"
 #include "env.h"
-#include "util.h"
 #include "rubysig.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
 #include <stdio.h>
 #include <setjmp.h>
 #include "st.h"
 #include "dln.h"
 
-#ifdef __APPLE__
-#include <crt_externs.h>
-#endif
-
-/* Make alloca work the best possible way.  */
-#ifdef __GNUC__
-# ifndef atarist
-#  ifndef alloca
-#   define alloca __builtin_alloca
-#  endif
-# endif /* atarist */
-#else
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca ();
-#   endif
-#  endif /* AIX */
-# endif /* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
-
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
-
 #ifndef HAVE_STRING_H
 char *strrchr _((const char*,const char));
 #endif
@@ -78,6 +32,12 @@ char *strrchr _((const char*,const char));
 #include <net/socket.h>
 #endif
 
+#ifdef USE_CWGUSI
+#include <sys/stat.h>
+#include <sys/errno.h>
+#include <compat.h>
+#endif
+
 #ifdef __MACOS__
 #include "macruby_private.h"
 #endif
@@ -89,32 +49,15 @@ char *strrchr _((const char*,const char));
 #endif
 #endif
 
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-#if defined(__VMS)
-#pragma nostandard
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#include <sys/stat.h>
-
 VALUE rb_cProc;
 static VALUE rb_cBinding;
-static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
+static VALUE proc_call _((VALUE,VALUE));
 static VALUE rb_f_binding _((VALUE));
 static void rb_f_END _((void));
-static VALUE rb_f_block_given_p _((void));
+static VALUE rb_f_iterator_p _((void));
 static VALUE block_pass _((VALUE,NODE*));
 static VALUE rb_cMethod;
-static VALUE method_call _((int, VALUE*, VALUE));
-static VALUE rb_cUnboundMethod;
-static VALUE umethod_bind _((VALUE, VALUE));
-static VALUE rb_mod_define_method _((int, VALUE*, VALUE));
+static VALUE method_proc _((VALUE));
 
 static int scope_vmode;
 #define SCOPE_PUBLIC    0
@@ -122,84 +65,21 @@ static int scope_vmode;
 #define SCOPE_PROTECTED 2
 #define SCOPE_MODFUNC   5
 #define SCOPE_MASK      7
-#define SCOPE_SET(f)  (scope_vmode=(f))
+#define SCOPE_SET(f)  do {scope_vmode=(f);} while(0)
 #define SCOPE_TEST(f) (scope_vmode&(f))
 
-NODE* ruby_current_node;
-int ruby_safe_level = 0;
-/* safe-level:
-   0 - strings from streams/environment/ARGV are tainted (default)
-   1 - no dangerous operation by tainted value
-   2 - process/file operations prohibited
-   3 - all generated objects are tainted
-   4 - no global (non-tainted) variable modification/no direct output
-*/
-
-static VALUE safe_getter _((void));
-static void safe_setter _((VALUE val));
-
-void
-rb_secure(level)
-    int level;
-{
-    if (level <= ruby_safe_level) {
-	if (ruby_frame->last_func) {
-	    rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
-		     rb_id2name(ruby_frame->last_func), ruby_safe_level);
-	}
-	else {
-	    rb_raise(rb_eSecurityError, "Insecure operation at level %d", ruby_safe_level);
-	}
-    }
-}
-
-void
-rb_secure_update(obj)
-    VALUE obj;
-{
-    if (!OBJ_TAINTED(obj)) rb_secure(4);
-}
-
-void
-rb_check_safe_obj(x)
-    VALUE x;
-{
-    if (ruby_safe_level > 0 && OBJ_TAINTED(x)){
-	if (ruby_frame->last_func) {
-	    rb_raise(rb_eSecurityError, "Insecure operation - %s",
-		     rb_id2name(ruby_frame->last_func));
-	}
-	else {
-	    rb_raise(rb_eSecurityError, "Insecure operation: -r");
-	}
-    }
-    rb_secure(4);
-}
-
-void
-rb_check_safe_str(x)
-    VALUE x;
-{
-    rb_check_safe_obj(x);
-    if (TYPE(x)!= T_STRING) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
-		 rb_obj_classname(x));
-    }
-}
-
-NORETURN(static void print_undef _((VALUE, ID)));
+static void print_undef _((VALUE, ID)) NORETURN;
 static void
 print_undef(klass, id)
     VALUE klass;
     ID id;
 {
-    rb_name_error(id, "undefined method `%s' for %s `%s'",
-		  rb_id2name(id),
-		  (TYPE(klass) == T_MODULE) ? "module" : "class",
-		  rb_class2name(klass));
+    rb_raise(rb_eNameError, "undefined method `%s' for %s `%s'",
+	     rb_id2name(id), 
+	     (TYPE(klass) == T_MODULE)?"module":"class",
+	     rb_class2name(klass));
 }
 
-static ID removed, singleton_removed, undefined, singleton_undefined;
 
 #define CACHE_SIZE 0x800
 #define CACHE_MASK 0x7ff
@@ -215,34 +95,15 @@ struct cache_entry {		/* method hash table. */
 };
 
 static struct cache_entry cache[CACHE_SIZE];
-static int ruby_running = 0;
 
 void
 rb_clear_cache()
 {
-   struct cache_entry *ent, *end;
-
-    if (!ruby_running) return;
-    ent = cache; end = ent + CACHE_SIZE;
-    while (ent < end) {
-	ent->mid = 0;
-	ent++;
-    }
-}
-
-static void
-rb_clear_cache_for_undef(klass, id)
-    VALUE klass;
-    ID id;
-{
     struct cache_entry *ent, *end;
 
-    if (!ruby_running) return;
     ent = cache; end = ent + CACHE_SIZE;
     while (ent < end) {
-	if (ent->origin == klass && ent->mid == id) {
-	    ent->mid = 0;
-	}
+	ent->mid = 0;
 	ent++;
     }
 }
@@ -253,7 +114,6 @@ rb_clear_cache_by_id(id)
 {
     struct cache_entry *ent, *end;
 
-    if (!ruby_running) return;
     ent = cache; end = ent + CACHE_SIZE;
     while (ent < end) {
 	if (ent->mid == id) {
@@ -264,26 +124,6 @@ rb_clear_cache_by_id(id)
 }
 
 void
-rb_clear_cache_by_class(klass)
-    VALUE klass;
-{
-    struct cache_entry *ent, *end;
-
-    if (!ruby_running) return;
-    ent = cache; end = ent + CACHE_SIZE;
-    while (ent < end) {
-	if (ent->klass == klass || ent->origin == klass) {
-	    ent->mid = 0;
-	}
-	ent++;
-    }
-}
-
-static ID init, eqq, each, aref, aset, match, missing;
-static ID added, singleton_added;
-static ID __id__, __send__;
-
-void
 rb_add_method(klass, mid, node, noex)
     VALUE klass;
     ID mid;
@@ -293,49 +133,11 @@ rb_add_method(klass, mid, node, noex)
     NODE *body;
 
     if (NIL_P(klass)) klass = rb_cObject;
-    if (ruby_safe_level >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) {
-	rb_raise(rb_eSecurityError, "Insecure: can't define method");
-    }
-    if (!FL_TEST(klass, FL_SINGLETON) &&
-	node && nd_type(node) != NODE_ZSUPER &&
-	(mid == rb_intern("initialize" )|| mid == rb_intern("initialize_copy"))) {
-	noex = NOEX_PRIVATE | noex;
-    }
-    else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
-	     mid == rb_intern("allocate")) {
-	rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()",
-		rb_class2name(rb_iv_get(klass, "__attached__")));
-	mid = ID_ALLOCATOR;
+    if (klass == rb_cObject) {
+	rb_secure(4);
     }
-    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
-    rb_clear_cache_by_id(mid);
     body = NEW_METHOD(node, noex);
-    st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
-    if (node && mid != ID_ALLOCATOR && ruby_running) {
-	if (FL_TEST(klass, FL_SINGLETON)) {
-	    rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid));
-	}
-	else {
-	    rb_funcall(klass, added, 1, ID2SYM(mid));
-	}
-    }
-}
-
-void
-rb_define_alloc_func(klass, func)
-    VALUE klass;
-    VALUE (*func) _((VALUE));
-{
-    Check_Type(klass, T_CLASS);
-    rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), NOEX_PRIVATE);
-}
-
-void
-rb_undef_alloc_func(klass)
-    VALUE klass;
-{
-    Check_Type(klass, T_CLASS);
-    rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, 0, NOEX_UNDEF);
+    st_insert(RCLASS(klass)->m_tbl, mid, body);
 }
 
 static NODE*
@@ -345,8 +147,7 @@ search_method(klass, id, origin)
 {
     NODE *body;
 
-    if (!klass) return 0;
-    while (!st_lookup(RCLASS(klass)->m_tbl, id, (st_data_t *)&body)) {
+    while (!st_lookup(RCLASS(klass)->m_tbl, id, &body)) {
 	klass = RCLASS(klass)->super;
 	if (!klass) return 0;
     }
@@ -367,85 +168,81 @@ rb_get_method_body(klassp, idp, noexp)
     NODE * volatile body;
     struct cache_entry *ent;
 
-    if ((body = search_method(klass, id, &origin)) == 0 || !body->nd_body) {
-	/* store empty info in cache */
-	ent = cache + EXPR1(klass, id);
-	ent->klass  = klass;
-	ent->origin = klass;
-	ent->mid = ent->mid0 = id;
-	ent->noex   = 0;
-	ent->method = 0;
-
+    if ((body = search_method(klass, id, &origin)) == 0) {
 	return 0;
     }
+    if (!body->nd_body) return 0;
 
-    if (ruby_running) {
-	/* store in cache */
-	if (BUILTIN_TYPE(origin) == T_ICLASS) origin = RBASIC(origin)->klass;
-	ent = cache + EXPR1(klass, id);
-	ent->klass  = klass;
-	ent->noex   = body->nd_noex;
-	if (noexp) *noexp = body->nd_noex;
-	body = body->nd_body;
-	if (nd_type(body) == NODE_FBODY) {
-	    ent->mid = id;
-	    *klassp = body->nd_orig;
-	    ent->origin = body->nd_orig;
-	    *idp = ent->mid0 = body->nd_mid;
-	    body = ent->method = body->nd_head;
-	}
-	else {
-	    *klassp = origin;
-	    ent->origin = origin;
-	    ent->mid = ent->mid0 = id;
-	    ent->method = body;
-	}
+    /* store in cache */
+    ent = cache + EXPR1(klass, id);
+    ent->klass  = klass;
+    ent->noex   = body->nd_noex;
+    body = body->nd_body;
+    if (nd_type(body) == NODE_FBODY) {
+	ent->mid = id;
+	*klassp = body->nd_orig;
+	ent->origin = body->nd_orig;
+	*idp = ent->mid0 = body->nd_mid;
+	body = ent->method = body->nd_head;
     }
     else {
-	if (noexp) *noexp = body->nd_noex;
-	body = body->nd_body;
-	if (nd_type(body) == NODE_FBODY) {
-	    *klassp = body->nd_orig;
-	    *idp = body->nd_mid;
-	    body = body->nd_head;
-	}
-	else {
-	    *klassp = origin;
-	}
+	*klassp = origin;
+	ent->origin = origin;
+	ent->mid = ent->mid0 = id;
+	ent->method = body;
     }
 
+    if (noexp) *noexp = ent->noex;
     return body;
 }
 
-static void
-remove_method(klass, mid)
+void
+rb_alias(klass, name, def)
     VALUE klass;
-    ID mid;
+    ID name, def;
 {
-    NODE *body;
+    VALUE origin;
+    NODE *orig, *body;
 
+    if (name == def) return;
     if (klass == rb_cObject) {
 	rb_secure(4);
     }
-    if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't remove method");
+    orig = search_method(klass, def, &origin);
+    if (!orig || !orig->nd_body) {
+	if (TYPE(klass) == T_MODULE) {
+	    orig = search_method(rb_cObject, def, &origin);
+	}
     }
-    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
-    if (mid == __id__ || mid == __send__ || mid == init) {
-	rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
+    if (!orig || !orig->nd_body) {
+	print_undef(klass, def);
     }
-    if (!st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body) ||
-	!body->nd_body) {
-	rb_name_error(mid, "method `%s' not defined in %s",
-		      rb_id2name(mid), rb_class2name(klass));
+    body = orig->nd_body;
+    if (nd_type(body) == NODE_FBODY) { /* was alias */
+	def = body->nd_mid;
+	origin = body->nd_orig;
+	body = body->nd_head;
     }
-    rb_clear_cache_for_undef(klass, mid);
-    if (FL_TEST(klass, FL_SINGLETON)) {
-	rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, ID2SYM(mid));
+
+    st_insert(RCLASS(klass)->m_tbl, name,
+	      NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
+}
+
+static void
+remove_method(klass, mid)
+    VALUE klass;
+    ID mid;
+{
+    NODE *body;
+
+    if (klass == rb_cObject) {
+	rb_secure(4);
     }
-    else {
-	rb_funcall(klass, removed, 1, ID2SYM(mid));
+    if (!st_delete(RCLASS(klass)->m_tbl, &mid, &body)) {
+	rb_raise(rb_eNameError, "method `%s' not defined in %s",
+		 rb_id2name(mid), rb_class2name(klass));
     }
+    rb_clear_cache_by_id(mid);
 }
 
 void
@@ -456,29 +253,26 @@ rb_remove_method(klass, name)
     remove_method(klass, rb_intern(name));
 }
 
-static VALUE
-rb_mod_remove_method(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-{
-    int i;
-
-    for (i=0; i<argc; i++) {
-	remove_method(mod, rb_to_id(argv[i]));
-    }
-    return mod;
-}
-
-#undef rb_disable_super
-#undef rb_enable_super
-
 void
 rb_disable_super(klass, name)
     VALUE klass;
     const char *name;
 {
-    /* obsolete - no use */
+    VALUE origin;
+    NODE *body;
+    ID mid = rb_intern(name);
+
+    body = search_method(klass, mid, &origin);
+    if (!body || !body->nd_body) {
+	print_undef(klass, mid);
+    }
+    if (origin == klass) {
+	body->nd_noex |= NOEX_UNDEF;
+    }
+    else {
+	rb_clear_cache_by_id(mid);
+	rb_add_method(ruby_class, mid, 0, NOEX_UNDEF);
+    }
 }
 
 void
@@ -486,7 +280,15 @@ rb_enable_super(klass, name)
     VALUE klass;
     const char *name;
 {
-    rb_warning("rb_enable_super() is obsolete");
+    VALUE origin;
+    NODE *body;
+    ID mid = rb_intern(name);
+
+    body = search_method(klass, mid, &origin);
+    if (!body || !body->nd_body || origin != klass) {
+	print_undef(klass, mid);
+    }
+    body->nd_noex &= ~NOEX_UNDEF;
 }
 
 static void
@@ -505,7 +307,7 @@ rb_export_method(klass, name, noex)
     if (!body && TYPE(klass) == T_MODULE) {
 	body = search_method(rb_cObject, name, &origin);
     }
-    if (!body || !body->nd_body) {
+    if (!body) {
 	print_undef(klass, name);
     }
     if (body->nd_noex != noex) {
@@ -513,6 +315,7 @@ rb_export_method(klass, name, noex)
 	    body->nd_noex = noex;
 	}
 	else {
+	    rb_clear_cache_by_id(name);
 	    rb_add_method(klass, name, NEW_ZSUPER(), noex);
 	}
     }
@@ -524,17 +327,8 @@ rb_method_boundp(klass, id, ex)
     ID id;
     int ex;
 {
-    struct cache_entry *ent;
     int noex;
 
-    /* is it in the method cache? */
-    ent = cache + EXPR1(klass, id);
-    if (ent->mid == id && ent->klass == klass) {
-	if (ex && (ent->noex & NOEX_PRIVATE))
-	    return Qfalse;
-	if (!ent->method) return Qfalse;
-	return Qtrue;
-    }
     if (rb_get_method_body(&klass, &id, &noex)) {
 	if (ex && (noex & NOEX_PRIVATE))
 	    return Qfalse;
@@ -558,9 +352,7 @@ rb_attr(klass, id, read, write, ex)
     else {
 	if (SCOPE_TEST(SCOPE_PRIVATE)) {
 	    noex = NOEX_PRIVATE;
-	    rb_warning((scope_vmode == SCOPE_MODFUNC) ?
-		       "attribute accessor as module_function" :
-		       "private attribute?");
+	    rb_warning("private attribute?");
 	}
 	else if (SCOPE_TEST(SCOPE_PROTECTED)) {
 	    noex = NOEX_PROTECTED;
@@ -580,15 +372,14 @@ rb_attr(klass, id, read, write, ex)
     if (read) {
 	rb_add_method(klass, id, NEW_IVAR(attriv), noex);
     }
+    sprintf(buf, "%s=", name);
+    id = rb_intern(buf);
     if (write) {
-	sprintf(buf, "%s=", name);
-	id = rb_intern(buf);
 	rb_add_method(klass, id, NEW_ATTRSET(attriv), noex);
     }
 }
 
-extern int ruby_in_compile;
-
+static ID init, eqq, each, aref, aset, match, missing;
 VALUE ruby_errinfo = Qnil;
 extern NODE *ruby_eval_tree_begin;
 extern NODE *ruby_eval_tree;
@@ -604,24 +395,20 @@ struct SCOPE *ruby_scope;
 static struct FRAME *top_frame;
 static struct SCOPE *top_scope;
 
-static unsigned long frame_unique = 0;
-
-#define PUSH_FRAME() do {		\
+#define PUSH_FRAME() {			\
     struct FRAME _frame;		\
     _frame.prev = ruby_frame;		\
-    _frame.tmp  = 0;			\
-    _frame.node = ruby_current_node;	\
+    _frame.file = ruby_sourcefile;	\
+    _frame.line = ruby_sourceline;	\
     _frame.iter = ruby_iter->iter;	\
+    _frame.cbase = ruby_frame->cbase;	\
     _frame.argc = 0;			\
-    _frame.argv = 0;			\
-    _frame.flags = FRAME_ALLOCA;	\
-    _frame.uniq = frame_unique++;	\
-    ruby_frame = &_frame
+    ruby_frame = &_frame;		\
 
 #define POP_FRAME()  			\
-    ruby_current_node = _frame.node;	\
-    ruby_frame = _frame.prev;		\
-} while (0)
+    ruby_sourcefile = _frame.file;	\
+    ruby_sourceline = _frame.line;	\
+    ruby_frame = _frame.prev; }
 
 struct BLOCK {
     NODE *var;
@@ -630,62 +417,56 @@ struct BLOCK {
     struct FRAME frame;
     struct SCOPE *scope;
     VALUE klass;
-    NODE *cref;
+    struct tag *tag;
     int iter;
     int vmode;
-    int flags;
-    struct RVarmap *dyna_vars;
+    int d_scope;
+    struct RVarmap *d_vars;
     VALUE orig_thread;
-    VALUE wrapper;
-    VALUE block_obj;
-    struct BLOCK *outer;
     struct BLOCK *prev;
 };
-
-#define BLOCK_D_SCOPE 1
-#define BLOCK_LAMBDA  2
-
 static struct BLOCK *ruby_block;
 
-#define PUSH_BLOCK(v,b) do {		\
+#define PUSH_BLOCK(v,b) {		\
     struct BLOCK _block;		\
+    _block.tag = prot_tag;		\
     _block.var = v;			\
     _block.body = b;			\
     _block.self = self;			\
     _block.frame = *ruby_frame;		\
     _block.klass = ruby_class;		\
-    _block.cref = ruby_cref;		\
-    _block.frame.node = ruby_current_node;\
+    _block.frame.file = ruby_sourcefile;\
+    _block.frame.line = ruby_sourceline;\
     _block.scope = ruby_scope;		\
     _block.prev = ruby_block;		\
-    _block.outer = ruby_block;		\
     _block.iter = ruby_iter->iter;	\
     _block.vmode = scope_vmode;		\
-    _block.flags = BLOCK_D_SCOPE;	\
-    _block.dyna_vars = ruby_dyna_vars;	\
-    _block.wrapper = ruby_wrapper;	\
-    _block.block_obj = 0;		\
-    ruby_block = &_block
+    _block.d_scope = Qtrue;		\
+    _block.d_vars = ruby_dyna_vars;	\
+    ruby_block = &_block;
+
+#define POP_BLOCK() 			\
+   ruby_block = _block.prev; 		\
+}
+
+#define PUSH_BLOCK2(b) {		\
+    struct BLOCK * volatile _old;	\
+    _old = ruby_block;			\
+    ruby_block = b;
 
-#define POP_BLOCK() \
-   ruby_block = _block.prev; \
-} while (0)
+#define POP_BLOCK2() 			\
+   ruby_block = _old;	 		\
+}
 
 struct RVarmap *ruby_dyna_vars;
-#define PUSH_VARS() do { \
-    struct RVarmap * volatile _old; \
-    _old = ruby_dyna_vars; \
-    ruby_dyna_vars = 0
-
-#define POP_VARS() \
-   if (_old && (ruby_scope->flags & SCOPE_DONT_RECYCLE)) {\
-       if (RBASIC(_old)->flags) /* unless it's already recycled */ \
-           FL_SET(_old, DVAR_DONT_RECYCLE); \
-    }\
-    ruby_dyna_vars = _old; \
-} while (0)
+#define PUSH_VARS() {			\
+    struct RVarmap * volatile _old;	\
+    _old = ruby_dyna_vars;		\
+    ruby_dyna_vars = 0;
 
-#define DVAR_DONT_RECYCLE FL_USER2
+#define POP_VARS()			\
+    ruby_dyna_vars = _old;		\
+}
 
 static struct RVarmap*
 new_dvar(id, value, prev)
@@ -716,20 +497,6 @@ rb_dvar_defined(id)
 }
 
 VALUE
-rb_dvar_curr(id)
-    ID id;
-{
-    struct RVarmap *vars = ruby_dyna_vars;
-
-    while (vars) {
-	if (vars->id == 0) break;
-	if (vars->id == id) return Qtrue;
-	vars = vars->next;
-    }
-    return Qfalse;
-}
-
-VALUE
 rb_dvar_ref(id)
     ID id;
 {
@@ -753,67 +520,48 @@ rb_dvar_push(id, value)
 }
 
 static void
-dvar_asgn_internal(id, value, curr)
+dvar_asgn(id, value, push)
     ID id;
     VALUE value;
-    int curr;
+    int push;
 {
-    int n = 0;
     struct RVarmap *vars = ruby_dyna_vars;
 
     while (vars) {
-	if (curr && vars->id == 0) {
-	    /* first null is a dvar header */
-	    n++;
-	    if (n == 2) break;
-	}
+	if (push && vars->id == 0) break;
 	if (vars->id == id) {
 	    vars->val = value;
 	    return;
 	}
 	vars = vars->next;
     }
-    if (!ruby_dyna_vars) {
-	ruby_dyna_vars = new_dvar(id, value, 0);
-    }
-    else {
-	vars = new_dvar(id, value, ruby_dyna_vars->next);
-	ruby_dyna_vars->next = vars;
-    }
+    rb_dvar_push(id, value);
 }
 
-static inline void
-dvar_asgn(id, value)
+void
+rb_dvar_asgn(id, value)
     ID id;
     VALUE value;
 {
-    dvar_asgn_internal(id, value, 0);
+    dvar_asgn(id, value, 0);
 }
 
-static inline void
-dvar_asgn_curr(id, value)
+static void
+dvar_asgn_push(id, value)
     ID id;
     VALUE value;
 {
-    dvar_asgn_internal(id, value, 1);
-}
-
-VALUE *
-rb_svar(cnt)
-    int cnt;
-{
-    struct RVarmap *vars = ruby_dyna_vars;
-    ID id;
+    struct RVarmap* vars = 0;
 
-    if (!ruby_scope->local_tbl) return NULL;
-    if (cnt >= ruby_scope->local_tbl[0]) return NULL;
-    id = ruby_scope->local_tbl[cnt+1];
-    while (vars) {
-	if (vars->id == id) return &vars->val;
-	vars = vars->next;
+    if (ruby_dyna_vars && ruby_dyna_vars->id == 0) {
+	vars = ruby_dyna_vars;
+	ruby_dyna_vars = ruby_dyna_vars->next;
+    }
+    dvar_asgn(id, value, 1);
+    if (vars) {
+	vars->next = ruby_dyna_vars;
+	ruby_dyna_vars = vars;
     }
-    if (ruby_scope->local_vars == 0) return NULL;
-    return &ruby_scope->local_vars[cnt];
 }
 
 struct iter {
@@ -826,59 +574,57 @@ static struct iter *ruby_iter;
 #define ITER_PRE 1
 #define ITER_CUR 2
 
-#define PUSH_ITER(i) do {		\
+#define PUSH_ITER(i) {			\
     struct iter _iter;			\
     _iter.prev = ruby_iter;		\
     _iter.iter = (i);			\
-    ruby_iter = &_iter
+    ruby_iter = &_iter;			\
 
 #define POP_ITER()			\
     ruby_iter = _iter.prev;		\
-} while (0)
+}
 
 struct tag {
     jmp_buf buf;
     struct FRAME *frame;
     struct iter *iter;
-    VALUE tag;
+    ID tag;
     VALUE retval;
     struct SCOPE *scope;
-    VALUE dst;
+    int dst;
     struct tag *prev;
 };
 static struct tag *prot_tag;
 
-#define PUSH_TAG(ptag) do {		\
+#define PUSH_TAG(ptag) {		\
     struct tag _tag;			\
     _tag.retval = Qnil;			\
     _tag.frame = ruby_frame;		\
     _tag.iter = ruby_iter;		\
     _tag.prev = prot_tag;		\
+    _tag.retval = Qnil;			\
     _tag.scope = ruby_scope;		\
     _tag.tag = ptag;			\
     _tag.dst = 0;			\
-    prot_tag = &_tag
+    prot_tag = &_tag;
 
-#define PROT_NONE   Qfalse	/* 0 */
-#define PROT_THREAD Qtrue	/* 2 */
-#define PROT_FUNC   INT2FIX(0)	/* 1 */
-#define PROT_ITER   INT2FIX(1)	/* 3 */
-#define PROT_CALL   INT2FIX(2)	/* 5 */
-#define PROT_PCALL  INT2FIX(3)	/* 7 */
+#define PROT_NONE   0
+#define PROT_FUNC   -1
+#define PROT_THREAD -2
 
-#define EXEC_TAG()    (FLUSH_REGISTER_WINDOWS, setjmp(prot_tag->buf))
+#define EXEC_TAG()    setjmp(prot_tag->buf)
 
-#define JUMP_TAG(st) do {		\
+#define JUMP_TAG(st) {			\
     ruby_frame = prot_tag->frame;	\
     ruby_iter = prot_tag->iter;		\
     longjmp(prot_tag->buf,(st));	\
-} while (0)
+}
 
 #define POP_TAG()			\
+    if (_tag.prev)			\
+        _tag.prev->retval = _tag.retval;\
     prot_tag = _tag.prev;		\
-} while (0)
-
-#define TAG_DST() (_tag.dst == (VALUE)ruby_frame->uniq)
+}
 
 #define TAG_RETURN	0x1
 #define TAG_BREAK	0x2
@@ -893,124 +639,136 @@ static struct tag *prot_tag;
 VALUE ruby_class;
 static VALUE ruby_wrapper;	/* security wrapper */
 
-#define PUSH_CLASS(c) do {		\
+#define PUSH_CLASS() {			\
     VALUE _class = ruby_class;		\
-    ruby_class = (c)
 
-#define POP_CLASS() ruby_class = _class; \
-} while (0)
+#define POP_CLASS() ruby_class = _class; }
 
-static NODE *ruby_cref = 0;
-static NODE *top_cref;
-#define PUSH_CREF(c) ruby_cref = NEW_NODE(NODE_CREF,(c),0,ruby_cref)
-#define POP_CREF() ruby_cref = ruby_cref->nd_next
-
-#define PUSH_SCOPE() do {		\
+#define PUSH_SCOPE() {			\
     volatile int _vmode = scope_vmode;	\
     struct SCOPE * volatile _old;	\
     NEWOBJ(_scope, struct SCOPE);	\
     OBJSETUP(_scope, 0, T_SCOPE);	\
     _scope->local_tbl = 0;		\
     _scope->local_vars = 0;		\
-    _scope->flags = 0;			\
+    _scope->flag = 0;			\
     _old = ruby_scope;			\
     ruby_scope = _scope;		\
-    scope_vmode = SCOPE_PUBLIC
-
-typedef struct thread * rb_thread_t;
-static rb_thread_t curr_thread = 0;
-static rb_thread_t main_thread;
-static void scope_dup _((struct SCOPE *));
+    scope_vmode = SCOPE_PUBLIC;
 
+#define SCOPE_DONT_RECYCLE FL_USER2
 #define POP_SCOPE() 			\
-    if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\
-       if (_old) scope_dup(_old);	\
+    if (FL_TEST(ruby_scope, SCOPE_DONT_RECYCLE)) {\
+	FL_SET(_old, SCOPE_DONT_RECYCLE);\
     }					\
-    if (!(ruby_scope->flags & SCOPE_MALLOC)) {\
-	ruby_scope->local_vars = 0;	\
-	ruby_scope->local_tbl  = 0;	\
-	if (!(ruby_scope->flags & SCOPE_DONT_RECYCLE) && \
-            ruby_scope != top_scope) {	\
-	    rb_gc_force_recycle((VALUE)ruby_scope);\
-        }				\
+    else {				\
+	if (ruby_scope->flag == SCOPE_ALLOCA) {\
+	    ruby_scope->local_vars = 0;	\
+	    ruby_scope->local_tbl  = 0;	\
+	    if (ruby_scope != top_scope)\
+		rb_gc_force_recycle((VALUE)ruby_scope);\
+	}				\
+	else {				\
+	    ruby_scope->flag |= SCOPE_NOSTACK;\
+	}				\
     }					\
-    ruby_scope->flags |= SCOPE_NOSTACK;	\
     ruby_scope = _old;			\
     scope_vmode = _vmode;		\
-} while (0)
+}
 
 static VALUE rb_eval _((VALUE,NODE*));
 static VALUE eval _((VALUE,VALUE,VALUE,char*,int));
 static NODE *compile _((VALUE, char*, int));
+static VALUE rb_yield_0 _((VALUE, VALUE, VALUE));
 
-static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int, int));
-
-#define YIELD_PROC_CALL  1
-#define YIELD_PUBLIC_DEF 2
-#define YIELD_FUNC_AVALUE 1
-#define YIELD_FUNC_SVALUE 2
-
-static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int));
+static VALUE rb_call _((VALUE,VALUE,ID,int,VALUE*,int));
 static VALUE module_setup _((VALUE,NODE*));
 
 static VALUE massign _((VALUE,NODE*,VALUE,int));
 static void assign _((VALUE,NODE*,VALUE,int));
 
-static VALUE trace_func = 0;
-static int tracing = 0;
-static void call_trace_func _((char*,NODE*,VALUE,ID,VALUE));
+static int safe_level = 0;
+/* safe-level:
+   0 - strings from streams/environment/ARGV are tainted (default)
+   1 - no dangerous operation by tainted string
+   2 - process/file operations prohibited
+   3 - all genetated strings are tainted
+   4 - no global (non-tainted) variable modification/no direct output
+*/
 
-#if 0
-#define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
-			      ruby_sourceline = nd_line(ruby_current_node))
-#else
-#define SET_CURRENT_SOURCE() ((void)0)
-#endif
+int
+rb_safe_level()
+{
+    return safe_level;
+}
 
 void
-ruby_set_current_source()
+rb_set_safe_level(level)
+    int level;
 {
-    if (ruby_current_node) {
-        ruby_sourcefile = ruby_current_node->nd_file;
-	ruby_sourceline = nd_line(ruby_current_node);
+    if (level > safe_level) {
+	safe_level = level;
     }
 }
 
+static VALUE
+safe_getter()
+{
+    return INT2FIX(safe_level);
+}
+
 static void
-#ifdef HAVE_STDARG_PROTOTYPES
-warn_printf(const char *fmt, ...)
-#else
-warn_printf(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
+safe_setter(val)
+    VALUE val;
 {
-    char buf[BUFSIZ];
-    va_list args;
+    int level = NUM2INT(val);
 
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
-    va_end(args);
-    rb_write_error(buf);
+    if (level < safe_level) {
+	rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d",
+		 safe_level, level);
+    }
+    safe_level = level;
 }
 
-#define warn_print(x) rb_write_error(x)
-#define warn_print2(x,l) rb_write_error2(x,l)
+void
+rb_check_safe_str(x)
+    VALUE x;
+{
+    if (TYPE(x)!= T_STRING) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
+		 rb_class2name(CLASS_OF(x)));
+    }
+    if (OBJ_TAINTED(x)) {
+	if (safe_level > 0){
+	    rb_raise(rb_eSecurityError, "Insecure operation - %s",
+		     rb_id2name(ruby_frame->last_func));
+	}
+    }
+}
+
+void
+rb_secure(level)
+    int level;
+{
+    if (level <= safe_level) {
+	rb_raise(rb_eSecurityError, "Insecure operation `%s' for level %d",
+		 rb_id2name(ruby_frame->last_func), safe_level);
+    }
+}
+
+static VALUE trace_func = 0;
+static void call_trace_func _((char*,char*,int,VALUE,ID,VALUE));
 
 static void
 error_pos()
 {
-    ruby_set_current_source();
     if (ruby_sourcefile) {
 	if (ruby_frame->last_func) {
-	    warn_printf("%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
-			rb_id2name(ruby_frame->last_func));
-	}
-	else if (ruby_sourceline == 0) {
-	    warn_printf("%s", ruby_sourcefile);
+	    fprintf(stderr, "%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
+		    rb_id2name(ruby_frame->last_func));
 	}
 	else {
-	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+	    fprintf(stderr, "%s:%d", ruby_sourcefile, ruby_sourceline);
 	}
     }
 }
@@ -1033,10 +791,10 @@ set_backtrace(info, bt)
 static void
 error_print()
 {
-    VALUE errat = Qnil;		/* OK */
-    volatile VALUE eclass, e;
+    VALUE errat;
+    VALUE eclass;
     char *einfo;
-    long elen;
+    int elen;
 
     if (NIL_P(ruby_errinfo)) return;
 
@@ -1047,72 +805,63 @@ error_print()
     else {
 	errat = Qnil;
     }
-    if (EXEC_TAG()) goto error;
-    if (NIL_P(errat)){
-	ruby_set_current_source();
-	if (ruby_sourcefile)
-	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
-	else
-	    warn_printf("%d", ruby_sourceline);
-    }
-    else if (RARRAY(errat)->len == 0) {
-	error_pos();
-    }
-    else {
+    POP_TAG();
+    if (!NIL_P(errat)) {
 	VALUE mesg = RARRAY(errat)->ptr[0];
 
 	if (NIL_P(mesg)) error_pos();
 	else {
-	    warn_print2(RSTRING(mesg)->ptr, RSTRING(mesg)->len);
+	    fwrite(RSTRING(mesg)->ptr, 1, RSTRING(mesg)->len, stderr);
 	}
     }
 
     eclass = CLASS_OF(ruby_errinfo);
+    PUSH_TAG(PROT_NONE);
     if (EXEC_TAG() == 0) {
-	e = rb_obj_as_string(ruby_errinfo);
-	einfo = RSTRING(e)->ptr;
-	elen = RSTRING(e)->len;
+	einfo = str2cstr(rb_obj_as_string(ruby_errinfo), &elen);
     }
     else {
 	einfo = "";
 	elen = 0;
     }
-    if (EXEC_TAG()) goto error;
+    POP_TAG();
     if (eclass == rb_eRuntimeError && elen == 0) {
-	warn_print(": unhandled exception\n");
+	fprintf(stderr, ": unhandled exception\n");
     }
     else {
 	VALUE epath;
 
 	epath = rb_class_path(eclass);
 	if (elen == 0) {
-	    warn_print(": ");
-	    warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
+	    fprintf(stderr, ": ");
+	    fwrite(RSTRING(epath)->ptr, 1, RSTRING(epath)->len, stderr);
+	    putc('\n', stderr);
 	}
 	else {
 	    char *tail  = 0;
-	    long len = elen;
+	    int len = elen;
 
 	    if (RSTRING(epath)->ptr[0] == '#') epath = 0;
-	    if (tail = memchr(einfo, '\n', elen)) {
+	    if (tail = strchr(einfo, '\n')) {
 		len = tail - einfo;
 		tail++;		/* skip newline */
 	    }
-	    warn_print(": ");
-	    warn_print2(einfo, len);
+	    fprintf(stderr, ": ");
+	    fwrite(einfo, 1, len, stderr);
 	    if (epath) {
-		warn_print(" (");
-		warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
-		warn_print(")\n");
+		fprintf(stderr, " (");
+		fwrite(RSTRING(epath)->ptr, 1, RSTRING(epath)->len, stderr);
+		fprintf(stderr, ")\n");
 	    }
 	    if (tail) {
-		warn_print2(tail, elen-len-1);
+		fwrite(tail, 1, elen-len-1, stderr);
+		putc('\n', stderr);
 	    }
 	}
     }
 
     if (!NIL_P(errat)) {
-	long i;
+	int i;
 	struct RArray *ep = RARRAY(errat);
 
 #define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
@@ -1122,22 +871,18 @@ error_print()
 	ep = RARRAY(errat);
 	for (i=1; i<ep->len; i++) {
 	    if (TYPE(ep->ptr[i]) == T_STRING) {
-		warn_printf("\tfrom %s\n", RSTRING(ep->ptr[i])->ptr);
+		fprintf(stderr, "\tfrom %s\n", RSTRING(ep->ptr[i])->ptr);
 	    }
 	    if (i == TRACE_HEAD && ep->len > TRACE_MAX) {
-		warn_printf("\t ... %ld levels...\n",
+		fprintf(stderr, "\t ... %ld levels...\n",
 			ep->len - TRACE_HEAD - TRACE_TAIL);
 		i = ep->len - TRACE_TAIL;
 	    }
 	}
     }
-  error:
-    POP_TAG();
 }
 
-#if defined(__APPLE__)
-#define environ (*_NSGetEnviron())
-#elif !defined(_WIN32) && !defined(__MACOS__) || defined(_WIN32_WCE)
+#if !defined(NT) && !defined(__MACOS__)
 extern char **environ;
 #endif
 char **rb_origenviron;
@@ -1168,7 +913,7 @@ ruby_init()
     rb_origenviron = environ;
 #endif
 
-    Init_stack((void*)&state);
+    Init_stack(0);
     Init_heap();
     PUSH_SCOPE();
     ruby_scope->local_vars = 0;
@@ -1182,39 +927,58 @@ ruby_init()
 	rb_call_inits();
 	ruby_class = rb_cObject;
 	ruby_frame->self = ruby_top_self;
-	top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
-	ruby_cref = top_cref;
+	ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,rb_cObject,0,0);
 	rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
 #ifdef __MACOS__
 	_macruby_init();
 #endif
 	ruby_prog_init();
-	ALLOW_INTS;
+    }
+    POP_TAG();
+    if (state) error_print();
+    POP_SCOPE();
+    ruby_scope = top_scope;
+}
+
+static int ext_init = 0;
+
+void
+ruby_options(argc, argv)
+    int argc;
+    char **argv;
+{
+    int state;
+
+    PUSH_TAG(PROT_NONE)
+    if ((state = EXEC_TAG()) == 0) {
+	ruby_process_options(argc, argv);
+	ext_init = 1;	/* Init_ext() called in ruby_process_options */
     }
     POP_TAG();
     if (state) {
+	trace_func = 0;
 	error_print();
-	exit(EXIT_FAILURE);
+	exit(1);
     }
-    POP_SCOPE();
-    ruby_scope = top_scope;
-    ruby_running = 1;
 }
 
 static VALUE
-eval_node(self, node)
+eval_node(self)
     VALUE self;
-    NODE *node;
 {
-    NODE *beg_tree = ruby_eval_tree_begin;
+    NODE *beg_tree, *tree;
 
-    ruby_eval_tree_begin = 0;
+    beg_tree = ruby_eval_tree_begin;
+    tree = ruby_eval_tree;
     if (beg_tree) {
+	ruby_eval_tree_begin = 0;
 	rb_eval(self, beg_tree);
     }
 
-    if (!node) return Qnil;
-    return rb_eval(self, node);
+    if (!tree) return Qnil;
+    ruby_eval_tree = 0;
+
+    return rb_eval(self, tree);
 }
 
 int ruby_in_eval;
@@ -1222,192 +986,100 @@ int ruby_in_eval;
 static void rb_thread_cleanup _((void));
 static void rb_thread_wait_other_threads _((void));
 
-static int thread_set_raised();
-static int thread_reset_raised();
+static int exit_status;
 
-static VALUE exception_error;
-static VALUE sysstack_error;
+static void
+call_required_libraries()
+{
+    NODE *save;
 
-static int
-error_handle(ex)
-    int ex;
+    ruby_sourcefile = 0;
+    if (!ext_init) Init_ext();
+    save = ruby_eval_tree;
+    ruby_require_libraries();
+    ruby_eval_tree = save;
+}
+
+void
+ruby_run()
 {
-    int status = EXIT_FAILURE;
+    int state;
+    static int ex;
+    volatile NODE *tmp;
+
+    if (ruby_nerrs > 0) exit(ruby_nerrs);
 
-    if (thread_set_raised()) return EXIT_FAILURE;
-    switch (ex & TAG_MASK) {
+    Init_stack(&tmp);
+    PUSH_TAG(PROT_NONE);
+    PUSH_ITER(ITER_NOT);
+    if ((state = EXEC_TAG()) == 0) {
+	call_required_libraries();
+	eval_node(ruby_top_self);
+    }
+    POP_ITER();
+    POP_TAG();
+
+    if (state && !ex) ex = state;
+    PUSH_TAG(PROT_NONE);
+    PUSH_ITER(ITER_NOT);
+    if ((state = EXEC_TAG()) == 0) {
+	rb_trap_exit();
+	rb_thread_cleanup();
+	rb_thread_wait_other_threads();
+    }
+    else {
+	ex = state;
+    }
+    POP_ITER();
+    POP_TAG();
+
+    switch (ex & 0xf) {
       case 0:
-	status = EXIT_SUCCESS;
+	ex = 0;
 	break;
 
       case TAG_RETURN:
 	error_pos();
-	warn_print(": unexpected return\n");
+	fprintf(stderr, ": unexpected return\n");
+	ex = 1;
 	break;
       case TAG_NEXT:
 	error_pos();
-	warn_print(": unexpected next\n");
+	fprintf(stderr, ": unexpected next\n");
+	ex = 1;
 	break;
       case TAG_BREAK:
 	error_pos();
-	warn_print(": unexpected break\n");
+	fprintf(stderr, ": unexpected break\n");
+	ex = 1;
 	break;
       case TAG_REDO:
 	error_pos();
-	warn_print(": unexpected redo\n");
+	fprintf(stderr, ": unexpected redo\n");
+	ex = 1;
 	break;
       case TAG_RETRY:
 	error_pos();
-	warn_print(": retry outside of rescue clause\n");
-	break;
-      case TAG_THROW:
-	if (prot_tag && prot_tag->frame && prot_tag->frame->node) {
-	    NODE *tag = prot_tag->frame->node;
-	    warn_printf("%s:%d: uncaught throw\n",
-		    tag->nd_file, nd_line(tag));
-	}
-	else {
-	    error_pos();
-	    warn_printf(": unexpected throw\n");
-	}
+	fprintf(stderr, ": retry outside of rescue clause\n");
+	ex = 1;
 	break;
       case TAG_RAISE:
       case TAG_FATAL:
 	if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    VALUE st = rb_iv_get(ruby_errinfo, "status");
-	    status = NUM2INT(st);
+	    ex = exit_status;
 	}
 	else {
 	    error_print();
+	    ex = 1;
 	}
 	break;
       default:
 	rb_bug("Unknown longjmp status %d", ex);
 	break;
     }
-    thread_reset_raised();
-    return status;
-}
-
-void
-ruby_options(argc, argv)
-    int argc;
-    char **argv;
-{
-    int state;
-
-    Init_stack((void*)&state);
-    PUSH_TAG(PROT_NONE);
-    if ((state = EXEC_TAG()) == 0) {
-	ruby_process_options(argc, argv);
-    }
-    else {
-	trace_func = 0;
-	tracing = 0;
-	exit(error_handle(state));
-    }
-    POP_TAG();
-}
-
-void rb_exec_end_proc _((void));
-
-static void
-ruby_finalize_0()
-{
-    ruby_errinfo = 0;
-    PUSH_TAG(PROT_NONE);
-    if (EXEC_TAG() == 0) {
-	rb_trap_exit();
-    }
-    POP_TAG();
     rb_exec_end_proc();
-}
-
-static void
-ruby_finalize_1()
-{
-    ruby_errinfo = 0;
     rb_gc_call_finalizer_at_exit();
-    trace_func = 0;
-    tracing = 0;
-}
-
-void
-ruby_finalize()
-{
-    ruby_finalize_0();
-    ruby_finalize_1();
-}
-
-int
-ruby_cleanup(ex)
-    int ex;
-{
-    int state;
-    volatile VALUE err = ruby_errinfo;
-
-    ruby_safe_level = 0;
-    Init_stack((void*)&state);
-    ruby_finalize_0();
-    if (ruby_errinfo) err = ruby_errinfo;
-    PUSH_TAG(PROT_NONE);
-    PUSH_ITER(ITER_NOT);
-    if ((state = EXEC_TAG()) == 0) {
-	rb_thread_cleanup();
-	rb_thread_wait_other_threads();
-    }
-    else if (ex == 0) {
-	ex = state;
-    }
-    POP_ITER();
-    ruby_errinfo = err;
-    ex = error_handle(ex);
-    POP_TAG();
-
-    ruby_finalize_1();
-    if (err && rb_obj_is_kind_of(err, rb_eSystemExit)) {
-	VALUE st = rb_iv_get(err, "status");
-	return NUM2INT(st);
-    }
-    return ex;
-}
-
-int
-ruby_exec()
-{
-    int state;
-    volatile NODE *tmp;
-
-    Init_stack((void*)&tmp);
-    PUSH_TAG(PROT_NONE);
-    PUSH_ITER(ITER_NOT);
-    /* default visibility is private at toplevel */
-    SCOPE_SET(SCOPE_PRIVATE);
-    if ((state = EXEC_TAG()) == 0) {
-	eval_node(ruby_top_self, ruby_eval_tree);
-    }
-    POP_ITER();
-    POP_TAG();
-    return state;
-}
-
-void
-ruby_stop(ex)
-    int ex;
-{
-    exit(ruby_cleanup(ex));
-}
-
-void
-ruby_run()
-{
-    int state;
-    static int ex;
-
-    if (ruby_nerrs > 0) exit(EXIT_FAILURE);
-    state = ruby_exec();
-    if (state && !ex) ex = state;
-    ruby_stop(ex);
+    exit(ex);
 }
 
 static void
@@ -1415,17 +1087,18 @@ compile_error(at)
     const char *at;
 {
     VALUE str;
+    char *mesg;
+    int len;
 
+    mesg = str2cstr(ruby_errinfo, &len);
     ruby_nerrs = 0;
-    str = rb_str_buf_new2("compile error");
+    str = rb_str_new2("compile error");
     if (at) {
-	rb_str_buf_cat2(str, " in ");
-	rb_str_buf_cat2(str, at);
-    }
-    rb_str_buf_cat(str, "\n", 1);
-    if (!NIL_P(ruby_errinfo)) {
-	rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+	rb_str_cat(str, " in ", 4);
+	rb_str_cat(str, at, strlen(at));
     }
+    rb_str_cat(str, "\n", 1);
+    rb_str_cat(str, mesg, len);
     rb_exc_raise(rb_exc_new3(rb_eSyntaxError, str));
 }
 
@@ -1434,12 +1107,11 @@ rb_eval_string(str)
     const char *str;
 {
     VALUE v;
-    NODE *oldsrc = ruby_current_node;
+    char *oldsrc = ruby_sourcefile;
 
-    ruby_current_node = 0;
-    ruby_sourcefile = rb_source_filename("(eval)");
+    ruby_sourcefile = "(eval)";
     v = eval(ruby_top_self, rb_str_new2(str), Qnil, 0, 0);
-    ruby_current_node = oldsrc;
+    ruby_sourcefile = oldsrc;
 
     return v;
 }
@@ -1449,7 +1121,7 @@ rb_eval_string_protect(str, state)
     const char *str;
     int *state;
 {
-    VALUE result = Qnil;	/* OK */
+    VALUE result;		/* OK */
     int status;
 
     PUSH_TAG(PROT_NONE);
@@ -1474,153 +1146,103 @@ rb_eval_string_wrap(str, state)
 {
     int status;
     VALUE self = ruby_top_self;
-    VALUE wrapper = ruby_wrapper;
     VALUE val;
 
-    PUSH_CLASS(ruby_wrapper = rb_module_new());
+    PUSH_CLASS();
+    ruby_class = ruby_wrapper = rb_module_new();
     ruby_top_self = rb_obj_clone(ruby_top_self);
-    rb_extend_object(ruby_top_self, ruby_wrapper);
-    PUSH_FRAME();
-    ruby_frame->last_func = 0;
-    ruby_frame->orig_func = 0;
-    ruby_frame->last_class = 0;
-    ruby_frame->self = self;
-    PUSH_CREF(ruby_wrapper);
-    PUSH_SCOPE();
+    rb_extend_object(self, ruby_class);
 
     val = rb_eval_string_protect(str, &status);
     ruby_top_self = self;
 
-    POP_SCOPE();
-    POP_FRAME();
     POP_CLASS();
-    ruby_wrapper = wrapper;
     if (state) {
 	*state = status;
-    }
-    else if (status) {
-	JUMP_TAG(status);
+	if (status == 0) {
+	    JUMP_TAG(status);
+	}
     }
     return val;
 }
 
-static void
-localjump_error(mesg, value, reason)
-    const char *mesg;
-    VALUE value;
-    int reason;
+VALUE
+rb_eval_cmd(cmd, arg)
+    VALUE cmd, arg;
 {
-    VALUE exc = rb_exc_new2(rb_eLocalJumpError, mesg);
-    ID id;
+    int state;
+    VALUE val;			/* OK */
+    struct SCOPE *saved_scope;
+    volatile int safe = safe_level;
 
-    rb_iv_set(exc, "@exit_value", value);
-    switch (reason) {
-      case TAG_BREAK:
-	id = rb_intern("break"); break;
-      case TAG_REDO:
-	id = rb_intern("redo"); break;
-      case TAG_RETRY:
-	id = rb_intern("retry"); break;
-      case TAG_NEXT:
-	id = rb_intern("next"); break;
-      case TAG_RETURN:
-	id = rb_intern("return"); break;
-      default:
-	id = rb_intern("noreason"); break;
+    if (TYPE(cmd) != T_STRING) {
+	return rb_funcall2(cmd, rb_intern("call"),
+			   RARRAY(arg)->len, RARRAY(arg)->ptr);
     }
-    rb_iv_set(exc, "@reason", ID2SYM(id));
-    rb_exc_raise(exc);
-}
 
-static VALUE
-localjump_xvalue(exc)
-    VALUE exc;
-{
-    return rb_iv_get(exc, "@exit_value");
-}
+    PUSH_CLASS();
+    PUSH_TAG(PROT_NONE);
+    saved_scope = ruby_scope;
+    ruby_scope = top_scope;
 
-static VALUE
-localjump_reason(exc)
-    VALUE exc;
-{
-    return rb_iv_get(exc, "@reason");
-}
+    ruby_class = rb_cObject;
+    if (OBJ_TAINTED(cmd)) {
+	safe_level = 4;
+    }
 
-NORETURN(static void jump_tag_but_local_jump _((int)));
-static void
-jump_tag_but_local_jump(state)
-    int state;
-{
-    VALUE val;
+    if ((state = EXEC_TAG()) == 0) {
+	val = eval(ruby_top_self, cmd, Qnil, 0, 0);
+    }
+
+    if (FL_TEST(ruby_scope, SCOPE_DONT_RECYCLE))
+	FL_SET(saved_scope, SCOPE_DONT_RECYCLE);
+    ruby_scope = saved_scope;
+    safe_level = safe;
+    POP_TAG();
+    POP_CLASS();
 
-    if (prot_tag) val = prot_tag->retval;
-    else          val = Qnil;
     switch (state) {
       case 0:
 	break;
       case TAG_RETURN:
-	localjump_error("unexpected return", val, state);
-	break;
-      case TAG_BREAK:
-	localjump_error("unexpected break", val, state);
+	rb_raise(rb_eLocalJumpError, "unexpected return");
 	break;
       case TAG_NEXT:
-	localjump_error("unexpected next", val, state);
+	rb_raise(rb_eLocalJumpError, "unexpected next");
+	break;
+      case TAG_BREAK:
+	rb_raise(rb_eLocalJumpError, "unexpected break");
 	break;
       case TAG_REDO:
-	localjump_error("unexpected redo", Qnil, state);
+	rb_raise(rb_eLocalJumpError, "unexpected redo");
 	break;
       case TAG_RETRY:
-	localjump_error("retry outside of rescue clause", Qnil, state);
+	rb_raise(rb_eLocalJumpError, "retry outside of rescue clause");
 	break;
       default:
+	JUMP_TAG(state);
 	break;
     }
-    JUMP_TAG(state);
+    return val;
 }
 
-VALUE
-rb_eval_cmd(cmd, arg, tcheck)
-    VALUE cmd, arg;
-    int tcheck;
+static VALUE
+rb_trap_eval(cmd, sig)
+    VALUE cmd;
+    int sig;
 {
     int state;
-    VALUE val = Qnil;		/* OK */
-    struct SCOPE *saved_scope;
-    volatile int safe = ruby_safe_level;
-
-    if (TYPE(cmd) != T_STRING) {
-	PUSH_ITER(ITER_NOT);
-	val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
-	POP_ITER();
-	return val;
-    }
-
-    saved_scope = ruby_scope;
-    ruby_scope = top_scope;
-    PUSH_FRAME();
-    ruby_frame->last_func = 0;
-    ruby_frame->orig_func = 0;
-    ruby_frame->last_class = 0;
-    ruby_frame->self = ruby_top_self;
-    PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
-
-    if (tcheck && OBJ_TAINTED(cmd)) {
-	ruby_safe_level = 4;
-    }
+    VALUE val;			/* OK */
 
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
-	val = eval(ruby_top_self, cmd, Qnil, 0, 0);
+	val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)));
     }
-    if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
-       scope_dup(saved_scope);
-    ruby_scope = saved_scope;
-    ruby_safe_level = safe;
     POP_TAG();
-    POP_FRAME();
-
-    jump_tag_but_local_jump(state);
+    if (state) {
+	rb_trap_immediate = 0;
+	JUMP_TAG(state);
+    }
     return val;
 }
 
@@ -1629,7 +1251,7 @@ superclass(self, node)
     VALUE self;
     NODE *node;
 {
-    VALUE val = Qnil;		/* OK */
+    VALUE val;			/* OK */
     int state;
 
     PUSH_TAG(PROT_NONE);
@@ -1638,22 +1260,20 @@ superclass(self, node)
     }
     POP_TAG();
     if (state) {
+      superclass_error:
 	switch (nd_type(node)) {
 	  case NODE_COLON2:
 	    rb_raise(rb_eTypeError, "undefined superclass `%s'",
 		     rb_id2name(node->nd_mid));
-	  case NODE_CONST:
+	  case NODE_CVAR:
 	    rb_raise(rb_eTypeError, "undefined superclass `%s'",
 		     rb_id2name(node->nd_vid));
 	  default:
-	    break;
+	    rb_raise(rb_eTypeError, "superclass undefined");
 	}
 	JUMP_TAG(state);
     }
-    if (TYPE(val) != T_CLASS) {
-	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
-		 rb_obj_classname(val));
-    }
+    if (TYPE(val) != T_CLASS) goto superclass_error;
     if (FL_TEST(val, FL_SINGLETON)) {
 	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
     }
@@ -1661,25 +1281,18 @@ superclass(self, node)
     return val;
 }
 
-#define ruby_cbase (ruby_cref->nd_clss)
-
 static VALUE
-ev_const_defined(cref, id, self)
+ev_const_defined(cref, id)
     NODE *cref;
     ID id;
-    VALUE self;
 {
     NODE *cbase = cref;
-    VALUE result;
 
-    while (cbase && cbase->nd_next) {
+    while (cbase && cbase->nd_clss != rb_cObject) {
 	struct RClass *klass = RCLASS(cbase->nd_clss);
 
-	if (NIL_P(klass)) return rb_const_defined(CLASS_OF(self), id);
-	if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
-	    if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) {
-		return Qfalse;
-	    }
+	if (klass->iv_tbl &&
+	    st_lookup(klass->iv_tbl, id, 0)) {
 	    return Qtrue;
 	}
 	cbase = cbase->nd_next;
@@ -1688,23 +1301,18 @@ ev_const_defined(cref, id, self)
 }
 
 static VALUE
-ev_const_get(cref, id, self)
+ev_const_get(cref, id)
     NODE *cref;
     ID id;
-    VALUE self;
 {
     NODE *cbase = cref;
     VALUE result;
 
-    while (cbase && cbase->nd_next) {
-	VALUE klass = cbase->nd_clss;
+    while (cbase && cbase->nd_clss != rb_cObject) {
+	struct RClass *klass = RCLASS(cbase->nd_clss);
 
-	if (NIL_P(klass)) return rb_const_get(CLASS_OF(self), id);
-	while (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
-	    if (result == Qundef) {
-		rb_autoload_load(klass, id);
-		continue;
-	    }
+	if (klass->iv_tbl &&
+	    st_lookup(klass->iv_tbl, id, &result)) {
 	    return result;
 	}
 	cbase = cbase->nd_next;
@@ -1713,207 +1321,61 @@ ev_const_get(cref, id, self)
 }
 
 static VALUE
-cvar_cbase()
-{
-    NODE *cref = ruby_cref;
-
-    while (cref && cref->nd_next && FL_TEST(cref->nd_clss, FL_SINGLETON)) {
-	cref = cref->nd_next;
-	if (!cref->nd_next) {
-	    rb_warn("class variable access from toplevel singleton method");
-	}
-    }
-    return cref->nd_clss;
-}
-
-static VALUE
 rb_mod_nesting()
 {
-    NODE *cbase = ruby_cref;
+    NODE *cbase = (NODE*)ruby_frame->cbase;
     VALUE ary = rb_ary_new();
 
-    while (cbase && cbase->nd_next) {
-	if (!NIL_P(cbase->nd_clss)) rb_ary_push(ary, cbase->nd_clss);
+    while (cbase && cbase->nd_clss != rb_cObject) {
+	rb_ary_push(ary, cbase->nd_clss);
 	cbase = cbase->nd_next;
     }
-    if (ruby_wrapper && RARRAY(ary)->len == 0) {
-	rb_ary_push(ary, ruby_wrapper);
-    }
     return ary;
 }
 
 static VALUE
 rb_mod_s_constants()
 {
-    NODE *cbase = ruby_cref;
-    void *data = 0;
+    NODE *cbase = (NODE*)ruby_frame->cbase;
+    VALUE ary = rb_ary_new();
 
-    while (cbase) {
-	if (!NIL_P(cbase->nd_clss)) {
-	    data = rb_mod_const_at(cbase->nd_clss, data);
-	}
+    while (cbase && cbase->nd_clss != rb_cObject) {
+	rb_mod_const_at(cbase->nd_clss, ary);
 	cbase = cbase->nd_next;
     }
 
-    if (!NIL_P(ruby_cbase)) {
-	data = rb_mod_const_of(ruby_cbase, data);
-    }
-    return rb_const_list(data);
-}
-
-void
-rb_frozen_class_p(klass)
-    VALUE klass;
-{
-    char *desc = "something(?!)";
-
-    if (OBJ_FROZEN(klass)) {
-	if (FL_TEST(klass, FL_SINGLETON))
-	    desc = "object";
-	else {
-	    switch (TYPE(klass)) {
-	      case T_MODULE:
-	      case T_ICLASS:
-		desc = "module"; break;
-	      case T_CLASS:
-		desc = "class"; break;
-	    }
-	}
-	rb_error_frozen(desc);
-    }
-}
-
-void
-rb_undef(klass, id)
-    VALUE klass;
-    ID id;
-{
-    VALUE origin;
-    NODE *body;
-
-    if (ruby_cbase == rb_cObject && klass == rb_cObject) {
-	rb_secure(4);
-    }
-    if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", rb_id2name(id));
-    }
-    rb_frozen_class_p(klass);
-    if (id == __id__ || id == __send__ || id == init) {
-	rb_warn("undefining `%s' may cause serious problem", rb_id2name(id));
-    }
-    body = search_method(klass, id, &origin);
-    if (!body || !body->nd_body) {
-	char *s0 = " class";
-	VALUE c = klass;
-
-	if (FL_TEST(c, FL_SINGLETON)) {
-	    VALUE obj = rb_iv_get(klass, "__attached__");
-
-	    switch (TYPE(obj)) {
-	      case T_MODULE:
-	      case T_CLASS:
-		c = obj;
-		s0 = "";
-	    }
-	}
-	else if (TYPE(c) == T_MODULE) {
-	    s0 = " module";
-	}
-	rb_name_error(id, "undefined method `%s' for%s `%s'",
-		      rb_id2name(id),s0,rb_class2name(c));
-    }
-    rb_add_method(klass, id, 0, NOEX_PUBLIC);
-    if (FL_TEST(klass, FL_SINGLETON)) {
-	rb_funcall(rb_iv_get(klass, "__attached__"),
-		   singleton_undefined, 1, ID2SYM(id));
-    }
-    else {
-	rb_funcall(klass, undefined, 1, ID2SYM(id));
-    }
+    rb_mod_const_of(((NODE*)ruby_frame->cbase)->nd_clss, ary);
+    return ary;
 }
 
 static VALUE
-rb_mod_undef_method(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_mod_remove_method(mod, name)
+    VALUE mod, name;
 {
-    int i;
-
-    for (i=0; i<argc; i++) {
-	rb_undef(mod, rb_to_id(argv[i]));
-    }
+    remove_method(mod, rb_to_id(name));
     return mod;
 }
 
-void
-rb_alias(klass, name, def)
-    VALUE klass;
-    ID name, def;
+static VALUE
+rb_mod_undef_method(mod, name)
+    VALUE mod, name;
 {
-    VALUE origin;
-    NODE *orig, *body;
-    VALUE singleton = 0;
+    ID id = rb_to_id(name);
 
-    rb_frozen_class_p(klass);
-    if (name == def) return;
-    if (klass == rb_cObject) {
-	rb_secure(4);
-    }
-    orig = search_method(klass, def, &origin);
-    if (!orig || !orig->nd_body) {
-	if (TYPE(klass) == T_MODULE) {
-	    orig = search_method(rb_cObject, def, &origin);
-	}
-    }
-    if (!orig || !orig->nd_body) {
-	print_undef(klass, def);
-    }
-    if (FL_TEST(klass, FL_SINGLETON)) {
-	singleton = rb_iv_get(klass, "__attached__");
-    }
-    body = orig->nd_body;
-    orig->nd_cnt++;
-    if (nd_type(body) == NODE_FBODY) { /* was alias */
-	def = body->nd_mid;
-	origin = body->nd_orig;
-	body = body->nd_head;
-    }
-
-    rb_clear_cache_by_id(name);
-    st_insert(RCLASS(klass)->m_tbl, name,
-      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
-    if (singleton) {
-	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
-    }
-    else {
-	rb_funcall(klass, added, 1, ID2SYM(name));
-    }
+    rb_add_method(mod, id, 0, NOEX_PUBLIC);
+    rb_clear_cache_by_id(id);
+    return mod;
 }
 
 static VALUE
 rb_mod_alias_method(mod, newname, oldname)
     VALUE mod, newname, oldname;
 {
-    rb_alias(mod, rb_to_id(newname), rb_to_id(oldname));
-    return mod;
-}
+    ID id = rb_to_id(newname);
 
-static NODE*
-copy_node_scope(node, rval)
-    NODE *node;
-    NODE *rval;
-{
-    NODE *copy = NEW_NODE(NODE_SCOPE,0,rval,node->nd_next);
-
-    if (node->nd_tbl) {
-	copy->nd_tbl = ALLOC_N(ID, node->nd_tbl[0]+1);
-	MEMCPY(copy->nd_tbl, node->nd_tbl, ID, node->nd_tbl[0]+1);
-    }
-    else {
-	copy->nd_tbl = 0;
-    }
-    return copy;
+    rb_alias(mod, id, rb_to_id(oldname));
+    rb_clear_cache_by_id(id);
+    return mod;
 }
 
 #ifdef C_ALLOCA
@@ -1927,15 +1389,17 @@ copy_node_scope(node, rval)
 # define TMP_ALLOC(n) ALLOCA_N(VALUE,n)
 #endif
 
-#define SETUP_ARGS0(anode,alen) do {\
+#define SETUP_ARGS(anode) {\
     NODE *n = anode;\
     if (!n) {\
 	argc = 0;\
 	argv = 0;\
     }\
     else if (nd_type(n) == NODE_ARRAY) {\
-	argc=alen;\
+	argc=n->nd_alen;\
         if (argc > 0) {\
+	    char *file = ruby_sourcefile;\
+	    int line = ruby_sourceline;\
             int i;\
 	    n = anode;\
 	    argv = TMP_ALLOC(argc);\
@@ -1943,6 +1407,8 @@ copy_node_scope(node, rval)
 		argv[i] = rb_eval(self,n->nd_head);\
 		n=n->nd_next;\
 	    }\
+	    ruby_sourcefile = file;\
+	    ruby_sourceline = line;\
         }\
         else {\
 	    argc = 0;\
@@ -1951,31 +1417,31 @@ copy_node_scope(node, rval)
     }\
     else {\
         VALUE args = rb_eval(self,n);\
+	char *file = ruby_sourcefile;\
+	int line = ruby_sourceline;\
 	if (TYPE(args) != T_ARRAY)\
-	    args = rb_ary_to_ary(args);\
+	    args = rb_Array(args);\
         argc = RARRAY(args)->len;\
 	argv = ALLOCA_N(VALUE, argc);\
 	MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
+	ruby_sourcefile = file;\
+	ruby_sourceline = line;\
     }\
-} while (0)
-
-#define SETUP_ARGS(anode) SETUP_ARGS0(anode, anode->nd_alen)
+}
 
-#define BEGIN_CALLARGS do {\
+#define BEGIN_CALLARGS {\
     struct BLOCK *tmp_block = ruby_block;\
-    int tmp_iter = ruby_iter->iter;\
-    if (tmp_iter == ITER_PRE) {\
-	ruby_block = ruby_block->outer;\
-        tmp_iter = ITER_NOT;\
+    if (ruby_iter->iter == ITER_PRE) {\
+	ruby_block = ruby_block->prev;\
     }\
-    PUSH_ITER(tmp_iter)
+    PUSH_ITER(ITER_NOT);
 
 #define END_CALLARGS \
     ruby_block = tmp_block;\
     POP_ITER();\
-} while (0)
+}
 
-#define MATCH_DATA *rb_svar(node->nd_cnt)
+#define MATCH_DATA ruby_scope->local_vars[node->nd_cnt]
 
 static char* is_defined _((VALUE, NODE*, char*));
 
@@ -2005,19 +1471,7 @@ arg_defined(self, node, buf, type)
     }
     return type;
 }
-
-static VALUE
-search_iclass(self, klass)
-    VALUE self, klass;
-{
-    VALUE k = CLASS_OF(self);
-
-    while (k && !(BUILTIN_TYPE(k) == T_ICLASS && RBASIC(k)->klass == klass)) {
-	k = RCLASS(k)->super;
-    }
-    return k;
-}
-
+    
 static char*
 is_defined(self, node, buf)
     VALUE self;
@@ -2027,19 +1481,12 @@ is_defined(self, node, buf)
     VALUE val;			/* OK */
     int state;
 
-  again:
-    if (!node) return "expression";
     switch (nd_type(node)) {
       case NODE_SUPER:
       case NODE_ZSUPER:
-	if (ruby_frame->orig_func == 0) return 0;
-	else if (ruby_frame->last_class == 0) return 0;
-	val = ruby_frame->last_class;
-	if (BUILTIN_TYPE(val) == T_MODULE) {
-	    val = search_iclass(self, val);
-	    if (!val) return 0;
-	}
-	if (rb_method_boundp(RCLASS(val)->super, ruby_frame->orig_func, 0)) {
+	if (ruby_frame->last_func == 0) return 0;
+	else if (rb_method_boundp(RCLASS(ruby_frame->last_class)->super,
+				  ruby_frame->last_func, 0)) {
 	    if (nd_type(node) == NODE_SUPER) {
 		return arg_defined(self, node->nd_args, buf, "super");
 	    }
@@ -2049,44 +1496,21 @@ is_defined(self, node, buf)
 
       case NODE_VCALL:
       case NODE_FCALL:
-	val = self;
+	val = CLASS_OF(self);
 	goto check_bound;
 
-      case NODE_ATTRASGN:
-	val = self;
-	if (node->nd_recv == (NODE *)1) goto check_bound;
       case NODE_CALL:
+	if (!is_defined(self, node->nd_recv, buf)) return 0;
 	PUSH_TAG(PROT_NONE);
 	if ((state = EXEC_TAG()) == 0) {
 	    val = rb_eval(self, node->nd_recv);
+	    val = CLASS_OF(val);
 	}
 	POP_TAG();
-	if (state) {
-	    ruby_errinfo = Qnil;
-	    return 0;
-	}
+	if (state) return 0;
       check_bound:
-	{
-	    int call = nd_type(node)==NODE_CALL;
-
-	    val = CLASS_OF(val);
-	    if (call) {
-		int noex;
-		ID id = node->nd_mid;
-
-		if (!rb_get_method_body(&val, &id, &noex))
-		    break;
-		if ((noex & NOEX_PRIVATE))
-		    break;
-		if ((noex & NOEX_PROTECTED) &&
-		    !rb_obj_is_kind_of(self, rb_class_real(val)))
-		    break;
-	    }
-	    else if (!rb_method_boundp(val, node->nd_mid, call))
-		break;
-	    return arg_defined(self, node->nd_args, buf,
-			       nd_type(node) == NODE_ATTRASGN ?
-			       "assignment" : "method");
+	if (rb_method_boundp(val, node->nd_mid, nd_type(node)== NODE_CALL)) {
+	    return arg_defined(self, node->nd_args, buf, "method");
 	}
 	break;
 
@@ -2095,7 +1519,7 @@ is_defined(self, node, buf)
 	return "method";
 
       case NODE_YIELD:
-	if (rb_block_given_p()) {
+	if (rb_iterator_p()) {
 	    return "yield";
 	}
 	break;
@@ -2118,11 +1542,10 @@ is_defined(self, node, buf)
       case NODE_MASGN:
       case NODE_LASGN:
       case NODE_DASGN:
-      case NODE_DASGN_CURR:
+      case NODE_DASGN_PUSH:
       case NODE_GASGN:
-      case NODE_CDECL:
-      case NODE_CVDECL:
-      case NODE_CVASGN:
+      case NODE_IASGN:
+      case NODE_CASGN:
 	return "assignment";
 
       case NODE_LVAR:
@@ -2142,15 +1565,9 @@ is_defined(self, node, buf)
 	}
 	break;
 
-      case NODE_CONST:
-	if (ev_const_defined(ruby_cref, node->nd_vid, self)) {
-	    return "constant";
-	}
-	break;
-
       case NODE_CVAR:
-	if (rb_cvar_defined(cvar_cbase(), node->nd_vid)) {
-	    return "class variable";
+	if (ev_const_defined((NODE*)ruby_frame->cbase, node->nd_vid)) {
+	    return "constant";
 	}
 	break;
 
@@ -2160,49 +1577,35 @@ is_defined(self, node, buf)
 	    val = rb_eval(self, node->nd_head);
 	}
 	POP_TAG();
-	if (state) {
-	    ruby_errinfo = Qnil;
-	    return 0;
-	}
+	if (state) return 0;
 	else {
 	    switch (TYPE(val)) {
 	      case T_CLASS:
 	      case T_MODULE:
-		if (rb_const_defined_from(val, node->nd_mid))
+		if (rb_const_defined_at(val, node->nd_mid))
 		    return "constant";
-		break;
 	      default:
-		if (rb_method_boundp(CLASS_OF(val), node->nd_mid, 1)) {
+		if (rb_method_boundp(val, node->nd_mid, 1)) {
 		    return "method";
 		}
 	    }
 	}
 	break;
 
-      case NODE_COLON3:
-	if (rb_const_defined_from(rb_cObject, node->nd_mid)) {
-	    return "constant";
-	}
-	break;
-
       case NODE_NTH_REF:
-	if (RTEST(rb_reg_nth_defined(node->nd_nth, MATCH_DATA))) {
-	    sprintf(buf, "$%d", (int)node->nd_nth);
+	if (rb_reg_nth_defined(node->nd_nth, MATCH_DATA)) {
+	    sprintf(buf, "$%d", node->nd_nth);
 	    return buf;
 	}
 	break;
 
       case NODE_BACK_REF:
-	if (RTEST(rb_reg_nth_defined(0, MATCH_DATA))) {
-	    sprintf(buf, "$%c", (char)node->nd_nth);
+	if (rb_reg_nth_defined(0, MATCH_DATA)) {
+	    sprintf(buf, "$%c", node->nd_nth);
 	    return buf;
 	}
 	break;
 
-      case NODE_NEWLINE:
-	node = node->nd_next;
-	goto again;
-
       default:
 	PUSH_TAG(PROT_NONE);
 	if ((state = EXEC_TAG()) == 0) {
@@ -2212,7 +1615,6 @@ is_defined(self, node, buf)
 	if (!state) {
 	    return "expression";
 	}
-	ruby_errinfo = Qnil;
 	break;
     }
     return 0;
@@ -2223,10 +1625,20 @@ static int handle_rescue _((VALUE,NODE*));
 static void blk_free();
 
 static VALUE
+rb_obj_is_block(block)
+    VALUE block;
+{
+    if (TYPE(block) == T_DATA && RDATA(block)->dfree == blk_free) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+static VALUE
 rb_obj_is_proc(proc)
     VALUE proc;
 {
-    if (TYPE(proc) == T_DATA && RDATA(proc)->dfree == (RUBY_DATA_FUNC)blk_free) {
+    if (rb_obj_is_block(proc) && rb_obj_is_kind_of(proc, rb_cProc)) {
 	return Qtrue;
     }
     return Qfalse;
@@ -2247,249 +1659,81 @@ set_trace_func(obj, trace)
 }
 
 static void
-call_trace_func(event, node, self, id, klass)
+call_trace_func(event, file, line, self, id, klass)
     char *event;
-    NODE *node;
+    char *file;
+    int line;
     VALUE self;
     ID id;
     VALUE klass;		/* OK */
 {
-    int state, raised;
+    int state;
+    volatile VALUE trace;
     struct FRAME *prev;
-    NODE *node_save;
-    VALUE srcfile;
+    char *file_save = ruby_sourcefile;
+    int line_save = ruby_sourceline;
 
     if (!trace_func) return;
-    if (tracing) return;
-    if (ruby_in_compile) return;
-    if (id == ID_ALLOCATOR) return;
 
-    if (!(node_save = ruby_current_node)) {
-	node_save = NEW_NEWLINE(0);
-    }
-    tracing = 1;
+    trace = trace_func;
+    trace_func = 0;
+    rb_thread_critical++;
+
     prev = ruby_frame;
     PUSH_FRAME();
-    *ruby_frame = *prev;
+    *ruby_frame = *_frame.prev;
     ruby_frame->prev = prev;
-    ruby_frame->iter = 0;	/* blocks not available anyway */
 
-    if (node) {
-	ruby_current_node = node;
-	ruby_frame->node = node;
-	ruby_sourcefile = node->nd_file;
-	ruby_sourceline = nd_line(node);
+    if (file) {
+	ruby_frame->line = ruby_sourceline = line;
+	ruby_frame->file = ruby_sourcefile = file;
     }
     if (klass) {
-	if (TYPE(klass) == T_ICLASS) {
-	    klass = RBASIC(klass)->klass;
-	}
-	else if (FL_TEST(klass, FL_SINGLETON)) {
+	if (TYPE(klass) == T_ICLASS || FL_TEST(klass, FL_SINGLETON)) {
 	    klass = self;
 	}
     }
     PUSH_TAG(PROT_NONE);
-    raised = thread_reset_raised();
     if ((state = EXEC_TAG()) == 0) {
-	srcfile = rb_str_new2(ruby_sourcefile?ruby_sourcefile:"(ruby)");
-	proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event),
-					    srcfile,
-					    INT2FIX(ruby_sourceline),
-					    id?ID2SYM(id):Qnil,
-					    self?rb_f_binding(self):Qnil,
-					    klass),
-		    Qundef, 0);
-    }
-    if (raised) thread_set_raised();
+	proc_call(trace, rb_ary_new3(6, rb_str_new2(event),
+				     rb_str_new2(ruby_sourcefile),
+				     INT2FIX(ruby_sourceline),
+				     INT2FIX(id),
+				     self?rb_f_binding(self):Qnil,
+				     klass));
+    }
     POP_TAG();
     POP_FRAME();
 
-    tracing = 0;
-    ruby_current_node = node_save;
-    SET_CURRENT_SOURCE();
+    rb_thread_critical--;
+    if (!trace_func) trace_func = trace;
+    ruby_sourceline = line_save;
+    ruby_sourcefile = file_save;
     if (state) JUMP_TAG(state);
 }
 
-static VALUE
-avalue_to_svalue(v)
-    VALUE v;
-{
-    VALUE tmp, top;
-
-    tmp = rb_check_array_type(v);
-    if (NIL_P(tmp)) {
-	return v;
-    }
-    if (RARRAY(tmp)->len == 0) {
-	return Qundef;
-    }
-    if (RARRAY(tmp)->len == 1) {
-	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
-	if (NIL_P(top)) {
-	    return RARRAY(tmp)->ptr[0];
-	}
-	if (RARRAY(top)->len > 1) {
-	    return v;
-	}
-	return top;
-    }
-    return tmp;
-}
-
-static VALUE
-svalue_to_avalue(v)
-    VALUE v;
-{
-    VALUE tmp, top;
-
-    if (v == Qundef) return rb_ary_new2(0);
-    tmp = rb_check_array_type(v);
-    if (NIL_P(tmp)) {
-	return rb_ary_new3(1, v);
-    }
-    if (RARRAY(tmp)->len == 1) {
-	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
-	if (!NIL_P(top) && RARRAY(top)->len > 1) {
-	    return v;
-	}
-	return rb_ary_new3(1, v);
-    }
-    return tmp;
-}
-
-static VALUE
-svalue_to_mrhs(v, lhs)
-    VALUE v;
-    NODE *lhs;
-{
-    VALUE tmp;
-
-    if (v == Qundef) return rb_ary_new2(0);
-    tmp = rb_check_array_type(v);
-    if (NIL_P(tmp)) {
-	return rb_ary_new3(1, v);
-    }
-    /* no lhs means splat lhs only */
-    if (!lhs) {
-	return rb_ary_new3(1, v);
-    }
-    return tmp;
-}
+static void return_check _((void));
+#define return_value(v) prot_tag->retval = (v)
 
 static VALUE
-avalue_splat(v)
-    VALUE v;
-{
-    if (RARRAY(v)->len == 0) {
-	return Qundef;
-    }
-    if (RARRAY(v)->len == 1) {
-	return RARRAY(v)->ptr[0];
-    }
-    return v;
-}
-
-#if 1
-VALUE
-rb_Array(val)
-    VALUE val;
-{
-    VALUE tmp = rb_check_array_type(val);
-
-    if (NIL_P(tmp)) {
-	/* hack to avoid invoke Object#to_a */
-	VALUE origin;
-	ID id = rb_intern("to_a");
-
-	if (search_method(CLASS_OF(val), id, &origin) &&
-	    RCLASS(origin)->m_tbl != RCLASS(rb_mKernel)->m_tbl) { /* exclude Kernel#to_a */
-	    val = rb_funcall(val, id, 0);
-	    if (TYPE(val) != T_ARRAY) {
-		rb_raise(rb_eTypeError, "`to_a' did not return Array");
-	    }
-	    return val;
-	}
-	else {
-	    return rb_ary_new3(1, val);
-	}
-    }
-    return tmp;
-}
-#endif
-
-static VALUE
-splat_value(v)
-    VALUE v;
-{
-    if (NIL_P(v)) return rb_ary_new3(1, Qnil);
-    return rb_Array(v);
-}
-
-static VALUE
-class_prefix(self, cpath)
+rb_eval(self, node)
     VALUE self;
-    NODE *cpath;
+    NODE * volatile node;
 {
-    if (!cpath) {
-	rb_bug("class path missing");
-    }
-    if (cpath->nd_head) {
-	VALUE c = rb_eval(self, cpath->nd_head);
-	switch (TYPE(c)) {
-	  case T_CLASS:
-	  case T_MODULE:
-	    break;
-	  default:
-	    rb_raise(rb_eTypeError, "%s is not a class/module",
-		     RSTRING(rb_obj_as_string(c))->ptr);
-	}
-	return c;
-    }
-    else if (nd_type(cpath) == NODE_COLON2) {
-	return ruby_cbase;
-    }
-    else if (ruby_wrapper) {
-	return ruby_wrapper;
-    }
-    else {
-	return rb_cObject;
-    }
-}
-
-#define return_value(v) do {\
-  if ((prot_tag->retval = (v)) == Qundef) {\
-    prot_tag->retval = Qnil;\
-  }\
-} while (0)
-
-NORETURN(static void localjump_destination _((int, VALUE)));
-
-static VALUE
-rb_eval(self, n)
-    VALUE self;
-    NODE *n;
-{
-    NODE * volatile contnode = 0;
-    NODE * volatile node = n;
     int state;
     volatile VALUE result = Qnil;
 
-#define RETURN(v) do { \
-    result = (v); \
-    goto finish; \
-} while (0)
+#define RETURN(v) { result = (v); goto finish; }
 
   again:
     if (!node) RETURN(Qnil);
 
-    ruby_current_node = node;
     switch (nd_type(node)) {
       case NODE_BLOCK:
-	if (contnode) {
-	    result = rb_eval(self, node);
-	    break;
+	while (node->nd_next) {
+	    rb_eval(self, node->nd_head);
+	    node = node->nd_next;
 	}
-	contnode = node->nd_next;
 	node = node->nd_head;
 	goto again;
 
@@ -2506,16 +1750,13 @@ rb_eval(self, n)
 
 	/* nodes for speed-up(default match) */
       case NODE_MATCH:
-	result = rb_reg_match2(node->nd_lit);
+	result = rb_reg_match2(node->nd_head->nd_lit);
 	break;
 
 	/* nodes for speed-up(literal match) */
       case NODE_MATCH2:
-	{
-	    VALUE l = rb_eval(self,node->nd_recv);
-	    VALUE r = rb_eval(self,node->nd_value);
-	    result = rb_reg_match(l, r);
-	}
+	result = rb_reg_match(rb_eval(self,node->nd_recv),
+			   rb_eval(self,node->nd_value));
 	break;
 
 	/* nodes for speed-up(literal match) */
@@ -2523,40 +1764,20 @@ rb_eval(self, n)
         {
 	    VALUE r = rb_eval(self,node->nd_recv);
 	    VALUE l = rb_eval(self,node->nd_value);
-	    if (TYPE(l) == T_STRING) {
-		result = rb_reg_match(r, l);
+	    if (TYPE(r) == T_STRING) {
+		result = rb_reg_match(l, r);
 	    }
 	    else {
-		result = rb_funcall(l, match, 1, r);
+		result = rb_funcall(r, match, 1, l);
 	    }
 	}
 	break;
 
-	/* node for speed-up(top-level loop for -n/-p) */
+	/* nodes for speed-up(top-level loop for -n/-p) */
       case NODE_OPT_N:
-	PUSH_TAG(PROT_ITER);
-	switch (state = EXEC_TAG()) {
-	  case 0:
-	  opt_n_next:
-	    while (!NIL_P(rb_gets())) {
-	      opt_n_redo:
-		rb_eval(self, node->nd_body);
-	    }
-	    break;
-
-	  case TAG_REDO:
-	    state = 0;
-	    goto opt_n_redo;
-	  case TAG_NEXT:
-	    state = 0;
-	    goto opt_n_next;
-	  case TAG_BREAK:
-	    state = 0;
-	  default:
-	    break;
+	while (!NIL_P(rb_gets())) {
+	    rb_eval(self, node->nd_body);
 	}
-	POP_TAG();
-	if (state) JUMP_TAG(state);
 	RETURN(Qnil);
 
       case NODE_SELF:
@@ -2572,11 +1793,7 @@ rb_eval(self, n)
 	RETURN(Qfalse);
 
       case NODE_IF:
-	if (trace_func) {
-	    call_trace_func("line", node, self,
-			    ruby_frame->last_func,
-			    ruby_frame->last_class);
-	}
+	ruby_sourceline = nd_line(node);
 	if (RTEST(rb_eval(self, node->nd_cond))) {
 	    node = node->nd_body;
 	}
@@ -2585,42 +1802,6 @@ rb_eval(self, n)
 	}
 	goto again;
 
-      case NODE_WHEN:
-	while (node) {
-	    NODE *tag;
-
-	    if (nd_type(node) != NODE_WHEN) goto again;
-	    tag = node->nd_head;
-	    while (tag) {
-		if (trace_func) {
-		    call_trace_func("line", tag, self,
-				    ruby_frame->last_func,
-				    ruby_frame->last_class);
-		}
-		if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
-		    VALUE v = rb_eval(self, tag->nd_head->nd_head);
-		    long i;
-
-		    if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
-		    for (i=0; i<RARRAY(v)->len; i++) {
-			if (RTEST(RARRAY(v)->ptr[i])) {
-			    node = node->nd_body;
-			    goto again;
-			}
-		    }
-		    tag = tag->nd_next;
-		    continue;
-		}
-		if (RTEST(rb_eval(self, tag->nd_head))) {
-		    node = node->nd_body;
-		    goto again;
-		}
-		tag = tag->nd_next;
-	    }
-	    node = node->nd_next;
-	}
-	RETURN(Qnil);
-
       case NODE_CASE:
 	{
 	    VALUE val;
@@ -2636,15 +1817,16 @@ rb_eval(self, n)
 		tag = node->nd_head;
 		while (tag) {
 		    if (trace_func) {
-			call_trace_func("line", tag, self,
-					ruby_frame->last_func,
-					ruby_frame->last_class);
+			call_trace_func("line", tag->nd_file, nd_line(tag),
+					self, ruby_frame->last_func, 0);	
 		    }
-		    if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+		    ruby_sourcefile = tag->nd_file;
+		    ruby_sourceline = nd_line(tag);
+		    if (nd_type(tag->nd_head) == NODE_WHEN) {
 			VALUE v = rb_eval(self, tag->nd_head->nd_head);
-			long i;
+			int i;
 
-			if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+			if (TYPE(v) != T_ARRAY) v = rb_Array(v);
 			for (i=0; i<RARRAY(v)->len; i++) {
 			    if (RTEST(rb_funcall2(RARRAY(v)->ptr[i], eqq, 1, &val))){
 				node = node->nd_body;
@@ -2666,10 +1848,10 @@ rb_eval(self, n)
 	RETURN(Qnil);
 
       case NODE_WHILE:
-	PUSH_TAG(PROT_ITER);
-	result = Qnil;
+	PUSH_TAG(PROT_NONE);
 	switch (state = EXEC_TAG()) {
 	  case 0:
+	    ruby_sourceline = nd_line(node);
 	    if (node->nd_state && !RTEST(rb_eval(self, node->nd_cond)))
 		goto while_out;
 	    do {
@@ -2687,22 +1869,17 @@ rb_eval(self, n)
 	    state = 0;
 	    goto while_next;
 	  case TAG_BREAK:
-	    if (TAG_DST()) {
-		state = 0;
-		result = prot_tag->retval;
-	    }
-	    /* fall through */
+	    state = 0;
 	  default:
 	    break;
 	}
       while_out:
 	POP_TAG();
 	if (state) JUMP_TAG(state);
-	RETURN(result);
+	RETURN(Qnil);
 
       case NODE_UNTIL:
-	PUSH_TAG(PROT_ITER);
-	result = Qnil;
+	PUSH_TAG(PROT_NONE);
 	switch (state = EXEC_TAG()) {
 	  case 0:
 	    if (node->nd_state && RTEST(rb_eval(self, node->nd_cond)))
@@ -2722,18 +1899,14 @@ rb_eval(self, n)
 	    state = 0;
 	    goto until_next;
 	  case TAG_BREAK:
-	    if (TAG_DST()) {
-		state = 0;
-		result = prot_tag->retval;
-	    }
-	    /* fall through */
+	    state = 0;
 	  default:
 	    break;
 	}
       until_out:
 	POP_TAG();
 	if (state) JUMP_TAG(state);
-	RETURN(result);
+	RETURN(Qnil);
 
       case NODE_BLOCK_PASS:
 	result = block_pass(self, node);
@@ -2742,42 +1915,52 @@ rb_eval(self, n)
       case NODE_ITER:
       case NODE_FOR:
 	{
-	    PUSH_TAG(PROT_ITER);
+	  iter_retry:
 	    PUSH_BLOCK(node->nd_var, node->nd_body);
+	    PUSH_TAG(PROT_FUNC);
 
 	    state = EXEC_TAG();
 	    if (state == 0) {
-	      iter_retry:
-		PUSH_ITER(ITER_PRE);
 		if (nd_type(node) == NODE_ITER) {
+		    PUSH_ITER(ITER_PRE);
 		    result = rb_eval(self, node->nd_iter);
+		    POP_ITER();
 		}
 		else {
 		    VALUE recv;
+		    char *file = ruby_sourcefile;
+		    int line = ruby_sourceline;
 
-		    _block.flags &= ~BLOCK_D_SCOPE;
-		    BEGIN_CALLARGS;
+		    _block.d_scope = Qfalse;
 		    recv = rb_eval(self, node->nd_iter);
-		    END_CALLARGS;
-		    ruby_current_node = node;
-		    SET_CURRENT_SOURCE();
+		    PUSH_ITER(ITER_PRE);
+		    ruby_sourcefile = file;
+		    ruby_sourceline = line;
 		    result = rb_call(CLASS_OF(recv),recv,each,0,0,0);
+		    POP_ITER();
 		}
-		POP_ITER();
 	    }
-	    else if (state == TAG_BREAK && TAG_DST()) {
-		result = prot_tag->retval;
-		state = 0;
-	    }
-	    else if (state == TAG_RETRY) {
-		state = 0;
-		goto iter_retry;
+	    else if (_block.tag->dst == state) {
+		state &= TAG_MASK;
+		if (state == TAG_RETURN) {
+		    result = prot_tag->retval;
+		}
 	    }
-	    POP_BLOCK();
 	    POP_TAG();
+	    POP_BLOCK();
 	    switch (state) {
 	      case 0:
 		break;
+
+	      case TAG_RETRY:
+		goto iter_retry;
+
+	      case TAG_BREAK:
+		result = Qnil;
+		break;
+	      case TAG_RETURN:
+		return_value(result);
+		/* fall through */
 	      default:
 		JUMP_TAG(state);
 	    }
@@ -2785,93 +1968,79 @@ rb_eval(self, n)
 	break;
 
       case NODE_BREAK:
-	localjump_destination(TAG_BREAK, rb_eval(self, node->nd_stts));
+	JUMP_TAG(TAG_BREAK);
 	break;
 
       case NODE_NEXT:
-	CHECK_INTS;
-	return_value(rb_eval(self, node->nd_stts));
 	JUMP_TAG(TAG_NEXT);
 	break;
 
       case NODE_REDO:
-	CHECK_INTS;
 	JUMP_TAG(TAG_REDO);
 	break;
 
       case NODE_RETRY:
-	CHECK_INTS;
 	JUMP_TAG(TAG_RETRY);
 	break;
 
-      case NODE_SPLAT:
-	result = splat_value(rb_eval(self, node->nd_head));
-	break;
-
-      case NODE_TO_ARY:
-	result = rb_ary_to_ary(rb_eval(self, node->nd_head));
-	break;
-
-      case NODE_SVALUE:
-	result = avalue_splat(rb_eval(self, node->nd_head));
-	if (result == Qundef) result = Qnil;
+      case NODE_RESTARGS:
+	result = rb_eval(self, node->nd_head);
+	if (TYPE(result) != T_ARRAY) {
+	    result = rb_Array(result);
+	}
 	break;
 
       case NODE_YIELD:
-	if (node->nd_head) {
-	    result = rb_eval(self, node->nd_head);
-	    ruby_current_node = node;
+	if (node->nd_stts) {
+	    result = rb_eval(self, node->nd_stts);
+	    if (nd_type(node->nd_stts) == NODE_RESTARGS &&
+		RARRAY(result)->len == 1)
+	    {
+		result = RARRAY(result)->ptr[0];
+	    }
 	}
 	else {
-	    result = Qundef;	/* no arg */
+	    result = Qnil;
 	}
-	SET_CURRENT_SOURCE();
-	result = rb_yield_0(result, 0, 0, 0, node->nd_state);
+	result = rb_yield_0(result, 0, 0);
 	break;
 
       case NODE_RESCUE:
+      retry_entry:
         {
 	    volatile VALUE e_info = ruby_errinfo;
-	    volatile int rescuing = 0;
 
 	    PUSH_TAG(PROT_NONE);
 	    if ((state = EXEC_TAG()) == 0) {
 		result = rb_eval(self, node->nd_head);
 	    }
-	    else if (rescuing) {
-		if (rescuing < 0) {
-		    /* in rescue argument, just reraise */
-		}
-		else if (state == TAG_RETRY) {
-		    rescuing = state = 0;
-		    e_info = ruby_errinfo = Qnil;
-		    result = rb_eval(self, node->nd_head);
-		}
-		else if (state != TAG_RAISE) {
-		    ruby_errinfo = e_info;
-		}
-	    }
-	    else if (state == TAG_RAISE) {
-		NODE *resq = node->nd_resq;
+	    POP_TAG();
+	    if (state == TAG_RAISE) {
+		NODE * volatile resq = node->nd_resq;
 
-		rescuing = -1;
 		while (resq) {
-		    ruby_current_node = resq;
 		    if (handle_rescue(self, resq)) {
 			state = 0;
-			rescuing = 1;
-			result = rb_eval(self, resq->nd_body);
-			ruby_errinfo = e_info;
+			PUSH_TAG(PROT_NONE);
+			if ((state = EXEC_TAG()) == 0) {
+			    result = rb_eval(self, resq->nd_body);
+			}
+			POP_TAG();
+			if (state == 0) {
+			    ruby_errinfo = e_info;
+			}
+			else if (state == TAG_RETRY) {
+			    state = 0;
+			    goto retry_entry;
+			}
 			break;
 		    }
 		    resq = resq->nd_head; /* next rescue */
 		}
 	    }
-	    POP_TAG();
 	    if (state) JUMP_TAG(state);
-	    /* no exception raised */
-	    if (!rescuing && (node = node->nd_else)) { /* else clause given */
-		goto again;
+	    if (node->nd_else) { /* no exception raised, else clause given */
+		result = rb_eval(self, node->nd_else);
 	    }
 	}
         break;
@@ -2884,11 +2053,9 @@ rb_eval(self, n)
 	POP_TAG();
 	if (node->nd_ensr) {
 	    VALUE retval = prot_tag->retval; /* save retval */
-	    VALUE errinfo = ruby_errinfo;
 
 	    rb_eval(self, node->nd_ensr);
 	    return_value(retval);
-	    ruby_errinfo = errinfo;
 	}
 	if (state) JUMP_TAG(state);
 	break;
@@ -2928,86 +2095,54 @@ rb_eval(self, n)
 	break;
 
       case NODE_FLIP2:		/* like AWK */
-	{
-	    VALUE *flip = rb_svar(node->nd_cnt);
-	    if (!flip) rb_bug("unexpected local variable");
-	    if (!RTEST(*flip)) {
-		if (RTEST(rb_eval(self, node->nd_beg))) {
-		    *flip = RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue;
-		    result = Qtrue;
-		}
-		else {
-		    result = Qfalse;
-		}
+	if (ruby_scope->local_vars == 0) {
+	    rb_bug("unexpected local variable");
+	}
+	if (!RTEST(ruby_scope->local_vars[node->nd_cnt])) {
+	    if (RTEST(rb_eval(self, node->nd_beg))) {
+		ruby_scope->local_vars[node->nd_cnt] = 
+		    RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue;
+		result = Qtrue;
 	    }
 	    else {
-		if (RTEST(rb_eval(self, node->nd_end))) {
-		    *flip = Qfalse;
-		}
-		result = Qtrue;
+		result = Qfalse;
 	    }
 	}
+	else {
+	    if (RTEST(rb_eval(self, node->nd_end))) {
+		ruby_scope->local_vars[node->nd_cnt] = Qfalse;
+	    }
+	    result = Qtrue;
+	}
 	break;
 
       case NODE_FLIP3:		/* like SED */
-	{
-	    VALUE *flip = rb_svar(node->nd_cnt);
-	    if (!flip) rb_bug("unexpected local variable");
-	    if (!RTEST(*flip)) {
-		result = RTEST(rb_eval(self, node->nd_beg)) ? Qtrue : Qfalse;
-		*flip = result;
-	    }
-	    else {
-		if (RTEST(rb_eval(self, node->nd_end))) {
-		    *flip = Qfalse;
-		}
-		result = Qtrue;
+	if (ruby_scope->local_vars == 0) {
+	    rb_bug("unexpected local variable");
+	}
+	if (!RTEST(ruby_scope->local_vars[node->nd_cnt])) {
+	    result = RTEST(rb_eval(self, node->nd_beg));
+	    ruby_scope->local_vars[node->nd_cnt] = result;
+	}
+	else {
+	    if (RTEST(rb_eval(self, node->nd_end))) {
+		ruby_scope->local_vars[node->nd_cnt] = Qfalse;
 	    }
+	    result = Qtrue;
 	}
 	break;
 
       case NODE_RETURN:
-	localjump_destination(TAG_RETURN, rb_eval(self, node->nd_stts));
-	break;
-
-      case NODE_ARGSCAT:
-	{
-	    VALUE args = rb_eval(self, node->nd_head);
-	    result = rb_ary_concat(args, splat_value(rb_eval(self, node->nd_body)));
+	if (node->nd_stts) {
+	    return_value(rb_eval(self, node->nd_stts));
 	}
+	return_check();
+	JUMP_TAG(TAG_RETURN);
 	break;
 
-      case NODE_ARGSPUSH:
-	{
-	    VALUE args = rb_ary_dup(rb_eval(self, node->nd_head));
-	    result = rb_ary_push(args, rb_eval(self, node->nd_body));
-	}
-	break;
-
-      case NODE_ATTRASGN:
-	{
-	    VALUE recv;
-	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    int scope;
-	    TMP_PROTECT;
-
-	    BEGIN_CALLARGS;
-	    if (node->nd_recv == (NODE *)1) {
-		recv = self;
-		scope = 1;
-	    }
-	    else {
-		recv = rb_eval(self, node->nd_recv);
-		scope = 0;
-	    }
-	    SETUP_ARGS(node->nd_args);
-	    END_CALLARGS;
-
-	    ruby_current_node = node;
-	    SET_CURRENT_SOURCE();
-	    rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,scope);
-	    result = argv[argc-1];
-	}
+      case NODE_ARGSCAT:
+	result = rb_ary_concat(rb_eval(self, node->nd_head),
+			       rb_eval(self, node->nd_body));
 	break;
 
       case NODE_CALL:
@@ -3021,8 +2156,6 @@ rb_eval(self, n)
 	    SETUP_ARGS(node->nd_args);
 	    END_CALLARGS;
 
-	    ruby_current_node = node;
-	    SET_CURRENT_SOURCE();
 	    result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,0);
 	}
 	break;
@@ -3036,14 +2169,11 @@ rb_eval(self, n)
 	    SETUP_ARGS(node->nd_args);
 	    END_CALLARGS;
 
-	    ruby_current_node = node;
-	    SET_CURRENT_SOURCE();
 	    result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv,1);
 	}
 	break;
 
       case NODE_VCALL:
-	SET_CURRENT_SOURCE();
 	result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2);
 	break;
 
@@ -3053,15 +2183,9 @@ rb_eval(self, n)
 	    int argc; VALUE *argv; /* used in SETUP_ARGS */
 	    TMP_PROTECT;
 
-	    if (ruby_frame->last_class == 0) {
-		if (ruby_frame->orig_func) {
-		    rb_name_error(ruby_frame->last_func,
-				  "superclass method `%s' disabled",
-				  rb_id2name(ruby_frame->orig_func));
-		}
-		else {
-		    rb_raise(rb_eNoMethodError, "super called outside of method");
-		}
+	    if (ruby_frame->last_class == 0) {	
+		rb_raise(rb_eNameError, "superclass method `%s' disabled",
+			 rb_id2name(ruby_frame->last_func));
 	    }
 	    if (nd_type(node) == NODE_ZSUPER) {
 		argc = ruby_frame->argc;
@@ -3071,30 +2195,23 @@ rb_eval(self, n)
 		BEGIN_CALLARGS;
 		SETUP_ARGS(node->nd_args);
 		END_CALLARGS;
-		ruby_current_node = node;
 	    }
 
-	    SET_CURRENT_SOURCE();
-	    result = rb_call_super(argc, argv);
+	    PUSH_ITER(ruby_iter->iter?ITER_PRE:ITER_NOT);
+	    result = rb_call(RCLASS(ruby_frame->last_class)->super,
+			     ruby_frame->self, ruby_frame->last_func,
+			     argc, argv, 3);
+	    POP_ITER();
 	}
 	break;
 
       case NODE_SCOPE:
 	{
-	    struct FRAME frame;
-	    NODE *saved_cref = 0;
-	    int jump_chain = Qfalse;
-
-	    frame = *ruby_frame;
-	    frame.tmp = ruby_frame;
-	    ruby_frame = &frame;
+	    VALUE save = ruby_frame->cbase;
 
 	    PUSH_SCOPE();
-	    PUSH_TAG(PROT_PCALL);
-	    if (node->nd_rval) {
-		saved_cref = ruby_cref;
-		ruby_cref = (NODE*)node->nd_rval;
-	    }
+	    PUSH_TAG(PROT_NONE);
+	    if (node->nd_rval) ruby_frame->cbase = node->nd_rval;
 	    if (node->nd_tbl) {
 		VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1);
 		*vars++ = (VALUE)node;
@@ -3109,24 +2226,10 @@ rb_eval(self, n)
 	    if ((state = EXEC_TAG()) == 0) {
 		result = rb_eval(self, node->nd_next);
 	    }
-	    else if (TAG_DST()) {
-		result = prot_tag->retval;
-		jump_chain = Qtrue;
-	    }
 	    POP_TAG();
 	    POP_SCOPE();
-	    ruby_frame = frame.tmp;
-	    if (saved_cref)
-		ruby_cref = saved_cref;
-	    switch (state) {
-	      case 0:
-		break;
-	      case TAG_RETURN:
-	      case TAG_BREAK:
-		localjump_destination(state, result);
-	      default:
-		JUMP_TAG(state);
-	    }
+	    ruby_frame->cbase = save;
+	    if (state) JUMP_TAG(state);
 	}
 	break;
 
@@ -3139,7 +2242,7 @@ rb_eval(self, n)
 
 	    recv = rb_eval(self, node->nd_recv);
 	    rval = node->nd_args->nd_head;
-	    SETUP_ARGS0(node->nd_args->nd_next, node->nd_args->nd_alen - 1);
+	    SETUP_ARGS(node->nd_args->nd_next);
 	    val = rb_funcall2(recv, aref, argc-1, argv);
 	    switch (node->nd_mid) {
 	    case 0: /* OR */
@@ -3154,7 +2257,7 @@ rb_eval(self, n)
 		val = rb_funcall(val, node->nd_mid, 1, rb_eval(self, rval));
 	    }
 	    argv[argc-1] = val;
-	    rb_funcall2(recv, aset, argc, argv);
+	    val = rb_funcall2(recv, aset, argc, argv);
 	    result = val;
 	}
 	break;
@@ -3187,20 +2290,20 @@ rb_eval(self, n)
 
       case NODE_OP_ASGN_AND:
 	result = rb_eval(self, node->nd_head);
-	if (!RTEST(result)) break;
-	node = node->nd_value;
-	goto again;
+	if (RTEST(result)) {
+	    result = rb_eval(self, node->nd_value);
+	}
+	break;
 
       case NODE_OP_ASGN_OR:
-	if ((node->nd_aid && !is_defined(self, node->nd_head, 0)) ||
-	    !RTEST(result = rb_eval(self, node->nd_head))) {
-	    node = node->nd_value;
-	    goto again;
+	result = rb_eval(self, node->nd_head);
+	if (!RTEST(result)) {
+	    result = rb_eval(self, node->nd_value);
 	}
 	break;
 
       case NODE_MASGN:
-	result = massign(self, node, rb_eval(self, node->nd_value), 0);
+	result = massign(self, node, rb_eval(self, node->nd_value),0);
 	break;
 
       case NODE_LASGN:
@@ -3212,12 +2315,12 @@ rb_eval(self, n)
 
       case NODE_DASGN:
 	result = rb_eval(self, node->nd_value);
-	dvar_asgn(node->nd_vid, result);
+	rb_dvar_asgn(node->nd_vid, result);
 	break;
 
-      case NODE_DASGN_CURR:
+      case NODE_DASGN_PUSH:
 	result = rb_eval(self, node->nd_value);
-	dvar_asgn_curr(node->nd_vid, result);
+	dvar_asgn_push(node->nd_vid, result);
 	break;
 
       case NODE_GASGN:
@@ -3230,30 +2333,20 @@ rb_eval(self, n)
 	rb_ivar_set(self, node->nd_vid, result);
 	break;
 
-      case NODE_CDECL:
-	result = rb_eval(self, node->nd_value);
-	if (node->nd_vid == 0) {
-	    rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
+      case NODE_CASGN:
+	if (NIL_P(ruby_class)) {
+	    rb_raise(rb_eTypeError, "no class/module to define constant");
 	}
-	else {
-	    if (NIL_P(ruby_cbase)) {
-		rb_raise(rb_eTypeError, "no class/module to define constant");
+	result = rb_eval(self, node->nd_value);
+	/* check for static scope constants */
+	if (RTEST(ruby_verbose) &&
+	    ev_const_defined((NODE*)ruby_frame->cbase, node->nd_vid)) {
+	    if (RTEST(ruby_verbose)) {
+		rb_warning("already initialized constant %s",
+			   rb_id2name(node->nd_vid));
 	    }
-	    rb_const_set(ruby_cbase, node->nd_vid, result);
 	}
-	break;
-
-      case NODE_CVDECL:
-	if (NIL_P(ruby_cbase)) {
-	    rb_raise(rb_eTypeError, "no class/module to define class variable");
-	}
-	result = rb_eval(self, node->nd_value);
-	rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qtrue);
-	break;
-
-      case NODE_CVASGN:
-	result = rb_eval(self, node->nd_value);
-	rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qfalse);
+	rb_const_set(ruby_class, node->nd_vid, result);
 	break;
 
       case NODE_LVAR:
@@ -3275,19 +2368,15 @@ rb_eval(self, n)
 	result = rb_ivar_get(self, node->nd_vid);
 	break;
 
-      case NODE_CONST:
-	result = ev_const_get(ruby_cref, node->nd_vid, self);
-	break;
-
       case NODE_CVAR:
-	result = rb_cvar_get(cvar_cbase(), node->nd_vid);
+	result = ev_const_get((NODE*)ruby_frame->cbase, node->nd_vid);
 	break;
 
       case NODE_BLOCK_ARG:
 	if (ruby_scope->local_vars == 0)
 	    rb_bug("unexpected block argument");
-	if (rb_block_given_p()) {
-	    result = rb_block_proc();
+	if (rb_iterator_p()) {
+	    result = rb_f_lambda();
 	    ruby_scope->local_vars[node->nd_cnt] = result;
 	}
 	else {
@@ -3300,26 +2389,19 @@ rb_eval(self, n)
 	    VALUE klass;
 
 	    klass = rb_eval(self, node->nd_head);
-	    if (rb_is_const_id(node->nd_mid)) {
-		switch (TYPE(klass)) {
-		  case T_CLASS:
-		  case T_MODULE:
-		    result = rb_const_get_from(klass, node->nd_mid);
-		    break;
-		  default:
-		    rb_raise(rb_eTypeError, "%s is not a class/module",
-			     RSTRING(rb_obj_as_string(klass))->ptr);
-		    break;
-		}
-	    }
-	    else {
-		result = rb_funcall(klass, node->nd_mid, 0, 0);
+	    switch (TYPE(klass)) {
+	      case T_CLASS:
+	      case T_MODULE:
+		break;
+	      default:
+		return rb_funcall(klass, node->nd_mid, 0, 0);
 	    }
+	    result = rb_const_get_at(klass, node->nd_mid);
 	}
 	break;
 
       case NODE_COLON3:
-	result = rb_const_get_from(rb_cObject, node->nd_mid);
+	result = rb_const_get_at(rb_cObject, node->nd_mid);
 	break;
 
       case NODE_NTH_REF:
@@ -3372,7 +2454,7 @@ rb_eval(self, n)
       case NODE_ARRAY:
 	{
 	    VALUE ary;
-	    long i;
+	    int i;
 
 	    i = node->nd_alen;
 	    ary = rb_ary_new2(i);
@@ -3389,15 +2471,10 @@ rb_eval(self, n)
 	result = rb_str_new3(node->nd_lit);
 	break;
 
-      case NODE_EVSTR:
-	result = rb_obj_as_string(rb_eval(self, node->nd_body));
-	break;
-
       case NODE_DSTR:
       case NODE_DXSTR:
       case NODE_DREGX:
       case NODE_DREGX_ONCE:
-      case NODE_DSYM:
 	{
 	    VALUE str, str2;
 	    NODE *list = node->nd_next;
@@ -3409,32 +2486,42 @@ rb_eval(self, n)
 		      case NODE_STR:
 			str2 = list->nd_head->nd_lit;
 			break;
+		      case NODE_EVSTR:
+			ruby_sourceline = nd_line(node);
+			ruby_in_eval++;
+			list->nd_head = compile(list->nd_head->nd_lit,
+						ruby_sourcefile,
+						ruby_sourceline);
+			ruby_eval_tree = 0;
+			ruby_in_eval--;
+			if (ruby_nerrs > 0) {
+			    compile_error("string expansion");
+			}
+			/* fall through */
 		      default:
 			str2 = rb_eval(self, list->nd_head);
+			str2 = rb_obj_as_string(str2);
 			break;
 		    }
-		    rb_str_append(str, str2);
-		    OBJ_INFECT(str, str2);
+		    rb_str_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
+		    if (OBJ_TAINTED(str2)) OBJ_TAINT(str);
 		}
 		list = list->nd_next;
 	    }
 	    switch (nd_type(node)) {
 	      case NODE_DREGX:
 		result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
-				    node->nd_cflag);
+				 node->nd_cflag);
 		break;
 	      case NODE_DREGX_ONCE:	/* regexp expand once */
 		result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
-				    node->nd_cflag);
+				 node->nd_cflag);
 		nd_set_type(node, NODE_LIT);
 		node->nd_lit = result;
 		break;
 	      case NODE_DXSTR:
 		result = rb_funcall(self, '`', 1, str);
 		break;
-	      case NODE_DSYM:
-		result = rb_str_intern(str);
-		break;
 	      default:
 		result = str;
 		break;
@@ -3452,33 +2539,34 @@ rb_eval(self, n)
 
       case NODE_ATTRSET:
 	if (ruby_frame->argc != 1)
-	    rb_raise(rb_eArgError, "wrong number of arguments(%d for 1)",
+	    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",
 		     ruby_frame->argc);
 	result = rb_ivar_set(self, node->nd_vid, ruby_frame->argv[0]);
 	break;
 
       case NODE_DEFN:
 	if (node->nd_defn) {
-	    NODE *body,  *defn;
+	    NODE *body;
 	    VALUE origin;
 	    int noex;
 
 	    if (NIL_P(ruby_class)) {
-		rb_raise(rb_eTypeError, "no class/module to add method");
+		rb_raise(rb_eTypeError, "no class to add method");
 	    }
 	    if (ruby_class == rb_cObject && node->nd_mid == init) {
-		rb_warn("redefining Object#initialize may cause infinite loop");
-	    }
-	    if (node->nd_mid == __id__ || node->nd_mid == __send__) {
-		rb_warn("redefining `%s' may cause serious problem",
-			rb_id2name(node->nd_mid));
+		rb_warn("re-defining Object#initialize may cause infinite loop");
 	    }
-	    rb_frozen_class_p(ruby_class);
 	    body = search_method(ruby_class, node->nd_mid, &origin);
-	    if (body){
-		if (RTEST(ruby_verbose) && ruby_class == origin && body->nd_cnt == 0 && body->nd_body) {
-		    rb_warning("method redefined; discarding old %s", rb_id2name(node->nd_mid));
+	    if (body) {
+		if (origin == ruby_class) {
+		    if (safe_level >= 4) {
+			rb_raise(rb_eSecurityError, "re-defining method prohibited");
+		    }
+		    if (RTEST(ruby_verbose)) {
+			rb_warning("discarding old %s", rb_id2name(node->nd_mid));
+		    }
 		}
+		rb_clear_cache_by_id(node->nd_mid);
 	    }
 
 	    if (SCOPE_TEST(SCOPE_PRIVATE) || node->nd_mid == init) {
@@ -3490,15 +2578,24 @@ rb_eval(self, n)
 	    else {
 		noex = NOEX_PUBLIC;
 	    }
-	    if (body && origin == ruby_class && body->nd_body == 0) {
-		noex |= NOEX_NOSUPER;
+	    if (body && origin == ruby_class && body->nd_noex & NOEX_UNDEF) {
+		noex |= NOEX_UNDEF;
 	    }
-
-	    defn = copy_node_scope(node->nd_defn, ruby_cref);
-	    rb_add_method(ruby_class, node->nd_mid, defn, noex);
+	    rb_add_method(ruby_class, node->nd_mid, node->nd_defn, noex);
 	    if (scope_vmode == SCOPE_MODFUNC) {
 		rb_add_method(rb_singleton_class(ruby_class),
-			      node->nd_mid, defn, NOEX_PUBLIC);
+			      node->nd_mid, node->nd_defn, NOEX_PUBLIC);
+		rb_funcall(ruby_class, rb_intern("singleton_method_added"),
+			   1, INT2FIX(node->nd_mid));
+	    }
+	    if (FL_TEST(ruby_class, FL_SINGLETON)) {
+		rb_funcall(rb_iv_get(ruby_class, "__attached__"),
+			   rb_intern("singleton_method_added"),
+			   1, INT2FIX(node->nd_mid));
+	    }
+	    else {
+		rb_funcall(ruby_class, rb_intern("method_added"),
+			   1, INT2FIX(node->nd_mid));
 	    }
 	    result = Qnil;
 	}
@@ -3508,41 +2605,71 @@ rb_eval(self, n)
 	if (node->nd_defn) {
 	    VALUE recv = rb_eval(self, node->nd_recv);
 	    VALUE klass;
-	    NODE *body = 0, *defn;
+	    NODE *body = 0;
 
-	    if (ruby_safe_level >= 4 && !OBJ_TAINTED(recv)) {
-		rb_raise(rb_eSecurityError, "Insecure: can't define singleton method");
-	    }
-	    if (FIXNUM_P(recv) || SYMBOL_P(recv)) {
+	    if (rb_special_const_p(recv)) {
 		rb_raise(rb_eTypeError,
-			 "can't define singleton method \"%s\" for %s",
+			 "can't define method \"%s\" for %s",
 			 rb_id2name(node->nd_mid),
-			 rb_obj_classname(recv));
+			 rb_class2name(CLASS_OF(recv)));
 	    }
 
-	    if (OBJ_FROZEN(recv)) rb_error_frozen("object");
+	    if (rb_safe_level() >= 4 && !FL_TEST(recv, FL_TAINT)) {
+		rb_raise(rb_eSecurityError, "can't define singleton method");
+	    }
 	    klass = rb_singleton_class(recv);
-	    if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, (st_data_t *)&body)) {
-		if (ruby_safe_level >= 4) {
-		    rb_raise(rb_eSecurityError, "redefining method prohibited");
+	    if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, &body)) {
+		if (safe_level >= 4) {
+		    rb_raise(rb_eSecurityError, "re-defining method prohibited");
 		}
 		if (RTEST(ruby_verbose)) {
 		    rb_warning("redefine %s", rb_id2name(node->nd_mid));
 		}
 	    }
-	    defn = copy_node_scope(node->nd_defn, ruby_cref);
-	    rb_add_method(klass, node->nd_mid, defn,
+	    rb_clear_cache_by_id(node->nd_mid);
+	    rb_add_method(klass, node->nd_mid, node->nd_defn, 
 			  NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0));
+	    rb_funcall(recv, rb_intern("singleton_method_added"),
+		       1, INT2FIX(node->nd_mid));
 	    result = Qnil;
 	}
 	break;
 
       case NODE_UNDEF:
-	if (NIL_P(ruby_class)) {
-	    rb_raise(rb_eTypeError, "no class to undef method");
+	{
+	    VALUE origin;
+	    NODE *body;
+
+	    if (NIL_P(ruby_class)) {
+		rb_raise(rb_eTypeError, "no class to undef method");
+	    }
+	    if (ruby_class == rb_cObject) {
+		rb_secure(4);
+	    }
+	    body = search_method(ruby_class, node->nd_mid, &origin);
+	    if (!body || !body->nd_body) {
+		char *s0 = " class";
+		VALUE klass = ruby_class;
+
+		if (FL_TEST(ruby_class, FL_SINGLETON)) {
+		    VALUE obj = rb_iv_get(ruby_class, "__attached__");
+		    switch (TYPE(obj)) {
+		      case T_MODULE:
+		      case T_CLASS:
+			klass = obj;
+			s0 = "";
+		    }
+		}
+		else if (TYPE(klass) == T_MODULE) {
+		    s0 = " module";
+		}
+		rb_raise(rb_eNameError, "undefined method `%s' for%s `%s'",
+			 rb_id2name(node->nd_mid),s0,rb_class2name(klass));
+	    }
+	    rb_clear_cache_by_id(node->nd_mid);
+	    rb_add_method(ruby_class, node->nd_mid, 0, NOEX_PUBLIC);
+	    result = Qnil;
 	}
-	rb_undef(ruby_class, node->nd_mid);
-	result = Qnil;
 	break;
 
       case NODE_ALIAS:
@@ -3550,6 +2677,8 @@ rb_eval(self, n)
 	    rb_raise(rb_eTypeError, "no class to make alias");
 	}
 	rb_alias(ruby_class, node->nd_new, node->nd_old);
+	rb_funcall(ruby_class, rb_intern("method_added"),
+		   1, INT2FIX(node->nd_mid));
 	result = Qnil;
 	break;
 
@@ -3560,10 +2689,9 @@ rb_eval(self, n)
 
       case NODE_CLASS:
 	{
-	    VALUE super, klass, tmp, cbase;
-	    ID cname;
+	    VALUE super, klass, tmp;
 
-	    if (NIL_P(ruby_cbase)) {
+	    if (NIL_P(ruby_class)) {
 		rb_raise(rb_eTypeError, "no outer class/module");
 	    }
 	    if (node->nd_super) {
@@ -3573,72 +2701,88 @@ rb_eval(self, n)
 		super = 0;
 	    }
 
-	    cbase = class_prefix(self, node->nd_cpath);
-	    cname = node->nd_cpath->nd_mid;
-	    if (rb_const_defined_at(cbase, cname)) {
-		klass = rb_const_get_at(cbase, cname);
+	    klass = 0;
+	    if (rb_const_defined_at(ruby_class, node->nd_cname) &&
+		(ruby_class != rb_cObject || !rb_autoload_defined(node->nd_cname))) {
+		klass = rb_const_get_at(ruby_class, node->nd_cname);
+	    }
+	    if (ruby_wrapper && rb_const_defined_at(rb_cObject, node->nd_cname)) {
+		klass = rb_const_get_at(rb_cObject, node->nd_cname);
+	    }
+	    if (klass) {
 		if (TYPE(klass) != T_CLASS) {
 		    rb_raise(rb_eTypeError, "%s is not a class",
-			     rb_id2name(cname));
+			     rb_id2name(node->nd_cname));
 		}
 		if (super) {
-		    tmp = rb_class_real(RCLASS(klass)->super);
+		    tmp = RCLASS(klass)->super;
+		    if (FL_TEST(tmp, FL_SINGLETON)) {
+			tmp = RCLASS(tmp)->super;
+		    }
+		    while (TYPE(tmp) == T_ICLASS) {
+			tmp = RCLASS(tmp)->super;
+		    }
 		    if (tmp != super) {
-			goto override_class;
+			rb_raise(rb_eTypeError, "superclass mismatch for %s",
+				 rb_id2name(node->nd_cname));
 		    }
-		    super = 0;
 		}
-		if (ruby_safe_level >= 4) {
+		if (safe_level >= 4) {
 		    rb_raise(rb_eSecurityError, "extending class prohibited");
 		}
+		rb_clear_cache();
 	    }
 	    else {
-	      override_class:
 		if (!super) super = rb_cObject;
-		klass = rb_define_class_id(cname, super);
-		rb_set_class_path(klass, cbase, rb_id2name(cname));
-		rb_const_set(cbase, cname, klass);
+		klass = rb_define_class_id(node->nd_cname, super);
+		rb_const_set(ruby_class, node->nd_cname, klass);
+		rb_set_class_path(klass,ruby_class,rb_id2name(node->nd_cname));
 	    }
 	    if (ruby_wrapper) {
 		rb_extend_object(klass, ruby_wrapper);
 		rb_include_module(klass, ruby_wrapper);
 	    }
-	    if (super) rb_class_inherited(super, klass);
-	    result = module_setup(klass, node);
+
+	    result = module_setup(klass, node->nd_body);
 	}
 	break;
 
       case NODE_MODULE:
 	{
-	    VALUE module, cbase;
-	    ID cname;
+	    VALUE module;
 
-	    if (NIL_P(ruby_cbase)) {
+	    if (NIL_P(ruby_class)) {
 		rb_raise(rb_eTypeError, "no outer class/module");
 	    }
-	    cbase = class_prefix(self, node->nd_cpath);
-	    cname = node->nd_cpath->nd_mid;
-	    if (rb_const_defined_at(cbase, cname)) {
-		module = rb_const_get_at(cbase, cname);
+	    module = 0;
+	    if (rb_const_defined_at(ruby_class, node->nd_cname) &&
+		(ruby_class != rb_cObject ||
+		 !rb_autoload_defined(node->nd_cname))) {
+		module = rb_const_get_at(ruby_class, node->nd_cname);
+	    }
+	    if (ruby_wrapper && rb_const_defined_at(rb_cObject, node->nd_cname)) {
+		module = rb_const_get_at(rb_cObject, node->nd_cname);
+	    }
+	    if (module) {
 		if (TYPE(module) != T_MODULE) {
 		    rb_raise(rb_eTypeError, "%s is not a module",
-			     rb_id2name(cname));
+			     rb_id2name(node->nd_cname));
 		}
-		if (ruby_safe_level >= 4) {
+		if (safe_level >= 4) {
 		    rb_raise(rb_eSecurityError, "extending module prohibited");
 		}
 	    }
 	    else {
-		module = rb_define_module_id(cname);
-		rb_set_class_path(module, cbase, rb_id2name(cname));
-		rb_const_set(cbase, cname, module);
+		module = rb_define_module_id(node->nd_cname);
+		rb_const_set(ruby_class, node->nd_cname, module);
+		rb_set_class_path(module,ruby_class,rb_id2name(node->nd_cname));
 	    }
 	    if (ruby_wrapper) {
 		rb_extend_object(module, ruby_wrapper);
 		rb_include_module(module, ruby_wrapper);
 	    }
 
-	    result = module_setup(module, node);
+	    result = module_setup(module, node->nd_body);
 	}
 	break;
 
@@ -3646,21 +2790,21 @@ rb_eval(self, n)
 	{
 	    VALUE klass;
 
-	    result = rb_eval(self, node->nd_recv);
-	    if (FIXNUM_P(result) || SYMBOL_P(result)) {
+	    klass = rb_eval(self, node->nd_recv);
+	    if (rb_special_const_p(klass)) {
 		rb_raise(rb_eTypeError, "no virtual class for %s",
-			 rb_obj_classname(result));
+			 rb_class2name(CLASS_OF(klass)));
 	    }
-	    if (ruby_safe_level >= 4 && !OBJ_TAINTED(result))
-		rb_raise(rb_eSecurityError, "Insecure: can't extend object");
-	    klass = rb_singleton_class(result);
-
+	    if (FL_TEST(CLASS_OF(klass), FL_SINGLETON)) {
+		rb_clear_cache();
+	    }
+	    klass = rb_singleton_class(klass);
 	    if (ruby_wrapper) {
 		rb_extend_object(klass, ruby_wrapper);
 		rb_include_module(klass, ruby_wrapper);
 	    }
-
-	    result = module_setup(klass, node);
+	    
+	    result = module_setup(klass, node->nd_body);
 	}
 	break;
 
@@ -3674,11 +2818,12 @@ rb_eval(self, n)
 	}
 	break;
 
-      case NODE_NEWLINE:
+    case NODE_NEWLINE:
+	ruby_sourcefile = node->nd_file;
+	ruby_sourceline = node->nd_nth;
 	if (trace_func) {
-	    call_trace_func("line", node, self,
-			    ruby_frame->last_func,
-			    ruby_frame->last_class);
+	    call_trace_func("line", ruby_sourcefile, ruby_sourceline,
+			    self, ruby_frame->last_func, 0);	
 	}
 	node = node->nd_next;
 	goto again;
@@ -3688,33 +2833,31 @@ rb_eval(self, n)
     }
   finish:
     CHECK_INTS;
-    if (contnode) {
-	node = contnode;
-	contnode = 0;
-	goto again;
-    }
     return result;
 }
 
 static VALUE
-module_setup(module, n)
+module_setup(module, node)
     VALUE module;
-    NODE *n;
+    NODE * volatile node;
 {
-    NODE * volatile node = n->nd_body;
     int state;
-    struct FRAME frame;
-    VALUE result = Qnil;	/* OK */
+    VALUE save = ruby_frame->cbase;
+    VALUE result;		/* OK */
+    char *file = ruby_sourcefile;
+    int line = ruby_sourceline;
     TMP_PROTECT;
 
-    frame = *ruby_frame;
-    frame.tmp = ruby_frame;
-    ruby_frame = &frame;
+    /* fill c-ref */
+    node->nd_clss = module;
+    node = node->nd_body;
 
-    PUSH_CLASS(module);
+    PUSH_CLASS();
+    ruby_class = module;
     PUSH_SCOPE();
     PUSH_VARS();
 
+    if (node->nd_rval) ruby_frame->cbase = node->nd_rval;
     if (node->nd_tbl) {
 	VALUE *vars = TMP_ALLOC(node->nd_tbl[0]+1);
 	*vars++ = (VALUE)node;
@@ -3727,23 +2870,22 @@ module_setup(module, n)
 	ruby_scope->local_tbl  = 0;
     }
 
-    PUSH_CREF(module);
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
 	if (trace_func) {
-	    call_trace_func("class", n, ruby_cbase, ruby_frame->last_func, ruby_frame->last_class);
+	    call_trace_func("class", file, line,
+			    ruby_class, ruby_frame->last_func, 0);
 	}
-	result = rb_eval(ruby_cbase, node->nd_next);
+	result = rb_eval(ruby_class, node->nd_next);
     }
     POP_TAG();
-    POP_CREF();
     POP_VARS();
     POP_SCOPE();
     POP_CLASS();
 
-    ruby_frame = frame.tmp;
+    ruby_frame->cbase = save;
     if (trace_func) {
-	call_trace_func("end", n, 0, ruby_frame->last_func, ruby_frame->last_class);
+	call_trace_func("end", file, line, 0, ruby_frame->last_func, 0);
     }
     if (state) JUMP_TAG(state);
 
@@ -3782,82 +2924,30 @@ static VALUE
 rb_mod_method_defined(mod, mid)
     VALUE mod, mid;
 {
-    return rb_method_boundp(mod, rb_to_id(mid), 1);
-}
-
-#define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f))
-
-static VALUE
-rb_mod_public_method_defined(mod, mid)
-    VALUE mod, mid;
-{
-    ID id = rb_to_id(mid);
-    int noex;
-
-    if (rb_get_method_body(&mod, &id, &noex)) {
-	if (VISI_CHECK(noex, NOEX_PUBLIC))
-	    return Qtrue;
-    }
-    return Qfalse;
-}
-
-static VALUE
-rb_mod_private_method_defined(mod, mid)
-    VALUE mod, mid;
-{
-    ID id = rb_to_id(mid);
-    int noex;
-
-    if (rb_get_method_body(&mod, &id, &noex)) {
-	if (VISI_CHECK(noex, NOEX_PRIVATE))
-	    return Qtrue;
-    }
-    return Qfalse;
-}
-
-static VALUE
-rb_mod_protected_method_defined(mod, mid)
-    VALUE mod, mid;
-{
-    ID id = rb_to_id(mid);
-    int noex;
-
-    if (rb_get_method_body(&mod, &id, &noex)) {
-	if (VISI_CHECK(noex, NOEX_PROTECTED))
-	    return Qtrue;
+    if (rb_method_boundp(mod, rb_to_id(mid), 1)) {
+	return Qtrue;
     }
     return Qfalse;
 }
 
-NORETURN(static VALUE terminate_process _((int, const char *, long)));
-static VALUE
-terminate_process(status, mesg, mlen)
-    int status;
-    const char *mesg;
-    long mlen;
-{
-    VALUE args[2];
-    args[0] = INT2NUM(status);
-    args[1] = rb_str_new(mesg, mlen);
-
-    rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
-}
-
 void
 rb_exit(status)
     int status;
 {
     if (prot_tag) {
-	terminate_process(status, "exit", 4);
+	exit_status = status;
+	rb_exc_raise(rb_exc_new(rb_eSystemExit, 0, 0));
     }
-    ruby_finalize();
+    rb_exec_end_proc();
+    rb_gc_call_finalizer_at_exit();
     exit(status);
 }
 
-VALUE
-rb_f_exit(argc, argv)
+static VALUE
+rb_f_exit(argc, argv, obj)
     int argc;
     VALUE *argv;
+    VALUE obj;
 {
     VALUE status;
     int istatus;
@@ -3867,42 +2957,36 @@ rb_f_exit(argc, argv)
 	istatus = NUM2INT(status);
     }
     else {
-	istatus = EXIT_SUCCESS;
+	istatus = 0;
     }
     rb_exit(istatus);
     return Qnil;		/* not reached */
 }
 
-VALUE
-rb_f_abort(argc, argv)
-    int argc;
-    VALUE *argv;
+static void
+rb_abort()
 {
-    rb_secure(4);
-    if (argc == 0) {
-	if (!NIL_P(ruby_errinfo)) {
-	    error_print();
-	}
-	rb_exit(EXIT_FAILURE);
+    if (ruby_errinfo) {
+	error_print();
     }
-    else {
-	VALUE mesg;
+    rb_exit(1);
+}
 
-	rb_scan_args(argc, argv, "1", &mesg);
-	StringValue(argv[0]);
-	rb_io_puts(argc, argv, rb_stderr);
-	terminate_process(1, RSTRING(argv[0])->ptr, RSTRING(argv[0])->len);
-    }
+static VALUE
+rb_f_abort()
+{
+    rb_secure(4);
+    rb_abort();
     return Qnil;		/* not reached */
 }
 
 void
 rb_iter_break()
 {
-    localjump_destination(TAG_BREAK, Qnil);
+    JUMP_TAG(TAG_BREAK);
 }
 
-NORETURN(static void rb_longjmp _((int, VALUE)));
+static void rb_longjmp _((int, VALUE)) NORETURN;
 static VALUE make_backtrace _((void));
 
 static void
@@ -3912,16 +2996,11 @@ rb_longjmp(tag, mesg)
 {
     VALUE at;
 
-    if (thread_set_raised()) {
-	ruby_errinfo = exception_error;
-	JUMP_TAG(TAG_FATAL);
-    }
     if (NIL_P(mesg)) mesg = ruby_errinfo;
     if (NIL_P(mesg)) {
 	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
     }
 
-    ruby_set_current_source();
     if (ruby_sourcefile && !NIL_P(mesg)) {
 	at = get_backtrace(mesg);
 	if (NIL_P(at)) {
@@ -3935,38 +3014,19 @@ rb_longjmp(tag, mesg)
 
     if (RTEST(ruby_debug) && !NIL_P(ruby_errinfo)
 	&& !rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	VALUE e = ruby_errinfo;
-	int status;
-
-	PUSH_TAG(PROT_NONE);
-	if ((status = EXEC_TAG()) == 0) {
-	    StringValue(e);
-	    warn_printf("Exception `%s' at %s:%d - %s\n",
-			rb_obj_classname(ruby_errinfo),
-			ruby_sourcefile, ruby_sourceline,
-			RSTRING(e)->ptr);
-	}
-	POP_TAG();
-	if (status == TAG_FATAL && ruby_errinfo == exception_error) {
-	    ruby_errinfo = mesg;
-	}
-	else if (status) {
-	    thread_reset_raised();
-	    JUMP_TAG(status);
-	}
+	fprintf(stderr, "Exception `%s' at %s:%d\n",
+		rb_class2name(CLASS_OF(ruby_errinfo)),
+		ruby_sourcefile, ruby_sourceline);
     }
 
     rb_trap_restore_mask();
     if (trace_func && tag != TAG_FATAL) {
-	call_trace_func("raise", ruby_current_node,
-			ruby_frame->self,
-			ruby_frame->last_func,
-			ruby_frame->last_class);
+	call_trace_func("raise", ruby_sourcefile, ruby_sourceline,
+			ruby_frame->self, ruby_frame->last_func, 0);
     }
     if (!prot_tag) {
 	error_print();
     }
-    thread_reset_raised();
     JUMP_TAG(tag);
 }
 
@@ -3996,8 +3056,6 @@ rb_f_raise(argc, argv)
     VALUE *argv;
 {
     VALUE mesg;
-    ID exception;
-    int n;
 
     mesg = Qnil;
     switch (argc) {
@@ -4010,36 +3068,26 @@ rb_f_raise(argc, argv)
 	    mesg = rb_exc_new3(rb_eRuntimeError, argv[0]);
 	    break;
 	}
-	n = 0;
-	goto exception_call;
-
-      case 2:
+	mesg = rb_funcall(argv[0], rb_intern("exception"), 0, 0);
+	break;
       case 3:
-	n = 1;
-      exception_call:
-	exception = rb_intern("exception");
-	if (!rb_respond_to(argv[0], exception)) {
-	    rb_raise(rb_eTypeError, "exception class/object expected");
-	}
-	mesg = rb_funcall(argv[0], exception, n, argv[1]);
+      case 2:
+	mesg = rb_funcall(argv[0], rb_intern("exception"), 1, argv[1]);
 	break;
       default:
-	rb_raise(rb_eArgError, "wrong number of arguments");
+	rb_raise(rb_eArgError, "wrong # of arguments");
 	break;
     }
-    if (argc > 0) {
+    if (!NIL_P(mesg)) {
 	if (!rb_obj_is_kind_of(mesg, rb_eException))
 	    rb_raise(rb_eTypeError, "exception object expected");
 	set_backtrace(mesg, (argc>2)?argv[2]:Qnil);
     }
 
-    if (ruby_frame != top_frame) {
-	PUSH_FRAME();		/* fake frame */
-	*ruby_frame = *_frame.prev->prev;
-	rb_longjmp(TAG_RAISE, mesg);
-	POP_FRAME();
-    }
+    PUSH_FRAME();		/* fake frame */
+    *ruby_frame = *_frame.prev->prev;
     rb_longjmp(TAG_RAISE, mesg);
+    POP_FRAME();
 
     return Qnil;		/* not reached */
 }
@@ -4052,177 +3100,74 @@ rb_jump_tag(tag)
 }
 
 int
-rb_block_given_p()
-{
-    if (ruby_frame->iter == ITER_CUR && ruby_block)
-	return Qtrue;
-    return Qfalse;
-}
-
-int
 rb_iterator_p()
 {
-    return rb_block_given_p();
+    if (ruby_frame->iter) return Qtrue;
+    return Qfalse;
 }
 
 static VALUE
-rb_f_block_given_p()
+rb_f_iterator_p()
 {
-    if (ruby_frame->prev && ruby_frame->prev->iter == ITER_CUR && ruby_block)
-	return Qtrue;
+    if (ruby_frame->prev && ruby_frame->prev->iter) return Qtrue;
     return Qfalse;
 }
 
-static VALUE rb_eThreadError;
-
-static void
-localjump_destination(state, retval)
-    int state;
-    VALUE retval;
-{
-    struct tag *tt = prot_tag;
-    VALUE tag = (state == TAG_BREAK) ? PROT_ITER : PROT_FUNC;
-
-    if (retval == Qundef) retval = Qnil;
-    while (tt) {
-	if (tt->tag == PROT_PCALL || (tt->tag == PROT_THREAD && state == TAG_BREAK) ||
-	    (tt->tag == PROT_CALL || tt->tag == tag) && tt->frame->uniq == ruby_frame->uniq) {
-	    tt->dst = (VALUE)ruby_frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(state);
-	}
-	if (tt->tag == PROT_FUNC && tt->frame->uniq == ruby_frame->uniq) break;
-	if (tt->tag == PROT_THREAD) {
-	    rb_raise(rb_eThreadError, "return jump can't across threads");
-	}
-	tt = tt->prev;
-    }
-    jump_tag_but_local_jump(state);
-}
-
 static VALUE
-rb_yield_0(val, self, klass, flags, avalue)
+rb_yield_0(val, self, klass)
     VALUE val, self, klass;	/* OK */
-    int flags, avalue;
 {
     NODE *node;
     volatile VALUE result = Qnil;
-    volatile VALUE old_cref;
-    volatile VALUE old_wrapper;
-    struct BLOCK * volatile block;
-    struct SCOPE * volatile old_scope;
-    int old_vmode;
+    struct BLOCK *block;
+    struct SCOPE *old_scope;
     struct FRAME frame;
-    NODE *cnode = ruby_current_node;
     int state;
+    static unsigned serial = 1;
 
-    if (!rb_block_given_p()) {
-	localjump_error("no block given", Qnil, 0);
+    if (!ruby_frame->iter || !ruby_block) {
+	rb_raise(rb_eLocalJumpError, "yield called out of iterator");
     }
 
     PUSH_VARS();
+    PUSH_CLASS();
     block = ruby_block;
     frame = block->frame;
     frame.prev = ruby_frame;
     ruby_frame = &(frame);
-    old_cref = (VALUE)ruby_cref;
-    ruby_cref = block->cref;
-    old_wrapper = ruby_wrapper;
-    ruby_wrapper = block->wrapper;
     old_scope = ruby_scope;
     ruby_scope = block->scope;
-    old_vmode = scope_vmode;
-    scope_vmode = (flags & YIELD_PUBLIC_DEF) ? SCOPE_PUBLIC : block->vmode;
     ruby_block = block->prev;
-    if (block->flags & BLOCK_D_SCOPE) {
+    if (block->d_scope) {
 	/* put place holder for dynamic (in-block) local variables */
-	ruby_dyna_vars = new_dvar(0, 0, block->dyna_vars);
+	ruby_dyna_vars = new_dvar(0, 0, block->d_vars);
     }
     else {
 	/* FOR does not introduce new scope */
-	ruby_dyna_vars = block->dyna_vars;
-    }
-    PUSH_CLASS(klass ? klass : block->klass);
-    if (!klass) {
-	self = block->self;
+	ruby_dyna_vars = block->d_vars;
     }
+    ruby_class = klass?klass:block->klass;
+    if (!self) self = block->self;
     node = block->body;
-
     if (block->var) {
 	PUSH_TAG(PROT_NONE);
 	if ((state = EXEC_TAG()) == 0) {
-	    if (block->var == (NODE*)1) { /* no parameter || */
-		if ((flags & YIELD_PROC_CALL) && RARRAY(val)->len != 0) {
-		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
-			     RARRAY(val)->len);
-		}
-	    }
-	    else if (block->var == (NODE*)2) {
-		if (TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
-		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
-			     RARRAY(val)->len);
-		}
-	    }
-	    else if (nd_type(block->var) == NODE_MASGN) {
-		if (!avalue) {
-		    val = svalue_to_mrhs(val, block->var->nd_head);
-		}
-		massign(self, block->var, val, flags&YIELD_PROC_CALL);
-	    }
-	    else {
-		int len = 0;
-		if (avalue) {
-		    len = RARRAY(val)->len;
-		    if (len == 0) {
-			goto zero_arg;
-		    }
-		    if (len == 1) {
-			val = RARRAY(val)->ptr[0];
-		    }
-		    else {
-			goto multi_values;
-		    }
-		}
-		else if (val == Qundef) {
-		  zero_arg:
-		    val = Qnil;
-		  multi_values:
-		    {
-			ruby_current_node = block->var;
-			rb_warn("multiple values for a block parameter (%d for 1)\n\tfrom %s:%d",
-				len, cnode->nd_file, nd_line(cnode));
-			ruby_current_node = cnode;
-		    }
-		}
-		assign(self, block->var, val, flags&YIELD_PROC_CALL);
-	    }
+	    if (nd_type(block->var) == NODE_MASGN)
+		massign(self, block->var, val, 1);
+	    else
+		assign(self, block->var, val, 1);
 	}
 	POP_TAG();
 	if (state) goto pop_state;
     }
-    if (!node) {
-	state = 0;
-	goto pop_state;
-    }
-    ruby_current_node = node;
-
     PUSH_ITER(block->iter);
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
       redo:
-	if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
-	    if (node->nd_state == YIELD_FUNC_AVALUE) {
-		if (!avalue) {
-		    val = svalue_to_avalue(val);
-		}
-	    }
-	    else {
-		if (avalue) {
-		    val = avalue_to_svalue(val);
-		}
-		if (val == Qundef && node->nd_state != YIELD_FUNC_SVALUE)
-		    val = Qnil;
-	    }
+	if (!node) {
+	    result = Qnil;
+	}
+	else if (nd_type(node) == NODE_CFUNC) {
 	    result = (*node->nd_cfnc)(val, node->nd_tval, self);
 	}
 	else {
@@ -4233,45 +3178,32 @@ rb_yield_0(val, self, klass, flags, avalue)
 	switch (state) {
 	  case TAG_REDO:
 	    state = 0;
-	    CHECK_INTS;
 	    goto redo;
 	  case TAG_NEXT:
 	    state = 0;
-	    result = prot_tag->retval;
+	    result = Qnil;
+	    break;
+	  case TAG_BREAK:
+	  case TAG_RETURN:
+	    state |= (serial++ << 8);
+	    state |= 0x10;
+	    block->tag->dst = state; 
 	    break;
 	  default:
 	    break;
 	}
     }
     POP_TAG();
-    POP_ITER();
   pop_state:
+    POP_ITER();
     POP_CLASS();
-    if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) &&
-	!FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE)) {
-	struct RVarmap *vars = ruby_dyna_vars;
-
-	if (ruby_dyna_vars->id == 0) {
-	    vars = ruby_dyna_vars->next;
-	    rb_gc_force_recycle((VALUE)ruby_dyna_vars);
-	    while (vars && vars->id != 0 && vars != block->dyna_vars) {
-		struct RVarmap *tmp = vars->next;
-		rb_gc_force_recycle((VALUE)vars);
-		vars = tmp;
-	    }
-	}
-    }
     POP_VARS();
     ruby_block = block;
     ruby_frame = ruby_frame->prev;
-    ruby_cref = (NODE*)old_cref;
-    ruby_wrapper = old_wrapper;
-    if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
-       scope_dup(old_scope);
+    if (FL_TEST(ruby_scope, SCOPE_DONT_RECYCLE))
+	FL_SET(old_scope, SCOPE_DONT_RECYCLE);
     ruby_scope = old_scope;
-    scope_vmode = old_vmode;
     if (state) JUMP_TAG(state);
-    ruby_current_node = cnode;
     return result;
 }
 
@@ -4279,95 +3211,58 @@ VALUE
 rb_yield(val)
     VALUE val;
 {
-    return rb_yield_0(val, 0, 0, Qfalse, Qfalse);
-}
-
-VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_yield_values(int n, ...)
-#else
-rb_yield_values(n, va_alist)
-    int n;
-    va_dcl
-#endif
-{
-    va_list args;
-    VALUE ary;
-
-    if (n == 0) {
-	return rb_yield_0(Qundef, 0, 0, Qfalse, Qfalse);
-    }
-    ary = rb_ary_new2(n);
-    va_init_list(args, n);
-    while (n--) {
-	rb_ary_push(ary, va_arg(args, VALUE));
-    }
-    va_end(args);
-    return rb_yield_0(ary, 0, 0, Qfalse, Qtrue);
-}
-
-VALUE
-rb_yield_splat(values)
-    VALUE values;
-{
-    int avalue = Qfalse;
-
-    if (TYPE(values) == T_ARRAY) {
-	if (RARRAY(values)->len == 0) {
-	    values = Qundef;
-	}
-	else {
-	    avalue = Qtrue;
-	}
-    }
-    return rb_yield_0(values, 0, 0, Qfalse, avalue);
+    return rb_yield_0(val, 0, 0);
 }
 
 static VALUE
 rb_f_loop()
 {
-    for (;;) {
-	rb_yield_0(Qundef, 0, 0, Qfalse, Qfalse);
-	CHECK_INTS;
-    }
-    return Qnil;		/* dummy */
+    for (;;) { rb_yield_0(Qnil, 0, 0); }
 }
 
 static VALUE
-massign(self, node, val, pcall)
+massign(self, node, val, check)
     VALUE self;
     NODE *node;
     VALUE val;
-    int pcall;
+    int check;
 {
     NODE *list;
-    long i = 0, len;
+    int i = 0, len;
 
-    len = RARRAY(val)->len;
     list = node->nd_head;
-    for (; list && i<len; i++) {
-	assign(self, list->nd_head, RARRAY(val)->ptr[i], pcall);
-	list = list->nd_next;
-    }
-    if (pcall && list) goto arg_error;
-    if (node->nd_args) {
-	if (node->nd_args == (NODE*)-1) {
-	    /* no check for mere `*' */
+
+    if (val) {
+	if (TYPE(val) != T_ARRAY) {
+	    val = rb_Array(val);
 	}
-	else if (!list && i<len) {
-	    assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), pcall);
+	len = RARRAY(val)->len;
+	for (i=0; list && i<len; i++) {
+	    assign(self, list->nd_head, RARRAY(val)->ptr[i], check);
+	    list = list->nd_next;
 	}
-	else {
-	    assign(self, node->nd_args, rb_ary_new2(0), pcall);
+	if (check && list) goto arg_error;
+	if (node->nd_args) {
+	    if (node->nd_args == (NODE*)-1) {
+		/* ignore rest args */
+	    }
+	    else if (!list && i<len) {
+		assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), check);
+	    }
+	    else {
+		assign(self, node->nd_args, rb_ary_new2(0), check);
+	    }
 	}
+	else if (check && i<len) goto arg_error;
     }
-    else if (pcall && i < len) {
-	goto arg_error;
+    else if (node->nd_args && node->nd_args != (NODE*)-1) {
+	assign(self, node->nd_args, Qnil, check);
     }
 
+    if (check && list) goto arg_error;
     while (list) {
 	i++;
-	assign(self, list->nd_head, Qnil, pcall);
+	assign(self, list->nd_head, Qnil, check);
 	list = list->nd_next;
     }
     return val;
@@ -4377,21 +3272,16 @@ massign(self, node, val, pcall)
 	i++;
 	list = list->nd_next;
     }
-    rb_raise(rb_eArgError, "wrong number of arguments (%ld for %ld)", len, i);
+    rb_raise(rb_eArgError, "wrong # of arguments (%d for %d)", len, i);
 }
 
 static void
-assign(self, lhs, val, pcall)
+assign(self, lhs, val, check)
     VALUE self;
     NODE *lhs;
     VALUE val;
-    int pcall;
+    int check;
 {
-    ruby_current_node = lhs;
-    if (val == Qundef) {
-	rb_warning("assigning void value");
-	val = Qnil;
-    }
     switch (nd_type(lhs)) {
       case NODE_GASGN:
 	rb_gvar_set(lhs->nd_entry, val);
@@ -4403,60 +3293,33 @@ assign(self, lhs, val, pcall)
 
       case NODE_LASGN:
 	if (ruby_scope->local_vars == 0)
-	    rb_bug("unexpected local variable assignment");
+	    rb_bug("unexpected iterator variable assignment");
 	ruby_scope->local_vars[lhs->nd_cnt] = val;
 	break;
 
       case NODE_DASGN:
-	dvar_asgn(lhs->nd_vid, val);
+	rb_dvar_asgn(lhs->nd_vid, val);
 	break;
 
-      case NODE_DASGN_CURR:
-	dvar_asgn_curr(lhs->nd_vid, val);
+      case NODE_DASGN_PUSH:
+	dvar_asgn_push(lhs->nd_vid, val);
 	break;
 
-      case NODE_CDECL:
-	if (lhs->nd_vid == 0) {
-	    rb_const_set(class_prefix(self, lhs->nd_else), lhs->nd_else->nd_mid, val);
-	}
-	else {
-	    rb_const_set(ruby_cbase, lhs->nd_vid, val);
-	}
-	break;
-
-      case NODE_CVDECL:
-	if (RTEST(ruby_verbose) && FL_TEST(ruby_cbase, FL_SINGLETON)) {
-	    rb_warn("declaring singleton class variable");
-	}
-	rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qtrue);
-	break;
-
-      case NODE_CVASGN:
-	rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qfalse);
+      case NODE_CASGN:
+	rb_const_set(ruby_class, lhs->nd_vid, val);
 	break;
 
       case NODE_MASGN:
-	massign(self, lhs, svalue_to_mrhs(val, lhs->nd_head), pcall);
+	massign(self, lhs, val, check);
 	break;
 
       case NODE_CALL:
-      case NODE_ATTRASGN:
 	{
 	    VALUE recv;
-	    int scope;
-	    if (lhs->nd_recv == (NODE *)1) {
-		recv = self;
-		scope = 1;
-	    }
-	    else {
-		recv = rb_eval(self, lhs->nd_recv);
-		scope = 0;
-	    }
+	    recv = rb_eval(self, lhs->nd_recv);
 	    if (!lhs->nd_args) {
 		/* attr set */
-		ruby_current_node = lhs;
-		SET_CURRENT_SOURCE();
-		rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, scope);
+		rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, 0);
 	    }
 	    else {
 		/* array set */
@@ -4464,10 +3327,8 @@ assign(self, lhs, val, pcall)
 
 		args = rb_eval(self, lhs->nd_args);
 		rb_ary_push(args, val);
-		ruby_current_node = lhs;
-		SET_CURRENT_SOURCE();
 		rb_call(CLASS_OF(recv), recv, lhs->nd_mid,
-			RARRAY(args)->len, RARRAY(args)->ptr, scope);
+			RARRAY(args)->len, RARRAY(args)->ptr, 0);
 	    }
 	}
 	break;
@@ -4480,30 +3341,28 @@ assign(self, lhs, val, pcall)
 
 VALUE
 rb_iterate(it_proc, data1, bl_proc, data2)
-    VALUE (*it_proc) _((VALUE)), (*bl_proc)(ANYARGS);
+    VALUE (*it_proc)(), (*bl_proc)();
     VALUE data1, data2;
 {
     int state;
     volatile VALUE retval = Qnil;
-    NODE *node = NEW_IFUNC(bl_proc, data2);
+    NODE *node = NEW_CFUNC(bl_proc, data2);
     VALUE self = ruby_top_self;
 
+  iter_retry:
     PUSH_ITER(ITER_PRE);
     PUSH_BLOCK(0, node);
+    PUSH_TAG(PROT_NONE);
 
-    PUSH_TAG(PROT_ITER);
     state = EXEC_TAG();
     if (state == 0) {
-  iter_retry:
 	retval = (*it_proc)(data1);
     }
-    else if (state == TAG_BREAK && TAG_DST()) {
-	retval = prot_tag->retval;
-	state = 0;
-    }
-    else if (state == TAG_RETRY) {
-	state = 0;
-	goto iter_retry;
+    if (ruby_block->tag->dst == state) {
+	state &= TAG_MASK;
+	if (state == TAG_RETURN) {
+	    retval = prot_tag->retval;
+	}
     }
     POP_TAG();
     POP_BLOCK();
@@ -4512,6 +3371,17 @@ rb_iterate(it_proc, data1, bl_proc, data2)
     switch (state) {
       case 0:
 	break;
+
+      case TAG_RETRY:
+	goto iter_retry;
+
+      case TAG_BREAK:
+	retval = Qnil;
+	break;
+
+      case TAG_RETURN:
+	return_value(retval);
+	/* fall through */
       default:
 	JUMP_TAG(state);
     }
@@ -4538,65 +3408,44 @@ handle_rescue(self, node)
 	if (!rb_obj_is_kind_of(argv[0], rb_cModule)) {
 	    rb_raise(rb_eTypeError, "class or module required for rescue clause");
 	}
-	if (RTEST(rb_funcall(*argv, eqq, 1, ruby_errinfo))) return 1;
+	if (rb_obj_is_kind_of(ruby_errinfo, argv[0])) return 1;
 	argv++;
     }
     return 0;
 }
 
 VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2, ...)
-#else
-rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
-    VALUE (*b_proc)(ANYARGS), (*r_proc)(ANYARGS);
+rb_rescue(b_proc, data1, r_proc, data2)
+    VALUE (*b_proc)(), (*r_proc)();
     VALUE data1, data2;
-    va_dcl
-#endif
 {
     int state;
     volatile VALUE result;
     volatile VALUE e_info = ruby_errinfo;
-    va_list args;
 
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
       retry_entry:
 	result = (*b_proc)(data1);
     }
-    else if (state == TAG_RAISE) {
-	int handle = Qfalse;
-	VALUE eclass;
-
-	va_init_list(args, data2);
-	while (eclass = va_arg(args, VALUE)) {
-	    if (rb_obj_is_kind_of(ruby_errinfo, eclass)) {
-		handle = Qtrue;
-		break;
-	    }
-	}
-	va_end(args);
-
-	if (handle) {
-	    if (r_proc) {
-		PUSH_TAG(PROT_NONE);
-		if ((state = EXEC_TAG()) == 0) {
-		    result = (*r_proc)(data2, ruby_errinfo);
-		}
-		POP_TAG();
-		if (state == TAG_RETRY) {
-		    state = 0;
-		    ruby_errinfo = Qnil;
-		    goto retry_entry;
-		}
+    else if (state == TAG_RAISE && rb_obj_is_kind_of(ruby_errinfo, rb_eStandardError)) {
+	if (r_proc) {
+	    PUSH_TAG(PROT_NONE);
+	    if ((state = EXEC_TAG()) == 0) {
+		result = (*r_proc)(data2, ruby_errinfo);
 	    }
-	    else {
-		result = Qnil;
+	    POP_TAG();
+	    if (state == TAG_RETRY) {
 		state = 0;
+		goto retry_entry;
 	    }
-	    if (state == 0) {
-		ruby_errinfo = e_info;
-	    }
+	}
+	else {
+	    result = Qnil;
+	    state = 0;
+	}
+	if (state == 0) {
+	    ruby_errinfo = e_info;
 	}
     }
     POP_TAG();
@@ -4606,20 +3455,12 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
 }
 
 VALUE
-rb_rescue(b_proc, data1, r_proc, data2)
-    VALUE (*b_proc)(), (*r_proc)();
-    VALUE data1, data2;
-{
-    return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0);
-}
-
-VALUE
 rb_protect(proc, data, state)
-    VALUE (*proc) _((VALUE));
+    VALUE (*proc)();
     VALUE data;
     int *state;
 {
-    VALUE result = Qnil;	/* OK */
+    VALUE result;		/* OK */
     int status;
 
     PUSH_TAG(PROT_NONE);
@@ -4640,9 +3481,8 @@ rb_protect(proc, data, state)
 VALUE
 rb_ensure(b_proc, data1, e_proc, data2)
     VALUE (*b_proc)();
-    VALUE data1;
     VALUE (*e_proc)();
-    VALUE data2;
+    VALUE data1, data2;
 {
     int state;
     volatile VALUE result = Qnil;
@@ -4653,175 +3493,133 @@ rb_ensure(b_proc, data1, e_proc, data2)
 	result = (*b_proc)(data1);
     }
     POP_TAG();
-    retval = prot_tag ? prot_tag->retval : Qnil;	/* save retval */
+    retval = prot_tag->retval;	/* save retval */
     (*e_proc)(data2);
-    if (prot_tag) return_value(retval);
-    if (state) JUMP_TAG(state);
-    return result;
-}
-
-VALUE
-rb_with_disable_interrupt(proc, data)
-    VALUE (*proc)();
-    VALUE data;
-{
-    VALUE result = Qnil;	/* OK */
-    int status;
-
-    DEFER_INTS;
-    PUSH_TAG(PROT_NONE);
-    if ((status = EXEC_TAG()) == 0) {
-	result = (*proc)(data);
-    }
-    POP_TAG();
-    ALLOW_INTS;
-    if (status) JUMP_TAG(status);
+    return_value(retval);
 
+    if (state) JUMP_TAG(state);
     return result;
 }
 
-static inline void
-stack_check()
-{
-    static int overflowing = 0;
-
-    if (!overflowing && ruby_stack_check()) {
-	int state;
-	overflowing = 1;
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    rb_exc_raise(sysstack_error);
-	}
-	POP_TAG();
-	overflowing = 0;
-	JUMP_TAG(state);
-    }
-}
-
 static int last_call_status;
 
 #define CSTAT_PRIV  1
 #define CSTAT_PROT  2
 #define CSTAT_VCALL 4
-#define CSTAT_SUPER 8
 
 static VALUE
-rb_method_missing(argc, argv, obj)
+rb_f_missing(argc, argv, obj)
     int argc;
     VALUE *argv;
     VALUE obj;
 {
-    ID id;
-    VALUE exc = rb_eNoMethodError;
+    ID    id;
     volatile VALUE d = 0;
     char *format = 0;
     char *desc = "";
-    NODE *cnode = ruby_current_node;
-    int state;
-
-    if (argc == 0 || !SYMBOL_P(argv[0])) {
-	rb_raise(rb_eArgError, "no id given");
-    }
-
-    stack_check();
-
-    id = SYM2ID(argv[0]);
+    char *file = ruby_sourcefile;
+    int   line = ruby_sourceline;
 
+    id = FIX2INT(argv[0]);
+    argc--; argv++;
 
     switch (TYPE(obj)) {
       case T_NIL:
-	desc = "nil";
+	format = "undefined method `%s' for nil";
 	break;
       case T_TRUE:
-	desc = "true";
+	format = "undefined method `%s' for true";
 	break;
       case T_FALSE:
-	desc = "false";
+	format = "undefined method `%s' for false";
+	break;
+      case T_OBJECT:
+	d = rb_any_to_s(obj);
 	break;
       default:
-	PUSH_TAG(PROT_NONE);
-	if ((state = EXEC_TAG()) == 0) {
-	    d = rb_inspect(obj);
-	}
-	POP_TAG();
-	if (!d || RSTRING(d)->len > 65) {
-	    d = rb_any_to_s(obj);
-	}
+	d = rb_inspect(obj);
 	break;
     }
     if (d) {
-	desc = RSTRING(d)->ptr;
-    }
+	if (last_call_status & CSTAT_PRIV) {
+	    format = "private method `%s' called for %s%s%s";
+	}
+	if (last_call_status & CSTAT_PROT) {
+	    format = "protected method `%s' called for %s%s%s";
+	}
+	else if (last_call_status & CSTAT_VCALL) {
+	    const char *mname = rb_id2name(id);
 
-    if (last_call_status & CSTAT_PRIV) {
-	format = "private method `%s' called for %s%s%s";
-    }
-    else if (last_call_status & CSTAT_PROT) {
-	format = "protected method `%s' called for %s%s%s";
-    }
-    else if (last_call_status & CSTAT_VCALL) {
-	format = "undefined local variable or method `%s' for %s%s%s";
-	exc = rb_eNameError;
-    }
-    else if (last_call_status & CSTAT_SUPER) {
-	format = "super: no superclass method `%s'";
-    }
-    if (!format) {
-	format = "undefined method `%s' for %s%s%s";
+	    if (('a' <= mname[0] && mname[0] <= 'z') || mname[0] == '_') {
+		format = "undefined local variable or method `%s' for %s%s%s";
+	    }
+	}
+	if (!format) {
+	    format = "undefined method `%s' for %s%s%s";
+	}
+	if (RSTRING(d)->len > 65) {
+	    d = rb_any_to_s(obj);
+	}
+	desc = RSTRING(d)->ptr;
     }
 
-    ruby_current_node = cnode;
-    {
-	char buf[BUFSIZ];
-	int noclass = (!desc || desc[0]=='#');
-	int n = 0;
-	VALUE args[3];
+    ruby_sourcefile = file;
+    ruby_sourceline = line;
+    PUSH_FRAME();		/* fake frame */
+    *ruby_frame = *_frame.prev->prev;
 
-	snprintf(buf, BUFSIZ, format, rb_id2name(id),
-		 desc, noclass ? "" : ":",
-		 noclass ? "" : rb_obj_classname(obj));
-	args[n++] = rb_str_new2(buf);
-	args[n++] = argv[0];
-	if (exc == rb_eNoMethodError) {
-	    args[n++] = rb_ary_new4(argc-1, argv+1);
-	}
-	exc = rb_class_new_instance(n, args, exc);
-	ruby_frame = ruby_frame->prev; /* pop frame for "method_missing" */
-	rb_exc_raise(exc);
-    }
+    rb_raise(rb_eNameError, format, rb_id2name(id),
+	     desc, desc[0]=='#'?"":":",
+	     desc[0]=='#'?"":rb_class2name(CLASS_OF(obj)));
+    POP_FRAME();
 
     return Qnil;		/* not reached */
 }
 
 static VALUE
-method_missing(obj, id, argc, argv, call_status)
+rb_undefined(obj, id, argc, argv, call_status)
     VALUE obj;
     ID    id;
     int   argc;
-    const VALUE *argv;
+    VALUE*argv;
     int   call_status;
 {
     VALUE *nargv;
 
-    last_call_status = call_status;
-
-    if (id == missing) {
-	PUSH_FRAME();
-	rb_method_missing(argc, argv, obj);
-	POP_FRAME();
-    }
-    else if (id == ID_ALLOCATOR) {
-	rb_raise(rb_eNoMethodError, "allocator undefined for %s", rb_class2name(obj));
-    }
-
     nargv = ALLOCA_N(VALUE, argc+1);
-    nargv[0] = ID2SYM(id);
+    nargv[0] = INT2FIX(id);
     MEMCPY(nargv+1, argv, VALUE, argc);
 
+    last_call_status = call_status;
+
     return rb_funcall2(obj, missing, argc+1, nargv);
 }
 
-static inline VALUE
+#ifdef DJGPP
+# define STACK_LEVEL_MAX 65535
+#else
+#ifdef __human68k__
+extern int _stacksize;
+# define STACK_LEVEL_MAX (_stacksize - 4096)
+#else
+# define STACK_LEVEL_MAX 655300
+#endif
+#endif
+extern VALUE *rb_gc_stack_start;
+static int
+stack_length()
+{
+    VALUE pos;
+
+#ifdef sparc
+    return rb_gc_stack_start - &pos + 0x80;
+#else
+    return (&pos < rb_gc_stack_start) ? rb_gc_stack_start - &pos
+	                              : &pos - rb_gc_stack_start;
+#endif
+}
+
+static VALUE
 call_cfunc(func, recv, len, argc, argv)
     VALUE (*func)();
     VALUE recv;
@@ -4829,7 +3627,7 @@ call_cfunc(func, recv, len, argc, argv)
     VALUE *argv;
 {
     if (len >= 0 && argc != len) {
-	rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
+	rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)",
 		 argc, len);
     }
 
@@ -4910,10 +3708,9 @@ call_cfunc(func, recv, len, argc, argv)
 }
 
 static VALUE
-rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
+rb_call0(klass, recv, id, argc, argv, body, nosuper)
     VALUE klass, recv;
     ID    id;
-    ID    oid;
     int argc;			/* OK */
     VALUE *argv;		/* OK */
     NODE *body;			/* OK */
@@ -4935,15 +3732,16 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 	break;
     }
 
-    if ((++tick & 0xff) == 0) {
+    if ((++tick & 0x3ff) == 0) {
 	CHECK_INTS;		/* better than nothing */
-	stack_check();
+	if (stack_length() > STACK_LEVEL_MAX) {
+	    rb_raise(rb_eSysStackError, "stack level too deep");
+	}
     }
     PUSH_ITER(itr);
     PUSH_FRAME();
 
     ruby_frame->last_func = id;
-    ruby_frame->orig_func = oid;
     ruby_frame->last_class = nosuper?0:klass;
     ruby_frame->self = recv;
     ruby_frame->argc = argc;
@@ -4960,15 +3758,20 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 	    }
 	    if (trace_func) {
 		int state;
+		char *file = ruby_frame->prev->file;
+		int line = ruby_frame->prev->line;
+		if (!file) {
+		    file = ruby_sourcefile;
+		    line = ruby_sourceline;
+		}
 
-		call_trace_func("c-call", ruby_current_node, recv, id, klass);
+		call_trace_func("c-call", 0, 0, 0, id, 0);
 		PUSH_TAG(PROT_FUNC);
 		if ((state = EXEC_TAG()) == 0) {
 		    result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
 		}
 		POP_TAG();
-		ruby_current_node = ruby_frame->node;
-		call_trace_func("c-return", ruby_current_node, recv, id, klass);
+		call_trace_func("c-return", 0, 0, recv, id, klass);
 		if (state) JUMP_TAG(state);
 	    }
 	    else {
@@ -4977,41 +3780,22 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 	}
 	break;
 
-	/* for attr get/set */
-      case NODE_IVAR:
-	if (argc != 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments(%d for 0)", argc);
-	}
-	result = rb_attr_get(recv, body->nd_vid);
-	break;
-
-      case NODE_ATTRSET:
 	/* for re-scoped/renamed method */
       case NODE_ZSUPER:
+	/* for attr get/set */
+      case NODE_ATTRSET:
+      case NODE_IVAR:
 	result = rb_eval(recv, body);
 	break;
 
-      case NODE_DMETHOD:
-	result = method_call(argc, argv, umethod_bind(body->nd_cval, recv));
-	break;
-
-      case NODE_BMETHOD:
-	result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), recv, klass);
-	break;
-
-      case NODE_SCOPE:
+      default:
 	{
 	    int state;
 	    VALUE *local_vars;	/* OK */
-	    NODE *saved_cref = 0;
 
 	    PUSH_SCOPE();
 
-	    if (body->nd_rval) {
-		saved_cref = ruby_cref;
-		ruby_cref = (NODE*)body->nd_rval;
-	    }
-	    PUSH_CLASS(ruby_cbase);
+	    if (body->nd_rval) ruby_frame->cbase = body->nd_rval;
 	    if (body->nd_tbl) {
 		local_vars = TMP_ALLOC(body->nd_tbl[0]+1);
 		*local_vars++ = (VALUE)body;
@@ -5047,7 +3831,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 
 		    i = node->nd_cnt;
 		    if (i > argc) {
-			rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
+			rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)",
 				 argc, i);
 		    }
 		    if (node->nd_rest == -1) {
@@ -5059,11 +3843,13 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 			    optnode = optnode->nd_next;
 			}
 			if (opt < argc) {
-			    rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
+			    rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)",
 				     argc, opt);
 			}
+#if 1
 			ruby_frame->argc = opt;
 			ruby_frame->argv = local_vars+2;
+#endif
 		    }
 
 		    if (local_vars) {
@@ -5080,62 +3866,61 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 				argv++; argc--;
 				opt = opt->nd_next;
 			    }
-			    if (opt) {
-				rb_eval(recv, opt);
-			    }
+			    rb_eval(recv, opt);
 			}
-			local_vars = ruby_scope->local_vars;
 			if (node->nd_rest >= 0) {
-			    VALUE v;
-
 			    if (argc > 0)
-				v = rb_ary_new4(argc,argv);
+				local_vars[node->nd_rest]=rb_ary_new4(argc,argv);
 			    else
-				v = rb_ary_new2(0);
-			    ruby_scope->local_vars[node->nd_rest] = v;
+				local_vars[node->nd_rest]=rb_ary_new2(0);
 			}
 		    }
 		}
 
 		if (trace_func) {
-		    call_trace_func("call", b2, recv, id, klass);
+		    call_trace_func("call", b2->nd_file, nd_line(b2),
+				    recv, ruby_frame->last_func, 0);
 		}
 		result = rb_eval(recv, body);
 	    }
-	    else if (state == TAG_RETURN && TAG_DST()) {
+	    else if (state == TAG_RETURN) {
 		result = prot_tag->retval;
 		state = 0;
 	    }
 	    POP_TAG();
 	    POP_VARS();
-	    POP_CLASS();
 	    POP_SCOPE();
-	    ruby_cref = saved_cref;
 	    if (trace_func) {
-		call_trace_func("return", ruby_frame->prev->node, recv, id, klass);
+		char *file = ruby_frame->prev->file;
+		int line = ruby_frame->prev->line;
+		if (!file) {
+		    file = ruby_sourcefile;
+		    line = ruby_sourceline;
+		}
+		call_trace_func("return", file, line, recv,
+				ruby_frame->last_func, klass);
 	    }
 	    switch (state) {
 	      case 0:
 		break;
 
+	      case TAG_NEXT:
+		rb_raise(rb_eLocalJumpError, "unexpected next");
+		break;
 	      case TAG_BREAK:
-	      case TAG_RETURN:
-		JUMP_TAG(state);
+		rb_raise(rb_eLocalJumpError, "unexpected break");
+		break;
+	      case TAG_REDO:
+		rb_raise(rb_eLocalJumpError, "unexpected redo");
 		break;
-
 	      case TAG_RETRY:
-		if (rb_block_given_p()) JUMP_TAG(state);
-		/* fall through */
+		if (!rb_iterator_p()) {
+		    rb_raise(rb_eLocalJumpError, "retry outside of rescue clause");
+		}
 	      default:
-		jump_tag_but_local_jump(state);
-		break;
+		JUMP_TAG(state);
 	    }
 	}
-	break;
-
-      default:
-	rb_bug("unknown node type %d", nd_type(body));
-	break;
     }
     POP_FRAME();
     POP_ITER();
@@ -5147,7 +3932,7 @@ rb_call(klass, recv, mid, argc, argv, scope)
     VALUE klass, recv;
     ID    mid;
     int argc;			/* OK */
-    const VALUE *argv;		/* OK */
+    VALUE *argv;		/* OK */
     int scope;
 {
     NODE  *body;		/* OK */
@@ -5155,15 +3940,9 @@ rb_call(klass, recv, mid, argc, argv, scope)
     ID     id = mid;
     struct cache_entry *ent;
 
-    if (!klass) {
-	rb_raise(rb_eNotImpError, "method `%s' called on terminated object (0x%lx)",
-		 rb_id2name(mid), recv);
-    }
     /* is it in the method cache? */
     ent = cache + EXPR1(klass, mid);
     if (ent->mid == mid && ent->klass == klass) {
-	if (!ent->method)
-	    return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
 	klass = ent->origin;
 	id    = ent->mid0;
 	noex  = ent->noex;
@@ -5171,29 +3950,28 @@ rb_call(klass, recv, mid, argc, argv, scope)
     }
     else if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
 	if (scope == 3) {
-	    return method_missing(recv, mid, argc, argv, CSTAT_SUPER);
+	    rb_raise(rb_eNameError, "super: no superclass method `%s'",
+		     rb_id2name(mid));
 	}
-	return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+	return rb_undefined(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
     }
 
     if (mid != missing) {
 	/* receiver specified form for private method */
 	if ((noex & NOEX_PRIVATE) && scope == 0)
-	    return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
+	    return rb_undefined(recv, mid, argc, argv, CSTAT_PRIV);
 
-	/* self must be kind of a specified form for protected method */
+	/* self must be kind of a specified form for private method */
 	if ((noex & NOEX_PROTECTED)) {
 	    VALUE defined_class = klass;
-
-	    if (TYPE(defined_class) == T_ICLASS) {
+	    while (TYPE(defined_class) == T_ICLASS)
 		defined_class = RBASIC(defined_class)->klass;
-	    }
-	    if (!rb_obj_is_kind_of(ruby_frame->self, rb_class_real(defined_class)))
-		return method_missing(recv, mid, argc, argv, CSTAT_PROT);
+	    if (!rb_obj_is_kind_of(ruby_frame->self, defined_class))
+		return rb_undefined(recv, mid, argc, argv, CSTAT_PROT);
 	}
     }
 
-    return rb_call0(klass, recv, mid, id, argc, argv, body, noex & NOEX_NOSUPER);
+    return rb_call0(klass, recv, id, argc, argv, body, noex & NOEX_UNDEF);
 }
 
 VALUE
@@ -5205,7 +3983,7 @@ rb_apply(recv, mid, args)
     int argc;
     VALUE *argv;
 
-    argc = RARRAY(args)->len; /* Assigns LONG, but argc is INT */
+    argc = RARRAY(args)->len;
     argv = ALLOCA_N(VALUE, argc);
     MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);
     return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1);
@@ -5222,13 +4000,22 @@ rb_f_send(argc, argv, recv)
     if (argc == 0) rb_raise(rb_eArgError, "no method name given");
 
     vid = *argv++; argc--;
-    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    PUSH_ITER(rb_iterator_p()?ITER_PRE:ITER_NOT);
     vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1);
     POP_ITER();
 
     return vid;
 }
 
+
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+
 VALUE
 #ifdef HAVE_STDARG_PROTOTYPES
 rb_funcall(VALUE recv, ID mid, int n, ...)
@@ -5244,7 +4031,7 @@ rb_funcall(recv, mid, n, va_alist)
     VALUE *argv;
 
     if (n > 0) {
-	long i;
+	int i;
 
 	argv = ALLOCA_N(VALUE, n);
 
@@ -5266,57 +4053,11 @@ rb_funcall2(recv, mid, argc, argv)
     VALUE recv;
     ID mid;
     int argc;
-    const VALUE *argv;
+    VALUE *argv;
 {
     return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1);
 }
 
-VALUE
-rb_funcall3(recv, mid, argc, argv)
-    VALUE recv;
-    ID mid;
-    int argc;
-    const VALUE *argv;
-{
-    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0);
-}
-
-VALUE
-rb_call_super(argc, argv)
-    int argc;
-    const VALUE *argv;
-{
-    VALUE result, self, klass, k;
-
-    if (ruby_frame->last_class == 0) {
-	rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
-		      rb_id2name(ruby_frame->last_func));
-    }
-
-    self = ruby_frame->self;
-    klass = ruby_frame->last_class;
-    if (BUILTIN_TYPE(klass) == T_MODULE) {
-	k = search_iclass(self, klass);
-	if (!k) {
-	    rb_raise(rb_eTypeError, "%s is not included in %s",
-		     rb_class2name(klass),
-		     rb_class2name(CLASS_OF(self)));
-	}
-	if (RCLASS(k)->super == 0) {
-	    rb_name_error(ruby_frame->last_func,
-			  "super: no superclass method `%s'",
-			  rb_id2name(ruby_frame->last_func));
-	}
-	klass = k;
-    }
-
-    PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
-    result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3);
-    POP_ITER();
-
-    return result;
-}
-
 static VALUE
 backtrace(lev)
     int lev;
@@ -5324,22 +4065,14 @@ backtrace(lev)
     struct FRAME *frame = ruby_frame;
     char buf[BUFSIZ];
     VALUE ary;
-    NODE *n;
 
     ary = rb_ary_new();
-    if (frame->last_func == ID_ALLOCATOR) {
-	frame = frame->prev;
-    }
     if (lev < 0) {
-	ruby_set_current_source();
 	if (frame->last_func) {
 	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
 		     ruby_sourcefile, ruby_sourceline,
 		     rb_id2name(frame->last_func));
 	}
-	else if (ruby_sourceline == 0) {
-	    snprintf(buf, BUFSIZ, "%s", ruby_sourcefile);
-	}
 	else {
 	    snprintf(buf, BUFSIZ, "%s:%d", ruby_sourcefile, ruby_sourceline);
 	}
@@ -5354,14 +4087,14 @@ backtrace(lev)
 	    }
 	}
     }
-    while (frame && (n = frame->node)) {
+    while (frame && frame->file) {
 	if (frame->prev && frame->prev->last_func) {
 	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
-		     n->nd_file, nd_line(n),
+		     frame->file, frame->line,
 		     rb_id2name(frame->prev->last_func));
 	}
 	else {
-	    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
+	    snprintf(buf, BUFSIZ, "%s:%d", frame->file, frame->line);
 	}
 	rb_ary_push(ary, rb_str_new2(buf));
 	frame = frame->prev;
@@ -5390,9 +4123,10 @@ rb_f_caller(argc, argv)
 void
 rb_backtrace()
 {
-    long i;
+    int i, lev;
     VALUE ary;
 
+    lev = INT2FIX(0);
     ary = backtrace(-1);
     for (i=0; i<RARRAY(ary)->len; i++) {
 	printf("\tfrom %s\n", RSTRING(RARRAY(ary)->ptr[i])->ptr);
@@ -5402,6 +4136,9 @@ rb_backtrace()
 static VALUE
 make_backtrace()
 {
+    VALUE lev;
+
+    lev = INT2FIX(0);
     return backtrace(-1);
 }
 
@@ -5418,14 +4155,9 @@ compile(src, file, line)
     int line;
 {
     NODE *node;
-    int critical;
 
-    ruby_nerrs = 0;
-    StringValue(src);
-    critical = rb_thread_critical;
-    rb_thread_critical = Qtrue;
+    Check_Type(src, T_STRING);
     node = rb_compile_string(file, src, line);
-    rb_thread_critical = critical;
 
     if (ruby_nerrs == 0) return node;
     return 0;
@@ -5437,47 +4169,42 @@ eval(self, src, scope, file, line)
     char *file;
     int line;
 {
-    struct BLOCK *data = NULL;
+    struct BLOCK *data;
     volatile VALUE result = Qnil;
     struct SCOPE * volatile old_scope;
     struct BLOCK * volatile old_block;
-    struct RVarmap * volatile old_dyna_vars;
-    VALUE volatile old_cref;
+    struct RVarmap * volatile old_d_vars;
     int volatile old_vmode;
-    volatile VALUE old_wrapper;
     struct FRAME frame;
-    NODE *nodesave = ruby_current_node;
+    char *filesave = ruby_sourcefile;
+    int linesave = ruby_sourceline;
     volatile int iter = ruby_frame->iter;
     int state;
 
+    if (file == 0) {
+	file = ruby_sourcefile;
+	line = ruby_sourceline;
+    }
     if (!NIL_P(scope)) {
-	if (!rb_obj_is_proc(scope)) {
+	if (!rb_obj_is_block(scope)) {
 	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Binding)",
-		     rb_obj_classname(scope));
+		     rb_class2name(CLASS_OF(scope)));
 	}
 
 	Data_Get_Struct(scope, struct BLOCK, data);
+
 	/* PUSH BLOCK from data */
 	frame = data->frame;
-	frame.tmp = ruby_frame;	/* gc protection */
+	frame.prev = ruby_frame;
 	ruby_frame = &(frame);
 	old_scope = ruby_scope;
 	ruby_scope = data->scope;
 	old_block = ruby_block;
 	ruby_block = data->prev;
-	old_dyna_vars = ruby_dyna_vars;
-	ruby_dyna_vars = data->dyna_vars;
+	old_d_vars = ruby_dyna_vars;
+	ruby_dyna_vars = data->d_vars;
 	old_vmode = scope_vmode;
 	scope_vmode = data->vmode;
-	old_cref = (VALUE)ruby_cref;
-	ruby_cref = data->cref;
-	old_wrapper = ruby_wrapper;
-	ruby_wrapper = data->wrapper;
-	if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->body) {
-	    file = data->body->nd_file;
-	    if (!file) file = "__builtin__";
-	    line = nd_line(data->body);
-	}
 
 	self = data->self;
 	ruby_frame->iter = data->iter;
@@ -5487,77 +4214,56 @@ eval(self, src, scope, file, line)
 	    ruby_frame->iter = ruby_frame->prev->iter;
 	}
     }
-    if (file == 0) {
-	ruby_set_current_source();
-	file = ruby_sourcefile;
-	line = ruby_sourceline;
-    }
-    PUSH_CLASS(ruby_cbase);
+    PUSH_CLASS();
+    ruby_class = ((NODE*)ruby_frame->cbase)->nd_clss;
+
     ruby_in_eval++;
     if (TYPE(ruby_class) == T_ICLASS) {
 	ruby_class = RBASIC(ruby_class)->klass;
     }
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
-	NODE *node;
-
-	result = ruby_errinfo;
-	ruby_errinfo = Qnil;
-	node = compile(src, file, line);
+	compile(src, file, line);
 	if (ruby_nerrs > 0) {
 	    compile_error(0);
 	}
-	if (!NIL_P(result)) ruby_errinfo = result;
-	result = eval_node(self, node);
+	result = eval_node(self);
     }
     POP_TAG();
     POP_CLASS();
     ruby_in_eval--;
     if (!NIL_P(scope)) {
-	int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
-
-	ruby_wrapper = old_wrapper;
-	ruby_cref  = (NODE*)old_cref;
-	ruby_frame = frame.tmp;
+	ruby_frame = ruby_frame->prev;
+	if (FL_TEST(ruby_scope, SCOPE_DONT_RECYCLE))
+	    FL_SET(old_scope, SCOPE_DONT_RECYCLE);
 	ruby_scope = old_scope;
 	ruby_block = old_block;
-	ruby_dyna_vars = old_dyna_vars;
+	ruby_dyna_vars = old_d_vars;
 	data->vmode = scope_vmode; /* write back visibility mode */
 	scope_vmode = old_vmode;
-	if (dont_recycle) {
-	    struct tag *tag;
-	    struct RVarmap *vars;
-
-	    scope_dup(ruby_scope);
-	    for (tag=prot_tag; tag; tag=tag->prev) {
-		scope_dup(tag->scope);
-	    }
-	    for (vars = ruby_dyna_vars; vars; vars = vars->next) {
-		FL_SET(vars, DVAR_DONT_RECYCLE);
-	    }
-	}
     }
     else {
 	ruby_frame->iter = iter;
     }
-    ruby_current_node = nodesave;
-    ruby_set_current_source();
+    ruby_sourcefile = filesave;
+    ruby_sourceline = linesave;
     if (state) {
 	if (state == TAG_RAISE) {
-	    VALUE err, errat, mesg;
+	    VALUE err;
+	    VALUE errat;
 
-	    mesg = rb_obj_as_string(ruby_errinfo);
+	    errat = get_backtrace(ruby_errinfo);
 	    if (strcmp(file, "(eval)") == 0) {
 		if (ruby_sourceline > 1) {
-		    errat = get_backtrace(ruby_errinfo);
-		    err = rb_str_dup(RARRAY(errat)->ptr[0]);
-		    rb_str_cat2(err, ": ");
-		    rb_str_append(err, mesg);
+		    err = RARRAY(errat)->ptr[0];
+		    rb_str_cat(err, ": ", 2);
+		    rb_str_concat(err, ruby_errinfo);
 		}
 		else {
-		    err = mesg;
+		    err = rb_str_dup(ruby_errinfo);
 		}
-		rb_exc_raise(rb_funcall(ruby_errinfo, rb_intern("exception"), 1, err));
+		errat = Qnil;
+		rb_exc_raise(rb_exc_new3(CLASS_OF(ruby_errinfo), err));
 	    }
 	    rb_exc_raise(ruby_errinfo);
 	}
@@ -5578,60 +4284,37 @@ rb_f_eval(argc, argv, self)
     int line = 1;
 
     rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
-    if (ruby_safe_level >= 4) {
-	StringValue(src);
-	if (!NIL_P(scope) && !OBJ_TAINTED(scope)) {
-	    rb_raise(rb_eSecurityError, "Insecure: can't modify trusted binding");
-	}
-    }
-    else {
-	SafeStringValue(src);
-    }
     if (argc >= 3) {
-	file = StringValuePtr(vfile);
+	Check_Type(vfile, T_STRING);
+	file = RSTRING(vfile)->ptr;
     }
     if (argc >= 4) {
 	line = NUM2INT(vline);
     }
 
-    if (NIL_P(scope) && ruby_frame->prev) {
-	struct FRAME *prev;
-	VALUE val;
-
-	prev = ruby_frame;
-	PUSH_FRAME();
-	*ruby_frame = *prev->prev;
-	ruby_frame->prev = prev;
-	val = eval(self, src, scope, file, line);
-	POP_FRAME();
-
-	return val;
-    }
+    Check_SafeStr(src);
     return eval(self, src, scope, file, line);
 }
 
-/* function to call func under the specified class/module context */
 static VALUE
-exec_under(func, under, cbase, args)
+exec_under(func, under, args)
     VALUE (*func)();
-    VALUE under, cbase;
+    VALUE under;
     void *args;
 {
-    VALUE val = Qnil;		/* OK */
+    VALUE val;			/* OK */
     int state;
     int mode;
+    VALUE cbase = ruby_frame->cbase;
 
-    PUSH_CLASS(under);
+    PUSH_CLASS();
+    ruby_class = under;
     PUSH_FRAME();
-    ruby_frame->self = _frame.prev->self;
     ruby_frame->last_func = _frame.prev->last_func;
     ruby_frame->last_class = _frame.prev->last_class;
     ruby_frame->argc = _frame.prev->argc;
     ruby_frame->argv = _frame.prev->argv;
-    if (cbase) {
-	PUSH_CREF(cbase);
-    }
-
+    ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,under,0,cbase);
     mode = scope_vmode;
     SCOPE_SET(SCOPE_PUBLIC);
     PUSH_TAG(PROT_NONE);
@@ -5639,7 +4322,6 @@ exec_under(func, under, cbase, args)
 	val = (*func)(args);
     }
     POP_TAG();
-    if (cbase) POP_CREF();
     SCOPE_SET(mode);
     POP_FRAME();
     POP_CLASS();
@@ -5655,7 +4337,6 @@ eval_under_i(args)
     return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]);
 }
 
-/* string eval under the class/module context */
 static VALUE
 eval_under(under, self, src, file, line)
     VALUE under, self, src;
@@ -5664,32 +4345,28 @@ eval_under(under, self, src, file, line)
 {
     VALUE args[4];
 
-    if (ruby_safe_level >= 4) {
-	StringValue(src);
-    }
-    else {
-	SafeStringValue(src);
-    }
+    Check_SafeStr(src);
     args[0] = self;
     args[1] = src;
     args[2] = (VALUE)file;
     args[3] = (VALUE)line;
-    return exec_under(eval_under_i, under, under, args);
+    return exec_under(eval_under_i, under, args);
 }
 
 static VALUE
 yield_under_i(self)
     VALUE self;
 {
-    return rb_yield_0(self, self, ruby_class, YIELD_PUBLIC_DEF, Qfalse);
+    return rb_yield_0(self, self, ruby_class);
 }
 
-/* block eval under the class/module context */
 static VALUE
 yield_under(under, self)
     VALUE under, self;
 {
-    return exec_under(yield_under_i, under, 0, self);
+    if (rb_safe_level() >= 4 && !FL_TEST(self, FL_TAINT))
+	rb_raise(rb_eSecurityError, "Insecure: can't eval");
+    return exec_under(yield_under_i, under, self);
 }
 
 static VALUE
@@ -5698,36 +4375,28 @@ specific_eval(argc, argv, klass, self)
     VALUE *argv;
     VALUE klass, self;
 {
-    if (rb_block_given_p()) {
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+    char *file = 0;
+    int   line = 1;
+    int   iter = rb_iterator_p();
+
+    if (argc > 0) {
+	Check_SafeStr(argv[0]);
+	if (argc > 3) {
+	    rb_raise(rb_eArgError, "wrong # of arguments: %s(src) or %s{..}",
+		     rb_id2name(ruby_frame->last_func),
+		     rb_id2name(ruby_frame->last_func));
 	}
+	if (argc > 1) file = STR2CSTR(argv[1]);
+	if (argc > 2) line = NUM2INT(argv[2]);
+    }
+    else if (!iter) {
+	rb_raise(rb_eArgError, "block not supplied");
+    }
+
+    if (iter) {
 	return yield_under(klass, self);
     }
     else {
-	char *file = "(eval)";
-	int   line = 1;
-
-	if (argc == 0) {
-	    rb_raise(rb_eArgError, "block not supplied");
-	}
-	else {
-	    if (ruby_safe_level >= 4) {
-		StringValue(argv[0]);
-	    }
-	    else {
-		SafeStringValue(argv[0]);
-	    }
-	    if (argc > 3) {
-		rb_raise(rb_eArgError, "wrong number of arguments: %s(src) or %s{..}",
-			 rb_id2name(ruby_frame->last_func),
-			 rb_id2name(ruby_frame->last_func));
-	    }
-	    if (argc > 1) {
-		file = StringValuePtr(argv[1]);
-	    }
-	    if (argc > 2) line = NUM2INT(argv[2]);
-	}
 	return eval_under(klass, self, argv[0], file, line);
     }
 }
@@ -5750,7 +4419,7 @@ rb_obj_instance_eval(argc, argv, self)
     return specific_eval(argc, argv, klass, self);
 }
 
-VALUE
+static VALUE
 rb_mod_module_eval(argc, argv, mod)
     int argc;
     VALUE *argv;
@@ -5761,106 +4430,164 @@ rb_mod_module_eval(argc, argv, mod)
 
 VALUE rb_load_path;
 
-NORETURN(static void load_failed _((VALUE)));
+static int
+is_absolute_path(path)
+    const char *path;
+{
+    if (path[0] == '/') return 1;
+# if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__)
+    if (path[0] == '\\') return 1;
+    if (strlen(path) > 2 && path[1] == ':') return 1;
+# endif
+    return 0;
+}
+
+#ifdef __MACOS__
+static int
+is_macos_native_path(path)
+    const char *path;
+{
+    if (strchr(path, ':')) return 1;
+    return 0;
+}
+#endif
+
+static char*
+find_file(file)
+    char *file;
+{
+    extern VALUE rb_load_path;
+    volatile VALUE vpath;
+    char *path;
+
+#ifdef __MACOS__
+    if (is_macos_native_path(file)) {
+	FILE *f = fopen(file, "r");
+
+	if (f == NULL) return 0;
+	fclose(f);
+	return file;
+    }
+#endif
+
+    if (is_absolute_path(file)) {
+	FILE *f = fopen(file, "r");
+
+	if (f == NULL) return 0;
+	fclose(f);
+	return file;
+    }
+
+    if (file[0] == '~') {
+	VALUE argv[1];
+	argv[0] = rb_str_new2(file);
+	file = STR2CSTR(rb_file_s_expand_path(1, argv));
+    }
+
+    if (rb_load_path) {
+	int i;
+
+	Check_Type(rb_load_path, T_ARRAY);
+	vpath = rb_ary_new();
+	for (i=0;i<RARRAY(rb_load_path)->len;i++) {
+	    VALUE str = RARRAY(rb_load_path)->ptr[i];
+	    Check_SafeStr(str);
+	    if (RSTRING(str)->len > 0) {
+		rb_ary_push(vpath, str);
+	    }
+	}
+	vpath = rb_ary_join(vpath, rb_str_new2(RUBY_PATH_SEP));
+	path = STR2CSTR(vpath);
+	if (safe_level >= 2 && !rb_path_check(path)) {
+	    rb_raise(rb_eSecurityError, "loading from unsefe path %s", path);
+	}
+    }
+    else {
+	path = 0;
+    }
+
+    return dln_find_file(file, path);
+}
 
 void
 rb_load(fname, wrap)
     VALUE fname;
     int wrap;
 {
-    VALUE tmp;
     int state;
+    char *file;
     volatile ID last_func;
-    volatile VALUE wrapper = 0;
-    volatile VALUE self = ruby_top_self;
-    NODE *volatile last_node;
-    NODE *saved_cref = ruby_cref;
+    VALUE self = ruby_top_self;
     TMP_PROTECT;
 
-    if (wrap && ruby_safe_level >= 4) {
-	StringValue(fname);
+    if (wrap) {
+	Check_Type(fname, T_STRING);
     }
     else {
-	SafeStringValue(fname);
+	Check_SafeStr(fname);
     }
-    tmp = rb_find_file(fname);
-    if (!tmp) {
-	load_failed(fname);
+    file = find_file(RSTRING(fname)->ptr);
+    if (!file) {
+	rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr);
     }
-    fname = tmp;
 
-    ruby_errinfo = Qnil;	/* ensure */
     PUSH_VARS();
-    PUSH_CLASS(ruby_wrapper);
-    ruby_cref = top_cref;
+    PUSH_CLASS();
     if (!wrap) {
 	rb_secure(4);		/* should alter global state */
 	ruby_class = rb_cObject;
-	ruby_wrapper = 0;
     }
     else {
 	/* load in anonymous module as toplevel */
 	ruby_class = ruby_wrapper = rb_module_new();
 	self = rb_obj_clone(ruby_top_self);
-	rb_extend_object(self, ruby_wrapper);
-	PUSH_CREF(ruby_wrapper);
+	rb_extend_object(self, ruby_class);
     }
-    PUSH_ITER(ITER_NOT);
     PUSH_FRAME();
     ruby_frame->last_func = 0;
-    ruby_frame->last_class = 0;
-    ruby_frame->self = self;
+    ruby_frame->self = ruby_top_self;
+    ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,ruby_class,0,0);
     PUSH_SCOPE();
+    if (ruby_class == rb_cObject && top_scope->local_tbl) {
+	int len = top_scope->local_tbl[0]+1;
+	ID *tbl = ALLOC_N(ID, len);
+	VALUE *vars = TMP_ALLOC(len);
+	*vars++ = 0;
+	MEMCPY(tbl, top_scope->local_tbl, ID, len);
+	MEMCPY(vars, top_scope->local_vars, VALUE, len-1);
+	ruby_scope->local_tbl = tbl;   /* copy toplevel scope */
+	ruby_scope->local_vars = vars; /* will not alter toplevel variables */
+    }
     /* default visibility is private at loading toplevel */
     SCOPE_SET(SCOPE_PRIVATE);
+
     PUSH_TAG(PROT_NONE);
     state = EXEC_TAG();
     last_func = ruby_frame->last_func;
-    last_node = ruby_current_node;
-    if (!ruby_current_node && ruby_sourcefile) {
-	last_node = NEW_NEWLINE(0);
-    }
-    ruby_current_node = 0;
     if (state == 0) {
-	NODE *node;
-	volatile int critical;
-
-	DEFER_INTS;
 	ruby_in_eval++;
-	critical = rb_thread_critical;
-	rb_thread_critical = Qtrue;
-	rb_load_file(RSTRING(fname)->ptr);
+	rb_load_file(file);
 	ruby_in_eval--;
-	node = ruby_eval_tree;
-	rb_thread_critical = critical;
 	if (ruby_nerrs == 0) {
-	    eval_node(self, node);
+	    eval_node(self);
 	}
     }
-    ALLOW_INTS;
     ruby_frame->last_func = last_func;
-    ruby_current_node = last_node;
-    ruby_sourcefile = 0;
-    ruby_set_current_source();
-    if (ruby_scope->flags == SCOPE_ALLOCA && ruby_class == rb_cObject) {
+    if (ruby_scope->flag == SCOPE_ALLOCA && ruby_class == rb_cObject) {
 	if (ruby_scope->local_tbl) /* toplevel was empty */
 	    free(ruby_scope->local_tbl);
     }
     POP_TAG();
-    ruby_cref = saved_cref;
     POP_SCOPE();
     POP_FRAME();
-    POP_ITER();
     POP_CLASS();
     POP_VARS();
-    ruby_wrapper = wrapper;
+    ruby_wrapper = 0;
     if (ruby_nerrs > 0) {
 	ruby_nerrs = 0;
 	rb_exc_raise(ruby_errinfo);
     }
-    if (state) jump_tag_but_local_jump(state);
-    if (!NIL_P(ruby_errinfo))	/* exception during load */
-	rb_exc_raise(ruby_errinfo);
+    if (state) JUMP_TAG(state);
 }
 
 void
@@ -5891,271 +4618,153 @@ rb_f_load(argc, argv)
     return Qtrue;
 }
 
-VALUE ruby_dln_librefs;
 static VALUE rb_features;
-static st_table *loading_tbl;
 
-#define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0)
-#ifdef DLEXT2
-#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0)
-#else
-#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0)
-#endif
-
-static char *
-rb_feature_p(feature, ext, rb)
-    const char *feature, *ext;
-    int rb;
+static int
+rb_provided(feature)
+    const char *feature;
 {
-    VALUE v;
-    char *f, *e;
-    long i, len, elen;
+    VALUE *p, *pend;
+    char *f;
+    int len;
 
-    if (ext) {
-	len = ext - feature;
-	elen = strlen(ext);
-    }
-    else {
+    p = RARRAY(rb_features)->ptr;
+    pend = p + RARRAY(rb_features)->len;
+    while (p < pend) {
+	f = STR2CSTR(*p);
+	if (strcmp(f, feature) == 0) return Qtrue;
 	len = strlen(feature);
-	elen = 0;
-    }
-    for (i = 0; i < RARRAY(rb_features)->len; ++i) {
-	v = RARRAY(rb_features)->ptr[i];
-	f = StringValuePtr(v);
-	if (strncmp(f, feature, len) != 0) continue;
-	if (!*(e = f + len)) {
-	    if (ext) continue;
-	    return e;
-	}
-	if (*e != '.') continue;
-	if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) {
-	    return e;
-	}
-	if ((rb || !ext) && (strcmp(e, ".rb") == 0)) {
-	    return e;
+	if (strncmp(f, feature, len) == 0
+	    && (strcmp(f+len, ".rb") == 0 ||strcmp(f+len, ".so") == 0)) {
+	    return Qtrue;
 	}
+	p++;
     }
-    return 0;
-}
-
-static const char *const loadable_ext[] = {
-    ".rb", DLEXT,
-#ifdef DLEXT2
-    DLEXT2,
-#endif
-    0
-};
-
-int
-rb_provided(feature)
-    const char *feature;
-{
-    return rb_feature_p(feature, 0, Qfalse) ? Qtrue : Qfalse;
+    return Qfalse;
 }
 
-static void
-rb_provide_feature(feature)
-    VALUE feature;
-{
-    rb_ary_push(rb_features, feature);
-}
+static int rb_thread_loading _((const char*));
+static void rb_thread_loading_done _((const char*));
 
 void
 rb_provide(feature)
     const char *feature;
 {
-    rb_provide_feature(rb_str_new2(feature));
-}
-
-static void
-load_wait(ftptr)
-    char *ftptr;
-{
-    st_data_t th;
+    char *buf, *ext;
 
-    if (!loading_tbl) return;
-    if (!st_lookup(loading_tbl, (st_data_t)ftptr, &th)) return;
-    if ((rb_thread_t)th == curr_thread) return;
-    do {
-	CHECK_INTS;
-	rb_thread_schedule();
-    } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
+    if (!rb_provided(feature)) {
+	ext = strrchr(feature, '.');
+	if (ext && strcmp(DLEXT, ext) == 0) {
+	    buf = ALLOCA_N(char, strlen(feature)+4);
+	    strcpy(buf, feature);
+	    ext = strrchr(buf, '.');
+	    strcpy(ext, ".so");
+	    feature = buf;
+	}
+	rb_ary_push(rb_features, rb_str_new2(feature));
+    }
 }
 
 VALUE
 rb_f_require(obj, fname)
     VALUE obj, fname;
 {
-    return rb_require_safe(fname, ruby_safe_level);
-}
+    char *ext, *file, *feature, *buf; /* OK */
+    volatile VALUE load;
+    int state;
 
-static int
-search_required(fname, featurep, path)
-    VALUE fname, *featurep, *path;
-{
-    VALUE tmp;
-    char *ext, *ftptr;
+    rb_secure(4);
+    Check_SafeStr(fname);
+    if (rb_provided(RSTRING(fname)->ptr))
+	return Qfalse;
 
-    *featurep = fname;
-    *path = 0;
-    ext = strrchr(ftptr = RSTRING(fname)->ptr, '.');
-    if (ext && !strchr(ext, '/')) {
+    ext = strrchr(RSTRING(fname)->ptr, '.');
+    if (ext) {
 	if (strcmp(".rb", ext) == 0) {
-	    if (rb_feature_p(ftptr, ext, Qtrue)) return 'r';
-	    if (*path = rb_find_file(fname)) return 'r';
-	    return 0;
-	}
-	else if (IS_SOEXT(ext)) {
-	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
-	    tmp = rb_str_new(RSTRING(fname)->ptr, ext-RSTRING(fname)->ptr);
-	    *featurep = tmp;
-#ifdef DLEXT2
-	    if (rb_find_file_ext(&tmp, loadable_ext+1)) {
-		*featurep = tmp;
-		*path = rb_find_file(tmp);
-		return 's';
-	    }
-#else
-	    rb_str_cat2(tmp, DLEXT);
-	    if (*path = rb_find_file(tmp)) {
-		return 's';
-	    }
-#endif
-	}
-	else if (IS_DLEXT(ext)) {
-	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
-	    if (*path = rb_find_file(fname)) return 's';
-	}
-    }
-    if ((ext = rb_feature_p(ftptr, 0, Qfalse)) != 0) {
-	return strcmp(ext, ".rb") == 0 ? 'r' : 's';
+	    feature = file = RSTRING(fname)->ptr;
+	    file = find_file(file);
+	    if (file) goto load_rb;
+	}
+	else if (strcmp(".so", ext) == 0 || strcmp(".o", ext) == 0) {
+	    file = feature = RSTRING(fname)->ptr;
+	    if (strcmp(ext, DLEXT) != 0) {
+		buf = ALLOCA_N(char, strlen(file)+sizeof(DLEXT)+1);
+		strcpy(buf, feature);
+		ext = strrchr(buf, '.');
+		strcpy(ext, DLEXT);
+		file = feature = buf;
+	    }
+	    file = find_file(file);
+	    if (file) goto load_dyna;
+	}
+	else if (strcmp(DLEXT, ext) == 0) {
+	    feature = RSTRING(fname)->ptr;
+	    file = find_file(feature);
+	    if (file) goto load_dyna;
+	}
+    }
+    buf = ALLOCA_N(char, strlen(RSTRING(fname)->ptr) + 5);
+    strcpy(buf, RSTRING(fname)->ptr);
+    strcat(buf, ".rb");
+    file = find_file(buf);
+    if (file) {
+	fname = rb_str_new2(file);
+	feature = buf;
+	goto load_rb;
+    }
+    strcpy(buf, RSTRING(fname)->ptr);
+    strcat(buf, DLEXT);
+    file = find_file(buf);
+    if (file) {
+	feature = buf;
+	goto load_dyna;
+    }
+    rb_raise(rb_eLoadError, "No such file to load -- %s",
+	     RSTRING(fname)->ptr);
+
+  load_dyna:
+    if (rb_thread_loading(feature)) return Qfalse;
+
+    rb_provide(feature);
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	load = rb_str_new2(file);
+	file = RSTRING(load)->ptr;
+	dln_load(file);
     }
-    tmp = fname;
-    switch (rb_find_file_ext(&tmp, loadable_ext)) {
-      case 0:
-	return 0;
+    POP_TAG();
+    rb_thread_loading_done(feature);
+    if (state) JUMP_TAG(state);
 
-      case 1:
-	*featurep = tmp;
-	*path = rb_find_file(tmp);
-	return 'r';
+    return Qtrue;
 
-      default:
-	*featurep = tmp;
-	*path = rb_find_file(tmp);
-	return 's';
-    }
-}
+  load_rb:
+    if (rb_thread_loading(feature)) return Qfalse;
+    rb_provide(feature);
 
-static void
-load_failed(fname)
-    VALUE fname;
-{
-    rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr);
-}
-
-VALUE
-rb_require_safe(fname, safe)
-    VALUE fname;
-    int safe;
-{
-    VALUE result = Qnil;
-    int state;
-    struct {
-	NODE *node;
-	ID func;
-	int vmode, safe;
-    } volatile saved;
-    char *volatile ftptr = 0;
-
-    if (OBJ_TAINTED(fname)) {
-	rb_check_safe_obj(fname);
-    }
-    StringValue(fname);
-    saved.vmode = scope_vmode;
-    saved.node = ruby_current_node;
-    saved.func = ruby_frame->last_func;
-    saved.safe = ruby_safe_level;
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
-	VALUE feature, path;
-	long handle;
-	int found;
-
-	ruby_safe_level = safe;
-	found = search_required(fname, &feature, &path);
-	if (found) {
-	    if (!path) {
-		load_wait(RSTRING(feature)->ptr);
-		result = Qfalse;
-	    }
-	    else {
-		ruby_safe_level = 0;
-		rb_provide_feature(feature);
-		switch (found) {
-		  case 'r':
-		    /* loading ruby library should be serialized. */
-		    if (!loading_tbl) {
-			loading_tbl = st_init_strtable();
-		    }
-		    /* partial state */
-		    ftptr = ruby_strdup(RSTRING(feature)->ptr);
-		    st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
-		    if (feature == fname && !OBJ_FROZEN(feature)) {
-			feature = rb_str_dup(feature);
-			OBJ_FREEZE(feature);
-		    }
-		    rb_load(path, 0);
-		    break;
-
-		  case 's':
-		    ruby_current_node = 0;
-		    ruby_sourcefile = rb_source_filename(RSTRING(path)->ptr);
-		    ruby_sourceline = 0;
-		    ruby_frame->last_func = 0;
-		    SCOPE_SET(SCOPE_PUBLIC);
-		    handle = (long)dln_load(RSTRING(path)->ptr);
-		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
-		    break;
-		}
-		result = Qtrue;
-	    }
-	}
+	rb_load(fname, 0);
     }
     POP_TAG();
-    ruby_current_node = saved.node;
-    ruby_set_current_source();
-    ruby_frame->last_func = saved.func;
-    SCOPE_SET(saved.vmode);
-    ruby_safe_level = saved.safe;
-    if (ftptr) {
-	if (st_delete(loading_tbl, (st_data_t *)&ftptr, 0)) { /* loading done */
-	    free(ftptr);
-	}
-    }
+    rb_thread_loading_done(feature);
     if (state) JUMP_TAG(state);
-    if (NIL_P(result)) {
-	load_failed(fname);
-    }
-    ruby_errinfo = Qnil;
-
-    return result;
-}
 
-VALUE
-rb_require(fname)
-    const char *fname;
-{
-    return rb_require_safe(rb_str_new2(fname), ruby_safe_level);
+    return Qtrue;
 }
 
-static void
-secure_visibility(self)
+static VALUE
+require_method(argc, argv, self)
+    int argc;
+    VALUE *argv;
     VALUE self;
 {
-    if (ruby_safe_level >= 4 && !OBJ_TAINTED(self)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't change method visibility");
+    int i;
+
+    for (i=0; i<argc; i++) {
+	rb_f_require(self, argv[i]);
     }
+    return Qnil;
 }
 
 static void
@@ -6167,11 +4776,9 @@ set_method_visibility(self, argc, argv, ex)
 {
     int i;
 
-    secure_visibility(self);
     for (i=0; i<argc; i++) {
 	rb_export_method(self, rb_to_id(argv[i]), ex);
     }
-    rb_clear_cache_by_class(self);
 }
 
 static VALUE
@@ -6180,7 +4787,6 @@ rb_mod_public(argc, argv, module)
     VALUE *argv;
     VALUE module;
 {
-    secure_visibility(module);
     if (argc == 0) {
 	SCOPE_SET(SCOPE_PUBLIC);
     }
@@ -6196,7 +4802,6 @@ rb_mod_protected(argc, argv, module)
     VALUE *argv;
     VALUE module;
 {
-    secure_visibility(module);
     if (argc == 0) {
 	SCOPE_SET(SCOPE_PROTECTED);
     }
@@ -6212,7 +4817,6 @@ rb_mod_private(argc, argv, module)
     VALUE *argv;
     VALUE module;
 {
-    secure_visibility(module);
     if (argc == 0) {
 	SCOPE_SET(SCOPE_PRIVATE);
     }
@@ -6268,11 +4872,6 @@ rb_mod_modfunc(argc, argv, module)
     ID id;
     NODE *body;
 
-    if (TYPE(module) != T_MODULE) {
-	rb_raise(rb_eTypeError, "module_function must be called for modules");
-    }
-
-    secure_visibility(module);
     if (argc == 0) {
 	SCOPE_SET(SCOPE_MODFUNC);
 	return module;
@@ -6280,19 +4879,12 @@ rb_mod_modfunc(argc, argv, module)
 
     set_method_visibility(module, argc, argv, NOEX_PRIVATE);
     for (i=0; i<argc; i++) {
-	VALUE m = module;
-
 	id = rb_to_id(argv[i]);
-	for (;;) {
-	    body = search_method(m, id, &m);
-	    if (body == 0 || body->nd_body == 0) {
-		rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
-	    }
-	    if (nd_type(body->nd_body) != NODE_ZSUPER) {
-		break;		/* normal case: need not to follow 'super' link */
-	    }
-	    m = RCLASS(m)->super;
+	body = search_method(module, id, 0);
+	if (body == 0 || body->nd_body == 0) {
+	    rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
 	}
+	rb_clear_cache_by_id(id);
 	rb_add_method(rb_singleton_class(module), id, body->nd_body, NOEX_PUBLIC);
     }
     return module;
@@ -6321,12 +4913,11 @@ rb_mod_include(argc, argv, module)
     VALUE *argv;
     VALUE module;
 {
-    while (argc--) {
-	VALUE m = argv[argc];
+    int i;
 
-	Check_Type(m, T_MODULE);
-	rb_funcall(m, rb_intern("append_features"), 1, module);
-	rb_funcall(m, rb_intern("included"), 1, module);
+    for (i=0; i<argc; i++) {
+	Check_Type(argv[i], T_MODULE);
+	rb_funcall(argv[i], rb_intern("append_features"), 1, module);
     }
     return module;
 }
@@ -6337,11 +4928,37 @@ rb_obj_call_init(obj, argc, argv)
     int argc;
     VALUE *argv;
 {
-    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    PUSH_ITER(rb_iterator_p()?ITER_PRE:ITER_NOT);
     rb_funcall2(obj, init, argc, argv);
     POP_ITER();
 }
 
+VALUE
+rb_class_new_instance(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj;
+
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	rb_raise(rb_eTypeError, "can't create instance of virtual class");
+    }
+    obj = rb_obj_alloc(klass);
+    rb_obj_call_init(obj, argc, argv);
+
+    return obj;
+}
+
+static VALUE
+top_include(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    rb_secure(4);
+    return rb_mod_include(argc, argv, rb_cObject);
+}
+
 void
 rb_extend_object(obj, module)
     VALUE obj, module;
@@ -6365,32 +4982,13 @@ rb_obj_extend(argc, argv, obj)
 {
     int i;
 
-    if (argc == 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments(0 for 1)");
-    }
     for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
-    while (argc--) {
-	rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj);
+    for (i=0; i<argc; i++) {
+	rb_funcall(argv[i], rb_intern("extend_object"), 1, obj);
     }
     return obj;
 }
 
-static VALUE
-top_include(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    rb_secure(4);
-    if (ruby_wrapper) {
-	rb_warn("main#include in the wrapped load is effective only for toplevel");
-	return rb_obj_extend(argc, argv, self);
-    }
-    else {
-	return rb_mod_include(argc, argv, rb_cObject);
-    }
-}
-
 VALUE rb_f_trace_var();
 VALUE rb_f_untrace_var();
 
@@ -6425,6 +5023,9 @@ errat_setter(val, id, var)
     set_backtrace(ruby_errinfo, val);
 }
 
+VALUE rb_f_global_variables();
+VALUE f_instance_variables();
+
 static VALUE
 rb_f_local_variables()
 {
@@ -6437,14 +5038,14 @@ rb_f_local_variables()
     if (tbl) {
 	n = *tbl++;
 	for (i=2; i<n; i++) {	/* skip first 2 ($_ and $~) */
-	    if (!rb_is_local_id(tbl[i])) continue; /* skip flip states */
+	    if (tbl[i] == 0) continue;  /* skip flip states */
 	    rb_ary_push(ary, rb_str_new2(rb_id2name(tbl[i])));
 	}
     }
 
     vars = ruby_dyna_vars;
     while (vars) {
-	if (vars->id && rb_is_local_id(vars->id)) { /* skip $_, $~ and flip states */
+	if (vars->id) {
 	    rb_ary_push(ary, rb_str_new2(rb_id2name(vars->id)));
 	}
 	vars = vars->next;
@@ -6454,66 +5055,34 @@ rb_f_local_variables()
 }
 
 static VALUE rb_f_catch _((VALUE,VALUE));
-NORETURN(static VALUE rb_f_throw _((int,VALUE*)));
+static VALUE rb_f_throw _((int,VALUE*)) NORETURN;
 
 struct end_proc_data {
     void (*func)();
     VALUE data;
-    int safe;
     struct end_proc_data *next;
 };
-
-static struct end_proc_data *end_procs, *ephemeral_end_procs;
+static struct end_proc_data *end_proc_data;
 
 void
 rb_set_end_proc(func, data)
-    void (*func) _((VALUE));
+    void (*func)();
     VALUE data;
 {
     struct end_proc_data *link = ALLOC(struct end_proc_data);
-    struct end_proc_data **list;
 
-    if (ruby_wrapper) list = &ephemeral_end_procs;
-    else              list = &end_procs;
-    link->next = *list;
+    link->next = end_proc_data;
     link->func = func;
     link->data = data;
-    link->safe = ruby_safe_level;
-    *list = link;
+    rb_global_variable(&link->data);
+    end_proc_data = link;
 }
 
-void
-rb_mark_end_proc()
-{
-    struct end_proc_data *link;
-
-    link = end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
-    link = ephemeral_end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
-}
-
-static void call_end_proc _((VALUE data));
-
 static void
 call_end_proc(data)
     VALUE data;
 {
-    PUSH_ITER(ITER_NOT);
-    PUSH_FRAME();
-    ruby_frame->self = ruby_frame->prev->self;
-    ruby_frame->node = 0;
-    ruby_frame->last_func = 0;
-    ruby_frame->last_class = 0;
-    proc_invoke(data, rb_ary_new2(0), Qundef, 0);
-    POP_FRAME();
-    POP_ITER();
+    proc_call(data, Qnil);
 }
 
 static void
@@ -6521,8 +5090,7 @@ rb_f_END()
 {
     PUSH_FRAME();
     ruby_frame->argc = 0;
-    ruby_frame->iter = ITER_CUR;
-    rb_set_end_proc(call_end_proc, rb_block_proc());
+    rb_set_end_proc(call_end_proc, rb_f_lambda());
     POP_FRAME();
 }
 
@@ -6531,10 +5099,8 @@ rb_f_at_exit()
 {
     VALUE proc;
 
-    if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "called without a block");
-    }
-    proc = rb_block_proc();
+    proc = rb_f_lambda();
+
     rb_set_end_proc(call_end_proc, proc);
     return proc;
 }
@@ -6542,47 +5108,17 @@ rb_f_at_exit()
 void
 rb_exec_end_proc()
 {
-    struct end_proc_data *link, *tmp;
+    struct end_proc_data *link = end_proc_data;
+    struct end_proc_data *tmp;
     int status;
-    volatile int safe = ruby_safe_level;
 
-    while (ephemeral_end_procs) {
-	link = ephemeral_end_procs;
-	ephemeral_end_procs = 0;
-	while (link) {
-	    PUSH_TAG(PROT_NONE);
-	    if ((status = EXEC_TAG()) == 0) {
-		ruby_safe_level = link->safe;
-		(*link->func)(link->data);
-	    }
-	    POP_TAG();
-	    if (status) {
-		error_handle(status);
-	    }
-	    tmp = link;
-	    link = link->next;
-	    free(tmp);
-	}
-    }
-    while (end_procs) {
-	link = end_procs;
-	end_procs = 0;
-	while (link) {
-	    PUSH_TAG(PROT_NONE);
-	    if ((status = EXEC_TAG()) == 0) {
-		ruby_safe_level = link->safe;
-		(*link->func)(link->data);
-	    }
-	    POP_TAG();
-	    if (status) {
-		error_handle(status);
-	    }
-	    tmp = link;
-	    link = link->next;
-	    free(tmp);
-	}
+    while (link) {
+	rb_protect((VALUE(*)())link->func, link->data, &status);
+	tmp = link->next;
+	free(link);
+	link = tmp;
     }
-    ruby_safe_level = safe;
+    end_proc_data = 0;
 }
 
 void
@@ -6596,15 +5132,6 @@ Init_eval()
     aset = rb_intern("[]=");
     match = rb_intern("=~");
     missing = rb_intern("method_missing");
-    added = rb_intern("method_added");
-    singleton_added = rb_intern("singleton_method_added");
-    removed = rb_intern("method_removed");
-    singleton_removed = rb_intern("singleton_method_removed");
-    undefined = rb_intern("method_undefined");
-    singleton_undefined = rb_intern("singleton_method_undefined");
-
-    __id__ = rb_intern("__id__");
-    __send__ = rb_intern("__send__");
 
     rb_global_variable((VALUE*)&top_scope);
     rb_global_variable((VALUE*)&ruby_eval_tree_begin);
@@ -6616,9 +5143,8 @@ Init_eval()
     rb_define_hooked_variable("$!", &ruby_errinfo, 0, errinfo_setter);
 
     rb_define_global_function("eval", rb_f_eval, -1);
-    rb_define_global_function("iterator?", rb_f_block_given_p, 0);
-    rb_define_global_function("block_given?", rb_f_block_given_p, 0);
-    rb_define_global_function("method_missing", rb_method_missing, -1);
+    rb_define_global_function("iterator?", rb_f_iterator_p, 0);
+    rb_define_global_function("method_missing", rb_f_missing, -1);
     rb_define_global_function("loop", rb_f_loop, 0);
 
     rb_define_method(rb_mKernel, "respond_to?", rb_obj_respond_to, -1);
@@ -6629,7 +5155,7 @@ Init_eval()
     rb_define_global_function("caller", rb_f_caller, -1);
 
     rb_define_global_function("exit", rb_f_exit, -1);
-    rb_define_global_function("abort", rb_f_abort, -1);
+    rb_define_global_function("abort", rb_f_abort, 0);
 
     rb_define_global_function("at_exit", rb_f_at_exit, 0);
 
@@ -6650,20 +5176,14 @@ Init_eval()
     rb_define_private_method(rb_cModule, "private", rb_mod_private, -1);
     rb_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1);
     rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1);
-    rb_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1);
-    rb_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1);
-    rb_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1);
     rb_define_method(rb_cModule, "public_class_method", rb_mod_public_method, -1);
     rb_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1);
     rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
     rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
 
-    rb_undef_method(rb_cClass, "module_function");
-
-    rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1);
-    rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1);
+    rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, 1);
+    rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, 1);
     rb_define_private_method(rb_cModule, "alias_method", rb_mod_alias_method, 2);
-    rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
 
     rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
     rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, 0);
@@ -6678,48 +5198,11 @@ Init_eval()
     rb_define_global_function("untrace_var", rb_f_untrace_var, -1);
 
     rb_define_global_function("set_trace_func", set_trace_func, 1);
-    rb_global_variable(&trace_func);
 
     rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
 }
 
-static VALUE
-rb_mod_autoload(mod, sym, file)
-    VALUE mod;
-    VALUE sym;
-    VALUE file;
-{
-    ID id = rb_to_id(sym);
-
-    Check_SafeStr(file);
-    rb_autoload(mod, id, RSTRING(file)->ptr);
-    return Qnil;
-}
-
-static VALUE
-rb_mod_autoload_p(mod, sym)
-    VALUE mod, sym;
-{
-    return rb_autoload_p(mod, rb_to_id(sym));
-}
-
-static VALUE
-rb_f_autoload(obj, sym, file)
-    VALUE obj;
-    VALUE sym;
-    VALUE file;
-{
-    return rb_mod_autoload(ruby_cbase, sym, file);
-}
-
-static VALUE
-rb_f_autoload_p(obj, sym)
-    VALUE obj;
-    VALUE sym;
-{
-    /* use ruby_cbase as same as rb_f_autoload. */
-    return rb_mod_autoload_p(ruby_cbase, sym);
-}
+VALUE rb_f_autoload();
 
 void
 Init_load()
@@ -6733,15 +5216,9 @@ Init_load()
     rb_define_readonly_variable("$\"", &rb_features);
 
     rb_define_global_function("load", rb_f_load, -1);
-    rb_define_global_function("require", rb_f_require, 1);
-    rb_define_method(rb_cModule, "autoload",  rb_mod_autoload,   2);
-    rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1);
-    rb_define_global_function("autoload",  rb_f_autoload,   2);
-    rb_define_global_function("autoload?", rb_f_autoload_p, 1);
+    rb_define_global_function("require", require_method, -1);
+    rb_define_global_function("autoload", rb_f_autoload, 2);
     rb_global_variable(&ruby_wrapper);
-
-    ruby_dln_librefs = rb_ary_new();
-    rb_global_variable(&ruby_dln_librefs);
 }
 
 static void
@@ -6751,8 +5228,7 @@ scope_dup(scope)
     ID *tbl;
     VALUE *vars;
 
-    scope->flags |= SCOPE_DONT_RECYCLE;
-    if (scope->flags & SCOPE_MALLOC) return;
+    if (scope->flag & SCOPE_MALLOC) return;
 
     if (scope->local_tbl) {
 	tbl = scope->local_tbl;
@@ -6760,7 +5236,10 @@ scope_dup(scope)
 	*vars++ = scope->local_vars[-1];
 	MEMCPY(vars, scope->local_vars, VALUE, tbl[0]);
 	scope->local_vars = vars;
-	scope->flags |= SCOPE_MALLOC;
+	scope->flag = SCOPE_MALLOC;
+    }
+    else {
+        scope->flag = SCOPE_NOSTACK;
     }
 }
 
@@ -6770,14 +5249,12 @@ blk_mark(data)
 {
     while (data) {
 	rb_gc_mark_frame(&data->frame);
-	rb_gc_mark((VALUE)data->scope);
-	rb_gc_mark((VALUE)data->var);
-	rb_gc_mark((VALUE)data->body);
-	rb_gc_mark((VALUE)data->self);
-	rb_gc_mark((VALUE)data->dyna_vars);
-	rb_gc_mark((VALUE)data->cref);
-	rb_gc_mark(data->wrapper);
-	rb_gc_mark(data->block_obj);
+	rb_gc_mark(data->scope);
+	rb_gc_mark(data->var);
+	rb_gc_mark(data->body);
+	rb_gc_mark(data->self);
+	rb_gc_mark(data->d_vars);
+	rb_gc_mark(data->klass);
 	data = data->prev;
     }
 }
@@ -6786,20 +5263,10 @@ static void
 blk_free(data)
     struct BLOCK *data;
 {
-    struct FRAME *frame;
-    void *tmp;
+    struct BLOCK *tmp;
 
-    frame = data->frame.prev;
-    while (frame) {
-	if (frame->argc > 0 && (frame->flags & FRAME_MALLOC))
-	    free(frame->argv);
-	tmp = frame;
-	frame = frame->prev;
-	free(tmp);
-    }
     while (data) {
-	if (data->frame.argc > 0)
-	    free(data->frame.argv);
+	free(data->frame.argv);
 	tmp = data;
 	data = data->prev;
 	free(tmp);
@@ -6811,63 +5278,32 @@ blk_copy_prev(block)
     struct BLOCK *block;
 {
     struct BLOCK *tmp;
-    struct RVarmap* vars;
 
     while (block->prev) {
 	tmp = ALLOC_N(struct BLOCK, 1);
 	MEMCPY(tmp, block->prev, struct BLOCK, 1);
-	if (tmp->frame.argc > 0) {
-	    tmp->frame.argv = ALLOC_N(VALUE, tmp->frame.argc);
-	    MEMCPY(tmp->frame.argv, block->prev->frame.argv, VALUE, tmp->frame.argc);
-	    tmp->frame.flags |= FRAME_MALLOC;
-	}
+	tmp->frame.argv = ALLOC_N(VALUE, tmp->frame.argc);
 	scope_dup(tmp->scope);
-
-	for (vars = tmp->dyna_vars; vars; vars = vars->next) {
-	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	    FL_SET(vars, DVAR_DONT_RECYCLE);
-	}
-
+	MEMCPY(tmp->frame.argv, block->frame.argv, VALUE, tmp->frame.argc);
 	block->prev = tmp;
 	block = tmp;
     }
 }
 
-static void
-frame_dup(frame)
-    struct FRAME *frame;
-{
-    VALUE *argv;
-    struct FRAME *tmp;
-
-    for (;;) {
-	if (frame->argc > 0) {
-	    argv = ALLOC_N(VALUE, frame->argc);
-	    MEMCPY(argv, frame->argv, VALUE, frame->argc);
-	    frame->argv = argv;
-	    frame->flags |= FRAME_MALLOC;
-	}
-	frame->tmp = 0;		/* should not preserve tmp */
-	if (!frame->prev) break;
-	tmp = ALLOC(struct FRAME);
-	*tmp = *frame->prev;
-	frame->prev = tmp;
-	frame = tmp;
-    }
-}
 
 static VALUE
-proc_clone(self)
+bind_clone(self)
     VALUE self;
 {
     struct BLOCK *orig, *data;
     VALUE bind;
 
     Data_Get_Struct(self, struct BLOCK, orig);
-    bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
-    CLONESETUP(bind, self);
+    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
+    CLONESETUP(bind,self);
     MEMCPY(data, orig, struct BLOCK, 1);
-    frame_dup(&data->frame);
+    data->frame.argv = ALLOC_N(VALUE, orig->frame.argc);
+    MEMCPY(data->frame.argv, orig->frame.argv, VALUE, orig->frame.argc);
 
     if (data->iter) {
 	blk_copy_prev(data);
@@ -6883,8 +5319,7 @@ static VALUE
 rb_f_binding(self)
     VALUE self;
 {
-    struct BLOCK *data, *p;
-    struct RVarmap *vars;
+    struct BLOCK *data;
     VALUE bind;
 
     PUSH_BLOCK(0,0);
@@ -6892,13 +5327,12 @@ rb_f_binding(self)
     *data = *ruby_block;
 
     data->orig_thread = rb_thread_current();
-    data->wrapper = ruby_wrapper;
-    data->iter = rb_f_block_given_p();
-    frame_dup(&data->frame);
+    data->iter = rb_f_iterator_p();
     if (ruby_frame->prev) {
 	data->frame.last_func = ruby_frame->prev->last_func;
-	data->frame.last_class = ruby_frame->prev->last_class;
     }
+    data->frame.argv = ALLOC_N(VALUE, data->frame.argc);
+    MEMCPY(data->frame.argv, ruby_block->frame.argv, VALUE, data->frame.argc);
 
     if (data->iter) {
 	blk_copy_prev(data);
@@ -6907,68 +5341,73 @@ rb_f_binding(self)
 	data->prev = 0;
     }
 
-    for (p = data; p; p = p->prev) {
-	for (vars = p->dyna_vars; vars; vars = vars->next) {
-	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	    FL_SET(vars, DVAR_DONT_RECYCLE);
-	}
-    }
     scope_dup(data->scope);
     POP_BLOCK();
 
     return bind;
 }
 
-#define PROC_TSHIFT (FL_USHIFT+1)
-#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
+#define PROC_T3    FL_USER1
+#define PROC_T4    FL_USER2
+#define PROC_T5    (FL_USER1|FL_USER2)
+#define PROC_TMASK (FL_USER1|FL_USER2)
 
 static void
 proc_save_safe_level(data)
     VALUE data;
 {
-    FL_SET(data, (ruby_safe_level << PROC_TSHIFT) & PROC_TMASK);
-}
-
-static int
-proc_get_safe_level(data)
-    VALUE data;
-{
-    return (RBASIC(data)->flags & PROC_TMASK) >> PROC_TSHIFT;
+    if (FL_TEST(data, FL_TAINT)) {
+	switch (safe_level) {
+	  case 3:
+	    FL_SET(data, PROC_T3);
+	    break;
+	  case 4:
+	    FL_SET(data, PROC_T4);
+	    break;
+	  case 5:
+	    FL_SET(data, PROC_T5);
+	    break;
+	}
+    }
 }
 
 static void
 proc_set_safe_level(data)
     VALUE data;
 {
-    ruby_safe_level = proc_get_safe_level(data);
+    if (FL_TEST(data, FL_TAINT)) {
+	switch (RBASIC(data)->flags & PROC_TMASK) {
+	  case PROC_T3:
+	    safe_level = 3;
+	    break;
+	  case PROC_T4:
+	    safe_level = 4;
+	    break;
+	  case PROC_T5:
+	    safe_level = 5;
+	    break;
+	}
+    }
 }
 
 static VALUE
-proc_alloc(klass, proc)
+proc_s_new(klass)
     VALUE klass;
-    int proc;
 {
-    volatile VALUE block;
-    struct BLOCK *data, *p;
-    struct RVarmap *vars;
+    volatile VALUE proc;
+    struct BLOCK *data;
 
-    if (!rb_block_given_p() && !rb_f_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to create Proc object without a block");
-    }
-    if (proc && !rb_block_given_p()) {
-	rb_warn("tried to create Proc object without a block");
+    if (!rb_iterator_p() && !rb_f_iterator_p()) {
+	rb_raise(rb_eArgError, "tried to create Procedure-Object out of iterator");
     }
 
-    if (!proc && ruby_block->block_obj && CLASS_OF(ruby_block->block_obj) == klass) {
-	return ruby_block->block_obj;
-    }
-    block = Data_Make_Struct(klass, struct BLOCK, blk_mark, blk_free, data);
+    proc = Data_Make_Struct(klass, struct BLOCK, blk_mark, blk_free, data);
     *data = *ruby_block;
 
     data->orig_thread = rb_thread_current();
-    data->wrapper = ruby_wrapper;
     data->iter = data->prev?Qtrue:Qfalse;
-    frame_dup(&data->frame);
+    data->frame.argv = ALLOC_N(VALUE, data->frame.argc);
+    MEMCPY(data->frame.argv, ruby_block->frame.argv, VALUE, data->frame.argc);
     if (data->iter) {
 	blk_copy_prev(data);
     }
@@ -6976,60 +5415,24 @@ proc_alloc(klass, proc)
 	data->prev = 0;
     }
 
-    for (p = data; p; p = p->prev) {
-	for (vars = p->dyna_vars; vars; vars = vars->next) {
-	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	    FL_SET(vars, DVAR_DONT_RECYCLE);
-	}
-    }
     scope_dup(data->scope);
-    proc_save_safe_level(block);
-    if (proc) {
-	data->flags |= BLOCK_LAMBDA;
-    }
-    else {
-	ruby_block->block_obj = block;
-    }
-
-    return block;
-}
+    proc_save_safe_level(proc);
 
-static VALUE
-proc_s_new(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE block = proc_alloc(klass, Qfalse);
-
-    rb_obj_call_init(block, argc, argv);
-    return block;
-}
-
-VALUE
-rb_block_proc()
-{
-    return proc_alloc(rb_cProc, Qfalse);
+    return proc;
 }
 
 VALUE
 rb_f_lambda()
 {
-    rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead");
-    return proc_alloc(rb_cProc, Qtrue);
-}
-
-static VALUE
-proc_lambda()
-{
-    return proc_alloc(rb_cProc, Qtrue);
+    return proc_s_new(rb_cProc);
 }
 
 static int
-block_orphan(data)
+blk_orphan(data)
     struct BLOCK *data;
 {
-    if (data->scope->flags & SCOPE_NOSTACK) {
+    if (data->scope && data->scope != top_scope &&
+	(data->scope->flag & SCOPE_NOSTACK)) {
 	return 1;
     }
     if (data->orig_thread != rb_thread_current()) {
@@ -7039,99 +5442,80 @@ block_orphan(data)
 }
 
 static VALUE
-proc_invoke(proc, args, self, klass)
+proc_call(proc, args)
     VALUE proc, args;		/* OK */
-    VALUE self, klass;
 {
     struct BLOCK * volatile old_block;
-    struct BLOCK _block;
     struct BLOCK *data;
-    volatile VALUE result = Qundef;
+    volatile VALUE result = Qnil;
     int state;
     volatile int orphan;
-    volatile int safe = ruby_safe_level;
-    volatile VALUE old_wrapper = ruby_wrapper;
-    struct RVarmap * volatile old_dvars = ruby_dyna_vars;
-    volatile int pcall, avalue = Qtrue;
-
-    if (rb_block_given_p() && ruby_frame->last_func) {
-	rb_warning("block for %s#%s is useless",
-		   rb_obj_classname(proc),
-		   rb_id2name(ruby_frame->last_func));
-    }
+    volatile int safe = safe_level;
 
     Data_Get_Struct(proc, struct BLOCK, data);
-    orphan = block_orphan(data);
-    pcall = data->flags & BLOCK_LAMBDA ? YIELD_PROC_CALL : 0;
-    if (!pcall && RARRAY(args)->len == 1) {
-	avalue = Qfalse;
-	args = RARRAY(args)->ptr[0];
-    }
+    orphan = blk_orphan(data);
 
-    ruby_wrapper = data->wrapper;
-    ruby_dyna_vars = data->dyna_vars;
     /* PUSH BLOCK from data */
     old_block = ruby_block;
-    _block = *data;
-    if (self != Qundef) _block.frame.self = self;
-    if (klass) _block.frame.last_class = klass;
-    ruby_block = &_block;
-
+    ruby_block = data;
     PUSH_ITER(ITER_CUR);
     ruby_frame->iter = ITER_CUR;
-    PUSH_TAG((pcall || orphan) ? PROT_PCALL : PROT_CALL);
+
+    if (TYPE(args) == T_ARRAY) {
+	switch (RARRAY(args)->len) {
+	  case 0:
+	    args = Qnil;
+	    break;
+	  case 1:
+	    args = RARRAY(args)->ptr[0];
+	    break;
+	}
+    }
+
+    if (orphan) {/* orphan procedure */
+	if (rb_iterator_p()) {
+	    ruby_block->frame.iter = ITER_CUR;
+	}
+	else {
+	    ruby_block->frame.iter = ITER_NOT;
+	}
+    }
+
+    PUSH_TAG(PROT_NONE);
     state = EXEC_TAG();
     if (state == 0) {
 	proc_set_safe_level(proc);
-	result = rb_yield_0(args, self, (self!=Qundef)?CLASS_OF(self):0, pcall, avalue);
-    }
-    else if (pcall || orphan || TAG_DST()) {
-	result = prot_tag->retval;
+	result = rb_yield_0(args, 0, 0);
     }
     POP_TAG();
+
     POP_ITER();
+    if (ruby_block->tag->dst == state) {
+	state &= TAG_MASK;
+    }
     ruby_block = old_block;
-    ruby_wrapper = old_wrapper;
-    ruby_dyna_vars = old_dvars;
-    ruby_safe_level = safe;
+    safe_level = safe;
 
-    switch (state) {
-      case 0:
-	break;
-      case TAG_RETRY:
-	if (pcall || orphan) {
-	    localjump_error("retry from proc-closure", Qnil, state);
-	}
-	/* fall through */
-      case TAG_BREAK:
-      case TAG_RETURN:
-	if (pcall) break;
-	if (orphan) {		/* orphan block */
-	    char mesg[32];
-	    snprintf(mesg, sizeof mesg, "%s from proc-closure",
-		     state == TAG_BREAK ? "break" : "return");
-	    localjump_error(mesg, result, state);
-	}
-	if (result != Qundef) {
-	    localjump_destination(state, result);
+    if (state) {
+	if (orphan) {/* orphan procedure */
+	    switch (state) {
+	      case TAG_BREAK:
+		rb_raise(rb_eLocalJumpError, "break from proc-closure");
+		break;
+	      case TAG_RETRY:
+		rb_raise(rb_eLocalJumpError, "retry from proc-closure");
+		break;
+	      case TAG_RETURN:
+		rb_raise(rb_eLocalJumpError, "return from proc-closure");
+		break;
+	    }
 	}
-      default:
 	JUMP_TAG(state);
     }
     return result;
 }
 
 static VALUE
-proc_call(proc, args)
-    VALUE proc, args;		/* OK */
-{
-    return proc_invoke(proc, args, Qundef, 0);
-}
-
-static VALUE bmcall _((VALUE, VALUE));
-static VALUE method_arity _((VALUE));
-
-static VALUE
 proc_arity(proc)
     VALUE proc;
 {
@@ -7140,18 +5524,10 @@ proc_arity(proc)
     int n;
 
     Data_Get_Struct(proc, struct BLOCK, data);
-    if (data->var == 0) {
-	if (data->body && nd_type(data->body) == NODE_IFUNC &&
-	    data->body->nd_cfnc == bmcall) {
-	    return method_arity(data->body->nd_tval);
-	}
-	return INT2FIX(-1);
-    }
-    if (data->var == (NODE*)1) return INT2FIX(0);
-    if (data->var == (NODE*)2) return INT2FIX(0);
+    if (data->var == 0) return FIX2INT(-1);
     switch (nd_type(data->var)) {
       default:
-	return INT2FIX(1);
+	return INT2FIX(-2);
       case NODE_MASGN:
 	list = data->var->nd_head;
 	n = 0;
@@ -7165,171 +5541,74 @@ proc_arity(proc)
 }
 
 static VALUE
-proc_eq(self, other)
-    VALUE self, other;
-{
-    struct BLOCK *data, *data2;
-
-    if (self == other) return Qtrue;
-    if (TYPE(other) != T_DATA) return Qfalse;
-    if (RDATA(other)->dmark != (RUBY_DATA_FUNC)blk_mark) return Qfalse;
-    if (CLASS_OF(self) != CLASS_OF(other)) return Qfalse;
-    Data_Get_Struct(self, struct BLOCK, data);
-    Data_Get_Struct(other, struct BLOCK, data2);
-    if (data->body == data2->body) return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-proc_to_s(self, other)
-    VALUE self, other;
-{
-    struct BLOCK *data;
-    NODE *node;
-    char *cname = rb_obj_classname(self);
-    const int w = (SIZEOF_LONG * CHAR_BIT) / 4;
-    long len = strlen(cname)+6+w; /* 6:tags 16:addr */
-    VALUE str;
-
-    Data_Get_Struct(self, struct BLOCK, data);
-    if ((node = data->frame.node) || (node = data->body)) {
-	len += strlen(node->nd_file) + 2 + (SIZEOF_LONG*CHAR_BIT-NODE_LSHIFT)/3;
-	str = rb_str_new(0, len);
-	sprintf(RSTRING(str)->ptr, "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
-		node->nd_file, nd_line(node));
-    }
-    else {
-	str = rb_str_new(0, len);
-	sprintf(RSTRING(str)->ptr, "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
-    }
-    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
-    if (OBJ_TAINTED(self)) OBJ_TAINT(str);
-
-    return str;
-}
-
-static VALUE
-proc_to_self(self)
-    VALUE self;
-{
-    return self;
-}
-
-static VALUE
-proc_binding(proc)
-    VALUE proc;
-{
-    struct BLOCK *orig, *data;
-    VALUE bind;
-
-    Data_Get_Struct(proc, struct BLOCK, orig);
-    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
-    MEMCPY(data, orig, struct BLOCK, 1);
-    frame_dup(&data->frame);
-
-    if (data->iter) {
-	blk_copy_prev(data);
-    }
-    else {
-	data->prev = 0;
-    }
-
-    return bind;
-}
-
-static VALUE
 block_pass(self, node)
     VALUE self;
     NODE *node;
 {
-    VALUE proc = rb_eval(self, node->nd_body);	/* OK */
-    VALUE b;
+    VALUE block = rb_eval(self, node->nd_body);
     struct BLOCK * volatile old_block;
-    struct BLOCK _block;
     struct BLOCK *data;
     volatile VALUE result = Qnil;
     int state;
     volatile int orphan;
-    volatile int safe = ruby_safe_level;
+    volatile int safe = safe_level;
 
-    if (NIL_P(proc)) {
-	PUSH_ITER(ITER_NOT);
-	result = rb_eval(self, node->nd_iter);
-	POP_ITER();
-	return result;
+    if (NIL_P(block)) {
+	return rb_eval(self, node->nd_iter);
     }
-    if (!rb_obj_is_proc(proc)) {
-	b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
-	if (!rb_obj_is_proc(b)) {
-	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)",
-		     rb_obj_classname(proc));
-	}
-	proc = b;
+    if (rb_obj_is_kind_of(block, rb_cMethod)) {
+	block = method_proc(block);
     }
-
-    if (ruby_safe_level >= 1 && OBJ_TAINTED(proc)) {
-	if (ruby_safe_level > proc_get_safe_level(proc)) {
-	    rb_raise(rb_eSecurityError, "Insecure: tainted block value");
-	}
+    else if (!rb_obj_is_proc(block)) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)",
+		 rb_class2name(CLASS_OF(block)));
     }
 
-    if (ruby_block && ruby_block->block_obj == proc) {
-	PUSH_ITER(ITER_PRE);
-	result = rb_eval(self, node->nd_iter);
-	POP_ITER();
-	return result;
-    }
-
-    Data_Get_Struct(proc, struct BLOCK, data);
-    orphan = block_orphan(data);
+    Data_Get_Struct(block, struct BLOCK, data);
+    orphan = blk_orphan(data);
 
     /* PUSH BLOCK from data */
     old_block = ruby_block;
-    _block = *data;
-    _block.outer = ruby_block;
-    ruby_block = &_block;
+    ruby_block = data;
     PUSH_ITER(ITER_PRE);
-    if (ruby_frame->iter == ITER_NOT)
-	ruby_frame->iter = ITER_PRE;
+    ruby_frame->iter = ITER_PRE;
 
-    PUSH_TAG(PROT_ITER);
+    PUSH_TAG(PROT_NONE);
     state = EXEC_TAG();
     if (state == 0) {
-      retry:
-	proc_set_safe_level(proc);
-	if (safe > ruby_safe_level)
-	    ruby_safe_level = safe;
+	proc_set_safe_level(block);
 	result = rb_eval(self, node->nd_iter);
     }
-    else if (state == TAG_BREAK && TAG_DST()) {
-	result = prot_tag->retval;
-	state = 0;
-    }
-    else if (state == TAG_RETRY) {
-	state = 0;
-	goto retry;
-    }
     POP_TAG();
     POP_ITER();
+    if (ruby_block->tag->dst == state) {
+	state &= TAG_MASK;
+	orphan = 2;
+    }
     ruby_block = old_block;
-    ruby_safe_level = safe;
+    safe_level = safe;
 
-    switch (state) {/* escape from orphan block */
-      case 0:
-	break;
-      case TAG_RETURN:
-	if (orphan) {
-	    localjump_error("return from proc-closure", prot_tag->retval, state);
+    if (state) {
+	if (orphan == 2) {/* escape from orphan procedure */
+	    switch (state) {
+	      case TAG_BREAK:
+		rb_raise(rb_eLocalJumpError, "break from proc-closure");
+		break;
+	      case TAG_RETRY:
+		rb_raise(rb_eLocalJumpError, "retry from proc-closure");
+		break;
+	      case TAG_RETURN:
+		rb_raise(rb_eLocalJumpError, "return from proc-closure");
+		break;
+	    }
 	}
-      default:
 	JUMP_TAG(state);
     }
-
     return result;
 }
 
 struct METHOD {
-    VALUE klass, rklass;
+    VALUE klass, oklass;
     VALUE recv;
     ID id, oid;
     NODE *body;
@@ -7339,27 +5618,29 @@ static void
 bm_mark(data)
     struct METHOD *data;
 {
-    rb_gc_mark(data->rklass);
+    rb_gc_mark(data->oklass);
     rb_gc_mark(data->klass);
     rb_gc_mark(data->recv);
-    rb_gc_mark((VALUE)data->body);
+    rb_gc_mark(data->body);
 }
 
 static VALUE
-mnew(klass, obj, id, mklass)
-    VALUE klass, obj, mklass;
-    ID id;
+rb_obj_method(obj, vid)
+    VALUE obj;
+    VALUE vid;
 {
     VALUE method;
+    VALUE klass = CLASS_OF(obj);
+    ID id;
     NODE *body;
     int noex;
     struct METHOD *data;
-    VALUE rklass = klass;
-    ID oid = id;
+
+    id = rb_to_id(vid);
 
   again:
     if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
-	print_undef(rklass, oid);
+	return rb_undefined(obj, rb_to_id(vid), 0, 0, 0);
     }
 
     if (nd_type(body) == NODE_ZSUPER) {
@@ -7367,155 +5648,50 @@ mnew(klass, obj, id, mklass)
 	goto again;
     }
 
-    while (rklass != klass &&
-	   (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) {
-	rklass = RCLASS(rklass)->super;
-    }
-    if (TYPE(klass) == T_ICLASS) klass = RBASIC(klass)->klass;
-    method = Data_Make_Struct(mklass, struct METHOD, bm_mark, free, data);
+    method = Data_Make_Struct(rb_cMethod, struct METHOD, bm_mark, free, data);
     data->klass = klass;
     data->recv = obj;
     data->id = id;
     data->body = body;
-    data->rklass = rklass;
-    data->oid = oid;
-    OBJ_INFECT(method, klass);
-
-    return method;
-}
-
-static VALUE
-method_eq(method, other)
-    VALUE method, other;
-{
-    struct METHOD *m1, *m2;
-
-    if (TYPE(other) != T_DATA || RDATA(other)->dmark != (RUBY_DATA_FUNC)bm_mark)
-	return Qfalse;
-    if (CLASS_OF(method) != CLASS_OF(other))
-	return Qfalse;
-
-    Data_Get_Struct(method, struct METHOD, m1);
-    Data_Get_Struct(other, struct METHOD, m2);
-
-    if (m1->klass != m2->klass || m1->rklass != m2->rklass ||
-	m1->recv != m2->recv || m1->body != m2->body)
-	return Qfalse;
-
-    return Qtrue;
-}
-
-static VALUE
-method_unbind(obj)
-    VALUE obj;
-{
-    VALUE method;
-    struct METHOD *orig, *data;
-
-    Data_Get_Struct(obj, struct METHOD, orig);
-    method = Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free, data);
-    data->klass = orig->klass;
-    data->recv = Qundef;
-    data->id = orig->id;
-    data->body = orig->body;
-    data->rklass = orig->rklass;
-    data->oid = orig->oid;
-    OBJ_INFECT(method, obj);
+    data->oklass = CLASS_OF(obj);
+    data->oid = rb_to_id(vid);
+    if (FL_TEST(obj, FL_TAINT)) {
+	FL_SET(method, FL_TAINT);
+    }
 
     return method;
 }
 
 static VALUE
-rb_obj_method(obj, vid)
-    VALUE obj;
-    VALUE vid;
-{
-    return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod);
-}
-
-static VALUE
-rb_mod_method(mod, vid)
-    VALUE mod;
-    VALUE vid;
-{
-    return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
-}
-
-static VALUE
-method_clone(self)
-    VALUE self;
-{
-    VALUE clone;
-    struct METHOD *orig, *data;
-
-    Data_Get_Struct(self, struct METHOD, orig);
-    clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
-    CLONESETUP(clone, self);
-    *data = *orig;
-
-    return clone;
-}
-
-static VALUE
 method_call(argc, argv, method)
     int argc;
     VALUE *argv;
     VALUE method;
 {
-    VALUE result = Qnil;	/* OK */
+    VALUE result;
     struct METHOD *data;
     int state;
-    volatile int safe = ruby_safe_level;
+    volatile int safe = safe_level;
 
     Data_Get_Struct(method, struct METHOD, data);
-    if (data->recv == Qundef) {
-	rb_raise(rb_eTypeError, "you cannot call unbound method; bind first");
-    }
-    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    PUSH_ITER(rb_iterator_p()?ITER_PRE:ITER_NOT);
     PUSH_TAG(PROT_NONE);
-    if (OBJ_TAINTED(method) && ruby_safe_level < 4) {
-	ruby_safe_level = 4;
+    if (FL_TEST(data->recv, FL_TAINT) || FL_TEST(method, FL_TAINT)) {
+	FL_SET(method, FL_TAINT);
+	if (safe_level < 4) safe_level = 4;
     }
     if ((state = EXEC_TAG()) == 0) {
-	result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,0);
+	result = rb_call0(data->klass, data->recv, data->id,
+			  argc, argv, data->body, 0);
     }
     POP_TAG();
     POP_ITER();
-    ruby_safe_level = safe;
+    safe_level = safe;
     if (state) JUMP_TAG(state);
     return result;
 }
 
 static VALUE
-umethod_bind(method, recv)
-    VALUE method, recv;
-{
-    struct METHOD *data, *bound;
-
-    Data_Get_Struct(method, struct METHOD, data);
-    if (data->rklass != CLASS_OF(recv)) {
-	if (FL_TEST(data->rklass, FL_SINGLETON)) {
-	    rb_raise(rb_eTypeError, "singleton method called for a different object");
-	}
-	if (FL_TEST(CLASS_OF(recv), FL_SINGLETON) &&
-	    st_lookup(RCLASS(CLASS_OF(recv))->m_tbl, data->oid, 0)) {
-	    rb_raise(rb_eTypeError, "method `%s' overridden", rb_id2name(data->oid));
-	}
-	if(!rb_obj_is_kind_of(recv, data->rklass)) {
-	    rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
-		     rb_class2name(data->rklass));
-	}
-    }
-
-    method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
-    *bound = *data;
-    bound->recv = recv;
-    bound->rklass = CLASS_OF(recv);
-
-    return method;
-}
-
-static VALUE
 method_arity(method)
     VALUE method;
 {
@@ -7536,17 +5712,13 @@ method_arity(method)
 	return INT2FIX(1);
       case NODE_IVAR:
 	return INT2FIX(0);
-      case NODE_BMETHOD:
-      case NODE_DMETHOD:
-       return proc_arity(method);
       default:
 	body = body->nd_next;	/* skip NODE_SCOPE */
 	if (nd_type(body) == NODE_BLOCK)
 	    body = body->nd_head;
 	if (!body) return INT2FIX(0);
 	n = body->nd_cnt;
-	if (body->nd_opt || body->nd_rest != -1)
-	    n = -n-1;
+	if (body->nd_rest) n = -n-1;
 	return INT2FIX(n);
     }
 }
@@ -7558,57 +5730,31 @@ method_inspect(method)
     struct METHOD *data;
     VALUE str;
     const char *s;
-    char *sharp = "#";
 
     Data_Get_Struct(method, struct METHOD, data);
-    str = rb_str_buf_new2("#<");
-    s = rb_obj_classname(method);
-    rb_str_buf_cat2(str, s);
-    rb_str_buf_cat2(str, ": ");
-
-    if (FL_TEST(data->klass, FL_SINGLETON)) {
-	VALUE v = rb_iv_get(data->klass, "__attached__");
-
-	if (data->recv == Qundef) {
-	    rb_str_buf_append(str, rb_inspect(data->klass));
-	}
-	else if (data->recv == v) {
-	    rb_str_buf_append(str, rb_inspect(v));
-	    sharp = ".";
-	}
-	else {
-	    rb_str_buf_append(str, rb_inspect(data->recv));
-	    rb_str_buf_cat2(str, "(");
-	    rb_str_buf_append(str, rb_inspect(v));
-	    rb_str_buf_cat2(str, ")");
-	    sharp = ".";
-	}
-    }
-    else {
-	rb_str_buf_cat2(str, rb_class2name(data->rklass));
-	if (data->rklass != data->klass) {
-	    rb_str_buf_cat2(str, "(");
-	    rb_str_buf_cat2(str, rb_class2name(data->klass));
-	    rb_str_buf_cat2(str, ")");
-	}
-    }
-    rb_str_buf_cat2(str, sharp);
-    rb_str_buf_cat2(str, rb_id2name(data->oid));
-    rb_str_buf_cat2(str, ">");
+    str = rb_str_new2("#<");
+    s = rb_class2name(CLASS_OF(method));
+    rb_str_cat(str, s, strlen(s));
+    rb_str_cat(str, ": ", 2);
+    s = rb_class2name(data->oklass);
+    rb_str_cat(str, s, strlen(s));
+    rb_str_cat(str, "#", 1);
+    s = rb_id2name(data->oid);
+    rb_str_cat(str, s, strlen(s));
+    rb_str_cat(str, ">", 1);
 
     return str;
 }
 
 static VALUE
-mproc(method)
-    VALUE method;
+mproc()
 {
     VALUE proc;
 
     /* emulate ruby's method call */
     PUSH_ITER(ITER_CUR);
     PUSH_FRAME();
-    proc = rb_block_proc();
+    proc = rb_f_lambda();
     POP_FRAME();
     POP_ITER();
 
@@ -7616,294 +5762,104 @@ mproc(method)
 }
 
 static VALUE
-bmcall(args, method)
+mcall(args, method)
     VALUE args, method;
 {
-    volatile VALUE a;
-
-    a = svalue_to_avalue(args);
-    return method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
-}
-
-VALUE
-rb_proc_new(func, val)
-    VALUE (*func)(ANYARGS);	/* VALUE yieldarg[, VALUE procarg] */
-    VALUE val;
-{
-    struct BLOCK *data;
-    VALUE proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, func, val);
-
-    Data_Get_Struct(proc, struct BLOCK, data);
-    data->body->nd_state = YIELD_FUNC_AVALUE;
-    return proc;
+    if (TYPE(args) == T_ARRAY) {
+	return method_call(RARRAY(args)->len, RARRAY(args)->ptr, method);
+    }
+    return method_call(1, &args, method);
 }
 
 static VALUE
 method_proc(method)
     VALUE method;
 {
-    VALUE proc;
-    struct METHOD *mdata;
-    struct BLOCK *bdata;
-
-    proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, bmcall, method);
-    Data_Get_Struct(method, struct METHOD, mdata);
-    Data_Get_Struct(proc, struct BLOCK, bdata);
-    bdata->body->nd_file = mdata->body->nd_file;
-    nd_set_line(bdata->body, nd_line(mdata->body));
-    bdata->body->nd_state = YIELD_FUNC_SVALUE;
-
-    return proc;
-}
-
-static VALUE
-rb_obj_is_method(m)
-    VALUE m;
-{
-    if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC)bm_mark) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-static VALUE
-rb_mod_define_method(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-{
-    ID id;
-    VALUE body;
-    NODE *node;
-    int noex;
-
-    if (argc == 1) {
-	id = rb_to_id(argv[0]);
-	body = proc_lambda();
-    }
-    else if (argc == 2) {
-	id = rb_to_id(argv[0]);
-	body = argv[1];
-	if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) {
-	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Method)",
-		     rb_obj_classname(body));
-	}
-    }
-    else {
-	rb_raise(rb_eArgError, "wrong number of arguments(%d for 1)", argc);
-    }
-    if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) {
-	node = NEW_DMETHOD(method_unbind(body));
-    }
-    else if (RDATA(body)->dmark == (RUBY_DATA_FUNC)blk_mark) {
-	struct BLOCK *block;
-
-	body = proc_clone(body);
-	Data_Get_Struct(body, struct BLOCK, block);
-	block->frame.last_func = id;
-	block->frame.orig_func = id;
-	block->frame.last_class = mod;
-	node = NEW_BMETHOD(body);
-    }
-    else {
-	/* type error */
-	rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)");
-    }
-
-    if (SCOPE_TEST(SCOPE_PRIVATE)) {
-	noex = NOEX_PRIVATE;
-    }
-    else if (SCOPE_TEST(SCOPE_PROTECTED)) {
-	noex = NOEX_PROTECTED;
-    }
-    else {
-	noex = NOEX_PUBLIC;
-    }
-    rb_add_method(mod, id, node, noex);
-    return body;
+    return rb_iterate(mproc, 0, mcall, method);
 }
 
 void
 Init_Proc()
 {
     rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError);
-    rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0);
-    rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
-
-    exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
-    rb_global_variable(&exception_error);
-
     rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
-    sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
-    OBJ_TAINT(sysstack_error);
-    rb_global_variable(&sysstack_error);
 
     rb_cProc = rb_define_class("Proc", rb_cObject);
-    rb_undef_alloc_func(rb_cProc);
-    rb_define_singleton_method(rb_cProc, "new", proc_s_new, -1);
+    rb_define_singleton_method(rb_cProc, "new", proc_s_new, 0);
 
-    rb_define_method(rb_cProc, "clone", proc_clone, 0);
     rb_define_method(rb_cProc, "call", proc_call, -2);
     rb_define_method(rb_cProc, "arity", proc_arity, 0);
     rb_define_method(rb_cProc, "[]", proc_call, -2);
-    rb_define_method(rb_cProc, "==", proc_eq, 1);
-    rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
-    rb_define_method(rb_cProc, "to_proc", proc_to_self, 0);
-    rb_define_method(rb_cProc, "binding", proc_binding, 0);
-
-    rb_define_global_function("proc", proc_lambda, 0);
-    rb_define_global_function("lambda", proc_lambda, 0);
-
-    rb_cBinding = rb_define_class("Binding", rb_cObject);
-    rb_undef_alloc_func(rb_cBinding);
-    rb_undef_method(CLASS_OF(rb_cBinding), "new");
-    rb_define_method(rb_cBinding, "clone", proc_clone, 0);
+    rb_define_global_function("proc", rb_f_lambda, 0);
+    rb_define_global_function("lambda", rb_f_lambda, 0);
     rb_define_global_function("binding", rb_f_binding, 0);
+    rb_cBinding = rb_define_class("Binding", rb_cObject);
+    rb_undef_method(CLASS_OF(rb_cMethod), "new");
+    rb_define_method(rb_cBinding, "clone", bind_clone, 0);
 
     rb_cMethod = rb_define_class("Method", rb_cObject);
-    rb_undef_alloc_func(rb_cMethod);
     rb_undef_method(CLASS_OF(rb_cMethod), "new");
-    rb_define_method(rb_cMethod, "==", method_eq, 1);
-    rb_define_method(rb_cMethod, "clone", method_clone, 0);
     rb_define_method(rb_cMethod, "call", method_call, -1);
     rb_define_method(rb_cMethod, "[]", method_call, -1);
     rb_define_method(rb_cMethod, "arity", method_arity, 0);
     rb_define_method(rb_cMethod, "inspect", method_inspect, 0);
     rb_define_method(rb_cMethod, "to_s", method_inspect, 0);
     rb_define_method(rb_cMethod, "to_proc", method_proc, 0);
-    rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
     rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
-
-    rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
-    rb_undef_alloc_func(rb_cUnboundMethod);
-    rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new");
-    rb_define_method(rb_cUnboundMethod, "==", method_eq, 1);
-    rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0);
-    rb_define_method(rb_cUnboundMethod, "arity", method_arity, 0);
-    rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0);
-    rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0);
-    rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
-    rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1);
-}
-
-#ifdef __ia64__
-#include <ucontext.h>
-#pragma weak __libc_ia64_register_backing_store_base
-extern unsigned long __libc_ia64_register_backing_store_base;
-#endif
-
-/* Windows SEH refers data on the stack. */
-#undef SAVE_WIN32_EXCEPTION_LIST
-#if defined _WIN32 || defined __CYGWIN__
-#if defined __CYGWIN__
-typedef unsigned long DWORD;
-#endif
-
-static inline DWORD
-win32_get_exception_list()
-{
-    DWORD p;
-# if defined _MSC_VER
-#   ifdef _M_IX86
-#   define SAVE_WIN32_EXCEPTION_LIST
-#   if _MSC_VER >= 1310
-      /* warning: unsafe assignment to fs:0 ... this is ok */
-#     pragma warning(disable: 4733)
-#   endif
-    __asm mov eax, fs:[0];
-    __asm mov p, eax;
-#   endif
-# elif defined __GNUC__
-#   ifdef __i386__
-#   define SAVE_WIN32_EXCEPTION_LIST
-    __asm__("movl %%fs:0,%0" : "=r"(p));
-#   endif
-# elif defined __BORLANDC__
-#   define SAVE_WIN32_EXCEPTION_LIST
-    __emit__(0x64, 0xA1, 0, 0, 0, 0); /* mov eax, fs:[0] */
-    p = _EAX;
-# endif
-    return p;
-}
-
-static inline void
-win32_set_exception_list(p)
-    DWORD p;
-{
-# if defined _MSC_VER
-#   ifdef _M_IX86
-    __asm mov eax, p;
-    __asm mov fs:[0], eax;
-#   endif
-# elif defined __GNUC__
-#   ifdef __i386__
-    __asm__("movl %0,%%fs:0" :: "r"(p));
-#   endif
-# elif defined __BORLANDC__
-    _EAX = p;
-    __emit__(0x64, 0xA3, 0, 0, 0, 0); /* mov fs:[0], eax */
-# endif
 }
 
-#if !defined SAVE_WIN32_EXCEPTION_LIST && !defined _WIN32_WCE
-# error unsupported platform
-#endif
-#endif
+static VALUE rb_eThreadError;
 
 int rb_thread_pending = 0;
 
 VALUE rb_cThread;
 
+#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#else
+#ifndef NT
+struct timeval {
+        long    tv_sec;         /* seconds */
+        long    tv_usec;        /* and microseconds */
+};
+#endif /* NT */
+#endif
+#include <signal.h>
+#include <errno.h>
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 extern VALUE rb_last_status;
 
 enum thread_status {
-    THREAD_TO_KILL,
     THREAD_RUNNABLE,
     THREAD_STOPPED,
+    THREAD_TO_KILL,
     THREAD_KILLED,
 };
 
 #define WAIT_FD		(1<<0)
-#define WAIT_SELECT	(1<<1)
-#define WAIT_TIME	(1<<2)
-#define WAIT_JOIN	(1<<3)
-#define WAIT_PID	(1<<4)
+#define WAIT_TIME	(1<<1)
+#define WAIT_JOIN	(1<<2)
 
 /* +infty, for this purpose */
 #define DELAY_INFTY 1E30
 
-#if !defined HAVE_PAUSE
-# if defined _WIN32 && !defined __CYGWIN__
-#  define pause() Sleep(INFINITE)
-# else
-#  define pause() sleep(0x7fffffff)
-# endif
-#endif
-
-/* typedef struct thread * rb_thread_t; */
+typedef struct thread * thread_t;
 
 struct thread {
     struct thread *next, *prev;
-#ifdef __ia64__
-    ucontext_t context;
-    int context_status;
-#else
     jmp_buf context;
-#endif
-#ifdef SAVE_WIN32_EXCEPTION_LIST
-    DWORD win32_exception_list;
-#endif
 
     VALUE result;
 
-    long   stk_len;
-    long   stk_max;
-    VALUE *stk_ptr;
-    VALUE *stk_pos;
-#ifdef __ia64__
-    VALUE *bstr_ptr;
-    long   bstr_len;
-#endif
+    int   stk_len;
+    int   stk_max;
+    VALUE*stk_ptr;
+    VALUE*stk_pos;
 
     struct FRAME *frame;
     struct SCOPE *scope;
@@ -7913,13 +5869,13 @@ struct thread {
     struct tag *tag;
     VALUE klass;
     VALUE wrapper;
-    NODE *cref;
 
-    int flags;		/* misc. states (vmode/rb_trap_immediate/raised) */
+    VALUE trace;
+    int misc;			/* misc. states (vmode/rb_trap_immediate) */
 
-    NODE *node;
+    char *file;
+    int   line;
 
-    int tracing;
     VALUE errinfo;
     VALUE last_status;
     VALUE last_line;
@@ -7930,25 +5886,20 @@ struct thread {
     enum thread_status status;
     int wait_for;
     int fd;
-    fd_set readfds;
-    fd_set writefds;
-    fd_set exceptfds;
-    int select_value;
     double delay;
-    rb_thread_t join;
+    thread_t join;
 
     int abort;
-    int priority;
-    VALUE thgroup;
 
     st_table *locals;
 
     VALUE thread;
 };
 
-#define THREAD_RAISED 0x200	 /* temporary flag */
-#define THREAD_TERMINATING 0x400 /* persistent flag */
-#define THREAD_FLAGS_MASK  0x400 /* mask for persistent flags */
+static thread_t curr_thread = 0;
+static int num_waiting_on_fd = 0;
+static int num_waiting_on_timer = 0;
+static int num_waiting_on_join = 0;
 
 #define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next;
 #define END_FOREACH_FROM(f,x) } while (x != f)
@@ -7956,150 +5907,6 @@ struct thread {
 #define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x)
 #define END_FOREACH(x)    END_FOREACH_FROM(curr_thread,x)
 
-struct thread_status_t {
-    NODE *node;
-
-    int tracing;
-    VALUE errinfo;
-    VALUE last_status;
-    VALUE last_line;
-    VALUE last_match;
-
-    int safe;
-
-    enum thread_status status;
-    int wait_for;
-    int fd;
-    fd_set readfds;
-    fd_set writefds;
-    fd_set exceptfds;
-    int select_value;
-    double delay;
-    rb_thread_t join;
-};
-
-#define THREAD_COPY_STATUS(src, dst) (void)(	\
-    (dst)->node = (src)->node,			\
-						\
-    (dst)->tracing = (src)->tracing,		\
-    (dst)->errinfo = (src)->errinfo,		\
-    (dst)->last_status = (src)->last_status,	\
-    (dst)->last_line = (src)->last_line,	\
-    (dst)->last_match = (src)->last_match,	\
-						\
-    (dst)->safe = (src)->safe,			\
-						\
-    (dst)->status = (src)->status,		\
-    (dst)->wait_for = (src)->wait_for,		\
-    (dst)->fd = (src)->fd,			\
-    (dst)->readfds = (src)->readfds,		\
-    (dst)->writefds = (src)->writefds,		\
-    (dst)->exceptfds = (src)->exceptfds,	\
-    (dst)->select_value = (src)->select_value,	\
-    (dst)->delay = (src)->delay,		\
-    (dst)->join = (src)->join,			\
-    0)
-
-static int
-thread_set_raised()
-{
-    if (curr_thread->flags & THREAD_RAISED) return 1;
-    curr_thread->flags |= THREAD_RAISED;
-    return 0;
-}
-
-static int
-thread_reset_raised()
-{
-    if (!(curr_thread->flags & THREAD_RAISED)) return 0;
-    curr_thread->flags &= ~THREAD_RAISED;
-    return 1;
-}
-
-static void rb_thread_ready _((rb_thread_t));
-
-static VALUE
-rb_trap_eval(cmd, sig)
-    VALUE cmd;
-    int sig;
-{
-    int state;
-    VALUE val = Qnil;		/* OK */
-    volatile struct thread_status_t save;
-
-    THREAD_COPY_STATUS(curr_thread, &save);
-    rb_thread_ready(curr_thread);
-    PUSH_TAG(PROT_NONE);
-    PUSH_ITER(ITER_NOT);
-    if ((state = EXEC_TAG()) == 0) {
-	val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)), 0);
-    }
-    POP_ITER();
-    POP_TAG();
-    THREAD_COPY_STATUS(&save, curr_thread);
-
-    if (state) {
-	rb_trap_immediate = 0;
-	JUMP_TAG(state);
-    }
-
-    if (curr_thread->status == THREAD_STOPPED) {
-	rb_thread_schedule();
-    }
-    errno = EINTR;
-
-    return val;
-}
-
-static const char *
-thread_status_name(status)
-    enum thread_status status;
-{
-    switch (status) {
-      case THREAD_RUNNABLE:
-	return "run";
-      case THREAD_STOPPED:
-	return "sleep";
-      case THREAD_TO_KILL:
-	return "aborting";
-      case THREAD_KILLED:
-	return "dead";
-      default:
-	return "unknown";
-    }
-}
-
-/* $SAFE accessor */
-void
-rb_set_safe_level(level)
-    int level;
-{
-    if (level > ruby_safe_level) {
-	ruby_safe_level = level;
-	curr_thread->safe = level;
-    }
-}
-
-static VALUE
-safe_getter()
-{
-    return INT2NUM(ruby_safe_level);
-}
-
-static void
-safe_setter(val)
-    VALUE val;
-{
-    int level = NUM2INT(val);
-
-    if (level < ruby_safe_level) {
-	rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d",
-		 ruby_safe_level, level);
-    }
-    ruby_safe_level = level;
-    curr_thread->safe = level;
-}
-
 /* Return the current time as a floating-point number */
 static double
 timeofday()
@@ -8109,31 +5916,14 @@ timeofday()
     return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
 }
 
-#define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len)
-#define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr))
-#ifdef C_ALLOCA
-# define MARK_FRAME_ADJ(f) rb_gc_mark_frame(f)
-#else
-# define MARK_FRAME_ADJ(f) mark_frame_adj(f, th)
-static void
-mark_frame_adj(frame, th)
-    struct FRAME *frame;
-    rb_thread_t th;
-{
-    if (frame->flags & FRAME_MALLOC) {
-	rb_gc_mark_locations(frame->argv, frame->argv+frame->argc);
-    }
-    else {
-	VALUE *start = ADJ(frame->argv);
-	rb_gc_mark_locations(start, start+frame->argc);
-    }
-    rb_gc_mark((VALUE)frame->node);
-}
-#endif
+static thread_t main_thread;
+
+#define ADJ(addr) (void*)(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr)
+#define STACK(addr) (th->stk_pos<(addr) && (addr)<th->stk_pos+th->stk_len)
 
 static void
 thread_mark(th)
-    rb_thread_t th;
+    thread_t th;
 {
     struct FRAME *frame;
     struct BLOCK *block;
@@ -8144,17 +5934,15 @@ thread_mark(th)
 
     rb_gc_mark(th->klass);
     rb_gc_mark(th->wrapper);
-    rb_gc_mark((VALUE)th->cref);
 
-    rb_gc_mark((VALUE)th->scope);
-    rb_gc_mark((VALUE)th->dyna_vars);
+    rb_gc_mark(th->scope);
+    rb_gc_mark(th->dyna_vars);
     rb_gc_mark(th->errinfo);
     rb_gc_mark(th->last_line);
     rb_gc_mark(th->last_match);
     rb_mark_tbl(th->locals);
 
     /* mark data in copied stack */
-    if (th == curr_thread) return;
     if (th->status == THREAD_KILLED) return;
     if (th->stk_len == 0) return;  /* stack not active, no need to mark. */
     if (th->stk_ptr) {
@@ -8162,31 +5950,21 @@ thread_mark(th)
 #if defined(THINK_C) || defined(__human68k__)
 	rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2);
 #endif
-#ifdef __ia64__
-	if (th->bstr_ptr) {
-	    rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len);
-	}
-#endif
     }
     frame = th->frame;
     while (frame && frame != top_frame) {
 	frame = ADJ(frame);
-	MARK_FRAME_ADJ(frame);
-	if (frame->tmp) {
-	    struct FRAME *tmp = frame->tmp;
-
-	    while (tmp && tmp != top_frame) {
-		tmp = ADJ(tmp);
-		MARK_FRAME_ADJ(tmp);
-		tmp = tmp->prev;
-	    }
+	if (frame->argv && !STACK(frame->argv)) {
+	    rb_gc_mark_frame(frame);
 	}
 	frame = frame->prev;
     }
     block = th->block;
     while (block) {
 	block = ADJ(block);
-	MARK_FRAME_ADJ(&block->frame);
+	if (block->frame.argv && !STACK(block->frame.argv)) {
+	    rb_gc_mark_frame(&block->frame);
+	}
 	block = block->prev;
     }
 }
@@ -8194,10 +5972,7 @@ thread_mark(th)
 void
 rb_gc_mark_threads()
 {
-    rb_thread_t th;
-
-    /* static global mark */
-    rb_gc_mark((VALUE)ruby_cref);
+    thread_t th;
 
     if (!curr_thread) return;
     FOREACH_THREAD(th) {
@@ -8207,170 +5982,68 @@ rb_gc_mark_threads()
 
 static void
 thread_free(th)
-    rb_thread_t th;
+    thread_t th;
 {
     if (th->stk_ptr) free(th->stk_ptr);
     th->stk_ptr = 0;
-#ifdef __ia64__
-    if (th->bstr_ptr) free(th->bstr_ptr);
-    th->bstr_ptr = 0;
-#endif
     if (th->locals) st_free_table(th->locals);
-    if (th->status != THREAD_KILLED) {
-	if (th->prev) th->prev->next = th->next;
-	if (th->next) th->next->prev = th->prev;
-    }
     if (th != main_thread) free(th);
 }
 
-static rb_thread_t
+static thread_t
 rb_thread_check(data)
     VALUE data;
 {
-    if (TYPE(data) != T_DATA || RDATA(data)->dmark != (RUBY_DATA_FUNC)thread_mark) {
+    if (TYPE(data) != T_DATA || RDATA(data)->dfree != thread_free) {
 	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
-		 rb_obj_classname(data));
+		 rb_class2name(CLASS_OF(data)));
     }
-    return (rb_thread_t)RDATA(data)->data;
+    return (thread_t)RDATA(data)->data;
 }
 
-static VALUE rb_thread_raise _((int, VALUE*, rb_thread_t));
-
-static int   th_raise_argc;
-static VALUE th_raise_argv[2];
-static NODE *th_raise_node;
-static VALUE th_cmd;
-static int   th_sig;
-static char *th_signm;
-
-#define RESTORE_NORMAL		1
-#define RESTORE_FATAL		2
-#define RESTORE_INTERRUPT	3
-#define RESTORE_TRAP		4
-#define RESTORE_RAISE		5
-#define RESTORE_SIGNAL		6
-#define RESTORE_EXIT		7
-
-extern VALUE *rb_gc_stack_start;
-
 static void
 rb_thread_save_context(th)
-    rb_thread_t th;
+    thread_t th;
 {
-    VALUE *pos;
-    int len;
-    static VALUE tval;
+    VALUE v;
 
-    len = ruby_stack_length(&pos);
+    int len = stack_length();
     th->stk_len = 0;
-    th->stk_pos = pos;
-    if (len > th->stk_max) {
+    th->stk_pos = (rb_gc_stack_start<(VALUE*)&v)?rb_gc_stack_start
+				                :rb_gc_stack_start - len;
+    if (len > th->stk_max)  {
 	REALLOC_N(th->stk_ptr, VALUE, len);
 	th->stk_max = len;
     }
     th->stk_len = len;
-    FLUSH_REGISTER_WINDOWS;
+    FLUSH_REGISTER_WINDOWS; 
     MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len);
-#ifdef __ia64__
-    {
-	ucontext_t ctx;
-	VALUE *top, *bot;
-
-	getcontext(&ctx);
-	bot = (VALUE*)__libc_ia64_register_backing_store_base;
-#if defined(__FreeBSD__)
-	top = (VALUE*)ctx.uc_mcontext.mc_special.bspstore;
-#else
-	top = (VALUE*)ctx.uc_mcontext.sc_ar_bsp;
-#endif
-	th->bstr_len = top - bot;
-	REALLOC_N(th->bstr_ptr, VALUE, th->bstr_len);
-	MEMCPY(th->bstr_ptr, (VALUE*)__libc_ia64_register_backing_store_base, VALUE, th->bstr_len);
-    }
-#endif
-#ifdef SAVE_WIN32_EXCEPTION_LIST
-    th->win32_exception_list = win32_get_exception_list();
-#endif
 
     th->frame = ruby_frame;
     th->scope = ruby_scope;
     th->klass = ruby_class;
     th->wrapper = ruby_wrapper;
-    th->cref = ruby_cref;
     th->dyna_vars = ruby_dyna_vars;
     th->block = ruby_block;
-    th->flags &= THREAD_FLAGS_MASK;
-    th->flags |= (rb_trap_immediate<<8) | scope_vmode;
+    th->misc = scope_vmode | (rb_trap_immediate<<8);
     th->iter = ruby_iter;
     th->tag = prot_tag;
-    th->tracing = tracing;
     th->errinfo = ruby_errinfo;
     th->last_status = rb_last_status;
-    tval = rb_lastline_get();
-    rb_lastline_set(th->last_line);
-    th->last_line = tval;
-    tval = rb_backref_get();
-    rb_backref_set(th->last_match);
-    th->last_match = tval;
-    th->safe = ruby_safe_level;
+    th->last_line = rb_lastline_get();
+    th->last_match = rb_backref_get();
+    th->safe = safe_level;
 
-    th->node = ruby_current_node;
+    th->trace = trace_func;
+    th->file = ruby_sourcefile;
+    th->line = ruby_sourceline;
 }
 
-static int
-rb_thread_switch(n)
-    int n;
-{
-    rb_trap_immediate = (curr_thread->flags&0x100)?1:0;
-    switch (n) {
-      case 0:
-	return 0;
-      case RESTORE_FATAL:
-	JUMP_TAG(TAG_FATAL);
-	break;
-      case RESTORE_INTERRUPT:
-	rb_interrupt();
-	break;
-      case RESTORE_TRAP:
-	rb_trap_eval(th_cmd, th_sig);
-	break;
-      case RESTORE_RAISE:
-	ruby_frame->last_func = 0;
-	ruby_current_node = th_raise_node;
-	rb_f_raise(th_raise_argc, th_raise_argv);
-	break;
-      case RESTORE_SIGNAL:
-	rb_raise(rb_eSignal, "SIG%s", th_signm);
-	break;
-      case RESTORE_EXIT:
-	ruby_errinfo = th_raise_argv[0];
-	ruby_current_node = th_raise_node;
-	error_print();
-	terminate_process(1, 0, 0);
-	break;
-      case RESTORE_NORMAL:
-      default:
-	break;
-    }
-    return 1;
-}
-
-#ifdef __ia64__
-# define THREAD_SAVE_CONTEXT(th) \
-    (rb_thread_save_context(th),\
-     th->context_status = 0,\
-     rb_thread_switch((FLUSH_REGISTER_WINDOWS, getcontext(&th->context),(th)->context_status)))
-#else
-# define THREAD_SAVE_CONTEXT(th) \
-    (rb_thread_save_context(th),\
-     rb_thread_switch((FLUSH_REGISTER_WINDOWS, setjmp((th)->context))))
-#endif
-
-NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
+static void rb_thread_restore_context _((thread_t,int));
 
 static void
 stack_extend(th, exit)
-    rb_thread_t th;
+    thread_t th;
     int exit;
 {
     VALUE space[1024];
@@ -8379,23 +6052,32 @@ stack_extend(th, exit)
     rb_thread_restore_context(th, exit);
 }
 
+static int   th_raise_argc;
+static VALUE th_raise_argv[2];
+static char *th_raise_file;
+static int   th_raise_line;
+static VALUE th_cmd;
+static int   th_sig;
+static char *th_signm;
+
+#define RESTORE_NORMAL		0 
+#define RESTORE_FATAL		1
+#define RESTORE_INTERRUPT	2
+#define RESTORE_TRAP		3
+#define RESTORE_RAISE		4
+#define RESTORE_SIGNAL		5
+
 static void
 rb_thread_restore_context(th, exit)
-    rb_thread_t th;
+    thread_t th;
     int exit;
 {
     VALUE v;
-    static rb_thread_t tmp;
+    static thread_t tmp;
     static int ex;
-    static VALUE tval;
 
     if (!th->stk_ptr) rb_bug("unsaved context");
 
-#if STACK_GROW_DIRECTION < 0
-    if (&v > th->stk_pos) stack_extend(th, exit);
-#elif STACK_GROW_DIRECTION > 0
-    if (&v < th->stk_pos + th->stk_len) stack_extend(th, exit);
-#else
     if (&v < rb_gc_stack_start) {
 	/* Stack grows downward */
 	if (&v > th->stk_pos) stack_extend(th, exit);
@@ -8404,87 +6086,94 @@ rb_thread_restore_context(th, exit)
 	/* Stack grows upward */
 	if (&v < th->stk_pos + th->stk_len) stack_extend(th, exit);
     }
-#endif
 
-    rb_trap_immediate = 0;	/* inhibit interrupts from here */
     ruby_frame = th->frame;
     ruby_scope = th->scope;
     ruby_class = th->klass;
     ruby_wrapper = th->wrapper;
-    ruby_cref = th->cref;
     ruby_dyna_vars = th->dyna_vars;
     ruby_block = th->block;
-    scope_vmode = th->flags&SCOPE_MASK;
+    scope_vmode = th->misc&SCOPE_MASK;
+    rb_trap_immediate = th->misc>>8;
     ruby_iter = th->iter;
     prot_tag = th->tag;
-    tracing = th->tracing;
     ruby_errinfo = th->errinfo;
     rb_last_status = th->last_status;
-    ruby_safe_level = th->safe;
+    safe_level = th->safe;
 
-    ruby_current_node = th->node;
+    trace_func = th->trace;
+    ruby_sourcefile = th->file;
+    ruby_sourceline = th->line;
 
-#ifdef SAVE_WIN32_EXCEPTION_LIST
-    win32_set_exception_list(th->win32_exception_list);
-#endif
     tmp = th;
     ex = exit;
     FLUSH_REGISTER_WINDOWS;
     MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len);
-#ifdef __ia64__
-    MEMCPY((VALUE*)__libc_ia64_register_backing_store_base, tmp->bstr_ptr, VALUE, tmp->bstr_len);
-#endif
 
-    tval = rb_lastline_get();
     rb_lastline_set(tmp->last_line);
-    tmp->last_line = tval;
-    tval = rb_backref_get();
     rb_backref_set(tmp->last_match);
-    tmp->last_match = tval;
 
-#ifdef __ia64__
-    tmp->context_status = ex;
-    setcontext(&tmp->context);
-#else
-    longjmp(tmp->context, ex);
-#endif
-}
+    switch (ex) {
+      case RESTORE_FATAL:
+	JUMP_TAG(TAG_FATAL);
+	break;
 
-static void
-rb_thread_ready(th)
-    rb_thread_t th;
-{
-    th->wait_for = 0;
-    if (th->status != THREAD_TO_KILL) {
-	th->status = THREAD_RUNNABLE;
+      case RESTORE_INTERRUPT:
+	rb_interrupt();
+	break;
+
+      case RESTORE_TRAP:
+	rb_trap_eval(th_cmd, th_sig);
+	errno = EINTR;
+	break;
+
+      case RESTORE_SIGNAL:
+	rb_raise(rb_eSignal, "SIG%s", th_signm);
+	break;
+
+      case RESTORE_RAISE:
+	ruby_frame->last_func = 0;
+	ruby_sourcefile = th_raise_file;
+	ruby_sourceline = th_raise_line;
+	rb_f_raise(th_raise_argc, th_raise_argv);
+	break;
+
+      case RESTORE_NORMAL:
+      default:
+	longjmp(tmp->context, 1);
     }
 }
 
 static void
-rb_thread_die(th)
-    rb_thread_t th;
+rb_thread_ready(th)
+    thread_t th;
 {
-    th->thgroup = 0;
-    th->status = THREAD_KILLED;
-    if (th->stk_ptr) free(th->stk_ptr);
-    th->stk_ptr = 0;
+    /* The thread is no longer waiting on anything */
+    if (th->wait_for & WAIT_FD) {
+	num_waiting_on_fd--;
+    }
+    if (th->wait_for & WAIT_TIME) {
+	num_waiting_on_timer--;
+    }
+    if (th->wait_for & WAIT_JOIN) {
+	num_waiting_on_join--;
+    }
+    th->wait_for = 0;
+    th->status = THREAD_RUNNABLE;
 }
 
 static void
-rb_thread_remove(th)
-    rb_thread_t th;
+rb_thread_remove()
 {
-    if (th->status == THREAD_KILLED) return;
-
-    rb_thread_ready(th);
-    rb_thread_die(th);
-    th->prev->next = th->next;
-    th->next->prev = th->prev;
+    rb_thread_ready(curr_thread);
+    curr_thread->status = THREAD_KILLED;
+    curr_thread->prev->next = curr_thread->next;
+    curr_thread->next->prev = curr_thread->prev;
 }
 
 static int
 rb_thread_dead(th)
-    rb_thread_t th;
+    thread_t th;
 {
     return th->status == THREAD_KILLED;
 }
@@ -8493,135 +6182,52 @@ void
 rb_thread_fd_close(fd)
     int fd;
 {
-    rb_thread_t th;
+    thread_t th;
 
     FOREACH_THREAD(th) {
-	if (((th->wait_for & WAIT_FD) && fd == th->fd) ||
-	    ((th->wait_for & WAIT_SELECT) && (fd < th->fd) &&
-	     (FD_ISSET(fd, &th->readfds) ||
-	      FD_ISSET(fd, &th->writefds) ||
-	      FD_ISSET(fd, &th->exceptfds)))) {
-	    VALUE exc = rb_exc_new2(rb_eIOError, "stream closed");
-	    rb_thread_raise(1, &exc, th);
+	if ((th->wait_for & WAIT_FD) && th->fd == fd) {
+	    th_raise_argc = 1;
+	    th_raise_argv[0] = rb_exc_new2(rb_eIOError, "stream closed");
+	    th_raise_file = ruby_sourcefile;
+	    th_raise_line = ruby_sourceline;
+	    curr_thread = th;
+	    rb_thread_ready(th);
+	    rb_thread_restore_context(curr_thread, RESTORE_RAISE);
 	}
     }
     END_FOREACH(th);
 }
 
-NORETURN(static void rb_thread_main_jump _((VALUE, int)));
 static void
-rb_thread_main_jump(err, tag)
-    VALUE err;
-    int tag;
+rb_thread_deadlock()
 {
+#if 1
     curr_thread = main_thread;
     th_raise_argc = 1;
-    th_raise_argv[0] = err;
-    th_raise_node = ruby_current_node;
-    rb_thread_restore_context(main_thread, tag);
-}
-
-NORETURN(static void rb_thread_deadlock _((void)));
-static void
-rb_thread_deadlock()
-{
-    char msg[21+SIZEOF_LONG*2];
-    VALUE e;
-
-    sprintf(msg, "Thread(0x%lx): deadlock", curr_thread->thread);
-    e = rb_exc_new2(rb_eFatal, msg);
-    if (curr_thread == main_thread) {
-	rb_exc_raise(e);
-    }
-    rb_thread_main_jump(e, RESTORE_RAISE);
-}
-
-static void
-copy_fds(dst, src, max)
-    fd_set *dst, *src;
-    int max;
-{
-    int n = 0;
-    int i;
-
-    for (i=0; i<=max; i++) {
-	if (FD_ISSET(i, src)) {
-	    n = i;
-	    FD_SET(i, dst);
-	}
-    }
-}
-
-static int
-match_fds(dst, src, max)
-    fd_set *dst, *src;
-    int max;
-{
-    int i;
-
-    for (i=0; i<=max; i++) {
-	if (FD_ISSET(i, src) && FD_ISSET(i, dst)) {
-	    return Qtrue;
-	}
-    }
-    return Qfalse;
-}
-
-static int
-intersect_fds(src, dst, max)
-    fd_set *src, *dst;
-    int max;
-{
-    int i, n = 0;
-
-    for (i=0; i<=max; i++) {
-	if (FD_ISSET(i, dst)) {
-	    if (FD_ISSET(i, src)) {
-		/* Wake up only one thread per fd. */
-		FD_CLR(i, src);
-		n++;
-	    }
-	    else {
-		FD_CLR(i, dst);
-	    }
-	}
-    }
-    return n;
-}
-
-static int
-find_bad_fds(dst, src, max)
-    fd_set *dst, *src;
-    int max;
-{
-    int i, test = Qfalse;
-
-    for (i=0; i<=max; i++) {
-	if (FD_ISSET(i, src) && !FD_ISSET(i, dst)) {
-	    FD_CLR(i, src);
-	    test = Qtrue;
-	}
-    }
-    return test;
+    th_raise_argv[0] = rb_exc_new2(rb_eFatal, "Thread: deadlock");
+    th_raise_file = ruby_sourcefile;
+    th_raise_line = ruby_sourceline;
+    rb_thread_restore_context(main_thread, RESTORE_RAISE);
+#else
+    static int invoked = 0;
+
+    if (invoked) return;
+    invoked = 1;
+    rb_prohibit_interrupt = 1;
+    ruby_errinfo = rb_exc_new2(rb_eFatal, "Thread: deadlock");
+    set_backtrace(ruby_errinfo, make_backtrace());
+    rb_abort();
+#endif
 }
 
 void
 rb_thread_schedule()
 {
-    rb_thread_t next;		/* OK */
-    rb_thread_t th;
-    rb_thread_t curr;
-    int found = 0;
-
-    fd_set readfds;
-    fd_set writefds;
-    fd_set exceptfds;
-    struct timeval delay_tv, *delay_ptr;
-    double delay, now;	/* OK */
-    int n, max;
-    int need_select = 0;
-    int select_timeout = 0;
+    thread_t next;		/* OK */
+    thread_t th;
+    thread_t curr;
 
+  select_err:
     rb_thread_pending = 0;
     if (curr_thread == curr_thread->next
 	&& curr_thread->status == THREAD_RUNNABLE)
@@ -8634,216 +6240,152 @@ rb_thread_schedule()
 	curr = curr->prev;
     }
 
-  again:
-    max = -1;
-    FD_ZERO(&readfds);
-    FD_ZERO(&writefds);
-    FD_ZERO(&exceptfds);
-    delay = DELAY_INFTY;
-    now = -1.0;
-
     FOREACH_THREAD_FROM(curr, th) {
-	if (!found && th->status <= THREAD_RUNNABLE) {
-	    found = 1;
-	}
-	if (th->status != THREAD_STOPPED) continue;
-	if (th->wait_for & WAIT_JOIN) {
-	    if (rb_thread_dead(th->join)) {
-		th->status = THREAD_RUNNABLE;
-		found = 1;
-	    }
-	}
-	if (th->wait_for & WAIT_FD) {
-	    FD_SET(th->fd, &readfds);
-	    if (max < th->fd) max = th->fd;
-	    need_select = 1;
-	}
-	if (th->wait_for & WAIT_SELECT) {
-	    copy_fds(&readfds, &th->readfds, th->fd);
-	    copy_fds(&writefds, &th->writefds, th->fd);
-	    copy_fds(&exceptfds, &th->exceptfds, th->fd);
-	    if (max < th->fd) max = th->fd;
-	    need_select = 1;
-	    if (th->wait_for & WAIT_TIME) {
-		select_timeout = 1;
-	    }
-	    th->select_value = 0;
-	}
-	if (th->wait_for & WAIT_TIME) {
-	    double th_delay;
+       if (th->status != THREAD_STOPPED && th->status != THREAD_KILLED) {
+           next = th;
+           break;
+       }
+    }
+    END_FOREACH_FROM(curr, th); 
 
-	    if (now < 0.0) now = timeofday();
-	    th_delay = th->delay - now;
-	    if (th_delay <= 0.0) {
+    if (num_waiting_on_join) {
+	FOREACH_THREAD_FROM(curr, th) {
+	    if ((th->wait_for&WAIT_JOIN) && rb_thread_dead(th->join)) {
+		th->join = 0;
+		th->wait_for &= ~WAIT_JOIN;
 		th->status = THREAD_RUNNABLE;
-		found = 1;
-	    }
-	    else if (th_delay < delay) {
-		delay = th_delay;
-		need_select = 1;
-	    }
-	    else if (th->delay == DELAY_INFTY) {
-		need_select = 1;
+		num_waiting_on_join--;
+		if (!next) next = th;
 	    }
 	}
+	END_FOREACH_FROM(curr, th);
     }
-    END_FOREACH_FROM(curr, th);
 
-    /* Do the select if needed */
-    if (need_select) {
-	/* Convert delay to a timeval */
-	/* If a thread is runnable, just poll */
-	if (found) {
-	    delay_tv.tv_sec = 0;
-	    delay_tv.tv_usec = 0;
-	    delay_ptr = &delay_tv;
-	}
-	else if (delay == DELAY_INFTY) {
-	    delay_ptr = 0;
-	}
-	else {
-	    delay_tv.tv_sec = delay;
-	    delay_tv.tv_usec = (delay - (double)delay_tv.tv_sec)*1e6;
-	    delay_ptr = &delay_tv;
-	}
+    if (num_waiting_on_fd > 0 || num_waiting_on_timer > 0) {
+	fd_set readfds;
+	struct timeval delay_tv, *delay_ptr;
+	double delay, now;	/* OK */
 
-	n = select(max+1, &readfds, &writefds, &exceptfds, delay_ptr);
-	if (n < 0) {
-	    int e = errno;
+	int n, max;
 
-	    if (rb_trap_pending) rb_trap_exec();
-	    if (e == EINTR) goto again;
-#ifdef ERESTART
-	    if (e == ERESTART) goto again;
-#endif
-	    FOREACH_THREAD_FROM(curr, th) {
-		if (th->wait_for & WAIT_SELECT) {
-		    int v = 0;
-
-		    v |= find_bad_fds(&readfds, &th->readfds, th->fd);
-		    v |= find_bad_fds(&writefds, &th->writefds, th->fd);
-		    v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd);
-		    if (v) {
-			th->select_value = n;
-			n = max;
+	do {
+	    max = 0;
+	    FD_ZERO(&readfds);
+	    if (num_waiting_on_fd > 0) {
+		FOREACH_THREAD_FROM(curr, th) {
+		    if (th->wait_for & WAIT_FD) {
+			FD_SET(th->fd, &readfds);
+			if (th->fd > max) max = th->fd;
 		    }
 		}
-	    }
-	    END_FOREACH_FROM(curr, th);
-	}
- 	if (select_timeout && n == 0) {
- 	    if (now < 0.0) now = timeofday();
- 	    FOREACH_THREAD_FROM(curr, th) {
- 		if (((th->wait_for&(WAIT_SELECT|WAIT_TIME)) == (WAIT_SELECT|WAIT_TIME)) &&
-		    th->delay <= now) {
- 		    th->status = THREAD_RUNNABLE;
- 		    th->wait_for = 0;
- 		    th->select_value = 0;
- 		    found = 1;
-                    intersect_fds(&readfds, &th->readfds, max);
-                    intersect_fds(&writefds, &th->writefds, max);
-                    intersect_fds(&exceptfds, &th->exceptfds, max);
+		END_FOREACH_FROM(curr, th);
+	    }
+
+	    delay = DELAY_INFTY;
+	    if (num_waiting_on_timer > 0) {
+		now = timeofday();
+		FOREACH_THREAD_FROM(curr, th) {
+		    if (th->wait_for & WAIT_TIME) {
+			if (th->delay <= now) {
+			    th->delay = 0.0;
+			    th->wait_for &= ~WAIT_TIME;
+			    th->status = THREAD_RUNNABLE;
+			    num_waiting_on_timer--;
+			    next = th;
+			} else if (th->delay < delay) {
+			    delay = th->delay;
+			}
+		    }
 		}
-	    }
-	    END_FOREACH_FROM(curr, th);
-	}
-	if (n > 0) {
-	    now = -1.0;
-	    /* Some descriptors are ready.
-	       Make the corresponding threads runnable. */
-	    FOREACH_THREAD_FROM(curr, th) {
-		if ((th->wait_for&WAIT_FD) && FD_ISSET(th->fd, &readfds)) {
-		    /* Wake up only one thread per fd. */
-		    FD_CLR(th->fd, &readfds);
-		    th->status = THREAD_RUNNABLE;
-		    th->fd = 0;
-		    th->wait_for = 0;
-		    found = 1;
+		END_FOREACH_FROM(curr, th);
+	    }
+	    /* Do the select if needed */
+	    if (num_waiting_on_fd > 0 || !next) {
+		/* Convert delay to a timeval */
+		/* If a thread is runnable, just poll */
+		if (next) {
+		    delay_tv.tv_sec = 0;
+		    delay_tv.tv_usec = 0;
+		    delay_ptr = &delay_tv;
 		}
-		if ((th->wait_for&WAIT_SELECT) &&
-		    (match_fds(&readfds, &th->readfds, max) ||
-		     match_fds(&writefds, &th->writefds, max) ||
-		     match_fds(&exceptfds, &th->exceptfds, max))) {
-		    /* Wake up only one thread per fd. */
-		    th->status = THREAD_RUNNABLE;
-		    th->wait_for = 0;
-		    n = intersect_fds(&readfds, &th->readfds, max) +
-			intersect_fds(&writefds, &th->writefds, max) +
-			intersect_fds(&exceptfds, &th->exceptfds, max);
-		    th->select_value = n;
-		    found = 1;
+		else if (delay == DELAY_INFTY) {
+		    delay_ptr = 0;
+		}
+		else {
+		    delay -= now;
+		    delay_tv.tv_sec = (unsigned int)delay;
+		    delay_tv.tv_usec = (long)((delay-(double)delay_tv.tv_sec)*1e6);
+		    delay_ptr = &delay_tv;
 		}
-	    }
-	    END_FOREACH_FROM(curr, th);
-	}
-	/* The delays for some of the threads should have expired.
-	   Go through the loop once more, to check the delays. */
-	if (!found && delay != DELAY_INFTY)
-	    goto again;
-    }
 
-    FOREACH_THREAD_FROM(curr, th) {
-	if (th->status == THREAD_TO_KILL) {
-	    next = th;
-	    break;
-	}
-	if (th->status == THREAD_RUNNABLE && th->stk_ptr) {
-	    if (!next || next->priority < th->priority)
-	       next = th;
-	}
+		n = select(max+1, &readfds, 0, 0, delay_ptr);
+		if (n < 0) {
+		    if (rb_trap_pending) rb_trap_exec();
+		    switch (errno) {
+		      case EBADF:
+		      case ENOMEM:
+			n = 0;
+			break;
+		      default:
+			goto select_err;
+		    }
+		}
+		if (n > 0) {
+		    /* Some descriptors are ready. 
+		       Make the corresponding threads runnable. */
+		    FOREACH_THREAD_FROM(curr, th) {
+			if ((th->wait_for&WAIT_FD)
+			    && FD_ISSET(th->fd, &readfds)) {
+			    /* Wake up only one thread per fd. */
+			    FD_CLR(th->fd, &readfds);
+			    th->status = THREAD_RUNNABLE;
+			    th->fd = 0;
+			    th->wait_for &= ~WAIT_FD;
+			    num_waiting_on_fd--;
+			    if (!next) next = th; /* Found one. */
+			}
+		    }
+		    END_FOREACH_FROM(curr, th);
+		}
+	    }
+	    /* The delays for some of the threads should have expired.
+	       Go through the loop once more, to check the delays. */
+	} while (!next && delay != DELAY_INFTY);
     }
-    END_FOREACH_FROM(curr, th);
 
     if (!next) {
-	/* raise fatal error to main thread */
-	curr_thread->node = ruby_current_node;
-	if (curr->next == curr) {
-	    TRAP_BEG;
-	    pause();
-	    TRAP_END;
-	}
+	curr_thread->file = ruby_sourcefile;
+	curr_thread->line = ruby_sourceline;
 	FOREACH_THREAD_FROM(curr, th) {
-	    warn_printf("deadlock 0x%lx: %s:",
-			th->thread, thread_status_name(th->status));
-	    if (th->wait_for & WAIT_FD) warn_printf("F(%d)", th->fd);
-	    if (th->wait_for & WAIT_SELECT) warn_printf("S");
-	    if (th->wait_for & WAIT_TIME) warn_printf("T(%f)", th->delay);
-	    if (th->wait_for & WAIT_JOIN)
-		warn_printf("J(0x%lx)", th->join ? th->join->thread : 0);
-	    if (th->wait_for & WAIT_PID) warn_printf("P");
-	    if (!th->wait_for) warn_printf("-");
-	    warn_printf(" %s - %s:%d\n",
-			th==main_thread ? "(main)" : "",
-			th->node->nd_file, nd_line(th->node));
+	    fprintf(stderr, "%s:%d:deadlock 0x%lx: %d:%d %s\n", 
+		    th->file, th->line, th->thread, th->status,
+		    th->wait_for, th==main_thread?"(main)":"");
+	    if (th->status == THREAD_STOPPED) {
+		next = th;
+	    }
 	}
 	END_FOREACH_FROM(curr, th);
-	next = main_thread;
+	/* raise fatal error to main thread */
+	rb_thread_deadlock();
 	rb_thread_ready(next);
 	next->status = THREAD_TO_KILL;
-	if (!rb_thread_dead(curr_thread)) {
-	    rb_thread_save_context(curr_thread);
-	}
-	rb_thread_deadlock();
     }
-    next->wait_for = 0;
     if (next->status == THREAD_RUNNABLE && next == curr_thread) {
 	return;
     }
 
     /* context switch */
     if (curr == curr_thread) {
-	if (THREAD_SAVE_CONTEXT(curr)) {
+	rb_thread_save_context(curr);
+	if (setjmp(curr->context)) {
 	    return;
 	}
     }
 
     curr_thread = next;
     if (next->status == THREAD_TO_KILL) {
-	if (!(next->flags & THREAD_TERMINATING)) {
-	    next->flags |= THREAD_TERMINATING;
-	    /* terminate; execute ensure-clause if any */
-	    rb_thread_restore_context(next, RESTORE_FATAL);
-	}
+	/* execute ensure-clause if any */
+	rb_thread_restore_context(next, RESTORE_FATAL);
     }
     rb_thread_restore_context(next, RESTORE_NORMAL);
 }
@@ -8852,14 +6394,12 @@ void
 rb_thread_wait_fd(fd)
     int fd;
 {
-    if (rb_thread_critical) return;
-    if (ruby_in_compile) return;
     if (curr_thread == curr_thread->next) return;
-    if (curr_thread->status == THREAD_TO_KILL) return;
 
     curr_thread->status = THREAD_STOPPED;
     curr_thread->fd = fd;
-    curr_thread->wait_for = WAIT_FD;
+    num_waiting_on_fd++;
+    curr_thread->wait_for |= WAIT_FD;
     rb_thread_schedule();
 }
 
@@ -8867,19 +6407,18 @@ int
 rb_thread_fd_writable(fd)
     int fd;
 {
-    if (rb_thread_critical) return Qtrue;
-    if (curr_thread == curr_thread->next) return Qtrue;
-    if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
+    struct timeval zero;
+    fd_set fds;
 
-    curr_thread->status = THREAD_STOPPED;
-    FD_ZERO(&curr_thread->readfds);
-    FD_ZERO(&curr_thread->writefds);
-    FD_SET(fd, &curr_thread->writefds);
-    FD_ZERO(&curr_thread->exceptfds);
-    curr_thread->fd = fd+1;
-    curr_thread->wait_for = WAIT_SELECT;
-    rb_thread_schedule();
-    return Qfalse;
+    if (curr_thread == curr_thread->next) return 1;
+
+    zero.tv_sec = zero.tv_usec = 0;
+    for (;;) {
+	FD_ZERO(&fds);
+	FD_SET(fd, &fds);
+	if (select(fd+1, 0, &fds, 0, &zero) == 1) return 0;
+	rb_thread_schedule();
+    }
 }
 
 void
@@ -8888,9 +6427,7 @@ rb_thread_wait_for(time)
 {
     double date;
 
-    if (rb_thread_critical ||
-	curr_thread == curr_thread->next ||
-	curr_thread->status == THREAD_TO_KILL) {
+    if (curr_thread == curr_thread->next) {
 	int n;
 #ifndef linux
 	double d, limit;
@@ -8901,17 +6438,7 @@ rb_thread_wait_for(time)
 	    n = select(0, 0, 0, 0, &time);
 	    TRAP_END;
 	    if (n == 0) return;
-	    if (n < 0) {
-		switch (errno) {
-		  case EINTR:
-#ifdef ERESTART
-		  case ERESTART:
-#endif
-		    return;
-		  default:
-		    rb_sys_fail("sleep");
-		}
-	    }
+
 #ifndef linux
 	    d = limit - timeofday();
 
@@ -8929,7 +6456,8 @@ rb_thread_wait_for(time)
     date = timeofday() + (double)time.tv_sec + (double)time.tv_usec*1e-6;
     curr_thread->status = THREAD_STOPPED;
     curr_thread->delay = date;
-    curr_thread->wait_for = WAIT_TIME;
+    num_waiting_on_timer++;
+    curr_thread->wait_for |= WAIT_TIME;
     rb_thread_schedule();
 }
 
@@ -8948,6 +6476,8 @@ rb_thread_select(max, read, write, except, timeout)
     struct timeval *timeout;
 {
     double limit;
+    struct timeval zero;
+    fd_set r, *rp, w, *wp, x, *xp;
     int n;
 
     if (!read && !write && !except) {
@@ -8964,9 +6494,7 @@ rb_thread_select(max, read, write, except, timeout)
 	    (double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
     }
 
-    if (rb_thread_critical ||
-	curr_thread == curr_thread->next ||
-	curr_thread->status == THREAD_TO_KILL) {
+    if (curr_thread == curr_thread->next) { /* no other thread */
 #ifndef linux
 	struct timeval tv, *tvp = timeout;
 
@@ -8974,90 +6502,79 @@ rb_thread_select(max, read, write, except, timeout)
 	    tv = *timeout;
 	    tvp = &tv;
 	}
-#else
-	struct timeval *const tvp = timeout;
-#endif
 	for (;;) {
 	    TRAP_BEG;
 	    n = select(max, read, write, except, tvp);
 	    TRAP_END;
-	    if (n < 0) {
-		switch (errno) {
-		  case EINTR:
-#ifdef ERESTART
-		  case ERESTART:
-#endif
-#ifndef linux
-		    if (timeout) {
-			double d = limit - timeofday();
+	    if (n < 0 && errno == EINTR) {
+		if (timeout) {
+		    double d = timeofday() - limit;
 
-			tv.tv_sec = (unsigned int)d;
-			tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
-			if (tv.tv_sec < 0)  tv.tv_sec = 0;
-			if (tv.tv_usec < 0) tv.tv_usec = 0;
-		    }
-#endif
-		    continue;
-		  default:
-		    break;
+		    tv.tv_sec = (unsigned int)d;
+		    tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
 		}
+		continue;
+	    }
+	    return n;
+	}
+#else
+	for (;;) {
+	    TRAP_BEG;
+	    n = select(max, read, write, except, timeout);
+	    TRAP_END;
+	    if (n < 0 && errno == EINTR) {
+		continue;
 	    }
 	    return n;
 	}
+#endif
+
     }
 
-    curr_thread->status = THREAD_STOPPED;
-    if (read) curr_thread->readfds = *read;
-    else FD_ZERO(&curr_thread->readfds);
-    if (write) curr_thread->writefds = *write;
-    else FD_ZERO(&curr_thread->writefds);
-    if (except) curr_thread->exceptfds = *except;
-    else FD_ZERO(&curr_thread->exceptfds);
-    curr_thread->fd = max;
-    curr_thread->wait_for = WAIT_SELECT;
-    if (timeout) {
-	curr_thread->delay = timeofday() +
-	    (double)timeout->tv_sec + (double)timeout->tv_usec*1e-6;
-	curr_thread->wait_for |= WAIT_TIME;
+    for (;;) {
+	zero.tv_sec = zero.tv_usec = 0;
+	if (read) {rp = &r; r = *read;} else {rp = 0;}
+	if (write) {wp = &w; w = *write;} else {wp = 0;}
+	if (except) {xp = &x; x = *except;} else {xp = 0;}
+	n = select(max, rp, wp, xp, &zero);
+	if (n > 0) {
+	    /* write back fds */
+	    if (read) {*read = r;}
+	    if (write) {*write = w;}
+	    if (except) {*except = x;}
+	    return n;
+	}
+	if (n < 0 && errno != EINTR) {
+	    return n;
+	}
+	if (timeout) {
+	    if (timeout->tv_sec == 0 && timeout->tv_usec == 0) return 0;
+	    if (limit <= timeofday()) return 0;
+	}
+
+        rb_thread_schedule();
+	CHECK_INTS;
     }
-    rb_thread_schedule();
-    if (read) *read = curr_thread->readfds;
-    if (write) *write = curr_thread->writefds;
-    if (except) *except = curr_thread->exceptfds;
-    return curr_thread->select_value;
 }
 
-static int rb_thread_join _((rb_thread_t, double));
-
-static int
-rb_thread_join(th, limit)
-    rb_thread_t th;
-    double limit;
+static VALUE
+rb_thread_join(thread)
+    VALUE thread;
 {
-    enum thread_status last_status = THREAD_RUNNABLE;
-
-    if (rb_thread_critical) rb_thread_deadlock();
-    if (!rb_thread_dead(th)) {
-	if (th == curr_thread)
-	    rb_raise(rb_eThreadError, "thread 0x%lx tried to join itself",
-		     th->thread);
-	if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
-	    rb_raise(rb_eThreadError, "Thread#join: deadlock 0x%lx - mutual join(0x%lx)",
-		     curr_thread->thread, th->thread);
-	if (curr_thread->status == THREAD_TO_KILL)
-	    last_status = THREAD_TO_KILL;
-	if (limit == 0) return Qfalse;
-	curr_thread->status = THREAD_STOPPED;
-	curr_thread->join = th;
-	curr_thread->wait_for = WAIT_JOIN;
-	curr_thread->delay = timeofday() + limit;
-	if (limit < DELAY_INFTY) curr_thread->wait_for |= WAIT_TIME;
-	rb_thread_schedule();
-	curr_thread->status = last_status;
-	if (!rb_thread_dead(th)) return Qfalse;
-    }
+    thread_t th = rb_thread_check(thread);
+
+    if (rb_thread_dead(th)) return thread;
+    if (th == curr_thread)
+	rb_raise(rb_eThreadError, "recursive join");
+    if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
+	rb_raise(rb_eThreadError, "Thread#join: deadlock");
+    curr_thread->status = THREAD_STOPPED;
+    curr_thread->join = th;
+    num_waiting_on_join++;
+    curr_thread->wait_for |= WAIT_JOIN;
+    rb_thread_schedule();
 
-    if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) {
+    if (!NIL_P(th->errinfo)) {
 	VALUE oldbt = get_backtrace(th->errinfo);
 	VALUE errat = make_backtrace();
 
@@ -9068,24 +6585,16 @@ rb_thread_join(th, limit)
 	rb_exc_raise(th->errinfo);
     }
 
-    return Qtrue;
+    return thread;
 }
 
 static VALUE
-rb_thread_join_m(argc, argv, thread)
-    int argc;
-    VALUE *argv;
+rb_thread_s_join(dmy, thread)	/* will be removed in 1.4 */
+    VALUE dmy;
     VALUE thread;
 {
-    VALUE limit;
-    double delay = DELAY_INFTY;
-    rb_thread_t th = rb_thread_check(thread);
-
-    rb_scan_args(argc, argv, "01", &limit);
-    if (!NIL_P(limit)) delay = rb_num2dbl(limit);
-    if (!rb_thread_join(th, delay))
-	return Qnil;
-    return thread;
+    rb_warn("Thread::join is obsolete; use Thread#join instead");
+    return rb_thread_join(thread);
 }
 
 VALUE
@@ -9101,31 +6610,10 @@ rb_thread_main()
 }
 
 VALUE
-rb_thread_list()
-{
-    rb_thread_t th;
-    VALUE ary = rb_ary_new();
-
-    FOREACH_THREAD(th) {
-	switch (th->status) {
-	  case THREAD_RUNNABLE:
-	  case THREAD_STOPPED:
-	  case THREAD_TO_KILL:
-	    rb_ary_push(ary, th->thread);
-	  default:
-	    break;
-	}
-    }
-    END_FOREACH(th);
-
-    return ary;
-}
-
-VALUE
 rb_thread_wakeup(thread)
     VALUE thread;
 {
-    rb_thread_t th = rb_thread_check(thread);
+    thread_t th = rb_thread_check(thread);
 
     if (th->status == THREAD_KILLED)
 	rb_raise(rb_eThreadError, "killed thread");
@@ -9144,23 +6632,20 @@ rb_thread_run(thread)
     return thread;
 }
 
-VALUE
+static VALUE
 rb_thread_kill(thread)
     VALUE thread;
 {
-    rb_thread_t th = rb_thread_check(thread);
+    thread_t th = rb_thread_check(thread);
 
-    if (th != curr_thread && th->safe < 4) {
-	rb_secure(4);
-    }
     if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED)
-	return thread;
-    if (th == th->next || th == main_thread) rb_exit(EXIT_SUCCESS);
+	return thread; 
+    if (th == th->next || th == main_thread) rb_exit(0);
 
     rb_thread_ready(th);
     th->status = THREAD_TO_KILL;
-    if (!rb_thread_critical) rb_thread_schedule();
-    return thread;
+    rb_thread_schedule();
+    return Qnil;		/* not reached */
 }
 
 static VALUE
@@ -9186,17 +6671,12 @@ rb_thread_pass()
 VALUE
 rb_thread_stop()
 {
-    enum thread_status last_status = THREAD_RUNNABLE;
-
     rb_thread_critical = 0;
     if (curr_thread == curr_thread->next) {
-	rb_raise(rb_eThreadError, "stopping only thread\n\tnote: use sleep to stop forever");
+	rb_raise(rb_eThreadError, "stopping only thread");
     }
-    if (curr_thread->status == THREAD_TO_KILL)
-	last_status = THREAD_TO_KILL;
     curr_thread->status = THREAD_STOPPED;
     rb_thread_schedule();
-    curr_thread->status = last_status;
 
     return Qnil;
 }
@@ -9204,17 +6684,6 @@ rb_thread_stop()
 struct timeval rb_time_timeval();
 
 void
-rb_thread_polling()
-{
-    if (curr_thread != curr_thread->next) {
-	curr_thread->status = THREAD_STOPPED;
-	curr_thread->delay = timeofday() + (double)0.06;
-	curr_thread->wait_for = WAIT_TIME;
-	rb_thread_schedule();
-    }
-}
-
-void
 rb_thread_sleep(sec)
     int sec;
 {
@@ -9230,69 +6699,33 @@ rb_thread_sleep(sec)
 void
 rb_thread_sleep_forever()
 {
-    if (curr_thread == curr_thread->next ||
-	curr_thread->status == THREAD_TO_KILL) {
+    if (curr_thread == curr_thread->next) {
 	TRAP_BEG;
-	pause();
+	sleep((32767L<<16)+32767);
 	TRAP_END;
 	return;
     }
 
+    num_waiting_on_timer++;
     curr_thread->delay = DELAY_INFTY;
-    curr_thread->wait_for = WAIT_TIME;
+    curr_thread->wait_for |= WAIT_TIME;
     curr_thread->status = THREAD_STOPPED;
     rb_thread_schedule();
 }
 
-static VALUE
-rb_thread_priority(thread)
-    VALUE thread;
-{
-    return INT2NUM(rb_thread_check(thread)->priority);
-}
-
-static VALUE
-rb_thread_priority_set(thread, prio)
-    VALUE thread, prio;
-{
-    rb_thread_t th;
-
-    rb_secure(4);
-    th = rb_thread_check(thread);
-
-    th->priority = NUM2INT(prio);
-    rb_thread_schedule();
-    return prio;
-}
-
-static VALUE
-rb_thread_safe_level(thread)
-    VALUE thread;
-{
-    rb_thread_t th;
-
-    th = rb_thread_check(thread);
-    if (th == curr_thread) {
-	return INT2NUM(ruby_safe_level);
-    }
-    return INT2NUM(th->safe);
-}
-
-static int ruby_thread_abort;
-static VALUE thgroup_default;
+static int thread_abort;
 
 static VALUE
 rb_thread_s_abort_exc()
 {
-    return ruby_thread_abort?Qtrue:Qfalse;
+    return thread_abort?Qtrue:Qfalse;
 }
 
 static VALUE
 rb_thread_s_abort_exc_set(self, val)
     VALUE self, val;
 {
-    rb_secure(4);
-    ruby_thread_abort = RTEST(val);
+    thread_abort = RTEST(val);
     return val;
 }
 
@@ -9300,54 +6733,33 @@ static VALUE
 rb_thread_abort_exc(thread)
     VALUE thread;
 {
-    return rb_thread_check(thread)->abort?Qtrue:Qfalse;
+    thread_t th = rb_thread_check(thread);
+
+    return th->abort?Qtrue:Qfalse;
 }
 
 static VALUE
 rb_thread_abort_exc_set(thread, val)
     VALUE thread, val;
 {
-    rb_secure(4);
-    rb_thread_check(thread)->abort = RTEST(val);
-    return val;
-}
+    thread_t th = rb_thread_check(thread);
 
-VALUE
-rb_thread_group(thread)
-    VALUE thread;
-{
-    VALUE group = rb_thread_check(thread)->thgroup;
-    if (!group) {
-	group = Qnil;
-    }
-    return group;
+    th->abort = RTEST(val);
+    return val;
 }
 
-#ifdef __ia64__
-# define IA64_INIT(x) x
-#else
-# define IA64_INIT(x)
-#endif
-
 #define THREAD_ALLOC(th) do {\
     th = ALLOC(struct thread);\
 \
-    th->next = 0;\
-    th->prev = 0;\
-\
-    th->status = THREAD_RUNNABLE;\
+    th->status = 0;\
     th->result = 0;\
-    th->flags = 0;\
+    th->errinfo = Qnil;\
 \
     th->stk_ptr = 0;\
     th->stk_len = 0;\
     th->stk_max = 0;\
     th->wait_for = 0;\
-    IA64_INIT(th->bstr_ptr = 0);\
-    IA64_INIT(th->bstr_len = 0);\
-    FD_ZERO(&th->readfds);\
-    FD_ZERO(&th->writefds);\
-    FD_ZERO(&th->exceptfds);\
+    th->fd = 0;\
     th->delay = 0.0;\
     th->join = 0;\
 \
@@ -9355,40 +6767,42 @@ rb_thread_group(thread)
     th->scope = 0;\
     th->klass = 0;\
     th->wrapper = 0;\
-    th->cref = ruby_cref;\
-    th->dyna_vars = ruby_dyna_vars;\
+    th->dyna_vars = 0;\
     th->block = 0;\
     th->iter = 0;\
     th->tag = 0;\
-    th->tracing = 0;\
-    th->errinfo = Qnil;\
+    th->errinfo = 0;\
     th->last_status = 0;\
     th->last_line = 0;\
-    th->last_match = Qnil;\
+    th->last_match = 0;\
     th->abort = 0;\
-    th->priority = 0;\
-    th->thgroup = thgroup_default;\
     th->locals = 0;\
-} while (0)
+} while(0)
 
-static rb_thread_t
+static thread_t
 rb_thread_alloc(klass)
     VALUE klass;
 {
-    rb_thread_t th;
-    struct RVarmap *vars;
+    thread_t th;
 
     THREAD_ALLOC(th);
     th->thread = Data_Wrap_Struct(klass, thread_mark, thread_free, th);
 
-    for (vars = th->dyna_vars; vars; vars = vars->next) {
-	if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	FL_SET(vars, DVAR_DONT_RECYCLE);
+    if (curr_thread) {
+	th->prev = curr_thread;
+	curr_thread->next->prev = th;
+	th->next = curr_thread->next;
+	curr_thread->next = th;
+    }
+    else {
+	curr_thread = th->prev = th->next = th;
+	th->status = THREAD_RUNNABLE;
     }
+
     return th;
 }
 
-#if defined(HAVE_SETITIMER)
+#if defined(HAVE_SETITIMER) && !defined(__BOW__)
 static void
 catch_timer(sig)
     int sig;
@@ -9407,7 +6821,11 @@ catch_timer(sig)
 int rb_thread_tick = THREAD_TICK;
 #endif
 
-#if defined(HAVE_SETITIMER)
+static VALUE rb_thread_raise _((int, VALUE*, VALUE));
+
+#define SCOPE_SHARED  FL_USER1
+
+#if defined(HAVE_SETITIMER) && !defined(__BOW__)
 static int thread_init = 0;
 
 void
@@ -9417,7 +6835,7 @@ rb_thread_start_timer()
 
     if (!thread_init) return;
     tval.it_interval.tv_sec = 0;
-    tval.it_interval.tv_usec = 10000;
+    tval.it_interval.tv_usec = 50000;
     tval.it_value = tval.it_interval;
     setitimer(ITIMER_VIRTUAL, &tval, NULL);
 }
@@ -9436,23 +6854,17 @@ rb_thread_stop_timer()
 #endif
 
 static VALUE
-rb_thread_start_0(fn, arg, th)
+rb_thread_create_0(fn, arg, klass)
     VALUE (*fn)();
     void *arg;
-    rb_thread_t th;
+    VALUE klass;
 {
-    volatile rb_thread_t th_save = th;
+    thread_t th = rb_thread_alloc(klass);
     volatile VALUE thread = th->thread;
-    struct BLOCK *volatile saved_block = 0, *block;
     enum thread_status status;
     int state;
 
-    if (OBJ_FROZEN(curr_thread->thgroup)) {
-	rb_raise(rb_eThreadError,
-		 "can't start a new thread (frozen ThreadGroup)");
-    }
-
-#if defined(HAVE_SETITIMER)
+#if defined(HAVE_SETITIMER) && !defined(__BOW__)
     if (!thread_init) {
 #ifdef POSIX_SIGNAL
 	posix_signal(SIGVTALRM, catch_timer);
@@ -9465,85 +6877,44 @@ rb_thread_start_0(fn, arg, th)
     }
 #endif
 
-    if (THREAD_SAVE_CONTEXT(curr_thread)) {
+    FL_SET(ruby_scope, SCOPE_SHARED);
+    rb_thread_save_context(curr_thread);
+    if (setjmp(curr_thread->context)) {
 	return thread;
     }
 
-    if (ruby_block) {		/* should nail down higher blocks */
-	struct BLOCK dummy;
-
-	dummy.prev = ruby_block;
-	blk_copy_prev(&dummy);
-	saved_block = ruby_block = dummy.prev;
-    }
-    scope_dup(ruby_scope);
-
-    if (!th->next) {
-	/* merge in thread list */
-	th->prev = curr_thread;
-	curr_thread->next->prev = th;
-	th->next = curr_thread->next;
-	curr_thread->next = th;
-	th->priority = curr_thread->priority;
-	th->thgroup = curr_thread->thgroup;
-    }
-
     PUSH_TAG(PROT_THREAD);
     if ((state = EXEC_TAG()) == 0) {
-	if (THREAD_SAVE_CONTEXT(th) == 0) {
+	rb_thread_save_context(th);
+	if (setjmp(th->context) == 0) {
 	    curr_thread = th;
 	    th->result = (*fn)(arg, th);
 	}
-	th = th_save;
-    }
-    else if (TAG_DST()) {
-	th = th_save;
-	th->result = prot_tag->retval;
     }
     POP_TAG();
     status = th->status;
-
-    if (th == main_thread) ruby_stop(state);
-    rb_thread_remove(th);
-
-    for (block = saved_block; block;) {
-	struct BLOCK *tmp = block;
-
-	if (tmp->frame.argc > 0)
-	    free(tmp->frame.argv);
-	block = tmp->prev;
-	free((void*)tmp);
-    }
-
+    rb_thread_remove();
     if (state && status != THREAD_TO_KILL && !NIL_P(ruby_errinfo)) {
-	th->flags |= THREAD_RAISED;
-	if (state == TAG_FATAL) {
+	if (state == TAG_FATAL) { 
 	    /* fatal error within this thread, need to stop whole script */
 	    main_thread->errinfo = ruby_errinfo;
 	    rb_thread_cleanup();
 	}
 	else if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    if (th->safe >= 4) {
-		char buf[32];
-
-		sprintf(buf, "Insecure exit at level %d", th->safe);
-		th->errinfo = rb_exc_new2(rb_eSecurityError, buf);
-	    }
-	    else {
-		/* delegate exception to main_thread */
-		rb_thread_main_jump(ruby_errinfo, RESTORE_RAISE);
-	    }
+	    /* delegate exception to main_thread */
+	    rb_thread_raise(1, &ruby_errinfo, main_thread->thread);
 	}
-	else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
+	else if (thread_abort || curr_thread->abort || RTEST(ruby_debug)) {
+	    VALUE err = rb_exc_new(rb_eSystemExit, 0, 0);
+	    error_print();
 	    /* exit on main_thread */
-	    rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT);
+	    rb_thread_raise(1, &err, main_thread->thread);
 	}
 	else {
-	    th->errinfo = ruby_errinfo;
+	    curr_thread->errinfo = ruby_errinfo;
 	}
     }
     rb_thread_schedule();
-    ruby_stop(0);		/* last thread termination */
     return 0;			/* not reached */
 }
 
@@ -9552,81 +6923,41 @@ rb_thread_create(fn, arg)
     VALUE (*fn)();
     void *arg;
 {
-    Init_stack((VALUE*)&arg);
-    return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread));
-}
-
-static VALUE
-rb_thread_yield(arg, th)
-    VALUE arg;
-    rb_thread_t th;
-{
-    const ID *tbl;
-
-    scope_dup(ruby_block->scope);
-
-    tbl = ruby_scope->local_tbl;
-    if (tbl) {
-	int n = *tbl++;
-	for (tbl += 2, n -= 2; n > 0; --n) { /* skip first 2 ($_ and $~) */
-	    ID id = *tbl++;
-	    if (id != 0 && !rb_is_local_id(id))  /* push flip states */
-		rb_dvar_push(id, Qfalse);
-	}
-    }
-    rb_dvar_push('_', Qnil);
-    rb_dvar_push('~', Qnil);
-    ruby_block->dyna_vars = ruby_dyna_vars;
-
-    return rb_yield_0(arg, 0, 0, Qtrue, Qtrue);
+    return rb_thread_create_0(fn, arg, rb_cThread);
 }
 
-static VALUE
-rb_thread_s_new(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+int
+rb_thread_scope_shared_p()
 {
-    rb_thread_t th = rb_thread_alloc(klass);
-    volatile VALUE *pos;
-
-    pos = th->stk_pos;
-    rb_obj_call_init(th->thread, argc, argv);
-    if (th->stk_pos == 0) {
-	rb_raise(rb_eThreadError, "uninitialized thread - check `%s#initialize'",
-		 rb_class2name(klass));
-    }
-
-    return th->thread;
+    return FL_TEST(ruby_scope, SCOPE_SHARED);
 }
 
 static VALUE
-rb_thread_initialize(thread, args)
-    VALUE thread, args;
+rb_thread_yield(arg, th) 
+    int arg;
+    thread_t th;
 {
-    if (!rb_block_given_p()) {
-	rb_raise(rb_eThreadError, "must be called with a block");
-    }
-    return rb_thread_start_0(rb_thread_yield, args, rb_thread_check(thread));
+    scope_dup(ruby_block->scope);
+    return rb_yield_0(th->thread, 0, 0);
 }
 
 static VALUE
-rb_thread_start(klass, args)
-    VALUE klass, args;
+rb_thread_start(klass)
+    VALUE klass;
 {
-    if (!rb_block_given_p()) {
-	rb_raise(rb_eThreadError, "must be called with a block");
+    if (!rb_iterator_p()) {
+	rb_raise(rb_eThreadError, "must be called as iterator");
     }
-    return rb_thread_start_0(rb_thread_yield, args, rb_thread_alloc(klass));
+    return rb_thread_create_0(rb_thread_yield, 0, klass);
 }
 
 static VALUE
 rb_thread_value(thread)
     VALUE thread;
 {
-    rb_thread_t th = rb_thread_check(thread);
+    thread_t th = rb_thread_check(thread);
 
-    while (!rb_thread_join(th, DELAY_INFTY));
+    rb_thread_join(thread);
 
     return th->result;
 }
@@ -9635,24 +6966,13 @@ static VALUE
 rb_thread_status(thread)
     VALUE thread;
 {
-    rb_thread_t th = rb_thread_check(thread);
+    thread_t th = rb_thread_check(thread);
 
     if (rb_thread_dead(th)) {
-	if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED))
-	    return Qnil;
-	return Qfalse;
+	if (NIL_P(th->errinfo)) return Qfalse;
+	return Qnil;
     }
 
-    return rb_str_new2(thread_status_name(th->status));
-}
-
-static VALUE
-rb_thread_alive_p(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-
-    if (rb_thread_dead(th)) return Qfalse;
     return Qtrue;
 }
 
@@ -9660,7 +6980,7 @@ static VALUE
 rb_thread_stop_p(thread)
     VALUE thread;
 {
-    rb_thread_t th = rb_thread_check(thread);
+    thread_t th = rb_thread_check(thread);
 
     if (rb_thread_dead(th)) return Qtrue;
     if (th->status == THREAD_STOPPED) return Qtrue;
@@ -9670,20 +6990,8 @@ rb_thread_stop_p(thread)
 static void
 rb_thread_wait_other_threads()
 {
-    rb_thread_t th;
-    int found;
-
     /* wait other threads to terminate */
     while (curr_thread != curr_thread->next) {
-	found = 0;
-	FOREACH_THREAD(th) {
-	    if (th != curr_thread && th->status != THREAD_STOPPED) {
-		found = 1;
-		break;
-	    }
-	}
-	END_FOREACH(th);
-	if (!found) return;
 	rb_thread_schedule();
     }
 }
@@ -9691,37 +6999,31 @@ rb_thread_wait_other_threads()
 static void
 rb_thread_cleanup()
 {
-    rb_thread_t curr, th;
+    thread_t th;
 
-    curr = curr_thread;
-    while (curr->status == THREAD_KILLED) {
-	curr = curr->prev;
+    if (curr_thread != curr_thread->next->prev) {
+	curr_thread = curr_thread->prev;
     }
 
-    FOREACH_THREAD_FROM(curr, th) {
-	if (th->status != THREAD_KILLED) {
+    FOREACH_THREAD(th) {
+	if (th != curr_thread && th->status != THREAD_KILLED) {
 	    rb_thread_ready(th);
-	    if (th != main_thread) {
-		th->thgroup = 0;
-		th->priority = 0;
-		th->status = THREAD_TO_KILL;
-		RDATA(th->thread)->dfree = NULL;
-	    }
+	    th->status = THREAD_TO_KILL;
 	}
     }
-    END_FOREACH_FROM(curr, th);
+    END_FOREACH(th);
 }
 
 int rb_thread_critical;
 
 static VALUE
-rb_thread_critical_get()
+rb_thread_get_critical()
 {
     return rb_thread_critical?Qtrue:Qfalse;
 }
 
 static VALUE
-rb_thread_critical_set(obj, val)
+rb_thread_set_critical(obj, val)
     VALUE obj, val;
 {
     rb_thread_critical = RTEST(val);
@@ -9736,10 +7038,9 @@ rb_thread_interrupt()
     if (curr_thread == main_thread) {
 	rb_interrupt();
     }
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
+    rb_thread_save_context(curr_thread);
+    if (setjmp(curr_thread->context)) {
+	return;
     }
     curr_thread = main_thread;
     rb_thread_restore_context(curr_thread, RESTORE_INTERRUPT);
@@ -9756,10 +7057,9 @@ rb_thread_signal_raise(sig)
 	rb_raise(rb_eSignal, "SIG%s", sig);
     }
     rb_thread_ready(main_thread);
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
+    rb_thread_save_context(curr_thread);
+    if (setjmp(curr_thread->context)) {
+	return;
     }
     th_signm = sig;
     curr_thread = main_thread;
@@ -9771,7 +7071,6 @@ rb_thread_trap_eval(cmd, sig)
     VALUE cmd;
     int sig;
 {
-#if 0
     rb_thread_critical = 0;
     if (!rb_thread_dead(curr_thread)) {
 	rb_thread_ready(curr_thread);
@@ -9779,44 +7078,33 @@ rb_thread_trap_eval(cmd, sig)
 	return;
     }
     rb_thread_ready(main_thread);
-    if (THREAD_SAVE_CONTEXT(curr_thread)) {
+    rb_thread_save_context(curr_thread);
+    if (setjmp(curr_thread->context)) {
 	return;
     }
     th_cmd = cmd;
     th_sig = sig;
     curr_thread = main_thread;
     rb_thread_restore_context(curr_thread, RESTORE_TRAP);
-#else
-    rb_thread_critical = 0;
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
-    }
-    th_cmd = cmd;
-    th_sig = sig;
-    curr_thread = main_thread;
-    rb_thread_restore_context(curr_thread, RESTORE_TRAP);
-#endif
 }
 
 static VALUE
-rb_thread_raise(argc, argv, th)
+rb_thread_raise(argc, argv, thread)
     int argc;
     VALUE *argv;
-    rb_thread_t th;
+    VALUE thread;
 {
-    volatile rb_thread_t th_save = th;
+    thread_t th = rb_thread_check(thread);
 
-    if (rb_thread_dead(th)) return Qnil;
+    if (rb_thread_dead(th)) return thread;
     if (curr_thread == th) {
 	rb_f_raise(argc, argv);
     }
 
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return th_save->thread;
-	}
+    if (curr_thread->status != THREAD_KILLED)
+	rb_thread_save_context(curr_thread);
+    if (setjmp(curr_thread->context)) {
+	return thread;
     }
 
     rb_scan_args(argc, argv, "11", &th_raise_argv[0], &th_raise_argv[1]);
@@ -9824,24 +7112,36 @@ rb_thread_raise(argc, argv, th)
     curr_thread = th;
 
     th_raise_argc = argc;
-    th_raise_node = ruby_current_node;
+    th_raise_file = ruby_sourcefile;
+    th_raise_line = ruby_sourceline;
     rb_thread_restore_context(curr_thread, RESTORE_RAISE);
     return Qnil;		/* not reached */
 }
 
-static VALUE
-rb_thread_raise_m(argc, argv, thread)
-    int argc;
-    VALUE *argv;
-    VALUE thread;
+static st_table *loading_tbl;
+
+static int
+rb_thread_loading(feature)
+    const char *feature;
 {
-    rb_thread_t th = rb_thread_check(thread);
+    if (!rb_provided(feature)) return Qfalse; /* need to load */
+    if (!loading_tbl) {
+	loading_tbl = st_init_strtable();
+    }
+    while (st_lookup(loading_tbl, feature, 0)) {
+	CHECK_INTS;
+	rb_thread_schedule();
+    }
+    return Qtrue;
+}
 
-    if (ruby_safe_level > th->safe) {
-	rb_secure(4);
+static void
+rb_thread_loading_done(feature)
+    const char *feature;
+{
+    if (loading_tbl) {
+	st_delete(loading_tbl, feature, 0);
     }
-    rb_thread_raise(argc, argv, th);
-    return Qnil;		/* not reached */
 }
 
 VALUE
@@ -9849,13 +7149,10 @@ rb_thread_local_aref(thread, id)
     VALUE thread;
     ID id;
 {
-    rb_thread_t th;
+    thread_t th;
     VALUE val;
 
     th = rb_thread_check(thread);
-    if (ruby_safe_level >= 4 && th != curr_thread) {
-	rb_raise(rb_eSecurityError, "Insecure: thread locals");
-    }
     if (!th->locals) return Qnil;
     if (st_lookup(th->locals, id, &val)) {
 	return val;
@@ -9876,18 +7173,16 @@ rb_thread_local_aset(thread, id, val)
     ID id;
     VALUE val;
 {
-    rb_thread_t th = rb_thread_check(thread);
+    thread_t th = rb_thread_check(thread);
 
-    if (ruby_safe_level >= 4 && th != curr_thread) {
-	rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals");
-    }
-    if (OBJ_FROZEN(thread)) rb_error_frozen("thread locals");
+    if (safe_level >= 4 && !FL_TEST(thread, FL_TAINT))
+	rb_raise(rb_eSecurityError, "Insecure: can't modify thread values");
 
     if (!th->locals) {
 	th->locals = st_init_numtable();
     }
     if (NIL_P(val)) {
-	st_delete(th->locals, (st_data_t*)&id, 0);
+	st_delete(th->locals, &id, 0);
 	return Qnil;
     }
     st_insert(th->locals, id, val);
@@ -9906,7 +7201,7 @@ static VALUE
 rb_thread_key_p(thread, id)
     VALUE thread, id;
 {
-    rb_thread_t th = rb_thread_check(thread);
+    thread_t th = rb_thread_check(thread);
 
     if (!th->locals) return Qfalse;
     if (st_lookup(th->locals, rb_to_id(id), 0))
@@ -9914,297 +7209,104 @@ rb_thread_key_p(thread, id)
     return Qfalse;
 }
 
-static int
-thread_keys_i(key, value, ary)
-    ID key;
-    VALUE value, ary;
-{
-    rb_ary_push(ary, ID2SYM(key));
-    return ST_CONTINUE;
-}
-
-static VALUE
-rb_thread_keys(thread)
-    VALUE thread;
-{
-    rb_thread_t th = rb_thread_check(thread);
-    VALUE ary = rb_ary_new();
-
-    if (th->locals) {
-	st_foreach(th->locals, thread_keys_i, ary);
-    }
-    return ary;
-}
-
-static VALUE
-rb_thread_inspect(thread)
-    VALUE thread;
-{
-    char *cname = rb_obj_classname(thread);
-    rb_thread_t th = rb_thread_check(thread);
-    const char *status = thread_status_name(th->status);
-    VALUE str;
-
-    str = rb_str_new(0, strlen(cname)+7+16+9+1); /* 7:tags 16:addr 9:status 1:nul */
-    sprintf(RSTRING(str)->ptr, "#<%s:0x%lx %s>", cname, thread, status);
-    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
-    OBJ_INFECT(str, thread);
-
-    return str;
-}
-
-void
-rb_thread_atfork()
-{
-    rb_thread_t th;
-
-    if (rb_thread_alone()) return;
-    FOREACH_THREAD(th) {
-	if (th != curr_thread) {
-	    rb_warn("fork terminates thread at %s:%d", th->node->nd_file, nd_line(th->node));
-	    rb_thread_die(th);
-	}
-    }
-    END_FOREACH(th);
-    main_thread = curr_thread;
-    curr_thread->next = curr_thread;
-    curr_thread->prev = curr_thread;
-}
-
-static VALUE rb_cCont;
+static VALUE rb_cContinuation;
 
 static VALUE
 rb_callcc(self)
     VALUE self;
 {
     volatile VALUE cont;
-    rb_thread_t th;
-    volatile rb_thread_t th_save;
+    thread_t th;
     struct tag *tag;
-    struct RVarmap *vars;
 
     THREAD_ALLOC(th);
-    cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th);
+    th->thread = cont = Data_Wrap_Struct(rb_cContinuation, thread_mark,
+					 thread_free, th);
 
-    scope_dup(ruby_scope);
+    FL_SET(ruby_scope, SCOPE_DONT_RECYCLE);
     for (tag=prot_tag; tag; tag=tag->prev) {
 	scope_dup(tag->scope);
     }
-    th->thread = curr_thread->thread;
-
-    for (vars = th->dyna_vars; vars; vars = vars->next) {
-	if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
-	FL_SET(vars, DVAR_DONT_RECYCLE);
-    }
-
-    th_save = th;
-    if (THREAD_SAVE_CONTEXT(th)) {
-	return th_save->result;
+    rb_thread_save_context(th);
+    if (setjmp(th->context)) {
+	return th->result;
     }
     else {
-	return rb_yield(cont);
+	return rb_yield(th->thread);
     }
 }
 
 static VALUE
-rb_cont_call(argc, argv, cont)
+rb_continuation_call(argc, argv, cont)
     int argc;
     VALUE *argv;
     VALUE cont;
 {
-    rb_thread_t th = rb_thread_check(cont);
+    thread_t th = rb_thread_check(cont);
 
-    if (th->thread != curr_thread->thread) {
-	rb_raise(rb_eRuntimeError, "continuation called across threads");
-    }
     switch (argc) {
-      case 0:
+    case 0:
 	th->result = Qnil;
 	break;
-      case 1:
-	th->result = argv[0];
+    case 1:
+	th->result = *argv;
 	break;
-      default:
+    default:
 	th->result = rb_ary_new4(argc, argv);
 	break;
     }
-
     rb_thread_restore_context(th, RESTORE_NORMAL);
     return Qnil;
 }
 
-struct thgroup {
-    int enclosed;
-    VALUE group;
-};
-
-static VALUE thgroup_s_alloc _((VALUE));
-static VALUE
-thgroup_s_alloc(klass)
-    VALUE klass;
-{
-    VALUE group;
-    struct thgroup *data;
-
-    group = Data_Make_Struct(klass, struct thgroup, 0, free, data);
-    data->enclosed = 0;
-    data->group = group;
-
-    return group;
-}
-
-static VALUE
-thgroup_list(group)
-    VALUE group;
-{
-    struct thgroup *data;
-    rb_thread_t th;
-    VALUE ary;
-
-    Data_Get_Struct(group, struct thgroup, data);
-    ary = rb_ary_new();
-
-    FOREACH_THREAD(th) {
-	if (th->thgroup == data->group) {
-	    rb_ary_push(ary, th->thread);
-	}
-    }
-    END_FOREACH(th);
-
-    return ary;
-}
-
-VALUE
-thgroup_enclose(group)
-    VALUE group;
-{
-    struct thgroup *data;
-
-    Data_Get_Struct(group, struct thgroup, data);
-    data->enclosed = 1;
-
-    return group;
-}
-
-static VALUE
-thgroup_enclosed_p(group)
-    VALUE group;
-{
-    struct thgroup *data;
-
-    Data_Get_Struct(group, struct thgroup, data);
-    if (data->enclosed) return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-thgroup_add(group, thread)
-    VALUE group, thread;
-{
-    rb_thread_t th;
-    struct thgroup *data;
-
-    rb_secure(4);
-    th = rb_thread_check(thread);
-
-    if (OBJ_FROZEN(group)) {
-      rb_raise(rb_eThreadError, "can't move to the frozen thread group");
-    }
-    Data_Get_Struct(group, struct thgroup, data);
-    if (data->enclosed) {
-	rb_raise(rb_eThreadError, "can't move to the enclosed thread group");
-    }
-
-    if (!th->thgroup) {
-	return Qnil;
-    }
-    if (OBJ_FROZEN(th->thgroup)) {
-	rb_raise(rb_eThreadError, "can't move from the frozen thread group");
-    }
-    Data_Get_Struct(th->thgroup, struct thgroup, data);
-    if (data->enclosed) {
-	rb_raise(rb_eThreadError, "can't move from the enclosed thread group");
-    }
-
-    th->thgroup = group;
-    return group;
-}
-
 void
 Init_Thread()
 {
-    VALUE cThGroup;
-
     rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);
     rb_cThread = rb_define_class("Thread", rb_cObject);
-    rb_undef_alloc_func(rb_cThread);
 
-    rb_define_singleton_method(rb_cThread, "new", rb_thread_s_new, -1);
-    rb_define_method(rb_cThread, "initialize", rb_thread_initialize, -2);
-    rb_define_singleton_method(rb_cThread, "start", rb_thread_start, -2);
-    rb_define_singleton_method(rb_cThread, "fork", rb_thread_start, -2);
+    rb_define_singleton_method(rb_cThread, "new", rb_thread_start, 0);
+    rb_define_singleton_method(rb_cThread, "start", rb_thread_start, 0);
+    rb_define_singleton_method(rb_cThread, "fork", rb_thread_start, 0);
 
     rb_define_singleton_method(rb_cThread, "stop", rb_thread_stop, 0);
     rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1);
     rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0);
     rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0);
+    rb_define_singleton_method(rb_cThread, "join", rb_thread_s_join, 1);
     rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0);
     rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0);
-    rb_define_singleton_method(rb_cThread, "list", rb_thread_list, 0);
 
-    rb_define_singleton_method(rb_cThread, "critical", rb_thread_critical_get, 0);
-    rb_define_singleton_method(rb_cThread, "critical=", rb_thread_critical_set, 1);
+    rb_define_singleton_method(rb_cThread, "critical", rb_thread_get_critical, 0);
+    rb_define_singleton_method(rb_cThread, "critical=", rb_thread_set_critical, 1);
 
     rb_define_singleton_method(rb_cThread, "abort_on_exception", rb_thread_s_abort_exc, 0);
     rb_define_singleton_method(rb_cThread, "abort_on_exception=", rb_thread_s_abort_exc_set, 1);
 
     rb_define_method(rb_cThread, "run", rb_thread_run, 0);
     rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0);
-    rb_define_method(rb_cThread, "kill", rb_thread_kill, 0);
-    rb_define_method(rb_cThread, "terminate", rb_thread_kill, 0);
     rb_define_method(rb_cThread, "exit", rb_thread_kill, 0);
     rb_define_method(rb_cThread, "value", rb_thread_value, 0);
     rb_define_method(rb_cThread, "status", rb_thread_status, 0);
-    rb_define_method(rb_cThread, "join", rb_thread_join_m, -1);
-    rb_define_method(rb_cThread, "alive?", rb_thread_alive_p, 0);
+    rb_define_method(rb_cThread, "join", rb_thread_join, 0);
+    rb_define_method(rb_cThread, "alive?", rb_thread_status, 0);
     rb_define_method(rb_cThread, "stop?", rb_thread_stop_p, 0);
-    rb_define_method(rb_cThread, "raise", rb_thread_raise_m, -1);
+    rb_define_method(rb_cThread, "raise", rb_thread_raise, -1);
 
     rb_define_method(rb_cThread, "abort_on_exception", rb_thread_abort_exc, 0);
     rb_define_method(rb_cThread, "abort_on_exception=", rb_thread_abort_exc_set, 1);
 
-    rb_define_method(rb_cThread, "priority", rb_thread_priority, 0);
-    rb_define_method(rb_cThread, "priority=", rb_thread_priority_set, 1);
-    rb_define_method(rb_cThread, "safe_level", rb_thread_safe_level, 0);
-    rb_define_method(rb_cThread, "group", rb_thread_group, 0);
-
     rb_define_method(rb_cThread, "[]", rb_thread_aref, 1);
     rb_define_method(rb_cThread, "[]=", rb_thread_aset, 2);
     rb_define_method(rb_cThread, "key?", rb_thread_key_p, 1);
-    rb_define_method(rb_cThread, "keys", rb_thread_keys, 0);
-
-    rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0);
-
-    rb_cCont = rb_define_class("Continuation", rb_cObject);
-    rb_undef_alloc_func(rb_cCont);
-    rb_undef_method(CLASS_OF(rb_cCont), "new");
-    rb_define_method(rb_cCont, "call", rb_cont_call, -1);
-    rb_define_method(rb_cCont, "[]", rb_cont_call, -1);
-    rb_define_global_function("callcc", rb_callcc, 0);
-
-    cThGroup = rb_define_class("ThreadGroup", rb_cObject);
-    rb_define_alloc_func(cThGroup, thgroup_s_alloc);
-    rb_define_method(cThGroup, "list", thgroup_list, 0);
-    rb_define_method(cThGroup, "enclose", thgroup_enclose, 0);
-    rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0);
-    rb_define_method(cThGroup, "add", thgroup_add, 1);
-    thgroup_default = rb_obj_alloc(cThGroup);
-    rb_define_const(cThGroup, "Default", thgroup_default);
-    rb_global_variable(&thgroup_default);
 
     /* allocate main thread */
     main_thread = rb_thread_alloc(rb_cThread);
-    curr_thread = main_thread->prev = main_thread->next = main_thread;
+
+    rb_cContinuation = rb_define_class("Continuation", rb_cObject);
+    rb_undef_method(CLASS_OF(rb_cContinuation), "new");
+    rb_define_method(rb_cContinuation, "call", rb_continuation_call, -1);
+    rb_define_global_function("callcc", rb_callcc, 0);
 }
 
 static VALUE
@@ -10212,14 +7314,15 @@ rb_f_catch(dmy, tag)
     VALUE dmy, tag;
 {
     int state;
-    VALUE val = Qnil;		/* OK */
+    ID t;
+    VALUE val;			/* OK */
 
-    tag = ID2SYM(rb_to_id(tag));
-    PUSH_TAG(tag);
+    t = rb_to_id(tag);
+    PUSH_TAG(t);
     if ((state = EXEC_TAG()) == 0) {
-	val = rb_yield_0(tag, 0, 0, Qfalse, Qfalse);
+	val = rb_yield_0(tag, 0, 0);
     }
-    else if (state == TAG_THROW && tag == prot_tag->dst) {
+    else if (state == TAG_THROW && t == prot_tag->dst) {
 	val = prot_tag->retval;
 	state = 0;
     }
@@ -10231,18 +7334,18 @@ rb_f_catch(dmy, tag)
 
 static VALUE
 catch_i(tag)
-    VALUE tag;
+    ID tag;
 {
-    return rb_funcall(Qnil, rb_intern("catch"), 1, tag);
+    return rb_f_catch(0, FIX2INT(tag));
 }
 
 VALUE
-rb_catch(tag, func, data)
+rb_catch(tag, proc, data)
     const char *tag;
-    VALUE (*func)();
+    VALUE (*proc)();
     VALUE data;
 {
-    return rb_iterate((VALUE(*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), func, data);
+    return rb_iterate(catch_i, rb_intern(tag), proc, data);
 }
 
 static VALUE
@@ -10251,32 +7354,31 @@ rb_f_throw(argc, argv)
     VALUE *argv;
 {
     VALUE tag, value;
+    ID t;
     struct tag *tt = prot_tag;
 
     rb_scan_args(argc, argv, "11", &tag, &value);
-    tag = ID2SYM(rb_to_id(tag));
+    t = rb_to_id(tag);
 
     while (tt) {
-	if (tt->tag == tag) {
-	    tt->dst = tag;
-	    tt->retval = value;
+	if (tt->tag == t) {
+	    tt->dst = t;
 	    break;
 	}
 	if (tt->tag == PROT_THREAD) {
-	    rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%lx",
-		     rb_id2name(SYM2ID(tag)),
+	    rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%x",
+		     rb_id2name(t),
 		     curr_thread);
 	}
 	tt = tt->prev;
     }
     if (!tt) {
-	rb_name_error(SYM2ID(tag), "uncaught throw `%s'", rb_id2name(SYM2ID(tag)));
+	rb_raise(rb_eNameError, "uncaught throw `%s'", rb_id2name(t));
     }
+    return_value(value);
     rb_trap_restore_mask();
     JUMP_TAG(TAG_THROW);
-#ifndef __GNUC__
-    return Qnil; 		/* not reached */
-#endif
+    /* not reached */
 }
 
 void
@@ -10285,8 +7387,27 @@ rb_throw(tag, val)
     VALUE val;
 {
     VALUE argv[2];
+    ID t = rb_intern(tag);
 
-    argv[0] = ID2SYM(rb_intern(tag));
+    argv[0] = FIX2INT(t);
     argv[1] = val;
     rb_f_throw(2, argv);
 }
+
+static void
+return_check()
+{
+    struct tag *tt = prot_tag;
+
+    while (tt) {
+	if (tt->tag == PROT_FUNC) {
+	    break;
+	}
+	if (tt->tag == PROT_THREAD) {
+	    rb_raise(rb_eThreadError, "return from within thread 0x%x",
+		     curr_thread);
+	}
+	tt = tt->prev;
+    }
+}
+
diff --git a/ext/.cvsignore b/ext/.cvsignore
deleted file mode 100644
index ab2424ff7a..0000000000
--- a/ext/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-extinit.c
-*.log
diff --git a/ext/Setup b/ext/Setup
index 7b214abde3..830a5095ca 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -1,33 +1,15 @@
 #option nodynamic
 
-#Win32API
-#bigdecimal
+#GD
 #curses
 #dbm
-#digest
-#digest/md5
-#digest/rmd160
-#digest/sha1
-#digest/sha2
-#dl
-#enumerator
 #etc
 #fcntl
-#gdbm
-#iconv
-#io/wait
-#nkf
+#kconv
+#md5
 #pty
-#openssl
-#racc/cparse
-#readline
 #sdbm
 #socket
-#stringio
-#strscan
-#syck
-#syslog
+#tkutil
 #tcltklib
-#tk
-#win32ole
-#zlib
+#gtk
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
deleted file mode 100644
index 9b1bdecb95..0000000000
--- a/ext/Setup.atheos
+++ /dev/null
@@ -1,33 +0,0 @@
-option nodynamic
-
-#Win32API
-bigdecimal
-curses
-dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-dl
-enumerator
-etc
-fcntl
-gdbm
-iconv
-io/wait
-nkf
-pty
-#openssl
-racc/parse
-readline
-sdbm
-socket
-stringio
-strscan
-syck
-syslog
-#tcltklib
-#tk
-#win32ole
-zlib
diff --git a/ext/Setup.dj b/ext/Setup.dj
index b84960a2e0..cf25c07e6b 100644
--- a/ext/Setup.dj
+++ b/ext/Setup.dj
@@ -1,33 +1,14 @@
 option nodynamic
 
-#Win32API
-bigdecimal
+#GD
 #curses
 dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
+gdbm
 #etc
-enumerator
 fcntl
-gdbm
-#iconv
-#io/wait
 nkf
-#pty
-#openssl
-racc/cparse
-readline
+marshal
+md5
 sdbm
 #socket
-stringio
-strscan
-syck
-#syslog
-#tcltklib
-#tk
-#win32ole
-#zlib
+#tkutil
diff --git a/ext/Setup.emx b/ext/Setup.emx
deleted file mode 100644
index 7ea04543c5..0000000000
--- a/ext/Setup.emx
+++ /dev/null
@@ -1,33 +0,0 @@
-option nodynamic
-
-#Win32API
-bigdecimal
-curses
-#dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
-enumerator
-etc
-fcntl
-#gdbm
-#iconv
-#io/wait
-nkf
-#pty
-#openssl
-racc/cparse
-#readline
-#sdbm
-socket
-stringio
-strscan
-#syck
-#syslog
-#tcltklib
-#tk
-#win32ole
-#zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index 7a330f801a..b469709585 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -1,33 +1,12 @@
-#option nodynamic
+option nodynamic
 
-Win32API
-bigdecimal
+#GD
 #curses
 #dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-dl
-enumerator
-etc
+#etc
 fcntl
-#gdbm
-#iconv
-#io/wait
-nkf
-#pty
-#openssl
-racc/cparse
-#readline
-sdbm
+kconv
+#marshal
+md5
 socket
-stringio
-strscan
-syck
-#syslog
-#tcltklib
-#tk
-win32ole
-#zlib
+#tkutil
diff --git a/ext/Setup.x68 b/ext/Setup.x68
index 9b9563d941..25adea2035 100644
--- a/ext/Setup.x68
+++ b/ext/Setup.x68
@@ -1,33 +1,12 @@
 option nodynamic
 
-#Win32API
-bigdecimal
+#GD
 #curses
 dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
 #etc
-enumerator
 fcntl
-#gdbm
-#iconv
-#io/wait
-nkf
-#pty
-#openssl
-racc/cparse
-#readline
-#sdbm
+kconv
+marshal
+md5
 #socket
-stringio
-strscan
-#syck
-#syslog
-#tcltklib
-#tk
-#win32ole
-#zlib
+#tkutil
diff --git a/ext/Win32API/.cvsignore b/ext/Win32API/.cvsignore
deleted file mode 100644
index 90c83ed9b1..0000000000
--- a/ext/Win32API/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-*.log
-*.def
diff --git a/ext/Win32API/MANIFEST b/ext/Win32API/MANIFEST
index ff3a399d26..7cc9ac445e 100644
--- a/ext/Win32API/MANIFEST
+++ b/ext/Win32API/MANIFEST
@@ -5,5 +5,3 @@ Win32API.c
 extconf.rb
 getch.rb
 point.rb
-lib/win32/registry.rb
-lib/win32/resolv.rb
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
index 776df56ecb..9f75653132 100644
--- a/ext/Win32API/Win32API.c
+++ b/ext/Win32API/Win32API.c
@@ -2,7 +2,7 @@
   Win32API - Ruby Win32 API Import Facility
 */
 
-#if !defined _MSC_VER && !defined _WIN32
+#ifndef _MSC_VER
 #define  WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdio.h>
@@ -13,6 +13,11 @@
 #define _T_POINTER  2
 #define _T_INTEGER  3
 
+typedef char *ApiPointer(void);
+typedef long  ApiNumber(void);
+typedef void  ApiVoid(void);
+typedef int   ApiInteger(void);
+
 #include "ruby.h"
 
 typedef struct {
@@ -43,17 +48,17 @@ Win32API_initialize(self, dllname, proc, import, export)
     VALUE str;
     VALUE a_import;
     VALUE *ptr;
-    char *s;
     int i;
     int len;
-    int ex = _T_VOID;
-
-    SafeStringValue(dllname);
-    SafeStringValue(proc);
-    hdll = LoadLibrary(RSTRING(dllname)->ptr);
-    if (!hdll)
-	rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
-    rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, hdll));
+    int ex;
+
+    hdll = GetModuleHandle(RSTRING(dllname)->ptr);
+    if (!hdll) {
+	hdll = LoadLibrary(RSTRING(dllname)->ptr);
+	if (!hdll)
+	    rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
+	Data_Wrap_Struct(self, 0, Win32API_FreeLibrary, hdll);
+    }
     hproc = GetProcAddress(hdll, RSTRING(proc)->ptr);
     if (!hproc) {
 	str = rb_str_new3(proc);
@@ -63,75 +68,42 @@ Win32API_initialize(self, dllname, proc, import, export)
 	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
 		RSTRING(proc)->ptr, RSTRING(str)->ptr);
     }
-    rb_iv_set(self, "__dll__", UINT2NUM((unsigned long)hdll));
+    rb_iv_set(self, "__dll__", INT2NUM((int)hdll));
     rb_iv_set(self, "__dllname__", dllname);
-    rb_iv_set(self, "__proc__", UINT2NUM((unsigned long)hproc));
+    rb_iv_set(self, "__proc__", INT2NUM((int)hproc));
 
     a_import = rb_ary_new();
-    switch (TYPE(import)) {
-    case T_NIL:
-	break;
-    case T_ARRAY:
-	ptr = RARRAY(import)->ptr;
-	for (i = 0, len = RARRAY(import)->len; i < len; i++) {
-	    SafeStringValue(ptr[i]);
-	    switch (*(char *)RSTRING(ptr[i])->ptr) {
-	    case 'N': case 'n': case 'L': case 'l':
-		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
-		break;
-	    case 'P': case 'p':
-		rb_ary_push(a_import, INT2FIX(_T_POINTER));
-		break;
-	    case 'I': case 'i':
-		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
-		break;
-	    }
-	}
-        break;
-    default:
-	SafeStringValue(import);
-	s = RSTRING(import)->ptr;
-	for (i = 0, len = RSTRING(import)->len; i < len; i++) {
-	    switch (*s++) {
-	    case 'N': case 'n': case 'L': case 'l':
-		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
-		break;
-	    case 'P': case 'p':
-		rb_ary_push(a_import, INT2FIX(_T_POINTER));
-		break;
-	    case 'I': case 'i':
-		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
-		break;
-	    }
-	}
-        break;
-    }
-
-    if (16 < RARRAY(a_import)->len) {
-	rb_raise(rb_eRuntimeError, "too many parameters: %d\n", RARRAY(a_import)->len);
-    }
-
-    rb_iv_set(self, "__import__", a_import);
-
-    if (NIL_P(export)) {
-	ex = _T_VOID;
-    } else {
-	SafeStringValue(export);
-	switch (*RSTRING(export)->ptr) {
-        case 'V': case 'v':
-	    ex = _T_VOID;
-	    break;
+    ptr = RARRAY(import)->ptr;
+    for (i = 0, len = RARRAY(import)->len; i < len; i++) {
+	int c = *(char *)RSTRING(ptr[i])->ptr;
+	switch (c) {
 	case 'N': case 'n': case 'L': case 'l':
-	    ex = _T_NUMBER;
+	    rb_ary_push(a_import, INT2FIX(_T_NUMBER));
 	    break;
 	case 'P': case 'p':
-	    ex = _T_POINTER;
+	    rb_ary_push(a_import, INT2FIX(_T_POINTER));
 	    break;
 	case 'I': case 'i':
-	    ex = _T_INTEGER;
+	    rb_ary_push(a_import, INT2FIX(_T_INTEGER));
 	    break;
 	}
     }
+    rb_iv_set(self, "__import__", a_import);
+
+    switch (*RSTRING(export)->ptr) {
+    case 'V': case 'v':
+	ex = _T_VOID;
+	break;
+    case 'N': case 'n': case 'L': case 'l':
+	ex = _T_NUMBER;
+	break;
+    case 'P': case 'p':
+	ex = _T_POINTER;
+	break;
+    case 'I': case 'i':
+	ex = _T_INTEGER;
+	break;
+    }
     rb_iv_set(self, "__export__", INT2FIX(ex));
 
     return Qnil;
@@ -144,62 +116,103 @@ Win32API_Call(argc, argv, obj)
     VALUE obj;
 {
     VALUE args;
-    unsigned long ret;
-    int i;
-    struct {
-	unsigned long params[16];
-    } param;
-#define params param.params
 
-    VALUE obj_proc = rb_iv_get(obj, "__proc__");
-    VALUE obj_import = rb_iv_get(obj, "__import__");
-    VALUE obj_export = rb_iv_get(obj, "__export__");
-    FARPROC ApiFunction = (FARPROC)NUM2ULONG(obj_proc);
-    int items = rb_scan_args(argc, argv, "0*", &args);
-    int nimport = RARRAY(obj_import)->len;
+    FARPROC ApiFunction;
+
+    ApiPointer  *ApiFunctionPointer;
+    ApiNumber   *ApiFunctionNumber;
+    ApiVoid     *ApiFunctionVoid;
+    ApiInteger  *ApiFunctionInteger;
+
+    long  lParam; 
+    char *pParam;
+
+    VALUE Return;
+
+    VALUE obj_proc;
+    VALUE obj_import;
+    VALUE obj_export;
+    VALUE import_type;
+    int nimport, timport, texport, i;
+    int items;
 
+    items = rb_scan_args(argc, argv, "0*", &args);
+
+    obj_proc = rb_iv_get(obj, "__proc__");
+
+    ApiFunction = (FARPROC)NUM2INT(obj_proc);
+
+    obj_import = rb_iv_get(obj, "__import__");
+    obj_export = rb_iv_get(obj, "__export__");
+    nimport  = RARRAY(obj_import)->len;
+    texport = FIX2INT(obj_export);
 
     if (items != nimport)
 	rb_raise(rb_eRuntimeError, "Wrong number of parameters: expected %d, got %d.\n",
 	    nimport, items);
 
-    for (i = 0; i < nimport; i++) {
-	unsigned long lParam = 0;
-	switch (FIX2INT(rb_ary_entry(obj_import, i))) {
+    if (0 < nimport) {
+	for (i = nimport - 1; 0 <= i; i--) {
 	    VALUE str;
-	case _T_NUMBER:
-	case _T_INTEGER:
-	default:
-	    lParam = NUM2ULONG(rb_ary_entry(args, i));
-	    break;
-	case _T_POINTER:
-	    str = rb_ary_entry(args, i);
-	    if (NIL_P(str)) {
-		lParam = 0;
-	    } else if (FIXNUM_P(str)) {
-		lParam = NUM2ULONG(str);
-	    } else {
-		StringValue(str);
+	    import_type = rb_ary_entry(obj_import, i);
+	    timport = FIX2INT(import_type);
+	    switch (timport) {
+	    case _T_NUMBER:
+	    case _T_INTEGER:
+		lParam = NUM2INT(rb_ary_entry(args, i));
+#if defined(_MSC_VER) || defined(__LCC__)
+		_asm {
+		    mov     eax, lParam
+		    push    eax
+		}
+#elif defined(__CYGWIN32__) || defined(__MINGW32__)
+		asm volatile ("pushl %0" :: "g" (lParam));
+#else
+#error
+#endif
+		break;
+	    case _T_POINTER:
+		str = rb_ary_entry(args, i);
+		Check_Type(str, T_STRING);
 		rb_str_modify(str);
-		lParam = (unsigned long)StringValuePtr(str);
+		pParam = RSTRING(str)->ptr;
+#if defined(_MSC_VER) || defined(__LCC__)
+		_asm {
+		    mov     eax, dword ptr pParam
+		    push    eax
+		}
+#elif defined(__CYGWIN32__) || defined(__MINGW32__)
+		asm volatile ("pushl %0" :: "g" (pParam));
+#else
+#error
+#endif
+		break;
 	    }
-	    break;
 	}
-	params[i] = lParam;
-    }
 
-    ret = ApiFunction(param);
+    }
 
-    switch (FIX2INT(obj_export)) {
+    switch (texport) {
     case _T_NUMBER:
-    case _T_INTEGER:
-	return INT2NUM(ret);
+	ApiFunctionNumber = (ApiNumber *) ApiFunction;
+	Return = INT2NUM(ApiFunctionNumber());
+	break;
     case _T_POINTER:
-	return rb_str_new2((char *)ret);
+	ApiFunctionPointer = (ApiPointer *) ApiFunction;
+	Return = rb_str_new2((char *)ApiFunctionPointer());
+	break;
+    case _T_INTEGER:
+	ApiFunctionInteger = (ApiInteger *) ApiFunction;
+	Return = INT2NUM(ApiFunctionInteger());
+	break;
     case _T_VOID:
     default:
-	return INT2NUM(0);
+	ApiFunctionVoid = (ApiVoid *) ApiFunction;
+	ApiFunctionVoid();
+	Return = INT2NUM(0);
+	break;
     }
+    return Return;
 }
 
 void
@@ -210,3 +223,9 @@ Init_Win32API()
     rb_define_method(cWin32API, "call", Win32API_Call, -1);
     rb_define_alias(cWin32API,  "Call", "call");
 }
+
+void
+Init_win32api()
+{
+    Init_Win32API();
+}
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
index 134a6e5b92..5af3243d96 100644
--- a/ext/Win32API/extconf.rb
+++ b/ext/Win32API/extconf.rb
@@ -1,5 +1,7 @@
-require 'mkmf'
-
-if have_header("windows.h") and have_library("kernel32")
+case PLATFORM
+when /cygwin/,/mingw/
+  $CFLAGS = "-fno-defer-pop"
+  create_makefile("Win32API")
+when /win32/
   create_makefile("Win32API")
 end
diff --git a/ext/Win32API/lib/win32/registry.rb b/ext/Win32API/lib/win32/registry.rb
deleted file mode 100644
index 2671551a33..0000000000
--- a/ext/Win32API/lib/win32/registry.rb
+++ /dev/null
@@ -1,831 +0,0 @@
-=begin
-= Win32 Registry I/F
-win32/registry is registry accessor library for Win32 platform.
-It uses Win32API to call Win32 Registry APIs.
-
-== example
-  Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
-    value = reg['foo']                               # read a value
-    value = reg['foo', Win32::Registry::REG_SZ]      # read a value with type
-    type, value = reg.read('foo')                    # read a value
-    reg['foo'] = 'bar'                               # write a value
-    reg['foo', Win32::Registry::REG_SZ] = 'bar'      # write a value with type
-    reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
-    
-    reg.each_value { |name, type, data| ... }        # Enumerate values
-    reg.each_key { |key, wtime| ... }                # Enumerate subkeys
-    
-    reg.delete_value(name)                         # Delete a value
-    reg.delete_key(name)                           # Delete a subkey
-    reg.delete_key(name, true)                     # Delete a subkey recursively
-  end
-
-= Reference
-
-== Win32::Registry class
-
-=== including modules
-
-* Enumerable
-* Registry::Constants
-
-=== class methods
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
-    Open the registry key ((|subkey|)) under ((|key|)).
-    ((|key|)) is Win32::Registry object of parent key.
-    You can use predefined key HKEY_* (see ((<constants>)))
-    
-    ((|desired|)) and ((|opt|)) is access mask and key option.
-    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp>)).
-    
-    If block is given, the key is closed automatically.
-
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
-    Create or open the registry key ((|subkey|)) under ((|key|)).
-    You can use predefined key HKEY_* (see ((<constants>)))
-    
-    If subkey is already exists, key is opened and Registry#((<created?>))
-    method will return false.
-    
-    If block is given, the key is closed automatically.
-
---- Registry.expand_environ(str)
-    Replace (({%\w+%})) into the environment value of ((|str|)).
-    This method is used for REG_EXPAND_SZ.
-    
-    For detail, see ((<ExpandEnvironmentStrings|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp>)) Win32 API.
-
---- Registry.type2name(type)
-    Convert registry type value to readable string.
-
---- Registry.wtime2time(wtime)
-    Convert 64-bit FILETIME integer into Time object.
-
---- Registry.time2wtime(time)
-    Convert Time object or Integer object into 64-bit FILETIME.
-
-=== instance methods
---- open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-    Same as (({Win32::((<Registry.open>))(self, subkey, desired, opt)}))
-
---- create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-    Same as (({Win32::((<Registry.create>))(self, subkey, desired, opt)}))
-
---- close
-    Close key.
-    
-    After closed, most method raises error.
-
---- read(name, *rtype)
-    Read a registry value named ((|name|)) and return array of
-    [ ((|type|)), ((|data|)) ].
-    When name is nil, the `default' value is read.
-    
-    ((|type|)) is value type. (see ((<Win32::Registry::Constants module>)))
-    ((|data|)) is value data, its class is:
-    :REG_SZ, REG_EXPAND_SZ
-       String
-    :REG_MULTI_SZ
-       Array of String
-    :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
-       Integer
-    :REG_BINARY
-       String (contains binary data)
-    
-    When ((|rtype|)) is specified, the value type must be included by
-    ((|rtype|)) array, or TypeError is raised.
-
---- self[name, *rtype]
-    Read a registry value named ((|name|)) and return its value data.
-    The class of value is same as ((<read>)) method returns.
-    
-    If the value type is REG_EXPAND_SZ, returns value data whose environment
-    variables are replaced.
-    If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
-    REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
-    
-    The meaning of ((|rtype|)) is same as ((<read>)) method.
-
---- read_s(name)
---- read_i(name)
---- read_bin(name)
-    Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    registry value named ((|name|)).
-    
-    If the values type does not match, TypeError is raised.
-
---- read_s_expand(name)
-    Read a REG_SZ or REG_EXPAND_SZ registry value named ((|name|)).
-    
-    If the value type is REG_EXPAND_SZ, environment variables are replaced.
-    Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
-
---- write(name, type, data)
-    Write ((|data|)) to a registry value named ((|name|)).
-    When name is nil, write to the `default' value.
-    
-    ((|type|)) is type value. (see ((<Registry::Constants module>)))
-    Class of ((|data|)) must be same as which ((<read>))
-    method returns.
-
---- self[name, wtype = nil] = value
-    Write ((|value|)) to a registry value named ((|name|)).
-    
-    If ((|wtype|)) is specified, the value type is it.
-    Otherwise, the value type is depend on class of ((|value|)):
-    :Integer
-      REG_DWORD
-    :String
-      REG_SZ
-    :Array
-      REG_MULTI_SZ
-
---- write_s(name, value)
---- write_i(name, value)
---- write_bin(name, value)
-    Write ((|value|)) to a registry value named ((|name|)).
-    
-    The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    REG_BINARY(write_bin).
-
---- each { |name, type, value| ... }
---- each_value { |name, type, value| ... }
-    Enumerate values.
-
---- each_key { |subkey, wtime| ... }
-    Enumerate subkeys.
-    
-    ((|subkey|)) is String which contains name of subkey.
-    ((|wtime|)) is last write time as FILETIME (64-bit integer).
-    (see ((<Registry.wtime2time>)))
-
---- delete(name)
---- delete_value(name)
-    Delete a registry value named ((|name|)).
-    We can not delete the `default' value.
-
---- delete_key(name, recursive = false)
-    Delete a subkey named ((|name|)) and all its values.
-    
-    If ((|recursive|)) is false, the subkey must not have subkeys.
-    Otherwise, this method deletes all subkeys and values recursively.
-
---- flush
-    Write all the attributes into the registry file.
-
---- created?
-    Returns if key is created ((*newly*)).
-    (see ((<Registry.create>)))
-
---- open?
-    Returns if key is not closed.
-
---- hkey
-    Returns key handle value.
-
---- parent
-    Win32::Registry object of parent key, or nil if predefeined key.
-
---- keyname
-    Same as ((|subkey|)) value of ((<Registry.open>)) or
-    ((<Registry.create>)) method.
-
---- disposition
-    Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
-
---- name
---- to_s
-    Full path of key such as (({'HKEY_CURRENT_USER\SOFTWARE\foo\bar'})).
-
---- info
-    Returns key information as Array of:
-    :num_keys
-      The number of subkeys.
-    :max_key_length
-      Maximum length of name of subkeys.
-    :num_values
-      The number of values.
-    :max_value_name_length
-      Maximum length of name of values.
-    :max_value_length
-      Maximum length of value of values.
-    :descriptor_length
-      Length of security descriptor.
-    :wtime
-      Last write time as FILETIME(64-bit integer)
-    
-    For detail, see ((<RegQueryInfoKey|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp>)) Win32 API.
-
---- num_keys
---- max_key_length
---- num_values
---- max_value_name_length
---- max_value_length
---- descriptor_length
---- wtime
-    Returns an item of key information.
-
-=== constants
---- HKEY_CLASSES_ROOT
---- HKEY_CURRENT_USER
---- HKEY_LOCAL_MACHINE
---- HKEY_PERFORMANCE_DATA
---- HKEY_CURRENT_CONFIG
---- HKEY_DYN_DATA
-    Win32::Registry object whose key is predefined key.
-    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp>)).
-
-== Win32::Registry::Constants module
-
-For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp>)).
-
---- HKEY_*
-    Predefined key ((*handle*)).
-    These are Integer, not Win32::Registry.
-
---- REG_*
-    Registry value type.
-
---- KEY_*
-    Security access mask.
-
---- KEY_OPTIONS_*
-    Key options.
-
---- REG_CREATED_NEW_KEY
---- REG_OPENED_EXISTING_KEY
-    If the key is created newly or opened existing key.
-    See also Registry#((<disposition>)) method.
-
-=end
-
-require 'Win32API'
-
-module Win32
-  class Registry
-    module Constants
-      HKEY_CLASSES_ROOT = 0x80000000
-      HKEY_CURRENT_USER = 0x80000001
-      HKEY_LOCAL_MACHINE = 0x80000002
-      HKEY_USERS = 0x80000003
-      HKEY_PERFORMANCE_DATA = 0x80000004
-      HKEY_PERFORMANCE_TEXT = 0x80000050
-      HKEY_PERFORMANCE_NLSTEXT = 0x80000060
-      HKEY_CURRENT_CONFIG = 0x80000005
-      HKEY_DYN_DATA = 0x80000006
-      
-      REG_NONE = 0
-      REG_SZ = 1
-      REG_EXPAND_SZ = 2
-      REG_BINARY = 3
-      REG_DWORD = 4
-      REG_DWORD_LITTLE_ENDIAN = 4
-      REG_DWORD_BIG_ENDIAN = 5
-      REG_LINK = 6
-      REG_MULTI_SZ = 7
-      REG_RESOURCE_LIST = 8
-      REG_FULL_RESOURCE_DESCRIPTOR = 9
-      REG_RESOURCE_REQUIREMENTS_LIST = 10
-      REG_QWORD = 11
-      REG_QWORD_LITTLE_ENDIAN = 11
-      
-      STANDARD_RIGHTS_READ = 0x00020000
-      STANDARD_RIGHTS_WRITE = 0x00020000
-      KEY_QUERY_VALUE = 0x0001
-      KEY_SET_VALUE = 0x0002
-      KEY_CREATE_SUB_KEY = 0x0004
-      KEY_ENUMERATE_SUB_KEYS = 0x0008
-      KEY_NOTIFY = 0x0010
-      KEY_CREATE_LINK = 0x0020
-      KEY_READ = STANDARD_RIGHTS_READ |
-        KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
-      KEY_WRITE = STANDARD_RIGHTS_WRITE |
-        KEY_SET_VALUE | KEY_CREATE_SUB_KEY
-      KEY_EXECUTE = KEY_READ
-      KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-      
-      REG_OPTION_RESERVED = 0x0000
-      REG_OPTION_NON_VOLATILE = 0x0000
-      REG_OPTION_VOLATILE = 0x0001
-      REG_OPTION_CREATE_LINK = 0x0002
-      REG_OPTION_BACKUP_RESTORE = 0x0004
-      REG_OPTION_OPEN_LINK = 0x0008
-      REG_LEGAL_OPTION = REG_OPTION_RESERVED |
-        REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
-        REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
-      
-      REG_CREATED_NEW_KEY = 1
-      REG_OPENED_EXISTING_KEY = 2
-      
-      REG_WHOLE_HIVE_VOLATILE = 0x0001
-      REG_REFRESH_HIVE = 0x0002
-      REG_NO_LAZY_FLUSH = 0x0004
-      REG_FORCE_RESTORE = 0x0008
-      
-      MAX_KEY_LENGTH = 514
-      MAX_VALUE_LENGTH = 32768
-    end
-    include Constants
-    include Enumerable
-    
-    #
-    # Error
-    #
-    class Error < ::StandardError
-      FormatMessageA = Win32API.new('kernel32.dll', 'FormatMessageA', 'LPLLPLP', 'L')
-      def initialize(code)
-        @code = code
-        msg = "\0" * 1024
-        len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
-        super msg[0, len].tr("\r", '').chomp
-      end
-      attr_reader :code
-    end
-    
-    #
-    # Predefined Keys
-    #
-    class PredefinedKey < Registry
-      def initialize(hkey, keyname)
-        @hkey = hkey
-        @parent = nil
-        @keyname = keyname
-        @disposition = REG_OPENED_EXISTING_KEY
-      end
-      
-      # Predefined keys cannot be closed
-      def close
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-      
-      # Fake class for Registry#open, Registry#create
-      def class
-        Registry
-      end
-      
-      # Make all
-      Constants.constants.grep(/^HKEY_/) do |c|
-        Registry.const_set c, new(Constants.const_get(c), c)
-      end
-    end
-    
-    #
-    # Win32 APIs
-    #
-    module API
-      [
-        %w/RegOpenKeyExA    LPLLP        L/,
-        %w/RegCreateKeyExA  LPLLLLPPP    L/,
-        %w/RegEnumValueA    LLPPPPPP     L/,
-        %w/RegEnumKeyExA    LLPPLLLP     L/,
-        %w/RegQueryValueExA LPLPPP       L/,
-        %w/RegSetValueExA   LPLLPL       L/,
-        %w/RegDeleteValue   LP           L/,
-        %w/RegDeleteKey     LP           L/,
-        %w/RegFlushKey      L            L/,
-        %w/RegCloseKey      L            L/,
-        %w/RegQueryInfoKey  LPPPPPPPPPPP L/,
-      ].each do |fn|
-        const_set fn[0].intern, Win32API.new('advapi32.dll', *fn)
-      end
-      
-      module_function
-      
-      def check(result)
-        raise Error, result, caller(2) if result != 0
-      end
-      
-      def packdw(dw)
-        [dw].pack('V')
-      end
-      
-      def unpackdw(dw)
-        dw += [0].pack('V')
-        dw.unpack('V')[0]
-      end
-      
-      def packqw(qw)
-        [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
-      end
-      
-      def unpackqw(qw)
-        qw = qw.unpack('VV')
-        (qw[1] << 32) | qw[0]
-      end
-      
-      def OpenKey(hkey, name, opt, desired)
-        result = packdw(0)
-        check RegOpenKeyExA.call(hkey, name, opt, desired, result)
-        unpackdw(result)
-      end
-      
-      def CreateKey(hkey, name, opt, desired)
-        result = packdw(0)
-        disp = packdw(0)
-        check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
-                                   0, result, disp)
-        [ unpackdw(result), unpackdw(disp) ]
-      end
-      
-      def EnumValue(hkey, index)
-        name = ' ' * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
-        name[0, unpackdw(size)]
-      end
-      
-      def EnumKey(hkey, index)
-        name = ' ' * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        wtime = ' ' * 8
-        check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
-        [ name[0, unpackdw(size)], unpackqw(wtime) ]
-      end
-      
-      def QueryValue(hkey, name)
-        type = packdw(0)
-        size = packdw(0)
-        check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
-        data = ' ' * unpackdw(size)
-        check RegQueryValueExA.call(hkey, name, 0, type, data, size)
-        [ unpackdw(type), data[0, unpackdw(size)] ]
-      end
-      
-      def SetValue(hkey, name, type, data, size)
-        check RegSetValueExA.call(hkey, name, 0, type, data, size)
-      end
-      
-      def DeleteValue(hkey, name)
-        check RegDeleteValue.call(hkey, name)
-      end
-      
-      def DeleteKey(hkey, name)
-        check RegDeleteKey.call(hkey, name)
-      end
-      
-      def FlushKey(hkey)
-        check RegFlushKey.call(hkey)
-      end
-      
-      def CloseKey(hkey)
-        check RegCloseKey.call(hkey)
-      end
-      
-      def QueryInfoKey(hkey)
-        subkeys = packdw(0)
-        maxsubkeylen = packdw(0)
-        values = packdw(0)
-        maxvaluenamelen = packdw(0)
-        maxvaluelen = packdw(0)
-        secdescs = packdw(0)
-        wtime = ' ' * 8
-        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
-          values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
-        [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
-          unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
-          unpackdw(secdescs), unpackqw(wtime) ]
-      end
-    end
-    
-    #
-    # utility functions
-    #
-    def self.expand_environ(str)
-      str.gsub(/%([^%]+)%/) { ENV[$1] || $& }
-    end
-    
-    @@type2name = { }
-    %w[
-      REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
-      REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
-      REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
-      REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
-    ].each do |type|
-      @@type2name[Constants.const_get(type)] = type
-    end
-    
-    def self.type2name(type)
-      @@type2name[type] || type.to_s
-    end
-    
-    def self.wtime2time(wtime)
-      Time.at((wtime - 116444736000000000) / 10000000)
-    end
-    
-    def self.time2wtime(time)
-      time.to_i * 10000000 + 116444736000000000
-    end
-    
-    #
-    # constructors
-    #
-    private_class_method :new
-    
-    def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-      subkey = subkey.chomp('\\')
-      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-    
-    def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, disp)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-    
-    #
-    # finalizer
-    #
-    @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
-    
-    #
-    # initialize
-    #
-    def initialize(hkey, parent, keyname, disposition)
-      @hkey = hkey
-      @parent = parent
-      @keyname = keyname
-      @disposition = disposition
-      @hkeyfinal = [ hkey ]
-      ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
-    end
-    attr_reader :hkey, :parent, :keyname, :disposition
-    
-    #
-    # attributes
-    #
-    def created?
-      @disposition == REG_CREATED_NEW_KEY
-    end
-    
-    def open?
-      !@hkey.nil?
-    end
-    
-    def name
-      parent = self
-      name = @keyname
-      while parent = parent.parent
-        name = parent.keyname + '\\' + name
-      end
-      name
-    end
-    
-    def inspect
-      "\#<Win32::Registry key=#{name.inspect}>"
-    end
-    
-    #
-    # marshalling
-    #
-    def _dump(depth)
-      raise TypeError, "can't dump Win32::Registry"
-    end
-    
-    #
-    # open/close
-    #
-    def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
-      self.class.open(self, subkey, desired, opt, &blk)
-    end
-    
-    def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
-      self.class.create(self, subkey, desired, opt, &blk)
-    end
-    
-    def close
-      API.CloseKey(@hkey)
-      @hkey = @parent = @keyname = nil
-      @hkeyfinal[0] = nil
-    end
-    
-    #
-    # iterator
-    #
-    def each_value
-      index = 0
-      while true
-        begin
-          subkey = API.EnumValue(@hkey, index)
-        rescue Error
-          break
-        end
-        begin
-          type, data = read(subkey)
-        rescue Error
-          next
-        end
-        yield subkey, type, data
-        index += 1
-      end
-      index
-    end
-    alias each each_value
-    
-    def each_key
-      index = 0
-      while true
-        begin
-          subkey, wtime = API.EnumKey(@hkey, index)
-        rescue Error
-          break
-        end
-        yield subkey, wtime
-        index += 1
-      end
-      index
-    end
-    
-    def keys
-      keys_ary = []
-      each_key { |key,| keys_ary << key }
-      keys_ary
-    end
-    
-    #
-    # reader
-    #
-    def read(name, *rtype)
-      type, data = API.QueryValue(@hkey, name)
-      unless rtype.empty? or rtype.include?(type)
-        raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
-      end
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        [ type, data.chop ]
-      when REG_MULTI_SZ
-        [ type, data.split(/\0/) ]
-      when REG_BINARY
-        [ type, data ]
-      when REG_DWORD
-        [ type, API.unpackdw(data) ]
-      when REG_DWORD_BIG_ENDIAN
-        [ type, data.unpack('N')[0] ]
-      when REG_QWORD
-        [ type, API.unpackqw(data) ]
-      else
-        raise TypeError, "Type #{type} is not supported."
-      end
-    end
-    
-    def [](name, *rtype)
-      type, data = read(name, *rtype)
-      case type
-      when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
-        data
-      when REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        raise TypeError, "Type #{type} is not supported."
-      end
-    end
-    
-    def read_s(name)
-      read(name, REG_SZ)[1]
-    end
-    
-    def read_s_expand(name)
-      type, data = read(name, REG_SZ, REG_EXPAND_SZ)
-      if type == REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        data
-      end
-    end
-    
-    def read_i(name)
-      read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
-    end
-    
-    def read_bin(name)
-      read(name, REG_BINARY)[1]
-    end
-    
-    #
-    # writer
-    #
-    def write(name, type, data)
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        data = data.to_s + "\0"
-      when REG_MULTI_SZ
-        data = data.to_a.join("\0") + "\0\0"
-      when REG_BINARY
-        data = data.to_s
-      when REG_DWORD
-        data = API.packdw(data.to_i)
-      when REG_DWORD_BIG_ENDIAN
-        data = [data.to_i].pack('N')
-      when REG_QWORD
-        data = API.packqw(data.to_i)
-      else
-        raise TypeError, "Unsupported type #{type}"
-      end
-      API.SetValue(@hkey, name, type, data, data.length)
-    end
-    
-    def []=(name, rtype, value = nil)
-      if value
-        write name, rtype, value
-      else
-        case value = rtype
-        when Integer
-          write name, REG_DWORD, value
-        when String
-          write name, REG_SZ, value
-        when Array
-          write name, REG_MULTI_SZ, value
-        else
-          raise TypeError, "Unexpected type #{value.class}"
-        end
-      end
-      value
-    end
-    
-    def write_s(name, value)
-      write name, REG_SZ, value.to_s
-    end
-    
-    def write_i(name, value)
-      write name, REG_DWORD, value.to_i
-    end
-    
-    def write_bin(name, value)
-      write name, REG_BINARY, value.to_s
-    end
-    
-    #
-    # delete
-    #
-    def delete_value(name)
-      API.DeleteValue(@hkey, name)
-    end
-    alias delete delete_value
-    
-    def delete_key(name, recursive = false)
-      if recursive
-        open(name, KEY_ALL_ACCESS) do |reg|
-          reg.keys.each do |key|
-            begin
-              reg.delete_key(key, true)
-            rescue Error
-              #
-            end
-          end
-        end
-        API.DeleteKey(@hkey, name)
-      else
-        begin
-          API.EnumKey @hkey, 0
-        rescue Error
-          return API.DeleteKey(@hkey, name)
-        end
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-    end
-    
-    #
-    # flush
-    #
-    def flush
-      API.FlushKey @hkey
-    end
-    
-    #
-    # key information
-    #
-    def info
-      API.QueryInfoKey(@hkey)
-    end
-    %w[
-      num_keys max_key_length
-      num_values max_value_name_length max_value_length
-      descriptor_length wtime
-    ].each_with_index do |s, i|
-      eval <<-__END__
-        def #{s}
-          info[#{i}]
-        end
-      __END__
-    end
-  end
-end
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
deleted file mode 100644
index 5a99d04d55..0000000000
--- a/ext/Win32API/lib/win32/resolv.rb
+++ /dev/null
@@ -1,366 +0,0 @@
-=begin
-= Win32 DNS and DHCP I/F
-
-=end
-
-require 'win32/registry'
-
-module Win32
-  module Resolv
-    API = Registry::API
-    
-    def self.get_hosts_path
-      path = get_hosts_dir
-      path = File.join(path.gsub(/\\/, File::SEPARATOR), 'hosts')
-      File.exist?(path) ? path : nil
-    end
-    
-    def self.get_resolv_info
-      search, nameserver = get_info
-      if search.empty?
-        search = nil
-      else
-        search.delete("")
-        search.uniq!
-      end
-      if nameserver.empty?
-        nameserver = nil
-      else
-        nameserver.delete("")
-        nameserver.delete("0.0.0.0")
-        nameserver.uniq!
-      end
-      [ search, nameserver ]
-    end
-
-getv = Win32API.new('kernel32.dll', 'GetVersionExA', 'P', 'L')
-info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
-getv.call(info)
-if info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
-#====================================================================
-# Windows NT
-#====================================================================
-  module_eval <<-'__EOS__', __FILE__, __LINE__+1
-    TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
-    
-    class << self
-      private
-      def get_hosts_dir
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          reg.read_s_expand('DataBasePath')
-        end
-      end
-      
-      def get_info
-        search = nil
-        nameserver = []
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          begin
-            slist = reg.read_s('SearchList')
-            search = slist.split(/,\s*/) unless slist.empty?
-          rescue Registry::Error
-          end
-          
-          if add_search = search.nil?
-            search = []
-            begin
-              nvdom = reg.read_s('NV Domain')
-              unless nvdom.empty?
-                @search = [ nvdom ]
-                if reg.read_i('UseDomainNameDevolution') != 0
-                  if /^[\w\d]+\./ =~ nvdom
-                    devo = $'
-                  end
-                end
-              end
-            rescue Registry::Error
-            end
-          end
-          
-          reg.open('Interfaces') do |reg|
-            reg.each_key do |iface,|
-              reg.open(iface) do |regif|
-                begin
-                  [ 'NameServer', 'DhcpNameServer' ].each do |key|
-                    ns = regif.read_s(key)
-                    unless ns.empty?
-                      nameserver.concat(ns.split(/\s+/))
-                      break
-                    end
-                  end
-                rescue Registry::Error
-                end
-                
-                if add_search
-                  begin
-                    [ 'Domain', 'DhcpDomain' ].each do |key|
-                      dom = regif.read_s(key)
-                      unless dom.empty?
-                        search.concat(dom.split(/,\s*/))
-                        break
-                      end
-                    end
-                  rescue Registry::Error
-                  end
-                end
-              end
-            end
-          end
-          search << devo if add_search and devo
-        end
-        [ search.uniq, nameserver.uniq ]
-      end
-    end
-  __EOS__
-else
-#====================================================================
-# Windows 9x
-#====================================================================
-  module_eval <<-'__EOS__', __FILE__, __LINE__+1
-    TCPIP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\MSTCP'
-    DHCP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\DHCP'
-    WINDOWS = 'Software\Microsoft\Windows\CurrentVersion'
-    
-    class << self
-   #   private
-      
-      def get_hosts_dir
-        Registry::HKEY_LOCAL_MACHINE.open(WINDOWS) do |reg|
-          reg.read_s_expand('SystemRoot')
-        end
-      end
-      
-      def get_info
-        search = []
-        nameserver = []
-        begin
-          Registry::HKEY_LOCAL_MACHINE.open(TCPIP_9X) do |reg|
-            if reg.read_s("EnableDNS") == "1"
-              domain = reg.read_s("Domain")
-              ns = reg.read_s("NameServer")
-              slist = reg.read_s("SearchList")
-              search << domain unless domain.empty?
-              search.concat(slist.split(/,\s*/))
-              nameserver.concat(ns.split(/,\s*/))
-            end
-          end
-        rescue Registry::Error
-        end
-        
-        dhcpinfo = get_dhcpinfo
-        search.concat(dhcpinfo[0])
-        nameserver.concat(dhcpinfo[1])
-        [ search, nameserver ]
-      end
-      
-      def get_dhcpinfo
-        macaddrs = {}
-        ipaddrs = {}
-        WsControl.get_iflist.each do |index, macaddr, *ipaddr|
-          macaddrs[macaddr] = 1
-          ipaddr.each { |ipaddr| ipaddrs[ipaddr] = 1 }
-        end
-        iflist = [ macaddrs, ipaddrs ]
-        
-        search = []
-        nameserver = []
-        version = -1
-        Registry::HKEY_LOCAL_MACHINE.open(DHCP_9X) do |reg|
-          begin
-            version = API.unpackdw(reg.read_bin("Version"))
-          rescue Registry::Error
-          end
-          
-          reg.each_key do |key,|
-            catch(:not_used) do
-              reg.open(key) do |regdi|
-                dom, ns = get_dhcpinfo_key(version, regdi, iflist)
-                search << dom if dom
-                nameserver.concat(ns) if ns
-              end
-            end
-          end
-        end
-        [ search, nameserver ]
-      end
-      
-      def get_dhcpinfo_95(reg)
-        dhcp = reg.read_bin("DhcpInfo")
-        [
-          API.unpackdw(dhcp[4..7]),
-          API.unpackdw(dhcp[8..11]),
-          1,
-          dhcp[45..50],
-          reg.read_bin("OptionInfo"),
-        ]
-      end
-      
-      def get_dhcpinfo_98(reg)
-        [
-          API.unpackdw(reg.read_bin("DhcpIPAddress")),
-          API.unpackdw(reg.read_bin("DhcpSubnetMask")),
-          API.unpackdw(reg.read_bin("HardwareType")),
-          reg.read_bin("HardwareAddress"),
-          reg.read_bin("OptionInfo"),
-        ]
-      end
-      
-      def get_dhcpinfo_key(version, reg, iflist)
-        info = case version
-               when 1
-                 get_dhcpinfo_95(reg)
-               when 2
-                 get_dhcpinfo_98(reg)
-               else
-                 begin
-                   get_dhcpinfo_98(reg)
-                 rescue Registry::Error
-                   get_dhcpinfo_95(reg)
-                 end
-               end
-        ipaddr, netmask, hwtype, macaddr, opt = info
-        throw :not_used unless
-          ipaddr and ipaddr != 0 and
-          netmask and netmask != 0 and
-          macaddr and macaddr.size == 6 and
-          hwtype == 1 and
-          iflist[0][macaddr] and iflist[1][ipaddr]
-        
-        size = opt.size
-        idx = 0
-        while idx <= size
-          opttype = opt[idx]
-          optsize = opt[idx + 1]
-          optval  = opt[idx + 2, optsize]
-          case opttype
-          when 0xFF    ## term
-            break
-          when 0x0F    ## domain
-            domain = optval.chomp("\0")
-          when 0x06    ## dns
-            nameserver = optval.scan(/..../).collect { |addr|
-              "%d.%d.%d.%d" % addr.unpack('C4')
-            }
-          end
-          idx += optsize + 2
-        end
-        [ domain, nameserver ]
-      rescue Registry::Error
-        throw :not_used
-      end
-    end
-    
-    module WsControl
-      WsControl = Win32API.new('wsock32.dll', 'WsControl', 'LLPPPP', 'L')
-      WSAGetLastError = Win32API.new('wsock32.dll', 'WSAGetLastError', 'V', 'L')
-      
-      MAX_TDI_ENTITIES = 512
-      IPPROTO_TCP = 6
-      WSCTL_TCP_QUERY_INFORMATION = 0
-      INFO_CLASS_GENERIC = 0x100
-      INFO_CLASS_PROTOCOL = 0x200
-      INFO_TYPE_PROVIDER = 0x100
-      ENTITY_LIST_ID = 0
-      GENERIC_ENTITY = 0
-      CL_NL_ENTITY = 0x301
-      IF_ENTITY = 0x200
-      ENTITY_TYPE_ID = 1
-      CL_NL_IP = 0x303
-      IF_MIB = 0x202
-      IF_MIB_STATS_ID = 1
-      IP_MIB_ADDRTABLE_ENTRY_ID = 0x102
-      
-      def self.wsctl(tei_entity, tei_instance,
-                     toi_class, toi_type, toi_id,
-                     buffsize)
-        reqinfo = [
-                  ## TDIEntityID
-                    tei_entity, tei_instance,
-                  ## TDIObjectID
-                    toi_class, toi_type, toi_id,
-                  ## TCP_REQUEST_INFORMATION_EX
-                    ""
-                  ].pack('VVVVVa16')
-        reqsize = API.packdw(reqinfo.size)
-        buff = "\0" * buffsize
-        buffsize = API.packdw(buffsize)
-        result = WsControl.call(
-                   IPPROTO_TCP,
-                   WSCTL_TCP_QUERY_INFORMATION,
-                   reqinfo, reqsize,
-                   buff, buffsize)
-        if result != 0
-          raise RuntimeError, "WsControl failed.(#{result})"
-        end
-        [ buff, API.unpackdw(buffsize) ]
-      end
-      private_class_method :wsctl
-      
-      def self.get_iflist
-        # Get TDI Entity List
-        entities, size =
-          wsctl(GENERIC_ENTITY, 0,
-                INFO_CLASS_GENERIC,
-                INFO_TYPE_PROVIDER,
-                ENTITY_LIST_ID,
-                MAX_TDI_ENTITIES * 8)  # sizeof(TDIEntityID)
-        entities = entities[0, size].
-                     scan(/.{8}/).
-                     collect { |e| e.unpack('VV') }
-
-        # Get MIB Interface List
-        iflist = []
-        ifcount = 0
-        entities.each do |entity, instance|
-          if( (entity & IF_ENTITY)>0 )
-            ifcount += 1
-            etype, = wsctl(entity, instance,
-                           INFO_CLASS_GENERIC,
-                           INFO_TYPE_PROVIDER,
-                           ENTITY_TYPE_ID,
-                           4)
-            if( (API.unpackdw(etype) & IF_MIB)==IF_MIB )
-              ifentry, = wsctl(entity, instance,
-                               INFO_CLASS_PROTOCOL,
-                               INFO_TYPE_PROVIDER,
-                               IF_MIB_STATS_ID,
-                               21 * 4 + 8 + 130)  # sizeof(IFEntry)
-              iflist << [
-                API.unpackdw(ifentry[0,4]),
-                ifentry[20, 6]
-              ]
-            end
-          end
-        end
-        
-        # Get IP Addresses
-        entities.each do |entity, instance|
-          if entity == CL_NL_ENTITY
-            etype, = wsctl(entity, instance,
-                           INFO_CLASS_GENERIC,
-                           INFO_TYPE_PROVIDER,
-                           ENTITY_TYPE_ID,
-                           4)
-            if API.unpackdw(etype) == CL_NL_IP
-              ipentries, = wsctl(entity, instance,
-                                 INFO_CLASS_PROTOCOL,
-                                 INFO_TYPE_PROVIDER,
-                                 IP_MIB_ADDRTABLE_ENTRY_ID,
-                                 24 * (ifcount+1))  # sizeof(IPAddrEntry)
-              ipentries.scan(/.{24}/) do |ipentry|
-                ipaddr, index = ipentry.unpack('VV')
-                if ifitem = iflist.assoc(index)
-                  ifitem << ipaddr
-                end
-              end
-            end
-          end
-        end
-        iflist
-      end
-    end
-  __EOS__
-end
-#====================================================================
-  end
-end
diff --git a/ext/aix_ld.rb b/ext/aix_ld.rb
new file mode 100644
index 0000000000..7dd5dbbb69
--- /dev/null
+++ b/ext/aix_ld.rb
@@ -0,0 +1,67 @@
+#! /usr/local/bin/ruby
+
+def older(file1, file2)
+  if !File.exist?(file1) then
+    return TRUE
+  end
+  if !File.exist?(file2) then
+    return FALSE
+  end
+  if File.mtime(file1) < File.mtime(file2)
+    return TRUE
+  end
+  return FALSE
+end
+
+target = ARGV.shift
+unless target =~ /\.so/
+  STDERR.printf "wrong suffix specified\n"
+  exit 1
+end
+base = File.basename(target, ".so")
+entry="Init_#{base}"
+ldargs = "-e#{entry} -bI:../ruby.imp -bM:SRE -T512 -H512 -lc"
+
+def uniq(data)
+  last=nil
+  data.delete_if do |name|
+    if last == name
+      TRUE
+    else
+      last = name
+      FALSE
+    end
+  end
+end
+
+def extract(nm, out)
+  data = nm.readlines.collect{|line|
+    line = line.split
+    case line[1]
+    when "B", "D"
+      line[0]
+    else
+      next
+    end
+  }.compact!.sort!
+  uniq(data)
+  exp = open(out, "w")
+  exp.printf "#!\n"
+  for line in data
+    exp.printf "%s\n", line
+  end
+  exp.close
+  nm.close
+end
+if older("../ruby.imp", "../../miniruby")
+  nm = open("|/usr/ccs/bin/nm -p ../../*.o")
+  extract(nm, "../ruby.imp")
+end
+
+#objs = Dir["*.o"].join(" ")
+#nm = open("|/usr/ccs/bin/nm -p #{objs}")
+#extract(nm, "#{base}.exp")
+
+cmd = format("/usr/ccs/bin/ld %s %s ", ldargs, ARGV.join(' '))
+printf "\t%s\n", cmd
+system cmd
diff --git a/ext/aix_mksym.rb b/ext/aix_mksym.rb
new file mode 100644
index 0000000000..7e1af283dc
--- /dev/null
+++ b/ext/aix_mksym.rb
@@ -0,0 +1,33 @@
+
+def uniq(data)
+  last=nil
+  data.delete_if do |name|
+    if last == name
+      TRUE
+    else
+      last = name
+      FALSE
+    end
+  end
+end
+
+def extract(nm, out)
+  data = nm.readlines.collect{|line|
+    line = line.split
+    case line[1]
+    when "B", "D"
+      line[0]
+    else
+      next
+    end
+  }.compact!.sort!
+  uniq(data)
+  exp = open(out, "w")
+  exp.printf "#!\n"
+  for line in data
+    exp.printf "%s\n", line
+  end
+  exp.close
+  nm.close
+end
+extract(open("|/usr/ccs/bin/nm -p ../libruby.a"), "../ruby.imp")
diff --git a/ext/bigdecimal/.cvsignore b/ext/bigdecimal/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/bigdecimal/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/bigdecimal/MANIFEST b/ext/bigdecimal/MANIFEST
deleted file mode 100644
index bb647c3414..0000000000
--- a/ext/bigdecimal/MANIFEST
+++ /dev/null
@@ -1,18 +0,0 @@
-MANIFEST
-README
-bigdecimal.def
-bigdecimal.c
-bigdecimal.h
-depend
-extconf.rb
-bigdecimal_en.html
-bigdecimal_ja.html
-lib/bigdecimal/jacobian.rb
-lib/bigdecimal/newton.rb
-lib/bigdecimal/ludcmp.rb
-lib/bigdecimal/util.rb
-lib/bigdecimal/nlsolve.rb
-lib/bigdecimal/math.rb
-sample/linear.rb
-sample/nlsolve.rb
-sample/pi.rb
diff --git a/ext/bigdecimal/README b/ext/bigdecimal/README
deleted file mode 100644
index a233f47f64..0000000000
--- a/ext/bigdecimal/README
+++ /dev/null
@@ -1,60 +0,0 @@
-
-  Ruby BIGDECIMAL(Variable Precision) extension library.
-  Copyright (C) 1999  by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
-
-BigDecimal is copyrighted free software by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).
-
-  5. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-
-* The Author
-
-Feel free to send comments and bug reports to the author.  Here is the 
-author's latest mail address:
-
-  shigeo@tinyforest.gr.jp
-
--------------------------------------------------------
-created at: Thu Dec 22 1999
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
deleted file mode 100644
index ae5f7a0895..0000000000
--- a/ext/bigdecimal/bigdecimal.c
+++ /dev/null
@@ -1,4082 +0,0 @@
-/*
- *
- * Ruby BigDecimal(Variable decimal precision) extension library.
- *
- * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Artistic License, as specified in the README file
- * of this BigDecimal distribution.
- *
- *  NOTE: Change log in this source removed to reduce source code size. 
- *        See rev. 1.25 if needed.
- *
- */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <float.h>
-#include <math.h>
-#include "ruby.h"
-#include "math.h"
-#include "version.h"
- 
-/* #define ENABLE_NUMERIC_STRING */
-
-VALUE rb_cBigDecimal;
-
-#include "bigdecimal.h"
-
-/* MACRO's to guard objects from GC by keeping them in stack */
-#define ENTER(n) volatile VALUE vStack[n];int iStack=0
-#define PUSH(x)  vStack[iStack++] = (unsigned long)(x);
-#define SAVE(p)  PUSH(p->obj);
-#define GUARD_OBJ(p,y) {p=y;SAVE(p);}
-
-/*
- * ================== Ruby Interface part ==========================
- */
-#define DoSomeOne(x,y) rb_num_coerce_bin(x,y)
-
-/*
- *  **** BigDecimal version ****
- */
-static VALUE
-BigDecimal_version(VALUE self)
-{
-    /*
-     * 1.0.0: Ruby 1.8.0
-     * 1.0.1: Ruby 1.8.1
-    */
-    return rb_str_new2("1.0.1");
-}
-
-/*
- *   VP routines used in BigDecimal part 
- */
-static unsigned short VpGetException(void);
-static void  VpSetException(unsigned short f);
-static void  VpInternalRound(Real *c,int ixDigit,U_LONG vPrev,U_LONG v);
-static int   VpLimitRound(Real *c,U_LONG ixDigit);
-
-/*
- *  **** BigDecimal part ****
- */
-
-static void
-BigDecimal_delete(Real *pv)
-{
-    VpFree(pv);
-}
-
-static VALUE
-ToValue(Real *p)
-{
-    if(VpIsNaN(p)) {
-        VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
-    } else if(VpIsPosInf(p)) {
-        VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
-    } else if(VpIsNegInf(p)) {
-        VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
-    }
-    return p->obj;
-}
-
-static Real *
-GetVpValue(VALUE v, int must)
-{
-    Real *pv;
-    VALUE bg;
-    char szD[128];
-
-    switch(TYPE(v))
-    {
-    case T_DATA:
-        if(RDATA(v)->dfree ==(void *) BigDecimal_delete) {
-            Data_Get_Struct(v, Real, pv);
-            return pv;
-        } else {
-            goto SomeOneMayDoIt;
-        }
-        break;
-    case T_FIXNUM:
-        sprintf(szD, "%d", FIX2INT(v));
-        return VpCreateRbObject(VpBaseFig() * 2 + 1, szD);
-
-#ifdef ENABLE_NUMERIC_STRING
-    case T_STRING:
-        SafeStringValue(v);
-        return VpCreateRbObject(strlen(RSTRING(v)->ptr) + VpBaseFig() + 1,
-                                RSTRING(v)->ptr);
-#endif /* ENABLE_NUMERIC_STRING */
-
-    case T_BIGNUM:
-        bg = rb_big2str(v, 10);
-        return VpCreateRbObject(strlen(RSTRING(bg)->ptr) + VpBaseFig() + 1,
-                                RSTRING(bg)->ptr);
-    default:
-        goto SomeOneMayDoIt;
-    }
-
-SomeOneMayDoIt:
-    if(must) {
-        rb_raise(rb_eTypeError, "%s can't be coerced into BigDecimal",
-                    rb_special_const_p(v)?
-                    RSTRING(rb_inspect(v))->ptr:
-                    rb_obj_classname(v)
-                );
-    }
-    return NULL; /* NULL means to coerce */
-}
-
-static VALUE
-BigDecimal_double_fig(VALUE self)
-{
-    return INT2FIX(VpDblFig());
-}
-
-static VALUE
-BigDecimal_prec(VALUE self)
-{
-    ENTER(1);
-    Real *p;
-    VALUE obj;
-
-    GUARD_OBJ(p,GetVpValue(self,1));
-    obj = rb_ary_new();
-    obj = rb_ary_push(obj,INT2NUM(p->Prec*VpBaseFig()));
-    obj = rb_ary_push(obj,INT2NUM(p->MaxPrec*VpBaseFig()));
-    return obj;
-}
-
-static VALUE
-BigDecimal_hash(VALUE self)
-{
-    ENTER(1);
-    Real *p;
-    U_LONG hash,i;
-
-    GUARD_OBJ(p,GetVpValue(self,1));
-    hash = (U_LONG)p->sign;
-    /* hash!=2: the case for 0(1),NaN(0) or +-Infinity(3) is sign itself */
-    if(hash==2) {
-        for(i = 0; i < p->Prec;i++) {
-            hash = 31 * hash + p->frac[i];
-            hash ^= p->frac[i];
-        }
-        hash += p->exponent;
-    }
-    return INT2FIX(hash);
-}
-
-static VALUE
-BigDecimal_dump(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    char sz[50];
-    Real *vp;
-    char *psz;
-    VALUE dummy;
-    rb_scan_args(argc, argv, "01", &dummy);
-    GUARD_OBJ(vp,GetVpValue(self,1));
-    sprintf(sz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
-    psz = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E")+strlen(sz));
-    sprintf(psz,"%s",sz);
-    VpToString(vp, psz+strlen(psz), 0, 0);
-    return rb_str_new2(psz);
-}
-
-static VALUE
-BigDecimal_load(VALUE self, VALUE str)
-{
-    ENTER(2);
-    Real *pv;
-    unsigned char *pch;
-    unsigned char ch;
-    unsigned long m=0;
-
-    SafeStringValue(str);
-    pch = RSTRING(str)->ptr;
-    /* First get max prec */
-    while((*pch)!=(unsigned char)'\0' && (ch=*pch++)!=(unsigned char)':') {
-        if(!ISDIGIT(ch)) {
-            rb_raise(rb_eTypeError, "Load failed: invalid character in the marshaled string");
-        }
-        m = m*10 + (unsigned long)(ch-'0');
-    }
-    if(m>VpBaseFig()) m -= VpBaseFig();
-    GUARD_OBJ(pv,VpNewRbClass(m,pch,self));
-    m /= VpBaseFig();
-    if(m && pv->MaxPrec>m) pv->MaxPrec = m+1;
-    return ToValue(pv);
-}
-
-static VALUE
-BigDecimal_mode(int argc, VALUE *argv, VALUE self)
-{
-    VALUE which;
-    VALUE val;
-    unsigned long f,fo;
- 
-    if(rb_scan_args(argc,argv,"11",&which,&val)==1) val = Qnil;
-
-    Check_Type(which, T_FIXNUM);
-    f = (unsigned long)FIX2INT(which);
-
-    if(f&VP_EXCEPTION_ALL) {
-        /* Exception mode setting */
-        fo = VpGetException();
-        if(val==Qnil) return INT2FIX(fo);
-        if(val!=Qfalse && val!=Qtrue) {
-            rb_raise(rb_eTypeError, "The second argument must be true or false.");
-            return Qnil; /* Not reached */
-        }
-        if(f&VP_EXCEPTION_INFINITY) {
-            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_INFINITY):
-                           (fo&(~VP_EXCEPTION_INFINITY))));
-        }
-        if(f&VP_EXCEPTION_NaN) {
-            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_NaN):
-                           (fo&(~VP_EXCEPTION_NaN))));
-        }
-        fo = VpGetException();
-        return INT2FIX(fo);
-    }
-    if(VP_ROUND_MODE==f) {
-        /* Rounding mode setting */
-        fo = VpGetRoundMode();
-        if(val==Qnil) return INT2FIX(fo);
-        Check_Type(val, T_FIXNUM);
-        if(!VpIsRoundMode(FIX2INT(val))) {
-            rb_raise(rb_eTypeError, "Invalid rounding mode.");
-            return Qnil;
-        }
-        fo = VpSetRoundMode((unsigned long)FIX2INT(val));
-        return INT2FIX(fo);
-    }
-    rb_raise(rb_eTypeError, "The first argument for BigDecimal#mode is invalid.");
-    return Qnil;
-}
-
-static U_LONG
-GetAddSubPrec(Real *a, Real *b)
-{
-    U_LONG mxs;
-    U_LONG mx = a->Prec;
-    S_INT d;
-
-    if(!VpIsDef(a) || !VpIsDef(b)) return (-1L);
-    if(mx < b->Prec) mx = b->Prec;
-    if(a->exponent!=b->exponent) {
-        mxs = mx;
-        d = a->exponent - b->exponent;
-        if(d<0) d = -d;
-        mx = mx+(U_LONG)d;
-        if(mx<mxs) {
-            return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
-        }
-    }
-    return mx;
-}
-
-static S_INT
-GetPositiveInt(VALUE v)
-{
-    S_INT n;
-    Check_Type(v, T_FIXNUM);
-    n = FIX2INT(v);
-    if(n < 0) {
-        rb_raise(rb_eArgError, "argument must be positive");
-    }
-    return n;
-}
-
-VP_EXPORT Real *
-VpNewRbClass(U_LONG mx, char *str, VALUE klass)
-{
-    Real *pv = VpAlloc(mx,str);
-    pv->obj = (VALUE)Data_Wrap_Struct(klass, 0, BigDecimal_delete, pv);
-    return pv;
-}
-
-VP_EXPORT Real *
-VpCreateRbObject(U_LONG mx, char *str)
-{
-    Real *pv = VpAlloc(mx,str);
-    pv->obj = (VALUE)Data_Wrap_Struct(rb_cBigDecimal, 0, BigDecimal_delete, pv);
-    return pv;
-}
-
-
-static VALUE
-BigDecimal_IsNaN(VALUE self)
-{
-    Real *p = GetVpValue(self,1);
-    if(VpIsNaN(p))  return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-BigDecimal_IsInfinite(VALUE self)
-{
-    Real *p = GetVpValue(self,1);
-    if(VpIsPosInf(p)) return INT2FIX(1);
-    if(VpIsNegInf(p)) return INT2FIX(-1);
-    return Qnil;
-}
-
-static VALUE
-BigDecimal_IsFinite(VALUE self)
-{
-    Real *p = GetVpValue(self,1);
-    if(VpIsNaN(p)) return Qfalse;
-    if(VpIsInf(p)) return Qfalse;
-    return Qtrue;
-}
-
-static VALUE
-BigDecimal_to_i(VALUE self)
-{
-    ENTER(5);
-    int e,n,i,nf;
-    U_LONG v,b,j;
-    char *psz,*pch;
-    Real *p;
-
-    GUARD_OBJ(p,GetVpValue(self,1));
-
-    /* Infinity or NaN not converted. */
-    if(VpIsNaN(p)) {
-       VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
-       return Qnil;
-    } else if(VpIsPosInf(p)) {
-       VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
-       return Qnil;
-    } else if(VpIsNegInf(p)) {
-       VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
-       return Qnil;
-    }
-
-    e = VpExponent10(p);
-    if(e<=0) return INT2FIX(0);
-    nf = VpBaseFig();
-    if(e<=nf) {
-        e = VpGetSign(p)*p->frac[0];
-        return INT2FIX(e);
-    }
-    psz = ALLOCA_N(char,(unsigned int)(e+nf+2));
-
-    n = (e+nf-1)/nf;
-    pch = psz;
-    if(VpGetSign(p)<0) *pch++ = '-';
-    for(i=0;i<n;++i) {
-        b = VpBaseVal()/10;
-        if(i>=(int)p->Prec) {
-            while(b) {
-                *pch++ = '0';
-                b /= 10;
-            }
-            continue;
-        }
-        v = p->frac[i];
-        while(b) {
-            j = v/b;
-            *pch++ = (char)(j + '0');
-            v -= j*b;
-            b /= 10;
-        }
-    }
-    *pch++ = 0;
-    return rb_cstr2inum(psz,10);
-}
-
-static VALUE
-BigDecimal_induced_from(VALUE self, VALUE x)
-{
-    Real *p = GetVpValue(x,1);
-    return p->obj;
-}
-
-static VALUE
-BigDecimal_to_f(VALUE self)
-{
-    ENTER(1);
-    Real *p;
-    double d, d2;
-    S_LONG e;
-
-    GUARD_OBJ(p,GetVpValue(self,1));
-    if(VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
-    errno = 0;
-    d2 = pow(10.0,(double)e);
-    if((errno == ERANGE && e>0) || (d2>1.0 && (fabs(d) > (DBL_MAX / d2)))) {
-       VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion.",0);
-       if(d>0.0) return rb_float_new(DBL_MAX);
-       else      return rb_float_new(-DBL_MAX);
-    }
-    return rb_float_new(d*d2);
-}
-
-static VALUE
-BigDecimal_coerce(VALUE self, VALUE other)
-{
-    ENTER(2);
-    VALUE obj;
-    Real *b;
-    if(TYPE(other) == T_FLOAT) {
-       obj = rb_ary_new();
-       obj = rb_ary_push(obj,other);
-       obj = rb_ary_push(obj,BigDecimal_to_f(self));
-    } else {
-       GUARD_OBJ(b,GetVpValue(other,1));
-       obj = rb_ary_new();
-       obj = rb_ary_push(obj, b->obj);
-       obj = rb_ary_push(obj, self);
-    }
-    return obj;
-}
-
-static VALUE
-BigDecimal_uplus(VALUE self)
-{
-    return self;
-}
-
-static VALUE
-BigDecimal_add(VALUE self, VALUE r)
-{
-    ENTER(5);
-    Real *c, *a, *b;
-    U_LONG mx;
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
-    SAVE(b);
-    if(VpIsNaN(b)) return b->obj;
-    if(VpIsNaN(a)) return a->obj;
-    mx = GetAddSubPrec(a,b);
-    if(mx==(-1L)) {
-        GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
-        VpAddSub(c, a, b, 1);
-    } else {
-        GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
-        if(!mx) {
-            VpSetInf(c,VpGetSign(a));
-        } else {
-            VpAddSub(c, a, b, 1);
-        }
-    }
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_sub(VALUE self, VALUE r)
-{
-    ENTER(5);
-    Real *c, *a, *b;
-    U_LONG mx;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
-    SAVE(b);
-
-    if(VpIsNaN(b)) return b->obj;
-    if(VpIsNaN(a)) return a->obj;
-
-    mx = GetAddSubPrec(a,b);
-    if(mx==(-1L)) {
-        GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
-        VpAddSub(c, a, b, -1);
-    } else {
-        GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
-        if(!mx) {
-            VpSetInf(c,VpGetSign(a));
-        } else {
-            VpAddSub(c, a, b, -1);
-        }
-    }
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimalCmp(VALUE self, VALUE r,char op)
-{
-    ENTER(5);
-    S_INT e;
-    Real *a, *b;
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return rb_num_coerce_cmp(self,r);
-    SAVE(b);
-    e = VpComp(a, b);
-    if(e==999) return Qnil;
-    switch(op)
-    {
-    case '*': return   INT2FIX(e); /* any op */
-    case '=': if(e==0) return Qtrue ; return Qfalse;
-    case '!': if(e!=0) return Qtrue ; return Qfalse;
-    case 'G': if(e>=0) return Qtrue ; return Qfalse;
-    case '>': if(e> 0) return Qtrue ; return Qfalse;
-    case 'L': if(e<=0) return Qtrue ; return Qfalse;
-    case '<': if(e< 0) return Qtrue ; return Qfalse;
-    }
-    rb_bug("Undefined operation in BigDecimalCmp()");
-}
-
-static VALUE
-BigDecimal_zero(VALUE self)
-{
-    Real *a = GetVpValue(self,1);
-    return VpIsZero(a) ? Qtrue : Qfalse;
-}
-
-static VALUE
-BigDecimal_nonzero(VALUE self)
-{
-    Real *a = GetVpValue(self,1);
-    return VpIsZero(a) ? Qnil : self;
-}
-
-static VALUE
-BigDecimal_comp(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '*');
-}
-
-static VALUE
-BigDecimal_eq(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '=');
-}
-
-static VALUE
-BigDecimal_ne(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '!');
-}
-
-static VALUE
-BigDecimal_lt(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '<');
-}
-
-static VALUE
-BigDecimal_le(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, 'L');
-}
-
-static VALUE
-BigDecimal_gt(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '>');
-}
-
-static VALUE
-BigDecimal_ge(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, 'G');
-}
-
-static VALUE
-BigDecimal_neg(VALUE self, VALUE r)
-{
-    ENTER(5);
-    Real *c, *a;
-    GUARD_OBJ(a,GetVpValue(self,1));
-    GUARD_OBJ(c,VpCreateRbObject(a->Prec *(VpBaseFig() + 1), "0"));
-    VpAsgn(c, a, -1);
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_mult(VALUE self, VALUE r)
-{
-    ENTER(5);
-    Real *c, *a, *b;
-    U_LONG mx;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
-    SAVE(b);
-
-    mx = a->Prec + b->Prec;
-    GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
-    VpMult(c, a, b);
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
-/* For c = self.div(r): with round operation */
-{
-    ENTER(5);
-    Real *a, *b;
-    U_LONG mx;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
-    SAVE(b);
-    *div = b;
-    mx =(a->MaxPrec + b->MaxPrec + 1) * VpBaseFig();
-    GUARD_OBJ((*c),VpCreateRbObject(mx, "#0"));
-    GUARD_OBJ((*res),VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
-    VpDivd(*c, *res, a, b);
-    return (VALUE)0;
-}
-
-static VALUE
-BigDecimal_div(VALUE self, VALUE r)
-/* For c = self/r: with round operation */
-{
-    ENTER(5);
-    Real *c=NULL, *res=NULL, *div = NULL;
-    r = BigDecimal_divide(&c, &res, &div, self, r);
-    if(r!=(VALUE)0) return r; /* coerced by other */
-    SAVE(c);SAVE(res);SAVE(div);
-    /* a/b = c + r/b */
-    /* c xxxxx
-       r 00000yyyyy  ==> (y/b)*BASE >= HALF_BASE
-     */
-    /* Round */
-    if(VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
-       VpInternalRound(c,0,c->frac[c->Prec-1],(VpBaseVal()*res->frac[0])/div->frac[0]);
-    }
-    return ToValue(c);
-}
-
-/*
- * %: mod = a%b = a - (a.to_f/b).floor * b
- * div = (a.to_f/b).floor
- */
-static VALUE
-BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
-{
-    ENTER(8);
-    Real *c=NULL, *d=NULL, *res=NULL;
-    Real *a, *b;
-    U_LONG mx;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
-    SAVE(b);
-
-    if(VpIsNaN(a) || VpIsNaN(b)) goto NaN;
-    if(VpIsInf(a) || VpIsInf(b)) goto NaN;
-    if(VpIsZero(b))              goto NaN;
-    if(VpIsZero(a)) {
-       GUARD_OBJ(c,VpCreateRbObject(1, "0"));
-       GUARD_OBJ(d,VpCreateRbObject(1, "0"));
-       *div = d;
-       *mod = c;
-       return (VALUE)0;
-    }
-
-    mx = a->Prec;
-    if(mx<b->Prec) mx = b->Prec;
-    mx =(mx + 1) * VpBaseFig();
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
-    VpDivd(c, res, a, b);
-    mx = c->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
-    VpActiveRound(d,c,VP_ROUND_DOWN,0);
-    VpMult(res,d,b);
-    VpAddSub(c,a,res,-1);
-    if(!VpIsZero(c) && (VpGetSign(a)*VpGetSign(b)<0)) {
-        VpAddSub(res,d,VpOne(),-1);
-        VpAddSub(d  ,c,b,       1);
-        *div = res;
-        *mod = d;
-    } else {
-        *div = d;
-        *mod = c;
-    }
-    return (VALUE)0;
-
-NaN:
-    GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
-    GUARD_OBJ(d,VpCreateRbObject(1, "NaN"));
-    *div = d;
-    *mod = c;
-    return (VALUE)0;
-}
-
-static VALUE
-BigDecimal_mod(VALUE self, VALUE r) /* %: a%b = a - (a.to_f/b).floor * b */
-{
-    ENTER(3);
-    VALUE obj;
-    Real *div=NULL, *mod=NULL;
-
-    obj = BigDecimal_DoDivmod(self,r,&div,&mod);
-    if(obj!=(VALUE)0) return obj;
-    SAVE(div);SAVE(mod);
-    return ToValue(mod);
-}
-
-static VALUE
-BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
-{
-    ENTER(10);
-    U_LONG mx;
-    Real *a=NULL, *b=NULL, *c=NULL, *res=NULL, *d=NULL, *rr=NULL, *ff=NULL;
-    Real *f=NULL;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r);
-    SAVE(b);
-
-    mx  =(a->MaxPrec + b->MaxPrec) *VpBaseFig();
-    GUARD_OBJ(c  ,VpCreateRbObject(mx, "0"));
-    GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
-    GUARD_OBJ(rr ,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
-    GUARD_OBJ(ff ,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
-
-    VpDivd(c, res, a, b);
-
-    mx = c->Prec *(VpBaseFig() + 1);
-
-    GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
-    GUARD_OBJ(f,VpCreateRbObject(mx, "0"));
-
-    VpActiveRound(d,c,VP_ROUND_DOWN,0); /* 0: round off */
-
-    VpFrac(f, c);
-    VpMult(rr,f,b);
-    VpAddSub(ff,res,rr,1);
-
-    *dv = d;
-    *rv = ff;
-    return (VALUE)0;
-}
-
-static VALUE
-BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
-{
-    VALUE  f;
-    Real  *d,*rv;
-    f = BigDecimal_divremain(self,r,&d,&rv);
-    if(f!=(VALUE)0) return f;
-    return ToValue(rv);
-}
-
-static VALUE
-BigDecimal_divmod(VALUE self, VALUE r)
-{
-    ENTER(5);
-    VALUE obj;
-    Real *div=NULL, *mod=NULL;
-
-    obj = BigDecimal_DoDivmod(self,r,&div,&mod);
-    if(obj!=(VALUE)0) return obj;
-    SAVE(div);SAVE(mod);
-    obj = rb_ary_new();
-    rb_ary_push(obj, ToValue(div));
-    rb_ary_push(obj, ToValue(mod));
-    return obj;
-}
-
-static VALUE
-BigDecimal_div2(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    VALUE b,n;
-    int na = rb_scan_args(argc,argv,"11",&b,&n);
-    if(na==1) { /* div in Float sense */
-       VALUE obj;
-       Real *div=NULL;
-       Real *mod;
-       obj = BigDecimal_DoDivmod(self,b,&div,&mod);
-       if(obj!=(VALUE)0) return obj;
-       return ToValue(div);
-    } else {    /* div in BigDecimal sense */
-       U_LONG ix = (U_LONG)GetPositiveInt(n);
-       if(ix==0) return BigDecimal_div(self,b);
-       else {
-          Real *res=NULL;
-          Real *av=NULL, *bv=NULL, *cv=NULL;
-          U_LONG mx = (ix+VpBaseFig()*2);
-          U_LONG pl = VpSetPrecLimit(0);
-
-          GUARD_OBJ(cv,VpCreateRbObject(mx,"0"));
-          GUARD_OBJ(av,GetVpValue(self,1));
-          GUARD_OBJ(bv,GetVpValue(b,1));
-          mx = av->Prec + bv->Prec + 2;
-          if(mx <= cv->MaxPrec) mx = cv->MaxPrec+1;
-          GUARD_OBJ(res,VpCreateRbObject((mx * 2  + 2)*VpBaseFig(), "#0"));
-          VpDivd(cv,res,av,bv);
-          VpSetPrecLimit(pl);
-          VpLeftRound(cv,VpGetRoundMode(),ix);
-          return ToValue(cv);
-       }
-    }
-}
-
-static VALUE
-BigDecimal_add2(VALUE self, VALUE b, VALUE n)
-{
-    ENTER(2);
-    Real   *cv;
-    U_LONG mx = (U_LONG)GetPositiveInt(n);
-    if(mx==0) return BigDecimal_add(self,b);
-    else {
-       U_LONG pl = VpSetPrecLimit(0);
-       VALUE   c = BigDecimal_add(self,b);
-       VpSetPrecLimit(pl);
-       GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
-       return ToValue(cv);
-    }
-}
-
-static VALUE
-BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
-{
-    ENTER(2);
-    Real *cv;
-    U_LONG mx = (U_LONG)GetPositiveInt(n);
-    if(mx==0) return BigDecimal_sub(self,b);
-    else {
-       U_LONG pl = VpSetPrecLimit(0);
-       VALUE   c = BigDecimal_sub(self,b);
-       VpSetPrecLimit(pl);
-       GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
-       return ToValue(cv);
-    }
-}
-
-static VALUE
-BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
-{
-    ENTER(2);
-    Real *cv;
-    U_LONG mx = (U_LONG)GetPositiveInt(n);
-    if(mx==0) return BigDecimal_mult(self,b);
-    else {
-       U_LONG pl = VpSetPrecLimit(0);
-       VALUE   c = BigDecimal_mult(self,b);
-       VpSetPrecLimit(pl);
-       GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
-       return ToValue(cv);
-    }
-}
-
-static VALUE
-BigDecimal_abs(VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    U_LONG mx;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpAsgn(c, a, 1);
-    VpChangeSign(c,(S_INT)1);
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_sqrt(VALUE self, VALUE nFig)
-{
-    ENTER(5);
-    Real *c, *a;
-    S_INT mx, n;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-
-    n = GetPositiveInt(nFig) + VpDblFig() + 1;
-    if(mx <= n) mx = n;
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpSqrt(c, a);
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_fix(VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    U_LONG mx;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpActiveRound(c,a,VP_ROUND_DOWN,0); /* 0: round off */
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_round(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real   *c, *a;
-    int    iLoc;
-    U_LONG mx;
-    VALUE  vLoc;
-    VALUE  vRound;
-    U_LONG pl;
-
-    int    sw = VpGetRoundMode();
-
-    int na = rb_scan_args(argc,argv,"02",&vLoc,&vRound);
-    switch(na) {
-    case 0:
-        iLoc = 0;
-        break;
-    case 1:
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
-        break;
-    case 2:
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
-        Check_Type(vRound, T_FIXNUM);
-        sw   = FIX2INT(vRound);
-        if(!VpIsRoundMode(sw)) {
-            rb_raise(rb_eTypeError, "Invalid rounding mode.");
-            return Qnil;
-        }
-        break;
-    }
-
-    pl = VpSetPrecLimit(0);
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpSetPrecLimit(pl);
-    VpActiveRound(c,a,sw,iLoc);
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    int iLoc;
-    U_LONG mx;
-    VALUE vLoc;
-    U_LONG pl = VpSetPrecLimit(0);
-
-    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
-        iLoc = 0;
-    } else {
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
-    }
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpSetPrecLimit(pl);
-    VpActiveRound(c,a,VP_ROUND_DOWN,iLoc); /* 0: truncate */
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_frac(VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    U_LONG mx;
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpFrac(c, a);
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_floor(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    U_LONG mx;
-    int iLoc;
-    VALUE vLoc;
-    U_LONG pl = VpSetPrecLimit(0);
-
-    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
-        iLoc = 0;
-    } else {
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
-    }
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpSetPrecLimit(pl);
-    VpActiveRound(c,a,VP_ROUND_FLOOR,iLoc);
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    U_LONG mx;
-    int iLoc;
-    VALUE vLoc;
-    U_LONG pl = VpSetPrecLimit(0);
-
-    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
-        iLoc = 0;
-    } else {
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
-    }
-
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpSetPrecLimit(pl);
-    VpActiveRound(c,a,VP_ROUND_CEIL,iLoc);
-    return ToValue(c);
-}
-
-static VALUE
-BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    int   fmt=0;   /* 0:E format */
-    int   fPlus=0; /* =0:default,=1: set ' ' before digits ,set '+' before digits. */
-    Real  *vp;
-    char  *psz;
-    char   ch;
-    U_LONG nc;
-    S_INT  mc = 0;
-    VALUE  f;
-
-    GUARD_OBJ(vp,GetVpValue(self,1));
-    
-    if(rb_scan_args(argc,argv,"01",&f)==1) {
-        if(TYPE(f)==T_STRING) {
-            SafeStringValue(f);
-            psz = RSTRING(f)->ptr;
-            if(*psz==' ') {
-                fPlus = 1; psz++;
-            } else if(*psz=='+') {
-                fPlus = 2; psz++;
-            }
-            while(ch=*psz++) {
-                if(ISSPACE(ch)) continue;
-                if(!ISDIGIT(ch)) {
-                    if(ch=='F' || ch=='f') fmt = 1; /* F format */
-                    break;
-                }
-                mc = mc * 10 + ch - '0';
-            }
-        } else {
-            mc  = GetPositiveInt(f);
-        }
-    }
-    if(fmt) {
-        nc = VpNumOfChars(vp,"F");
-    } else {
-        nc = VpNumOfChars(vp,"E");
-    }
-    if(mc>0) nc += (nc + mc - 1) / mc + 1;
-
-    psz = ALLOCA_N(char,(unsigned int)nc);
-
-    if(fmt) {
-        VpToFString(vp, psz, mc, fPlus);
-    } else {
-        VpToString (vp, psz, mc, fPlus);
-    }
-    return rb_str_new2(psz);
-}
-
-static VALUE
-BigDecimal_split(VALUE self)
-{
-    ENTER(5);
-    Real *vp;
-    VALUE obj,obj1;
-    S_LONG e;
-    S_LONG s;
-    char *psz1;
-
-    GUARD_OBJ(vp,GetVpValue(self,1));
-    psz1 = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E"));
-    VpSzMantissa(vp,psz1);
-    s = 1;
-    if(psz1[0]=='-') {
-        s = -1; ++psz1;
-    }
-    if(psz1[0]=='N') s=0; /* NaN */
-    e = VpExponent10(vp);
-    obj1 = rb_str_new2(psz1);
-    obj  = rb_ary_new();
-    rb_ary_push(obj, INT2FIX(s));
-    rb_ary_push(obj, obj1);
-    rb_ary_push(obj, INT2FIX(10));
-    rb_ary_push(obj, INT2NUM(e));
-    return obj;
-}
-
-static VALUE
-BigDecimal_exponent(VALUE self)
-{
-    S_LONG e = VpExponent10(GetVpValue(self,1));
-    return INT2NUM(e);
-}
-
-static VALUE
-BigDecimal_inspect(VALUE self)
-{
-    ENTER(5);
-    Real *vp;
-    VALUE obj;
-    unsigned int nc;
-    char *psz1;
-    char *pszAll;
-
-    GUARD_OBJ(vp,GetVpValue(self,1));
-    nc = VpNumOfChars(vp,"E");
-    nc +=(nc + 9) / 10;
-
-    psz1   = ALLOCA_N(char,nc);
-    pszAll = ALLOCA_N(char,nc+256);
-    VpToString(vp, psz1, 10, 0);
-    sprintf(pszAll,"#<BigDecimal:%lx,'%s',%lu(%lu)>",self,psz1,VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
-    obj = rb_str_new2(pszAll);
-    return obj;
-}
-
-static VALUE
-BigDecimal_power(VALUE self, VALUE p)
-{
-    ENTER(5);
-    Real *x, *y;
-    S_LONG mp, ma, n;
-
-    Check_Type(p, T_FIXNUM);
-    n = FIX2INT(p);
-    ma = n;
-    if(ma < 0)  ma = -ma;
-    if(ma == 0) ma = 1;
-
-    GUARD_OBJ(x,GetVpValue(self,1));
-    if(VpIsDef(x)) {
-        mp = x->Prec *(VpBaseFig() + 1);
-        GUARD_OBJ(y,VpCreateRbObject(mp *(ma + 1), "0"));
-    } else {
-        GUARD_OBJ(y,VpCreateRbObject(1, "0"));
-    }
-    VpPower(y, x, n);
-    return ToValue(y);
-}
-
-static VALUE
-BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *pv;
-    S_LONG mf;
-    VALUE  nFig;
-    VALUE  iniValue;
-
-    if(rb_scan_args(argc,argv,"11",&iniValue,&nFig)==1) {
-        mf = 0;
-    } else {
-        mf = GetPositiveInt(nFig);
-    }
-    SafeStringValue(iniValue);
-    GUARD_OBJ(pv,VpCreateRbObject(mf, RSTRING(iniValue)->ptr));
-    return ToValue(pv);
-}
-
-static VALUE
-BigDecimal_new(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *pv;
-    S_LONG mf;
-    VALUE  nFig;
-    VALUE  iniValue;
-
-    if(rb_scan_args(argc,argv,"11",&iniValue,&nFig)==1) {
-        mf = 0;
-    } else {
-        mf = GetPositiveInt(nFig);
-    }
-    SafeStringValue(iniValue);
-    GUARD_OBJ(pv,VpNewRbClass(mf, RSTRING(iniValue)->ptr,self));
-    return ToValue(pv);
-}
-
-static VALUE
-BigDecimal_limit(int argc, VALUE *argv, VALUE self)
-{
-    VALUE  nFig;
-    VALUE  nCur = INT2NUM(VpGetPrecLimit());
-
-    if(rb_scan_args(argc,argv,"01",&nFig)==1) {
-        int nf;
-        if(nFig==Qnil) return nCur;
-        Check_Type(nFig, T_FIXNUM);
-        nf = FIX2INT(nFig);
-        if(nf<0) {
-            rb_raise(rb_eArgError, "argument must be positive");
-        }
-        VpSetPrecLimit(nf);
-    }
-    return nCur;
-}
-
-static VALUE
-BigDecimal_sign(VALUE self)
-{ /* sign */
-    int s = GetVpValue(self,1)->sign;
-    return INT2FIX(s);
-}
-
-void
-Init_bigdecimal(void)
-{
-    /* Initialize VP routines */
-    VpInit((U_LONG)0);
-
-    /* Class and method registration */
-    rb_cBigDecimal = rb_define_class("BigDecimal",rb_cNumeric);
-
-    /* Global function */
-    rb_define_global_function("BigDecimal", BigDecimal_global_new, -1);
-
-    /* Class methods */
-    rb_define_singleton_method(rb_cBigDecimal, "new", BigDecimal_new, -1);
-    rb_define_singleton_method(rb_cBigDecimal, "mode", BigDecimal_mode, -1);
-    rb_define_singleton_method(rb_cBigDecimal, "limit", BigDecimal_limit, -1);
-    rb_define_singleton_method(rb_cBigDecimal, "double_fig", BigDecimal_double_fig, 0);
-    rb_define_singleton_method(rb_cBigDecimal, "induced_from",BigDecimal_induced_from, 1);
-    rb_define_singleton_method(rb_cBigDecimal, "_load", BigDecimal_load, 1);
-    rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
-
-    /* Constants definition */
-    rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((S_INT)VpBaseVal()));
-
-    /* Exceptions */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL",INT2FIX(VP_EXCEPTION_ALL));
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN",INT2FIX(VP_EXCEPTION_NaN));
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY",INT2FIX(VP_EXCEPTION_INFINITY));
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW",INT2FIX(VP_EXCEPTION_UNDERFLOW));
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW",INT2FIX(VP_EXCEPTION_OVERFLOW));
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE",INT2FIX(VP_EXCEPTION_ZERODIVIDE));
-
-    /* Computation mode */
-    rb_define_const(rb_cBigDecimal, "ROUND_MODE",INT2FIX(VP_ROUND_MODE));
-    rb_define_const(rb_cBigDecimal, "ROUND_UP",INT2FIX(VP_ROUND_UP));
-    rb_define_const(rb_cBigDecimal, "ROUND_DOWN",INT2FIX(VP_ROUND_DOWN));
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_UP",INT2FIX(VP_ROUND_HALF_UP));
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_DOWN",INT2FIX(VP_ROUND_HALF_DOWN));
-    rb_define_const(rb_cBigDecimal, "ROUND_CEILING",INT2FIX(VP_ROUND_CEIL));
-    rb_define_const(rb_cBigDecimal, "ROUND_FLOOR",INT2FIX(VP_ROUND_FLOOR));
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_EVEN",INT2FIX(VP_ROUND_HALF_EVEN));
-
-    /* Constants for sign value */
-    rb_define_const(rb_cBigDecimal, "SIGN_NaN",INT2FIX(VP_SIGN_NaN));
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_ZERO",INT2FIX(VP_SIGN_POSITIVE_ZERO));
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_ZERO",INT2FIX(VP_SIGN_NEGATIVE_ZERO));
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_FINITE",INT2FIX(VP_SIGN_POSITIVE_FINITE));
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_FINITE",INT2FIX(VP_SIGN_NEGATIVE_FINITE));
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_INFINITE",INT2FIX(VP_SIGN_POSITIVE_INFINITE));
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE",INT2FIX(VP_SIGN_NEGATIVE_INFINITE));
-
-    /* instance methods */
-    rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
-    rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
-    rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
-    rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
-    rb_define_method(rb_cBigDecimal, "div",BigDecimal_div2, -1);
-    rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
-    rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
-    rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);
-    rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0);
-    rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0);
-    rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1);
-    rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1);
-    rb_define_method(rb_cBigDecimal, "+@", BigDecimal_uplus, 0);
-    rb_define_method(rb_cBigDecimal, "-@", BigDecimal_neg, 0);
-    rb_define_method(rb_cBigDecimal, "*", BigDecimal_mult, 1);
-    rb_define_method(rb_cBigDecimal, "/", BigDecimal_div, 1);
-    rb_define_method(rb_cBigDecimal, "quo", BigDecimal_div, 1);
-    rb_define_method(rb_cBigDecimal, "%", BigDecimal_mod, 1);
-    rb_define_method(rb_cBigDecimal, "modulo", BigDecimal_mod, 1);
-    rb_define_method(rb_cBigDecimal, "remainder", BigDecimal_remainder, 1);
-    rb_define_method(rb_cBigDecimal, "divmod", BigDecimal_divmod, 1);
-    /* rb_define_method(rb_cBigDecimal, "dup", BigDecimal_dup, 0); */
-    rb_define_method(rb_cBigDecimal, "to_f", BigDecimal_to_f, 0);
-    rb_define_method(rb_cBigDecimal, "abs", BigDecimal_abs, 0);
-    rb_define_method(rb_cBigDecimal, "sqrt", BigDecimal_sqrt, 1);
-    rb_define_method(rb_cBigDecimal, "fix", BigDecimal_fix, 0);
-    rb_define_method(rb_cBigDecimal, "round", BigDecimal_round, -1);
-    rb_define_method(rb_cBigDecimal, "frac", BigDecimal_frac, 0);
-    rb_define_method(rb_cBigDecimal, "floor", BigDecimal_floor, -1);
-    rb_define_method(rb_cBigDecimal, "ceil", BigDecimal_ceil, -1);
-    rb_define_method(rb_cBigDecimal, "power", BigDecimal_power, 1);
-    rb_define_method(rb_cBigDecimal, "**", BigDecimal_power, 1);
-    rb_define_method(rb_cBigDecimal, "<=>", BigDecimal_comp, 1);
-    rb_define_method(rb_cBigDecimal, "==", BigDecimal_eq, 1);
-    rb_define_method(rb_cBigDecimal, "===", BigDecimal_eq, 1);
-    rb_define_method(rb_cBigDecimal, "eql?", BigDecimal_eq, 1);
-    rb_define_method(rb_cBigDecimal, "!=", BigDecimal_ne, 1);
-    rb_define_method(rb_cBigDecimal, "<", BigDecimal_lt, 1);
-    rb_define_method(rb_cBigDecimal, "<=", BigDecimal_le, 1);
-    rb_define_method(rb_cBigDecimal, ">", BigDecimal_gt, 1);
-    rb_define_method(rb_cBigDecimal, ">=", BigDecimal_ge, 1);
-    rb_define_method(rb_cBigDecimal, "zero?", BigDecimal_zero, 0);
-    rb_define_method(rb_cBigDecimal, "nonzero?", BigDecimal_nonzero, 0);
-    rb_define_method(rb_cBigDecimal, "coerce", BigDecimal_coerce, 1);
-    rb_define_method(rb_cBigDecimal, "inspect", BigDecimal_inspect, 0);
-    rb_define_method(rb_cBigDecimal, "exponent", BigDecimal_exponent, 0);
-    rb_define_method(rb_cBigDecimal, "sign", BigDecimal_sign, 0);
-    rb_define_method(rb_cBigDecimal, "nan?",      BigDecimal_IsNaN, 0);
-    rb_define_method(rb_cBigDecimal, "infinite?", BigDecimal_IsInfinite, 0);
-    rb_define_method(rb_cBigDecimal, "finite?",   BigDecimal_IsFinite, 0);
-    rb_define_method(rb_cBigDecimal, "truncate",  BigDecimal_truncate, -1);
-    rb_define_method(rb_cBigDecimal, "_dump", BigDecimal_dump, -1);
-}
-
-/*
- *
- *  ============================================================================
- *
- *  vp_ routines begin from here.
- *
- *  ============================================================================
- *
- */
-#ifdef _DEBUG
-/*static int gfDebug = 1;*/         /* Debug switch */
-static int gfCheckVal = 1;      /* Value checking flag in VpNmlz()  */
-#endif /* _DEBUG */
-
-static U_LONG gnPrecLimit = 0;  /* Global upper limit of the precision newly allocated */
-static U_LONG gfRoundMode = VP_ROUND_HALF_UP; /* Mode for general rounding operation   */
-
-static U_LONG BASE_FIG = 4;     /* =log10(BASE)  */
-static U_LONG BASE = 10000L;    /* Base value(value must be 10**BASE_FIG) */
-                /* The value of BASE**2 + BASE must be represented */
-                /* within one U_LONG. */
-static U_LONG HALF_BASE = 5000L;/* =BASE/2  */
-static S_LONG DBLE_FIG = 8;    /* figure of double */
-static U_LONG BASE1 = 1000L;    /* =BASE/10  */
-
-static Real *VpConstOne;    /* constant 1.0 */
-static Real *VpPt5;        /* constant 0.5 */
-static U_LONG maxnr = 100;    /* Maximum iterations for calcurating sqrt. */
-                /* used in VpSqrt() */
-
-/* ETC */
-#define MemCmp(x,y,z) memcmp(x,y,z)
-#define StrCmp(x,y)   strcmp(x,y)
-
-static int VpIsDefOP(Real *c,Real *a,Real *b,int sw);
-static int AddExponent(Real *a,S_INT n);
-static U_LONG VpAddAbs(Real *a,Real *b,Real *c);
-static U_LONG VpSubAbs(Real *a,Real *b,Real *c);
-static U_LONG VpSetPTR(Real *a,Real *b,Real *c,U_LONG *a_pos,U_LONG *b_pos,U_LONG *c_pos,U_LONG *av,U_LONG *bv);
-static int VpNmlz(Real *a);
-static void VpFormatSt(char *psz,S_INT fFmt);
-static int VpRdup(Real *m,U_LONG ind_m);
-
-#ifdef _DEBUG
-static int gnAlloc=0; /* Memory allocation counter */
-#endif /* _DEBUG */
-
-VP_EXPORT void *
-VpMemAlloc(U_LONG mb)
-{
-    void *p = xmalloc((unsigned int)mb);
-    if(!p) {
-        VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1);
-    }
-    memset(p,0,mb);
-#ifdef _DEBUG
-    gnAlloc++; /* Count allocation call */
-#endif /* _DEBUG */
-    return p;
-}
-
-VP_EXPORT void
-VpFree(Real *pv)
-{
-    if(pv != NULL) {
-        xfree(pv);
-#ifdef _DEBUG
-        gnAlloc--; /* Decrement allocation count */
-        if(gnAlloc==0) {
-            printf(" *************** All memories allocated freed ****************");
-            getchar();
-        }
-        if(gnAlloc<0) {
-            printf(" ??????????? Too many memory free calls(%d) ?????????????\n",gnAlloc);
-            getchar();
-        }
-#endif /* _DEBUG */
-    }
-}
-
-/*
- * EXCEPTION Handling.
- */
-static unsigned short gfDoException = 0; /* Exception flag */
-
-static unsigned short
-VpGetException (void)
-{
-    return gfDoException;
-}
-
-static void
-VpSetException(unsigned short f)
-{
-    gfDoException = f;
-}
-
-/* These 2 functions added at v1.1.7 */
-VP_EXPORT U_LONG
-VpGetPrecLimit(void)
-{
-    return gnPrecLimit;
-}
-
-VP_EXPORT U_LONG
-VpSetPrecLimit(U_LONG n)
-{
-    U_LONG s = gnPrecLimit;
-    gnPrecLimit = n;
-    return s;
-}
-
-VP_EXPORT unsigned long
-VpGetRoundMode(void)
-{
-    return gfRoundMode;
-}
-
-VP_EXPORT int
-VpIsRoundMode(unsigned long n)
-{
-    if(n==VP_ROUND_UP      || n!=VP_ROUND_DOWN      ||
-       n==VP_ROUND_HALF_UP || n!=VP_ROUND_HALF_DOWN ||
-       n==VP_ROUND_CEIL    || n!=VP_ROUND_FLOOR     ||
-       n==VP_ROUND_HALF_EVEN
-      ) return 1;
-    return 0;
-}
-
-VP_EXPORT unsigned long
-VpSetRoundMode(unsigned long n)
-{
-    if(VpIsRoundMode(n)) gfRoundMode = n;
-    return gfRoundMode;
-}
-
-/*
- *  0.0 & 1.0 generator
- *    These gZero_..... and gOne_..... can be any name
- *    referenced from nowhere except Zero() and One().
- *    gZero_..... and gOne_..... must have global scope
- *    (to let the compiler know they may be changed in outside
- *    (... but not actually..)).
- */
-volatile double gZero_ABCED9B1_CE73__00400511F31D = 0.0;
-volatile double gOne_ABCED9B4_CE73__00400511F31D  = 1.0;
-static double
-Zero(void)
-{
-    return gZero_ABCED9B1_CE73__00400511F31D;
-}
-
-static double
-One(void)
-{
-    return gOne_ABCED9B4_CE73__00400511F31D;
-}
-
-VP_EXPORT U_LONG
-VpBaseFig(void)
-{
-    return BASE_FIG;
-}
-
-VP_EXPORT U_LONG
-VpDblFig(void)
-{
-    return DBLE_FIG;
-}
-
-VP_EXPORT U_LONG
-VpBaseVal(void)
-{
-    return BASE;
-}
-
-/*
-  ----------------------------------------------------------------
-  Value of sign in Real structure is reserved for future use.
-  short sign;
-                    ==0 : NaN
-                      1 : Positive zero
-                     -1 : Negative zero
-                      2 : Positive number
-                     -2 : Negative number
-                      3 : Positive infinite number
-                     -3 : Negative infinite number
-  ----------------------------------------------------------------
-*/
-
-VP_EXPORT double
-VpGetDoubleNaN(void) /* Returns the value of NaN */
-{
-    static double fNaN = 0.0;
-    if(fNaN==0.0) fNaN = Zero()/Zero();
-    return fNaN;
-}
-
-VP_EXPORT double
-VpGetDoublePosInf(void) /* Returns the value of +Infinity */
-{
-    static double fInf = 0.0;
-    if(fInf==0.0) fInf = One()/Zero();
-    return fInf;
-}
-
-VP_EXPORT double
-VpGetDoubleNegInf(void) /* Returns the value of -Infinity */
-{
-    static double fInf = 0.0;
-    if(fInf==0.0) fInf = -(One()/Zero());
-    return fInf;
-}
-
-VP_EXPORT double
-VpGetDoubleNegZero(void) /* Returns the value of -0 */
-{
-    static double nzero = 1000.0;
-    if(nzero!=0.0) nzero = (One()/VpGetDoubleNegInf());
-    return nzero;
-}
-
-VP_EXPORT int
-VpIsNegDoubleZero(double v)
-{
-    double z = VpGetDoubleNegZero();
-    return MemCmp(&v,&z,sizeof(v))==0;
-}
-
-VP_EXPORT int
-VpException(unsigned short f,char *str,int always)
-{
-    VALUE exc;
-    int   fatal=0;
-
-    if(f==VP_EXCEPTION_OP || f==VP_EXCEPTION_MEMORY) always = 1;
-
-    if(always||(gfDoException&f)) {
-        switch(f)
-        {
-        /*
-        case VP_EXCEPTION_ZERODIVIDE:
-        case VP_EXCEPTION_OVERFLOW:
-        */
-        case VP_EXCEPTION_INFINITY:
-             exc = rb_eFloatDomainError;
-             goto raise;
-        case VP_EXCEPTION_NaN:
-             exc = rb_eFloatDomainError;
-             goto raise;
-        case VP_EXCEPTION_UNDERFLOW:
-             exc = rb_eFloatDomainError;
-             goto raise;
-        case VP_EXCEPTION_OP:
-             exc = rb_eFloatDomainError;
-             goto raise;
-        case VP_EXCEPTION_MEMORY:
-             fatal = 1;
-             goto raise;
-        default:
-             fatal = 1;
-             goto raise;
-        }
-    }
-    return 0; /* 0 Means VpException() raised no exception */
-
-raise:
-    if(fatal) rb_fatal(str);
-    else   rb_raise(exc,str);
-    return 0;
-}
-
-/* Throw exception or returns 0,when resulting c is Inf or NaN */
-/*  sw=1:+ 2:- 3:* 4:/ */
-static int
-VpIsDefOP(Real *c,Real *a,Real *b,int sw)
-{
-    if(VpIsNaN(a) || VpIsNaN(b)) {
-        /* at least a or b is NaN */
-        VpSetNaN(c);
-        goto NaN;
-    }
-
-    if(VpIsInf(a)) {
-        if(VpIsInf(b)) {
-            switch(sw)
-            {
-            case 1: /* + */
-                if(VpGetSign(a)==VpGetSign(b)) {
-                    VpSetInf(c,VpGetSign(a));
-                    goto Inf;
-                } else {
-                    VpSetNaN(c);
-                    goto NaN;
-                }
-            case 2: /* - */
-                if(VpGetSign(a)!=VpGetSign(b)) {
-                    VpSetInf(c,VpGetSign(a));
-                    goto Inf;
-                } else {
-                    VpSetNaN(c);
-                    goto NaN;
-                }
-                break;
-            case 3: /* * */
-                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-                goto Inf;
-                break;
-            case 4: /* / */
-                VpSetNaN(c);
-                goto NaN;
-            }
-            VpSetNaN(c);
-            goto NaN;
-        }
-        /* Inf op Finite */
-        switch(sw)
-        {
-        case 1: /* + */
-        case 2: /* - */
-                VpSetInf(c,VpGetSign(a));
-                break;
-        case 3: /* * */
-                if(VpIsZero(b)) {
-                    VpSetNaN(c);
-                    goto NaN;
-                }
-                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-                break;
-        case 4: /* / */
-                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-        }
-        goto Inf;
-    }
-
-    if(VpIsInf(b)) {
-        switch(sw)
-        {
-        case 1: /* + */
-                VpSetInf(c,VpGetSign(b));
-                break;
-        case 2: /* - */
-                VpSetInf(c,-VpGetSign(b));
-                break;
-        case 3: /* * */
-                if(VpIsZero(a)) {
-                    VpSetNaN(c);
-                    goto NaN;
-                }
-                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-                break;
-        case 4: /* / */
-                VpSetZero(c,VpGetSign(a)*VpGetSign(b));
-        }
-        goto Inf;
-    }
-    return 1; /* Results OK */
-
-Inf:
-    return VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
-NaN:
-    return VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'",0);
-}
-
-/*
-  ----------------------------------------------------------------
-*/
-
-/*
- *    returns number of chars needed to represent vp in specified format.
- */
-VP_EXPORT U_LONG
-VpNumOfChars(Real *vp,char *pszFmt)
-{
-    S_INT  ex;
-    U_LONG nc;
-
-    if(vp == NULL)   return BASE_FIG*2+6;
-    if(!VpIsDef(vp)) return 32; /* not sure,may be OK */
-
-    switch(*pszFmt)
-    {
-    case 'F':
-         nc = BASE_FIG*(vp->Prec + 1)+2;
-         ex = vp->exponent;
-         if(ex<0) {
-             nc += BASE_FIG*(-ex);
-         } else {
-             if(ex > (S_INT)vp->Prec) {
-                 nc += BASE_FIG*(ex - (S_INT)vp->Prec);
-             }
-         }
-         break;
-    case 'E':
-    default:
-         nc = BASE_FIG*(vp->Prec + 2)+6; /* 3: sign + exponent chars */
-    }
-    return nc;
-}
-
-/*
- * Initializer for Vp routines and constants used.
- * [Input]
- *   BaseVal: Base value(assigned to BASE) for Vp calculation.
- *   It must be the form BaseVal=10**n.(n=1,2,3,...)
- *   If Base <= 0L,then the BASE will be calcurated so
- *   that BASE is as large as possible satisfying the
- *   relation MaxVal <= BASE*(BASE+1). Where the value
- *   MaxVal is the largest value which can be represented
- *   by one U_LONG word(LONG) in the computer used.
- *
- * [Returns]
- * DBLE_FIG   ... OK
- */
-VP_EXPORT U_LONG
-VpInit(U_LONG BaseVal)
-{
-    U_LONG w;
-    double v;
-
-    /* Setup +/- Inf  NaN -0 */
-    VpGetDoubleNaN();
-    VpGetDoublePosInf();
-    VpGetDoubleNegInf();
-    VpGetDoubleNegZero();
-
-    if(BaseVal <= 0) {
-        /* Base <= 0, then determine Base by calcuration. */
-        BASE = 1;
-        while(
-               (BASE > 0) &&
-               ((w = BASE *(BASE + 1)) > BASE) &&((w / BASE) ==(BASE + 1))
-            ) {
-            BaseVal = BASE;
-            BASE = BaseVal * 10L;
-        }
-    }
-    /* Set Base Values */
-    BASE = BaseVal;
-    HALF_BASE = BASE / 2;
-    BASE1 = BASE / 10;
-    BASE_FIG = 0;
-    while(BaseVal /= 10) ++BASE_FIG;
-    /* Allocates Vp constants. */
-    VpConstOne = VpAlloc((U_LONG)1, "1");
-    VpPt5 = VpAlloc((U_LONG)1, ".5");
-
-#ifdef _DEBUG
-    gnAlloc = 0;
-#endif /* _DEBUG */
-
-    /* Determine # of digits available in one 'double'. */
-
-    v = 1.0;
-    DBLE_FIG = 0;
-    while(v + 1.0 > 1.0) {
-        ++DBLE_FIG;
-        v /= 10;
-    }
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        printf("VpInit: BaseVal   = %lu\n", BaseVal);
-        printf("  BASE   = %lu\n", BASE);
-        printf("  HALF_BASE = %lu\n", HALF_BASE);
-        printf("  BASE1  = %lu\n", BASE1);
-        printf("  BASE_FIG  = %lu\n", BASE_FIG);
-        printf("  DBLE_FIG  = %lu\n", DBLE_FIG);
-    }
-#endif /* _DEBUG */
-
-    return DBLE_FIG;
-}
-
-VP_EXPORT Real *
-VpOne()
-{
-    return VpConstOne;
-}
-
-/* If exponent overflows,then raise exception or returns 0 */
-static int
-AddExponent(Real *a,S_INT n)
-{
-    S_INT e = a->exponent;
-    S_INT m = e+n;
-    S_INT eb,mb;
-    if(e>0) {
-        if(n>0) {
-            mb = m*BASE_FIG;
-            eb = e*BASE_FIG;
-            if(mb<eb) goto overflow;
-        }
-    } else if(n<0) {
-        mb = m*BASE_FIG;
-        eb = e*BASE_FIG;
-        if(mb>eb) goto underflow;
-    }
-    a->exponent = m;
-    return 1;
-
-/* Overflow/Underflow ==> Raise exception or returns 0 */
-underflow:
-    VpSetZero(a,VpGetSign(a));
-    return VpException(VP_EXCEPTION_UNDERFLOW,"Exponent underflow",0);
-
-overflow:
-    VpSetInf(a,VpGetSign(a));
-    return VpException(VP_EXCEPTION_OVERFLOW,"Exponent overflow",0);
-}
-
-/*
- * Allocates variable.
- * [Input]
- *   mx ... allocation unit, if zero then mx is determined by szVal.
- *    The mx is the number of effective digits can to be stored.
- *   szVal ... value assigned(char). If szVal==NULL,then zero is assumed.
- *            If szVal[0]=='#' then Max. Prec. will not be considered(1.1.7),
- *            full precision specified by szVal is allocated.
- *
- * [Returns]
- *   Pointer to the newly allocated variable, or
- *   NULL be returned if memory allocation is failed,or any error.
- */
-VP_EXPORT Real *
-VpAlloc(U_LONG mx, char *szVal)
-{
-    U_LONG i, ni, ipn, ipf, nf, ipe, ne, nalloc;
-    char v,*psz;
-    int  sign=1;
-    Real *vp = NULL;
-    U_LONG mf = VpGetPrecLimit();
-
-    mx = (mx + BASE_FIG - 1) / BASE_FIG + 1;    /* Determine allocation unit. */
-    if(szVal) {
-        while(ISSPACE(*szVal)) szVal++;
-        if(*szVal!='#') {
-             if(mf) {
-                mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
-                if(mx>mf) {
-                    mx = mf;
-                }
-            }
-        } else {
-            ++szVal;
-        }
-    } else {
-       /* necessary to be able to store */
-       /* at least mx digits. */
-       /* szVal==NULL ==> allocate zero value. */
-       vp = (Real *) VpMemAlloc(sizeof(Real) + mx * sizeof(U_LONG));
-       /* xmalloc() alway returns(or throw interruption) */
-       vp->MaxPrec = mx;    /* set max precision */
-       VpSetZero(vp,1);    /* initialize vp to zero. */
-       return vp;
-    }
-
-    /* Skip all spaces */
-    psz = ALLOCA_N(char,strlen(szVal)+1);
-    i   = 0;
-    ipn = 0;
-    while(psz[i]=szVal[ipn]) {
-        if(ISSPACE(szVal[ipn])) {ipn++;continue;}
-        ++i; ++ipn;
-    }
-    szVal = psz;
-
-    /* Check on Inf & NaN */
-    if(StrCmp(szVal,SZ_PINF)==0 ||
-       StrCmp(szVal,SZ_INF)==0 ) {
-        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetPosInf(vp);
-        return vp;
-    }
-    if(StrCmp(szVal,SZ_NINF)==0) {
-        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetNegInf(vp);
-        return vp;
-    }
-    if(StrCmp(szVal,SZ_NaN)==0) {
-        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetNaN(vp);
-        return vp;
-    }
-
-    /* check on number szVal[] */
-    ipn = i = 0;
-    if     (szVal[i] == '-') {sign=-1;++i;}
-    else if(szVal[i] == '+')          ++i;
-    /* Skip digits */
-    ni = 0;            /* digits in mantissa */
-    while(v = szVal[i]) {
-        if(!ISDIGIT(v)) break;
-        ++i;
-        ++ni;
-    }
-    nf  = 0;
-    ipf = 0;
-    ipe = 0;
-    ne  = 0;
-    if(v) {
-        /* other than digit nor \0 */
-        if(szVal[i] == '.') {    /* xxx. */
-            ++i;
-            ipf = i;
-            while(v = szVal[i]) {    /* get fraction part. */
-                if(!ISDIGIT(v)) break;
-                ++i;
-                ++nf;
-            }
-        }
-        ipe = 0;        /* Exponent */
-
-        switch(szVal[i]) {
-        case '\0': break;
-        case 'e':
-        case 'E':
-        case 'd':
-        case 'D':
-            ++i;
-            ipe = i;
-            v = szVal[i];
-            if((v == '-') ||(v == '+')) ++i;
-            while(v=szVal[i]) {
-                if(!ISDIGIT(v)) break;
-                ++i;
-                ++ne;
-            }
-            break;
-        default:
-            break;
-        }
-    }
-    nalloc =(ni + nf + BASE_FIG - 1) / BASE_FIG + 1;    /* set effective allocation  */
-    /* units for szVal[]  */
-    if(mx <= 0) mx = 1;
-    nalloc = Max(nalloc, mx);
-    mx = nalloc;
-    vp =(Real *) VpMemAlloc(sizeof(Real) + mx * sizeof(U_LONG));
-    /* xmalloc() alway returns(or throw interruption) */
-    vp->MaxPrec = mx;        /* set max precision */
-    VpSetZero(vp,sign);
-    VpCtoV(vp, &(szVal[ipn]), ni, &(szVal[ipf]), nf, &(szVal[ipe]), ne);
-    return vp;
-}
-
-/*
- * Assignment(c=a).
- * [Input]
- *   a   ... RHSV
- *   isw ... switch for assignment.
- *    c = a  when isw > 0
- *    c = -a when isw < 0
- *    if c->MaxPrec < a->Prec,then round operation
- *    will be performed.
- * [Output]
- *  c  ... LHSV
- */
-VP_EXPORT int
-VpAsgn(Real *c, Real *a, int isw)
-{
-    U_LONG n;
-    if(VpIsNaN(a)) {
-        VpSetNaN(c);
-        return 0;
-    }
-    if(VpIsInf(a)) {
-        VpSetInf(c,isw*VpGetSign(a));
-        return 0;
-    }
-
-    /* check if the RHS is zero */
-    if(!VpIsZero(a)) {
-        c->exponent = a->exponent;    /* store  exponent */
-        VpSetSign(c,(isw*VpGetSign(a)));    /* set sign */
-        n =(a->Prec < c->MaxPrec) ?(a->Prec) :(c->MaxPrec);
-        c->Prec = n;
-        memcpy(c->frac, a->frac, n * sizeof(U_LONG));
-        /* Needs round ? */
-        if(isw!=10) {
-            /* Not in ActiveRound */
-            if(c->Prec < a->Prec) {
-               VpInternalRound(c,n,(n>0)?a->frac[n-1]:0,a->frac[n]);
-            } else {
-               VpLimitRound(c,0);
-            }
-        }
-    } else {
-        /* The value of 'a' is zero.  */
-        VpSetZero(c,isw*VpGetSign(a));
-        return 1;
-    }
-    return c->Prec*BASE_FIG;
-}
-
-/*
- *   c = a + b  when operation =  1 or 2
- *  = a - b  when operation = -1 or -2.
- *   Returns number of significant digits of c
- */
-VP_EXPORT int
-VpAddSub(Real *c, Real *a, Real *b, int operation)
-{
-    S_INT sw, isw;
-    Real *a_ptr, *b_ptr;
-    U_LONG n, na, nb, i;
-    U_LONG mrv;
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpAddSub(enter) a=% \n", a);
-        VPrint(stdout, "     b=% \n", b);
-        printf(" operation=%d\n", operation);
-    }
-#endif /* _DEBUG */
-
-    if(!VpIsDefOP(c,a,b,(operation>0)?1:2)) return 0; /* No significant digits */
-
-    /* check if a or b is zero  */
-    if(VpIsZero(a)) {
-        /* a is zero,then assign b to c */
-        if(!VpIsZero(b)) {
-            VpAsgn(c, b, operation);
-        } else {
-            /* Both a and b are zero. */
-            if(VpGetSign(a)<0 && operation*VpGetSign(b)<0) {
-                /* -0 -0 */
-                VpSetZero(c,-1);
-            } else {
-                VpSetZero(c,1);
-            }
-            return 1; /* 0: 1 significant digits */
-        }
-        return c->Prec*BASE_FIG;
-    }
-    if(VpIsZero(b)) {
-        /* b is zero,then assign a to c. */
-        VpAsgn(c, a, 1);
-        return c->Prec*BASE_FIG;
-    }
-
-    if(operation < 0) sw = -1;
-    else              sw =  1;
-
-    /* compare absolute value. As a result,|a_ptr|>=|b_ptr| */
-    if(a->exponent > b->exponent) {
-        a_ptr = a;
-        b_ptr = b;
-    }         /* |a|>|b| */
-    else if(a->exponent < b->exponent) {
-        a_ptr = b;
-        b_ptr = a;
-    }                /* |a|<|b| */
-    else {
-        /* Exponent part of a and b is the same,then compare fraction */
-        /* part */
-        na = a->Prec;
-        nb = b->Prec;
-        n = Min(na, nb);
-        for(i=0;i < n; ++i) {
-            if(a->frac[i] > b->frac[i]) {
-                a_ptr = a;
-                b_ptr = b;
-                goto end_if;
-            } else if(a->frac[i] < b->frac[i]) {
-                a_ptr = b;
-                b_ptr = a;
-                goto end_if;
-            }
-        }
-        if(na > nb) {
-         a_ptr = a;
-            b_ptr = b;
-            goto end_if;
-        } else if(na < nb) {
-            a_ptr = b;
-            b_ptr = a;
-            goto end_if;
-        }
-        /* |a| == |b| */
-        if(VpGetSign(a) + sw *VpGetSign(b) == 0) {
-            VpSetZero(c,1);        /* abs(a)=abs(b) and operation = '-'  */
-            return c->Prec*BASE_FIG;
-        }
-        a_ptr = a;
-        b_ptr = b;
-    }
-
-end_if:
-    isw = VpGetSign(a) + sw *VpGetSign(b);
-    /*
-     *  isw = 0 ...( 1)+(-1),( 1)-( 1),(-1)+(1),(-1)-(-1)
-     *      = 2 ...( 1)+( 1),( 1)-(-1)
-     *      =-2 ...(-1)+(-1),(-1)-( 1)
-     *   If isw==0, then c =(Sign a_ptr)(|a_ptr|-|b_ptr|)
-     *              else c =(Sign ofisw)(|a_ptr|+|b_ptr|)
-    */
-    if(isw) {            /* addition */
-        VpSetSign(c,(S_INT)1);
-        mrv = VpAddAbs(a_ptr, b_ptr, c);
-        VpSetSign(c,isw / 2);
-    } else {            /* subtraction */
-        VpSetSign(c,(S_INT)1);
-        mrv = VpSubAbs(a_ptr, b_ptr, c);
-        if(a_ptr == a) {
-            VpSetSign(c,VpGetSign(a));
-        } else    {
-            VpSetSign(c,VpGetSign(a_ptr) * sw);
-        }
-    }
-    VpInternalRound(c,0,(c->Prec>0)?c->frac[c->Prec-1]:0,mrv);
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpAddSub(result) c=% \n", c);
-        VPrint(stdout, "     a=% \n", a);
-        VPrint(stdout, "     b=% \n", b);
-        printf(" operation=%d\n", operation);
-    }
-#endif /* _DEBUG */
-    return c->Prec*BASE_FIG;
-}
-
-/*
- * Addition of two variable precisional variables
- * a and b assuming abs(a)>abs(b).
- *   c = abs(a) + abs(b) ; where |a|>=|b|
- */
-static U_LONG
-VpAddAbs(Real *a, Real *b, Real *c)
-{
-    U_LONG word_shift;
-    U_LONG carry;
-    U_LONG ap;
-    U_LONG bp;
-    U_LONG cp;
-    U_LONG a_pos;
-    U_LONG b_pos;
-    U_LONG c_pos;
-    U_LONG av, bv, mrv;
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpAddAbs called: a = %\n", a);
-        VPrint(stdout, "     b = %\n", b);
-    }
-#endif /* _DEBUG */
-
-    word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
-    a_pos = ap;
-    b_pos = bp;
-    c_pos = cp;
-    if(word_shift==-1L) return 0; /* Overflow */
-    if(b_pos == -1L) goto Assign_a;
-
-    mrv = av + bv; /* Most right val. Used for round. */
-
-    /* Just assign the last few digits of b to c because a has no  */
-    /* corresponding digits to be added. */
-    while(b_pos + word_shift > a_pos) {
-        --c_pos;
-        if(b_pos > 0) {
-            --b_pos;
-            c->frac[c_pos] = b->frac[b_pos];
-        } else {
-            --word_shift;
-            c->frac[c_pos] = 0;
-        }
-    }
-
-    /* Just assign the last few digits of a to c because b has no */
-    /* corresponding digits to be added. */
-    bv = b_pos + word_shift;
-    while(a_pos > bv) {
-        --c_pos;
-        --a_pos;
-        c->frac[c_pos] = a->frac[a_pos];
-    }
-    carry = 0;    /* set first carry be zero */
-
-    /* Now perform addition until every digits of b will be */
-    /* exhausted. */
-    while(b_pos > 0) {
-        --a_pos;
-        --b_pos;
-        --c_pos;
-        c->frac[c_pos] = a->frac[a_pos] + b->frac[b_pos] + carry;
-        if(c->frac[c_pos] >= BASE) {
-            c->frac[c_pos] -= BASE;
-            carry = 1;
-        } else {
-            carry = 0;
-        }
-    }
-
-    /* Just assign the first few digits of a with considering */
-    /* the carry obtained so far because b has been exhausted. */
-    while(a_pos > 0) {
-        --a_pos;
-        --c_pos;
-        c->frac[c_pos] = a->frac[a_pos] + carry;
-        if(c->frac[c_pos] >= BASE) {
-            c->frac[c_pos] -= BASE;
-            carry = 1;
-        } else {
-            carry = 0;
-        }
-    }
-    if(c_pos) c->frac[c_pos - 1] += carry;
-    goto Exit;
-
-Assign_a:
-    VpAsgn(c, a, 1);
-    mrv = 0;
-
-Exit:
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpAddAbs exit: c=% \n", c);
-    }
-#endif /* _DEBUG */
-    return mrv;
-}
-
-/*
- * c = abs(a) - abs(b)
- */
-static U_LONG
-VpSubAbs(Real *a, Real *b, Real *c)
-{
-    U_LONG word_shift;
-    U_LONG mrv;
-    U_LONG borrow;
-    U_LONG ap;
-    U_LONG bp;
-    U_LONG cp;
-    U_LONG a_pos;
-    U_LONG b_pos;
-    U_LONG c_pos;
-    U_LONG av, bv;
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpSubAbs called: a = %\n", a);
-        VPrint(stdout, "     b = %\n", b);
-    }
-#endif /* _DEBUG */
-
-    word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
-    a_pos = ap;
-    b_pos = bp;
-    c_pos = cp;
-    if(word_shift==-1L) return 0; /* Overflow */
-    if(b_pos == -1L) goto Assign_a;
-
-    if(av >= bv) {
-        mrv = av - bv;
-        borrow = 0;
-    } else {
-        mrv    = 0;
-        borrow = 1;
-    }
-
-    /* Just assign the values which are the BASE subtracted by   */
-    /* each of the last few digits of the b because the a has no */
-    /* corresponding digits to be subtracted. */
-    if(b_pos + word_shift > a_pos) {
-        borrow = 1;
-        --c_pos;
-        --b_pos;
-        c->frac[c_pos] = BASE - b->frac[b_pos];
-        while(b_pos + word_shift > a_pos) {
-            --c_pos;
-            if(b_pos > 0) {
-                --b_pos;
-                c->frac[c_pos] = BASE - b->frac[b_pos] - borrow;
-            } else {
-                --word_shift;
-                c->frac[c_pos] = BASE - borrow;
-            }
-        }
-    }
-    /* Just assign the last few digits of a to c because b has no */
-    /* corresponding digits to subtract. */
-
-    bv = b_pos + word_shift;
-    while(a_pos > bv) {
-        --c_pos;
-        --a_pos;
-        c->frac[c_pos] = a->frac[a_pos];
-    }
-
-    /* Now perform subtraction until every digits of b will be */
-    /* exhausted. */
-    while(b_pos > 0) {
-        --a_pos;
-        --b_pos;
-        --c_pos;
-        if(a->frac[a_pos] < b->frac[b_pos] + borrow) {
-            c->frac[c_pos] = BASE + a->frac[a_pos] - b->frac[b_pos] - borrow;
-            borrow = 1;
-        } else {
-            c->frac[c_pos] = a->frac[a_pos] - b->frac[b_pos] - borrow;
-            borrow = 0;
-        }
-    }
-
-    /* Just assign the first few digits of a with considering */
-    /* the borrow obtained so far because b has been exhausted. */
-    while(a_pos > 0) {
-        --c_pos;
-        --a_pos;
-        if(a->frac[a_pos] < borrow) {
-            c->frac[c_pos] = BASE + a->frac[a_pos] - borrow;
-            borrow = 1;
-        } else {
-            c->frac[c_pos] = a->frac[a_pos] - borrow;
-            borrow = 0;
-        }
-    }
-    if(c_pos) c->frac[c_pos - 1] -= borrow;
-    goto Exit;
-
-Assign_a:
-    VpAsgn(c, a, 1);
-    mrv = 0;
-
-Exit:
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpSubAbs exit: c=% \n", c);
-    }
-#endif /* _DEBUG */
-    return mrv;
-}
-
-/*
- * Note: If(av+bv)>= HALF_BASE,then 1 will be added to the least significant
- *    digit of c(In case of addition).
- * ------------------------- figure of output -----------------------------------
- *      a =  xxxxxxxxxxx
- *      b =    xxxxxxxxxx
- *      c =xxxxxxxxxxxxxxx
- *      word_shift =  |   |
- *      right_word =  |    | (Total digits in RHSV)
- *      left_word  = |   |   (Total digits in LHSV)
- *      a_pos      =    |
- *      b_pos      =     |
- *      c_pos      =      |
- */
-static U_LONG
-VpSetPTR(Real *a, Real *b, Real *c, U_LONG *a_pos, U_LONG *b_pos, U_LONG *c_pos, U_LONG *av, U_LONG *bv)
-{
-    U_LONG left_word, right_word, word_shift;
-    c->frac[0] = 0;
-    *av = *bv = 0;
-    word_shift =((a->exponent) -(b->exponent));
-    left_word = b->Prec + word_shift;
-    right_word = Max((a->Prec),left_word);
-    left_word =(c->MaxPrec) - 1;    /* -1 ... prepare for round up */
-    /*
-     * check if 'round' is needed.
-     */
-    if(right_word > left_word) {    /* round ? */
-        /*---------------------------------
-         *  Actual size of a = xxxxxxAxx
-         *  Actual size of b = xxxBxxxxx
-         *  Max. size of   c = xxxxxx
-         *  Round off        =   |-----|
-         *  c_pos            =   |
-         *  right_word       =   |
-         *  a_pos            =    |
-         */
-        *c_pos = right_word = left_word + 1;    /* Set resulting precision */
-        /* be equal to that of c */
-        if((a->Prec) >=(c->MaxPrec)) {
-            /*
-             *   a =  xxxxxxAxxx
-             *   c =  xxxxxx
-             *   a_pos =    |
-             */
-            *a_pos = left_word;
-            *av = a->frac[*a_pos];    /* av is 'A' shown in above. */
-        } else {
-            /*
-             *   a = xxxxxxx
-             *   c = xxxxxxxxxx
-             *  a_pos =     |
-             */
-            *a_pos = a->Prec;
-        }
-        if((b->Prec + word_shift) >= c->MaxPrec) {
-            /*
-             *   a = xxxxxxxxx
-             *   b =  xxxxxxxBxxx
-             *   c = xxxxxxxxxxx
-             *  b_pos =   |
-             */
-            if(c->MaxPrec >=(word_shift + 1)) {
-                *b_pos = c->MaxPrec - word_shift - 1;
-                *bv = b->frac[*b_pos];
-            } else {
-                *b_pos = -1L;
-            }
-        } else {
-            /*
-             *   a = xxxxxxxxxxxxxxxx
-             *   b =  xxxxxx
-             *   c = xxxxxxxxxxxxx
-             *  b_pos =     |
-             */
-            *b_pos = b->Prec;
-        }
-    } else {            /* The MaxPrec of c - 1 > The Prec of a + b  */
-        /*
-         *    a =   xxxxxxx
-         *    b =   xxxxxx
-         *    c = xxxxxxxxxxx
-         *   c_pos =   |
-         */
-        *b_pos = b->Prec;
-        *a_pos = a->Prec;
-        *c_pos = right_word + 1;
-    }
-    c->Prec = *c_pos;
-    c->exponent = a->exponent;
-    if(!AddExponent(c,(S_LONG)1)) return (-1L);
-    return word_shift;
-}
-
-/*
- * Return number og significant digits
- *       c = a * b , Where a = a0a1a2 ... an
- *             b = b0b1b2 ... bm
- *             c = c0c1c2 ... cl
- *          a0 a1 ... an   * bm
- *       a0 a1 ... an   * bm-1
- *         .   .    .
- *       .   .   .
- *        a0 a1 .... an    * b0
- *      +_____________________________
- *     c0 c1 c2  ......  cl
- *     nc      <---|
- *     MaxAB |--------------------|
- */
-VP_EXPORT int
-VpMult(Real *c, Real *a, Real *b)
-{
-    U_LONG MxIndA, MxIndB, MxIndAB, MxIndC;
-    U_LONG ind_c, i, ii, nc;
-    U_LONG ind_as, ind_ae, ind_bs, ind_be;
-    U_LONG Carry, s;
-    Real *w;
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpMult(Enter): a=% \n", a);
-        VPrint(stdout, "      b=% \n", b);
-    }
-#endif /* _DEBUG */
-
-    if(!VpIsDefOP(c,a,b,3)) return 0; /* No significant digit */
-
-    if(VpIsZero(a) || VpIsZero(b)) {
-        /* at least a or b is zero */
-        VpSetZero(c,VpGetSign(a)*VpGetSign(b));
-        return 1; /* 0: 1 significant digit */
-    }
-
-    if(VpIsOne(a)) {
-        VpAsgn(c, b, VpGetSign(a));
-        goto Exit;
-    }
-    if(VpIsOne(b)) {
-        VpAsgn(c, a, VpGetSign(b));
-        goto Exit;
-    }
-    if((b->Prec) >(a->Prec)) {
-        /* Adjust so that digits(a)>digits(b) */
-        w = a;
-        a = b;
-        b = w;
-    }
-    w = NULL;
-    MxIndA = a->Prec - 1;
-    MxIndB = b->Prec - 1;
-    MxIndC = c->MaxPrec - 1;
-    MxIndAB = a->Prec + b->Prec - 1;
-
-    if(MxIndC < MxIndAB) {    /* The Max. prec. of c < Prec(a)+Prec(b) */
-        w = c;
-        c = VpAlloc((U_LONG)((MxIndAB + 1) * BASE_FIG), "#0");
-        MxIndC = MxIndAB;
-    }
-
-    /* set LHSV c info */
-
-    c->exponent = a->exponent;    /* set exponent */
-    if(!AddExponent(c,b->exponent)) return 0;
-    VpSetSign(c,VpGetSign(a)*VpGetSign(b));    /* set sign  */
-    Carry = 0;
-    nc = ind_c = MxIndAB;
-    memset(c->frac, 0, (nc + 1) * sizeof(U_LONG));        /* Initialize c  */
-    c->Prec = nc + 1;        /* set precision */
-    for(nc = 0; nc < MxIndAB; ++nc, --ind_c) {
-        if(nc < MxIndB) {    /* The left triangle of the Fig. */
-            ind_as = MxIndA - nc;
-            ind_ae = MxIndA;
-            ind_bs = MxIndB;
-            ind_be = MxIndB - nc;
-        } else if(nc <= MxIndA) {    /* The middle rectangular of the Fig. */
-            ind_as = MxIndA - nc;
-            ind_ae = MxIndA -(nc - MxIndB);
-            ind_bs = MxIndB;
-            ind_be = 0;
-        } else if(nc > MxIndA) {    /*  The right triangle of the Fig. */
-            ind_as = 0;
-            ind_ae = MxIndAB - nc - 1;
-            ind_bs = MxIndB -(nc - MxIndA);
-            ind_be = 0;
-        }
-
-        for(i = ind_as; i <= ind_ae; ++i) {
-            s =((a->frac[i]) *(b->frac[ind_bs--]));
-            Carry = s / BASE;
-            s = s -(Carry * BASE);
-            c->frac[ind_c] += s;
-            if(c->frac[ind_c] >= BASE) {
-                s = c->frac[ind_c] / BASE;
-                Carry += s;
-                c->frac[ind_c] -= (s * BASE);
-            }
-            if(Carry) {
-                ii = ind_c;
-                while((--ii) >= 0) {
-                    c->frac[ii] += Carry;
-                    if(c->frac[ii] >= BASE) {
-                        Carry = c->frac[ii] / BASE;
-                        c->frac[ii] -=(Carry * BASE);
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    if(w != NULL) {        /* free work variable */
-        VpNmlz(c);
-        VpAsgn(w, c, 1);
-        VpFree(c);
-        c = w;
-    } else {
-        VpLimitRound(c,0);
-    }
-
-Exit:
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpMult(c=a*b): c=% \n", c);
-        VPrint(stdout, "      a=% \n", a);
-        VPrint(stdout, "      b=% \n", b);
-    }
-#endif /*_DEBUG */
-    return c->Prec*BASE_FIG;
-}
-
-/*
- *   c = a / b,  remainder = r
- */
-VP_EXPORT int
-VpDivd(Real *c, Real *r, Real *a, Real *b)
-{
-    U_LONG word_a, word_b, word_c, word_r;
-    U_LONG i, n, ind_a, ind_b, ind_c, ind_r;
-    U_LONG nLoop;
-    U_LONG q, b1, b1p1, b1b2, b1b2p1, r1r2;
-    U_LONG borrow, borrow1, borrow2, qb;
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, " VpDivd(c=a/b)  a=% \n", a);
-        VPrint(stdout, "    b=% \n", b);
-    }
-#endif /*_DEBUG */
-
-    VpSetNaN(r);
-    if(!VpIsDefOP(c,a,b,4)) goto Exit;
-    if(VpIsZero(a)&&VpIsZero(b)) {
-        VpSetNaN(c);
-        return VpException(VP_EXCEPTION_NaN,"(VpDivd) 0/0 not defined(NaN)",0);
-    }
-    if(VpIsZero(b)) {
-        VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-        return VpException(VP_EXCEPTION_ZERODIVIDE,"(VpDivd) Divide by zero",0);
-    }
-    if(VpIsZero(a)) {
-        /* numerator a is zero  */
-        VpSetZero(c,VpGetSign(a)*VpGetSign(b));
-        VpSetZero(r,VpGetSign(a)*VpGetSign(b));
-        goto Exit;
-    }
-    if(VpIsOne(b)) {
-        /* divide by one  */
-        VpAsgn(c, a, VpGetSign(b));
-        VpSetZero(r,VpGetSign(a));
-        goto Exit;
-    }
-
-    word_a = a->Prec;
-    word_b = b->Prec;
-    word_c = c->MaxPrec;
-    word_r = r->MaxPrec;
-
-    ind_c = 0;
-    ind_r = 1;
-
-    if(word_a >= word_r) goto space_error;
-
-    r->frac[0] = 0;
-    while(ind_r <= word_a) {
-        r->frac[ind_r] = a->frac[ind_r - 1];
-        ++ind_r;
-    }
-
-    while(ind_r < word_r) r->frac[ind_r++] = 0;
-    while(ind_c < word_c) c->frac[ind_c++] = 0;
-
-    /* initial procedure */
-    b1 = b1p1 = b->frac[0];
-    if(b->Prec <= 1) {
-        b1b2p1 = b1b2 = b1p1 * BASE;
-    } else {
-        b1p1 = b1 + 1;
-        b1b2p1 = b1b2 = b1 * BASE + b->frac[1];
-        if(b->Prec > 2) ++b1b2p1;
-    }
-
-    /* */
-    /* loop start */
-    ind_c = word_r - 1;
-    nLoop = Min(word_c,ind_c);
-    ind_c = 1;
-    while(ind_c < nLoop) {
-        if(r->frac[ind_c] == 0) {
-            ++ind_c;
-            continue;
-        }
-        r1r2 = r->frac[ind_c] * BASE + r->frac[ind_c + 1];
-        if(r1r2 == b1b2) {
-            /* The first two word digits is the same */
-            ind_b = 2;
-            ind_a = ind_c + 2;
-            while(ind_b < word_b) {
-                if(r->frac[ind_a] < b->frac[ind_b]) goto div_b1p1;
-                if(r->frac[ind_a] > b->frac[ind_b]) break;
-                ++ind_a;
-                ++ind_b;
-            }
-            /* The first few word digits of r and b is the same and */
-            /* the first different word digit of w is greater than that */
-            /* of b, so quotinet is 1 and just subtract b from r. */
-            borrow = 0;        /* quotient=1, then just r-b */
-            ind_b = b->Prec - 1;
-            ind_r = ind_c + ind_b;
-            if(ind_r >= word_r) goto space_error;
-            n = ind_b;
-            for(i = 0; i <= n; ++i) {
-                if(r->frac[ind_r] < b->frac[ind_b] + borrow) {
-                    r->frac[ind_r] +=(BASE -(b->frac[ind_b] + borrow));
-                    borrow = 1;
-                } else {
-                    r->frac[ind_r] = r->frac[ind_r] - b->frac[ind_b] - borrow;
-                    borrow = 0;
-                }
-                --ind_r;
-                --ind_b;
-            }
-            ++(c->frac[ind_c]);
-            goto carry;
-        }
-        /* The first two word digits is not the same, */
-        /* then compare magnitude, and divide actually. */
-        if(r1r2 >= b1b2p1) {
-            q = r1r2 / b1b2p1;
-            c->frac[ind_c] += q;
-            ind_r = b->Prec + ind_c - 1;
-            goto sub_mult;
-        }
-
-div_b1p1:
-        if(ind_c + 1 >= word_c) goto out_side;
-        q = r1r2 / b1p1;
-        c->frac[ind_c + 1] += q;
-        ind_r = b->Prec + ind_c;
-
-sub_mult:
-        borrow1 = borrow2 = 0;
-        ind_b = word_b - 1;
-        if(ind_r >= word_r) goto space_error;
-        n = ind_b;
-        for(i = 0; i <= n; ++i) {
-            /* now, perform r = r - q * b */
-            qb = q *(b->frac[ind_b]);
-            if(qb < BASE) borrow1 = 0;
-            else {
-                borrow1 = qb / BASE;
-                qb = qb - borrow1 * BASE;
-            }
-            if(r->frac[ind_r] < qb) {
-                r->frac[ind_r] +=(BASE - qb);
-                borrow2 = borrow2 + borrow1 + 1;
-            } else {
-                r->frac[ind_r] -= qb;
-                borrow2 += borrow1;
-            }
-            if(borrow2) {
-                if(r->frac[ind_r - 1] < borrow2) {
-                    r->frac[ind_r - 1] +=(BASE - borrow2);
-                    borrow2 = 1;
-                } else {
-                    r->frac[ind_r - 1] -= borrow2;
-                    borrow2 = 0;
-                }
-            }
-            --ind_r;
-            --ind_b;
-        }
-
-        r->frac[ind_r] -= borrow2;
-carry:
-        ind_r = ind_c;
-        while(c->frac[ind_r] >= BASE) {
-            c->frac[ind_r] -= BASE;
-            --ind_r;
-            ++(c->frac[ind_r]);
-        }
-    }
-    /* End of operation, now final arrangement */
-out_side:
-    c->Prec = word_c;
-    c->exponent = a->exponent;
-    if(!AddExponent(c,(S_LONG)2))   return 0;
-    if(!AddExponent(c,-(b->exponent))) return 0;
-
-    VpSetSign(c,VpGetSign(a)*VpGetSign(b));
-    VpNmlz(c);            /* normalize c */
-    r->Prec = word_r;
-    r->exponent = a->exponent;
-    if(!AddExponent(r,(S_LONG)1)) return 0;
-    VpSetSign(r,VpGetSign(a));
-    VpNmlz(r);            /* normalize r(remainder) */
-    goto Exit;
-
-space_error:
-#ifdef _DEBUG
-    if(gfDebug) {
-        printf("   word_a=%lu\n", word_a);
-        printf("   word_b=%lu\n", word_b);
-        printf("   word_c=%lu\n", word_c);
-        printf("   word_r=%lu\n", word_r);
-        printf("   ind_r =%lu\n", ind_r);
-    }
-#endif /* _DEBUG */
-    rb_bug("ERROR(VpDivd): space for remainder too small.");
-
-Exit:
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, " VpDivd(c=a/b), c=% \n", c);
-        VPrint(stdout, "    r=% \n", r);
-    }
-#endif /* _DEBUG */
-    return c->Prec*BASE_FIG;
-}
-
-/*
- *  Input  a = 00000xxxxxxxx En(5 preceeding zeros)
- *  Output a = xxxxxxxx En-5
- */
-static int
-VpNmlz(Real *a)
-{
-    U_LONG ind_a, i;
-
-    if(!VpIsDef(a)) goto NoVal;
-    if(VpIsZero(a)) goto NoVal;
-
-    ind_a = a->Prec;
-    while(ind_a--) {
-        if(a->frac[ind_a]) {
-            a->Prec = ind_a + 1;
-            i = 0;
-            while(a->frac[i] == 0) ++i;        /* skip the first few zeros */
-            if(i) {
-                a->Prec -= i;
-                if(!AddExponent(a,-((S_INT)i))) return 0;
-                memmove(&(a->frac[0]),&(a->frac[i]),(a->Prec)*sizeof(U_LONG));
-            }
-            return 1;
-        }
-    }
-    /* a is zero(no non-zero digit) */
-    VpSetZero(a,VpGetSign(a));
-    return 0;
-
-NoVal:
-    a->frac[0] = 0;
-    a->Prec=1;
-    return 0;
-}
-
-/*
- *  VpComp = 0  ... if a=b,
- *   Pos  ... a>b,
- *   Neg  ... a<b.
- *   999  ... result undefined(NaN)
- */
-VP_EXPORT int
-VpComp(Real *a, Real *b)
-{
-    int val;
-    U_LONG mx, ind;
-    int e;
-    val = 0;
-    if(VpIsNaN(a)||VpIsNaN(b)) return 999;
-    if(!VpIsDef(a)) {
-        if(!VpIsDef(b)) e = a->sign - b->sign;
-        else             e = a->sign;
-        if(e>0)   return  1;
-        else if(e<0) return -1;
-        else   return  0;
-    }
-    if(!VpIsDef(b)) {
-        e = -b->sign;
-        if(e>0) return  1;
-        else return -1;
-    }
-    /* Zero check */
-    if(VpIsZero(a)) {
-        if(VpIsZero(b))      return 0; /* both zero */
-        val = -VpGetSign(b);
-        goto Exit;
-    }
-    if(VpIsZero(b)) {
-        val = VpGetSign(a);
-        goto Exit;
-    }
-
-    /* compare sign */
-    if(VpGetSign(a) > VpGetSign(b)) {
-        val = 1;        /* a>b */
-        goto Exit;
-    }
-    if(VpGetSign(a) < VpGetSign(b)) {
-        val = -1;        /* a<b */
-        goto Exit;
-    }
-
-    /* a and b have same sign, && signe!=0,then compare exponent */
-    if((a->exponent) >(b->exponent)) {
-        val = VpGetSign(a);
-        goto Exit;
-    }
-    if((a->exponent) <(b->exponent)) {
-        val = -VpGetSign(b);
-        goto Exit;
-    }
-
-    /* a and b have same exponent, then compare significand. */
-    mx =((a->Prec) <(b->Prec)) ?(a->Prec) :(b->Prec);
-    ind = 0;
-    while(ind < mx) {
-        if((a->frac[ind]) >(b->frac[ind])) {
-            val = VpGetSign(a);
-         goto Exit;
-        }
-        if((a->frac[ind]) <(b->frac[ind])) {
-            val = -VpGetSign(b);
-            goto Exit;
-        }
-        ++ind;
-    }
-    if((a->Prec) >(b->Prec)) {
-        val = VpGetSign(a);
-    } else if((a->Prec) <(b->Prec)) {
-        val = -VpGetSign(b);
-    }
-
-Exit:
-    if  (val> 1) val =  1;
-    else if(val<-1) val = -1;
-
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, " VpComp a=%\n", a);
-        VPrint(stdout, "  b=%\n", b);
-        printf("  ans=%d\n", val);
-    }
-#endif /* _DEBUG */
-    return (int)val;
-}
-
-#ifdef _DEBUG
-/*
- *    cntl_chr ... ASCIIZ Character, print control characters
- *     Available control codes:
- *      %  ... VP variable. To print '%', use '%%'.
- *      \n ... new line
- *      \b ... backspace
- *           ... tab
- *     Note: % must must not appear more than once
- *    a  ... VP variable to be printed
- */
-VP_EXPORT int
-VPrint(FILE *fp, char *cntl_chr, Real *a)
-{
-    U_LONG i, j, nc, nd, ZeroSup;
-    U_LONG n, m, e, nn;
-
-    /* Check if NaN & Inf. */
-    if(VpIsNaN(a)) {
-        fprintf(fp,SZ_NaN);
-        return 8;
-    }
-    if(VpIsPosInf(a)) {
-        fprintf(fp,SZ_INF);
-        return 8;
-    }
-    if(VpIsNegInf(a)) {
-        fprintf(fp,SZ_NINF);
-        return 9;
-    }
-    if(VpIsZero(a)) {
-        fprintf(fp,"0.0");
-        return 3;
-    }
-
-    j = 0;
-    nd = nc = 0;        /*  nd : number of digits in fraction part(every 10 digits, */
-    /*    nd<=10). */
-    /*  nc : number of caracters printed  */
-    ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
-    while(*(cntl_chr + j)) {
-        if((*(cntl_chr + j) == '%') &&(*(cntl_chr + j + 1) != '%')) {
-         nc = 0;
-         if(!VpIsZero(a)) {
-                if(VpGetSign(a) < 0) {
-                    fprintf(fp, "-");
-                    ++nc;
-                }
-                nc += fprintf(fp, "0.");
-                n = a->Prec;
-                for(i=0;i < n;++i) {
-                 m = BASE1;
-                    e = a->frac[i];
-                    while(m) {
-                        nn = e / m;
-                        if((!ZeroSup) || nn) {
-                            nc += fprintf(fp, "%lu", nn);    /* The reading zero(s) */
-                            /* as 0.00xx will not */
-                            /* be printed. */
-                            ++nd;
-                            ZeroSup = 0;    /* Set to print succeeding zeros */
-                        }
-                        if(nd >= 10) {    /* print ' ' after every 10 digits */
-                            nd = 0;
-                            nc += fprintf(fp, " ");
-                        }
-                        e = e - nn * m;
-                        m /= 10;
-                    }
-                }
-                nc += fprintf(fp, "E%ld", VpExponent10(a));
-            } else {
-                nc += fprintf(fp, "0.0");
-            }
-        } else {
-            ++nc;
-            if(*(cntl_chr + j) == '\\') {
-                switch(*(cntl_chr + j + 1)) {
-                case 'n':
-                    fprintf(fp, "\n");
-                    ++j;
-                    break;
-                case 't':
-                    fprintf(fp, "\t");
-                    ++j;
-                 break;
-                case 'b':
-                    fprintf(fp, "\n");
-                    ++j;
-                    break;
-                default:
-                    fprintf(fp, "%c", *(cntl_chr + j));
-                    break;
-                }
-            } else {
-                fprintf(fp, "%c", *(cntl_chr + j));
-                if(*(cntl_chr + j) == '%') ++j;
-            }
-        }
-        j++;
-    }
-    return (int)nc;
-}
-#endif /* _DEBUG */
-
-static void
-VpFormatSt(char *psz,S_INT fFmt)
-{
-    U_LONG ie;
-    U_LONG i;
-    S_INT nf = 0;
-    char ch;
-
-    if(fFmt<=0) return;
-
-    ie = strlen(psz);
-    for(i = 0; i < ie; ++i) {
-        ch = psz[i];
-        if(!ch) break;
-        if(ISSPACE(ch) || ch=='-' || ch=='+') continue;
-        if(ch == '.')                { nf = 0;continue;}
-        if(ch == 'E') break;
-        nf++;
-        if(nf > fFmt) {
-            memmove(psz + i + 1, psz + i, ie - i + 1);
-            ++ie;
-            nf = 0;
-            psz[i] = ' ';
-        }
-    }
-}
-
-VP_EXPORT S_LONG
-VpExponent10(Real *a)
-{
-    S_LONG ex;
-    U_LONG n;
-
-    if(!VpHasVal(a)) return 0;
-
-    ex =(a->exponent) * BASE_FIG;
-    n = BASE1;
-    while((a->frac[0] / n) == 0) {
-         --ex;
-         n /= 10;
-    }
-    return ex;
-}
-
-VP_EXPORT void
-VpSzMantissa(Real *a,char *psz)
-{
-    U_LONG i, ZeroSup;
-    U_LONG n, m, e, nn;
-
-    if(VpIsNaN(a)) {
-        sprintf(psz,SZ_NaN);
-        return;
-    }
-    if(VpIsPosInf(a)) {
-        sprintf(psz,SZ_INF);
-        return;
-    }
-    if(VpIsNegInf(a)) {
-        sprintf(psz,SZ_NINF);
-        return;
-    }
-
-    ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
-    if(!VpIsZero(a)) {
-        if(VpGetSign(a) < 0) *psz++ = '-';
-        n = a->Prec;
-        for(i=0;i < n;++i) {
-            m = BASE1;
-            e = a->frac[i];
-            while(m) {
-                nn = e / m;
-                if((!ZeroSup) || nn) {
-                    sprintf(psz, "%lu", nn);    /* The reading zero(s) */
-                    psz += strlen(psz);
-                    /* as 0.00xx will be ignored. */
-                    ZeroSup = 0;    /* Set to print succeeding zeros */
-                }
-                e = e - nn * m;
-                m /= 10;
-            }
-        }
-        *psz = 0;
-        while(psz[-1]=='0') *(--psz) = 0;
-    } else {
-        if(VpIsPosZero(a)) sprintf(psz, "0");
-        else      sprintf(psz, "-0");
-    }
-}
-
-VP_EXPORT int
-VpToSpecialString(Real *a,char *psz,int fPlus)
-/* fPlus =0:default, =1: set ' ' before digits , =2: set '+' before digits. */
-{
-    if(VpIsNaN(a)) {
-        sprintf(psz,SZ_NaN);
-        return 1;
-    }
-
-    if(VpIsPosInf(a)) {
-        if(fPlus==1) {
-           *psz++ = ' ';
-        } else if(fPlus==2) {
-           *psz++ = '+';
-        }
-        sprintf(psz,SZ_INF);
-        return 1;
-    }
-    if(VpIsNegInf(a)) {
-        sprintf(psz,SZ_NINF);
-        return 1;
-    }
-    if(VpIsZero(a)) {
-        if(VpIsPosZero(a)) {
-            if(fPlus==1)      sprintf(psz, " 0.0");
-            else if(fPlus==2) sprintf(psz, "+0.0");
-            else              sprintf(psz, "0.0");
-        } else    sprintf(psz, "-0.0");
-        return 1;
-    }
-    return 0;
-}
-
-VP_EXPORT void
-VpToString(Real *a,char *psz,int fFmt,int fPlus)
-/* fPlus =0:default, =1: set ' ' before digits , =2:set '+' before digits. */
-{
-    U_LONG i, ZeroSup;
-    U_LONG n, m, e, nn;
-    char *pszSav = psz;
-    S_LONG ex;
-
-    if(VpToSpecialString(a,psz,fPlus)) return;
-
-    ZeroSup = 1;    /* Flag not to print the leading zeros as 0.00xxxxEnn */
-
-    if(VpGetSign(a) < 0) *psz++ = '-';
-    else if(fPlus==1)    *psz++ = ' ';
-    else if(fPlus==2)    *psz++ = '+';
-
-    *psz++ = '0';
-    *psz++ = '.';
-    n = a->Prec;
-    for(i=0;i < n;++i) {
-        m = BASE1;
-        e = a->frac[i];
-        while(m) {
-            nn = e / m;
-            if((!ZeroSup) || nn) {
-                sprintf(psz, "%lu", nn);    /* The reading zero(s) */
-                psz += strlen(psz);
-                /* as 0.00xx will be ignored. */
-                ZeroSup = 0;    /* Set to print succeeding zeros */
-            }
-            e = e - nn * m;
-            m /= 10;
-        }
-    }
-    ex =(a->exponent) * BASE_FIG;
-    n = BASE1;
-    while((a->frac[0] / n) == 0) {
-        --ex;
-        n /= 10;
-    }
-    while(psz[-1]=='0') *(--psz) = 0;
-    sprintf(psz, "E%ld", ex);
-    if(fFmt) VpFormatSt(pszSav, fFmt);
-}
-
-VP_EXPORT void
-VpToFString(Real *a,char *psz,int fFmt,int fPlus)
-/* fPlus =0:default,=1: set ' ' before digits ,set '+' before digits. */
-{
-    U_LONG i;
-    U_LONG n, m, e, nn;
-    char *pszSav = psz;
-    S_LONG ex;
-
-    if(VpToSpecialString(a,psz,fPlus)) return;
-
-    if(VpGetSign(a) < 0) *psz++ = '-';
-    else if(fPlus==1)    *psz++ = ' ';
-    else if(fPlus==2)    *psz++ = '+';
-
-    n  = a->Prec;
-    ex = a->exponent;
-    if(ex<=0) {
-       *psz++ = '0';*psz++ = '.';
-       while(ex<0) {
-          for(i=0;i<BASE_FIG;++i) *psz++ = '0';
-          ++ex;
-       }
-       ex = -1;
-    }
-
-    for(i=0;i < n;++i) {
-       --ex;
-       if(i==0 && ex >= 0) {
-           sprintf(psz, "%lu", a->frac[i]);
-           psz += strlen(psz);
-       } else {
-           m = BASE1;
-           e = a->frac[i];
-           while(m) {
-               nn = e / m;
-               *psz++ = (char)(nn + '0');
-               e = e - nn * m;
-               m /= 10;
-           }
-       }
-       if(ex == 0) *psz++ = '.';
-    }
-    while(--ex>=0) {
-       m = BASE;
-       while(m/=10) *psz++ = '0';
-       if(ex == 0) *psz++ = '.';
-    }
-    *psz = 0;
-    while(psz[-1]=='0') *(--psz) = 0;
-    if(psz[-1]=='.') sprintf(psz, "0");
-    if(fFmt) VpFormatSt(pszSav, fFmt);
-}
-
-/*
- *  [Output]
- *   a[]  ... variable to be assigned the value.
- *  [Input]
- *   int_chr[]  ... integer part(may include '+/-').
- *   ni   ... number of characters in int_chr[],not including '+/-'.
- *   frac[]  ... fraction part.
- *   nf   ... number of characters in frac[].
- *   exp_chr[]  ... exponent part(including '+/-').
- *   ne   ... number of characters in exp_chr[],not including '+/-'.
- */
-VP_EXPORT int
-VpCtoV(Real *a, char *int_chr, U_LONG ni, char *frac, U_LONG nf, char *exp_chr, U_LONG ne)
-{
-    U_LONG i, j, ind_a, ma, mi, me;
-    U_LONG loc;
-    S_INT  e,es, eb, ef;
-    S_INT  sign, signe;
-    /* get exponent part */
-    e = 0;
-    ma = a->MaxPrec;
-    mi = ni;
-    me = ne;
-    signe = 1;
-    memset(a->frac, 0, ma * sizeof(U_LONG));
-    if(ne > 0) {
-        i = 0;
-        if(exp_chr[0] == '-') {
-            signe = -1;
-            ++i;
-            ++me;
-        } else if(exp_chr[0] == '+') {
-            ++i;
-            ++me;
-        }
-        while(i < me) {
-            es = e*((S_INT)BASE_FIG);
-            e = e * 10 + exp_chr[i] - '0';
-            if(es>e*((S_INT)BASE_FIG)) {
-                return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
-            }
-            ++i;
-        }
-    }
-
-    /* get integer part */
-    i = 0;
-    sign = 1;
-    if(ni > 0) {
-        if(int_chr[0] == '-') {
-            sign = -1;
-            ++i;
-            ++mi;
-        } else if(int_chr[0] == '+') {
-            ++i;
-            ++mi;
-        }
-    }
-
-    e = signe * e;        /* e: The value of exponent part. */
-    e = e + ni;        /* set actual exponent size. */
-
-    if(e > 0)    signe = 1;
-    else        signe = -1;
-
-    /* Adjust the exponent so that it is the multiple of BASE_FIG. */
-    j = 0;
-    ef = 1;
-    while(ef) {
-        if(e>=0) eb =  e;
-        else  eb = -e;
-        ef = eb / ((S_INT)BASE_FIG);
-        ef = eb - ef * ((S_INT)BASE_FIG);
-        if(ef) {
-            ++j;        /* Means to add one more preceeding zero */
-            ++e;
-        }
-    }
-
-    eb = e / ((S_INT)BASE_FIG);
-
-    ind_a = 0;
-    while(i < mi) {
-        a->frac[ind_a] = 0;
-        while((j < (U_LONG)BASE_FIG) &&(i < mi)) {
-            a->frac[ind_a] = a->frac[ind_a] * 10 + int_chr[i] - '0';
-            ++j;
-            ++i;
-        }
-        if(i < mi) {
-            ++ind_a;
-            if(ind_a >= ma) goto over_flow;
-            j = 0;
-        }
-    }
-    loc = 1;
-
-    /* get fraction part */
-
-    i = 0;
-    while(i < nf) {
-        while((j < (U_LONG)BASE_FIG) &&(i < nf)) {
-            a->frac[ind_a] = a->frac[ind_a] * 10 + frac[i] - '0';
-            ++j;
-            ++i;
-        }
-        if(i < nf) {
-            ++ind_a;
-            if(ind_a >= ma) goto over_flow;
-            j = 0;
-        }
-    }
-    goto Final;
-
-over_flow:
-    rb_warn("Conversion from String to BigDecimal overflow (last few digits discarded).");
-
-Final:
-    if(ind_a >= ma) ind_a = ma - 1;
-    while(j < (U_LONG)BASE_FIG) {
-        a->frac[ind_a] = a->frac[ind_a] * 10;
-        ++j;
-    }
-    a->Prec = ind_a + 1;
-    a->exponent = eb;
-    VpSetSign(a,sign);
-    VpNmlz(a);
-    return 1;
-}
-
-/*
- * [Input]
- *   *m  ... Real
- * [Output]
- *   *d  ... fraction part of m(d = 0.xxxxxxx). where # of 'x's is fig.
- *   *e  ... U_LONG,exponent of m.
- * DBLE_FIG ... Number of digits in a double variable.
- *
- *  m -> d*10**e, 0<d<BASE
- * [Returns]
- *   0 ... Zero
- *   1 ... Normal
- *   2 ... Infinity
- *  -1 ... NaN
- */
-VP_EXPORT int
-VpVtoD(double *d, S_LONG *e, Real *m)
-{
-    U_LONG ind_m, mm, fig;
-    double div;
-    int    f = 1;
-
-    if(VpIsNaN(m)) {
-        *d = VpGetDoubleNaN();
-        *e = 0;
-        f = -1; /* NaN */
-        goto Exit;
-    } else
-    if(VpIsPosZero(m)) {
-        *d = 0.0;
-        *e = 0;
-        f  = 0;
-        goto Exit;
-    } else
-    if(VpIsNegZero(m)) {
-        *d = VpGetDoubleNegZero();
-        *e = 0;
-        f  = 0;
-        goto Exit;
-    } else
-    if(VpIsPosInf(m)) {
-        *d = VpGetDoublePosInf();
-        *e = 0;
-        f  = 2;
-        goto Exit;
-    } else
-    if(VpIsNegInf(m)) {
-        *d = VpGetDoubleNegInf();
-        *e = 0;
-        f  = 2;
-        goto Exit;
-    }
-    /* Normal number */
-    fig =(DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
-    ind_m = 0;
-    mm = Min(fig,(m->Prec));
-    *d = 0.0;
-    div = 1.;
-    while(ind_m < mm) {
-        div /=(double)((S_INT)BASE);
-        *d = *d +((double) ((S_INT)m->frac[ind_m++])) * div;
-    }
-    *e = m->exponent * ((S_INT)BASE_FIG);
-    *d *= VpGetSign(m);
-
-Exit:
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, " VpVtoD: m=%\n", m);
-        printf("   d=%e * 10 **%ld\n", *d, *e);
-        printf("   DBLE_FIG = %ld\n", DBLE_FIG);
-    }
-#endif /*_DEBUG */
-    return f;
-}
-
-/*
- * m <- d
- */
-VP_EXPORT void
-VpDtoV(Real *m, double d)
-{
-    U_LONG i, ind_m, mm;
-    U_LONG ne;
-    double  val, val2;
-
-    if(isnan(d)) {
-        VpSetNaN(m);
-        goto Exit;
-    }
-    if(isinf(d)) {
-        if(d>0.0) VpSetPosInf(m);
-        else   VpSetNegInf(m);
-        goto Exit;
-    }
-
-    if(d == 0.0) {
-        VpSetZero(m,1);
-        goto Exit;
-    }
-    val =(d > 0.) ? d :(-d);
-    ne = 0;
-    if(val >= 1.0) {
-        while(val >= 1.0) {
-            val /=(double)((S_INT)BASE);
-            ++ne;
-        }
-    } else {
-        val2 = 1.0 /(double)((S_INT)BASE);
-        while(val < val2) {
-            val *=(double)((S_INT)BASE);
-            --ne;
-        }
-    }
-    /* Now val = 0.xxxxx*BASE**ne */
-
-    mm = m->MaxPrec;
-    memset(m->frac, 0, mm * sizeof(U_LONG));
-    for(ind_m = 0;val > 0.0 && ind_m < mm;ind_m++) {
-        val *=(double)((S_INT)BASE);
-        i =(U_LONG) val;
-        val -=(double)((S_INT)i);
-        m->frac[ind_m] = i;
-    }
-    if(ind_m >= mm) ind_m = mm - 1;
-    if(d > 0.0) {
-        VpSetSign(m, (S_INT)1);
-    } else {
-        VpSetSign(m,-(S_INT)1);
-    }
-    m->Prec = ind_m + 1;
-    m->exponent = ne;
-
-    VpInternalRound(m,0,(m->Prec>0)?m->frac[m->Prec-1]:0,
-                      (U_LONG)(val*((double)((S_INT)BASE))));
-
-Exit:
-#ifdef _DEBUG
-    if(gfDebug) {
-        printf("VpDtoV d=%30.30e\n", d);
-        VPrint(stdout, "  m=%\n", m);
-    }
-#endif /* _DEBUG */
-    return;
-}
-
-/*
- *  m <- ival
- */
-VP_EXPORT void
-VpItoV(Real *m, S_INT ival)
-{
-    U_LONG mm, ind_m;
-    U_LONG val, v1, v2, v;
-    int isign;
-    S_INT ne;
-
-    if(ival == 0) {
-        VpSetZero(m,1);
-        goto Exit;
-    }
-    isign = 1;
-    val = ival;
-    if(ival < 0) {
-        isign = -1;
-        val =(U_LONG)(-ival);
-    }
-    ne = 0;
-    ind_m = 0;
-    mm = m->MaxPrec;
-    while(ind_m < mm) {
-        m->frac[ind_m] = 0;
-        ++ind_m;
-    }
-    ind_m = 0;
-    while(val > 0) {
-        if(val) {
-         v1 = val;
-         v2 = 1;
-            while(v1 >= BASE) {
-                v1 /= BASE;
-                v2 *= BASE;
-            }
-            val = val - v2 * v1;
-            v = v1;
-        } else {
-            v = 0;
-        }
-        m->frac[ind_m] = v;
-        ++ind_m;
-        ++ne;
-    }
-    m->Prec = ind_m - 1;
-    m->exponent = ne;
-    VpSetSign(m,isign);
-    VpNmlz(m);
-
-Exit:
-#ifdef _DEBUG
-    if(gfDebug) {
-        printf(" VpItoV i=%d\n", ival);
-        VPrint(stdout, "  m=%\n", m);
-    }
-#endif /* _DEBUG */
-    return;
-}
-
-/*
- * y = SQRT(x),  y*y - x =>0
- */
-VP_EXPORT int
-VpSqrt(Real *y, Real *x)
-{
-    Real *f = NULL;
-    Real *r = NULL;
-    S_LONG y_prec, f_prec;
-    S_LONG n;
-    S_LONG e;
-    S_LONG prec;
-    S_LONG nr;
-    double val;
-
-    /* Zero, NaN or Infinity ? */
-    if(!VpHasVal(x)) {
-        if(VpIsZero(x)||VpGetSign(x)>0) {
-            VpAsgn(y,x,1);
-            goto Exit;
-        }
-        VpSetNaN(y);
-        return VpException(VP_EXCEPTION_OP,"(VpSqrt) SQRT(NaN or negative value)",0);
-        goto Exit;
-    }
-
-     /* Negative ? */
-    if(VpGetSign(x) < 0) {
-        VpSetNaN(y);
-        return VpException(VP_EXCEPTION_OP,"(VpSqrt) SQRT(negative value)",0);
-    }
-
-    /* One ? */
-    if(VpIsOne(x)) {
-        VpSetOne(y);
-        goto Exit;
-    }
-
-    n = (S_LONG)y->MaxPrec;
-    if((S_LONG)x->MaxPrec > n) n = (S_LONG)x->MaxPrec;
-    /* allocate temporally variables  */
-    f = VpAlloc(y->MaxPrec *(BASE_FIG + 2), "#1");
-    r = VpAlloc((n + n) *(BASE_FIG + 2), "#1");
-
-    nr = 0;
-    y_prec = (S_LONG)y->MaxPrec;
-    f_prec = (S_LONG)f->MaxPrec;
-
-    prec = x->exponent;
-    if(prec > 0)    ++prec;
-    else            --prec;
-    prec = prec - (S_LONG)y->MaxPrec;
-    VpVtoD(&val, &e, x);    /* val <- x  */
-    e /= ((S_LONG)BASE_FIG);
-    n = e / 2;
-    if(e - n * 2 != 0) {
-        val /=(double)((S_INT)BASE);
-        n =(e + 1) / 2;
-    }
-    VpDtoV(y, sqrt(val));    /* y <- sqrt(val) */
-    y->exponent += n;
-    n = (DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
-    y->MaxPrec = (U_LONG)Min(n , y_prec);
-    f->MaxPrec = y->MaxPrec + 1;
-    n = y_prec*((S_LONG)BASE_FIG);
-    if((U_LONG)n<maxnr) n = (U_LONG)maxnr;
-    do {
-        y->MaxPrec *= 2;
-        if(y->MaxPrec > (U_LONG)y_prec) y->MaxPrec = (U_LONG)y_prec;
-        f->MaxPrec = y->MaxPrec;
-        VpDivd(f, r, x, y);     /* f = x/y    */
-        VpAddSub(r, f, y, -1);  /* r = f - y  */
-        VpMult(f, VpPt5, r);    /* f = 0.5*r  */
-        if(VpIsZero(f))         goto converge;
-        VpAddSub(r, f, y, 1);   /* r = y + f  */
-        VpAsgn(y, r, 1);        /* y = r      */
-        if(f->exponent <= prec) goto converge;
-    } while(++nr < n);
-    /* */
-#ifdef _DEBUG
-    if(gfDebug) {
-        printf("ERROR(VpSqrt): did not converge within %ld iterations.\n",
-            nr);
-    }
-#endif /* _DEBUG */
-    y->MaxPrec = y_prec;
-
-converge:
-    VpChangeSign(y,(S_INT)1);
-#ifdef _DEBUG
-    if(gfDebug) {
-        VpMult(r, y, y);
-        VpAddSub(f, x, r, -1);
-        printf("VpSqrt: iterations = %lu\n", nr);
-        VPrint(stdout, "  y =% \n", y);
-        VPrint(stdout, "  x =% \n", x);
-        VPrint(stdout, "  x-y*y = % \n", f);
-    }
-#endif /* _DEBUG */
-    y->MaxPrec = y_prec;
-
-Exit:
-    VpFree(f);
-    VpFree(r);
-    return 1;
-}
-
-/*
- *
- * f = 0: Round off/Truncate, 1: round up, 2:ceil, 3: floor, 4: Banker's rounding
- * nf: digit position for operation.
- *
- */
-VP_EXPORT int
-VpMidRound(Real *y, int f, int nf)
-/*
- * Round reletively from the decimal point.
- *    f: rounding mode
- *   nf: digit location to round from the the decimal point.
- */
-{
-    int n,i,ix,ioffset;
-    U_LONG v;
-    U_LONG div;
-
-    nf += y->exponent*((int)BASE_FIG);
-    /* ix: x->fraq[ix] contains round position */
-    ix = nf/(int)BASE_FIG;
-    if(ix<0 || ((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
-    ioffset = nf - ix*((int)BASE_FIG);
-
-    memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(U_LONG));
-    v = y->frac[ix];
-    /* drop digits after pointed digit */
-    n = BASE_FIG - ioffset - 1;
-    for(i=0;i<n;++i) v /= 10;
-    div = v/10;
-    v = v - div*10;
-    switch(f) {
-    case VP_ROUND_DOWN: /* Truncate */
-         break;
-    case VP_ROUND_UP:   /* Roundup */
-        if(v) ++div;
-         break;
-    case VP_ROUND_HALF_UP:   /* Round half up  */
-        if(v>=5) ++div;
-        break;
-    case VP_ROUND_HALF_DOWN: /* Round half down  */
-        if(v>=6) ++div;
-        break;
-    case VP_ROUND_CEIL: /* ceil */
-        if(v && (VpGetSign(y)>0)) ++div;
-        break;
-    case VP_ROUND_FLOOR: /* floor */
-        if(v && (VpGetSign(y)<0)) ++div;
-        break;
-    case VP_ROUND_HALF_EVEN: /* Banker's rounding */
-        if(v>5) ++div;
-        else if(v==5) {
-            if((U_LONG)i==(BASE_FIG-1)) {
-                if(ix && (y->frac[ix-1]%2)) ++div;
-            } else {
-                if(div%2) ++div;
-            }
-        }
-        break;
-    }
-    for(i=0;i<=n;++i) div *= 10;
-    if(div>=BASE) {
-        y->frac[ix] = 0;
-        if(ix) {
-            VpNmlz(y);
-            VpRdup(y,0);
-        } else {
-            S_INT s = VpGetSign(y);
-            VpSetOne(y);
-            VpSetSign(y,s);
-        }
-    } else {
-        y->frac[ix] = div;
-        VpNmlz(y);
-    }
-    return 1;
-}
-
-VP_EXPORT int
-VpLeftRound(Real *y, int f, int nf)
-/*
- * Round from the left hand side of the digits.
- */
-{
-    U_LONG v;
-    if(!VpHasVal(y)) return 0; /* Unable to round */
-    v = y->frac[0];
-    nf -= VpExponent(y)*BASE_FIG;
-    while(v=v/10) nf--;
-    nf += (BASE_FIG-1);
-    return VpMidRound(y,f,nf);
-}
-
-VP_EXPORT int 
-VpActiveRound(Real *y, Real *x, int f, int nf)
-{
-    /* First,assign whole value in truncation mode */
-    if(VpAsgn(y, x, 10)<=1) return 0; /* Zero,NaN,or Infinity */
-    return VpMidRound(y,f,nf);
-}
-
-static int
-VpLimitRound(Real *c,U_LONG ixDigit)
-{
-    U_LONG ix = VpGetPrecLimit();
-    if(!VpNmlz(c))    return -1;
-    if(!ix)           return 0;
-    if(!ixDigit) ixDigit = c->Prec-1;
-    if((ix+BASE_FIG-1)/BASE_FIG > ixDigit+1) return 0;
-    return VpLeftRound(c,VpGetRoundMode(),ix);
-}
-
-static void 
-VpInternalRound(Real *c,int ixDigit,U_LONG vPrev,U_LONG v)
-{
-    int f = 0;
-
-    if(VpLimitRound(c,ixDigit)) return;
-    if(!v)                      return;
-
-    v /= BASE1;
-    switch(gfRoundMode) {
-    case VP_ROUND_DOWN:
-        break;
-    case VP_ROUND_UP:
-        if(v)                    f = 1;
-        break;
-    case VP_ROUND_HALF_UP:
-        if(v >= 5)               f = 1;
-        break;
-    case VP_ROUND_HALF_DOWN:
-        if(v >= 6)               f = 1;
-        break;
-    case VP_ROUND_CEIL:  /* ceil */
-        if(v && (VpGetSign(c)>0)) f = 1;
-        break;
-    case VP_ROUND_FLOOR: /* floor */
-        if(v && (VpGetSign(c)<0)) f = 1;
-        break;
-    case VP_ROUND_HALF_EVEN:  /* Banker's rounding */
-        if(v>5) f = 1;
-        else if(v==5 && vPrev%2)  f = 1;
-        break;
-    }
-    if(f) {
-        VpRdup(c,ixDigit);    /* round up */
-        VpNmlz(c);
-    }
-}
-
-/*
- *  Rounds up m(plus one to final digit of m).
- */
-static int
-VpRdup(Real *m,U_LONG ind_m)
-{
-    U_LONG carry;
-
-    if(!ind_m) ind_m = m->Prec;
-
-    carry = 1;
-    while(carry > 0 && (ind_m--)) {
-        m->frac[ind_m] += carry;
-        if(m->frac[ind_m] >= BASE) m->frac[ind_m] -= BASE;
-        else                       carry = 0;
-    }
-    if(carry > 0) {        /* Overflow,count exponent and set fraction part be 1  */
-        if(!AddExponent(m,(S_LONG)1)) return 0;
-        m->Prec = m->frac[0] = 1;
-    } else {
-        VpNmlz(m);
-    }
-    return 1;
-}
-
-/*
- *  y = x - fix(x)
- */
-VP_EXPORT void
-VpFrac(Real *y, Real *x)
-{
-    U_LONG my, ind_y, ind_x;
-
-    if(!VpHasVal(x)) {
-        VpAsgn(y,x,1);
-        goto Exit;
-    }
-
-    if(x->exponent > 0 && (U_LONG)x->exponent >= x->Prec) {
-        VpSetZero(y,VpGetSign(x));
-        goto Exit;
-    } else if(x->exponent <= 0) {
-        VpAsgn(y, x, 1);
-        goto Exit;
-    }
-
-    y->Prec = x->Prec -(U_LONG) x->exponent;
-    y->Prec = Min(y->Prec, y->MaxPrec);
-    y->exponent = 0;
-    VpSetSign(y,VpGetSign(x));
-    ind_y = 0;
-    my = y->Prec;
-    ind_x = x->exponent;
-    while(ind_y < my) {
-        y->frac[ind_y] = x->frac[ind_x];
-        ++ind_y;
-        ++ind_x;
-    }
-    VpNmlz(y);
-
-Exit:
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpFrac y=%\n", y);
-        VPrint(stdout, "    x=%\n", x);
-    }
-#endif /* _DEBUG */
-    return;
-}
-
-/*
- *   y = x ** n
- */
-VP_EXPORT int
-VpPower(Real *y, Real *x, S_INT n)
-{
-    U_LONG s, ss;
-    S_LONG sign;
-    Real *w1 = NULL;
-    Real *w2 = NULL;
-
-    if(VpIsZero(x)) {
-        if(n==0) {
-           VpSetOne(y);
-           goto Exit;
-        }
-        sign = VpGetSign(x);
-        if(n<0) {
-           n = -n;
-           if(sign<0) sign = (n%2)?(-1):(1);
-           VpSetInf (y,sign);
-        } else {
-           if(sign<0) sign = (n%2)?(-1):(1);
-           VpSetZero(y,sign);
-        }
-        goto Exit;
-    }
-    if(!VpIsDef(x)) {
-        VpSetNaN(y); /* Not sure !!! */
-        goto Exit;
-    }
-
-    if((x->exponent == 1) &&(x->Prec == 1) &&(x->frac[0] == 1)) {
-        /* abs(x) = 1 */
-        VpSetOne(y);
-        if(VpGetSign(x) > 0) goto Exit;
-        if((n % 2) == 0) goto Exit;
-        VpSetSign(y,-(S_INT)1);
-        goto Exit;
-    }
-
-    if(n > 0) sign = 1;
-    else if(n < 0) {
-        sign = -1;
-        n = -n;
-    } else {
-        VpSetOne(y);
-        goto Exit;
-    }
-
-    /* Allocate working variables  */
-
-    w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0");
-    w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0");
-    /* calculation start */
-
-    VpAsgn(y, x, 1);
-    --n;
-    while(n > 0) {
-        VpAsgn(w1, x, 1);
-        s = 1;
-loop1:  ss = s;
-        s += s;
-        if(s >(U_LONG) n) goto out_loop1;
-        VpMult(w2, w1, w1);
-        VpAsgn(w1, w2, 1);
-        goto loop1;
-out_loop1:
-        n -= ss;
-        VpMult(w2, y, w1);
-        VpAsgn(y, w2, 1);
-    }
-    if(sign < 0) {
-        VpDivd(w1, w2, VpConstOne, y);
-        VpAsgn(y, w1, 1);
-    }
-
-Exit:
-#ifdef _DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpPower y=%\n", y);
-        VPrint(stdout, "VpPower x=%\n", x);
-        printf("  n=%d\n", n);
-    }
-#endif /* _DEBUG */
-    VpFree(w2);
-    VpFree(w1);
-    return 1;
-}
-
-#ifdef _DEBUG
-int
-VpVarCheck(Real * v)
-/*
- * Checks the validity of the Real variable v.
- * [Input]
- *   v ... Real *, variable to be checked.
- * [Returns]
- *   0  ... correct v.
- *   other ... error
- */
-{
-    U_LONG i;
-
-    if(v->MaxPrec <= 0) {
-        printf("ERROR(VpVarCheck): Illegal Max. Precision(=%lu)\n",
-            v->MaxPrec);
-        return 1;
-    }
-    if((v->Prec <= 0) ||((v->Prec) >(v->MaxPrec))) {
-        printf("ERROR(VpVarCheck): Illegal Precision(=%lu)\n", v->Prec);
-        printf("       Max. Prec.=%lu\n", v->MaxPrec);
-        return 2;
-    }
-    for(i = 0; i < v->Prec; ++i) {
-        if((v->frac[i] >= BASE)) {
-            printf("ERROR(VpVarCheck): Illegal fraction\n");
-            printf("       Frac[%ld]=%lu\n", i, v->frac[i]);
-            printf("       Prec.   =%lu\n", v->Prec);
-            printf("       Exp. =%d\n", v->exponent);
-            printf("       BASE =%lu\n", BASE);
-            return 3;
-        }
-    }
-    return 0;
-}
-#endif /* _DEBUG */
diff --git a/ext/bigdecimal/bigdecimal.def b/ext/bigdecimal/bigdecimal.def
deleted file mode 100644
index 8450e164e6..0000000000
--- a/ext/bigdecimal/bigdecimal.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORTS
-Init_bigdecimal
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
deleted file mode 100644
index aabc551a76..0000000000
--- a/ext/bigdecimal/bigdecimal.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- *
- * Ruby BigDecimal(Variable decimal precision) extension library. 
- *
- * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp) 
- *
- * You may distribute under the terms of either the GNU General Public 
- * License or the Artistic License, as specified in the README file 
- * of this BigDecimal distribution. 
- *
- * NOTES:
- *   2003-03-28 V1.0 checked in.
- *
- */
-
-#ifndef  ____BIG_DECIMAL__H____
-#define  ____BIG_DECIMAL__H____
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- *  NaN & Infinity
- */
-#define SZ_NaN  "NaN"
-#define SZ_INF  "Infinity"
-#define SZ_PINF "+Infinity"
-#define SZ_NINF "-Infinity"
-
-/*
- *   #define VP_EXPORT other than static to let VP_ routines 
- *   be called from outside of this module.
- */
-#define VP_EXPORT static 
-
-#define U_LONG unsigned long
-#define S_LONG long
-#define U_INT  unsigned int
-#define S_INT  int
-
-/* Exception codes */
-#define VP_EXCEPTION_ALL        ((unsigned short)0x00FF)
-#define VP_EXCEPTION_INFINITY   ((unsigned short)0x0001)
-#define VP_EXCEPTION_NaN        ((unsigned short)0x0002)
-#define VP_EXCEPTION_UNDERFLOW  ((unsigned short)0x0004)
-#define VP_EXCEPTION_OVERFLOW   ((unsigned short)0x0001) /* 0x0008) */
-#define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0001) /* 0x0010) */
-
-/* Following 2 exceptions cann't controlled by user */
-#define VP_EXCEPTION_OP         ((unsigned short)0x0020)
-#define VP_EXCEPTION_MEMORY     ((unsigned short)0x0040)
-
-/* Computation mode */
-#define VP_ROUND_MODE            ((unsigned short)0x0100)
-#define VP_ROUND_UP         1
-#define VP_ROUND_DOWN       2
-#define VP_ROUND_HALF_UP    3
-#define VP_ROUND_HALF_DOWN  4
-#define VP_ROUND_CEIL       5
-#define VP_ROUND_FLOOR      6
-#define VP_ROUND_HALF_EVEN  7
-
-#define VP_SIGN_NaN                0 /* NaN                      */
-#define VP_SIGN_POSITIVE_ZERO      1 /* Positive zero            */
-#define VP_SIGN_NEGATIVE_ZERO     -1 /* Negative zero            */
-#define VP_SIGN_POSITIVE_FINITE    2 /* Positive finite number   */
-#define VP_SIGN_NEGATIVE_FINITE   -2 /* Negative finite number   */
-#define VP_SIGN_POSITIVE_INFINITE  3 /* Positive infinite number */
-#define VP_SIGN_NEGATIVE_INFINITE -3 /* Negative infinite number */
-
-/*
- * VP representation
- *  r = 0.xxxxxxxxx *BASE**exponent
- */
-typedef struct {
-    VALUE  obj;     /* Back pointer(VALUE) for Ruby object.     */
-    U_LONG MaxPrec; /* Maximum precision size                   */
-                    /* This is the actual size of pfrac[]       */
-                    /*(frac[0] to frac[MaxPrec] are available). */
-    U_LONG Prec;    /* Current precision size.                  */
-                    /* This indicates how much the.             */
-                    /* the array frac[] is actually used.       */
-    S_INT  exponent;/* Exponent part.                           */
-    short  sign;    /* Attributes of the value.                 */
-                    /*
-                     *        ==0 : NaN
-                     *          1 : Positive zero
-                     *         -1 : Negative zero
-                     *          2 : Positive number
-                     *         -2 : Negative number
-                     *          3 : Positive infinite number
-                     *         -3 : Negative infinite number
-                     */
-    short  flag;    /* Not used in vp_routines,space for user.  */
-    U_LONG frac[1]; /* Pointer to array of fraction part.       */
-} Real;
-
-/*  
- *  ------------------
- *   EXPORTables.
- *  ------------------
- */
-
-VP_EXPORT  Real *
-VpNewRbClass(U_LONG mx,char *str,VALUE klass);
-
-VP_EXPORT  Real *VpCreateRbObject(U_LONG mx,char *str);
-
-VP_EXPORT U_LONG VpBaseFig(void);
-VP_EXPORT U_LONG VpDblFig(void);
-VP_EXPORT U_LONG VpBaseVal(void);
-
-/* Zero,Inf,NaN (isinf(),isnan() used to check) */
-VP_EXPORT double VpGetDoubleNaN(void);
-VP_EXPORT double VpGetDoublePosInf(void);
-VP_EXPORT double VpGetDoubleNegInf(void);
-VP_EXPORT double VpGetDoubleNegZero(void);
-
-/* These 2 functions added at v1.1.7 */
-VP_EXPORT U_LONG VpGetPrecLimit(void);
-VP_EXPORT U_LONG VpSetPrecLimit(U_LONG n);
-
-/* Round mode */
-VP_EXPORT int           VpIsRoundMode(unsigned long n);
-VP_EXPORT unsigned long VpGetRoundMode(void);
-VP_EXPORT unsigned long VpSetRoundMode(unsigned long n);
-
-VP_EXPORT int VpException(unsigned short f,char *str,int always);
-VP_EXPORT int VpIsNegDoubleZero(double v);
-VP_EXPORT U_LONG VpNumOfChars(Real *vp,char *pszFmt);
-VP_EXPORT U_LONG VpInit(U_LONG BaseVal);
-VP_EXPORT void *VpMemAlloc(U_LONG mb);
-VP_EXPORT void VpFree(Real *pv);
-VP_EXPORT Real *VpAlloc(U_LONG mx, char *szVal);
-VP_EXPORT int VpAsgn(Real *c,Real *a,int isw);
-VP_EXPORT int VpAddSub(Real *c,Real *a,Real *b,int operation);
-VP_EXPORT int VpMult(Real *c,Real *a,Real *b);
-VP_EXPORT int VpDivd(Real *c,Real *r,Real *a,Real *b);
-VP_EXPORT int VpComp(Real *a,Real *b);
-VP_EXPORT S_LONG VpExponent10(Real *a);
-VP_EXPORT void VpSzMantissa(Real *a,char *psz);
-VP_EXPORT int VpToSpecialString(Real *a,char *psz,int fPlus);
-VP_EXPORT void VpToString(Real *a,char *psz,int fFmt,int fPlus);
-VP_EXPORT void VpToFString(Real *a,char *psz,int fFmt,int fPlus);
-VP_EXPORT int VpCtoV(Real *a,char *int_chr,U_LONG ni,char *frac,U_LONG nf,char *exp_chr,U_LONG ne);
-VP_EXPORT int VpVtoD(double *d,S_LONG *e,Real *m);
-VP_EXPORT void VpDtoV(Real *m,double d);
-VP_EXPORT void VpItoV(Real *m,S_INT ival);
-VP_EXPORT int VpSqrt(Real *y,Real *x);
-VP_EXPORT int VpActiveRound(Real *y,Real *x,int f,int il);
-VP_EXPORT int VpMidRound(Real *y, int f, int nf);
-VP_EXPORT int VpLeftRound(Real *y, int f, int nf);
-VP_EXPORT void VpFrac(Real *y,Real *x);
-VP_EXPORT int VpPower(Real *y,Real *x,S_INT n);
-
-/* VP constants */
-VP_EXPORT Real *VpOne();
-
-/*  
- *  ------------------
- *  MACRO definitions.
- *  ------------------
- */
-#define Abs(a)     (((a)>= 0)?(a):(-(a)))
-#define Max(a, b)  (((a)>(b))?(a):(b))
-#define Min(a, b)  (((a)>(b))?(b):(a))
-
-#define VpMaxPrec(a)   ((a)->MaxPrec)
-#define VpPrec(a)      ((a)->Prec)
-#define VpGetFlag(a)   ((a)->flag)
-
-/* Sign */
-
-/* VpGetSign(a) returns 1,-1 if a>0,a<0 respectively */
-#define VpGetSign(a) (((a)->sign>0)?1:(-1))
-/* Change sign of a to a>0,a<0 if s = 1,-1 respectively */
-#define VpChangeSign(a,s) {if((s)>0) (a)->sign=(short)Abs((S_LONG)(a)->sign);else (a)->sign=-(short)Abs((S_LONG)(a)->sign);}
-/* Sets sign of a to a>0,a<0 if s = 1,-1 respectively */
-#define VpSetSign(a,s)    {if((s)>0) (a)->sign=(short)VP_SIGN_POSITIVE_FINITE;else (a)->sign=(short)VP_SIGN_NEGATIVE_FINITE;}
-
-/* 1 */
-#define VpSetOne(a)       {(a)->frac[0]=(a)->exponent=(a)->Prec=1;(a)->sign=VP_SIGN_POSITIVE_FINITE;}
-
-/* ZEROs */
-#define VpIsPosZero(a)  ((a)->sign==VP_SIGN_POSITIVE_ZERO)
-#define VpIsNegZero(a)  ((a)->sign==VP_SIGN_NEGATIVE_ZERO)
-#define VpIsZero(a)     (VpIsPosZero(a) || VpIsNegZero(a))
-#define VpSetPosZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_ZERO)
-#define VpSetNegZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_ZERO)
-#define VpSetZero(a,s)  ( ((s)>0)?VpSetPosZero(a):VpSetNegZero(a) )
-
-/* NaN */
-#define VpIsNaN(a)      ((a)->sign==VP_SIGN_NaN)
-#define VpSetNaN(a)     ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NaN)
-
-/* Infinity */
-#define VpIsPosInf(a)   ((a)->sign==VP_SIGN_POSITIVE_INFINITE)
-#define VpIsNegInf(a)   ((a)->sign==VP_SIGN_NEGATIVE_INFINITE)
-#define VpIsInf(a)      (VpIsPosInf(a) || VpIsNegInf(a))
-#define VpIsDef(a)      ( !(VpIsNaN(a)||VpIsInf(a)) )
-#define VpSetPosInf(a)  ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_INFINITE)
-#define VpSetNegInf(a)  ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_INFINITE)
-#define VpSetInf(a,s)   ( ((s)>0)?VpSetPosInf(a):VpSetNegInf(a) )
-#define VpHasVal(a)     (a->frac[0])
-#define VpIsOne(a)      ((a->Prec==1)&&(a->frac[0]==1)&&(a->exponent==1))
-#define VpExponent(a)   (a->exponent)
-#ifdef _DEBUG
-int VpVarCheck(Real * v);
-VP_EXPORT int VPrint(FILE *fp,char *cntl_chr,Real *a);
-#endif /* _DEBUG */
-
-#if defined(__cplusplus)
-}  /* extern "C" { */
-#endif
-#endif /* ____BIG_DECIMAL__H____ */
diff --git a/ext/bigdecimal/bigdecimal_en.html b/ext/bigdecimal/bigdecimal_en.html
deleted file mode 100644
index 02c88df43e..0000000000
--- a/ext/bigdecimal/bigdecimal_en.html
+++ /dev/null
@@ -1,797 +0,0 @@
-<!-- saved from url=(0022)http://internet.e-mail -->
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html">
-<style type="text/css"><!--
-body {  color: #3f0f0f;  background: #fefeff;  margin-left: 2em; margin-right: 2em;}
-h1 {  color: #ffffff;  background-color: #3939AD;  border-color: #FF00FF;  width: 100%;  border-style: solid;
-  border-top-width: 0.1em;  border-bottom-width: 0.1em;  border-right: none;  border-left: none;
-  padding: 0.1em;  font-weight: bold;  font-size: 160%;  text-align: center;}
-h2 {  color: #00007f;  background-color: #e7e7ff;  border-color: #000094;  width: 100%;  border-style: solid;  border-le  ft: none;  border-right: none;  border-top-width: 0.1em;  border-bottom-width: 0.1em;  padding: 0.1em;
-  font-weight: bold;  font-size: 110%;
-}
-h3 {  color: #00007f;  padding: 0.2em;  font-size: 110%;}
-h4, h5 {  color: #000000;  padding: 0.2em;  font-size: 100%;}
-table {  margin-top: 0.2em; margin-bottom: 0.2em;  margin-left: 2em; margin-right: 2em;}
-caption {  color: #7f0000;  font-weight: bold;}
-th {  background: #e7e7ff;  padding-left: 0.2em; padding-right: 0.2em;}
-td {  background: #f3f7ff;  padding-left: 0.2em; padding-right: 0.2em;}
-code {  color: #0000df;}
-dt {  margin-top: 0.2em;}
-li {  margin-top: 0.2em;}
-pre
-{    BACKGROUND-COLOR: #d0d0d0;    BORDER-BOTTOM: medium none;    BORDER-LEFT: medium none;
-    BORDER-RIGHT: medium none;    BORDER-TOP: medium none;    LINE-HEIGHT: 100%;    MARGIN: 12px 12px 12px 12px;
-    PADDING-BOTTOM: 12px;    PADDING-LEFT: 12px;    PADDING-RIGHT: 12px;    PADDING-TOP: 12px;
-    WHITE-SPACE: pre;    WIDTH: 100%
-}
---></style>
-
-<TITLE>BigDecimal:An extension library for Ruby</TITLE>
-</HEAD>
-<BODY BGCOLOR=#FFFFE0>
-<H1>BigDecimal(Variable Precision Floating Library for Ruby)</H1>
-<DIV align="right"><A HREF="./bigdecimal_ja.html">Japanese</A></DIV><BR>
-BigDecimal is an extension library for the Ruby interpreter. 
-Using BigDecimal class, you can obtain any number of significant digits in computation. 
-For the details about Ruby see:<BR>
-<UL>
-<LI><A HREF="http://www.ruby-lang.org/en/">http://www.ruby-lang.org/en/</A>:Official Ruby page(English).</LI>
-<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>:Mutually linked pages relating to Ruby(Japanese).
-</LI>
-</UL> 
-NOTE:<BR>
- This software is provided "AS IS" and without any express or
- implied warranties,including,without limitation,the implied
- warranties of merchantibility and fitness for a particular
- purpose. For the details,see COPYING and README included in this
- distribution.
-<BR>
-<hr>
-
-<H2>Contents</H2>
-<UL>
-<LI><A HREF="#INTRO">Introduction</LI>
-<LI><A HREF="#SPEC">Usage and methods</A></LI>
-<LI><A HREF="#UNDEF">Infinity,NaN,Zero</A></LI>
-<LI><A HREF="#STRUCT">Internal structure</A></LI>
-<LI><A HREF="#BASE">Binary or decimal number representation</A></LI>
-<LI><A HREF="#PREC">Resulting number of significant digits</A></LI>
-</UL>
-<HR>
-
-<A NAME="#INTRO">
-<H2>Introduction</H2>
-Ruby already has builtin (variable length integer number) class Bignum. Using Bignum class,you can obtain
- any integer value in magnitude. But, variable length decimal number class is not yet built in. 
-This is why I made variable length floating class BigDecimal.
-Feel free to send any comments or bug reports to me.
-<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
-I will try(but can't promise) to fix bugs reported. 
-<hr>
-<H2>Installation</H2>
-The Ruby latest version can be downloaded from <A HREF="http://www.ruby-lang.org/en/">Official Ruby page</A>.
-Once decompress the downloaded Ruby archive,follow the normal installation procedures according to the 
-documents included.
-
-<A NAME="#SPEC">
-<H2>Usage and methods</H2>
-Suppose you already know Ruby programming,
-to create BigDecimal objects,the program would like:<BR>
-
-<CODE><PRE>
-   require 'bigdecimal'
-   a=BigDecimal::new("0.123456789123456789")
-   b=BigDecimal("123456.78912345678",40)
-   c=a+b
-</PRE></CODE>
-
-<H3>List of methods</H3>
-In 32 bits integer system,every 4 digits(in decimal) are computed simultaneously.
-This means the number of significant digits in BigDecimal is always a multiple of 4.
-<P>
-Some more methods are available in Ruby code (not C code). 
-Functions such as sin,cos ...,are in math.rb in bigdecimal directory.
-To use them,require math.rb as:
-<CODE><PRE>
-require "bigdecimal/math.rb"
-</PRE></CODE>
-For details,see the math.rb code and comments.
-Other utility methods are in util.rb.
-To use util.rb, require it as:
-<CODE><PRE>
-require "bigdecimal/util.rb"
-</PRE></CODE>
-For details,see the util.rb code.
-
-<H4><U>Class methods</U></H4>
-<UL>
-<LI><B>new</B></LI><BLOCKQUOTE>
-"new" method creates a new BigDecimal object.<BR>
-a=BigDecimal::new(s[,n]) or<BR>
-a=BigDecimal(s[,n]) or<BR>
-where:<BR>
-s: Initial value string. Spaces will be ignored. Any unrecognizable character for 
-representing initial value terminates the string.<BR>
-n: Maximum number of significant digits of a. n must be a Fixnum object.
-If n is omitted or is equal to 0,then the maximum number of significant digits of a is determined from the length of s.
-Actual number of digits handled in computations are usually gretaer than n.<BR>
-n is useful when performing divisions like
-<CODE><PRE>
-BigDecimal("1")    / BigDecimal("3")    # => 0.3333333333 33E0
-BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
-</PRE></CODE>
-but the resulting digits obtained may differ in future version.
-</BLOCKQUOTE>
-
-<LI><B>mode</B></LI><BLOCKQUOTE>
-f = BigDecimal.mode(s[,v])<BR>
-mode method controls BigDecimal computation. If the second argument is not given or is nil,then the value
-of current setting is returned.
-Following usage are defined.<BR>
-<P><B>[EXCEPTION control]</B><P>
-Actions when computation results NaN or Infinity can be defined as follows.
-<P>
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_NaN,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_INFINITY,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_UNDERFLOW,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_OVERFLOW,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
-</BLOCKQUOTE>
-EXCEPTION_NaN controls the execution when computation results to NaN.<BR>
-EXCEPTION_INFINITY controls the execution when computation results to Infinity(�}Infinity).<BR>
-EXCEPTION_UNDERFLOW controls the execution when computation underflows.<BR>
-EXCEPTION_OVERFLOW controls the execution when computation overflows.<BR>
-EXCEPTION_ZERODIVIDE controls the execution when zero-division occures.<BR>
-EXCEPTION_ALL controls the execution for any exception defined occures.<BR>
-If the flag is true,then the relating exception is thrown.<BR>
-No exception is thrown when the flag is false(default) and computation 
-continues with the result:<BR>
-<BLOCKQUOTE>
-EXCEPTION_NaN results to NaN<BR>
-EXCEPTION_INFINITY results to +Infinity or -Infinity<BR>
-EXCEPTION_UNDERFLOW results to 0.<BR>
-EXCEPTION_OVERFLOW results to +Infinity or -Infinity<BR>
-EXCEPTION_ZERODIVIDE results to +Infinity or -Infinity<BR>
-</BLOCKQUOTE>
-EXCEPTION_INFINITY,EXCEPTION_OVERFLOW, and EXCEPTION_ZERODIVIDE are
- currently the same.<BR>
-The return value of mode method is the value set.<BR>
-If nil is specified for the second argument,then current setting is returned.<BR>
-Suppose the return value of the mode method is f,then 
- f &amp; BigDecimal::EXCEPTION_NaN !=0 means EXCEPTION_NaN is set to on.
-<P>
-<B>[ROUND error control]</B><P>
-Rounding operation can be controlled as:
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
-</BLOCKQUOTE>
-where flag must be one of:
-<TABLE>
-
-<TR><TD>ROUND_UP</TD><TD>round away from zero.</TD></TR>
-<TR><TD>ROUND_DOWN</TD><TD>round towards zero(truncate).</TD></TR>
-<TR><TD>ROUND_HALF_UP</TD><TD>round up if the digit &gt;= 5 otherwise truncated(default).</TD></TR>
-<TR><TD>ROUND_HALF_DOWN</TD><TD>round up if the digit &gt;= 6 otherwise truncated.</TD></TR>
-<TR><TD>ROUND_HALF_EVEN</TD><TD>round towards the even neighbor(Banker's rounding).
-<TR><TD>ROUND_CEILING</TD><TD>round towards positive infinity(ceil).</TD></TR>
-<TR><TD>ROUND_FLOOR</TD><TD>round towards negative infinity(floor).</TD></TR>
-</TABLE>
-New rounding mode is returned. If nil is specified for the second argument,then current setting is returned.<BR>
-The digit location for rounding operation can not be specified by this mode method,
-use truncate/round/ceil/floor/add/sub/mult/div mthods for each instance instead.
-</BLOCKQUOTE>
-
-<LI><B>limit[(n)]</B></LI><BLOCKQUOTE>
-Limits the maximum digits that the newly created BigDecimal objects can hold never exceed n.
-This means the rounding operation specified by BigDecimal.mode is 
-performed if necessary.
-limit returns the value before set if n is nil or is not specified.
-Zero,the default value,means no upper limit.<BR>
-The limit has no more priority than instance methods such as truncate,round,ceil,floor,add,sub,mult,and div. <BR>
-mf = BigDecimal::limit(n)<BR>
-</BLOCKQUOTE>
-
-<LI><B>double_fig</B></LI><BLOCKQUOTE>
-double_fig is a class method which returns the number of digits 
-the Float class can have.
-<CODE><PRE>
-  p BigDecimal::double_fig  # ==> 20 (depends on the CPU etc.)
-</PRE></CODE>
-The equivalent C programs which calculates the value of
-double_fig is:
-<CODE><PRE>
- double v          = 1.0;
- int    double_fig = 0;
- while(v + 1.0 > 1.0) {
-    ++double_fig;
-    v /= 10;
- }
-</PRE></CODE>
-</BLOCKQUOTE>
-
-<LI><B>BASE</B></LI><BLOCKQUOTE>
-Base value used in the BigDecimal calculation.
-On 32 bits integer system,the value of BASE is 10000.<BR>
-b = BigDecimal::BASE<BR>
-</BLOCKQUOTE>
-</UL>
-
-<H4><U>Instance methods</U></H4>
-<UL>
-<LI><B>+</B></LI><BLOCKQUOTE>
-addition(c = a + b)<BR>
-For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
-
-</BLOCKQUOTE>
-<LI><B>-</B></LI><BLOCKQUOTE>
-subtraction (c = a - b) or negation (c = -a)<BR>
-For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
-
-</BLOCKQUOTE>
-<LI><B>*</B></LI><BLOCKQUOTE>
-multiplication(c = a * b)<BR>
-For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
-
-</BLOCKQUOTE>
-<LI><B>/</B></LI><BLOCKQUOTE>
-division(c = a / b)<BR>
-For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
-</BLOCKQUOTE>
-
-<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
-c = a.add(b,n)<BR>
-c = a.add(b,n) performs c = a + b.<BR>
-If n is less than the actual significant digits of a + b,
-then c is rounded properly according to the BigDecimal.limit.<BR>
-If n is zero,then the result is the same as +'s.
-</BLOCKQUOTE>
-<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
-c = a.sub(b,n)<BR>
-c = a.sub(b,n) performs c = a - b.<BR>
-If n is less than the actual significant digits of a - b,
-then c is rounded properly according to the BigDecimal.limit.<BR>
-If n is zero,then the result is the same as -'s.
-
-</BLOCKQUOTE>
-<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
-c = a.mult(b,n)<BR>
-c = a.mult(b,n) performs c = a * b.<BR>
-If n is less than the actual significant digits of a * b,
-then c is rounded properly according to the BigDecimal.limit.<BR>
-If n is zero,then the result is the same as *'s.
-
-</BLOCKQUOTE>
-<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
-c = a.div(b,n)<BR>
-c = a.div(b,n) performs c = a / b.<BR>
-If n is less than the actual significant digits of a / b,
-then c is rounded properly according to the BigDecimal.limit.<BR>
-If n is zero,then the result is the same as /'s.
-If n is not given,then the result will be an integer(BigDecimal) like Float#div.
-</BLOCKQUOTE>
-
-<LI><B>fix</B></LI><BLOCKQUOTE>
-c = a.fix<BR>
-returns integer part of a.<BR>
-
-</BLOCKQUOTE>
-<LI><B>frac</B></LI><BLOCKQUOTE>
-c = a.frac<BR>
-returns fraction part of a.<BR>
-
-</BLOCKQUOTE>
-<LI><B>floor[(n)]</B></LI><BLOCKQUOTE>
-c = a.floor<BR>
-returns the maximum integer value (in BigDecimal) which is less than or equal to a.
-<CODE><PRE>
- c = BigDecimal("1.23456").floor  #  ==> 1
- c = BigDecimal("-1.23456").floor #  ==> -2
-</PRE></CODE>
-
-As shown in the following example,an optional integer argument (n) specifying the position 
-of the target digit can be given.<BR>
-If n> 0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
-If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
-<CODE><PRE>
- c = BigDecimal("1.23456").floor(4)   #  ==> 1.2345
- c = BigDecimal("15.23456").floor(-1) #  ==> 10.0
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>ceil[(n)]</B></LI><BLOCKQUOTE>
-c = a.ceil<BR>
-returns the minimum integer value (in BigDecimal) which is greater than or equal to a.
-<CODE><PRE>
- c = BigDecimal("1.23456").ceil  #  ==> 2
- c = BigDecimal("-1.23456").ceil #  ==> -1
-</PRE></CODE>
-
-As shown in the following example,an optional integer argument (n) specifying the position 
-of the target digit can be given.<BR>
-If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
-If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
-<CODE><PRE>
- c = BigDecimal("1.23456").ceil(4)   # ==> 1.2346
- c = BigDecimal("15.23456").ceil(-1) # ==> 20.0
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
-c = a.round<BR>
-round a to the nearest 1(default)�D<BR>
-<CODE><PRE>
- c = BigDecimal("1.23456").round  #  ==> 1
- c = BigDecimal("-1.23456").round #  ==> -1
-</PRE></CODE>
-The rounding operation changes according to BigDecimal::mode(BigDecimal::ROUND_MODE,flag) if specified.
-
-As shown in the following example,an optional integer argument (n) specifying the position 
-of the target digit can be given.<BR>
-If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction  part digits is less than or equal to n).<BR>
-If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
-<CODE><PRE>
-c = BigDecimal::new("1.23456").round(4)   #  ==> 1.2346
-c = BigDecimal::new("15.23456").round(-1) #  ==> 20.0
-</PRE></CODE>
-
-Rounding operation can be specified by setting the second optional argument b with the valid ROUND_MODE.<BR>
-<CODE><PRE>
-c = BigDecimal::new("1.23456").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
-c = BigDecimal::new("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>truncate[(n)]</B></LI><BLOCKQUOTE>
-c = a.truncate<BR>
-truncate a to the nearest 1�D<BR>
-As shown in the following example,an optional integer argument (n) specifying the position 
-of the target digit can be given.<BR>
-If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
-If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
-
-<CODE><PRE>
-c = BigDecimal::new("1.23456").truncate(4)   #  ==> 1.2345
-c = BigDecimal::new("15.23456").truncate(-1) #  ==> 10.0
-</PRE></CODE>
-</BLOCKQUOTE>
-<LI><B>abs</B></LI><BLOCKQUOTE>
-c = a.abs<BR>
-returns an absolute value of a.<BR>
-
-</BLOCKQUOTE>
-<LI><B>to_i</B></LI><BLOCKQUOTE>
-changes a to an integer.<BR>
-i = a.to_i<BR>
-i becomes to Fixnum or Bignum.
-If a is Infinity or NaN,then i becomes to nil.
-
-</BLOCKQUOTE>
-<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
-converts to string(default results look like "0.xxxxxEn").
-<CODE><PRE>
-BigDecimal("1.23456").to_s  #  ==> "0.123456E1"
-</PRE></CODE>
-If n(>0) is given,then a space is inserted to each of two parts divided by the decimal point 
-after every n digits for readability.
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(10)   #  ==> "0.1234567890 123456789E0"
-</PRE></CODE>
-n can be an string representing a positive integer number.
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s("10") #  ==> "0.1234567890 123456789E0"
-</PRE></CODE>
-If the first character is '+'(or ' '),then '+'(or ' ') will be set before value string
-when the value is positive.
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(" 10") #  ==> " 0.1234567890 123456789E0"
-BigDecimal("0.1234567890123456789").to_s("+10") #  ==> "+0.1234567890 123456789E0"
-BigDecimal("-0.1234567890123456789").to_s("10") #  ==> "-0.1234567890 123456789E0"
-</PRE></CODE>
-
-At the end of the string,'E'(or 'e') or 'F'(or 'f') can be specified to change 
-number representation.
-<CODE><PRE>
-BigDecimal("1234567890.123456789").to_s("E")  #  ==> "0.1234567890123456789E10"
-BigDecimal("1234567890.123456789").to_s("F")  #  ==> "1234567890.123456789"
-BigDecimal("1234567890.123456789").to_s("5E") #  ==> "0.12345 67890 12345 6789E10"
-BigDecimal("1234567890.123456789").to_s("5F") #  ==> "12345 67890.12345 6789"
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>exponent</B></LI><BLOCKQUOTE>
-returns an integer holding exponent value of a.<BR>
-n = a.exponent <BR>
-means a = 0.xxxxxxx*10**n.
-</BLOCKQUOTE>
-
-<LI><B>precs</B></LI><BLOCKQUOTE>
-n,m = a.precs <BR>
-prec returns number of significant digits (n) and maximum number of 
-significant digits (m) of a.
-</BLOCKQUOTE>
-
-<LI><B>to_f</B></LI><BLOCKQUOTE>
-Creates a new Float object having (nearly) the same value.
-Use split method if you want to convert by yourself.
-</BLOCKQUOTE>
-
-</BLOCKQUOTE>
-<LI><B>sign</B></LI><BLOCKQUOTE>
-n = a.sign <BR>
-returns positive value if a &gt; 0,negative value if a &lt; 0,
-otherwise zero if a == 0.<BR>
-where the value of n means that a is:<BR>
-n = BigDecimal::SIGN_NaN(0) : a is NaN<BR>
-n = BigDecimal::SIGN_POSITIVE_ZERO(1) : a is +0<BR>
-n = BigDecimal::SIGN_NEGATIVE_ZERO(-1) : a is -0<BR>
-n = BigDecimal::SIGN_POSITIVE_FINITE(2) : a is positive<BR>
-n = BigDecimal::SIGN_NEGATIVE_FINITE(-2) : a is negative<BR>
-n = BigDecimal::SIGN_POSITIVE_INFINITE(3) : a is +Infinity<BR>
-n = BigDecimal::SIGN_NEGATIVE_INFINITE(-3) : a is -Infinity<BR>
-The value in () is the actual value,see (<A HREF="#STRUCT">Internal structure</A>.<BR>
-
-</BLOCKQUOTE>
-<LI><B>nan?</B></LI><BLOCKQUOTE>
-a.nan? returns True when a is NaN.
-
-</BLOCKQUOTE>
-<LI><B>infinite?</B></LI><BLOCKQUOTE>
-a.infinite? returns 1 when a is +��,-1 when a is -��, nil otherwise.
-
-</BLOCKQUOTE>
-<LI><B>finite?</B></LI><BLOCKQUOTE>
-a.finite? returns true when a is neither �� nor NaN.
-</BLOCKQUOTE>
-
-<LI><B>zero?</B></LI><BLOCKQUOTE>
-c = a.zero?<BR>
-returns true if a is equal to 0,otherwise returns false<BR>
-</BLOCKQUOTE>
-<LI><B>nonzero?</B></LI><BLOCKQUOTE>
-c = a.nonzero?<BR>
-returns nil if a is 0,otherwise returns a itself.<BR>
-</BLOCKQUOTE>
-
-<LI><B>split</B></LI><BLOCKQUOTE>
-decomposes a BigDecimal value to 4 parts.
-All 4 parts are returned as an array.<BR>
-Parts consist of a sign(0 when the value is NaN,+1 for positive and
- -1 for negative value), a string representing fraction part,base value(always 10 currently),and an integer(Fixnum) for exponent respectively.
-a=BigDecimal::new("3.14159265")<BR>
-f,x,y,z = a.split<BR>
-where f=+1,x="314159265",y=10 and z=1<BR>
-therefore,you can translate BigDecimal value to Float as:<BR>
-s = "0."+x<BR>
-b = f*(s.to_f)*(y**z)<BR>
-
-</BLOCKQUOTE>
-<LI><B>inspect</B></LI><BLOCKQUOTE>
-is used for debugging output.<BR>
-p a=BigDecimal::new("3.14",10)<BR>
-should produce output like "#&lt;0x112344:'0.314E1',4(12)%gt;".
-where "0x112344" is the address,
-'0.314E1' is the value,4 is the number of the significant digits,
-and 12 is the maximum number of the significant digits 
-the object can hold.
-</BLOCKQUOTE>
-
-<LI><B>sqrt</B></LI><BLOCKQUOTE>
-c = a.sqrt(n)<BR>
-computes square root value of a with significant digit number n at least.<BR>
-</BLOCKQUOTE>
-
-<LI><B>**</B></LI><BLOCKQUOTE>
-c = a ** n<BR>
-returns the value of a powered by n.
-n must be an integer.<BR>
-
-</BLOCKQUOTE>
-<LI><B>power</B></LI><BLOCKQUOTE>
-The same as ** method.<BR>
-c = a.power(n)<BR>
-returns the value of a powered by n(c=a**n).
-n must be an integer.<BR>
-</BLOCKQUOTE>
-
-<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
-See,corresponding methods in Float class.
-</BLOCKQUOTE>
-
-</BLOCKQUOTE>
-<LI><B>&lt;=&gt;</B></LI><BLOCKQUOTE>
-c = a &lt;=&gt; b <BR>
-returns 0 if a==b,1 if a &gt b,and returns -1 if a &lt b.<BR>
-</BLOCKQUOTE>
-</UL>
-
-Following methods need no explanation.<BR>
-<UL>
-<LI>==</LI>
-<LI>===</LI>
-same as ==,used in case statement.
-<LI>!=</LI>
-<LI>&lt;</LI>
-<LI>&lt;=</LI>
-<LI>&gt;</LI>
-<LI>&gt;=</LI>
-</UL>
-
-<HR>
-<H3>About 'coerce'</H3>
-<B>For the binary operation like A op B:</B>
-<DL>
-<DT> 1.Both A and B are BigDecimal objects</DT>
-<DD> A op B is normally performed.</DD>
-<DT> 2.A is the BigDecimal object but B is other than BigDecimal object</DT>
-<DD> Operation is performed,after B is translated to correcponding BigDecimal object(because BigDecimal supports coerce method).</DD>
-<DT> 3.A is not the BigDecimal object but B is BigDecimal object</DT>
-<DD>If A has coerce mthod,then B will translate A to corresponding 
-BigDecimal object and the operation is performed,otherwise an error occures.</DD>
-</DL>
-
-String is not translated to BigDecimal in default.
-Uncomment /* #define ENABLE_NUMERIC_STRING */ in bigdecimal.c, compile and install 
-again if you want to enable string to BigDecimal conversion.
-Translation stops without error at the character representing non digit.
-For instance,"10XX" is translated to 10,"XXXX" is translated to 0.<BR>
-String representing zero or infinity such as "Infinity","+Infinity","-Infinity",and "NaN" can also be translated to BigDecimal unless false is specified by mode method.<BR>
-
-BigDecimal class supports coerce method(for the details about coerce method,see Ruby documentations). This means the most binary operation can be performed if the BigDecimal object is at the left hand side of the operation.<BR><BR>
-
- For example:
-<CODE><PRE>
-  a = BigDecimal.E(20)
-  c = a * "0.123456789123456789123456789" # A String is changed to BigDecimal object.
-</PRE></CODE>
-is performed normally.<BR>
- But,because String does not have coerce method,the following example can not be performed.<BR>
-
-<CODE><PRE>
-  a = BigDecimal.E(20)
-  c = "0.123456789123456789123456789" * a # ERROR
-</PRE></CODE>
-
-If you actually have any inconvenience about the error above.
-You can define a new class derived from String class,
-and define coerce method within the new class.<BR>
-
-<hr>
-<A NAME="#UNDEF">
-<H2>Infinity,Not a Number(NaN),Zero</H2>
-Infinite numbers and NaN can be represented by string writing "+Infinity"(or "Infinity"),"-Infinity",and "NaN" respectively in your program.
-Infinite numbers can be obtained by 1.0/0.0(=Infinity) or -1.0/0.0(=-Infinity).
-<BR><BR>
-NaN(Not a number) can be obtained by undefined computation like 0.0/0.0 
-or Infinity-Infinity.
-Any computation including NaN results to NaN.
-Comparisons with NaN never become true,including comparison with NaN itself.
-<BR><BR>
-Zero has two different variations as +0.0 and -0.0.
-But,still, +0.0==-0.0 is true.
-<BR><BR>
-Computation results including Infinity,NaN,+0.0 or -0.0 become complicated.
-Run following program and comfirm the results.
-Send me any incorrect result if you find.
-
-<CODE><PRE>
- require "bigdecimal"
- aa  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
- ba  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
- opa = %w(+ - * / <=> > >=  < == != <=)
- for a in aa
-  for b in ba
-    for op in opa
-      x = BigDecimal::new(a)
-      y = BigDecimal::new(b)
-      eval("ans= x #{op} y;print a,' ',op,' ',b,' ==> ',ans.to_s,\"\n\"")
-    end
-  end
- end
-</PRE></CODE>
-<hr>
-
-<A NAME="#STRUCT">
-<H2>Internal structure</H2>
-BigDecimal number is defined by the structure Real in BigDecimal.h.
-Digits representing a float number are kept in the array frac[] defined in the structure.
-In the program,any floating number(BigDecimal number) is represented as:<BR>
- <BigDecimal number> = 0.xxxxxxxxx*BASE**n<BR><BR>
-where 'x' is any digit representing mantissa(kept in the array frac[]),
-BASE is base value(=10000 in 32 bit integer system),
-and n is the exponent value.<BR>
-Larger BASE value enables smaller size of the array frac[],and increases computation speed.
-The value of BASE is defined ind VpInit(). In 32 bit integer system,this value is 
-10000. In 64 bit integer system,the value becomes larger.
-BigDecimal has not yet been compiled and tested on 64 bit integer system.
-It will be very nice if anyone try to run BigDecimal on 64 bit system and
- inform me the results.
-When BASE is 10000,an element of the array frac[] can have vale of from 0 to 9999.
-(up to 4 digits).<BR>
-The structure Real is defined in bigdecimal.h as:<BR>
-<CODE><PRE>
-  typedef struct {
-     VALUE  obj;     /* Back pointer(VALUE) for Ruby object.         */
-     unsigned long MaxPrec; /* The size of the array frac[]          */
-     unsigned long Prec;    /* Current size of frac[] actually used. */
-     short    sign;         /* Attribute of the value.  */
-                            /*  ==0 : NaN               */
-                            /*    1 : +0                */
-                            /*   -1 : -0                */
-                            /*    2 : Positive number   */
-                            /*   -2 : Negative number   */
-                            /*    3 : +Infinity         */
-                            /*   -3 : -Infinity         */
-     unsigned short flag;   /* Control flag             */
-     int      exponent;     /* Exponent value(0.xxxx*BASE**exponent) */
-     unsigned long frac[1]; /* An araay holding mantissa(Variable)   */
-  } Real;
-</CODE></PRE>
-The decimal value 1234.56784321 is represented as(BASE=10000):<BR>
-<PRE>
-    0.1234 5678 4321*(10000)**1
-</PRE>
-where frac[0]=1234,frac[1]=5678,frac[2]=4321,
-Prec=3,sign=2,exponent=1. MaxPrec can be any value greater than or equal to 
-Prec.
-<hr>
-
-<A NAME="#BASE">
-<H2>Binary or decimal number representation</H2>
-I adopted decimal number representation for BigDecimal implementation.
-Of cource,binary number representation is common on the most computers.
-
-<H3>Advantages using decimal representation</H3>
-The reason why I adopted decimal number representation for BigDecimal is:<BR>
-<DL>
-<DT>Easy for debugging
-<DD>The floating number 1234.56784321 can be easily represented as:<BR>
-  frac[0]=1234,frac[1]=5678,frac[2]=4321,exponent=1,and sign=2.
-<DT>Exact representation
-<DD>Following program can add all numbers(in decimal) in a file
- without any error(no round operation).<BR>
-
-<CODE><PRE>
-   file = File::open(....,"r")
-   s = BigDecimal::new("0")
-   while line = file.gets
-      s = s + line
-   end
-</PRE></CODE>
-
-If the internal representation is binary,translation from decimal to 
-binary is required and the translation error is inevitable.
-For example, 0.1 can not exactly be represented in binary.<BR>
-0.1 => b1*2**(-1)+b1*2**(-2)+b3*2**(-3)+b4*2**(-4)....<BR>
-where b1=0,b2=0,b3=0,b4=1...<BR>
-bn(n=1,2,3,...) is infinite series of digit with value of 0 or 1,
-and rounding operation is necessary but where we should round the series ?
-Of cource,exact "0.1" is printed if the rouding operation is properly done,
-<DT>Significant digit we can have is automatically determined
-<DD>In binary representation,0.1 can not be represented in finite series of digit.
-
-But we only need one element(frac[0]=1) in decimal representation.
-This means that we can always determine the size of the array frac[] in Real 
-structure.
-</DL>
-
-<H3>Disadvantage of decimal representation</H3>
-Advantages stated so far can also be disadvantages if the input from outside is
- represented in binary.
-Translation error from decimal to binary or vice versa is inevitable.
-So,translation from Float(binary) to BigDecimal(decimal) is not alway done exactly.
-
-<H4>Which is the first input?</H4>
-Because most people uses decimal notatin for numeric data representation,
-BigDecimal can handle numeric data without loss of translation error.
-<hr>
-
-<A NAME="#PREC">
-<H2>Resulting number of significant digits</H2>
-For the fundamental arithmetics such as addition,subtraction,
-multiplication,and division,I prepared 2 group of methods<BR>
-
-<H3>1. +,-,*,/</H3>
-For the operation + - * /,you can not specify the resulting 
-number of significant digits.<BR>
-Resulting number of significant digits are defined as:<BR>
-1.1 For *,resulting number of significant digits is the sum of the 
-significant digits of both side of the operator. For / ,resulting number of significant digits is the sum of the 
-maximum significant digits of both side of the operator.<BR>
-1.2 For + and -,resulting number of significant digits is determined so that
- no round operation is needed. <br>
-For example, c has more than 100 siginificant digits if c is computed as:<BR>
-c = 0.1+0.1*10**(-100)<br>
-<BR>
-As +,-,and * are always exact(no round operation is performed unless BigDecimal.limit is specified),
-which means more momories are required to keep computation results.
-But,the division such as c=1.0/3.0 will always be rounded.<BR>
-
-<H3>2. add,sub,mult,div</H3>
-The length of the significant digits obtained from +,-,*,/ 
-is always defined by that of right and left side of the operator.
-To specify the length of the significant digits by your self,
-use methos add,sub,mult,div.
-<CODE><PRE>
- BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
-</PRE></CODE>
-</BLOCKQUOTE>
-
-<H3>3. truncate,round,ceil,floor</H3>
-Using these methods,you can specify rounding location relatively from
-decimal point.
-<CODE><PRE>
- BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
-</PRE></CODE>
-</BLOCKQUOTE>
-
-
-<H3>4. Example</H3>
-Following example compute the ratio of the circumference of a circle to 
-its dirmeter(pi=3.14159265358979....) using J.Machin's formula.
-<BR><BR>
-<CODE><PRE>
-#!/usr/local/bin/ruby
-
-require "bigdecimal"
-#
-# Calculates 3.1415.... (the number of times that a circle's diameter
-# will fit around the circle) using J. Machin's formula.
-#
-def big_pi(sig) # sig: Number of significant figures
-  exp    = -sig
-  pi     = BigDecimal::new("0")
-  two    = BigDecimal::new("2")
-  m25    = BigDecimal::new("-0.04")
-  m57121 = BigDecimal::new("-57121")
-
-  u = BigDecimal::new("1")
-  k = BigDecimal::new("1")
-  w = BigDecimal::new("1")
-  t = BigDecimal::new("-80")
-  while (u.nonzero? && u.exponent >= exp) 
-    t   = t*m25
-    u   = t.div(k,sig)
-    pi  = pi + u
-    k   = k+two
-  end
-
-  u = BigDecimal::new("1")
-  k = BigDecimal::new("1")
-  w = BigDecimal::new("1")
-  t = BigDecimal::new("956")
-  while (u.nonzero? && u.exponent >= exp )
-    t   = t.div(m57121,sig)
-    u   = t.div(k,sig)
-    pi  = pi + u
-    k   = k+two
-  end
-  pi
-end
-
-if $0 == __FILE__
-  if ARGV.size == 1
-    print "PI("+ARGV[0]+"):\n"
-    p big_pi(ARGV[0].to_i)
-  else
-    print "TRY: ruby pi.rb 1000 \n"
-  end
-end
-
-</PRE></CODE>
-<HR>
-<FONT size=2>
-<I>
-<A HREF="http://www.tinyforest.gr.jp">
-Shigeo Kobayashi
-</A>
-(E-Mail:<A HREF="mailto:shigeo@tinyforest.gr.jp">&lt;shigeo@tinyforest.gr.jp&gt;</U></A>)
-</I>
-</FONT>
-</TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/ext/bigdecimal/bigdecimal_ja.html b/ext/bigdecimal/bigdecimal_ja.html
deleted file mode 100644
index 33d5d834fb..0000000000
--- a/ext/bigdecimal/bigdecimal_ja.html
+++ /dev/null
@@ -1,798 +0,0 @@
-<!-- saved from url=(0022)http://internet.e-mail -->
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=Shift_JIS">
-<style type="text/css"><!--
-body { color: #3f0f0f;  background: #fefeff; margin-left: 2em; margin-right: 2em;}
-h1 { color: #ffffff;  background-color: #3939AD;  border-color: #FF00FF;  width: 100%;
-  border-style: solid;  border-top-width: 0.1em;  border-bottom-width: 0.1em;  border-right: none;
-  border-left: none;  padding: 0.1em;  font-weight: bold;  font-size: 160%;  text-align: center;
-}
-h2 {  color: #00007f;  background-color: #e7e7ff;  border-color: #000094;  width: 100%;
-  border-style: solid; border-left: none;  border-right: none;  border-top-width: 0.1em;  border-bottom-width: 0.1em;
-  padding: 0.1em;
-  font-weight: bold;  font-size: 110%;
-}
-h3 {  color: #00007f;  padding: 0.2em;  font-size: 110%;}
-h4, h5 {  color: #000000;  padding: 0.2em;  font-size: 100%;}
-table {  margin-top: 0.2em; margin-bottom: 0.2em;  margin-left: 2em; margin-right: 2em;}
-caption {  color: #7f0000;  font-weight: bold;}
-th {  background: #e7e7ff;  padding-left: 0.2em; padding-right: 0.2em;}
-td {  background: #f3f7ff;  padding-left: 0.2em; padding-right: 0.2em;}
-code {  color: #0000df;}
-dt {  margin-top: 0.2em;}
-li {  margin-top: 0.2em;}
-pre
-{    BACKGROUND-COLOR: #d0d0d0;    BORDER-BOTTOM: medium none;    BORDER-LEFT: medium none;
-    BORDER-RIGHT: medium none;    BORDER-TOP: medium none;    LINE-HEIGHT: 100%;    MARGIN: 12px 12px 12px 12px;
-    PADDING-BOTTOM: 12px;    PADDING-LEFT: 12px;    PADDING-RIGHT: 12px;    PADDING-TOP: 12px;
-    WHITE-SPACE: pre;    WIDTH: 100%
-}
---></style>
-
-<TITLE>BigDecimal:An extension library for Ruby</TITLE>
-</HEAD>
-<BODY BGCOLOR=#FFFFE0>
-<H1>BigDecimal(�ϒ����������_���Z�p�g�����C�u����)</H1>
-<DIV align="right"><A HREF="./bigdecimal_en.html">English</A></DIV><BR>
-BigDecimal �̓I�u�W�F�N�g�w���̋��͂ȃX�N���v�g����ł��� Ruby �ɉϒ����������_
-�v�Z�@�\��ǉ����邽�߂̊g�����C�u�����ł��B
-Ruby �ɂ��Ă̏ڂ������e�͈ȉ���URL���Q�Ƃ��Ă��������B
-<UL>
-<LI><A HREF="http://www.ruby-lang.org/ja/">http://www.ruby-lang.org/ja/</A>�FRuby�����y�[�W</LI>
-<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>�FRuby�Ɋւ���y�[�W��H��܂�</LI>
-</UL> 
-<hr>
-<H2>�ڎ�</H2>
-<UL>
-<LI><A HREF="#INTRO">�͂��߂�</LI>
-<LI><A HREF="#SPEC">�g�p���@�ƃ��\�b�h�̈ꗗ</A></LI>
-<LI><A HREF="#UNDEF">�����A�񐔁A�[���̈���</A></LI>
-<LI><A HREF="#STRUCT">�����\��</A></LI>
-<LI><A HREF="#BASE">2�i��10�i</A></LI>
-<LI><A HREF="#PREC">�v�Z���x�ɂ���</A></LI>
-</UL>
-
-<HR>
-<A NAME="#INTRO">
-<H2>�͂��߂�</H2>
-Ruby �ɂ� Bignum �Ƃ����N���X������A���S���̐����ł��v�Z���邱�Ƃ��ł��܂��B
-�����A�C�ӌ��̕��������_���Z�p�N���X�������悤�ł��B�����ŁA
-�C�ӌ��̕��������_���Z�p�g�����C�u���� BigDecimal ���쐬���܂����B
-�s��⏕���E��Ă�����ꍇ�ǂ��ǂ��A
-<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
-�܂ł��m�点���������B�s��𒼂��C�͑傢�ɂ���܂��B�����A���ԂȂǂ̊֌W�Ŗ�
-�͂ł��܂���B�܂��A���ʂɂ��Ă��ۏ؂ł�����̂ł͂���܂���B
-�\�߁A���������������B
-<BR><BR>
-���̃v���O�����́A���R�ɔz�z�E���ς��č\���܂���B�������A���쌠�͕������Ă��܂���B
-�z�z�E���ϓ��̌����� Ruby �̂���ɏ����܂��B�ڂ����� README ��ǂ�ł��������B
-
-<hr>
-<H2>�C���X�g�[���ɂ���</H2>
-BigDecimal ���܂� Ruby �̍ŐV�ł�<A HREF="http://www.ruby-lang.org/ja/">Ruby�����y�[�W</A>����_�E�����[�h�ł��܂��B
-�_�E�����[�h�����ŐV�ł��𓀂�����A�ʏ�̃C���X�g�[���菇�����s���ĉ������B
-Ruby ���������C���X�g�[�������΁A������ BigDecimal �����p�ł���悤�ɂȂ�͂��ł��B
-�\�[�X�t�@�C���� 
-bigdecimal.c,bigdecimal.h 
-�̂Q�݂̂ł��B<BR>
-
-<hr>
-<A NAME="#SPEC">
-<H2>�g�p���@�ƃ��\�b�h�̈ꗗ</H2>
-�uRuby�͊��ɏ�����v�Ƃ����O��ŁA
-<CODE><PRE>
-require 'bigdecimal'
-a=BigDecimal::new("0.123456789123456789")
-b=BigDecimal("123456.78912345678",40)
-c=a+b
-</PRE></CODE>
-<br>
-�Ƃ����悤�Ȋ����Ŏg�p���܂��B
-
-<H3>���\�b�h�ꗗ</H3>
-�ȉ��̃��\�b�h�����p�\�ł��B
-�u�L�������v�Ƃ� BigDecimal �����x��ۏ؂��錅���ł��B
-�҂�����ł͂���܂���A�኱�̗]�T�������Čv�Z����܂��B
-�܂��A�Ⴆ�΂R�Q�r�b�g�̃V�X�e���ł͂P�O�i�łS�����Ɍv�Z���܂��B�]���āA����ł́A
-�����́u�L�������v�͂S�̔{���ƂȂ��Ă��܂��B
-<P>
-�ȉ��̃��\�b�h�ȊO�ɂ��A(C �ł͂Ȃ�) Ruby �\�[�X�̌`��
-�񋟂���Ă�����̂�����܂��B�Ⴆ�΁A
-<CODE><PRE>
-require "bigdecimal/math.rb"
-</PRE></CODE>
-�Ƃ��邱�ƂŁAsin �� cos �Ƃ������֐����g�p�ł���悤�ɂȂ�܂��B
-�g�p���@�ȂǁA�ڍׂ� math.rb �̓��e���Q�Ƃ��ĉ������B
-
-���̑��AFloat �Ƃ̑��ݕϊ��Ȃǂ̃��\�b�h�� util.rb �ŃT�|�[�g����Ă��܂��B
-���p����ɂ�
-<CODE><PRE>
-require "bigdecimal/util.rb"
-</PRE></CODE>
-�̂悤�ɂ��܂��B�ڍׂ� util.rb �̓��e���Q�Ƃ��ĉ������B
-
-<H4><U>�N���X���\�b�h</U></H4>
-<UL>
-<LI><B>new</B></LI><BLOCKQUOTE>
-�V���� BigDecimal �I�u�W�F�N�g�𐶐����܂��B<BR>
-a=BigDecimal::new(s[,n]) �܂���<BR>
-a=BigDecimal(s[,n])<BR>
-s �͐�����\�����鏉���l�𕶎���Ŏw�肵�܂��B
-�X�y�[�X�͖�������܂��B�܂��A���f�ł��Ȃ��������o���������_��
-������͏I���������̂Ƃ݂Ȃ���܂��B
-n �͕K�v�ȗL�������ia �̍ő�L�������j�𐮐��Ŏw�肵�܂��B
-n �� 0 �܂��͏ȗ����ꂽ�Ƃ��́An �̒l�� s �̗L�������Ƃ݂Ȃ���܂��B
-s �̗L��������� n ���������Ƃ��� n=0 �̂Ƃ��Ɠ����ł��B
-a �̍ő�L�������� n ���኱�傢�l���̗p����܂��B
-�ő�L�������͈ȉ��̂悤�Ȋ���Z�����s����Ƃ����ɈӖ��������܂��B
-<CODE><PRE>
-BigDecimal("1")    / BigDecimal("3")    # => 0.3333333333 33E0
-BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
-</PRE></CODE>
-�������A�X�̉��Z�ɂ�����ő�L������ n �̎�舵���͏����̃o�[�W������
-�኱�ύX�����\��������܂��B
-</BLOCKQUOTE>
-
-<LI><B>mode</B></LI><BLOCKQUOTE>
-f = BigDecimal.mode(s[,v])<BR>
-BigDecimal�̎��s���ʂ𐧌䂵�܂��B��Q�������ȗ��A�܂��� nil ���w�肷���
-����̐ݒ�l���߂�܂��B<BR>
-�ȉ��̎g�p���@����`����Ă��܂��B
-<P>
-<B>[��O����]</B><P>
-�v�Z���ʂ���(NaN)��[���ɂ�鏜�Z�ɂȂ����Ƃ��̏������`���邱�Ƃ��ł��܂��B
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_NaN,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_INFINITY,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_UNDERFLOW,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_OVERFLOW,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
-</BLOCKQUOTE>
-
-EXCEPTION_NaN �͌��ʂ� NaN �ɂȂ����Ƃ��̎w��ł��B<BR>
-EXCEPTION_INFINITY �͌��ʂ�������(�}Infinity)�ɂȂ����Ƃ��̎w��ł��B<BR>
-EXCEPTION_UNDERFLOW �͎w�������A���_�[�t���[����Ƃ��̎w��ł��B<BR>
-EXCEPTION_OVERFLOW �͎w�������I�[�o�[�t���[����Ƃ��̎w��ł��B<BR>
-EXCEPTION_ZERODIVIDE �̓[���ɂ�銄��Z�����s�����Ƃ��̎w��ł��B<BR>
-EXCEPTION_ALL �́A�\�ȑS�Ăɑ΂��Ĉꊇ���Đݒ肷��Ƃ��Ɏg�p���܂��B<BR><BR>
-
-flag �� true �̂Ƃ��́A�w�肵����ԂɂȂ����Ƃ��ɗ�O�𔭍s����悤�ɂȂ�܂��B<BR>
-flag �� false�i�f�t�H���g�j�Ȃ�A��O�͔��s����܂���B�v�Z���ʂ͈ȉ��̂悤�ɂȂ�܂��B<BR>
-<BLOCKQUOTE>
-EXCEPTION_NaN �̂Ƃ��A��(NaN)<BR>
-EXCEPTION_INFINITY �̂Ƃ��A����(+ or -Infinity)<BR>
-EXCEPTION_UNDERFLOW �̂Ƃ��A�[��<BR>
-EXCEPTION_OVERFLOW �̂Ƃ��A+Infinity �� -Infinity<BR>
-EXCEPTION_ZERODIVIDE �̂Ƃ��A+Infinity �� -Infinity<BR>
-</BLOCKQUOTE>
-EXCEPTION_INFINITY�AEXCEPTION_OVERFLOW�AEXCEPTION_ZERODIVIDE
-�͍��̂Ƃ��듯���ł��B<BR>
-�߂�l�́A�ݒ��̒l�ł��B�u�l�v�̈Ӗ��́A�Ⴆ��
-BigDecimal::EXCEPTION_NaN�Ɓu�l�v�� & �� �[���ȊO�Ȃ��
-EXCEPTION_NaN���ݒ肳��Ă���Ƃ����Ӗ��ł��B
-
-<P>
-<B>[�ۂߏ����w��]</B><P>
-�v�Z�r���̊ۂߑ���̎w�肪�ł��܂��B
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
-</BLOCKQUOTE>
-�̌`���Ŏw�肵�܂��B<BR>
-�����ŁAflag �͈ȉ�(���ʓ��͑Ή�����C���X�^���X���\�b�h)�̈���w�肵�܂��B
-<TABLE>
-<TR><TD>ROUND_UP</TD><TD>�S�Đ؂�グ�܂��B</TD></TR>
-<TR><TD>ROUND_DOWN</TD><TD>�S�Đ؂�̂Ă܂�(truncate)�B</TD></TR>
-<TR><TD>ROUND_HALF_UP</TD><TD>�l�̌ܓ����܂�(�f�t�H���g)�B</TD></TR>
-<TR><TD>ROUND_HALF_DOWN</TD><TD>�܎̘Z�����܂��B</TD></TR>
-<TR><TD>ROUND_HALF_EVEN</TD><TD>�l�̘Z�����܂��B�T�̎��͏�ʂP������̎��̂݌J��グ�܂�(Banker's rounding)�B</TD></TR>
-<TR><TD>ROUND_CEILING</TD><TD>���l�̑傫�����ɌJ��グ�܂�(ceil)�B</TD></TR>
-<TR><TD>ROUND_FLOOR</TD><TD>���l�̏��������ɌJ�艺���܂�(floor)�B</TD></TR>
-
-</TABLE>
-�߂�l�͎w���� flag �̒l�ł��B
-��Q������ nil ���w�肷��ƁA����̐ݒ�l���Ԃ�܂��B
-mode ���\�b�h�ł͊ۂߑ���̈ʒu�����[�U���w�肷�邱�Ƃ͂ł��܂���B
-�ۂߑ���ƈʒu�������Ő��䂵�����ꍇ�� BigDecimal::limit �� truncate/round/ceil/floor�A
-add/sub/mult/div �Ƃ������C���X�^���X���\�b�h���g�p���ĉ������B
-</BLOCKQUOTE>
-<LI><B>limit([n])</B></LI><BLOCKQUOTE>
-���������BigDecimal�I�u�W�F�N�g�̍ő包����n���ɐ������܂��B
-�߂�l�͐ݒ肷��O�̒l�ł��B�ݒ�l�̃f�t�H���g�l�͂O�ŁA�����������Ƃ����Ӗ��ł��B
-n ���w�肵�Ȃ��A�܂��� n �� nil �̏ꍇ�́A����̍ő包�����Ԃ�܂��B<BR>
-�v�Z�𑱍s����ԂɁA�����̌������������ɑ����Ă��܂��悤�ȏꍇ
- limit �ŗ\�ߌ����𐧌��ł��܂��B���̏ꍇ BigDecimal.mode �Ŏw�肳�ꂽ
-�ۂߏ��������s����܂��B
-�������A�C���X�^���X���\�b�h (truncate/round/ceil/floor/add/sub/mult/div) ��
-���������� limit ���D�悳��܂��B<BR>
-mf = BigDecimal::limit(n)<BR>
-</BLOCKQUOTE>
-
-<LI><B>double_fig</B></LI><BLOCKQUOTE>
-Ruby �� Float �N���X���ێ��ł���L�������̐���Ԃ��܂��B
-<CODE><PRE>
-  p BigDecimal::double_fig  # ==> 20 (depends on the CPU etc.)
-</PRE></CODE>
-double_fig�͈ȉ��� C �v���O�����̌��ʂƓ����ł��B
-<CODE><PRE>
- double v          = 1.0;
- int    double_fig = 0;
- while(v + 1.0 > 1.0) {
-    ++double_fig;
-    v /= 10;
- }
-</PRE></CODE>
-</BLOCKQUOTE>
-
-<LI><B>BASE</B></LI><BLOCKQUOTE>
-�����Ŏg�p������̒l�ł��B������ 32 �r�b�g�̏����n�ł�10000�ł��B<BR>
-b = BigDecimal::BASE<BR>
-</BLOCKQUOTE>
-</UL>
-
-<H4><U>�C���X�^���X���\�b�h</U></H4>
-<UL>
-<LI><B>+</B></LI><BLOCKQUOTE>
-���Z�ic = a + b�j<BR>
-c �̐��x�ɂ��Ắu<A HREF="#PREC">�v�Z���x�ɂ���</A>�v���Q�Ƃ��Ă��������B
-</BLOCKQUOTE>
-
-<LI><B>-</B></LI><BLOCKQUOTE>
-���Z�ic = a - b�j�A�܂��͕������]�ic = -a�j<BR>
-c �̐��x�ɂ��Ắu<A HREF="#PREC">�v�Z���x�ɂ���</A>�v���Q�Ƃ��Ă��������B
-
-</BLOCKQUOTE>
-<LI><B>*</B></LI><BLOCKQUOTE>
-��Z(c = a * b)<BR>
-c�̐��x��(a�̐��x)+(b�̐��x)���x�ł��B<br>
-�ڂ����́u<A HREF="#PREC">�v�Z���x�ɂ���</A>�v���Q�Ƃ��Ă��������B
-
-</BLOCKQUOTE>
-<LI><B>/</B></LI><BLOCKQUOTE>
-���Z(c = a / b)<BR>
-c �̐��x�ɂ��Ắu<A HREF="#PREC">�v�Z���x�ɂ���</A>�v���Q�Ƃ��Ă��������B
-
-</BLOCKQUOTE>
-
-<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
-�ȉ��̂悤�Ɏg�p���܂��B<BR>
-c = a.add(b,n)<BR>
-c = a + b ���ő�� n ���܂Ōv�Z���܂��B<BR>
-a + b �̐��x�� n ���傫���Ƃ��� BigDecimal.mode �Ŏw�肳�ꂽ���@�Ŋۂ߂��܂��B<BR>
-n ���[���Ȃ� + �Ɠ����ł��B
-</BLOCKQUOTE>
-<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
-�ȉ��̂悤�Ɏg�p���܂��B<BR>
-c = a.sub(b,n)<BR>
-c = a - b ���ő�� n ���܂Ōv�Z���܂��B<BR>
-a - b �̐��x�� n ���傫���Ƃ��� BigDecimal.mode �Ŏw�肳�ꂽ���@�Ŋۂ߂��܂��B<BR>
-n ���[���Ȃ� - �Ɠ����ł��B
-
-</BLOCKQUOTE>
-<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
-�ȉ��̂悤�Ɏg�p���܂��B<BR>
-c = a.mult(b,n)<BR>
-c = a * b ���ő�� n ���܂Ōv�Z���܂��B<BR>
-a * b �̐��x�� n ���傫���Ƃ��� BigDecimal.mode �Ŏw�肳�ꂽ���@�Ŋۂ߂��܂��B<BR>
-n ���[���Ȃ� * �Ɠ����ł��B
-
-</BLOCKQUOTE>
-<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
-�ȉ��̂悤�Ɏg�p���܂��B<BR>
-c = a.div(b,n)<BR>
-c = a / b ���ő�� n ���܂Ōv�Z���܂��B
-a / b �̐��x�� n ���傫���Ƃ��� BigDecimal.mode �Ŏw�肳�ꂽ���@�Ŋۂ߂��܂��B<BR>
-n ���[���Ȃ� / �Ɠ����ł��B<BR>
-n ���ȗ����ꂽ�Ƃ��� Float#div �Ɠ��l�Ɍ��ʂ�����(BigDecimal)�ɂȂ�܂��B
-</BLOCKQUOTE>
-
-<LI><B>fix</B></LI><BLOCKQUOTE>
-a �̏����_�ȉ��̐؂�̂āB<BR>
-c = a.fix
-</BLOCKQUOTE>
-<LI><B>frac</B></LI><BLOCKQUOTE>
-a �̐��������̐؂�̂āB<BR>
-c = a.frac
-</BLOCKQUOTE>
-
-<LI><B>floor[(n)]</B></LI><BLOCKQUOTE>
-c = a.floor<BR>
-a �ȉ��̍ő吮���iBigDecimal �l�j��Ԃ��܂��B
-<CODE><PRE>
-c = BigDecimal("1.23456").floor  #  ==> 1
-c = BigDecimal("-1.23456").floor #  ==> -2
-</PRE></CODE>
-�ȉ��̂悤�Ɉ��� n ��^���邱�Ƃ��ł��܂��B<BR>
-n>=0 �Ȃ�A�����_�ȉ� n+1 �ʂ̐����𑀍삵�܂�(�����_�ȉ����A�ő� n ���ɂ��܂�)�B<BR>
-n �����̂Ƃ��͏����_�ȏ� n ���ڂ𑀍삵�܂�(�����_�ʒu���獶�ɏ��Ȃ��Ƃ� n �� 0 �����т܂�)�B<BR>
-<CODE><PRE>
- c = BigDecimal("1.23456").floor(4)   #  ==> 1.2345
- c = BigDecimal("15.23456").floor(-1) #  ==> 10.0
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>ceil[(n)]</B></LI><BLOCKQUOTE>
-c = a.ceil<BR>
-a �ȏ�̐����̂����A�ł��������������v�Z���A���̒l�iBigDecimal �l�j��Ԃ��܂��B
-<CODE><PRE>
-c = BigDecimal("1.23456").ceil  #  ==> 2
-c = BigDecimal("-1.23456").ceil #  ==> -1
-</PRE></CODE>
-
-�ȉ��̂悤�Ɉ�����^���āA�����_�ȉ� n+1 �ʂ̐����𑀍삷�邱�Ƃ��ł��܂��B<BR>
-n>=0 �Ȃ�A�����_�ȉ� n+1 �ʂ̐����𑀍삵�܂�(�����_�ȉ����A�ő� n ���ɂ��܂�)�B<BR>
- n �����̂Ƃ��͏����_�ȏ� n ���ڂ��𑀍삵�܂�(�����_�ʒu���獶�ɏ��Ȃ��Ƃ� n �� 0 �����т܂�)�B<BR>
-<CODE><PRE>
- c = BigDecimal("1.23456").ceil(4)   # ==> 1.2346
- c = BigDecimal("15.23456").ceil(-1) # ==> 20.0
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
-c = a.round<BR>
-
-�N���X���\�b�h BigDecimal::mode(BigDecimal::ROUND_MODE,flag) �Ŏw�肵�� 
-ROUND_MODE �ɏ]���Ċۂߑ�������s���܂��B
-BigDecimal::mode(BigDecimal::ROUND_MODE,flag) �ŉ����w�肹���A���A����
-���w�肵�Ȃ��ꍇ�́u�����_�ȉ����ʂ̐����l�̌ܓ����Đ����iBigDecimal �l�j�v�ɂ��܂��B<BR>
-<CODE><PRE>
- c = BigDecimal("1.23456").round  #  ==> 1
- c = BigDecimal("-1.23456").round #  ==> -1
-</PRE></CODE>
-
-�ȉ��̂悤�Ɉ�����^���āA�����_�ȉ� n+1 �ʂ̐����𑀍삷�邱�Ƃ��ł��܂��B<BR>
-n �����̎��́A�����_�ȉ� n+1 �ʂ̐������ۂ߂܂�(�����_�ȉ����A�ő� n ���ɂ��܂�)�B<BR>
-n �����̂Ƃ��͏����_�ȏ� n ���ڂ��ۂ߂܂�(�����_�ʒu���獶�ɏ��Ȃ��Ƃ� n �� 0 �����т܂�)�B
-<CODE><PRE>
-c = BigDecimal("1.23456").round(4)   #  ==> 1.2346
-c = BigDecimal("15.23456").round(-1) #  ==> 20.0
-</PRE></CODE>
-�Q�Ԗڂ̈������w�肷��ƁABigDecimal#mode �̎w��𖳎����āA�w�肳�ꂽ���@��
-�ۂߑ�������s���܂��B
-<CODE><PRE>
-c = BigDecimal("1.23456").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
-c = BigDecimal("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>truncate</B></LI><BLOCKQUOTE>
-c = a.truncate<BR>
-�����_�ȉ��̐���؂�̂ĂĐ����iBigDecimal �l�j�ɂ��܂��B<BR>
-�ȉ��̂悤�Ɉ�����^���āA�����_�ȉ� n+1 �ʂ̐����𑀍삷�邱�Ƃ��ł��܂��B<BR>
-n �����̎��́A�����_�ȉ� n+1 �ʂ̐�����؂�̂Ă܂�(�����_�ȉ����A�ő� n ���ɂ��܂�)�B
-n �����̂Ƃ��͏����_�ȏ� n ���ڂ��𑀍삵�܂�(�����_�ʒu���獶�ɏ��Ȃ��Ƃ� n �� 0 �����т܂�)�B<BR>
-<CODE><PRE>
-c = BigDecimal("1.23456").truncate(4)   #  ==> 1.2345
-c = BigDecimal("15.23456").truncate(-1) #  ==> 10.0
-</PRE></CODE>
-</BLOCKQUOTE>
-
-</BLOCKQUOTE>
-<LI><B>abs</B></LI><BLOCKQUOTE>
-���̐�Βl<BR>
-c = a.abs<BR>
-
-</BLOCKQUOTE>
-<LI><B>to_i</B></LI><BLOCKQUOTE>
-�����_�ȉ���؂�̂ĂĐ����ɕϊ����܂��B<BR>
-i = a.to_i<BR>
-i �͒l�ɉ����� Fixnum �� Bignum �ɂȂ�܂��B
-a �� Infinity �� NaN �̂Ƃ��Ai �� nil �ɂȂ�܂��B
-</BLOCKQUOTE>
-<LI><B>to_f</B></LI><BLOCKQUOTE>
-Float �I�u�W�F�N�g�ɕϊ����܂��B
-��肫�ߍׂ����l���K�v�Ȃ�� split ���\�b�h�𗘗p����
-���������B
-</BLOCKQUOTE>
-<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
-������ɕϊ����܂�(�f�t�H���g�� "0.xxxxxEn" �̌`�ɂȂ�܂��j�B
-<CODE><PRE>
-BigDecimal("1.23456").to_s  #  ==> "0.123456E1"
-</PRE></CODE>
-���� n �ɐ��̐������w�肳�ꂽ�Ƃ��́A�����_�ŕ������鍶�E�������A���ꂼ�� n ����
-�ɋ󔒂ŋ�؂�܂��B
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(10)   #  ==> "0.1234567890 123456789E0"
-</PRE></CODE>
-���� n �ɐ��̐�����\����������w�肷�邱�Ƃ��ł��܂��B
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s("10") #  ==> "0.1234567890 123456789E0"
-</PRE></CODE>
-������̍ŏ��� '+'�i�܂��� ' '�j��t����ƁA�l�����̏ꍇ�A�擪�� '+'�i�܂��� ' '�j���t���܂�
-�i���̏ꍇ�́A��� '-' ���t���܂��B�j�B
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(" 10") #  ==> " 0.1234567890 123456789E0"
-BigDecimal("0.1234567890123456789").to_s("+10") #  ==> "+0.1234567890 123456789E0"
-BigDecimal("-0.1234567890123456789").to_s("10") #  ==> "-0.1234567890 123456789E0"
-</PRE></CODE>
-
-����ɕ�����̍Ō�� E(�܂��� e) �� F(�܂��� f) ���w�肷�邱�ƂŁA�ȉ��̂悤��
-�\���`����ύX���邱�Ƃ��ł��܂��B
-<CODE><PRE>
-BigDecimal("1234567890.123456789").to_s("E")  #  ==> "0.1234567890123456789E10"
-BigDecimal("1234567890.123456789").to_s("F")  #  ==> "1234567890.123456789"
-BigDecimal("1234567890.123456789").to_s("5E") #  ==> "0.12345 67890 12345 6789E10"
-BigDecimal("1234567890.123456789").to_s("5F") #  ==> "12345 67890.12345 6789"
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>exponent</B></LI><BLOCKQUOTE>
-�w�����𐮐��l�ŕԂ��܂��B
-n = a.exponent <BR>
-�� a �̒l�� 0.xxxxxxx*10**n ���Ӗ����܂��B
-</BLOCKQUOTE>
-
-<LI><B>precs</B></LI><BLOCKQUOTE>
-n,m  = a.precs<BR>
-a �̗L������ (n) �ƍő�L������ (m) �̔z���Ԃ��܂��B
-
-</BLOCKQUOTE>
-
-<LI><B>sign</B></LI><BLOCKQUOTE>
-�l����(sign &gt; 0)�A��(sign &lt; 0)�A���̑�(sigh==0)�ł��邩�̏���Ԃ��܂��B
-n = a.sign <BR>
-�Ƃ����Ƃ� n �̒l�� a ���ȉ��̂Ƃ����Ӗ����܂��B<BR>
-() �̒��̐����́A���ۂ̒l�ł�(<A HREF="#STRUCT">�u�����\���v</A>���Q��)�B<BR>
-n = BigDecimal::SIGN_NaN(0) : a �� NaN<BR>
-n = BigDecimal::SIGN_POSITIVE_ZERO(1) : a �� +0<BR>
-n = BigDecimal::SIGN_NEGATIVE_ZERO(-1) : a �� -0<BR>
-n = BigDecimal::SIGN_POSITIVE_FINITE(2) : a �͐��̒l<BR>
-n = BigDecimal::SIGN_NEGATIVE_FINITE(-2) : a �͕��̒l<BR>
-n = BigDecimal::SIGN_POSITIVE_INFINITE(3) : a ��+Infinity<BR>
-n = BigDecimal::SIGN_NEGATIVE_INFINITE(-3) : a ��-Infinity<BR>
-
-</BLOCKQUOTE>
-<LI><B>nan?</B></LI><BLOCKQUOTE>
-a.nan? �� a ��NaN�̂Ƃ��^��Ԃ��܂��B
-</BLOCKQUOTE>
-<LI><B>infinite?</B></LI><BLOCKQUOTE>
-a.infinite? �� a ��+���̂Ƃ� 1 �A-���̂Ƃ��� -1�A����ȊO�̂Ƃ��� nil ��Ԃ��܂��B
-</BLOCKQUOTE>
-<LI><B>finite?</B></LI><BLOCKQUOTE>
-a.finite? �� a �����܂��� NaN �łȂ��Ƃ��^��Ԃ��܂��B
-</BLOCKQUOTE>
-
-<LI><B>zero?</B></LI><BLOCKQUOTE>
-a �� 0 �Ȃ� true �ɂȂ�܂��B<BR>
-c = a.zero?
-</BLOCKQUOTE>
-<LI><B>nonzero?</B></LI><BLOCKQUOTE>
-a �� 0 �Ȃ� nil�A0 �ȊO�Ȃ� a ���̂��̂��Ԃ�܂��B<BR>
-c = a.nonzero?
-
-</BLOCKQUOTE>
-<LI><B>split</B></LI><BLOCKQUOTE>
-BigDecimal �l�� 0.xxxxxxx*10**n �ƕ\�������Ƃ��ɁA�����iNaN�̂Ƃ���
-0�A����ȊO��+1��-1�ɂȂ�܂��j�A
-���������̕�����i"xxxxxxx"�j�ƁA��i10�j�A�X�Ɏw�� n ��z���
-�Ԃ��܂��B<BR>
-a=BigDecimal::new("3.14159265")<BR>
-f,x,y,z = a.split<BR>
-�Ƃ���ƁAf=+1�Ax="314159265"�Ay=10�Az=1�ɂȂ�܂��B<BR>
-�]���āA<BR>
-s = "0."+x<BR>
-b = f*(s.to_f)*(y**z)<BR>
-�� Float �ɕϊ����邱�Ƃ��ł��܂��B
-</BLOCKQUOTE>
-<LI><B>inspect</B></LI><BLOCKQUOTE>
-�f�o�b�O�o�͂Ɏg�p����܂��B<BR>
-p a=BigDecimal::new("3.14",10)<BR>
-�Ƃ���ƁA[0x112344:'0.314E1',4(12)]�̂悤�ɏo�͂���܂��B
-�ŏ���16�i���̓I�u�W�F�N�g�̃A�h���X�A���� '0.314E1' �͒l�A
-����4�͌��݂̗L������(�\�����኱�傫�����Ƃ�����܂�)�A
-�Ō�̓I�u�W�F�N�g����蓾��ő包���ɂȂ�܂��B
-</BLOCKQUOTE>
-<LI><B>**</B></LI><BLOCKQUOTE>
-a �� n ����v�Z���܂��B���͐����B<BR>
-c = a ** n<BR>
-���ʂƂ��� c �̗L������ a �� n �{�ȏ�ɂȂ�̂Œ��ӁB
-</BLOCKQUOTE>
-<LI><B>power</B></LI><BLOCKQUOTE>
-** �Ɠ����ŁAa �� n ����v�Z���܂��B���͐����B<BR>
-c = a.power(n)<BR>
-���ʂƂ��� c �̗L������ a �� n �{�ȏ�ɂȂ�̂Œ��ӁB
-</BLOCKQUOTE>
-<LI><B>sqrt</B></LI><BLOCKQUOTE>
-a�̗L���� n ���̕������in �̕������ł͂���܂���j��
-�j���[�g���@�Ōv�Z���܂��B<BR>
-c = a.sqrt(n)<BR>
-</BLOCKQUOTE>
-
-<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
-�ڍׂ͑Ή����� Float �̊e���\�b�h���Q�Ƃ��ĉ������B
-</BLOCKQUOTE>
-
-<LI><B>&lt=&gt</B></LI><BLOCKQUOTE>
-a==b �Ȃ� 0�Aa &gt b �Ȃ� 1�Aa &lt b �Ȃ� -1 �ɂȂ�܂��B<BR>
-c = a &lt=&gt b 
-</BLOCKQUOTE>
-</UL>
-��́A�ǂ�Ŏ��̔@���ł��B<BR>
-<UL>
-<LI><B>==</B></LI>
-<LI><B>===</B></LI>
-�u==�v�Ɠ����ł��� case ���Ŏg�p����܂��B
-<LI><B>!=</B></LI>
-<LI><B>&lt</B></LI>
-<LI><B>&lt=</B></LI>
-<LI><B>&gt</B></LI>
-<LI><B>&gt=</B></LI>
-</UL>
-
-<H3>coerce�ɂ���</H3>
-BigDecimal �I�u�W�F�N�g���Z�p���Z�q�̍��ɂ���Ƃ��́ABigDecimal �I�u�W�F�N�g��
-�E�ɂ���I�u�W�F�N�g��(�K�v�Ȃ�) BigDecimal �ɕϊ����Ă���v�Z���܂��B
-�]���āABigDecimal �I�u�W�F�N�g�ȊO�ł����l���Ӗ�������̂Ȃ�E�ɒu����
-���Z�͉\�ł��B<BR>
-�������A������́i�ʏ�j���l�Ɏ����ϊ����邱�Ƃ͂ł��܂���B
-������𐔒l�Ɏ����ϊ��Ɏ����ϊ��������ꍇ�� bigfloat.c ��
-�u/* #define ENABLE_NUMERIC_STRING */�v�̃R�����g���O���Ă���A
-�ăR���p�C���A�ăC���X�g�[������K�v������܂��B
-������Ő��l��^����ꍇ�͒��ӂ��K�v�ł��B���l�ɕϊ��ł��Ȃ�����������ƁA
-�P�ɕϊ����~�߂邾���ŃG���[�ɂ͂Ȃ�܂���B"10XX"�Ȃ�P�O�A"XXXX"�͂O
-�ƈ����܂��B<BR>
-<CODE><PRE>
-   a = BigDecimal.E(20)
-   c = a * "0.123456789123456789123456789" # ������ BigDecimal �ɕϊ����Ă���v�Z
-</PRE></CODE>
-�������񐔂�\�������Ƃ��āA"Infinity"�A"+Infinity"�A"-Infinity"�A"NaN"
-���g�p�ł��܂�(�啶���E����������ʂ��܂�)�B�������Amode ���\�b�h�� false ��
-�w�肵���ꍇ�͗�O���������܂��B
-<BR>
-�܂��ABigDecimal�N���X�� coerce�iRuby�{�Q�Ɓj���T�|�[�g���Ă��܂��B
-�]���āABigDecimal �I�u�W�F�N�g���E�ɂ���ꍇ�����͑��v�ł��B
-�����A���݂� Ruby �C���^�v���^�̎d�l��A�����񂪍��ɂ���ƌv�Z�ł��܂���B<BR>
-<CODE><PRE>
-  a = BigDecimal.E(20)
-  c = "0.123456789123456789123456789" * a # �G���[
-</PRE></CODE>
-�K�v��������Ƃ͎v���܂��񂪁A�ǂ����Ă��ƌ����l��
- String �I�u�W�F�N�g���p�������V���ȃN���X���쐬���Ă���A
-���̃N���X�� coerce ���T�|�[�g���Ă��������B
-
-<hr>
-<A NAME="#UNDEF">
-<H2>�����A�񐔁A�[���̈���</H2>
-�u�����v�Ƃ͕\���ł��Ȃ����炢�傫�Ȑ��ł��B���ʂɈ������߂�
- +Infinity�i���̖�����j�� -Infinity�i���̖�����j�Ƃ���
-�悤�ɕ\�L����܂��B
-������ 1.0/0.0 �̂悤�Ƀ[���Ŋ���悤�Ȍv�Z�������Ƃ��ɐ�������܂��B
-<BR><BR>
-�u�񐔁v�� 0.0/0.0 �� Infinity-Infinity ���̌��ʂ���`�ł��Ȃ�
-�v�Z�������Ƃ��ɐ�������܂��B�񐔂� NaN�iNot a Number�j�ƕ\�L����܂��B
-NaN ���܂ތv�Z�͑S�� NaN �ɂȂ�܂��B�܂� NaN �͎������܂߂āA�ǂ�Ȑ�
-�Ƃ���v���܂���B
-<BR><BR>
-�[���� +0.0 �� -0.0 �����݂��܂��B�������A+0.0==-0.0 �� true �ł��B
-<BR><BR>
-Infinity�ANaN�A +0.0 �� -0.0 �����܂񂾌v�Z���ʂ͑g�ݍ��킹��
-��蕡�G�ł��B�����̂���l�́A�ȉ��̃v���O���������s���Č��ʂ�
-�m�F���Ă��������i���ʂɂ��āA�^���ԈႢ�𔭌����ꂽ����
-���m�点�肢�܂��j�B
-
-<PRE>
-<CODE>
-require "bigdecimal"
-
-aa  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
-ba  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
-opa = %w(+ - * / <=> > >=  < == != <=)
-
-for a in aa
-  for b in ba
-    for op in opa
-      x = BigDecimal::new(a)
-      y = BigDecimal::new(b)
-      eval("ans= x #{op} y;print a,' ',op,' ',b,' ==> ',ans.to_s,\"\n\"")
-    end
-  end
-end
-</CODE>
-</PRE>
-
-<hr>
-<A NAME="#STRUCT">
-<H2>�����\��</H2>
-BigDecimal�����ŕ��������_�͍\����(Real)�ŕ\������܂��B
-���̂����������� unsigned long �̔z��(�ȉ��̍\���̗v�ffrac)�ŊǗ�����܂��B
-�T�O�I�ɂ́A�ȉ��̂悤�ɂȂ�܂��B<BR><BR>
- <���������_��> = 0.xxxxxxxxx*BASE**n<BR><BR>
-�����ŁAx�͉�������\�������ABASE�͊�i�P�O�i�Ȃ�P�O�j�An�͎w������\��
-�����l�ł��BBASE���傫���قǁA�傫�Ȑ��l���\���ł��܂��B�܂�A�z��̃T�C�Y��
-���Ȃ��ł��܂��BBASE�͑傫���قǓs�����悢�킯�ł����A�f�o�b�O�̂��₷���Ȃǂ�
-�l�����āA10000�ɂȂ��Ă��܂��iBASE��VpInit()�֐��Ŏ����I�Ɍv�Z���܂��j�B
-����́A32�r�b�g�����̏ꍇ�ł��B64�r�b�g�����̏ꍇ�͂����Ƒ傫�Ȓl�ɂȂ�܂��B
-�c�O�Ȃ���A64�r�b�g�����ł̃e�X�g�͂܂�����Ă��܂���i�����A���ꂽ���������
-���ʂ������Ă���������΂��肪�����ł��j�B
-BASE��10000�̂Ƃ��́A�ȉ��̉������̔z��(frac)�̊e�v�f�ɂ͍ő�łS����
-�������i�[����܂��B<BR><BR>
-���������_�\����(Real)�͈ȉ��̂悤�ɂȂ��Ă��܂��B
-<BR>
-<CODE><PRE>
-  typedef struct {
-     unsigned long MaxPrec; // �ő吸�x(frac[]�̔z��T�C�Y)
-     unsigned long Prec;    // ���x(frac[]�̎g�p�T�C�Y)
-     short    sign;         // �ȉ��̂悤�ɕ������̏�Ԃ��`���܂��B
-                            //  ==0 : NaN
-                            //    1 : +0
-                            //   -1 : -0
-                            //    2 : ���̒l
-                            //   -2 : ���̒l
-                            //    3 : +Infinity
-                            //   -3 : -Infinity
-     unsigned short flag;   // �e��̐���t���b�O
-     int      exponent;     // �w�����̒l(������*BASE**exponent)
-     unsigned long frac[1]; // �������̔z��(��)
-  } Real;
-</CODE></PRE>
-�Ⴆ�� 1234.56784321 �Ƃ���������(BASE=10000�Ȃ�)<BR>
-<PRE>
-    0.1234 5678 4321*(10000)**1
-</PRE>
-�ł����� frac[0]=1234�Afrac[1]=5678�Afrac[2]=4321�A
-Prec=3�Asign=2�Aexponent=1 �ƂȂ�܂��BMaxPrec��
-Prec ���傫����΂����ł����܂��܂���Bflag ��
-�g�p���@�͎����Ɉˑ����ē����Ŏg�p����܂��B
-
-<hr>
-<A NAME="#BASE">
-<H2>2�i��10�i</H2>
-BigDecimal �� <���������_��> = 0.xxxxxxxxx*10**n �Ƃ���10�i�`���Ő��l��ێ����܂��B
-�������A�v�Z�@�̕��������_���̓����\���́A�����܂ł��Ȃ� <���������_��> = 0.bbbbbbbb*2**n �Ƃ���
-2�i�`�������ʂł�(x �� 0 ���� 9 �܂ŁAb �� 0 �� 1 �̐���)�B
-BigDecimal ���Ȃ�10�i�̓����\���`�����̗p�����̂����ȉ��ɐ������܂��B
-<H4>10�i�̃����b�g</H4>
-<DL>
-<DT>�f�o�b�O�̂��₷��
-<DD>�܂��A�v���O�����쐬���y�ł��Bfrac[0]=1234�Afrac[1]=5678�Afrac[2]=4321�A
-exponent=1�Asign=2 �Ȃ琔�l�� 1234.56784321 �ł���̂͌���Β����ɕ�����܂��B
-
-<DT>10�i�\�L���ꂽ���l�Ȃ�m���ɓ����\���ɕϊ��ł���
-<DD>�Ⴆ�΁A�ȉ��̂悤�ȃv���O�����͑S���덷������
-�v�Z���邱�Ƃ��ł��܂��B�ȉ��̗�́A��s�Ɉ�̐��l
-�������Ă���t�@�C�� file �̍��v���l�����߂���̂ł��B
-<CODE><PRE>
-   file = File::open(....,"r")
-   s = BigDecimal::new("0")
-   while line = file.gets
-      s = s + line
-   end
-</PRE></CODE>
-���̗��2�i���ł��ƌ덷�����荞�މ\��������܂��B
-�Ⴆ�� 0.1 ��2�i�ŕ\������� 0.1 = b1*2**(-1)+b1*2**(-2)+b3*2**(-3)+b4*2**(-4)....
-�Ɩ����ɑ����Ă��܂��܂�(b1=0,b2=0,b3=0,b4=1...)�B������ bn(n=1,2,3,...) ��
-2�i��\������ 0 �� 1 �̐�����ł��B�]���āA�ǂ����őł��؂�K�v������܂��B
-�����ŕϊ��덷������܂��B�������A������ēx10�i�\�L�ɂ��Ĉ������悤��
-�ꍇ�͓K�؂Ȋۂߑ���i�l�̌ܓ��j�ɂ���čĂ� "0.1" �ƕ\������܂��B�������A
-�����ł͐��m�� 0.1 �ł͂���܂���B
-
-<DT>�L�������͗L���ł���i�܂莩������ł���j
-<DD>0.1 ��\�����邽�߂̗̈�͂�������̔z��v�f�i frac[0]=1 �j�ōς݂܂��B
-�z��v�f�̐���10�i���l���玩���I�Ɍ���ł��܂��B����́A�ϒ����������_���Z�ł�
-�厖�Ȃ��Ƃł��B�t�� 0.1 ��2�i�\�������Ƃ��ɂ�2�i�̗L�����������ɂ���̂� 0.1 ��
-���������ł͌���ł��܂���B
-</DL>
-
-<H3>10�i�̃f�����b�g</H3>
-���͍��܂ł̃����b�g�́A���̂܂܃f�����b�g�ɂ��Ȃ�܂��B
-���������A10�i��2�i�A2�i��10�i�ɕϊ�����悤�ȑ���͕ϊ��덷
-�𔺂��ꍇ��������邱�Ƃ͂ł��܂���B
-���Ɍv�Z�@�����Ɏ�荞�܂ꂽ2�i���l�� BigDecimal �̓����\����
-�ϊ�����Ƃ��ɂ͌덷���������Ȃ��ꍇ������܂��B
-
-<H3>�ŏ��͉����H</H3>
-�����Ōv�Z����Ƃ��ɂ킴�킴2�i�����g���l�͋ɂ߂Ă܂�ł��B
-�v�Z�@�Ƀf�[�^����͂���Ƃ����قƂ�ǂ̏ꍇ�A
-10�i���œ��͂��܂��B���̌��ʁAdouble ���̌v�Z�@����
-�\���͍ŏ�����덷�������Ă���ꍇ������܂��B
-BigDecimal �̓��[�U���͂��덷�����Ŏ�荞�ނ��Ƃ��ł��܂��B
-�f�o�b�O�����₷���̂ƁA�f�[�^�ǂ݂��ݎ��Ɍ덷������Ȃ�
-�Ƃ����̂����ۂ̃����b�g�ł��B
-
-<hr>
-<A NAME="#PREC">
-<H2>�v�Z���x�ɂ���</H2>
-c = a op b �Ƃ����v�Z(op �� + - * /)�������Ƃ��̓����
-�ȉ��̂悤�ɂȂ�܂��B<BR><BR>
-�P�D��Z��(a �̗L������)+(b �̗L������)�A
-���Z��(a �̍ő�L������)+(b �̍ő�L������)���̍ő包���i���ۂ́A�]�T�������āA
-���������傫���Ȃ�܂��j�����ϐ� c ��V���ɐ������܂��B
-�����Z�̏ꍇ�́A�덷���o�Ȃ������̐��x������ c �𐶐����܂��B�Ⴆ��
- c = 0.1+0.1*10**(-100) �̂悤�ȏꍇ�Ac �̐��x�͂P�O�O���ȏ�̐��x��
-���悤�ɂȂ�܂��B
-<BR><BR>
-�Q�D���� c = a op b �̌v�Z�����s���܂��B<BR><BR>
-���̂悤�ɁA�����Z�Ə�Z�ł� c �͕K���u�덷���o�Ȃ��v�����̐��x��
-�����Đ�������܂�(BigDecimal.limit ���w�肵�Ȃ��ꍇ)�B
-���Z��(a �̍ő�L������)+(b �̍ő�L������)���̍ő包��
-������ c ����������܂����Ac = 1.0/3.0 �̂悤�Ȍv�Z�Ŗ��炩�Ȃ悤�ɁA
- c �̍ő吸�x�𒴂���Ƃ���Ōv�Z���ł��؂���ꍇ������܂��B<BR><BR>
-������ɂ���Ac �̍ő吸�x�� a �� b ���傫���Ȃ�܂��̂� c ���K�v�Ƃ���
-�������[�̈�͑傫���Ȃ邱�Ƃɒ��ӂ��ĉ������B
-<BR><BR>
-���ӁF�u+,-,*,/�v�ł͌��ʂ̐��x�i�L�������j�������Ŏw��ł��܂���B
-���x���R���g���[���������ꍇ�́A�ȉ��̃C���X�^���X���\�b�h���g�p���܂��B<BR>
-<UL>
-<LI>add,sub,mult,div</LI><BLOCKQUOTE>
-�����̃��\�b�h�͐擪(�ō�)�̐�������̌������w��ł��܂��B
-<CODE><PRE>
- BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
-</PRE></CODE>
-</BLOCKQUOTE>
-<LI>truncate,round,ceil,floor</LI><BLOCKQUOTE>
-�����̃��\�b�h�͏����_����̑��Έʒu���w�肵�Č��������肵�܂��B
-<CODE><PRE>
- BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
-</PRE></CODE>
-</BLOCKQUOTE>
-</UL>
-<H3>�����Ő��x���R���g���[���������ꍇ</H3>
-�����Ő��x(�L������)���R���g���[���������ꍇ�� add�Asub�Amult�Adiv ���̃��\�b�h
-���g�p�ł��܂��B
-�ȉ��̉~�������v�Z����v���O������̂悤�ɁA
-���߂錅���͎����Ŏw�肷�邱�Ƃ��ł��܂��B
-<BR><BR>
-<CODE><PRE>
-#!/usr/local/bin/ruby
-
-require "bigdecimal"
-#
-# Calculates 3.1415.... (the number of times that a circle's diameter
-# will fit around the circle) using J. Machin's formula.
-#
-def big_pi(sig) # sig: Number of significant figures
-  exp    = -sig
-  pi     = BigDecimal::new("0")
-  two    = BigDecimal::new("2")
-  m25    = BigDecimal::new("-0.04")
-  m57121 = BigDecimal::new("-57121")
-
-  u = BigDecimal::new("1")
-  k = BigDecimal::new("1")
-  w = BigDecimal::new("1")
-  t = BigDecimal::new("-80")
-  while (u.nonzero? && u.exponent >= exp) 
-    t   = t*m25
-    u   = t.div(k,sig)
-    pi  = pi + u
-    k   = k+two
-  end
-
-  u = BigDecimal::new("1")
-  k = BigDecimal::new("1")
-  w = BigDecimal::new("1")
-  t = BigDecimal::new("956")
-  while (u.nonzero? && u.exponent >= exp )
-    t   = t.div(m57121,sig)
-    u   = t.div(k,sig)
-    pi  = pi + u
-    k   = k+two
-  end
-  pi
-end
-
-if $0 == __FILE__
-  if ARGV.size == 1
-    print "PI("+ARGV[0]+"):\n"
-    p big_pi(ARGV[0].to_i)
-  else
-    print "TRY: ruby pi.rb 1000 \n"
-  end
-end
-
-</PRE></CODE>
-<HR>
-<FONT size=2>
-<I>
-<A HREF="http://www.tinyforest.gr.jp">
-���� �ΗY
-</A>
-(E-Mail:<A HREF="mailto:shigeo@tinyforest.gr.jp">&ltshigeo@tinyforest.gr.jp&gt</U></A>)
-</I>
-</FONT>
-</TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/ext/bigdecimal/depend b/ext/bigdecimal/depend
deleted file mode 100644
index 402cae95dd..0000000000
--- a/ext/bigdecimal/depend
+++ /dev/null
@@ -1 +0,0 @@
-bigdecimal.o: bigdecimal.c bigdecimal.h $(hdrdir)/ruby.h
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
deleted file mode 100644
index a68a656044..0000000000
--- a/ext/bigdecimal/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('bigdecimal')
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
deleted file mode 100644
index 34a60ae67a..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# jacobian.rb
-#
-# Computes Jacobian matrix of f at x
-#
-module Jacobian
-  def isEqual(a,b,zero=0.0,e=1.0e-8)
-    aa = a.abs
-    bb = b.abs
-    if aa == zero &&  bb == zero then
-          true
-    else
-          if ((a-b)/(aa+bb)).abs < e then
-             true
-          else
-             false
-          end
-    end
-  end
-
-  def dfdxi(f,fx,x,i)
-    nRetry = 0
-    n = x.size
-    xSave = x[i]
-    ok = 0
-    ratio = f.ten*f.ten*f.ten
-    dx = x[i].abs/ratio
-    dx = fx[i].abs/ratio if isEqual(dx,f.zero,f.zero,f.eps)
-    dx = f.one/f.ten     if isEqual(dx,f.zero,f.zero,f.eps)
-    until ok>0 do
-      s = f.zero
-      deriv = []
-      if(nRetry>100) then
-         raize "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
-      end
-      dx = dx*f.two
-      x[i] += dx
-      fxNew = f.values(x)
-      for j in 0...n do
-        if !isEqual(fxNew[j],fx[j],f.zero,f.eps) then
-           ok += 1
-           deriv <<= (fxNew[j]-fx[j])/dx
-        else
-           deriv <<= f.zero
-        end
-      end
-      x[i] = xSave
-    end
-    deriv
-  end
-
-  def jacobian(f,fx,x)
-    n = x.size
-    dfdx = Array::new(n*n)
-    for i in 0...n do
-      df = dfdxi(f,fx,x,i)
-      for j in 0...n do
-         dfdx[j*n+i] = df[j]
-      end
-    end
-    dfdx
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
deleted file mode 100644
index 1d5d3170cc..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# ludcmp.rb
-#
-module LUSolve
-  def ludecomp(a,n,zero=0,one=1)
-    prec = BigDecimal.limit(nil)
-    ps     = []
-    scales = []
-    for i in 0...n do  # pick up largest(abs. val.) element in each row.
-      ps <<= i
-      nrmrow  = zero
-      ixn = i*n
-      for j in 0...n do
-         biggst = a[ixn+j].abs
-         nrmrow = biggst if biggst>nrmrow
-      end
-      if nrmrow>zero then
-         scales <<= one.div(nrmrow,prec)
-      else 
-         raise "Singular matrix"
-      end
-    end
-    n1          = n - 1
-    for k in 0...n1 do # Gaussian elimination with partial pivoting.
-      biggst  = zero;
-      for i in k...n do
-         size = a[ps[i]*n+k].abs*scales[ps[i]]
-         if size>biggst then
-            biggst = size
-            pividx  = i
-         end
-      end
-      raise "Singular matrix" if biggst<=zero
-      if pividx!=k then
-        j = ps[k]
-        ps[k] = ps[pividx]
-        ps[pividx] = j
-      end
-      pivot   = a[ps[k]*n+k]
-      for i in (k+1)...n do
-        psin = ps[i]*n
-        a[psin+k] = mult = a[psin+k].div(pivot,prec)
-        if mult!=zero then
-           pskn = ps[k]*n
-           for j in (k+1)...n do
-             a[psin+j] -= mult.mult(a[pskn+j],prec)
-           end
-        end
-      end
-    end
-    raise "Singular matrix" if a[ps[n1]*n+n1] == zero
-    ps
-  end
-
-  def lusolve(a,b,ps,zero=0.0)
-    prec = BigDecimal.limit(nil)
-    n = ps.size
-    x = []
-    for i in 0...n do
-      dot = zero
-      psin = ps[i]*n
-      for j in 0...i do
-        dot = a[psin+j].mult(x[j],prec) + dot
-      end
-      x <<= b[ps[i]] - dot
-    end
-    (n-1).downto(0) do |i|
-       dot = zero
-       psin = ps[i]*n
-       for j in (i+1)...n do
-         dot = a[psin+j].mult(x[j],prec) + dot
-       end
-       x[i]  = (x[i]-dot).div(a[psin+i],prec)
-    end
-    x
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
deleted file mode 100644
index 7b3f46ed1a..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-#
-# Contents:
-#   sqrt(x, prec)
-#   sin (x, prec)
-#   cos (x, prec)
-#   atan(x, prec)  Note: |x|<1, x=0.9999 may not converge.
-#   exp (x, prec)
-#   log (x, prec)
-#   PI  (prec)
-#   E   (prec) == exp(1.0,prec)
-#
-# where:
-#   x    ... BigDecimal number to be computed.
-#            |x| must be small enough to get convergence.
-#   prec ... Number of digits to be obtained.
-#
-# Usage:
-#   require "bigdecimal"
-#   require "bigdecimal/math.rb"
-#   include BigMath
-#   a = BigDecimal((PI(100)/2).to_s)
-#   puts sin(a,100) # => 0.10000000000000000000......E1
-#
-module BigMath
-  def sqrt(x,prec)
-    x.sqrt(prec)
-  end
-
-  def sin(x, prec)
-    raise ArgumentError, "Zero or negative precision for sin" if prec <= 0
-    return BigDecimal("NaN") if x.infinite? || x.nan?
-    n    = prec + BigDecimal.double_fig
-    one  = BigDecimal("1")
-    two  = BigDecimal("2")
-    x1   = x
-    x2   = x.mult(x,n)
-    sign = 1
-    y    = x
-    d    = y
-    i    = one
-    z    = one
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      sign = -sign
-      x1  = x2.mult(x1,n)
-      i  += two
-      z  *= (i-one) * i
-      d   = sign * x1.div(z,m)
-      y  += d
-    end
-    y
-  end
-
-  def cos(x, prec)
-    raise ArgumentError, "Zero or negative precision for cos" if prec <= 0
-    return BigDecimal("NaN") if x.infinite? || x.nan?
-    n    = prec + BigDecimal.double_fig
-    one  = BigDecimal("1")
-    two  = BigDecimal("2")
-    x1 = one
-    x2 = x.mult(x,n)
-    sign = 1
-    y = one
-    d = y
-    i = BigDecimal("0")
-    z = one
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      sign = -sign
-      x1  = x2.mult(x1,n)
-      i  += two
-      z  *= (i-one) * i
-      d   = sign * x1.div(z,m)
-      y  += d
-    end
-    y
-  end
-
-  def atan(x, prec)
-    raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
-    return BigDecimal("NaN") if x.infinite? || x.nan?
-    raise ArgumentError, "x.abs must be less than 1.0" if x.abs>=1
-    n    = prec + BigDecimal.double_fig
-    y = x
-    d = y
-    t = x
-    r = BigDecimal("3")
-    x2 = x.mult(x,n)
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      t = -t.mult(x2,n)
-      d = t.div(r,m)
-      y += d
-      r += 2
-    end
-    y
-  end
-
-  def exp(x, prec)
-    raise ArgumentError, "Zero or negative precision for exp" if prec <= 0
-    return BigDecimal("NaN") if x.infinite? || x.nan?
-    n    = prec + BigDecimal.double_fig
-    one  = BigDecimal("1")
-    x1 = one
-    y  = one
-    d  = y
-    z  = one
-    i  = 0
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      x1  = x1.mult(x,n)
-      i += 1
-      z *= i
-      d  = x1.div(z,m)
-      y += d
-    end
-    y
-  end
-
-  def log(x, prec)
-    raise ArgumentError, "Zero or negative argument for log" if x <= 0 || prec <= 0
-    return x if x.infinite? || x.nan?
-    one = BigDecimal("1")
-    two = BigDecimal("2")
-    n  = prec + BigDecimal.double_fig
-    x  = (x - one).div(x + one,n)
-    x2 = x.mult(x,n)
-    y  = x
-    d  = y
-    i = one
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      x  = x2.mult(x,n)
-      i += two
-      d  = x.div(i,m)
-      y += d
-    end
-    y*two
-  end
-
-  def PI(prec)
-    raise ArgumentError, "Zero or negative argument for PI" if prec <= 0
-    n      = prec + BigDecimal.double_fig
-    zero   = BigDecimal("0")
-    one    = BigDecimal("1")
-    two    = BigDecimal("2")
-
-    m25    = BigDecimal("-0.04")
-    m57121 = BigDecimal("-57121")
-
-    pi     = zero
-
-    d = one
-    k = one
-    w = one
-    t = BigDecimal("-80")
-    while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      t   = t*m25
-      d   = t.div(k,m)
-      k   = k+two
-      pi  = pi + d
-    end
-
-    d = one
-    k = one
-    w = one
-    t = BigDecimal("956")
-    while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      t   = t.div(m57121,n)
-      d   = t.div(k,m)
-      pi  = pi + d
-      k   = k+two
-    end
-    pi
-  end
-
-  def E(prec)
-    raise ArgumentError, "Zero or negative precision for E" if prec <= 0
-    n    = prec + BigDecimal.double_fig
-    one  = BigDecimal("1")
-    y  = one
-    d  = y
-    z  = one
-    i  = 0
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      i += 1
-      z *= i
-      d  = one.div(z,m)
-      y += d
-    end
-    y
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
deleted file mode 100644
index 67a92474ac..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# newton.rb 
-#
-# Solves nonlinear algebraic equation system f = 0 by Newton's method.
-#  (This program is not dependent on BigDecimal)
-#
-# To call:
-#    n = nlsolve(f,x)
-#  where n is the number of iterations required.
-#        x is the solution vector.
-#        f is the object to be solved which must have following methods.
-#
-#   f ... Object to compute Jacobian matrix of the equation systems.
-#       [Methods required for f]
-#         f.values(x) returns values of all functions at x.
-#         f.zero      returns 0.0
-#         f.one       returns 1.0
-#         f.two       returns 1.0
-#         f.ten       returns 10.0
-#         f.eps       convergence criterion
-#   x ... initial values
-#
-require "ludcmp"
-require "jacobian"
-
-module Newton
-  include LUSolve
-  include Jacobian
-  
-  def norm(fv,zero=0.0)
-    s = zero
-    n = fv.size
-    for i in 0...n do
-      s += fv[i]*fv[i]
-    end
-    s
-  end
-
-  def nlsolve(f,x)
-    nRetry = 0
-    n = x.size
-
-    f0 = f.values(x)
-    zero = f.zero
-    one  = f.one
-    two  = f.two
-    p5 = one/two
-    d  = norm(f0,zero)
-    minfact = f.ten*f.ten*f.ten
-    minfact = one/minfact
-    e = f.eps
-    while d >= e do
-      nRetry += 1
-      # Not yet converged. => Compute Jacobian matrix
-      dfdx = jacobian(f,f0,x)
-      # Solve dfdx*dx = -f0 to estimate dx
-      dx = lusolve(dfdx,f0,ludecomp(dfdx,n,zero,one),zero)
-      fact = two
-      xs = x.dup
-      begin
-        fact *= p5
-        if fact < minfact then
-          raize "Failed to reduce function values."
-        end
-        for i in 0...n do
-          x[i] = xs[i] - dx[i]*fact
-        end
-        f0 = f.values(x)
-        dn = norm(f0,zero)
-      end while(dn>=d)
-      d = dn
-    end
-    nRetry
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/nlsolve.rb b/ext/bigdecimal/lib/bigdecimal/nlsolve.rb
deleted file mode 100644
index 08f17f9ecd..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/nlsolve.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/local/bin/ruby
-
-#
-# nlsolve.rb
-# An example for solving nonlinear algebraic equation system.
-#
-
-require "bigdecimal"
-require "newton"
-include Newton
-
-class Function
-  def initialize()
-    @zero = BigDecimal::new("0.0")
-    @one  = BigDecimal::new("1.0")
-    @two  = BigDecimal::new("2.0")
-    @ten  = BigDecimal::new("10.0")
-    @eps  = BigDecimal::new("1.0e-16")
-  end
-  def zero;@zero;end
-  def one ;@one ;end
-  def two ;@two ;end
-  def ten ;@ten ;end
-  def eps ;@eps ;end
-  def values(x) # <= defines functions solved
-    f = []
-    f1 = x[0]*x[0] + x[1]*x[1] - @two # f1 = x**2 + y**2 - 2 => 0
-    f2 = x[0] - x[1]                  # f2 = x    - y        => 0
-    f <<= f1
-    f <<= f2
-    f
-  end
-end
- f = BigDecimal::limit(100)
- f = Function.new
- x = [f.zero,f.zero]      # Initial values
- n = nlsolve(f,x)
- p x
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
deleted file mode 100644
index 1f8d6c7a49..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# BigDecimal utility library.
-# ----------------------------------------------------------------------
-# Contents:
-#
-#   String#
-#     to_d      ... to BigDecimal
-#
-#   Float#
-#     to_d      ... to BigDecimal
-#
-#   BigDecimal#
-#     to_r      ... to Rational
-#
-#   Rational#
-#     to_d      ... to BigDecimal
-#
-# ----------------------------------------------------------------------
-#
-class Float < Numeric
-  def to_d
-    BigDecimal(self.to_s)
-  end
-end
-
-class String
-  def to_d
-    BigDecimal(self)
-  end
-end
-
-class BigDecimal < Numeric
-  # to "nnnnnn.mmm" form digit string
-  # Use BigDecimal#to_s("F") instead.
-  def to_digits
-     if self.nan? || self.infinite? || self.zero?
-        self.to_s
-     else
-       i       = self.to_i.to_s
-       s,f,y,z = self.frac.split
-       i + "." + ("0"*(-z)) + f
-     end
-  end
-
-  # Convert BigDecimal to Rational
-  def to_r 
-     sign,digits,base,power = self.split
-     numerator = sign*digits.to_i
-     denomi_power = power - digits.size # base is always 10
-     if denomi_power < 0
-        denominator = base ** (-denomi_power)
-     else
-        denominator = base ** denomi_power
-     end
-     Rational(numerator,denominator)
-  end
-end
-
-class Rational < Numeric
-  # Convert Rational to BigDecimal
-  def to_d(nFig=0)
-     num = self.numerator.to_s
-     if nFig<=0
-        nFig = BigDecimal.double_fig*2+1
-     end
-     BigDecimal.new(num).div(self.denominator,nFig)
-  end
-end
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
deleted file mode 100644
index 7c8ca263eb..0000000000
--- a/ext/bigdecimal/sample/linear.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/local/bin/ruby
-
-#
-# linear.rb
-#
-# Solves linear equation system(A*x = b) by LU decomposition method.
-#  where  A is a coefficient matrix,x is an answer vector,b is a constant vector.
-#
-# USAGE:
-#   ruby linear.rb [input file solved]
-#
-
-require "bigdecimal"
-require "ludcmp"
-
-#
-# NOTE:
-#   Change following BigDecimal::limit() if needed.
-BigDecimal::limit(100)
-#
-
-include LUSolve
-def rd_order(na)
-   printf("Number of equations ?") if(na <= 0)
-   n = ARGF.gets().to_i
-end
-
-na   = ARGV.size
-zero = BigDecimal::new("0.0")
-one  = BigDecimal::new("1.0")
-
-while (n=rd_order(na))>0
-  a = []
-  as= []
-  b = []
-  if na <= 0
-     # Read data from console.
-     printf("\nEnter coefficient matrix element A[i,j]\n");
-     for i in 0...n do
-       for j in 0...n do
-         printf("A[%d,%d]? ",i,j); s = ARGF.gets
-         a  << BigDecimal::new(s);
-         as << BigDecimal::new(s);
-       end
-       printf("Contatant vector element b[%d] ? ",i); b << BigDecimal::new(ARGF.gets);
-     end
-  else
-     # Read data from specified file.
-     printf("Coefficient matrix and constant vector.\n");
-     for i in 0...n do
-       s = ARGF.gets
-       printf("%d) %s",i,s)
-       s = s.split
-       for j in 0...n do
-         a  << BigDecimal::new(s[j]);
-         as << BigDecimal::new(s[j]);
-       end
-       b << BigDecimal::new(s[n]);
-     end
-  end
-  x = lusolve(a,b,ludecomp(a,n,zero,one),zero)
-  printf("Answer(x[i] & (A*x-b)[i]) follows\n")
-  for i in 0...n do
-     printf("x[%d]=%s ",i,x[i].to_s)
-     s = zero
-     for j in 0...n do
-       s = s + as[i*n+j]*x[j]
-     end
-     printf(" & %s\n",(s-b[i]).to_s)
-  end
-end
diff --git a/ext/bigdecimal/sample/nlsolve.rb b/ext/bigdecimal/sample/nlsolve.rb
deleted file mode 100644
index 08f17f9ecd..0000000000
--- a/ext/bigdecimal/sample/nlsolve.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/local/bin/ruby
-
-#
-# nlsolve.rb
-# An example for solving nonlinear algebraic equation system.
-#
-
-require "bigdecimal"
-require "newton"
-include Newton
-
-class Function
-  def initialize()
-    @zero = BigDecimal::new("0.0")
-    @one  = BigDecimal::new("1.0")
-    @two  = BigDecimal::new("2.0")
-    @ten  = BigDecimal::new("10.0")
-    @eps  = BigDecimal::new("1.0e-16")
-  end
-  def zero;@zero;end
-  def one ;@one ;end
-  def two ;@two ;end
-  def ten ;@ten ;end
-  def eps ;@eps ;end
-  def values(x) # <= defines functions solved
-    f = []
-    f1 = x[0]*x[0] + x[1]*x[1] - @two # f1 = x**2 + y**2 - 2 => 0
-    f2 = x[0] - x[1]                  # f2 = x    - y        => 0
-    f <<= f1
-    f <<= f2
-    f
-  end
-end
- f = BigDecimal::limit(100)
- f = Function.new
- x = [f.zero,f.zero]      # Initial values
- n = nlsolve(f,x)
- p x
diff --git a/ext/bigdecimal/sample/pi.rb b/ext/bigdecimal/sample/pi.rb
deleted file mode 100644
index 2f7dd27d60..0000000000
--- a/ext/bigdecimal/sample/pi.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/local/bin/ruby
-
-#
-# pi.rb
-#
-# Calculates 3.1415.... (the number of times that a circle's diameter
-# will fit around the circle) using J. Machin's formula.
-#
-
-require "bigdecimal"
-require "bigdecimal/math.rb"
-
-include BigMath
-
-if ARGV.size == 1
-    print "PI("+ARGV[0]+"):\n"
-    p PI(ARGV[0].to_i)
-else
-    print "TRY: ruby pi.rb 1000 \n"
-end
diff --git a/ext/curses/.cvsignore b/ext/curses/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/curses/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/curses/MANIFEST b/ext/curses/MANIFEST
index 5882d682f0..db5e54ffe8 100644
--- a/ext/curses/MANIFEST
+++ b/ext/curses/MANIFEST
@@ -1,9 +1,6 @@
 MANIFEST
 curses.c
-depend
 extconf.rb
 hello.rb
 rain.rb
 view.rb
-view2.rb
-mouse.rb
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 8aa095e5a5..202a0f9244 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -1,86 +1,62 @@
-/* -*- C -*-
- * $Id$
- *
+/*
  * ext/curses/curses.c
  * 
  * by MAEDA Shugo (ender@pic-internet.or.jp)
- * modified by Yukihiro Matsumoto (matz@netlab.co.jp),
- *         Toki Yoshinori,
- *         Hitoshi Takahashi,
- *         and Takaaki Tateishi (ttate@kt.jaist.ac.jp)
- *
- * maintainers:
- * - Takaaki Tateishi (ttate@kt.jaist.ac.jp)
+ * modified by Yukihiro Matsumoto (matz@netlab.co.jp)
  */
 
-#include "ruby.h"
-#include "rubyio.h"
-
-#if defined(HAVE_NCURSES_H)
+#ifdef HAVE_NCURSES_H
 # include <ncurses.h>
-#elif defined(HAVE_NCURSES_CURSES_H)
-# include <ncurses/curses.h>
-#elif defined(HAVE_CURSES_COLR_CURSES_H)
-# include <varargs.h>
-# include <curses_colr/curses.h>
 #else
-# include <curses.h>
-# if defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)
-#  if !defined(_maxx)
-#  define _maxx maxx
+# ifdef HAVE_NCURSES_CURSES_H
+#  include <ncurses/curses.h>
+#else
+# ifdef HAVE_CURSES_COLR_CURSES_H
+#  include <varargs.h>
+#  include <curses_colr/curses.h>
+# else
+#  include <curses.h>
+#  if (defined(__bsdi__) || defined(__NetBSD__)) && !defined(_maxx)
+#   define _maxx maxx
 #  endif
-#  if !defined(_maxy)
-#  define _maxy maxy
+#  if (defined(__bsdi__) || defined(__NetBSD__)) && !defined(_maxy)
+#   define _maxy maxy
 #  endif
-#  if !defined(_begx)
-#  define _begx begx
+#  if (defined(__bsdi__) || defined(__NetBSD__)) && !defined(_begx)
+#   define _begx begx
 #  endif
-#  if !defined(_begy)
-#  define _begy begy
+#  if (defined(__bsdi__) || defined(__NetBSD__)) && !defined(_begy)
+#   define _begy begy
 #  endif
 # endif
 #endif
-
-#ifdef HAVE_INIT_COLOR
-# define USE_COLOR 1
 #endif
 
-/* supports only ncurses mouse routines */
-#ifdef NCURSES_MOUSE_VERSION
-# define USE_MOUSE 1
-#endif
+#include "stdio.h"
+#include "ruby.h"
+#include "rubyio.h"
 
 static VALUE mCurses;
-static VALUE mKey;
 static VALUE cWindow;
-#ifdef USE_MOUSE
-static VALUE cMouseEvent;
-#endif
 
-static VALUE rb_stdscr;
+VALUE rb_stdscr;
 
 struct windata {
     WINDOW *window;
 };
 
-#define CHECK(c) c
-
-static VALUE window_attroff();
-static VALUE window_attron();
-static VALUE window_attrset();
-
 static void
 no_window()
 {
     rb_raise(rb_eRuntimeError, "already closed window");
 }
 
-#define GetWINDOW(obj, winp) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted window");\
+#define GetWINDOW(obj, winp) {\
     Data_Get_Struct(obj, struct windata, winp);\
     if (winp->window == 0) no_window();\
-} while (0)
+}
+
+#define CHECK(c) c
 
 static void
 free_window(winp)
@@ -103,8 +79,7 @@ prep_window(class, window)
 	rb_raise(rb_eRuntimeError, "failed to create window");
     }
 
-    obj = rb_obj_alloc(class);
-    Data_Get_Struct(obj, struct windata, winp);
+    obj = Data_Make_Struct(class, struct windata, 0, free_window, winp);
     winp->window = window;
     
     return obj;    
@@ -116,19 +91,22 @@ prep_window(class, window)
 static VALUE
 curses_init_screen()
 {
-    rb_secure(4);
-    if (rb_stdscr) return rb_stdscr;
     initscr();
     if (stdscr == 0) {
 	rb_raise(rb_eRuntimeError, "cannot initialize curses");
     }
     clear();
     rb_stdscr = prep_window(cWindow, stdscr);
-    return rb_stdscr;
+    return Qnil;
 }
 
 /* def stdscr */
-#define curses_stdscr curses_init_screen
+static VALUE
+curses_stdscr()
+{
+    if (rb_stdscr == 0) curses_init_screen();
+    return rb_stdscr;
+}
 
 /* def close_screen */
 static VALUE
@@ -138,12 +116,11 @@ curses_close_screen()
     if (!isendwin())
 #endif
 	endwin();
-    rb_stdscr = 0;
     return Qnil;
 }
 
 static void
-curses_finalize(VALUE dummy)
+curses_finalize()
 {
     if (stdscr
 #ifdef HAVE_ISENDWIN
@@ -151,8 +128,6 @@ curses_finalize(VALUE dummy)
 #endif
 	)
 	endwin();
-    rb_stdscr = 0;
-    rb_gc_unregister_address(&rb_stdscr);
 }
 
 /* def closed? */
@@ -174,7 +149,6 @@ static VALUE
 curses_clear(obj)
     VALUE obj;
 {
-    curses_stdscr();
     wclear(stdscr);
     return Qnil;
 }
@@ -184,7 +158,6 @@ static VALUE
 curses_refresh(obj)
     VALUE obj;
 {
-    curses_stdscr();
     refresh();
     return Qnil;
 }
@@ -194,7 +167,6 @@ static VALUE
 curses_doupdate(obj)
     VALUE obj;
 {
-    curses_stdscr();
 #ifdef HAVE_DOUPDATE
     doupdate();
 #else
@@ -208,7 +180,6 @@ static VALUE
 curses_echo(obj)
     VALUE obj;
 {
-    curses_stdscr();
     echo();
     return Qnil;
 }
@@ -218,7 +189,6 @@ static VALUE
 curses_noecho(obj)
     VALUE obj;
 {
-    curses_stdscr();
     noecho();
     return Qnil;
 }
@@ -228,7 +198,6 @@ static VALUE
 curses_raw(obj)
     VALUE obj;
 {
-    curses_stdscr();
     raw();
     return Qnil;
 }
@@ -238,7 +207,6 @@ static VALUE
 curses_noraw(obj)
     VALUE obj;
 {
-    curses_stdscr();
     noraw();
     return Qnil;
 }
@@ -248,7 +216,6 @@ static VALUE
 curses_cbreak(obj)
     VALUE obj;
 {
-    curses_stdscr();
     cbreak();
     return Qnil;
 }
@@ -258,7 +225,6 @@ static VALUE
 curses_nocbreak(obj)
     VALUE obj;
 {
-    curses_stdscr();
     nocbreak();
     return Qnil;
 }
@@ -268,7 +234,6 @@ static VALUE
 curses_nl(obj)
     VALUE obj;
 {
-    curses_stdscr();
     nl();
     return Qnil;
 }
@@ -278,7 +243,6 @@ static VALUE
 curses_nonl(obj)
     VALUE obj;
 {
-    curses_stdscr();
     nonl();
     return Qnil;
 }
@@ -289,7 +253,6 @@ curses_beep(obj)
     VALUE obj;
 {
 #ifdef HAVE_BEEP
-    curses_stdscr();
     beep();
 #endif
     return Qnil;
@@ -301,7 +264,6 @@ curses_flash(obj)
     VALUE obj;
 {
 #ifdef HAVE_FLASH
-    curses_stdscr();
     flash();
 #endif
     return Qnil;
@@ -314,7 +276,6 @@ curses_ungetch(obj, ch)
     VALUE ch;
 {
 #ifdef HAVE_UNGETCH
-    curses_stdscr();
     ungetch(NUM2INT(ch));
 #else
     rb_notimplement();
@@ -329,7 +290,6 @@ curses_setpos(obj, y, x)
     VALUE y;
     VALUE x;
 {
-    curses_stdscr();
     move(NUM2INT(y), NUM2INT(x));
     return Qnil;
 }
@@ -357,7 +317,6 @@ static VALUE
 curses_inch(obj)
     VALUE obj;
 {
-    curses_stdscr();
     return CHR2FIX(inch());
 }
 
@@ -367,7 +326,6 @@ curses_addch(obj, ch)
     VALUE obj;
     VALUE ch;
 {
-    curses_stdscr();
     addch(NUM2CHR(ch));
     return Qnil;
 }
@@ -378,7 +336,6 @@ curses_insch(obj, ch)
     VALUE obj;
     VALUE ch;
 {
-    curses_stdscr();
     insch(NUM2CHR(ch));
     return Qnil;
 }
@@ -389,7 +346,6 @@ curses_addstr(obj, str)
     VALUE obj;
     VALUE str;
 {
-    curses_stdscr();
     if (!NIL_P(str)) {
 	addstr(STR2CSTR(str));
     }
@@ -402,8 +358,7 @@ curses_getch(obj)
     VALUE obj;
 {
     rb_read_check(stdin);
-    curses_stdscr();
-    return UINT2NUM(getch());
+    return CHR2FIX(getch());
 }
 
 /* def getstr */
@@ -414,11 +369,7 @@ curses_getstr(obj)
     char rtn[1024]; /* This should be big enough.. I hope */
 
     rb_read_check(stdin);
-#if defined(HAVE_GETNSTR)
-    getnstr(rtn,1023);
-#else
     getstr(rtn);
-#endif
     return rb_tainted_str_new2(rtn);
 }
 
@@ -436,32 +387,12 @@ static VALUE
 curses_deleteln(obj)
     VALUE obj;
 {
-#if defined(HAVE_DELETELN) || defined(deleteln)
+#ifdef HAVE_DELETELN
     deleteln();
 #endif
     return Qnil;
 }
 
-/* def keyname */
-static VALUE
-curses_keyname(obj, c)
-    VALUE obj;
-    VALUE c;
-{
-#ifdef HAVE_KEYNAME
-  const char *name;
-
-  name = keyname(NUM2INT(c));
-  if (name) {
-    return rb_str_new2(name);
-  } else {
-    return Qnil;
-  }
-#else
-  return Qnil;
-#endif
-}
-
 static VALUE
 curses_lines()
 {
@@ -474,264 +405,52 @@ curses_cols()
     return INT2FIX(COLS);
 }
 
-static VALUE
-curses_curs_set(VALUE obj, VALUE visibility)
-{
-  int n;
-  return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
-}
-
-static VALUE
-curses_scrl(VALUE obj, VALUE n)
-{
-  /* may have to raise exception on ERR */
-  return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
-{
-  /* may have to raise exception on ERR */
-  return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_attroff(VALUE obj, VALUE attrs)
-{
-  return window_attroff(rb_stdscr,attrs);  
-  /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-static VALUE
-curses_attron(VALUE obj, VALUE attrs)
-{
-  return window_attron(rb_stdscr,attrs);
-  /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-static VALUE
-curses_attrset(VALUE obj, VALUE attrs)
-{
-  return window_attrset(rb_stdscr,attrs);
-  /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-static VALUE
-curses_bkgdset(VALUE obj, VALUE ch)
-{
-  bkgdset(NUM2CHR(ch));
-  return Qnil;
-}
-
-static VALUE
-curses_bkgd(VALUE obj, VALUE ch)
-{
-  return CHR2FIX(bkgd(NUM2CHR(ch)));
-}
-
-static VALUE
-curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
-{
-#if defined(HAVE_RESIZETERM)
-  return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
-#else
-  return Qnil;
-#endif
-}
-
-#ifdef USE_COLOR
-static VALUE
-curses_start_color(VALUE obj)
-{
-  /* may have to raise exception on ERR */
-  return (start_color() == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
-{
-  /* may have to raise exception on ERR */
-  return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
-{
-  /* may have to raise exception on ERR */
-  return (init_color(NUM2INT(color),NUM2INT(r),
-		     NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_has_colors(VALUE obj)
-{
-  return has_colors() ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_can_change_color(VALUE obj)
-{
-  return can_change_color() ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_color_content(VALUE obj, VALUE color)
-{
-  short r,g,b;
-
-  color_content(NUM2INT(color),&r,&g,&b);
-  return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
-}
-
-static VALUE
-curses_pair_content(VALUE obj, VALUE pair)
-{
-  short f,b;
-
-  pair_content(NUM2INT(pair),&f,&b);
-  return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
-}
-
-static VALUE
-curses_color_pair(VALUE obj, VALUE attrs)
-{
-  return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
-}
-
-static VALUE
-curses_pair_number(VALUE obj, VALUE attrs)
-{
-  return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
-}
-#endif
-
-#ifdef USE_MOUSE
-struct mousedata {
-  MEVENT *mevent;
-};
-
-static void
-no_mevent()
-{
-  rb_raise(rb_eRuntimeError, "no such mouse event");
-}
-
-#define GetMOUSE(obj, data) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted mouse");\
-    Data_Get_Struct(obj, struct mousedata, data);\
-    if (data->mevent == 0) no_mevent();\
-} while (0)
-
-static void
-curses_mousedata_free(struct mousedata *mdata)
-{
-  if (mdata->mevent)
-    free(mdata->mevent);
-}
-
-static VALUE
-curses_getmouse(VALUE obj)
-{
-  struct mousedata *mdata;
-  VALUE val;
-
-  val = Data_Make_Struct(cMouseEvent,struct mousedata,
-			 0,curses_mousedata_free,mdata);
-  mdata->mevent = (MEVENT*)malloc(sizeof(MEVENT));
-  return (getmouse(mdata->mevent) == OK) ? val : Qnil;
-}
-
-static VALUE
-curses_ungetmouse(VALUE obj, VALUE mevent)
-{
-  struct mousedata *mdata;
-
-  GetMOUSE(mevent,mdata);
-  return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_mouseinterval(VALUE obj, VALUE interval)
-{
-  return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_mousemask(VALUE obj, VALUE mask)
-{
-  return INT2NUM(mousemask(NUM2UINT(mask),NULL));
-}
-
-#define DEFINE_MOUSE_GET_MEMBER(func_name,mem) \
-static VALUE func_name (VALUE mouse) \
-{ \
-  struct mousedata *mdata; \
-  GetMOUSE(mouse, mdata); \
-  return (UINT2NUM(mdata->mevent -> mem)); \
-}
-
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_id, id)
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_x, x)
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_y, y)
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_z, z)
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
-#undef define_curs_mouse_member
-#endif /* USE_MOUSE */
-
 /*-------------------------- class Window --------------------------*/
 
-/* def self.allocate */
-static VALUE
-window_s_allocate(VALUE class)
-{
-    struct windata *winp;
-
-    return Data_Make_Struct(class, struct windata, 0, free_window, winp);
-}
-
-/* def initialize(h, w, top, left) */
+/* def new(lines, cols, top, left) */
 static VALUE
-window_initialize(obj, h, w, top, left)
-    VALUE obj;
-    VALUE h;
-    VALUE w;
+window_s_new(class, lines, cols, top, left)
+    VALUE class;
+    VALUE lines;
+    VALUE cols;
     VALUE top;
     VALUE left;
 {
-    struct windata *winp;
+    VALUE w;
     WINDOW *window;
-
-    rb_secure(4);
-    curses_init_screen();
-    Data_Get_Struct(obj, struct windata, winp);
-    if (winp->window) delwin(winp->window);
-    window = newwin(NUM2INT(h), NUM2INT(w), NUM2INT(top), NUM2INT(left));
+    VALUE args[4];
+    
+    window = newwin(NUM2INT(lines), NUM2INT(cols), NUM2INT(top), NUM2INT(left));
     wclear(window);
-    winp->window = window;
+    w = prep_window(class, window);
+    args[0] = lines; args[1] = cols; args[2] = top; args[3] = left;
+    rb_obj_call_init(w, 4, args);
 
-    return obj;
+    return w;
 }
 
-/* def subwin(h, w, top, left) */
+/* def subwin(lines, cols, top, left) */
 static VALUE
-window_subwin(obj, h, w, top, left)
+window_subwin(obj, lines, cols, top, left)
     VALUE obj;
-    VALUE h;
-    VALUE w;
+    VALUE lines;
+    VALUE cols;
     VALUE top;
     VALUE left;
 {
     struct windata *winp;
     WINDOW *window;
-    VALUE win;
+    VALUE w;
+    VALUE args[4];
 
     GetWINDOW(obj, winp);
-    window = subwin(winp->window, NUM2INT(h), NUM2INT(w),
+    window = subwin(winp->window, NUM2INT(lines), NUM2INT(cols),
 		                  NUM2INT(top), NUM2INT(left));
-    win = prep_window(rb_obj_class(obj), window);
+    w = prep_window(cWindow, window);
+    args[0] = lines; args[1] = cols; args[2] = top; args[3] = left;
+    rb_obj_call_init(w, 4, args);
 
-    return win;
+    return w;
 }
 
 /* def close */
@@ -774,23 +493,22 @@ window_refresh(obj)
     return Qnil;
 }
 
-/* def noutrefresh */
+/* def box(vert, hor) */
 static VALUE
-window_noutrefresh(obj)
+window_box(obj, vert, hor)
     VALUE obj;
+    VALUE vert;
+    VALUE hor;
 {
-    struct windata *winp;
-
+    struct windata *winp; 
+   
     GetWINDOW(obj, winp);
-#ifdef HAVE_DOUPDATE
-    wnoutrefresh(winp->window);
-#else
-    wrefresh(winp->window);
-#endif
-
+    box(winp->window, NUM2CHR(vert), NUM2CHR(hor));
+    
     return Qnil;
 }
 
+
 /* def move(y, x) */
 static VALUE
 window_move(obj, y, x)
@@ -852,19 +570,19 @@ window_maxy(obj)
     VALUE obj;
 {
     struct windata *winp;
+    int x, y;
 
     GetWINDOW(obj, winp);
-#if defined(getmaxy)
+#ifdef getmaxy
     return INT2FIX(getmaxy(winp->window));
-#elif defined(getmaxyx)
-    {
-	int x, y;
-	getmaxyx(winp->window, y, x);
-	return INT2FIX(y);
-    }
+#else
+#ifdef getmaxyx
+    getmaxyx(winp->window, y, x);
+    return INT2FIX(y);
 #else
     return INT2FIX(winp->window->_maxy+1);
 #endif
+#endif
 }
 
 /* def maxx */
@@ -873,19 +591,19 @@ window_maxx(obj)
     VALUE obj;
 {
     struct windata *winp;
+    int x, y;
 
     GetWINDOW(obj, winp);
-#if defined(getmaxx)
+#ifdef getmaxx
     return INT2FIX(getmaxx(winp->window));
-#elif defined(getmaxyx)
-    {
-	int x, y;
-	getmaxyx(winp->window, y, x);
-	return INT2FIX(x);
-    }
+#else
+#ifdef getmaxyx
+    getmaxyx(winp->window, y, x);
+    return INT2FIX(x);
 #else
     return INT2FIX(winp->window->_maxx+1);
 #endif
+#endif
 }
 
 /* def begy */
@@ -922,42 +640,6 @@ window_begx(obj)
 #endif
 }
 
-/* def box(vert, hor) */
-static VALUE
-window_box(argc, argv, self)
-    int argc;
-    VALUE argv[], self;
-{
-    struct windata *winp; 
-    VALUE vert, hor, corn;
-
-    rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
-
-    GetWINDOW(self, winp);
-    box(winp->window, NUM2CHR(vert), NUM2CHR(hor));
-
-    if (!NIL_P(corn)) {
-      int cur_x, cur_y, x, y;
-      char c;
-
-      c = NUM2CHR(corn);
-      getyx(winp->window, cur_y, cur_x);
-      x = NUM2INT(window_maxx(self)) - 1;
-      y = NUM2INT(window_maxy(self)) - 1;
-      wmove(winp->window, 0, 0);
-      waddch(winp->window, c);
-      wmove(winp->window, y, 0);
-      waddch(winp->window, c);
-      wmove(winp->window, y, x);
-      waddch(winp->window, c);
-      wmove(winp->window, 0, x);
-      waddch(winp->window, c);
-      wmove(winp->window, cur_y, cur_x);
-    }
-    
-    return Qnil;
-}
-
 /* def standout */
 static VALUE
 window_standout(obj)
@@ -1055,7 +737,7 @@ window_getch(obj)
     
     rb_read_check(stdin);
     GetWINDOW(obj, winp);
-    return UINT2NUM(wgetch(winp->window));
+    return CHR2FIX(wgetch(winp->window));
 }
 
 /* def getstr */
@@ -1068,11 +750,7 @@ window_getstr(obj)
     
     GetWINDOW(obj, winp);
     rb_read_check(stdin);
-#if defined(HAVE_WGETNSTR)
-    wgetnstr(winp->window, rtn, 1023);
-#else
     wgetstr(winp->window, rtn);
-#endif
     return rb_tainted_str_new2(rtn);
 }
 
@@ -1093,7 +771,7 @@ static VALUE
 window_deleteln(obj)
     VALUE obj;
 {
-#if defined(HAVE_WDELETELN) || defined(wdeleteln)
+#ifdef HAVE_WDELETELN
     struct windata *winp;
     
     GetWINDOW(obj, winp);
@@ -1102,174 +780,11 @@ window_deleteln(obj)
     return Qnil;
 }
 
-static VALUE
-window_scrollok(VALUE obj, VALUE bf)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj, winp);
-  scrollok(winp->window, RTEST(bf) ? TRUE : FALSE);
-  return Qnil;
-}
-
-static VALUE
-window_idlok(VALUE obj, VALUE bf)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj, winp);
-  idlok(winp->window, RTEST(bf) ? TRUE : FALSE);
-  return Qnil;
-}
-
-static VALUE
-window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
-{
-  struct windata *winp;
-  int res;
-
-  GetWINDOW(obj, winp);
-  res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
-  /* may have to raise exception on ERR */
-  return (res == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-window_scroll(VALUE obj)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj, winp);
-  /* may have to raise exception on ERR */
-  return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-window_scrl(VALUE obj, VALUE n)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj, winp);
-  /* may have to raise exception on ERR */
-  return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-window_attroff(VALUE obj, VALUE attrs)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj,winp);
-  return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
-}
-
-static VALUE
-window_attron(VALUE obj, VALUE attrs)
-{
-  struct windata *winp;
-  VALUE val;
-
-  GetWINDOW(obj,winp);
-  val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
-  if( rb_block_given_p() ){
-    rb_yield(val);
-    wattroff(winp->window,NUM2INT(attrs));
-    return val;
-  }
-  else{
-    return val;
-  }
-}
-
-static VALUE
-window_attrset(VALUE obj, VALUE attrs)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj,winp);
-  return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
-}
-
-static VALUE
-window_bkgdset(VALUE obj, VALUE ch)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj,winp);
-  wbkgdset(winp->window, NUM2CHR(ch));
-  return Qnil;
-}
-
-static VALUE
-window_bkgd(VALUE obj, VALUE ch)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj,winp);
-  return CHR2FIX(wbkgd(winp->window, NUM2CHR(ch)));
-}
-
-static VALUE
-window_getbkgd(VALUE obj)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj,winp);
-  return CHR2FIX(getbkgd(winp->window));
-}
-
-static VALUE
-window_resize(VALUE obj, VALUE lin, VALUE col)
-{
-#if defined(HAVE_WRESIZE)
-  struct windata *winp;
-
-  GetWINDOW(obj,winp);
-  return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
-#else
-  return Qnil;
-#endif
-}
-
-
-#ifdef HAVE_KEYPAD
-static VALUE
-window_keypad(VALUE obj, VALUE val)
-{
-  struct windata *winp;
-
-  GetWINDOW(obj,winp);
-  /* keypad() of NetBSD's libcurses returns no value */
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-  keypad(winp->window,(RTEST(val) ? TRUE : FALSE));
-  return Qnil;
-#else
-  /* may have to raise exception on ERR */
-  return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
-    Qtrue : Qfalse;
-#endif
-}
-#endif /* HAVE_KEYPAD */
-
 /*------------------------- Initialization -------------------------*/
 void
 Init_curses()
 {
-    mCurses    = rb_define_module("Curses");
-    mKey       = rb_define_module_under(mCurses, "Key");
-
-    rb_gc_register_address(&rb_stdscr);
-
-#ifdef USE_MOUSE
-    cMouseEvent = rb_define_class_under(mCurses,"MouseEvent",rb_cObject);
-    rb_undef_method(CLASS_OF(cMouseEvent),"new");
-    rb_define_method(cMouseEvent, "eid", curs_mouse_id, 0);
-    rb_define_method(cMouseEvent, "x", curs_mouse_x, 0);
-    rb_define_method(cMouseEvent, "y", curs_mouse_y, 0);
-    rb_define_method(cMouseEvent, "z", curs_mouse_z, 0);
-    rb_define_method(cMouseEvent, "bstate", curs_mouse_bstate, 0);
-#endif /* USE_MOUSE */
-
+    mCurses = rb_define_module("Curses");
     rb_define_module_function(mCurses, "init_screen", curses_init_screen, 0);
     rb_define_module_function(mCurses, "close_screen", curses_close_screen, 0);
     rb_define_module_function(mCurses, "closed?", curses_closed, 0);
@@ -1301,47 +816,16 @@ Init_curses()
     rb_define_module_function(mCurses, "getstr", curses_getstr, 0);
     rb_define_module_function(mCurses, "delch", curses_delch, 0);
     rb_define_module_function(mCurses, "deleteln", curses_deleteln, 0);
-    rb_define_module_function(mCurses, "keyname", curses_keyname, 1);
     rb_define_module_function(mCurses, "lines", curses_lines, 0);
     rb_define_module_function(mCurses, "cols", curses_cols, 0);
-    rb_define_module_function(mCurses, "curs_set", curses_curs_set, 1);
-    rb_define_module_function(mCurses, "scrl", curses_scrl, 1);
-    rb_define_module_function(mCurses, "setscrreg", curses_setscrreg, 2);
-    rb_define_module_function(mCurses, "attroff", curses_attroff, 1);
-    rb_define_module_function(mCurses, "attron", curses_attron, 1);
-    rb_define_module_function(mCurses, "attrset", curses_attrset, 1);
-    rb_define_module_function(mCurses, "bkgdset", curses_bkgdset, 1);
-    rb_define_module_function(mCurses, "bkgd", curses_bkgd, 1);
-    rb_define_module_function(mCurses, "resizeterm", curses_resizeterm, 2);
-    rb_define_module_function(mCurses, "resize", curses_resizeterm, 2);
-#ifdef USE_COLOR
-    rb_define_module_function(mCurses, "start_color", curses_start_color, 0);
-    rb_define_module_function(mCurses, "init_pair", curses_init_pair, 3);
-    rb_define_module_function(mCurses, "init_color", curses_init_color, 4);
-    rb_define_module_function(mCurses, "has_colors?", curses_has_colors, 0);
-    rb_define_module_function(mCurses, "can_change_color?",
-			      curses_can_change_color, 0);
-    rb_define_module_function(mCurses, "color_content", curses_color_content, 1);
-    rb_define_module_function(mCurses, "pair_content", curses_pair_content, 1);
-    rb_define_module_function(mCurses, "color_pair", curses_color_pair, 1);
-    rb_define_module_function(mCurses, "pair_number", curses_pair_number, 1);
-#endif /* USE_COLOR */
-#ifdef USE_MOUSE
-    rb_define_module_function(mCurses, "getmouse", curses_getmouse, 0);
-    rb_define_module_function(mCurses, "ungetmouse", curses_getmouse, 1);
-    rb_define_module_function(mCurses, "mouseinterval", curses_mouseinterval, 1);
-    rb_define_module_function(mCurses, "mousemask", curses_mousemask, 1);
-#endif /* USE_MOUSE */
-
-    cWindow = rb_define_class_under(mCurses, "Window", rb_cData);
-    rb_define_alloc_func(cWindow, window_s_allocate);
-    rb_define_method(cWindow, "initialize", window_initialize, 4);
+    
+    cWindow = rb_define_class_under(mCurses, "Window", rb_cObject);
+    rb_define_singleton_method(cWindow, "new", window_s_new, 4);
     rb_define_method(cWindow, "subwin", window_subwin, 4);
     rb_define_method(cWindow, "close", window_close, 0);
     rb_define_method(cWindow, "clear", window_clear, 0);
     rb_define_method(cWindow, "refresh", window_refresh, 0);
-    rb_define_method(cWindow, "noutrefresh", window_noutrefresh, 0);
-    rb_define_method(cWindow, "box", window_box, -1);
+    rb_define_method(cWindow, "box", window_box, 2);
     rb_define_method(cWindow, "move", window_move, 2);
     rb_define_method(cWindow, "setpos", window_setpos, 2);
     rb_define_method(cWindow, "cury", window_cury, 0);
@@ -1361,545 +845,6 @@ Init_curses()
     rb_define_method(cWindow, "getstr", window_getstr, 0);
     rb_define_method(cWindow, "delch", window_delch, 0);
     rb_define_method(cWindow, "deleteln", window_deleteln, 0);
-    rb_define_method(cWindow, "scroll", window_scroll, 0);
-    rb_define_method(cWindow, "scrollok", window_scrollok, 1);
-    rb_define_method(cWindow, "idlok", window_idlok, 1);
-    rb_define_method(cWindow, "setscrreg", window_setscrreg, 2);
-    rb_define_method(cWindow, "scrl", window_scrl, 1);
-    rb_define_method(cWindow, "resize", window_resize, 2);
-#ifdef HAVE_KEYPAD
-    rb_define_method(cWindow, "keypad", window_keypad, 1);
-    rb_define_method(cWindow, "keypad=", window_keypad, 1);
-#endif
-#ifdef USE_COLOR
-    rb_define_method(cWindow, "attroff", window_attroff, 1);
-    rb_define_method(cWindow, "attron", window_attron, 1);
-    rb_define_method(cWindow, "attrset", window_attrset, 1);
-    rb_define_method(cWindow, "bkgdset", window_bkgdset, 1);
-    rb_define_method(cWindow, "bkgd", window_bkgd, 1);
-    rb_define_method(cWindow, "getbkgd", window_getbkgd, 0);
-#endif /* USE_COLOR */
-
-
-#define rb_curses_define_const(c) rb_define_const(mCurses,#c,UINT2NUM(c))
-
-#ifdef USE_COLOR
-    rb_curses_define_const(A_ATTRIBUTES);
-#ifdef A_NORMAL
-    rb_curses_define_const(A_NORMAL);
-#endif
-    rb_curses_define_const(A_STANDOUT);
-    rb_curses_define_const(A_UNDERLINE);
-    rb_curses_define_const(A_REVERSE);
-    rb_curses_define_const(A_BLINK);
-    rb_curses_define_const(A_DIM);
-    rb_curses_define_const(A_BOLD);
-    rb_curses_define_const(A_PROTECT);
-#ifdef A_INVIS /* for NetBSD */
-    rb_curses_define_const(A_INVIS);
-#endif
-    rb_curses_define_const(A_ALTCHARSET);
-    rb_curses_define_const(A_CHARTEXT);
-#ifdef A_HORIZONTAL
-    rb_curses_define_const(A_HORIZONTAL);
-#endif
-#ifdef A_LEFT
-    rb_curses_define_const(A_LEFT);
-#endif
-#ifdef A_LOW
-    rb_curses_define_const(A_LOW);
-#endif
-#ifdef A_RIGHT
-    rb_curses_define_const(A_RIGHT);
-#endif
-#ifdef A_TOP
-    rb_curses_define_const(A_TOP);
-#endif
-#ifdef A_VERTICAL
-    rb_curses_define_const(A_VERTICAL);
-#endif
-    rb_curses_define_const(A_COLOR);
-
-#ifdef COLORS
-    rb_curses_define_const(COLORS);
-#endif
-    rb_curses_define_const(COLOR_BLACK);
-    rb_curses_define_const(COLOR_RED);
-    rb_curses_define_const(COLOR_GREEN);
-    rb_curses_define_const(COLOR_YELLOW);
-    rb_curses_define_const(COLOR_BLUE);
-    rb_curses_define_const(COLOR_MAGENTA);
-    rb_curses_define_const(COLOR_CYAN);
-    rb_curses_define_const(COLOR_WHITE);
-#endif /* USE_COLOR */
-#ifdef USE_MOUSE
-#ifdef BUTTON1_PRESSED
-    rb_curses_define_const(BUTTON1_PRESSED);
-#endif
-#ifdef BUTTON1_RELEASED
-    rb_curses_define_const(BUTTON1_RELEASED);
-#endif
-#ifdef BUTTON1_CLICKED
-    rb_curses_define_const(BUTTON1_CLICKED);
-#endif
-#ifdef BUTTON1_DOUBLE_CLICKED
-    rb_curses_define_const(BUTTON1_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON1_TRIPLE_CLICKED
-    rb_curses_define_const(BUTTON1_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON2_PRESSED
-    rb_curses_define_const(BUTTON2_PRESSED);
-#endif
-#ifdef BUTTON2_RELEASED
-    rb_curses_define_const(BUTTON2_RELEASED);
-#endif
-#ifdef BUTTON2_CLICKED
-    rb_curses_define_const(BUTTON2_CLICKED);
-#endif
-#ifdef BUTTON2_DOUBLE_CLICKED
-    rb_curses_define_const(BUTTON2_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON2_TRIPLE_CLICKED
-    rb_curses_define_const(BUTTON2_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON3_PRESSED
-    rb_curses_define_const(BUTTON3_PRESSED);
-#endif
-#ifdef BUTTON3_RELEASED
-    rb_curses_define_const(BUTTON3_RELEASED);
-#endif
-#ifdef BUTTON3_CLICKED
-    rb_curses_define_const(BUTTON3_CLICKED);
-#endif
-#ifdef BUTTON3_DOUBLE_CLICKED
-    rb_curses_define_const(BUTTON3_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON3_TRIPLE_CLICKED
-    rb_curses_define_const(BUTTON3_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON4_PRESSED
-    rb_curses_define_const(BUTTON4_PRESSED);
-#endif
-#ifdef BUTTON4_RELEASED
-    rb_curses_define_const(BUTTON4_RELEASED);
-#endif
-#ifdef BUTTON4_CLICKED
-    rb_curses_define_const(BUTTON4_CLICKED);
-#endif
-#ifdef BUTTON4_DOUBLE_CLICKED
-    rb_curses_define_const(BUTTON4_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON4_TRIPLE_CLICKED
-    rb_curses_define_const(BUTTON4_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON_SHIFT
-    rb_curses_define_const(BUTTON_SHIFT);
-#endif
-#ifdef BUTTON_CTRL
-    rb_curses_define_const(BUTTON_CTRL);
-#endif
-#ifdef BUTTON_ALT
-    rb_curses_define_const(BUTTON_ALT);
-#endif
-#ifdef ALL_MOUSE_EVENTS
-    rb_curses_define_const(ALL_MOUSE_EVENTS);
-#endif
-#ifdef REPORT_MOUSE_POSITION
-    rb_curses_define_const(REPORT_MOUSE_POSITION);
-#endif
-#endif /* USE_MOUSE */
-
-#if defined(KEY_MOUSE) && defined(USE_MOUSE)
-    rb_curses_define_const(KEY_MOUSE);
-    rb_define_const(mKey, "MOUSE", INT2NUM(KEY_MOUSE));
-#endif
-#ifdef KEY_MIN
-    rb_curses_define_const(KEY_MIN);
-    rb_define_const(mKey, "MIN", INT2NUM(KEY_MIN));
-#endif
-#ifdef KEY_BREAK
-    rb_curses_define_const(KEY_BREAK);
-    rb_define_const(mKey, "BREAK", INT2NUM(KEY_BREAK));
-#endif
-#ifdef KEY_DOWN
-    rb_curses_define_const(KEY_DOWN);
-    rb_define_const(mKey, "DOWN", INT2NUM(KEY_DOWN));
-#endif
-#ifdef KEY_UP
-    rb_curses_define_const(KEY_UP);
-    rb_define_const(mKey, "UP", INT2NUM(KEY_UP));
-#endif
-#ifdef KEY_LEFT
-    rb_curses_define_const(KEY_LEFT);
-    rb_define_const(mKey, "LEFT", INT2NUM(KEY_LEFT));
-#endif
-#ifdef KEY_RIGHT
-    rb_curses_define_const(KEY_RIGHT);
-    rb_define_const(mKey, "RIGHT", INT2NUM(KEY_RIGHT));
-#endif
-#ifdef KEY_HOME
-    rb_curses_define_const(KEY_HOME);
-    rb_define_const(mKey, "HOME", INT2NUM(KEY_HOME));
-#endif
-#ifdef KEY_BACKSPACE
-    rb_curses_define_const(KEY_BACKSPACE);
-    rb_define_const(mKey, "BACKSPACE", INT2NUM(KEY_BACKSPACE));
-#endif
-#ifdef KEY_F
-    /* KEY_F(n) : 0 <= n <= 63 */
-    {
-      int i;
-      char c[8];
-      for( i=0; i<64; i++ ){
-	sprintf(c, "KEY_F%d", i);
-	rb_define_const(mCurses, c, INT2NUM(KEY_F(i)));
-	sprintf(c, "F%d", i);
-	rb_define_const(mKey, c, INT2NUM(KEY_F(i)));
-      }
-    }
-#endif
-#ifdef KEY_DL
-    rb_curses_define_const(KEY_DL);
-    rb_define_const(mKey, "DL", INT2NUM(KEY_DL));
-#endif
-#ifdef KEY_IL
-    rb_curses_define_const(KEY_IL);
-    rb_define_const(mKey, "IL", INT2NUM(KEY_IL));
-#endif
-#ifdef KEY_DC
-    rb_curses_define_const(KEY_DC);
-    rb_define_const(mKey, "DC", INT2NUM(KEY_DC));
-#endif
-#ifdef KEY_IC
-    rb_curses_define_const(KEY_IC);
-    rb_define_const(mKey, "IC", INT2NUM(KEY_IC));
-#endif
-#ifdef KEY_EIC
-    rb_curses_define_const(KEY_EIC);
-    rb_define_const(mKey, "EIC", INT2NUM(KEY_EIC));
-#endif
-#ifdef KEY_CLEAR
-    rb_curses_define_const(KEY_CLEAR);
-    rb_define_const(mKey, "CLEAR", INT2NUM(KEY_CLEAR));
-#endif
-#ifdef KEY_EOS
-    rb_curses_define_const(KEY_EOS);
-    rb_define_const(mKey, "EOS", INT2NUM(KEY_EOS));
-#endif
-#ifdef KEY_EOL
-    rb_curses_define_const(KEY_EOL);
-    rb_define_const(mKey, "EOL", INT2NUM(KEY_EOL));
-#endif
-#ifdef KEY_SF
-    rb_curses_define_const(KEY_SF);
-    rb_define_const(mKey, "SF", INT2NUM(KEY_SF));
-#endif
-#ifdef KEY_SR
-    rb_curses_define_const(KEY_SR);
-    rb_define_const(mKey, "SR", INT2NUM(KEY_SR));
-#endif
-#ifdef KEY_NPAGE
-    rb_curses_define_const(KEY_NPAGE);
-    rb_define_const(mKey, "NPAGE", INT2NUM(KEY_NPAGE));
-#endif
-#ifdef KEY_PPAGE
-    rb_curses_define_const(KEY_PPAGE);
-    rb_define_const(mKey, "PPAGE", INT2NUM(KEY_PPAGE));
-#endif
-#ifdef KEY_STAB
-    rb_curses_define_const(KEY_STAB);
-    rb_define_const(mKey, "STAB", INT2NUM(KEY_STAB));
-#endif
-#ifdef KEY_CTAB
-    rb_curses_define_const(KEY_CTAB);
-    rb_define_const(mKey, "CTAB", INT2NUM(KEY_CTAB));
-#endif
-#ifdef KEY_CATAB
-    rb_curses_define_const(KEY_CATAB);
-    rb_define_const(mKey, "CATAB", INT2NUM(KEY_CATAB));
-#endif
-#ifdef KEY_ENTER
-    rb_curses_define_const(KEY_ENTER);
-    rb_define_const(mKey, "ENTER", INT2NUM(KEY_ENTER));
-#endif
-#ifdef KEY_SRESET
-    rb_curses_define_const(KEY_SRESET);
-    rb_define_const(mKey, "SRESET", INT2NUM(KEY_SRESET));
-#endif
-#ifdef KEY_RESET
-    rb_curses_define_const(KEY_RESET);
-    rb_define_const(mKey, "RESET", INT2NUM(KEY_RESET));
-#endif
-#ifdef KEY_PRINT
-    rb_curses_define_const(KEY_PRINT);
-    rb_define_const(mKey, "PRINT", INT2NUM(KEY_PRINT));
-#endif
-#ifdef KEY_LL
-    rb_curses_define_const(KEY_LL);
-    rb_define_const(mKey, "LL", INT2NUM(KEY_LL));
-#endif
-#ifdef KEY_A1
-    rb_curses_define_const(KEY_A1);
-    rb_define_const(mKey, "A1", INT2NUM(KEY_A1));
-#endif
-#ifdef KEY_A3
-    rb_curses_define_const(KEY_A3);
-    rb_define_const(mKey, "A3", INT2NUM(KEY_A3));
-#endif
-#ifdef KEY_B2
-    rb_curses_define_const(KEY_B2);
-    rb_define_const(mKey, "B2", INT2NUM(KEY_B2));
-#endif
-#ifdef KEY_C1
-    rb_curses_define_const(KEY_C1);
-    rb_define_const(mKey, "C1", INT2NUM(KEY_C1));
-#endif
-#ifdef KEY_C3
-    rb_curses_define_const(KEY_C3);
-    rb_define_const(mKey, "C3", INT2NUM(KEY_C3));
-#endif
-#ifdef KEY_BTAB
-    rb_curses_define_const(KEY_BTAB);
-    rb_define_const(mKey, "BTAB", INT2NUM(KEY_BTAB));
-#endif
-#ifdef KEY_BEG
-    rb_curses_define_const(KEY_BEG);
-    rb_define_const(mKey, "BEG", INT2NUM(KEY_BEG));
-#endif
-#ifdef KEY_CANCEL
-    rb_curses_define_const(KEY_CANCEL);
-    rb_define_const(mKey, "CANCEL", INT2NUM(KEY_CANCEL));
-#endif
-#ifdef KEY_CLOSE
-    rb_curses_define_const(KEY_CLOSE);
-    rb_define_const(mKey, "CLOSE", INT2NUM(KEY_CLOSE));
-#endif
-#ifdef KEY_COMMAND
-    rb_curses_define_const(KEY_COMMAND);
-    rb_define_const(mKey, "COMMAND", INT2NUM(KEY_COMMAND));
-#endif
-#ifdef KEY_COPY
-    rb_curses_define_const(KEY_COPY);
-    rb_define_const(mKey, "COPY", INT2NUM(KEY_COPY));
-#endif
-#ifdef KEY_CREATE
-    rb_curses_define_const(KEY_CREATE);
-    rb_define_const(mKey, "CREATE", INT2NUM(KEY_CREATE));
-#endif
-#ifdef KEY_END
-    rb_curses_define_const(KEY_END);
-    rb_define_const(mKey, "END", INT2NUM(KEY_END));
-#endif
-#ifdef KEY_EXIT
-    rb_curses_define_const(KEY_EXIT);
-    rb_define_const(mKey, "EXIT", INT2NUM(KEY_EXIT));
-#endif
-#ifdef KEY_FIND
-    rb_curses_define_const(KEY_FIND);
-    rb_define_const(mKey, "FIND", INT2NUM(KEY_FIND));
-#endif
-#ifdef KEY_HELP
-    rb_curses_define_const(KEY_HELP);
-    rb_define_const(mKey, "HELP", INT2NUM(KEY_HELP));
-#endif
-#ifdef KEY_MARK
-    rb_curses_define_const(KEY_MARK);
-    rb_define_const(mKey, "MARK", INT2NUM(KEY_MARK));
-#endif
-#ifdef KEY_MESSAGE
-    rb_curses_define_const(KEY_MESSAGE);
-    rb_define_const(mKey, "MESSAGE", INT2NUM(KEY_MESSAGE));
-#endif
-#ifdef KEY_MOVE
-    rb_curses_define_const(KEY_MOVE);
-    rb_define_const(mKey, "MOVE", INT2NUM(KEY_MOVE));
-#endif
-#ifdef KEY_NEXT
-    rb_curses_define_const(KEY_NEXT);
-    rb_define_const(mKey, "NEXT", INT2NUM(KEY_NEXT));
-#endif
-#ifdef KEY_OPEN
-    rb_curses_define_const(KEY_OPEN);
-    rb_define_const(mKey, "OPEN", INT2NUM(KEY_OPEN));
-#endif
-#ifdef KEY_OPTIONS
-    rb_curses_define_const(KEY_OPTIONS);
-    rb_define_const(mKey, "OPTIONS", INT2NUM(KEY_OPTIONS));
-#endif
-#ifdef KEY_PREVIOUS
-    rb_curses_define_const(KEY_PREVIOUS);
-    rb_define_const(mKey, "PREVIOUS", INT2NUM(KEY_PREVIOUS));
-#endif
-#ifdef KEY_REDO
-    rb_curses_define_const(KEY_REDO);
-    rb_define_const(mKey, "REDO", INT2NUM(KEY_REDO));
-#endif
-#ifdef KEY_REFERENCE
-    rb_curses_define_const(KEY_REFERENCE);
-    rb_define_const(mKey, "REFERENCE", INT2NUM(KEY_REFERENCE));
-#endif
-#ifdef KEY_REFRESH
-    rb_curses_define_const(KEY_REFRESH);
-    rb_define_const(mKey, "REFRESH", INT2NUM(KEY_REFRESH));
-#endif
-#ifdef KEY_REPLACE
-    rb_curses_define_const(KEY_REPLACE);
-    rb_define_const(mKey, "REPLACE", INT2NUM(KEY_REPLACE));
-#endif
-#ifdef KEY_RESTART
-    rb_curses_define_const(KEY_RESTART);
-    rb_define_const(mKey, "RESTART", INT2NUM(KEY_RESTART));
-#endif
-#ifdef KEY_RESUME
-    rb_curses_define_const(KEY_RESUME);
-    rb_define_const(mKey, "RESUME", INT2NUM(KEY_RESUME));
-#endif
-#ifdef KEY_SAVE
-    rb_curses_define_const(KEY_SAVE);
-    rb_define_const(mKey, "SAVE", INT2NUM(KEY_SAVE));
-#endif
-#ifdef KEY_SBEG
-    rb_curses_define_const(KEY_SBEG);
-    rb_define_const(mKey, "SBEG", INT2NUM(KEY_SBEG));
-#endif
-#ifdef KEY_SCANCEL
-    rb_curses_define_const(KEY_SCANCEL);
-    rb_define_const(mKey, "SCANCEL", INT2NUM(KEY_SCANCEL));
-#endif
-#ifdef KEY_SCOMMAND
-    rb_curses_define_const(KEY_SCOMMAND);
-    rb_define_const(mKey, "SCOMMAND", INT2NUM(KEY_SCOMMAND));
-#endif
-#ifdef KEY_SCOPY
-    rb_curses_define_const(KEY_SCOPY);
-    rb_define_const(mKey, "SCOPY", INT2NUM(KEY_SCOPY));
-#endif
-#ifdef KEY_SCREATE
-    rb_curses_define_const(KEY_SCREATE);
-    rb_define_const(mKey, "SCREATE", INT2NUM(KEY_SCREATE));
-#endif
-#ifdef KEY_SDC
-    rb_curses_define_const(KEY_SDC);
-    rb_define_const(mKey, "SDC", INT2NUM(KEY_SDC));
-#endif
-#ifdef KEY_SDL
-    rb_curses_define_const(KEY_SDL);
-    rb_define_const(mKey, "SDL", INT2NUM(KEY_SDL));
-#endif
-#ifdef KEY_SELECT
-    rb_curses_define_const(KEY_SELECT);
-    rb_define_const(mKey, "SELECT", INT2NUM(KEY_SELECT));
-#endif
-#ifdef KEY_SEND
-    rb_curses_define_const(KEY_SEND);
-    rb_define_const(mKey, "SEND", INT2NUM(KEY_SEND));
-#endif
-#ifdef KEY_SEOL
-    rb_curses_define_const(KEY_SEOL);
-    rb_define_const(mKey, "SEOL", INT2NUM(KEY_SEOL));
-#endif
-#ifdef KEY_SEXIT
-    rb_curses_define_const(KEY_SEXIT);
-    rb_define_const(mKey, "SEXIT", INT2NUM(KEY_SEXIT));
-#endif
-#ifdef KEY_SFIND
-    rb_curses_define_const(KEY_SFIND);
-    rb_define_const(mKey, "SFIND", INT2NUM(KEY_SFIND));
-#endif
-#ifdef KEY_SHELP
-    rb_curses_define_const(KEY_SHELP);
-    rb_define_const(mKey, "SHELP", INT2NUM(KEY_SHELP));
-#endif
-#ifdef KEY_SHOME
-    rb_curses_define_const(KEY_SHOME);
-    rb_define_const(mKey, "SHOME", INT2NUM(KEY_SHOME));
-#endif
-#ifdef KEY_SIC
-    rb_curses_define_const(KEY_SIC);
-    rb_define_const(mKey, "SIC", INT2NUM(KEY_SIC));
-#endif
-#ifdef KEY_SLEFT
-    rb_curses_define_const(KEY_SLEFT);
-    rb_define_const(mKey, "SLEFT", INT2NUM(KEY_SLEFT));
-#endif
-#ifdef KEY_SMESSAGE
-    rb_curses_define_const(KEY_SMESSAGE);
-    rb_define_const(mKey, "SMESSAGE", INT2NUM(KEY_SMESSAGE));
-#endif
-#ifdef KEY_SMOVE
-    rb_curses_define_const(KEY_SMOVE);
-    rb_define_const(mKey, "SMOVE", INT2NUM(KEY_SMOVE));
-#endif
-#ifdef KEY_SNEXT
-    rb_curses_define_const(KEY_SNEXT);
-    rb_define_const(mKey, "SNEXT", INT2NUM(KEY_SNEXT));
-#endif
-#ifdef KEY_SOPTIONS
-    rb_curses_define_const(KEY_SOPTIONS);
-    rb_define_const(mKey, "SOPTIONS", INT2NUM(KEY_SOPTIONS));
-#endif
-#ifdef KEY_SPREVIOUS
-    rb_curses_define_const(KEY_SPREVIOUS);
-    rb_define_const(mKey, "SPREVIOUS", INT2NUM(KEY_SPREVIOUS));
-#endif
-#ifdef KEY_SPRINT
-    rb_curses_define_const(KEY_SPRINT);
-    rb_define_const(mKey, "SPRINT", INT2NUM(KEY_SPRINT));
-#endif
-#ifdef KEY_SREDO
-    rb_curses_define_const(KEY_SREDO);
-    rb_define_const(mKey, "SREDO", INT2NUM(KEY_SREDO));
-#endif
-#ifdef KEY_SREPLACE
-    rb_curses_define_const(KEY_SREPLACE);
-    rb_define_const(mKey, "SREPLACE", INT2NUM(KEY_SREPLACE));
-#endif
-#ifdef KEY_SRIGHT
-    rb_curses_define_const(KEY_SRIGHT);
-    rb_define_const(mKey, "SRIGHT", INT2NUM(KEY_SRIGHT));
-#endif
-#ifdef KEY_SRSUME
-    rb_curses_define_const(KEY_SRSUME);
-    rb_define_const(mKey, "SRSUME", INT2NUM(KEY_SRSUME));
-#endif
-#ifdef KEY_SSAVE
-    rb_curses_define_const(KEY_SSAVE);
-    rb_define_const(mKey, "SSAVE", INT2NUM(KEY_SSAVE));
-#endif
-#ifdef KEY_SSUSPEND
-    rb_curses_define_const(KEY_SSUSPEND);
-    rb_define_const(mKey, "SSUSPEND", INT2NUM(KEY_SSUSPEND));
-#endif
-#ifdef KEY_SUNDO
-    rb_curses_define_const(KEY_SUNDO);
-    rb_define_const(mKey, "SUNDO", INT2NUM(KEY_SUNDO));
-#endif
-#ifdef KEY_SUSPEND
-    rb_curses_define_const(KEY_SUSPEND);
-    rb_define_const(mKey, "SUSPEND", INT2NUM(KEY_SUSPEND));
-#endif
-#ifdef KEY_UNDO
-    rb_curses_define_const(KEY_UNDO);
-    rb_define_const(mKey, "UNDO", INT2NUM(KEY_UNDO));
-#endif
-#ifdef KEY_RESIZE
-    rb_curses_define_const(KEY_RESIZE);
-    rb_define_const(mKey, "RESIZE", INT2NUM(KEY_RESIZE));
-#endif
-#ifdef KEY_MAX
-    rb_curses_define_const(KEY_MAX);
-    rb_define_const(mKey, "MAX", INT2NUM(KEY_MAX));
-#endif
-    {
-      int c;
-      char name[] = "KEY_CTRL_x";
-      for( c = 'A'; c <= 'Z'; c++ ){
-	sprintf(name, "KEY_CTRL_%c", c);
-	rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
-      }
-    }
-#undef rb_curses_define_const
 
     rb_set_end_proc(curses_finalize, 0);
 }
diff --git a/ext/curses/depend b/ext/curses/depend
deleted file mode 100644
index ecb79e512d..0000000000
--- a/ext/curses/depend
+++ /dev/null
@@ -1 +0,0 @@
-curses.o: curses.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index a79cebf600..e1bf24c435 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -1,31 +1,23 @@
 require 'mkmf'
 
-dir_config('curses')
-dir_config('ncurses')
-dir_config('termcap')
-
 make=false
-have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
-have_library("tinfo", "tgetent") or have_library("termcap", "tgetent")
-if have_header(*curses=%w"ncurses.h") and have_library("ncurses", "initscr")
-  make=true
-elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
+have_library("mytinfo", "tgetent") if /bow/ =~ PLATFORM
+if have_header("ncurses.h") and have_library("ncurses", "initscr")
   make=true
-elsif have_header(*curses=%w"curses_colr/curses.h") and have_library("cur_colr", "initscr")
-  curses.unshift("varargs.h")
+elsif have_header("ncurses/curses.h") and have_library("ncurses", "initscr")
   make=true
-elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
+elsif have_header("curses_colr/curses.h") and have_library("cur_colr", "initscr")
   make=true
+else
+  have_library("termcap", "tgetent") 
+  if have_library("curses", "initscr")
+    make=true
+  end
 end
 
 if make
-  for f in %w(isendwin ungetch beep getnstr wgetnstr doupdate flash deleteln wdeleteln keypad keyname init_color wresize resizeterm)
+  for f in %w(isendwin ungetch beep doupdate flash deleteln wdeleteln)
     have_func(f)
   end
-  flag = "-D_XOPEN_SOURCE_EXTENDED"
-  src = "int test_var[(sizeof(char*)>sizeof(int))*2-1];"
-  if try_compile(cpp_include(%w[stdio.h stdlib.h]+curses)+src , flag)
-    $defs << flag
-  end
   create_makefile("curses")
 end
diff --git a/ext/curses/hello.rb b/ext/curses/hello.rb
index 7f57d801a3..a1915ce60d 100644
--- a/ext/curses/hello.rb
+++ b/ext/curses/hello.rb
@@ -7,7 +7,7 @@ def show_message(message)
   width = message.length + 6
   win = Window.new(5, width,
 		   (lines - 5) / 2, (cols - width) / 2)
-  win.box(?|, ?-)
+  win.box(?|, ?=)
   win.setpos(2, 3)
   win.addstr(message)
   win.refresh
diff --git a/ext/curses/mouse.rb b/ext/curses/mouse.rb
deleted file mode 100644
index c42bc31f33..0000000000
--- a/ext/curses/mouse.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/local/bin/ruby
-
-require "curses"
-include Curses
-
-def show_message(*msgs)
-  message = msgs.join
-  width = message.length + 6
-  win = Window.new(5, width,
-		   (lines - 5) / 2, (cols - width) / 2)
-  win.keypad = true
-  win.attron(color_pair(COLOR_RED)){
-    win.box(?|, ?-, ?+)
-  }
-  win.setpos(2, 3)
-  win.addstr(message)
-  win.refresh
-  win.getch
-  win.close
-end
-
-init_screen
-start_color
-init_pair(COLOR_BLUE,COLOR_BLUE,COLOR_WHITE)
-init_pair(COLOR_RED,COLOR_RED,COLOR_WHITE)
-crmode
-noecho
-stdscr.keypad(true)
-
-begin
-  mousemask(BUTTON1_CLICKED|BUTTON2_CLICKED|BUTTON3_CLICKED|BUTTON4_CLICKED)
-  setpos((lines - 5) / 2, (cols - 10) / 2)
-  attron(color_pair(COLOR_BLUE)|A_BOLD){
-    addstr("click")
-  }
-  refresh
-  while( true )
-    c = getch
-    case c
-    when KEY_MOUSE
-      m = getmouse
-      if( m )
-	show_message("getch = #{c.inspect}, ",
-		     "mouse event = #{'0x%x' % m.bstate}, ",
-		     "axis = (#{m.x},#{m.y},#{m.z})")
-      end
-      break
-    end
-  end
-  refresh
-ensure
-  close_screen
-end
diff --git a/ext/curses/view2.rb b/ext/curses/view2.rb
deleted file mode 100644
index 18d9619216..0000000000
--- a/ext/curses/view2.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/local/bin/ruby
-
-require "curses"
-
-if ARGV.size != 1 then
-  printf("usage: view file\n");
-  exit
-end
-begin
-  fp = open(ARGV[0], "r")
-rescue
-  raise "cannot open file: #{ARGV[1]}"
-end
-
-# signal(SIGINT, finish)
-
-Curses.init_screen
-Curses.nonl
-Curses.cbreak
-Curses.noecho
-
-$screen = Curses.stdscr
-
-$screen.scrollok(true)
-#$screen.keypad(true)
-
-# slurp the file
-$data_lines = []
-fp.each_line { |l|
-  $data_lines.push(l.chop)
-}
-fp.close
-
-$top = 0
-$data_lines[0..$screen.maxy-1].each_with_index{|line, idx|
-  $screen.setpos(idx, 0)
-  $screen.addstr(line)
-}
-$screen.setpos(0,0)
-$screen.refresh
-
-def scroll_up
-  if( $top > 0 )
-    $screen.scrl(-1)
-    $top -= 1
-    str = $data_lines[$top]
-    if( str )
-      $screen.setpos(0, 0)
-      $screen.addstr(str)
-    end
-    return true
-  else
-    return false
-  end
-end
-
-def scroll_down
-  if( $top + $screen.maxy < $data_lines.length )
-    $screen.scrl(1)
-    $top += 1
-    str = $data_lines[$top + $screen.maxy - 1]
-    if( str )
-      $screen.setpos($screen.maxy - 1, 0)
-      $screen.addstr(str)
-    end
-    return true
-  else
-    return false
-  end
-end
-
-while true
-  result = true
-  c = Curses.getch
-  case c
-  when Curses::KEY_DOWN, Curses::KEY_CTRL_N
-    result = scroll_down
-  when Curses::KEY_UP, Curses::KEY_CTRL_P
-    result = scroll_up
-  when Curses::KEY_NPAGE, ?\s  # white space
-    for i in 0..($screen.maxy - 2)
-      if( ! scroll_down )
-	if( i == 0 )
-	  result = false
-	end
-	break
-      end
-    end
-  when Curses::KEY_PPAGE
-    for i in 0..($screen.maxy - 2)
-      if( ! scroll_up )
-	if( i == 0 )
-	  result = false
-	end
-	break
-      end
-    end
-  when Curses::KEY_LEFT, Curses::KEY_CTRL_T
-    while( scroll_up )
-    end
-  when Curses::KEY_RIGHT, Curses::KEY_CTRL_B
-    while( scroll_down )
-    end
-  when ?q
-    break
-  else
-    $screen.setpos(0,0)
-    $screen.addstr("[unknown key `#{Curses.keyname(c)}'=#{c}] ")
-  end
-  if( !result )
-    Curses.beep
-  end
-  $screen.setpos(0,0)
-end
-Curses.close_screen
diff --git a/ext/cygwin32_ld.rb b/ext/cygwin32_ld.rb
new file mode 100644
index 0000000000..a9c8e21cb0
--- /dev/null
+++ b/ext/cygwin32_ld.rb
@@ -0,0 +1,90 @@
+#!/usr/local/bin/ruby
+require '../../rbconfig'
+include Config
+
+args = ARGV.join(" ")
+
+objs = []
+flags = []
+libname = ''
+Init = "../init"
+
+path = ''
+
+def writeInit
+  out = open("#{Init}.c", "w")
+
+  out.print %q@
+#include <windows.h>
+#include <stdio.h>
+
+extern struct _reent *__imp_reent_data;
+WINAPI dll_entry(int a, int b, int c)
+{
+    _impure_ptr =__imp_reent_data;
+    return 1;
+}
+main(){}
+//void impure_setup(struct _reent *_impure_ptrMain)
+//{
+//    _impure_ptr =__imp_reent_data;
+//}
+@
+  out.close
+end
+
+def xsystem cmd
+  print cmd, "\n"
+  system cmd
+end
+
+if args =~ /-o (\w+)\.dll/i
+  libname = $1
+  # Check for path:
+  if libname =~ /(\w+\/)(\w+)$/
+    path = $1
+    libname = $2
+  end
+  for arg in ARGV
+    case arg
+    when /\.[oa]$/i
+      objs.push(arg)
+    when /-o/, /\w+\.dll/i
+      ;
+    else
+      flags << arg
+    end
+  end
+
+  writeInit unless FileTest.exist?("#{Init}.c")
+  unless FileTest.exist?("#{Init}.o") and
+    File.mtime("#{Init}.c") < File.mtime("#{Init}.o")
+    xsystem "gcc -c #{Init}.c -o #{Init}.o"
+  end
+  
+  command = "echo EXPORTS > #{libname}.def"
+  xsystem command
+#  xsystem "echo impure_setup >> #{libname}.def"
+  xsystem "nm --extern-only " + objs.join(" ") +
+    "  | sed -n '/^........ [CDT] _/s///p' >> #{libname}.def"
+
+  command = "gcc -nostdlib -o junk.o -Wl,--base-file,#{libname}.base,--dll " +
+    objs.join(" ") + "  #{Init}.o "
+  command.concat(flags.join(" ") +
+    " -Wl,-e,_dll_entry@12 -lcygwin -lkernel32 #{CONFIG['srcdir']}/libruby.a")
+  xsystem command
+
+  command = "dlltool --as=as --dllname #{libname}.dll --def #{libname}.def --base-file #{libname}.base --output-exp #{libname}.exp"
+  xsystem command
+  
+  command = "gcc -s -nostdlib -o #{libname}.dll -Wl,--dll #{libname}.exp " +
+    objs.join(" ") + "  #{Init}.o "
+  command.concat(flags.join(" ") +
+    " -Wl,-e,_dll_entry@12 -lcygwin -lkernel32 #{CONFIG['srcdir']}/libruby.a")
+  xsystem command
+  File.unlink "junk.o" if FileTest.exist? "junk.o"
+
+else
+  # no special processing, just call ld
+  xsystem "ld #{args}"
+end
diff --git a/ext/dbm/.cvsignore b/ext/dbm/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/dbm/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/dbm/MANIFEST b/ext/dbm/MANIFEST
index c8719f62a7..8beec6783d 100644
--- a/ext/dbm/MANIFEST
+++ b/ext/dbm/MANIFEST
@@ -2,4 +2,3 @@ MANIFEST
 dbm.c
 depend
 extconf.rb
-testdbm.rb
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index c422394405..4d83cec1b1 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -6,7 +6,7 @@
   $Date$
   created at: Mon Jan 24 15:59:52 JST 1994
 
-  Copyright (C) 1995-2001 Yukihiro Matsumoto
+  Copyright (C) 1995-1998 Yukihiro Matsumoto
 
 ************************************************/
 
@@ -15,14 +15,14 @@
 #ifdef HAVE_CDEFS_H
 # include <cdefs.h>
 #endif
-#ifdef HAVE_SYS_CDEFS_H
-# include <sys/cdefs.h>
-#endif
-#include DBM_HDR
+#include <ndbm.h>
 #include <fcntl.h>
 #include <errno.h>
+#ifdef USE_CWGUSI
+# include <sys/errno.h>
+#endif
 
-static VALUE rb_cDBM, rb_eDBMError;
+VALUE cDBM;
 
 struct dbmdata {
     int  di_size;
@@ -32,12 +32,11 @@ struct dbmdata {
 static void
 closed_dbm()
 {
-    rb_raise(rb_eDBMError, "closed DBM file");
+    rb_raise(rb_eRuntimeError, "closed DBM file");
 }
 
 #define GetDBM(obj, dbmp) {\
     Data_Get_Struct(obj, struct dbmdata, dbmp);\
-    if (dbmp == 0) closed_dbm();\
     if (dbmp->di_dbm == 0) closed_dbm();\
 }
 
@@ -45,43 +44,21 @@ static void
 free_dbm(dbmp)
     struct dbmdata *dbmp;
 {
-    if (dbmp) {
-	if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
-	free(dbmp);
-    }
-}
-
-static VALUE
-fdbm_close(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-
-    GetDBM(obj, dbmp);
-    dbm_close(dbmp->di_dbm);
-    dbmp->di_dbm = 0;
-
-    return Qnil;
-}
-
-static VALUE fdbm_alloc _((VALUE));
-static VALUE
-fdbm_alloc(klass)
-    VALUE klass;
-{
-    return Data_Wrap_Struct(klass, 0, free_dbm, 0);
+    if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
+    free(dbmp);
 }
 
 static VALUE
-fdbm_initialize(argc, argv, obj)
+fdbm_s_open(argc, argv, klass)
     int argc;
     VALUE *argv;
-    VALUE obj;
+    VALUE klass;
 {
     VALUE file, vmode;
     DBM *dbm;
     struct dbmdata *dbmp;
     int mode;
+    VALUE obj;
 
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
 	mode = 0666;		/* default value */
@@ -92,60 +69,52 @@ fdbm_initialize(argc, argv, obj)
     else {
 	mode = NUM2INT(vmode);
     }
-    SafeStringValue(file);
+    Check_SafeStr(file);
 
     dbm = 0;
-    if (mode >= 0) {
+    if (mode >= 0)
 	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
-    }
-    if (!dbm) {
-	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
-    }
-    if (!dbm) {
-	dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
-    }
+    if (!dbm)
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, mode);
+    if (!dbm)
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, mode);
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
 	rb_sys_fail(RSTRING(file)->ptr);
     }
 
-    dbmp = ALLOC(struct dbmdata);
-    DATA_PTR(obj) = dbmp;
+    obj = Data_Make_Struct(klass,struct dbmdata,0,free_dbm,dbmp);
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
+    rb_obj_call_init(obj, argc, argv);
 
     return obj;
 }
 
 static VALUE
-fdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+fdbm_close(obj)
+    VALUE obj;
 {
-    VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
-
-    if (NIL_P(fdbm_initialize(argc, argv, obj))) {
-	return Qnil;
-    }
+    struct dbmdata *dbmp;
 
-    if (rb_block_given_p()) {
-        return rb_ensure(rb_yield, obj, fdbm_close, obj);
-    }
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
+    if (dbmp->di_dbm == 0) closed_dbm();
+    dbm_close(dbmp->di_dbm);
+    dbmp->di_dbm = 0;
 
-    return obj;
+    return Qnil;
 }
 
 static VALUE
-fdbm_fetch(obj, keystr, ifnone)
-    VALUE obj, keystr, ifnone;
+fdbm_fetch(obj, keystr)
+    VALUE obj, keystr;
 {
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(keystr);
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
@@ -153,61 +122,12 @@ fdbm_fetch(obj, keystr, ifnone)
     dbm = dbmp->di_dbm;
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
-	if (ifnone == Qnil && rb_block_given_p())
-	    return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
-	return ifnone;
+	return Qnil;
     }
     return rb_tainted_str_new(value.dptr, value.dsize);
 }
 
 static VALUE
-fdbm_aref(obj, keystr)
-    VALUE obj, keystr;
-{
-    return fdbm_fetch(obj, keystr, Qnil);
-}
-
-static VALUE
-fdbm_fetch_m(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE keystr, valstr, ifnone;
-
-    rb_scan_args(argc, argv, "11", &keystr, &ifnone);
-    valstr = fdbm_fetch(obj, keystr, ifnone);
-    if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
-	rb_raise(rb_eIndexError, "key not found");
-
-    return valstr;
-}
-
-static VALUE
-fdbm_index(obj, valstr)
-    VALUE obj, valstr;
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    StringValue(valstr);
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	val = dbm_fetch(dbm, key);
-	if (val.dsize == RSTRING(valstr)->len &&
-	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0) {
-	    return rb_tainted_str_new(key.dptr, key.dsize);
-	}
-    }
-    return Qnil;
-}
-
-static VALUE
 fdbm_indexes(argc, argv, obj)
     int argc;
     VALUE *argv;
@@ -218,63 +138,7 @@ fdbm_indexes(argc, argv, obj)
 
     new = rb_ary_new2(argc);
     for (i=0; i<argc; i++) {
-	rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
-    }
-
-    return new;
-}
-
-static VALUE
-fdbm_select(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    if (rb_block_given_p()) {
-        datum key, val;
-        DBM *dbm;
-        struct dbmdata *dbmp;
-
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-	}
-        GetDBM(obj, dbmp);
-        dbm = dbmp->di_dbm;
-
-        for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-            VALUE assoc;
-            val = dbm_fetch(dbm, key);
-            assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-                                 rb_tainted_str_new(val.dptr, val.dsize));
-            if (RTEST(rb_yield(assoc)))
-                rb_ary_push(new, assoc);
-        }
-    }
-    else {
-	rb_warn("DBM#select(index..) is deprecated; use DBM#values_at");
-
-        for (i=0; i<argc; i++) {
-            rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
-        }
-    }
-
-    return new;
-}
-
-static VALUE
-fdbm_values_at(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    for (i=0; i<argc; i++) {
-        rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+	rb_ary_push(new, fdbm_fetch(obj, argv[i]));
     }
 
     return new;
@@ -287,10 +151,9 @@ fdbm_delete(obj, keystr)
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
-    VALUE valstr;
 
     rb_secure(4);
-    StringValue(keystr);
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
@@ -299,21 +162,18 @@ fdbm_delete(obj, keystr)
 
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
-	if (rb_block_given_p()) return rb_yield(keystr);
+	if (rb_iterator_p()) rb_yield(keystr);
 	return Qnil;
     }
 
-    /* need to save value before dbm_delete() */
-    valstr = rb_tainted_str_new(value.dptr, value.dsize);
-
     if (dbm_delete(dbm, key)) {
 	dbmp->di_size = -1;
-	rb_raise(rb_eDBMError, "dbm_delete failed");
+	rb_raise(rb_eRuntimeError, "dbm_delete failed");
     }
     else if (dbmp->di_size >= 0) {
 	dbmp->di_size--;
     }
-    return valstr;
+    return obj;
 }
 
 static VALUE
@@ -328,15 +188,14 @@ fdbm_shift(obj)
     rb_secure(4);
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    dbmp->di_size = -1;
 
     key = dbm_firstkey(dbm); 
     if (!key.dptr) return Qnil;
     val = dbm_fetch(dbm, key);
-    keystr = rb_tainted_str_new(key.dptr, key.dsize);
-    valstr = rb_tainted_str_new(val.dptr, val.dsize);
     dbm_delete(dbm, key);
 
+    keystr = rb_tainted_str_new(key.dptr, key.dsize);
+    valstr = rb_tainted_str_new(val.dptr, val.dsize);
     return rb_assoc_new(keystr, valstr);
 }
 
@@ -348,35 +207,20 @@ fdbm_delete_if(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
     VALUE keystr, valstr;
-    VALUE ret, ary = rb_ary_new();
-    int i, status = 0, n;
 
     rb_secure(4);
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    n = dbmp->di_size;
-    dbmp->di_size = -1;
-
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	keystr = rb_tainted_str_new(key.dptr, key.dsize);
 	valstr = rb_tainted_str_new(val.dptr, val.dsize);
-        ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
-        if (status != 0) break;
-	if (RTEST(ret)) rb_ary_push(ary, keystr);
-    }
-
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	keystr = RARRAY(ary)->ptr[i];
-	key.dptr = RSTRING(keystr)->ptr;
-	key.dsize = RSTRING(keystr)->len;
-	if (dbm_delete(dbm, key)) {
-	    rb_raise(rb_eDBMError, "dbm_delete failed");
+	if (RTEST(rb_yield(rb_assoc_new(keystr, valstr)))) {
+	    if (dbm_delete(dbm, key)) {
+		rb_raise(rb_eRuntimeError, "dbm_delete failed");
+	    }
 	}
     }
-    if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
-
     return obj;
 }
 
@@ -392,13 +236,11 @@ fdbm_clear(obj)
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
-    while (key = dbm_firstkey(dbm), key.dptr) {
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	if (dbm_delete(dbm, key)) {
-	    rb_raise(rb_eDBMError, "dbm_delete failed");
+	    rb_raise(rb_eRuntimeError, "dbm_delete failed");
 	}
     }
-    dbmp->di_size = 0;
-
     return obj;
 }
 
@@ -420,11 +262,9 @@ fdbm_invert(obj)
 	valstr = rb_tainted_str_new(val.dptr, val.dsize);
 	rb_hash_aset(hash, valstr, keystr);
     }
-    return hash;
+    return obj;
 }
 
-static VALUE each_pair _((VALUE));
-
 static VALUE
 each_pair(obj)
     VALUE obj;
@@ -471,17 +311,24 @@ fdbm_store(obj, keystr, valstr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
+    if (valstr == Qnil) {
+	fdbm_delete(obj, keystr);
+	return Qnil;
+    }
+
     rb_secure(4);
     keystr = rb_obj_as_string(keystr);
 
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    if (NIL_P(valstr)) return fdbm_delete(obj, keystr);
+
     valstr = rb_obj_as_string(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     dbmp->di_size = -1;
     dbm = dbmp->di_dbm;
     if (dbm_store(dbm, key, val, DBM_REPLACE)) {
@@ -489,7 +336,7 @@ fdbm_store(obj, keystr, valstr)
 	dbm_clearerr(dbm);
 #endif
 	if (errno == EPERM) rb_sys_fail(0);
-	rb_raise(rb_eDBMError, "dbm_store failed");
+	rb_raise(rb_eRuntimeError, "dbm_store failed");
     }
 
     return valstr;
@@ -504,7 +351,7 @@ fdbm_length(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
     dbm = dbmp->di_dbm;
 
@@ -525,7 +372,7 @@ fdbm_empty_p(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp->di_size < 0) {
 	dbm = dbmp->di_dbm;
 
@@ -644,7 +491,7 @@ fdbm_has_key(obj, keystr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(keystr);
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
@@ -663,7 +510,7 @@ fdbm_has_value(obj, valstr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(valstr);
+    Check_Type(valstr, T_STRING);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
@@ -700,86 +547,41 @@ fdbm_to_a(obj)
     return ary;
 }
 
-static VALUE
-fdbm_to_hash(obj)
-    VALUE obj;
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE hash;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-
-    hash = rb_hash_new();
-    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	val = dbm_fetch(dbm, key);
-	rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
-		           rb_tainted_str_new(val.dptr, val.dsize));
-    }
-
-    return hash;
-}
-
-static VALUE
-fdbm_reject(obj)
-    VALUE obj;
-{
-    return rb_hash_delete_if(fdbm_to_hash(obj));
-}
-
 void
 Init_dbm()
 {
-    rb_cDBM = rb_define_class("DBM", rb_cObject);
-    rb_eDBMError = rb_define_class("DBMError", rb_eStandardError);
-    rb_include_module(rb_cDBM, rb_mEnumerable);
-
-    rb_define_alloc_func(rb_cDBM, fdbm_alloc);
-    rb_define_singleton_method(rb_cDBM, "open", fdbm_s_open, -1);
-
-    rb_define_method(rb_cDBM, "initialize", fdbm_initialize, -1);
-    rb_define_method(rb_cDBM, "close", fdbm_close, 0);
-    rb_define_method(rb_cDBM, "[]", fdbm_aref, 1);
-    rb_define_method(rb_cDBM, "fetch", fdbm_fetch_m, -1);
-    rb_define_method(rb_cDBM, "[]=", fdbm_store, 2);
-    rb_define_method(rb_cDBM, "store", fdbm_store, 2);
-    rb_define_method(rb_cDBM, "index",  fdbm_index, 1);
-    rb_define_method(rb_cDBM, "indexes",  fdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "indices",  fdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "select",  fdbm_select, -1);
-    rb_define_method(rb_cDBM, "values_at", fdbm_values_at, -1);
-    rb_define_method(rb_cDBM, "length", fdbm_length, 0);
-    rb_define_method(rb_cDBM, "size", fdbm_length, 0);
-    rb_define_method(rb_cDBM, "empty?", fdbm_empty_p, 0);
-    rb_define_method(rb_cDBM, "each", fdbm_each_pair, 0);
-    rb_define_method(rb_cDBM, "each_value", fdbm_each_value, 0);
-    rb_define_method(rb_cDBM, "each_key", fdbm_each_key, 0);
-    rb_define_method(rb_cDBM, "each_pair", fdbm_each_pair, 0);
-    rb_define_method(rb_cDBM, "keys", fdbm_keys, 0);
-    rb_define_method(rb_cDBM, "values", fdbm_values, 0);
-    rb_define_method(rb_cDBM, "shift", fdbm_shift, 0);
-    rb_define_method(rb_cDBM, "delete", fdbm_delete, 1);
-    rb_define_method(rb_cDBM, "delete_if", fdbm_delete_if, 0);
-    rb_define_method(rb_cDBM, "reject!", fdbm_delete_if, 0);
-    rb_define_method(rb_cDBM, "reject", fdbm_reject, 0);
-    rb_define_method(rb_cDBM, "clear", fdbm_clear, 0);
-    rb_define_method(rb_cDBM,"invert", fdbm_invert, 0);
-    rb_define_method(rb_cDBM,"update", fdbm_update, 1);
-    rb_define_method(rb_cDBM,"replace", fdbm_replace, 1);
-
-    rb_define_method(rb_cDBM, "include?", fdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "has_key?", fdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "member?", fdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "has_value?", fdbm_has_value, 1);
-    rb_define_method(rb_cDBM, "key?", fdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "value?", fdbm_has_value, 1);
-
-    rb_define_method(rb_cDBM, "to_a", fdbm_to_a, 0);
-    rb_define_method(rb_cDBM, "to_hash", fdbm_to_hash, 0);
-
-#ifdef DB_VERSION_STRING
-    rb_define_const(rb_cDBM, "VERSION",  rb_str_new2(DB_VERSION_STRING));
-#endif
+    cDBM = rb_define_class("DBM", rb_cObject);
+    rb_include_module(cDBM, rb_mEnumerable);
+
+    rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
+    rb_define_singleton_method(cDBM, "new", fdbm_s_open, -1);
+    rb_define_method(cDBM, "close", fdbm_close, 0);
+    rb_define_method(cDBM, "[]", fdbm_fetch, 1);
+    rb_define_method(cDBM, "[]=", fdbm_store, 2);
+    rb_define_method(cDBM, "indexes",  fdbm_indexes, -1);
+    rb_define_method(cDBM, "indices",  fdbm_indexes, -1);
+    rb_define_method(cDBM, "length", fdbm_length, 0);
+    rb_define_alias(cDBM,  "size", "length");
+    rb_define_method(cDBM, "empty?", fdbm_empty_p, 0);
+    rb_define_method(cDBM, "each", fdbm_each_pair, 0);
+    rb_define_method(cDBM, "each_value", fdbm_each_value, 0);
+    rb_define_method(cDBM, "each_key", fdbm_each_key, 0);
+    rb_define_method(cDBM, "each_pair", fdbm_each_pair, 0);
+    rb_define_method(cDBM, "keys", fdbm_keys, 0);
+    rb_define_method(cDBM, "values", fdbm_values, 0);
+    rb_define_method(cDBM, "shift", fdbm_shift, 1);
+    rb_define_method(cDBM, "delete", fdbm_delete, 1);
+    rb_define_method(cDBM, "delete_if", fdbm_delete_if, 0);
+    rb_define_method(cDBM, "clear", fdbm_clear, 0);
+    rb_define_method(cDBM,"invert", fdbm_invert, 0);
+    rb_define_method(cDBM,"update", fdbm_update, 1);
+    rb_define_method(cDBM,"replace", fdbm_replace, 1);
+
+    rb_define_method(cDBM, "include?", fdbm_has_key, 1);
+    rb_define_method(cDBM, "has_key?", fdbm_has_key, 1);
+    rb_define_method(cDBM, "has_value?", fdbm_has_value, 1);
+    rb_define_method(cDBM, "key?", fdbm_has_key, 1);
+    rb_define_method(cDBM, "value?", fdbm_has_value, 1);
+
+    rb_define_method(cDBM, "to_a", fdbm_to_a, 0);
 }
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 5a67603e69..22198910cc 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -1,61 +1,10 @@
 require 'mkmf'
-
 dir_config("dbm")
-
-dblib = with_config("dbm-type", nil)
-
-$dbm_conf_headers = {
-  "db" => ["db.h"],
-  "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
-  "db2" => ["db2/db.h", "db2.h", "db.h"],
-  "dbm" => ["ndbm.h"],
-  "gdbm" => ["gdbm-ndbm.h", "ndbm.h"],
-  "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"],
-  "qdbm" => ["relic.h"],
-}
-
-def db_check(db)
-  $dbm_conf_db_prefix = ""
-  $dbm_conf_have_gdbm = false
-  hsearch = ""
-
-  case db
-  when /^db2?$/
-    $dbm_conf_db_prefix = "__db_n"
-    hsearch = "-DDB_DBM_HSEARCH "
-  when "gdbm"
-    $dbm_conf_have_gdbm = true
-  when "gdbm_compat"
-    $dbm_conf_have_gdbm = true
-    have_library("gdbm") or return false
-  end
-
-  if have_library(db, db_prefix("dbm_open")) || have_func(db_prefix("dbm_open"))
-    for hdr in $dbm_conf_headers.fetch(db, ["ndbm.h"])
-      if have_header(hdr.dup) and have_type("DBM", hdr.dup, hsearch)
-	$CFLAGS += " " + hsearch + '-DDBM_HDR="<'+hdr+'>"'
-	return true
-      end
-    end
-  end
-  return false
-end
-
-def db_prefix(func)
-  $dbm_conf_db_prefix+func
-end
-
-if dblib
-  db_check(dblib)
-else
-  for dblib in %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
-    db_check(dblib) and break
-  end
-end
-
+have_library("gdbm", "dbm_open") or
+  have_library("db", "dbm_open") or
+  have_library("dbm", "dbm_open")
 have_header("cdefs.h") 
-have_header("sys/cdefs.h") 
-if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open"))
-  have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm
+if have_header("ndbm.h") and have_func("dbm_open")
+  have_func("dbm_clearerr")
   create_makefile("dbm")
 end
diff --git a/ext/dbm/testdbm.rb b/ext/dbm/testdbm.rb
deleted file mode 100644
index 4942ffb64a..0000000000
--- a/ext/dbm/testdbm.rb
+++ /dev/null
@@ -1,593 +0,0 @@
-require 'runit/testcase'
-require 'runit/cui/testrunner'
-
-if $".grep(/\bdbm.so\b/).empty?
-  begin
-    require './dbm'
-  rescue LoadError
-    require 'dbm'
-  end
-end
-
-def uname_s
-  require 'rbconfig'
-  case Config::CONFIG['host_os']
-  when 'cygwin'
-    require 'Win32API'
-    uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
-    utsname = ' ' * 100
-    raise 'cannot get system name' if uname.call(utsname) == -1
-
-    utsname.unpack('A20' * 5)[0]
-  else
-    Config::CONFIG['host_os']
-  end
-end
-
-SYSTEM = uname_s
-
-class TestDBM < RUNIT::TestCase
-  def setup
-    @path = "tmptest_dbm_"
-    assert_instance_of(DBM, @dbm = DBM.new(@path))
-
-    # prepare to make readonly DBM file
-    DBM.open("tmptest_dbm_rdonly") {|dbm|
-      dbm['foo'] = 'FOO'
-    }
-    
-    File.chmod(0400, *Dir.glob("tmptest_dbm_rdonly.*"))
-
-    assert_instance_of(DBM, @dbm_rdonly = DBM.new("tmptest_dbm_rdonly", nil))
-  end
-  def teardown
-    assert_nil(@dbm.close)
-    assert_nil(@dbm_rdonly.close)
-    GC.start
-    File.delete *Dir.glob("tmptest_dbm*").to_a
-    p Dir.glob("tmptest_dbm*") if $DEBUG
-  end
-
-  def check_size(expect, dbm=@dbm)
-    assert_equals(expect, dbm.size)
-    n = 0
-    dbm.each { n+=1 }
-    assert_equals(expect, n)
-    if expect == 0
-      assert_equals(true, dbm.empty?)
-    else
-      assert_equals(false, dbm.empty?)
-    end
-  end
-
-  def test_version
-    STDERR.print DBM::VERSION
-  end
-
-  def test_s_new_has_no_block
-    # DBM.new ignore the block
-    foo = true
-    assert_instance_of(DBM, dbm = DBM.new("tmptest_dbm") { foo = false })
-    assert_equals(foo, true)
-    assert_nil(dbm.close)
-  end
-  def test_s_open_no_create
-    assert_nil(dbm = DBM.open("tmptest_dbm", nil))
-  ensure
-    dbm.close if dbm
-  end
-  def test_s_open_with_block
-    assert_equals(DBM.open("tmptest_dbm") { :foo }, :foo)
-  end
-  def test_s_open_lock
-    fork() {
-      assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm", 0644))
-      sleep 2
-    }
-    begin
-      sleep 1
-      assert_exception(Errno::EWOULDBLOCK, "NEVER MIND IF YOU USE Berkeley DB3") {
-	begin
-	  assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644))
-	rescue Errno::EAGAIN, Errno::EACCES, Errno::EINVAL
-	  raise Errno::EWOULDBLOCK
-	end
-      }
-    ensure
-      Process.wait
-    end
-  end
-
-=begin
-  # Is it guaranteed on many OS?
-  def test_s_open_lock_one_process
-    # locking on one process
-    assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644))
-    assert_exception(Errno::EWOULDBLOCK) {
-      begin
-	DBM.open("tmptest_dbm", 0644)
-      rescue Errno::EAGAIN
-	raise Errno::EWOULDBLOCK
-      end
-    }
-  end
-=end
-
-  def test_s_open_nolock
-    # dbm 1.8.0 specific
-    if not defined? DBM::NOLOCK
-      return
-    end
-
-    fork() {
-      assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644,
-						DBM::NOLOCK))
-      sleep 2
-    }
-    sleep 1
-    begin
-      dbm2 = nil
-      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
-	assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644))
-      }
-    ensure
-      Process.wait
-      dbm2.close if dbm2
-    end
-
-    p Dir.glob("tmptest_dbm*") if $DEBUG
-
-    fork() {
-      assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644))
-      sleep 2
-    }
-    begin
-      sleep 1
-      dbm2 = nil
-      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
-	# this test is failed on Cygwin98 (???)
-	assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644,
-						   DBM::NOLOCK))
-      }
-    ensure
-      Process.wait
-      dbm2.close if dbm2
-    end
-  end
-
-  def test_s_open_error
-    assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm", 0))
-    assert_exception(Errno::EACCES, "NEVER MIND IF YOU USE Berkeley DB3") {
-      DBM.open("tmptest_dbm", 0)
-    }
-    dbm.close
-  end
-
-  def test_close
-    assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm"))
-    assert_nil(dbm.close)
-
-    # closed DBM file
-    assert_exception(DBMError) { dbm.close }
-  end
-
-  def test_aref
-    assert_equals('bar', @dbm['foo'] = 'bar')
-    assert_equals('bar', @dbm['foo'])
-
-    assert_nil(@dbm['bar'])
-  end
-
-  def test_fetch
-    assert_equals('bar', @dbm['foo']='bar')
-    assert_equals('bar', @dbm.fetch('foo'))
-
-    # key not found
-    assert_exception(IndexError) {
-      @dbm.fetch('bar')
-    }
-
-    # test for `ifnone' arg
-    assert_equals('baz', @dbm.fetch('bar', 'baz'))
-
-    # test for `ifnone' block
-    assert_equals('foobar', @dbm.fetch('bar') {|key| 'foo' + key })
-  end
-
-  def test_aset
-    num = 0
-    2.times {|i|
-      assert_equals('foo', @dbm['foo'] = 'foo')
-      assert_equals('foo', @dbm['foo'])
-      assert_equals('bar', @dbm['foo'] = 'bar')
-      assert_equals('bar', @dbm['foo'])
-
-      num += 1 if i == 0
-      assert_equals(num, @dbm.size)
-
-      # assign nil
-      assert_equals('', @dbm['bar'] = '')
-      assert_equals('', @dbm['bar'])
-
-      num += 1 if i == 0
-      assert_equals(num, @dbm.size)
-
-      # empty string
-      assert_equals('', @dbm[''] = '')
-      assert_equals('', @dbm[''])
-
-      num += 1 if i == 0
-      assert_equals(num, @dbm.size)
-
-      # Fixnum
-      assert_equals('200', @dbm['100'] = '200')
-      assert_equals('200', @dbm['100'])
-
-      num += 1 if i == 0
-      assert_equals(num, @dbm.size)
-
-      # Big key and value
-      assert_equals('y' * 100, @dbm['x' * 100] = 'y' * 100)
-      assert_equals('y' * 100, @dbm['x' * 100])
-
-      num += 1 if i == 0
-      assert_equals(num, @dbm.size)
-    }
-  end
-
-  def test_index
-    assert_equals('bar', @dbm['foo'] = 'bar')
-    assert_equals('foo', @dbm.index('bar'))
-    assert_nil(@dbm['bar'])
-  end
-
-  def test_indexes
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-    assert_equals(values.reverse, @dbm.indexes(*keys.reverse))
-  end
-
-  def test_values_at
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-    assert_equals(values.reverse, @dbm.values_at(*keys.reverse))
-  end
-
-  def test_select_with_block
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-    ret = @dbm.select {|k,v|
-      assert_equals(k.upcase, v)
-      k != "bar"
-    }
-    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
-		  ret.sort)
-  end
-
-  def test_length
-    num = 10
-    assert_equals(0, @dbm.size)
-    num.times {|i|
-      i = i.to_s
-      @dbm[i] = i
-    }
-    assert_equals(num, @dbm.size)
-
-    @dbm.shift
-
-    assert_equals(num - 1, @dbm.size)
-  end
-
-  def test_empty?
-    assert_equals(true, @dbm.empty?)
-    @dbm['foo'] = 'FOO'
-    assert_equals(false, @dbm.empty?)
-  end
-
-  def test_each_pair
-    n = 0
-    @dbm.each_pair { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-
-    n = 0
-    ret = @dbm.each_pair {|key, val|
-      assert_not_nil(i = keys.index(key))
-      assert_equals(val, values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@dbm, ret)
-  end
-
-  def test_each_value
-    n = 0
-    @dbm.each_value { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-
-    n = 0
-    ret = @dbm.each_value {|val|
-      assert_not_nil(key = @dbm.index(val))
-      assert_not_nil(i = keys.index(key))
-      assert_equals(val, values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@dbm, ret)
-  end
-
-  def test_each_key
-    n = 0
-    @dbm.each_key { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-
-    n = 0
-    ret = @dbm.each_key {|key|
-      assert_not_nil(i = keys.index(key))
-      assert_equals(@dbm[key], values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@dbm, ret)
-  end
-
-  def test_keys
-    assert_equals([], @dbm.keys)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-
-    assert_equals(keys.sort, @dbm.keys.sort)
-    assert_equals(values.sort, @dbm.values.sort)
-  end
-
-  def test_values
-    test_keys
-  end
-
-  def test_shift
-    assert_nil(@dbm.shift)
-    assert_equals(0, @dbm.size)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-
-    ret_keys = []
-    ret_values = []
-    while ret = @dbm.shift
-      ret_keys.push ret[0]
-      ret_values.push ret[1]
-
-      assert_equals(keys.size - ret_keys.size, @dbm.size)
-    end
-
-    assert_equals(keys.sort, ret_keys.sort)
-    assert_equals(values.sort, ret_values.sort)
-  end
-
-  def test_delete
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    key = keys[1]
-
-    assert_nil(@dbm.delete(key))
-    assert_equals(0, @dbm.size)
-
-    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
-
-    assert_equals('BAR', @dbm.delete(key))
-    assert_nil(@dbm[key])
-    assert_equals(2, @dbm.size)
-
-    assert_nil(@dbm.delete(key))
-
-    if /^CYGWIN_9/ !~ SYSTEM
-      assert_exception(DBMError) {
-	@dbm_rdonly.delete("foo")
-      }
-
-      assert_nil(@dbm_rdonly.delete("bar"))
-    end
-  end
-  def test_delete_with_block
-    key = 'no called block'
-    @dbm[key] = 'foo'
-    assert_equals('foo', @dbm.delete(key) {|k| k.replace 'called block'})
-    assert_equals('no called block', key)
-    assert_equals(0, @dbm.size)
-
-    key = 'no called block'
-    assert_equals(:blockval,
-		  @dbm.delete(key) {|k| k.replace 'called block'; :blockval})
-    assert_equals('called block', key)
-    assert_equals(0, @dbm.size)
-  end
-
-  def test_delete_if
-    v = "0"
-    100.times {@dbm[v] = v; v = v.next}
-
-    ret = @dbm.delete_if {|key, val| key.to_i < 50}
-    assert_equals(@dbm, ret)
-    check_size(50, @dbm)
-
-    ret = @dbm.delete_if {|key, val| key.to_i >= 50}
-    assert_equals(@dbm, ret)
-    check_size(0, @dbm)
-
-    # break
-    v = "0"
-    100.times {@dbm[v] = v; v = v.next}
-    check_size(100, @dbm)
-    n = 0;
-    @dbm.delete_if {|key, val|
-      break if n > 50
-      n+=1
-      true
-    }
-    assert_equals(51, n)
-    check_size(49, @dbm)
-
-    @dbm.clear
-
-    # raise
-    v = "0"
-    100.times {@dbm[v] = v; v = v.next}
-    check_size(100, @dbm)
-    n = 0;
-    begin
-      @dbm.delete_if {|key, val|
-	raise "runtime error" if n > 50
-	n+=1
-	true
-      }
-    rescue
-    end
-    assert_equals(51, n)
-    check_size(49, @dbm)
-  end
-
-  def test_reject
-    v = "0"
-    100.times {@dbm[v] = v; v = v.next}
-
-    hash = @dbm.reject {|key, val| key.to_i < 50}
-    assert_instance_of(Hash, hash)
-    assert_equals(100, @dbm.size)
-
-    assert_equals(50, hash.size)
-    hash.each_pair {|key,val|
-      assert_equals(false, key.to_i < 50)
-      assert_equals(key, val)
-    }
-
-    hash = @dbm.reject {|key, val| key.to_i < 100}
-    assert_instance_of(Hash, hash)
-    assert_equals(true, hash.empty?)
-  end
-
-  def test_clear
-    v = "1"
-    100.times {v = v.next; @dbm[v] = v}
-
-    assert_equals(@dbm, @dbm.clear)
-
-    # validate DBM#size
-    i = 0
-    @dbm.each { i += 1 }
-    assert_equals(@dbm.size, i)
-    assert_equals(0, i)
-  end
-
-  def test_invert
-    v = "0"
-    100.times {@dbm[v] = v; v = v.next}
-
-    hash = @dbm.invert
-    assert_instance_of(Hash, hash)
-    assert_equals(100, hash.size)
-    hash.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_update
-    hash = {}
-    v = "0"
-    100.times {v = v.next; hash[v] = v}
-
-    @dbm["101"] = "101"
-    @dbm.update hash
-    assert_equals(101, @dbm.size)
-    @dbm.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_replace
-    hash = {}
-    v = "0"
-    100.times {v = v.next; hash[v] = v}
-
-    @dbm["101"] = "101"
-    @dbm.replace hash
-    assert_equals(100, @dbm.size)
-    @dbm.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_haskey?
-    assert_equals('bar', @dbm['foo']='bar')
-    assert_equals(true,  @dbm.has_key?('foo'))
-    assert_equals(false, @dbm.has_key?('bar'))
-  end
-
-  def test_has_value?
-    assert_equals('bar', @dbm['foo']='bar')
-    assert_equals(true,  @dbm.has_value?('bar'))
-    assert_equals(false, @dbm.has_value?('foo'))
-  end
-
-  def test_to_a
-    v = "0"
-    100.times {v = v.next; @dbm[v] = v}
-
-    ary = @dbm.to_a
-    assert_instance_of(Array, ary)
-    assert_equals(100, ary.size)
-    ary.each {|key,val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_to_hash
-    v = "0"
-    100.times {v = v.next; @dbm[v] = v}
-
-    hash = @dbm.to_hash
-    assert_instance_of(Hash, hash)
-    assert_equals(100, hash.size)
-    hash.each {|key,val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-end
-
-if $0 == __FILE__
-  if ARGV.size == 0
-    suite = RUNIT::TestSuite.new
-    suite.add_test(TestDBM.suite)
-  else
-    suite = RUNIT::TestSuite.new
-    ARGV.each do |testmethod|
-      suite.add_test(TestDBM.new(testmethod))
-    end
-  end
-
-  RUNIT::CUI::TestRunner.run(suite)
-end
diff --git a/ext/digest/.cvsignore b/ext/digest/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/MANIFEST b/ext/digest/MANIFEST
deleted file mode 100644
index 5e50dfa714..0000000000
--- a/ext/digest/MANIFEST
+++ /dev/null
@@ -1,44 +0,0 @@
-MANIFEST
-defs.h
-digest.c
-digest.h
-digest.txt
-digest.txt.ja
-extconf.rb
-lib/md5.rb
-lib/sha1.rb
-md5/MANIFEST
-md5/extconf.rb
-md5/md5.c
-md5/md5.h
-md5/md5init.c
-md5/md5ossl.c
-md5/md5ossl.h
-md5/depend
-rmd160/MANIFEST
-rmd160/extconf.rb
-rmd160/rmd160.c
-rmd160/rmd160.h
-rmd160/rmd160hl.c
-rmd160/rmd160init.c
-rmd160/rmd160ossl.c
-rmd160/rmd160ossl.h
-rmd160/depend
-sha1/MANIFEST
-sha1/extconf.rb
-sha1/sha1.c
-sha1/sha1.h
-sha1/sha1hl.c
-sha1/sha1init.c
-sha1/sha1ossl.c
-sha1/sha1ossl.h
-sha1/depend
-sha2/MANIFEST
-sha2/extconf.rb
-sha2/sha2.c
-sha2/sha2.h
-sha2/sha2hl.c
-sha2/sha2init.c
-sha2/depend
-test.sh
-depend
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
deleted file mode 100644
index 5cfc77dd24..0000000000
--- a/ext/digest/defs.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#ifndef DEFS_H
-#define DEFS_H
-
-#include "ruby.h"
-#include <sys/types.h>
-
-#if defined(HAVE_SYS_CDEFS_H)
-# include <sys/cdefs.h>
-#endif
-#if !defined(__BEGIN_DECLS)
-# define __BEGIN_DECLS
-# define __END_DECLS
-#endif
-
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif !defined __CYGWIN__ || !defined __uint8_t_defined
-  typedef unsigned char uint8_t;
-  typedef unsigned int  uint32_t;
-# if SIZEOF_LONG == 8
-  typedef unsigned long uint64_t;
-# elif defined(__GNUC__)
-  typedef unsigned long long uint64_t;
-# elif defined(_MSC_VER)
-  typedef unsigned _int64 uint64_t;
-# elif defined(__BORLANDC__)
-  typedef unsigned __int64 uint64_t;
-# else
-#  define NO_UINT64_T
-# endif
-#endif
-
-#endif /* DEFS_H */
diff --git a/ext/digest/depend b/ext/digest/depend
deleted file mode 100644
index 43601a208f..0000000000
--- a/ext/digest/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-digest.o: digest.c digest.h $(hdrdir)/ruby.h $(topdir)/config.h \
-  $(hdrdir)/defines.h $(hdrdir)/intern.h
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
deleted file mode 100644
index c570055322..0000000000
--- a/ext/digest/digest.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/************************************************
-
-  digest.c -
-
-  $Author$
-  created at: Fri May 25 08:57:27 JST 2001
-
-  Copyright (C) 1995-2001 Yukihiro Matsumoto
-  Copyright (C) 2001 Akinori MUSHA
-
-  $RoughId: digest.c,v 1.16 2001/07/13 15:38:27 knu Exp $
-  $Id$
-
-************************************************/
-
-/*
- * This module provides an interface to the following hash algorithms:
- *
- *   - the MD5 Message-Digest Algorithm by the RSA Data Security,
- *     Inc., described in RFC 1321
- *
- *   - the SHA-1 Secure Hash Algorithm by NIST (the US' National
- *     Institute of Standards and Technology), described in FIPS PUB
- *     180-1.
- *
- *   - the SHA-256/384/512 Secure Hash Algorithm by NIST (the US'
- *     National Institute of Standards and Technology), described in
- *     FIPS PUB 180-2.
- *
- *   - the RIPEMD-160 cryptographic hash function, designed by Hans
- *     Dobbertin, Antoon Bosselaers, and Bart Preneel.
- */
-
-#include "digest.h"
-
-static VALUE mDigest, cDigest_Base;
-static ID id_metadata;
-
-/*
- * Digest::Base
- */
-
-static algo_t *
-get_digest_base_metadata(klass)
-    VALUE klass;
-{
-    VALUE obj;
-    algo_t *algo;
-
-    if (rb_cvar_defined(klass, id_metadata) == Qfalse) {
-	rb_notimplement();
-    }
-
-    obj = rb_cvar_get(klass, id_metadata);
-
-    Data_Get_Struct(obj, algo_t, algo);
-
-    return algo;
-}
-
-static VALUE rb_digest_base_alloc _((VALUE));
-static VALUE
-rb_digest_base_alloc(klass)
-    VALUE klass;
-{
-    algo_t *algo;
-    VALUE obj;
-    void *pctx;
-
-    if (klass == cDigest_Base) {
-	rb_raise(rb_eNotImpError, "Digest::Base is an abstract class");
-    }
-
-    algo = get_digest_base_metadata(klass);
-
-    /* XXX: An uninitialized buffer leads ALGO_Equal() to fail */
-    pctx = xcalloc(algo->ctx_size, 1);
-    algo->init_func(pctx);
-
-    obj = Data_Wrap_Struct(klass, 0, free, pctx);
-
-    return obj;
-}
-
-static VALUE
-rb_digest_base_s_digest(klass, str)
-    VALUE klass;
-    VALUE str;
-{
-    algo_t *algo;
-    void *pctx;
-    size_t len;
-    unsigned char *digest;
-    VALUE obj = rb_digest_base_alloc(klass);
-
-    algo = get_digest_base_metadata(klass);
-    Data_Get_Struct(obj, void, pctx);
-
-    StringValue(str);
-    algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
-
-    len = algo->digest_len;
-
-    digest = xmalloc(len);
-    algo->final_func(digest, pctx);
-
-    obj = rb_str_new(digest, len);
-
-    free(digest);
-
-    return obj;
-}
-
-static VALUE
-rb_digest_base_s_hexdigest(klass, str)
-    VALUE klass;
-    VALUE str;
-{
-    algo_t *algo;
-    void *pctx;
-    size_t len;
-    unsigned char *hexdigest;
-    VALUE obj = rb_digest_base_alloc(klass);
-
-    algo = get_digest_base_metadata(klass);
-    Data_Get_Struct(obj, void, pctx);
-
-    StringValue(str);
-    algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
-
-    len = algo->digest_len * 2;
-
-    hexdigest = xmalloc(len + 1); /* +1 is for '\0' */
-    algo->end_func(pctx, hexdigest);
-
-    obj = rb_str_new(hexdigest, len);
-
-    free(hexdigest);
-
-    return obj;
-}
-
-static VALUE
-rb_digest_base_copy(copy, obj)
-    VALUE copy, obj;
-{
-    algo_t *algo;
-    void *pctx1, *pctx2;
-
-    if (copy == obj) return copy;
-    rb_check_frozen(copy);
-    algo = get_digest_base_metadata(CLASS_OF(copy));
-    if (algo != get_digest_base_metadata(CLASS_OF(obj))) {
-	rb_raise(rb_eTypeError, "wrong argument class");
-    }
-    Data_Get_Struct(obj, void, pctx1);
-    Data_Get_Struct(copy, void, pctx2);
-    memcpy(pctx2, pctx1, algo->ctx_size);
-
-    return copy;
-}
-
-static VALUE
-rb_digest_base_update(self, str)
-    VALUE self, str;
-{
-    algo_t *algo;
-    void *pctx;
-
-    StringValue(str);
-    algo = get_digest_base_metadata(CLASS_OF(self));
-    Data_Get_Struct(self, void, pctx);
-
-    algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
-
-    return self;
-}
-
-static VALUE
-rb_digest_base_init(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
-{
-    VALUE arg;
-
-    rb_scan_args(argc, argv, "01", &arg);
-
-    if (!NIL_P(arg)) rb_digest_base_update(self, arg);
-
-    return self;
-}
-
-static VALUE
-rb_digest_base_digest(self)
-    VALUE self;
-{
-    algo_t *algo;
-    void *pctx1, *pctx2;
-    unsigned char *digest;
-    size_t len;
-    VALUE str;
-
-    algo = get_digest_base_metadata(CLASS_OF(self));
-    Data_Get_Struct(self, void, pctx1);
-
-    len = algo->ctx_size;
-
-    pctx2 = xmalloc(len);
-    memcpy(pctx2, pctx1, len);
-
-    len = algo->digest_len;
-
-    digest = xmalloc(len);
-    algo->final_func(digest, pctx2);
-
-    str = rb_str_new(digest, len);
-
-    free(digest);
-    free(pctx2);
-
-    return str;
-}
-
-static VALUE
-rb_digest_base_hexdigest(self)
-    VALUE self;
-{
-    algo_t *algo;
-    void *pctx1, *pctx2;
-    unsigned char *hexdigest;
-    size_t len;
-    VALUE str;
-
-    algo = get_digest_base_metadata(CLASS_OF(self));
-    Data_Get_Struct(self, void, pctx1);
-
-    len = algo->ctx_size;
-
-    pctx2 = xmalloc(len);
-    memcpy(pctx2, pctx1, len);
-
-    len = algo->digest_len * 2;
-
-    hexdigest = xmalloc(len + 1); /* +1 is for '\0' */
-    algo->end_func(pctx2, hexdigest);
-
-    str = rb_str_new(hexdigest, len);
-
-    free(hexdigest);
-    free(pctx2);
-
-    return str;
-}
-
-static VALUE
-rb_digest_base_equal(self, other)
-    VALUE self, other;
-{
-    algo_t *algo;
-    VALUE klass;
-    VALUE str1, str2;
-
-    klass = CLASS_OF(self);
-    algo = get_digest_base_metadata(klass);
-
-    if (CLASS_OF(other) == klass) {
-	void *pctx1, *pctx2;
-
-	Data_Get_Struct(self, void, pctx1);
-	Data_Get_Struct(other, void, pctx2);
-
-	return algo->equal_func(pctx1, pctx2) ? Qtrue : Qfalse;
-    }
-
-    StringValue(other);
-    str2 = other;
-
-    if (RSTRING(str2)->len == algo->digest_len)
-	str1 = rb_digest_base_digest(self);
-    else
-	str1 = rb_digest_base_hexdigest(self);
-
-    if (RSTRING(str1)->len == RSTRING(str2)->len
-      && rb_str_cmp(str1, str2) == 0)
-	return Qtrue;
-
-    return Qfalse;
-}
-
-/*
- * Init
- */
-
-void
-Init_digest()
-{
-    mDigest = rb_define_module("Digest");
-
-    cDigest_Base = rb_define_class_under(mDigest, "Base", rb_cObject);
-
-    rb_define_alloc_func(cDigest_Base, rb_digest_base_alloc);
-    rb_define_singleton_method(cDigest_Base, "digest", rb_digest_base_s_digest, 1);
-    rb_define_singleton_method(cDigest_Base, "hexdigest", rb_digest_base_s_hexdigest, 1);
-
-    rb_define_method(cDigest_Base, "initialize", rb_digest_base_init, -1);
-    rb_define_method(cDigest_Base, "initialize_copy",  rb_digest_base_copy, 1);
-    rb_define_method(cDigest_Base, "update", rb_digest_base_update, 1);
-    rb_define_method(cDigest_Base, "<<", rb_digest_base_update, 1);
-    rb_define_method(cDigest_Base, "digest", rb_digest_base_digest, 0);
-    rb_define_method(cDigest_Base, "hexdigest", rb_digest_base_hexdigest, 0);
-    rb_define_method(cDigest_Base, "to_s", rb_digest_base_hexdigest, 0);
-    rb_define_method(cDigest_Base, "==", rb_digest_base_equal, 1);
-
-    id_metadata = rb_intern("metadata");
-}
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
deleted file mode 100644
index 5e846df040..0000000000
--- a/ext/digest/digest.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/************************************************
-
-  digest.c -
-
-  $Author$
-  created at: Fri May 25 08:54:56 JST 2001
-
-
-  Copyright (C) 2001 Akinori MUSHA
-
-  $RoughId: digest.h,v 1.3 2001/07/13 15:38:27 knu Exp $
-  $Id$
-
-************************************************/
-
-#include "ruby.h"
-
-typedef void (*hash_init_func_t) _((void *));
-typedef void (*hash_update_func_t) _((void *, unsigned char *, size_t));
-typedef void (*hash_end_func_t) _((void *, unsigned char *));
-typedef void (*hash_final_func_t) _((unsigned char *, void *));
-typedef int (*hash_equal_func_t) _((void *, void *));
-
-typedef struct {
-    size_t digest_len;
-    size_t ctx_size;
-    hash_init_func_t init_func;
-    hash_update_func_t update_func;
-    hash_end_func_t end_func;
-    hash_final_func_t final_func;
-    hash_equal_func_t equal_func;
-} algo_t;
diff --git a/ext/digest/digest.txt b/ext/digest/digest.txt
deleted file mode 100644
index 5797dd18f9..0000000000
--- a/ext/digest/digest.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" digest.txt -  -*- Indented-Text -*- created at: Fri May 25 08:13:50 JST 2001
-$RoughId: digest.txt,v 1.9 2001/07/13 19:46:51 knu Exp $
-$Id$
-
-** MD5(Class)
-
-A class to implement the MD5 Message-Digest Algorithm by RSA Data
-Security, Inc., described in RFC1321.
-
-Superclass: Digest::Base
-
-require 'digest/md5'
-
-** SHA1(Class)
-
-A class to implement the SHA-1 Secure Hash Algorithm by NIST (the US'
-National Institute of Standards and Technology), described in FIPS PUB
-180-1.
-
-Superclass: Digest::Base
-
-require 'digest/sha1'
-
-** SHA256(Class)
-** SHA384(Class)
-** SHA512(Class)
-
-Classes to implement the SHA-256/384/512 Secure Hash Algorithm(s) by
-NIST (the US' National Institute of Standards and Technology),
-described in FIPS PUB 180-2.
-
-Superclass: Digest::Base
-
-require 'digest/sha2'
-
-** RMD160(Class)
-
-A class to implement the RIPEMD-160 cryptographic hash function,
-designed by Hans Dobbertin, Antoon Bosselaers, and Bart Preneel.
-
-Superclass: Digest::Base
-
-require 'digest/rmd160'
-
-
-Those above classes provide a common interface as shown below.
-
-
-Class Methods:
-
-   new([str])
-
-	Creates a new digest object.  If a string argument is given,
-	it is added to the object. (see update.)
-
-   digest(str)
-
-	Immediately calculates and return the hash of the given
-	strings as a string.  Equivalent to new(str).digest.
-
-   hexdigest(str)
-
-	Immediately calculates and return the hash of the given
-	strings as a string of hexadecimal digits.  Equivalent to
-	new(str).hexdigest.
-
-Methods:
-
-   clone
-
-	Creates a copy of the digest object.
-
-   digest
-
-	Returns the hash of the added strings as a string of 16 bytes
-	for MD5, 20 bytes for SHA1 and RMD160, 32 bytes for SHA256, 48
-	bytes for SHA384, and 64 bytes for SHA512.
-
-   hexdigest
-   to_s
-
-	Returns the hash of the added strings as a string of 32
-	hexadecimal digits for MD5, 40 hexadecimal digits for SHA1 and
-	RMD160, 64 hexadecimal digits for SHA256, 96 hexadecimal
-	digits for SHA384, and 128 hexadecimal digits for SHA512.
-	This method is equal to:
-
-	def hexdigest
-	  digest.unpack("H*")[0]
-	end
-
-   update(str)
-   << str
-
-	Appends the string str to the digest object.  Repeated calls
-	are equivalent to a single call with the concatenation of all
-	the arguments, i.e. m.update(a); m.update(b) is equivalent to
-	m.update(a + b) and m << a << b is equivalent to m << a + b.
-
-   == md
-
-	Checks if the object is equal to the given digest object.
-
-   == str
-
-	Regards the value as either a digest value or a hexdigest
-	value (depending on the length) and checks if the object is
-	equal to the given string.
-
--------------------------------------------------------
-Local variables:
-fill-column: 70
-end:
diff --git a/ext/digest/digest.txt.ja b/ext/digest/digest.txt.ja
deleted file mode 100644
index 8997d25b9d..0000000000
--- a/ext/digest/digest.txt.ja
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" digest.txt.ja -  -*- Indented-Text -*- created at: Fri May 25 08:22:19 JST 2001
-$RoughId: digest.txt.jp,v 1.8 2001/07/13 15:38:27 knu Exp $
-$Id$
-
-** MD5(���饹)
-
-RFC1321�˵��Ҥ���Ƥ���RSA Data Security, Inc. �� MD5 Message-Digest
-Algorithm��������륯�饹��
-
-Superclass: Digest::Base
-
-require 'digest/md5'
-
-** SHA1(���饹)
-
-FIPS PUB 180-1�˵��Ҥ���Ƥ���NIST (the US' National Institute of
-Standards and Technology) �� SHA-1 Secure Hash Algorithm��������륯�饹��
-
-Superclass: Digest::Base
-
-require 'digest/sha1'
-
-** SHA256(���饹)
-** SHA384(���饹)
-** SHA512(���饹)
-
-FIPS PUB 180-2�˵��Ҥ���Ƥ���NIST (the US' National Institute of
-Standards and Technology) �� SHA-256/384/512 Secure Hash Algorithm��
-�������륯�饹��
-
-Superclass: Digest::Base
-
-require 'digest/sha2'
-
-** RMD160(���饹)
-
-Hans Dobbertin, Antoon Bosselaers, Bart Preneel �ˤ�ä��߷פ��줿 
-RIPEMD-160 �ϥå���ؿ���������륯�饹��
-
-Superclass: Digest::Base
-
-require 'digest/rmd160'
-
-
-�����Υ��饹�ϰʲ��Τ褦�ʶ��̤Υ��󥿡��ե��������󶡤��롣
-
-
-Class Methods:
-
-   new([str])
-
-        �����������������ȥ��֥������Ȥ��������롥ʸ���������Ϳ������
-        �Ȥ�����ɲä���(see update)��
-
-   digest(str)
-
-	Ϳ����줿ʸ������Ф���ϥå����ͤ�ʸ������֤���
-	new(str).digest ��������
-
-   hexdigest(str)
-
-	Ϳ����줿ʸ������Ф���ϥå����ͤ�ASCII�����ɤ�Ȥä�
-        16�ʿ�����򼨤�ʸ����˥��󥳡��ɤ����֤���
-	new(str).hexdigest ��������
-
-Methods:
-
-   clone
-
-	�����������ȥ��֥������Ȥ�ʣ�����롣
-
-   digest
-
-        ���ޤǤ��ɲä���ʸ������Ф���ϥå����ͤ�ʸ������֤���MD5�Ǥ�
-        16�Х���Ĺ��SHA1�����RMD160�Ǥ�20�Х���Ĺ��SHA256�Ǥ�32�Х���Ĺ��
-	SHA384�Ǥ�48�Х���Ĺ��SHA512�Ǥ�64�Х���Ĺ�Ȥʤ롣
-
-   hexdigest
-   to_s
-
-        ���ޤǤ��ɲä���ʸ������Ф���ϥå����ͤ�ASCII�����ɤ�Ȥä�
-        16�ʿ�����򼨤�ʸ����˥��󥳡��ɤ����֤���MD5�Ǥ�32�Х���Ĺ��
-        SHA1�����RMD160�Ǥ�40�Х���Ĺ��SHA256�Ǥ�64�Х���Ĺ��SHA384�Ǥ�
-	96�Х���Ĺ��SHA512�Ǥ�128�Х���Ĺ�Ȥʤ롣Ruby�ǽ񤯤Ȱʲ���Ʊ����
-
-	def hexdigest
-	  digest.unpack("H*")[0]
-	end
-
-   update(str)
-   << str
-
-        ʸ������ɲä��롣ʣ����update��Ƥ֤��Ȥ�ʸ�����Ϣ�뤷��
-	update��Ƥ֤��Ȥ������������ʤ�� m.update(a); m.update(b) ��
-	m.update(a + b) �ȡ� m << a << b �� m << a + b �Ȥ��줾������
-	�Ǥ��롣
-
-   == md
-
-	Ϳ����줿�����������ȥ��֥������Ȥ���Ӥ��롣
-
-   == str
-
-	Ϳ����줿ʸ����� digest �͡��⤷���� hexdigest �ͤ���Ӥ��롣
-	��������ͤȸ��뤫��Ϳ����줿ʸ�����Ĺ���ˤ�äƼ�ưȽ��
-	����롣
-
--------------------------------------------------------
-Local variables:
-fill-column: 70
-end:
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
deleted file mode 100644
index cd512622a4..0000000000
--- a/ext/digest/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# $RoughId: extconf.rb,v 1.6 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-require "mkmf"
-
-create_makefile("digest")
diff --git a/ext/digest/lib/md5.rb b/ext/digest/lib/md5.rb
deleted file mode 100644
index 1d05d7d04e..0000000000
--- a/ext/digest/lib/md5.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# just for compatibility; requiring "md5" is obsoleted
-#
-# $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-require 'digest/md5'
-
-MD5 = Digest::MD5
-
-class MD5
-  def self.md5(*args)
-    new(*args)
-  end
-end
diff --git a/ext/digest/lib/sha1.rb b/ext/digest/lib/sha1.rb
deleted file mode 100644
index c4ac6f66ea..0000000000
--- a/ext/digest/lib/sha1.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# just for compatibility; requiring "sha1" is obsoleted
-#
-# $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-require 'digest/sha1'
-
-SHA1 = Digest::SHA1
-
-class SHA1
-  def self.sha1(*args)
-    new(*args)
-  end
-end
diff --git a/ext/digest/md5/.cvsignore b/ext/digest/md5/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/md5/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/md5/MANIFEST b/ext/digest/md5/MANIFEST
deleted file mode 100644
index e371e075e9..0000000000
--- a/ext/digest/md5/MANIFEST
+++ /dev/null
@@ -1,7 +0,0 @@
-extconf.rb
-md5.c
-md5.h
-md5init.c
-md5ossl.c
-md5ossl.h
-depend
diff --git a/ext/digest/md5/depend b/ext/digest/md5/depend
deleted file mode 100644
index 8eaec20b4b..0000000000
--- a/ext/digest/md5/depend
+++ /dev/null
@@ -1,6 +0,0 @@
-md5.o: md5.c md5.h $(srcdir)/../defs.h $(hdrdir)/ruby.h $(topdir)/config.h \
-  $(hdrdir)/defines.h $(hdrdir)/intern.h
-md5init.o: md5init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h md5.h \
-  $(srcdir)/../defs.h
-md5ossl.o: md5ossl.h
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
deleted file mode 100644
index 0db0404dbe..0000000000
--- a/ext/digest/md5/extconf.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id$
-
-require "mkmf"
-
-$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
-
-$objs = [ "md5init.#{$OBJEXT}" ]
-
-dir_config("openssl")
-
-if !with_config("bundled-md5") &&
-    have_library("crypto") && have_header("openssl/md5.h")
-  $objs << "md5ossl.#{$OBJEXT}"
-
-  $libs << " -lcrypto"
-else
-  $objs << "md5.#{$OBJEXT}"
-end
-
-have_header("sys/cdefs.h")
-
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
-create_makefile("digest/md5")
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
deleted file mode 100644
index 6b61f031c4..0000000000
--- a/ext/digest/md5/md5.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
-  Copyright (C) 1999, 2000 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321.
-  It is derived directly from the text of the RFC and not from the
-  reference implementation.
-
-  The original and principal author of md5.c is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2000-07-03 lpd Patched to eliminate warnings about "constant is
-		unsigned in ANSI C, signed in traditional";
-		made test program self-checking.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
-  1999-05-03 lpd Original version.
- */
-
-/*$OrigId: md5c.c,v 1.2 2001/03/26 08:57:14 matz Exp $ */
-/*$RoughId: md5.c,v 1.2 2001/07/13 19:48:41 knu Exp $ */
-/*$Id$ */
-
-#include "md5.h"
-
-#ifdef TEST
-/*
- * Compile with -DTEST to create a self-contained executable test program.
- * The test program should print out the same values as given in section
- * A.5 of RFC 1321, reproduced below.
- */
-#include <string.h>
-main()
-{
-    static const char *const test[7*2] = {
-	"", "d41d8cd98f00b204e9800998ecf8427e",
-	"a", "0cc175b9c0f1b6a831c399e269772661",
-	"abc", "900150983cd24fb0d6963f7d28e17f72",
-	"message digest", "f96b697d7cb7938d525a2f31aaf161d0",
-	"abcdefghijklmnopqrstuvwxyz", "c3fcd3d76192e4007dfb496cca67e13b",
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-				"d174ab98d277d9f5a5611c2c9f419d9f",
-	"12345678901234567890123456789012345678901234567890123456789012345678901234567890", "57edf4a22be3c955ac49da2e2107b67a"
-    };
-    int i;
-
-    for (i = 0; i < 7*2; i += 2) {
-	MD5_CTX state;
-	uint8_t digest[16];
-	char hex_output[16*2 + 1];
-	int di;
-
-	MD5_Init(&state);
-	MD5_Update(&state, (const uint8_t *)test[i], strlen(test[i]));
-	MD5_Final(digest, &state);
-	printf("MD5 (\"%s\") = ", test[i]);
-	for (di = 0; di < 16; ++di)
-	    sprintf(hex_output + di * 2, "%02x", digest[di]);
-	puts(hex_output);
-	if (strcmp(hex_output, test[i + 1]))
-	    printf("**** ERROR, should be: %s\n", test[i + 1]);
-    }
-    return 0;
-}
-#endif /* TEST */
-
-
-/*
- * For reference, here is the program that computed the T values.
- */
-#ifdef COMPUTE_T_VALUES
-#include <math.h>
-main()
-{
-    int i;
-    for (i = 1; i <= 64; ++i) {
-	unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
-
-	/*
-	 * The following nonsense is only to avoid compiler warnings about
-	 * "integer constant is unsigned in ANSI C, signed with -traditional".
-	 */
-	if (v >> 31) {
-	    printf("#define T%d /* 0x%08lx */ (T_MASK ^ 0x%08lx)\n", i,
-		   v, (unsigned long)(unsigned int)(~v));
-	} else {
-	    printf("#define T%d    0x%08lx\n", i, v);
-	}
-    }
-    return 0;
-}
-#endif /* COMPUTE_T_VALUES */
-/*
- * End of T computation program.
- */
-#ifdef T_MASK
-#undef T_MASK
-#endif
-#define T_MASK ((uint32_t)~0)
-#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
-#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
-#define T3    0x242070db
-#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
-#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
-#define T6    0x4787c62a
-#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
-#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
-#define T9    0x698098d8
-#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
-#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
-#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
-#define T13    0x6b901122
-#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
-#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
-#define T16    0x49b40821
-#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
-#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
-#define T19    0x265e5a51
-#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
-#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
-#define T22    0x02441453
-#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
-#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
-#define T25    0x21e1cde6
-#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
-#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
-#define T28    0x455a14ed
-#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
-#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
-#define T31    0x676f02d9
-#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
-#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
-#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
-#define T35    0x6d9d6122
-#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
-#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
-#define T38    0x4bdecfa9
-#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
-#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
-#define T41    0x289b7ec6
-#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
-#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
-#define T44    0x04881d05
-#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
-#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
-#define T47    0x1fa27cf8
-#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
-#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
-#define T50    0x432aff97
-#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
-#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
-#define T53    0x655b59c3
-#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
-#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
-#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
-#define T57    0x6fa87e4f
-#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
-#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
-#define T60    0x4e0811a1
-#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
-#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
-#define T63    0x2ad7d2bb
-#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
-
-
-static void
-md5_process(MD5_CTX *pms, const uint8_t *data /*[64]*/)
-{
-    uint32_t
-	a = pms->state[0], b = pms->state[1],
-	c = pms->state[2], d = pms->state[3];
-    uint32_t t;
-
-#ifdef WORDS_BIGENDIAN
-
-    /*
-     * On big-endian machines, we must arrange the bytes in the right
-     * order.  (This also works on machines of unknown byte order.)
-     */
-    uint32_t X[16];
-    const uint8_t *xp = data;
-    int i;
-
-    for (i = 0; i < 16; ++i, xp += 4)
-	X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-
-#else
-
-    /*
-     * On little-endian machines, we can process properly aligned data
-     * without copying it.
-     */
-    uint32_t xbuf[16];
-    const uint32_t *X;
-
-    if (!((data - (const uint8_t *)0) & 3)) {
-	/* data are properly aligned */
-	X = (const uint32_t *)data;
-    } else {
-	/* not aligned */
-	memcpy(xbuf, data, 64);
-	X = xbuf;
-    }
-#endif
-
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + F(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  T1);
-    SET(d, a, b, c,  1, 12,  T2);
-    SET(c, d, a, b,  2, 17,  T3);
-    SET(b, c, d, a,  3, 22,  T4);
-    SET(a, b, c, d,  4,  7,  T5);
-    SET(d, a, b, c,  5, 12,  T6);
-    SET(c, d, a, b,  6, 17,  T7);
-    SET(b, c, d, a,  7, 22,  T8);
-    SET(a, b, c, d,  8,  7,  T9);
-    SET(d, a, b, c,  9, 12, T10);
-    SET(c, d, a, b, 10, 17, T11);
-    SET(b, c, d, a, 11, 22, T12);
-    SET(a, b, c, d, 12,  7, T13);
-    SET(d, a, b, c, 13, 12, T14);
-    SET(c, d, a, b, 14, 17, T15);
-    SET(b, c, d, a, 15, 22, T16);
-#undef SET
-
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + G(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, T17);
-    SET(d, a, b, c,  6,  9, T18);
-    SET(c, d, a, b, 11, 14, T19);
-    SET(b, c, d, a,  0, 20, T20);
-    SET(a, b, c, d,  5,  5, T21);
-    SET(d, a, b, c, 10,  9, T22);
-    SET(c, d, a, b, 15, 14, T23);
-    SET(b, c, d, a,  4, 20, T24);
-    SET(a, b, c, d,  9,  5, T25);
-    SET(d, a, b, c, 14,  9, T26);
-    SET(c, d, a, b,  3, 14, T27);
-    SET(b, c, d, a,  8, 20, T28);
-    SET(a, b, c, d, 13,  5, T29);
-    SET(d, a, b, c,  2,  9, T30);
-    SET(c, d, a, b,  7, 14, T31);
-    SET(b, c, d, a, 12, 20, T32);
-#undef SET
-
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + H(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, T33);
-    SET(d, a, b, c,  8, 11, T34);
-    SET(c, d, a, b, 11, 16, T35);
-    SET(b, c, d, a, 14, 23, T36);
-    SET(a, b, c, d,  1,  4, T37);
-    SET(d, a, b, c,  4, 11, T38);
-    SET(c, d, a, b,  7, 16, T39);
-    SET(b, c, d, a, 10, 23, T40);
-    SET(a, b, c, d, 13,  4, T41);
-    SET(d, a, b, c,  0, 11, T42);
-    SET(c, d, a, b,  3, 16, T43);
-    SET(b, c, d, a,  6, 23, T44);
-    SET(a, b, c, d,  9,  4, T45);
-    SET(d, a, b, c, 12, 11, T46);
-    SET(c, d, a, b, 15, 16, T47);
-    SET(b, c, d, a,  2, 23, T48);
-#undef SET
-
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + I(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, T49);
-    SET(d, a, b, c,  7, 10, T50);
-    SET(c, d, a, b, 14, 15, T51);
-    SET(b, c, d, a,  5, 21, T52);
-    SET(a, b, c, d, 12,  6, T53);
-    SET(d, a, b, c,  3, 10, T54);
-    SET(c, d, a, b, 10, 15, T55);
-    SET(b, c, d, a,  1, 21, T56);
-    SET(a, b, c, d,  8,  6, T57);
-    SET(d, a, b, c, 15, 10, T58);
-    SET(c, d, a, b,  6, 15, T59);
-    SET(b, c, d, a, 13, 21, T60);
-    SET(a, b, c, d,  4,  6, T61);
-    SET(d, a, b, c, 11, 10, T62);
-    SET(c, d, a, b,  2, 15, T63);
-    SET(b, c, d, a,  9, 21, T64);
-#undef SET
-
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->state[0] += a;
-    pms->state[1] += b;
-    pms->state[2] += c;
-    pms->state[3] += d;
-}
-
-void
-MD5_Init(MD5_CTX *pms)
-{
-    pms->count[0] = pms->count[1] = 0;
-    pms->state[0] = 0x67452301;
-    pms->state[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
-    pms->state[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
-    pms->state[3] = 0x10325476;
-}
-
-void
-MD5_Update(MD5_CTX *pms, const uint8_t *data, size_t nbytes)
-{
-    const uint8_t *p = data;
-    size_t left = nbytes;
-    size_t offset = (pms->count[0] >> 3) & 63;
-    uint32_t nbits = (uint32_t)(nbytes << 3);
-
-    if (nbytes <= 0)
-	return;
-
-    /* Update the message length. */
-    pms->count[1] += nbytes >> 29;
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-	pms->count[1]++;
-
-    /* Process an initial partial block. */
-    if (offset) {
-	size_t copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-	memcpy(pms->buffer + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buffer);
-    }
-
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
-
-    /* Process a final partial block. */
-    if (left)
-	memcpy(pms->buffer, p, left);
-}
-
-void
-MD5_Final(uint8_t *digest, MD5_CTX *pms)
-{
-    static const uint8_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    uint8_t data[8];
-    size_t i;
-
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-	data[i] = (uint8_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    MD5_Update(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    MD5_Update(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-	digest[i] = (uint8_t)(pms->state[i >> 2] >> ((i & 3) << 3));
-}
-
-void
-MD5_End(MD5_CTX *pctx, uint8_t *hexdigest)
-{
-    unsigned char digest[16];
-    size_t i;
-
-    MD5_Final(digest, pctx);
-
-    for (i = 0; i < 16; i++)
-        sprintf(hexdigest + i * 2, "%02x", digest[i]);
-}
-
-int MD5_Equal(MD5_CTX* pctx1, MD5_CTX* pctx2) {
-	return memcmp(pctx1->count, pctx2->count, sizeof(pctx1->count)) == 0
-		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
-		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
-}
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
deleted file mode 100644
index fc41380d38..0000000000
--- a/ext/digest/md5/md5.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321.
-  It is derived directly from the text of the RFC and not from the
-  reference implementation.
-
-  The original and principal author of md5.h is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
-	added conditionalization for C++ compilation from Martin
-	Purschke <purschke@bnl.gov>.
-  1999-05-03 lpd Original version.
- */
-
-/* $OrigId: md5.h,v 1.2 2001/03/26 08:57:14 matz Exp $ */
-/* $RoughId: md5.h,v 1.3 2002/02/24 08:14:31 knu Exp $ */
-/* $Id$ */
-
-#ifndef MD5_INCLUDED
-#  define MD5_INCLUDED
-
-#include "defs.h"
-
-/*
- * This code has some adaptations for the Ghostscript environment, but it
- * will compile and run correctly in any environment with 8-bit chars and
- * 32-bit ints.  Specifically, it assumes that if the following are
- * defined, they have the same meaning as in Ghostscript: P1, P2, P3.
- */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
-    uint32_t count[2];	/* message length in bits, lsw first */
-    uint32_t state[4];	/* digest buffer */
-    uint8_t buffer[64];	/* accumulate block */
-} MD5_CTX;
-
-#ifdef RUBY
-#define MD5_Init	rb_Digest_MD5_Init
-#define MD5_Update	rb_Digest_MD5_Update
-#define MD5_Final	rb_Digest_MD5_Final
-#define MD5_End		rb_Digest_MD5_End
-#define MD5_Equal	rb_Digest_MD5_Equal
-#endif
-
-void	MD5_Init _((MD5_CTX *pms));
-void	MD5_Update _((MD5_CTX *pms, const uint8_t *data, size_t nbytes));
-void	MD5_Final _((uint8_t *digest, MD5_CTX *pms));
-void	MD5_End _((MD5_CTX *pctx, uint8_t *hexdigest));
-int	MD5_Equal _((MD5_CTX *pctx1, MD5_CTX *pctx2));
-
-#define MD5_BLOCK_LENGTH		64
-#define MD5_DIGEST_LENGTH		16
-#define MD5_DIGEST_STRING_LENGTH	(MD5_DIGEST_LENGTH * 2 + 1)
-
-#endif /* MD5_INCLUDED */
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
deleted file mode 100644
index 2acca16a46..0000000000
--- a/ext/digest/md5/md5init.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id$ */
-
-#include "digest.h"
-#if defined(HAVE_OPENSSL_MD5_H)
-#include "md5ossl.h"
-#else
-#include "md5.h"
-#endif
-
-static algo_t md5 = {
-    MD5_DIGEST_LENGTH,
-    sizeof(MD5_CTX),
-    (hash_init_func_t)MD5_Init,
-    (hash_update_func_t)MD5_Update,
-    (hash_end_func_t)MD5_End,
-    (hash_final_func_t)MD5_Final,
-    (hash_equal_func_t)MD5_Equal,
-};
-
-void
-Init_md5()
-{
-    VALUE mDigest, cDigest_Base, cDigest_MD5;
-
-    rb_require("digest.so");
-
-    mDigest = rb_path2class("Digest");
-    cDigest_Base = rb_path2class("Digest::Base");
-
-    cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
-
-    rb_cvar_set(cDigest_MD5, rb_intern("metadata"),
-		Data_Wrap_Struct(rb_cObject, 0, 0, &md5), Qtrue);
-}
diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c
deleted file mode 100644
index d930c7ab51..0000000000
--- a/ext/digest/md5/md5ossl.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $Id$ */
-
-#include "md5ossl.h"
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-
-void
-MD5_End(MD5_CTX *pctx, unsigned char *hexdigest)
-{
-    unsigned char digest[16];
-    size_t i;
-
-    MD5_Final(digest, pctx);
-
-    for (i = 0; i < 16; i++)
-        sprintf(hexdigest + i * 2, "%02x", digest[i]);
-}
-
-int
-MD5_Equal(MD5_CTX* pctx1, MD5_CTX* pctx2) {
-    return pctx1->num == pctx2->num
-      && pctx1->A == pctx2->A
-      && pctx1->B == pctx2->B
-      && pctx1->C == pctx2->C
-      && pctx1->D == pctx2->D
-      && pctx1->Nl == pctx2->Nl
-      && pctx1->Nh == pctx2->Nh
-      && memcmp(pctx1->data, pctx2->data, sizeof(pctx1->data)) == 0;
-}
diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h
deleted file mode 100644
index dda7c743ed..0000000000
--- a/ext/digest/md5/md5ossl.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* $Id$ */
-
-#ifndef MD5OSSL_H_INCLUDED
-#define MD5OSSL_H_INCLUDED
-
-#include <openssl/md5.h>
-
-void MD5_End(MD5_CTX *pctx, unsigned char *hexdigest);
-int MD5_Equal(MD5_CTX *pctx1, MD5_CTX *pctx2);
-
-#endif
diff --git a/ext/digest/rmd160/.cvsignore b/ext/digest/rmd160/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/rmd160/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/rmd160/MANIFEST b/ext/digest/rmd160/MANIFEST
deleted file mode 100644
index 4579def9fe..0000000000
--- a/ext/digest/rmd160/MANIFEST
+++ /dev/null
@@ -1,8 +0,0 @@
-extconf.rb
-rmd160.c
-rmd160.h
-rmd160hl.c
-rmd160init.c
-rmd160ossl.c
-rmd160ossl.h
-depend
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
deleted file mode 100644
index 0ca79c5f40..0000000000
--- a/ext/digest/rmd160/depend
+++ /dev/null
@@ -1,8 +0,0 @@
-rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-rmd160hl.o: rmd160hl.c rmd160.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-rmd160init.o: rmd160init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
-  rmd160.h $(srcdir)/../defs.h
-rmd160ossl.o: rmd160ossl.h $(srcdir)/../defs.h
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
deleted file mode 100644
index 3f6a88e756..0000000000
--- a/ext/digest/rmd160/extconf.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id$
-
-require "mkmf"
-
-$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
-
-$objs = [ "rmd160init.#{$OBJEXT}" ]
-
-dir_config("openssl")
-
-if !with_config("bundled-rmd160") &&
-    have_library("crypto") && have_header("openssl/ripemd.h")
-  $objs << "rmd160ossl.#{$OBJEXT}"
-  $libs << " -lcrypto"
-else
-  $objs << "rmd160.#{$OBJEXT}" << "rmd160hl.#{$OBJEXT}"
-end
-
-have_header("sys/cdefs.h")
-
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
-create_makefile("digest/rmd160")
diff --git a/ext/digest/rmd160/rmd160.c b/ext/digest/rmd160/rmd160.c
deleted file mode 100644
index 2de3c99b29..0000000000
--- a/ext/digest/rmd160/rmd160.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/*	$NetBSD: rmd160.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $	*/
-/*	$RoughId: rmd160.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id$	*/
-
-/********************************************************************\
- *
- *      FILE:     rmd160.c
- *
- *      CONTENTS: A sample C-implementation of the RIPEMD-160
- *		  hash-function.
- *      TARGET:   any computer with an ANSI C compiler
- *
- *      AUTHOR:   Antoon Bosselaers, ESAT-COSIC
- *		  (Arranged for libc by Todd C. Miller)
- *      DATE:     1 March 1996
- *      VERSION:  1.0
- *
- *      Copyright (c) Katholieke Universiteit Leuven
- *      1996, All Rights Reserved
- *
-\********************************************************************/
-
-#include "rmd160.h"
-
-#ifndef lint
-/* __RCSID("$NetBSD: rmd160.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $"); */
-#endif	/* not lint */
-
-/* header files */
-
-#ifdef HAVE_SYS_ENDIAN_H_
-#include <sys/endian.h>
-#endif
-
-#ifdef HAVE_MACHINE_ENDIAN_H_
-#include <machine/endian.h>
-#endif
-
-/* #include "namespace.h" */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond)	assert(cond)
-#endif
-
-
-/********************************************************************/
-
-/* macro definitions */
-
-/* collect four bytes into one word: */
-#define BYTES_TO_DWORD(strptr)			\
-    (((uint32_t) *((strptr)+3) << 24) |	\
-    ((uint32_t) *((strptr)+2) << 16) |		\
-    ((uint32_t) *((strptr)+1) <<  8) |		\
-    ((uint32_t) *(strptr)))
-
-/* ROL(x, n) cyclically rotates x over n bits to the left */
-/* x must be of an unsigned 32 bits type and 0 <= n < 32. */
-#define ROL(x, n)	(((x) << (n)) | ((x) >> (32-(n))))
-
-/* the three basic functions F(), G() and H() */
-#define F(x, y, z)	((x) ^ (y) ^ (z))
-#define G(x, y, z)	(((x) & (y)) | (~(x) & (z)))
-#define H(x, y, z)	(((x) | ~(y)) ^ (z))
-#define I(x, y, z)	(((x) & (z)) | ((y) & ~(z)))
-#define J(x, y, z)	((x) ^ ((y) | ~(z)))
-
-/* the eight basic operations FF() through III() */
-#define FF(a, b, c, d, e, x, s)	{			\
-      (a) += F((b), (c), (d)) + (x);			\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define GG(a, b, c, d, e, x, s)	{			\
-      (a) += G((b), (c), (d)) + (x) + 0x5a827999U;	\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define HH(a, b, c, d, e, x, s)	{			\
-      (a) += H((b), (c), (d)) + (x) + 0x6ed9eba1U;	\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define II(a, b, c, d, e, x, s)	{			\
-      (a) += I((b), (c), (d)) + (x) + 0x8f1bbcdcU;	\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define JJ(a, b, c, d, e, x, s)	{			\
-      (a) += J((b), (c), (d)) + (x) + 0xa953fd4eU;	\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define FFF(a, b, c, d, e, x, s)	{		\
-      (a) += F((b), (c), (d)) + (x);			\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define GGG(a, b, c, d, e, x, s)	{		\
-      (a) += G((b), (c), (d)) + (x) + 0x7a6d76e9U;	\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define HHH(a, b, c, d, e, x, s)	{		\
-      (a) += H((b), (c), (d)) + (x) + 0x6d703ef3U;	\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define III(a, b, c, d, e, x, s)	{		\
-      (a) += I((b), (c), (d)) + (x) + 0x5c4dd124U;	\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-#define JJJ(a, b, c, d, e, x, s)	{		\
-      (a) += J((b), (c), (d)) + (x) + 0x50a28be6U;	\
-      (a) = ROL((a), (s)) + (e);			\
-      (c) = ROL((c), 10);				\
-}
-
-/********************************************************************/
-
-void
-RMD160_Init(RMD160_CTX *context)
-{
-
-	_DIAGASSERT(context != NULL);
-
-	/* ripemd-160 initialization constants */
-	context->state[0] = 0x67452301U;
-	context->state[1] = 0xefcdab89U;
-	context->state[2] = 0x98badcfeU;
-	context->state[3] = 0x10325476U;
-	context->state[4] = 0xc3d2e1f0U;
-	context->length[0] = context->length[1] = 0;
-	context->buflen = 0;
-}
-
-/********************************************************************/
-
-void
-RMD160_Transform(uint32_t state[5], const uint32_t block[16])
-{
-	uint32_t aa, bb, cc, dd, ee;
-	uint32_t aaa, bbb, ccc, ddd, eee;
-
-	_DIAGASSERT(state != NULL);
-	_DIAGASSERT(block != NULL);
-
-	aa = aaa = state[0];
-	bb = bbb = state[1];
-	cc = ccc = state[2];
-	dd = ddd = state[3];
-	ee = eee = state[4];
-
-	/* round 1 */
-	FF(aa, bb, cc, dd, ee, block[ 0], 11);
-	FF(ee, aa, bb, cc, dd, block[ 1], 14);
-	FF(dd, ee, aa, bb, cc, block[ 2], 15);
-	FF(cc, dd, ee, aa, bb, block[ 3], 12);
-	FF(bb, cc, dd, ee, aa, block[ 4],  5);
-	FF(aa, bb, cc, dd, ee, block[ 5],  8);
-	FF(ee, aa, bb, cc, dd, block[ 6],  7);
-	FF(dd, ee, aa, bb, cc, block[ 7],  9);
-	FF(cc, dd, ee, aa, bb, block[ 8], 11);
-	FF(bb, cc, dd, ee, aa, block[ 9], 13);
-	FF(aa, bb, cc, dd, ee, block[10], 14);
-	FF(ee, aa, bb, cc, dd, block[11], 15);
-	FF(dd, ee, aa, bb, cc, block[12],  6);
-	FF(cc, dd, ee, aa, bb, block[13],  7);
-	FF(bb, cc, dd, ee, aa, block[14],  9);
-	FF(aa, bb, cc, dd, ee, block[15],  8);
-
-	/* round 2 */
-	GG(ee, aa, bb, cc, dd, block[ 7],  7);
-	GG(dd, ee, aa, bb, cc, block[ 4],  6);
-	GG(cc, dd, ee, aa, bb, block[13],  8);
-	GG(bb, cc, dd, ee, aa, block[ 1], 13);
-	GG(aa, bb, cc, dd, ee, block[10], 11);
-	GG(ee, aa, bb, cc, dd, block[ 6],  9);
-	GG(dd, ee, aa, bb, cc, block[15],  7);
-	GG(cc, dd, ee, aa, bb, block[ 3], 15);
-	GG(bb, cc, dd, ee, aa, block[12],  7);
-	GG(aa, bb, cc, dd, ee, block[ 0], 12);
-	GG(ee, aa, bb, cc, dd, block[ 9], 15);
-	GG(dd, ee, aa, bb, cc, block[ 5],  9);
-	GG(cc, dd, ee, aa, bb, block[ 2], 11);
-	GG(bb, cc, dd, ee, aa, block[14],  7);
-	GG(aa, bb, cc, dd, ee, block[11], 13);
-	GG(ee, aa, bb, cc, dd, block[ 8], 12);
-
-	/* round 3 */
-	HH(dd, ee, aa, bb, cc, block[ 3], 11);
-	HH(cc, dd, ee, aa, bb, block[10], 13);
-	HH(bb, cc, dd, ee, aa, block[14],  6);
-	HH(aa, bb, cc, dd, ee, block[ 4],  7);
-	HH(ee, aa, bb, cc, dd, block[ 9], 14);
-	HH(dd, ee, aa, bb, cc, block[15],  9);
-	HH(cc, dd, ee, aa, bb, block[ 8], 13);
-	HH(bb, cc, dd, ee, aa, block[ 1], 15);
-	HH(aa, bb, cc, dd, ee, block[ 2], 14);
-	HH(ee, aa, bb, cc, dd, block[ 7],  8);
-	HH(dd, ee, aa, bb, cc, block[ 0], 13);
-	HH(cc, dd, ee, aa, bb, block[ 6],  6);
-	HH(bb, cc, dd, ee, aa, block[13],  5);
-	HH(aa, bb, cc, dd, ee, block[11], 12);
-	HH(ee, aa, bb, cc, dd, block[ 5],  7);
-	HH(dd, ee, aa, bb, cc, block[12],  5);
-
-	/* round 4 */
-	II(cc, dd, ee, aa, bb, block[ 1], 11);
-	II(bb, cc, dd, ee, aa, block[ 9], 12);
-	II(aa, bb, cc, dd, ee, block[11], 14);
-	II(ee, aa, bb, cc, dd, block[10], 15);
-	II(dd, ee, aa, bb, cc, block[ 0], 14);
-	II(cc, dd, ee, aa, bb, block[ 8], 15);
-	II(bb, cc, dd, ee, aa, block[12],  9);
-	II(aa, bb, cc, dd, ee, block[ 4],  8);
-	II(ee, aa, bb, cc, dd, block[13],  9);
-	II(dd, ee, aa, bb, cc, block[ 3], 14);
-	II(cc, dd, ee, aa, bb, block[ 7],  5);
-	II(bb, cc, dd, ee, aa, block[15],  6);
-	II(aa, bb, cc, dd, ee, block[14],  8);
-	II(ee, aa, bb, cc, dd, block[ 5],  6);
-	II(dd, ee, aa, bb, cc, block[ 6],  5);
-	II(cc, dd, ee, aa, bb, block[ 2], 12);
-
-	/* round 5 */
-	JJ(bb, cc, dd, ee, aa, block[ 4],  9);
-	JJ(aa, bb, cc, dd, ee, block[ 0], 15);
-	JJ(ee, aa, bb, cc, dd, block[ 5],  5);
-	JJ(dd, ee, aa, bb, cc, block[ 9], 11);
-	JJ(cc, dd, ee, aa, bb, block[ 7],  6);
-	JJ(bb, cc, dd, ee, aa, block[12],  8);
-	JJ(aa, bb, cc, dd, ee, block[ 2], 13);
-	JJ(ee, aa, bb, cc, dd, block[10], 12);
-	JJ(dd, ee, aa, bb, cc, block[14],  5);
-	JJ(cc, dd, ee, aa, bb, block[ 1], 12);
-	JJ(bb, cc, dd, ee, aa, block[ 3], 13);
-	JJ(aa, bb, cc, dd, ee, block[ 8], 14);
-	JJ(ee, aa, bb, cc, dd, block[11], 11);
-	JJ(dd, ee, aa, bb, cc, block[ 6],  8);
-	JJ(cc, dd, ee, aa, bb, block[15],  5);
-	JJ(bb, cc, dd, ee, aa, block[13],  6);
-
-	/* parallel round 1 */
-	JJJ(aaa, bbb, ccc, ddd, eee, block[ 5],  8);
-	JJJ(eee, aaa, bbb, ccc, ddd, block[14],  9);
-	JJJ(ddd, eee, aaa, bbb, ccc, block[ 7],  9);
-	JJJ(ccc, ddd, eee, aaa, bbb, block[ 0], 11);
-	JJJ(bbb, ccc, ddd, eee, aaa, block[ 9], 13);
-	JJJ(aaa, bbb, ccc, ddd, eee, block[ 2], 15);
-	JJJ(eee, aaa, bbb, ccc, ddd, block[11], 15);
-	JJJ(ddd, eee, aaa, bbb, ccc, block[ 4],  5);
-	JJJ(ccc, ddd, eee, aaa, bbb, block[13],  7);
-	JJJ(bbb, ccc, ddd, eee, aaa, block[ 6],  7);
-	JJJ(aaa, bbb, ccc, ddd, eee, block[15],  8);
-	JJJ(eee, aaa, bbb, ccc, ddd, block[ 8], 11);
-	JJJ(ddd, eee, aaa, bbb, ccc, block[ 1], 14);
-	JJJ(ccc, ddd, eee, aaa, bbb, block[10], 14);
-	JJJ(bbb, ccc, ddd, eee, aaa, block[ 3], 12);
-	JJJ(aaa, bbb, ccc, ddd, eee, block[12],  6);
-
-	/* parallel round 2 */
-	III(eee, aaa, bbb, ccc, ddd, block[ 6],  9);
-	III(ddd, eee, aaa, bbb, ccc, block[11], 13);
-	III(ccc, ddd, eee, aaa, bbb, block[ 3], 15);
-	III(bbb, ccc, ddd, eee, aaa, block[ 7],  7);
-	III(aaa, bbb, ccc, ddd, eee, block[ 0], 12);
-	III(eee, aaa, bbb, ccc, ddd, block[13],  8);
-	III(ddd, eee, aaa, bbb, ccc, block[ 5],  9);
-	III(ccc, ddd, eee, aaa, bbb, block[10], 11);
-	III(bbb, ccc, ddd, eee, aaa, block[14],  7);
-	III(aaa, bbb, ccc, ddd, eee, block[15],  7);
-	III(eee, aaa, bbb, ccc, ddd, block[ 8], 12);
-	III(ddd, eee, aaa, bbb, ccc, block[12],  7);
-	III(ccc, ddd, eee, aaa, bbb, block[ 4],  6);
-	III(bbb, ccc, ddd, eee, aaa, block[ 9], 15);
-	III(aaa, bbb, ccc, ddd, eee, block[ 1], 13);
-	III(eee, aaa, bbb, ccc, ddd, block[ 2], 11);
-
-	/* parallel round 3 */
-	HHH(ddd, eee, aaa, bbb, ccc, block[15],  9);
-	HHH(ccc, ddd, eee, aaa, bbb, block[ 5],  7);
-	HHH(bbb, ccc, ddd, eee, aaa, block[ 1], 15);
-	HHH(aaa, bbb, ccc, ddd, eee, block[ 3], 11);
-	HHH(eee, aaa, bbb, ccc, ddd, block[ 7],  8);
-	HHH(ddd, eee, aaa, bbb, ccc, block[14],  6);
-	HHH(ccc, ddd, eee, aaa, bbb, block[ 6],  6);
-	HHH(bbb, ccc, ddd, eee, aaa, block[ 9], 14);
-	HHH(aaa, bbb, ccc, ddd, eee, block[11], 12);
-	HHH(eee, aaa, bbb, ccc, ddd, block[ 8], 13);
-	HHH(ddd, eee, aaa, bbb, ccc, block[12],  5);
-	HHH(ccc, ddd, eee, aaa, bbb, block[ 2], 14);
-	HHH(bbb, ccc, ddd, eee, aaa, block[10], 13);
-	HHH(aaa, bbb, ccc, ddd, eee, block[ 0], 13);
-	HHH(eee, aaa, bbb, ccc, ddd, block[ 4],  7);
-	HHH(ddd, eee, aaa, bbb, ccc, block[13],  5);
-
-	/* parallel round 4 */
-	GGG(ccc, ddd, eee, aaa, bbb, block[ 8], 15);
-	GGG(bbb, ccc, ddd, eee, aaa, block[ 6],  5);
-	GGG(aaa, bbb, ccc, ddd, eee, block[ 4],  8);
-	GGG(eee, aaa, bbb, ccc, ddd, block[ 1], 11);
-	GGG(ddd, eee, aaa, bbb, ccc, block[ 3], 14);
-	GGG(ccc, ddd, eee, aaa, bbb, block[11], 14);
-	GGG(bbb, ccc, ddd, eee, aaa, block[15],  6);
-	GGG(aaa, bbb, ccc, ddd, eee, block[ 0], 14);
-	GGG(eee, aaa, bbb, ccc, ddd, block[ 5],  6);
-	GGG(ddd, eee, aaa, bbb, ccc, block[12],  9);
-	GGG(ccc, ddd, eee, aaa, bbb, block[ 2], 12);
-	GGG(bbb, ccc, ddd, eee, aaa, block[13],  9);
-	GGG(aaa, bbb, ccc, ddd, eee, block[ 9], 12);
-	GGG(eee, aaa, bbb, ccc, ddd, block[ 7],  5);
-	GGG(ddd, eee, aaa, bbb, ccc, block[10], 15);
-	GGG(ccc, ddd, eee, aaa, bbb, block[14],  8);
-
-	/* parallel round 5 */
-	FFF(bbb, ccc, ddd, eee, aaa, block[12] ,  8);
-	FFF(aaa, bbb, ccc, ddd, eee, block[15] ,  5);
-	FFF(eee, aaa, bbb, ccc, ddd, block[10] , 12);
-	FFF(ddd, eee, aaa, bbb, ccc, block[ 4] ,  9);
-	FFF(ccc, ddd, eee, aaa, bbb, block[ 1] , 12);
-	FFF(bbb, ccc, ddd, eee, aaa, block[ 5] ,  5);
-	FFF(aaa, bbb, ccc, ddd, eee, block[ 8] , 14);
-	FFF(eee, aaa, bbb, ccc, ddd, block[ 7] ,  6);
-	FFF(ddd, eee, aaa, bbb, ccc, block[ 6] ,  8);
-	FFF(ccc, ddd, eee, aaa, bbb, block[ 2] , 13);
-	FFF(bbb, ccc, ddd, eee, aaa, block[13] ,  6);
-	FFF(aaa, bbb, ccc, ddd, eee, block[14] ,  5);
-	FFF(eee, aaa, bbb, ccc, ddd, block[ 0] , 15);
-	FFF(ddd, eee, aaa, bbb, ccc, block[ 3] , 13);
-	FFF(ccc, ddd, eee, aaa, bbb, block[ 9] , 11);
-	FFF(bbb, ccc, ddd, eee, aaa, block[11] , 11);
-
-	/* combine results */
-	ddd += cc + state[1];		/* final result for state[0] */
-	state[1] = state[2] + dd + eee;
-	state[2] = state[3] + ee + aaa;
-	state[3] = state[4] + aa + bbb;
-	state[4] = state[0] + bb + ccc;
-	state[0] = ddd;
-}
-
-/********************************************************************/
-
-void
-RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
-{
-	uint32_t X[16];
-	uint32_t ofs = 0;
-	uint32_t i;
-#ifdef WORDS_BIGENDIAN
-	uint32_t j;
-#endif
-
-	_DIAGASSERT(context != NULL);
-	_DIAGASSERT(data != NULL);
-
-	/* update length[] */
-	if (context->length[0] + nbytes < context->length[0])
-		context->length[1]++;		/* overflow to msb of length */
-	context->length[0] += nbytes;
-
-	(void)memset(X, 0, sizeof(X));
-
-        if ( context->buflen + nbytes < 64 )
-        {
-                (void)memcpy(context->bbuffer + context->buflen, data, nbytes);
-                context->buflen += nbytes;
-        }
-        else
-        {
-                /* process first block */
-                ofs = 64 - context->buflen;
-                (void)memcpy(context->bbuffer + context->buflen, data, ofs);
-#ifndef WORDS_BIGENDIAN
-                (void)memcpy(X, context->bbuffer, sizeof(X));
-#else
-                for (j=0; j < 16; j++)
-                        X[j] = BYTES_TO_DWORD(context->bbuffer + (4 * j));
-#endif
-                RMD160_Transform(context->state, X);
-                nbytes -= ofs;
-
-                /* process remaining complete blocks */
-                for (i = 0; i < (nbytes >> 6); i++) {
-#ifndef WORDS_BIGENDIAN
-                        (void)memcpy(X, data + (64 * i) + ofs, sizeof(X));
-#else
-                        for (j=0; j < 16; j++)
-                                X[j] = BYTES_TO_DWORD(data + (64 * i) + (4 * j) + ofs);
-#endif
-                        RMD160_Transform(context->state, X);
-                }
-
-                /*
-                 * Put last bytes from data into context's buffer
-                 */
-                context->buflen = nbytes & 63;
-                memcpy(context->bbuffer, data + (64 * i) + ofs, context->buflen);
-        }
-}
-
-/********************************************************************/
-
-void
-RMD160_Final(uint8_t digest[20], RMD160_CTX *context)
-{
-	uint32_t i;
-	uint32_t X[16];
-#ifdef WORDS_BIGENDIAN
-	uint32_t j;
-#endif
-
-	_DIAGASSERT(digest != NULL);
-	_DIAGASSERT(context != NULL);
-
-	/* append the bit m_n == 1 */
-	context->bbuffer[context->buflen] = (uint8_t)'\200';
-
-	(void)memset(context->bbuffer + context->buflen + 1, 0,
-		63 - context->buflen);
-#ifndef WORDS_BIGENDIAN
-	(void)memcpy(X, context->bbuffer, sizeof(X));
-#else
-	for (j=0; j < 16; j++)
-		X[j] = BYTES_TO_DWORD(context->bbuffer + (4 * j));
-#endif
-	if ((context->buflen) > 55) {
-		/* length goes to next block */
-		RMD160_Transform(context->state, X);
-		(void)memset(X, 0, sizeof(X));
-	}
-
-	/* append length in bits */
-	X[14] = context->length[0] << 3;
-	X[15] = (context->length[0] >> 29) |
-	    (context->length[1] << 3);
-	RMD160_Transform(context->state, X);
-
-	if (digest != NULL) {
-		for (i = 0; i < 20; i += 4) {
-			/* extracts the 8 least significant bits. */
-			digest[i]     =  context->state[i>>2];
-			digest[i + 1] = (context->state[i>>2] >>  8);
-			digest[i + 2] = (context->state[i>>2] >> 16);
-			digest[i + 3] = (context->state[i>>2] >> 24);
-		}
-	}
-}
-
-int RMD160_Equal(RMD160_CTX* pctx1, RMD160_CTX* pctx2) {
-	return pctx1->buflen == pctx2->buflen
-		&& memcmp(pctx1->length, pctx2->length, sizeof(pctx1->length)) == 0
-		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
-		&& memcmp(pctx1->bbuffer, pctx2->bbuffer, sizeof(pctx1->bbuffer)) == 0;
-}
-
-/************************ end of file rmd160.c **********************/
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
deleted file mode 100644
index 24f9a025f0..0000000000
--- a/ext/digest/rmd160/rmd160.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: rmd160.h,v 1.2 2000/07/07 10:47:06 ad Exp $	*/
-/*	$RoughId: rmd160.h,v 1.3 2002/02/24 08:14:31 knu Exp $	*/
-/*	$Id$	*/
-
-/********************************************************************\
- *
- *      FILE:     rmd160.h
- *
- *      CONTENTS: Header file for a sample C-implementation of the
- *                RIPEMD-160 hash-function. 
- *      TARGET:   any computer with an ANSI C compiler
- *
- *      AUTHOR:   Antoon Bosselaers, ESAT-COSIC
- *      DATE:     1 March 1996
- *      VERSION:  1.0
- *
- *      Copyright (c) Katholieke Universiteit Leuven
- *      1996, All Rights Reserved
- *
-\********************************************************************/
-
-/*
- * from OpenBSD: rmd160.h,v 1.4 1999/08/16 09:59:04 millert Exp
- */
-
-#ifndef _RMD160_H_
-#define _RMD160_H_
-
-#include "defs.h"
-
-typedef struct {
-	uint32_t	state[5];	/* state (ABCDE) */
-	uint32_t	length[2];	/* number of bits */
-	uint8_t		bbuffer[64];    /* overflow buffer */
-	uint32_t	buflen;		/* number of chars in bbuffer */
-} RMD160_CTX;
-
-#ifdef RUBY
-#define RMD160_Init	rb_Digest_RMD160_Init
-#define RMD160_Transform	rb_Digest_RMD160_Transform
-#define RMD160_Update	rb_Digest_RMD160_Update
-#define RMD160_Final	rb_Digest_RMD160_Final
-#define RMD160_Equal	rb_Digest_RMD160_Equal
-#ifndef _KERNEL
-#define RMD160_End	rb_Digest_RMD160_End
-#define RMD160_File	rb_Digest_RMD160_File
-#define RMD160_Data	rb_Digest_RMD160_Data
-#endif /* _KERNEL */
-#endif
-
-__BEGIN_DECLS
-void	RMD160_Init _((RMD160_CTX *));
-void	RMD160_Transform _((uint32_t[5], const uint32_t[16]));
-void	RMD160_Update _((RMD160_CTX *, const uint8_t *, size_t));
-void	RMD160_Final _((uint8_t[20], RMD160_CTX *));
-int	RMD160_Equal _((RMD160_CTX *, RMD160_CTX *));
-#ifndef	_KERNEL
-char	*RMD160_End _((RMD160_CTX *, char *));
-char	*RMD160_File _((char *, char *));
-char	*RMD160_Data _((const uint8_t *, size_t, char *));
-#endif /* _KERNEL */
-__END_DECLS
-
-#define RMD160_BLOCK_LENGTH             64
-#define RMD160_DIGEST_LENGTH            20
-#define RMD160_DIGEST_STRING_LENGTH     (RMD160_DIGEST_LENGTH * 2 + 1)
-
-#endif  /* !_RMD160_H_ */
diff --git a/ext/digest/rmd160/rmd160hl.c b/ext/digest/rmd160/rmd160hl.c
deleted file mode 100644
index 4c5e0217d9..0000000000
--- a/ext/digest/rmd160/rmd160hl.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$NetBSD: rmd160hl.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $	*/
-/*	$RoughId: rmd160hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id$	*/
-
-/* rmd160hl.c
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * from OpenBSD: rmd160hl.c,v 1.2 1999/08/17 09:13:12 millert Exp $
- */  
-
-#include "rmd160.h"
-
-#ifndef lint
-/* __RCSID("$NetBSD: rmd160hl.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $"); */
-#endif	/* not lint */
-
-/* #include "namespace.h" */
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#if defined(HAVE_UNISTD_H)
-# include <unistd.h>
-#endif
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond)	assert(cond)
-#endif
-
-
-char *
-RMD160_End(RMD160_CTX *ctx, char *buf)
-{
-    size_t i;
-    char *p = buf;
-    uint8_t digest[20];
-    static const char hex[]="0123456789abcdef";
-
-    _DIAGASSERT(ctx != NULL);
-    /* buf may be NULL */
-
-    if (p == NULL && (p = malloc(41)) == NULL)
-	return 0;
-
-    RMD160_Final(digest,ctx);
-    for (i = 0; i < 20; i++) {
-	p[i + i] = hex[(uint32_t)digest[i] >> 4];
-	p[i + i + 1] = hex[digest[i] & 0x0f];
-    }
-    p[i + i] = '\0';
-    return(p);
-}
-
-char *
-RMD160_File(char *filename, char *buf)
-{
-    uint8_t buffer[BUFSIZ];
-    RMD160_CTX ctx;
-    int fd, num, oerrno;
-
-    _DIAGASSERT(filename != NULL);
-    /* XXX: buf may be NULL ? */
-
-    RMD160_Init(&ctx);
-
-    if ((fd = open(filename, O_RDONLY)) < 0)
-	return(0);
-
-    while ((num = read(fd, buffer, sizeof(buffer))) > 0)
-	RMD160_Update(&ctx, buffer, (size_t)num);
-
-    oerrno = errno;
-    close(fd);
-    errno = oerrno;
-    return(num < 0 ? 0 : RMD160_End(&ctx, buf));
-}
-
-char *
-RMD160_Data(const uint8_t *data, size_t len, char *buf)
-{
-    RMD160_CTX ctx;
-
-    _DIAGASSERT(data != NULL);
-    /* XXX: buf may be NULL ? */
-
-    RMD160_Init(&ctx);
-    RMD160_Update(&ctx, data, len);
-    return(RMD160_End(&ctx, buf));
-}
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
deleted file mode 100644
index b16cdbbed8..0000000000
--- a/ext/digest/rmd160/rmd160init.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id$ */
-
-#include "digest.h"
-#if defined(HAVE_OPENSSL_RIPEMD_H)
-#include "rmd160ossl.h"
-#else
-#include "rmd160.h"
-#endif
-
-static algo_t rmd160 = {
-    RMD160_DIGEST_LENGTH,
-    sizeof(RMD160_CTX),
-    (hash_init_func_t)RMD160_Init,
-    (hash_update_func_t)RMD160_Update,
-    (hash_end_func_t)RMD160_End,
-    (hash_final_func_t)RMD160_Final,
-    (hash_equal_func_t)RMD160_Equal,
-};
-
-void
-Init_rmd160()
-{
-    VALUE mDigest, cDigest_Base, cDigest_RMD160;
-    ID id_metadata;
-
-    rb_require("digest.so");
-
-    mDigest = rb_path2class("Digest");
-    cDigest_Base = rb_path2class("Digest::Base");
-
-    cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
-
-    id_metadata = rb_intern("metadata");
-
-    rb_cvar_set(cDigest_RMD160, id_metadata,
-		Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160), Qtrue);
-}
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
deleted file mode 100644
index be66d81ff9..0000000000
--- a/ext/digest/rmd160/rmd160ossl.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$ */
-
-#include "rmd160ossl.h"
-#include "defs.h"
-#include <assert.h>
-#include <stdlib.h>
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond)	assert(cond)
-#endif
-
-char *
-RMD160_End(RMD160_CTX *ctx, char *buf)
-{
-    size_t i;
-    char *p = buf;
-    uint8_t digest[20];
-    static const char hex[]="0123456789abcdef";
-
-    _DIAGASSERT(ctx != NULL);
-    /* buf may be NULL */
-
-    if (p == NULL && (p = malloc(41)) == NULL)
-	return 0;
-
-    RMD160_Final(digest,ctx);
-    for (i = 0; i < 20; i++) {
-	p[i + i] = hex[(uint32_t)digest[i] >> 4];
-	p[i + i + 1] = hex[digest[i] & 0x0f];
-    }
-    p[i + i] = '\0';
-    return(p);
-}
-
-int RMD160_Equal(RMD160_CTX* pctx1, RMD160_CTX* pctx2) {
-	return pctx1->num == pctx2->num
-	  && pctx1->A == pctx2->A
-	  && pctx1->B == pctx2->B
-	  && pctx1->C == pctx2->C
-	  && pctx1->D == pctx2->D
-	  && pctx1->E == pctx2->E
-	  && pctx1->Nl == pctx2->Nl
-	  && pctx1->Nh == pctx2->Nh
-	  && memcmp(pctx1->data, pctx2->data, sizeof(pctx1->data)) == 0;
-}
diff --git a/ext/digest/rmd160/rmd160ossl.h b/ext/digest/rmd160/rmd160ossl.h
deleted file mode 100644
index 824a1bf32f..0000000000
--- a/ext/digest/rmd160/rmd160ossl.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$ */
-
-#ifndef RMD160OSSL_H_INCLUDED
-#define RMD160OSSL_H_INCLUDED
-
-#include <openssl/ripemd.h>
-
-#define RMD160_CTX	RIPEMD160_CTX
-
-#define RMD160_Init	RIPEMD160_Init
-#define RMD160_Update	RIPEMD160_Update
-#define RMD160_Final	RIPEMD160_Final
-
-#define RMD160_BLOCK_LENGTH		RIPEMD160_CBLOCK
-#define RMD160_DIGEST_LENGTH		RIPEMD160_DIGEST_LENGTH
-
-char *RMD160_End(RMD160_CTX *ctx, char *buf);
-int RMD160_Equal(RMD160_CTX *pctx1, RMD160_CTX *pctx2);
-
-#endif
diff --git a/ext/digest/sha1/.cvsignore b/ext/digest/sha1/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/sha1/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/sha1/MANIFEST b/ext/digest/sha1/MANIFEST
deleted file mode 100644
index 7109ab90b6..0000000000
--- a/ext/digest/sha1/MANIFEST
+++ /dev/null
@@ -1,8 +0,0 @@
-extconf.rb
-sha1.c
-sha1.h
-sha1hl.c
-sha1init.c
-sha1ossl.c
-sha1ossl.h
-depend
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
deleted file mode 100644
index a159f456d3..0000000000
--- a/ext/digest/sha1/depend
+++ /dev/null
@@ -1,8 +0,0 @@
-sha1.o: sha1.c sha1.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-sha1hl.o: sha1hl.c sha1.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-sha1init.o: sha1init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
-  sha1.h $(srcdir)/../defs.h
-sha1ossl.o: sha1ossl.h  $(srcdir)/../defs.h
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
deleted file mode 100644
index c249a415ed..0000000000
--- a/ext/digest/sha1/extconf.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id$
-
-require "mkmf"
-
-$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
-
-$objs = [ "sha1init.#{$OBJEXT}" ]
-
-dir_config("openssl")
-
-if !with_config("bundled-sha1") &&
-    have_library("crypto") && have_header("openssl/sha.h")
-  $objs << "sha1ossl.#{$OBJEXT}"
-else
-  $objs << "sha1.#{$OBJEXT}" << "sha1hl.#{$OBJEXT}"
-end
-
-have_header("sys/cdefs.h")
-
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
-create_makefile("digest/sha1")
diff --git a/ext/digest/sha1/sha1.c b/ext/digest/sha1/sha1.c
deleted file mode 100644
index 1012ef8751..0000000000
--- a/ext/digest/sha1/sha1.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*	$NetBSD: sha1.c,v 1.2 2001/03/22 09:51:48 agc Exp $	*/
-/*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
-/*	$RoughId: sha1.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id$	*/
-
-/*
- * SHA-1 in C
- * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
- *
- * Test Vectors (from FIPS PUB 180-1)
- * "abc"
- *   A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
- * "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
- *   84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
- * A million repetitions of "a"
- *   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
- */
-
-#include "sha1.h"
-
-#define SHA1HANDSOFF		/* Copies data before messing with it. */
-
-#if defined(_KERNEL) || defined(_STANDALONE)
-#include <sys/param.h>
-#include <sys/systm.h>
-#define _DIAGASSERT(x)	(void)0
-#else
-/* #include "namespace.h" */
-#include <assert.h>
-#include <string.h>
-#endif
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond)	assert(cond)
-#endif
-
-/*
- * XXX Kludge until there is resolution regarding mem*() functions
- * XXX in the kernel.
- */
-#if defined(_KERNEL) || defined(_STANDALONE)
-#define	memcpy(s, d, l)		bcopy((d), (s), (l))
-#endif
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-/*
- * blk0() and blk() perform the initial expand.
- * I got the idea of expanding during the round function from SSLeay
- */
-#ifndef WORDS_BIGENDIAN
-# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
-    |(rol(block->l[i],8)&0x00FF00FF))
-#else
-# define blk0(i) block->l[i]
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-    ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/*
- * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
- */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-
-typedef union {
-    uint8_t c[64];
-    uint32_t l[16];
-} CHAR64LONG16;
-
-#ifdef __sparc_v9__
-void do_R01(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
-void do_R2(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
-void do_R3(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
-void do_R4(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
-
-#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
-#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
-#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
-#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
-#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
-
-void
-do_R01(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
-{
-    nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
-    nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
-    nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
-    nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
-    nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
-}
-
-void
-do_R2(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
-{
-    nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
-    nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
-    nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
-    nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
-    nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
-}
-
-void
-do_R3(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
-{
-    nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
-    nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
-    nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
-    nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
-    nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
-}
-
-void
-do_R4(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
-{
-    nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
-    nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
-    nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
-    nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
-    nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
-}
-#endif
-
-/*
- * Hash a single 512-bit block. This is the core of the algorithm.
- */
-void SHA1_Transform(state, buffer)
-    uint32_t state[5];
-    const uint8_t buffer[64];
-{
-    uint32_t a, b, c, d, e;
-    CHAR64LONG16 *block;
-
-#ifdef SHA1HANDSOFF
-    CHAR64LONG16 workspace;
-#endif
-
-    _DIAGASSERT(buffer != 0);
-    _DIAGASSERT(state != 0);
-
-#ifdef SHA1HANDSOFF
-    block = &workspace;
-    (void)memcpy(block, buffer, 64);
-#else
-    block = (CHAR64LONG16 *)(void *)buffer;
-#endif
-
-    /* Copy context->state[] to working vars */
-    a = state[0];
-    b = state[1];
-    c = state[2];
-    d = state[3];
-    e = state[4];
-
-#ifdef __sparc_v9__
-    do_R01(&a, &b, &c, &d, &e, block);
-    do_R2(&a, &b, &c, &d, &e, block);
-    do_R3(&a, &b, &c, &d, &e, block);
-    do_R4(&a, &b, &c, &d, &e, block);
-#else
-    /* 4 rounds of 20 operations each. Loop unrolled. */
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-#endif
-
-    /* Add the working vars back into context.state[] */
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    state[4] += e;
-
-    /* Wipe variables */
-    a = b = c = d = e = 0;
-}
-
-
-/*
- * SHA1_Init - Initialize new context
- */
-void SHA1_Init(context)
-    SHA1_CTX *context;
-{
-
-    _DIAGASSERT(context != 0);
-
-    /* SHA1 initialization constants */
-    context->state[0] = 0x67452301;
-    context->state[1] = 0xEFCDAB89;
-    context->state[2] = 0x98BADCFE;
-    context->state[3] = 0x10325476;
-    context->state[4] = 0xC3D2E1F0;
-    context->count[0] = context->count[1] = 0;
-}
-
-
-/*
- * Run your data through this.
- */
-void SHA1_Update(context, data, len)
-    SHA1_CTX *context;
-    const uint8_t *data;
-    size_t len;
-{
-    uint32_t i, j;
-
-    _DIAGASSERT(context != 0);
-    _DIAGASSERT(data != 0);
-
-    j = context->count[0];
-    if ((context->count[0] += len << 3) < j)
-	context->count[1] += (len>>29)+1;
-    j = (j >> 3) & 63;
-    if ((j + len) > 63) {
-	(void)memcpy(&context->buffer[j], data, (i = 64-j));
-	SHA1_Transform(context->state, context->buffer);
-	for ( ; i + 63 < len; i += 64)
-	    SHA1_Transform(context->state, &data[i]);
-	j = 0;
-    } else {
-	i = 0;
-    }
-    (void)memcpy(&context->buffer[j], &data[i], len - i);
-}
-
-
-/*
- * Add padding and return the message digest.
- */
-void SHA1_Final(digest, context)
-    uint8_t digest[20];
-    SHA1_CTX* context;
-{
-    size_t i;
-    uint8_t finalcount[8];
-
-    _DIAGASSERT(digest != 0);
-    _DIAGASSERT(context != 0);
-
-    for (i = 0; i < 8; i++) {
-	finalcount[i] = (uint8_t)((context->count[(i >= 4 ? 0 : 1)]
-	 >> ((3-(i & 3)) * 8) ) & 255);	 /* Endian independent */
-    }
-    SHA1_Update(context, (const uint8_t *)"\200", 1);
-    while ((context->count[0] & 504) != 448)
-	SHA1_Update(context, (const uint8_t *)"\0", 1);
-    SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
-
-    if (digest) {
-	for (i = 0; i < 20; i++)
-	    digest[i] = (uint8_t)
-		((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
-    }
-}
-
-int SHA1_Equal(SHA1_CTX* pctx1, SHA1_CTX* pctx2) {
-	return memcmp(pctx1->count, pctx2->count, sizeof(pctx1->count)) == 0
-		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
-		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
-}
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
deleted file mode 100644
index 2303cecc2b..0000000000
--- a/ext/digest/sha1/sha1.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $	*/
-/*	$RoughId: sha1.h,v 1.3 2002/02/24 08:14:32 knu Exp $	*/
-/*	$Id$	*/
-
-/*
- * SHA-1 in C
- * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
- */
-
-#ifndef _SYS_SHA1_H_
-#define	_SYS_SHA1_H_
-
-#include "defs.h"
-
-typedef struct {
-	uint32_t state[5];
-	uint32_t count[2];  
-	uint8_t buffer[64];
-} SHA1_CTX;
-
-#ifdef RUBY
-#define SHA1_Transform	rb_Digest_SHA1_Transform
-#define SHA1_Init	rb_Digest_SHA1_Init
-#define SHA1_Update	rb_Digest_SHA1_Update
-#define SHA1_Final	rb_Digest_SHA1_Final
-#define SHA1_Equal	rb_Digest_SHA1_Equal
-#ifndef _KERNEL
-#define SHA1_End	rb_Digest_SHA1_End
-#define SHA1_File	rb_Digest_SHA1_File
-#define SHA1_Data	rb_Digest_SHA1_Data
-#endif /* _KERNEL */
-#endif
-
-void	SHA1_Transform _((uint32_t state[5], const uint8_t buffer[64]));
-void	SHA1_Init _((SHA1_CTX *context));
-void	SHA1_Update _((SHA1_CTX *context, const uint8_t *data, size_t len));
-void	SHA1_Final _((uint8_t digest[20], SHA1_CTX *context));
-int	SHA1_Equal _((SHA1_CTX *pctx1, SHA1_CTX *pctx2));
-#ifndef _KERNEL
-char	*SHA1_End _((SHA1_CTX *, char *));
-char	*SHA1_File _((char *, char *));
-char	*SHA1_Data _((const uint8_t *, size_t, char *));
-#endif /* _KERNEL */
-
-#define SHA1_BLOCK_LENGTH		64
-#define SHA1_DIGEST_LENGTH		20
-#define SHA1_DIGEST_STRING_LENGTH	(SHA1_DIGEST_LENGTH * 2 + 1)
-  
-#endif /* _SYS_SHA1_H_ */
diff --git a/ext/digest/sha1/sha1hl.c b/ext/digest/sha1/sha1hl.c
deleted file mode 100644
index d1a236b22c..0000000000
--- a/ext/digest/sha1/sha1hl.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $	*/
-/*	$RoughId: sha1hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id$	*/
-
-/* sha1hl.c
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- */
-
-/* #include "namespace.h" */
-
-#include "sha1.h"
-#include <fcntl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#if defined(HAVE_UNISTD_H)
-# include <unistd.h>
-#endif
-
-#if defined(LIBC_SCCS) && !defined(lint)
-/* __RCSID("$NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $"); */
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond)	assert(cond)
-#endif
-
-
-/* ARGSUSED */
-char *
-SHA1_End(ctx, buf)
-    SHA1_CTX *ctx;
-    char *buf;
-{
-    int i;
-    char *p = buf;
-    uint8_t digest[20];
-    static const char hex[]="0123456789abcdef";
-
-    _DIAGASSERT(ctx != NULL);
-    /* buf may be NULL */
-
-    if (p == NULL && (p = malloc(41)) == NULL)
-	return 0;
-
-    SHA1_Final(digest,ctx);
-    for (i = 0; i < 20; i++) {
-	p[i + i] = hex[((uint32_t)digest[i]) >> 4];
-	p[i + i + 1] = hex[digest[i] & 0x0f];
-    }
-    p[i + i] = '\0';
-    return(p);
-}
-
-char *
-SHA1_File (filename, buf)
-    char *filename;
-    char *buf;
-{
-    uint8_t buffer[BUFSIZ];
-    SHA1_CTX ctx;
-    int fd, num, oerrno;
-
-    _DIAGASSERT(filename != NULL);
-    /* XXX: buf may be NULL ? */
-
-    SHA1_Init(&ctx);
-
-    if ((fd = open(filename,O_RDONLY)) < 0)
-	return(0);
-
-    while ((num = read(fd, buffer, sizeof(buffer))) > 0)
-	SHA1_Update(&ctx, buffer, (size_t)num);
-
-    oerrno = errno;
-    close(fd);
-    errno = oerrno;
-    return(num < 0 ? 0 : SHA1_End(&ctx, buf));
-}
-
-char *
-SHA1_Data (data, len, buf)
-    const uint8_t *data;
-    size_t len;
-    char *buf;
-{
-    SHA1_CTX ctx;
-
-    _DIAGASSERT(data != NULL);
-    /* XXX: buf may be NULL ? */
-
-    SHA1_Init(&ctx);
-    SHA1_Update(&ctx, data, len);
-    return(SHA1_End(&ctx, buf));
-}
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
deleted file mode 100644
index 426afb7cd0..0000000000
--- a/ext/digest/sha1/sha1init.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id$ */
-
-#include "digest.h"
-#if defined(HAVE_OPENSSL_SHA_H)
-#include "sha1ossl.h"
-#else
-#include "sha1.h"
-#endif
-
-static algo_t sha1 = {
-    SHA1_DIGEST_LENGTH,
-    sizeof(SHA1_CTX),
-    (hash_init_func_t)SHA1_Init,
-    (hash_update_func_t)SHA1_Update,
-    (hash_end_func_t)SHA1_End,
-    (hash_final_func_t)SHA1_Final,
-    (hash_equal_func_t)SHA1_Equal,
-};
-
-void
-Init_sha1()
-{
-    VALUE mDigest, cDigest_Base, cDigest_SHA1;
-    ID id_metadata;
-
-    rb_require("digest.so");
-
-    mDigest = rb_path2class("Digest");
-    cDigest_Base = rb_path2class("Digest::Base");
-
-    cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
-
-    id_metadata = rb_intern("metadata");
-
-    rb_cvar_set(cDigest_SHA1, id_metadata,
-		Data_Wrap_Struct(rb_cObject, 0, 0, &sha1), Qtrue);
-}
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
deleted file mode 100644
index b125128f82..0000000000
--- a/ext/digest/sha1/sha1ossl.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$ */
-
-#include "sha1ossl.h"
-#include "defs.h"
-#include <assert.h>
-#include <stdlib.h>
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond)	assert(cond)
-#endif
-
-char *
-SHA1_End(SHA1_CTX *ctx, char *buf)
-{
-    int i;
-    char *p = buf;
-    uint8_t digest[20];
-    static const char hex[]="0123456789abcdef";
-
-    _DIAGASSERT(ctx != NULL);
-    /* buf may be NULL */
-
-    if (p == NULL && (p = malloc(41)) == NULL)
-	return 0;
-
-    SHA1_Final(digest,ctx);
-    for (i = 0; i < 20; i++) {
-	p[i + i] = hex[((uint32_t)digest[i]) >> 4];
-	p[i + i + 1] = hex[digest[i] & 0x0f];
-    }
-    p[i + i] = '\0';
-    return(p);
-}
-
-int SHA1_Equal(SHA1_CTX* pctx1, SHA1_CTX* pctx2) {
-	return pctx1->num == pctx2->num
-	  && pctx1->h0 == pctx2->h0
-	  && pctx1->h1 == pctx2->h1
-	  && pctx1->h2 == pctx2->h2
-	  && pctx1->h3 == pctx2->h3
-	  && pctx1->h4 == pctx2->h4
-	  && pctx1->Nl == pctx2->Nl
-	  && pctx1->Nh == pctx2->Nh
-	  && memcmp(pctx1->data, pctx2->data, sizeof(pctx1->data)) == 0;
-}
diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h
deleted file mode 100644
index e8d7e74baf..0000000000
--- a/ext/digest/sha1/sha1ossl.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $Id$ */
-
-#ifndef SHA1OSSL_H_INCLUDED
-#define SHA1OSSL_H_INCLUDED
-
-#include <openssl/sha.h>
-
-#define SHA1_CTX	SHA_CTX
-
-#define SHA1_BLOCK_LENGTH	SHA_BLOCK_LENGTH
-#define SHA1_DIGEST_LENGTH	SHA_DIGEST_LENGTH
-
-char *SHA1_End(SHA1_CTX *ctx, char *buf);
-int SHA1_Equal(SHA1_CTX *pctx1, SHA1_CTX *pctx2);
-
-#endif
diff --git a/ext/digest/sha2/.cvsignore b/ext/digest/sha2/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/sha2/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/sha2/MANIFEST b/ext/digest/sha2/MANIFEST
deleted file mode 100644
index f117b94771..0000000000
--- a/ext/digest/sha2/MANIFEST
+++ /dev/null
@@ -1,6 +0,0 @@
-extconf.rb
-sha2.c
-sha2.h
-sha2hl.c
-sha2init.c
-depend
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
deleted file mode 100644
index 2587415fdc..0000000000
--- a/ext/digest/sha2/depend
+++ /dev/null
@@ -1,7 +0,0 @@
-sha2.o: sha2.c sha2.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-sha2hl.o: sha2hl.c sha2.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-sha2init.o: sha2init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
-  sha2.h $(srcdir)/../defs.h
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
deleted file mode 100644
index c982aa64de..0000000000
--- a/ext/digest/sha2/extconf.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# $RoughId: extconf.rb,v 1.4 2001/08/14 19:54:51 knu Exp $
-# $Id$
-
-require "mkmf"
-
-$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
-
-$objs = [
-  "sha2.#{$OBJEXT}",
-  "sha2hl.#{$OBJEXT}",
-  "sha2init.#{$OBJEXT}",
-]
-
-have_header("sys/cdefs.h")
-
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
-if try_cpp(<<SRC, $defs.join(' '))
-#include "defs.h"
-#ifdef NO_UINT64_T
-  #error ** Cannot find a 64bit integer type - skipping the SHA2 module.
-#endif
-SRC
-then
-  create_makefile("digest/sha2")
-end
diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c
deleted file mode 100644
index 24a57ded0d..0000000000
--- a/ext/digest/sha2/sha2.c
+++ /dev/null
@@ -1,937 +0,0 @@
-/*
- * sha2.c
- *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me@aarongifford.com>
- *
- * Copyright 2000 Aaron D. Gifford.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-/* $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $ */
-/* $Id$ */
-
-#include "sha2.h"
-#include <stdio.h>
-#include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
-#include <assert.h>	/* assert() */
-
-/*
- * ASSERT NOTE:
- * Some sanity checking code is included using assert().  On my FreeBSD
- * system, this additional code can be removed by compiling with NDEBUG
- * defined.  Check your own systems manpage on assert() to see how to
- * compile WITHOUT the sanity checking code on your system.
- *
- * UNROLLED TRANSFORM LOOP NOTE:
- * You can define SHA2_UNROLL_TRANSFORM to use the unrolled transform
- * loop version for the hash transform rounds (defined using macros
- * later in this file).  Either define on the command line, for example:
- *
- *   cc -DSHA2_UNROLL_TRANSFORM -o sha2 sha2.c sha2prog.c
- *
- * or define below:
- *
- *   #define SHA2_UNROLL_TRANSFORM
- *
- */
-
-
-/*** SHA-256/384/512 Machine Architecture Definitions *****************/
-typedef uint8_t  sha2_byte;	/* Exactly 1 byte */
-typedef uint32_t sha2_word32;	/* Exactly 4 bytes */
-typedef uint64_t sha2_word64;	/* Exactly 8 bytes */
-
-#if defined(__GNUC__) || defined(_HPUX_SOURCE)
-#define ULL(number)	number##ULL
-#else
-#define ULL(number)	(uint64_t)(number)
-#endif
-
-
-/*** SHA-256/384/512 Various Length Definitions ***********************/
-/* NOTE: Most of these are in sha2.h */
-#define SHA256_SHORT_BLOCK_LENGTH	(SHA256_BLOCK_LENGTH - 8)
-#define SHA384_SHORT_BLOCK_LENGTH	(SHA384_BLOCK_LENGTH - 16)
-#define SHA512_SHORT_BLOCK_LENGTH	(SHA512_BLOCK_LENGTH - 16)
-
-
-/*** ENDIAN REVERSAL MACROS *******************************************/
-#ifndef WORDS_BIGENDIAN
-#define REVERSE32(w,x)	{ \
-	sha2_word32 tmp = (w); \
-	tmp = (tmp >> 16) | (tmp << 16); \
-	(x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
-}
-#define REVERSE64(w,x)	{ \
-	sha2_word64 tmp = (w); \
-	tmp = (tmp >> 32) | (tmp << 32); \
-	tmp = ((tmp & ULL(0xff00ff00ff00ff00)) >> 8) | \
-	      ((tmp & ULL(0x00ff00ff00ff00ff)) << 8); \
-	(x) = ((tmp & ULL(0xffff0000ffff0000)) >> 16) | \
-	      ((tmp & ULL(0x0000ffff0000ffff)) << 16); \
-}
-#endif
-
-/*
- * Macro for incrementally adding the unsigned 64-bit integer n to the
- * unsigned 128-bit integer (represented using a two-element array of
- * 64-bit words):
- */
-#define ADDINC128(w,n)	{ \
-	(w)[0] += (sha2_word64)(n); \
-	if ((w)[0] < (n)) { \
-		(w)[1]++; \
-	} \
-}
-
-/*
- * Macros for copying blocks of memory and for zeroing out ranges
- * of memory.  Using these macros makes it easy to switch from
- * using memset()/memcpy() and using bzero()/bcopy().
- *
- * Please define either SHA2_USE_MEMSET_MEMCPY or define
- * SHA2_USE_BZERO_BCOPY depending on which function set you
- * choose to use:
- */
-#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY)
-/* Default to memset()/memcpy() if no option is specified */
-#define	SHA2_USE_MEMSET_MEMCPY	1
-#endif
-#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY)
-/* Abort with an error if BOTH options are defined */
-#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both!
-#endif
-
-#ifdef SHA2_USE_MEMSET_MEMCPY
-#define MEMSET_BZERO(p,l)	memset((p), 0, (l))
-#define MEMCPY_BCOPY(d,s,l)	memcpy((d), (s), (l))
-#endif
-#ifdef SHA2_USE_BZERO_BCOPY
-#define MEMSET_BZERO(p,l)	bzero((p), (l))
-#define MEMCPY_BCOPY(d,s,l)	bcopy((s), (d), (l))
-#endif
-
-
-/*** THE SIX LOGICAL FUNCTIONS ****************************************/
-/*
- * Bit shifting and rotation (used by the six SHA-XYZ logical functions:
- *
- *   NOTE:  The naming of R and S appears backwards here (R is a SHIFT and
- *   S is a ROTATION) because the SHA-256/384/512 description document
- *   (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this
- *   same "backwards" definition.
- */
-/* Shift-right (used in SHA-256, SHA-384, and SHA-512): */
-#define R(b,x) 		((x) >> (b))
-/* 32-bit Rotate-right (used in SHA-256): */
-#define S32(b,x)	(((x) >> (b)) | ((x) << (32 - (b))))
-/* 64-bit Rotate-right (used in SHA-384 and SHA-512): */
-#define S64(b,x)	(((x) >> (b)) | ((x) << (64 - (b))))
-
-/* Two of six logical functions used in SHA-256, SHA-384, and SHA-512: */
-#define Ch(x,y,z)	(((x) & (y)) ^ ((~(x)) & (z)))
-#define Maj(x,y,z)	(((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-
-/* Four of six logical functions used in SHA-256: */
-#define Sigma0_256(x)	(S32(2,  (x)) ^ S32(13, (x)) ^ S32(22, (x)))
-#define Sigma1_256(x)	(S32(6,  (x)) ^ S32(11, (x)) ^ S32(25, (x)))
-#define sigma0_256(x)	(S32(7,  (x)) ^ S32(18, (x)) ^ R(3 ,   (x)))
-#define sigma1_256(x)	(S32(17, (x)) ^ S32(19, (x)) ^ R(10,   (x)))
-
-/* Four of six logical functions used in SHA-384 and SHA-512: */
-#define Sigma0_512(x)	(S64(28, (x)) ^ S64(34, (x)) ^ S64(39, (x)))
-#define Sigma1_512(x)	(S64(14, (x)) ^ S64(18, (x)) ^ S64(41, (x)))
-#define sigma0_512(x)	(S64( 1, (x)) ^ S64( 8, (x)) ^ R( 7,   (x)))
-#define sigma1_512(x)	(S64(19, (x)) ^ S64(61, (x)) ^ R( 6,   (x)))
-
-/*** INTERNAL FUNCTION PROTOTYPES *************************************/
-/* NOTE: These should not be accessed directly from outside this
- * library -- they are intended for private internal visibility/use
- * only.
- */
-void SHA512_Last(SHA512_CTX*);
-void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
-void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
-
-
-/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
-/* Hash constant words K for SHA-256: */
-const static sha2_word32 K256[64] = {
-	0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
-	0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
-	0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
-	0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
-	0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
-	0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
-	0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
-	0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
-	0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
-	0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
-	0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
-	0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
-	0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
-	0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
-	0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
-	0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
-};
-
-/* Initial hash value H for SHA-256: */
-const static sha2_word32 sha256_initial_hash_value[8] = {
-	0x6a09e667UL,
-	0xbb67ae85UL,
-	0x3c6ef372UL,
-	0xa54ff53aUL,
-	0x510e527fUL,
-	0x9b05688cUL,
-	0x1f83d9abUL,
-	0x5be0cd19UL
-};
-
-/* Hash constant words K for SHA-384 and SHA-512: */
-const static sha2_word64 K512[80] = {
-	ULL(0x428a2f98d728ae22), ULL(0x7137449123ef65cd),
-	ULL(0xb5c0fbcfec4d3b2f), ULL(0xe9b5dba58189dbbc),
-	ULL(0x3956c25bf348b538), ULL(0x59f111f1b605d019),
-	ULL(0x923f82a4af194f9b), ULL(0xab1c5ed5da6d8118),
-	ULL(0xd807aa98a3030242), ULL(0x12835b0145706fbe),
-	ULL(0x243185be4ee4b28c), ULL(0x550c7dc3d5ffb4e2),
-	ULL(0x72be5d74f27b896f), ULL(0x80deb1fe3b1696b1),
-	ULL(0x9bdc06a725c71235), ULL(0xc19bf174cf692694),
-	ULL(0xe49b69c19ef14ad2), ULL(0xefbe4786384f25e3),
-	ULL(0x0fc19dc68b8cd5b5), ULL(0x240ca1cc77ac9c65),
-	ULL(0x2de92c6f592b0275), ULL(0x4a7484aa6ea6e483),
-	ULL(0x5cb0a9dcbd41fbd4), ULL(0x76f988da831153b5),
-	ULL(0x983e5152ee66dfab), ULL(0xa831c66d2db43210),
-	ULL(0xb00327c898fb213f), ULL(0xbf597fc7beef0ee4),
-	ULL(0xc6e00bf33da88fc2), ULL(0xd5a79147930aa725),
-	ULL(0x06ca6351e003826f), ULL(0x142929670a0e6e70),
-	ULL(0x27b70a8546d22ffc), ULL(0x2e1b21385c26c926),
-	ULL(0x4d2c6dfc5ac42aed), ULL(0x53380d139d95b3df),
-	ULL(0x650a73548baf63de), ULL(0x766a0abb3c77b2a8),
-	ULL(0x81c2c92e47edaee6), ULL(0x92722c851482353b),
-	ULL(0xa2bfe8a14cf10364), ULL(0xa81a664bbc423001),
-	ULL(0xc24b8b70d0f89791), ULL(0xc76c51a30654be30),
-	ULL(0xd192e819d6ef5218), ULL(0xd69906245565a910),
-	ULL(0xf40e35855771202a), ULL(0x106aa07032bbd1b8),
-	ULL(0x19a4c116b8d2d0c8), ULL(0x1e376c085141ab53),
-	ULL(0x2748774cdf8eeb99), ULL(0x34b0bcb5e19b48a8),
-	ULL(0x391c0cb3c5c95a63), ULL(0x4ed8aa4ae3418acb),
-	ULL(0x5b9cca4f7763e373), ULL(0x682e6ff3d6b2b8a3),
-	ULL(0x748f82ee5defb2fc), ULL(0x78a5636f43172f60),
-	ULL(0x84c87814a1f0ab72), ULL(0x8cc702081a6439ec),
-	ULL(0x90befffa23631e28), ULL(0xa4506cebde82bde9),
-	ULL(0xbef9a3f7b2c67915), ULL(0xc67178f2e372532b),
-	ULL(0xca273eceea26619c), ULL(0xd186b8c721c0c207),
-	ULL(0xeada7dd6cde0eb1e), ULL(0xf57d4f7fee6ed178),
-	ULL(0x06f067aa72176fba), ULL(0x0a637dc5a2c898a6),
-	ULL(0x113f9804bef90dae), ULL(0x1b710b35131c471b),
-	ULL(0x28db77f523047d84), ULL(0x32caab7b40c72493),
-	ULL(0x3c9ebe0a15c9bebc), ULL(0x431d67c49c100d4c),
-	ULL(0x4cc5d4becb3e42b6), ULL(0x597f299cfc657e2a),
-	ULL(0x5fcb6fab3ad6faec), ULL(0x6c44198c4a475817)
-};
-
-/* Initial hash value H for SHA-384 */
-const static sha2_word64 sha384_initial_hash_value[8] = {
-	ULL(0xcbbb9d5dc1059ed8),
-	ULL(0x629a292a367cd507),
-	ULL(0x9159015a3070dd17),
-	ULL(0x152fecd8f70e5939),
-	ULL(0x67332667ffc00b31),
-	ULL(0x8eb44a8768581511),
-	ULL(0xdb0c2e0d64f98fa7),
-	ULL(0x47b5481dbefa4fa4)
-};
-
-/* Initial hash value H for SHA-512 */
-const static sha2_word64 sha512_initial_hash_value[8] = {
-	ULL(0x6a09e667f3bcc908),
-	ULL(0xbb67ae8584caa73b),
-	ULL(0x3c6ef372fe94f82b),
-	ULL(0xa54ff53a5f1d36f1),
-	ULL(0x510e527fade682d1),
-	ULL(0x9b05688c2b3e6c1f),
-	ULL(0x1f83d9abfb41bd6b),
-	ULL(0x5be0cd19137e2179)
-};
-
-
-/*** SHA-256: *********************************************************/
-void SHA256_Init(SHA256_CTX* context) {
-	if (context == (SHA256_CTX*)0) {
-		return;
-	}
-	MEMCPY_BCOPY(context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH);
-	MEMSET_BZERO(context->buffer, SHA256_BLOCK_LENGTH);
-	context->bitcount = 0;
-}
-
-#ifdef SHA2_UNROLL_TRANSFORM
-
-/* Unrolled SHA-256 round macros: */
-
-#ifndef WORDS_BIGENDIAN
-
-#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
-	REVERSE32(*data++, W256[j]); \
-	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
-             K256[j] + W256[j]; \
-	(d) += T1; \
-	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
-	j++
-
-
-#else
-
-#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
-	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
-	     K256[j] + (W256[j] = *data++); \
-	(d) += T1; \
-	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
-	j++
-
-#endif
-
-#define ROUND256(a,b,c,d,e,f,g,h)	\
-	s0 = W256[(j+1)&0x0f]; \
-	s0 = sigma0_256(s0); \
-	s1 = W256[(j+14)&0x0f]; \
-	s1 = sigma1_256(s1); \
-	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + K256[j] + \
-	     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); \
-	(d) += T1; \
-	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
-	j++
-
-void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
-	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
-	sha2_word32	T1, *W256;
-	int		j;
-
-	W256 = (sha2_word32*)context->buffer;
-
-	/* Initialize registers with the prev. intermediate value */
-	a = context->state[0];
-	b = context->state[1];
-	c = context->state[2];
-	d = context->state[3];
-	e = context->state[4];
-	f = context->state[5];
-	g = context->state[6];
-	h = context->state[7];
-
-	j = 0;
-	do {
-		/* Rounds 0 to 15 (unrolled): */
-		ROUND256_0_TO_15(a,b,c,d,e,f,g,h);
-		ROUND256_0_TO_15(h,a,b,c,d,e,f,g);
-		ROUND256_0_TO_15(g,h,a,b,c,d,e,f);
-		ROUND256_0_TO_15(f,g,h,a,b,c,d,e);
-		ROUND256_0_TO_15(e,f,g,h,a,b,c,d);
-		ROUND256_0_TO_15(d,e,f,g,h,a,b,c);
-		ROUND256_0_TO_15(c,d,e,f,g,h,a,b);
-		ROUND256_0_TO_15(b,c,d,e,f,g,h,a);
-	} while (j < 16);
-
-	/* Now for the remaining rounds to 64: */
-	do {
-		ROUND256(a,b,c,d,e,f,g,h);
-		ROUND256(h,a,b,c,d,e,f,g);
-		ROUND256(g,h,a,b,c,d,e,f);
-		ROUND256(f,g,h,a,b,c,d,e);
-		ROUND256(e,f,g,h,a,b,c,d);
-		ROUND256(d,e,f,g,h,a,b,c);
-		ROUND256(c,d,e,f,g,h,a,b);
-		ROUND256(b,c,d,e,f,g,h,a);
-	} while (j < 64);
-
-	/* Compute the current intermediate hash value */
-	context->state[0] += a;
-	context->state[1] += b;
-	context->state[2] += c;
-	context->state[3] += d;
-	context->state[4] += e;
-	context->state[5] += f;
-	context->state[6] += g;
-	context->state[7] += h;
-
-	/* Clean up */
-	a = b = c = d = e = f = g = h = T1 = 0;
-}
-
-#else /* SHA2_UNROLL_TRANSFORM */
-
-void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
-	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
-	sha2_word32	T1, T2, *W256;
-	int		j;
-
-	W256 = (sha2_word32*)context->buffer;
-
-	/* Initialize registers with the prev. intermediate value */
-	a = context->state[0];
-	b = context->state[1];
-	c = context->state[2];
-	d = context->state[3];
-	e = context->state[4];
-	f = context->state[5];
-	g = context->state[6];
-	h = context->state[7];
-
-	j = 0;
-	do {
-#ifndef WORDS_BIGENDIAN
-		/* Copy data while converting to host byte order */
-		REVERSE32(*data++,W256[j]);
-		/* Apply the SHA-256 compression function to update a..h */
-		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
-#else
-		/* Apply the SHA-256 compression function to update a..h with copy */
-		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
-#endif
-		T2 = Sigma0_256(a) + Maj(a, b, c);
-		h = g;
-		g = f;
-		f = e;
-		e = d + T1;
-		d = c;
-		c = b;
-		b = a;
-		a = T1 + T2;
-
-		j++;
-	} while (j < 16);
-
-	do {
-		/* Part of the message block expansion: */
-		s0 = W256[(j+1)&0x0f];
-		s0 = sigma0_256(s0);
-		s1 = W256[(j+14)&0x0f];	
-		s1 = sigma1_256(s1);
-
-		/* Apply the SHA-256 compression function to update a..h */
-		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + 
-		     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
-		T2 = Sigma0_256(a) + Maj(a, b, c);
-		h = g;
-		g = f;
-		f = e;
-		e = d + T1;
-		d = c;
-		c = b;
-		b = a;
-		a = T1 + T2;
-
-		j++;
-	} while (j < 64);
-
-	/* Compute the current intermediate hash value */
-	context->state[0] += a;
-	context->state[1] += b;
-	context->state[2] += c;
-	context->state[3] += d;
-	context->state[4] += e;
-	context->state[5] += f;
-	context->state[6] += g;
-	context->state[7] += h;
-
-	/* Clean up */
-	a = b = c = d = e = f = g = h = T1 = T2 = 0;
-}
-
-#endif /* SHA2_UNROLL_TRANSFORM */
-
-void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
-	unsigned int	freespace, usedspace;
-
-	if (len == 0) {
-		/* Calling with no data is valid - we do nothing */
-		return;
-	}
-
-	/* Sanity check: */
-	assert(context != NULL && data != NULL);
-
-	usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
-	if (usedspace > 0) {
-		/* Calculate how much free space is available in the buffer */
-		freespace = SHA256_BLOCK_LENGTH - usedspace;
-
-		if (len >= freespace) {
-			/* Fill the buffer completely and process it */
-			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
-			context->bitcount += freespace << 3;
-			len -= freespace;
-			data += freespace;
-			SHA256_Transform(context, (sha2_word32*)context->buffer);
-		} else {
-			/* The buffer is not yet full */
-			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
-			context->bitcount += len << 3;
-			/* Clean up: */
-			usedspace = freespace = 0;
-			return;
-		}
-	}
-	while (len >= SHA256_BLOCK_LENGTH) {
-		/* Process as many complete blocks as we can */
-		SHA256_Transform(context, (const sha2_word32*)data);
-		context->bitcount += SHA256_BLOCK_LENGTH << 3;
-		len -= SHA256_BLOCK_LENGTH;
-		data += SHA256_BLOCK_LENGTH;
-	}
-	if (len > 0) {
-		/* There's left-overs, so save 'em */
-		MEMCPY_BCOPY(context->buffer, data, len);
-		context->bitcount += len << 3;
-	}
-	/* Clean up: */
-	usedspace = freespace = 0;
-}
-
-void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
-	sha2_word32	*d = (sha2_word32*)digest;
-	unsigned int	usedspace;
-
-	/* Sanity check: */
-	assert(context != NULL);
-
-	/* If no digest buffer is passed, we don't bother doing this: */
-	if (digest != (sha2_byte*)0) {
-		usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
-#ifndef WORDS_BIGENDIAN
-		/* Convert FROM host byte order */
-		REVERSE64(context->bitcount,context->bitcount);
-#endif
-		if (usedspace > 0) {
-			/* Begin padding with a 1 bit: */
-			context->buffer[usedspace++] = 0x80;
-
-			if (usedspace <= SHA256_SHORT_BLOCK_LENGTH) {
-				/* Set-up for the last transform: */
-				MEMSET_BZERO(&context->buffer[usedspace], SHA256_SHORT_BLOCK_LENGTH - usedspace);
-			} else {
-				if (usedspace < SHA256_BLOCK_LENGTH) {
-					MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace);
-				}
-				/* Do second-to-last transform: */
-				SHA256_Transform(context, (sha2_word32*)context->buffer);
-
-				/* And set-up for the last transform: */
-				MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
-			}
-		} else {
-			/* Set-up for the last transform: */
-			MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
-
-			/* Begin padding with a 1 bit: */
-			*context->buffer = 0x80;
-		}
-		/* Set the bit count: */
-		*(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
-
-		/* Final transform: */
-		SHA256_Transform(context, (sha2_word32*)context->buffer);
-
-#ifndef WORDS_BIGENDIAN
-		{
-			/* Convert TO host byte order */
-			int	j;
-			for (j = 0; j < 8; j++) {
-				REVERSE32(context->state[j],context->state[j]);
-				*d++ = context->state[j];
-			}
-		}
-#else
-		MEMCPY_BCOPY(d, context->state, SHA256_DIGEST_LENGTH);
-#endif
-	}
-
-	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(SHA256_CTX));
-	usedspace = 0;
-}
-
-int SHA256_Equal(SHA256_CTX* pctx1, SHA256_CTX* pctx2) {
-	return pctx1->bitcount == pctx2->bitcount
-		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
-		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
-}
-
-/*** SHA-512: *********************************************************/
-void SHA512_Init(SHA512_CTX* context) {
-	if (context == (SHA512_CTX*)0) {
-		return;
-	}
-	MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
-	MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH);
-	context->bitcount[0] = context->bitcount[1] =  0;
-}
-
-#ifdef SHA2_UNROLL_TRANSFORM
-
-/* Unrolled SHA-512 round macros: */
-#ifndef WORDS_BIGENDIAN
-
-#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
-	REVERSE64(*data++, W512[j]); \
-	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
-             K512[j] + W512[j]; \
-	(d) += T1, \
-	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \
-	j++
-
-
-#else
-
-#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
-	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
-             K512[j] + (W512[j] = *data++); \
-	(d) += T1; \
-	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
-	j++
-
-#endif
-
-#define ROUND512(a,b,c,d,e,f,g,h)	\
-	s0 = W512[(j+1)&0x0f]; \
-	s0 = sigma0_512(s0); \
-	s1 = W512[(j+14)&0x0f]; \
-	s1 = sigma1_512(s1); \
-	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \
-             (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \
-	(d) += T1; \
-	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
-	j++
-
-void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
-	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
-	sha2_word64	T1, *W512 = (sha2_word64*)context->buffer;
-	int		j;
-
-	/* Initialize registers with the prev. intermediate value */
-	a = context->state[0];
-	b = context->state[1];
-	c = context->state[2];
-	d = context->state[3];
-	e = context->state[4];
-	f = context->state[5];
-	g = context->state[6];
-	h = context->state[7];
-
-	j = 0;
-	do {
-		ROUND512_0_TO_15(a,b,c,d,e,f,g,h);
-		ROUND512_0_TO_15(h,a,b,c,d,e,f,g);
-		ROUND512_0_TO_15(g,h,a,b,c,d,e,f);
-		ROUND512_0_TO_15(f,g,h,a,b,c,d,e);
-		ROUND512_0_TO_15(e,f,g,h,a,b,c,d);
-		ROUND512_0_TO_15(d,e,f,g,h,a,b,c);
-		ROUND512_0_TO_15(c,d,e,f,g,h,a,b);
-		ROUND512_0_TO_15(b,c,d,e,f,g,h,a);
-	} while (j < 16);
-
-	/* Now for the remaining rounds up to 79: */
-	do {
-		ROUND512(a,b,c,d,e,f,g,h);
-		ROUND512(h,a,b,c,d,e,f,g);
-		ROUND512(g,h,a,b,c,d,e,f);
-		ROUND512(f,g,h,a,b,c,d,e);
-		ROUND512(e,f,g,h,a,b,c,d);
-		ROUND512(d,e,f,g,h,a,b,c);
-		ROUND512(c,d,e,f,g,h,a,b);
-		ROUND512(b,c,d,e,f,g,h,a);
-	} while (j < 80);
-
-	/* Compute the current intermediate hash value */
-	context->state[0] += a;
-	context->state[1] += b;
-	context->state[2] += c;
-	context->state[3] += d;
-	context->state[4] += e;
-	context->state[5] += f;
-	context->state[6] += g;
-	context->state[7] += h;
-
-	/* Clean up */
-	a = b = c = d = e = f = g = h = T1 = 0;
-}
-
-#else /* SHA2_UNROLL_TRANSFORM */
-
-void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
-	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
-	sha2_word64	T1, T2, *W512 = (sha2_word64*)context->buffer;
-	int		j;
-
-	/* Initialize registers with the prev. intermediate value */
-	a = context->state[0];
-	b = context->state[1];
-	c = context->state[2];
-	d = context->state[3];
-	e = context->state[4];
-	f = context->state[5];
-	g = context->state[6];
-	h = context->state[7];
-
-	j = 0;
-	do {
-#ifndef WORDS_BIGENDIAN
-		/* Convert TO host byte order */
-		REVERSE64(*data++, W512[j]);
-		/* Apply the SHA-512 compression function to update a..h */
-		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
-#else
-		/* Apply the SHA-512 compression function to update a..h with copy */
-		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
-#endif
-		T2 = Sigma0_512(a) + Maj(a, b, c);
-		h = g;
-		g = f;
-		f = e;
-		e = d + T1;
-		d = c;
-		c = b;
-		b = a;
-		a = T1 + T2;
-
-		j++;
-	} while (j < 16);
-
-	do {
-		/* Part of the message block expansion: */
-		s0 = W512[(j+1)&0x0f];
-		s0 = sigma0_512(s0);
-		s1 = W512[(j+14)&0x0f];
-		s1 =  sigma1_512(s1);
-
-		/* Apply the SHA-512 compression function to update a..h */
-		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] +
-		     (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0);
-		T2 = Sigma0_512(a) + Maj(a, b, c);
-		h = g;
-		g = f;
-		f = e;
-		e = d + T1;
-		d = c;
-		c = b;
-		b = a;
-		a = T1 + T2;
-
-		j++;
-	} while (j < 80);
-
-	/* Compute the current intermediate hash value */
-	context->state[0] += a;
-	context->state[1] += b;
-	context->state[2] += c;
-	context->state[3] += d;
-	context->state[4] += e;
-	context->state[5] += f;
-	context->state[6] += g;
-	context->state[7] += h;
-
-	/* Clean up */
-	a = b = c = d = e = f = g = h = T1 = T2 = 0;
-}
-
-#endif /* SHA2_UNROLL_TRANSFORM */
-
-void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
-	unsigned int	freespace, usedspace;
-
-	if (len == 0) {
-		/* Calling with no data is valid - we do nothing */
-		return;
-	}
-
-	/* Sanity check: */
-	assert(context != NULL && data != NULL);
-
-	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
-	if (usedspace > 0) {
-		/* Calculate how much free space is available in the buffer */
-		freespace = SHA512_BLOCK_LENGTH - usedspace;
-
-		if (len >= freespace) {
-			/* Fill the buffer completely and process it */
-			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
-			ADDINC128(context->bitcount, freespace << 3);
-			len -= freespace;
-			data += freespace;
-			SHA512_Transform(context, (const sha2_word64*)context->buffer);
-		} else {
-			/* The buffer is not yet full */
-			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
-			ADDINC128(context->bitcount, len << 3);
-			/* Clean up: */
-			usedspace = freespace = 0;
-			return;
-		}
-	}
-	while (len >= SHA512_BLOCK_LENGTH) {
-		/* Process as many complete blocks as we can */
-		SHA512_Transform(context, (const sha2_word64*)data);
-		ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
-		len -= SHA512_BLOCK_LENGTH;
-		data += SHA512_BLOCK_LENGTH;
-	}
-	if (len > 0) {
-		/* There's left-overs, so save 'em */
-		MEMCPY_BCOPY(context->buffer, data, len);
-		ADDINC128(context->bitcount, len << 3);
-	}
-	/* Clean up: */
-	usedspace = freespace = 0;
-}
-
-void SHA512_Last(SHA512_CTX* context) {
-	unsigned int	usedspace;
-
-	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
-#ifndef WORDS_BIGENDIAN
-	/* Convert FROM host byte order */
-	REVERSE64(context->bitcount[0],context->bitcount[0]);
-	REVERSE64(context->bitcount[1],context->bitcount[1]);
-#endif
-	if (usedspace > 0) {
-		/* Begin padding with a 1 bit: */
-		context->buffer[usedspace++] = 0x80;
-
-		if (usedspace <= SHA512_SHORT_BLOCK_LENGTH) {
-			/* Set-up for the last transform: */
-			MEMSET_BZERO(&context->buffer[usedspace], SHA512_SHORT_BLOCK_LENGTH - usedspace);
-		} else {
-			if (usedspace < SHA512_BLOCK_LENGTH) {
-				MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
-			}
-			/* Do second-to-last transform: */
-			SHA512_Transform(context, (const sha2_word64*)context->buffer);
-
-			/* And set-up for the last transform: */
-			MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
-		}
-	} else {
-		/* Prepare for final transform: */
-		MEMSET_BZERO(context->buffer, SHA512_SHORT_BLOCK_LENGTH);
-
-		/* Begin padding with a 1 bit: */
-		*context->buffer = 0x80;
-	}
-	/* Store the length of input data (in bits): */
-	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
-	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
-
-	/* Final transform: */
-	SHA512_Transform(context, (const sha2_word64*)context->buffer);
-}
-
-void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
-	sha2_word64	*d = (sha2_word64*)digest;
-
-	/* Sanity check: */
-	assert(context != NULL);
-
-	/* If no digest buffer is passed, we don't bother doing this: */
-	if (digest != (sha2_byte*)0) {
-		SHA512_Last(context);
-
-		/* Save the hash data for output: */
-#ifndef WORDS_BIGENDIAN
-		{
-			/* Convert TO host byte order */
-			int	j;
-			for (j = 0; j < 8; j++) {
-				REVERSE64(context->state[j],context->state[j]);
-				*d++ = context->state[j];
-			}
-		}
-#else
-		MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH);
-#endif
-	}
-
-	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(SHA512_CTX));
-}
-
-int SHA512_Equal(SHA512_CTX* pctx1, SHA512_CTX* pctx2) {
-	return memcmp(pctx1->bitcount, pctx2->bitcount, sizeof(pctx1->bitcount)) == 0
-		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
-		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
-}
-
-/*** SHA-384: *********************************************************/
-void SHA384_Init(SHA384_CTX* context) {
-	if (context == (SHA384_CTX*)0) {
-		return;
-	}
-	MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH);
-	MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH);
-	context->bitcount[0] = context->bitcount[1] = 0;
-}
-
-void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
-	SHA512_Update((SHA512_CTX*)context, data, len);
-}
-
-void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
-	sha2_word64	*d = (sha2_word64*)digest;
-
-	/* Sanity check: */
-	assert(context != NULL);
-
-	/* If no digest buffer is passed, we don't bother doing this: */
-	if (digest != (sha2_byte*)0) {
-		SHA512_Last((SHA512_CTX*)context);
-
-		/* Save the hash data for output: */
-#ifndef WORDS_BIGENDIAN
-		{
-			/* Convert TO host byte order */
-			int	j;
-			for (j = 0; j < 6; j++) {
-				REVERSE64(context->state[j],context->state[j]);
-				*d++ = context->state[j];
-			}
-		}
-#else
-		MEMCPY_BCOPY(d, context->state, SHA384_DIGEST_LENGTH);
-#endif
-	}
-
-	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(SHA384_CTX));
-}
-
-int SHA384_Equal(SHA384_CTX* pctx1, SHA384_CTX* pctx2) {
-	return memcmp(pctx1->bitcount, pctx2->bitcount, sizeof(pctx1->bitcount)) == 0
-		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
-		&& memcmp(pctx1->buffer, pctx2->buffer, sizeof(pctx1->buffer)) == 0;
-}
diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h
deleted file mode 100644
index 4689ad93ce..0000000000
--- a/ext/digest/sha2/sha2.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * sha2.h
- *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me@aarongifford.com>
- *
- * Copyright 2000 Aaron D. Gifford.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-/* $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $ */
-/* $Id$ */
-
-#ifndef __SHA2_H__
-#define __SHA2_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "defs.h"
-
-
-/*** SHA-256/384/512 Various Length Definitions ***********************/
-#define SHA256_BLOCK_LENGTH		64
-#define SHA256_DIGEST_LENGTH		32
-#define SHA256_DIGEST_STRING_LENGTH	(SHA256_DIGEST_LENGTH * 2 + 1)
-#define SHA384_BLOCK_LENGTH		128
-#define SHA384_DIGEST_LENGTH		48
-#define SHA384_DIGEST_STRING_LENGTH	(SHA384_DIGEST_LENGTH * 2 + 1)
-#define SHA512_BLOCK_LENGTH		128
-#define SHA512_DIGEST_LENGTH		64
-#define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
-
-
-/*** SHA-256/384/512 Context Structures *******************************/
-
-typedef struct _SHA256_CTX {
-	uint32_t	state[8];
-	uint64_t	bitcount;
-	uint8_t	buffer[SHA256_BLOCK_LENGTH];
-} SHA256_CTX;
-typedef struct _SHA512_CTX {
-	uint64_t	state[8];
-	uint64_t	bitcount[2];
-	uint8_t	buffer[SHA512_BLOCK_LENGTH];
-} SHA512_CTX;
-
-typedef SHA512_CTX SHA384_CTX;
-
-
-#ifdef RUBY
-#define SHA256_Init		rb_Digest_SHA256_Init
-#define SHA256_Update		rb_Digest_SHA256_Update
-#define SHA256_Final		rb_Digest_SHA256_Final
-#define SHA256_End		rb_Digest_SHA256_End
-#define SHA256_Data		rb_Digest_SHA256_Data
-#define SHA256_File		rb_Digest_SHA256_File
-#define SHA256_Equal		rb_Digest_SHA256_Equal
-
-#define SHA384_Init		rb_Digest_SHA384_Init
-#define SHA384_Update		rb_Digest_SHA384_Update
-#define SHA384_Final		rb_Digest_SHA384_Final
-#define SHA384_End		rb_Digest_SHA384_End
-#define SHA384_Data		rb_Digest_SHA384_Data
-#define SHA384_File		rb_Digest_SHA384_File
-#define SHA384_Equal		rb_Digest_SHA384_Equal
-
-#define SHA512_Init		rb_Digest_SHA512_Init
-#define SHA512_Update		rb_Digest_SHA512_Update
-#define SHA512_Final		rb_Digest_SHA512_Final
-#define SHA512_End		rb_Digest_SHA512_End
-#define SHA512_Data		rb_Digest_SHA512_Data
-#define SHA512_File		rb_Digest_SHA512_File
-#define SHA512_Equal		rb_Digest_SHA512_Equal
-#endif
-
-/*** SHA-256/384/512 Function Prototypes ******************************/
-void SHA256_Init _((SHA256_CTX *));
-void SHA256_Update _((SHA256_CTX*, const uint8_t*, size_t));
-void SHA256_Final _((uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*));
-char* SHA256_End _((SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]));
-char* SHA256_Data _((const uint8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]));
-char *SHA256_File _((char *, char *));
-int SHA256_Equal _((SHA256_CTX*, SHA256_CTX*));
-
-void SHA384_Init _((SHA384_CTX*));
-void SHA384_Update _((SHA384_CTX*, const uint8_t*, size_t));
-void SHA384_Final _((uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*));
-char* SHA384_End _((SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]));
-char* SHA384_Data _((const uint8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]));
-char *SHA384_File _((char *, char *));
-int SHA384_Equal _((SHA384_CTX*, SHA384_CTX*));
-
-void SHA512_Init _((SHA512_CTX*));
-void SHA512_Update _((SHA512_CTX*, const uint8_t*, size_t));
-void SHA512_Final _((uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*));
-char* SHA512_End _((SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]));
-char* SHA512_Data _((const uint8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]));
-char *SHA512_File _((char *, char *));
-int SHA512_Equal _((SHA512_CTX*, SHA512_CTX*));
-
-#ifdef	__cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __SHA2_H__ */
-
diff --git a/ext/digest/sha2/sha2hl.c b/ext/digest/sha2/sha2hl.c
deleted file mode 100644
index 03fde538c3..0000000000
--- a/ext/digest/sha2/sha2hl.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* $NetBSD: sha2hl.c,v 1.1 2001/03/12 09:08:40 agc Exp $	 */
-/* $RoughId: sha2hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id$ */
-
-/*
- * sha2hl.c
- * This code includes some functions taken from sha2.c, hence the
- * following licence reproduction.
- *
- * This code is not a verbatim copy, since some routines have been added,
- * and some bugs have been fixed.
- *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me@aarongifford.com>
- *
- * Copyright 2000 Aaron D. Gifford.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include "sha2.h"
-
-#ifndef lint
-/* __RCSID("$NetBSD: sha2hl.c,v 1.1 2001/03/12 09:08:40 agc Exp $"); */
-#endif				/* not lint */
-
-/* #include "namespace.h" */
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#if defined(HAVE_UNISTD_H)
-# include <unistd.h>
-#endif
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond)	assert(cond)
-#endif
-
-/*
- * Constant used by SHA256/384/512_End() functions for converting the
- * digest to a readable hexadecimal character string:
- */
-static const char sha2_hex_digits[] = "0123456789abcdef";
-
-char           *
-SHA256_File(char *filename, char *buf)
-{
-	uint8_t         buffer[BUFSIZ * 20];
-	SHA256_CTX      ctx;
-	int             fd, num, oerrno;
-
-	_DIAGASSERT(filename != NULL);
-	/* XXX: buf may be NULL ? */
-
-	SHA256_Init(&ctx);
-
-	if ((fd = open(filename, O_RDONLY)) < 0)
-		return (0);
-
-	while ((num = read(fd, buffer, sizeof(buffer))) > 0)
-		SHA256_Update(&ctx, buffer, (size_t) num);
-
-	oerrno = errno;
-	close(fd);
-	errno = oerrno;
-	return (num < 0 ? 0 : SHA256_End(&ctx, buf));
-}
-
-
-char           *
-SHA256_End(SHA256_CTX *ctx, char buffer[])
-{
-	uint8_t         digest[SHA256_DIGEST_LENGTH], *d = digest;
-	uint8_t	       *ret;
-	int             i;
-
-	/* Sanity check: */
-	assert(ctx != NULL);
-
-	if ((ret = buffer) != NULL) {
-		SHA256_Final(digest, ctx);
-
-		for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
-			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
-			*buffer++ = sha2_hex_digits[*d & 0x0f];
-			d++;
-		}
-		*buffer = (char) 0;
-	} else {
-		(void) memset(ctx, 0, sizeof(SHA256_CTX));
-	}
-	(void) memset(digest, 0, SHA256_DIGEST_LENGTH);
-	return ret;
-}
-
-char           *
-SHA256_Data(const uint8_t * data, size_t len, char *digest)
-{
-	SHA256_CTX      ctx;
-
-	SHA256_Init(&ctx);
-	SHA256_Update(&ctx, data, len);
-	return SHA256_End(&ctx, digest);
-}
-
-char           *
-SHA384_File(char *filename, char *buf)
-{
-	SHA384_CTX      ctx;
-	uint8_t         buffer[BUFSIZ * 20];
-	int             fd, num, oerrno;
-
-	_DIAGASSERT(filename != NULL);
-	/* XXX: buf may be NULL ? */
-
-	SHA384_Init(&ctx);
-
-	if ((fd = open(filename, O_RDONLY)) < 0)
-		return (0);
-
-	while ((num = read(fd, buffer, sizeof(buffer))) > 0)
-		SHA384_Update(&ctx, buffer, (size_t) num);
-
-	oerrno = errno;
-	close(fd);
-	errno = oerrno;
-	return (num < 0 ? 0 : SHA384_End(&ctx, buf));
-}
-
-char           *
-SHA384_End(SHA384_CTX * ctx, char buffer[])
-{
-	uint8_t         digest[SHA384_DIGEST_LENGTH], *d = digest;
-	uint8_t	       *ret;
-	int             i;
-
-	/* Sanity check: */
-	assert(ctx != NULL);
-
-	if ((ret = buffer) != NULL) {
-		SHA384_Final(digest, ctx);
-
-		for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
-			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
-			*buffer++ = sha2_hex_digits[*d & 0x0f];
-			d++;
-		}
-		*buffer = (char) 0;
-	} else {
-		(void) memset(ctx, 0, sizeof(SHA384_CTX));
-	}
-	(void) memset(digest, 0, SHA384_DIGEST_LENGTH);
-	return ret;
-}
-
-char           *
-SHA384_Data(const uint8_t * data, size_t len, char *digest)
-{
-	SHA384_CTX      ctx;
-
-	SHA384_Init(&ctx);
-	SHA384_Update(&ctx, data, len);
-	return SHA384_End(&ctx, digest);
-}
-
-char           *
-SHA512_File(char *filename, char *buf)
-{
-	SHA512_CTX      ctx;
-	uint8_t         buffer[BUFSIZ * 20];
-	int             fd, num, oerrno;
-
-	_DIAGASSERT(filename != NULL);
-	/* XXX: buf may be NULL ? */
-
-	SHA512_Init(&ctx);
-
-	if ((fd = open(filename, O_RDONLY)) < 0)
-		return (0);
-
-	while ((num = read(fd, buffer, sizeof(buffer))) > 0)
-		SHA512_Update(&ctx, buffer, (size_t) num);
-
-	oerrno = errno;
-	close(fd);
-	errno = oerrno;
-	return (num < 0 ? 0 : SHA512_End(&ctx, buf));
-}
-
-char           *
-SHA512_End(SHA512_CTX * ctx, char buffer[])
-{
-	uint8_t         digest[SHA512_DIGEST_LENGTH], *d = digest;
-	uint8_t	       *ret;
-	int             i;
-
-	/* Sanity check: */
-	assert(ctx != NULL);
-
-	if ((ret = buffer) != NULL) {
-		SHA512_Final(digest, ctx);
-
-		for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
-			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
-			*buffer++ = sha2_hex_digits[*d & 0x0f];
-			d++;
-		}
-		*buffer = (char) 0;
-	} else {
-		(void) memset(ctx, 0, sizeof(SHA512_CTX));
-	}
-	(void) memset(digest, 0, SHA512_DIGEST_LENGTH);
-	return ret;
-}
-
-char           *
-SHA512_Data(const uint8_t * data, size_t len, char *digest)
-{
-	SHA512_CTX      ctx;
-
-	SHA512_Init(&ctx);
-	SHA512_Update(&ctx, data, len);
-	return SHA512_End(&ctx, digest);
-}
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
deleted file mode 100644
index 4b14031811..0000000000
--- a/ext/digest/sha2/sha2init.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id$ */
-
-#include "digest.h"
-#include "sha2.h"
-
-#define FOREACH_BITLEN(func)	func(256) func(384) func(512)
-
-#define DEFINE_ALGO_METADATA(bitlen) \
-static algo_t sha##bitlen = { \
-    SHA##bitlen##_DIGEST_LENGTH, \
-    sizeof(SHA##bitlen##_CTX), \
-    (hash_init_func_t)SHA##bitlen##_Init, \
-    (hash_update_func_t)SHA##bitlen##_Update, \
-    (hash_end_func_t)SHA##bitlen##_End, \
-    (hash_final_func_t)SHA##bitlen##_Final, \
-    (hash_equal_func_t)SHA##bitlen##_Equal, \
-};
-
-FOREACH_BITLEN(DEFINE_ALGO_METADATA)
-
-void
-Init_sha2()
-{
-    VALUE mDigest, cDigest_Base;
-    ID id_metadata;
-
-#define DECLARE_ALGO_CLASS(bitlen) \
-    VALUE cDigest_SHA##bitlen;
-
-    FOREACH_BITLEN(DECLARE_ALGO_CLASS)
-
-    rb_require("digest.so");
-
-    id_metadata = rb_intern("metadata");
-
-    mDigest = rb_path2class("Digest");
-    cDigest_Base = rb_path2class("Digest::Base");
-
-#define DEFINE_ALGO_CLASS(bitlen) \
-    cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
-\
-    rb_cvar_set(cDigest_SHA##bitlen, id_metadata, \
-		Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen), Qtrue);
-
-    FOREACH_BITLEN(DEFINE_ALGO_CLASS)
-}
diff --git a/ext/digest/test.sh b/ext/digest/test.sh
deleted file mode 100644
index 6fb07d2177..0000000000
--- a/ext/digest/test.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $RoughId: test.sh,v 1.5 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-RUBY=${RUBY:=ruby}
-MAKE=${MAKE:=make}
-CFLAGS=${CFLAGS:=-Wall}
-
-${RUBY} extconf.rb --with-cflags="${CFLAGS}"
-${MAKE} clean
-${MAKE}
-
-mkdir -p lib/digest
-
-for algo in md5 rmd160 sha1 sha2; do
-    args=--with-cflags="${CFLAGS}"
-
-    if [ $WITH_BUNDLED_ENGINES ]; then
-	args="$args --with-bundled-$algo"
-    fi
-
-    (cd $algo &&
-	${RUBY} extconf.rb $args;
-	${MAKE} clean;
-	${MAKE})
-    ln -sf ../../$algo/$algo.so lib/digest/
-done
-
-${RUBY} -I. -I./lib test.rb
-
-rm lib/digest/*.so
-rmdir lib/digest
diff --git a/ext/dl/.cvsignore b/ext/dl/.cvsignore
deleted file mode 100644
index 6d884b6cec..0000000000
--- a/ext/dl/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-mkmf.log
-dlconfig.h
-dlconfig.rb
-*.func
-*.o
-*~
-*.def
diff --git a/ext/dl/MANIFEST b/ext/dl/MANIFEST
deleted file mode 100644
index d44344421d..0000000000
--- a/ext/dl/MANIFEST
+++ /dev/null
@@ -1,31 +0,0 @@
-MANIFEST
-depend
-dl.c
-dl.def
-dl.h
-doc/dl.txt
-extconf.rb
-h2rb
-handle.c
-install.rb
-lib/dl/import.rb
-lib/dl/struct.rb
-lib/dl/types.rb
-lib/dl/win32.rb
-mkcall.rb
-mkcallback.rb
-mkcbtable.rb
-ptr.c
-sample/c++sample.C
-sample/c++sample.rb
-sample/drives.rb
-sample/getch.rb
-sample/libc.rb
-sample/msgbox.rb
-sample/msgbox2.rb
-sample/stream.rb
-sym.c
-test/libtest.def
-test/test.c
-test/test.rb
-type.rb
diff --git a/ext/dl/depend b/ext/dl/depend
deleted file mode 100644
index fba3df7a3d..0000000000
--- a/ext/dl/depend
+++ /dev/null
@@ -1,46 +0,0 @@
-LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS)
-
-libtest.so: test/libtest.so
-
-test/libtest.so: test/test.o $(srcdir)/test/libtest.def
-	$(RUBY) -rftools -e 'ARGV.each do|d|File.mkpath(File.dirname(d))end' $@
-	$(LDSHARED_TEST:dl.def=test/libtest.def)
-
-test/test.o: $(srcdir)/test/test.c
-	@$(RUBY) -rftools -e 'File.mkpath(*ARGV)' test
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/test/test.c -o $@
-
-test:: dl.so libtest.so force
-	$(RUBY) -I. -I$(srcdir)/lib $(srcdir)/test/test.rb
-
-force:
-
-.PHONY: force test
-
-allclean: distclean
-	@rm -f $(CLEANFILES) $(DISTCLEANFILES)
-
-$(OBJS): ./dlconfig.h
-
-sym.o: dl.h call.func
-
-dl.o: dl.h callback.func cbtable.func
-
-ptr.o: dl.h
-
-handle.o: dl.h
-
-call.func: $(srcdir)/mkcall.rb ./dlconfig.rb
-	@echo "Generating call.func"
-	@$(RUBY) $(srcdir)/mkcall.rb > $@
-
-callback.func: $(srcdir)/mkcallback.rb ./dlconfig.rb
-	@echo "Generating callback.func"
-	@$(RUBY) $(srcdir)/mkcallback.rb > $@
-
-cbtable.func: $(srcdir)/mkcbtable.rb ./dlconfig.rb
-	@echo "Generating cbtable.func"
-	@$(RUBY) $(srcdir)/mkcbtable.rb > $@
-
-debug:
-	$(MAKE) CPPFLAGS="$(CPPFLAGS) -DDEBUG"
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
deleted file mode 100644
index 22abb754d2..0000000000
--- a/ext/dl/dl.c
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
- * $Id$
- */
-
-#include <ruby.h>
-#include <rubyio.h>
-#include <ctype.h>
-#include "dl.h"
-
-VALUE rb_mDL;
-VALUE rb_eDLError;
-VALUE rb_eDLTypeError;
-
-static VALUE DLFuncTable;
-static void *rb_dl_callback_table[CALLBACK_TYPES][MAX_CALLBACK];
-static ID id_call;
-
-static int
-rb_dl_scan_callback_args(long stack[], const char *proto,
-			 int *argc, VALUE argv[])
-{
-  int i;
-  long *sp;
-  VALUE val;
-
-  sp = stack;
-  for (i=1; proto[i]; i++) {
-    switch (proto[i]) {
-    case 'C':
-      {
-	char v;
-	v = (char)(*sp);
-	sp++;
-	val = INT2NUM(v);
-      }
-      break;
-    case 'H':
-      {
-	short v;
-	v = (short)(*sp);
-	sp++;
-	val = INT2NUM(v);
-      }
-      break;
-    case 'I':
-      {
-	int v;
-	v = (int)(*sp);
-	sp++;
-	val = INT2NUM(v);
-      }
-      break;
-    case 'L':
-      {
-	long v;
-	v = (long)(*sp);
-	sp++;
-	val = INT2NUM(v);
-      }
-      break;
-    case 'F':
-      {
-	float v;
-	memcpy(&v, sp, sizeof(float));
-	sp += sizeof(float)/sizeof(long);
-	val = rb_float_new(v);
-      }
-      break;
-    case 'D':
-      {
-	double v;
-	memcpy(&v, sp, sizeof(double));
-	sp += sizeof(double)/sizeof(long);
-	val = rb_float_new(v);
-      }
-      break;
-    case 'P':
-      {
-	void *v;
-	memcpy(&v, sp, sizeof(void*));
-	sp++;
-	val = rb_dlptr_new(v, 0, 0);
-      }
-      break;
-    case 'S':
-      {
-	char *v;
-	memcpy(&v, sp, sizeof(void*));
-	sp++;
-	val = rb_tainted_str_new2(v);
-      }
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unsupported type `%c'", proto[i]);
-      break;
-    }
-    argv[i-1] = val;
-  }
-  *argc = (i - 1);
-
-  return (*argc);
-}
-
-#include "callback.func"
-
-static void
-init_dl_func_table(){
-#include "cbtable.func"
-}
-
-void *
-dlmalloc(size_t size)
-{
-  DEBUG_CODE2({
-    void *ptr;
-
-    printf("dlmalloc(%d)",size);
-    ptr = xmalloc(size);
-    printf(":0x%x\n",ptr);
-    return ptr;
-  },
-  {
-    return xmalloc(size);
-  });
-}
-
-void *
-dlrealloc(void *ptr, size_t size)
-{
-  DEBUG_CODE({
-    printf("dlrealloc(0x%x,%d)\n",ptr,size);
-  });
-  return xrealloc(ptr, size);
-}
-
-void
-dlfree(void *ptr)
-{
-  DEBUG_CODE({
-    printf("dlfree(0x%x)\n",ptr);
-  });
-  xfree(ptr);
-}
-
-char*
-dlstrdup(const char *str)
-{
-  char *newstr;
-
-  newstr = (char*)dlmalloc(strlen(str));
-  strcpy(newstr,str);
-
-  return newstr;
-}
-
-size_t
-dlsizeof(const char *cstr)
-{
-  size_t size;
-  int i, len, n, dlen;
-  char *d;
-
-  len  = strlen(cstr);
-  size = 0;
-  for (i=0; i<len; i++) {
-    n = 1;
-    if (isdigit(cstr[i+1])) {
-      dlen = 1;
-      while (isdigit(cstr[i+dlen])) { dlen ++; };
-      dlen --;
-      d = ALLOCA_N(char, dlen + 1);
-      strncpy(d, cstr + i + 1, dlen);
-      d[dlen] = '\0';
-      n = atoi(d);
-    }
-    else{
-      dlen = 0;
-    }
-
-    switch (cstr[i]) {
-    case 'I':
-      DLALIGN(0,size,INT_ALIGN);
-    case 'i':
-      size += sizeof(int) * n;
-      break;
-    case 'L':
-      DLALIGN(0,size,LONG_ALIGN);
-    case 'l':
-      size += sizeof(long) * n;
-      break;
-    case 'F':
-      DLALIGN(0,size,FLOAT_ALIGN);
-    case 'f':
-      size += sizeof(float) * n;
-      break;
-    case 'D':
-      DLALIGN(0,size,DOUBLE_ALIGN);
-    case 'd':
-      size += sizeof(double) * n;
-      break;
-    case 'C':
-    case 'c':
-      size += sizeof(char) * n;
-      break;
-    case 'H':
-      DLALIGN(0,size,SHORT_ALIGN);
-    case 'h':
-      size += sizeof(short) * n;
-      break;
-    case 'P':
-    case 'S':
-      DLALIGN(0,size,VOIDP_ALIGN);
-    case 'p':
-    case 's':
-      size += sizeof(void*) * n;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type '%c'", cstr[i]);
-      break;
-    }
-    i += dlen;
-  }
-
-  return size;
-}
-
-static float *
-c_farray(VALUE v, long *size)
-{
-  int i, len;
-  float *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(float) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FLOAT:
-      ary[i] = (float)(RFLOAT(e)->value);
-      break;
-    case T_NIL:
-      ary[i] = 0.0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static double *
-c_darray(VALUE v, long *size)
-{
-  int i, len;
-  double *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(double) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FLOAT:
-      ary[i] = (double)(RFLOAT(e)->value);
-      break;
-    case T_NIL:
-      ary[i] = 0.0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static long *
-c_larray(VALUE v, long *size)
-{
-  int i, len;
-  long *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(long) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-      ary[i] = (long)(NUM2INT(e));
-      break;
-    case T_NIL:
-      ary[i] = 0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static int *
-c_iarray(VALUE v, long *size)
-{
-  int i, len;
-  int *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(int) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-      ary[i] = (int)(NUM2INT(e));
-      break;
-    case T_NIL:
-      ary[i] = 0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static short *
-c_harray(VALUE v, long *size)
-{
-  int i, len;
-  short *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(short) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-      ary[i] = (short)(NUM2INT(e));
-      break;
-    case T_NIL:
-      ary[i] = 0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static char *
-c_carray(VALUE v, long *size)
-{
-  int i, len;
-  char *ary;
-  VALUE e;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(char) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-      ary[i] = (char)(NUM2INT(e));
-      break;
-    case T_NIL:
-      ary[i] = 0;
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
-    }
-  }
-
-  return ary;
-}
-
-static void *
-c_parray(VALUE v, long *size)
-{
-  int i, len;
-  void **ary;
-  VALUE e, tmp;
-
-  len = RARRAY(v)->len;
-  *size = sizeof(void*) * len;
-  ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
-    e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
-    default:
-      tmp = rb_check_string_type(e);
-      if (NIL_P(tmp)) {
-	  rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      }
-      e = tmp;
-      /* fall through */
-    case T_STRING:
-      rb_check_safe_str(e);
-      {
-	char *str, *src;
-	src = RSTRING(e)->ptr;
-	str = dlstrdup(src);
-	ary[i] = (void*)str;
-      }
-      break;
-    case T_NIL:
-      ary[i] = NULL;
-      break;
-    case T_DATA:
-      if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
-	struct ptr_data *pdata;
-	Data_Get_Struct(e, struct ptr_data, pdata);
-	ary[i] = (void*)(pdata->ptr);
-      }
-      else{
-	rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      }
-      break;
-    }
-  }
-
-  return ary;
-}
-
-void *
-rb_ary2cary(char t, VALUE v, long *size)
-{
-  int len;
-  VALUE val0;
-
-  val0 = rb_check_array_type(v);
-  if(NIL_P(TYPE(val0))) {
-    rb_raise(rb_eDLTypeError, "an array is expected.");
-  }
-  v = val0;
-
-  len = RARRAY(v)->len;
-  if (len == 0) {
-    return NULL;
-  }
-
-  if (!size) {
-    size = ALLOCA_N(long,1);
-  }
-
-  val0 = rb_ary_entry(v,0);
-  switch (TYPE(val0)) {
-  case T_FIXNUM:
-  case T_BIGNUM:
-    switch (t) {
-    case 'C': case 'c':
-      return (void*)c_carray(v,size);
-    case 'H': case 'h':
-      return (void*)c_harray(v,size);
-    case 'I': case 'i':
-      return (void*)c_iarray(v,size);
-    case 'L': case 'l': case 0:
-      return (void*)c_larray(v,size);
-    default:
-      rb_raise(rb_eDLTypeError, "type mismatch");
-    }
-  case T_STRING:
-    return (void*)c_parray(v,size);
-  case T_FLOAT:
-    switch (t) {
-    case 'F': case 'f':
-      return (void*)c_farray(v,size);
-    case 'D': case 'd': case 0:
-      return (void*)c_darray(v,size);
-    }
-    rb_raise(rb_eDLTypeError, "type mismatch");
-  case T_DATA:
-    if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
-      return (void*)c_parray(v,size);
-    }
-    rb_raise(rb_eDLTypeError, "type mismatch");
-  case T_NIL:
-    return (void*)c_parray(v, size);
-  default:
-    rb_raise(rb_eDLTypeError, "unsupported type");
-  }
-}
-
-VALUE
-rb_str_to_ptr(VALUE self)
-{
-  char *ptr;
-  int  len;
-
-  len = RSTRING(self)->len;
-  ptr = (char*)dlmalloc(len + 1);
-  memcpy(ptr, RSTRING(self)->ptr, len);
-  ptr[len] = '\0';
-  return rb_dlptr_new((void*)ptr,len,dlfree);
-}
-
-VALUE
-rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
-{
-  void *ptr;
-  VALUE t;
-  long size;
-
-  switch (rb_scan_args(argc, argv, "01", &t)) {
-  case 1:
-    ptr = rb_ary2cary(StringValuePtr(t)[0], self, &size);
-    break;
-  case 0:
-    ptr = rb_ary2cary(0, self, &size);
-    break;
-  }
-  return ptr ? rb_dlptr_new(ptr, size, dlfree) : Qnil;
-}
-
-VALUE
-rb_io_to_ptr(VALUE self)
-{
-  OpenFile *fptr;
-  FILE     *fp;
-
-  GetOpenFile(self, fptr);
-  fp = fptr->f;
-
-  return fp ? rb_dlptr_new(fp, sizeof(FILE), 0) : Qnil;
-}
-
-VALUE
-rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
-{
-  rb_secure(4);
-  return rb_class_new_instance(argc, argv, rb_cDLHandle);
-}
-
-VALUE
-rb_dl_malloc(VALUE self, VALUE size)
-{
-  rb_secure(4);
-  return rb_dlptr_malloc(DLNUM2LONG(size), dlfree);
-}
-
-VALUE
-rb_dl_strdup(VALUE self, VALUE str)
-{
-  SafeStringValue(str);
-  return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
-}
-
-static VALUE
-rb_dl_sizeof(VALUE self, VALUE str)
-{
-  return INT2NUM(dlsizeof(StringValuePtr(str)));
-}
-
-static VALUE
-rb_dl_callback(int argc, VALUE argv[], VALUE self)
-{
-  VALUE type, proc;
-  int rettype, entry, i;
-  char fname[127];
-
-  rb_secure(4);
-  proc = Qnil;
-  switch (rb_scan_args(argc, argv, "11", &type, &proc)) {
-  case 1:
-    if (rb_block_given_p()) {
-      proc = rb_block_proc();
-    }
-    else{
-      proc = Qnil;
-    }
-  default:
-    break;
-  }
-
-  StringValue(type);
-  switch (RSTRING(type)->ptr[0]) {
-  case '0':
-    rettype = 0x00;
-    break;
-  case 'C':
-    rettype = 0x01;
-    break;
-  case 'H':
-    rettype = 0x02;
-    break;
-  case 'I':
-    rettype = 0x03;
-    break;
-  case 'L':
-    rettype = 0x04;
-    break;
-  case 'F':
-    rettype = 0x05;
-    break;
-  case 'D':
-    rettype = 0x06;
-    break;
-  case 'P':
-    rettype = 0x07;
-    break;
-  default:
-    rb_raise(rb_eDLTypeError, "unsupported type `%c'", RSTRING(type)->ptr[0]);
-  }
-
-  entry = -1;
-  for (i=0; i < MAX_CALLBACK; i++) {
-    if (rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(rettype), INT2NUM(i))) == Qnil) {
-      entry = i;
-      break;
-    }
-  }
-  if (entry < 0) {
-    rb_raise(rb_eDLError, "too many callbacks are defined.");
-  }
-
-  rb_hash_aset(DLFuncTable,
-	       rb_assoc_new(INT2NUM(rettype),INT2NUM(entry)),
-	       rb_assoc_new(type,proc));
-  sprintf(fname, "rb_dl_callback_func_%d_%d", rettype, entry);
-  return rb_dlsym_new((void (*)())rb_dl_callback_table[rettype][entry],
-		      fname, RSTRING(type)->ptr);
-}
-
-static VALUE
-rb_dl_remove_callback(VALUE mod, VALUE sym)
-{
-  freefunc_t f;
-  int i, j;
-
-  rb_secure(4);
-  f = rb_dlsym2csym(sym);
-  for (i=0; i < CALLBACK_TYPES; i++) {
-    for (j=0; j < MAX_CALLBACK; j++) {
-      if (rb_dl_callback_table[i][j] == f) {
-	rb_hash_aset(DLFuncTable, rb_assoc_new(INT2NUM(i),INT2NUM(j)),Qnil);
-	break;
-      }
-    }
-  }
-  return Qnil;
-}
-
-void
-Init_dl()
-{
-  void Init_dlptr();
-  void Init_dlsym();
-  void Init_dlhandle();
-
-  id_call = rb_intern("call");
-
-  rb_mDL = rb_define_module("DL");
-
-  rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
-  rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
-
-  DLFuncTable = rb_hash_new();
-  init_dl_func_table();
-  rb_define_const(rb_mDL, "FuncTable", DLFuncTable);
-
-  rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
-  rb_define_const(rb_mDL, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
-  rb_define_const(rb_mDL, "RTLD_NOW",    INT2NUM(RTLD_NOW));
-
-  rb_define_const(rb_mDL, "ALIGN_INT",   INT2NUM(ALIGN_INT));
-  rb_define_const(rb_mDL, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
-  rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
-  rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
-  rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
-  rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
-
-  rb_define_const(rb_mDL, "MAX_ARG", INT2NUM(MAX_ARG));
-  rb_define_const(rb_mDL, "DLSTACK", rb_tainted_str_new2(DLSTACK_METHOD));
-
-  rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
-  rb_define_module_function(rb_mDL, "callback", rb_dl_callback, -1);
-  rb_define_module_function(rb_mDL, "define_callback", rb_dl_callback, -1);
-  rb_define_module_function(rb_mDL, "remove_callback", rb_dl_remove_callback, 1);
-  rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
-  rb_define_module_function(rb_mDL, "strdup", rb_dl_strdup, 1);
-  rb_define_module_function(rb_mDL, "sizeof", rb_dl_sizeof, 1);
-
-  Init_dlptr();
-  Init_dlsym();
-  Init_dlhandle();
-
-  rb_define_const(rb_mDL, "FREE", rb_dlsym_new(dlfree, "free", "0P"));
-
-  rb_define_method(rb_cString, "to_ptr", rb_str_to_ptr, 0);
-  rb_define_method(rb_cArray, "to_ptr", rb_ary_to_ptr, -1);
-  rb_define_method(rb_cIO, "to_ptr", rb_io_to_ptr, 0);
-}
diff --git a/ext/dl/dl.def b/ext/dl/dl.def
deleted file mode 100644
index cdab4af90d..0000000000
--- a/ext/dl/dl.def
+++ /dev/null
@@ -1,59 +0,0 @@
-EXPORTS
-Init_dl
-dlfree
-dlmalloc
-dlrealloc
-dlstrdup
-rb_ary_to_ptr
-rb_dl_dlopen
-rb_dl_malloc
-rb_dl_strdup
-rb_eDLError
-rb_eDLTypeError
-rb_io_to_ptr
-rb_mDL
-rb_str_to_ptr
-Init_dlhandle
-rb_cDLHandle
-rb_dlhandle_close
-rb_dlhandle_disable_close
-rb_dlhandle_enable_close
-rb_dlhandle_sym
-Init_dlptr
-rb_cDLPtrData
-rb_dlmem_each
-rb_dlptr2cptr
-rb_dlptr_malloc
-rb_dlptr_aref
-rb_dlptr_aset
-rb_dlptr_cmp
-rb_dlptr_define_data_type
-rb_dlptr_define_struct
-rb_dlptr_define_union
-rb_dlptr_eql
-rb_dlptr_free_get
-rb_dlptr_free_set
-rb_dlptr_get_data_type
-rb_dlptr_inspect
-rb_dlptr_minus
-rb_dlptr_new
-rb_dlptr_new2
-rb_dlptr_null_p
-rb_dlptr_plus
-rb_dlptr_ptr
-rb_dlptr_ref
-rb_dlptr_to_array
-rb_dlptr_to_i
-rb_dlptr_to_s
-rb_dlptr_to_str
-rb_mDLMemorySpace
-Init_dlsym
-rb_cDLSymbol
-rb_dlsym2csym
-rb_dlsym_call
-rb_dlsym_cproto
-rb_dlsym_inspect
-rb_dlsym_name
-rb_dlsym_new
-rb_dlsym_proto
-rb_dlsym_to_ptr
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
deleted file mode 100644
index c390e18bbb..0000000000
--- a/ext/dl/dl.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#ifndef RUBY_DL_H
-#define RUBY_DL_H
-
-#include <ruby.h>
-#include <dlconfig.h>
-
-#if defined(HAVE_DLFCN_H)
-# include <dlfcn.h>
-# /* some stranger systems may not define all of these */
-#ifndef RTLD_LAZY
-#define RTLD_LAZY 0
-#endif
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-#ifndef RTLD_NOW
-#define RTLD_NOW 0
-#endif
-#else
-# if defined(HAVE_WINDOWS_H)
-#   include <windows.h>
-#   define dlclose(ptr) FreeLibrary((HINSTANCE)ptr)
-#   define dlopen(name,flag) ((void*)LoadLibrary(name))
-#   define dlerror()    "unknown error"
-#   define dlsym(handle,name) ((void*)GetProcAddress(handle,name))
-#   define RTLD_LAZY -1
-#   define RTLD_NOW  -1
-#   define RTLD_GLOBAL -1
-# endif
-#endif
-
-#if !defined(StringValue)
-# define StringValue(v) if(TYPE(v) != T_STRING) v = rb_str_to_str(v)
-#endif
-#if !defined(StringValuePtr)
-# define StringValuePtr(v) RSTRING((TYPE(v) == T_STRING) ? (v) : rb_str_to_str(v))->ptr
-#endif
-
-#ifdef DEBUG
-#define DEBUG_CODE(b) {printf("DEBUG:%d\n",__LINE__);b;}
-#define DEBUG_CODE2(b1,b2) {printf("DEBUG:%d\n",__LINE__);b1;}
-#else
-#define DEBUG_CODE(b)
-#define DEBUG_CODE2(b1,b2) b2
-#endif
-
-#define VOID_DLTYPE   0x00
-#define CHAR_DLTYPE   0x01
-#define SHORT_DLTYPE  0x02
-#define INT_DLTYPE    0x03
-#define LONG_DLTYPE   0x04
-#define FLOAT_DLTYPE  0x05
-#define DOUBLE_DLTYPE 0x06
-#define VOIDP_DLTYPE  0x07
-
-#define ARG_TYPE(x,i) (((x) & (0x07 << ((i)*3))) >> ((i)*3))
-#define PUSH_ARG(x,t) do{x <<= 3; x |= t;}while(0)
-#define PUSH_0(x) PUSH_ARG(x,VOID_DLTYPE)
-
-#if SIZEOF_INT == SIZEOF_LONG
-# define PUSH_I(x) PUSH_ARG(x,LONG_DLTYPE)
-# define ANY2I(x)  x.l
-# define DLINT(x)  (long)x
-#else
-# define PUSH_I(x) PUSH_ARG(x,INT_DLTYPE)
-# define ANY2I(x)  x.i
-# define DLINT(x)  (int)x
-#endif
-#define PUSH_L(x) PUSH_ARG(x,LONG_DLTYPE)
-#define ANY2L(x)  x.l
-#define DLLONG(x) (long)x
-
-#if defined(WITH_TYPE_FLOAT)
-# if SIZEOF_FLOAT == SIZEOF_DOUBLE
-#   define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-#   define ANY2F(x)  (x.d)
-#   define DLFLOAT(x) ((double)x)
-# else
-#   define PUSH_F(x) PUSH_ARG(x,FLOAT_DLTYPE)
-#   define ANY2F(x)  (x.f)
-#   define DLFLOAT(x) ((float)x)
-# endif
-#else
-# define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-# define ANY2F(x)  (x.d)
-# define DLFLOAT(x) ((double)x)
-#endif
-#define PUSH_D(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-#define ANY2D(x)  (x.d)
-#define DLDOUBLE(x) ((double)x)
-
-#if SIZEOF_INT == SIZEOF_VOIDP && SIZEOF_INT != SIZEOF_LONG
-# define PUSH_P(x) PUSH_ARG(x,INT_DLTYPE)
-# define ANY2P(x)  (x.i)
-# define DLVOIDP(x) ((int)x)
-#elif SIZEOF_LONG == SIZEOF_VOIDP
-# define PUSH_P(x) PUSH_ARG(x,LONG_DLTYPE)
-# define ANY2P(x)  (x.l)
-# define DLVOIDP(x) ((long)x)
-#else
-# define PUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
-# define ANY2P(x)  (x.p)
-# define DLVOIDP(x) ((void*)p)
-#endif
-
-#if defined(WITH_TYPE_CHAR)
-# define PUSH_C(x) PUSH_ARG(x,CHAR_DLTYPE)
-# define ANY2C(x)  (x.c)
-# define DLCHAR(x) ((char)x)
-#else
-# define PUSH_C(x) PUSH_I(x)
-# define ANY2C(x)  ANY2I(x)
-# define DLCHAR(x) DLINT(x)
-#endif
-
-#if defined(WITH_TYPE_SHORT)
-# define PUSH_H(x) PUSH_ARG(x,SHORT_DLTYPE)
-# define ANY2H(x)  (x.h)
-# define DLSHORT(x) ((short)x)
-#else
-# define PUSH_H(x) PUSH_I(x)
-# define ANY2H(x)  ANY2I(x)
-# define DLSHORT(x) DLINT(x)
-#endif
-
-#define PUSH_S(x) PUSH_P(x)
-#define ANY2S(x) ANY2P(x)
-#define DLSTR(x) DLVOIDP(x)
-
-#define CBPUSH_0(x) PUSH_0(x)
-#define CBPUSH_C(x) PUSH_C(x)
-#define CBPUSH_H(x) PUSH_H(x)
-#define CBPUSH_I(x) PUSH_I(x)
-#define CBPUSH_L(x) PUSH_L(x)
-#define CBPUSH_F(x) PUSH_F(x)
-#define CBPUSH_D(x) PUSH_D(x)
-#if defined(WITH_CBTYPE_VOIDP)
-# define CBPUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
-#else
-# define CBPUSH_P(x) PUSH_P(x)
-#endif
-
-
-#if defined(USE_INLINE_ASM)
-# if defined(__i386__) && defined(__GNUC__)
-#   define DLSTACK
-#   define DLSTACK_METHOD "asm"
-#   define DLSTACK_REVERSE
-#   define DLSTACK_PROTO
-#   define DLSTACK_ARGS
-#   define DLSTACK_START(sym)
-#   define DLSTACK_END(sym)
-#   define DLSTACK_PUSH_C(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_H(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_I(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_L(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_P(x) asm volatile ("pushl %0" :: "g" (x));
-#   define DLSTACK_PUSH_F(x) asm volatile ("flds %0"::"g"(x));\
-                             asm volatile ("subl $4,%esp");\
-                             asm volatile ("fstps (%esp)");
-#   define DLSTACK_PUSH_D(x) asm volatile ("fldl %0"::"g"(x));\
-                             asm volatile ("subl $8,%esp");\
-                             asm volatile ("fstpl (%esp)")
-# else
-# error --with-asm is not supported on this machine
-# endif
-#elif defined(USE_DLSTACK)
-# define DLSTACK
-# define DLSTACK_METHOD "dl"
-# define DLSTACK_PROTO long,long,long,long,long,\
-                       long,long,long,long,long,\
-                       long,long,long,long,long
-# define DLSTACK_ARGS  stack[0],stack[1],stack[2],stack[3],stack[4],\
-                       stack[5],stack[6],stack[7],stack[8],stack[9],\
-                       stack[10],stack[11],stack[12],stack[13],stack[14]
-# define DLSTACK_SIZE  (sizeof(long)*15)
-# define DLSTACK_START(sym)
-# define DLSTACK_END(sym)
-# define DLSTACK_PUSH_C(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_H(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_I(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_L(x)  memcpy(sp,&x,sizeof(long)); sp++;
-# define DLSTACK_PUSH_P(x)  memcpy(sp,&x,sizeof(void*)); sp++;
-# define DLSTACK_PUSH_F(x)  memcpy(sp,&x,sizeof(float)); sp+=sizeof(float)/sizeof(long);
-# define DLSTACK_PUSH_D(x)  memcpy(sp,&x,sizeof(double)); sp+=sizeof(double)/sizeof(long);
-#else
-# define DLSTACK_METHOD "none"
-#endif
-
-extern VALUE rb_mDL;
-extern VALUE rb_mDLMemorySpace;
-extern VALUE rb_cDLHandle;
-extern VALUE rb_cDLSymbol;
-extern VALUE rb_cDLPtrData;
-extern VALUE rb_cDLStructData;
-
-extern VALUE rb_eDLError;
-extern VALUE rb_eDLTypeError;
-
-#if defined(LONG2NUM) && (SIZEOF_LONG == SIZEOF_VOIDP)
-# define DLLONG2NUM(x) LONG2NUM((long)x)
-# define DLNUM2LONG(x) (long)(NUM2LONG(x))
-#else
-# define DLLONG2NUM(x) INT2NUM((long)x)
-# define DLNUM2LONG(x) (long)(NUM2INT(x))
-#endif
-
-typedef struct { char c; void *x; } s_voidp;
-typedef struct { char c; short x; } s_short;
-typedef struct { char c; int x; } s_int;
-typedef struct { char c; long x; } s_long;
-typedef struct { char c; float x; } s_float;
-typedef struct { char c; double x; } s_double;
-
-#define ALIGN_VOIDP  (sizeof(s_voidp) - sizeof(void *))
-#define ALIGN_SHORT  (sizeof(s_short) - sizeof(short))
-#define ALIGN_INT    (sizeof(s_int) - sizeof(int))
-#define ALIGN_LONG   (sizeof(s_long) - sizeof(long))
-#define ALIGN_FLOAT  (sizeof(s_float) - sizeof(float))
-#define ALIGN_DOUBLE (sizeof(s_double) - sizeof(double))
-
-/* for compatibility */
-#define VOIDP_ALIGN  ALIGN_VOIDP
-#define SHORT_ALIGN  ALIGN_SHORT
-#define INT_ALIGN    ALIGN_INT
-#define LONG_ALIGN   ALIGN_LONG
-#define FLOAT_ALIGN  ALIGN_FLOAT
-#define DOUBLE_ALIGN ALIGN_DOUBLE
-
-#define DLALIGN(ptr,offset,align) {\
-  while( (((unsigned long)((char *)ptr + offset)) % align) != 0 ) offset++;\
-}
-
-typedef void (*freefunc_t)(void *);
-#define DLFREEFUNC(func) ((freefunc_t)(func))
-
-typedef union {
-  void*  p;
-  char   c;
-  short  h;
-  int    i;
-  long   l;
-  float  f;
-  double d;
-  char  *s;
-} ANY_TYPE;
-
-struct dl_handle {
-  void *ptr;
-  int  open;
-  int  enable_close;
-};
-
-struct sym_data {
-  void *func;
-  char *name;
-  char *type;
-  int  len;
-};
-
-enum DLPTR_CTYPE {
-  DLPTR_CTYPE_UNKNOWN,
-  DLPTR_CTYPE_STRUCT,
-  DLPTR_CTYPE_UNION
-};
-
-struct ptr_data {
-  void *ptr;       /* a pointer to the data */
-  freefunc_t free; /* free() */
-  char *stype;      /* array of type specifiers */
-  int  *ssize;      /* size[i] = sizeof(type[i]) > 0 */
-  int  slen;   /* the number of type specifiers */
-  ID   *ids;
-  int  ids_num;
-  int  ctype; /* DLPTR_CTYPE_UNKNOWN, DLPTR_CTYPE_STRUCT, DLPTR_CTYPE_UNION */
-  long size;
-};
-
-#define RDLPTR(obj)  ((struct ptr_data *)(DATA_PTR(obj)))
-#define RDLSYM(obj)  ((struct sym_data *)(DATA_PTR(obj)))
-
-void dlfree(void*);
-void *dlmalloc(size_t);
-void *dlrealloc(void*,size_t);
-char *dlstrdup(const char *);
-size_t dlsizeof(const char *);
-
-void *rb_ary2cary(char t, VALUE ary, long *size);
-
-/*
-void rb_dlmem_delete(void *ptr);
-void rb_dlmem_aset(void *ptr, VALUE obj);
-VALUE rb_dlmem_aref(void *ptr);
-*/
-
-void dlptr_free(struct ptr_data *data);
-void dlptr_init(VALUE val);
-
-VALUE rb_dlptr_new(void *ptr, long size, freefunc_t func);
-VALUE rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func);
-VALUE rb_dlptr_malloc(long size, freefunc_t func);
-void *rb_dlptr2cptr(VALUE val);
-
-VALUE rb_dlsym_new(void (*func)(), const char *name, const char *type);
-freefunc_t rb_dlsym2csym(VALUE val);
-
-
-#endif /* RUBY_DL_H */
diff --git a/ext/dl/doc/dl.txt b/ext/dl/doc/dl.txt
deleted file mode 100644
index 893bd21d79..0000000000
--- a/ext/dl/doc/dl.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-=begin
-
-= Ruby/DL
-
-Ruby/DL provides an interface to the dynamic linker such as dlopen() on UNIX
-and LoadLibrary() on Windows.
-
-= Building and Installing
-
-  $ ruby extconf.rb    # to create the Makefile
-  $ make               # to build the library 'dl.so'
-  $ make libtest.so    # to build the C library 'libtest.so' for the test script
-  $ make test          # to run the test script
-  $ make install       # to install the library
-  $ make clean         # to remove the created files without Makefile
-  $ make distclean     # to remove the all created files
-
-= Using Ruby/DL
-
-We should usually use DL::Importable module provided by "dl/import.rb".
-It has high-level functions to access library functions. We use
-DL::Importable module to extend a module as follows:
-
-  require "dl/import"
-  module LIBC
-    extend DL::Importable
-  end
-
-Now we can use methods dlload and extern in this module. We load the
-libraries using dlload, and define wrapper methods to library functions
-using extern respectively as follows:
-
-  module LIBC
-    extend DL::Importable
-    dlload "libc.so.6","libm.so.6"
-    extern "int strlen(char*)"
-  end
-  # Note that we should not include the module LIBC from some reason.
-
-We can call the library function strlen() using LIBC.strlen. If the first
-character of given function name is an uppercase, the first character of the
-defined method name becomes lowercase.
-We can also construct memory images of structures and unions using functions
-struct and union which are defined in "dl/struct.rb" as follows:
-
-  require "dl/import"
-  require "dl/struct"
-  module LIBC
-    extend DL::Importable
-    Timeval = struct [       # define timeval structure.
-      "long tv_sec",
-      "long tv_uses",
-    ]
-  end
-  val = LIBC::Timeval.malloc # allocate memory.
-
-Notice that the above example takes LIBC::Timeval.malloc to allocate memory,
-rather than LIBC::Timeval.new. It is because DL::Timeval.new is for wrapping
-an object, PtrData, which has already been created.
-
-We can define a callback using the module function "callback" as follows:
-
-  module Foo
-    extend DL::Importable
-    def my_comp(str1,str2)
-      str1 <=> str2
-    end
-    COMPARE = callback "int my_comp(char*,char*)"
-  end
-
-where Foo::COMPARE is a Symbol object which invokes the method "my_comp".
-
-DL::Importable module is very useful. However, we sometimes encounter a case
-that we must directly use low-level functions such as dlsym(). In such case,
-we would use DL module functions. They are described in next section.
-
-= DL module
-
-Module DL consists of three classes, a few module functions and constants.
-The class Symbol represents the symbol we can call. The class PtrData
-indicates a memory block such as a pointer in C. An object instantiated from
-the class Handle keeps a handle to opened library.
-
-== Constants
-
-* VERSION
-* MAJOR_VERSION
-* MINOR_VERSION
-* PATCH_VERSION
-* RTLD_GLOBAL
-* RTLD_LAZY
-* RTLD_NOW
-* MAX_ARG
-* MAX_CBARG
-* MAX_CBENT
-
-== Functions
-
-* handle = dlopen(lib){|handle| ... }
-  * is quite equal to `Handle.new(lib)'
-
-* sym = set_callback(cbtype, entry){|args| ... }
-* sym = set_callback(cbtype, entry, proc)
-  * makes entry-th pre-defined function to call the proc or given block. the 
-    entry-th pre-defined function is specified by cbtype and entry. cbtype is a
-    prototype of the callback. see also the section `Type specifiers' about 
-    cbtype.
-
-* sym = get_callback(cbtype, entry)
-  * returns the Proc object which is given by the above function
-   `set_callback'.
-
-* ptr = malloc(size, [free = nil])
-  * allocates the size bytes, and returns the pointer as a PtrData object ptr.
-
-* ptr = strdup(str)
-  * returns a PtrData object ptr which represents the pointer to a new string
-    which is a duplicate of the string str.
-
-* size = sizeof(type)
-  * returns the size of type. `sizeof("C") + sizeof("L")' is not equal to
-    `sizeof("CL")'. the latter is assumed to returns the enough size of the
-    structure `struct foo { char c; long l; }', but the size may not equal to
-    `sizeof(foo)' of C.
-
-== Handle class
-
-* handle = Handle.new(lib){|handle| ... }
-  * opens a library lib and returns a Handle object handle. if a block is
-    given, the handle is automatically closed as the block ends.
-
-* Handle#close
-  * closes the handle opened by the above Handle.new(lib).
-
-* sym = Handle#sym(func, prototype = "0"),
-  sym = Handle#[func, prototype = nil]
-
-  * obtains the pointer to a function called func and returns a Symbol object
-    or a DataPtr object. prototype is a string which consists of type
-    specifiers, it indicates the function's prototype. see also the section
-    `Type specifiers'.
-
-== Symbol class
-
-* sym = Symbol.new(addr, type = nil, name = nil)
-  * creates the Symbol object sym with the type type if type is not nil. addr
-    is the address where the function is allocated. If type is nil, it returns
-    a DataPtr object.
-
-* Symbol::char2type(char)
-  * takes a character char that represents a type and returns the type
-    specifier of the C language.
-
-* str = Symbol#proto()
-  * returns the function prototype.
-
-* str = Symbol#name()
-  * Returns the function name.
-
-* str = Symbol#cproto(),
-  str = Symbol#to_s()
-  * returns the prototype of the C language.
-
-* str = Symbol#inspect()
-  * returns the inspectable string.
-
-* r,rs = Symbol#call(arg1,arg2,...,argN),
-  r,rs = Symbol#[](arg1,arg2,...,argN)
-  * calls the function with parameters arg1, arg2, ..., argN. and the result
-    consists of the return value r and parameters rs. rs is an array.
-
-* ptr = Symbol#to_ptr
-  * returns the corresponding PtrData object ptr.
-
-== PtrData class
-
-* ptr = PtrData.new(addr, [size = 0, free = nil])
-  * returns the PtrData object representing the pointer which indicates the
-    address addr. GC frees the memory using the free function.
-
-* PtrData#free=(sym)
-  * If you specify a symbol object sym, GC frees the memory using the function
-    represented by sym.
-
-* sym = PtrData#free
-  * returns a symbol object sym which is used when GC frees the memory. it
-    usually configured by `PtrData#free=' or `PtrData.new'.
-
-* size = PtrData#size, PtrData#size=(size)
-  * gets and sets allocated size of the memory.
-
-* ary = PtrData#to_a(type, [size])
-  * returns an array of the type which specified with type. type must be one of
-    'S','P','I','L','D' and 'F'.
-
-* str = PtrData#to_s([len])
-  * returns a string which length is len. if len is omitted, the end of the
-    string is '\0'.
-
-* ptr = PtrData#ptr,+@
-  * returns the pointed value as a PtrData object ptr.
-
-* ptr = PtrData#ref,-@
-  * returns the reference as a PtrData object ptr.
-
-* ptr = PtrData#+
-  * returns the PtrData object
-
-* ptr = PtrData#-
-  * returns the PtrData object
-
-* PtrData#struct!(type, *members)
-  * defines the data type to get access to a structure member with a symbol.
-    (see also PtrData#[])
-
-* PtrData#union!(type, *members)
-  * defines the data type to get access to a union member with a symbol. (see
-    also PtrData#[])
-
-* val = PtrData#[key], PtrData#[key, num = 0]
-  * if the key is a string or symbol, this method returns the value of the
-    structure/union member which has the type defined by PtrData#
-    {struct!,union!}. if the key is a integer value and this object represents
-    the pointer ptr, it returns the value of `(ptr + key).to_s(num)'
-
-* PtrData#[key,num]=val, PtrData#[key]=val
-  * if the key is a string or symbol, this method substitute the value of the
-    structure/union member with val. if the key is a integer value and val is a
-    string, this method copies num bytes of val to the memory area ptr using
-    memcpy(3).
-
-== Type specifiers
-
-the prototype consists of the following type specifiers, first element of 
-prototype represents the type of return value, and remaining elements represent
-the type of each argument.
-
-    C : char
-    c : char *
-    H : short
-    h : short *
-    I : int
-    i : int *
-    L : long
-    l : long *
-    F : float
-    f : float *
-    D : double
-    d : double *
-    S : const char *
-    s : char *
-    A : const type[]
-    a : type[] (allocates new memory space)
-    P : void * (same as 'p')
-    p : void * (same as 'P')
-    0 : void function (this must be a first character of the prototype)
-
-the cbtype consists of type specifiers 0, C, I, H, L, F, D, S and P.
-for example:
-
-    DL.callback('IPP'){|ptr1,ptr2|
-      str1 = ptr1.ptr.to_s
-      str2 = ptr2.ptr.to_s
-      str1 <=> str2
-    }
-=end
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
deleted file mode 100644
index e712134448..0000000000
--- a/ext/dl/extconf.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-require 'mkmf'
-
-begin # for the exception SystemExit
-
-$:.unshift File.dirname(__FILE__)
-require 'type'
-
-if( ARGV.include?("--help") )
-  print <<EOF
-  --help             print this messages
-  --with-type-char   strictly use type 'char'
-  --with-type-short  strictly use type 'short'
-  --with-type-float  strictly use type 'float'
-  --with-args=<max_arg>
-  --with-callback=<max_callback>
-  --enable-asm       use the embedded assembler for passing arguments.
-                     (this option is available for i386 machine now.)
-  --enable-dlstack   use a stack emulation for constructing function call.
-EOF
-  exit(0)
-end
-
-($CPPFLAGS || $CFLAGS) << " -I."
-
-if (Config::CONFIG['CC'] =~ /gcc/)  # from Win32API
-  $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
-end
-
-$with_dlstack ||= true
-$with_asm = ! $with_dlstack
-
-$with_type_int = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_INT == SIZEOF_LONG
-#error int not needed
-#endif
-EOF
-
-$with_type_float = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_FLOAT == SIZEOF_DOUBLE
-#error float not needed
-#endif
-EOF
-
-$with_type_voidp = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_VOIDP == SIZEOF_INT || SIZEOF_VOIDP == SIZEOF_LONG
-#error void* not needed
-#endif
-EOF
-
-$with_type_char  = DLTYPE[CHAR][:sym]
-$with_type_short = DLTYPE[SHORT][:sym]
-$with_type_long  = DLTYPE[LONG][:sym]
-$with_type_double= DLTYPE[DOUBLE][:sym]
-$with_type_int   &= DLTYPE[INT][:sym]
-$with_type_float &= DLTYPE[FLOAT][:sym]
-$with_type_voidp &= DLTYPE[VOIDP][:sym]
-
-$with_type_char  = enable_config("type-char", $with_type_char)
-$with_type_short = enable_config("type-short", $with_type_short)
-$with_type_float = enable_config("type-float", $with_type_float)
-
-$with_asm        = enable_config("asm", $with_asm)
-$with_dlstack    = enable_config("dlstack", $with_dlstack)
-
-args = with_config("args")
-max_arg = nil
-if( $with_asm || $with_dlstack )
-  $with_type_char = true
-  $with_type_short = true
-  $with_type_float = true
-  max_arg = 0
-end
-if( args )
-  max_arg = args.to_i
-  if( !max_arg )
-    print("--with-args=<max_arg>\n")
-    exit(1)
-  end
-end
-max_arg   ||= 6
-
-max_callback = with_config("callback","10").to_i
-callback_types = DLTYPE.keys.length
-
-
-$dlconfig_h = <<EOF
-#define MAX_ARG           #{max_arg}
-EOF
-
-def dlc_define(const)
-  $dlconfig_h << "#if !defined(#{const})\n" +
-                 "# define #{const}\n" +
-                 "#endif\n"
-end
-
-$dlconfig_h << "#define MAX_CALLBACK #{max_callback}\n"
-$dlconfig_h << "#define CALLBACK_TYPES #{callback_types}\n"
-if( $with_dlstack )
-  $dlconfig_h << "#define USE_DLSTACK\n"
-else
-  if( $with_asm )
-    $dlconfig_h << "#define USE_INLINE_ASM\n"
-  end
-end
-if( $with_type_char )
-  $dlconfig_h << "#define WITH_TYPE_CHAR\n"
-end
-if( $with_type_short )
-  $dlconfig_h << "#define WITH_TYPE_SHORT\n"
-end
-if( $with_type_long )
-  $dlconfig_h << "#define WITH_TYPE_LONG\n"
-end
-if( $with_type_double )
-  $dlconfig_h << "#define WITH_TYPE_DOUBLE\n"
-end
-if( $with_type_float )
-  $dlconfig_h << "#define WITH_TYPE_FLOAT\n"
-end
-if( $with_type_int )
-  $dlconfig_h << "#define WITH_TYPE_INT\n"
-end
-if( $with_type_voidp )
-  $dlconfig_h << "#define WITH_TYPE_VOIDP\n"
-end
-
-if( have_header("dlfcn.h") )
-  dlc_define("HAVE_DLFCN_H")
-  have_library("dl")
-  have_func("dlopen")
-  have_func("dlclose")
-  have_func("dlsym")
-  if( have_func("dlerror") )
-    dlc_define("HAVE_DLERROR")
-  end
-elsif( have_header("windows.h") )
-  dlc_define("HAVE_WINDOWS_H")
-  have_func("LoadLibrary")
-  have_func("FreeLibrary")
-  have_func("GetProcAddress")
-else
-  exit(0)
-end
-
-def File.update(file, str)
-  begin
-    open(file){|f|f.read} == str
-  rescue Errno::ENOENT
-    false
-  end or open(file, "w"){|f|f.print(str)}
-end
-
-File.update("dlconfig.h", <<EOF)
-#ifndef DLCONFIG_H
-#define DLCONFIG_H
-#{$dlconfig_h}
-#endif /* DLCONFIG_H */
-EOF
-
-File.update("dlconfig.rb", <<EOF)
-MAX_ARG = #{max_arg}
-MAX_CALLBACK = #{max_callback}
-CALLBACK_TYPES = #{callback_types}
-DLTYPE[CHAR][:sym]  = #{$with_type_char}
-DLTYPE[SHORT][:sym] = #{$with_type_short}
-DLTYPE[INT][:sym]   = #{$with_type_int}
-DLTYPE[LONG][:sym]  = #{$with_type_long}
-DLTYPE[FLOAT][:sym] = #{$with_type_float}
-DLTYPE[DOUBLE][:sym]= #{$with_type_double}
-DLTYPE[VOIDP][:sym] = #{$with_type_voidp}
-EOF
-
-$INSTALLFILES = [
-  ["./dlconfig.h", "$(archdir)$(target_prefix)", "."],
-  ["dl.h", "$(archdir)$(target_prefix)", ""],
-]
-$cleanfiles = %w[test/test.o]
-$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb
-./dlconfig.h test/libtest.so test/*~ *~ mkmf.log]
-
-create_makefile('dl')
-rescue SystemExit
-  # do nothing
-end
diff --git a/ext/dl/h2rb b/ext/dl/h2rb
deleted file mode 100644
index 00fbd60c82..0000000000
--- a/ext/dl/h2rb
+++ /dev/null
@@ -1,500 +0,0 @@
-#!/usr/bin/env ruby
-# -*- ruby -*-
-# $Id$
-
-require 'mkmf'
-require 'ftools'
-
-$recursive = false
-$force     = false
-$conly     = true
-$inc_path  = []
-$infilename= nil
-$insert_require = true
-
-def valid_ruby_code?(code)
-  begin
-    eval("BEGIN {return true}; #{code}")
-  rescue SyntaxError
-    return false
-  end
-  return false
-end
-
-def print_usage
-  print <<EOF
-h2rb [-r] [-I <path>] [-d] [<filename>]
-EOF
-end
-
-while( ARGV[0] )
-  case( ARGV[0] )
-  when "-r"
-    ARGV.shift
-    $recursive = true
-  when "-R"
-    ARGV.shift
-    $recursive = false
-  when "-l"
-    ARGV.shift
-    $insert_require = true
-  when "-L"
-    ARGV.shift
-    $insert_require = false
-  when "-c"
-    ARGV.shift
-    $conly = true
-  when "-C"
-    ARGV.shift
-    $conly = false
-  when "-f"
-    ARGV.shift
-    $force = true
-  when "-F"
-    ARGV.shift
-    $force = false
-  when "-I"
-    ARGV.shift
-    $inc_path << ARGV.shift
-  when "-d"
-    ARGV.shift
-    $DEBUG = true
-  when "-h","--help"
-    print_usage()
-    exit 0
-  when /-.*/
-    $stderr.print("unknown option '#{ARGV[0]}'.\n")
-    print_usage()
-    exit 0
-  else
-    $infilename = ARGV.shift
-  end
-end
-
-$inc_dir = File.join(CONFIG["prefix"], "lib", "ruby",
-		     CONFIG["MAJOR"] + "." + CONFIG["MINOR"],
-		     "dl")
-
-class H2RBError < StandardError; end
-
-
-class H2RB
-  def initialize(inc_dir = nil, inc_path = nil, insert_require = nil)
-    @inc_path = inc_path || []
-    @inc_dir  = inc_dir  || '.'
-    @indent = 0
-    @parsed_files = []
-    @insert_require = insert_require || false
-  end
-
-  def find_path(file)
-    if( ! file )
-      return nil
-    end
-    if( File.exist?(file) )
-      if( file[0] == ?/ )
-	return file
-      else
-	return file
-      end
-    end
-    @inc_path.each{|path|
-    full = File.join(path, file)
-      if( File.exist?(full) )
-	return full
-      end
-    }
-    return nil
-  end
-
-  def strip_comment(line)
-    if( @commented )
-      if( e = line.index("*/") )
-	line[0..(e+1)] = ""
-	@commented = false
-      else
-	line = ""
-      end
-    else
-      if( s = line.index("/*") )
-	if( e = line.index("*/") )
-	  line[s..(e+1)] = ""
-	else
-	  line[s..-1] = ""
-	  @commented = true
-	end
-      elsif( s = line.index("//") )
-	line[s..(-1)] = ""
-      end
-    end
-      
-    line.gsub!(/\s+$/,"")
-    return line
-  end
-  
-  def up_indent
-    @indent += 1
-  end
-  
-  def down_indent
-    @indent -= 1
-    if( @indent < 0 )
-      raise
-    end
-  end
-  
-  def indent
-    "  " * @indent
-  end
-
-  def rescue_begin
-    line = "#{indent}begin"
-    up_indent
-    return line
-  end
-
-  def rescue_nameerror
-    down_indent
-    line = [
-      "#{indent}rescue NameError => e",
-      "#{indent}  raise e if( $DEBUG )",
-      "#{indent}end"].join($/)
-    return line
-  end
-
-  def parse_enum(line)
-    if( line =~ /enum\s+(\S+\s+)?\{(.+)\}/ )
-      enum_name  = $1
-      enum_block = $2
-      if( enum_name )
-	line = "#{indent}# -- enum #{enum_name}\n"
-      else
-	line = "#{indent}# -- enum\n"
-      end
-      enums = enum_block.split(/,/).collect{|e| e.strip}
-      i = 0
-      enums.each{|elem|
-	var,val = elem.split(/=/).collect{|e| e.strip}
-	if( val )
-	  i = val.to_i
-	end
-	line += "#{indent}#{var} = #{i.to_s}\n"
-	i += 1
-      }
-      line += "#{indent}# -- end of enum"
-      return line
-    else
-      return nil
-    end
-  end
-
-  def parse_define(line)
-    case line
-    when /^#\s*define\s+(\S+)\(\)/
-      line = nil
-    when /^#\s*define\s+(\S+)\((.+)\)\s+(.+)$/
-      if( @conly )
-	line = nil
-      else
-	defname = $1
-	defargs = $2
-	defval  = $3
-	if( !valid_ruby_code?(defval) )
-	  defval = "nil # #{defval}"
-	end
-	if( defname[0,1] =~ /^[A-Z]$/ )
-	  line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
-	else
-	  line = [
-	    "#{indent}def #{defname}(#{defargs})",
-	    "#{indent}  #{defval}",
-	    "#{indent}end"
-	  ].join("\n")
-	end
-      end
-    when /^#\s*define\s+(\S+)\((.+)\)$/
-      if( @conly )
-	line = nil
-      else
-	defname = $1
-	defargs = $2
-	defval  = nil
-	if( !valid_ruby_code?(defval) )
-	  defval = "nil # #{defval}"
-	end
-	if( defname[0,1] =~ /^[A-Z]$/ )
-	  line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
-	else
-	  line = [
-	    "#{indent}def #{defname}(#{defargs})",
-	    "#{indent}  #{defval}",
-	    "#{indent}end"
-	  ].join("\n")
-	end
-      end
-    when /^#\s*define\s+(\S+)\s+(.+)$/
-      defname = $1
-      defval  = $2
-      if( !valid_ruby_code?(defval) )
-	defval = "nil # #{defval}"
-      end
-      line = [rescue_begin, "#{indent}#{defname} = #{defval}", rescue_nameerror].join($/)
-    when /^#\s*define\s+(\S+)$/
-      defname = $1
-      line = "#{indent}#{defname} = nil"
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_undef(line)
-    case line
-    when /^#\s*undef\s+([A-Z]\S+)$/
-      defname = $1
-      line = "#{indent}remove_const(:#{defname})"
-    when /^#\s*undef\s+(\S+)$/
-      defname = $1
-      line = "#{indent}#{defname} = nil"
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_ifdef(line)
-    case line
-    when /^#\s*ifdef\s+(\S+)$/
-      defname = $1
-      line = [
-	rescue_begin,
-	"#{indent}if( defined?(#{defname}) && ! #{defname}.nil? )"].join($/)
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_ifndef(line)
-    case line
-    when /^#\s*ifndef\s+(\S+)$/
-      defname = $1
-      line = [
-	rescue_begin,
-	"#{indent}if( ! defined?(#{defname}) || #{defname}.nil? )"].join($/)
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_if(line)
-    case line
-    when /^#\s*if\s+(.+)$/
-      cond = $1
-      cond.gsub!(/defined(.+)/){ "defined?(#{$1}) && ! #{$1}.nil?" }
-      if( valid_ruby_code?(cond) )
-	line = "#{indent}if( #{cond} )"
-      else
-	line = "#{indent}if( false ) # #{cond}"
-      end
-      line = [rescue_begin, line].join($/)
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_elif(line)
-    case line
-    when /^#\s*elif\s+(.+)$/
-      cond = $1
-      cond.gsub!("defined","defined?")
-      line = "#{indent}elsif( #{cond} )"
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_else(line)
-    case line
-    when /^#\s*else\s*/
-      line = "#{indent}else"
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_endif(line)
-    case line
-    when /^#\s*endif\s*$/
-      line = ["#{indent}end", rescue_nameerror].join($/)
-    else
-      line = nil
-    end
-    return line
-  end
-  
-  def parse_include(line)
-    if( ! @insert_require )
-      return nil
-    end
-
-    file = nil
-    case line
-    when /^#\s*include "(.+)"$/
-      file = $1
-      line = "#{indent}require '#{file}'"
-    when /^#\s*include \<(.+)\>$/
-      file = $1
-      line = "#{indent}require '#{file}'"
-    else
-      line = nil
-    end
-    if( @recursive && file && (!@parsed_files.include?(file)) )
-      parse(file, @recursive, @force, @conly)
-    end
-    return line
-  end
-
-
-  def open_files(infilename)
-    if( ! infilename )
-      return [$stdin, $stdout]
-    end
-
-    old_infilename = infilename
-    infilename = find_path(infilename)
-    if( ! infilename )
-      $stderr.print("'#{old_infilename}' was not found.\n")
-      return [nil,nil]
-    end
-
-    if( infilename )
-      if( infilename[0,1] == '/' )
-	outfilename = File.join(@inc_dir, infilename[1..-1] + ".rb")
-      else
-	outfilename = infilename + ".rb"
-      end
-      File.mkpath(File.dirname(outfilename))
-    else
-      outfilename = nil
-    end
-    
-    if( infilename )
-      fin    = File.open(infilename,"r")
-    else
-      fin    = $stdin
-    end
-    if( outfilename )
-      if( File.exist?(outfilename) && (!@force) )
-	$stderr.print("'#{outfilename}' have already existed.\n")
-	return [fin, nil]
-      end
-      fout   = File.open(outfilename,"w")
-    else
-      fout   = $stdout
-    end
-
-    $stderr.print("#{infilename} -> #{outfilename}\n")
-    if( fout )
-      dir = File.dirname(outfilename)
-      if( dir[0,1] != "." && dir != "" )
-	fout.print("if( ! $LOAD_PATH.include?('#{dir}') )\n",
-		   "  $LOAD_PATH.push('#{dir}')\n",
-		   "end\n")
-      end
-    end
-    return [fin,fout]
-  end
-
-  def parse(infilename = nil, recursive = false, force = false, conly = false)
-    @commented = false
-    @recursive = recursive
-    @force     = force
-    @conly     = conly
-    @parsed_files << infilename
-
-    fin,fout = open_files(infilename)
-    if( !fin )
-      return
-    end
-
-    begin
-      line_number = 0
-      pre_line    = nil
-      fin.each_line{|line|
-	line_number += 1
-	line.chop!
-	if( $DEBUG )
-	  $stderr.print("#{line_number}:(#{@indent}):", line, "\n")
-	end
-	
-	if( pre_line )
-	  line = pre_line + line
-	  pre_line = nil
-	end
-
-	if( line[-1,1] == "\\" )
-	  pre_line = line[0..-2]
-	  next
-	end
-
-	if( eidx = line.index("enum ") )
-	  pre_line = line[eidx .. -1]
-	  if( i = line.index("{") && j = line.index("}") )
-	    line = line[0..j]
-	    pre_line = nil
-	  else
-	    next
-	  end
-	end
-
-	line = strip_comment(line)
-	case line
-	when /^enum\s/
-	  line = parse_enum(line)
-	when /^#\s*define\s/
-	  line = parse_define(line)
-	when /^#\s*undef\s/
-	  line = parse_undef(line)
-	when /^#\s*ifdef\s/
-	  line = parse_ifdef(line)
-	  up_indent
-	when /^#\s*ifndef\s/
-	  line = parse_ifndef(line)
-	  up_indent
-	when /^#\s*if\s/
-	  line = parse_if(line)
-	  up_indent
-	when /^#\s*elif\s/
-	  down_indent
-	  line = parse_elif(line)
-	  up_indent
-	when /^#\s*else/
-	  down_indent
-	  line = parse_else(line)
-	  up_indent
-	when /^#\s*endif/
-	  down_indent
-	  line = parse_endif(line)
-	when /^#\s*include\s/
-	  line = parse_include(line)
-	else
-	  line = nil
-	end
-	if( line && fout )
-	  fout.print(line, "     # #{line_number}",$/)
-	end
-      }
-    ensure
-      fin.close if fin
-      fout.close if fout
-    end
-  end
-end
-
-h2rb = H2RB.new($inc_dir, $inc_path, $insert_require)
-h2rb.parse($infilename, $recursive, $force, $conly)
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
deleted file mode 100644
index 9ca2fa0a54..0000000000
--- a/ext/dl/handle.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include "dl.h"
-
-VALUE rb_cDLHandle;
-
-void
-dlhandle_free(struct dl_handle *dlhandle)
-{
-  if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
-    dlclose(dlhandle->ptr);
-  }
-}
-
-VALUE
-rb_dlhandle_close(VALUE self)
-{
-  struct dl_handle *dlhandle;
-
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  dlhandle->open = 0;
-  return INT2NUM(dlclose(dlhandle->ptr));
-}
-
-VALUE
-rb_dlhandle_s_allocate(VALUE klass)
-{
-  VALUE obj;
-  struct dl_handle *dlhandle;
-
-  obj = Data_Make_Struct(rb_cDLHandle, struct dl_handle, 0,
-			 dlhandle_free, dlhandle);
-  dlhandle->ptr  = 0;
-  dlhandle->open = 0;
-  dlhandle->enable_close = 0;
-
-  return obj;
-}
-
-VALUE
-rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
-{
-  void *ptr;
-  struct dl_handle *dlhandle;
-  VALUE lib, flag;
-  char  *clib;
-  int   cflag;
-  const char *err;
-
-  switch (rb_scan_args(argc, argv, "11", &lib, &flag)) {
-  case 1:
-    clib = StringValuePtr(lib);
-    cflag = RTLD_LAZY | RTLD_GLOBAL;
-    break;
-  case 2:
-    clib = StringValuePtr(lib);
-    cflag = NUM2INT(flag);
-    break;
-  default:
-    rb_bug("rb_dlhandle_new");
-  }
-
-  ptr = dlopen(clib, cflag);
-#if defined(HAVE_DLERROR)
-  if (!ptr && (err = dlerror())) {
-    rb_raise(rb_eRuntimeError, err);
-  }
-#else
-  if (!ptr) {
-    err = dlerror();
-    rb_raise(rb_eRuntimeError, err);
-  }
-#endif
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
-    dlclose(dlhandle->ptr);
-  }
-  dlhandle->ptr = ptr;
-  dlhandle->open = 1;
-  dlhandle->enable_close = 0;
-
-  if (rb_block_given_p()) {
-    rb_ensure(rb_yield, self, rb_dlhandle_close, self);
-  }
-
-  return Qnil;
-}
-
-VALUE
-rb_dlhandle_enable_close(VALUE self)
-{
-  struct dl_handle *dlhandle;
-
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  dlhandle->enable_close = 1;
-  return Qnil;
-}
-
-VALUE
-rb_dlhandle_disable_close(VALUE self)
-{
-  struct dl_handle *dlhandle;
-
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  dlhandle->enable_close = 0;
-  return Qnil;
-}
-
-VALUE
-rb_dlhandle_to_i(VALUE self)
-{
-  struct dl_handle *dlhandle;
-
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  return DLLONG2NUM(dlhandle);
-}
-
-VALUE
-rb_dlhandle_to_ptr(VALUE self)
-{
-  struct dl_handle *dlhandle;
-
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  return rb_dlptr_new(dlhandle, sizeof(dlhandle), 0);
-}
-
-VALUE
-rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
-{
-  VALUE sym, type;
-  void (*func)();
-  VALUE val;
-  struct dl_handle *dlhandle;
-  void *handle;
-  const char *name, *stype;
-  const char *err;
-
-  rb_secure(2);
-  if (rb_scan_args(argc, argv, "11", &sym, &type) == 2) {
-    SafeStringValue(type);
-    stype = StringValuePtr(type);
-  }
-  else{
-    stype = NULL;
-  }
-
-  if (sym == Qnil) {
-#if defined(RTLD_NEXT)
-    name = RTLD_NEXT;
-#else
-    name = NULL;
-#endif
-  }
-  else{
-    SafeStringValue(sym);
-    name = StringValuePtr(sym);
-  }
-
-  Data_Get_Struct(self, struct dl_handle, dlhandle);
-  if (!dlhandle->open) {
-    rb_raise(rb_eRuntimeError, "Closed handle.");
-  }
-  handle = dlhandle->ptr;
-
-  func = dlsym(handle, name);
-#if defined(HAVE_DLERROR)
-  if (!func && (err = dlerror()))
-#else
-  if (!func)
-#endif
-  {
-#if defined(__CYGWIN__) || defined(WIN32) || defined(__MINGW32__)
-    {
-      int  len = strlen(name);
-      char *name_a = (char*)dlmalloc(len+2);
-      strcpy(name_a, name);
-      name_a[len]   = 'A';
-      name_a[len+1] = '\0';
-      func = dlsym(handle, name_a);
-      dlfree(name_a);
-#if defined(HAVE_DLERROR)
-      if (!func && (err = dlerror()))
-#else
-      if (!func)
-#endif
-      {
-	rb_raise(rb_eRuntimeError, "Unknown symbol \"%sA\".", name);
-      }
-    }
-#else
-    rb_raise(rb_eRuntimeError, "Unknown symbol \"%s\".", name);
-#endif
-  }
-  val = rb_dlsym_new(func, name, stype);
-
-  return val;
-}
-
-void
-Init_dlhandle()
-{
-  rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
-  rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
-  rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
-  rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
-  rb_define_method(rb_cDLHandle, "to_ptr", rb_dlhandle_to_ptr, 0);
-  rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
-  rb_define_method(rb_cDLHandle, "sym",  rb_dlhandle_sym, -1);
-  rb_define_method(rb_cDLHandle, "[]",  rb_dlhandle_sym, -1);
-  rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
-  rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
-}
diff --git a/ext/dl/install.rb b/ext/dl/install.rb
deleted file mode 100644
index 69b1834301..0000000000
--- a/ext/dl/install.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'mkmf'
-require 'ftools'
-
-SO_LIBS = ["dl.so"]
-
-$ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR']
-$prefix = CONFIG['prefix']
-$libdir = File.join($prefix,'lib')
-$rubylibdir = File.join($libdir, 'ruby', $ruby_version)
-$arch = CONFIG['arch']
-$archdir = File.join($rubylibdir, $arch)
-
-def find(dir, match = /./)
-  Dir.chdir(dir)
-  files = []
-  Dir.new(".").each{|file|
-    if( file != "." && file != ".." )
-      case File.ftype(file)
-      when "file"
-	if( file =~ match )
-	  files.push(File.join(dir,file))
-	end
-      when "directory"
-	files += find(file, match).collect{|f| File.join(dir,f)}
-      end
-    end
-  }
-  Dir.chdir("..")
-  return files
-end
-
-def install()
-  rb_files = find(File.join(".","lib"), /.rb$/)
-
-  SO_LIBS.each{|f|
-    File.makedirs($rubylibdir, "#{$archdir}")
-    File.install(f, File.join($archdir,f), 0555, true)
-  }
-
-  rb_files.each{|f|
-    origfile = f
-    instfile = File.join($rubylibdir, origfile.sub("./lib/",""))
-    instdir  = File.dirname(instfile)
-    File.makedirs(instdir)
-    File.install(origfile, instfile, 0644, true)
-  }
-end
-
-install()
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
deleted file mode 100644
index c0dfb5f705..0000000000
--- a/ext/dl/lib/dl/import.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-require 'dl/types'
-
-module DL
-  module Importable
-    LIB_MAP = {}
-
-    module Internal
-      def init_types()
-	if( !@types )
-	  @types = ::DL::Types.new
-	end
-      end
-
-      def init_sym()
-	if( !@SYM )
-	  @SYM = {}
-	end
-      end
-
-      def [](name)
-	return @SYM[name.to_s][0]
-      end
-
-      def dlload(*libnames)
-	if( !defined?(@LIBS) )
-	  @LIBS = []
-	end
-	libnames.each{|libname|
-	  if( !LIB_MAP[libname] )
-	    LIB_MAP[libname] = DL.dlopen(libname)
-	  end
-	  @LIBS.push(LIB_MAP[libname])
-	}
-      end
-      alias dllink :dlload
-
-      def parse_cproto(proto)
-	proto = proto.gsub(/\s+/, " ").strip
-	case proto
-	when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
-	  ret = $1
-	  args = $2
-	  ret = ret.split(/\s+/)
-	  args = args.split(/\s*,\s*/)
-	  func = ret.pop
-	  if( func =~ /^\*/ )
-	    func.gsub!(/^\*+/,"")
-	    ret.push("*")
-	  end
-	  ret  = ret.join(" ")
-	  return [func, ret, args]
-	else
-	  raise(RuntimeError,"can't parse the function prototype: #{proto}")
-	end
-      end
-
-      # example:
-      #   extern "int strlen(char*)"
-      #
-      def extern(proto)
-	func,ret,args = parse_cproto(proto)
-	return import(func, ret, args)
-      end
-
-      # example:
-      #   callback "int method_name(int, char*)"
-      #
-      def callback(proto)
-	func,ret,args = parse_cproto(proto)
-
-	init_types()
-	init_sym()
-
-	rty,renc,rdec = @types.encode_type(ret)
-	ty,enc,dec = encode_types(args)
-	symty = rty + ty
-
-	module_eval("module_function :#{func}")
-	sym = module_eval([
-	  "DL::callback(\"#{symty}\"){|*args|",
-	  "  sym,rdec,enc,dec  = @SYM['#{func}']",
-	  "  args = enc.call(args) if enc",
-	  "  r,rs = #{func}(*args)",
-	  "  r  = renc.call(r) if rdec",
-	  "  rs = dec.call(rs) if dec",
-	  "  @retval = r",
-	  "  @args   = rs",
-	  "  @retval",
-	  "}",
-	].join("\n"))
-
-	@SYM[func] = [sym,rdec,enc,dec]
-
-	return sym
-      end
-
-      # example:
-      #  typealias("uint", "unsigned int")
-      #
-      def typealias(*args)
-	init_types()
-	@types.typealias(*args)
-      end
-
-      # example:
-      #  symbol "foo_value"
-      #  symbol "foo_func", "IIP"
-      #
-      def symbol(name, ty = nil)
-	sym = nil
-	@LIBS.each{|lib|
-	  begin
-	    if( ty )
-	      sym = lib[name, ty]
-	    else
-	      sym = lib[name]
-	    end
-	  rescue
-	    next
-	  end
-	}
-	if( !sym )
-	  raise(RuntimeError, "can't find the symbol `#{name}'")
-	end
-	return sym
-      end
-
-      # example:
-      #   import("get_length", "int", ["void*", "int"])
-      #
-      def import(name, rettype, argtypes = nil)
-	init_types()
-	init_sym()
-
-	rty,_,rdec = @types.encode_type(rettype)
-	ty,enc,dec = encode_types(argtypes)
-	symty = rty + ty
-
-	sym = symbol(name, symty)
-
-	mname = name.dup
-	if( ?A <= mname[0] && mname[0] <= ?Z )
-	  mname[0,1] = mname[0,1].downcase
-	end
-	@SYM[mname] = [sym,rdec,enc,dec]
-	
-	module_eval [
-	  "def #{mname}(*args)",
-	  "  sym,rdec,enc,dec  = @SYM['#{mname}']",
-	  "  args = enc.call(args) if enc",
-	  if( $DEBUG )
-	    "  p \"[DL] call #{mname} with \#{args.inspect}\""
-	  else
-	    ""
-	  end,
-	  "  r,rs = sym.call(*args)",
-	  if( $DEBUG )
-	    "  p \"[DL] retval=\#{r.inspect} args=\#{rs.inspect}\""
-	  else
-	    ""
-	  end,
-	  "  r  = rdec.call(r) if rdec",
-	  "  rs = dec.call(rs) if dec",
-	  "  @retval = r",
-	  "  @args   = rs",
-	  "  return @retval",
-	  "end",
-	  "module_function :#{mname}",
-	].join("\n")
-
-	return sym
-      end
-
-      def _args_
-	return @args
-      end
-
-      def _retval_
-	return @retval
-      end
-
-      def encode_types(tys)
-	init_types()
-	encty = []
-	enc = nil
-	dec = nil
-	tys.each_with_index{|ty,idx|
-	  ty,c1,c2,_,_ = @types.encode_type(ty)
-	  encty.push(ty)
-	  if( enc )
-	    if( c1 )
-	      conv1 = enc
-	      enc = proc{|v| v = conv1.call(v); v[idx] = c1.call(v[idx]); v}
-	    end
-	  else
-	    if( c1 )
-	      enc = proc{|v| v[idx] = c1.call(v[idx]); v}
-	    end
-	  end
-	  if( dec )
-	    if( c2 )
-	      conv2 = dec
-	      dec = proc{|v| v = conv2.call(v); v[idx] = c2.call(v[idx]); v}
-	    end
-	  else
-	    if( c2 )
-	      dec = proc{|v| v[idx] = c2.call(v[idx]); v}
-	    end
-	  end
-	}
-	return [encty.join, enc, dec]
-      end
-    end # end of Internal
-    include Internal
-  end # end of Importable
-end
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
deleted file mode 100644
index 2c52d5040d..0000000000
--- a/ext/dl/lib/dl/struct.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-require 'dl/import'
-
-module DL
-  module Importable
-    module Internal
-      def define_struct(contents)
-	init_types()
-	Struct.new(@types, contents)
-      end
-      alias struct define_struct
-
-      def define_union(contents)
-	init_types()
-	Union.new(@types, contents)
-      end
-      alias union define_union
-
-      class Memory
-	def initialize(ptr, names, ty, len, enc, dec)
-	  @ptr = ptr
-	  @names = names
-	  @ty    = ty
-	  @len   = len
-	  @enc   = enc
-	  @dec   = dec
-
-	  # define methods
-	  @names.each{|name|
-	    instance_eval [
-	      "def #{name}",
-	      "  v = @ptr[\"#{name}\"]",
-	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @dec[\"#{name}\"].call(x) if @dec[\"#{name}\"] }",
-              "  else",
-	      "    v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
-	      "  end",
-	      "  return v",
-	      "end",
-	      "def #{name}=(v)",
-	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @enc[\"#{name}\"].call(x) if @enc[\"#{name}\"] }",
-	      "  else",
-	      "    v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
-              "  end",
-	      "  @ptr[\"#{name}\"] = v",
-	      "  return v",
-	      "end",
-	    ].join("\n")
-	  }
-	end
-
-	def to_ptr
-	  return @ptr
-	end
-
-	def size
-	  return @ptr.size
-	end
-      end
-
-      class Struct
-	def initialize(types, contents)
-	  @names = []
-	  @ty   = {}
-	  @len  = {}
-	  @enc  = {}
-	  @dec  = {}
-	  @size = 0
-	  @tys  = ""
-	  @types = types
-	  parse(contents)
-	end
-
-	def size
-	  return @size
-	end
-
-	def members
-	  return @names
-	end
-
-	# ptr must be a PtrData object.
-	def new(ptr)
-	  ptr.struct!(@tys, *@names)
-	  mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
-	  return mem
-	end
-
-	def malloc(size = nil)
-	  if( !size )
-	    size = @size
-	  end
-	  ptr = DL::malloc(size)
-	  return new(ptr)
-	end
-
-	def parse(contents)
-	  contents.each{|elem|
-	    name,ty,num,enc,dec = parse_elem(elem)
-	    @names.push(name)
-	    @ty[name]  = ty
-	    @len[name] = num
-	    @enc[name] = enc
-	    @dec[name] = dec
-	    if( num )
-	      @tys += "#{ty}#{num}"
-	    else
-	      @tys += ty
-	    end
-	  }
-	  @size = DL.sizeof(@tys)
-	end
-	
-	def parse_elem(elem)
-	  elem.strip!
-	  case elem
-	  when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)$/
-	    ty = ($1 + $2).strip
-	    name = $3
-	    num = nil;
-	  when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)\[(\d+)\]$/
-	    ty = ($1 + $2).strip
-	    name = $3
-	    num = $4.to_i
-	  else
-	    raise(RuntimeError, "invalid element: #{elem}")
-	  end
-	  ty,_,_,enc,dec = @types.encode_type(ty)
-	  return [name,ty,num,enc,dec]
-	end
-      end  # class Struct
-      
-      class Union < Struct
-	def new
-	  ptr = DL::malloc(@size)
-	  ptr.union!(@tys, *@names)
-	  mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
-	  return mem
-	end
-      end
-    end  # module Internal
-  end  # module Importable
-end  # module DL
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
deleted file mode 100644
index e4d79ecf03..0000000000
--- a/ext/dl/lib/dl/types.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-
-module DL
-  class Types
-    TYPES = [
-      # FORMAT:
-      # ["alias name", "type name",
-      #    encoding_method, decoding_method,   for function prototypes
-      #    encoding_method, decoding_method]   for structures (not implemented)
-      
-      # for Windows
-      ["DWORD",  "unsigned long", nil, nil, nil, nil],
-      ["PDWORD", "unsigned long *", nil, nil, nil, nil],
-      ["WORD",   "unsigned short", nil, nil, nil, nil],
-      ["PWORD",  "unsigned int *", nil, nil, nil, nil],
-      ["BOOL",   "ibool", nil, nil, nil, nil],
-      ["ATOM",   "int", nil, nil, nil, nil],
-      ["BYTE",   "unsigned char", nil, nil, nil, nil],
-      ["PBYTE",  "unsigned char *", nil, nil, nil, nil],
-      ["UINT",   "unsigned int", nil, nil, nil, nil],
-      ["ULONG",  "unsigned long", nil, nil, nil, nil],
-      ["UCHAR",  "unsigned char", nil, nil, nil, nil],
-      ["HANDLE", "unsigned long", nil, nil, nil, nil],
-      ["PHANDLE","void*", nil, nil, nil, nil],
-      ["PVOID",  "void*", nil, nil, nil, nil],
-      ["LPCSTR", "char*", nil, nil, nil, nil],
-      ["HDC",    "unsigned int", nil, nil, nil, nil],
-      ["HWND",   "unsigned int", nil, nil, nil, nil],
-      
-      # Others
-      ["uint",   "unsigned int", nil, nil, nil, nil],
-      ["u_int",  "unsigned int", nil, nil, nil, nil],
-      ["ulong",  "unsigned long", nil, nil, nil, nil],
-      ["u_long", "unsigned long", nil, nil, nil, nil],
-
-      # DL::Importable primitive types
-      ["ibool",   "I",
-	proc{|v| v ? 1 : 0},
-	proc{|v| (v != 0) ? true : false},
-	proc{|v| v ? 1 : 0 },
-	proc{|v| (v != 0) ? true : false} ],
-      ["cbool",   "C",
-	proc{|v| v ? 1 : 0},
-	proc{|v| (v != 0) ? true : false},
-	proc{|v,len| v ? 1 : 0},
-	proc{|v,len| (v != 0) ? true : false}],
-      ["lbool",   "L",
-	proc{|v| v ? 1 : 0},
-	proc{|v| (v != 0) ? true : false},
-	proc{|v,len| v ? 1 : 0},
-	proc{|v,len| (v != 0) ? true : false}],
-      ["unsigned char", "I",
-	proc{|v| [v].pack("C").unpack("c")[0]},
-	proc{|v| [v].pack("c").unpack("C")[0]},
-	proc{|v| [v].pack("C").unpack("c")[0]},
-	proc{|v| [v].pack("c").unpack("C")[0]}],
-      ["unsigned short", "H",
-	proc{|v| [v].pack("S").unpack("s")[0]},
-	proc{|v| [v].pack("s").unpack("S")[0]},
-	proc{|v| [v].pack("S").unpack("s")[0]},
-	proc{|v| [v].pack("s").unpack("S")[0]}],
-      ["unsigned int", "I",
-	proc{|v| [v].pack("I").unpack("i")[0]},
-	proc{|v| [v].pack("i").unpack("I")[0]},
-	proc{|v| [v].pack("I").unpack("i")[0]},
-	proc{|v| [v].pack("i").unpack("I")[0]}],
-      ["unsigned long", "L",
-	proc{|v| [v].pack("L").unpack("l")[0]},
-	proc{|v| [v].pack("l").unpack("L")[0]},
-	proc{|v| [v].pack("L").unpack("l")[0]},
-	proc{|v| [v].pack("l").unpack("L")[0]}],
-      ["unsigned char ref", "i",
-	proc{|v| [v].pack("C").unpack("c")[0]},
-	proc{|v| [v].pack("c").unpack("C")[0]},
-	nil, nil],
-      ["unsigned int ref", "i",
-	proc{|v| [v].pack("I").unpack("i")[0]},
-	proc{|v| [v].pack("i").unpack("I")[0]},
-	nil, nil],
-      ["unsigned long ref", "l",
-	proc{|v| [v].pack("L").unpack("l")[0]},
-	proc{|v| [v].pack("l").unpack("L")[0]},
-	nil, nil],
-      ["char ref",  "c", nil, nil, nil, nil],
-      ["short ref", "h", nil, nil, nil, nil],
-      ["int ref",   "i", nil, nil, nil, nil],
-      ["long ref",  "l", nil, nil, nil, nil],
-      ["float ref", "f", nil, nil, nil, nil],
-      ["double ref","d", nil, nil, nil, nil],
-      ["char",   "C", nil, nil, nil, nil],
-      ["short",  "H", nil, nil, nil, nil],
-      ["int",    "I", nil, nil, nil, nil],
-      ["long",   "L", nil, nil, nil, nil],
-      ["float",  "F", nil, nil, nil, nil],
-      ["double", "D", nil, nil, nil, nil],
-      [/char\s*\*/,"S",nil, nil, nil, nil],
-      [/.+\*/,   "P", nil, nil, nil, nil],
-      [/.+\[\]/, "a", nil, nil, nil, nil],
-      ["void",   "0", nil, nil, nil, nil],
-    ]
-
-    def initialize
-      init_types()
-    end
-
-    def typealias(ty1, ty2, enc=nil, dec=nil, senc=nil, sdec=nil)
-      @TYDEFS.unshift([ty1,ty2, enc,dec, senc, sdec])
-    end
-
-    def init_types
-      @TYDEFS = TYPES.dup
-    end
-
-    def encode_type(ty)
-      orig_ty = ty
-      enc = nil
-      dec = nil
-      senc = nil
-      sdec = nil
-      @TYDEFS.each{|t1,t2,c1,c2,c3,c4|
-	if( t1.is_a?(String) )
-	  t1 = Regexp.new("^" + t1 + "$")
-	end
-	if( t1 =~ ty )
-	  ty = ty.gsub(t1,t2)
-	  if( enc )
-	    if( c1 )
-	      conv1 = enc
-	      enc = proc{|v| c1.call(conv1.call(v))}
-	    end
-	  else
-	    if( c1 )
-	      enc = c1
-	    end
-	  end
-	  if( dec )
-	    if( c2 )
-	      conv2 = dec
-	      dec = proc{|v| c2.call(conv2.call(v))}
-	    end
-	  else
-	    if( c2 )
-	      dec = c2
-	    end
-	  end
-	  if( senc )
-	    if( c3 )
-	      conv3 = senc
-	      senc = proc{|v| c3.call(conv3.call(v))}
-	    end
-	  else
-	    if( c3 )
-	      senc = c3
-	    end
-	  end
-	  if( sdec )
-	    if( c4 )
-	      conv4 = sdec
-	      sdec = proc{|v| c4.call(conv4.call(v))}
-	    end
-	  else
-	    if( c4 )
-	      sdec = c4
-	    end
-	  end
-	end
-      }
-      ty = ty.strip
-      if( ty.length != 1 )
-	raise(TypeError, "unknown type: #{orig_ty}.")
-      end
-      return [ty,enc,dec,senc,sdec]
-    end
-  end # end of Types
-end
diff --git a/ext/dl/lib/dl/win32.rb b/ext/dl/lib/dl/win32.rb
deleted file mode 100644
index 92f473d392..0000000000
--- a/ext/dl/lib/dl/win32.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-
-class Win32API
-  DLL = {}
-
-  def initialize(dllname, func, import, export = "0")
-    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI")
-    handle = DLL[dllname] ||= DL::Handle.new(dllname)
-    @sym = handle.sym(func, prototype)
-  end
-
-  def call(*args)
-    import = @sym.proto.split("", 2)[1]
-    args.each_with_index do |x, i|
-      args[i] = nil if x == 0 and import[i] == ?S
-      args[i], = [x].pack("I").unpack("i") if import[i] == ?I
-    end
-    ret, = @sym.call(*args)
-    return ret || 0
-  end
-
-  alias Call call
-end
diff --git a/ext/dl/mkcall.rb b/ext/dl/mkcall.rb
deleted file mode 100644
index 6a85570152..0000000000
--- a/ext/dl/mkcall.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def output_arg(x,i)
-  "args[#{i}].#{DLTYPE[x][:stmem]}"
-end
-
-def output_args(types)
-  t = []
-  types[1..-1].each_with_index{|x,i| t.push(output_arg(x,i))}
-  t.join(",")
-end
-
-def output_callfunc(types)
-  t = types[0]
-  stmem = DLTYPE[t][:stmem]
-  ctypes = types2ctypes(types)
-  if( t == VOID )
-    callstm = "(*f)(#{output_args(types)})"
-  else
-    callstm = "ret.#{stmem} = (*f)(#{output_args(types)})"
-  end
-  [ "{",
-    "#{ctypes[0]} (*f)(#{ctypes[1..-1].join(',')}) = func;",
-    "#{callstm};",
-    "}"].join(" ")
-end
-
-def output_case(types)
-  num = types2num(types)
-  callfunc_stm = output_callfunc(types)
-<<EOF
-  case #{num}:
-#ifdef DEBUG
-    printf("#{callfunc_stm}\\n");
-#endif
-    #{callfunc_stm};
-    break;
-EOF
-end
-
-def rec_output(types = [VOID])
-  print output_case(types)
-  if( types.length <= MAX_ARG )
-    DLTYPE.keys.sort.each{|t|
-      if( t != VOID && DLTYPE[t][:sym] )
-	rec_output(types + [t])
-      end
-    }
-  end
-end
-
-DLTYPE.keys.sort.each{|t|
-  if( DLTYPE[t][:sym] )
-    $stderr.printf("  #{DLTYPE[t][:ctype]}\n")
-    rec_output([t])
-  end
-}
diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
deleted file mode 100644
index b7ea1718d0..0000000000
--- a/ext/dl/mkcallback.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def mkfunc(rettype, fnum, argc)
-  args = (0..(argc-1)).collect{|i| "long arg#{i}"}.join(", ")
-
-  subst_code = (0..(argc-1)).collect{|i|
-    "  buff[#{i.to_s}] = arg#{i.to_s};"
-  }.join("\n")
-
-  ret_code =
-    if( DLTYPE[rettype][:c2rb] )
-      "  return #{DLTYPE[rettype][:rb2c]['retval']};"
-    else
-      "  /* no return value */"
-    end
-
-  code = [
-    "static #{DLTYPE[rettype][:ctype]}",
-    "rb_dl_callback_func_#{rettype.to_s}_#{fnum.to_s}(#{args})",
-    "{",
-    "  VALUE retval, proto, proc, obj;",
-    "  VALUE argv[#{argc.to_s}];",
-    "  int  argc;",
-    "  long buff[#{argc.to_s}];",
-    "",
-    subst_code,
-    "",
-    "  obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));",
-    "  proto = rb_ary_entry(obj, 0);",
-    "  proc  = rb_ary_entry(obj, 1);",
-    "  Check_Type(proto, T_STRING);",
-    "  if( RSTRING(proto)->len >= #{argc.to_s} )",
-    "    rb_raise(rb_eArgError, \"too many arguments\");",
-    "  rb_dl_scan_callback_args(buff, RSTRING(proto)->ptr, &argc, argv);",
-    "  retval = rb_funcall2(proc, id_call, argc, argv);",
-    "",
-    ret_code,
-    "}",
-  ].join("\n")
-
-  return code
-end
-
-DLTYPE.keys.sort.each{|t|
-  for n in 0..(MAX_CALLBACK - 1)
-    print(mkfunc(t, n, 15), "\n\n")
-  end
-}
diff --git a/ext/dl/mkcbtable.rb b/ext/dl/mkcbtable.rb
deleted file mode 100644
index 165c4bdc88..0000000000
--- a/ext/dl/mkcbtable.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def mktable(rettype, fnum, argc)
-  code =
-    "rb_dl_callback_table[#{rettype}][#{fnum}] = &rb_dl_callback_func_#{rettype.to_s}_#{fnum};"
-  return code
-end
-
-DLTYPE.keys.sort.each{|t|
-  for n in 0..(MAX_CALLBACK - 1)
-    print(mktable(t, n, 15), "\n")
-  end
-}
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
deleted file mode 100644
index 32f78c4de5..0000000000
--- a/ext/dl/ptr.c
+++ /dev/null
@@ -1,1065 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include <ctype.h>
-#include <version.h> /* for ruby version code */
-#include "dl.h"
-
-VALUE rb_cDLPtrData;
-VALUE rb_mDLMemorySpace;
-static VALUE DLMemoryTable;
-
-#ifndef T_SYMBOL
-# define T_SYMBOL T_FIXNUM
-#endif
-
-#if RUBY_VERSION_CODE < 171
-static VALUE
-rb_hash_delete(VALUE hash, VALUE key)
-{
-  return rb_funcall(hash, rb_intern("delete"), 1, key);
-}
-#endif
-
-static void
-rb_dlmem_delete(void *ptr)
-{
-  rb_secure(4);
-  rb_hash_delete(DLMemoryTable, DLLONG2NUM(ptr));
-}
-
-static void
-rb_dlmem_aset(void *ptr, VALUE obj)
-{
-  if (obj == Qnil) {
-    rb_dlmem_delete(ptr);
-  }
-  else{
-    rb_hash_aset(DLMemoryTable, DLLONG2NUM(ptr), DLLONG2NUM(obj));
-  }
-}
-
-static VALUE
-rb_dlmem_aref(void *ptr)
-{
-  VALUE val;
-
-  val = rb_hash_aref(DLMemoryTable, DLLONG2NUM(ptr));
-  return val == Qnil ? Qnil : (VALUE)DLNUM2LONG(val);
-}
-
-void
-dlptr_free(struct ptr_data *data)
-{
-  if (data->ptr) {
-    DEBUG_CODE({
-      printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n",
-	     data->ptr);
-    });
-    rb_dlmem_delete(data->ptr);
-    if (data->free) {
-      DEBUG_CODE({
-	printf("dlptr_free(): 0x%x(data->ptr:0x%x)\n",data->free,data->ptr);
-      });
-      (*(data->free))(data->ptr);
-    }
-  }
-  if (data->stype) dlfree(data->stype);
-  if (data->ssize) dlfree(data->ssize);
-  if (data->ids) dlfree(data->ids);
-}
-
-void
-dlptr_init(VALUE val)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(val, struct ptr_data, data);
-  DEBUG_CODE({
-    printf("dlptr_init(): add the pointer `0x%x' to the MemorySpace\n",
-	   data->ptr);
-  });
-  rb_dlmem_aset(data->ptr, val);
-  OBJ_TAINT(val);
-}
-
-VALUE
-rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
-{
-  struct ptr_data *data;
-  VALUE val;
-
-  rb_secure(4);
-  if (ptr) {
-    val = rb_dlmem_aref(ptr);
-    if (val == Qnil) {
-      val = Data_Make_Struct(klass, struct ptr_data,
-			     0, dlptr_free, data);
-      data->ptr = ptr;
-      data->free = func;
-      data->ctype = DLPTR_CTYPE_UNKNOWN;
-      data->stype = NULL;
-      data->ssize = NULL;
-      data->slen = 0;
-      data->size = size;
-      data->ids = NULL;
-      data->ids_num = 0;
-      dlptr_init(val);
-    }
-    else{
-      if (func) {
-	Data_Get_Struct(val, struct ptr_data, data);
-	data->free = func;
-      }
-    }
-  }
-  else{
-    val = Qnil;
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlptr_new(void *ptr, long size, freefunc_t func)
-{
-  return rb_dlptr_new2(rb_cDLPtrData, ptr, size, func);
-}
-
-VALUE
-rb_dlptr_malloc(long size, freefunc_t func)
-{
-  void *ptr;
-
-  rb_secure(4);
-  ptr = dlmalloc((size_t)size);
-  memset(ptr,0,(size_t)size);
-  return rb_dlptr_new(ptr, size, func);
-}
-
-void *
-rb_dlptr2cptr(VALUE val)
-{
-  struct ptr_data *data;
-  void *ptr;
-
-  if (rb_obj_is_kind_of(val, rb_cDLPtrData)) {
-    Data_Get_Struct(val, struct ptr_data, data);
-    ptr = data->ptr;
-  }
-  else if (val == Qnil) {
-    ptr = NULL;
-  }
-  else{
-    rb_raise(rb_eTypeError, "DL::PtrData was expected");
-  }
-    
-  return ptr;
-}
-
-static VALUE
-rb_dlptr_s_allocate(VALUE klass)
-{
-  VALUE obj;
-  struct ptr_data *data;
-
-  rb_secure(4);
-  obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data);
-  data->ptr = 0;
-  data->free = 0;
-  data->ctype = DLPTR_CTYPE_UNKNOWN;
-  data->stype = NULL;
-  data->ssize = NULL;
-  data->slen  = 0;
-  data->size  = 0;
-  data->ids   = NULL;
-  data->ids_num = 0;
-
-  return obj;
-}
-
-static VALUE
-rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
-{
-  VALUE ptr, sym, size;
-  struct ptr_data *data;
-  void *p = NULL;
-  freefunc_t f = NULL;
-  long s = 0;
-
-  switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
-  case 1:
-    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
-    break;
-  case 2:
-    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
-    s = DLNUM2LONG(size);
-    break;
-  case 3:
-    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
-    s = DLNUM2LONG(size);
-    f = rb_dlsym2csym(sym);
-    break;
-  default:
-    rb_bug("rb_dlptr_initialize");
-  }
-
-  if (p) {
-    Data_Get_Struct(self, struct ptr_data, data);
-    if (data->ptr && data->free) {
-      /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
-      (*(data->free))(data->ptr);
-    }
-    data->ptr  = p;
-    data->size = s;
-    data->free = f;
-  }
-
-  return Qnil;
-}
-
-static VALUE
-rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
-{
-  VALUE size, sym, obj;
-  int   s;
-  freefunc_t f = NULL;
-
-  switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
-  case 1:
-    s = NUM2INT(size);
-    break;
-  case 2:
-    s = NUM2INT(size);
-    f = rb_dlsym2csym(sym);
-    break;
-  default:
-    rb_bug("rb_dlptr_s_malloc");
-  }
-
-  obj = rb_dlptr_malloc(s,f);
-
-  return obj;
-}
-
-VALUE
-rb_dlptr_to_i(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return DLLONG2NUM(data->ptr);
-}
-
-VALUE
-rb_dlptr_ptr(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return rb_dlptr_new(*((void**)(data->ptr)),0,0);
-}
-
-VALUE
-rb_dlptr_ref(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return rb_dlptr_new(&(data->ptr),0,0);
-}
-
-VALUE
-rb_dlptr_null_p(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return data->ptr ? Qfalse : Qtrue;
-}
-
-VALUE
-rb_dlptr_free_set(VALUE self, VALUE val)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-
-  data->free = DLFREEFUNC(rb_dlsym2csym(val));
-
-  return Qnil;
-}
-
-VALUE
-rb_dlptr_free_get(VALUE self)
-{
-  struct ptr_data *pdata;
-
-  Data_Get_Struct(self, struct ptr_data, pdata);
-
-  return rb_dlsym_new(pdata->free,"(free)","0P");
-}
-
-VALUE
-rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
-{
-  struct ptr_data *data;
-  int n;
-  int i;
-  int t;
-  VALUE ary;
-  VALUE type, size;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-
-  switch (rb_scan_args(argc, argv, "11", &type, &size)) {
-  case 2:
-    t = StringValuePtr(type)[0];
-    n = NUM2INT(size);
-    break;
-  case 1:
-    t = StringValuePtr(type)[0];
-    switch (t) {
-    case 'C':
-      n = data->size;
-      break;
-    case 'H':
-      n = data->size / sizeof(short);
-      break;
-    case 'I':
-      n = data->size / sizeof(int);
-      break;
-    case 'L':
-      n = data->size / sizeof(long);
-      break;
-    case 'F':
-      n = data->size / sizeof(float);
-      break;
-    case 'D':
-      n = data->size / sizeof(double);
-      break;
-    case  'P': case 'p':
-      n = data->size / sizeof(void*);
-      break;
-    case 'S': case 's':
-      for (n=0; ((void**)(data->ptr))[n]; n++) {};
-      break;
-    default:
-	n = 0;
-    }
-    break;
-  default:
-    rb_bug("rb_dlptr_to_array");
-  }
-
-  ary = rb_ary_new();
-
-  for (i=0; i < n; i++) {
-    switch (t) {
-    case 'C':
-      rb_ary_push(ary, INT2NUM(((char*)(data->ptr))[i]));
-      break;
-    case 'H':
-      rb_ary_push(ary, INT2NUM(((short*)(data->ptr))[i]));
-      break;
-    case 'I':
-      rb_ary_push(ary, INT2NUM(((int*)(data->ptr))[i]));
-      break;
-    case 'L':
-      rb_ary_push(ary, DLLONG2NUM(((long*)(data->ptr))[i]));
-      break;
-    case 'D':
-      rb_ary_push(ary, rb_float_new(((double*)(data->ptr))[i]));
-      break;
-    case 'F':
-      rb_ary_push(ary, rb_float_new(((float*)(data->ptr))[i]));
-      break;
-    case 'S':
-      {
-	char *str = ((char**)(data->ptr))[i];
-	if (str) {
-	  rb_ary_push(ary, rb_tainted_str_new2(str));
-	}
-	else{
-	  rb_ary_push(ary, Qnil);
-	}
-      }
-      break;
-    case 's':
-      {
-	char *str = ((char**)(data->ptr))[i];
-	if (str) {
-	  rb_ary_push(ary, rb_tainted_str_new2(str));
-	  xfree(str);
-	}
-	else{
-	  rb_ary_push(ary, Qnil);
-	}
-      }
-      break;
-    case 'P':
-      rb_ary_push(ary, rb_dlptr_new(((void**)(data->ptr))[i],0,0));
-      break;
-    case 'p':
-      rb_ary_push(ary,
-		  rb_dlptr_new(((void**)(data->ptr))[i],0,dlfree));
-      break;
-    }
-  }
-
-  return ary;
-}
-
-
-VALUE
-rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
-{
-  struct ptr_data *data;
-  VALUE arg1, val;
-  int len;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  switch (rb_scan_args(argc, argv, "01", &arg1)) {
-  case 0:
-    val = rb_tainted_str_new2((char*)(data->ptr));
-    break;
-  case 1:
-    len = NUM2INT(arg1);
-    val = rb_tainted_str_new((char*)(data->ptr), len);
-    break;
-  default:
-    rb_bug("rb_dlptr_to_s");
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
-{
-  struct ptr_data *data;
-  VALUE arg1, val;
-  int len;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  switch (rb_scan_args(argc, argv, "01", &arg1)) {
-  case 0:
-    val = rb_tainted_str_new((char*)(data->ptr),data->size);
-    break;
-  case 1:
-    len = NUM2INT(arg1);
-    val = rb_tainted_str_new((char*)(data->ptr), len);
-    break;
-  default:
-    rb_bug("rb_dlptr_to_str");
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlptr_inspect(VALUE self)
-{
-  struct ptr_data *data;
-  char str[1024];
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  snprintf(str, 1023, "#<%s:0x%p ptr=0x%p size=%ld free=0x%p>",
-	   rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free);
-  return rb_str_new2(str);
-}
-
-VALUE
-rb_dlptr_eql(VALUE self, VALUE other)
-{
-  void *ptr1, *ptr2;
-  ptr1 = rb_dlptr2cptr(self);
-  ptr2 = rb_dlptr2cptr(other);
-
-  return ptr1 == ptr2 ? Qtrue : Qfalse;
-}
-
-VALUE
-rb_dlptr_cmp(VALUE self, VALUE other)
-{
-  void *ptr1, *ptr2;
-  ptr1 = rb_dlptr2cptr(self);
-  ptr2 = rb_dlptr2cptr(other);
-  return DLLONG2NUM((long)ptr1 - (long)ptr2);
-}
-
-VALUE
-rb_dlptr_plus(VALUE self, VALUE other)
-{
-  void *ptr;
-  long num, size;
-
-  ptr = rb_dlptr2cptr(self);
-  size = RDLPTR(self)->size;
-  num = DLNUM2LONG(other);
-  return rb_dlptr_new((char *)ptr + num, size - num, 0);
-}
-
-VALUE
-rb_dlptr_minus(VALUE self, VALUE other)
-{
-  void *ptr;
-  long num, size;
-
-  ptr = rb_dlptr2cptr(self);
-  size = RDLPTR(self)->size;
-  num = DLNUM2LONG(other);
-  return rb_dlptr_new((char *)ptr - num, size + num, 0);
-}
-
-VALUE
-rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
-{
-  VALUE data_type, type, rest, vid;
-  struct ptr_data *data;
-  int i, t, num;
-  char *ctype;
-
-  rb_scan_args(argc, argv, "11*", &data_type, &type, &rest);
-  Data_Get_Struct(self, struct ptr_data, data);
-
-  if (argc == 1 || (argc == 2 && type == Qnil)) {
-    if (NUM2INT(data_type) == DLPTR_CTYPE_UNKNOWN) {
-      data->ctype = DLPTR_CTYPE_UNKNOWN;
-      data->slen = 0;
-      data->ids_num  = 0;
-      if (data->stype) {
-	dlfree(data->stype);
-	data->stype = NULL;
-      }
-      if (data->ids) {
-	dlfree(data->ids);
-	data->ids = NULL;
-      }
-      return Qnil;
-    }
-    else{
-      rb_raise(rb_eArgError, "wrong arguments");
-    }
-  }
-
-  t = NUM2INT(data_type);
-  StringValue(type);
-  Check_Type(rest, T_ARRAY);
-  num = RARRAY(rest)->len;
-  for (i=0; i<num; i++) {
-    rb_to_id(rb_ary_entry(rest,i));
-  }
-
-  data->ctype = t;
-  data->slen = num;
-  data->ids_num  = num;
-  if (data->stype) dlfree(data->stype);
-  data->stype = (char*)dlmalloc(sizeof(char) * num);
-  if (data->ssize) dlfree(data->ssize);
-  data->ssize = (int*)dlmalloc(sizeof(int) * num);
-  if (data->ids) dlfree(data->ids);
-  data->ids  = (ID*)dlmalloc(sizeof(ID) * data->ids_num);
-
-  ctype = StringValuePtr(type);
-  for (i=0; i<num; i++) {
-    vid = rb_ary_entry(rest,i);
-    data->ids[i] = rb_to_id(vid);
-    data->stype[i] = *ctype;
-    ctype ++;
-    if (isdigit(*ctype)) {
-      char *p, *d;
-      for (p=ctype; isdigit(*p); p++) ;
-      d = ALLOCA_N(char, p - ctype + 1);
-      strncpy(d, ctype, p - ctype);
-      d[p - ctype] = '\0';
-      data->ssize[i] = atoi(d);
-      ctype = p;
-    }
-    else{
-      data->ssize[i] = 1;
-    }
-  }
-
-  if (*ctype) {
-    rb_raise(rb_eArgError, "too few/many arguments");
-  }
-
-  if (!data->size)
-    data->size = dlsizeof(RSTRING(type)->ptr);
-
-  return Qnil;
-}
-
-VALUE
-rb_dlptr_define_struct(int argc, VALUE argv[], VALUE self)
-{
-  VALUE *pass_argv;
-  int pass_argc, i;
-
-  pass_argc = argc + 1;
-  pass_argv = ALLOCA_N(VALUE, pass_argc);
-  pass_argv[0] = INT2FIX(DLPTR_CTYPE_STRUCT);
-  for (i=1; i<pass_argc; i++) {
-    pass_argv[i] = argv[i-1];
-  }
-  return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
-}
-
-VALUE
-rb_dlptr_define_union(int argc, VALUE argv[], VALUE self)
-{
-  VALUE *pass_argv;
-  int pass_argc, i;
-
-  pass_argc = argc + 1;
-  pass_argv = ALLOCA_N(VALUE, pass_argc);
-  pass_argv[0] = INT2FIX(DLPTR_CTYPE_UNION);
-  for (i=1; i<pass_argc; i++) {
-    pass_argv[i] = argv[i-1];
-  }
-  return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
-}
-
-VALUE
-rb_dlptr_get_data_type(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  if (data->stype)
-    return rb_assoc_new(INT2FIX(data->ctype),
-			rb_tainted_str_new(data->stype, data->slen));
-  else
-    return rb_assoc_new(INT2FIX(data->ctype), Qnil);
-}
-
-static VALUE
-cary2ary(void *ptr, char t, int len)
-{
-  VALUE ary;
-  VALUE elem;
-  int i;
-
-  if (len < 1)
-    return Qnil;
-
-  if (len == 1) {
-    switch (t) {
-    case 'I':
-      elem = INT2NUM(*((int*)ptr));
-      ptr = (char *)ptr + sizeof(int);
-      break;
-    case 'L':
-      elem = DLLONG2NUM(*((long*)ptr));
-      ptr = (char *)ptr + sizeof(long);
-      break;
-    case 'P':
-    case 'S':
-      elem = rb_dlptr_new(*((void**)ptr),0, 0);
-      ptr = (char *)ptr + sizeof(void*);
-      break;
-    case 'F':
-      elem = rb_float_new(*((float*)ptr));
-      ptr = (char *)ptr + sizeof(float);
-      break;
-    case 'D':
-      elem = rb_float_new(*((double*)ptr));
-      ptr = (char *)ptr + sizeof(double);
-      break;
-    case 'C':
-      elem = INT2NUM(*((char*)ptr));
-      ptr = (char *)ptr + sizeof(char);
-      break;
-    case 'H':
-      elem = INT2NUM(*((short*)ptr));
-      ptr = (char *)ptr + sizeof(short);
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
-    }
-    return elem;
-  }
-
-  ary = rb_ary_new();
-  for (i=0; i < len; i++) {
-    switch (t) {
-    case 'I':
-      elem = INT2NUM(*((int*)ptr));
-      ptr = (char *)ptr + sizeof(int);
-      break;
-    case 'L':
-      elem = DLLONG2NUM(*((long*)ptr));
-      ptr = (char *)ptr + sizeof(long);
-      break;
-    case 'P':
-    case 'S':
-      elem = rb_dlptr_new(*((void**)ptr), 0, 0);
-      ptr = (char *)ptr + sizeof(void*);
-      break;
-    case 'F':
-      elem = rb_float_new(*((float*)ptr));
-      ptr = (char *)ptr + sizeof(float);
-      break;
-    case 'D':
-      elem = rb_float_new(*((float*)ptr));
-      ptr = (char *)ptr + sizeof(double);
-      break;
-    case 'C':
-      elem = INT2NUM(*((char*)ptr));
-      ptr = (char *)ptr + sizeof(char);
-      break;
-    case 'H':
-      elem = INT2NUM(*((short*)ptr));
-      ptr = (char *)ptr + sizeof(short);
-      break;
-    default:
-      rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
-    }
-    rb_ary_push(ary, elem);
-  }
-
-  return ary;
-}
-
-VALUE
-rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
-{
-  VALUE key = Qnil, num = Qnil;
-  ID id;
-  struct ptr_data *data;
-  int i;
-  int offset;
-
-  if (rb_scan_args(argc, argv, "11", &key, &num) == 1) {
-    num = INT2NUM(0);
-  }
-
-  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
-    VALUE pass[1];
-    pass[0] = num;
-    return rb_dlptr_to_str(1, pass, rb_dlptr_plus(self, key));
-  }
-  rb_to_id(key);
-  if (! (TYPE(key) == T_STRING || TYPE(key) == T_SYMBOL)) {
-    rb_raise(rb_eTypeError, "the key must be a string or symbol");
-  }
-
-  id = rb_to_id(key);
-  Data_Get_Struct(self, struct ptr_data, data);
-  offset = 0;
-  switch (data->ctype) {
-  case DLPTR_CTYPE_STRUCT:
-    for (i=0; i < data->ids_num; i++) {
-      if (data->ids[i] == id) {
-	switch (data->stype[i]) {
-	case 'I':
-	  DLALIGN(data->ptr,offset,INT_ALIGN);
-	  break;
-	case 'L':
-	  DLALIGN(data->ptr,offset,LONG_ALIGN);
-	  break;
-	case 'P':
-	case 'S':
-	  DLALIGN(data->ptr,offset,VOIDP_ALIGN);
-	  break;
-	case 'F':
-	  DLALIGN(data->ptr,offset,FLOAT_ALIGN);
-	  break;
-	case 'D':
-	  DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
-	  break;
-	case 'C':
-	  break;
-	case 'H':
-	  DLALIGN(data->ptr,offset,SHORT_ALIGN);
-	  break;
-	default:
-	  rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-	}
-	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
-      }
-      switch (data->stype[i]) {
-      case 'I':
-	offset += sizeof(int) * data->ssize[i];
-	break;
-      case 'L':
-	offset += sizeof(long) * data->ssize[i];
-	break;
-      case 'P':
-      case 'S':
-	offset += sizeof(void*) * data->ssize[i];
-	break;
-      case 'F':
-	offset += sizeof(float) * data->ssize[i];
-	break;
-      case 'D':
-	offset += sizeof(double) * data->ssize[i];
-	break;
-      case 'C':
-	offset += sizeof(char) * data->ssize[i];
-	break;
-      case 'H':
-	offset += sizeof(short) * data->ssize[i];
-	break;
-      default:
-	rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-      }
-    }
-    break;
-  case DLPTR_CTYPE_UNION:
-    for (i=0; i < data->ids_num; i++) {
-      if (data->ids[i] == id) {
-	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
-      }
-    }
-    break;
-  } /* end of switch */
-
-  rb_raise(rb_eNameError, "undefined key `%s' for %s",
-	   rb_id2name(id), rb_class2name(CLASS_OF(self)));
-
-  return Qnil;
-}
-
-static void *
-ary2cary(char t, VALUE val, long *size)
-{
-  void *ptr;
-
-  if (TYPE(val) == T_ARRAY) {
-    ptr = rb_ary2cary(t, val, size);
-  }
-  else{
-    ptr = rb_ary2cary(t, rb_ary_new3(1, val), size);
-  }
-  return ptr;
-}
-
-VALUE
-rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
-{
-  VALUE key = Qnil, num = Qnil, val = Qnil;
-  ID id;
-  struct ptr_data *data;
-  int i;
-  int offset;
-  long memsize;
-  void *memimg;
-
-  rb_secure(4);
-  switch (rb_scan_args(argc, argv, "21", &key, &num, &val)) {
-  case 2:
-    val = num;
-    num = Qnil;
-    break;
-  }
-
-  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
-    void *dst, *src;
-    long len;
-
-    StringValue(val);
-    Data_Get_Struct(self, struct ptr_data, data);
-    dst = (void*)((long)(data->ptr) + DLNUM2LONG(key));
-    src = RSTRING(val)->ptr;
-    len = RSTRING(val)->len;
-    if (num == Qnil) {
-      memcpy(dst, src, len);
-    }
-    else{
-      long n = NUM2INT(num);
-      memcpy(dst, src, n < len ? n : len);
-      if (n > len) MEMZERO((char*)dst + len, char, n - len);
-    }
-    return val;
-  }
-
-  id = rb_to_id(key);
-  Data_Get_Struct(self, struct ptr_data, data);
-  switch (data->ctype) {
-  case DLPTR_CTYPE_STRUCT:
-    offset = 0;
-    for (i=0; i < data->ids_num; i++) {
-      if (data->ids[i] == id) {
-	switch (data->stype[i]) {
-	case 'I':
-	  DLALIGN(data->ptr,offset,INT_ALIGN);
-	  break;
-	case 'L':
-	  DLALIGN(data->ptr,offset,LONG_ALIGN);
-	  break;
-	case 'P':
-	case 'S':
-	  DLALIGN(data->ptr,offset,VOIDP_ALIGN);
-	  break;
-	case 'D':
-	  DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
-	  break;
-	case 'F':
-	  DLALIGN(data->ptr,offset,FLOAT_ALIGN);
-	  break;
-	case 'C':
-	  break;
-	case 'H':
-	  DLALIGN(data->ptr,offset,SHORT_ALIGN);
-	  break;
-	default:
-	  rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-	}
-	memimg = ary2cary(data->stype[i], val, &memsize);
-	memcpy((char *)data->ptr + offset, memimg, memsize);
-	return val;
-      }
-      switch (data->stype[i]) {
-      case 'I':
-      case 'i':
-	offset += sizeof(int) * data->ssize[i];
-	break;
-      case 'L':
-      case 'l':
-	offset += sizeof(long) * data->ssize[i];
-	break;
-      case 'P':
-      case 'p':
-      case 'S':
-      case 's':
-	offset += sizeof(void*) * data->ssize[i];
-	break;
-      case 'D':
-      case 'd':
-	offset += sizeof(double) * data->ssize[i];
-	break;
-      case 'F':
-      case 'f':
-	offset += sizeof(float) * data->ssize[i];
-	break;
-      case 'C':
-      case 'c':
-	offset += sizeof(char) * data->ssize[i];
-	break;
-      case 'H':
-      case 'h':
-	offset += sizeof(short) * data->ssize[i];
-	break;
-      default:
-	rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-      }
-    }
-    return val;
-    /* break; */
-  case DLPTR_CTYPE_UNION:
-    for (i=0; i < data->ids_num; i++) {
-      if (data->ids[i] == id) {
-	switch (data->stype[i]) {
-	case 'I': case 'i':
-	  memsize = sizeof(int) * data->ssize[i];
-	  break;
-	case 'L': case 'l':
-	  memsize = sizeof(long) * data->ssize[i];
-	  break;
-	case 'P': case 'p':
-	case 'S': case 's':
-	  memsize = sizeof(void*) * data->ssize[i];
-	  break;
-	case 'F': case 'f':
-	  memsize = sizeof(float) * data->ssize[i];
-	  break;
-	case 'D': case 'd':
-	  memsize = sizeof(double) * data->ssize[i];
-	  break;
-	case 'C': case 'c':
-	  memsize = sizeof(char) * data->ssize[i];
-	  break;
-	case 'H': case 'h':
-	  memsize = sizeof(short) * data->ssize[i];
-	  break;
-	default:
-	  rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-	}
-	memimg = ary2cary(data->stype[i], val, NULL);
-	memcpy(data->ptr, memimg, memsize);
-      }
-    }
-    return val;
-    /* break; */
-  }
-
-  rb_raise(rb_eNameError, "undefined key `%s' for %s",
-	   rb_id2name(id), rb_class2name(CLASS_OF(self)));
-
-  return Qnil;
-}
-
-VALUE
-rb_dlptr_size(int argc, VALUE argv[], VALUE self)
-{
-  VALUE size;
-
-  if (rb_scan_args(argc, argv, "01", &size) == 0){
-    return DLLONG2NUM(RDLPTR(self)->size);
-  }
-  else{
-    RDLPTR(self)->size = DLNUM2LONG(size);
-    return size;
-  }
-}
-
-static VALUE
-dlmem_each_i(VALUE assoc, void *data)
-{
-  VALUE key, val;
-  key = rb_ary_entry(assoc, 0);
-  val = rb_ary_entry(assoc, 1);
-  rb_yield(rb_assoc_new(key,(VALUE)DLNUM2LONG(val)));
-  return Qnil;
-}
-
-VALUE
-rb_dlmem_each(VALUE self)
-{
-  rb_iterate(rb_each, DLMemoryTable, dlmem_each_i, 0);
-  return Qnil;
-}
-
-void
-Init_dlptr()
-{
-  rb_cDLPtrData = rb_define_class_under(rb_mDL, "PtrData", rb_cObject);
-  rb_define_alloc_func(rb_cDLPtrData, rb_dlptr_s_allocate);
-  rb_define_singleton_method(rb_cDLPtrData, "malloc", rb_dlptr_s_malloc, -1);
-  rb_define_method(rb_cDLPtrData, "initialize", rb_dlptr_initialize, -1);
-  rb_define_method(rb_cDLPtrData, "free=", rb_dlptr_free_set, 1);
-  rb_define_method(rb_cDLPtrData, "free",  rb_dlptr_free_get, 0);
-  rb_define_method(rb_cDLPtrData, "to_i",  rb_dlptr_to_i, 0);
-  rb_define_method(rb_cDLPtrData, "ptr",   rb_dlptr_ptr, 0);
-  rb_define_method(rb_cDLPtrData, "+@", rb_dlptr_ptr, 0);
-  rb_define_method(rb_cDLPtrData, "ref",   rb_dlptr_ref, 0);
-  rb_define_method(rb_cDLPtrData, "-@", rb_dlptr_ref, 0);
-  rb_define_method(rb_cDLPtrData, "null?", rb_dlptr_null_p, 0);
-  rb_define_method(rb_cDLPtrData, "to_a", rb_dlptr_to_array, -1);
-  rb_define_method(rb_cDLPtrData, "to_s", rb_dlptr_to_s, -1);
-  rb_define_method(rb_cDLPtrData, "to_str", rb_dlptr_to_str, -1);
-  rb_define_method(rb_cDLPtrData, "inspect", rb_dlptr_inspect, 0);
-  rb_define_method(rb_cDLPtrData, "<=>", rb_dlptr_cmp, 1);
-  rb_define_method(rb_cDLPtrData, "==", rb_dlptr_eql, 1);
-  rb_define_method(rb_cDLPtrData, "eql?", rb_dlptr_eql, 1);
-  rb_define_method(rb_cDLPtrData, "+", rb_dlptr_plus, 1);
-  rb_define_method(rb_cDLPtrData, "-", rb_dlptr_minus, 1);
-  rb_define_method(rb_cDLPtrData, "define_data_type",
-		   rb_dlptr_define_data_type, -1);
-  rb_define_method(rb_cDLPtrData, "struct!", rb_dlptr_define_struct, -1);
-  rb_define_method(rb_cDLPtrData, "union!",  rb_dlptr_define_union,  -1);
-  rb_define_method(rb_cDLPtrData, "data_type", rb_dlptr_get_data_type, 0);
-  rb_define_method(rb_cDLPtrData, "[]", rb_dlptr_aref, -1);
-  rb_define_method(rb_cDLPtrData, "[]=", rb_dlptr_aset, -1);
-  rb_define_method(rb_cDLPtrData, "size", rb_dlptr_size, -1);
-  rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);
-
-  rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");
-  DLMemoryTable = rb_hash_new();
-  rb_define_const(rb_mDLMemorySpace, "MemoryTable", DLMemoryTable);
-  rb_define_module_function(rb_mDLMemorySpace, "each", rb_dlmem_each, 0);
-}
diff --git a/ext/dl/sample/c++sample.C b/ext/dl/sample/c++sample.C
deleted file mode 100644
index d083d337a7..0000000000
--- a/ext/dl/sample/c++sample.C
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <stdio.h>
-
-class Person {
-private:
-  const char *name;
-  int age;
-
-public:
-  Person(const char *name, int age);
-  const char * get_name();
-  int get_age();
-  void set_age(int i);
-};
-
-Person::Person(const char *name, int age)
-  : name(name), age(age)
-{
-  /* empty */
-}
-
-const char *
-Person::get_name()
-{
-  return name;
-}
-
-int
-Person::get_age(){
-  return age;
-}
-
-void
-Person::set_age(int i){
-  age = i;
-}
diff --git a/ext/dl/sample/c++sample.rb b/ext/dl/sample/c++sample.rb
deleted file mode 100644
index 29887df845..0000000000
--- a/ext/dl/sample/c++sample.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-=begin
- This script shows how to deal with C++ classes using Ruby/DL.
- You must build a dynamic loadable library using "c++sample.C"
- to run this script as follows:
-   $ g++ -o libsample.so -shared c++sample.C
-=end
-
-require 'dl'
-require 'dl/import'
-require 'dl/struct'
-
-# Give a name of dynamic loadable library
-LIBNAME = ARGV[0] || "libsample.so"
-
-class Person
-  module Core
-    extend DL::Importable
-    
-    dlload LIBNAME
-
-    # mangled symbol names
-    extern "void __6PersonPCci(void *, const char *, int)"
-    extern "const char *get_name__6Person(void *)"
-    extern "int get_age__6Person(void *)"
-    extern "void set_age__6Personi(void *, int)"
-
-    Data = struct [
-      "char *name",
-      "int age",
-    ]
-  end
-
-  def initialize(name, age)
-    @ptr = Core::Data.alloc
-    Core::__6PersonPCci(@ptr, name, age)
-  end
-
-  def get_name()
-    str = Core::get_name__6Person(@ptr)
-    if( str )
-      str.to_s
-    else
-      nil
-    end
-  end
-
-  def get_age()
-    Core::get_age__6Person(@ptr)
-  end
-
-  def set_age(age)
-    Core::set_age__6Personi(@ptr, age)
-  end
-end
-
-obj = Person.new("ttate", 1)
-p obj.get_name()
-p obj.get_age()
-obj.set_age(10)
-p obj.get_age()
diff --git a/ext/dl/sample/drives.rb b/ext/dl/sample/drives.rb
deleted file mode 100644
index 8a590404b1..0000000000
--- a/ext/dl/sample/drives.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- ruby -*-
-# drives.rb -- find existing drives and show the drive type.
-
-require 'dl'
-require 'dl/import'
-
-module Kernel32
-  extend DL::Importable
-
-  dlload "kernel32"
-
-  extern "long GetLogicalDrives()"
-  extern "int GetDriveType(char*)"
-  extern "long GetDiskFreeSpace(char*, long ref, long ref, long ref, long ref)"
-end
-
-include Kernel32
-
-buff = Kernel32.getLogicalDrives()
-
-i = 0
-ds = []
-while( i < 26 )
-  mask = (1 << i)
-  if( buff & mask > 0 )
-    ds.push((65+i).chr)
-  end
-  i += 1
-end
-
-=begin
-From the cygwin's /usr/include/w32api/winbase.h:
-#define DRIVE_UNKNOWN 0
-#define DRIVE_NO_ROOT_DIR 1
-#define DRIVE_REMOVABLE 2
-#define DRIVE_FIXED 3
-#define DRIVE_REMOTE 4
-#define DRIVE_CDROM 5
-#define DRIVE_RAMDISK 6
-=end
-
-types = [
-  "unknown",
-  "no root dir",
-  "Removable",
-  "Fixed", 
-  "Remote",
-  "CDROM",
-  "RAM",
-]
-print("Drive : Type (Free Space/Available Space)\n")
-ds.each{|d|
-  t = Kernel32.getDriveType(d + ":\\")
-  Kernel32.getDiskFreeSpace(d + ":\\", 0, 0, 0, 0)
-  _,sec_per_clus,byte_per_sec,free_clus,total_clus = Kernel32._args_
-  fbytes = sec_per_clus * byte_per_sec * free_clus
-  tbytes = sec_per_clus * byte_per_sec * total_clus
-  unit = "B"
-  if( fbytes > 1024 && tbytes > 1024 )
-    fbytes = fbytes / 1024
-    tbytes = tbytes / 1024
-    unit = "K"
-  end
-  if( fbytes > 1024 && tbytes > 1024 )
-    fbytes = fbytes / 1024
-    tbytes = tbytes / 1024
-    unit = "M"
-  end
-  print("#{d} : #{types[t]} (#{fbytes} #{unit}/#{tbytes} #{unit})\n")
-}
diff --git a/ext/dl/sample/getch.rb b/ext/dl/sample/getch.rb
deleted file mode 100644
index 3f7261c979..0000000000
--- a/ext/dl/sample/getch.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'dl'
-
-crtdll = DL::dlopen("crtdll")
-getch  = crtdll['_getch', 'L']
-print(getch.call, "\n")
diff --git a/ext/dl/sample/libc.rb b/ext/dl/sample/libc.rb
deleted file mode 100644
index a1f6fbe543..0000000000
--- a/ext/dl/sample/libc.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require "dl/import"
-require "dl/struct"
-
-module LIBC
-  extend DL::Importable
-
-  begin
-    dlload "libc.so.6"
-  rescue
-    dlload "libc.so.5"
-  end
-
-  extern "int atoi(char*)"
-  extern "ibool isdigit(int)"
-  extern "int gettimeofday(struct timeval *, struct timezone *)"
-  extern "char* strcat(char*, char*)"
-  extern "FILE* fopen(char*, char*)"
-  extern "int fclose(FILE*)"
-  extern "int fgetc(FILE*)"
-  extern "int strlen(char*)"
-  extern "void qsort(void*, int, int, void*)"
-
-  def str_qsort(ary, comp)
-    len = ary.length
-    r,rs = qsort(ary, len, DL.sizeof('P'), comp)
-    return rs[0].to_a('S', len)
-  end
-
-  Timeval = struct [
-    "long tv_sec",
-    "long tv_usec",
-  ]
-
-  Timezone = struct [
-    "int tz_minuteswest",
-    "int tz_dsttime",
-  ]
-
-  def my_compare(ptr1, ptr2)
-    ptr1.ptr.to_s <=> ptr2.ptr.to_s
-  end
-  COMPARE = callback("int my_compare(char**, char**)")
-end
-
-
-$cb1 = DL.callback('IPP'){|ptr1, ptr2|
-  str1 = ptr1.ptr.to_s
-  str2 = ptr2.ptr.to_s
-  str1 <=> str2
-}
-
-p LIBC.atoi("10")
-
-p LIBC.isdigit(?1)
-
-p LIBC.isdigit(?a)
-
-p LIBC.strcat("a", "b")
-
-ary = ["a","c","b"]
-ptr = ary.to_ptr
-LIBC.qsort(ptr, ary.length, DL.sizeof('P'), LIBC::COMPARE)
-p ptr.to_a('S', ary.length)
-
-tv = LIBC::Timeval.malloc
-tz = LIBC::Timezone.malloc
-LIBC.gettimeofday(tv, tz)
-
-p Time.at(tv.tv_sec)
diff --git a/ext/dl/sample/msgbox.rb b/ext/dl/sample/msgbox.rb
deleted file mode 100644
index 091e646091..0000000000
--- a/ext/dl/sample/msgbox.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# This script works on Windows.
-
-require 'dl'
-
-User32 = DL.dlopen("user32")
-Kernel32 = DL.dlopen("kernel32")
-
-MB_OK = 0
-MB_OKCANCEL = 1
-
-message_box = User32['MessageBoxA', 'ILSSI']
-r,rs = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
-
-case r
-when 1
-  print("OK!\n")
-when 2
-  print("Cancel!\n")
-end
diff --git a/ext/dl/sample/msgbox2.rb b/ext/dl/sample/msgbox2.rb
deleted file mode 100644
index e49846cc5e..0000000000
--- a/ext/dl/sample/msgbox2.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# This script works on Windows.
-
-require 'dl/win32'
-
-MB_OK = 0
-MB_OKCANCEL = 1
-
-message_box = Win32API.new("user32",'MessageBoxA', 'ISSI', 'I')
-r = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
-
-case r
-when 1
-  print("OK!\n")
-when 2
-  print("Cancel!\n")
-else
-  p r
-end
diff --git a/ext/dl/sample/stream.rb b/ext/dl/sample/stream.rb
deleted file mode 100644
index 179836999d..0000000000
--- a/ext/dl/sample/stream.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- ruby -*-
-# Display a file name and stream names of a file with those size.
-
-require 'dl'
-require 'dl/import'
-
-module NTFS
-  extend DL::Importable
-
-  dlload "kernel32.dll"
-
-  OPEN_EXISTING         = 3
-  GENERIC_READ          = 0x80000000
-  BACKUP_DATA           = 0x00000001
-  BACKUP_ALTERNATE_DATA = 0x00000004
-  FILE_SHARE_READ       = 0x00000001
-  FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
-
-  typealias "LPSECURITY_ATTRIBUTES", "void*"
-
-  extern "BOOL BackupRead(HANDLE, PBYTE, DWORD, PDWORD, BOOL, BOOL, PVOID)"
-  extern "BOOL BackupSeek(HANDLE, DWORD, DWORD, PDWORD, PDWORD, PVOID)"
-  extern "BOOL CloseHandle(HANDLE)"
-  extern "HANDLE CreateFile(LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES,
-                            DWORD, DWORD, HANDLE)"
-
-  module_function
-
-  def streams(filename)
-    status = []
-    h = createFile(filename,GENERIC_READ,FILE_SHARE_READ,nil,
-		   OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,0)
-    if( h != 0 )
-      begin
-	# allocate the memory for backup data used in backupRead().
-	data = DL.malloc(DL.sizeof("L5"))
-	data.struct!("LLLLL", :id, :attrs, :size_low, :size_high, :name_size)
-
-	# allocate memories for references to long values used in backupRead().
-	context = DL.malloc(DL.sizeof("L"))
-	lval = DL.malloc(DL.sizeof("L"))
-
-	while( backupRead(h, data, data.size, lval, false, false, context) )
-	  size = data[:size_low] + (data[:size_high] << (DL.sizeof("I") * 8))
-	  case data[:id]
-	  when BACKUP_ALTERNATE_DATA
-	    stream_name = DL.malloc(data[:name_size])
-	    backupRead(h, stream_name, stream_name.size,
-		       lval, false, false, context)
-	    name = stream_name[0, stream_name.size]
-	    name.tr!("\000","")
-	    if( name =~ /^:(.*?):.*$/ )
-	      status.push([$1,size])
-	    end
-	  when BACKUP_DATA
-	    status.push([nil,size])
-	  else
-	    raise(RuntimeError, "unknown data type #{data[:id]}.")
-	  end
-	  l1 = DL.malloc(DL.sizeof("L"))
-	  l2 = DL.malloc(DL.sizeof("L"))
-	  if( !backupSeek(h, data[:size_low], data[:size_high], l1, l2, context) )
-	    break
-	  end
-	end
-      ensure
-	backupRead(h, nil, 0, lval, true, false, context)
-	closeHandle(h)
-      end
-      return status
-    else
-      raise(RuntimeError, "can't open #{filename}.\n")
-    end
-  end
-end
-
-ARGV.each{|filename|
-  if( File.exist?(filename) )
-    NTFS.streams(filename).each{|name,size|
-      if( name )
-	print("#{filename}:#{name}\t#{size}bytes\n")
-      else
-	print("#{filename}\t#{size}bytes\n")
-      end
-    }
-  end
-}
diff --git a/ext/dl/sym.c b/ext/dl/sym.c
deleted file mode 100644
index 4a2d736465..0000000000
--- a/ext/dl/sym.c
+++ /dev/null
@@ -1,838 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include "dl.h"
-
-VALUE rb_cDLSymbol;
-
-static const char *
-char2type(int ch)
-{
-  switch (ch) {
-  case '0':
-    return "void";
-  case 'P':
-    return "void *";
-  case 'p':
-    return "void *";
-  case 'C':
-    return "char";
-  case 'c':
-    return "char *";
-  case 'H':
-    return "short";
-  case 'h':
-    return "short *";
-  case 'I':
-    return "int";
-  case 'i':
-    return "int *";
-  case 'L':
-    return "long";
-  case 'l':
-    return "long *";
-  case 'F':
-    return "double";
-  case 'f':
-    return "double *";
-  case 'D':
-    return "double";
-  case 'd':
-    return "double *";
-  case 'S':
-    return "const char *";
-  case 's':
-    return "char *";
-  case 'A':
-    return "[]";
-  case 'a':
-    return "[]"; /* ?? */
-  }
-  return NULL;
-}
-
-void
-dlsym_free(struct sym_data *data)
-{
-  if( data->name ){
-    DEBUG_CODE({
-      printf("dlsym_free(): free(data->name:%s)\n",data->name);
-    });
-    free(data->name);
-  }
-  if( data->type ){
-    DEBUG_CODE({
-      printf("dlsym_free(): free(data->type:%s)\n",data->type);
-    });
-    free(data->type);
-  }
-}
-
-VALUE
-rb_dlsym_new(void (*func)(), const char *name, const char *type)
-{
-  VALUE val;
-  struct sym_data *data;
-  const char *ptype;
-
-  rb_secure(4);
-  if( !type || !type[0] ){
-    return rb_dlptr_new((void*)func, 0, 0);
-  }
-
-  for( ptype = type; *ptype; ptype ++ ){
-    if( ! char2type(*ptype) ){
-      rb_raise(rb_eDLTypeError, "unknown type specifier '%c'", *ptype);
-    }
-  }
-
-  if( func ){
-    val = Data_Make_Struct(rb_cDLSymbol, struct sym_data, 0, dlsym_free, data);
-    data->func = func;
-    data->name = name ? strdup(name) : NULL;
-    data->type = type ? strdup(type) : NULL;
-    data->len  = type ? strlen(type) : 0;
-#if !(defined(DLSTACK))
-    if( data->len - 1 > MAX_ARG ){
-      rb_raise(rb_eDLError, "maximum number of arguments is %d.", MAX_ARG);
-    }
-#endif
-  }
-  else{
-    val = Qnil;
-  }
-
-  return val;
-}
-
-freefunc_t
-rb_dlsym2csym(VALUE val)
-{
-  struct sym_data *data;
-  freefunc_t func;
-
-  if( rb_obj_is_kind_of(val, rb_cDLSymbol) ){
-    Data_Get_Struct(val, struct sym_data, data);
-    func = data->func;
-  }
-  else if( val == Qnil ){
-    func = NULL;
-  }
-  else{
-    rb_raise(rb_eTypeError, "DL::Symbol was expected");
-  }
-
-  return func;
-}
-
-VALUE
-rb_dlsym_s_allocate(VALUE klass)
-{
-  VALUE obj;
-  struct sym_data *data;
-
-  obj = Data_Make_Struct(klass, struct sym_data, 0, dlsym_free, data);
-  data->func = 0;
-  data->name = 0;
-  data->type = 0;
-  data->len  = 0;
-
-  return obj;
-}
-
-VALUE
-rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
-{
-  VALUE addr, name, type;
-  struct sym_data *data;
-  void *saddr;
-  const char *sname, *stype;
-
-  rb_scan_args(argc, argv, "12", &addr, &name, &type);
-
-  saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
-  sname = NIL_P(name) ? NULL : StringValuePtr(name);
-  stype = NIL_P(type) ? NULL : StringValuePtr(type);
-
-  if( saddr ){
-    Data_Get_Struct(self, struct sym_data, data);
-    if( data->name ) free(data->name);
-    if( data->type ) free(data->type);
-    data->func = saddr;
-    data->name = sname ? strdup(sname) : 0;
-    data->type = stype ? strdup(stype) : 0;
-    data->len  = stype ? strlen(stype) : 0;
-  }
-
-  return Qnil;
-}
-
-VALUE
-rb_s_dlsym_char2type(VALUE self, VALUE ch)
-{
-  const char *type;
-
-  type = char2type(StringValuePtr(ch)[0]);
-
-  if (type == NULL)
-    return Qnil;
-  else
-    return rb_str_new2(type);
-}
-
-VALUE
-rb_dlsym_name(VALUE self)
-{
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  return sym->name ? rb_tainted_str_new2(sym->name) : Qnil;
-}
-
-VALUE
-rb_dlsym_proto(VALUE self)
-{
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  return sym->type ? rb_tainted_str_new2(sym->type) : Qnil;
-}
-
-VALUE
-rb_dlsym_cproto(VALUE self)
-{
-  struct sym_data *sym;
-  const char *ptype, *typestr;
-  size_t len;
-  VALUE val;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-
-  ptype = sym->type;
-
-  if( ptype ){
-    typestr = char2type(*ptype++);
-    len = strlen(typestr);
-    
-    val = rb_tainted_str_new(typestr, len);
-    if (typestr[len - 1] != '*')
-      rb_str_cat(val, " ", 1);
-
-    if( sym->name ){
-      rb_str_cat2(val, sym->name);
-    }
-    else{
-      rb_str_cat2(val, "(null)");
-    }
-    rb_str_cat(val, "(", 1);
-    
-    while (*ptype) {
-      const char *ty = char2type(*ptype++);
-      rb_str_cat2(val, ty);
-      if (*ptype)
-	rb_str_cat(val, ", ", 2);
-    }
-
-    rb_str_cat(val, ");", 2);
-  }
-  else{
-    val = rb_tainted_str_new2("void (");
-    if( sym->name ){
-      rb_str_cat2(val, sym->name);
-    }
-    else{
-      rb_str_cat2(val, "(null)");
-    }
-    rb_str_cat2(val, ")()");
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlsym_inspect(VALUE self)
-{
-  VALUE proto;
-  VALUE val;
-  char  *str;
-  int str_size;
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  proto = rb_dlsym_cproto(self);
-
-  str_size = RSTRING(proto)->len + 100;
-  str = dlmalloc(str_size);
-  snprintf(str, str_size - 1,
-	   "#<DL::Symbol:0x%p func=0x%p '%s'>",
-	   sym, sym->func, RSTRING(proto)->ptr);
-  val = rb_tainted_str_new2(str);
-  dlfree(str);
-
-  return val;
-}
-
-static int
-stack_size(struct sym_data *sym)
-{
-  int i;
-  int size;
-
-  size = 0;
-  for( i=1; i < sym->len; i++ ){
-    switch(sym->type[i]){
-    case 'C':
-    case 'H':
-    case 'I':
-    case 'L':
-      size += sizeof(long);
-      break;
-    case 'F':
-      size += sizeof(float);
-      break;
-    case 'D':
-      size += sizeof(double);
-      break;
-    case 'c':
-    case 'h':
-    case 'i':
-    case 'l':
-    case 'f':
-    case 'd':
-    case 'p':
-    case 'P':
-    case 's':
-    case 'S':
-    case 'a':
-    case 'A':
-      size += sizeof(void*);
-      break;
-    default:
-      return -(sym->type[i]);
-    }
-  }
-  return size;
-}
-
-VALUE
-rb_dlsym_call(int argc, VALUE argv[], VALUE self)
-{
-  struct sym_data *sym;
-  ANY_TYPE *args;
-  ANY_TYPE *dargs;
-  ANY_TYPE ret;
-  int   *dtypes;
-  VALUE val;
-  VALUE dvals;
-  int i;
-  long ftype;
-  void *func;
-
-  rb_secure_update(self);
-  Data_Get_Struct(self, struct sym_data, sym);
-  DEBUG_CODE({
-    printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func);
-  });
-  if( (sym->len - 1) != argc ){
-    rb_raise(rb_eArgError, "%d arguments are needed", sym->len - 1);
-  }
-
-  ftype = 0;
-  dvals = Qnil;
-
-  args = ALLOC_N(ANY_TYPE, sym->len - 1);
-  dargs = ALLOC_N(ANY_TYPE, sym->len - 1);
-  dtypes = ALLOC_N(int, sym->len - 1);
-#define FREE_ARGS {xfree(args); xfree(dargs); xfree(dtypes);}
-
-  for( i = sym->len - 2; i >= 0; i-- ){
-    dtypes[i] = 0;
-
-    switch( sym->type[i+1] ){
-    case 'p':
-      dtypes[i] = 'p';
-    case 'P':
-      {
-	struct ptr_data *data;
-	VALUE pval;
-
-	if( argv[i] == Qnil ){
-	  ANY2P(args[i]) = DLVOIDP(0);
-	}
-	else{
-	  if( rb_obj_is_kind_of(argv[i], rb_cDLPtrData) ){
-	    pval = argv[i];
-	  }
-	  else{
-	    pval = rb_funcall(argv[i], rb_intern("to_ptr"), 0);
-	    if( !rb_obj_is_kind_of(pval, rb_cDLPtrData) ){
-	      rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i);
-	    }
-	  }
-	  Data_Get_Struct(pval, struct ptr_data, data);
-	  ANY2P(args[i]) = DLVOIDP(data->ptr);
-	}
-      }
-      PUSH_P(ftype);
-      break;
-    case 'a':
-      dtypes[i] = 'a';
-    case 'A':
-      if( argv[i] == Qnil ){
-	ANY2P(args[i]) = DLVOIDP(0);
-      }
-      else{
-	ANY2P(args[i]) = DLVOIDP(rb_ary2cary(0, argv[i], NULL));
-      }
-      PUSH_P(ftype);
-      break;
-    case 'C':
-      ANY2C(args[i]) = DLCHAR(NUM2CHR(argv[i]));
-      PUSH_C(ftype);
-      break;
-    case 'c':
-      ANY2C(dargs[i]) = DLCHAR(NUM2CHR(argv[i]));
-      ANY2P(args[i]) = DLVOIDP(&(ANY2C(dargs[i])));
-      dtypes[i] = 'c';
-      PUSH_P(ftype);
-      break;
-    case 'H':
-      ANY2H(args[i]) = DLSHORT(NUM2CHR(argv[i]));
-      PUSH_C(ftype);
-      break;
-    case 'h':
-      ANY2H(dargs[i]) = DLSHORT(NUM2CHR(argv[i]));
-      ANY2P(args[i]) = DLVOIDP(&(ANY2H(dargs[i])));
-      dtypes[i] = 'h';
-      PUSH_P(ftype);
-      break;
-    case 'I':
-      ANY2I(args[i]) = DLINT(NUM2INT(argv[i]));
-      PUSH_I(ftype);
-      break;
-    case 'i':
-      ANY2I(dargs[i]) = DLINT(NUM2INT(argv[i]));
-      ANY2P(args[i]) = DLVOIDP(&(ANY2I(dargs[i])));
-      dtypes[i] = 'i';
-      PUSH_P(ftype);
-      break;
-    case 'L':
-      ANY2L(args[i]) = DLNUM2LONG(argv[i]);
-      PUSH_L(ftype);
-      break;
-    case 'l':
-      ANY2L(dargs[i]) = DLNUM2LONG(argv[i]);
-      ANY2P(args[i]) = DLVOIDP(&(ANY2L(dargs[i])));
-      dtypes[i] = 'l';
-      PUSH_P(ftype);
-      break;
-    case 'F':
-      Check_Type(argv[i], T_FLOAT);
-      ANY2F(args[i]) = DLFLOAT(RFLOAT(argv[i])->value);
-      PUSH_F(ftype);
-      break;
-    case 'f':
-      Check_Type(argv[i], T_FLOAT);
-      ANY2F(dargs[i]) = DLFLOAT(RFLOAT(argv[i])->value);
-      ANY2P(args[i]) = DLVOIDP(&(ANY2F(dargs[i])));
-      dtypes[i] = 'f';
-      PUSH_P(ftype);
-      break;
-    case 'D':
-      Check_Type(argv[i], T_FLOAT);
-      ANY2D(args[i]) = RFLOAT(argv[i])->value;
-      PUSH_D(ftype);
-      break;
-    case 'd':
-      Check_Type(argv[i], T_FLOAT);
-      ANY2D(dargs[i]) = RFLOAT(argv[i])->value;
-      ANY2P(args[i]) = DLVOIDP(&(ANY2D(dargs[i])));
-      dtypes[i] = 'd';
-      PUSH_P(ftype);
-      break;
-    case 'S':
-      if( argv[i] == Qnil ){
-	ANY2S(args[i]) = DLSTR(0);
-      }
-      else{
-	VALUE str = argv[i];
-	SafeStringValue(str);
-	ANY2S(args[i]) = DLSTR(RSTRING(str)->ptr);
-      }
-      PUSH_P(ftype);
-      break;
-    case 's':
-      {
-	VALUE str = argv[i];
-	SafeStringValue(str);
-	ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(str)->len + 1));
-	memcpy((char*)(ANY2S(args[i])), RSTRING(str)->ptr, RSTRING(str)->len + 1);
-	dtypes[i] = 's';
-      }
-      PUSH_P(ftype);
-      break;
-    default:
-      FREE_ARGS;
-      rb_raise(rb_eDLTypeError,
-	       "unknown type '%c' of the return value.",
-	       sym->type[i+1]);
-    }
-  }
-
-  switch( sym->type[0] ){
-  case '0':
-    PUSH_0(ftype);
-    break;
-  case 'P':
-  case 'p':
-  case 'S':
-  case 's':
-  case 'A':
-  case 'a':
-    PUSH_P(ftype);
-    break;
-  case 'C':
-  case 'c':
-    PUSH_C(ftype);
-    break;
-  case 'H':
-  case 'h':
-    PUSH_H(ftype);
-    break;
-  case 'I':
-  case 'i':
-    PUSH_I(ftype);
-    break;
-  case 'L':
-  case 'l':
-    PUSH_L(ftype);
-    break;
-  case 'F':
-  case 'f':
-    PUSH_F(ftype);
-    break;
-  case 'D':
-  case 'd':
-    PUSH_D(ftype);
-    break;
-  default:
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError,
-	     "unknown type `%c' of the return value.",
-	     sym->type[0]);
-  }
-
-  func = sym->func;
-
-#if defined(DLSTACK)
-  {
-#if defined(DLSTACK_SIZE)
-  int  stk_size;
-  long stack[DLSTACK_SIZE];
-  long *sp;
-
-  sp = stack;
-  stk_size = stack_size(sym);
-  if( stk_size < 0 ){
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError, "unknown type '%c'.", -stk_size);
-  }
-  else if( stk_size > (int)(DLSTACK_SIZE) ){
-    FREE_ARGS;
-    rb_raise(rb_eArgError, "too many arguments.");
-  }
-#endif
-
-  DLSTACK_START(sym);
-
-#if defined(DLSTACK_REVERSE)
-  for( i = sym->len - 2; i >= 0; i-- )
-#else
-  for( i = 0; i <= sym->len -2; i++ )
-#endif
-  {
-    switch( sym->type[i+1] ){
-    case 'p':
-    case 'P':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'a':
-    case 'A':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'C':
-      DLSTACK_PUSH_C(ANY2C(args[i]));
-      break;
-    case 'c':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'H':
-      DLSTACK_PUSH_H(ANY2H(args[i]));
-      break;
-    case 'h':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'I':
-      DLSTACK_PUSH_I(ANY2I(args[i]));
-      break;
-    case 'i':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'L':
-      DLSTACK_PUSH_L(ANY2L(args[i]));
-      break;
-    case 'l':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'F':
-      DLSTACK_PUSH_F(ANY2F(args[i]));
-      break;
-    case 'f':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'D':
-      DLSTACK_PUSH_D(ANY2D(args[i]));
-      break;
-    case 'd':
-      DLSTACK_PUSH_P(ANY2P(args[i]));
-      break;
-    case 'S':
-    case 's':
-      DLSTACK_PUSH_P(ANY2S(args[i]));
-      break;
-    }
-  }
-  DLSTACK_END(sym->type);
-
-  {
-    switch( sym->type[0] ){
-    case '0':
-      {
-	void (*f)(DLSTACK_PROTO) = func;
-	f(DLSTACK_ARGS);
-      }
-      break;
-    case 'P':
-    case 'p':
-      {
-	void * (*f)(DLSTACK_PROTO) = func;
-	ret.p = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'C':
-    case 'c':
-      {
-	char (*f)(DLSTACK_PROTO) = func;
-	ret.c = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'H':
-    case 'h':
-      {
-	short (*f)(DLSTACK_PROTO) = func;
-	ret.h = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'I':
-    case 'i':
-      {
-	int (*f)(DLSTACK_PROTO) = func;
-	ret.i = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'L':
-    case 'l':
-      {
-	long (*f)(DLSTACK_PROTO) = func;
-	ret.l = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'F':
-    case 'f':
-      {
-	float (*f)(DLSTACK_PROTO) = func;
-	ret.f = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'D':
-    case 'd':
-      {
-	double (*f)(DLSTACK_PROTO) = func;
-	ret.d = f(DLSTACK_ARGS);
-      }
-      break;
-    case 'S':
-    case 's':
-      {
-	char * (*f)(DLSTACK_PROTO) = func;
-	ret.s = f(DLSTACK_ARGS);
-      }
-      break;
-    default:
-      FREE_ARGS;
-      rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
-    }
-  }
-  }
-#else /* defined(DLSTACK) */
-  switch(ftype){
-#include "call.func"
-  default:
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError, "unsupported function type `%s'", sym->type);
-  }
-#endif /* defined(DLSTACK) */
-
-  switch( sym->type[0] ){
-  case '0':
-    val = Qnil;
-    break;
-  case 'P':
-    val = rb_dlptr_new((void*)(ANY2P(ret)), 0, 0);
-    break;
-  case 'p':
-    val = rb_dlptr_new((void*)(ANY2P(ret)), 0, dlfree);
-    break;
-  case 'C':
-  case 'c':
-    val = CHR2FIX((char)(ANY2C(ret)));
-    break;
-  case 'H':
-  case 'h':
-    val = INT2NUM((short)(ANY2H(ret)));
-    break;
-  case 'I':
-  case 'i':
-    val = INT2NUM((int)(ANY2I(ret)));
-    break;
-  case 'L':
-  case 'l':
-    val = DLLONG2NUM((long)(ANY2L(ret)));
-    break;
-  case 'F':
-  case 'f':
-    val = rb_float_new((double)(ANY2F(ret)));
-    break;
-  case 'D':
-  case 'd':
-    val = rb_float_new((double)(ANY2D(ret)));
-    break;
-  case 'S':
-    if( ANY2S(ret) ){
-      val = rb_tainted_str_new2((char*)(ANY2S(ret)));
-    }
-    else{
-      val = Qnil;
-    }
-    break;
-  case 's':
-    if( ANY2S(ret) ){
-      val = rb_tainted_str_new2((char*)(ANY2S(ret)));
-      DEBUG_CODE({
-	printf("dlfree(%s)\n",(char*)(ANY2S(ret)));
-      });
-      dlfree((void*)(ANY2S(ret)));
-    }
-    else{
-      val = Qnil;
-    }
-    break;
-  default:
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
-  }
-
-  dvals = rb_ary_new();
-  for( i = 0; i <= sym->len - 2; i++ ){
-    if( dtypes[i] ){
-      switch( dtypes[i] ){
-      case 'c':
-	rb_ary_push(dvals, CHR2FIX(*((char*)(ANY2P(args[i])))));
-	break;
-      case 'h':
-	rb_ary_push(dvals, INT2NUM(*((short*)(ANY2P(args[i])))));
-	break;
-      case 'i':
-	rb_ary_push(dvals, INT2NUM(*((int*)(ANY2P(args[i])))));
-	break;
-      case 'l':
-        rb_ary_push(dvals, DLLONG2NUM(*((long*)(ANY2P(args[i])))));
-        break;
-      case 'f':
-	rb_ary_push(dvals, rb_float_new(*((float*)(ANY2P(args[i])))));
-	break;
-      case 'd':
-	rb_ary_push(dvals, rb_float_new(*((double*)(ANY2P(args[i])))));
-	break;
-      case 'p':
-	rb_ary_push(dvals, rb_dlptr_new((void*)(ANY2P(args[i])), 0, 0));
-	break;
-      case 'a':
-	rb_ary_push(dvals, rb_dlptr_new((void*)ANY2P(args[i]), 0, 0));
-	break;
-      case 's':
-	rb_ary_push(dvals, rb_tainted_str_new2((char*)ANY2S(args[i])));
-	DEBUG_CODE({
-	  printf("dlfree(%s)\n",(char*)ANY2S(args[i]));
-	});
-	dlfree((void*)ANY2S(args[i]));
-	break;
-      default:
-	{
-	  char c = dtypes[i];
-	  FREE_ARGS;
-	  rb_raise(rb_eRuntimeError, "unknown argument type '%c'", i, c);
-	}
-      }
-    }
-    else{
-      switch( sym->type[i+1] ){
-      case 'A':
-	dlfree((void*)ANY2P(args[i]));
-	break;
-      }
-      rb_ary_push(dvals, argv[i]);
-    }
-  }
-
-#undef FREE_ARGS
-  return rb_assoc_new(val,dvals);
-}
-
-VALUE
-rb_dlsym_to_i(VALUE self)
-{
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  return DLLONG2NUM(sym);
-}
-
-VALUE
-rb_dlsym_to_ptr(VALUE self)
-{
-  struct sym_data *sym;
-
-  Data_Get_Struct(self, struct sym_data, sym);
-  return rb_dlptr_new(sym->func, sizeof(freefunc_t), 0);
-}
-
-void
-Init_dlsym()
-{
-  rb_cDLSymbol = rb_define_class_under(rb_mDL, "Symbol", rb_cObject);
-  rb_define_alloc_func(rb_cDLSymbol, rb_dlsym_s_allocate);
-  rb_define_singleton_method(rb_cDLSymbol, "char2type", rb_s_dlsym_char2type, 1);
-  rb_define_method(rb_cDLSymbol, "initialize", rb_dlsym_initialize, -1);
-  rb_define_method(rb_cDLSymbol, "call", rb_dlsym_call, -1);
-  rb_define_method(rb_cDLSymbol, "[]",   rb_dlsym_call, -1);
-  rb_define_method(rb_cDLSymbol, "name", rb_dlsym_name, 0);
-  rb_define_method(rb_cDLSymbol, "proto", rb_dlsym_proto, 0);
-  rb_define_method(rb_cDLSymbol, "cproto", rb_dlsym_cproto, 0);
-  rb_define_method(rb_cDLSymbol, "inspect", rb_dlsym_inspect, 0);
-  rb_define_method(rb_cDLSymbol, "to_s", rb_dlsym_cproto, 0);
-  rb_define_method(rb_cDLSymbol, "to_ptr", rb_dlsym_to_ptr, 0);
-  rb_define_method(rb_cDLSymbol, "to_i", rb_dlsym_to_i, 0);
-}
diff --git a/ext/dl/test/libtest.def b/ext/dl/test/libtest.def
deleted file mode 100644
index 8ecefc917b..0000000000
--- a/ext/dl/test/libtest.def
+++ /dev/null
@@ -1,28 +0,0 @@
-EXPORTS
-test_alloc_test_struct
-test_append
-test_arylen
-test_c2i
-test_call_func1
-test_callback1
-test_close
-test_d2f
-test_f2d
-test_fill_test_struct
-test_fill_test_union
-test_gets
-test_i2c
-test_init
-test_isucc
-test_lcc
-test_lsucc
-test_open
-test_strcat
-test_strlen
-test_succ
-test_data_init
-test_data_add
-test_data_aref
-test_set_long_value
-test_get_long_value
-internal_long_value
diff --git a/ext/dl/test/test.c b/ext/dl/test/test.c
deleted file mode 100644
index 7321379390..0000000000
--- a/ext/dl/test/test.c
+++ /dev/null
@@ -1,247 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-static char internal_string[] = "internal_string";
-long internal_long_value = 100;
-
-struct test_struct {
-  char c;
-  long l;
-};
-
-union test_union {
-  char c;
-  int  i;
-  long l;
-  void *p;
-};
-
-struct test_data {
-  char name[1024];
-  struct test_data *next;
-};
-
-long
-test_get_long_value()
-{
-  return internal_long_value;
-};
-
-void
-test_set_long_value(long l)
-{
-  internal_long_value = l;
-};
-
-void
-test_fill_test_struct(struct test_struct *ptr, char c, long l)
-{
-  ptr->c = c;
-  ptr->l = l;
-};
-
-void
-test_fill_test_union(union test_union *ptr, long l)
-{
-  ptr->l = l;
-};
-
-struct test_struct *
-test_alloc_test_struct(char c, long l)
-{
-  struct test_struct *data;
-
-  data = (struct test_struct *)malloc(sizeof(struct test_struct));
-  data->c = c;
-  data->l = l;
-
-  return data;
-};
-
-int
-test_c2i(char c)
-{
-  return (int)c;
-};
-
-char
-test_i2c(int i)
-{
-  return (char)i;
-};
-
-long
-test_lcc(char c1, char c2)
-{
-  return (long)(c1 + c2);
-};
-
-double
-test_f2d(float f)
-{
-  double d;
-  d = f;
-  return d;
-};
-
-float
-test_d2f(double d)
-{
-  float f;
-  f = d;
-  return f;
-};
-
-int
-test_strlen(const char *str)
-{
-  return strlen(str);
-};
-
-int
-test_isucc(int i)
-{
-  return (i+1);
-};
-
-long
-test_lsucc(long l)
-{
-  return (l+1);
-};
-
-void
-test_succ(long *l)
-{
-  (*l)++;
-};
-
-char *
-test_strcat(char *str1, const char *str2)
-{
-  return strcat(str1, str2);
-};
-
-int
-test_arylen(char *ary[])
-{
-  int i;
-  for( i=0; ary[i]; i++ ){};
-  return i;
-};
-
-void
-test_append(char *ary[], int len, char *astr)
-{
-  int i;
-  int size1,size2;
-  char *str;
-
-  size2 = strlen(astr);
-
-  for( i=0; i <= len - 1; i++ ){
-    size1 = strlen(ary[i]);
-    str = (char*)malloc(size1 + size2 + 1);
-    strcpy(str, ary[i]);
-    strcat(str, astr);
-    ary[i] = str;
-  };
-};
-
-int
-test_init(int *argc, char **argv[])
-{
-  int i;
-  char s[256];
-
-  for( i=0; i < (*argc); i++ ){
-    sprintf(s, "arg%d", i);
-    if( strcmp((*argv)[i], s) != 0 ){
-      return 1;
-    }
-  }
-  return 0;
-}
-
-FILE *
-test_open(const char *filename, const char *mode)
-{
-  FILE *file;
-  file = fopen(filename,mode);
-  return file;
-};
-
-void
-test_close(FILE *file)
-{
-  fclose(file);
-};
-
-char *
-test_gets(char *s, int size, FILE *f)
-{
-  return fgets(s,size,f);
-};
-
-typedef int callback1_t(int, char *);
-#define CALLBACK_MSG "callback message"
-
-int
-test_callback1(int err, const char *msg)
-{
-  if( strcmp(msg, CALLBACK_MSG) == 0 ){
-    return 1;
-  }
-  else{
-    return 0;
-  }
-}
-
-int
-test_call_func1(callback1_t *func)
-{
-  if( func ){
-    return (*func)(0, CALLBACK_MSG);
-  }
-  else{
-    return 0;
-  }
-}
-
-struct test_data *
-test_data_init()
-{
-  struct test_data *data;
-
-  data = (struct test_data *)malloc(sizeof(struct test_data));
-  data->next = NULL;
-  memset(data->name, 0, 1024);
-
-  return data;
-};
-
-void
-test_data_add(struct test_data *list, const char *name)
-{
-  struct test_data *data;
-
-  data = (struct test_data *)malloc(sizeof(struct test_data));
-  memset(data->name, 0, 1024);
-  strncpy(data->name, name, 1024);
-  data->next = list->next;
-  list->next = data;
-};
-
-struct test_data *
-test_data_aref(struct test_data *list, int i)
-{
-  struct test_data *data;
-  int j;
-
-  for( data = list->next, j=0; data; data = data->next, j++ ){
-    if( i == j ){
-      return data;
-    };
-  };
-  return NULL;
-};
diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb
deleted file mode 100644
index 52be04699f..0000000000
--- a/ext/dl/test/test.rb
+++ /dev/null
@@ -1,295 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-require 'dl/import'
-
-$FAIL = 0
-$TOTAL = 0
-
-def assert(label, ty, *conds)
-  $TOTAL += 1
-  cond = !conds.include?(false)
-  if( cond )
-    printf("succeed in `#{label}'\n")
-  else
-    $FAIL += 1
-    case ty
-    when :may
-      printf("fail in `#{label}' ... expected\n")
-    when :must
-      printf("fail in `#{label}' ... unexpected\n")
-    when :raise
-      raise(RuntimeError, "fail in `#{label}'")
-    end
-  end
-end
-
-def debug(*xs)
-  if( $DEBUG )
-    xs.each{|x|
-      p x
-    }
-  end
-end
-
-print("DLSTACK   = #{DL::DLSTACK}\n")
-print("MAX_ARG   = #{DL::MAX_ARG}\n")
-print("\n")
-print("DL::FREE = #{DL::FREE.inspect}\n")
-print("\n")
-
-$LIB = nil
-if( !$LIB && File.exist?("libtest.so") )
-  $LIB = "./libtest.so"
-end
-if( !$LIB && File.exist?("test/libtest.so") )
-  $LIB = "./test/libtest.so"
-end
-
-module LIBTest
-  extend DL::Importable
-
-  dlload($LIB)
-  extern "int test_c2i(char)"
-  extern "char test_i2c(int)"
-  extern "long test_lcc(char, char)"
-  extern "double test_f2d(float)"
-  extern "float test_d2f(double)"
-  extern "int test_strlen(char*)"
-  extern "int test_isucc(int)"
-  extern "long test_lsucc(long)"
-  extern "void test_succ(long *)"
-  extern "int test_arylen(int [])"
-  extern "void test_append(char*[], int, char *)"
-end
-
-DL.dlopen($LIB){|h|
-  c2i = h["test_c2i","IC"]
-  debug c2i
-  r,rs = c2i[?a]
-  debug r,rs
-  assert("c2i", :may, r == ?a)
-  assert("extern c2i", :must, r == LIBTest.test_c2i(?a))
-
-  i2c = h["test_i2c","CI"]
-  debug i2c
-  r,rs = i2c[?a]
-  debug r,rs
-  assert("i2c", :may, r == ?a)
-  assert("exern i2c", :must, r == LIBTest.test_i2c(?a))
-
-  lcc = h["test_lcc","LCC"]
-  debug lcc
-  r,rs = lcc[1,2]
-  assert("lcc", :may, r == 3)
-  assert("extern lcc", :must, r == LIBTest.test_lcc(1,2))
-
-  f2d = h["test_f2d","DF"]
-  debug f2d
-  r,rs = f2d[20.001]
-  debug r,rs
-  assert("f2d", :may, r.to_i == 20)
-  assert("extern f2d", :must, r = LIBTest.test_f2d(20.001))
-
-  d2f = h["test_d2f","FD"]
-  debug d2f
-  r,rs = d2f[20.001]
-  debug r,rs
-  assert("d2f", :may, r.to_i == 20)
-  assert("extern d2f", :must, r == LIBTest.test_d2f(20.001))
-
-  strlen = h["test_strlen","IS"]
-  debug strlen
-  r,rs = strlen["0123456789"]
-  debug r,rs
-  assert("strlen", :must, r == 10)
-  assert("extern strlen", :must, r == LIBTest.test_strlen("0123456789"))
-
-  isucc = h["test_isucc","II"]
-  debug isucc
-  r,rs = isucc[2]
-  debug r,rs
-  assert("isucc", :must, r == 3)
-  assert("extern isucc", :must, r == LIBTest.test_isucc(2))
-
-  lsucc = h["test_lsucc","LL"]
-  debug lsucc
-  r,rs = lsucc[10000000]
-  debug r,rs
-  assert("lsucc", :must, r == 10000001)
-  assert("extern lsucc", :must, r == LIBTest.test_lsucc(10000000))
-
-  succ = h["test_succ","0l"]
-  debug succ
-  r,rs = succ[0]
-  debug r,rs
-  assert("succ", :must, rs[0] == 1)
-  l = DL.malloc(DL.sizeof("L"))
-  l.struct!("L",:lval)
-  LIBTest.test_succ(l)
-  assert("extern succ", :must, rs[0] == l[:lval])
-
-  arylen = h["test_arylen","IA"]
-  debug arylen
-  r,rs = arylen[["a","b","c","d",nil]]
-  debug r,rs
-  assert("arylen", :must, r == 4)
-
-  arylen = h["test_arylen","IP"]
-  debug arylen
-  r,rs = arylen[["a","b","c","d",nil]]
-  debug r,rs
-  assert("arylen", :must, r == 4)
-  assert("extern arylen", :must, r == LIBTest.test_arylen(["a","b","c","d",nil]))
-
-  append = h["test_append","0aIS"]
-  debug append
-  r,rs = append[["a","b","c"],3,"x"]
-  debug r,rs
-  assert("append", :must, rs[0].to_a('S',3) == ["ax","bx","cx"])
-
-  LIBTest.test_append(["a","b","c"],3,"x")
-  assert("extern append", :must, rs[0].to_a('S',3) == LIBTest._args_[0].to_a('S',3))
-
-  strcat = h["test_strcat","SsS"]
-  debug strcat
-  r,rs = strcat["abc\0","x"]
-  debug r,rs
-  assert("strcat", :must, rs[0].to_s == "abcx")
-
-  init = h["test_init","IiP"]
-  debug init
-  argc = 3
-  argv = ["arg0","arg1","arg2"].to_ptr
-  r,rs = init[argc, argv.ref]
-  assert("init", :must, r == 0)
-}
-
-
-h = DL.dlopen($LIB)
-
-sym_open = h["test_open", "PSS"]
-sym_gets = h["test_gets", "SsIP"]
-sym_close = h["test_close", "0P"]
-debug sym_open,sym_gets,sym_close
-
-line = "Hello world!\n"
-File.open("tmp.txt", "w"){|f|
-  f.print(line)
-}
-
-fp,rs = sym_open["tmp.txt", "r"]
-if( fp )
-  fp.free = sym_close
-  r,rs = sym_gets[" " * 256, 256, fp]
-  debug r,rs
-  assert("open,gets", :must, rs[0] == line)
-  ObjectSpace.define_finalizer(fp) {File.unlink("tmp.txt")}
-  fp = nil
-else
-  assert("open,gets", :must, line == nil)
-  File.unlink("tmp.txt")
-end
-
-
-callback1 = h["test_callback1"]
-debug callback1
-r,rs = h["test_call_func1", "IP"][callback1]
-debug r,rs
-assert("callback1", :must, r == 1)
-
-
-callback2 = DL.callback("LLP"){|num,ptr|
-  msg = ptr.to_s
-  if( msg == "callback message" )
-    2
-  else
-    0
-  end
-}
-debug callback2
-r,rs = h["test_call_func1", "IP"][callback2]
-debug r,rs
-assert("callback2", :must, r == 2)
-DL.remove_callback(callback2)
-
-ptr = DL.malloc(DL.sizeof('CL'))
-ptr.struct!("CL", :c, :l)
-ptr["c"] = 0
-ptr["l"] = 0
-r,rs = h["test_fill_test_struct","0PIL"][ptr,100,1000]
-debug r,rs
-assert("fill_test_struct", :must, ptr["c"] == 100, ptr["l"] == 1000)
-assert("fill_test_struct", :must, ptr[:c] == 100, ptr[:l] == 1000) unless (Fixnum === :-)
-
-
-r,rs = h["test_alloc_test_struct", "PIL"][100,200]
-r.free = DL::FREE
-r.struct!("CL", :c, :l)
-assert("alloc_test_struct", :must, r["c"] == 100, r["l"] == 200)
-assert("alloc_test_struct", :must, r[:c] == 100, r[:l] == 200) unless (Fixnum === :-)
-
-ptr = h["test_strlen"]
-sym1 = DL::Symbol.new(ptr,"foo","0")
-sym2 = h["test_strlen","LS"]
-assert("Symbol.new", :must, ptr == sym1.to_ptr, sym1.to_ptr == sym2.to_ptr)
-
-set_val = h["test_set_long_value","0"]
-get_val = h["test_get_long_value","L"]
-lval = get_val[][0]
-ptr = h["internal_long_value"]
-ptr.struct!("L", :l)
-assert("get value", :must, ptr["l"] == lval)
-assert("get value", :must, ptr[:l] == lval) unless (Fixnum === :-)
-ptr["l"] = 200
-lval = get_val[][0]
-assert("set value", :must, ptr["l"] == lval)
-assert("set value", :must, ptr[:l] == lval) unless (Fixnum === :-)
-
-
-data_init = h["test_data_init", "P"]
-data_add  = h["test_data_add", "0PS"]
-data_aref = h["test_data_aref", "PPI"]
-r,rs = data_init[]
-ptr = r
-data_add[ptr, "name1"]
-data_add[ptr, "name2"]
-data_add[ptr, "name3"]
-
-r,rs = data_aref[ptr, 1]
-ptr = r
-ptr.struct!("C1024P", :name, :next)
-assert("data_aref", :must,
-       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2")
-assert("data_aref", :must,
-       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2") unless (Fixnum === :-)
-
-ptr = ptr["next"]
-ptr.struct!("C1024P", :name, :next)
-assert("data_aref", :must,
-       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1")
-assert("data_aref", :must,
-       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1") unless (Fixnum === :-)
-
-GC.start
-
-ptr = DL::malloc(1024)
-ptr.struct!("CHIL", "c", "h", "i", "l")
-ptr["c"] = 1
-ptr["h"] = 2
-ptr["i"] = 3
-ptr["l"] = 4
-assert("struct!", :must,
-       ptr["c"] == 1 &&
-       ptr["h"] == 2 &&
-       ptr["i"] == 3 &&
-       ptr["l"] == 4)
-
-ptr = DL::malloc(DL::sizeof("IP"))
-ptr.struct!("IP", "n", "ptr")
-ptr["n"] = 10
-ptr["ptr"] = nil
-assert("struct!", :must, ptr["n"] == 10 && ptr["ptr"] == nil)
-
-GC.start
-printf("fail/total = #{$FAIL}/#{$TOTAL}\n")
diff --git a/ext/dl/type.rb b/ext/dl/type.rb
deleted file mode 100644
index 804420c395..0000000000
--- a/ext/dl/type.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# example:
-#  DLTYPE[INT][:rb2c]["arg0"] => "NUM2INT(arg0)"
-#  DLTYPE[DOUBLE][:c2rb]["r"] => "rb_float_new(r)"
-
-DLTYPE = {
-  VOID  = 0x00 => {
-    :name => 'VOID',
-    :rb2c => nil,
-    :c2rb => nil,
-    :ctype => "void",
-    :stmem => "v",
-    :sym => true,
-    :cb => true,
-  },
-  CHAR  = 0x01 => {
-    :name => 'CHAR',
-    :rb2c => proc{|x| "NUM2CHR(#{x})"},
-    :c2rb => proc{|x| "CHR2FIX(#{x})"},
-    :ctype => "char",
-    :stmem => "c",
-    :sym => false,
-    :cb => false,
-  },
-  SHORT = 0x02 => {
-    :name => 'SHORT',
-    :rb2c => proc{|x| "FIX2INT(#{x})"},
-    :c2rb => proc{|x| "INT2FIX(#{x})"},
-    :ctype => "short",
-    :stmem => "h",
-    :sym => false,
-    :cb => false,
-  },
-  INT   = 0x03 => {
-    :name => 'INT',
-    :rb2c => proc{|x| "NUM2INT(#{x})"},
-    :c2rb => proc{|x| "INT2NUM(#{x})"},
-    :ctype => "int",
-    :stmem => "i",
-    :sym => true,
-    :cb => false,
-  },
-  LONG  = 0x04 => {
-    :name => 'LONG',
-    :rb2c => proc{|x| "NUM2INT(#{x})"},
-    :c2rb => proc{|x| "INT2NUM(#{x})"},
-    :ctype => "long",
-    :stmem => "l",
-    :sym => true,
-    :cb => true,
-  },
-  FLOAT = 0x05 => {
-    :name => 'FLOAT',
-    :rb2c => proc{|x| "(float)(RFLOAT(#{x})->value)"},
-    :c2rb => proc{|x| "rb_float_new((double)#{x})"},
-    :ctype => "float",
-    :stmem => "f",
-    :sym => false,
-    :cb => false,
-  },
-  DOUBLE = 0x06 => {
-    :name => 'DOUBLE',
-    :rb2c => proc{|x| "RFLOAT(#{x})->value"},
-    :c2rb => proc{|x| "rb_float_new(#{x})"},
-    :ctype => "double",
-    :stmem => "d",
-    :sym => true,
-    :cb => true,
-  },
-  VOIDP = 0x07 => {
-    :name => 'VOIDP',
-    :rb2c => proc{|x| "rb_dlptr2cptr(#{x})"},
-    :c2rb => proc{|x| "rb_dlptr_new(#{x},sizeof(void*),0)"},
-    :ctype => "void *",
-    :stmem => "p",
-    :sym => true,
-    :cb => true,
-  },
-}
-
-def tpush(t, x)
-  (t << 3)|x
-end
-
-def tget(t, i)
-  (t & (0x07 << (i * 3))) >> (i * 3)
-end
-
-def types2num(types)
-  res = 0x00
-  r = types.reverse
-  r.each{|t|
-    res = tpush(res,t)
-  }
-  res
-end
-
-def num2types(num)
-  ts = []
-  i  = 0
-  t = tget(num,i)
-  while( (t != VOID && i > 0) || (i == 0) )
-    ts.push(DLTYPE[t][:ctype])
-    i += 1
-    t = tget(num,i)
-  end
-  ts
-end
-
-def types2ctypes(types)
-  res = []
-  types.each{|t|
-    res.push(DLTYPE[t][:ctype])
-  }
-  res
-end
diff --git a/ext/enumerator/.cvsignore b/ext/enumerator/.cvsignore
deleted file mode 100644
index fc802ff1c2..0000000000
--- a/ext/enumerator/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-mkmf.log
diff --git a/ext/enumerator/MANIFEST b/ext/enumerator/MANIFEST
deleted file mode 100644
index b1ab0ba8e2..0000000000
--- a/ext/enumerator/MANIFEST
+++ /dev/null
@@ -1,3 +0,0 @@
-MANIFEST
-enumerator.c
-enumerator.txt
diff --git a/ext/enumerator/enumerator.c b/ext/enumerator/enumerator.c
deleted file mode 100644
index 8c3c566178..0000000000
--- a/ext/enumerator/enumerator.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/************************************************
-
-  enumerator.c - provides Enumerator class
-
-  $Author$
-
-  Copyright (C) 2001-2003 Akinori MUSHA
-
-  $Idaemons: /home/cvs/rb/enumerator/enumerator.c,v 1.1.1.1 2001/07/15 10:12:48 knu Exp $
-  $RoughId: enumerator.c,v 1.6 2003/07/27 11:03:24 nobu Exp $
-  $Id$
-
-************************************************/
-
-#include "ruby.h"
-#include "node.h"
-
-static VALUE rb_cEnumerator;
-static ID sym_each, sym_each_with_index, sym_each_slice, sym_each_cons;
-static ID id_new, id_enum_obj, id_enum_method, id_enum_args;
-
-static VALUE
-obj_to_enum(obj, enum_args)
-    VALUE obj, enum_args;
-{
-    rb_ary_unshift(enum_args, obj);
-
-    return rb_apply(rb_cEnumerator, id_new, enum_args);
-}
-
-static VALUE
-enumerator_enum_with_index(obj)
-    VALUE obj;
-{
-    return rb_funcall(rb_cEnumerator, id_new, 2, obj, sym_each_with_index);
-}
-
-static VALUE
-each_slice_i(val, memo)
-    VALUE val;
-    NODE *memo;
-{
-    VALUE ary = memo->u1.value;
-    long size = memo->u3.cnt;
-
-    rb_ary_push(ary, val);
-
-    if (RARRAY(ary)->len == size) {
-	rb_yield(ary);
-	memo->u1.value = rb_ary_new2(size);
-    }
-
-    return Qnil;
-}
-
-static VALUE
-enum_each_slice(obj, n)
-    VALUE obj, n;
-{
-    long size = NUM2LONG(n);
-    NODE *memo;
-    VALUE ary;
-
-    if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
-
-    memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size);
-
-    rb_iterate(rb_each, obj, each_slice_i, (VALUE)memo);
-
-    ary = memo->u1.value;
-    if (RARRAY(ary)->len > 0) rb_yield(ary);
-
-    rb_gc_force_recycle((VALUE)memo);
-    return Qnil;
-}
-
-static VALUE
-enumerator_enum_slice(obj, n)
-    VALUE obj, n;
-{
-    return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_slice, n);
-}
-
-static VALUE
-each_cons_i(val, memo)
-    VALUE val;
-    NODE *memo;
-{
-    VALUE ary = memo->u1.value;
-    long size = memo->u3.cnt;
-    long len = RARRAY(ary)->len;
-
-    if (len == size) {
-	rb_ary_shift(ary);
-	rb_ary_push(ary, val);
-	rb_yield(ary);
-    } else {
-	rb_ary_push(ary, val);
-	if (len + 1 == size) rb_yield(ary);
-    }
-    return Qnil;
-}
-
-static VALUE
-enum_each_cons(obj, n)
-    VALUE obj, n;
-{
-    long size = NUM2LONG(n);
-    NODE *memo;
-    VALUE ary;
-
-    if (size <= 0) rb_raise(rb_eArgError, "invalid size");
-    memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size);
-
-    rb_iterate(rb_each, obj, each_cons_i, (VALUE)memo);
-
-    rb_gc_force_recycle((VALUE)memo);
-    return Qnil;
-}
-
-static VALUE
-enumerator_enum_cons(obj, n)
-    VALUE obj, n;
-{
-    return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_cons, n);
-}
-
-static VALUE
-enumerator_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE enum_obj, enum_method, enum_args;
-
-    rb_scan_args(argc, argv, "11*", &enum_obj, &enum_method, &enum_args);
-
-    if (enum_method == Qnil)
-	enum_method = sym_each;
-
-    rb_ivar_set(obj, id_enum_obj, enum_obj);
-    rb_ivar_set(obj, id_enum_method, enum_method);
-    rb_ivar_set(obj, id_enum_args, enum_args);
-
-    return Qnil;
-}
-
-static VALUE
-enumerator_iter(memo)
-    NODE *memo;
-{
-    return rb_apply(memo->u1.value, memo->u2.id, memo->u3.value);
-}
-
-static VALUE
-enumerator_each(obj)
-    VALUE obj;
-{
-    VALUE val;
-
-    obj = (VALUE)rb_node_newnode(NODE_MEMO,
-				 rb_ivar_get(obj, id_enum_obj),
-				 rb_to_id(rb_ivar_get(obj, id_enum_method)),
-				 rb_ivar_get(obj, id_enum_args));
-    val = rb_iterate((VALUE (*)_((VALUE)))enumerator_iter, obj, rb_yield, 0);
-    rb_gc_force_recycle(obj);
-    return val;
-}
-
-void
-Init_enumerator()
-{
-    VALUE rb_mEnumerable;
-
-    rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -2);
-    rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -2);
-
-    rb_mEnumerable = rb_path2class("Enumerable");
-
-    rb_define_method(rb_mEnumerable, "enum_with_index", enumerator_enum_with_index, 0);
-    rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
-    rb_define_method(rb_mEnumerable, "enum_slice", enumerator_enum_slice, 1);
-    rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
-    rb_define_method(rb_mEnumerable, "enum_cons", enumerator_enum_cons, 1);
-
-    rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
-    rb_include_module(rb_cEnumerator, rb_mEnumerable);
-
-    rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
-    rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
-
-    sym_each		= ID2SYM(rb_intern("each"));
-    sym_each_with_index	= ID2SYM(rb_intern("each_with_index"));
-    sym_each_slice	= ID2SYM(rb_intern("each_slice"));
-    sym_each_cons	= ID2SYM(rb_intern("each_cons"));
-
-    id_new		= rb_intern("new");
-    id_enum_obj		= rb_intern("enum_obj");
-    id_enum_method	= rb_intern("enum_method");
-    id_enum_args	= rb_intern("enum_args");
-}
diff --git a/ext/enumerator/enumerator.txt b/ext/enumerator/enumerator.txt
deleted file mode 100644
index 64c7d50226..0000000000
--- a/ext/enumerator/enumerator.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" enumerator.txt -  -*- Indented-Text -*-
-$Idaemons: /home/cvs/rb/enumerator/enumerator.txt,v 1.2 2001/07/15 10:19:24 knu Exp $
-$RoughId: enumerator.txt,v 1.5 2003/02/20 12:24:51 knu Exp $
-$Id$
-
-** Enumerable::Enumerator(Class)
-
-A class which provides a method `each' to be used as an Enumerable
-object.
-
-Superclass: Object
-
-Mix-ins: Enumerable
-
-require 'enumerator'
-
-Class Methods:
-
-    new(obj, method = :each, *args)
-
-	Creates a new Enumerable::Enumerator object, which is to be
-	used as an Enumerable object using the given object's given
-	method with the given arguments.
-
-	e.g.:
-	    str = "xyz"
-
-	    enum = Enumerable::Enumerator.new(str, :each_byte)
-	    a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
-
-Methods:
-
-    each {...}
-
-	Iterates the given block using the object and the method
-	specified in the first place.
-
-
-Requiring this module also adds some methods to the Object class:
-
-    to_enum(method = :each, *args)
-    enum_for(method = :each, *args)
-
-	Returns Enumerable::Enumerator.new(self, method, *args).
-
-	e.g.:
-	    str = "xyz"
-
-	    enum = str.enum_for(:each_byte)
-	    a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
-
-	    # protects an array from being modified
-	    a = [1, 2, 3]
-	    some_method(a.to_enum)
-
-And the Enumerable module.
-
-    each_slice(n) {...}
-
-	Iterates the given block for each slice of <n> elements.
-
-	e.g.:
-	    (1..10).each_slice(3) {|a| p a}
-	    # outputs below
-	    [1, 2, 3]
-	    [4, 5, 6]
-	    [7, 8, 9]
-	    [10]
-
-    enum_slice(n)
-
-	Returns Enumerable::Enumerator.new(self, :each_slice, n).
-
-    each_cons(n) {...}
-
-	Iterates the given block for each array of consecutive <n>
-	elements.
-
-	e.g.:
-	    (1..10).each_cons(3) {|a| p a}
-	    # outputs below
-	    [1, 2, 3]
-	    [2, 3, 4]
-	    [3, 4, 5]
-	    [4, 5, 6]
-	    [5, 6, 7]
-	    [6, 7, 8]
-	    [7, 8, 9]
-	    [8, 9, 10]
-
-    enum_cons(n)
-
-	Returns Enumerable::Enumerator.new(self, :each_cons, n).
-
-    enum_with_index
-
-	Returns Enumerable::Enumerator.new(self, :each_with_index).
-
--------------------------------------------------------
-Local variables:
-fill-column: 70
-end:
diff --git a/ext/etc/.cvsignore b/ext/etc/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/etc/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/etc/MANIFEST b/ext/etc/MANIFEST
index 62cf5be233..79fb1ff34c 100644
--- a/ext/etc/MANIFEST
+++ b/ext/etc/MANIFEST
@@ -1,6 +1,6 @@
 MANIFEST
 etc.c
 etc.txt
-etc.txt.ja
+etc.txt.jp
 depend
 extconf.rb
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index f64b30604a..e5f69f9285 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -10,11 +10,6 @@
 
 #include "ruby.h"
 
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef HAVE_GETPWENT
 #include <pwd.h>
 #endif
@@ -25,19 +20,16 @@
 
 static VALUE sPasswd, sGroup;
 
-#ifndef _WIN32
-char *getenv();
-#endif
-char *getlogin();
-
 static VALUE
 etc_getlogin(obj)
     VALUE obj;
 {
+    char *getenv();
     char *login;
 
-    rb_secure(4);
 #ifdef HAVE_GETLOGIN
+    char *getlogin();
+
     login = getlogin();
     if (!login) login = getenv("USER");
 #else
@@ -60,27 +52,27 @@ setup_passwd(pwd)
 			 rb_tainted_str_new2(pwd->pw_passwd),
 			 INT2FIX(pwd->pw_uid),
 			 INT2FIX(pwd->pw_gid),
-#ifdef HAVE_ST_PW_GECOS
+#ifdef PW_GECOS
 			 rb_tainted_str_new2(pwd->pw_gecos),
 #endif
 			 rb_tainted_str_new2(pwd->pw_dir),
 			 rb_tainted_str_new2(pwd->pw_shell),
-#ifdef HAVE_ST_PW_CHANGE
+#ifdef PW_CHANGE
 			 INT2FIX(pwd->pw_change),
 #endif
-#ifdef HAVE_ST_PW_QUOTA
+#ifdef PW_QUOTA
 			 INT2FIX(pwd->pw_quota),
 #endif
-#ifdef HAVE_ST_PW_AGE
+#ifdef PW_AGE
 			 INT2FIX(pwd->pw_age),
 #endif
-#ifdef HAVE_ST_PW_CLASS
+#ifdef PW_CLASS
 			 rb_tainted_str_new2(pwd->pw_class),
 #endif
-#ifdef HAVE_ST_PW_COMMENT
+#ifdef PW_COMMENT
 			 rb_tainted_str_new2(pwd->pw_comment),
 #endif
-#ifdef HAVE_ST_PW_EXPIRE
+#ifdef PW_EXPIRE
 			 INT2FIX(pwd->pw_expire),
 #endif
 			 0		/*dummy*/
@@ -94,12 +86,11 @@ etc_getpwuid(argc, argv, obj)
     VALUE *argv;
     VALUE obj;
 {
-#if defined(HAVE_GETPWENT)
+#ifdef HAVE_GETPWENT
     VALUE id;
     int uid;
     struct passwd *pwd;
 
-    rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &id) == 1) {
 	uid = NUM2INT(id);
     }
@@ -121,7 +112,7 @@ etc_getpwnam(obj, nam)
 #ifdef HAVE_GETPWENT
     struct passwd *pwd;
 
-    SafeStringValue(nam);
+    Check_Type(nam, T_STRING);
     pwd = getpwnam(RSTRING(nam)->ptr);
     if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING(nam)->ptr);
     return setup_passwd(pwd);
@@ -130,29 +121,6 @@ etc_getpwnam(obj, nam)
 #endif
 }
 
-#ifdef HAVE_GETPWENT
-static int passwd_blocking = 0;
-static VALUE
-passwd_ensure()
-{
-    passwd_blocking = Qfalse;
-    return Qnil;
-}
-
-static VALUE
-passwd_iterate()
-{
-    struct passwd *pw;
-
-    setpwent();
-    while (pw = getpwent()) {
-	rb_yield(setup_passwd(pw));
-    }
-    endpwent();
-    return Qnil;
-}
-#endif
-
 static VALUE
 etc_passwd(obj)
     VALUE obj;
@@ -160,13 +128,13 @@ etc_passwd(obj)
 #ifdef HAVE_GETPWENT
     struct passwd *pw;
 
-    rb_secure(4);
-    if (rb_block_given_p()) {
-	if (passwd_blocking) {
-	    rb_raise(rb_eRuntimeError, "parallel passwd iteration");
+    if (rb_iterator_p()) {
+	setpwent();
+	while (pw = getpwent()) {
+	    rb_yield(setup_passwd(pw));
 	}
-	passwd_blocking = Qtrue;
-	rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
+	endpwent();
+	return obj;
     }
     if (pw = getpwent()) {
 	return setup_passwd(pw);
@@ -175,40 +143,6 @@ etc_passwd(obj)
     return Qnil;
 }
 
-static VALUE
-etc_setpwent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETPWENT
-    setpwent();
-#endif
-    return Qnil;
-}
-
-static VALUE
-etc_endpwent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETPWENT
-    endpwent();
-#endif
-    return Qnil;
-}
-
-static VALUE
-etc_getpwent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETPWENT
-    struct passwd *pw;
-
-    if (pw = getpwent()) {
-	return setup_passwd(pw);
-    }
-#endif
-    return Qnil;
-}
-
 #ifdef HAVE_GETGRENT
 static VALUE
 setup_group(grp)
@@ -239,7 +173,6 @@ etc_getgrgid(obj, id)
     int gid;
     struct group *grp;
 
-    rb_secure(4);
     gid = NUM2INT(id);
     grp = getgrgid(gid);
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
@@ -256,8 +189,7 @@ etc_getgrnam(obj, nam)
 #ifdef HAVE_GETGRENT
     struct group *grp;
 
-    rb_secure(4);
-    SafeStringValue(nam);
+    Check_Type(nam, T_STRING);
     grp = getgrnam(RSTRING(nam)->ptr);
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING(nam)->ptr);
     return setup_group(grp);
@@ -266,29 +198,6 @@ etc_getgrnam(obj, nam)
 #endif
 }
 
-#ifdef HAVE_GETGRENT
-static int group_blocking = 0;
-static VALUE
-group_ensure()
-{
-    group_blocking = Qfalse;
-    return Qnil;
-}
-
-static VALUE
-group_iterate()
-{
-    struct group *pw;
-
-    setgrent();
-    while (pw = getgrent()) {
-	rb_yield(setup_group(pw));
-    }
-    endgrent();
-    return Qnil;
-}
-#endif
-
 static VALUE
 etc_group(obj)
     VALUE obj;
@@ -296,13 +205,13 @@ etc_group(obj)
 #ifdef HAVE_GETGRENT
     struct group *grp;
 
-    rb_secure(4);
-    if (rb_block_given_p()) {
-	if (group_blocking) {
-	    rb_raise(rb_eRuntimeError, "parallel group iteration");
+    if (rb_iterator_p()) {
+	setgrent();
+	while (grp = getgrent()) {
+	    rb_yield(setup_group(grp));
 	}
-	group_blocking = Qtrue;
-	rb_ensure(group_iterate, 0, group_ensure, 0);
+	endgrent();
+	return obj;
     }
     if (grp = getgrent()) {
 	return setup_group(grp);
@@ -311,40 +220,6 @@ etc_group(obj)
     return Qnil;
 }
 
-static VALUE
-etc_setgrent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETGRENT
-    setgrent();
-#endif
-    return Qnil;
-}
-
-static VALUE
-etc_endgrent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETGRENT
-    endgrent();
-#endif
-    return Qnil;
-}
-
-static VALUE
-etc_getgrent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETGRENT
-    struct group *gr;
-
-    if (gr = getgrent()) {
-	return setup_group(gr);
-    }
-#endif
-    return Qnil;
-}
-
 static VALUE mEtc;
 
 void
@@ -356,47 +231,41 @@ Init_etc()
 
     rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
     rb_define_module_function(mEtc, "getpwnam", etc_getpwnam, 1);
-    rb_define_module_function(mEtc, "setpwent", etc_setpwent, 0);
-    rb_define_module_function(mEtc, "endpwent", etc_endpwent, 0);
-    rb_define_module_function(mEtc, "getpwent", etc_getpwent, 0);
     rb_define_module_function(mEtc, "passwd", etc_passwd, 0);
 
     rb_define_module_function(mEtc, "getgrgid", etc_getgrgid, 1);
     rb_define_module_function(mEtc, "getgrnam", etc_getgrnam, 1);
     rb_define_module_function(mEtc, "group", etc_group, 0);
-    rb_define_module_function(mEtc, "setgrent", etc_setgrent, 0);
-    rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
-    rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
 
     sPasswd =  rb_struct_define("Passwd",
 				"name", "passwd", "uid", "gid",
-#ifdef HAVE_ST_PW_GECOS
+#ifdef PW_GECOS
 				"gecos",
 #endif
 				"dir", "shell",
-#ifdef HAVE_ST_PW_CHANGE
+#ifdef PW_CHANGE
 				"change",
 #endif
-#ifdef HAVE_ST_PW_QUOTA
+#ifdef PW_QUOTA
 				"quota",
 #endif
-#ifdef HAVE_ST_PW_AGE
+#ifdef PW_AGE
 				"age",
 #endif
-#ifdef HAVE_ST_PW_CLASS
-				"uclass",
+#ifdef PW_CLASS
+				"class",
 #endif
-#ifdef HAVE_ST_PW_COMMENT
+#ifdef PW_COMMENT
 				"comment",
 #endif
-#ifdef HAVE_ST_PW_EXPIRE
+#ifdef PW_EXPIRE
 				"expire",
 #endif
-				NULL);
+				0);
     rb_global_variable(&sPasswd);
 
 #ifdef HAVE_GETGRENT
-    sGroup = rb_struct_define("Group", "name", "passwd", "gid", "mem", NULL);
+    sGroup = rb_struct_define("Group", "name", "passwd", "gid", "mem", 0);
     rb_global_variable(&sGroup);
 #endif
 }
diff --git a/ext/etc/etc.txt.ja b/ext/etc/etc.doc
index 2dddcfb036..2af895c9de 100644
--- a/ext/etc/etc.txt.ja
+++ b/ext/etc/etc.doc
@@ -1,11 +1,12 @@
-.\" etc.txt.ja -  -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
+.\" etc.doc -  -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
 
 ** Etc(�⥸�塼��)
 
 /etc�ǥ��쥯�ȥ�ʲ��ξ�������뤿��Υ⥸�塼�롥���饹�˥��󥯥롼��
 ���ƻȤ����Ȥ�Ǥ��롥
 
-Module Function:
+Methods:
+Single Methods:
 
    getlogin
 
diff --git a/ext/etc/etc.txt b/ext/etc/etc.txt
deleted file mode 100644
index 534790172c..0000000000
--- a/ext/etc/etc.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" etc.txt -  -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
-
-** Etc(Module)
-
-The module to retrieve information under /etc directory.  Available
-only on UNIX platforms.  All operations defined in this module are
-module functions, so that you can include Etc module into your class.
-
-Module Function:
-
-   getlogin
-
-	returns login name of the user.  It this fails, try getpwuid().
-
-   getpwnam(name)
-
-	searches in /etc/passwd file (or equivalent database), and
-	returns password entry for the user.  The return value is an
-	passwd structure, which has members described below.
-
-	  struct passwd
-	    name 	# user name(string)
-	    passwd	# encrypted password(string)
-	    uid		# user ID(integer)
-	    gid		# group ID(integer)
-	    gecos	# gecos field(string)
-	    dir		# home directory(string)
-	    shell	# login shell(string)
-	    # members below are optional
-	    change	# password change time(integer)
-	    quota	# quota value(integer)
-	    age		# password age(integer)
-	    class	# user access class(string)
-	    comment	# comment(string)
-	    expire	# account expiration time(integer)	    
-	  end
-
-	See getpwnam(3) for detail.
-
-   getpwuid([uid])
-
-	returns passwd entry for the specified user id.  If uid is
-	ommitted, use the value from getuid().  See getpwuid(3) for
-	detail.
-
-   getgrgid(gid)
-
-	searches in /etc/group file (or equivalent database), and
-	returns group entry for the group id.  The return value is an
-	group structure, which has members described below.
-
-	  struct group
-	    name 	# group name(string)
-	    passwd	# group password(string)
-	    gid		# group ID(integer)
-	    mem		# array of the group member names
-	  end
-
-	See getgrgid(3) for detail.
-
-   getgrnam(name)
-
-	returns the group entry for the specified name.  The return
-	value is the group structure.  See getgrnam(3) for detail.
-
-   group
-
-	iterates over all group entries.
-
-   passwd
-
-	iterates over all passwd entries.
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index bf6890ca9d..4cf04a3ec3 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -1,16 +1,31 @@
 require 'mkmf'
 
+def etc_grep_header(field)
+  f = open("conftest.c", "w")
+  f.print <<EOF
+#include <pwd.h>
+EOF
+  f.close
+  begin
+    if xsystem("#{CPP} | egrep #{field}")
+      $defs.push(format("-D%s", field.upcase))
+    end
+  ensure
+    system "rm -f conftest.c"
+  end
+end
+
 have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
 a = have_func("getlogin")
 b = have_func("getpwent")
 c = have_func("getgrent")
 if  a or b or c
-  have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_change', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_age', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_class', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
-  have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
+  etc_grep_header("pw_gecos")
+  etc_grep_header("pw_change")
+  etc_grep_header("pw_quota")
+  etc_grep_header("pw_age")
+  etc_grep_header("pw_class")
+  etc_grep_header("pw_comment")
+  etc_grep_header("pw_expire")
   create_makefile("etc")
 end
diff --git a/ext/extmk.rb b/ext/extmk.rb
deleted file mode 100644
index 5f99c85ea9..0000000000
--- a/ext/extmk.rb
+++ /dev/null
@@ -1,291 +0,0 @@
-#! /usr/local/bin/ruby
-# -*- ruby -*-
-
-$force_static = nil
-$install = nil
-$destdir = nil
-$clean = nil
-$nodynamic = nil
-$extinit = nil
-$extobjs = nil
-$ignore = nil
-$message = nil
-
-$progname = $0
-alias $PROGRAM_NAME $0
-alias $0 $progname
-
-$extlist = []
-
-$:.replace ["."]
-require 'rbconfig'
-
-srcdir = Config::CONFIG["srcdir"]
-
-$:.replace [srcdir, srcdir+"/lib", "."]
-
-require 'mkmf'
-require 'getopts'
-
-$topdir = File.expand_path(".")
-$top_srcdir = srcdir
-$hdrdir = $top_srcdir
-
-def sysquote(x)
-  @quote ||= /human|os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
-  @quote ? x.quote : x
-end
-
-def extmake(target)
-  print "#{$message} #{target}\n"
-  $stdout.flush
-  if $force_static or $static_ext[target]
-    $static = target
-  else
-    $static = false
-  end
-
-  unless $ignore
-    return true if $nodynamic and not $static
-  end
-
-  init_mkmf
-
-  begin
-    dir = Dir.pwd
-    FileUtils.mkpath target unless File.directory?(target)
-    Dir.chdir target
-    $target = target
-    $mdir = target
-    $srcdir = File.join($top_srcdir, "ext", $mdir)
-    $preload = nil
-    makefile = "./Makefile"
-    unless $ignore
-      if $static ||
-	 !(t = modified?(makefile, MTIMES)) ||
-	 %W<#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb
-	    #{$srcdir}/depend #{$srcdir}/MANIFEST>.any? {|f| modified?(f, [t])}
-      then
-	$defs = []
-	Logging::logfile 'mkmf.log'
-	Config::CONFIG["srcdir"] = $srcdir
-	rm_f makefile
-	begin
-	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
-	    load $0
-	  elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
-	    load $0
-	  else
-	    create_makefile(target)
-	  end
-	  File.exist?(makefile)
-	rescue SystemExit
-	  # ignore
-	ensure
-	  rm_f "conftest*"
-	  $0 = $PROGRAM_NAME
-	  Config::CONFIG["srcdir"] = $top_srcdir
-	end
-      else
-	true
-      end
-    else
-      File.exist?(makefile)
-    end or open(makefile, "w") do |f|
-      f.print dummy_makefile($srcdir)
-      return true
-    end
-    args = sysquote($mflags)
-    if $static
-      args += ["static"]
-      $extlist.push [$static, $target, File.basename($target), $preload]
-    end
-    unless system($make, *args)
-      $ignore or $continue or return false
-    end
-    if $static
-      $extflags ||= ""
-      $extlibs ||= []
-      $extpath ||= []
-      $extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty?
-      $extflags += " " + $LDFLAGS unless $LDFLAGS.empty?
-      $extlibs |= $libs.split | $LOCAL_LIBS.split
-      $extpath |= $LIBPATH
-    end
-  ensure
-    Dir.chdir dir
-  end
-  true
-end
-
-def parse_args()
-  getopts('n', 'extstatic:', 'dest-dir:',
-	  'make:', 'make-flags:', 'mflags:')
-
-  $dryrun = $OPT['n']
-  $force_static = $OPT['extstatic'] == 'static'
-  $destdir = $OPT['dest-dir'] || ''
-  $make = $OPT['make'] || $make || 'make'
-  mflags = ($OPT['make-flags'] || '').strip
-  mflags = ($OPT['mflags'] || '').strip if mflags.empty?
-
-  $mflags = Shellwords.shellwords(mflags)
-  if arg = $mflags.first
-    arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
-  end
-
-  $make, *rest = Shellwords.shellwords($make)
-  $mflags.unshift(*rest) unless rest.empty?
-
-  def $mflags.set?(flag)
-    grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
-    false
-  end
-
-  if $mflags.set?(?n)
-    $dryrun = true
-  else
-    $mflags.unshift '-n' if $dryrun
-  end
-
-  $continue = $mflags.set?(?k)
-  $mflags |= ["DESTDIR=#{$destdir}"]
-end
-
-parse_args()
-
-unless $message
-  if $message = ARGV.shift and /^[a-z]+$/ =~ $message
-    $mflags.push($message)
-    $message = $message.sub(/^(?:dist|real)(?=(?:clean)?$)/, '\1')
-    case $message
-    when "clean"
-      $ignore ||= true
-    when "install"
-      $ignore ||= true
-      $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
-		      "INSTALL_DATA=install -c -p -m 0644",
-		      "MAKEDIRS=mkdir -p") if $dryrun
-    end
-    $message.sub!(/e?$/, "ing")
-  else
-    $message = "compiling"
-  end
-end
-
-EXEEXT = CONFIG['EXEEXT']
-if CROSS_COMPILING
-  $ruby = CONFIG['MINIRUBY']
-elsif $nmake
-  $ruby = '$(topdir:/=\\)\\miniruby' + EXEEXT
-else
-  $ruby = '$(topdir)/miniruby' + EXEEXT
-end
-$ruby << " -I$(topdir) -I$(hdrdir)/lib"
-$config_h = '$(topdir)/config.h'
-
-MTIMES = [File.mtime(__FILE__)]
-
-# get static-link modules
-$static_ext = {}
-for dir in ["ext", File::join($top_srcdir, "ext")]
-  setup = File::join(dir, CONFIG['setup'])
-  if File.file? setup
-    f = open(setup) 
-    while line = f.gets()
-      line.chomp!
-      line.sub!(/#.*$/, '')
-      next if /^\s*$/ =~ line
-      target, opt = line.split(nil, 3)
-      if target == 'option'
-	case opt
-	when 'nodynamic'
-	  $nodynamic = true
-	end
-	next
-      end
-      target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
-      $static_ext[target] = true
-    end
-    MTIMES << f.mtime
-    $setup = setup
-    f.close
-    break
-  end
-end
-
-FileUtils::makedirs('ext')
-Dir::chdir('ext')
-
-ext_prefix = "#{$top_srcdir}/ext"
-Dir.glob("#{ext_prefix}/*/**/MANIFEST") do |d|
-  d = File.dirname(d)
-  d.slice!(0, ext_prefix.length + 1)
-  extmake(d) or exit(1)
-end
-
-if $ignore
-  Dir.chdir ".."
-  exit
-end
-
-if $extlist.size > 0
-  $extinit ||= ""
-  $extobjs ||= ""
-  list = $extlist.dup
-  until list.empty?
-    s,t,i,r = list.shift
-    if r and list.any? {|l| r.include?(l[1])}
-      list << [s,t,i]
-      next
-    end
-    f = format("%s/%s.%s", s, i, $LIBEXT)
-    if File.exist?(f)
-      $extinit += "\tinit(Init_#{i}, \"#{t}.so\");\n"
-      $extobjs += "ext/#{f} "
-    end
-  end
-
-  src = <<SRC
-extern char *ruby_sourcefile, *rb_source_filename();
-#define init(func, name) (ruby_sourcefile = src = rb_source_filename(name), func(), rb_provide(src))
-void Init_ext() {\n\tchar* src;\n#$extinit}
-SRC
-  if !modified?("extinit.c", MTIMES) || IO.read("extinit.c") != src
-    open("extinit.c", "w") {|f| f.print src}
-  end
-
-  $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs
-  if RUBY_PLATFORM =~ /m68k-human|beos/
-    $extflags.delete("-L/usr/local/lib")
-  end
-  $extpath.delete("$(topdir)")
-  $extflags = libpathflag($extpath) << " " << $extflags.strip
-  conf = [
-    ['SETUP', $setup], [$enable_shared ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
-    ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
-  ].map {|n, v|
-    "#{n}=#{v}" if v and !(v = v.strip).empty?
-  }.compact
-  puts conf
-  $stdout.flush
-  $mflags.concat(conf)
-end
-rubies = []
-%w[RUBY RUBYW].each {|r|
-  config_string(r+"_INSTALL_NAME") {|r| rubies << r+EXEEXT}
-}
-
-Dir.chdir ".."
-if $extlist.size > 0
-  rm_f(Config::CONFIG["LIBRUBY_SO"])
-end
-puts "making #{rubies.join(', ')}"
-$stdout.flush
-$mflags.concat(rubies)
-
-system($make, *sysquote($mflags)) or exit($?.exitstatus)
-
-#Local variables:
-# mode: ruby
-#end:
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
new file mode 100644
index 0000000000..3514ab2503
--- /dev/null
+++ b/ext/extmk.rb.in
@@ -0,0 +1,681 @@
+#! /usr/local/bin/ruby
+
+$".push 'mkmf.rb'
+
+if ARGV[0] == 'static'
+  $force_static = true
+  ARGV.shift
+elsif ARGV[0] == 'install'
+  $install = true
+  $destdir = ARGV[1] || ''
+  ARGV.shift
+elsif ARGV[0] == 'clean'
+  $clean = true
+  ARGV.shift
+end
+
+SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"]
+$extlist = []
+
+$cache_mod = false
+$lib_cache = {}
+$func_cache = {}
+$hdr_cache = {}
+$top_srcdir = "@top_srcdir@"
+if $top_srcdir !~ "^/"
+  # get absolute path
+  $top_srcdir = File.expand_path($top_srcdir)
+end
+# get absolute path
+$topdir = File.expand_path("..")
+
+load "#{$top_srcdir}/lib/find.rb"
+
+if File.exist?("config.cache") then
+  f = open("config.cache", "r")
+  while f.gets
+    case $_
+    when /^lib: (.+) (yes|no)/
+      $lib_cache[$1] = $2
+    when /^func: ([\w_]+) (yes|no)/
+      $func_cache[$1] = $2
+    when /^hdr: (.+) (yes|no)/
+      $hdr_cache[$1] = $2
+    end
+  end
+  f.close
+end
+
+def older(file1, file2)
+  if !File.exist?(file1) then
+    return true
+  end
+  if !File.exist?(file2) then
+    return false
+  end
+  if File.mtime(file1) < File.mtime(file2)
+    return true
+  end
+  return false
+end
+
+if RUBY_PLATFORM == "m68k-human"
+  CFLAGS = "@CFLAGS@".gsub(/-c..-stack=[0-9]+ */, '')
+else
+  CFLAGS = "@CFLAGS@"
+end
+LINK = "@CC@ -o conftest -I#$topdir -I#$top_srcdir -I@includedir@ #{CFLAGS} @LDFLAGS@ %s %s conftest.c %s %s @LIBS@"
+CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir -I@includedir@ #{CFLAGS} %s %s conftest.c"
+
+if /cygwin|mswin32|djgpp|mingw32|m68k-human|i386-os2_emx/i =~ RUBY_PLATFORM
+  $null = open("nul", "w")
+else
+  $null = open("/dev/null", "w")
+end
+
+$orgerr = $stderr.dup
+$orgout = $stdout.dup
+def xsystem command
+  if $DEBUG
+    return system(command)
+  end
+  $stderr.reopen($null) 
+  $stdout.reopen($null) 
+  r = system(command)
+  $stderr.reopen($orgerr)
+  $stdout.reopen($orgout)
+  return r
+end
+
+def try_link0(src, opt="")
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  xsystem(format(LINK, $CFLAGS, $LDFLAGS, opt, $LOCAL_LIBS))
+end
+
+def try_link(src, opt="")
+  begin
+    try_link0(src, opt)
+  ensure
+    system "rm -f conftest*"
+  end
+end
+
+def try_cpp(src, opt="")
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  begin
+    xsystem(format(CPP, $CFLAGS, opt))
+  ensure
+    system "rm -f conftest*"
+  end
+end
+
+def egrep_cpp(pat, src, opt="")
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  begin
+    xsystem(format(CPP+"|egrep #{pat}", $CFLAGS, opt))
+  ensure
+    system "rm -f conftest*"
+  end
+end
+
+def try_run(src, opt="")
+  begin
+    if try_link0(src, opt)
+      if xsystem("./conftest")
+	true
+      else
+	false
+      end
+    else
+      nil
+    end
+  ensure
+    system "rm -f conftest*"
+  end
+end
+
+def install_rb(mfile, srcdir = nil)
+  libdir = "lib"
+  libdir = srcdir + "/" + libdir if srcdir
+  path = []
+  dir = []
+  Find.find(libdir) do |f|
+    next unless /\.rb$/ =~ f
+    f = f[libdir.length+1..-1]
+    path.push f
+    dir |= File.dirname(f)
+  end
+  for f in dir
+    next if f == "."
+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)/%s\n", f
+  end
+  for f in path
+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f
+  end
+end
+
+def append_library(libs, lib)
+  if /mswin32/ =~ RUBY_PLATFORM
+    lib + ".lib " + libs
+  else
+    "-l" + lib + " " + libs
+  end
+end
+
+def have_library(lib, func="main")
+  if $lib_cache[lib]
+    if $lib_cache[lib] == "yes"
+      $libs = append_library($libs, lib)
+      return true
+    else
+      return false
+    end
+  end
+
+  if func && func != ""
+    libs = append_library($libs, lib)
+    unless try_link(<<"SRC", libs)
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+      $lib_cache[lib] = 'no'
+      $cache_mod = true
+      return false
+    end
+  else
+    libs = append_library($libs, lib)
+  end
+
+  $libs = libs
+  $lib_cache[lib] = 'yes'
+  $cache_mod = true
+  return true
+end
+
+def find_library(lib, func, *paths)
+  ldflags = $LDFLAGS
+  libs = "-l" + lib + " " + $libs 
+  until try_link(<<"SRC", libs)
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+    if paths.size == 0
+      $LDFLAGS = ldflags
+      return false
+    end
+    $LDFLAGS = ldflags + " -L"+paths.shift
+  end
+  $libs = libs
+  return true
+end
+
+def have_func(func)
+  if $func_cache[func]
+    if $func_cache[func] == "yes"
+      $defs.push(format("-DHAVE_%s", func.upcase))
+      return true
+    else
+      return false
+    end
+  end
+
+  libs = $libs
+
+  unless try_link(<<"SRC", libs)
+char #{func}();
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+    $func_cache[func] = 'no'
+    $cache_mod = true
+    return false
+  end
+  $defs.push(format("-DHAVE_%s", func.upcase))
+  $func_cache[func] = 'yes'
+  $cache_mod = true
+  return true
+end
+
+def have_header(header)
+  if $hdr_cache[header]
+    if $hdr_cache[header] == "yes"
+      header.tr!("a-z./\055", "A-Z___")
+      $defs.push(format("-DHAVE_%s", header))
+      return true
+    else
+      return false
+    end
+  end
+
+  unless try_cpp(<<"SRC")
+#include <#{header}>
+SRC
+    $hdr_cache[header] = 'no'
+    $cache_mod = true
+    return false
+  end
+  $hdr_cache[header] = 'yes'
+  header.tr!("a-z./\055", "A-Z___")
+  $defs.push(format("-DHAVE_%s", header))
+  $cache_mod = true
+  return true
+end
+
+def arg_config(config, default=nil)
+  unless defined? $configure_args
+    $configure_args = {}
+    for arg in "@configure_args@".split
+      next unless /^--/ =~ arg
+      if /=/ =~ arg
+	$configure_args[$`] = $'
+      else
+	$configure_args[arg] = true
+      end
+    end
+  end
+  $configure_args.fetch(config, default)
+end
+
+def with_config(config, default=nil)
+  unless /^--with-/ =~ config
+    config = '--with-' + config
+  end
+  arg_config(config, default)
+end
+
+def enable_config(config, default=nil)
+  if arg_config("--enable-"+config, default)
+    true
+  elsif arg_config("--disable-"+config, false)
+    false
+  else
+    default
+  end
+end
+
+def create_header()
+  if $defs.length > 0
+    hfile = open("extconf.h", "w")
+    for line in $defs
+      line =~ /^-D(.*)/
+      hfile.printf "#define %s 1\n", $1
+    end
+    hfile.close
+  end
+end
+
+def dir_config(target)
+  dir = with_config("%s-dir"%target)
+  if dir
+    idir = " -I"+dir+"/include"
+    ldir = " -L"+dir+"/lib"
+  end
+  unless idir
+    dir = with_config("%s-include"%target)
+    idir = " -I"+dir if dir
+  end
+  unless ldir
+    dir = with_config("%s-lib"%target)
+    ldir = " -L"+dir if dir
+  end
+
+  $CFLAGS += idir if idir
+  $LDFLAGS += ldir if ldir
+end
+
+def create_makefile(target)
+  system "rm -f conftest*"
+  if "@DLEXT@" == $OBJEXT
+    libs = $libs.split
+    for lib in libs
+      lib.sub!(/-l(.*)/, '"lib\1.a"')
+    end
+    $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
+  end
+
+  $DLDFLAGS = '@DLDFLAGS@'
+
+  if RUBY_PLATFORM =~ /beos/
+    $libs = $libs + " -lruby"
+    $DLDFLAGS = $DLDFLAGS + " -L" + $topdir
+  end
+
+  defflag = ''
+  if RUBY_PLATFORM =~ /cygwin/ and not $static
+    if File.exist? target + ".def"
+      defflag = "--def=" + target + ".def"
+    end
+    $libs = $libs + " @LIBRUBYARG@"
+    $DLDFLAGS = $DLDFLAGS + " -L" + $topdir
+  end
+
+  $srcdir = $top_srcdir + "/ext/" + $mdir
+  mfile = open("Makefile", "w")
+  mfile.printf "\
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = #{$srcdir}
+VPATH = #{$srcdir}
+
+topdir = #{$topdir}
+hdrdir = #{$top_srcdir}
+DESTDIR = 
+
+CC = @CC@
+
+CFLAGS   = %s -I$(topdir) -I$(hdrdir) -I@includedir@ #{CFLAGS} #$CFLAGS %s
+DLDFLAGS = #$DLDFLAGS #$LDFLAGS
+LDSHARED = @LDSHARED@ #{defflag}
+", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" ")
+
+  mfile.printf "\
+
+RUBY_INSTALL_NAME = @RUBY_INSTALL_NAME@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+#pkglibdir = $(libdir)/$(RUBY_INSTALL_NAME)/@MAJOR@.@MINOR@
+pkglibdir = $(libdir)/ruby/@MAJOR@.@MINOR@
+archdir = $(pkglibdir)/@arch@
+@SET_MAKE@
+
+#### End of system configuration section. ####
+
+"
+  mfile.printf "LOCAL_LIBS = %s %s\n", $LOCAL_LIBS, $local_flags
+  mfile.printf "LIBS = %s\n", $libs
+  mfile.printf "OBJS = "
+  if !$objs then
+    $objs = []
+    for f in Dir["#{$top_srcdir}/ext/#{$mdir}/*.{#{SRC_EXT.join(%q{,})}}"]
+      f = File.basename(f)
+      f.sub!(/(#{SRC_EXT.join(%q{|})})$/, $OBJEXT)
+      $objs.push f
+    end
+  end
+  mfile.printf $objs.join(" ")
+  mfile.printf "\n"
+
+  mfile.printf <<EOS
+TARGET = #{target}
+DLLIB = $(TARGET).#{$static ? "a" : "@DLEXT@"}
+
+RUBY = ../../miniruby@EXEEXT@
+
+EXEEXT = @EXEEXT@
+
+all:		$(DLLIB)
+
+clean:;		@rm -f *.#{$OBJEXT} *.so *.sl *.a $(DLLIB)
+		@rm -f Makefile extconf.h conftest.*
+		@rm -f core ruby$(EXEEXT) *~
+
+realclean:	clean
+EOS
+
+  mfile.printf <<EOS
+
+install:
+	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(libdir) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(archdir)
+EOS
+  unless $static
+    mfile.printf "\
+	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(DESTDIR)$(archdir)/$(DLLIB)
+"
+  end
+  install_rb(mfile, $srcdir)
+  mfile.printf "\n"
+
+  if $static
+    mfile.printf "\
+$(DLLIB): $(OBJS)
+	@AR@ cru $(DLLIB) $(OBJS)
+	@-@RANLIB@ $(DLLIB) 2> /dev/null || true
+"
+  elsif "@DLEXT@" != $OBJEXT
+    mfile.printf "\
+$(DLLIB): $(OBJS)
+	$(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)
+"
+  elsif RUBY_PLATFORM == "m68k-human"
+    mfile.printf "\
+$(DLLIB): $(OBJS)
+	ar cru $(DLLIB) $(OBJS)
+"
+  else
+    mfile.printf "\
+$(DLLIB): $(OBJS)
+	ld $(DLDFLAGS) -r -o $(DLLIB) $(OBJS)
+"
+  end
+
+  if File.exist?("#{$srcdir}/depend")
+    dfile = open("#{$srcdir}/depend", "r")
+    mfile.printf "###\n"
+    while line = dfile.gets()
+      mfile.printf "%s", line.gsub('\$\(hdrdir\)/config.h', '$(topdir)/config.h')
+    end
+    dfile.close
+  end
+  mfile.close
+  
+  if RUBY_PLATFORM =~ /beos/
+    if RUBY_PLATFORM =~ /^powerpc/ then
+      deffilename = "ruby.exp"
+    else
+      deffilename = "ruby.def"
+    end
+    print "creating #{deffilename}\n"
+    open(deffilename, "w") do |file|
+      file.print("EXPORTS\n") if RUBY_PLATFORM =~ /^i/
+      file.print("Init_#{target}\n")
+    end
+  end
+end
+
+def extmake(target)
+  if $force_static or $static_ext[target]
+    $static = target
+  else
+    $static = false
+  end
+
+  unless $install or $clean
+    return if $nodynamic and not $static
+  end
+
+  $OBJEXT = "@OBJEXT@"
+  $objs = nil
+  $local_flags = ""
+  case RUBY_PLATFORM
+  when /cygwin|beos|openstep|nextstep|rhapsody/
+    $libs = ""
+  when /mswin32/
+    $libs = ""
+    $local_flags = "rubymw.lib -link /LIBPATH:$(topdir) /EXPORT:Init_$(TARGET)"
+  else
+    $libs = "-lc"
+  end
+  $LOCAL_LIBS = ""		# to be assigned in extconf.rb
+  dir = with_config("opt-dir")
+  if dir
+    idir = "-I"+dir+"/include"
+    ldir = "-L"+dir+"/lib"
+  end
+  unless idir
+    dir = with_config("opt-include")
+    idir = "-I"+dir if dir
+  end
+  unless ldir
+    dir = with_config("opt-lib")
+    ldir = "-L"+dir if dir
+  end
+
+  $CFLAGS = idir || ""
+  $LDFLAGS = ldir || ""
+
+  begin
+    system "mkdir", target unless File.directory?(target)
+    Dir.chdir target
+    $mdir = target
+    unless $install or $clean
+      if $static_ext.size > 0 ||
+	!File.exist?("./Makefile") ||
+	older("./Makefile", "#{$top_srcdir}/ext/@setup@") ||
+	older("./Makefile", "../extmk.rb") ||
+	older("./Makefile", "#{$top_srcdir}/ext/#{target}/extconf.rb")
+      then
+	$defs = []
+	if File.exist?("#{$top_srcdir}/ext/#{target}/extconf.rb")
+	  load "#{$top_srcdir}/ext/#{target}/extconf.rb"
+	else
+	  create_makefile(target)
+	end
+      end
+    end
+    if File.exist?("./Makefile")
+      if $static
+	$extlist.push [$static,target]
+      end
+      if $install
+	system "#{$make} install DESTDIR=#{$destdir}"
+      elsif $clean
+	system "#{$make} clean"
+      else
+	system "#{$make} all" or exit
+      end
+    end
+    if $static
+      $extlibs ||= ""
+      $extlibs += " " + $LDFLAGS unless $LDFLAGS == ""
+      $extlibs += " " + $libs unless $libs == ""
+      $extlibs += " " + $LOCAL_LIBS unless $LOCAL_LIBS == ""
+    end
+  ensure
+    system "rm -f conftest*"
+    Dir.chdir ".."
+  end
+end
+
+$make = ENV["MAKE"]
+$make ||= with_config("make-prog", "make")
+
+# get static-link modules
+$static_ext = {}
+for setup in ["@setup@", "#{$top_srcdir}/ext/@setup@"]
+  if File.file? setup
+    f = open(setup) 
+    while f.gets()
+      $_.chomp!
+      sub!(/#.*$/, '')
+      next if /^\s*$/
+      if /^option +nodynamic/
+	$nodynamic = true
+	next
+      end
+      $static_ext[$_.split[0]] = true
+    end
+    f.close
+    break
+  end
+end
+
+for d in Dir["#{$top_srcdir}/ext/*"]
+  File.directory?(d) || next
+  File.file?(d + "/MANIFEST") || next
+  
+  d = File.basename(d)
+  if $install
+    print "installing ", d, "\n"
+  elsif $clean
+    print "cleaning ", d, "\n"
+  else
+    print "compiling ", d, "\n"
+    if RUBY_PLATFORM =~ /-aix/ and older("../ruby.imp", "../miniruby")
+      load "#{$top_srcdir}/ext/aix_mksym.rb"
+    end
+  end
+  extmake(d)
+end
+
+if $cache_mod
+  f = open("config.cache", "w")
+  for k,v in $lib_cache
+    f.printf "lib: %s %s\n", k, v
+  end
+  for k,v in $func_cache
+    f.printf "func: %s %s\n", k, v
+  end
+  for k,v in $hdr_cache
+    f.printf "hdr: %s %s\n", k, v
+  end
+  f.close
+end
+
+exit if $install or $clean
+$extinit = "" unless $extinit
+
+ruby = "@RUBY_INSTALL_NAME@@EXEEXT@"
+miniruby = "miniruby@EXEEXT@"
+
+$extobjs = "" unless $extobjs
+if $extlist.size > 0
+  for s,t in $extlist
+    f = format("%s/%s.a", s, t)
+    if File.exist?(f)
+      $extinit += format("\
+\tInit_%s();\n\
+\trb_provide(\"%s.so\");\n\
+", t, t)
+      $extobjs += "ext/"
+      $extobjs += f
+      $extobjs += " "
+    else
+      false
+    end
+  end
+
+  if older("extinit.c", "#{$top_srcdir}/ext/@setup@")
+    f = open("extinit.c", "w")
+    f.printf "void Init_ext() {\n"
+    f.printf $extinit
+    f.printf "}\n"
+    f.close
+  end
+  if older("extinit.#{$OBJEXT}", "extinit.c")
+    cmd = "@CC@ " + CFLAGS + " -c extinit.c"
+    print cmd, "\n"
+    system cmd or exit 1
+  end
+
+  Dir.chdir ".."
+
+  if older(ruby, "#{$top_srcdir}/ext/@setup@") or older(ruby, miniruby)
+    system("rm -f #{ruby}")
+  end
+
+  $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs
+  if RUBY_PLATFORM =~ /m68k-human|beos/
+    $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs
+  end
+  system format(%[#{$make} #{ruby} EXTOBJS="%s" EXTLIBS="%s"], $extobjs, $extlibs)
+else
+  Dir.chdir ".."
+  if older(ruby, miniruby)
+    system("rm -f #{ruby}")
+    system("#{$make} #{ruby}")
+  end
+end
+
+#Local variables:
+# mode: ruby
+#end:
diff --git a/ext/extmk.rb.nt b/ext/extmk.rb.nt
new file mode 100644
index 0000000000..1416548649
--- /dev/null
+++ b/ext/extmk.rb.nt
@@ -0,0 +1,615 @@
+#! /usr/local/bin/ruby
+
+$".push 'mkmf.rb'
+
+if ARGV[0] == 'static'
+  $force_static = true
+  ARGV.shift
+elsif ARGV[0] == 'install'
+  $install = true
+  $destdir = ARGV[1] || ''
+  ARGV.shift
+elsif ARGV[0] == 'clean'
+  $clean = true
+  ARGV.shift
+end
+
+SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"]
+$extlist = []
+
+$cache_mod = false
+$lib_cache = {}
+$func_cache = {}
+$hdr_cache = {}
+
+$top_srcdir = File.expand_path("..")
+$topdir = File.expand_path("..")
+$ruby_inc = $top_srcdir
+
+load "#{$top_srcdir}/lib/find.rb"
+
+#$dllopt = '-MD'
+$dllopt = ''
+
+if File.exist?("config.cache") then
+  f = open("config.cache", "r")
+  while f.gets
+    case $_
+    when /^lib: ([\w_]+) (yes|no)/
+      $lib_cache[$1] = $2
+    when /^func: ([\w_]+) (yes|no)/
+      $func_cache[$1] = $2
+    when /^hdr: (.+) (yes|no)/
+      $hdr_cache[$1] = $2
+    end
+  end
+  f.close
+end
+
+def older(file1, file2)
+  if !File.exist?(file1) then
+    return true
+  end
+  if !File.exist?(file2) then
+    return false
+  end
+  if File.mtime(file1) < File.mtime(file2)
+    return true
+  end
+  return false
+end
+
+CFLAGS = ""
+LINK = "cl -o conftest.exe %s  conftest.c %s %s"
+CPP = "cl -E  -I#{$ruby_inc} -I#{$ruby_inc}/missing -I#{$ruby_inc}/win32 -I. %s conftest.c"
+$null = open("nul", "w")
+
+$orgerr = $stderr.dup
+$orgout = $stdout.dup
+def xsystem command
+  if $DEBUG
+    return system(command)
+  end
+  $stderr.reopen($null) 
+  $stdout.reopen($null) 
+  r = system(command)
+  $stderr.reopen($orgerr)
+  $stdout.reopen($orgout)
+  return r
+end
+
+def try_link0(src, opt="")
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  xsystem(format(LINK, $CFLAGS, $LDFLAGS, opt))
+end
+
+def try_link(src, opt="")
+  begin
+    try_link0(src, opt)
+  ensure
+    system "rm -f conftest*"
+  end
+end
+
+def try_cpp(src, opt=$CFLAGS)
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  begin
+    xsystem(format(CPP, opt))
+  ensure
+    system "rm -f conftest*"
+  end
+end
+
+def egrep_cpp(pat, src, opt=$CFLAGS)
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  begin
+    xsystem(format(CPP+"|egrep #{pat}", opt))
+  ensure
+    system "rm -f conftest*"
+  end
+end
+
+def try_run(src, opt="")
+  begin
+    if try_link0(src, opt)
+      if xsystem("./conftest")
+	true
+      else
+	false
+      end
+    else
+      nil
+    end
+  ensure
+    system "rm -f conftest*"
+  end
+end
+
+def install_rb(mfile, srcdir = nil)
+  libdir = "lib"
+  libdir = srcdir + "/" + libdir if srcdir
+  path = []
+  dir = []
+  Find.find(libdir) do |f|
+    next unless /\.rb$/ =~ f
+    f = f[libdir.length+1..-1]
+    path.push f
+    dir |= File.dirname(f)
+  end
+  for f in dir
+    next if f == "."
+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)/%s\n", f
+  end
+  for f in path
+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f
+  end
+end
+
+def append_library(libs, lib)
+  if /mswin32/ =~ RUBY_PLATFORM
+    lib + ".lib " + libs
+  else
+    "-l" + lib + " " + libs
+  end
+end
+
+def have_library(lib, func="main")
+  #print format("have_library(%s, %s)\n", lib, func)
+  if $lib_cache[lib]
+    if $lib_cache[lib] == "yes"
+      $libs = append_library($libs, lib)
+      return true
+    else
+      return false
+    end
+  end
+
+  if func && func != ""
+    libs = append_library($libs, lib)
+    #print "libs=#{libs}\n"
+    r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+    unless r
+      r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
+SRC
+    end
+    unless r
+      #print "fail : #{libs}\n"
+      $lib_cache[lib] = 'no'
+      $cache_mod = true
+      return false
+    end
+  end
+
+  $libs = libs
+  $lib_cache[lib] = 'yes'
+  $cache_mod = true
+  return true
+end
+
+def have_func(func)
+  if $func_cache[func]
+    if $func_cache[func] == "yes"
+      $defs.push(format("-DHAVE_%s", func.upcase))
+      return true
+    else
+      return false
+    end
+  end
+
+  libs = $libs
+
+  #print "libs=#{libs}\n"
+  r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+  unless r
+    try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
+SRC
+  end
+  unless r
+    $func_cache[func] = 'no'
+    $cache_mod = true
+    return false
+  end
+  $defs.push(format("-DHAVE_%s", func.upcase))
+  $func_cache[func] = 'yes'
+  $cache_mod = true
+  return true
+end
+
+def have_header(header)
+  if $hdr_cache[header]
+    if $hdr_cache[header] == "yes"
+      header.tr!("a-z./\055", "A-Z___")
+      $defs.push(format("-DHAVE_%s", header))
+      return true
+    else
+      return false
+    end
+  end
+
+  unless try_cpp(<<"SRC")
+#include <#{header}>
+SRC
+    $hdr_cache[header] = 'no'
+    $cache_mod = true
+    return false
+  end
+  $hdr_cache[header] = 'yes'
+  header.tr!("a-z./\055", "A-Z___")
+  $defs.push(format("-DHAVE_%s", header))
+  $cache_mod = true
+  return true
+end
+
+def arg_config(config, default=nil)
+  return default if /mswin32/i =~ PLATFORM
+  unless defined? $configure_args
+    $configure_args = {}
+    for arg in ENV["CONFIGURE_ARGS"].split
+      next unless /^--/ =~ arg
+      if /=/ =~ arg
+	$configure_args[$`] = $'
+      else
+	$configure_args[arg] = true
+      end
+    end
+  end
+  $configure_args.fetch(config, default)
+end
+
+def with_config(config, default=nil)
+  unless /^--with-/ =~ config
+    config = '--with-' + config
+  end
+  arg_config(config, default)
+end
+
+def enable_config(config, default=nil)
+  if arg_config("--enable-"+config, default)
+    true
+  elsif arg_config("--disable-"+config, false)
+    false
+  else
+    default
+  end
+end
+
+def create_header()
+  if $defs.length > 0
+    hfile = open("extconf.h", "w")
+    for line in $defs
+      line =~ /^-D(.*)/
+      hfile.printf "#define %s 1\n", $1
+    end
+    hfile.close
+  end
+end
+
+def create_makefile(target)
+  $target = target
+
+  if $libs != ""
+    libs = $libs.split
+    for lib in libs
+      lib.sub!(/(.*)/, '"\1.lib"') if /.lib$/ !~ lib
+    end
+    $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
+  end
+
+  mfile = open("Makefile", "w")
+  mfile.printf "\
+SHELL = $(COMPSEC)
+
+#### Start of system configuration section. ####
+
+srcdir = .
+VPATH = .
+
+topdir = #{$topdir}
+hdrdir = #{$top_srcdir}
+
+CC = cl
+
+CFLAGS   = %s -I#{$ruby_inc} -I#{$ruby_inc}/missing -I. -O -DNT %s #{CFLAGS} #{$CFLAGS} %s
+DLDFLAGS = 
+LDSHARED = cl -LD
+RUBYLIB  = ../../ruby.lib
+", if $static then "" else "-fpic" end, $dllopt, $defs.join(" ")
+
+  if $force_static
+    print "static\n"
+  else
+    print "non static\n"
+  end
+
+  mfile.printf "\
+
+libdir = /usr/local/lib
+pkglibdir = $(libdir)/ruby/1.3
+archdir = $(pkglibdir)/i386-mswin32
+
+#### End of system configuration section. ####
+"
+  mfile.printf "LOCAL_LIBS = %s\n", $LOCAL_LIBS unless $LOCAL_LIBS == ""
+  mfile.printf "LIBS = %s\n", $libs
+  mfile.printf "OBJS = "
+  if !$objs then
+    $objs = []
+    for f in Dir["*.{#{SRC_EXT.join(%q{,})}}"]
+      f = File.basename(f)
+      f.sub!(/(#{SRC_EXT.join(%q{|})})$/, $OBJEXT)
+      $objs.push f
+    end
+  end
+  mfile.printf $objs.join(" ")
+  mfile.printf "\n"
+
+  mfile.printf "\
+TARGET = %s
+DLLIB = $(TARGET).%s
+DEFFILE = $(TARGET).def
+
+RUBY = ..\\..\\miniruby.exe
+
+all:            $(DLLIB)
+
+clean:;         @rm -f *.#{$OBJEXT} *.lib *.exp vc*.pdb *.bak *.def
+		@rm -f Makefile extconf.h conftest.*
+
+realclean:      clean
+
+install:
+	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(libdir) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(archdir)
+", target,
+    if $force_static then "lib" else "dll" end
+
+  unless $static
+    mfile.printf "\
+	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(DESTDIR)$(archdir)/$(DLLIB)
+"
+  end
+  install_rb(mfile, $srcdir)
+
+  if $force_static
+    mfile.printf "\
+$(DLLIB): $(OBJS)
+	lib /OUT:$(DLLIB) $(OBJS)
+"
+  else
+    mfile.printf "\
+$(DEFFILE):
+	echo $(DEFFILE)
+
+$(DLLIB): $(OBJS) $(DEFFILE)
+	$(LDSHARED) -o $(DLLIB) $(OBJS) $(RUBYLIB) -link /DEF:$(DEFFILE)
+"
+  end
+
+  if File.exist?("depend")
+    dfile = open("depend", "r")
+    mfile.printf "###\n"
+    while line = dfile.gets()
+      mfile.printf "%s", line.gsub(/\.o/, ".#{$OBJEXT}")
+    end
+    dfile.close
+  end
+  mfile.close
+  unless $static
+    if !File.exist?("#{target}.def")
+      create_def(target)
+    end
+  end
+end
+
+#template of .def file.
+def create_def(basename)
+  defname = sprintf("%s.def", basename)
+  f = open(defname, "w")
+  f.printf "\
+LIBRARY %s.dll
+CODE LOADONCALL
+DATA LOADONCALL
+DESCRIPTION 'win32 %s.dll'
+EXPORTS
+
+	Init_%s
+", basename, basename, basename
+  f.close
+
+end
+
+def extmake(target)
+  if $force_static or $static_ext[target]
+    $static = target
+  else
+    $static = false
+  end
+
+  unless $install or $clean
+    return if $nodynamic and not $static
+  end
+
+  $OBJEXT = 'obj'
+  $objs = nil
+  $local_flags = ""
+  $libs = ""
+  $LOCAL_LIBS = ""		# to be assigned in extconf.rb
+  $CFLAGS = ""
+  $LDFLAGS = ""
+
+  begin
+    Dir.chdir target
+    $target = target
+    unless $install or $clean
+      if $static_ext.size > 0 ||
+	!File.exist?("./Makefile") ||
+	older("./Makefile", "../Setup") ||
+	older("./Makefile", "../extmk.rb") ||
+	older("./Makefile", "./extconf.rb")
+      then
+	$defs = []
+	if File.exist?("extconf.rb")
+	  load "extconf.rb"
+	else
+	  create_makefile(target)
+	end
+      end
+    end
+    if File.exist?("./Makefile")
+      if $static
+	$extlist.push [$static,$target]
+      end
+      if $install
+	system "#{$make} install DESTDIR=#{$destdir}"
+      elsif $clean
+	system "#{$make} clean"
+      else
+	system "#{$make} all" or exit
+      end
+    end
+    if $static
+      $extlibs ||= ""
+      $extlibs += " " + $LDFLAGS unless $LDFLAGS == ""
+      $extlibs += " " + $libs unless $libs == ""
+      $extlibs += " " + $LOCAL_LIBS unless $LOCAL_LIBS == ""
+    end
+  ensure
+    system "rm -f conftest*"
+    Dir.chdir ".."
+  end
+end
+
+$make = ENV["MAKE"]
+$make ||= with_config("make-prog", "nmake -nologo")
+
+# get static-link modules
+$static_ext = {}
+if File.file? "./Setup"
+  f = open("./Setup") 
+  while f.gets()
+    $_.chop!
+    sub!(/#.*$/, '')
+    next if /^\s*$/
+    #print $_, "\n"
+
+    if /^option +nodynamic/
+      $nodynamic = true
+      next
+    end
+    $static_ext[$_.split[0]] = true
+  end
+  f.close
+end
+
+for d in Dir["*"]
+  File.directory?(d) || next
+  File.file?(d + "/MANIFEST") || next
+  
+  d = $1 if d =~ /\/([\/]*)$/
+  if $install
+    print "installing ", d, "\n"
+  elsif $clean
+    print "cleaning ", d, "\n"
+  else
+    print "compiling ", d, "\n"
+  end
+  extmake(d)
+end
+
+if $cache_mod
+  f = open("config.cache", "w")
+  for k,v in $lib_cache
+    f.printf "lib: %s %s\n", k, v
+  end
+  for k,v in $func_cache
+    f.printf "func: %s %s\n", k, v
+  end
+  for k,v in $hdr_cache
+    f.printf "hdr: %s %s\n", k, v
+  end
+  f.close
+end
+
+exit if $install or $clean
+$extinit = "" unless $extinit
+
+ruby = "ruby.exe"
+miniruby = "miniruby.exe"
+
+$extobjs = "" unless $extobjs
+if $extlist.size > 0
+  for s,t in $extlist
+    f = format("%s/%s.lib", s, t)
+    if File.exist?(f)
+      $extinit += format("\
+\tInit_%s();\n\
+\trb_provide(\"%s.so\");\n\
+", t, t)
+      $extobjs += "ext/"
+      $extobjs += f
+      $extobjs += " "
+    else
+      false
+    end
+  end
+
+  if older("extinit.c", "Setup")
+    f = open("extinit.c", "w")
+    f.printf "void Init_ext() {\n"
+    f.printf $extinit
+    f.printf "}\n"
+    f.close
+  end
+  if older("extinit.#{$OBJEXT}", "extinit.c")
+    cmd = "cl -Zi -O -I. -c extinit.c"
+    print cmd, "\n"
+    system cmd or exit 1
+  end
+
+  Dir.chdir ".."
+
+  if older(ruby, "ext/Setup") or older(ruby, miniruby)
+    system("rm -f #{ruby}")
+  end
+
+  $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs
+  #$extlibs = ""
+  #print "EXTLIBS=#{$extlibs}\n"
+  $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs
+  $extlibs.gsub!(" +", " ") if $extlibs
+  #print "EXTLIBS=#{$extlibs}\n"
+
+  system format(%[#{$make} #{ruby} EXTOBJS="%s" EXTLIBS="%s"], $extobjs, $extlibs)
+else
+  Dir.chdir ".."
+  if older(ruby, miniruby)
+    system("rm -f #{ruby}")
+    system("#{$make} #{ruby}")
+  end
+end
+#Local variables:
+# mode: ruby
+#end:
diff --git a/ext/fcntl/.cvsignore b/ext/fcntl/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/fcntl/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index d48630fc66..186f9ac893 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -5,7 +5,7 @@
   $Author$
   created at: Mon Apr  7 18:53:05 JST 1997
 
-  Copyright (C) 1997-2001 Yukihiro Matsumoto
+  Copyright (C) 1997-1998 Yukihiro Matsumoto
 
 ************************************************/
 
@@ -34,7 +34,6 @@ pack up your own arguments to pass as args for locking functions, etc.
 #include "ruby.h"
 #include <fcntl.h>
 
-void
 Init_fcntl()
 {
     VALUE mFcntl = rb_define_module("Fcntl");
@@ -104,9 +103,4 @@ Init_fcntl()
 #ifdef O_WRONLY
     rb_define_const(mFcntl, "O_WRONLY", INT2NUM(O_WRONLY));
 #endif
-#ifdef O_ACCMODE
-    rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_ACCMODE));
-#else
-    rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_RDONLY | O_WRONLY | O_RDWR));
-#endif
 }
diff --git a/ext/gdbm/.cvsignore b/ext/gdbm/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/gdbm/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/gdbm/MANIFEST b/ext/gdbm/MANIFEST
index 1359b4fdaf..f4a8796d18 100644
--- a/ext/gdbm/MANIFEST
+++ b/ext/gdbm/MANIFEST
@@ -3,4 +3,3 @@ README
 depend
 extconf.rb
 gdbm.c
-testgdbm.rb
diff --git a/ext/gdbm/README b/ext/gdbm/README
index df7a261c68..d25cc9240a 100644
--- a/ext/gdbm/README
+++ b/ext/gdbm/README
@@ -1 +1 @@
-gdbm ext-library for Ruby 1.3 or later
+gdbm ext-library for Ruby 1.3
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 84996896ab..a9c2c64ef6 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -13,17 +13,14 @@
 #include <gdbm.h>
 #include <fcntl.h>
 #include <errno.h>
+#ifdef USE_CWGUSI
+# include <sys/errno.h>
+#endif
 
-static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
+VALUE cGDBM;
 
 #define MY_BLOCK_SIZE (2048)
-#define MY_FATAL_FUNC rb_gdbm_fatal
-static void
-rb_gdbm_fatal(msg)
-    char *msg;
-{
-    rb_raise(rb_eGDBMFatalError, msg);
-}
+#define MY_FATAL_FUNC (0)
 
 struct dbmdata {
     int  di_size;
@@ -36,56 +33,32 @@ closed_dbm()
     rb_raise(rb_eRuntimeError, "closed GDBM file");
 }
 
-#define GetDBM(obj, dbmp) do {\
+#define GetDBM(obj, dbmp) {\
     Data_Get_Struct(obj, struct dbmdata, dbmp);\
-    if (dbmp == 0) closed_dbm();\
     if (dbmp->di_dbm == 0) closed_dbm();\
-} while (0)
+}
 
 static void
 free_dbm(dbmp)
     struct dbmdata *dbmp;
 {
-    if (dbmp) {
-	if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
-	free(dbmp);
-    }
-}
-
-static VALUE
-fgdbm_close(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-
-    GetDBM(obj, dbmp);
-    gdbm_close(dbmp->di_dbm);
-    dbmp->di_dbm = 0;
-
-    return Qnil;
-}
-
-static VALUE fgdbm_s_alloc _((VALUE));
-
-static VALUE
-fgdbm_s_alloc(klass)
-    VALUE klass;
-{
-    return Data_Wrap_Struct(klass, 0, free_dbm, 0);
+    if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
+    free(dbmp);
 }
 
 static VALUE
-fgdbm_initialize(argc, argv, obj)
+fgdbm_s_open(argc, argv, klass)
     int argc;
     VALUE *argv;
-    VALUE obj;
+    VALUE klass;
 {
-    VALUE file, vmode, vflags;
+    VALUE file, vmode;
     GDBM_FILE dbm;
     struct dbmdata *dbmp;
-    int mode, flags = 0;
+    int mode;
+    VALUE obj;
 
-    if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
+    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
 	mode = 0666;		/* default value */
     }
     else if (NIL_P(vmode)) {
@@ -94,216 +67,65 @@ fgdbm_initialize(argc, argv, obj)
     else {
 	mode = NUM2INT(vmode);
     }
-
-    if (!NIL_P(vflags))
-        flags = NUM2INT(vflags);
-
-    SafeStringValue(file);
+    Check_SafeStr(file);
 
     dbm = 0;
     if (mode >= 0)
 	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-			GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
+			O_RDWR|O_CREAT, mode, MY_FATAL_FUNC);
     if (!dbm)
 	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-			GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
+			O_RDWR, mode, MY_FATAL_FUNC);
     if (!dbm)
 	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-			GDBM_READER|flags, 0, MY_FATAL_FUNC);
+			O_RDONLY, mode, MY_FATAL_FUNC);
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
-
-	if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
-	    gdbm_errno == GDBM_CANT_BE_READER ||
-	    gdbm_errno == GDBM_CANT_BE_WRITER)
-	    rb_sys_fail(RSTRING(file)->ptr);
-	else
-	    rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+	rb_sys_fail(RSTRING(file)->ptr);
     }
 
-    dbmp = ALLOC(struct dbmdata);
-    free_dbm(DATA_PTR(obj));
-    DATA_PTR(obj) = dbmp;
+    obj = Data_Make_Struct(klass,struct dbmdata,0,free_dbm,dbmp);
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
+    rb_obj_call_init(obj, argc, argv);
 
     return obj;
 }
 
 static VALUE
-fgdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
-
-    if (NIL_P(fgdbm_initialize(argc, argv, obj))) {
-	return Qnil;
-    }
-
-    if (rb_block_given_p()) {
-        return rb_ensure(rb_yield, obj, fgdbm_close, obj);
-    }
-
-    return obj;
-}
-
-static VALUE
-rb_gdbm_fetch(dbm, key)
-    GDBM_FILE dbm;
-    datum key;
-{
-    datum val;
-    VALUE str;
-
-    val = gdbm_fetch(dbm, key);
-    if (val.dptr == 0)
-        return Qnil;
-
-    str = rb_obj_alloc(rb_cString);
-    RSTRING(str)->len = val.dsize;
-    RSTRING(str)->aux.capa = val.dsize;
-    RSTRING(str)->ptr = REALLOC_N(val.dptr,char,val.dsize+1);
-    RSTRING(str)->ptr[val.dsize] = '\0';
-
-    OBJ_TAINT(str);
-    return (VALUE)str;
-}
-
-static VALUE
-rb_gdbm_fetch2(dbm, keystr)
-    GDBM_FILE dbm;
-    VALUE keystr;
+fgdbm_close(obj)
+    VALUE obj;
 {
-    datum key;
+    struct dbmdata *dbmp;
 
-    StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
+    if (dbmp->di_dbm == 0) closed_dbm();
+    gdbm_close(dbmp->di_dbm);
+    dbmp->di_dbm = 0;
 
-    return rb_gdbm_fetch(dbm, key);
+    return Qnil;
 }
 
 static VALUE
-rb_gdbm_fetch3(obj, keystr)
+fgdbm_fetch(obj, keystr)
     VALUE obj, keystr;
 {
+    datum key, value;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-    return rb_gdbm_fetch2(dbm, keystr);
-}
-
-static VALUE
-rb_gdbm_firstkey(dbm)
-    GDBM_FILE dbm;
-{
-    datum key;
-    VALUE str;
-
-    key = gdbm_firstkey(dbm);
-    if (key.dptr == 0)
-        return Qnil;
-
-    str = rb_obj_alloc(rb_cString);
-    RSTRING(str)->len = key.dsize;
-    RSTRING(str)->aux.capa = key.dsize;
-    RSTRING(str)->ptr = REALLOC_N(key.dptr,char,key.dsize+1);
-    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
-
-    OBJ_TAINT(str);
-    return str;
-}
-
-static VALUE
-rb_gdbm_nextkey(dbm, keystr)
-    GDBM_FILE dbm;
-    VALUE keystr;
-{
-    datum key, key2;
-    VALUE str;
-
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
-    key2 = gdbm_nextkey(dbm, key);
-    if (key2.dptr == 0)
-        return Qnil;
-
-    str = rb_obj_alloc(rb_cString);
-    RSTRING(str)->len = key2.dsize;
-    RSTRING(str)->aux.capa = key2.dsize;
-    RSTRING(str)->ptr = REALLOC_N(key2.dptr,char,key2.dsize+1);
-    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
-
-    OBJ_TAINT(str);
-    return str;
-}
-
-static VALUE
-fgdbm_fetch(obj, keystr, ifnone)
-    VALUE obj, keystr, ifnone;
-{
-    VALUE valstr;
-
-    valstr = rb_gdbm_fetch3(obj, keystr);
-    if (NIL_P(valstr)) {
-	if (ifnone == Qnil && rb_block_given_p())
-	    return rb_yield(keystr);
-	return ifnone;
-    }
-    return valstr;
-}
-
-static VALUE
-fgdbm_aref(obj, keystr)
-    VALUE obj, keystr;
-{
-    return rb_gdbm_fetch3(obj, keystr);
-}
-
-static VALUE
-fgdbm_fetch_m(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE keystr, valstr, ifnone;
-
-    rb_scan_args(argc, argv, "11", &keystr, &ifnone);
-    valstr = fgdbm_fetch(obj, keystr, ifnone);
-    if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
-	rb_raise(rb_eIndexError, "key not found");
 
-    return valstr;
-}
-
-static VALUE
-fgdbm_index(obj, valstr)
-    VALUE obj, valstr;
-{
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
-    VALUE keystr, valstr2;
-
-    StringValue(valstr);
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-	valstr2 = rb_gdbm_fetch2(dbm, keystr);
-        if (!NIL_P(valstr2) &&
-            RSTRING(valstr)->len == RSTRING(valstr2)->len &&
-            memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
-                   RSTRING(valstr)->len) == 0) {
-	    return keystr;
-        }
+    value = gdbm_fetch(dbm, key);
+    if (value.dptr == 0) {
+	return Qnil;
     }
-    return Qnil;
+    return rb_tainted_str_new(value.dptr, value.dsize);
 }
 
 static VALUE
@@ -317,90 +139,37 @@ fgdbm_indexes(argc, argv, obj)
 
     new = rb_ary_new2(argc);
     for (i=0; i<argc; i++) {
-	rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+	rb_ary_push(new, fgdbm_fetch(obj, argv[i]));
     }
 
     return new;
 }
 
 static VALUE
-fgdbm_select(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    if (rb_block_given_p()) {
-        GDBM_FILE dbm;
-        struct dbmdata *dbmp;
-        VALUE keystr;
-
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-	}
-        GetDBM(obj, dbmp);
-        dbm = dbmp->di_dbm;
-
-        for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-             keystr = rb_gdbm_nextkey(dbm, keystr)) {
-            VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr));
-
-            if (RTEST(rb_yield(assoc)))
-                rb_ary_push(new, assoc);
-        }
-    }
-    else {
-	rb_warn("GDBM#select(index..) is deprecated; use GDBM#values_at");
-
-        for (i=0; i<argc; i++) {
-            rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
-        }
-    }
-
-    return new;
-}
-
-static VALUE
-fgdbm_values_at(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    for (i=0; i<argc; i++) {
-        rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
-    }
-
-    return new;
-}
-
-static VALUE
-rb_gdbm_delete(obj, keystr)
+fgdbm_delete(obj, keystr)
     VALUE obj, keystr;
 {
-    datum key;
+    datum key, value;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
     rb_secure(4);
-    StringValue(keystr);
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
 
-    if (!gdbm_exists(dbm, key)) {
+    value = gdbm_fetch(dbm, key);
+    if (value.dptr == 0) {
+	if (rb_iterator_p()) rb_yield(keystr);
 	return Qnil;
     }
 
     if (gdbm_delete(dbm, key)) {
 	dbmp->di_size = -1;
-	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+	rb_raise(rb_eRuntimeError, "dbm_delete failed");
     }
     else if (dbmp->di_size >= 0) {
 	dbmp->di_size--;
@@ -409,20 +178,10 @@ rb_gdbm_delete(obj, keystr)
 }
 
 static VALUE
-fgdbm_delete(obj, keystr)
-    VALUE obj, keystr;
-{
-    VALUE valstr;
-
-    valstr = fgdbm_fetch(obj, keystr, Qnil);
-    rb_gdbm_delete(obj, keystr);
-    return valstr;
-}
-
-static VALUE
 fgdbm_shift(obj)
     VALUE obj;
 {
+    datum key, val;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr, valstr;
@@ -431,11 +190,13 @@ fgdbm_shift(obj)
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
 
-    keystr = rb_gdbm_firstkey(dbm);
-    if (NIL_P(keystr)) return Qnil;
-    valstr = rb_gdbm_fetch2(dbm, keystr);
-    rb_gdbm_delete(obj, keystr);
+    key = gdbm_firstkey(dbm); 
+    if (!key.dptr) return Qnil;
+    val = gdbm_fetch(dbm, key);
+    gdbm_delete(dbm, key);
 
+    keystr = rb_tainted_str_new(key.dptr, key.dsize);
+    valstr = rb_tainted_str_new(val.dptr, val.dsize);
     return rb_assoc_new(keystr, valstr);
 }
 
@@ -443,32 +204,24 @@ static VALUE
 fgdbm_delete_if(obj)
     VALUE obj;
 {
+    datum key, val;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr, valstr;
-    VALUE ret, ary = rb_ary_new();
-    int i, status = 0, n;
 
     rb_secure(4);
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    n = dbmp->di_size;
-    dbmp->di_size = -1;
-
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-	valstr = rb_gdbm_fetch2(dbm, keystr);
-        ret = rb_protect(rb_yield, rb_assoc_new(keystr, valstr), &status);
-        if (status != 0) break;
-	if (RTEST(ret)) rb_ary_push(ary, keystr);
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	val = gdbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	if (RTEST(rb_yield(rb_assoc_new(keystr, valstr)))) {
+	    if (gdbm_delete(dbm, key)) {
+		rb_raise(rb_eRuntimeError, "dbm_delete failed");
+	    }
+	}
     }
-
-    for (i = 0; i < RARRAY(ary)->len; i++)
-        rb_gdbm_delete(obj, RARRAY(ary)->ptr[i]);
-    if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
-
     return obj;
 }
 
@@ -484,30 +237,12 @@ fgdbm_clear(obj)
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
-
-#if 0
-    while (key = gdbm_firstkey(dbm), key.dptr) {
+    for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
+	nextkey = gdbm_nextkey(dbm, key);
 	if (gdbm_delete(dbm, key)) {
-	    free(key.dptr);
-	    rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+	    rb_raise(rb_eRuntimeError, "dbm_delete failed");
 	}
-	free(key.dptr); 
     }
-#else
-    while (key = gdbm_firstkey(dbm), key.dptr) {
-        for (; key.dptr; key = nextkey) {
-            nextkey = gdbm_nextkey(dbm, key);
-            if (gdbm_delete(dbm, key)) {
-                free(key.dptr);
-                if (nextkey.dptr) free(nextkey.dptr);
-                rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
-            }
-            free(key.dptr);
-        }
-    }
-#endif
-    dbmp->di_size = 0;
-
     return obj;
 }
 
@@ -515,6 +250,7 @@ static VALUE
 fgdbm_invert(obj)
     VALUE obj;
 {
+    datum key, val;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr, valstr;
@@ -522,17 +258,15 @@ fgdbm_invert(obj)
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-	valstr = rb_gdbm_fetch2(dbm, keystr);
-
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	val = gdbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
 	rb_hash_aset(hash, valstr, keystr);
     }
-    return hash;
+    return obj;
 }
 
-static VALUE each_pair _((VALUE));
-
 static VALUE
 each_pair(obj)
     VALUE obj;
@@ -579,21 +313,32 @@ fgdbm_store(obj, keystr, valstr)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
+    if (valstr == Qnil) {
+	fgdbm_delete(obj, keystr);
+	return Qnil;
+    }
+
     rb_secure(4);
-    StringValue(keystr);
+    keystr = rb_obj_as_string(keystr);
+
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    StringValue(valstr);
+    if (NIL_P(valstr)) return fgdbm_delete(obj, keystr);
+
+    valstr = rb_obj_as_string(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     dbmp->di_size = -1;
     dbm = dbmp->di_dbm;
     if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
+#ifdef HAVE_DBM_CLAERERR
+	gdbm_clearerr(dbm);
+#endif
 	if (errno == EPERM) rb_sys_fail(0);
-	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+	rb_raise(rb_eRuntimeError, "dbm_store failed");
     }
 
     return valstr;
@@ -603,18 +348,16 @@ static VALUE
 fgdbm_length(obj)
     VALUE obj;
 {
-    datum key, nextkey;
+    datum key;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     int i = 0;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
     dbm = dbmp->di_dbm;
 
-    for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
-        nextkey = gdbm_nextkey(dbm, key);
-        free(key.dptr);
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
 	i++;
     }
     dbmp->di_size = i;
@@ -629,20 +372,20 @@ fgdbm_empty_p(obj)
     datum key;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
+    int i = 0;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp->di_size < 0) {
 	dbm = dbmp->di_dbm;
 
-	key = gdbm_firstkey(dbm);
-        if (key.dptr) {
-            free(key.dptr);
-            return Qfalse;
+	for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	    i++;
 	}
-        return Qtrue;
     }
-
-    if (dbmp->di_size == 0) return Qtrue;
+    else {
+	i = dbmp->di_size;
+    }
+    if (i == 0) return Qtrue;
     return Qfalse;
 }
 
@@ -650,17 +393,15 @@ static VALUE
 fgdbm_each_value(obj)
     VALUE obj;
 {
+    datum key, val;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
-    VALUE keystr;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-        rb_yield(rb_gdbm_fetch2(dbm, keystr));
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	val = gdbm_fetch(dbm, key);
+	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
     }
     return obj;
 }
@@ -669,17 +410,14 @@ static VALUE
 fgdbm_each_key(obj)
     VALUE obj;
 {
+    datum key;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
-    VALUE keystr;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-        rb_yield(keystr);
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
     }
     return obj;
 }
@@ -688,17 +426,19 @@ static VALUE
 fgdbm_each_pair(obj)
     VALUE obj;
 {
+    datum key, val;
     GDBM_FILE dbm;
     struct dbmdata *dbmp;
-    VALUE keystr;
+    VALUE keystr, valstr;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
 
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-        rb_yield(rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)));
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	val = gdbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	rb_yield(rb_assoc_new(keystr, valstr));
     }
 
     return obj;
@@ -708,18 +448,17 @@ static VALUE
 fgdbm_keys(obj)
     VALUE obj;
 {
+    datum key;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
-    VALUE keystr, ary;
+    VALUE ary;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
 
     ary = rb_ary_new();
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-        rb_ary_push(ary, keystr);
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
     }
 
     return ary;
@@ -729,20 +468,18 @@ static VALUE
 fgdbm_values(obj)
     VALUE obj;
 {
-    datum key, nextkey;
+    datum key, val;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
-    VALUE valstr, ary;
+    VALUE ary;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
 
     ary = rb_ary_new();
-    for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
-        nextkey = gdbm_nextkey(dbm, key);
-	valstr = rb_gdbm_fetch(dbm, key);
-        free(key.dptr);
-	rb_ary_push(ary, valstr);
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	val = gdbm_fetch(dbm, key);
+	rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
     }
 
     return ary;
@@ -752,18 +489,18 @@ static VALUE
 fgdbm_has_key(obj, keystr)
     VALUE obj, keystr;
 {
-    datum key;
+    datum key, val;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    StringValue(keystr);
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    if (gdbm_exists(dbm, key))
-        return Qtrue;
+    val = gdbm_fetch(dbm, key);
+    if (val.dptr) return Qtrue;
     return Qfalse;
 }
 
@@ -771,24 +508,21 @@ static VALUE
 fgdbm_has_value(obj, valstr)
     VALUE obj, valstr;
 {
+    datum key, val;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
-    VALUE keystr, valstr2;
 
-    StringValue(valstr);
+    Check_Type(valstr, T_STRING);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-	valstr2 = rb_gdbm_fetch2(dbm, keystr);
-
-        if (!NIL_P(valstr2) &&
-            RSTRING(valstr)->len == RSTRING(valstr2)->len &&
-            memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
-                   RSTRING(valstr)->len) == 0) {
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	val = gdbm_fetch(dbm, key);
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
 	    return Qtrue;
-        }
     }
     return Qfalse;
 }
@@ -797,18 +531,19 @@ static VALUE
 fgdbm_to_a(obj)
     VALUE obj;
 {
+    datum key, val;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
-    VALUE keystr, ary;
+    VALUE ary;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
 
     ary = rb_ary_new();
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-        rb_ary_push(ary, rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)));
+    for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
+	val = gdbm_fetch(dbm, key);
+	rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+				rb_tainted_str_new(val.dptr, val.dsize)));
     }
 
     return ary;
@@ -828,187 +563,42 @@ fgdbm_reorganize(obj)
     return obj;
 }
 
-static VALUE
-fgdbm_sync(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
-
-    rb_secure(4);
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-    gdbm_sync(dbm);
-    return obj;
-}
-
-static VALUE
-fgdbm_set_cachesize(obj, val)
-    VALUE obj, val;
-{
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
-    int optval;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-
-    optval = FIX2INT(val);
-    if (gdbm_setopt(dbm, GDBM_CACHESIZE, &optval, sizeof(optval)) == -1) {
-	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
-    }
-    return val;
-}
-
-static VALUE
-fgdbm_set_fastmode(obj, val)
-    VALUE obj, val;
-{
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
-    int optval;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-
-    optval = 0;
-    if (RTEST(val))
-        optval = 1;
-
-    if (gdbm_setopt(dbm, GDBM_FASTMODE, &optval, sizeof(optval)) == -1) {
-	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
-    }
-    return val;
-}
-
-static VALUE
-fgdbm_set_syncmode(obj, val)
-    VALUE obj, val;
-{
-#if !defined(GDBM_SYNCMODE)
-    fgdbm_set_fastmode(obj, RTEST(val) ? Qfalse : Qtrue);
-    return val;
-#else
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
-    int optval;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-
-    optval = 0;
-    if (RTEST(val))
-        optval = 1;
-
-    if (gdbm_setopt(dbm, GDBM_FASTMODE, &optval, sizeof(optval)) == -1) {
-	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
-    }
-    return val;
-#endif
-}
-
-static VALUE
-fgdbm_to_hash(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
-    VALUE keystr, hash;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-
-    hash = rb_hash_new();
-    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
-         keystr = rb_gdbm_nextkey(dbm, keystr)) {
-
-        rb_hash_aset(hash, keystr, rb_gdbm_fetch2(dbm, keystr));
-    }
-
-    return hash;
-}
-
-static VALUE
-fgdbm_reject(obj)
-    VALUE obj;
-{
-    return rb_hash_delete_if(fgdbm_to_hash(obj));
-}
-
 void
 Init_gdbm()
 {
-    rb_cGDBM = rb_define_class("GDBM", rb_cObject);
-    rb_eGDBMError = rb_define_class("GDBMError", rb_eStandardError);
-    rb_eGDBMFatalError = rb_define_class("GDBMFatalError", rb_eException);
-    rb_include_module(rb_cGDBM, rb_mEnumerable);
-
-    rb_define_alloc_func(rb_cGDBM, fgdbm_s_alloc);
-    rb_define_singleton_method(rb_cGDBM, "open", fgdbm_s_open, -1);
-
-    rb_define_method(rb_cGDBM, "initialize", fgdbm_initialize, -1);
-    rb_define_method(rb_cGDBM, "close", fgdbm_close, 0);
-    rb_define_method(rb_cGDBM, "[]", fgdbm_aref, 1);
-    rb_define_method(rb_cGDBM, "fetch", fgdbm_fetch_m, -1);
-    rb_define_method(rb_cGDBM, "[]=", fgdbm_store, 2);
-    rb_define_method(rb_cGDBM, "store", fgdbm_store, 2);
-    rb_define_method(rb_cGDBM, "index",  fgdbm_index, 1);
-    rb_define_method(rb_cGDBM, "indexes",  fgdbm_indexes, -1);
-    rb_define_method(rb_cGDBM, "indices",  fgdbm_indexes, -1);
-    rb_define_method(rb_cGDBM, "select",  fgdbm_select, -1);
-    rb_define_method(rb_cGDBM, "values_at",  fgdbm_values_at, -1);
-    rb_define_method(rb_cGDBM, "length", fgdbm_length, 0);
-    rb_define_method(rb_cGDBM, "size", fgdbm_length, 0);
-    rb_define_method(rb_cGDBM, "empty?", fgdbm_empty_p, 0);
-    rb_define_method(rb_cGDBM, "each", fgdbm_each_pair, 0);
-    rb_define_method(rb_cGDBM, "each_value", fgdbm_each_value, 0);
-    rb_define_method(rb_cGDBM, "each_key", fgdbm_each_key, 0);
-    rb_define_method(rb_cGDBM, "each_pair", fgdbm_each_pair, 0);
-    rb_define_method(rb_cGDBM, "keys", fgdbm_keys, 0);
-    rb_define_method(rb_cGDBM, "values", fgdbm_values, 0);
-    rb_define_method(rb_cGDBM, "shift", fgdbm_shift, 0);
-    rb_define_method(rb_cGDBM, "delete", fgdbm_delete, 1);
-    rb_define_method(rb_cGDBM, "delete_if", fgdbm_delete_if, 0);
-    rb_define_method(rb_cGDBM, "reject!", fgdbm_delete_if, 0);
-    rb_define_method(rb_cGDBM, "reject", fgdbm_reject, 0);
-    rb_define_method(rb_cGDBM, "clear", fgdbm_clear, 0);
-    rb_define_method(rb_cGDBM,"invert", fgdbm_invert, 0);
-    rb_define_method(rb_cGDBM,"update", fgdbm_update, 1);
-    rb_define_method(rb_cGDBM,"replace", fgdbm_replace, 1);
-    rb_define_method(rb_cGDBM,"reorganize", fgdbm_reorganize, 0);
-    rb_define_method(rb_cGDBM,"sync", fgdbm_sync, 0);
-    /* rb_define_method(rb_cGDBM,"setopt", fgdbm_setopt, 2); */
-    rb_define_method(rb_cGDBM,"cachesize=", fgdbm_set_cachesize, 1);
-    rb_define_method(rb_cGDBM,"fastmode=", fgdbm_set_fastmode, 1);
-    rb_define_method(rb_cGDBM,"syncmode=", fgdbm_set_syncmode, 1);
-
-    rb_define_method(rb_cGDBM, "include?", fgdbm_has_key, 1);
-    rb_define_method(rb_cGDBM, "has_key?", fgdbm_has_key, 1);
-    rb_define_method(rb_cGDBM, "member?", fgdbm_has_key, 1);
-    rb_define_method(rb_cGDBM, "has_value?", fgdbm_has_value, 1);
-    rb_define_method(rb_cGDBM, "key?", fgdbm_has_key, 1);
-    rb_define_method(rb_cGDBM, "value?", fgdbm_has_value, 1);
-
-    rb_define_method(rb_cGDBM, "to_a", fgdbm_to_a, 0);
-    rb_define_method(rb_cGDBM, "to_hash", fgdbm_to_hash, 0);
-
-    /* flags for gdbm_opn() */
-    /*
-    rb_define_const(rb_cGDBM, "READER",  INT2FIX(GDBM_READER));
-    rb_define_const(rb_cGDBM, "WRITER",  INT2FIX(GDBM_WRITER));
-    rb_define_const(rb_cGDBM, "WRCREAT", INT2FIX(GDBM_WRCREAT));
-    rb_define_const(rb_cGDBM, "NEWDB",   INT2FIX(GDBM_NEWDB));
-    */
-    rb_define_const(rb_cGDBM, "FAST", INT2FIX(GDBM_FAST));
-    /* this flag is obsolete in gdbm 1.8.
-       On gdbm 1.8, fast mode is default behavior. */
-
-    /* gdbm version 1.8 specific */
-#if defined(GDBM_SYNC)
-    rb_define_const(rb_cGDBM, "SYNC",    INT2FIX(GDBM_SYNC));
-#endif
-#if defined(GDBM_NOLOCK)
-    rb_define_const(rb_cGDBM, "NOLOCK",  INT2FIX(GDBM_NOLOCK));
-#endif
-    rb_define_const(rb_cGDBM, "VERSION",  rb_str_new2(gdbm_version));
+    cGDBM = rb_define_class("GDBM", rb_cObject);
+    rb_include_module(cGDBM, rb_mEnumerable);
+
+    rb_define_singleton_method(cGDBM, "open", fgdbm_s_open, -1);
+    rb_define_singleton_method(cGDBM, "new", fgdbm_s_open, -1);
+    rb_define_method(cGDBM, "close", fgdbm_close, 0);
+    rb_define_method(cGDBM, "[]", fgdbm_fetch, 1);
+    rb_define_method(cGDBM, "[]=", fgdbm_store, 2);
+    rb_define_method(cGDBM, "indexes",  fgdbm_indexes, -1);
+    rb_define_method(cGDBM, "indices",  fgdbm_indexes, -1);
+    rb_define_method(cGDBM, "length", fgdbm_length, 0);
+    rb_define_alias(cGDBM,  "size", "length");
+    rb_define_method(cGDBM, "empty?", fgdbm_empty_p, 0);
+    rb_define_method(cGDBM, "each", fgdbm_each_pair, 0);
+    rb_define_method(cGDBM, "each_value", fgdbm_each_value, 0);
+    rb_define_method(cGDBM, "each_key", fgdbm_each_key, 0);
+    rb_define_method(cGDBM, "each_pair", fgdbm_each_pair, 0);
+    rb_define_method(cGDBM, "keys", fgdbm_keys, 0);
+    rb_define_method(cGDBM, "values", fgdbm_values, 0);
+    rb_define_method(cGDBM, "shift", fgdbm_shift, 1);
+    rb_define_method(cGDBM, "delete", fgdbm_delete, 1);
+    rb_define_method(cGDBM, "delete_if", fgdbm_delete_if, 0);
+    rb_define_method(cGDBM, "clear", fgdbm_clear, 0);
+    rb_define_method(cGDBM,"invert", fgdbm_invert, 0);
+    rb_define_method(cGDBM,"update", fgdbm_update, 1);
+    rb_define_method(cGDBM,"replace", fgdbm_replace, 1);
+    rb_define_method(cGDBM,"reorganize", fgdbm_reorganize, 0);
+
+    rb_define_method(cGDBM, "include?", fgdbm_has_key, 1);
+    rb_define_method(cGDBM, "has_key?", fgdbm_has_key, 1);
+    rb_define_method(cGDBM, "has_value?", fgdbm_has_value, 1);
+    rb_define_method(cGDBM, "key?", fgdbm_has_key, 1);
+    rb_define_method(cGDBM, "value?", fgdbm_has_value, 1);
+
+    rb_define_method(cGDBM, "to_a", fgdbm_to_a, 0);
 }
diff --git a/ext/gdbm/testgdbm.rb b/ext/gdbm/testgdbm.rb
deleted file mode 100644
index a435498640..0000000000
--- a/ext/gdbm/testgdbm.rb
+++ /dev/null
@@ -1,663 +0,0 @@
-require 'runit/testcase'
-require 'runit/cui/testrunner'
-
-if $".grep(/\bgdbm.so\b/).empty?
-  begin
-    require './gdbm'
-  rescue LoadError
-    require 'gdbm'
-  end
-end
-
-def uname_s
-  require 'rbconfig'
-  case Config::CONFIG['host_os']
-  when 'cygwin'
-    require 'Win32API'
-    uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
-    utsname = ' ' * 100
-    raise 'cannot get system name' if uname.call(utsname) == -1
-
-    utsname.unpack('A20' * 5)[0]
-  else
-    Config::CONFIG['host_os']
-  end
-end
-
-SYSTEM = uname_s
-
-class TestGDBM < RUNIT::TestCase
-  def setup
-    @path = "tmptest_gdbm_"
-    assert_instance_of(GDBM, @gdbm = GDBM.new(@path))
-
-    # prepare to make readonly GDBM file
-    GDBM.open("tmptest_gdbm_rdonly", 0400) {|gdbm|
-      gdbm['foo'] = 'FOO'
-    }
-    assert_instance_of(GDBM, @gdbm_rdonly = GDBM.new("tmptest_gdbm_rdonly", nil))
-  end
-  def teardown
-    assert_nil(@gdbm.close)
-    assert_nil(@gdbm_rdonly.close)
-    GC.start
-    File.delete *Dir.glob("tmptest_gdbm*").to_a
-    p Dir.glob("tmptest_gdbm*") if $DEBUG
-  end
-
-  def check_size(expect, gdbm=@gdbm)
-    assert_equals(expect, gdbm.size)
-    n = 0
-    gdbm.each { n+=1 }
-    assert_equals(expect, n)
-    if expect == 0
-      assert_equals(true, gdbm.empty?)
-    else
-      assert_equals(false, gdbm.empty?)
-    end
-  end
-
-  def test_version
-    STDERR.print GDBM::VERSION
-  end
-
-  def test_s_new_has_no_block
-    # GDBM.new ignore the block
-    foo = true
-    assert_instance_of(GDBM, gdbm = GDBM.new("tmptest_gdbm") { foo = false })
-    assert_equals(foo, true)
-    assert_nil(gdbm.close)
-  end
-  def test_s_open_create_new
-    return if /^CYGWIN_9/ =~ SYSTEM
-
-    save_mask = File.umask(0)
-    begin
-      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm"))
-      gdbm.close
-      assert_equals(File.stat("tmptest_gdbm").mode & 0777, 0666)
-      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm2", 0644))
-      gdbm.close
-      assert_equals(File.stat("tmptest_gdbm2").mode & 0777, 0644)
-    ensure
-      File.umask save_mask
-    end
-  end
-  def test_s_open_no_create
-    # this test is failed on libgdbm 1.8.0
-    assert_nil(gdbm = GDBM.open("tmptest_gdbm", nil))
-  ensure
-    gdbm.close if gdbm
-  end
-  def test_s_open_3rd_arg
-    assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
-					      GDBM::FAST))
-    gdbm.close
-
-    # gdbm 1.8.0 specific
-    if defined? GDBM::SYNC
-      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
-						GDBM::SYNC))
-      gdbm.close
-    end
-    # gdbm 1.8.0 specific
-    if defined? GDBM::NOLOCK
-      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
-						GDBM::NOLOCK))
-      gdbm.close
-    end
-  end
-  def test_s_open_with_block
-    assert_equals(GDBM.open("tmptest_gdbm") { :foo }, :foo)
-  end
-  def test_s_open_lock
-    fork() {
-      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
-      sleep 2
-    }
-    begin
-      sleep 1
-      assert_exception(Errno::EWOULDBLOCK) {
-	begin
-	  assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644))
-	rescue Errno::EAGAIN, Errno::EACCES
-	  raise Errno::EWOULDBLOCK
-	end
-      }
-    ensure
-      Process.wait
-    end
-  end
-
-=begin
-  # Is it guaranteed on many OS?
-  def test_s_open_lock_one_process
-    # locking on one process
-    assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
-    assert_exception(Errno::EWOULDBLOCK) {
-      begin
-	GDBM.open("tmptest_gdbm", 0644)
-      rescue Errno::EAGAIN
-	raise Errno::EWOULDBLOCK
-      end
-    }
-  end
-=end
-
-  def test_s_open_nolock
-    # gdbm 1.8.0 specific
-    if not defined? GDBM::NOLOCK
-      return
-    end
-
-    fork() {
-      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644,
-						GDBM::NOLOCK))
-      sleep 2
-    }
-    sleep 1
-    begin
-      gdbm2 = nil
-      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
-	assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644))
-      }
-    ensure
-      Process.wait
-      gdbm2.close if gdbm2
-    end
-
-    p Dir.glob("tmptest_gdbm*") if $DEBUG
-
-    fork() {
-      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
-      sleep 2
-    }
-    begin
-      sleep 1
-      gdbm2 = nil
-      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
-	# this test is failed on Cygwin98 (???)
-	assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644,
-						   GDBM::NOLOCK))
-      }
-    ensure
-      Process.wait
-      gdbm2.close if gdbm2
-    end
-  end
-
-  def test_s_open_error
-    assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0))
-    assert_exception(Errno::EACCES) {
-      GDBM.open("tmptest_gdbm", 0)
-    }
-    gdbm.close
-  end
-
-  def test_close
-    assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm"))
-    assert_nil(gdbm.close)
-
-    # closed GDBM file
-    assert_exception(RuntimeError) { gdbm.close }
-  end
-
-  def test_aref
-    assert_equals('bar', @gdbm['foo'] = 'bar')
-    assert_equals('bar', @gdbm['foo'])
-
-    assert_nil(@gdbm['bar'])
-  end
-
-  def test_fetch
-    assert_equals('bar', @gdbm['foo']='bar')
-    assert_equals('bar', @gdbm.fetch('foo'))
-
-    # key not found
-    assert_exception(IndexError) {
-      @gdbm.fetch('bar')
-    }
-
-    # test for `ifnone' arg
-    assert_equals('baz', @gdbm.fetch('bar', 'baz'))
-
-    # test for `ifnone' block
-    assert_equals('foobar', @gdbm.fetch('bar') {|key| 'foo' + key })
-  end
-
-  def test_aset
-    num = 0
-    2.times {|i|
-      assert_equals('foo', @gdbm['foo'] = 'foo')
-      assert_equals('foo', @gdbm['foo'])
-      assert_equals('bar', @gdbm['foo'] = 'bar')
-      assert_equals('bar', @gdbm['foo'])
-
-      num += 1 if i == 0
-      assert_equals(num, @gdbm.size)
-
-      # assign nil
-      assert_equals('', @gdbm['bar'] = '')
-      assert_equals('', @gdbm['bar'])
-
-      num += 1 if i == 0
-      assert_equals(num, @gdbm.size)
-
-      # empty string
-      assert_equals('', @gdbm[''] = '')
-      assert_equals('', @gdbm[''])
-
-      num += 1 if i == 0
-      assert_equals(num, @gdbm.size)
-
-      # Fixnum
-      assert_equals('200', @gdbm['100'] = '200')
-      assert_equals('200', @gdbm['100'])
-
-      num += 1 if i == 0
-      assert_equals(num, @gdbm.size)
-
-      # Big key and value
-      assert_equals('y' * 100, @gdbm['x' * 100] = 'y' * 100)
-      assert_equals('y' * 100, @gdbm['x' * 100])
-
-      num += 1 if i == 0
-      assert_equals(num, @gdbm.size)
-    }
-  end
-
-  def test_index
-    assert_equals('bar', @gdbm['foo'] = 'bar')
-    assert_equals('foo', @gdbm.index('bar'))
-    assert_nil(@gdbm['bar'])
-  end
-
-  def test_indexes
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-    assert_equals(values.reverse, @gdbm.indexes(*keys.reverse))
-  end
-
-  def test_values_at
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-    assert_equals(values.reverse, @gdbm.values_at(*keys.reverse))
-  end
-
-  def test_select_with_block
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-    ret = @gdbm.select {|k,v|
-      assert_equals(k.upcase, v)
-      k != "bar"
-    }
-    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
-		  ret.sort)
-  end
-
-  def test_length
-    num = 10
-    assert_equals(0, @gdbm.size)
-    num.times {|i|
-      i = i.to_s
-      @gdbm[i] = i
-    }
-    assert_equals(num, @gdbm.size)
-
-    @gdbm.shift
-
-    assert_equals(num - 1, @gdbm.size)
-  end
-
-  def test_empty?
-    assert_equals(true, @gdbm.empty?)
-    @gdbm['foo'] = 'FOO'
-    assert_equals(false, @gdbm.empty?)
-  end
-
-  def test_each_pair
-    n = 0
-    @gdbm.each_pair { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-
-    n = 0
-    ret = @gdbm.each_pair {|key, val|
-      assert_not_nil(i = keys.index(key))
-      assert_equals(val, values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@gdbm, ret)
-  end
-
-  def test_each_value
-    n = 0
-    @gdbm.each_value { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-
-    n = 0
-    ret = @gdbm.each_value {|val|
-      assert_not_nil(key = @gdbm.index(val))
-      assert_not_nil(i = keys.index(key))
-      assert_equals(val, values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@gdbm, ret)
-  end
-
-  def test_each_key
-    n = 0
-    @gdbm.each_key { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-
-    n = 0
-    ret = @gdbm.each_key {|key|
-      assert_not_nil(i = keys.index(key))
-      assert_equals(@gdbm[key], values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@gdbm, ret)
-  end
-
-  def test_keys
-    assert_equals([], @gdbm.keys)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-
-    assert_equals(keys.sort, @gdbm.keys.sort)
-    assert_equals(values.sort, @gdbm.values.sort)
-  end
-
-  def test_values
-    test_keys
-  end
-
-  def test_shift
-    assert_nil(@gdbm.shift)
-    assert_equals(0, @gdbm.size)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-
-    ret_keys = []
-    ret_values = []
-    while ret = @gdbm.shift
-      ret_keys.push ret[0]
-      ret_values.push ret[1]
-
-      assert_equals(keys.size - ret_keys.size, @gdbm.size)
-    end
-
-    assert_equals(keys.sort, ret_keys.sort)
-    assert_equals(values.sort, ret_values.sort)
-  end
-
-  def test_delete
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    key = keys[1]
-
-    assert_nil(@gdbm.delete(key))
-    assert_equals(0, @gdbm.size)
-
-    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
-
-    assert_equals('BAR', @gdbm.delete(key))
-    assert_nil(@gdbm[key])
-    assert_equals(2, @gdbm.size)
-
-    assert_nil(@gdbm.delete(key))
-
-    if /^CYGWIN_9/ !~ SYSTEM
-      assert_exception(GDBMError) {
-	@gdbm_rdonly.delete("foo")
-      }
-
-      assert_nil(@gdbm_rdonly.delete("bar"))
-    end
-  end
-  def test_delete_with_block
-    key = 'no called block'
-    @gdbm[key] = 'foo'
-    assert_equals('foo', @gdbm.delete(key) {|k| k.replace 'called block'})
-    assert_equals('no called block', key)
-    assert_equals(0, @gdbm.size)
-
-    key = 'no called block'
-    assert_equals(:blockval,
-		  @gdbm.delete(key) {|k| k.replace 'called block'; :blockval})
-    assert_equals('called block', key)
-    assert_equals(0, @gdbm.size)
-  end
-
-  def test_delete_if
-    v = "0"
-    100.times {@gdbm[v] = v; v = v.next}
-
-    ret = @gdbm.delete_if {|key, val| key.to_i < 50}
-    assert_equals(@gdbm, ret)
-    check_size(50, @gdbm)
-
-    ret = @gdbm.delete_if {|key, val| key.to_i >= 50}
-    assert_equals(@gdbm, ret)
-    check_size(0, @gdbm)
-
-    # break
-    v = "0"
-    100.times {@gdbm[v] = v; v = v.next}
-    check_size(100, @gdbm)
-    n = 0;
-    @gdbm.delete_if {|key, val|
-      break if n > 50
-      n+=1
-      true
-    }
-    assert_equals(51, n)
-    check_size(49, @gdbm)
-
-    @gdbm.clear
-
-    # raise
-    v = "0"
-    100.times {@gdbm[v] = v; v = v.next}
-    check_size(100, @gdbm)
-    n = 0;
-    begin
-      @gdbm.delete_if {|key, val|
-	raise "runtime error" if n > 50
-	n+=1
-	true
-      }
-    rescue
-    end
-    assert_equals(51, n)
-    check_size(49, @gdbm)
-  end
-
-  def test_reject
-    v = "0"
-    100.times {@gdbm[v] = v; v = v.next}
-
-    hash = @gdbm.reject {|key, val| key.to_i < 50}
-    assert_instance_of(Hash, hash)
-    assert_equals(100, @gdbm.size)
-
-    assert_equals(50, hash.size)
-    hash.each_pair {|key,val|
-      assert_equals(false, key.to_i < 50)
-      assert_equals(key, val)
-    }
-
-    hash = @gdbm.reject {|key, val| key.to_i < 100}
-    assert_instance_of(Hash, hash)
-    assert_equals(true, hash.empty?)
-  end
-
-  def test_clear
-    v = "1"
-    100.times {v = v.next; @gdbm[v] = v}
-
-    assert_equals(@gdbm, @gdbm.clear)
-
-    # validate GDBM#size
-    i = 0
-    @gdbm.each { i += 1 }
-    assert_equals(@gdbm.size, i)
-    assert_equals(0, i)
-  end
-
-  def test_invert
-    v = "0"
-    100.times {@gdbm[v] = v; v = v.next}
-
-    hash = @gdbm.invert
-    assert_instance_of(Hash, hash)
-    assert_equals(100, hash.size)
-    hash.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_update
-    hash = {}
-    v = "0"
-    100.times {v = v.next; hash[v] = v}
-
-    @gdbm["101"] = "101"
-    @gdbm.update hash
-    assert_equals(101, @gdbm.size)
-    @gdbm.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_replace
-    hash = {}
-    v = "0"
-    100.times {v = v.next; hash[v] = v}
-
-    @gdbm["101"] = "101"
-    @gdbm.replace hash
-    assert_equals(100, @gdbm.size)
-    @gdbm.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_reorganize
-    size1 = File.size(@path)
-    i = "1"
-    1000.times {i = i.next; @gdbm[i] = i}
-    @gdbm.clear
-    @gdbm.sync
-
-    size2 = File.size(@path)
-    @gdbm.reorganize
-    size3 = File.size(@path)
-
-    # p [size1, size2, size3]
-    assert_equals(true, size1 < size2)
-    # this test is failed on Cygwin98. `GDBM version 1.8.0, as of May 19, 1999'
-    assert_equals(true, size3 < size2)
-    assert_equals(size1, size3)
-  end
-
-  def test_sync
-    assert_instance_of(GDBM, gdbm = GDBM.open('tmptest_gdbm', 0666, GDBM::FAST))
-    assert_equals(gdbm.sync, gdbm)
-    gdbm.close
-    assert_instance_of(GDBM, gdbm = GDBM.open('tmptest_gdbm', 0666))
-    assert_equals(gdbm.sync, gdbm)
-    gdbm.close
-  end
-
-  def test_cachesize=
-      assert_equals(@gdbm.cachesize = 1024, 1024)
-  end
-
-  def test_fastmode=
-      assert_equals(@gdbm.fastmode = true, true)
-  end
-
-  def test_syncmode=
-      assert_equals(@gdbm.syncmode = true, true)
-  end
-
-  def test_haskey?
-    assert_equals('bar', @gdbm['foo']='bar')
-    assert_equals(true,  @gdbm.has_key?('foo'))
-    assert_equals(false, @gdbm.has_key?('bar'))
-  end
-
-  def test_has_value?
-    assert_equals('bar', @gdbm['foo']='bar')
-    assert_equals(true,  @gdbm.has_value?('bar'))
-    assert_equals(false, @gdbm.has_value?('foo'))
-  end
-
-  def test_to_a
-    v = "0"
-    100.times {v = v.next; @gdbm[v] = v}
-
-    ary = @gdbm.to_a
-    assert_instance_of(Array, ary)
-    assert_equals(100, ary.size)
-    ary.each {|key,val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_to_hash
-    v = "0"
-    100.times {v = v.next; @gdbm[v] = v}
-
-    hash = @gdbm.to_hash
-    assert_instance_of(Hash, hash)
-    assert_equals(100, hash.size)
-    hash.each {|key,val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-end
-
-if $0 == __FILE__
-  if ARGV.size == 0
-    suite = RUNIT::TestSuite.new
-    suite.add_test(TestGDBM.suite)
-  else
-    suite = RUNIT::TestSuite.new
-    ARGV.each do |testmethod|
-      suite.add_test(TestGDBM.new(testmethod))
-    end
-  end
-
-  RUNIT::CUI::TestRunner.run(suite)
-end
diff --git a/ext/iconv/.cvsignore b/ext/iconv/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/iconv/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/iconv/MANIFEST b/ext/iconv/MANIFEST
deleted file mode 100644
index fd7e22deda..0000000000
--- a/ext/iconv/MANIFEST
+++ /dev/null
@@ -1,5 +0,0 @@
-MANIFEST
-extconf.rb
-iconv.c
-depend
-charset_alias.rb
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
deleted file mode 100644
index 48f0fae5f9..0000000000
--- a/ext/iconv/charset_alias.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/ruby
-require 'rbconfig'
-
-# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
-# Fri, 30 May 2003 00:09:00 GMT'
-
-OS = Config::CONFIG["target"]
-SHELL = Config::CONFIG['SHELL']
-
-def charset_alias(config_charset, mapfile, target = OS)
-  map = {}
-  comments = []
-  IO.foreach("|#{SHELL} #{config_charset} #{target}") do |list|
-    next comments << list if /^\#/ =~ list
-    next unless /^(\S+)\s+(\S+)$/ =~ list
-    sys, can = $1, $2
-    next if sys == can
-    next if can.downcase! and sys == can
-    map[can] = sys
-  end
-  case target
-  when /linux|-gnu/
-    map.delete('ascii')
-  when /cygwin/
-    # get rid of tilde/yen problem.
-    map['shift_jis'] = 'cp932'
-  end
-  open(mapfile, "w") do |f|
-    f.puts("require 'iconv.so'")
-    f.puts
-    f.puts(comments)
-    f.puts("class Iconv")
-    map.each {|can, sys| f.puts("  charset_map['#{can}'.freeze] = '#{sys}'.freeze")}
-    f.puts("end")
-  end
-end
-
-(2..3) === ARGV.size or abort "usage: #$0 config.status map.rb [target]"
-charset_alias(*ARGV)
diff --git a/ext/iconv/depend b/ext/iconv/depend
deleted file mode 100644
index 688ddd97b7..0000000000
--- a/ext/iconv/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/intern.h
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
deleted file mode 100644
index 7176fa45e3..0000000000
--- a/ext/iconv/extconf.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'mkmf'
-
-dir_config("iconv")
-
-conf = File.exist?(File.join($srcdir, "config.charset"))
-conf = with_config("config-charset", enable_config("config-charset", conf))
-
-if have_header("iconv.h")
-  if !try_compile("", "-Werror") or checking_for("iconv() 2nd argument is const") do
-      !try_compile('
-#include <iconv.h>
-size_t
-test(iconv_t cd, char **inptr, size_t *inlen, char **outptr, size_t *outlen)
-{
-    return iconv(cd, inptr, inlen, outptr, outlen);
-}
-', "-Werror")
-    end
-    $defs.push('-DICONV_INPTR_CAST=""')
-  else
-    $defs.push('-DICONV_INPTR_CAST="(char **)"')
-  end
-  have_library("iconv")
-  if conf
-    prefix = '$(srcdir)'
-    prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
-    $INSTALLFILES = [["./iconv.rb", "$(RUBYLIBDIR)"]]
-    if String === conf
-      require 'uri'
-      scheme = URI.parse(conf).scheme
-    else
-      conf = prefix + "config.charset"
-    end
-  end
-  create_makefile("iconv")
-  if conf
-    open("Makefile", "a") do |mf|
-      mf.print("\nall: iconv.rb\n\niconv.rb: ", prefix, "charset_alias.rb")
-      mf.print(" ", conf) unless scheme
-      mf.print("\n\t$(RUBY) ", prefix, "charset_alias.rb ", conf, " $@\n")
-    end
-  end
-end
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
deleted file mode 100644
index 8e978b8730..0000000000
--- a/ext/iconv/iconv.c
+++ /dev/null
@@ -1,890 +0,0 @@
-/* -*- mode:c; c-file-style:"ruby" -*- */
-/**********************************************************************
-
-  iconv.c -
-
-  $Author$
-  $Date$
-  created at: Wed Dec  1 20:28:09 JST 1999
-
-  All the files in this distribution are covered under the Ruby's
-  license (see the file COPYING).
-
-**********************************************************************/
-
-/*
-=begin
-= Summary
-Ruby extension for codeset conversion.
-
-= Abstract
-Iconv is a wrapper class for UNIX 95 (({iconv()})) function family, which
-translates string between various coding systems.
-
-See ((<Open Group|URL:http://www.opengroup.org/>))'s on-line documents for more details.
-* ((<iconv.h|URL:http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html>))
-* ((<iconv_open()|URL:http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_open.html>))
-* ((<iconv()|URL:http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html>))
-* ((<iconv_close()|URL:http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_close.html>))
-
-Which coding systems are available, it depends on the platform.
-
-=end
-*/
-
-#include "ruby.h"
-#include <errno.h>
-#include <iconv.h>
-#include <assert.h>
-#include "st.h"
-#include "intern.h"
-
-/* Invalid value for iconv_t is -1 but 0 for VALUE, I hope VALUE is
-   big enough to keep iconv_t */
-#define VALUE2ICONV(v) ((iconv_t)((VALUE)(v) ^ -1))
-#define ICONV2VALUE(c) ((VALUE)(c) ^ -1)
-
-struct iconv_env_t
-{
-    iconv_t cd;
-    int argc;
-    VALUE *argv;
-    VALUE ret;
-    VALUE (*append)_((VALUE, VALUE));
-};
-
-static VALUE rb_eIconvFailure;
-static VALUE rb_eIconvIllegalSeq;
-static VALUE rb_eIconvInvalidChar;
-static VALUE rb_eIconvOutOfRange;
-
-static ID rb_success, rb_failed;
-static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
-static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success, VALUE failed));
-static VALUE iconv_failure_success _((VALUE self));
-static VALUE iconv_failure_failed _((VALUE self));
-
-static iconv_t iconv_create _((VALUE to, VALUE from));
-static void iconv_dfree _((void *cd));
-static VALUE iconv_free _((VALUE cd));
-static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen));
-static VALUE rb_str_derive _((VALUE str, const char* ptr, int len));
-static VALUE iconv_convert _((iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env));
-static VALUE iconv_s_allocate _((VALUE klass));
-static VALUE iconv_initialize _((VALUE self, VALUE to, VALUE from));
-static VALUE iconv_s_open _((VALUE self, VALUE to, VALUE from));
-static VALUE iconv_s_convert _((struct iconv_env_t* env));
-static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_init_state _((VALUE cd));
-static VALUE iconv_finish _((VALUE self));
-static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
-
-
-/*
-=begin
-= Classes & Modules
-=end
-*/
-
-/*
-=begin
-== Iconv
-=end
-*/
-static VALUE charset_map;
-
-static VALUE charset_map_get _((void))
-{
-    return charset_map;
-}
-
-static char *
-map_charset
-#ifdef HAVE_PROTOTYPES
-    (VALUE *code)
-#else /* HAVE_PROTOTYPES */
-    (code)
-    VALUE *code;
-#endif /* HAVE_PROTOTYPES */
-{
-    VALUE val = *code;
-
-    if (RHASH(charset_map)->tbl && RHASH(charset_map)->tbl->num_entries) {
-	val = rb_funcall2(val, rb_intern("downcase"), 0, 0);
-	StringValuePtr(val);
-	if (st_lookup(RHASH(charset_map)->tbl, val, &val)) {
-	    StringValuePtr(val);
-	    *code = val;
-	}
-    }
-    else {
-	StringValuePtr(val);
-    }
-    return RSTRING(val)->ptr;
-}
-
-static iconv_t
-iconv_create
-#ifdef HAVE_PROTOTYPES
-    (VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
-    (to, from)
-    VALUE to;
-    VALUE from;
-#endif /* HAVE_PROTOTYPES */
-{
-    const char* tocode = map_charset(&to);
-    const char* fromcode = map_charset(&from);
-
-    iconv_t cd = iconv_open(tocode, fromcode);
-
-    if (cd == (iconv_t)-1) {
-	switch (errno) {
-	  case EMFILE:
-	  case ENFILE:
-	  case ENOMEM:
-	    rb_gc();
-	    cd = iconv_open(tocode, fromcode);
-	}
-	if (cd == (iconv_t)-1) {
-	    volatile VALUE msg = rb_str_new2("iconv(\"");
-	    rb_str_buf_cat2(rb_str_buf_append(msg, to), "\", \"");
-	    rb_str_buf_cat2(rb_str_buf_append(msg, from), "\")");
-	    rb_sys_fail(StringValuePtr(msg));
-	}
-    }
-
-    return cd;
-}
-
-static void
-iconv_dfree
-#ifdef HAVE_PROTOTYPES
-    (void *cd)
-#else /* HAVE_PROTOTYPES */
-    (cd)
-    void *cd;
-#endif /* HAVE_PROTOTYPES */
-{
-    iconv_close(VALUE2ICONV(cd));
-}
-
-#define ICONV_FREE iconv_dfree
-
-static VALUE
-iconv_free
-#ifdef HAVE_PROTOTYPES
-    (VALUE cd)
-#else /* HAVE_PROTOTYPES */
-    (cd)
-    VALUE cd;
-#endif /* HAVE_PROTOTYPES */
-{
-    if (cd && iconv_close(VALUE2ICONV(cd)) == -1)
-	rb_sys_fail("iconv_close");
-    return Qnil;
-}
-
-static VALUE
-check_iconv
-#ifdef HAVE_PROTOTYPES
-    (VALUE obj)
-#else /* HAVE_PROTOTYPES */
-    (obj)
-    VALUE obj;
-#endif /* HAVE_PROTOTYPES */
-{
-    Check_Type(obj, T_DATA);
-    if (RDATA(obj)->dfree != ICONV_FREE) {
-	rb_raise(rb_eArgError, "Iconv expected (%s)", rb_class2name(CLASS_OF(obj)));
-    }
-    return (VALUE)DATA_PTR(obj);
-}
-
-static VALUE
-iconv_try
-#ifdef HAVE_PROTOTYPES
-    (iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
-#else /* HAVE_PROTOTYPES */
-    (cd, inptr, inlen, outptr, outlen)
-    iconv_t cd;
-    const char **inptr;
-    size_t *inlen;
-    char **outptr;
-    size_t *outlen;
-#endif /* HAVE_PROTOTYPES */
-{
-    size_t ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
-    if (ret == (size_t)-1) {
-	if (!*inlen)
-	    return Qfalse;
-	switch (errno) {
-	  case E2BIG:
-	    /* try the left in next loop */
-	    break;
-	  case EILSEQ:
-	    return rb_eIconvIllegalSeq;
-	  case EINVAL:
-	    return rb_eIconvInvalidChar;
-	  default:
-	    rb_sys_fail("iconv");
-	}
-    }
-    else if (*inlen > 0) {
-	/* something goes wrong */
-	return rb_eIconvIllegalSeq;
-    }
-    else if (ret) {
-	return Qnil;		/* conversion */
-    }
-    return Qfalse;
-}
-
-#define FAILED_MAXLEN 16
-
-static VALUE iconv_failure_initialize
-#ifdef HAVE_PROTOTYPES
-    (VALUE error, VALUE mesg, VALUE success, VALUE failed)
-#else /* HAVE_PROTOTYPES */
-    (error, mesg, success, failed)
-    VALUE error, mesg, success, failed;
-#endif /* HAVE_PROTOTYPES */
-{
-    rb_call_super(1, &mesg);
-    rb_ivar_set(error, rb_success, success);
-    rb_ivar_set(error, rb_failed, failed);
-    return error;
-}
-
-static VALUE
-iconv_fail
-#ifdef HAVE_PROTOTYPES
-    (VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
-#else /* HAVE_PROTOTYPES */
-    (error, success, failed, env, mesg)
-    VALUE error, success, failed;
-    struct iconv_env_t *env;
-    const char *mesg;
-#endif /* HAVE_PROTOTYPES */
-{
-    VALUE args[3];
-
-    if (mesg && *mesg) {
-	args[0] = rb_str_new2(mesg);
-    }
-    else if (TYPE(failed) != T_STRING || RSTRING(failed)->len < FAILED_MAXLEN) {
-	args[0] = rb_inspect(failed);
-    }
-    else {
-	args[0] = rb_inspect(rb_str_substr(failed, 0, FAILED_MAXLEN));
-	rb_str_cat2(args[0], "...");
-    }
-    args[1] = success;
-    args[2] = failed;
-    if (env) {
-	args[1] = env->append(rb_obj_dup(env->ret), success);
-	if (env->argc > 0) {
-	    *(env->argv) = failed;
-	    args[2] = rb_ary_new4(env->argc, env->argv);
-	}
-    }
-    error = rb_class_new_instance(3, args, error);
-    if (!rb_block_given_p()) rb_exc_raise(error);
-    ruby_errinfo = error;
-    return rb_yield(failed);
-}
-
-static VALUE
-rb_str_derive
-#ifdef HAVE_PROTOTYPES
-    (VALUE str, const char* ptr, int len)
-#else /* HAVE_PROTOTYPES */
-    (str, ptr, len)
-    VALUE str;
-    const char *ptr;
-    int len;
-#endif /* HAVE_PROTOTYPES */
-{
-    VALUE ret;
-
-    if (NIL_P(str))
-	return rb_str_new(ptr, len);
-    if (RSTRING(str)->ptr == ptr && RSTRING(str)->len == len)
-	return str;
-    if (RSTRING(str)->ptr + RSTRING(str)->len == ptr + len)
-	ret = rb_str_substr(str, ptr - RSTRING(str)->ptr, len);
-    else
-	ret = rb_str_new(ptr, len);
-    OBJ_INFECT(ret, str);
-    return ret;
-}
-
-static VALUE
-iconv_convert
-#ifdef HAVE_PROTOTYPES
-    (iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env)
-#else /* HAVE_PROTOTYPES */
-    (cd, str, start, length, env)
-    iconv_t cd;
-    VALUE str;
-    int start;
-    int length;
-    struct iconv_env_t *env;
-#endif /* HAVE_PROTOTYPES */
-{
-    VALUE ret = Qfalse;
-    VALUE error = Qfalse;
-    VALUE rescue;
-    const char *inptr, *instart;
-    size_t inlen;
-    /* I believe ONE CHARACTER never exceed this. */
-    char buffer[BUFSIZ];
-    char *outptr;
-    size_t outlen;
-
-    if (cd == (iconv_t)-1)
-	rb_raise(rb_eArgError, "closed iconv");
-
-    if (NIL_P(str)) {
-	/* Reset output pointer or something. */
-	inptr = "";
-	inlen = 0;
-	outptr = buffer;
-	outlen = sizeof(buffer);
-	error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
-	if (RTEST(error)) {
-	    unsigned int i;
-	    rescue = iconv_fail(error, Qnil, Qnil, env, 0);
-	    if (TYPE(rescue) == T_ARRAY) {
-		str = RARRAY(rescue)->len > 0 ? RARRAY(rescue)->ptr[0] : Qnil;
-	    }
-	    if (FIXNUM_P(str) && (i = FIX2INT(str)) <= 0xff) {
-		char c = i;
-		str = rb_str_new(&c, 1);
-	    }
-	    else if (!NIL_P(str)) {
-		StringValue(str);
-	    }
-	}
-
-	inptr = NULL;
-	length = 0;
-    }
-    else {
-	int slen;
-
-	StringValue(str);
-	slen = RSTRING(str)->len;
-	inptr = RSTRING(str)->ptr;
-
-	if (start < 0 ? (start += slen) < 0 : start >= slen)
-	    length = 0;
-	else if (length < 0 && (length += slen + 1) < 0)
-	    length = 0;
-	else if ((length -= start) < 0)
-	    length = 0;
-	else
-	    inptr += start;
-    }
-    instart = inptr;
-    inlen = length;
-
-    do {
-	char errmsg[50];
-	const char *tmpstart = inptr;
-	outptr = buffer;
-	outlen = sizeof(buffer);
-
-	errmsg[0] = 0;
-	error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
-
-	if (0 <= outlen && outlen <= sizeof(buffer)) {
-	    outlen = sizeof(buffer) - outlen;
-	    if (NIL_P(error) ||	/* something converted */
-		outlen > inptr - tmpstart || /* input can't contain output */
-		(outlen < inptr - tmpstart && inlen > 0) || /* something skipped */
-		memcmp(buffer, tmpstart, outlen)) /* something differs */
-	    {
-		if (NIL_P(str)) {
-		    ret = rb_str_new(buffer, outlen);
-		}
-		else {
-		    if (ret) {
-			ret = rb_str_buf_cat(ret, instart, tmpstart - instart);
-		    }
-		    else {
-			ret = rb_str_new(instart, tmpstart - instart);
-			OBJ_INFECT(ret, str);
-		    }
-		    ret = rb_str_buf_cat(ret, buffer, outlen);
-		    instart = inptr;
-		}
-	    }
-	    else if (!inlen) {
-		inptr = tmpstart + outlen;
-	    }
-	}
-	else {
-	    /* Some iconv() have a bug, return *outlen out of range */
-	    sprintf(errmsg, "bug?(output length = %d)", sizeof(buffer) - outlen);
-	    error = rb_eIconvOutOfRange;
-	}
-
-	if (RTEST(error)) {
-	    long len = 0;
-
-	    if (!ret)
-		ret = rb_str_derive(str, instart, inptr - instart);
-	    else if (inptr > instart)
-		rb_str_cat(ret, instart, inptr - instart);
-	    str = rb_str_derive(str, inptr, inlen);
-	    rescue = iconv_fail(error, ret, str, env, errmsg);
-	    if (TYPE(rescue) == T_ARRAY) {
-		if ((len = RARRAY(rescue)->len) > 0)
-		    rb_str_concat(ret, RARRAY(rescue)->ptr[0]);
-		if (len > 1 && !NIL_P(str = RARRAY(rescue)->ptr[1])) {
-		    StringValue(str);
-		    inlen = length = RSTRING(str)->len;
-		    instart = inptr = RSTRING(str)->ptr;
-		    continue;
-		}
-	    }
-	    else if (!NIL_P(rescue)) {
-		rb_str_concat(ret, rescue);
-	    }
-	    break;
-	}
-    } while (inlen > 0);
-
-    if (!ret)
-	ret = rb_str_derive(str, instart, inptr - instart);
-    else if (inptr > instart)
-	rb_str_cat(ret, instart, inptr - instart);
-    return ret;
-}
-
-
-/*
-=begin
-=== Class methods
-=end
-*/
-/*
-=begin
---- Iconv.new(to, from) {|cd| ...}
-    Creates new code converter from a coding-system designated with ((|from|))
-    to another one designated with ((|to|)).
-    :Parameters
-      :((|to|))
-        coding-system name for destination.
-      :((|from|))
-        coding-system name for source.
-    :Exceptions
-      :(({TypeError}))
-        if ((|to|)) or ((|from|)) aren't String
-      :(({ArgumentError}))
-        if designated converter couldn't find out.
-      :(({SystemCallError}))
-        when (({iconv_open(3)})) failed.
-
---- Iconv.open(to, from)
-    Equivalents to ((<Iconv.new>)) except with in the case of called
-    with a block, yields with the new instance and closes it, and
-    returns the result which returned from the block.
-=end
-*/
-static VALUE
-iconv_s_allocate
-#ifdef HAVE_PROTOTYPES
-    (VALUE klass)
-#else /* HAVE_PROTOTYPES */
-    (klass)
-    VALUE klass;
-#endif /* HAVE_PROTOTYPES */
-{
-    return Data_Wrap_Struct(klass, 0, ICONV_FREE, 0);
-}
-
-static VALUE
-iconv_initialize
-#ifdef HAVE_PROTOTYPES
-    (VALUE self, VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
-    (self, to, from)
-    VALUE self;
-    VALUE to;
-    VALUE from;
-#endif /* HAVE_PROTOTYPES */
-{
-    iconv_free(check_iconv(self));
-    DATA_PTR(self) = NULL;
-    DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from));
-    return self;
-}
-
-static VALUE
-iconv_s_open
-#ifdef HAVE_PROTOTYPES
-    (VALUE self, VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
-    (self, to, from)
-    VALUE self;
-    VALUE to;
-    VALUE from;
-#endif /* HAVE_PROTOTYPES */
-{
-    VALUE cd = ICONV2VALUE(iconv_create(to, from));
-
-    self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
-    if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, self, (VALUE(*)())iconv_finish, self);
-    }
-    else {
-	return self;
-    }
-}
-
-/*
-=begin
---- Iconv.iconv(to, from, *strs)
-    Shorthand for
-      Iconv.open(to, from) {|cd| (strs + [nil]).collect {|s| cd.iconv(s)}}
-    :Parameters
-      :((|to|)), ((|from|))
-        see ((<Iconv.new>)).
-      :((|strs|))
-        strings to be converted.
-    :Exceptions
-      exceptions thrown by ((<Iconv.new>)), ((<Iconv.open>)) and
-      ((<Iconv#iconv>)).
-=end
-*/
-
-static VALUE
-iconv_s_convert
-#ifdef HAVE_PROTOTYPES
-    (struct iconv_env_t* env)
-#else /* HAVE_PROTOTYPES */
-    (env)
-    struct iconv_env_t *env;
-#endif /* HAVE_PROTOTYPES */
-{
-    VALUE last = 0;
-
-    for (; env->argc > 0; --env->argc, ++env->argv) {
-	VALUE s = iconv_convert(env->cd, last = *(env->argv), 0, -1, env);
-	env->append(env->ret, s);
-    }
-
-    if (!NIL_P(last)) {
-	VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env);
-	if (RSTRING(s)->len)
-	    env->append(env->ret, s);
-    }
-
-    return env->ret;
-}
-
-static VALUE
-iconv_s_iconv
-#ifdef HAVE_PROTOTYPES
-    (int argc, VALUE *argv, VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
-    struct iconv_env_t arg;
-
-    if (argc < 2)		/* needs `to' and `from' arguments at least */
-	rb_raise(rb_eArgError, "wrong # of arguments (%d for %d)", argc, 2);
-
-    arg.argc = argc -= 2;
-    arg.argv = argv + 2;
-    arg.append = rb_ary_push;
-    arg.ret = rb_ary_new2(argc);
-    arg.cd = iconv_create(argv[0], argv[1]);
-    return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
-}
-
-static VALUE
-iconv_s_conv
-#ifdef HAVE_PROTOTYPES
-    (VALUE self, VALUE to, VALUE from, VALUE str)
-#else /* HAVE_PROTOTYPES */
-    (self, to, from, str)
-    VALUE self, to, from, str;
-#endif /* HAVE_PROTOTYPES */
-{
-    struct iconv_env_t arg;
-
-    arg.argc = 1;
-    arg.argv = &str;
-    arg.append = rb_str_append;
-    arg.ret = rb_str_new(0, 0);
-    arg.cd = iconv_create(to, from);
-    return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
-}
-
-
-/*
-=begin
-=== Instance methods
-=end
-*/
-/*
-=begin
---- Iconv#close
-    Finishes conversion.
-    * After calling this, invoking method ((<Iconv#iconv>)) will cause
-      exception, but multiple calls of (({close})) are guaranteed to
-      end successfully.
-    * Returns a string contains the byte sequence to change the
-      output buffer to its initial shift state.
-=end
-*/
-static VALUE
-iconv_init_state
-#ifdef HAVE_PROTOTYPES
-    (VALUE cd)
-#else /* HAVE_PROTOTYPES */
-    (cd)
-    VALUE cd;
-#endif /* HAVE_PROTOTYPES */
-{
-    return iconv_convert(VALUE2ICONV(cd), Qnil, 0, 0, NULL);
-}
-
-static VALUE
-iconv_finish
-#ifdef HAVE_PROTOTYPES
-    (VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (self)
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
-    VALUE cd = check_iconv(self);
-
-    if (!cd) return Qnil;
-    DATA_PTR(self) = NULL;
-
-    return rb_ensure(iconv_init_state, cd, iconv_free, cd);
-}
-
-/*
-=begin
---- Iconv#iconv(str, [ start = 0, [ length = -1 ] ])
-    Converts string and returns converted one.
-    * In the case of ((|str|)) is (({String})), converts (({str[start, length]})).
-      Returns converted string.
-    * In the case of ((|str|)) is (({nil})), places ((|converter|))
-      itself into initial shift state and just returns a string contains
-      the byte sequence to change the output buffer to its initial shift
-      state.
-    * Otherwise, causes exception.
-    :Parameters
-      :((|str|))
-        string to be converted or (({nil})).
-      :((|start|))
-        starting offset.
-      :((|length|))
-        conversion length,
-        (({nil})) or (({-1})) means whole string from (({start})).
-    :Exceptions
-      * ((<Iconv::IllegalSequence>))
-      * ((<Iconv::InvalidCharacter>))
-      * ((<Iconv::OutOfRange>))
-=end
-*/
-static VALUE
-iconv_iconv
-#ifdef HAVE_PROTOTYPES
-    (int argc, VALUE *argv, VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
-    VALUE str, n1, n2;
-    VALUE cd = check_iconv(self);
-
-    n1 = n2 = Qnil;
-    rb_scan_args(argc, argv, "12", &str, &n1, &n2);
-
-    return iconv_convert(VALUE2ICONV(cd), str,
-			 NIL_P(n1) ? 0 : NUM2INT(n1),
-			 NIL_P(n2) ? -1 : NUM2INT(n1),
-			 NULL);
-}
-
-
-/*
-=begin
-= Exceptions
-=end
-*/
-/*
-=begin
-== Iconv::Failure
-Base exceptional attributes from ((<Iconv>)).
-
-=== Instance methods
-=end
-*/
-/*
-=begin
---- Iconv::Failure#success
-    Returns string(s) translated successfully until the exception occurred.
-    * In the case of failure occurred within ((<Iconv.iconv>)), returned
-      value is an array of strings translated successfully preceding
-      failure and the last element is string on the way.
-=end
-*/
-static VALUE
-iconv_failure_success
-#ifdef HAVE_PROTOTYPES
-(VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (self)
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
-    return rb_attr_get(self, rb_success);
-}
-
-/*
-=begin
---- Iconv::Failure#failed
-    Returns substring of the original string passed to ((<Iconv>)) that
-    starts at the character caused the exception. 
-=end
-*/
-static VALUE
-iconv_failure_failed
-#ifdef HAVE_PROTOTYPES
-(VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (self)
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
-    return rb_attr_get(self, rb_failed);
-}
-
-/*
-=begin
---- Iconv::Failure#inspect
-    Returns inspected string like as: #<(({type})): "(({success}))", "(({failed}))">
-=end
-*/
-static VALUE
-iconv_failure_inspect
-#ifdef HAVE_PROTOTYPES
-    (VALUE self)
-#else /* HAVE_PROTOTYPES */
-    (self)
-    VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
-    char *cname = rb_class2name(CLASS_OF(self));
-    VALUE success = rb_attr_get(self, rb_success);
-    VALUE failed = rb_attr_get(self, rb_failed);
-    VALUE str = rb_str_buf_cat2(rb_str_new2("#<"), cname);
-    str = rb_str_buf_cat(str, ": ", 2);
-    str = rb_str_buf_append(str, rb_inspect(success));
-    str = rb_str_buf_cat(str, ", ", 2);
-    str = rb_str_buf_append(str, rb_inspect(failed));
-    return rb_str_buf_cat(str, ">", 1);
-}
-
-/*
-  Hmmm, I don't like to write RD inside of function :-<.
-
-=begin
-== Iconv::IllegalSequence
-Input conversion stopped due to an input byte that does not belong to
-the input codeset, or the output codeset does not contain the
-character.
-=== Superclass
-(({ArgumentError}))
-=== Included Modules
-((<Iconv::Failure>))
-
-== Iconv::InvalidCharacter
-Input conversion stopped due to an incomplete character or shift
-sequence at the end of the input buffer.
-=== Superclass
-(({ArgumentError}))
-=== Included Modules
-((<Iconv::Failure>))
-
-== Iconv::OutOfRange
-Iconv library internal error.  Must not occur.
-=== Superclass
-(({RuntimeError}))
-=== Included Modules
-((<Iconv::Failure>))
-=end
-*/
-
-void
-Init_iconv _((void))
-{
-    VALUE rb_cIconv = rb_define_class("Iconv", rb_cData);
-    VALUE metaclass = RBASIC(rb_cIconv)->klass;
-
-    rb_define_alloc_func(rb_cIconv, iconv_s_allocate);
-    rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, 2);
-    rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);
-    rb_define_singleton_method(rb_cIconv, "conv", iconv_s_conv, 3);
-    rb_define_method(rb_cIconv, "initialize", iconv_initialize, 2);
-    rb_define_method(rb_cIconv, "close", iconv_finish, 0);
-    rb_define_method(rb_cIconv, "iconv", iconv_iconv, -1);
-
-    rb_eIconvFailure = rb_define_module_under(rb_cIconv, "Failure");
-    rb_define_method(rb_eIconvFailure, "initialize", iconv_failure_initialize, 3);
-    rb_define_method(rb_eIconvFailure, "success", iconv_failure_success, 0);
-    rb_define_method(rb_eIconvFailure, "failed", iconv_failure_failed, 0);
-    rb_define_method(rb_eIconvFailure, "inspect", iconv_failure_inspect, 0);
-
-    rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError);
-    rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError);
-    rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError);
-    rb_include_module(rb_eIconvIllegalSeq, rb_eIconvFailure);
-    rb_include_module(rb_eIconvInvalidChar, rb_eIconvFailure);
-    rb_include_module(rb_eIconvOutOfRange, rb_eIconvFailure);
-
-    rb_success = rb_intern("success");
-    rb_failed = rb_intern("failed");
-
-    charset_map = rb_hash_new();
-    rb_gc_register_address(&charset_map);
-    rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
-}
-
-
-/*
-=begin
-== Example
-(1) Instantiate a new ((<Iconv>)), use method ((<Iconv#iconv>)).
-      cd = Iconv.new(to, from)
-      begin
-        input.each {|s| output << cd.iconv(s)}
-        output << cd.iconv(nil)      # don't forget this
-      ensure
-        cd.close
-      end
-(2) Invoke ((<Iconv.open>)) with a block.
-      Iconv.open(to, from) do |cd|
-        input.each {|s| output << cd.iconv(s)}
-        output << cd.iconv(nil)
-      end
-(3) Shorthand for (2).
-      Iconv.iconv(to, from, *input.to_a)
-=end
-*/
diff --git a/ext/io/wait/.cvsignore b/ext/io/wait/.cvsignore
deleted file mode 100644
index fc802ff1c2..0000000000
--- a/ext/io/wait/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-mkmf.log
diff --git a/ext/io/wait/MANIFEST b/ext/io/wait/MANIFEST
deleted file mode 100644
index a08526c13a..0000000000
--- a/ext/io/wait/MANIFEST
+++ /dev/null
@@ -1,4 +0,0 @@
-MANIFEST
-extconf.rb
-wait.c
-lib/nonblock.rb
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
deleted file mode 100644
index ea7dc9f6cf..0000000000
--- a/ext/io/wait/extconf.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'mkmf'
-target = "io/wait"
-
-unless macro_defined?("DOSISH", "#include <ruby.h>")
-  fionread = %w[sys/ioctl.h sys/filio.h].find do |h|
-    checking_for("FIONREAD") {macro_defined?("FIONREAD", "#include <#{h}>\n")}
-  end
-  if fionread
-    $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
-    create_makefile(target)
-  end
-end
diff --git a/ext/io/wait/lib/nonblock.rb b/ext/io/wait/lib/nonblock.rb
deleted file mode 100644
index 46511fb40c..0000000000
--- a/ext/io/wait/lib/nonblock.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "fcntl"
-class IO
-  def nonblock?
-    (fcntl(Fcntl::F_GETFL) & File::NONBLOCK) != 0
-  end
-
-  def nonblock=(nb)
-    f = fcntl(Fcntl::F_GETFL)
-    if nb
-      f |= File::NONBLOCK
-    else
-      f &= ~File::NONBLOCK
-    end
-    fcntl(Fcntl::F_SETFL, f)
-  end
-
-  def nonblock(nb = true)
-    nb, self.nonblock = nonblock?, nb
-    yield
-  ensure
-    self.nonblock = nb
-  end
-end
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
deleted file mode 100644
index 53d5bd7d18..0000000000
--- a/ext/io/wait/wait.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/**********************************************************************
-
-  io/wait.c -
-
-  $Author$
-  $Date$
-  created at: Tue Aug 28 09:08:06 JST 2001
-
-  All the files in this distribution are covered under the Ruby's
-  license (see the file COPYING).
-
-**********************************************************************/
-
-#include "ruby.h"
-#include "rubyio.h"
-
-#include <sys/types.h>
-#include FIONREAD_HEADER
-
-static VALUE io_ready_p _((VALUE io));
-static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
-void Init_wait _((void));
-
-EXTERN struct timeval rb_time_interval _((VALUE time));
-
-/*
-=begin
-= IO wait methods.
-=end
- */
-
-/*
-=begin
---- IO#ready?
-    returns non-nil if input available without blocking, or nil.
-=end
-*/
-static VALUE
-io_ready_p(io)
-    VALUE io;
-{
-    OpenFile *fptr;
-    FILE *fp;
-    int n;
-
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    fp = fptr->f;
-    if (feof(fp)) return Qfalse;
-    if (rb_read_pending(fp)) return Qtrue;
-    if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
-    if (n > 0) return INT2NUM(n);
-    return Qnil;
-}
-
-/*
-=begin
---- IO#wait([timeout])
-    waits until input available or timed out and returns self, or nil
-    when EOF reached.
-=end
-*/
-static VALUE
-io_wait(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-    OpenFile *fptr;
-    fd_set rd;
-    FILE *fp;
-    int fd, n;
-    VALUE timeout;
-    struct timeval *tp, timerec;
-
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    rb_scan_args(argc, argv, "01", &timeout);
-    if (NIL_P(timeout)) {
-	tp = 0;
-    }
-    else {
-	timerec = rb_time_interval(timeout);
-	tp = &timerec;
-    }
-
-    fp = fptr->f;
-    if (feof(fp)) return Qfalse;
-    if (rb_read_pending(fp)) return Qtrue;
-    fd = fileno(fp);
-    FD_ZERO(&rd);
-    FD_SET(fd, &rd);
-    if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0)
-	rb_sys_fail(0);
-    rb_io_check_closed(fptr);
-    if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
-    if (n > 0) return io;
-    return Qnil;
-}
-
-void
-Init_wait()
-{
-    rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
-    rb_define_method(rb_cIO, "wait", io_wait, -1);
-}
diff --git a/ext/md5/MANIFEST b/ext/md5/MANIFEST
new file mode 100644
index 0000000000..8057ebb06c
--- /dev/null
+++ b/ext/md5/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+depend
+md5.txt
+md5.txt.jp
+md5.h
+md5c.c
+md5init.c
diff --git a/ext/md5/depend b/ext/md5/depend
new file mode 100644
index 0000000000..c99f78ee90
--- /dev/null
+++ b/ext/md5/depend
@@ -0,0 +1,2 @@
+md5c.o: md5c.c md5.h
+md5init.o: md5init.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h md5.h
diff --git a/ext/md5/md5.doc b/ext/md5/md5.doc
new file mode 100644
index 0000000000..2203404602
--- /dev/null
+++ b/ext/md5/md5.doc
@@ -0,0 +1,36 @@
+.\" md5.doc -  -*- Indented-Text -*- created at: Fri Aug  2 12:01:27 JST 1996
+
+** MD5(���饹)
+
+RFC1321�˵��Ҥ���Ƥ���RSA Data Security, Inc. �� MD5 Message-Digest
+Algorithm��������륯�饹��
+
+SuperClass: Object
+
+Class Methods:
+
+   new([str])
+   md5([str])
+
+        ������MD5���֥������Ȥ��������롥ʸ���������Ϳ������Ȥ���
+        ���ɲä���(see update)��
+
+Methods:
+
+   clone
+
+	MD5���֥������Ȥ�ʣ������
+
+   digest
+
+        ���ޤǤ��ɲä���ʸ������Ф���ϥå����ͤ�16�Х���Ĺ��ʸ�����
+        �֤���
+
+   update(str)
+
+        key�򥭡��Ȥ����ͤ��֤���
+
+-------------------------------------------------------
+Local variables:
+fill-column: 70
+end:
diff --git a/ext/md5/md5.h b/ext/md5/md5.h
new file mode 100644
index 0000000000..81a6d7ff36
--- /dev/null
+++ b/ext/md5/md5.h
@@ -0,0 +1,86 @@
+/* MD5.H - header file for MD5C.C
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+/* ========== include global.h ========== */
+/* GLOBAL.H - RSAREF types and constants
+ */
+
+/* PROTOTYPES should be set to one if and only if the compiler supports
+  function argument prototyping.
+The following makes PROTOTYPES default to 0 if it has not already
+  been defined with C compiler flags.
+ */
+#ifdef HAVE_PROTOTYPES
+#define PROTOTYPES 1
+#endif
+#ifndef PROTOTYPES
+#define PROTOTYPES 0
+#endif
+
+/* POINTER defines a generic pointer type */
+typedef unsigned char *POINTER;
+
+/* UINT2 defines a two byte word */
+typedef unsigned short int UINT2;
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#else
+/* Wild guess */
+#define LONG_MAX 2147483647L
+#endif
+
+/* UINT4 defines a four byte word */
+#if defined(INT_MAX) && INT_MAX == 2147483647
+typedef unsigned int UINT4;
+#else
+#if defined(LONG_MAX) && LONG_MAX == 2147483647L
+typedef unsigned long int UINT4;
+#endif
+/* Too bad if neither is */
+#endif
+
+/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
+  returns an empty list.
+ */
+#if PROTOTYPES
+#define PROTO_LIST(list) list
+#else
+#define PROTO_LIST(list) ()
+#endif
+/* ========== End global.h; continue md5.h ========== */
+
+/* MD5 context. */
+typedef struct {
+  UINT4 state[4];                                   /* state (ABCD) */
+  UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
+  unsigned char buffer[64];                         /* input buffer */
+} MD5_CTX;
+
+void MD5Init PROTO_LIST ((MD5_CTX *));
+void MD5Update PROTO_LIST
+  ((MD5_CTX *, unsigned char *, unsigned int));
+void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
diff --git a/ext/md5/md5c.c b/ext/md5/md5c.c
new file mode 100644
index 0000000000..d7c7e4fb27
--- /dev/null
+++ b/ext/md5/md5c.c
@@ -0,0 +1,337 @@
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "md5.h"
+
+/* Constants for MD5Transform routine.
+ */
+
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64]));
+static void Encode PROTO_LIST
+  ((unsigned char *, UINT4 *, unsigned int));
+static void Decode PROTO_LIST
+  ((UINT4 *, unsigned char *, unsigned int));
+static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
+static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int));
+
+static unsigned char PADDING[64] = {
+  0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* F, G, H and I are basic MD5 functions.
+ */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits.
+ */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+Rotation is separate from addition to prevent recomputation.
+ */
+#define FF(a, b, c, d, x, s, ac) { \
+ (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) { \
+ (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) { \
+ (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) { \
+ (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+
+/* MD5 initialization. Begins an MD5 operation, writing a new context.
+ */
+void MD5Init (context)
+MD5_CTX *context;                                        /* context */
+{
+  context->count[0] = context->count[1] = 0;
+  /* Load magic initialization constants.
+*/
+  context->state[0] = 0x67452301;
+  context->state[1] = 0xefcdab89;
+  context->state[2] = 0x98badcfe;
+  context->state[3] = 0x10325476;
+}
+
+/* MD5 block update operation. Continues an MD5 message-digest
+  operation, processing another message block, and updating the
+  context.
+ */
+void MD5Update (context, input, inputLen)
+MD5_CTX *context;                                        /* context */
+unsigned char *input;                                /* input block */
+unsigned int inputLen;                     /* length of input block */
+{
+  unsigned int i, index, partLen;
+
+  /* Compute number of bytes mod 64 */
+  index = (unsigned int)((context->count[0] >> 3) & 0x3F);
+
+  /* Update number of bits */
+  if ((context->count[0] += ((UINT4)inputLen << 3))
+   < ((UINT4)inputLen << 3))
+ context->count[1]++;
+  context->count[1] += ((UINT4)inputLen >> 29);
+
+  partLen = 64 - index;
+
+  /* Transform as many times as possible.
+*/
+  if (inputLen >= partLen) {
+ MD5_memcpy
+   ((POINTER)&context->buffer[index], (POINTER)input, partLen);
+ MD5Transform (context->state, context->buffer);
+
+ for (i = partLen; i + 63 < inputLen; i += 64)
+   MD5Transform (context->state, &input[i]);
+
+ index = 0;
+  }
+  else
+ i = 0;
+
+  /* Buffer remaining input */
+  MD5_memcpy
+ ((POINTER)&context->buffer[index], (POINTER)&input[i],
+  inputLen-i);
+}
+
+/* MD5 finalization. Ends an MD5 message-digest operation, writing the
+  the message digest and zeroizing the context.
+ */
+void MD5Final (digest, context)
+unsigned char digest[16];                         /* message digest */
+MD5_CTX *context;                                       /* context */
+{
+  unsigned char bits[8];
+  unsigned int index, padLen;
+
+  /* Save number of bits */
+  Encode (bits, context->count, 8);
+
+  /* Pad out to 56 mod 64.
+*/
+  index = (unsigned int)((context->count[0] >> 3) & 0x3f);
+  padLen = (index < 56) ? (56 - index) : (120 - index);
+  MD5Update (context, PADDING, padLen);
+
+  /* Append length (before padding) */
+  MD5Update (context, bits, 8);
+
+  /* Store state in digest */
+  Encode (digest, context->state, 16);
+
+  /* Zeroize sensitive information.
+*/
+  MD5_memset ((POINTER)context, 0, sizeof (*context));
+}
+
+/* MD5 basic transformation. Transforms state based on block.
+ */
+static void MD5Transform (state, block)
+UINT4 state[4];
+unsigned char block[64];
+{
+  UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+
+  Decode (x, block, 64);
+
+  /* Round 1 */
+  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+ /* Round 2 */
+  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+  /* Round 3 */
+  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+  /* Round 4 */
+  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+
+  state[0] += a;
+  state[1] += b;
+  state[2] += c;
+  state[3] += d;
+
+  /* Zeroize sensitive information.
+*/
+  MD5_memset ((POINTER)x, 0, sizeof (x));
+}
+
+/* Encodes input (UINT4) into output (unsigned char). Assumes len is
+  a multiple of 4.
+ */
+static void Encode (output, input, len)
+unsigned char *output;
+UINT4 *input;
+unsigned int len;
+{
+  unsigned int i, j;
+
+  for (i = 0, j = 0; j < len; i++, j += 4) {
+ output[j] = (unsigned char)(input[i] & 0xff);
+ output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
+ output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
+ output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
+  }
+}
+
+/* Decodes input (unsigned char) into output (UINT4). Assumes len is
+  a multiple of 4.
+ */
+static void Decode (output, input, len)
+UINT4 *output;
+unsigned char *input;
+unsigned int len;
+{
+  unsigned int i, j;
+
+  for (i = 0, j = 0; j < len; i++, j += 4)
+ output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
+   (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
+}
+
+/* Note: Replace "for loop" with standard memcpy if possible.
+ */
+
+static void MD5_memcpy (output, input, len)
+POINTER output;
+POINTER input;
+unsigned int len;
+{
+  unsigned int i;
+
+  for (i = 0; i < len; i++)
+ output[i] = input[i];
+}
+
+/* Note: Replace "for loop" with standard memset if possible.
+ */
+static void MD5_memset (output, value, len)
+POINTER output;
+int value;
+unsigned int len;
+{
+  unsigned int i;
+
+  for (i = 0; i < len; i++)
+ ((char *)output)[i] = (char)value;
+}
diff --git a/ext/md5/md5init.c b/ext/md5/md5init.c
new file mode 100644
index 0000000000..552a407c6d
--- /dev/null
+++ b/ext/md5/md5init.c
@@ -0,0 +1,114 @@
+/************************************************
+
+  md5init.c -
+
+  $Author$
+  created at: Fri Aug  2 09:24:12 JST 1996
+
+  Copyright (C) 1995-1998 Yukihiro Matsumoto
+
+************************************************/
+/* This module provides an interface to the RSA Data Security,
+   Inc. MD5 Message-Digest Algorithm, described in RFC 1321.
+   It requires the files md5c.c and md5.h (which are slightly changed
+   from the versions in the RFC to avoid the "global.h" file.) */
+
+#include "ruby.h"
+#include "md5.h"
+
+static VALUE cMD5;
+
+static VALUE
+md5_update(obj, str)
+    VALUE obj;
+    struct RString *str;
+{
+    MD5_CTX *md5;
+
+    Check_Type(str, T_STRING);
+    Data_Get_Struct(obj, MD5_CTX, md5);
+    MD5Update(md5, str->ptr, str->len);
+
+    return obj;
+}
+
+static VALUE
+md5_digest(obj)
+    VALUE obj;
+{
+    MD5_CTX *md5, ctx;
+    unsigned char digest[16];
+
+    Data_Get_Struct(obj, MD5_CTX, md5);
+    ctx = *md5;
+    MD5Final(digest, &ctx);
+
+    return rb_str_new(digest, 16);
+}
+
+static VALUE
+md5_hexdigest(obj)
+    VALUE obj;
+{
+    MD5_CTX *md5, ctx;
+    unsigned char digest[16];
+    char buf[33];
+    int i;
+
+    Data_Get_Struct(obj, MD5_CTX, md5);
+    ctx = *md5;
+    MD5Final(digest, &ctx);
+
+    for (i=0; i<16; i++) {
+	sprintf(buf+i*2, "%02x", digest[i]);
+    }
+    return rb_str_new(buf, 32);
+}
+
+static VALUE
+md5_clone(obj)
+    VALUE obj;
+{
+    MD5_CTX *md5, *md5_new;
+
+    Data_Get_Struct(obj, MD5_CTX, md5);
+    obj = Data_Make_Struct(CLASS_OF(obj), MD5_CTX, 0, free, md5_new);
+    *md5_new = *md5;
+
+    return obj;
+}
+
+static VALUE
+md5_new(argc, argv, class)
+    int argc;
+    VALUE* argv;
+    VALUE class;
+{
+    VALUE arg, obj;
+    MD5_CTX *md5;
+
+    rb_scan_args(argc, argv, "01", &arg);
+    if (!NIL_P(arg)) Check_Type(arg, T_STRING);
+
+    obj = Data_Make_Struct(class, MD5_CTX, 0, free, md5);
+    MD5Init(md5);
+    if (!NIL_P(arg)) {
+	md5_update(obj, arg);
+    }
+    rb_obj_call_init(obj, argc, argv);
+
+    return obj;
+}
+
+void
+Init_md5()
+{
+    cMD5 = rb_define_class("MD5", rb_cObject);
+
+    rb_define_singleton_method(cMD5, "new", md5_new, -1);
+
+    rb_define_method(cMD5, "update", md5_update, 1);
+    rb_define_method(cMD5, "digest", md5_digest, 0);
+    rb_define_method(cMD5, "hexdigest", md5_hexdigest, 0);
+    rb_define_method(cMD5, "clone",  md5_clone, 0);
+}
diff --git a/ext/nkf/.cvsignore b/ext/nkf/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/nkf/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/nkf/depend b/ext/nkf/depend
index 13e32e6074..645bc869c8 100644
--- a/ext/nkf/depend
+++ b/ext/nkf/depend
@@ -1 +1 @@
-nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(srcdir)/nkf1.7/nkf.c
+nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h nkf1.7/nkf.c
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index af6d82275f..bfd276330d 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -56,18 +56,3 @@ module Kconv
   end
   module_function :guess
 end
-
-class String
-  def kconv(out_code, in_code=Kconv::AUTO)
-    Kconv::kconv(self, out_code, in_code)
-  end
-  def tojis
-    NKF::nkf('-j', self)
-  end
-  def toeuc
-    NKF::nkf('-e', self)
-  end
-  def tosjis
-    NKF::nkf('-s', self)
-  end
-end
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index ca6de73e10..aa38bada7f 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -10,7 +10,7 @@
 
 #undef getc
 #undef ungetc
-#define getc(f)   	(input_ctr<i_len?input[input_ctr++]:-1)
+#define getc(f)   	(input_ctr>i_len?-1:input[input_ctr++])
 #define ungetc(c,f)	input_ctr--
 
 #undef putchar
@@ -31,12 +31,14 @@ rb_nkf_putchar(c)
 {
   if (output_ctr >= o_len) {
     o_len += incsize;
-    rb_str_resize(dst, o_len);
-    output = RSTRING(dst)->ptr;
+    rb_str_cat(dst, "", incsize);
     incsize *= 2;
   }
+  
   output[output_ctr++] = c;
-
+/*
+printf("[[%c][%c][%d]]\n", c, output[output_ctr - 1], output_ctr);
+*/
   return c;
 }
 
@@ -47,13 +49,12 @@ static VALUE
 rb_nkf_kconv(obj, opt, src)
      VALUE obj, opt, src;
 {
+  int i;
   char *opt_ptr, *opt_end;
-  volatile VALUE v;
 
   reinit();
-  StringValue(opt);
-  opt_ptr = RSTRING(opt)->ptr;
-  opt_end = opt_ptr + RSTRING(opt)->len;
+  opt_ptr = str2cstr(opt, &i);
+  opt_end = opt_ptr + i;
   for (; opt_ptr < opt_end; opt_ptr++) {
     if (*opt_ptr != '-') {
       continue;
@@ -64,11 +65,8 @@ rb_nkf_kconv(obj, opt, src)
   incsize = INCSIZE;
 
   input_ctr = 0; 
-  StringValue(src);
-  input = RSTRING(src)->ptr;
-  i_len = RSTRING(src)->len;
-  dst = rb_str_new(0, i_len*3 + 10);
-  v = dst;
+  input     = str2cstr(src, &i_len);
+  dst = rb_str_new(0, i_len*3 + 10); /* large enough? */
 
   output_ctr = 0;
   output     = RSTRING(dst)->ptr;
@@ -80,9 +78,18 @@ rb_nkf_kconv(obj, opt, src)
   } 
 
   kanji_convert(NULL);
-  RSTRING(dst)->ptr[output_ctr] = '\0';
-  RSTRING(dst)->len = output_ctr;
-  OBJ_INFECT(dst, src);
+  if (output_ctr > 0) output_ctr--;
+  if (output[output_ctr] == '\0') {
+/*
+printf("([%c][%d])\n", output[output_ctr], output_ctr);
+*/
+    RSTRING(dst)->len = output_ctr;
+  } else {
+/*
+printf("<[%c][%d]>\n", output[output_ctr], output_ctr);
+*/
+    RSTRING(dst)->len = output_ctr + 1;
+  }
 
   return dst;
 }
@@ -99,12 +106,13 @@ rb_nkf_guess(obj, src)
 {
   unsigned char *p;
   unsigned char *pend;
+  int plen;
   int sequence_counter = 0;
 
-  StringValue(src);
-  p = RSTRING(src)->ptr;
-  pend = p + RSTRING(src)->len;
-  if (p == pend) return INT2FIX(_UNKNOWN);
+  Check_Type(src, T_STRING);
+
+  p = str2cstr(src, &plen);
+  pend = p + plen;
 
 #define INCR do {\
     p++;\
@@ -125,7 +133,9 @@ rb_nkf_guess(obj, src)
     if (*p == '\033') {
       return INT2FIX(_JIS);
     }
-    if (*p < '\006' || *p == 0x7f || *p == 0xff) {
+    if ('\000' < *p && *p < '\006'
+	|| *p == 0x7f
+	|| *p == 0xdf) {
       return INT2FIX(_BINARY);
     }
     if (0x81 <= *p && *p <= 0x8d) {
diff --git a/ext/nkf/nkf1.7/nkf.c b/ext/nkf/nkf1.7/nkf.c
index 09419f40a7..26ef657021 100644
--- a/ext/nkf/nkf1.7/nkf.c
+++ b/ext/nkf/nkf1.7/nkf.c
@@ -871,7 +871,7 @@ kanji_convert(f)
             } else if(c1 == SO) {
                 shift_mode = TRUE; 
                 NEXT;
-            } else if(c1 == ESC) {
+            } else if(c1 == ESC ) {
                 if((c1 = GETC(f)) == EOF) {
                     (*oconv)(0, ESC);
                     LAST;
@@ -1826,7 +1826,6 @@ reinit()
     file_out = FALSE;
     add_cr = FALSE;
     del_cr = FALSE;
-    line = 0;
 }
 
 #ifndef PERL_XS
diff --git a/ext/openssl/.cvsignore b/ext/openssl/.cvsignore
deleted file mode 100644
index dfb8bfb8bb..0000000000
--- a/ext/openssl/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-GNUmakefile
-Makefile
-mkmf.log
-dep
diff --git a/ext/openssl/MANIFEST b/ext/openssl/MANIFEST
deleted file mode 100644
index cdaf55c926..0000000000
--- a/ext/openssl/MANIFEST
+++ /dev/null
@@ -1,60 +0,0 @@
-MANIFEST
-extconf.rb
-lib/net/ftptls.rb
-lib/net/https.rb
-lib/net/protocols.rb
-lib/net/telnets.rb
-lib/openssl.rb
-lib/openssl/bn.rb
-lib/openssl/buffering.rb
-lib/openssl/cipher.rb
-lib/openssl/digest.rb
-lib/openssl/ssl.rb
-lib/openssl/x509.rb
-openssl_missing.c
-openssl_missing.h
-ossl.c
-ossl.h
-ossl_asn1.c
-ossl_asn1.h
-ossl_bio.c
-ossl_bio.h
-ossl_bn.c
-ossl_bn.h
-ossl_cipher.c
-ossl_cipher.h
-ossl_config.c
-ossl_config.h
-ossl_digest.c
-ossl_digest.h
-ossl_engine.c
-ossl_engine.h
-ossl_hmac.c
-ossl_hmac.h
-ossl_ns_spki.c
-ossl_ns_spki.h
-ossl_ocsp.c
-ossl_ocsp.h
-ossl_pkcs7.c
-ossl_pkcs7.h
-ossl_pkey.c
-ossl_pkey.h
-ossl_pkey_dh.c
-ossl_pkey_dsa.c
-ossl_pkey_rsa.c
-ossl_rand.c
-ossl_rand.h
-ossl_ssl.c
-ossl_ssl.h
-ossl_version.h
-ossl_x509.c
-ossl_x509.h
-ossl_x509attr.c
-ossl_x509cert.c
-ossl_x509crl.c
-ossl_x509ext.c
-ossl_x509name.c
-ossl_x509req.c
-ossl_x509revoked.c
-ossl_x509store.c
-ruby_missing.h
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
deleted file mode 100644
index a4239a1225..0000000000
--- a/ext/openssl/extconf.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-=begin
-= $RCSfile$ -- Generator for Makefile
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-require "mkmf"
-
-dir_config("openssl")
-dir_config("kerberos")
-
-message "=== OpenSSL for Ruby configurator ===\n"
-
-##
-# Adds -Wall -DOSSL_DEBUG for compilation and some more targets when GCC is used
-# To turn it on, use: --with-debug or --enable-debug
-#
-if with_config("debug") or enable_config("debug")
-  $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
-
-  if /gcc/ =~ CONFIG["CC"]
-    $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
-  end
-end
-
-
-
-message "=== Checking for system dependent stuff... ===\n"
-have_library("nsl", "t_open")
-have_library("socket", "socket")
-have_header("unistd.h")
-have_header("sys/time.h")
-have_header("assert.h")
-
-message "=== Checking for required stuff... ===\n"
-if $mingw
-  have_library("wsock32")
-  have_library("gdi32")
-end
-result = have_header("openssl/ssl.h")
-result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
-result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
-if !result
-  unless pkg_config("openssl") and have_header("openssl/ssl.h")
-    message "=== Checking for required stuff failed. ===\n"
-    message "Makefile wasn't created. Fix the errors above.\n"
-    exit 1
-  end
-end
-
-message "=== Checking for OpenSSL features... ===\n"
-have_func("HMAC_CTX_copy")
-have_func("X509_STORE_get_ex_data")
-have_func("X509_STORE_set_ex_data")
-have_func("EVP_MD_CTX_create")
-have_func("EVP_MD_CTX_cleanup")
-have_func("EVP_MD_CTX_destroy")
-have_func("PEM_def_callback")
-have_func("EVP_MD_CTX_init")
-have_func("HMAC_CTX_init")
-have_func("HMAC_CTX_cleanup")
-have_func("X509_CRL_set_version")
-have_func("X509_CRL_set_issuer_name")
-have_func("X509_CRL_sort")
-have_func("X509_CRL_add0_revoked")
-have_func("CONF_get1_default_config_file")
-have_func("BN_mod_sqr")
-have_func("BN_mod_add")
-have_func("BN_mod_sub")
-have_func("BN_rand_range")
-have_func("BN_pseudo_rand_range")
-have_func("CONF_get1_default_config_file")
-have_func("X509V3_set_nconf")
-if try_compile("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
-  $defs.push("-DHAVE_VA_ARGS_MACRO")
-end
-if have_header("openssl/engine.h")
-  have_func("ENGINE_load_builtin_engines")
-  have_func("ENGINE_load_openbsd_dev_crypto")
-  have_func("ENGINE_get_digest")
-  have_func("ENGINE_get_cipher")
-  have_func("ENGINE_cleanup")
-end
-have_header("openssl/ocsp.h")
-have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h")
-have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
-
-message "=== Checking done. ===\n"
-$distcleanfiles << "GNUmakefile" << "dep"
-create_makefile("openssl")
-if /gcc/ =~ CONFIG["CC"]
-  File.open("GNUmakefile", "w") {|f|
-    f.print <<EOD
-include Makefile
-
-SRCS = $(OBJS:.o=.c)
-
-test-link: $(OBJS)
-	$(CC) $(DLDFLAGS) #{OUTFLAG}.testlink $(OBJS) $(LIBPATH) $(LIBS) $(LOCAL_LIBS)
-	@$(RM) .testlink
-	@echo "Done."
-
-dep:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(SRCS) -MM | \\
-	$(RUBY) -p -e 'BEGIN{S = []' \\
-		-e 'while !ARGV.empty? and /^(\\w+)=(.*)/ =~ ARGV[0]' \\
-		  -e 'S << [/\#{Regexp.quote($$2)}\\//, "$$(\#{$$1})/"]' \\
-		  -e 'ARGV.shift' \\
-		-e 'end' \\
-		-e '}' -e 'S.each(&method(:gsub!))' -- \\
-            'topdir=$(topdir)' 'srcdir=$(srcdir)' 'hdrdir=$(hdrdir)' \\
-	> dep
-
-include dep
-EOD
-  }
-end
-message "Done.\n"
diff --git a/ext/openssl/lib/net/ftptls.rb b/ext/openssl/lib/net/ftptls.rb
deleted file mode 100644
index f433457923..0000000000
--- a/ext/openssl/lib/net/ftptls.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-=begin
-= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2003 Blaz Grilc <farmer@gmx.co.uk>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Requirements
-
-= Version
-  $Id$
-  
-= Notes
-  Tested on FreeBSD 5-CURRENT and 4-STABLE
-  - ruby 1.6.8 (2003-01-17) [i386-freebsd5]
-  - OpenSSL 0.9.7a Feb 19 2003
-  - ruby-openssl-0.2.0.p0
-  tested on ftp server: glftpd 1.30
-=end
-
-require 'socket'
-require 'openssl'
-require 'net/ftp'
-
-module Net
-  class FTPTLS < FTP
-    def login(user = "anonymous", passwd = nil, acct = nil)
-       ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
-       ctx.key = nil
-       ctx.cert = nil
-       voidcmd("AUTH TLS")
-       @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
-       @sock.connect
-       super(user, passwd, acct)
-       voidcmd("PBSZ 0")
-    end
-  end
-end
diff --git a/ext/openssl/lib/net/https.rb b/ext/openssl/lib/net/https.rb
deleted file mode 100644
index fb7f53c555..0000000000
--- a/ext/openssl/lib/net/https.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-=begin
-= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU Yuuzou <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Requirements
-  This program requires Net 1.2.0 or higher version.
-  You can get it from RAA or Ruby's CVS repository.
-
-= Version
-  $Id$
-  
-  2001/11/06: Contiributed to Ruby/OpenSSL project.
-
-== class Net::HTTP
-
-== Example
-
-Simple HTTP client is here:
-
-    require 'net/http'
-    host, port, path = "localhost", 80, "/"
-    if %r!http://(.*?)(?::(\d+))?(/.*)! =~ ARGV[0]
-      host   = $1
-      port   = $2.to_i if $2
-      path   = $3
-    end
-    h = Net::HTTP.new(host, port)
-    h.get2(path){ |resp| print resp.body }
-
-It can be replaced by follow one:
-
-    require 'net/https'
-    host, port, path = "localhost", 80, "/"
-    if %r!(https?)://(.*?)(?::(\d+))?(/.*)! =~ ARGV[0]
-      scheme = $1
-      host   = $2
-      port   = $3 ? $3.to_i : ((scheme == "http") ? 80 : 443)
-      path   = $4
-    end
-    h = Net::HTTP.new(host, port)
-    h.use_ssl = true if scheme == "https" # enable SSL/TLS
-    h.get2(path){ |resp| print resp.body }
-
-=== Instance Methods
-
-: use_ssl
-    returns ture if use SSL/TLS with HTTP.
-
-: use_ssl=((|true_or_false|))
-    sets use_ssl.
-
-: peer_cert
-    return the X.509 certificates the server presented.
-
-: key=((|key|))
-    Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
-    (This method is appeared in Michal Rokos's OpenSSL extention.)
-
-: key_file=((|path|))
-    Sets a private key file to use in PEM format.
-
-: cert=((|cert|))
-    Sets an OpenSSL::X509::Certificate object as client certificate.
-    (This method is appeared in Michal Rokos's OpenSSL extention.)
-
-: cert_file=((|path|))
-    Sets pathname of a X.509 certification file in PEM format.
-
-: ca_file=((|path|))
-    Sets path of a CA certification file in PEM format.
-    The file can contrain several CA certificats.
-
-: ca_path=((|path|))
-    Sets path of a CA certification directory containing certifications
-    in PEM format.
-
-: verify_mode=((|mode|))
-    Sets the flags for server the certification verification at
-    begining of SSL/TLS session.
-    OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable.
-
-: verify_callback=((|proc|))
-    Sets the verify callback for the server certification verification.
-
-: verify_depth=((|num|))
-    Sets the maximum depth for the certificate chain verification.
-
-: cert_store=((|store|))
-    Sets the X509::Store to verify peer certificate.
-
-=end
-
-require 'net/protocols'
-require 'net/http'
-
-module Net
-  class HTTP
-    class Conn < HTTPRequest
-      REQUEST_HAS_BODY=false
-      RESPONSE_HAS_BODY=false
-      METHOD="connect"
-
-      def initialize
-        super nil, nil
-      end
-
-      def exec( sock, addr, port, ver )
-        @socket = sock
-        request(addr, port, ver)
-      end
-
-      def request( addr, port, ver )
-        @socket.writeline sprintf('CONNECT %s:%s HTTP/%s', addr, port, ver)
-        @socket.writeline ''
-      end
-    end
-
-    module ProxyMod
-      def edit_path( path )
-        if use_ssl
-          'https://' + addr_port + path
-        else
-          'http://' + addr_port + path
-        end
-      end
-    end
-
-    def self.socket_type
-      SSLIO
-    end
-
-    attr_reader :use_ssl
-    attr_writer :key, :cert
-    attr_writer :ca_file, :ca_path
-    attr_writer :verify_mode, :verify_callback, :verify_depth
-    attr_writer :cert_store, :timeout
-    attr_reader :peer_cert
-
-    alias :default_initialize :initialize
-
-    def initialize(*args)
-      default_initialize(*args)
-      @key = @cert = @ca_file = @ca_path = @verify_mode =
-      @verify_callback = @verify_depth = @timeout = @cert_store = nil
-      @already_connected = false
-    end
-
-    def use_ssl=(flag)
-      if @already_connected && !@use_ssl
-        raise ProtocolError, "connection is alrady set up"
-      end
-      @use_ssl = flag
-    end
-
-    def on_connect
-      if use_ssl
-        if proxy?
-          Conn.new.exec(@socket, @address, @port, "1.0")
-          resp = HTTPResponse.read_new(@socket)
-          if resp.code != '200'
-            raise resp.message
-          end
-        end
-        @socket.key             = @key       if @key
-        @socket.cert            = @cert      if @cert
-        @socket.ca_file         = @ca_file
-        @socket.ca_path         = @ca_path
-        @socket.verify_mode     = @verify_mode
-        @socket.verify_callback = @verify_callback
-        @socket.verify_depth    = @verify_depth
-        @socket.timeout         = @timeout
-        @socket.cert_store      = @cert_store
-        @socket.ssl_connect
-        @peer_cert = @socket.peer_cert
-      end
-      @already_connected = true
-    end
-
-  end
-end
diff --git a/ext/openssl/lib/net/protocols.rb b/ext/openssl/lib/net/protocols.rb
deleted file mode 100644
index 073d4f3027..0000000000
--- a/ext/openssl/lib/net/protocols.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-=begin
-= $RCSfile$ -- SSL/TLS enhancement for Net.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Requirements
-  This program requires Net 1.2.0 or higher version.
-  You can get it from RAA or Ruby's CVS repository.
-
-= Version
-  $Id$
-  
-  2001/11/06: Contiributed to Ruby/OpenSSL project.
-=end
-
-require 'net/protocol'
-require 'forwardable'
-require 'openssl'
-
-module Net
-  class SSLIO < InternetMessageIO
-    extend Forwardable
-
-    def_delegators(:@ssl_context,
-                   :key=, :cert=, :key_file=, :cert_file=,
-                   :ca_file=, :ca_path=,
-                   :verify_mode=, :verify_callback=, :verify_depth=,
-                   :timeout=, :cert_store=)
-
-    def initialize(addr, port, otime = nil, rtime = nil, dout = nil)
-      super
-      @ssl_context = OpenSSL::SSL::SSLContext.new()
-    end
-
-    def ssl_connect()
-      unless @ssl_context.verify_mode
-        warn "warning: peer certificate won't be verified in this SSL session."
-        @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      @socket = OpenSSL::SSL::SSLSocket.new(@socket, @ssl_context)
-      @socket.sync_close = true
-      @socket.connect
-    end
-
-    def peer_cert
-      @socket.peer_cert
-    end
-  end
-end
diff --git a/ext/openssl/lib/net/telnets.rb b/ext/openssl/lib/net/telnets.rb
deleted file mode 100644
index c7ecbd717a..0000000000
--- a/ext/openssl/lib/net/telnets.rb
+++ /dev/null
@@ -1,250 +0,0 @@
-=begin
-= $RCSfile$ -- SSL/TLS enhancement for Net::Telnet.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-  
-  2001/11/06: Contiributed to Ruby/OpenSSL project.
-
-== class Net::Telnet
-
-This class will initiate SSL/TLS session automaticaly if the server
-sent OPT_STARTTLS. Some options are added for SSL/TLS.
-
-  host = Net::Telnet::new({
-           "Host"       => "localhost",
-           "Port"       => "telnets",
-           ## follows are new options.
-           'CertFile'   => "user.crt",
-           'KeyFile'    => "user.key",
-           'CAFile'     => "/some/where/certs/casert.pem",
-           'CAPath'     => "/some/where/caserts",
-           'VerifyMode' => SSL::VERIFY_PEER,
-           'VerifyCallback' => verify_proc
-         })
-
-Or, the new options ('Cert', 'Key' and 'CACert') are available from
-Michal Rokos's OpenSSL module.
-
-  cert_data = File.open("user.crt"){|io| io.read }
-  pkey_data = File.open("user.key"){|io| io.read }
-  cacert_data = File.open("your_ca.pem"){|io| io.read }
-  host = Net::Telnet::new({
-           "Host"       => "localhost",
-           "Port"       => "telnets",
-           'Cert'       => OpenSSL::X509::Certificate.new(cert_data)
-           'Key'        => OpenSSL::PKey::RSA.new(pkey_data)
-           'CACert'     => OpenSSL::X509::Certificate.new(cacert_data)
-           'CAFile'     => "/some/where/certs/casert.pem",
-           'CAPath'     => "/some/where/caserts",
-           'VerifyMode' => SSL::VERIFY_PEER,
-           'VerifyCallback' => verify_proc
-         })
-
-This class is expected to be a superset of usual Net::Telnet.
-=end
-
-require "net/telnet"
-require "openssl"
-
-module Net
-  class Telnet
-    attr_reader :ssl
-
-    OPT_STARTTLS       =  46.chr # "\056" # "\x2e" # Start TLS
-    TLS_FOLLOWS        =   1.chr # "\001" # "\x01" # FOLLOWS (for STARTTLS)
-
-    alias preprocess_orig preprocess
-
-    def ssl?; @ssl; end
-
-    def preprocess(string)
-      # combine CR+NULL into CR
-      string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
-
-      # combine EOL into "\n"
-      string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
-
-      string.gsub(/#{IAC}(
-                   [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
-                   [#{DO}#{DONT}#{WILL}#{WONT}][#{OPT_BINARY}-#{OPT_EXOPL}]|
-                   #{SB}[#{OPT_BINARY}-#{OPT_EXOPL}]
-                     (#{IAC}#{IAC}|[^#{IAC}])+#{IAC}#{SE}
-                 )/xno) do
-        if    IAC == $1  # handle escaped IAC characters
-          IAC
-        elsif AYT == $1  # respond to "IAC AYT" (are you there)
-          self.write("nobody here but us pigeons" + EOL)
-          ''
-        elsif DO[0] == $1[0]  # respond to "IAC DO x"
-          if    OPT_BINARY[0] == $1[1]
-            @telnet_option["BINARY"] = true
-            self.write(IAC + WILL + OPT_BINARY)
-          elsif OPT_STARTTLS[0] == $1[1]
-            self.write(IAC + WILL + OPT_STARTTLS)
-            self.write(IAC + SB + OPT_STARTTLS + TLS_FOLLOWS + IAC + SE)
-          else
-            self.write(IAC + WONT + $1[1..1])
-          end
-          ''
-        elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
-          self.write(IAC + WONT + $1[1..1])
-          ''
-        elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
-          if    OPT_BINARY[0] == $1[1]
-            self.write(IAC + DO + OPT_BINARY)
-          elsif OPT_ECHO[0] == $1[1]
-            self.write(IAC + DO + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = true
-            self.write(IAC + DO + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
-          if    OPT_ECHO[0] == $1[1]
-            self.write(IAC + DONT + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = false
-            self.write(IAC + DONT + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        elsif SB[0] == $1[0]    # respond to "IAC SB xxx IAC SE"
-          if    OPT_STARTTLS[0] == $1[1] && TLS_FOLLOWS[0] == $2[0]
-            @sock = OpenSSL::SSL::SSLSocket.new(@sock)
-            @sock.cert_file       = @options['CertFile']
-            @sock.cert            = @options['Cert'] unless @sock.cert
-            @sock.key_file        = @options['KeyFile']
-            @sock.key             = @options['Key'] unless @sock.key
-            @sock.ca_cert         = @options['CACert']
-            @sock.ca_file         = @options['CAFile']
-            @sock.ca_path         = @options['CAPath']
-            @sock.timeout         = @options['Timeout']
-            @sock.verify_mode     = @options['VerifyMode']
-            @sock.verify_callback = @options['VerifyCallback']
-            @sock.verify_depth    = @options['VerifyDepth']
-            @sock.connect
-            @ssl = true
-          end
-          ''
-        else
-          ''
-        end
-      end
-    end # preprocess
-    
-    alias waitfor_org waitfor
-
-    def waitfor(options)
-      time_out = @options["Timeout"]
-      waittime = @options["Waittime"]
-
-      if options.kind_of?(Hash)
-        prompt   = if options.has_key?("Match")
-                     options["Match"]
-                   elsif options.has_key?("Prompt")
-                     options["Prompt"]
-                   elsif options.has_key?("String")
-                     Regexp.new( Regexp.quote(options["String"]) )
-                   end
-        time_out = options["Timeout"]  if options.has_key?("Timeout")
-        waittime = options["Waittime"] if options.has_key?("Waittime")
-      else
-        prompt = options
-      end
-
-      if time_out == false
-        time_out = nil
-      end
-
-      line = ''
-      buf = ''
-      @rest = '' unless @rest
-
-      until(prompt === line and not IO::select([@sock], nil, nil, waittime))
-        unless IO::select([@sock], nil, nil, time_out)
-          raise TimeoutError, "timed-out; wait for the next data"
-        end
-        begin
-          c = @rest + @sock.sysread(1024 * 1024)
-          @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
-          if @options["Telnetmode"]   
-            pos = 0
-            catch(:next){
-              while true
-                case c[pos]
-                when IAC[0]
-                  case c[pos+1]
-                  when DO[0], DONT[0], WILL[0], WONT[0]
-                    throw :next unless c[pos+2]
-                    pos += 3
-                  when SB[0]
-                    ret = detect_sub_negotiation(c, pos)
-                    throw :next unless ret
-                    pos = ret
-                  when nil
-                    throw :next
-                  else
-                    pos += 2
-                  end
-                when nil
-                  throw :next
-                else
-                  pos += 1
-                end
-              end
-            }
-
-            buf = preprocess(c[0...pos])
-            @rest = c[pos..-1]
-          end
-          @log.print(buf) if @options.has_key?("Output_log")
-          line.concat(buf)
-          yield buf if block_given?   
-        rescue EOFError # End of file reached
-          if line == ''
-            line = nil
-            yield nil if block_given? 
-          end
-          break
-        end
-      end
-      line
-    end
-
-    private
-
-    def detect_sub_negotiation(data, pos)
-      return nil if data.length < pos+6  # IAC SB x param IAC SE
-      pos += 3
-      while true
-        case data[pos]
-        when IAC[0]
-          if data[pos+1] == SE[0]
-            pos += 2
-            return pos
-          else
-            pos += 2
-          end
-        when nil
-          return nil
-        else
-          pos += 1
-        end
-      end
-    end
-
-  end
-end
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
deleted file mode 100644
index 24a9eed136..0000000000
--- a/ext/openssl/lib/openssl.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-=begin
-= $RCSfile$ -- Loader for all OpenSSL C-space and Ruby-space definitions
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-require 'openssl.so'
-
-require 'openssl/bn'
-require 'openssl/cipher'
-require 'openssl/digest'
-require 'openssl/ssl'
-require 'openssl/x509'
-
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
deleted file mode 100644
index e7cbf2cfaf..0000000000
--- a/ext/openssl/lib/openssl/bn.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for BN
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
-module OpenSSL
-  class BN
-    include Comparable
-  end # BN
-end # OpenSSL
-
-##
-# Add double dispatch to Integer
-#
-class Integer
-  def to_bn
-    OpenSSL::BN::new(self)
-  end
-end # Integer
-
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
deleted file mode 100644
index fdbd71bc0c..0000000000
--- a/ext/openssl/lib/openssl/buffering.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-=begin
-= $RCSfile$ -- Buffering mix-in module.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-module Buffering
-  include Enumerable
-  attr_accessor :sync
-  BLOCK_SIZE = 1024*16
-
-  def initialize(*args)
-    @sync = @io.sync
-  end
-
-  #
-  # for reading.
-  #
-  private
-
-  def fill_rbuff
-    @rbuffer = "" unless defined? @rbuffer
-    begin
-      if self.respond_to?(:to_io)
-        IO.select([self.to_io], nil, nil)
-      end
-      @rbuffer << self.sysread(BLOCK_SIZE)
-    rescue EOFError
-      @eof = true
-    end
-  end
-
-  def consume_rbuff(size=nil)
-    if @rbuffer.size == 0
-      @eof = nil
-      nil
-    else
-      size = @rbuffer.size unless size
-      ret = @rbuffer[0, size]
-      @rbuffer[0, size] = ""
-      ret
-    end
-  end
-
-  public
-
-  def read(size=nil)
-    fill_rbuff unless defined? @rbuffer
-    @eof ||= nil
-    until @eof
-      break if size && size <= @rbuffer.size
-      fill_rbuff
-    end
-    consume_rbuff(size)
-  end
-
-  def gets(eol=$/)
-    fill_rbuff unless defined? @rbuffer
-    idx = @rbuffer.index(eol)
-    @eof ||= nil
-    until @eof
-      break if idx
-      fill_rbuff
-      idx = @rbuffer.index(eol)
-    end
-    if eol.is_a?(Regexp)
-      size = idx ? idx+$&.size : nil
-    else
-      size = idx ? idx+eol.size : nil
-    end
-    consume_rbuff(size)
-  end
-
-  def each(eol=$/)
-    while line = self.gets(eol?)
-      yield line
-    end
-  end
-  alias each_line each
-
-  def readlines(eol=$/)
-    ary = []
-    while line = self.gets(eol)
-      ary << line
-    end
-    ary
-  end
-
-  def readline(eol=$/)
-    raise EOFErorr if eof?
-    gets(eol)
-  end
-
-  def getc
-    c = read(1)
-    c ? c.to_i : nil
-  end
-
-  def each_byte
-    while c = getc
-      yield(c)
-    end
-  end
-
-  def readchar
-    raise EOFErorr if eof?
-    getc
-  end
-
-  def ungetc(c)
-    @rbuffer[0,0] = c.chr
-  end
-
-  def eof?
-    @eof ||= nil
-    @eof && @rbuffer.size == 0
-  end
-  alias eof eof?
-
-  #
-  # for writing.
-  #
-  private
-
-  def do_write(s)
-    @wbuffer = "" unless defined? @wbuffer
-    @wbuffer << s
-    @sync ||= false
-    if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
-      remain = idx ? idx + $/.size : @wbuffer.length
-      nwritten = 0
-      while remain > 0
-        nwrote = syswrite(@wbuffer[nwritten,remain])
-        remain -= nwrote
-        nwritten += nwrote
-      end
-      @wbuffer = ""
-    end
-  end
-
-  public
-
-  def write(s)
-    do_write(s)
-    s.length
-  end
-
-  def << (s)
-    do_write(s)
-    self
-  end
-
-  def puts(*args)
-    s = ""
-    args.each{|arg|
-      s << arg.to_s
-      unless /#{$/}\Z/o =~ s
-        s << $/
-      end
-    }
-    do_write(s)
-    nil
-  end
-
-  def print(*args)
-    s = ""
-    args.each{ |arg| s << arg.to_s }
-    do_write(s)
-    nil
-  end
-
-  def printf(s, *args)
-    do_write(s % args)
-    nil
-  end
-
-  def flush
-    osync = @sync
-    @sync = true
-    do_write ""
-    @sync = osync
-  end
-
-  def close
-    flush rescue nil
-    sysclose
-  end
-end
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
deleted file mode 100644
index 11153104ee..0000000000
--- a/ext/openssl/lib/openssl/cipher.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space predefined Cipher subclasses
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
-module OpenSSL
-  module Cipher
-    %w(AES Cast5 BF DES Idea RC2 RC4 RC5).each{|cipher|
-      eval(<<-EOD)
-        class #{cipher} < Cipher
-          def initialize(*args)
-            args = args.join('-')
-            if args.size == 0
-              super(\"#{cipher}\")
-            else
-              super(\"#{cipher}-#\{args\}\")
-            end
-          end
-        end
-      EOD
-    }
-
-    class Cipher
-      def random_key
-        str = OpenSSL::Random.random_bytes(self.key_len)
-        self.key = str
-        return str
-      end
-
-      def random_iv
-        str = OpenSSL::Random.random_bytes(self.iv_len)
-        self.iv = str
-        return str
-      end
-    end
-  end # Cipher
-end # OpenSSL
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
deleted file mode 100644
index 58622f543e..0000000000
--- a/ext/openssl/lib/openssl/digest.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space predefined Digest subclasses
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
-module OpenSSL
-  module Digest
-
-    %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1).each{|digest|
-      eval(<<-EOD)
-        class #{digest} < Digest
-          def initialize(data=nil)
-            super(\"#{digest}\", data)
-          end
-
-          def #{digest}::digest(data)
-            Digest::digest(\"#{digest}\", data)
-          end
-
-          def #{digest}::hexdigest(data)
-            Digest::hexdigest(\"#{digest}\", data)
-          end
-        end
-      EOD
-    }
-
-  end # Digest
-end # OpenSSL
-
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
deleted file mode 100644
index 811a935509..0000000000
--- a/ext/openssl/lib/openssl/ssl.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for SSL
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-require 'openssl/buffering'
-
-module OpenSSL
-  module SSL
-    module SocketForwarder
-      def addr
-        to_io.addr
-      end
-
-      def peeraddr
-        to_io.peeraddr
-      end
-
-      def getsockopt(level, optname, optval)
-        to_io.setsockopt(level, optname, optval)
-      end
-
-      def setsockopt(level, optname)
-        to_io.setsockopt(level, optname)
-      end
-
-      def fcntl(*args)
-        to_io.fcntl(*args)
-      end
-
-      def closed?
-        to_io.closed?
-      end
-    end
-
-    class SSLSocket
-      include Buffering
-      include SocketForwarder
-    end
-
-    class SSLServer
-      include SocketForwarder
-      attr_accessor :start_immediately
-
-      def initialize(svr, ctx)
-        @svr = svr
-        @ctx = ctx
-        @start_immediately = true
-      end
-
-      def to_io
-        @svr
-      end
-
-      def listen(basklog=5)
-        @svr.listen(backlog)
-      end
-
-      def accept
-        sock = @svr.accept
-        begin
-          ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
-          ssl.sync_close = true
-          ssl.accept if @start_immediately
-          ssl
-        rescue SSLError => ex
-          sock.close
-          raise ex
-        end
-      end
-
-      def close
-        @svr.close
-      end
-    end
-  end
-end
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
deleted file mode 100644
index 40b1a6dd15..0000000000
--- a/ext/openssl/lib/openssl/x509.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for X509 and subclasses
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
-module OpenSSL
-  module X509
-    class ExtensionFactory
-      def create_extension(*arg)
-        if arg.size > 1
-          create_ext(*arg)
-        else
-          send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
-        end
-      end
-
-      def create_ext_from_array(ary)
-        raise ExtensionError, "unexpected array form" if ary.size > 3 
-        create_ext(ary[0], ary[1], ary[2])
-      end
-
-      def create_ext_from_string(str) # "oid = critical, value"
-        oid, value = str.split(/=/, 2)
-        oid.strip!
-        value.strip!
-        create_ext(oid, value)
-      end
-      
-      def create_ext_from_hash(hash)
-        create_ext(hash["oid"], hash["value"], hash["critical"])
-      end
-    end # ExtensionFactory
-    
-    class Extension
-      def to_s # "oid = critical, value"
-        str = self.oid
-        str << " = "
-        str << "critical, " if self.critical?
-        str << self.value.gsub(/\n/, ", ")
-      end
-        
-      def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
-        {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
-      end
-
-      def to_a
-        [ self.oid, self.value, self.critical? ]
-      end
-    end # Extension
-    
-    class Name
-      def self.parse(str, type=ASN1::UTF8STRING)
-        ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=") }
-        self.new(ary, type)
-      end
-    end # Name
-
-  end # X509
-end # OpenSSL
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
deleted file mode 100644
index 0c0be5fc1f..0000000000
--- a/ext/openssl/openssl_missing.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-
-#if !defined(OPENSSL_NO_HMAC)
-#include <string.h> /* memcpy() */
-#include <openssl/hmac.h>
-
-#if !defined(HAVE_HMAC_CTX_COPY)
-int
-HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
-{
-    if (!out || !in) return 0;
-    memcpy(out, in, sizeof(HMAC_CTX));
-
-    if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx)
-	    || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx)
-	    || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx))
-	return 0;
-    return 1;
-}
-#endif /* HAVE_HMAC_CTX_COPY */
-#endif /* NO_HMAC */
-
-#if !defined(HAVE_X509_STORE_SET_EX_DATA)
-#include <openssl/x509_vfy.h>
-
-int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data)
-{
-    return CRYPTO_set_ex_data(&str->ex_data, idx, data);
-}
- 
-void *X509_STORE_get_ex_data(X509_STORE *str, int idx)
-{
-    return CRYPTO_get_ex_data(&str->ex_data, idx);
-}
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_CREATE)
-EVP_MD_CTX *
-EVP_MD_CTX_create(void)
-{
-    EVP_MD_CTX *ctx = OPENSSL_malloc(sizeof(EVP_MD_CTX));
-    if (!ctx) return NULL;
-
-    memset(ctx, 0, sizeof(EVP_MD_CTX));
-
-    return ctx;
-}
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
-int
-EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
-{
-    /* FIXME!!! */
-    memset(ctx, 0, sizeof(EVP_MD_CTX));
-
-    return 1;
-}
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_DESTROY)
-void
-EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
-{
-    EVP_MD_CTX_cleanup(ctx);
-    OPENSSL_free(ctx);
-}
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_INIT)
-void
-EVP_MD_CTX_init(EVP_MD_CTX *ctx)
-{
-    memset(ctx, 0, sizeof(EVP_MD_CTX));
-}
-#endif
-
-#if !defined(HAVE_HMAC_CTX_INIT)
-void
-HMAC_CTX_init(HMAC_CTX *ctx)
-{
-    EVP_MD_CTX_init(&ctx->i_ctx);
-    EVP_MD_CTX_init(&ctx->o_ctx);
-    EVP_MD_CTX_init(&ctx->md_ctx);
-}
-#endif
-
-#if !defined(HAVE_HMAC_CTX_CLEANUP)
-void
-HMAC_CTX_cleanup(HMAC_CTX *ctx)
-{
-    EVP_MD_CTX_cleanup(&ctx->i_ctx);
-    EVP_MD_CTX_cleanup(&ctx->o_ctx);
-    EVP_MD_CTX_cleanup(&ctx->md_ctx);
-    memset(ctx, 0, sizeof(HMAC_CTX));
-}
-#endif
-
-#if !defined(HAVE_X509_CRL_SET_VERSION)
-int
-X509_CRL_set_version(X509_CRL *x, long version)
-{
-    if (x == NULL || x->crl == NULL) return 0;
-    if (x->crl->version == NULL) {
-	x->crl->version = M_ASN1_INTEGER_new();
-	if (x->crl->version == NULL) return 0;
-    }
-    return ASN1_INTEGER_set(x->crl->version, version);
-}
-#endif
-
-#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
-int
-X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name)
-{
-    if (x == NULL || x->crl == NULL) return 0;
-    return X509_NAME_set(&x->crl->issuer, name);
-}
-#endif
-
-#if !defined(HAVE_X509_CRL_SORT)
-int
-X509_CRL_sort(X509_CRL *c)
-{
-    int i;
-    X509_REVOKED *r;
-    /* sort the data so it will be written in serial
-     * number order */
-    sk_X509_REVOKED_sort(c->crl->revoked);
-    for (i=0; i<sk_X509_REVOKED_num(c->crl->revoked); i++) {
-	r=sk_X509_REVOKED_value(c->crl->revoked, i);
-	r->sequence=i;
-    }
-    return 1;
-}
-#endif
-
-#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
-static int
-OSSL_X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b)
-{
-    return(ASN1_STRING_cmp(
-		(ASN1_STRING *)(*a)->serialNumber,
-		(ASN1_STRING *)(*b)->serialNumber));
-}
-		    
-int
-X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)
-{
-    X509_CRL_INFO *inf;
-    
-    inf = crl->crl;
-    if (!inf->revoked)
-	inf->revoked = sk_X509_REVOKED_new(OSSL_X509_REVOKED_cmp);
-    if (!inf->revoked || !sk_X509_REVOKED_push(inf->revoked, rev))
-	return 0;
-    return 1;
-}
-#endif
-
-#if !defined(HAVE_BN_MOD_SQR)
-int
-BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx)
-{
-    if (!BN_sqr(r, (BIGNUM*)a, ctx)) return 0;
-    return BN_mod(r, r, m, ctx);
-}
-#endif
-
-#if !defined(HAVE_BN_MOD_ADD) || !defined(HAVE_BN_MOD_SUB)
-int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx)
-{
-    if (!BN_mod(r,m,d,ctx)) return 0;
-    if (!r->neg) return 1;
-    return (d->neg ? BN_sub : BN_add)(r, r, d);
-}
-#endif
-
-#if !defined(HAVE_BN_MOD_ADD)
-int
-BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx)
-{
-    if (!BN_add(r, a, b)) return 0;
-    return BN_nnmod(r, r, m, ctx);
-}
-#endif
-
-#if !defined(HAVE_BN_MOD_SUB)
-int
-BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx)
-{
-    if (!BN_sub(r, a, b)) return 0;
-    return BN_nnmod(r, r, m, ctx);
-}
-#endif
-
-#if !defined(HAVE_BN_RAND_RANGE) || !defined(HAVE_BN_PSEUDO_RAND_RANGE)
-static int
-bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
-{
-    int (*bn_rand)(BIGNUM *, int, int, int) = pseudo ? BN_pseudo_rand : BN_rand;
-    int n;
-
-    if (range->neg || BN_is_zero(range)) return 0;
-
-    n = BN_num_bits(range);
-
-    if (n == 1) {
-	if (!BN_zero(r)) return 0;
-    } else if (!BN_is_bit_set(range, n - 2) && !BN_is_bit_set(range, n - 3)) {
-	do {
-	    if (!bn_rand(r, n + 1, -1, 0)) return 0;
-	    if (BN_cmp(r ,range) >= 0) {
-		if (!BN_sub(r, r, range)) return 0;
-		if (BN_cmp(r, range) >= 0)
-		    if (!BN_sub(r, r, range)) return 0;
-	    }
-	} while (BN_cmp(r, range) >= 0);
-    } else {
-	do {
-	    if (!bn_rand(r, n, -1, 0)) return 0;
-	} while (BN_cmp(r, range) >= 0);
-    }
-
-    return 1;
-}
-#endif
-
-#if !defined(HAVE_BN_RAND_RANGE)
-int
-BN_rand_range(BIGNUM *r, BIGNUM *range)
-{
-    return bn_rand_range(0, r, range);
-}
-#endif
-
-#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
-int
-BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range)
-{
-    return bn_rand_range(1, r, range);
-}
-#endif
-
-#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
-#define OPENSSL_CONF "openssl.cnf"
-char *
-CONF_get1_default_config_file(void)
-{
-    char *file;
-    int len;
-
-    file = getenv("OPENSSL_CONF");
-    if (file) return BUF_strdup(file);
-    len = strlen(X509_get_default_cert_area());
-#ifndef OPENSSL_SYS_VMS
-    len++;
-#endif
-    len += strlen(OPENSSL_CONF);
-    file = OPENSSL_malloc(len + 1);
-    if (!file) return NULL;
-    strcpy(file,X509_get_default_cert_area());
-#ifndef OPENSSL_SYS_VMS
-    strcat(file,"/");
-#endif
-    strcat(file,OPENSSL_CONF);
-
-    return file;
-}
-#endif
-
-#if !defined(HAVE_PEM_DEF_CALLBACK)
-#define OSSL_PASS_MIN_LENGTH 4
-int
-PEM_def_callback(char *buf, int num, int w, void *key)
-{
-    int i,j;
-    const char *prompt;
-    
-    if (key) {
-	i = strlen(key);
-	i = (i > num) ? num : i;
-	memcpy(buf, key, i);
-	return i;
-    }
-
-    prompt = EVP_get_pw_prompt();
-    if (prompt == NULL) prompt = "Enter PEM pass phrase:";
-    for (;;) {
-	i = EVP_read_pw_string(buf, num, prompt, w);
-	if (i != 0) {
-	    memset(buf, 0, (unsigned int)num);
-	    return(-1);
-	}
-	j = strlen(buf);
-	if (j < OSSL_PASS_MIN_LENGTH) {
-	    fprintf(stderr,
-		    "phrase is too short, needs to be at least %d chars\n",
-		    OSSL_PASS_MIN_LENGTH);
-	}
-	else break;
-    }
-    return j;
-}
-#endif
-
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
deleted file mode 100644
index 7a755f79b5..0000000000
--- a/ext/openssl/openssl_missing.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_OPENSSL_MISSING_H_)
-#define _OSSL_OPENSSL_MISSING_H_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * These functions are not included in headers of OPENSSL <= 0.9.6b
- */
-
-#if !defined(PEM_read_bio_DSAPublicKey)
-# define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u)
-#endif
-
-#if !defined(PEM_write_bio_DSAPublicKey)
-# define PEM_write_bio_DSAPublicKey(bp,x) \
-	PEM_ASN1_write_bio((int (*)())i2d_DSAPublicKey,\
-		PEM_STRING_DSA_PUBLIC,\
-		bp,(char *)x, NULL, NULL, 0, NULL, NULL)
-#endif
-
-#if !defined(DSAPrivateKey_dup)
-# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPrivateKey, \
-	(char *(*)())d2i_DSAPrivateKey,(char *)dsa)
-#endif
-
-#if !defined(DSAPublicKey_dup)
-# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPublicKey, \
-	(char *(*)())d2i_DSAPublicKey,(char *)dsa)
-#endif
-
-#if !defined(X509_REVOKED_dup)
-# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
-	(char *(*)())d2i_X509_REVOKED, (char *)rev)
-#endif
-
-#if !defined(PKCS7_SIGNER_INFO_dup)
-#  define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((int (*)())i2d_PKCS7_SIGNER_INFO, \
-	(char *(*)())d2i_PKCS7_SIGNER_INFO, (char *)si)
-#endif
-
-#if !defined(PKCS7_RECIP_INFO_dup)
-#  define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((int (*)())i2d_PKCS7_RECIP_INFO, \
-	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
-#endif
-
-int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
-int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-EVP_MD_CTX *EVP_MD_CTX_create(void);
-int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-
-#if !defined(EVP_CIPHER_name)
-#  define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e))
-#endif
-
-#if !defined(EVP_MD_name)
-#  define EVP_MD_name(e) OBJ_nid2sn(EVP_MD_type(e))
-#endif
-
-void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-void HMAC_CTX_init(HMAC_CTX *ctx);
-void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-
-#if !defined(PKCS7_is_detached)
-#  define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
-#endif
-
-#if !defined(PKCS7_type_is_encrypted)
-#  define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
-#endif
-
-int X509_CRL_set_version(X509_CRL *x, long version);
-int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-int X509_CRL_sort(X509_CRL *c);
-int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-int BN_rand_range(BIGNUM *r, BIGNUM *range);
-int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
-char *CONF_get1_default_config_file(void);
-int PEM_def_callback(char *buf, int num, int w, void *key);
-
-#if defined(__cplusplus)
-}
-#endif
-
-
-#endif /* _OSSL_OPENSSL_MISSING_H_ */
-
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
deleted file mode 100644
index 581da783eb..0000000000
--- a/ext/openssl/ossl.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-#include <stdarg.h> /* for ossl_raise */
-
-/*
- * String to HEXString conversion
- */
-int
-string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
-{
-    static const char hex[]="0123456789abcdef";
-    int i, len = 2 * buf_len;
-
-    if (buf_len < 0 || len < buf_len) { /* PARANOIA? */
-	return -1;
-    }
-    if (!hexbuf) { /* if no buf, return calculated len */
-	if (hexbuf_len) {
-	    *hexbuf_len = len;
-	}
-	return len;
-    }
-    if (!(*hexbuf = OPENSSL_malloc(len + 1))) {
-	return -1;
-    }
-    for (i = 0; i < buf_len; i++) {
-	(*hexbuf)[2 * i] = hex[((unsigned char)buf[i]) >> 4];
-	(*hexbuf)[2 * i + 1] = hex[buf[i] & 0x0f];
-    }
-    (*hexbuf)[2 * i] = '\0';
-
-    if (hexbuf_len) {
-	*hexbuf_len = len;
-    }
-    return len;
-}
-
-/*
- * Data Conversion
- */
-STACK_OF(X509) *
-ossl_x509_ary2sk0(VALUE ary)  
-{
-    STACK_OF(X509) *sk;
-    VALUE val;
-    X509 *x509;
-    int i;
-
-    Check_Type(ary, T_ARRAY);
-    sk = sk_X509_new_null();
-    if (!sk) ossl_raise(eOSSLError, NULL); 
-
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-        val = rb_ary_entry(ary, i);
-        if (!rb_obj_is_kind_of(val, cX509Cert)) {
-            sk_X509_pop_free(sk, X509_free);
-            ossl_raise(eOSSLError, "object except X509 cert is in array"); 
-        }
-        x509 = DupX509CertPtr(val); /* NEED TO DUP */
-        sk_X509_push(sk, x509);
-    }
-    return sk;
-}
-
-STACK_OF(X509) *
-ossl_protect_x509_ary2sk(VALUE ary, int *status)
-{
-    return (STACK_OF(X509)*)rb_protect((VALUE(*)_((VALUE)))ossl_x509_ary2sk0,
-				       ary, status);
-}
-
-STACK_OF(X509) *
-ossl_x509_ary2sk(VALUE ary)
-{
-    STACK_OF(X509) *sk;
-    int status = 0;
-
-    sk = ossl_protect_x509_ary2sk(ary, &status);
-    if(status) rb_jump_tag(status);
-
-    return sk;
-}
-
-#if 0
-#define OSSL_SK2ARY(name, type)			\
-VALUE						\
-ossl_##name##_sk2ary(STACK *sk)			\
-{						\
-    type *t;					\
-    int i, num;					\
-    VALUE ary;					\
-						\
-    if (!sk) {					\
-	OSSL_Debug("empty sk!");		\
-	return rb_ary_new();			\
-    }						\
-    num = sk_num(sk);				\
-    if (num < 0) {				\
-	OSSL_Debug("items in sk < -1???");	\
-	return rb_ary_new();			\
-    }						\
-    ary = rb_ary_new2(num);			\
-						\
-    for (i=0; i<num; i++) {			\
-	t = (type *)sk_value(sk, i);		\
-	rb_ary_push(ary, ossl_##name##_new(t));	\
-    }						\
-    return ary;					\
-}
-OSSL_SK2ARY(x509, X509)
-OSSL_SK2ARY(x509crl, X509_CRL)
-#endif
-
-static VALUE
-ossl_str_new(int size)
-{
-    return rb_str_new(0, size);
-}
-
-VALUE
-ossl_buf2str(char *buf, int len)
-{
-    VALUE str;
-    int status = 0;
-
-    str = rb_protect((VALUE(*)_((VALUE)))ossl_str_new, len, &status);
-    if(!NIL_P(str)) memcpy(RSTRING(str)->ptr, buf, len);
-    OPENSSL_free(buf);
-    if(status) rb_jump_tag(status);
-
-    return str;
-}
-
-/*
- * our default PEM callback
- */
-static VALUE
-ossl_pem_passwd_cb0(VALUE flag)
-{	
-    VALUE pass;
-
-    pass = rb_yield(flag);
-    SafeStringValue(pass);
-
-    return pass;
-}
-
-int
-ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
-{
-    int len, status = 0;
-    VALUE rflag, pass;
-    
-    if (pwd || !rb_block_given_p())
-	return PEM_def_callback(buf, max_len, flag, pwd);
-
-    while (1) {
-	/*
-	 * when the flag is nonzero, this passphrase
-	 * will be used to perform encryption; otherwise it will
-	 * be used to perform decryption.
-	 */
-	rflag = flag ? Qtrue : Qfalse;
-	pass  = rb_protect(ossl_pem_passwd_cb0, rflag, &status);
-	if (status) return -1; /* exception was raised. */
-	len = RSTRING(pass)->len;
-	if (len < 4) { /* 4 is OpenSSL hardcoded limit */
-	    rb_warning("password must be longer than 4 bytes");
-	    continue;
-	}
-	if (len > max_len) {
-	    rb_warning("password must be shorter then %d bytes", max_len-1);
-	    continue;
-	}
-	memcpy(buf, RSTRING(pass)->ptr, len);
-	break;
-    }
-    return len;
-}
-
-/*
- * Verify callback
- */
-int ossl_verify_cb_idx;
-
-VALUE
-ossl_call_verify_cb_proc(struct ossl_verify_cb_args *args)
-{   
-    return rb_funcall(args->proc, rb_intern("call"), 2,
-                      args->preverify_ok, args->store_ctx);
-}
- 
-int 
-ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
-{
-    VALUE proc, rctx, ret;
-    struct ossl_verify_cb_args args;
-    int state = 0;
-
-    proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, ossl_verify_cb_idx);
-    if ((void*)proc == 0)
-	proc = (VALUE)X509_STORE_get_ex_data(ctx->ctx, ossl_verify_cb_idx);
-    if ((void*)proc == 0)
-	return ok;
-    if (!NIL_P(proc)) {
-	rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new,
-			  (VALUE)ctx, &state);
-	ret = Qfalse;
-	if (!state) {
-	    args.proc = proc;
-	    args.preverify_ok = ok ? Qtrue : Qfalse;
-	    args.store_ctx = rctx;
-	    ret = rb_ensure(ossl_call_verify_cb_proc, (VALUE)&args,
-			    ossl_x509stctx_clear_ptr, rctx);
-	}
-	if (ret == Qtrue) {
-	    X509_STORE_CTX_set_error(ctx, X509_V_OK);
-	    ok = 1;
-	}
-	else{
-	    if (X509_STORE_CTX_get_error(ctx) == X509_V_OK) {
-		X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
-	    }
-	    ok = 0;
-	}
-    }
-
-    return ok;
-}
-
-/*
- * main module
- */
-VALUE mOSSL;
-
-/*
- * OpenSSLError < StandardError
- */
-VALUE eOSSLError;
-
-/*
- * Convert to DER string
- */
-ID ossl_s_to_der;
-
-VALUE
-ossl_to_der(VALUE obj)
-{
-    VALUE tmp;
-
-    tmp = rb_funcall(obj, ossl_s_to_der, 0);
-    StringValue(tmp);
-
-    return tmp;
-}
-
-VALUE
-ossl_to_der_if_possible(VALUE obj)
-{
-    if(rb_respond_to(obj, ossl_s_to_der))
-	return ossl_to_der(obj);
-    return obj;
-}
-
-/*
- * Errors
- */
-void
-ossl_raise(VALUE exc, const char *fmt, ...)
-{
-    va_list args;
-    char buf[BUFSIZ];
-    const char *msg;
-    long e = ERR_get_error();
-    int len = 0;
-
-    if (fmt) {
-	va_start(args, fmt);
-	len = vsnprintf(buf, BUFSIZ, fmt, args);
-	va_end(args);
-	len += snprintf(buf+len, BUFSIZ-len, ": ");
-    }
-    if (e) {
-	if (dOSSL == Qtrue) /* FULL INFO */
-	    msg = ERR_error_string(e, NULL);
-	else
-	    msg = ERR_reason_error_string(e);
-	ERR_clear_error();
-	len += snprintf(buf+len, BUFSIZ-len, "%s", msg);
-    }
-
-    rb_exc_raise(rb_exc_new(exc, buf, len));
-}
-
-/*
- * Debug
- */
-VALUE dOSSL;
-
-#if !defined(HAVE_VA_ARGS_MACRO)
-void
-ossl_debug(const char *fmt, ...)
-{
-    va_list args;
-	
-    if (dOSSL == Qtrue) {
-	fprintf(stderr, "OSSL_DEBUG: ");
-	va_start(args, fmt);
-	vfprintf(stderr, fmt, args);
-	va_end(args);
-	fprintf(stderr, " [CONTEXT N/A]\n");
-    }
-}
-#endif
-
-static VALUE
-ossl_debug_get(VALUE self)
-{
-    return dOSSL;
-}
-
-static VALUE
-ossl_debug_set(VALUE self, VALUE val)
-{
-    VALUE old = dOSSL;
-    dOSSL = val;
-	
-    if (old != dOSSL) {
-	if (dOSSL == Qtrue) {
-	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-	    fprintf(stderr, "OSSL_DEBUG: IS NOW ON!\n");
-	} else if (old == Qtrue) {
-	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF);
-	    fprintf(stderr, "OSSL_DEBUG: IS NOW OFF!\n");
-	}
-    }
-    return val;
-}
-
-/*
- * OSSL library init
- */
-void
-Init_openssl()
-{
-    /*
-     * Init timezone info
-     */
-#if 0
-    tzset();
-#endif
-
-    /*
-     * Init all digests, ciphers
-     */
-    /* CRYPTO_malloc_init(); */
-    /* ENGINE_load_builtin_engines(); */
-    OpenSSL_add_all_algorithms();
-    ERR_load_crypto_strings();
-    SSL_load_error_strings();
-
-    /*
-     * FIXME:
-     * On unload do:
-     */
-#if 0
-    CONF_modules_unload(1);
-    destroy_ui_method();
-    EVP_cleanup();
-    ENGINE_cleanup();
-    CRYPTO_cleanup_all_ex_data();
-    ERR_remove_state(0);
-    ERR_free_strings();
-#endif
-
-    /*
-     * Init main module
-     */
-    mOSSL = rb_define_module("OpenSSL");
-
-    /*
-     * Constants
-     */
-    rb_define_const(mOSSL, "VERSION", rb_str_new2(OSSL_VERSION));
-    rb_define_const(mOSSL, "OPENSSL_VERSION", rb_str_new2(OPENSSL_VERSION_TEXT));
-    rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER", INT2NUM(OPENSSL_VERSION_NUMBER));
-
-    /*
-     * Generic error,
-     * common for all classes under OpenSSL module
-     */
-    eOSSLError = rb_define_class_under(mOSSL,"OpenSSLError",rb_eStandardError);
-
-    /*
-     * Verify callback Proc index for ext-data
-     */
-    ossl_verify_cb_idx =
-	X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0);
-
-    /*
-     * Init debug core
-     */
-    dOSSL = Qfalse;
-    rb_define_module_function(mOSSL, "debug", ossl_debug_get, 0);
-    rb_define_module_function(mOSSL, "debug=", ossl_debug_set, 1);
-
-    /*
-     * Get ID of to_der
-     */
-    ossl_s_to_der = rb_intern("to_der");
-
-    /*
-     * Init components
-     */
-    Init_ossl_bn();
-    Init_ossl_cipher();
-    Init_ossl_config();
-    Init_ossl_digest();
-    Init_ossl_hmac();
-    Init_ossl_ns_spki();
-    Init_ossl_pkcs7();
-    Init_ossl_pkey();
-    Init_ossl_rand();
-    Init_ossl_ssl();
-    Init_ossl_x509();
-    Init_ossl_ocsp();
-    Init_ossl_engine();
-    Init_ossl_asn1();
-}
-
-#if defined(OSSL_DEBUG)
-/*
- * Check if all symbols are OK with 'make LDSHARED=gcc all'
- */
-int
-main(int argc, char *argv[], char *env[])
-{
-    return 0;
-}
-#endif /* OSSL_DEBUG */
-
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
deleted file mode 100644
index bb9bd2a497..0000000000
--- a/ext/openssl/ossl.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_H_)
-#define _OSSL_H_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * Check the OpenSSL version
- * The only supported are:
- * 	OpenSSL >= 0.9.7
- */
-#include <openssl/opensslv.h>
-
-#ifdef HAVE_ASSERT_H
-#  include <assert.h>
-#else
-#  define assert(condition)
-#endif
-
-#if defined(_WIN32)
-#  define OpenFile WINAPI_OpenFile
-#  define OSSL_NO_CONF_API 1
-#endif
-#include <errno.h>
-#include <openssl/err.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509v3.h>
-#include <openssl/ssl.h>
-#include <openssl/hmac.h>
-#include <openssl/rand.h>
-#include <openssl/conf.h>
-#include <openssl/conf_api.h>
-#undef X509_NAME
-#undef PKCS7_SIGNER_INFO
-#if defined(HAVE_OPENSSL_ENGINE_H) && !defined(OPENSSL_NO_ENGINE)
-#  define OSSL_ENGINE_ENABLED
-#  include <openssl/engine.h>
-#endif
-#if defined(HAVE_OPENSSL_OCSP_H)
-#  define OSSL_OCSP_ENABLED
-#  include <openssl/ocsp.h>
-#endif
-#if defined(_WIN32)
-#  undef OpenFile
-#endif
-
-/*
- * OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
- */
-#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
-#  undef RFILE
-#endif
-#include <ruby.h>
-#include <rubyio.h>
-
-/*
- * Common Module
- */
-extern VALUE mOSSL;
-
-/*
- * Common Error Class
- */
-extern VALUE eOSSLError;
-
-/*
- * CheckTypes
- */
-#define OSSL_Check_Kind(obj, klass) do {\
-  if (!rb_obj_is_kind_of(obj, klass)) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected kind of %s)",\
-               rb_obj_classname(obj), rb_class2name(klass));\
-  }\
-} while (0)
-
-#define OSSL_Check_Instance(obj, klass) do {\
-  if (!rb_obj_is_instance_of(obj, klass)) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected instance of %s)",\
-               rb_obj_classname(obj), rb_class2name(klass));\
-  }\
-} while (0)
-
-#define OSSL_Check_Same_Class(obj1, obj2) do {\
-  if (!rb_obj_is_instance_of(obj1, rb_obj_class(obj2))) {\
-    ossl_raise(rb_eTypeError, "wrong argument type");\
-  }\
-} while (0)
-
-/*
- * String to HEXString conversion
- */
-int string2hex(char *, int, char **, int *);
-
-/*
- * Data Conversion
- */
-STACK_OF(X509) *ossl_x509_ary2sk0(VALUE);
-STACK_OF(X509) *ossl_x509_ary2sk(VALUE);
-STACK_OF(X509) *ossl_protect_x509_ary2sk(VALUE,int*);
-VALUE ossl_buf2str(char *buf, int len);
-#define ossl_str_adjust(str, p) \
-do{\
-    int len = RSTRING(str)->len;\
-    int newlen = (p) - (unsigned char*)RSTRING(str)->ptr;\
-    assert(newlen <= len);\
-    RSTRING(str)->len = newlen;\
-    RSTRING(str)->ptr[newlen] = 0;\
-}while(0)
-
-/*
- * our default PEM callback
- */
-int ossl_pem_passwd_cb(char *, int, int, void *);
-
-/*
- * ERRor messages
- */
-#define OSSL_ErrMsg() ERR_reason_error_string(ERR_get_error())
-NORETURN(void ossl_raise(VALUE, const char *, ...));
-
-/*
- * Verify callback
- */
-extern int ossl_verify_cb_idx;
-
-struct ossl_verify_cb_args {
-    VALUE proc;
-    VALUE preverify_ok;
-    VALUE store_ctx;
-};
-
-VALUE ossl_call_verify_cb_proc(struct ossl_verify_cb_args *);
-int ossl_verify_cb(int, X509_STORE_CTX *);
-
-/*
- * String to DER String
- */
-extern ID ossl_s_to_der;
-VALUE ossl_to_der(VALUE);
-VALUE ossl_to_der_if_possible(VALUE);
-
-/*
- * Debug
- */
-extern VALUE dOSSL;
-
-#if defined(HAVE_VA_ARGS_MACRO)
-#define OSSL_Debug(fmt, ...) do { \
-  if (dOSSL == Qtrue) { \
-    fprintf(stderr, "OSSL_DEBUG: "); \
-    fprintf(stderr, fmt, ##__VA_ARGS__); \
-    fprintf(stderr, " [in %s (%s:%d)]\n", __func__, __FILE__, __LINE__); \
-  } \
-} while (0)
-
-#define OSSL_Warning(fmt, ...) do { \
-  OSSL_Debug(fmt, ##__VA_ARGS__); \
-  rb_warning(fmt, ##__VA_ARGS__); \
-} while (0)
-
-#define OSSL_Warn(fmt, ...) do { \
-  OSSL_Debug(fmt, ##__VA_ARGS__); \
-  rb_warn(fmt, ##__VA_ARGS__); \
-} while (0)
-#else
-void ossl_debug(const char *, ...);
-#define OSSL_Debug ossl_debug
-#define OSSL_Warning rb_warning
-#define OSSL_Warn rb_warn
-#endif
-
-/*
- * Include all parts
- */
-#include "openssl_missing.h"
-#include "ruby_missing.h"
-#include "ossl_asn1.h"
-#include "ossl_bio.h"
-#include "ossl_bn.h"
-#include "ossl_cipher.h"
-#include "ossl_config.h"
-#include "ossl_digest.h"
-#include "ossl_hmac.h"
-#include "ossl_ns_spki.h"
-#include "ossl_ocsp.h"
-#include "ossl_pkcs7.h"
-#include "ossl_pkey.h"
-#include "ossl_rand.h"
-#include "ossl_ssl.h"
-#include "ossl_version.h"
-#include "ossl_x509.h"
-#include "ossl_engine.h"
-
-void Init_openssl(void);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* _OSSL_H_ */
-
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
deleted file mode 100644
index 02d2f2cafb..0000000000
--- a/ext/openssl/ossl_asn1.c
+++ /dev/null
@@ -1,1134 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' team members
- * Copyright (C) 2003
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#if defined(HAVE_SYS_TIME_H)
-#  include <sys/time.h>
-#elif !defined(NT) && !defined(_WIN32)
-struct timeval {
-    long tv_sec;	/* seconds */
-    long tv_usec;	/* and microseconds */
-};
-#endif
-
-/*
- * DATE conversion
- */
-VALUE
-asn1time_to_time(ASN1_TIME *time)
-{
-    struct tm tm;
-    VALUE argv[6];
-    
-    if (!time) {
-	ossl_raise(rb_eTypeError, "ASN1_TIME is NULL!");
-    }
-    memset(&tm, 0, sizeof(struct tm));
-	
-    switch (time->type) {
-    case V_ASN1_UTCTIME:
-	if (sscanf(time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
-    		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
-	    ossl_raise(rb_eTypeError, "bad UTCTIME format");
-	} 
-	if (tm.tm_year < 69) {
-	    tm.tm_year += 2000;
-	} else {
-	    tm.tm_year += 1900;
-	}
-	tm.tm_mon -= 1;
-	break;
-    case V_ASN1_GENERALIZEDTIME:
-	if (sscanf(time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
-    		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
-	    ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
-	} 
-	tm.tm_mon -= 1;
-	break;
-    default:
-	rb_warning("unknown time format");
-        return Qnil;
-    }
-    argv[0] = INT2NUM(tm.tm_year);
-    argv[1] = INT2NUM(tm.tm_mon+1);
-    argv[2] = INT2NUM(tm.tm_mday);
-    argv[3] = INT2NUM(tm.tm_hour);
-    argv[4] = INT2NUM(tm.tm_min);
-    argv[5] = INT2NUM(tm.tm_sec);
-
-    return rb_funcall2(rb_cTime, rb_intern("utc"), 6, argv);
-}
-
-/*
- * This function is not exported in Ruby's *.h
- */
-extern struct timeval rb_time_timeval(VALUE);
-
-time_t
-time_to_time_t(VALUE time)
-{
-    return (time_t)NUM2LONG(rb_Integer(time));
-}
-
-/*
- * ASN1_INTEGER conversions
- * TODO: Make a decision what's the right way to do this.
- */
-#define DO_IT_VIA_RUBY 0
-VALUE
-asn1integer_to_num(ASN1_INTEGER *ai)
-{
-    BIGNUM *bn;
-#if DO_IT_VIA_RUBY
-    char *txt;
-#endif
-    VALUE num;
-
-    if (!ai) {
-	ossl_raise(rb_eTypeError, "ASN1_INTEGER is NULL!");
-    }
-    if (!(bn = ASN1_INTEGER_to_BN(ai, NULL))) {
-	ossl_raise(eOSSLError, NULL);
-    }
-#if DO_IT_VIA_RUBY
-    if (!(txt = BN_bn2dec(bn))) {
-	BN_free(bn);
-	ossl_raise(eOSSLError, NULL);
-    }
-    num = rb_cstr_to_inum(txt, 10, Qtrue);
-    OPENSSL_free(txt);
-#else
-    num = ossl_bn_new(bn);
-#endif
-    BN_free(bn);
-
-    return num;
-}
-
-#if DO_IT_VIA_RUBY
-ASN1_INTEGER *
-num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
-{
-    BIGNUM *bn = NULL;
-
-    if (RTEST(rb_obj_is_kind_of(obj, cBN))) {
-	bn = GetBNPtr(obj);
-    } else {
-	obj = rb_String(obj);
-	if (!BN_dec2bn(&bn, StringValuePtr(obj))) {
-	    ossl_raise(eOSSLError, NULL);
-	}
-    }
-    if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
-	BN_free(bn);
-	ossl_raise(eOSSLError, NULL);
-    }
-    BN_free(bn);
-    return ai;
-}
-#else
-ASN1_INTEGER *
-num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
-{
-    BIGNUM *bn = GetBNPtr(obj);
-    
-    if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
-	ossl_raise(eOSSLError, NULL);
-    }
-    return ai;
-}
-#endif
-
-/********/
-/*
- * ASN1 module
- */
-#define ossl_asn1_get_value(o)       rb_attr_get((o),rb_intern("@value"))
-#define ossl_asn1_get_tag(o)         rb_attr_get((o),rb_intern("@tag"))
-#define ossl_asn1_get_tagging(o)     rb_attr_get((o),rb_intern("@tagging"))
-#define ossl_asn1_get_tag_class(o)   rb_attr_get((o),rb_intern("@tag_class"))
-
-#define ossl_asn1_set_value(o,v)     rb_iv_set((o),"@value",(v))
-#define ossl_asn1_set_tag(o,v)       rb_iv_set((o),"@tag",(v))
-#define ossl_asn1_set_tagging(o,v)   rb_iv_set((o),"@tagging",(v))
-#define ossl_asn1_set_tag_class(o,v) rb_iv_set((o),"@tag_class",(v))
-
-VALUE mASN1;
-VALUE eASN1Error;
-
-VALUE cASN1Data;
-VALUE cASN1Primitive;
-VALUE cASN1Constructive;
-
-VALUE cASN1Boolean;                           /* BOOLEAN           */
-VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
-VALUE cASN1BitString;                         /* BIT STRING        */
-VALUE cASN1OctetString, cASN1UTF8String;      /* STRINGs           */
-VALUE cASN1NumericString, cASN1PrintableString;
-VALUE cASN1T61String, cASN1VideotexString;
-VALUE cASN1IA5String, cASN1GraphicString;
-VALUE cASN1ISO64String, cASN1GeneralString;
-VALUE cASN1UniversalString, cASN1BMPString;
-VALUE cASN1Null;                              /* NULL              */
-VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
-VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
-VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
-
-static ID sIMPLICIT, sEXPLICIT;
-static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
-
-/*
- * Ruby to ASN1 converters
- */
-static ASN1_BOOLEAN
-obj_to_asn1bool(VALUE obj)
-{
-     return RTEST(obj) ? 255 : 0;
-}
-
-static ASN1_INTEGER*
-obj_to_asn1int(VALUE obj)
-{
-    return num_to_asn1integer(obj, NULL);
-}
-
-static ASN1_BIT_STRING*
-obj_to_asn1bstr(VALUE obj, long unused_bits)
-{
-    ASN1_BIT_STRING *bstr;
-
-    if(unused_bits < 0) unused_bits = 0;
-    StringValue(obj);
-    if(!(bstr = ASN1_BIT_STRING_new()))
-	ossl_raise(eASN1Error, NULL);
-    ASN1_BIT_STRING_set(bstr, RSTRING(obj)->ptr, RSTRING(obj)->len);
-    bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
-    bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
-
-    return bstr;
-}
-
-static ASN1_STRING*
-obj_to_asn1str(VALUE obj)
-{
-    ASN1_STRING *str;
-
-    StringValue(obj);
-    if(!(str = ASN1_STRING_new()))
-	ossl_raise(eASN1Error, NULL);
-    ASN1_STRING_set(str, RSTRING(obj)->ptr, RSTRING(obj)->len);
-
-    return str;
-}
-
-static ASN1_NULL*
-obj_to_asn1null(VALUE obj)
-{
-    ASN1_NULL *null;
-
-    if(!NIL_P(obj))
-	ossl_raise(eASN1Error, "nil expected");
-    if(!(null = ASN1_NULL_new()))
-	ossl_raise(eASN1Error, NULL);
-
-    return null;
-}
-
-static ASN1_OBJECT*
-obj_to_asn1obj(VALUE obj)
-{
-    ASN1_OBJECT *a1obj;
-
-    StringValue(obj);
-    a1obj = OBJ_txt2obj(RSTRING(obj)->ptr, 0);
-    if(!a1obj) a1obj = OBJ_txt2obj(RSTRING(obj)->ptr, 1);
-    if(!a1obj) ossl_raise(eASN1Error, "invalid OBJECT ID");
-
-    return a1obj;
-}
-
-static ASN1_UTCTIME*
-obj_to_asn1utime(VALUE time)
-{
-    time_t sec;
-    ASN1_UTCTIME *t;
-
-    sec = time_to_time_t(time);
-    if(!(t = ASN1_UTCTIME_set(NULL, sec)))
-        ossl_raise(eASN1Error, NULL);
-
-    return t;
-}
-
-static ASN1_GENERALIZEDTIME*
-obj_to_asn1gtime(VALUE time)
-{
-    time_t sec;
-    ASN1_GENERALIZEDTIME *t;
-
-    sec = time_to_time_t(time);
-    if(!(t =ASN1_GENERALIZEDTIME_set(NULL, sec)))
-        ossl_raise(eASN1Error, NULL);
-
-    return t;
-}
-
-static ASN1_STRING*
-obj_to_asn1derstr(VALUE obj)
-{
-    ASN1_STRING *a1str;
-    VALUE str;
-
-    str = ossl_to_der(obj);
-    if(!(a1str = ASN1_STRING_new()))
-	ossl_raise(eASN1Error, NULL);
-    ASN1_STRING_set(a1str, RSTRING(str)->ptr, RSTRING(str)->len);
-
-    return a1str;
-}
-
-/*
- * DER to Ruby converters
- */
-static VALUE
-decode_bool(unsigned char* der, int length)
-{
-    int bool;
-    unsigned char *p;
-
-    p = der;
-    if((bool = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
-	ossl_raise(eASN1Error, NULL);
-
-    return bool ? Qtrue : Qfalse;
-}
-
-static VALUE
-decode_int(unsigned char* der, int length)
-{
-    ASN1_INTEGER *ai;
-    unsigned char *p;
-    VALUE ret; 
-    int status = 0;
-
-    p = der;
-    if(!(ai = d2i_ASN1_INTEGER(NULL, &p, length)))
-	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE(*)_((VALUE)))asn1integer_to_num,
-		     (VALUE)ai, &status);
-    ASN1_INTEGER_free(ai);
-    if(status) rb_jump_tag(status);
-
-    return ret;
-}
-
-static VALUE
-decode_bstr(unsigned char* der, int length, long *unused_bits)
-{
-    ASN1_BIT_STRING *bstr;
-    unsigned char *p, *buf;
-    long len;
-    VALUE ret;
-
-    p = der;
-    if(!(bstr = d2i_ASN1_BIT_STRING(NULL, &p, length)))
-	ossl_raise(eASN1Error, NULL);
-    len = bstr->length;
-    if(!(buf = OPENSSL_malloc(len))){
-	ASN1_BIT_STRING_free(bstr);
-	ossl_raise(eASN1Error, NULL);
-    }
-    *unused_bits = 0;
-    if(bstr->flags & ASN1_STRING_FLAG_BITS_LEFT)
-	*unused_bits = bstr->flags & 0x07;
-    memcpy(buf, bstr->data, len);
-    ASN1_BIT_STRING_free(bstr);
-    ret = ossl_buf2str(buf, len);
-
-    return ret;
-}
-
-static VALUE
-decode_enum(unsigned char* der, int length)
-{
-    ASN1_ENUMERATED *ai;
-    unsigned char *p;
-    VALUE ret; 
-    int status = 0;
-
-    p = der;
-    if(!(ai = d2i_ASN1_ENUMERATED(NULL, &p, length)))
-	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE(*)_((VALUE)))asn1integer_to_num,
-		     (VALUE)ai, &status);
-    ASN1_ENUMERATED_free(ai);
-    if(status) rb_jump_tag(status);
-
-    return ret;
-}
-
-static VALUE
-decode_null(unsigned char* der, int length)
-{
-    ASN1_NULL *null;
-    unsigned char *p;
-
-    p = der;
-    if(!(null = d2i_ASN1_NULL(NULL, &p, length)))
-	ossl_raise(eASN1Error, NULL);
-    ASN1_NULL_free(null);
-
-    return Qnil;
-}
-
-static VALUE
-decode_obj(unsigned char* der, int length)
-{
-    ASN1_OBJECT *obj;
-    unsigned char *p;
-    VALUE ret;
-    int nid;
-    BIO *bio;
-
-    p = der;
-    if(!(obj = d2i_ASN1_OBJECT(NULL, &p, length)))
-	ossl_raise(eASN1Error, NULL);
-    if((nid = OBJ_obj2nid(obj)) != NID_undef){
-	ASN1_OBJECT_free(obj);
-	ret = rb_str_new2(OBJ_nid2sn(nid));
-    }
-    else{
-	if(!(bio = BIO_new(BIO_s_mem()))){
-	    ASN1_OBJECT_free(obj);
-	    ossl_raise(eASN1Error, NULL);
-	}
-	i2a_ASN1_OBJECT(bio, obj);
-	ASN1_OBJECT_free(obj);
-	ret = ossl_membio2str(bio);
-    }
-
-    return ret;
-}
-
-static VALUE
-decode_time(unsigned char* der, int length)
-{
-    ASN1_TIME *time;
-    unsigned char *p;
-    VALUE ret;
-    int status = 0;
-
-    p = der;
-    if(!(time = d2i_ASN1_TIME(NULL, &p, length)))
-	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE(*)_((VALUE)))asn1time_to_time,
-		     (VALUE)time, &status);
-    ASN1_TIME_free(time);
-    if(status) rb_jump_tag(status);
-
-    return ret;
-}
-
-/********/
-
-typedef struct {
-    char *name;
-    VALUE *klass;
-} ossl_asn1_info_t;
-
-static ossl_asn1_info_t ossl_asn1_info[] = {
-    { "EOC",               NULL,                  },  /*  0 */
-    { "BOOLEAN",           &cASN1Boolean,         },  /*  1 */
-    { "INTEGER",           &cASN1Integer,         },  /*  2 */
-    { "BIT_STRING",        &cASN1BitString,       },  /*  3 */
-    { "OCTET_STRING",      &cASN1OctetString,     },  /*  4 */
-    { "NULL",              &cASN1Null,            },  /*  5 */
-    { "OBJECT",            &cASN1ObjectId,        },  /*  6 */
-    { "OBJECT_DESCRIPTOR", NULL,                  },  /*  7 */
-    { "EXTERNAL",          NULL,                  },  /*  8 */
-    { "REAL",              NULL,                  },  /*  9 */
-    { "ENUMERATED",        &cASN1Enumerated,      },  /* 10 */
-    { "EMBEDDED_PDV",      NULL,                  },  /* 11 */
-    { "UTF8STRING",        &cASN1UTF8String,      },  /* 12 */
-    { "RELATIVE_OID",      NULL,                  },  /* 13 */
-    { "[UNIVERSAL 14]",    NULL,                  },  /* 14 */
-    { "[UNIVERSAL 15]",    NULL,                  },  /* 15 */
-    { "SEQUENCE",          &cASN1Sequence,        },  /* 16 */
-    { "SET",               &cASN1Set,             },  /* 17 */
-    { "NUMERICSTRING",     &cASN1NumericString,   },  /* 18 */
-    { "PRINTABLESTRING",   &cASN1PrintableString, },  /* 19 */
-    { "T61STRING",         &cASN1T61String,       },  /* 20 */
-    { "VIDEOTEXSTRING",    &cASN1VideotexString,  },  /* 21 */
-    { "IA5STRING",         &cASN1IA5String,       },  /* 22 */
-    { "UTCTIME",           &cASN1UTCTime,         },  /* 23 */
-    { "GENERALIZEDTIME",   &cASN1GeneralizedTime, },  /* 24 */
-    { "GRAPHICSTRING",     &cASN1GraphicString,   },  /* 25 */
-    { "ISO64STRING",       &cASN1ISO64String,     },  /* 26 */
-    { "GENERALSTRING",     &cASN1GeneralString,   },  /* 27 */
-    { "UNIVERSALSTRING",   &cASN1UniversalString, },  /* 28 */
-    { "CHARACTER_STRING",  NULL,                  },  /* 29 */
-    { "BMPSTRING",         &cASN1BMPString,       },  /* 30 */
-};
-
-int ossl_asn1_info_size = (sizeof(ossl_asn1_info)/sizeof(ossl_asn1_info[0]));
-
-static int ossl_asn1_default_tag(VALUE obj);
-
-ASN1_TYPE*
-ossl_asn1_get_asn1type(VALUE obj)
-{
-    ASN1_TYPE *ret;
-    VALUE value, rflag;
-    void *ptr;
-    void (*free_func)();
-    long tag, flag;
-
-    tag = ossl_asn1_default_tag(obj);
-    value = ossl_asn1_get_value(obj);
-    switch(tag){
-    case V_ASN1_BOOLEAN:
-	ptr = (void*)obj_to_asn1bool(value);
-	free_func = NULL;
-	break;
-    case V_ASN1_INTEGER:         /* FALLTHROUGH */
-    case V_ASN1_ENUMERATED:
-	ptr = obj_to_asn1int(value);
-	free_func = ASN1_INTEGER_free;
-	break;
-    case V_ASN1_BIT_STRING:
-        rflag = rb_attr_get(obj, rb_intern("@unused_bits"));
-        flag = NIL_P(rflag) ? -1 : NUM2INT(rflag);
-	ptr = obj_to_asn1bstr(value, flag);
-	free_func = ASN1_BIT_STRING_free;
-	break;
-    case V_ASN1_NULL:
-	ptr = obj_to_asn1null(value);
-	free_func = ASN1_NULL_free;
-	break;
-    case V_ASN1_OCTET_STRING:    /* FALLTHROUGH */
-    case V_ASN1_UTF8STRING:      /* FALLTHROUGH */
-    case V_ASN1_NUMERICSTRING:   /* FALLTHROUGH */
-    case V_ASN1_PRINTABLESTRING: /* FALLTHROUGH */
-    case V_ASN1_T61STRING:       /* FALLTHROUGH */
-    case V_ASN1_VIDEOTEXSTRING:  /* FALLTHROUGH */
-    case V_ASN1_IA5STRING:       /* FALLTHROUGH */
-    case V_ASN1_GRAPHICSTRING:   /* FALLTHROUGH */
-    case V_ASN1_ISO64STRING:     /* FALLTHROUGH */
-    case V_ASN1_GENERALSTRING:   /* FALLTHROUGH */
-    case V_ASN1_UNIVERSALSTRING: /* FALLTHROUGH */
-    case V_ASN1_BMPSTRING:   
-	ptr = obj_to_asn1str(value);
-	free_func = ASN1_STRING_free;
-	break;
-    case V_ASN1_OBJECT:
-	ptr = obj_to_asn1obj(value);
-	free_func = ASN1_OBJECT_free;
-	break;
-    case V_ASN1_UTCTIME:
-	ptr = obj_to_asn1utime(value);
-	free_func = ASN1_TIME_free;
-	break;
-    case V_ASN1_GENERALIZEDTIME:
-	ptr = obj_to_asn1gtime(value);
-	free_func = ASN1_TIME_free;
-	break;
-    case V_ASN1_SET:             /* FALLTHROUGH */
-    case V_ASN1_SEQUENCE:
-	ptr = obj_to_asn1derstr(obj);
-	free_func = ASN1_STRING_free;
-	break;
-    default:
-	ossl_raise(eASN1Error, "unsupported ASN.1 type");
-    }
-    if(!(ret = OPENSSL_malloc(sizeof(ASN1_TYPE)))){
-	if(free_func) free_func(ptr);
-	ossl_raise(eASN1Error, "ASN1_TYPE alloc failure");
-    }
-    memset(ret, 0, sizeof(ASN1_TYPE));
-    ASN1_TYPE_set(ret, tag, ptr);
-
-    return ret;
-}
-
-static int
-ossl_asn1_default_tag(VALUE obj)
-{
-    int i;
-
-    for(i = 0; i < ossl_asn1_info_size; i++){
-	if(ossl_asn1_info[i].klass &&
-	   rb_obj_is_kind_of(obj, *ossl_asn1_info[i].klass)){
-	    return i;
-	}
-    }
-    ossl_raise(eASN1Error, "not found universal tag for %s",
-	       rb_class2name(CLASS_OF(obj)));
-
-    return -1; /* dummy */
-}
-
-static int
-ossl_asn1_tag(VALUE obj)
-{
-    VALUE tag;
-
-    tag = ossl_asn1_get_tag(obj);
-    if(NIL_P(tag))
-	ossl_raise(eASN1Error, "tag number not specified");
-
-    return NUM2INT(tag);
-}
-
-static int
-ossl_asn1_is_explicit(VALUE obj)
-{
-    VALUE s;
-    int ret = -1;
-
-    s = ossl_asn1_get_tagging(obj);
-    if(NIL_P(s)) return 0;
-    else if(SYMBOL_P(s)){
-	if (SYM2ID(s) == sIMPLICIT)
-	    ret = 0;
-	else if (SYM2ID(s) == sEXPLICIT)
-	    ret = 1;
-    }
-    if(ret < 0){
-	ossl_raise(eASN1Error, "invalid tag default");
-    }
-
-    return ret;
-}
-
-static int
-ossl_asn1_tag_class(VALUE obj)
-{
-    VALUE s;
-    int ret = -1;
-
-    s = ossl_asn1_get_tag_class(obj);
-    if(NIL_P(s)) ret = V_ASN1_UNIVERSAL;
-    else if(SYMBOL_P(s)){
-	if (SYM2ID(s) == sUNIVERSAL)
-	    ret = V_ASN1_UNIVERSAL;
-	else if (SYM2ID(s) == sAPPLICATION)
-	    ret = V_ASN1_APPLICATION;
-	else if (SYM2ID(s) == sCONTEXT_SPECIFIC)
-	    ret = V_ASN1_CONTEXT_SPECIFIC;
-	else if (SYM2ID(s) == sPRIVATE)
-	    ret = V_ASN1_PRIVATE;
-    }
-    if(ret < 0){
-	ossl_raise(eASN1Error, "invalid tag class");
-    }
-
-    return ret;
-}
-
-static VALUE
-ossl_asn1_class2sym(int tc)
-{
-    if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-	return ID2SYM(sPRIVATE);
-    else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	return ID2SYM(sCONTEXT_SPECIFIC);
-    else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	return ID2SYM(sAPPLICATION);
-    else
-	return ID2SYM(sUNIVERSAL);
-}
-
-static VALUE
-ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
-{
-    if(!SYMBOL_P(tag_class))
-	ossl_raise(eASN1Error, "invalid tag class");
-    if((SYM2ID(tag_class) == sUNIVERSAL) && NUM2INT(tag) > 31)
-	ossl_raise(eASN1Error, "too large tag number for Universal");
-    ossl_asn1_set_tag(self, tag);
-    ossl_asn1_set_value(self, value);
-    ossl_asn1_set_tag_class(self, tag_class);
-
-    return self;
-}
-
-static VALUE 
-join_der_i(VALUE i, VALUE str) 
-{
-    i = ossl_to_der_if_possible(i);
-    StringValue(i);
-    rb_str_append(str, i);
-    return Qnil;
-}
-
-static VALUE
-join_der(VALUE enumerable)
-{
-    VALUE str = rb_str_new(0, 0);
-    rb_iterate(rb_each, enumerable, join_der_i, str);
-    return str;
-}
-
-static VALUE
-ossl_asn1data_to_der(VALUE self)
-{
-    VALUE value, der;
-    int tag, tag_class, is_cons = 0;
-    long length;
-    unsigned char *p;
-
-    value = ossl_asn1_get_value(self);
-    if(rb_obj_is_kind_of(value, rb_cArray)){
-	is_cons = 1;
-	value = join_der(value);
-    }
-    StringValue(value);
-
-    tag = ossl_asn1_tag(self);
-    tag_class = ossl_asn1_tag_class(self);
-    if((length = ASN1_object_size(1, RSTRING(value)->len, tag)) <= 0)
-	ossl_raise(eASN1Error, NULL);
-    der = rb_str_new(0, length);
-    p = RSTRING(der)->ptr;
-    ASN1_put_object(&p, is_cons, RSTRING(value)->len, tag, tag_class);
-    memcpy(p, RSTRING(value)->ptr, RSTRING(value)->len);
-    p += RSTRING(value)->len;
-    ossl_str_adjust(der, p);
-
-    return der;
-}
-
-static VALUE
-ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
-		  int once, int yield)
-{
-    unsigned char *start, *p;
-    long len, off = *offset;
-    int hlen, tag, tc, j;
-    VALUE ary, asn1data, value, tag_class;
-
-    ary = rb_ary_new();
-    p = *pp;
-    while(length > 0){
-	start = p;
-	j = ASN1_get_object(&p, &len, &tag, &tc, length);
-	if(j & 0x80) ossl_raise(eASN1Error, NULL);
-	hlen = p - start;
-	if(yield){
-	    VALUE arg = rb_ary_new();
-	    rb_ary_push(arg, LONG2NUM(depth));
-	    rb_ary_push(arg, LONG2NUM(off));
-	    rb_ary_push(arg, LONG2NUM(hlen));
-	    rb_ary_push(arg, LONG2NUM(len));
-	    rb_ary_push(arg, (j & V_ASN1_CONSTRUCTED) ? Qtrue : Qfalse);
-	    rb_ary_push(arg, ossl_asn1_class2sym(tc));
-	    rb_ary_push(arg, INT2NUM(tag));
-	    rb_yield(arg);
-	}
-	length -= hlen;
-	off += hlen; 
-	if(len > length) ossl_raise(eASN1Error, "value is too short");
-	if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-	    tag_class = sPRIVATE;
-	else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	    tag_class = sCONTEXT_SPECIFIC;
-	else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	    tag_class = sAPPLICATION;
-	else
-	    tag_class = sUNIVERSAL;
-	if(j & V_ASN1_CONSTRUCTED){
-	    /* TODO: if j == 0x21 it is indefinite length object. */
-	    if((j == 0x21) && (len == 0)){
-		long lastoff = off;
-		value = ossl_asn1_decode0(&p, length, &off, depth+1, 0, yield);
-		len = off - lastoff;
-	    }
-	    else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
-	}
-	else{
-	    value = rb_str_new(p, len);
-	    p += len;
-	    off += len;
-	}
-	if(tag_class == sUNIVERSAL &&
-	   tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass){
-	    VALUE klass = *ossl_asn1_info[tag].klass;
-	    long flag;
-	    if(!rb_obj_is_kind_of(value, rb_cArray)){
-		switch(tag){
-		case V_ASN1_BOOLEAN:
-		    value = decode_bool(start, hlen+len);
-		    break;
-		case V_ASN1_INTEGER:
-		    value = decode_int(start, hlen+len);
-		    break;
-		case V_ASN1_BIT_STRING:
-		    value = decode_bstr(start, hlen+len, &flag);
-		    break;
-		case V_ASN1_NULL:
-		    value = decode_null(start, hlen+len);
-		    break;
-		case V_ASN1_ENUMERATED:
-		    value = decode_enum(start, hlen+len);
-		    break;
-		case V_ASN1_OBJECT:
-		    value = decode_obj(start, hlen+len);
-		    break;
-		case V_ASN1_UTCTIME:           /* FALLTHROUGH */
-		case V_ASN1_GENERALIZEDTIME:
-		    value = decode_time(start, hlen+len);
-		    break;
-		default:
-		    /* use original value */
-		    break;
-		}
-	    }
-	    asn1data = rb_funcall(klass, rb_intern("new"), 1, value);
-	    if(tag == V_ASN1_BIT_STRING){
-		rb_iv_set(asn1data, "@unused_bits", LONG2NUM(flag));
-	    }
-	}
-	else{
-	    asn1data = rb_funcall(cASN1Data, rb_intern("new"), 3,
-				  value, INT2NUM(tag), ID2SYM(tag_class));
-	}
-	rb_ary_push(ary, asn1data);
-	length -= len;
-        if(once) break;
-    }
-    *pp = p;
-    *offset = off;
-
-    return ary;
-}
-
-static VALUE
-ossl_asn1_traverse(VALUE self, VALUE obj)
-{
-    unsigned char *p;
-    long offset = 0;
-
-    obj = ossl_to_der_if_possible(obj);
-    StringValue(obj);
-    p = RSTRING(obj)->ptr;
-    ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 0, 1);
-
-    return obj;
-}
-
-static VALUE
-ossl_asn1_decode(VALUE self, VALUE obj)
-{
-    VALUE ret, ary;
-    unsigned char *p;
-    long offset = 0;
-
-    obj = ossl_to_der_if_possible(obj);
-    StringValue(obj);
-    p = RSTRING(obj)->ptr;
-    ary = ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 1, 0);
-    ret = rb_ary_entry(ary, 0);
-
-    return ret;
-}
-
-static VALUE
-ossl_asn1_decode_all(VALUE self, VALUE obj)
-{
-    VALUE ret;
-    unsigned char *p;
-    long offset = 0;
-
-    obj = ossl_to_der_if_possible(obj);
-    StringValue(obj);
-    p = RSTRING(obj)->ptr;
-    ret = ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 0, 0);
-
-    return ret;
-}
-
-static VALUE
-ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE value, tag, tagging, tag_class;
-
-    rb_scan_args(argc, argv, "13", &value, &tag, &tagging, &tag_class);
-    if(argc > 1){
-	if(NIL_P(tag))
-	    ossl_raise(eASN1Error, "must specify tag number");
-        if(NIL_P(tagging))
-	    tagging = ID2SYM(sEXPLICIT);
-	if(!SYMBOL_P(tagging))
-	    ossl_raise(eASN1Error, "invelid tag default");
-	if(NIL_P(tag_class))
-	    tag_class = ID2SYM(sCONTEXT_SPECIFIC);
-	if(!SYMBOL_P(tag_class))
-	    ossl_raise(eASN1Error, "invelid tag class");
-	if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
-	    ossl_raise(eASN1Error, "too large tag number for Universal");
-    }
-    else{
-	tag = INT2NUM(ossl_asn1_default_tag(self));
-        tagging = Qnil;
-	tag_class = ID2SYM(sUNIVERSAL);
-    }
-    ossl_asn1_set_tag(self, tag);
-    ossl_asn1_set_value(self, value);
-    ossl_asn1_set_tagging(self, tagging);
-    ossl_asn1_set_tag_class(self, tag_class);
-
-    return self;
-}
-
-static VALUE
-ossl_asn1prim_to_der(VALUE self)
-{
-    ASN1_TYPE *asn1;
-    int tn, tc, explicit;
-    long length, reallen;
-    unsigned char *buf, *p;
-    VALUE str;
-
-    tn = NUM2INT(ossl_asn1_get_tag(self));
-    tc = ossl_asn1_tag_class(self);
-    explicit = ossl_asn1_is_explicit(self);
-    asn1 = ossl_asn1_get_asn1type(self);
-
-    length = ASN1_object_size(1, i2d_ASN1_TYPE(asn1, NULL), tn);
-    if(!(buf = OPENSSL_malloc(length))){
-	ASN1_TYPE_free(asn1);
-	ossl_raise(eASN1Error, "cannot alloc buffer");
-    }
-    p = buf;
-    if(tc == V_ASN1_UNIVERSAL) i2d_ASN1_TYPE(asn1, &p);
-    else{
-	if(explicit){
-	    ASN1_put_object(&p, 1, i2d_ASN1_TYPE(asn1, NULL), tn, tc);
-	    i2d_ASN1_TYPE(asn1, &p);
-	}
-	else{
-	    i2d_ASN1_TYPE(asn1, &p);
-	    *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
-	}
-    }
-    ASN1_TYPE_free(asn1);
-    reallen = p - buf;
-    assert(reallen <= length);
-    str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
-
-    return str;
-}
-
-static VALUE
-ossl_asn1cons_to_der(self)
-{
-    int tag, tn, tc, explicit;
-    long seq_len, length;
-    unsigned char *p;
-    VALUE value, str;
-
-    tag = ossl_asn1_default_tag(self);
-    tn = NUM2INT(ossl_asn1_get_tag(self));
-    tc = ossl_asn1_tag_class(self);
-    explicit = ossl_asn1_is_explicit(self);
-    value = join_der(ossl_asn1_get_value(self));
-
-    seq_len = ASN1_object_size(1, RSTRING(value)->len, tag);
-    length = ASN1_object_size(1, seq_len, tn);
-    str = rb_str_new(0, length);
-    p = RSTRING(str)->ptr;
-    if(tc == V_ASN1_UNIVERSAL)
-	ASN1_put_object(&p, 1, RSTRING(value)->len, tn, tc);
-    else{
-	if(explicit){
-	    ASN1_put_object(&p, 1, seq_len, tn, tc);
-	    ASN1_put_object(&p, 1, RSTRING(value)->len, tag, V_ASN1_UNIVERSAL);
-	}
-	else ASN1_put_object(&p, 1, RSTRING(value)->len, tn, tc);
-    }
-    memcpy(p, RSTRING(value)->ptr, RSTRING(value)->len);
-    p += RSTRING(value)->len;
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-static VALUE
-ossl_asn1cons_each(VALUE self)
-{
-    rb_ary_each(ossl_asn1_get_value(self));
-    return self;
-}
-
-static VALUE
-ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
-{
-    StringValue(oid);
-    StringValue(sn);
-    StringValue(ln);
-
-    if(!OBJ_create(RSTRING(oid)->ptr, RSTRING(sn)->ptr, RSTRING(ln)->ptr))
-	ossl_raise(eASN1Error, NULL);
-
-    return Qtrue;
-}
-
-static VALUE
-ossl_asn1obj_get_sn(VALUE self)
-{
-    VALUE val, ret = Qnil;
-    int nid;
-
-    val = ossl_asn1_get_value(self);
-    if ((nid = OBJ_txt2nid(StringValuePtr(val))) != NID_undef)
-	ret = rb_str_new2(OBJ_nid2sn(nid));
-
-    return ret;
-}
-
-static VALUE
-ossl_asn1obj_get_ln(VALUE self)
-{
-    VALUE val, ret = Qnil;
-    int nid;
-
-    val = ossl_asn1_get_value(self);
-    if ((nid = OBJ_txt2nid(StringValuePtr(val))) != NID_undef)
-	ret = rb_str_new2(OBJ_nid2ln(nid));
-
-    return ret;
-}
-
-static VALUE
-ossl_asn1obj_get_oid(VALUE self)
-{
-    VALUE val;
-    ASN1_OBJECT *a1obj;
-    char buf[128];
-
-    val = ossl_asn1_get_value(self);
-    a1obj = obj_to_asn1obj(val);
-    OBJ_obj2txt(buf, sizeof(buf), a1obj, 1);
-    ASN1_OBJECT_free(a1obj);
-
-    return rb_str_new2(buf);
-}
-
-#define OSSL_ASN1_IMPL_FACTORY_METHOD(klass) \
-static VALUE ossl_asn1_##klass(int argc, VALUE *argv, VALUE self)\
-{ return rb_funcall3(cASN1##klass, rb_intern("new"), argc, argv); }
-
-OSSL_ASN1_IMPL_FACTORY_METHOD(Boolean)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Integer)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Enumerated)
-OSSL_ASN1_IMPL_FACTORY_METHOD(BitString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(OctetString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(UTF8String)
-OSSL_ASN1_IMPL_FACTORY_METHOD(NumericString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(PrintableString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(T61String)
-OSSL_ASN1_IMPL_FACTORY_METHOD(VideotexString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(IA5String)
-OSSL_ASN1_IMPL_FACTORY_METHOD(GraphicString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(ISO64String)
-OSSL_ASN1_IMPL_FACTORY_METHOD(GeneralString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(UniversalString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(BMPString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Null)
-OSSL_ASN1_IMPL_FACTORY_METHOD(ObjectId)
-OSSL_ASN1_IMPL_FACTORY_METHOD(UTCTime)
-OSSL_ASN1_IMPL_FACTORY_METHOD(GeneralizedTime)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Sequence)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Set)
-
-void
-Init_ossl_asn1()
-{
-    VALUE ary;
-    int i;
-
-    sUNIVERSAL = rb_intern("UNIVERSAL");
-    sCONTEXT_SPECIFIC = rb_intern("CONTEXT_SPECIFIC");
-    sAPPLICATION = rb_intern("APPLICATION");
-    sPRIVATE = rb_intern("PRIVATE");
-    sEXPLICIT = rb_intern("EXPLICIT");
-    sIMPLICIT = rb_intern("IMPLICIT");
-
-    mASN1 = rb_define_module_under(mOSSL, "ASN1");
-    eASN1Error = rb_define_class_under(mASN1, "ASN1Error", eOSSLError);
-    rb_define_module_function(mASN1, "traverse", ossl_asn1_traverse, 1);
-    rb_define_module_function(mASN1, "decode", ossl_asn1_decode, 1);
-    rb_define_module_function(mASN1, "decode_all", ossl_asn1_decode_all, 1);
-    ary = rb_ary_new();
-    rb_define_const(mASN1, "UNIVERSAL_TAG_NAME", ary);
-    for(i = 0; i < ossl_asn1_info_size; i++){
-	if(ossl_asn1_info[i].name[0] == '[') continue;
-	rb_define_const(mASN1, ossl_asn1_info[i].name, INT2NUM(i));
-	rb_ary_store(ary, i, rb_str_new2(ossl_asn1_info[i].name));
-    }
-
-    cASN1Data = rb_define_class_under(mASN1, "ASN1Data", rb_cObject);
-    rb_attr(cASN1Data, rb_intern("value"), 1, 1, Qtrue);
-    rb_attr(cASN1Data, rb_intern("tag"), 1, 1, Qtrue);
-    rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, Qtrue);
-    rb_define_method(cASN1Data, "initialize", ossl_asn1data_initialize, 3);
-    rb_define_method(cASN1Data, "to_der", ossl_asn1data_to_der, 0);
-
-    cASN1Primitive = rb_define_class_under(mASN1, "Primitive", cASN1Data);
-    rb_attr(cASN1Primitive, rb_intern("tagging"), 1, 1, Qtrue);
-    rb_define_method(cASN1Primitive, "initialize", ossl_asn1_initialize, -1);
-    rb_define_method(cASN1Primitive, "to_der", ossl_asn1prim_to_der, 0);
-
-    cASN1Constructive = rb_define_class_under(mASN1,"Constructive", cASN1Data);
-    rb_include_module(cASN1Constructive, rb_mEnumerable);
-    rb_attr(cASN1Constructive, rb_intern("tagging"), 1, 1, Qtrue);
-    rb_define_method(cASN1Constructive, "initialize", ossl_asn1_initialize, -1);
-    rb_define_method(cASN1Constructive, "to_der", ossl_asn1cons_to_der, 0);
-    rb_define_method(cASN1Constructive, "each", ossl_asn1cons_each, 0);
-
-#define OSSL_ASN1_DEFINE_CLASS(name, super) \
-do{\
-    cASN1##name = rb_define_class_under(mASN1, #name, cASN1##super);\
-    rb_define_module_function(mASN1, #name, ossl_asn1_##name, -1);\
-}while(0)
-
-    OSSL_ASN1_DEFINE_CLASS(Boolean, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(Integer, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(Enumerated, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(BitString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(OctetString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(UTF8String, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(NumericString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(PrintableString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(T61String, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(VideotexString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(IA5String, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(GraphicString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(ISO64String, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(GeneralString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(UniversalString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(BMPString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(Null, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(ObjectId, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(UTCTime, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(GeneralizedTime, Primitive);
-
-    OSSL_ASN1_DEFINE_CLASS(Sequence, Constructive);
-    OSSL_ASN1_DEFINE_CLASS(Set, Constructive);
-
-    rb_define_singleton_method(cASN1ObjectId, "register", ossl_asn1obj_s_register, 3);
-    rb_define_method(cASN1ObjectId, "sn", ossl_asn1obj_get_sn, 0);
-    rb_define_method(cASN1ObjectId, "ln", ossl_asn1obj_get_ln, 0);
-    rb_define_method(cASN1ObjectId, "oid", ossl_asn1obj_get_oid, 0);
-    rb_define_alias(cASN1ObjectId, "short_name", "sn");
-    rb_define_alias(cASN1ObjectId, "long_name", "ln");
-    rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, Qtrue);
-}
diff --git a/ext/openssl/ossl_asn1.h b/ext/openssl/ossl_asn1.h
deleted file mode 100644
index 919ede0f3b..0000000000
--- a/ext/openssl/ossl_asn1.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' team members
- * Copyright (C) 2003
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_ASN1_H_)
-#define _OSSL_ASN1_H_
-
-/*
- * ASN1_DATE conversions
- */
-VALUE asn1time_to_time(ASN1_TIME *);
-time_t time_to_time_t(VALUE);
-
-/*
- * ASN1_INTEGER conversions
- */
-VALUE asn1integer_to_num(ASN1_INTEGER *);
-ASN1_INTEGER *num_to_asn1integer(VALUE, ASN1_INTEGER *);
-
-/*
- * ASN1 module
- */
-extern VALUE mASN1;
-extern VALUE eASN1Error;  
-
-extern VALUE cASN1Data;
-extern VALUE cASN1Primitive;
-extern VALUE cASN1Constructive;
- 
-extern VALUE cASN1Boolean;                           /* BOOLEAN           */
-extern VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
-extern VALUE cASN1BitString;                         /* BIT STRING        */
-extern VALUE cASN1OctetString, cASN1UTF8String;      /* STRINGs           */
-extern VALUE cASN1NumericString, cASN1PrintableString;
-extern VALUE cASN1T61String, cASN1VideotexString;
-extern VALUE cASN1IA5String, cASN1GraphicString;
-extern VALUE cASN1ISO64String, cASN1GeneralString;
-extern VALUE cASN1UniversalString, cASN1BMPString;
-extern VALUE cASN1Null;                              /* NULL              */
-extern VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
-extern VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
-extern VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
-
-ASN1_TYPE *ossl_asn1_get_asn1type(VALUE);
-
-void Init_ossl_asn1(void);
-
-#endif
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
deleted file mode 100644
index 8e80f412ee..0000000000
--- a/ext/openssl/ossl_bio.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' team members
- * Copyright (C) 2003
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-BIO *
-ossl_obj2bio(VALUE obj)
-{
-    BIO *bio;
-
-    if (TYPE(obj) == T_FILE) {
-	OpenFile *fptr;
-	GetOpenFile(obj, fptr);
-	rb_io_check_readable(fptr);
-	bio = BIO_new_fp(fptr->f, BIO_NOCLOSE);
-    }       
-    else {
-	StringValue(obj);
-	bio = BIO_new_mem_buf(RSTRING(obj)->ptr, RSTRING(obj)->len);
-    }
-    if (!bio) ossl_raise(eOSSLError, NULL);
-
-    return bio;
-}
-
-BIO *
-ossl_protect_obj2bio(VALUE obj, int *status)
-{
-     BIO *ret = NULL;
-     ret = (BIO*)rb_protect((VALUE(*)_((VALUE)))ossl_obj2bio, obj, status);
-     return ret;
-}
-
-VALUE
-ossl_membio2str0(BIO *bio)
-{
-    VALUE ret;
-    BUF_MEM *buf;
-
-    BIO_get_mem_ptr(bio, &buf);
-    ret = rb_str_new(buf->data, buf->length);
-
-    return ret;
-}
-
-VALUE
-ossl_protect_membio2str(BIO *bio, int *status)
-{
-    return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
-}
-
-VALUE 
-ossl_membio2str(BIO *bio)
-{
-    VALUE ret;
-    int status = 0;
-
-    ret = ossl_protect_membio2str(bio, &status);
-    BIO_free(bio);
-    if(status) rb_jump_tag(status);
-
-    return ret;
-}
diff --git a/ext/openssl/ossl_bio.h b/ext/openssl/ossl_bio.h
deleted file mode 100644
index 2d8f675c5b..0000000000
--- a/ext/openssl/ossl_bio.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' team members
- * Copyright (C) 2003
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_BIO_H_)
-#define _OSSL_BIO_H_
-
-BIO *ossl_obj2bio(VALUE);
-BIO *ossl_protect_obj2bio(VALUE,int*);
-VALUE ossl_membio2str0(BIO*);
-VALUE ossl_membio2str(BIO*);
-VALUE ossl_protect_membio2str(BIO*,int*);
-
-#endif
-
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
deleted file mode 100644
index c3a371a008..0000000000
--- a/ext/openssl/ossl_bn.c
+++ /dev/null
@@ -1,719 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Technorama team <oss-ruby@technorama.net>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-/* modified by Michal Rokos <m.rokos@sh.cvut.cz> */
-#include "ossl.h"
-
-#define WrapBN(klass, obj, bn) do { \
-  if (!bn) { \
-    ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
-  } \
-  obj = Data_Wrap_Struct(klass, 0, BN_clear_free, bn); \
-} while (0)
-
-#define GetBN(obj, bn) do { \
-  Data_Get_Struct(obj, BIGNUM, bn); \
-  if (!bn) { \
-    ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
-  } \
-} while (0)
-
-#define SafeGetBN(obj, bn) do { \
-  OSSL_Check_Kind(obj, cBN); \
-  GetBN(obj, bn); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cBN;
-VALUE eBNError;
-
-/*
- * Public
- */
-VALUE
-ossl_bn_new(BIGNUM *bn)
-{
-    BIGNUM *newbn;
-    VALUE obj;
-
-    newbn = bn ? BN_dup(bn) : BN_new();
-    if (!newbn) {
-	ossl_raise(eBNError, NULL);
-    }
-    WrapBN(cBN, obj, newbn);
-
-    return obj;
-}
-
-BIGNUM *
-GetBNPtr(VALUE obj)
-{
-    BIGNUM *bn = NULL;
-
-    if (RTEST(rb_obj_is_kind_of(obj, cBN))) {
-	GetBN(obj, bn);
-    } else switch (TYPE(obj)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-	obj = rb_String(obj);
-	if (!BN_dec2bn(&bn, StringValuePtr(obj))) {
-	    ossl_raise(eBNError, NULL);
-	}
-	WrapBN(cBN, obj, bn); /* Handle potencial mem leaks */
-	break;
-    default:
-	ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
-    }
-    return bn;
-}
-
-/*
- * Private
- */
-/*
- * BN_CTX - is used in more difficult math. ops
- * (Why just 1? Because Ruby itself isn't thread safe,
- *  we don't need to care about threads)
- */
-BN_CTX *ossl_bn_ctx;
-
-static VALUE
-ossl_bn_alloc(VALUE klass)
-{
-    BIGNUM *bn;
-    VALUE obj;
-	
-    if (!(bn = BN_new())) {
-	ossl_raise(eBNError, NULL);
-    }
-    WrapBN(klass, obj, bn);
-
-    return obj;
-}
-
-static VALUE
-ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
-{
-    BIGNUM *bn;
-    VALUE str, bs;
-    int base = 10;
-
-    GetBN(self, bn);
-
-    if (rb_scan_args(argc, argv, "11", &str, &bs) == 2) {
-	base = NUM2INT(bs);
-    }
-    if (RTEST(rb_obj_is_kind_of(str, cBN))) {
-	BIGNUM *other;
-
-	GetBN(str, other); /* Safe - we checked kind_of? above */
-	if (!BN_copy(bn, other)) {
-	    ossl_raise(eBNError, NULL);
-	}
-	return self;
-    }
-    str = rb_String(str);
-    StringValue(str);
-
-    switch (base) {
-    case 0:
-	if (!BN_mpi2bn(RSTRING(str)->ptr, RSTRING(str)->len, bn)) {
-	    ossl_raise(eBNError, NULL);
-	}
-	break;
-    case 2:
-	if (!BN_bin2bn(RSTRING(str)->ptr, RSTRING(str)->len, bn)) {
-	    ossl_raise(eBNError, NULL);
-	}
-	break;
-    case 10:
-	if (!BN_dec2bn(&bn, RSTRING(str)->ptr)) {
-	    ossl_raise(eBNError, NULL);
-	}
-	break;
-    case 16:
-	if (!BN_hex2bn(&bn, RSTRING(str)->ptr)) {
-	    ossl_raise(eBNError, NULL);
-	}
-	break;
-    default:
-	ossl_raise(rb_eArgError, "illegal radix %d", base);
-    }
-    return self;
-}
-
-static VALUE
-ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
-{
-    BIGNUM *bn;
-    VALUE str, bs;
-    int base = 10, len;
-    char *buf;
-
-    GetBN(self, bn);
-	
-    if (rb_scan_args(argc, argv, "01", &bs) == 1) {
-	base = NUM2INT(bs);
-    }
-    switch (base) {
-    case 0:
-	len = BN_bn2mpi(bn, NULL);
-        str = rb_str_new(0, len);
-	if (BN_bn2mpi(bn, RSTRING(str)->ptr) != len)
-	    ossl_raise(eBNError, NULL);
-	break;
-    case 2:
-	len = BN_num_bytes(bn);
-        str = rb_str_new(0, len);
-	if (BN_bn2bin(bn, RSTRING(str)->ptr) != len)
-	    ossl_raise(eBNError, NULL);
-	break;
-    case 10:
-	if (!(buf = BN_bn2dec(bn))) ossl_raise(eBNError, NULL);
-	str = ossl_buf2str(buf, strlen(buf));
-	break;
-    case 16:
-	if (!(buf = BN_bn2hex(bn))) ossl_raise(eBNError, NULL);
-	str = ossl_buf2str(buf, strlen(buf));
-	break;
-    default:
-	ossl_raise(rb_eArgError, "illegal radix %d", base);
-    }
-
-    return str;
-}
-
-static VALUE
-ossl_bn_to_i(VALUE self)
-{
-    BIGNUM *bn;
-    char *txt;
-    VALUE num;
-
-    GetBN(self, bn);
-
-    if (!(txt = BN_bn2dec(bn))) {
-	ossl_raise(eBNError, NULL);
-    }
-    num = rb_cstr_to_inum(txt, 10, Qtrue);
-    OPENSSL_free(txt);
-
-    return num;
-}
-
-static VALUE
-ossl_bn_to_bn(VALUE self)
-{
-    return self;
-}
-
-static VALUE
-ossl_bn_coerce(VALUE self, VALUE other)
-{
-    switch(TYPE(other)) {
-    case T_STRING:
-	self = ossl_bn_to_s(0, NULL, self);
-	break;
-    case T_FIXNUM:
-    case T_BIGNUM:
-	self = ossl_bn_to_i(self);
-	break;
-    default:
-	if (!RTEST(rb_obj_is_kind_of(other, cBN))) {
-	    ossl_raise(rb_eTypeError, "Don't know how to coerce");
-	}
-    }
-    return rb_assoc_new(other, self);
-}
-
-#define BIGNUM_BOOL1(func)				\
-    static VALUE					\
-    ossl_bn_##func(VALUE self)				\
-    {							\
-	BIGNUM *bn;					\
-	GetBN(self, bn);				\
-	if (BN_##func(bn)) {				\
-	    return Qtrue;				\
-	}						\
-	return Qfalse;					\
-    }
-BIGNUM_BOOL1(is_zero);
-BIGNUM_BOOL1(is_one);
-BIGNUM_BOOL1(is_odd);
-
-#define BIGNUM_1c(func)					\
-    static VALUE					\
-    ossl_bn_##func(VALUE self)				\
-    {							\
-	BIGNUM *bn, *result;				\
-	VALUE obj;					\
-	GetBN(self, bn);				\
-	if (!(result = BN_new())) {			\
-	    ossl_raise(eBNError, NULL);			\
-	}						\
-	if (!BN_##func(result, bn, ossl_bn_ctx)) {	\
-	    BN_free(result);				\
-	    ossl_raise(eBNError, NULL);			\
-	}						\
-	WrapBN(CLASS_OF(self), obj, result);		\
-	return obj;					\
-    }
-BIGNUM_1c(sqr);
-
-#define BIGNUM_2(func)					\
-    static VALUE					\
-    ossl_bn_##func(VALUE self, VALUE other)		\
-    {							\
-	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;	\
-	VALUE obj;					\
-	GetBN(self, bn1);				\
-	if (!(result = BN_new())) {			\
-	    ossl_raise(eBNError, NULL);			\
-	}						\
-	if (!BN_##func(result, bn1, bn2)) {		\
-	    BN_free(result);				\
-	    ossl_raise(eBNError, NULL);			\
-	}						\
-	WrapBN(CLASS_OF(self), obj, result);		\
-	return obj;					\
-    }
-BIGNUM_2(add);
-BIGNUM_2(sub);
-
-#define BIGNUM_2c(func)						\
-    static VALUE						\
-    ossl_bn_##func(VALUE self, VALUE other)			\
-    {								\
-	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;		\
-	VALUE obj;						\
-	GetBN(self, bn1);					\
-	if (!(result = BN_new())) {				\
-	    ossl_raise(eBNError, NULL);				\
-	}							\
-	if (!BN_##func(result, bn1, bn2, ossl_bn_ctx)) {	\
-	    BN_free(result);					\
-	    ossl_raise(eBNError, NULL);				\
-	}							\
-	WrapBN(CLASS_OF(self), obj, result);			\
-	return obj;						\
-    }
-BIGNUM_2c(mul);
-BIGNUM_2c(mod);
-BIGNUM_2c(exp);
-BIGNUM_2c(gcd);
-BIGNUM_2c(mod_sqr);
-BIGNUM_2c(mod_inverse);
-
-static VALUE
-ossl_bn_div(VALUE self, VALUE other)
-{
-    BIGNUM *bn1, *bn2 = GetBNPtr(other), *r1, *r2;
-    VALUE obj1, obj2;
-
-    GetBN(self, bn1);
-
-    if (!(r1 = BN_new())) {
-	ossl_raise(eBNError, NULL);
-    }
-    if (!(r2 = BN_new())) {
-	BN_free(r1);
-	ossl_raise(eBNError, NULL);
-    }
-    if (!BN_div(r1, r2, bn1, bn2, ossl_bn_ctx)) {
-	BN_free(r1);
-	BN_free(r2);
-	ossl_raise(eBNError, NULL);
-    }
-    WrapBN(CLASS_OF(self), obj1, r1);
-    WrapBN(CLASS_OF(self), obj2, r2);
-    
-    return rb_ary_new3(2, obj1, obj2);
-}
-
-#define BIGNUM_3c(func)						\
-    static VALUE						\
-    ossl_bn_##func(VALUE self, VALUE other1, VALUE other2)	\
-    {								\
-	BIGNUM *bn1, *bn2 = GetBNPtr(other1);			\
-	BIGNUM *bn3 = GetBNPtr(other2), *result;		\
-	VALUE obj;						\
-	GetBN(self, bn1);					\
-	if (!(result = BN_new())) {				\
-	    ossl_raise(eBNError, NULL);				\
-	}							\
-	if (!BN_##func(result, bn1, bn2, bn3, ossl_bn_ctx)) {	\
-	    BN_free(result);					\
-	    ossl_raise(eBNError, NULL);				\
-	}							\
-	WrapBN(CLASS_OF(self), obj, result);			\
-	return obj;						\
-    }
-BIGNUM_3c(mod_add);
-BIGNUM_3c(mod_sub);
-BIGNUM_3c(mod_mul);
-BIGNUM_3c(mod_exp);
-
-#define BIGNUM_BIT(func)				\
-    static VALUE					\
-    ossl_bn_##func(VALUE self, VALUE bit)		\
-    {							\
-	BIGNUM *bn;					\
-	GetBN(self, bn);				\
-	if (!BN_##func(bn, NUM2INT(bit))) {		\
-	    ossl_raise(eBNError, NULL);			\
-	}						\
-	return self;					\
-    }
-BIGNUM_BIT(set_bit);
-BIGNUM_BIT(clear_bit);
-BIGNUM_BIT(mask_bits);
-
-static VALUE
-ossl_bn_is_bit_set(VALUE self, VALUE bit)
-{
-    BIGNUM *bn;
-
-    GetBN(self, bn);
-
-    if (BN_is_bit_set(bn, NUM2INT(bit))) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-#define BIGNUM_SHIFT(func)				\
-    static VALUE					\
-    ossl_bn_##func(VALUE self, VALUE bits)		\
-    {							\
-	BIGNUM *bn, *result;				\
-	int b;						\
-	VALUE obj;					\
-	GetBN(self, bn);				\
-	b = NUM2INT(bits);				\
-	if (!(result = BN_new())) {			\
-		ossl_raise(eBNError, NULL);		\
-	}						\
-	if (!BN_##func(result, bn, b)) {		\
-		BN_free(result);			\
-		ossl_raise(eBNError, NULL);		\
-	}						\
-	WrapBN(CLASS_OF(self), obj, result);		\
-	return obj;					\
-    }
-BIGNUM_SHIFT(lshift);
-BIGNUM_SHIFT(rshift);
-
-#define BIGNUM_RAND(func)					\
-    static VALUE						\
-    ossl_bn_s_##func(int argc, VALUE *argv, VALUE klass)	\
-    {								\
-	BIGNUM *result;						\
-	int bottom = 0, top = 0, b;				\
-	VALUE bits, fill, odd, obj;				\
-								\
-	switch (rb_scan_args(argc, argv, "12", &bits, &fill, &odd)) {	\
-	case 3:							\
-	    bottom = (odd == Qtrue) ? 1 : 0;			\
-	    /* FALLTHROUGH */					\
-	case 2:							\
-	    top = FIX2INT(fill);				\
-	}							\
-	b = NUM2INT(bits);					\
-	if (!(result = BN_new())) {				\
-	    ossl_raise(eBNError, NULL);				\
-	}							\
-	if (!BN_##func(result, b, top, bottom)) {		\
-	    BN_free(result);					\
-	    ossl_raise(eBNError, NULL);				\
-	}							\
-	WrapBN(klass, obj, result);				\
-	return obj;						\
-    }
-BIGNUM_RAND(rand);
-BIGNUM_RAND(pseudo_rand);
-
-#define BIGNUM_RAND_RANGE(func)					\
-    static VALUE						\
-    ossl_bn_s_##func##_range(VALUE klass, VALUE range)		\
-    {								\
-	BIGNUM *bn = GetBNPtr(range), *result;			\
-	VALUE obj;						\
-	if (!(result = BN_new())) {				\
-	    ossl_raise(eBNError, NULL);				\
-	}							\
-	if (!BN_##func##_range(result, bn)) {			\
-	    BN_free(result);					\
-	    ossl_raise(eBNError, NULL);				\
-	}							\
-	WrapBN(klass, obj, result);				\
-	return obj;						\
-    }
-BIGNUM_RAND_RANGE(rand);
-BIGNUM_RAND_RANGE(pseudo_rand);
-
-static VALUE
-ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
-{
-    BIGNUM *add = NULL, *rem = NULL, *result;
-    int safe = 1, num;
-    VALUE vnum, vsafe, vadd, vrem, obj;
-
-    rb_scan_args(argc, argv, "13", &vnum, &vsafe, &vadd, &vrem);
-	
-    num = NUM2INT(vnum);
-
-    if (vsafe == Qfalse) {
-	safe = 0;
-    }
-    if (!NIL_P(vadd)) {
-	if (NIL_P(vrem)) {
-	    ossl_raise(rb_eArgError,
-		       "if ADD is specified, REM must be also given");
-	}
-	add = GetBNPtr(vadd);
-	rem = GetBNPtr(vrem);
-    }
-    if (!(result = BN_new())) {
-	ossl_raise(eBNError, NULL);
-    }
-    if (!BN_generate_prime(result, num, safe, add, rem, NULL, NULL)) {
-	BN_free(result);
-	ossl_raise(eBNError, NULL);
-    }
-    WrapBN(klass, obj, result);
-    
-	return obj;
-}
-
-#define BIGNUM_NUM(func)			\
-    static VALUE 				\
-    ossl_bn_##func(VALUE self)			\
-    {						\
-	BIGNUM *bn;				\
-	GetBN(self, bn);			\
-	return INT2FIX(BN_##func(bn));		\
-    }
-BIGNUM_NUM(num_bytes);
-BIGNUM_NUM(num_bits);
-
-static VALUE
-ossl_bn_copy(VALUE self, VALUE other)
-{
-    BIGNUM *bn1, *bn2;
-    
-    rb_check_frozen(self);
-    
-    if (self == other) return self;
-    
-    GetBN(self, bn1);
-    bn2 = GetBNPtr(other);
-    
-    if (!BN_copy(bn1, bn2)) {
-	ossl_raise(eBNError, NULL);
-    }
-    return self;
-}
-
-#define BIGNUM_CMP(func)				\
-    static VALUE					\
-    ossl_bn_##func(VALUE self, VALUE other)		\
-    {							\
-	BIGNUM *bn1, *bn2 = GetBNPtr(other);		\
-	GetBN(self, bn1);				\
-	return INT2FIX(BN_##func(bn1, bn2));		\
-    }
-BIGNUM_CMP(cmp);
-BIGNUM_CMP(ucmp);
-
-static VALUE
-ossl_bn_eql(VALUE self, VALUE other)
-{
-    if (ossl_bn_cmp(self, other) == INT2FIX(0)) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-static VALUE
-ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
-{
-    BIGNUM *bn;
-    VALUE vchecks;
-    int checks = BN_prime_checks;
-
-    GetBN(self, bn);
-	
-    if (rb_scan_args(argc, argv, "01", &vchecks) == 0) {
-	checks = NUM2INT(vchecks);
-    }
-    switch (BN_is_prime(bn, checks, NULL, ossl_bn_ctx, NULL)) {
-    case 1:
-	return Qtrue;
-    case 0:
-	return Qfalse;
-    default:
-	ossl_raise(eBNError, NULL);
-    }
-    /* not reachable */
-    return Qnil;
-}
-
-static VALUE
-ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
-{
-    BIGNUM *bn;
-    VALUE vchecks, vtrivdiv;
-    int checks = BN_prime_checks, do_trial_division = 1;
-
-    GetBN(self, bn);
-	
-    rb_scan_args(argc, argv, "02", &vchecks, &vtrivdiv);
-
-    if (!NIL_P(vchecks)) {
-	checks = NUM2INT(vchecks);
-    }
-    /* handle true/false */
-    if (vtrivdiv == Qfalse) {
-	do_trial_division = 0;
-    }
-    switch (BN_is_prime_fasttest(bn, checks, NULL, ossl_bn_ctx, NULL, do_trial_division)) {
-    case 1:
-	return Qtrue;
-    case 0:
-	return Qfalse;
-    default:
-	ossl_raise(eBNError, NULL);
-    }
-    /* not reachable */
-    return Qnil;
-}
-
-/*
- * INIT
- * (NOTE: ordering of methods is the same as in 'man bn')
- */
-void
-Init_ossl_bn()
-{
-    if (!(ossl_bn_ctx = BN_CTX_new())) {
-	ossl_raise(rb_eRuntimeError, "Cannot init BN_CTX");
-    }
-
-    eBNError = rb_define_class_under(mOSSL, "BNError", eOSSLError);
-
-    cBN = rb_define_class_under(mOSSL, "BN", rb_cObject);
-
-    rb_define_alloc_func(cBN, ossl_bn_alloc);
-    rb_define_method(cBN, "initialize", ossl_bn_initialize, -1);
-	
-    rb_define_copy_func(cBN, ossl_bn_copy);
-    rb_define_method(cBN, "copy", ossl_bn_copy, 1);
-
-    /* swap (=coerce?) */
-
-    rb_define_method(cBN, "num_bytes", ossl_bn_num_bytes, 0);
-    rb_define_method(cBN, "num_bits", ossl_bn_num_bits, 0);
-    /* num_bits_word */
-
-    rb_define_method(cBN, "+", ossl_bn_add, 1);
-    rb_define_method(cBN, "-", ossl_bn_sub, 1);
-    rb_define_method(cBN, "*", ossl_bn_mul, 1);
-    rb_define_method(cBN, "sqr", ossl_bn_sqr, 0);
-    rb_define_method(cBN, "/", ossl_bn_div, 1);
-    rb_define_method(cBN, "%", ossl_bn_mod, 1);
-    /* nnmod */
-
-    rb_define_method(cBN, "mod_add", ossl_bn_mod_add, 2);
-    rb_define_method(cBN, "mod_sub", ossl_bn_mod_sub, 2);
-    rb_define_method(cBN, "mod_mul", ossl_bn_mod_mul, 2);
-    rb_define_method(cBN, "mod_sqr", ossl_bn_mod_sqr, 1);
-    rb_define_method(cBN, "**", ossl_bn_exp, 1);
-    rb_define_method(cBN, "mod_exp", ossl_bn_mod_exp, 2);
-    rb_define_method(cBN, "gcd", ossl_bn_gcd, 1);
-
-    /* add_word
-     * sub_word
-     * mul_word
-     * div_word
-     * mod_word */
-
-    rb_define_method(cBN, "cmp", ossl_bn_cmp, 1);
-    rb_define_alias(cBN, "<=>", "cmp");
-    rb_define_method(cBN, "ucmp", ossl_bn_ucmp, 1);
-    rb_define_method(cBN, "eql?", ossl_bn_eql, 1);
-    rb_define_alias(cBN, "==", "eql?");
-    rb_define_alias(cBN, "===", "eql?");
-    rb_define_method(cBN, "zero?", ossl_bn_is_zero, 0);
-    rb_define_method(cBN, "one?", ossl_bn_is_one, 0);
-    /* is_word */
-    rb_define_method(cBN, "odd?", ossl_bn_is_odd, 0);
-
-    /* zero
-     * one
-     * value_one - DON'T IMPL.
-     * set_word
-     * get_word */
-    
-    rb_define_singleton_method(cBN, "rand", ossl_bn_s_rand, -1);
-    rb_define_singleton_method(cBN, "pseudo_rand", ossl_bn_s_pseudo_rand, -1);
-    rb_define_singleton_method(cBN, "rand_range", ossl_bn_s_rand_range, 1);
-    rb_define_singleton_method(cBN, "pseudo_rand_range", ossl_bn_s_pseudo_rand_range, 1);
-
-    rb_define_singleton_method(cBN, "generate_prime", ossl_bn_s_generate_prime, -1);
-    rb_define_method(cBN, "prime?", ossl_bn_is_prime, -1);
-
-    rb_define_method(cBN, "set_bit!", ossl_bn_set_bit, 1);
-    rb_define_method(cBN, "clear_bit!", ossl_bn_clear_bit, 1);
-    rb_define_method(cBN, "bit_set?", ossl_bn_is_bit_set, 1);
-    rb_define_method(cBN, "mask_bits!", ossl_bn_mask_bits, 1);
-    rb_define_method(cBN, "<<", ossl_bn_lshift, 1);
-    /* lshift1 - DON'T IMPL. */
-    rb_define_method(cBN, ">>", ossl_bn_rshift, 1);
-    /* rshift1 - DON'T IMPL. */
-
-    /*
-     * bn2bin
-     * bin2bn
-     * bn2hex
-     * bn2dec
-     * hex2bn
-     * dec2bn - all these are implemented in ossl_bn_initialize, and ossl_bn_to_s
-     * print - NOT IMPL.
-     * print_fp - NOT IMPL.
-     * bn2mpi
-     * mpi2bn
-     */
-    rb_define_method(cBN, "to_s", ossl_bn_to_s, -1);
-    rb_define_method(cBN, "to_i", ossl_bn_to_i, 0);
-    rb_define_alias(cBN, "to_int", "to_i");
-    rb_define_method(cBN, "to_bn", ossl_bn_to_bn, 0);
-    rb_define_method(cBN, "coerce", ossl_bn_coerce, 1);
-	
-    /*
-     * TODO:
-     * But how to: from_bin, from_mpi? PACK?
-     * to_bin
-     * to_mpi
-     */
-
-    rb_define_method(cBN, "mod_inverse", ossl_bn_mod_inverse, 1);
-
-    /* RECiProcal
-     * MONTgomery */
-
-    /*
-     * TODO:
-     * Where to belong these?
-     */
-    rb_define_method(cBN, "prime_fasttest?", ossl_bn_is_prime_fasttest, -1);
-}
-
diff --git a/ext/openssl/ossl_bn.h b/ext/openssl/ossl_bn.h
deleted file mode 100644
index 12aa484873..0000000000
--- a/ext/openssl/ossl_bn.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_BN_H_)
-#define _OSSL_BN_H_
-
-extern VALUE cBN;
-extern VALUE eBNError;
-
-VALUE ossl_bn_new(BIGNUM *);
-BIGNUM *GetBNPtr(VALUE);
-void Init_ossl_bn(void);
-
-#endif /* _OSS_BN_H_ */
-
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
deleted file mode 100644
index 93b3f6ccf9..0000000000
--- a/ext/openssl/ossl_cipher.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define MakeCipher(obj, klass, ctx) \
-    obj = Data_Make_Struct(klass, EVP_CIPHER_CTX, 0, ossl_cipher_free, ctx)
-#define GetCipher(obj, ctx) do { \
-    Data_Get_Struct(obj, EVP_CIPHER_CTX, ctx); \
-    if (!ctx) { \
-	ossl_raise(rb_eRuntimeError, "Cipher not inititalized!"); \
-    } \
-} while (0)
-#define SafeGetCipher(obj, ctx) do { \
-    OSSL_Check_Kind(obj, cCipher); \
-    GetCipher(obj, ctx); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE mCipher;
-VALUE cCipher;
-VALUE eCipherError;
-
-static VALUE ossl_cipher_alloc(VALUE klass);
-
-/*
- * PUBLIC
- */
-const EVP_CIPHER *
-GetCipherPtr(VALUE obj)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    SafeGetCipher(obj, ctx);
-
-    return EVP_CIPHER_CTX_cipher(ctx);
-}
-
-VALUE
-ossl_cipher_new(const EVP_CIPHER *cipher)
-{
-    VALUE ret;
-    EVP_CIPHER_CTX *ctx;
-
-    ret = ossl_cipher_alloc(cCipher);
-    GetCipher(ret, ctx);
-    EVP_CIPHER_CTX_init(ctx);
-    if (EVP_CipherInit(ctx, cipher, NULL, NULL, -1) != 1)
-	ossl_raise(eCipherError, NULL);
-
-    return ret;
-}
-
-/*
- * PRIVATE
- */
-static void
-ossl_cipher_free(EVP_CIPHER_CTX *ctx)
-{
-    if (ctx) {
-	EVP_CIPHER_CTX_cleanup(ctx);
-	free(ctx);
-    }
-}
-
-static VALUE
-ossl_cipher_alloc(VALUE klass)
-{
-    EVP_CIPHER_CTX *ctx;
-    VALUE obj;
-
-    MakeCipher(obj, klass, ctx);
-	
-    return obj;
-}
-
-static VALUE
-ossl_cipher_initialize(VALUE self, VALUE str)
-{
-    EVP_CIPHER_CTX *ctx;
-    const EVP_CIPHER *cipher;
-    char *name;
-
-    GetCipher(self, ctx);
-
-    name = StringValuePtr(str);
-
-    if (!(cipher = EVP_get_cipherbyname(name))) {
-	ossl_raise(rb_eRuntimeError, "Unsupported cipher algorithm (%s).", name);
-    }
-    EVP_CIPHER_CTX_init(ctx);
-    if (EVP_CipherInit(ctx, cipher, NULL, NULL, -1) != 1)
-		ossl_raise(eCipherError, NULL);
-
-    return self;
-}
-static VALUE
-ossl_cipher_copy(VALUE self, VALUE other)
-{
-    EVP_CIPHER_CTX *ctx1, *ctx2;
-	
-    rb_check_frozen(self);
-    if (self == other) return self;
-
-    GetCipher(self, ctx1);
-    SafeGetCipher(other, ctx2);
-
-    memcpy(ctx1, ctx2, sizeof(EVP_CIPHER_CTX));
-
-    return self;
-}
-
-static VALUE
-ossl_cipher_reset(VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    GetCipher(self, ctx);
-    if (EVP_CipherInit(ctx, NULL, NULL, NULL, -1) != 1)
-	ossl_raise(eCipherError, NULL);
-		
-    return self;
-}
-
-static VALUE
-ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-    unsigned char iv[EVP_MAX_IV_LENGTH], key[EVP_MAX_KEY_LENGTH];
-    VALUE pass, init_v;
-
-    GetCipher(self, ctx);
-	
-    rb_scan_args(argc, argv, "02", &pass, &init_v);
-	
-    if (NIL_P(init_v)) {
-	/*
-	 * TODO:
-	 * random IV generation!
-	 */ 
-	memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv));
-	/*
-	  RAND_add(data,i,0); where from take data?
-	  if (RAND_pseudo_bytes(iv, 8) < 0) {
-	  ossl_raise(eCipherError, NULL);
-	  }
-	*/
-    }
-    else {
-	init_v = rb_obj_as_string(init_v);
-	if (EVP_MAX_IV_LENGTH > RSTRING(init_v)->len) {
-	    memset(iv, 0, EVP_MAX_IV_LENGTH);
-	    memcpy(iv, RSTRING(init_v)->ptr, RSTRING(init_v)->len);
-	}
-	else {
-	    memcpy(iv, RSTRING(init_v)->ptr, sizeof(iv));
-	}
-    }
-
-    if (EVP_CipherInit(ctx, NULL, NULL, NULL, 1) != 1) {
-        ossl_raise(eCipherError, NULL);
-    }
-
-    if (!NIL_P(pass)) {
-        StringValue(pass);
-
-        EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
-		   RSTRING(pass)->ptr, RSTRING(pass)->len, 1, key, NULL);
-        if (EVP_CipherInit(ctx, NULL, key, iv, -1) != 1) {
-            ossl_raise(eCipherError, NULL);
-        }
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-    unsigned char iv[EVP_MAX_IV_LENGTH], key[EVP_MAX_KEY_LENGTH];
-    VALUE pass, init_v;
-	
-    GetCipher(self, ctx);
-    rb_scan_args(argc, argv, "02", &pass, &init_v);
-
-    if (NIL_P(init_v)) {
-	/*
-	 * TODO:
-	 * random IV generation!
-	 */
-	memcpy(iv, "OpenSSL for Ruby rulez!", EVP_MAX_IV_LENGTH);
-    }
-    else {
-	init_v = rb_obj_as_string(init_v);
-	if (EVP_MAX_IV_LENGTH > RSTRING(init_v)->len) {
-	    memset(iv, 0, EVP_MAX_IV_LENGTH);
-	    memcpy(iv, RSTRING(init_v)->ptr, RSTRING(init_v)->len);
-	}
-	else {
-	    memcpy(iv, RSTRING(init_v)->ptr, EVP_MAX_IV_LENGTH);
-	}
-    }
-
-    if (EVP_CipherInit(ctx, NULL, NULL, NULL, 0) != 1) {
-        ossl_raise(eCipherError, NULL);
-    }
-
-    if (!NIL_P(pass)) {
-        StringValue(pass);
-
-        EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
-		   RSTRING(pass)->ptr, RSTRING(pass)->len, 1, key, NULL);
-        if (EVP_CipherInit(ctx, NULL, key, iv, -1) != 1) {
-            ossl_raise(eCipherError, NULL);
-        }
-    }
-
-    return self;
-}
-
-static VALUE 
-ossl_cipher_update(VALUE self, VALUE data)
-{
-    EVP_CIPHER_CTX *ctx;
-    char *in;
-    int in_len, out_len;
-    VALUE str;
-
-    GetCipher(self, ctx);
-    StringValue(data);
-    in = RSTRING(data)->ptr;
-    in_len = RSTRING(data)->len;
-    str = rb_str_new(0, in_len+EVP_CIPHER_CTX_block_size(ctx));
-    if (!EVP_CipherUpdate(ctx, RSTRING(str)->ptr, &out_len, in, in_len))
-	ossl_raise(eCipherError, NULL);
-    assert(out_len < RSTRING(str)->len);
-    RSTRING(str)->len = out_len;
-    RSTRING(str)->ptr[out_len] = 0;
-
-    return str;
-}
-
-static VALUE 
-ossl_cipher_final(VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-    int out_len;
-    VALUE str;
-
-    GetCipher(self, ctx);
-    str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx));
-    if (!EVP_CipherFinal(ctx, RSTRING(str)->ptr, &out_len))
-	ossl_raise(eCipherError, NULL);
-    assert(out_len <= RSTRING(str)->len);
-    RSTRING(str)->len = out_len;
-    RSTRING(str)->ptr[out_len] = 0;
-
-    return str;
-}
-
-static VALUE
-ossl_cipher_name(VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    GetCipher(self, ctx);
-
-    return rb_str_new2(EVP_CIPHER_name(EVP_CIPHER_CTX_cipher(ctx)));
-}
-
-static VALUE
-ossl_cipher_set_key(VALUE self, VALUE key)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    StringValue(key);
-    GetCipher(self, ctx);
-
-    if (RSTRING(key)->len < EVP_CIPHER_CTX_key_length(ctx))
-        ossl_raise(eCipherError, "key length too short");
-
-    if (EVP_CipherInit(ctx, NULL, RSTRING(key)->ptr, NULL, -1) != 1)
-        ossl_raise(eCipherError, NULL);
-
-    return key;
-}
-
-static VALUE
-ossl_cipher_set_iv(VALUE self, VALUE iv)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    StringValue(iv);
-    GetCipher(self, ctx);
-
-    if (RSTRING(iv)->len < EVP_CIPHER_CTX_iv_length(ctx))
-        ossl_raise(eCipherError, "iv length too short");
-
-    if (EVP_CipherInit(ctx, NULL, NULL, RSTRING(iv)->ptr, -1) != 1)
-		ossl_raise(eCipherError, NULL);
-
-    return iv;
-}
-
-static VALUE
-ossl_cipher_set_padding(VALUE self, VALUE padding)
-{
-#if defined(HAVE_ST_FLAGS)
-    EVP_CIPHER_CTX *ctx;
-
-    GetCipher(self, ctx);
-
-    if (EVP_CIPHER_CTX_set_padding(ctx, NUM2INT(padding)) != 1)
-		ossl_raise(eCipherError, NULL);
-#else
-    rb_notimplement();
-#endif
-    return padding;
-}
-
-#define CIPHER_0ARG_INT(func)					\
-    static VALUE						\
-    ossl_cipher_##func(VALUE self)				\
-    {								\
-	EVP_CIPHER_CTX *ctx;					\
-	GetCipher(self, ctx);					\
-	return INT2NUM(EVP_CIPHER_##func(EVP_CIPHER_CTX_cipher(ctx)));	\
-    }
-CIPHER_0ARG_INT(key_length)
-CIPHER_0ARG_INT(iv_length)
-CIPHER_0ARG_INT(block_size)
-
-/*
- * INIT
- */
-void 
-Init_ossl_cipher(void)
-{
-    mCipher = rb_define_module_under(mOSSL, "Cipher");
-    eCipherError = rb_define_class_under(mOSSL, "CipherError", eOSSLError);
-    cCipher = rb_define_class_under(mCipher, "Cipher", rb_cObject);
-
-    rb_define_alloc_func(cCipher, ossl_cipher_alloc);
-    rb_define_method(cCipher, "initialize", ossl_cipher_initialize, 1);
-
-    rb_define_copy_func(cCipher, ossl_cipher_copy);
-
-    rb_define_method(cCipher, "reset", ossl_cipher_reset, 0);
-
-    rb_define_method(cCipher, "encrypt", ossl_cipher_encrypt, -1);
-    rb_define_method(cCipher, "decrypt", ossl_cipher_decrypt, -1);
-    rb_define_method(cCipher, "update", ossl_cipher_update, 1);
-    rb_define_alias(cCipher, "<<", "update");
-    rb_define_method(cCipher, "final", ossl_cipher_final, 0);
-
-    rb_define_method(cCipher, "name", ossl_cipher_name, 0);
-
-    rb_define_method(cCipher, "key=", ossl_cipher_set_key, 1);
-    rb_define_method(cCipher, "key_len", ossl_cipher_key_length, 0);
-/*
- * TODO
- * int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- */
-    rb_define_method(cCipher, "iv=", ossl_cipher_set_iv, 1);
-    rb_define_method(cCipher, "iv_len", ossl_cipher_iv_length, 0);
-
-    rb_define_method(cCipher, "block_size", ossl_cipher_block_size, 0);
-
-    rb_define_method(cCipher, "padding=", ossl_cipher_set_padding, 1);
-
-} /* Init_ossl_cipher */
-
diff --git a/ext/openssl/ossl_cipher.h b/ext/openssl/ossl_cipher.h
deleted file mode 100644
index 63c7a875e8..0000000000
--- a/ext/openssl/ossl_cipher.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_CIPHER_H_)
-#define _OSSL_CIPHER_H_
-
-extern VALUE mCipher;
-extern VALUE cCipher;
-extern VALUE eCipherError;
-
-const EVP_CIPHER *GetCipherPtr(VALUE);
-VALUE ossl_cipher_new(const EVP_CIPHER *);
-void Init_ossl_cipher(void);
-
-#endif /* _OSSL_CIPHER_H_ */
-
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
deleted file mode 100644
index 78fae970de..0000000000
--- a/ext/openssl/ossl_config.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapConfig(klass, obj, conf) do { \
-    if (!conf) { \
-	ossl_raise(rb_eRuntimeError, "Config wasn't intitialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, NCONF_free, conf); \
-} while (0)
-#define GetConfig(obj, conf) do { \
-    Data_Get_Struct(obj, CONF, conf); \
-    if (!conf) { \
-	ossl_raise(rb_eRuntimeError, "Config wasn't intitialized!"); \
-    } \
-} while (0)
-#define SafeGetConfig(obj, conf) do { \
-    OSSL_Check_Kind(obj, cConfig); \
-    GetConfig(obj, conf); \
-} while(0);
-
-/*
- * Classes
- */
-VALUE cConfig;
-VALUE eConfigError;
-
-/* 
- * Public 
- */
-
-static CONF *parse_config(VALUE, CONF*);
-
-CONF *
-GetConfigPtr(VALUE obj)
-{
-    CONF *conf;
-
-    SafeGetConfig(obj, conf);
-
-    return conf;
-}
-
-CONF *
-DupConfigPtr(VALUE obj)
-{
-    VALUE str;
-
-    OSSL_Check_Kind(obj, cConfig);
-    str = rb_funcall(obj, rb_intern("to_s"), 0);
-
-    return parse_config(str, NULL);
-}
-
-/*
- * Private
- */
-static CONF *
-parse_config(VALUE str, CONF *dst)
-{
-    CONF *conf;
-    BIO *bio;
-    long eline = -1;
-
-    bio = ossl_obj2bio(str);
-    conf = dst ? dst : NCONF_new(NULL);
-    if(!conf){
-	BIO_free(bio);
-	ossl_raise(eConfigError, NULL);
-    }
-    if(!NCONF_load_bio(conf, bio, &eline)){
-	BIO_free(bio);
-	if(!dst) NCONF_free(conf);
-	if (eline <= 0) ossl_raise(eConfigError, "wrong config format");
-	else ossl_raise(eConfigError, "error in line %d", eline);
-	ossl_raise(eConfigError, NULL);
-    }
-    BIO_free(bio);
-
-    return conf;
-}
-
-static VALUE
-ossl_config_s_parse(VALUE klass, VALUE str)
-{
-    CONF *conf;
-    VALUE obj;
-
-    conf = parse_config(str, NULL);
-    WrapConfig(klass, obj, conf);
-
-    return obj;
-}
-
-static VALUE
-ossl_config_s_alloc(VALUE klass)
-{
-    CONF *conf;
-    VALUE obj;
-
-    if(!(conf = NCONF_new(NULL)))
-	ossl_raise(eConfigError, NULL);
-    WrapConfig(klass, obj, conf);
-
-    return obj;
-}
-
-static VALUE
-ossl_config_copy(VALUE self, VALUE other)
-{
-    VALUE str;
-    CONF *conf;
-
-    GetConfig(other, conf);
-    str = rb_funcall(self, rb_intern("to_s"), 0);
-    parse_config(str, conf);
-
-    return self;
-}
-
-static VALUE
-ossl_config_initialize(int argc, VALUE *argv, VALUE self)
-{
-    CONF *conf;
-    long eline = -1;
-    char *filename;
-    VALUE path;
-
-    GetConfig(self, conf);
-    rb_scan_args(argc, argv, "01", &path);
-    if(!NIL_P(path)){
-	SafeStringValue(path);
-        filename = StringValuePtr(path);
-	if (!NCONF_load(conf, filename, &eline)){
-	    if (eline <= 0)
-		ossl_raise(eConfigError, "wrong config file %s", filename);
-	    else
-		ossl_raise(eConfigError, "error in %s:%d", filename, eline);
-        }
-    }
-#ifdef OSSL_NO_CONF_API
-    else rb_raise(rb_eArgError, "wrong number of arguments(0 for 1)");
-#else
-    else _CONF_new_data(conf);
-#endif
-    
-    return self;
-}
-
-static VALUE
-ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
-{
-#ifdef OSSL_NO_CONF_API
-    rb_notimplement();
-#else
-    CONF *conf;
-    CONF_VALUE *sv, *cv;
-
-    GetConfig(self, conf);
-    StringValue(section);
-    StringValue(name);
-    StringValue(value);
-    if(!(sv = _CONF_get_section(conf, RSTRING(section)->ptr))){
-	if(!(sv = _CONF_new_section(conf, RSTRING(section)->ptr))){
-	    ossl_raise(eConfigError, NULL);
-	}
-    }
-    if(!(cv = OPENSSL_malloc(sizeof(CONF_VALUE)))){
-	ossl_raise(eConfigError, NULL);
-    }
-    cv->name = BUF_strdup(RSTRING(name)->ptr);
-    cv->value = BUF_strdup(RSTRING(value)->ptr);
-    if(!cv->name || !cv->value || !_CONF_add_string(conf, sv, cv)){
-	OPENSSL_free(cv->name);
-	OPENSSL_free(cv->value);
-	OPENSSL_free(cv);
-	ossl_raise(eConfigError, "_CONF_add_string failure");
-    }
-    
-    return value;
-#endif
-}
-
-static VALUE
-ossl_config_get_value(VALUE self, VALUE section, VALUE name)
-{
-    CONF *conf;
-    char *str;
-
-    GetConfig(self, conf);
-    StringValue(section);
-    StringValue(name);
-    str = NCONF_get_string(conf, RSTRING(section)->ptr, RSTRING(name)->ptr);
-    if(!str) ossl_raise(eConfigError, NULL);
-
-    return rb_str_new2(str);
-}
-
-static VALUE
-ossl_config_get_value_old(int argc, VALUE *argv, VALUE self)
-{
-    VALUE section, name;
-    
-    rb_scan_args(argc, argv, "11", &section, &name);
-
-    /* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */
-    if (NIL_P(section)) section = rb_str_new2("");
-    /* support conf.value("HOME") -> conf.get_value("", "HOME") */
-    if (NIL_P(name)) {
-	name = section;
-	section = rb_str_new2("");
-    }
-    /* NOTE: Don't care about conf.get_value(nil, nil) */
-    rb_warn("Config#value is deprecated; use Config#get_value");
-    return ossl_config_get_value(self, section, name);
-}
-
-static VALUE
-set_conf_section_i(VALUE i, VALUE *arg)
-{
-    VALUE name, value;
-
-    Check_Type(i, T_ARRAY);
-    name = rb_ary_entry(i, 0);
-    value = rb_ary_entry(i, 1);
-    ossl_config_add_value(arg[0], arg[1], name, value);
-
-    return Qnil;
-}
-
-static VALUE
-ossl_config_set_section(VALUE self, VALUE section, VALUE hash)
-{
-    VALUE arg[2] = { self, section };
-    rb_iterate(rb_each, hash, set_conf_section_i, (VALUE)arg);
-    return hash;
-}
-
-/*
- * Get all numbers as strings - use str.to_i to convert
- * long number = CONF_get_number(confp->config, sect, StringValuePtr(item));
- */
-static VALUE
-ossl_config_get_section(VALUE self, VALUE section)
-{
-    CONF *conf;
-    STACK_OF(CONF_VALUE) *sk;
-    CONF_VALUE *entry;
-    int i, entries;
-    VALUE hash;
-
-    GetConfig(self, conf);
-    if (!(sk = NCONF_get_section(conf, StringValuePtr(section)))) {
-	ossl_raise(eConfigError, NULL);
-    }
-    hash = rb_hash_new();
-    if ((entries = sk_CONF_VALUE_num(sk)) < 0) {
-	OSSL_Debug("# of items in section is < 0?!?");
-	return hash;
-    }
-    for (i=0; i<entries; i++) {
-	entry = sk_CONF_VALUE_value(sk, i);		
-	rb_hash_aset(hash, rb_str_new2(entry->name), rb_str_new2(entry->value));
-    }
-
-    return hash;
-}
-
-static VALUE
-ossl_config_get_section_old(VALUE self, VALUE section)
-{
-    rb_warn("Config#section is deprecated; use Config#[]");
-    return ossl_config_get_section(self, section);
-}
-
-#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN
-static void
-get_conf_section(CONF_VALUE *cv, VALUE ary)
-{
-    if(cv->name) return;
-    rb_ary_push(ary, rb_str_new2(cv->section));
-}
-
-static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE);
-
-static VALUE
-ossl_config_get_sections(VALUE self)
-{
-    CONF *conf;
-    VALUE ary;
-
-    GetConfig(self, conf);
-    ary = rb_ary_new();
-    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary);
-
-    return ary;
-}
-#else
-static VALUE
-ossl_config_get_sections(VALUE self)
-{
-    rb_warn("Config::sections don't work with %s", OPENSSL_VERSION_TEXT);
-    return rb_ary_new();
-}
-#endif
-
-#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN
-static void
-dump_conf_value(CONF_VALUE *cv, VALUE str)
-{
-    STACK_OF(CONF_VALUE) *sk;
-    CONF_VALUE *v;
-    int i, num;
-
-    if (cv->name) return;
-    sk = (STACK_OF(CONF_VALUE)*)cv->value;
-    num = sk_CONF_VALUE_num(sk);
-    rb_str_cat2(str, "[ ");
-    rb_str_cat2(str, cv->section);
-    rb_str_cat2(str, " ]\n");
-    for(i = 0; i < num; i++){
-	v = sk_CONF_VALUE_value(sk, i);
-	rb_str_cat2(str, v->name ? v->name : "None");
-	rb_str_cat2(str, "=");
-	rb_str_cat2(str, v->value ? v->value : "None");
-	rb_str_cat2(str, "\n");
-    }
-    rb_str_cat2(str, "\n");
-}
-
-static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE);
-
-static VALUE
-dump_conf(CONF *conf)
-{
-    VALUE str;
-
-    str = rb_str_new(0, 0);
-    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str);
-
-    return str;
-}
-
-static VALUE
-ossl_config_to_s(VALUE self)
-{
-    CONF *conf;
-
-    GetConfig(self, conf);
-
-    return dump_conf(conf);
-}
-#else
-static VALUE
-ossl_config_to_s(VALUE self)
-{
-    rb_warn("Config::to_s don't work with %s", OPENSSL_VERSION_TEXT);
-    return rb_str_new(0, 0);
-}
-#endif
-
-static VALUE
-ossl_config_inspect(VALUE self)
-{
-    VALUE str, ary = ossl_config_get_sections(self);
-    char *cname = rb_class2name(rb_obj_class(self));
-
-    str = rb_str_new2("#<");
-    rb_str_cat2(str, cname);
-    rb_str_cat2(str, " sections=");
-    rb_str_append(str, rb_inspect(ary));
-    rb_str_cat2(str, ">");
-
-    return str;
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_config()
-{
-    eConfigError = rb_define_class_under(mOSSL, "ConfigError", eOSSLError);
-    cConfig = rb_define_class_under(mOSSL, "Config", rb_cObject);
-
-    rb_define_const(cConfig, "DEFAULT_CONFIG_FILE",
-		    rb_str_new2(CONF_get1_default_config_file()));
-    rb_define_singleton_method(cConfig, "parse", ossl_config_s_parse, 1);
-    rb_define_alias(CLASS_OF(cConfig), "load", "new");
-    rb_define_alloc_func(cConfig, ossl_config_s_alloc);
-    rb_define_copy_func(cConfig, ossl_config_copy);
-    rb_define_method(cConfig, "initialize", ossl_config_initialize, -1);
-    rb_define_method(cConfig, "get_value", ossl_config_get_value, 2);
-    rb_define_method(cConfig, "value", ossl_config_get_value_old, -1);
-    rb_define_method(cConfig, "add_value", ossl_config_add_value, 3);
-    rb_define_method(cConfig, "[]", ossl_config_get_section, 1);
-    rb_define_method(cConfig, "section", ossl_config_get_section_old, 1);
-    rb_define_method(cConfig, "[]=", ossl_config_set_section, 2);
-    rb_define_method(cConfig, "sections", ossl_config_get_sections, 0);
-    rb_define_method(cConfig, "to_s", ossl_config_to_s, 0);
-    rb_define_method(cConfig, "inspect", ossl_config_inspect, 0);
-}
diff --git a/ext/openssl/ossl_config.h b/ext/openssl/ossl_config.h
deleted file mode 100644
index cb226b27e5..0000000000
--- a/ext/openssl/ossl_config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_CONFIG_H_)
-#define _OSSL_CONFIG_H_
-
-extern VALUE cConfig;
-extern VALUE eConfigError;
-
-CONF* GetConfigPtr(VALUE obj);
-CONF* DupConfigPtr(VALUE obj);
-void Init_ossl_config(void);
-
-#endif /* _OSSL_CONFIG_H_ */
-
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
deleted file mode 100644
index b117ddd30d..0000000000
--- a/ext/openssl/ossl_digest.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define GetDigest(obj, ctx) do { \
-    Data_Get_Struct(obj, EVP_MD_CTX, ctx); \
-    if (!ctx) { \
-	ossl_raise(rb_eRuntimeError, "Digest CTX wasn't initialized!"); \
-    } \
-} while (0)
-#define SafeGetDigest(obj, ctx) do { \
-    OSSL_Check_Kind(obj, cDigest); \
-    GetDigest(obj, ctx); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE mDigest;
-VALUE cDigest;
-VALUE eDigestError;
-
-static VALUE ossl_digest_alloc(VALUE klass);
-
-/*
- * Public
- */
-const EVP_MD *
-GetDigestPtr(VALUE obj)
-{
-    EVP_MD_CTX *ctx;
-
-    SafeGetDigest(obj, ctx);
-
-    return EVP_MD_CTX_md(ctx); /*== ctx->digest*/
-}
-
-VALUE
-ossl_digest_new(const EVP_MD *md)
-{  
-    VALUE ret;
-    EVP_MD_CTX *ctx;
-
-    ret = ossl_digest_alloc(cDigest);
-    GetDigest(ret, ctx);
-    EVP_MD_CTX_init(ctx);
-    EVP_DigestInit(ctx, md);
-   
-    return ret;
-}
-
-/*
- * Private
- */
-static VALUE
-ossl_digest_alloc(VALUE klass)
-{
-    EVP_MD_CTX *ctx;
-    VALUE obj;
-
-    ctx = EVP_MD_CTX_create();
-    if (ctx == NULL)
-	ossl_raise(rb_eRuntimeError, "EVP_MD_CTX_create() failed");
-    obj = Data_Wrap_Struct(klass, 0, EVP_MD_CTX_destroy, ctx);
-	
-    return obj;
-}
-
-VALUE ossl_digest_update(VALUE, VALUE);
-
-static VALUE
-ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
-{
-    EVP_MD_CTX *ctx;
-    const EVP_MD *md;
-    char *name;
-    VALUE type, data;
-
-    GetDigest(self, ctx);
-
-    rb_scan_args(argc, argv, "11", &type, &data);
-    name = StringValuePtr(type);
-    if (!NIL_P(data)) StringValue(data);
-    
-    md = EVP_get_digestbyname(name);
-    if (!md) {
-	ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
-    }
-    EVP_MD_CTX_init(ctx);
-    EVP_DigestInit(ctx, md);
-    
-    if (!NIL_P(data)) return ossl_digest_update(self, data);
-    return self;
-}
-
-static VALUE
-ossl_digest_copy(VALUE self, VALUE other)
-{
-    EVP_MD_CTX *ctx1, *ctx2;
-    
-    rb_check_frozen(self);
-    if (self == other) return self;
-
-    GetDigest(self, ctx1);
-    SafeGetDigest(other, ctx2);
-
-    if (!EVP_MD_CTX_copy(ctx1, ctx2)) {
-	ossl_raise(eDigestError, NULL);
-    }
-    return self;
-}
-
-static VALUE
-ossl_digest_reset(VALUE self)
-{
-    EVP_MD_CTX *ctx;
-
-    GetDigest(self, ctx);
-    EVP_DigestInit(ctx, EVP_MD_CTX_md(ctx));
-
-    return self;
-}
-
-VALUE
-ossl_digest_update(VALUE self, VALUE data)
-{
-    EVP_MD_CTX *ctx;
-
-    GetDigest(self, ctx);
-    StringValue(data);
-    EVP_DigestUpdate(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
-
-    return self;
-}
-
-static void
-digest_final(EVP_MD_CTX *ctx, char **buf, int *buf_len)
-{
-    EVP_MD_CTX final;
-
-    if (!EVP_MD_CTX_copy(&final, ctx)) {
-	ossl_raise(eDigestError, NULL);
-    }
-    if (!(*buf = OPENSSL_malloc(EVP_MD_CTX_size(&final)))) {
-	ossl_raise(eDigestError, "Cannot allocate mem for digest");
-    }
-    EVP_DigestFinal(&final, *buf, buf_len);
-    EVP_MD_CTX_cleanup(&final);
-}
-
-static VALUE
-ossl_digest_digest(VALUE self)
-{
-    EVP_MD_CTX *ctx;
-    char *buf;
-    int buf_len;
-    VALUE digest;
-	
-    GetDigest(self, ctx);
-    digest_final(ctx, &buf, &buf_len);
-    digest = ossl_buf2str(buf, buf_len);
-	
-    return digest;
-}
-
-static VALUE
-ossl_digest_hexdigest(VALUE self)
-{
-    EVP_MD_CTX *ctx;
-    char *buf, *hexbuf;
-    int buf_len;
-    VALUE hexdigest;
-
-    GetDigest(self, ctx);
-    digest_final(ctx, &buf, &buf_len);
-    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
-	OPENSSL_free(buf);
-	ossl_raise(eDigestError, "Memory alloc error");
-    }
-    OPENSSL_free(buf);
-    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
-
-    return hexdigest;
-}
-
-static VALUE
-ossl_digest_s_digest(VALUE klass, VALUE str, VALUE data)
-{
-    VALUE obj = rb_class_new_instance(1, &str, klass);
-
-    ossl_digest_update(obj, data);
-
-    return ossl_digest_digest(obj);
-}
-
-static VALUE
-ossl_digest_s_hexdigest(VALUE klass, VALUE str, VALUE data)
-{
-    VALUE obj = rb_class_new_instance(1, &str, klass);
-
-    ossl_digest_update(obj, data);
-
-    return ossl_digest_hexdigest(obj);
-}
-
-static VALUE
-ossl_digest_equal(VALUE self, VALUE other)
-{
-    EVP_MD_CTX *ctx;
-    VALUE str1, str2;
-
-    GetDigest(self, ctx);
-    if (rb_obj_is_kind_of(other, cDigest) == Qtrue) {
-	str2 = ossl_digest_digest(other);
-    } else {
-	StringValue(other);
-	str2 = other;
-    }
-    if (RSTRING(str2)->len == EVP_MD_CTX_size(ctx)) {
-	str1 = ossl_digest_digest(self);
-    } else {
-	str1 = ossl_digest_hexdigest(self);
-    }
-    if (RSTRING(str1)->len == RSTRING(str2)->len
-	&& rb_str_cmp(str1, str2) == 0) {
-	return Qtrue;
-    }
-
-    return Qfalse;
-}
-
-static VALUE
-ossl_digest_name(VALUE self)
-{
-    EVP_MD_CTX *ctx;
-
-    GetDigest(self, ctx);
-
-    return rb_str_new2(EVP_MD_name(EVP_MD_CTX_md(ctx)));
-}
-
-static VALUE
-ossl_digest_size(VALUE self)
-{
-    EVP_MD_CTX *ctx;
-
-    GetDigest(self, ctx);
-
-    return INT2NUM(EVP_MD_CTX_size(ctx));
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_digest()
-{
-    mDigest = rb_define_module_under(mOSSL, "Digest");
-	
-    eDigestError = rb_define_class_under(mDigest, "DigestError", eOSSLError);
-	
-    cDigest = rb_define_class_under(mDigest, "Digest", rb_cObject);
-	
-    rb_define_alloc_func(cDigest, ossl_digest_alloc);
-    rb_define_singleton_method(cDigest, "digest", ossl_digest_s_digest, 2);
-    rb_define_singleton_method(cDigest, "hexdigest", ossl_digest_s_hexdigest, 2);
-	
-    rb_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
-    rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
-    
-    rb_define_copy_func(cDigest, ossl_digest_copy);
-    
-    rb_define_method(cDigest, "digest", ossl_digest_digest, 0);
-    rb_define_method(cDigest, "hexdigest", ossl_digest_hexdigest, 0);
-    rb_define_alias(cDigest, "inspect", "hexdigest");
-    rb_define_alias(cDigest, "to_s", "hexdigest");
-    
-    rb_define_method(cDigest, "update", ossl_digest_update, 1);
-    rb_define_alias(cDigest, "<<", "update");
-    
-    rb_define_method(cDigest, "==", ossl_digest_equal, 1);
-    
-    rb_define_method(cDigest, "name", ossl_digest_name, 0);
-    rb_define_method(cDigest, "size", ossl_digest_size, 0);
-}
diff --git a/ext/openssl/ossl_digest.h b/ext/openssl/ossl_digest.h
deleted file mode 100644
index 8a1f7964f2..0000000000
--- a/ext/openssl/ossl_digest.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_DIGEST_H_)
-#define _OSSL_DIGEST_H_
-
-extern VALUE mDigest;
-extern VALUE cDigest;
-extern VALUE eDigestError;
-
-const EVP_MD *GetDigestPtr(VALUE);
-VALUE ossl_digest_new(const EVP_MD *);
-void Init_ossl_digest(void);
-
-#endif /* _OSSL_DIGEST_H_ */
-
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
deleted file mode 100644
index 91025941b9..0000000000
--- a/ext/openssl/ossl_engine.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#if defined(OSSL_ENGINE_ENABLED)
-
-#define WrapEngine(klass, obj, engine) do { \
-    if (!engine) { \
-	ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, ENGINE_free, engine); \
-} while(0)
-#define GetEngine(obj, engine) do { \
-    Data_Get_Struct(obj, ENGINE, engine); \
-    if (!engine) { \
-        ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
-    } \
-} while (0)
-#define SafeGetEngine(obj, engine) do { \
-    OSSL_Check_Kind(obj, cEngine); \
-    GetPKCS7(obj, engine); \
-} while (0)
-
-/* 
- * Classes
- */
-VALUE cEngine;
-VALUE eEngineError;
-
-/*
- * Private
- */
-#define OSSL_ENGINE_LOAD_IF_MATCH(x) \
-do{\
-  if(!strcmp(#x, RSTRING(name)->ptr)){\
-    ENGINE_load_##x();\
-    return Qtrue;\
-  }\
-}while(0)
-
-static VALUE
-ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
-{
-#if !defined(HAVE_ENGINE_LOAD_BUILTIN_ENGINES)
-    return Qnil;
-#else
-    VALUE name;
-
-    rb_scan_args(argc, argv, "01", &name);
-    if(NIL_P(name)) ENGINE_load_builtin_engines();
-    StringValue(name);
-    OSSL_ENGINE_LOAD_IF_MATCH(openssl);
-    OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
-    OSSL_ENGINE_LOAD_IF_MATCH(cswift);
-    OSSL_ENGINE_LOAD_IF_MATCH(chil);
-    OSSL_ENGINE_LOAD_IF_MATCH(atalla);
-    OSSL_ENGINE_LOAD_IF_MATCH(nuron);
-    OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
-    OSSL_ENGINE_LOAD_IF_MATCH(aep);
-    OSSL_ENGINE_LOAD_IF_MATCH(sureware);
-    OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
-#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
-    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
-#endif
-    rb_raise(eEngineError, "no such engine `%s'", RSTRING(name)->ptr);
-#endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
-}
-
-static VALUE
-ossl_engine_s_cleanup(VALUE self)
-{
-#if defined(HAVE_ENGINE_CLEANUP)
-    ENGINE_cleanup();
-#endif
-    return Qnil;
-}
-
-static VALUE
-ossl_engine_s_engines(VALUE klass)
-{
-    ENGINE *e;
-    VALUE ary, obj;
-
-    ary = rb_ary_new();
-    for(e = ENGINE_get_first(); e; e = ENGINE_get_next(e)){
-        WrapEngine(klass, obj, e);
-        rb_ary_push(ary, obj);
-    }
-
-    return ary;
-}
-
-static VALUE
-ossl_engine_s_by_id(VALUE klass, VALUE id)
-{
-    ENGINE *e;
-    VALUE obj;
-
-    StringValue(id);
-    ossl_engine_s_load(1, &id, klass);
-    if(!(e = ENGINE_by_id(RSTRING(id)->ptr)))
-	ossl_raise(eEngineError, NULL);
-    if(!ENGINE_init(e))
-	ossl_raise(eEngineError, NULL);
-    ENGINE_ctrl(e, ENGINE_CTRL_SET_PASSWORD_CALLBACK,
-		0, NULL, (void(*)())ossl_pem_passwd_cb);
-    ERR_clear_error();
-    WrapEngine(klass, obj, e);
-
-    return obj;
-}
-
-static VALUE
-ossl_engine_s_alloc(VALUE klass)
-{
-    ENGINE *e;
-    VALUE obj;
-
-    if (!(e = ENGINE_new())) {
-       ossl_raise(eEngineError, NULL);
-    }
-    WrapEngine(klass, obj, e);
-
-    return obj;
-}
-
-static VALUE
-ossl_engine_get_id(VALUE self)
-{
-    ENGINE *e;
-    GetEngine(self, e);
-    return rb_str_new2(ENGINE_get_id(e));
-}
-
-static VALUE
-ossl_engine_get_name(VALUE self)
-{
-    ENGINE *e;
-    GetEngine(self, e);
-    return rb_str_new2(ENGINE_get_name(e));
-}
-
-static VALUE
-ossl_engine_finish(VALUE self)
-{
-    ENGINE *e;
-
-    GetEngine(self, e);
-    if(!ENGINE_finish(e)) ossl_raise(eEngineError, NULL);
-
-    return Qnil;
-}
-
-static VALUE
-ossl_engine_get_cipher(VALUE self, VALUE name)
-{
-#if defined(HAVE_ENGINE_GET_CIPHER)
-    ENGINE *e;
-    const EVP_CIPHER *ciph, *tmp;
-    char *s;
-    int nid;
-
-    s = StringValuePtr(name);
-    tmp = EVP_get_cipherbyname(s);
-    if(!tmp) ossl_raise(eEngineError, "no such cipher `%s'", s);
-    nid = EVP_CIPHER_nid(tmp);
-    GetEngine(self, e);
-    ciph = ENGINE_get_cipher(e, nid);
-    if(!ciph) ossl_raise(eEngineError, NULL);
-
-    return ossl_cipher_new(ciph);
-#else
-    rb_notimplement();
-#endif
-}
-
-static VALUE
-ossl_engine_get_digest(VALUE self, VALUE name)
-{
-#if defined(HAVE_ENGINE_GET_DIGEST)
-    ENGINE *e;
-    const EVP_MD *md, *tmp;
-    char *s;
-    int nid;
-
-    s = StringValuePtr(name);
-    tmp = EVP_get_digestbyname(s);
-    if(!tmp) ossl_raise(eEngineError, "no such digest `%s'", s);
-    nid = EVP_MD_nid(tmp);
-    GetEngine(self, e);
-    md = ENGINE_get_digest(e, nid);
-    if(!md) ossl_raise(eEngineError, NULL);
-
-    return ossl_digest_new(md);
-#else
-    rb_notimplement();
-#endif
-}
-
-static VALUE
-ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
-{
-    ENGINE *e;
-    EVP_PKEY *pkey;
-    VALUE id, data;
-    char *sid, *sdata;
-
-    rb_scan_args(argc, argv, "11", &id, &data);
-    sid = StringValuePtr(id);
-    sdata = NIL_P(data) ? NULL : StringValuePtr(data);
-    GetEngine(self, e);
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
-    pkey = ENGINE_load_private_key(e, sid, sdata);
-#else
-    pkey = ENGINE_load_private_key(e, sid, NULL, sdata);
-#endif
-    if (!pkey) ossl_raise(eEngineError, NULL);
-
-    return ossl_pkey_new(pkey);
-}
-
-static VALUE
-ossl_engine_load_pubkey(int argc, VALUE *argv, VALUE self)
-{
-    ENGINE *e;
-    EVP_PKEY *pkey;
-    VALUE id, data;
-    char *sid, *sdata;
-
-    rb_scan_args(argc, argv, "11", &id, &data);
-    sid = StringValuePtr(id);
-    sdata = NIL_P(data) ? NULL : StringValuePtr(data);
-    GetEngine(self, e);
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
-    pkey = ENGINE_load_public_key(e, sid, sdata);
-#else
-    pkey = ENGINE_load_public_key(e, sid, NULL, sdata);
-#endif
-    if (!pkey) ossl_raise(eEngineError, NULL);
-
-    return ossl_pkey_new(pkey);
-}
-
-static VALUE
-ossl_engine_set_default(VALUE self, VALUE flag)
-{
-    ENGINE *e;
-
-    GetEngine(self, e);
-    ENGINE_set_default(e, NUM2INT(flag));
-
-    return Qtrue;
-}
-
-static VALUE
-ossl_engine_inspect(VALUE self)
-{
-    VALUE str;
-    char *cname = rb_class2name(rb_obj_class(self));
-    
-    str = rb_str_new2("#<");
-    rb_str_cat2(str, cname);
-    rb_str_cat2(str, " id=\"");
-    rb_str_append(str, ossl_engine_get_id(self));
-    rb_str_cat2(str, "\" name=\"");
-    rb_str_append(str, ossl_engine_get_name(self));
-    rb_str_cat2(str, "\">");
-
-    return str;
-}
-
-#define DefEngineConst(x) rb_define_const(cEngine, #x, INT2NUM(ENGINE_##x))
-
-void
-Init_ossl_engine()
-{
-    cEngine = rb_define_class_under(mOSSL, "Engine", rb_cObject);
-    eEngineError = rb_define_class_under(cEngine, "EngineError", eOSSLError);
-
-    rb_define_alloc_func(cEngine, ossl_engine_s_alloc);
-    rb_define_singleton_method(cEngine, "load", ossl_engine_s_load, -1);
-    rb_define_singleton_method(cEngine, "cleanup", ossl_engine_s_cleanup, 0);
-    rb_define_singleton_method(cEngine, "engines", ossl_engine_s_engines, 0);
-    rb_define_singleton_method(cEngine, "by_id", ossl_engine_s_by_id, 1);
-    rb_undef_method(CLASS_OF(cEngine), "new");
-
-    rb_define_method(cEngine, "id", ossl_engine_get_id, 0);
-    rb_define_method(cEngine, "name", ossl_engine_get_name, 0);
-    rb_define_method(cEngine, "finish", ossl_engine_finish, 0);
-    rb_define_method(cEngine, "cipher", ossl_engine_get_cipher, 1);
-    rb_define_method(cEngine, "digest",  ossl_engine_get_digest, 1);
-    rb_define_method(cEngine, "load_private_key", ossl_engine_load_privkey, -1);
-    rb_define_method(cEngine, "load_public_key", ossl_engine_load_pubkey, -1);
-    rb_define_method(cEngine, "set_default", ossl_engine_set_default, 1);
-    rb_define_method(cEngine, "inspect", ossl_engine_inspect, 0);
-
-    DefEngineConst(METHOD_RSA);
-    DefEngineConst(METHOD_DSA);
-    DefEngineConst(METHOD_DH);
-    DefEngineConst(METHOD_RAND);
-#ifdef ENGINE_METHOD_BN_MOD_EXP
-    DefEngineConst(METHOD_BN_MOD_EXP);
-#endif
-#ifdef ENGINE_METHOD_BN_MOD_EXP_CRT
-    DefEngineConst(METHOD_BN_MOD_EXP_CRT);
-#endif
-#ifdef ENGINE_METHOD_CIPHERS
-    DefEngineConst(METHOD_CIPHERS);
-#endif
-#ifdef ENGINE_METHOD_DIGESTS
-    DefEngineConst(METHOD_DIGESTS);
-#endif
-    DefEngineConst(METHOD_ALL);
-    DefEngineConst(METHOD_NONE);
-}
-#else
-void
-Init_ossl_engine()
-{
-}
-#endif
diff --git a/ext/openssl/ossl_engine.h b/ext/openssl/ossl_engine.h
deleted file mode 100644
index ea2f256912..0000000000
--- a/ext/openssl/ossl_engine.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
- * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(OSSL_ENGINE_H)
-#define OSSL_ENGINE_H
-
-extern VALUE cEngine;
-extern VALUE eEngineError;
-
-void Init_ossl_engine(void);
-
-#endif /* OSSL_ENGINE_H */
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
deleted file mode 100644
index 0b4d8d9b54..0000000000
--- a/ext/openssl/ossl_hmac.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(OPENSSL_NO_HMAC)
-
-#include "ossl.h"
-
-#define MakeHMAC(obj, klass, ctx) \
-    obj = Data_Make_Struct(klass, HMAC_CTX, 0, ossl_hmac_free, ctx)
-#define GetHMAC(obj, ctx) do { \
-    Data_Get_Struct(obj, HMAC_CTX, ctx); \
-    if (!ctx) { \
-	ossl_raise(rb_eRuntimeError, "HMAC wasn't initialized"); \
-    } \
-} while (0)
-#define SafeGetHMAC(obj, ctx) do { \
-    OSSL_Check_Kind(obj, cHMAC); \
-    GetHMAC(obj, ctx); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cHMAC;
-VALUE eHMACError;
-
-/*
- * Public
- */
-
-/*
- * Private
- */
-static void
-ossl_hmac_free(HMAC_CTX *ctx)
-{
-	HMAC_CTX_cleanup(ctx);
-	free(ctx);
-}
-
-static VALUE
-ossl_hmac_alloc(VALUE klass)
-{
-    HMAC_CTX *ctx;
-    VALUE obj;
-
-    MakeHMAC(obj, klass, ctx);
-	
-    return obj;
-}
-
-static VALUE
-ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
-{
-    HMAC_CTX *ctx;
-
-    GetHMAC(self, ctx);
-    StringValue(key);
-    HMAC_CTX_init(ctx);
-    HMAC_Init(ctx, RSTRING(key)->ptr, RSTRING(key)->len, GetDigestPtr(digest));
-
-    return self;
-}
-
-static VALUE
-ossl_hmac_copy(VALUE self, VALUE other)
-{
-    HMAC_CTX *ctx1, *ctx2;
-    
-    rb_check_frozen(self);
-    if (self == other) return self;
-
-    GetHMAC(self, ctx1);
-    SafeGetHMAC(other, ctx2);
-
-    if (!HMAC_CTX_copy(ctx1, ctx2)) {
-	ossl_raise(eHMACError, NULL);
-    }
-    return self;
-}
-
-static VALUE
-ossl_hmac_update(VALUE self, VALUE data)
-{
-    HMAC_CTX *ctx;
-
-    GetHMAC(self, ctx);
-    StringValue(data);
-    HMAC_Update(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
-
-    return self;
-}
-
-static void
-hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
-{
-    HMAC_CTX final;
-
-    if (!HMAC_CTX_copy(&final, ctx)) {
-	ossl_raise(eHMACError, NULL);
-    }
-    if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
-	OSSL_Debug("Allocating %d mem", HMAC_size(&final));
-	ossl_raise(eHMACError, "Cannot allocate memory for hmac");
-    }
-    HMAC_Final(&final, *buf, buf_len);
-    HMAC_CTX_cleanup(&final);
-}
-
-static VALUE
-ossl_hmac_digest(VALUE self)
-{
-    HMAC_CTX *ctx;
-    char *buf;
-    int buf_len;
-    VALUE digest;
-	
-    GetHMAC(self, ctx);
-    hmac_final(ctx, &buf, &buf_len);
-    digest = ossl_buf2str(buf, buf_len);
-    
-    return digest;
-}
-
-static VALUE
-ossl_hmac_hexdigest(VALUE self)
-{
-    HMAC_CTX *ctx;
-    char *buf, *hexbuf;
-    int buf_len;
-    VALUE hexdigest;
-	
-    GetHMAC(self, ctx);
-    hmac_final(ctx, &buf, &buf_len);
-    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
-	OPENSSL_free(buf);
-	ossl_raise(eHMACError, "Memory alloc error");
-    }
-    OPENSSL_free(buf);
-    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
-
-    return hexdigest;
-}
-
-static VALUE
-ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
-{
-    char *buf;
-    int buf_len;
-	
-    StringValue(key);
-    StringValue(data);
-    buf = HMAC(GetDigestPtr(digest), RSTRING(key)->ptr, RSTRING(key)->len,
-	       RSTRING(data)->ptr, RSTRING(data)->len, NULL, &buf_len);
-
-    return rb_str_new(buf, buf_len);
-}
-
-static VALUE
-ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
-{
-    char *buf, *hexbuf;
-    int buf_len;
-    VALUE hexdigest;
-
-    StringValue(key);
-    StringValue(data);
-	
-    buf = HMAC(GetDigestPtr(digest), RSTRING(key)->ptr, RSTRING(key)->len,
-	       RSTRING(data)->ptr, RSTRING(data)->len, NULL, &buf_len);
-    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
-	ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
-    }
-    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
-
-    return hexdigest;
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_hmac()
-{
-    eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError);
-	
-    cHMAC = rb_define_class_under(mOSSL, "HMAC", rb_cObject);
-
-    rb_define_alloc_func(cHMAC, ossl_hmac_alloc);
-    rb_define_singleton_method(cHMAC, "digest", ossl_hmac_s_digest, 3);
-    rb_define_singleton_method(cHMAC, "hexdigest", ossl_hmac_s_hexdigest, 3);
-    
-    rb_define_method(cHMAC, "initialize", ossl_hmac_initialize, 2);
-    rb_define_copy_func(cHMAC, ossl_hmac_copy);
-
-    rb_define_method(cHMAC, "update", ossl_hmac_update, 1);
-    rb_define_alias(cHMAC, "<<", "update");
-    rb_define_method(cHMAC, "digest", ossl_hmac_digest, 0);
-    rb_define_method(cHMAC, "hexdigest", ossl_hmac_hexdigest, 0);
-    rb_define_alias(cHMAC, "inspect", "hexdigest");
-    rb_define_alias(cHMAC, "to_s", "hexdigest");
-}
-
-#else /* NO_HMAC */
-#  warning >>> OpenSSL is compiled without HMAC support <<<
-void
-Init_ossl_hmac()
-{
-    rb_warning("HMAC will NOT be avaible: OpenSSL is compiled without HMAC.");
-}
-#endif /* NO_HMAC */
diff --git a/ext/openssl/ossl_hmac.h b/ext/openssl/ossl_hmac.h
deleted file mode 100644
index 1a2978b39a..0000000000
--- a/ext/openssl/ossl_hmac.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_HMAC_H_)
-#define _OSSL_HMAC_H_
-
-extern VALUE cHMAC;
-extern VALUE eHMACError;
-
-void Init_ossl_hmac(void);
-
-#endif /* _OSSL_HMAC_H_ */
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
deleted file mode 100644
index 9aed773edc..0000000000
--- a/ext/openssl/ossl_ns_spki.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapSPKI(klass, obj, spki) do { \
-    if (!spki) { \
-	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, NETSCAPE_SPKI_free, spki); \
-} while (0)
-#define GetSPKI(obj, spki) do { \
-    Data_Get_Struct(obj, NETSCAPE_SPKI, spki); \
-    if (!spki) { \
-	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
-    } \
-} while (0)
-
-/*
- * Classes
- */
-VALUE mNetscape;
-VALUE cSPKI;
-VALUE eSPKIError;
-
-/*
- * Public functions
- */
-
-/*
- * Private functions
- */
-static VALUE
-ossl_spki_alloc(VALUE klass)
-{
-    NETSCAPE_SPKI *spki;
-    VALUE obj;
-	
-    if (!(spki = NETSCAPE_SPKI_new())) {
-	ossl_raise(eSPKIError, NULL);
-    }	
-    WrapSPKI(klass, obj, spki);
-	
-    return obj;
-}
-
-static VALUE
-ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
-{
-    NETSCAPE_SPKI *spki;
-    VALUE buffer;
-	
-    if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
-	return self;
-    }
-    if (!(spki = NETSCAPE_SPKI_b64_decode(StringValuePtr(buffer), -1))) {
-	ossl_raise(eSPKIError, NULL);
-    }
-    NETSCAPE_SPKI_free(DATA_PTR(self));
-    DATA_PTR(self) = spki;
-
-    return self;
-}
-
-static VALUE
-ossl_spki_to_pem(VALUE self)
-{
-    NETSCAPE_SPKI *spki;
-    char *data;
-    VALUE str;
-	
-    GetSPKI(self, spki);
-    if (!(data = NETSCAPE_SPKI_b64_encode(spki))) {
-	ossl_raise(eSPKIError, NULL);
-    }
-    str = ossl_buf2str(data, strlen(data));
-
-    return str;
-}
-
-static VALUE
-ossl_spki_print(VALUE self)
-{
-    NETSCAPE_SPKI *spki;
-    BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
-	
-    GetSPKI(self, spki);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eSPKIError, NULL);
-    }
-    if (!NETSCAPE_SPKI_print(out, spki)) {
-	BIO_free(out);
-	ossl_raise(eSPKIError, NULL);
-    }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-	
-    return str;
-}
-
-static VALUE
-ossl_spki_get_public_key(VALUE self)
-{
-    NETSCAPE_SPKI *spki;
-    EVP_PKEY *pkey;
-
-    GetSPKI(self, spki);
-    if (!(pkey = NETSCAPE_SPKI_get_pubkey(spki))) { /* adds an reference */
-	ossl_raise(eSPKIError, NULL);
-    }
-
-    return ossl_pkey_new(pkey); /* NO DUP - OK */
-}
-
-static VALUE
-ossl_spki_set_public_key(VALUE self, VALUE key)
-{
-    NETSCAPE_SPKI *spki;
-
-    GetSPKI(self, spki);
-    if (!NETSCAPE_SPKI_set_pubkey(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
-	ossl_raise(eSPKIError, NULL);
-    }
-
-    return key;
-}
-
-static VALUE
-ossl_spki_get_challenge(VALUE self)
-{
-    NETSCAPE_SPKI *spki;
-
-    GetSPKI(self, spki);
-    if (spki->spkac->challenge->length <= 0) {
-	OSSL_Debug("Challenge.length <= 0?");
-	return rb_str_new2(NULL);
-    }
-
-    return rb_str_new(spki->spkac->challenge->data,
-		      spki->spkac->challenge->length);
-}
-
-static VALUE
-ossl_spki_set_challenge(VALUE self, VALUE str)
-{
-    NETSCAPE_SPKI *spki;
-
-    GetSPKI(self, spki);
-    StringValue(str);
-    if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING(str)->ptr,
-			 RSTRING(str)->len)) {
-	ossl_raise(eSPKIError, NULL);
-    }
-    
-    return str;
-}
-
-static VALUE
-ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
-{
-    NETSCAPE_SPKI *spki;
-    EVP_PKEY *pkey;
-    const EVP_MD *md;
-
-    GetSPKI(self, spki);
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
-    if (!NETSCAPE_SPKI_sign(spki, pkey, md)) {
-	ossl_raise(eSPKIError, NULL);
-    }
-
-    return self;
-}
-
-/*
- * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
- */
-static VALUE
-ossl_spki_verify(VALUE self, VALUE key)
-{
-    NETSCAPE_SPKI *spki;
-
-    GetSPKI(self, spki);
-    switch (NETSCAPE_SPKI_verify(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
-    case 0:
-	return Qfalse;
-    case 1:
-	return Qtrue;
-    default:
-	ossl_raise(eSPKIError, NULL);
-    }
-    return Qnil; /* dummy */
-}
-
-/*
- * NETSCAPE_SPKI init
- */
-void
-Init_ossl_ns_spki()
-{
-    mNetscape = rb_define_module_under(mOSSL, "Netscape");
-	
-    eSPKIError = rb_define_class_under(mNetscape, "SPKIError", eOSSLError);
-	
-    cSPKI = rb_define_class_under(mNetscape, "SPKI", rb_cObject);
-	
-    rb_define_alloc_func(cSPKI, ossl_spki_alloc);
-    rb_define_method(cSPKI, "initialize", ossl_spki_initialize, -1);
-	
-    rb_define_method(cSPKI, "to_pem", ossl_spki_to_pem, 0);
-    rb_define_alias(cSPKI, "to_s", "to_pem");
-    rb_define_method(cSPKI, "to_text", ossl_spki_print, 0);
-    rb_define_method(cSPKI, "public_key", ossl_spki_get_public_key, 0);
-    rb_define_method(cSPKI, "public_key=", ossl_spki_set_public_key, 1);
-    rb_define_method(cSPKI, "sign", ossl_spki_sign, 2);
-    rb_define_method(cSPKI, "verify", ossl_spki_verify, 1);
-    rb_define_method(cSPKI, "challenge", ossl_spki_get_challenge, 0);
-    rb_define_method(cSPKI, "challenge=", ossl_spki_set_challenge, 1);
-}
-
diff --git a/ext/openssl/ossl_ns_spki.h b/ext/openssl/ossl_ns_spki.h
deleted file mode 100644
index 9977035a9c..0000000000
--- a/ext/openssl/ossl_ns_spki.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_NS_SPKI_H_)
-#define _OSSL_NS_SPKI_H_
-
-extern VALUE mNetscape;
-extern VALUE cSPKI;
-extern VALUE eSPKIError;
-
-void Init_ossl_ns_spki(void);
-
-#endif /* _OSSL_NS_SPKI_H_ */
-
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
deleted file mode 100644
index d1f1b84127..0000000000
--- a/ext/openssl/ossl_ocsp.c
+++ /dev/null
@@ -1,765 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
- * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#if defined(OSSL_OCSP_ENABLED)
-
-#define WrapOCSPReq(klass, obj, req) do { \
-    if(!req) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
-    obj = Data_Wrap_Struct(klass, 0, OCSP_REQUEST_free, req); \
-} while (0)
-#define GetOCSPReq(obj, req) do { \
-    Data_Get_Struct(obj, OCSP_REQUEST, req); \
-    if(!req) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
-} while (0)
-#define SafeGetOCSPReq(obj, req) do { \
-    OSSL_Check_Kind(obj, cOCSPReq); \
-    GetOCSPReq(obj, req); \
-} while (0)
-
-#define WrapOCSPRes(klass, obj, res) do { \
-    if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
-    obj = Data_Wrap_Struct(klass, 0, OCSP_RESPONSE_free, res); \
-} while (0)
-#define GetOCSPRes(obj, res) do { \
-    Data_Get_Struct(obj, OCSP_RESPONSE, res); \
-    if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
-} while (0)
-#define SafeGetOCSPRes(obj, res) do { \
-    OSSL_Check_Kind(obj, cOCSPRes); \
-    GetOCSPRes(obj, res); \
-} while (0)
-
-#define WrapOCSPBasicRes(klass, obj, res) do { \
-    if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
-    obj = Data_Wrap_Struct(klass, 0, OCSP_BASICRESP_free, res); \
-} while (0)
-#define GetOCSPBasicRes(obj, res) do { \
-    Data_Get_Struct(obj, OCSP_BASICRESP, res); \
-    if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
-} while (0)
-#define SafeGetOCSPBasicRes(obj, res) do { \
-    OSSL_Check_Kind(obj, cOCSPBasicRes); \
-    GetOCSPBasicRes(obj, res); \
-} while (0)
-
-#define WrapOCSPCertId(klass, obj, cid) do { \
-    if(!cid) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
-    obj = Data_Wrap_Struct(klass, 0, OCSP_CERTID_free, cid); \
-} while (0)
-#define GetOCSPCertId(obj, cid) do { \
-    Data_Get_Struct(obj, OCSP_CERTID, cid); \
-    if(!cid) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
-} while (0)
-#define SafeGetOCSPCertId(obj, cid) do { \
-    OSSL_Check_Kind(obj, cOCSPCertId); \
-    GetOCSPCertId(obj, cid); \
-} while (0)
-
-VALUE mOCSP;
-VALUE eOCSPError;
-VALUE cOCSPReq;
-VALUE cOCSPRes;
-VALUE cOCSPBasicRes;
-VALUE cOCSPCertId;
-
-/*
- * Public
- */
-static VALUE
-ossl_ocspcertid_new(OCSP_CERTID *cid)
-{
-    VALUE obj;
-    WrapOCSPCertId(cOCSPCertId, obj, cid);
-    return obj;
-}
-
-/*
- * OCSP::Resquest
- */
-static VALUE
-ossl_ocspreq_alloc(VALUE klass)
-{
-    OCSP_REQUEST *req;
-    VALUE obj;
-
-    if (!(req = OCSP_REQUEST_new()))
-	ossl_raise(eOCSPError, NULL);
-    WrapOCSPReq(klass, obj, req);
-
-    return obj;
-}
-
-static VALUE
-ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE arg;
-    unsigned char *p;
-
-    rb_scan_args(argc, argv, "01", &arg);
-    if(!NIL_P(arg)){
-	arg = ossl_to_der_if_possible(arg);
-	StringValue(arg);
-	p = (unsigned char*)RSTRING(arg)->ptr;
-	if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p,
-			     RSTRING(arg)->len)){
-	    ossl_raise(eOCSPError, "cannot load DER encoded request");
-	}
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
-{
-    OCSP_REQUEST *req;
-    VALUE val;
-    int ret;
-
-    rb_scan_args(argc, argv, "01", &val);
-    GetOCSPReq(self, req);
-    if(NIL_P(val))
-	ret = OCSP_request_add1_nonce(req, NULL, -1);
-    else{
-	StringValue(val);
-	ret = OCSP_request_add1_nonce(req, RSTRING(val)->ptr, RSTRING(val)->len);
-    }
-    if(!ret) ossl_raise(eOCSPError, NULL);
-
-    return self;
-}
-
-/* Check nonce validity in a request and response.
- * Return value reflects result:
- *  1: nonces present and equal.
- *  2: nonces both absent.
- *  3: nonce present in response only.
- *  0: nonces both present and not equal.
- * -1: nonce in request only.
- *
- *  For most responders clients can check return > 0.
- *  If responder doesn't handle nonces return != 0 may be
- *  necessary. return == 0 is always an error.
- */
-static VALUE
-ossl_ocspreq_check_nonce(VALUE self, VALUE basic_resp)
-{
-    OCSP_REQUEST *req;
-    OCSP_BASICRESP *bs;
-    int res;
-
-    GetOCSPReq(self, req);
-    SafeGetOCSPBasicRes(basic_resp, bs);
-    res = OCSP_check_nonce(req, bs);
-
-    return INT2NUM(res);
-}
-
-static VALUE
-ossl_ocspreq_add_certid(VALUE self, VALUE certid)
-{
-    OCSP_REQUEST *req;
-    OCSP_CERTID *id;
-
-    GetOCSPReq(self, req);
-    GetOCSPCertId(certid, id);
-    if(!OCSP_request_add0_id(req, OCSP_CERTID_dup(id)))
-	ossl_raise(eOCSPError, NULL);
-
-    return self;
-}
-
-static VALUE
-ossl_ocspreq_get_certid(VALUE self)
-{
-    OCSP_REQUEST *req;
-    OCSP_ONEREQ *one;
-    OCSP_CERTID *id;
-    VALUE ary, tmp;
-    int i, count;
-
-    GetOCSPReq(self, req);
-    count = OCSP_request_onereq_count(req);
-    ary = (count > 0) ? rb_ary_new() : Qnil;
-    for(i = 0; i < count; i++){
-	one = OCSP_request_onereq_get0(req, i);
-	if(!(id = OCSP_CERTID_dup(OCSP_onereq_get0_id(one))))
-	    ossl_raise(eOCSPError, NULL);
-	WrapOCSPCertId(cOCSPCertId, tmp, id);
-	rb_ary_push(ary, tmp);
-    }
-
-    return ary;
-}
-
-static VALUE
-ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
-{
-    VALUE signer_cert, signer_key, certs, flags;
-    OCSP_REQUEST *req;
-    X509 *signer;
-    EVP_PKEY *key;
-    STACK_OF(X509) *x509s;
-    unsigned long flg;
-    int ret;
-
-    rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
-    GetOCSPReq(self, req);
-    signer = GetX509CertPtr(signer_cert);
-    key = GetPrivPKeyPtr(signer_key);
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    if(NIL_P(certs)){
-	x509s = sk_X509_new_null();
-	flags |= OCSP_NOCERTS;
-    }
-    else x509s = ossl_x509_ary2sk(certs);
-    ret = OCSP_request_sign(req, signer, key, EVP_sha1(), x509s, flg);
-    sk_X509_pop_free(x509s, X509_free);
-    if(!ret) ossl_raise(eOCSPError, NULL);
-
-    return self;
-}
-
-static VALUE
-ossl_ocspreq_verify(int argc, VALUE *argv, VALUE self)
-{
-    VALUE certs, store, flags;
-    OCSP_REQUEST *req;
-    STACK_OF(X509) *x509s;
-    X509_STORE *x509st;
-    int flg, result;
-
-    rb_scan_args(argc, argv, "21", &certs, &store, &flags);
-    GetOCSPReq(self, req);
-    x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
-    x509s = ossl_x509_ary2sk(certs);
-    result = OCSP_request_verify(req, x509s, x509st, flg);
-    sk_X509_pop_free(x509s, X509_free);
-    if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
-
-    return result ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_ocspreq_to_der(VALUE self)
-{
-    OCSP_REQUEST *req;
-    VALUE str;
-    unsigned char *p;
-    long len;
-
-    GetOCSPReq(self, req);
-
-    if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_OCSP_REQUEST(req, &p) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-/*
- * OCSP::Response
- */
-static VALUE
-ossl_ocspres_s_create(VALUE klass, VALUE status, VALUE basic_resp)
-{
-    OCSP_BASICRESP *bs;
-    OCSP_RESPONSE *res;
-    VALUE obj;
-
-    if(NIL_P(basic_resp)) bs = NULL;
-    else GetOCSPBasicRes(basic_resp, bs); /* NO NEED TO DUP */
-    if(!(res = OCSP_response_create(NUM2INT(status), bs)))
-	ossl_raise(eOCSPError, NULL);
-    WrapOCSPRes(klass, obj, res);
-
-    return obj;
-}
-
-static VALUE
-ossl_ocspres_alloc(VALUE klass)
-{
-    OCSP_RESPONSE *res;
-    VALUE obj;
-
-    if(!(res = OCSP_RESPONSE_new()))
-	ossl_raise(eOCSPError, NULL);
-    WrapOCSPRes(klass, obj, res);
-
-    return obj;
-}
-
-static VALUE
-ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE arg;
-    unsigned char *p;
-
-    rb_scan_args(argc, argv, "01", &arg);
-    if(!NIL_P(arg)){
-	arg = ossl_to_der_if_possible(arg);
-	StringValue(arg);
-	p = RSTRING(arg)->ptr;
-	if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p,
-			      RSTRING(arg)->len)){
-	    ossl_raise(eOCSPError, "cannot load DER encoded response");
-	}
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_ocspres_status(VALUE self)
-{
-    OCSP_RESPONSE *res;
-    int st;
-
-    GetOCSPRes(self, res);
-    st = OCSP_response_status(res);
-
-    return INT2NUM(st);
-}
-
-static VALUE
-ossl_ocspres_status_string(VALUE self)
-{
-    OCSP_RESPONSE *res;
-    int st;
-
-    GetOCSPRes(self, res);
-    st = OCSP_response_status(res);
-
-    return rb_str_new2(OCSP_response_status_str(st));
-}
-
-static VALUE
-ossl_ocspres_get_basic(VALUE self)
-{
-    OCSP_RESPONSE *res;
-    OCSP_BASICRESP *bs;
-    VALUE ret;
-
-    GetOCSPRes(self, res);
-    if(!(bs = OCSP_response_get1_basic(res)))
-	return Qnil;
-    WrapOCSPBasicRes(cOCSPBasicRes, ret, bs);
-
-    return ret;
-}
-
-static VALUE
-ossl_ocspres_to_der(VALUE self)
-{
-    OCSP_RESPONSE *res;
-    VALUE str;
-    long len;
-    unsigned char *p;
-
-    GetOCSPRes(self, res);
-    if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_OCSP_RESPONSE(res, NULL) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-/*
- * OCSP::BasicResponse
- */
-static VALUE
-ossl_ocspbres_alloc(VALUE klass)
-{
-    OCSP_BASICRESP *bs;
-    VALUE obj;
-
-    if(!(bs = OCSP_BASICRESP_new()))
-	ossl_raise(eOCSPError, NULL);
-    WrapOCSPBasicRes(klass, obj, bs);
-
-    return obj;
-}
-
-static VALUE
-ossl_ocspbres_initialize(int argc, VALUE *argv, VALUE self)
-{
-    return self;
-}
-
-static VALUE
-ossl_ocspbres_copy_nonce(VALUE self, VALUE request)
-{
-    OCSP_BASICRESP *bs;
-    OCSP_REQUEST *req;
-    int ret;
-
-    GetOCSPBasicRes(self, bs);
-    SafeGetOCSPReq(request, req);
-    ret = OCSP_copy_nonce(bs, req);
-
-    return INT2NUM(ret);
-}
-
-static VALUE
-ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
-{
-    OCSP_BASICRESP *bs;
-    VALUE val;
-    int ret;
-
-    GetOCSPBasicRes(self, bs);
-    rb_scan_args(argc, argv, "01", &val);
-    if(NIL_P(val))
-	ret = OCSP_basic_add1_nonce(bs, NULL, -1);
-    else{
-	StringValue(val);
-	ret = OCSP_basic_add1_nonce(bs, RSTRING(val)->ptr, RSTRING(val)->len);
-    }
-    if(!ret) ossl_raise(eOCSPError, NULL);
-
-    return self;
-}
-
-static VALUE
-ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
-			 VALUE reason, VALUE revtime,
-			 VALUE thisupd, VALUE nextupd, VALUE ext)
-{
-    OCSP_BASICRESP *bs;
-    OCSP_SINGLERESP *single;
-    OCSP_CERTID *id;
-    int st, rsn;
-    ASN1_TIME *ths, *nxt, *rev;
-    int error, i, rstatus = 0;
-    VALUE tmp;
-
-    GetOCSPBasicRes(self, bs);
-    SafeGetOCSPCertId(cid, id);
-    st = NUM2INT(status);
-    rsn = NIL_P(status) ? 0 : NUM2INT(reason);
-    if(!NIL_P(ext)){
-	/* All ary's members should be X509Extension */
-	Check_Type(ext, T_ARRAY);
-	for (i = 0; i < RARRAY(ext)->len; i++)
-	    OSSL_Check_Kind(RARRAY(ext)->ptr[i], cX509Ext);
-    }
-
-    error = 0;
-    ths = nxt = rev = NULL;
-    if(!NIL_P(revtime)){
-	tmp = rb_protect(rb_Integer, revtime, &rstatus);
-	if(rstatus) goto err;
-	rev = X509_gmtime_adj(NULL, NUM2INT(tmp));
-    }
-    tmp = rb_protect(rb_Integer, thisupd, &rstatus);
-    if(rstatus) goto err;
-    ths = X509_gmtime_adj(NULL, NUM2INT(tmp));
-    tmp = rb_protect(rb_Integer, nextupd, &rstatus);
-    if(rstatus) goto err;
-    nxt = X509_gmtime_adj(NULL, NUM2INT(tmp));
-
-    if(!(single = OCSP_basic_add1_status(bs, id, st, rsn, rev, ths, nxt))){
-	error = 1;
-	goto err;
-    }
-
-    if(!NIL_P(ext)){
-	X509_EXTENSION *x509ext;
-	sk_X509_EXTENSION_pop_free(single->singleExtensions, X509_EXTENSION_free);
-	single->singleExtensions = NULL;
-	for(i = 0; i < RARRAY(ext)->len; i++){
-	    x509ext = DupX509ExtPtr(RARRAY(ext)->ptr[i]);
-	    if(!OCSP_SINGLERESP_add_ext(single, x509ext, -1)){
-		X509_EXTENSION_free(x509ext);
-		error = 1;
-		goto err;
-	    }
-	    X509_EXTENSION_free(x509ext);
-	}
-    }
-
- err:
-    ASN1_TIME_free(ths);
-    ASN1_TIME_free(nxt);
-    ASN1_TIME_free(rev);
-    if(error) ossl_raise(eOCSPError, NULL);
-    if(rstatus) rb_jump_tag(rstatus);
-
-    return self;
-}
-
-static VALUE
-ossl_ocspbres_get_status(VALUE self)
-{
-    OCSP_BASICRESP *bs;
-    OCSP_SINGLERESP *single;
-    OCSP_CERTID *cid;
-    ASN1_TIME *revtime, *thisupd, *nextupd;
-    int status, reason;
-    X509_EXTENSION *x509ext;
-    VALUE ret, ary, ext;
-    int count, ext_count, i, j;
-
-    GetOCSPBasicRes(self, bs);
-    ret = rb_ary_new();
-    count = OCSP_resp_count(bs);
-    for(i = 0; i < count; i++){
-	single = OCSP_resp_get0(bs, i);
-	if(!single) continue;
-
-	revtime = thisupd = nextupd = NULL;
-	status = OCSP_single_get0_status(single, &reason, &revtime,
-					 &thisupd, &nextupd);
-	if(status < 0) continue;
-	if(!(cid = OCSP_CERTID_dup(single->certId)))
-	    ossl_raise(eOCSPError, NULL);
-	ary = rb_ary_new();
-	rb_ary_push(ary, ossl_ocspcertid_new(cid));
-	rb_ary_push(ary, INT2NUM(status));
-	rb_ary_push(ary, INT2NUM(reason));
-	rb_ary_push(ary, revtime ? asn1time_to_time(revtime) : Qnil);
-	rb_ary_push(ary, thisupd ? asn1time_to_time(thisupd) : Qnil);
-	rb_ary_push(ary, nextupd ? asn1time_to_time(nextupd) : Qnil);
-	ext = rb_ary_new();
-	ext_count = OCSP_SINGLERESP_get_ext_count(single);
-	for(j = 0; j < ext_count; j++){
-	    x509ext = OCSP_SINGLERESP_get_ext(single, j);
-	    rb_ary_push(ext, ossl_x509ext_new(x509ext));
-	}
-	rb_ary_push(ary, ext);
-	rb_ary_push(ret, ary);
-    }
-
-    return ret;
-} 
-
-static VALUE
-ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
-{
-    VALUE signer_cert, signer_key, certs, flags;
-    OCSP_BASICRESP *bs;
-    X509 *signer;
-    EVP_PKEY *key;
-    STACK_OF(X509) *x509s;
-    unsigned long flg;
-    int ret;
-
-    rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
-    GetOCSPBasicRes(self, bs);
-    signer = GetX509CertPtr(signer_cert);
-    key = GetPrivPKeyPtr(signer_key);
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    if(NIL_P(certs)){
-	x509s = sk_X509_new_null();
-	flg |= OCSP_NOCERTS;
-    }
-    else{
-	x509s = ossl_x509_ary2sk(certs);
-    }
-    ret = OCSP_basic_sign(bs, signer, key, EVP_sha1(), x509s, flg);
-    sk_X509_pop_free(x509s, X509_free);
-    if(!ret) ossl_raise(eOCSPError, NULL);
-
-    return self;
-}
-
-static VALUE
-ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
-{
-    VALUE certs, store, flags;
-    OCSP_BASICRESP *bs;
-    STACK_OF(X509) *x509s;
-    X509_STORE *x509st;
-    int flg, result;
-
-    rb_scan_args(argc, argv, "21", &certs, &store, &flags);
-    GetOCSPBasicRes(self, bs);
-    x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
-    x509s = ossl_x509_ary2sk(certs);
-    result = OCSP_basic_verify(bs, x509s, x509st, flg);
-    sk_X509_pop_free(x509s, X509_free);
-    if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
-
-    return result ? Qtrue : Qfalse;
-}
-
-/*
- * OCSP::CertificateId
- */
-static VALUE
-ossl_ocspcid_alloc(VALUE klass)
-{
-    OCSP_CERTID *id;
-    VALUE obj;
-
-    if(!(id = OCSP_CERTID_new()))
-	ossl_raise(eOCSPError, NULL);
-    WrapOCSPCertId(klass, obj, id);
-
-    return obj;
-}
-
-static VALUE
-ossl_ocspcid_initialize(VALUE self, VALUE subject, VALUE issuer)
-{
-    OCSP_CERTID *id, *newid;
-    X509 *x509s, *x509i;
-
-    GetOCSPCertId(self, id);
-    x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
-    x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
-    if(!(newid = OCSP_cert_to_id(NULL, x509s, x509i)))
-	ossl_raise(eOCSPError, NULL);
-    OCSP_CERTID_free(id);
-    RDATA(self)->data = newid;
-
-    return self;
-}
-
-static VALUE
-ossl_ocspcid_cmp(VALUE self, VALUE other)
-{
-    OCSP_CERTID *id, *id2;
-    int result;
-
-    GetOCSPCertId(self, id);
-    SafeGetOCSPCertId(other, id2);
-    result = OCSP_id_cmp(id, id2);
-
-    return (result == 0) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_ocspcid_cmp_issuer(VALUE self, VALUE other)
-{
-    OCSP_CERTID *id, *id2;
-    int result;
-
-    GetOCSPCertId(self, id);
-    SafeGetOCSPCertId(other, id2);
-    result = OCSP_id_issuer_cmp(id, id2);
-
-    return (result == 0) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_ocspcid_get_serial(VALUE self)
-{
-    OCSP_CERTID *id;
-
-    GetOCSPCertId(self, id);
-
-    return asn1integer_to_num(id->serialNumber);
-}
-
-void
-Init_ossl_ocsp()
-{
-    mOCSP = rb_define_module_under(mOSSL, "OCSP");
-
-    eOCSPError = rb_define_class_under(mOCSP, "OCSPError", rb_cObject);
-
-    cOCSPReq = rb_define_class_under(mOCSP, "Request", rb_cObject);
-    rb_define_alloc_func(cOCSPReq, ossl_ocspreq_alloc);
-    rb_define_method(cOCSPReq, "initialize", ossl_ocspreq_initialize, -1);
-    rb_define_method(cOCSPReq, "add_nonce", ossl_ocspreq_add_nonce, -1);
-    rb_define_method(cOCSPReq, "check_nonce", ossl_ocspreq_check_nonce, 1);
-    rb_define_method(cOCSPReq, "add_certid", ossl_ocspreq_add_certid, 1);
-    rb_define_method(cOCSPReq, "certid", ossl_ocspreq_get_certid, 0);
-    rb_define_method(cOCSPReq, "sign", ossl_ocspreq_sign, -1);
-    rb_define_method(cOCSPReq, "verify", ossl_ocspreq_verify, -1);
-    rb_define_method(cOCSPReq, "to_der", ossl_ocspreq_to_der, 0);
-
-    cOCSPRes = rb_define_class_under(mOCSP, "Response", rb_cObject);
-    rb_define_singleton_method(cOCSPRes, "create", ossl_ocspres_s_create, 2);
-    rb_define_alloc_func(cOCSPRes, ossl_ocspres_alloc);
-    rb_define_method(cOCSPRes, "initialize", ossl_ocspres_initialize, -1);
-    rb_define_method(cOCSPRes, "status", ossl_ocspres_status, 0);
-    rb_define_method(cOCSPRes, "status_string", ossl_ocspres_status_string, 0);
-    rb_define_method(cOCSPRes, "basic", ossl_ocspres_get_basic, 0);
-    rb_define_method(cOCSPRes, "to_der", ossl_ocspres_to_der, 0);
-
-    cOCSPBasicRes = rb_define_class_under(mOCSP, "BasicResponse", rb_cObject);
-    rb_define_alloc_func(cOCSPBasicRes, ossl_ocspbres_alloc);
-    rb_define_method(cOCSPBasicRes, "initialize", ossl_ocspbres_initialize, -1);
-    rb_define_method(cOCSPBasicRes, "copy_nonce", ossl_ocspbres_copy_nonce, 1);
-    rb_define_method(cOCSPBasicRes, "add_nonce", ossl_ocspbres_add_nonce, -1);
-    rb_define_method(cOCSPBasicRes, "add_status", ossl_ocspbres_add_status, 7);
-    rb_define_method(cOCSPBasicRes, "status", ossl_ocspbres_get_status, 0);
-    rb_define_method(cOCSPBasicRes, "sign", ossl_ocspbres_sign, -1);
-    rb_define_method(cOCSPBasicRes, "verify", ossl_ocspbres_verify, -1);
-
-    cOCSPCertId = rb_define_class_under(mOCSP, "CertificateId", rb_cObject);
-    rb_define_alloc_func(cOCSPCertId, ossl_ocspcid_alloc);
-    rb_define_method(cOCSPCertId, "initialize", ossl_ocspcid_initialize, 2);
-    rb_define_method(cOCSPCertId, "cmp", ossl_ocspcid_cmp, 1);
-    rb_define_method(cOCSPCertId, "cmp_issuer", ossl_ocspcid_cmp_issuer, 1);
-    rb_define_method(cOCSPCertId, "serial", ossl_ocspcid_get_serial, 0);
-
-#define DefOCSPConst(x) rb_define_const(mOCSP, #x, INT2NUM(OCSP_##x))
-
-    DefOCSPConst(RESPONSE_STATUS_SUCCESSFUL);
-    DefOCSPConst(RESPONSE_STATUS_MALFORMEDREQUEST);
-    DefOCSPConst(RESPONSE_STATUS_INTERNALERROR);
-    DefOCSPConst(RESPONSE_STATUS_TRYLATER);
-    DefOCSPConst(RESPONSE_STATUS_SIGREQUIRED);
-    DefOCSPConst(RESPONSE_STATUS_UNAUTHORIZED);
-
-    DefOCSPConst(REVOKED_STATUS_NOSTATUS);
-    DefOCSPConst(REVOKED_STATUS_UNSPECIFIED);
-    DefOCSPConst(REVOKED_STATUS_KEYCOMPROMISE);
-    DefOCSPConst(REVOKED_STATUS_CACOMPROMISE);
-    DefOCSPConst(REVOKED_STATUS_AFFILIATIONCHANGED);
-    DefOCSPConst(REVOKED_STATUS_SUPERSEDED);
-    DefOCSPConst(REVOKED_STATUS_CESSATIONOFOPERATION);
-    DefOCSPConst(REVOKED_STATUS_CERTIFICATEHOLD);
-    DefOCSPConst(REVOKED_STATUS_REMOVEFROMCRL);
-
-    DefOCSPConst(NOCERTS);
-    DefOCSPConst(NOINTERN);
-    DefOCSPConst(NOSIGS);
-    DefOCSPConst(NOCHAIN);
-    DefOCSPConst(NOVERIFY);
-    DefOCSPConst(NOEXPLICIT);
-    DefOCSPConst(NOCASIGN);
-    DefOCSPConst(NODELEGATED);
-    DefOCSPConst(NOCHECKS);
-    DefOCSPConst(TRUSTOTHER);
-    DefOCSPConst(RESPID_KEY);
-    DefOCSPConst(NOTIME);
-
-#define DefOCSPVConst(x) rb_define_const(mOCSP, "V_" #x, INT2NUM(V_OCSP_##x))
-
-    DefOCSPVConst(CERTSTATUS_GOOD);
-    DefOCSPVConst(CERTSTATUS_REVOKED);
-    DefOCSPVConst(CERTSTATUS_UNKNOWN);
-    DefOCSPVConst(RESPID_NAME);
-    DefOCSPVConst(RESPID_KEY);
-}
-
-#else /* ! OSSL_OCSP_ENABLED */
-void
-Init_ossl_ocsp()
-{
-}
-#endif
diff --git a/ext/openssl/ossl_ocsp.h b/ext/openssl/ossl_ocsp.h
deleted file mode 100644
index 65b4f2e23f..0000000000
--- a/ext/openssl/ossl_ocsp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
- * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_OCSP_H_)
-#define _OSSL_OCSP_H_
-
-#if defined(OSSL_OCSP_ENABLED)
-extern VALUE mOCSP;
-extern VALUE cOPCSReq;
-extern VALUE cOPCSRes;
-extern VALUE cOPCSBasicRes;
-#endif
-
-void Init_ossl_ocsp(void);
-
-#endif /* _OSSL_OCSP_H_ */
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
deleted file mode 100644
index 66c40b9b39..0000000000
--- a/ext/openssl/ossl_pkcs7.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapPKCS7(klass, obj, pkcs7) do { \
-    if (!pkcs7) { \
-	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, PKCS7_free, pkcs7); \
-} while (0)
-#define GetPKCS7(obj, pkcs7) do { \
-    Data_Get_Struct(obj, PKCS7, pkcs7); \
-    if (!pkcs7) { \
-	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
-    } \
-} while (0)
-#define SafeGetPKCS7(obj, pkcs7) do { \
-    OSSL_Check_Kind(obj, cPKCS7); \
-    GetPKCS7(obj, pkcs7); \
-} while (0)
-
-#define WrapPKCS7si(klass, obj, p7si) do { \
-    if (!p7si) { \
-	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, PKCS7_SIGNER_INFO_free, p7si); \
-} while (0)
-#define GetPKCS7si(obj, p7si) do { \
-    Data_Get_Struct(obj, PKCS7_SIGNER_INFO, p7si); \
-    if (!p7si) { \
-	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
-    } \
-} while (0)
-#define SafeGetPKCS7si(obj, p7si) do { \
-    OSSL_Check_Kind(obj, cPKCS7Signer); \
-    GetPKCS7si(obj, p7si); \
-} while (0)
-
-#define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
-
-#define ossl_pkcs7_set_data(o,v)       rb_iv_set((o), "@data", (v))
-#define ossl_pkcs7_get_data(o)         rb_iv_get((o), "@data")
-#define ossl_pkcs7_set_err_string(o,v) rb_iv_set((o), "@error_string", (v))
-#define ossl_pkcs7_get_err_string(o)   rb_iv_get((o), "@error_string")
-
-/* 
- * Classes
- */
-VALUE mPKCS7;
-VALUE cPKCS7;
-VALUE cPKCS7Signer;
-VALUE ePKCS7Error;
-
-/*
- * Public
- * (MADE PRIVATE UNTIL SOMEBODY WILL NEED THEM)
- */
-static VALUE
-ossl_pkcs7si_new(PKCS7_SIGNER_INFO *p7si)
-{
-    PKCS7_SIGNER_INFO *pkcs7;
-    VALUE obj;
-
-    pkcs7 = p7si ? PKCS7_SIGNER_INFO_dup(p7si) : PKCS7_SIGNER_INFO_new();
-    if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
-    WrapPKCS7si(cPKCS7Signer, obj, pkcs7);
-
-    return obj;
-}
-
-static PKCS7_SIGNER_INFO *
-DupPKCS7SignerPtr(VALUE obj)
-{
-    PKCS7_SIGNER_INFO *p7si, *pkcs7;
-	
-    SafeGetPKCS7si(obj, p7si);
-    if (!(pkcs7 = PKCS7_SIGNER_INFO_dup(p7si))) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return pkcs7;
-}
-
-/*
- * Private
- */
-static VALUE
-ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
-{
-    BIO *in, *out;
-    PKCS7 *pkcs7;
-    VALUE ret, data;
-
-    in = ossl_obj2bio(arg);
-    out = NULL;
-    pkcs7 = SMIME_read_PKCS7(in, &out);
-    BIO_free(in);
-    if(!pkcs7) ossl_raise(ePKCS7Error, NULL);
-    data = out ? ossl_membio2str(out) : Qnil;
-    WrapPKCS7(cPKCS7, ret, pkcs7);
-    ossl_pkcs7_set_data(ret, data);
-    ossl_pkcs7_set_err_string(ret, Qnil);
-
-    return ret;
-}
-
-static VALUE
-ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE pkcs7, data, flags;
-    BIO *out, *in;
-    PKCS7 *p7;
-    VALUE str;
-    int flg;
-
-    rb_scan_args(argc, argv, "12", &pkcs7, &data, &flags);
-    SafeGetPKCS7(pkcs7, p7);
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    if(NIL_P(data)) data = ossl_pkcs7_get_data(pkcs7);
-    if(!NIL_P(data) && PKCS7_is_detached(p7))
-	flg |= PKCS7_DETACHED;
-    in = NIL_P(data) ? NULL : ossl_obj2bio(data);
-    if(!(out = BIO_new(BIO_s_mem()))){
-        BIO_free(in);
-        ossl_raise(ePKCS7Error, NULL);
-    }
-    if(!SMIME_write_PKCS7(out, p7, in, flg)){
-        BIO_free(out);
-        BIO_free(in);
-        ossl_raise(ePKCS7Error, NULL);
-    }
-    BIO_free(in);
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-static VALUE
-ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE cert, key, data, certs, flags;
-    X509 *x509;
-    EVP_PKEY *pkey;
-    BIO *in;
-    STACK_OF(X509) *x509s;
-    int flg, status = 0;
-    PKCS7 *pkcs7;
-    VALUE ret;
-
-    rb_scan_args(argc, argv, "32", &cert, &key, &data, &certs, &flags);
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    in = ossl_obj2bio(data);
-    if(NIL_P(certs)) x509s = NULL;
-    else{
-	x509s = ossl_protect_x509_ary2sk(certs, &status);
-	if(status){
-	    BIO_free(in);
-	    rb_jump_tag(status);
-	}
-    }
-    if(!(pkcs7 = PKCS7_sign(x509, pkey, x509s, in, flg))){
-	BIO_free(in);
-	sk_X509_pop_free(x509s, X509_free);
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    WrapPKCS7(cPKCS7, ret, pkcs7);
-    ossl_pkcs7_set_data(ret, data);
-    ossl_pkcs7_set_err_string(ret, Qnil);
-    BIO_free(in);
-    sk_X509_pop_free(x509s, X509_free);
-
-    return ret;
-}
-
-static VALUE
-ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE certs, data, cipher, flags;
-    STACK_OF(X509) *x509s;
-    BIO *in;
-    const EVP_CIPHER *ciph;
-    int flg, status = 0;
-    VALUE ret;
-    PKCS7 *p7;
-
-    rb_scan_args(argc, argv, "22", &certs, &data, &cipher, &flags);
-    if(NIL_P(cipher)){
-#if !defined(OPENSSL_NO_RC2)
-	ciph = EVP_rc2_40_cbc();
-#elif !defined(OPENSSL_NO_DES)
-	ciph = EVP_des_ede3_cbc();
-#elif !defined(OPENSSL_NO_RC2)
-	ciph = EVP_rc2_40_cbc();
-#elif !defined(OPENSSL_NO_AES)
-	ciph = EVP_EVP_aes_128_cbc();
-#else
-	ossl_raise(ePKCS7Error, "Must specify cipher");
-#endif
-
-    }
-    else ciph = GetCipherPtr(cipher); /* NO NEED TO DUP */
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    in = ossl_obj2bio(data);
-    x509s = ossl_protect_x509_ary2sk(certs, &status);
-    if(status){
-	BIO_free(in);
-	rb_jump_tag(status);
-    }
-    if(!(p7 = PKCS7_encrypt(x509s, in, (EVP_CIPHER*)ciph, flg))){
-	BIO_free(in);
-	sk_X509_pop_free(x509s, X509_free);
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    BIO_free(in);
-    WrapPKCS7(cPKCS7, ret, p7);
-    ossl_pkcs7_set_data(ret, data);
-    sk_X509_pop_free(x509s, X509_free);
-
-    return ret;
-}
-
-static VALUE
-ossl_pkcs7_alloc(VALUE klass)
-{
-    PKCS7 *pkcs7;
-    VALUE obj;
-
-    if (!(pkcs7 = PKCS7_new())) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    WrapPKCS7(klass, obj, pkcs7);
-    
-    return obj;
-}
-
-static VALUE
-ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
-{
-    PKCS7 *p7;
-    BIO *in;
-    VALUE arg;
-
-    if(rb_scan_args(argc, argv, "01", &arg) == 0)
-	return self;
-    arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
-    p7 = PEM_read_bio_PKCS7(in, (PKCS7 **)&DATA_PTR(self), NULL, NULL);
-    if (!p7) {
-	BIO_reset(in);
-        p7 = d2i_PKCS7_bio(in, (PKCS7 **)&DATA_PTR(self));
-    }
-    BIO_free(in);
-    ossl_pkcs7_set_data(self, Qnil);
-    ossl_pkcs7_set_err_string(self, Qnil);
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7_copy(VALUE self, VALUE other)
-{
-    PKCS7 *a, *b, *pkcs7;
-
-    rb_check_frozen(self);
-    if (self == other) return self;
-
-    GetPKCS7(self, a);
-    SafeGetPKCS7(other, b);
-
-    pkcs7 = PKCS7_dup(b);
-    if (!pkcs7) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    DATA_PTR(self) = pkcs7;
-    PKCS7_free(a);
-
-    return self;
-}
-
-static int
-ossl_pkcs7_sym2typeid(VALUE sym)
-{
-    int i, ret = Qnil;
-    char *s;
-
-    static struct {
-        const char *name;
-        int nid;
-    } p7_type_tab[] = {
-        { "signed",             NID_pkcs7_signed },
-        { "data",               NID_pkcs7_data },
-        { "signedAndEnveloped", NID_pkcs7_signedAndEnveloped },
-        { "enveloped",          NID_pkcs7_enveloped },
-        { "encrypted",          NID_pkcs7_encrypted },
-        { "digest",             NID_pkcs7_digest },
-        { NULL,                 0 },
-    };
-
-    if(TYPE(sym) == T_SYMBOL) s = rb_id2name(SYM2ID(sym));
-    else s = StringValuePtr(sym);
-    for(i = 0; i < numberof(p7_type_tab); i++){
-	if(p7_type_tab[i].name == NULL)
-	    ossl_raise(ePKCS7Error, "unknown type \"%s\"", s);
-	if(strcmp(p7_type_tab[i].name, s) == 0){
-	    ret = p7_type_tab[i].nid;
-	    break;
-	}
-    }
-
-    return ret;
-}
-
-static VALUE
-ossl_pkcs7_set_type(VALUE self, VALUE type)
-{
-    PKCS7 *p7;
-
-    GetPKCS7(self, p7);
-    if(!PKCS7_set_type(p7, ossl_pkcs7_sym2typeid(type)))
-	ossl_raise(ePKCS7Error, NULL);
-
-    return type;
-}
-
-static VALUE
-ossl_pkcs7_get_type(VALUE self)
-{
-    PKCS7 *p7;
-
-    GetPKCS7(self, p7);
-    if(PKCS7_type_is_signed(p7))
-	return ID2SYM(rb_intern("signed"));
-    if(PKCS7_type_is_encrypted(p7))
-	return ID2SYM(rb_intern("encrypted"));
-    if(PKCS7_type_is_enveloped(p7))
-	return ID2SYM(rb_intern("enveloped"));
-    if(PKCS7_type_is_signedAndEnveloped(p7))
-	return ID2SYM(rb_intern("signedAndEnveloped"));
-    if(PKCS7_type_is_data(p7))
-	return ID2SYM(rb_intern("data"));
-    return Qnil;
-}
-
-static VALUE
-ossl_pkcs7_set_detached(VALUE self, VALUE flag)
-{
-    PKCS7 *p7;
-
-    GetPKCS7(self, p7);
-    if(flag != Qtrue && flag != Qfalse)
-	ossl_raise(ePKCS7Error, "must secify a boolean");
-    if(!PKCS7_set_detached(p7, flag == Qtrue ? 1 : 0))
-	ossl_raise(ePKCS7Error, NULL);
-
-    return flag;
-}
-
-static VALUE
-ossl_pkcs7_get_detached(VALUE self)
-{
-    PKCS7 *p7;
-    GetPKCS7(self, p7);
-    return PKCS7_get_detached(p7) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_pkcs7_detached_p(VALUE self)
-{
-    PKCS7 *p7;
-    GetPKCS7(self, p7);
-    return PKCS7_is_detached(p7) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_pkcs7_set_cipher(VALUE self, VALUE cipher)
-{
-    PKCS7 *pkcs7;
-
-    GetPKCS7(self, pkcs7);
-    if (!PKCS7_set_cipher(pkcs7, GetCipherPtr(cipher))) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return cipher;
-}
-
-static VALUE
-ossl_pkcs7_add_signer(VALUE self, VALUE signer)
-{
-    PKCS7 *pkcs7;
-    PKCS7_SIGNER_INFO *p7si;
-
-    GetPKCS7(self, pkcs7);
-    p7si = DupPKCS7SignerPtr(signer); /* NEED TO DUP */
-    if (!PKCS7_add_signer(pkcs7, p7si)) {
-	PKCS7_SIGNER_INFO_free(p7si);
-	ossl_raise(ePKCS7Error, "Could not add signer.");
-    }
-    if (PKCS7_type_is_signed(pkcs7)){
-	PKCS7_add_signed_attribute(p7si, NID_pkcs9_contentType,
-				   V_ASN1_OBJECT, OBJ_nid2obj(NID_pkcs7_data));
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7_get_signer(VALUE self)
-{
-    PKCS7 *pkcs7;
-    STACK_OF(PKCS7_SIGNER_INFO) *sk;
-    PKCS7_SIGNER_INFO *si;
-    int num, i;
-    VALUE ary;
-    
-    GetPKCS7(self, pkcs7);
-    if (!(sk = PKCS7_get_signer_info(pkcs7))) {
-	OSSL_Debug("OpenSSL::PKCS7#get_signer_info == NULL!");
-	return rb_ary_new();
-    }
-    if ((num = sk_PKCS7_SIGNER_INFO_num(sk)) < 0) {
-	ossl_raise(ePKCS7Error, "Negative number of signers!");
-    }
-    ary = rb_ary_new2(num);
-    for (i=0; i<num; i++) {
-	si = sk_PKCS7_SIGNER_INFO_value(sk, i);
-	rb_ary_push(ary, ossl_pkcs7si_new(si));
-    }
-
-    return ary;
-}
-
-static VALUE
-ossl_pkcs7_add_recipient(VALUE self, VALUE cert)
-{
-    PKCS7 *pkcs7;
-    PKCS7_RECIP_INFO *ri;
-    X509 *x509;
-	
-    GetPKCS7(self, pkcs7);
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    if (!(ri = PKCS7_RECIP_INFO_new())) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    if (!PKCS7_RECIP_INFO_set(ri, x509)) {
-	PKCS7_RECIP_INFO_free(ri);
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    if (!PKCS7_add_recipient_info(pkcs7, ri)) {
-	PKCS7_RECIP_INFO_free(ri);
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7_add_certificate(VALUE self, VALUE cert)
-{
-    PKCS7 *pkcs7;
-    X509 *x509;
-
-    GetPKCS7(self, pkcs7);
-    x509 = GetX509CertPtr(cert);  /* NO NEED TO DUP */
-    if (!PKCS7_add_certificate(pkcs7, x509)){
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7_add_crl(VALUE self, VALUE crl)
-{
-    PKCS7 *pkcs7;
-    X509_CRL *x509crl;
-
-    GetPKCS7(self, pkcs7); /* NO DUP needed! */
-    x509crl = GetX509CRLPtr(crl);
-    if (!PKCS7_add_crl(pkcs7, x509crl)) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
-{
-    VALUE certs, store, indata, flags;
-    STACK_OF(X509) *x509s;
-    X509_STORE *x509st;
-    int flg, ok, status = 0;
-    BIO *in, *out;
-    PKCS7 *p7;
-    VALUE data;
-    const char *msg;
-
-    GetPKCS7(self, p7);
-    rb_scan_args(argc, argv, "22", &certs, &store, &indata, &flags);
-    x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    if(NIL_P(indata)) indata = ossl_pkcs7_get_data(self);
-    in = NIL_P(indata) ? NULL : ossl_obj2bio(indata);
-    if(NIL_P(certs)) x509s = NULL;
-    else{
-	x509s = ossl_protect_x509_ary2sk(certs, &status);
-	if(status){
-	    BIO_free(in);
-	    rb_jump_tag(status);
-	}
-    }
-    if(!(out = BIO_new(BIO_s_mem()))){
-	BIO_free(in);
-	sk_X509_pop_free(x509s, X509_free);
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    ok = PKCS7_verify(p7, x509s, x509st, in, out, flg);
-    BIO_free(in);
-    msg = ERR_reason_error_string(ERR_get_error());
-    ossl_pkcs7_set_err_string(self, msg ? rb_str_new2(msg) : Qnil);
-    data = ossl_membio2str(out);
-    ossl_pkcs7_set_data(self, data);
-    sk_X509_pop_free(x509s, X509_free);
-
-    return (ok == 1) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_pkcs7_decrypt(int argc, VALUE *argv, VALUE self)
-{
-    VALUE pkey, cert, flags;
-    EVP_PKEY *key;
-    X509 *x509;
-    int flg;
-    PKCS7 *p7;
-    BIO *out;
-    VALUE str;
-
-    rb_scan_args(argc, argv, "21", &pkey, &cert, &flags);
-    GetPKCS7(self, p7);
-    key = GetPrivPKeyPtr(pkey); /* NO NEED TO DUP */
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    if(!(out = BIO_new(BIO_s_mem())))
-	ossl_raise(ePKCS7Error, NULL);
-    if(!PKCS7_decrypt(p7, key, x509, out, flg)){
-	BIO_free(out);
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    str = ossl_membio2str(out); /* out will be free */
-
-    return str;
-}
-
-static VALUE
-ossl_pkcs7_add_data(VALUE self, VALUE data)
-{
-    PKCS7 *pkcs7;
-    BIO *out, *in;
-    char buf[4096];
-    int len;
-
-    in = out = NULL;
-    GetPKCS7(self, pkcs7);
-    if(PKCS7_type_is_signed(pkcs7)){
-	if(!PKCS7_content_new(pkcs7, NID_pkcs7_data))
-	    ossl_raise(ePKCS7Error, NULL);
-    }
-    in = ossl_obj2bio(data);
-    if(!(out = PKCS7_dataInit(pkcs7, NULL))) goto err;
-    for(;;){
-	if((len = BIO_read(in, buf, sizeof(buf))) <= 0)
-	    break;
-	if(BIO_write(out, buf, len) != len)
-	    goto err;
-    }
-    if(!PKCS7_dataFinal(pkcs7, out)) goto err;
-    ossl_pkcs7_set_data(self, Qnil);
-    
- err:
-    BIO_free(out);
-    BIO_free(in);
-    if(ERR_peek_error()){
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return data;
-}
-
-static VALUE
-ossl_pkcs7_to_der(VALUE self)
-{
-    PKCS7 *pkcs7;
-    VALUE str;
-    long len;
-    unsigned char *p;
-
-    GetPKCS7(self, pkcs7);
-    if((len = i2d_PKCS7(pkcs7, NULL)) <= 0)
-	ossl_raise(ePKCS7Error, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_PKCS7(pkcs7, &p) <= 0)
-	ossl_raise(ePKCS7Error, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-static VALUE
-ossl_pkcs7_to_pem(VALUE self)
-{
-    PKCS7 *pkcs7;
-    BIO *out;
-    VALUE str;
-	
-    GetPKCS7(self, pkcs7);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    if (!PEM_write_bio_PKCS7(out, pkcs7)) {
-	BIO_free(out);
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*
- * SIGNER INFO
- */
-static VALUE
-ossl_pkcs7si_alloc(VALUE klass)
-{
-    PKCS7_SIGNER_INFO *p7si;
-    VALUE obj;
-
-    if (!(p7si = PKCS7_SIGNER_INFO_new())) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    WrapPKCS7si(klass, obj, p7si);
-
-    return obj;
-}
-
-static VALUE
-ossl_pkcs7si_initialize(VALUE self, VALUE cert, VALUE key, VALUE digest)
-{
-    PKCS7_SIGNER_INFO *p7si;
-    EVP_PKEY *pkey;
-    X509 *x509;
-    const EVP_MD *md;
-
-    GetPKCS7si(self, p7si);
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
-    if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, (EVP_MD*)md))) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7si_get_name(VALUE self)
-{
-    PKCS7_SIGNER_INFO *p7si;
-
-    GetPKCS7si(self, p7si);
-
-    return ossl_x509name_new(p7si->issuer_and_serial->issuer);
-}
-
-static VALUE
-ossl_pkcs7si_get_serial(VALUE self)
-{
-    PKCS7_SIGNER_INFO *p7si;
-
-    GetPKCS7si(self, p7si);
-
-    return asn1integer_to_num(p7si->issuer_and_serial->serial);
-}
-
-static VALUE
-ossl_pkcs7si_get_signed_time(VALUE self)
-{
-    PKCS7_SIGNER_INFO *p7si;
-    ASN1_TYPE *asn1obj;
-	
-    GetPKCS7si(self, p7si);
-	
-    if (!(asn1obj = PKCS7_get_signed_attribute(p7si, NID_pkcs9_signingTime))) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    if (asn1obj->type == V_ASN1_UTCTIME) {
-	return asn1time_to_time(asn1obj->value.utctime);
-    }
-    /*
-     * OR
-     * ossl_raise(ePKCS7Error, "...");
-     * ?
-     */
-
-    return Qnil;
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_pkcs7()
-{
-    mPKCS7 = rb_define_module_under(mOSSL, "PKCS7");
-
-    ePKCS7Error = rb_define_class_under(mPKCS7, "PKCS7Error", eOSSLError);
-
-    cPKCS7 = rb_define_class_under(mPKCS7, "PKCS7", rb_cObject);
-    rb_define_singleton_method(mPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
-    rb_define_singleton_method(mPKCS7, "write_smime", ossl_pkcs7_s_write_smime, -1);
-    rb_define_singleton_method(mPKCS7, "sign",  ossl_pkcs7_s_sign, -1);
-    rb_define_singleton_method(mPKCS7, "encrypt", ossl_pkcs7_s_encrypt, -1);
-    rb_attr(cPKCS7, rb_intern("data"), 1, 0, Qfalse);
-    rb_attr(cPKCS7, rb_intern("error_string"), 1, 1, Qfalse);
-    rb_define_alloc_func(cPKCS7, ossl_pkcs7_alloc);
-    rb_define_copy_func(cPKCS7, ossl_pkcs7_copy);
-    rb_define_method(cPKCS7, "initialize", ossl_pkcs7_initialize, -1);
-    rb_define_method(cPKCS7, "type=", ossl_pkcs7_set_type, 1);
-    rb_define_method(cPKCS7, "type", ossl_pkcs7_get_type, 0);
-    rb_define_method(cPKCS7, "detached=", ossl_pkcs7_set_detached, 1);
-    rb_define_method(cPKCS7, "detached", ossl_pkcs7_get_detached, 0);
-    rb_define_method(cPKCS7, "detached?", ossl_pkcs7_detached_p, 0);
-    rb_define_method(cPKCS7, "cipher=", ossl_pkcs7_set_cipher, 1);
-    rb_define_method(cPKCS7, "add_signer", ossl_pkcs7_add_signer, 1);
-    rb_define_method(cPKCS7, "signers", ossl_pkcs7_get_signer, 0);
-    rb_define_method(cPKCS7, "add_recipient", ossl_pkcs7_add_recipient, 1);
-    rb_define_method(cPKCS7, "add_certificate", ossl_pkcs7_add_certificate, 1);
-    rb_define_method(cPKCS7, "add_crl", ossl_pkcs7_add_crl, 1);
-    rb_define_method(cPKCS7, "add_data", ossl_pkcs7_add_data, 1);
-    rb_define_alias(cPKCS7,  "data=", "add_data");
-    rb_define_method(cPKCS7, "verify", ossl_pkcs7_verify, -1);
-    rb_define_method(cPKCS7, "decrypt", ossl_pkcs7_decrypt, -1);
-    rb_define_method(cPKCS7, "to_pem", ossl_pkcs7_to_pem, 0);
-    rb_define_alias(cPKCS7,  "to_s", "to_pem");
-    rb_define_method(cPKCS7, "to_der", ossl_pkcs7_to_der, 0);
-
-    cPKCS7Signer = rb_define_class_under(mPKCS7, "Signer", rb_cObject);
-    rb_define_alloc_func(cPKCS7Signer, ossl_pkcs7si_alloc);
-    rb_define_method(cPKCS7Signer, "initialize", ossl_pkcs7si_initialize,3);
-    rb_define_method(cPKCS7Signer, "name", ossl_pkcs7si_get_name,0);
-    rb_define_method(cPKCS7Signer, "serial", ossl_pkcs7si_get_serial,0);
-    rb_define_method(cPKCS7Signer, "signed_time", ossl_pkcs7si_get_signed_time,0);
-
-#define DefPKCS7Const(x) rb_define_const(mPKCS7, #x, INT2NUM(PKCS7_##x))
-
-    DefPKCS7Const(TEXT);
-    DefPKCS7Const(NOCERTS);
-    DefPKCS7Const(NOSIGS);
-    DefPKCS7Const(NOCHAIN);
-    DefPKCS7Const(NOINTERN);
-    DefPKCS7Const(NOVERIFY);
-    DefPKCS7Const(DETACHED);
-    DefPKCS7Const(BINARY);
-    DefPKCS7Const(NOATTR);
-    DefPKCS7Const(NOSMIMECAP);
-}
diff --git a/ext/openssl/ossl_pkcs7.h b/ext/openssl/ossl_pkcs7.h
deleted file mode 100644
index 9378397f25..0000000000
--- a/ext/openssl/ossl_pkcs7.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_PKCS7_H_)
-#define _OSSL_PKCS7_H_
-
-extern VALUE mPKCS7;
-extern VALUE cPKCS7;
-extern VALUE cPKCS7SignerInfo;
-extern VALUE ePKCS7Error;
-
-void Init_ossl_pkcs7(void);
-
-#endif /* _OSSL_PKCS7_H_ */
-
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
deleted file mode 100644
index dcae075ee8..0000000000
--- a/ext/openssl/ossl_pkey.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-/*
- * Classes
- */
-VALUE mPKey;
-VALUE cPKey;
-VALUE ePKeyError;
-ID id_private_q;
-
-/*
- * callback for generating keys
- */
-void
-ossl_generate_cb(int p, int n, void *arg)
-{
-    VALUE ary;
-
-    ary = rb_ary_new2(2);
-    rb_ary_store(ary, 0, INT2NUM(p));
-    rb_ary_store(ary, 1, INT2NUM(n));
-
-    rb_yield(ary);
-}
-
-/*
- * Public
- */
-VALUE
-ossl_pkey_new(EVP_PKEY *pkey)
-{
-    if (!pkey) {
-	ossl_raise(ePKeyError, "Cannot make new key from NULL.");
-    }
-    switch (EVP_PKEY_type(pkey->type)) {
-#if !defined(OPENSSL_NO_RSA)
-    case EVP_PKEY_RSA:
-	return ossl_rsa_new(pkey);
-#endif
-#if !defined(OPENSSL_NO_DSA)
-    case EVP_PKEY_DSA:
-	return ossl_dsa_new(pkey);
-#endif
-#if !defined(OPENSSL_NO_DH)
-    case EVP_PKEY_DH:
-	return ossl_dh_new(pkey);
-#endif
-    default:
-	ossl_raise(ePKeyError, "unsupported key type");
-    }
-    return Qnil; /* not reached */
-}
-
-VALUE
-ossl_pkey_new_from_file(VALUE filename)
-{
-    FILE *fp;
-    EVP_PKEY *pkey;
-
-    SafeStringValue(filename);
-    if (!(fp = fopen(RSTRING(filename)->ptr, "r"))) {
-	ossl_raise(ePKeyError, "%s", strerror(errno));
-    }
-
-    pkey = PEM_read_PrivateKey(fp, NULL, ossl_pem_passwd_cb, NULL);
-    fclose(fp);
-    if (!pkey) {
-	ossl_raise(ePKeyError, NULL);
-    }
-
-    return ossl_pkey_new(pkey);
-}
-
-EVP_PKEY *
-GetPKeyPtr(VALUE obj)
-{
-    EVP_PKEY *pkey;
-
-    SafeGetPKey(obj, pkey);
-
-    return pkey;
-}
-
-EVP_PKEY *
-GetPrivPKeyPtr(VALUE obj)
-{
-    EVP_PKEY *pkey;
-	
-    SafeGetPKey(obj, pkey);
-    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) { /* returns Qtrue */
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    }
-
-    return pkey;
-}
-
-EVP_PKEY *
-DupPrivPKeyPtr(VALUE obj)
-{
-    EVP_PKEY *pkey;
-	
-    SafeGetPKey(obj, pkey);
-    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) { /* returns Qtrue */
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    }
-    CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
-
-    return pkey;
-}
-
-/*
- * Private
- */
-static VALUE
-ossl_pkey_alloc(VALUE klass)
-{
-    EVP_PKEY *pkey;
-    VALUE obj;
-
-    if (!(pkey = EVP_PKEY_new())) {
-	ossl_raise(ePKeyError, NULL);
-    }
-    WrapPKey(klass, obj, pkey);
-
-    return obj;
-}
-
-static VALUE
-ossl_pkey_initialize(VALUE self)
-{
-    if (rb_obj_is_instance_of(self, cPKey)) {
-	ossl_raise(rb_eNotImpError, "OpenSSL::PKey::PKey is an abstract class.");
-    }
-    return self;
-}
-
-static VALUE
-ossl_pkey_to_der(VALUE self)
-{
-    EVP_PKEY *pkey;
-    VALUE str;
-    long len;
-    unsigned char *p;
-    
-    GetPKey(self, pkey);
-    if((len = i2d_PUBKEY(pkey, NULL)) <= 0)
-	ossl_raise(ePKeyError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(len = i2d_PUBKEY(pkey, &p) <= 0)
-	ossl_raise(ePKeyError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-static VALUE
-ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
-{
-    EVP_PKEY *pkey;
-    EVP_MD_CTX ctx;
-    int buf_len;
-    VALUE str;
-
-    GetPKey(self, pkey);
-    if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    }
-    EVP_SignInit(&ctx, GetDigestPtr(digest));
-    StringValue(data);
-    EVP_SignUpdate(&ctx, RSTRING(data)->ptr, RSTRING(data)->len);
-    str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
-    if (!EVP_SignFinal(&ctx, RSTRING(str)->ptr, &buf_len, pkey))
-	ossl_raise(ePKeyError, NULL);
-    assert(buf_len <= RSTRING(str)->len);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
-
-    return str;
-}
-
-static VALUE
-ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
-{
-    EVP_PKEY *pkey;
-    EVP_MD_CTX ctx;
-
-    GetPKey(self, pkey);
-    EVP_VerifyInit(&ctx, GetDigestPtr(digest));
-    StringValue(sig);
-    StringValue(data);
-    EVP_VerifyUpdate(&ctx, RSTRING(data)->ptr, RSTRING(data)->len);
-    switch (EVP_VerifyFinal(&ctx, RSTRING(sig)->ptr, RSTRING(sig)->len, pkey)) {
-    case 0:
-	return Qfalse;
-    case 1:
-	return Qtrue;
-    default:
-	ossl_raise(ePKeyError, NULL);
-    }
-    return Qnil; /* dummy */
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_pkey()
-{
-    mPKey = rb_define_module_under(mOSSL, "PKey");
-	
-    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
-
-    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
-	
-    rb_define_alloc_func(cPKey, ossl_pkey_alloc);
-    rb_define_method(cPKey, "initialize", ossl_pkey_initialize, 0);
-
-    rb_define_method(cPKey, "to_der", ossl_pkey_to_der, 0);
-    rb_define_method(cPKey, "sign", ossl_pkey_sign, 2);
-    rb_define_method(cPKey, "verify", ossl_pkey_verify, 3);
-	
-    id_private_q = rb_intern("private?");
-	
-    /*
-     * INIT rsa, dsa
-     */
-    Init_ossl_rsa();
-    Init_ossl_dsa();
-    Init_ossl_dh();
-}
-
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
deleted file mode 100644
index 189573546e..0000000000
--- a/ext/openssl/ossl_pkey.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_PKEY_H_)
-#define _OSSL_PKEY_H_
-
-extern VALUE mPKey;
-extern VALUE cPKey;
-extern VALUE ePKeyError;
-extern ID id_private_q;
-
-#define WrapPKey(klass, obj, pkey) do { \
-    if (!pkey) { \
-	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, EVP_PKEY_free, pkey); \
-} while (0)
-#define GetPKey(obj, pkey) do {\
-    Data_Get_Struct(obj, EVP_PKEY, pkey);\
-    if (!pkey) { \
-	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!");\
-    } \
-} while (0)
-#define SafeGetPKey(obj, pkey) do { \
-    OSSL_Check_Kind(obj, cPKey); \
-    GetPKey(obj, pkey); \
-} while (0)
-
-void ossl_generate_cb(int, int, void *);
-
-VALUE ossl_pkey_new(EVP_PKEY *);
-VALUE ossl_pkey_new_from_file(VALUE);
-EVP_PKEY *GetPKeyPtr(VALUE);
-/*EVP_PKEY *DupPKeyPtr(VALUE);*/
-EVP_PKEY *GetPrivPKeyPtr(VALUE);
-EVP_PKEY *DupPrivPKeyPtr(VALUE);
-void Init_ossl_pkey(void);
-
-/*
- * RSA
- */
-extern VALUE cRSA;
-extern VALUE eRSAError;
-
-VALUE ossl_rsa_new(EVP_PKEY *);
-void Init_ossl_rsa(void);
-
-/*
- * DSA
- */
-extern VALUE cDSA;
-extern VALUE eDSAError;
-
-VALUE ossl_dsa_new(EVP_PKEY *);
-void Init_ossl_dsa(void);
-
-/*
- * DH
- */
-extern VALUE cDH;
-extern VALUE eDHError;
-
-VALUE ossl_dh_new(EVP_PKEY *);
-void Init_ossl_dh(void);
-
-#define OSSL_PKEY_BN(keytype, name)					\
-static VALUE ossl_##keytype##_get_##name(VALUE self)			\
-{									\
-	EVP_PKEY *pkey;							\
-	BIGNUM *bn;							\
-									\
-	GetPKey(self, pkey);						\
-	bn = pkey->pkey.keytype->name;					\
-	if (bn == NULL)							\
-		return Qnil;						\
-	return ossl_bn_new(bn);						\
-}									\
-static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum)	\
-{									\
-	EVP_PKEY *pkey;							\
-	BIGNUM *bn;							\
-									\
-	GetPKey(self, pkey);						\
-	if (NIL_P(bignum)) {						\
-		BN_clear_free(pkey->pkey.keytype->name);		\
-		pkey->pkey.keytype->name = NULL;			\
-		return Qnil;						\
-	}								\
-									\
-	bn = GetBNPtr(bignum);						\
-	if (pkey->pkey.keytype->name == NULL)				\
-		pkey->pkey.keytype->name = BN_new();			\
-	if (pkey->pkey.keytype->name == NULL)				\
-		ossl_raise(eBNError, NULL);				\
-	if (BN_copy(pkey->pkey.keytype->name, bn) == NULL)		\
-		ossl_raise(eBNError, NULL);				\
-	return bignum;							\
-}
-
-#define DEF_OSSL_PKEY_BN(class, keytype, name)					\
-do {										\
-	rb_define_method(class, #name, ossl_##keytype##_get_##name, 0);	\
-	rb_define_method(class, #name "=", ossl_##keytype##_set_##name, 1);	\
-} while (0)
-
-#endif /* _OSSL_PKEY_H_ */
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
deleted file mode 100644
index e4823a2ec7..0000000000
--- a/ext/openssl/ossl_pkey_dh.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(OPENSSL_NO_DH)
-
-#include "ossl.h"
-
-#define GetPKeyDH(obj, pkey) do { \
-    GetPKey(obj, pkey); \
-    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) { /* PARANOIA? */ \
-	ossl_raise(rb_eRuntimeError, "THIS IS NOT A DH!") ; \
-    } \
-} while (0)
-
-#define DH_HAS_PRIVATE(dh) ((dh)->priv_key)
-
-#ifdef OSSL_ENGINE_ENABLED
-#  define DH_PRIVATE(dh) (DH_HAS_PRIVATE(dh) || (dh)->engine)
-#else
-#  define DH_PRIVATE(dh) DH_HAS_PRIVATE(dh)
-#endif
-
-
-/*
- * Classes
- */
-VALUE cDH;
-VALUE eDHError;
-
-/*
- * Public
- */
-static VALUE
-dh_instance(VALUE klass, DH *dh)
-{
-    EVP_PKEY *pkey;
-    VALUE obj;
-	
-    if (!dh) {
-	return Qfalse;
-    }
-    if (!(pkey = EVP_PKEY_new())) {
-	return Qfalse;
-    }
-    if (!EVP_PKEY_assign_DH(pkey, dh)) {
-	EVP_PKEY_free(pkey);
-	return Qfalse;
-    }
-    WrapPKey(klass, obj, pkey);
-
-    return obj;
-}
-
-VALUE
-ossl_dh_new(EVP_PKEY *pkey)
-{
-    VALUE obj;
-
-    if (!pkey) {
-	obj = dh_instance(cDH, DH_new());
-    } else {
-	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) {
-	    ossl_raise(rb_eTypeError, "Not a DH key!");
-	}
-	WrapPKey(cDH, obj, pkey);
-    }
-    if (obj == Qfalse) {
-	ossl_raise(eDHError, NULL);
-    }
-
-    return obj;
-}
-
-/*
- * Private
- */
-static DH *
-dh_generate(int size, int gen)
-{
-    DH *dh;
-    
-    dh = DH_generate_parameters(size, gen,
-	    rb_block_given_p() ? ossl_generate_cb : NULL,
-	    NULL);
-    if (!dh) return 0;
-
-    if (!DH_generate_key(dh)) {
-	DH_free(dh);
-	return 0;
-    }
-
-    return dh;
-}
-
-static VALUE
-ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
-{
-    DH *dh ;
-    int g = 2;
-    VALUE size, gen, obj;
-	
-    if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) {
-	g = FIX2INT(gen);
-    }
-    dh = dh_generate(FIX2INT(size), g);
-    obj = dh_instance(klass, dh);
-    if (obj == Qfalse) {
-	DH_free(dh);
-	ossl_raise(eDHError, NULL);
-    }
-
-    return obj;
-}
-
-static VALUE
-ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    DH *dh;
-    int g = 2;
-    BIO *in;
-    VALUE arg, gen;
-
-    GetPKey(self, pkey);
-    rb_scan_args(argc, argv, "11", &arg, &gen);
-    if (FIXNUM_P(arg)) {
-	if (!NIL_P(gen)) {
-	    g = FIX2INT(gen);
-	}
-	if (!(dh = dh_generate(FIX2INT(arg), g))) {
-	    ossl_raise(eDHError, NULL);
-	}
-    }
-    else {
-	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
-	dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
-	if (!dh){
-	    BIO_reset(in);
-	    dh = d2i_DHparams_bio(in, NULL);
-	}
-	BIO_free(in);
-	if (!dh) ossl_raise(eDHError, NULL);
-    }
-    if (!EVP_PKEY_assign_DH(pkey, dh)) {
-	DH_free(dh);
-	ossl_raise(eRSAError, NULL);
-    }
-    return self;
-}
-
-static VALUE
-ossl_dh_is_public(VALUE self)
-{
-    EVP_PKEY *pkey;
-
-    GetPKeyDH(self, pkey);
-    /*
-     * Do we need to check dhp->dh->public_pkey?
-     * return Qtrue;
-     */
-    return (pkey->pkey.dh->pub_key) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_dh_is_private(VALUE self)
-{
-    EVP_PKEY *pkey;
-
-    GetPKeyDH(self, pkey);
-	
-    return (DH_PRIVATE(pkey->pkey.dh)) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_dh_export(VALUE self)
-{
-    EVP_PKEY *pkey;
-    BIO *out;
-    VALUE str;
-
-    GetPKeyDH(self, pkey);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eDHError, NULL);
-    }
-    if (!PEM_write_bio_DHparams(out, pkey->pkey.dh)) {
-	BIO_free(out);
-	ossl_raise(eDHError, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*
- * Stores all parameters of key to the hash
- * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
- * Don't use :-)) (I's up to you)
- */
-static VALUE
-ossl_dh_get_params(VALUE self)
-{
-    EVP_PKEY *pkey;
-    VALUE hash;
-
-    GetPKeyDH(self, pkey);
-
-    hash = rb_hash_new();
-
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.dh->p));
-    rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(pkey->pkey.dh->g));
-    rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pkey->pkey.dh->pub_key));
-    rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(pkey->pkey.dh->priv_key));
-    
-    return hash;
-}
-
-/*
- * Prints all parameters of key to buffer
- * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
- * Don't use :-)) (I's up to you)
- */
-static VALUE
-ossl_dh_to_text(VALUE self)
-{
-    EVP_PKEY *pkey;
-    BIO *out;
-    VALUE str;
-
-    GetPKeyDH(self, pkey);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eDHError, NULL);
-    }
-    if (!DHparams_print(out, pkey->pkey.dh)) {
-	BIO_free(out);
-	ossl_raise(eDHError, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*
- * Makes new instance DH PUBLIC_KEY from PRIVATE_KEY
- */
-static VALUE
-ossl_dh_to_public_key(VALUE self)
-{
-    EVP_PKEY *pkey;
-    DH *dh;
-    VALUE obj;
-	
-    GetPKeyDH(self, pkey);
-    dh = DHparams_dup(pkey->pkey.dh); /* err check perfomed by dh_instance */
-    obj = dh_instance(CLASS_OF(self), dh);
-    if (obj == Qfalse) {
-	DH_free(dh);
-	ossl_raise(eDHError, NULL);
-    }
-
-    return obj;
-}
-
-static VALUE
-ossl_dh_check_params(VALUE self)
-{
-    DH *dh;
-    EVP_PKEY *pkey;
-    int codes;
-    
-    GetPKeyDH(self, pkey);
-    dh = pkey->pkey.dh;
-
-    if (!DH_check(dh, &codes)) {
-	return Qfalse;
-    }
-
-    return codes == 0 ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_dh_generate_key(VALUE self)
-{
-    DH *dh;
-    EVP_PKEY *pkey;
-
-    GetPKeyDH(self, pkey);
-    dh = pkey->pkey.dh;
-
-    if (!DH_generate_key(dh))
-	ossl_raise(eDHError, "Failed to generate key");
-    return self;
-}
-
-static VALUE
-ossl_dh_compute_key(VALUE self, VALUE pub)
-{
-    DH *dh;
-    EVP_PKEY *pkey;
-    BIGNUM *pub_key;
-    VALUE str;
-    int len;
-
-    GetPKeyDH(self, pkey);
-    dh = pkey->pkey.dh;
-    pub_key = GetBNPtr(pub);
-    len = DH_size(dh);
-    str = rb_str_new(0, len);
-    if ((len = DH_compute_key(RSTRING(str)->ptr, pub_key, dh)) < 0) {
-	ossl_raise(eDHError, NULL);
-    }
-    RSTRING(str)->len = len;
-    RSTRING(str)->ptr[len] = 0;
-
-    return str;
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_dh()
-{
-    eDHError = rb_define_class_under(mPKey, "DHError", ePKeyError);
-
-    cDH = rb_define_class_under(mPKey, "DH", cPKey);
-	
-    rb_define_singleton_method(cDH, "generate", ossl_dh_s_generate, -1);
-    rb_define_method(cDH, "initialize", ossl_dh_initialize, -1);
-
-    rb_define_method(cDH, "public?", ossl_dh_is_public, 0);
-    rb_define_method(cDH, "private?", ossl_dh_is_private, 0);
-    rb_define_method(cDH, "to_text", ossl_dh_to_text, 0);
-    rb_define_method(cDH, "export", ossl_dh_export, 0);
-    rb_define_alias(cDH, "to_pem", "export");
-    rb_define_alias(cDH, "to_s", "export");
-    rb_define_method(cDH, "public_key", ossl_dh_to_public_key, 0);
-
-    rb_define_method(cDH, "params_ok?", ossl_dh_check_params, 0);
-    rb_define_method(cDH, "generate_key!", ossl_dh_generate_key, 0);
-    rb_define_method(cDH, "compute_key", ossl_dh_compute_key, 1);
-
-    rb_define_method(cDH, "params", ossl_dh_get_params, 0);
-}
-
-#else /* defined NO_DH */
-#   warning >>> OpenSSL is compiled without DH support <<<
-
-void
-Init_ossl_dh()
-{
-    rb_warning("OpenSSL is compiled without DH support");
-}
-#endif /* NO_DH */
-
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
deleted file mode 100644
index 8da71a0867..0000000000
--- a/ext/openssl/ossl_pkey_dsa.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(OPENSSL_NO_DSA)
-
-#include "ossl.h"
-
-#define GetPKeyDSA(obj, pkey) do { \
-    GetPKey(obj, pkey); \
-    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DSA) { /* PARANOIA? */ \
-	ossl_raise(rb_eRuntimeError, "THIS IS NOT A DSA!"); \
-    } \
-} while (0)
-
-#define DSA_HAS_PRIVATE(dsa) ((dsa)->priv_key)
-
-#ifdef OSSL_ENGINE_ENABLED
-#  define DSA_PRIVATE(dsa) (DSA_HAS_PRIVATE(dsa) || (dsa)->engine)
-#else
-#  define DSA_PRIVATE(dsa) DSA_HAS_PRIVATE(dsa)
-#endif
-
-
-/*
- * Classes
- */
-VALUE cDSA;
-VALUE eDSAError;
-
-/*
- * Public
- */
-static VALUE
-dsa_instance(VALUE klass, DSA *dsa)
-{
-    EVP_PKEY *pkey;
-    VALUE obj;
-	
-    if (!dsa) {
-	return Qfalse;
-    }
-    if (!(pkey = EVP_PKEY_new())) {
-	return Qfalse;
-    }
-    if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
-	EVP_PKEY_free(pkey);
-	return Qfalse;
-    }
-    WrapPKey(klass, obj, pkey);
-
-    return obj;
-}
-
-VALUE
-ossl_dsa_new(EVP_PKEY *pkey)
-{
-    VALUE obj;
-
-    if (!pkey) {
-	obj = dsa_instance(cDSA, DSA_new());
-    } else {
-	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DSA) {
-	    ossl_raise(rb_eTypeError, "Not a DSA key!");
-	}
-	WrapPKey(cDSA, obj, pkey);
-    }
-    if (obj == Qfalse) {
-	ossl_raise(eDSAError, NULL);
-    }
-
-    return obj;
-}
-
-/*
- * Private
- */
-static DSA *
-dsa_generate(int size)
-{
-    DSA *dsa;
-    unsigned char seed[20];
-    int seed_len = 20, counter;
-    unsigned long h;
-
-    if (!RAND_bytes(seed, seed_len)) {
-	return 0;
-    }
-    dsa = DSA_generate_parameters(size, seed, seed_len, &counter, &h,
-	    rb_block_given_p() ? ossl_generate_cb : NULL,
-	    NULL);
-    if(!dsa) return 0;
-
-    if (!DSA_generate_key(dsa)) {
-	DSA_free(dsa);
-	return 0;
-    }
-
-    return dsa;
-}
-
-static VALUE
-ossl_dsa_s_generate(VALUE klass, VALUE size)
-{
-    DSA *dsa = dsa_generate(FIX2INT(size)); /* err handled by dsa_instance */
-    VALUE obj = dsa_instance(klass, dsa);
-
-    if (obj == Qfalse) {
-	DSA_free(dsa);
-	ossl_raise(eDSAError, NULL);
-    }
-
-    return obj;
-}
-
-static VALUE
-ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    DSA *dsa;
-    BIO *in;
-    char *passwd = NULL;
-    VALUE arg, pass;
-	
-    GetPKey(self, pkey);
-    rb_scan_args(argc, argv, "11", &arg, &pass);
-    if (FIXNUM_P(arg)) {
-	if (!(dsa = dsa_generate(FIX2INT(arg)))) {
-	    ossl_raise(eDSAError, NULL);
-	}
-    }
-    else {
-	if (!NIL_P(pass)) passwd = StringValuePtr(pass);
-	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
-	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
-	if (!dsa) { BIO_reset(in);
-	    dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
-	}
-	if (!dsa) {
-	    BIO_reset(in);
-	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
-	}
-        if (!dsa) {
-	    BIO_reset(in);
-	    dsa = d2i_DSAPrivateKey_bio(in, NULL);
-	}
-        if (!dsa) {
-	    BIO_reset(in);
-	    dsa = d2i_DSA_PUBKEY_bio(in, NULL);
-	}
-	BIO_free(in);
-	if (!dsa) ossl_raise(eDSAError, "Neither PUB key nor PRIV key:");
-    }
-    if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
-	DSA_free(dsa);
-	ossl_raise(eDSAError, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_dsa_is_public(VALUE self)
-{
-    EVP_PKEY *pkey;
-
-    GetPKeyDSA(self, pkey);
-
-    /*
-     * Do we need to check dsap->dsa->public_pkey?
-     * return Qtrue;
-     */
-    return (pkey->pkey.dsa->pub_key) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_dsa_is_private(VALUE self)
-{
-    EVP_PKEY *pkey;
-	
-    GetPKeyDSA(self, pkey);
-	
-    return (DSA_PRIVATE(pkey->pkey.dsa)) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_dsa_export(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    BIO *out;
-    const EVP_CIPHER *ciph = NULL;
-    char *passwd = NULL;
-    VALUE cipher, pass, str;
-
-    GetPKeyDSA(self, pkey);
-    rb_scan_args(argc, argv, "02", &cipher, &pass);
-    if (!NIL_P(cipher)) {
-	ciph = GetCipherPtr(cipher);
-	if (!NIL_P(pass)) {
-	    passwd = StringValuePtr(pass);
-	}
-    }
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eDSAError, NULL);
-    }
-    if (DSA_HAS_PRIVATE(pkey->pkey.dsa)) {
-	if (!PEM_write_bio_DSAPrivateKey(out, pkey->pkey.dsa, ciph,
-					 NULL, 0, ossl_pem_passwd_cb, passwd)){
-	    BIO_free(out);
-	    ossl_raise(eDSAError, NULL);
-	}
-    } else {
-	if (!PEM_write_bio_DSAPublicKey(out, pkey->pkey.dsa)) {
-	    BIO_free(out);
-	    ossl_raise(eDSAError, NULL);
-	}
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*
- * Stores all parameters of key to the hash
- * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
- * Don't use :-)) (I's up to you)
- */
-static VALUE
-ossl_dsa_get_params(VALUE self)
-{
-    EVP_PKEY *pkey;
-    VALUE hash;
-
-    GetPKeyDSA(self, pkey);
-
-    hash = rb_hash_new();
-
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.dsa->p));
-    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(pkey->pkey.dsa->q));
-    rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(pkey->pkey.dsa->g));
-    rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pkey->pkey.dsa->pub_key));
-    rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(pkey->pkey.dsa->priv_key));
-    
-    return hash;
-}
-
-/*
- * Prints all parameters of key to buffer
- * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
- * Don't use :-)) (I's up to you)
- */
-static VALUE
-ossl_dsa_to_text(VALUE self)
-{
-    EVP_PKEY *pkey;
-    BIO *out;
-    VALUE str;
-
-    GetPKeyDSA(self, pkey);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eDSAError, NULL);
-    }
-    if (!DSA_print(out, pkey->pkey.dsa, 0)) { /* offset = 0 */
-	BIO_free(out);
-	ossl_raise(eDSAError, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*
- * Makes new instance DSA PUBLIC_KEY from PRIVATE_KEY
- */
-static VALUE
-ossl_dsa_to_public_key(VALUE self)
-{
-    EVP_PKEY *pkey;
-    DSA *dsa;
-    VALUE obj;
-	
-    GetPKeyDSA(self, pkey);
-    /* err check performed by dsa_instance */
-    dsa = DSAPublicKey_dup(pkey->pkey.dsa);
-    obj = dsa_instance(CLASS_OF(self), dsa);
-    if (obj == Qfalse) {
-	DSA_free(dsa);
-	ossl_raise(eDSAError, NULL);
-    }
-    return obj;
-}
-
-#define ossl_dsa_buf_size(pkey) (DSA_size((pkey)->pkey.dsa)+16)
-
-static VALUE
-ossl_dsa_sign(VALUE self, VALUE data)
-{
-    EVP_PKEY *pkey;
-    int buf_len;
-    VALUE str;
-
-    GetPKeyDSA(self, pkey);
-    StringValue(data);
-    if (!DSA_PRIVATE(pkey->pkey.dsa)) {
-	ossl_raise(eDSAError, "Private DSA key needed!");
-    }
-    str = rb_str_new(0, ossl_dsa_buf_size(pkey));
-    if (!DSA_sign(0, RSTRING(data)->ptr, RSTRING(data)->len, RSTRING(str)->ptr,
-		  &buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
-	ossl_raise(eDSAError, NULL);
-    }
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
-
-    return str;
-}
-
-static VALUE
-ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
-{
-    EVP_PKEY *pkey;
-    int ret;
-
-    GetPKeyDSA(self, pkey);
-    StringValue(digest);
-    StringValue(sig);
-    /* type is ignored (0) */
-    ret = DSA_verify(0, RSTRING(digest)->ptr, RSTRING(digest)->len,
-		     RSTRING(sig)->ptr, RSTRING(sig)->len, pkey->pkey.dsa);
-    if (ret < 0) {
-	ossl_raise(eDSAError, NULL);
-    }
-    else if (ret == 1) {
-	return Qtrue;
-    }
-
-    return Qfalse;
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_dsa()
-{
-    eDSAError = rb_define_class_under(mPKey, "DSAError", ePKeyError);
-
-    cDSA = rb_define_class_under(mPKey, "DSA", cPKey);
-	
-    rb_define_singleton_method(cDSA, "generate", ossl_dsa_s_generate, 1);
-    rb_define_method(cDSA, "initialize", ossl_dsa_initialize, -1);
-
-    rb_define_method(cDSA, "public?", ossl_dsa_is_public, 0);
-    rb_define_method(cDSA, "private?", ossl_dsa_is_private, 0);
-    rb_define_method(cDSA, "to_text", ossl_dsa_to_text, 0);
-    rb_define_method(cDSA, "export", ossl_dsa_export, -1);
-    rb_define_alias(cDSA, "to_pem", "export");
-    rb_define_alias(cDSA, "to_s", "export");
-    rb_define_method(cDSA, "public_key", ossl_dsa_to_public_key, 0);
-    rb_define_method(cDSA, "syssign", ossl_dsa_sign, 1);
-    rb_define_method(cDSA, "sysverify", ossl_dsa_verify, 2);
-
-    rb_define_method(cDSA, "params", ossl_dsa_get_params, 0);
-}
-
-#else /* defined NO_DSA */
-#   warning >>> OpenSSL is compiled without DSA support <<<
-
-void
-Init_ossl_dsa()
-{
-    rb_warning("OpenSSL is compiled without DSA support");
-}
-
-#endif /* NO_DSA */
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
deleted file mode 100644
index 669e84efca..0000000000
--- a/ext/openssl/ossl_pkey_rsa.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(OPENSSL_NO_RSA)
-
-#include "ossl.h"
-
-#define GetPKeyRSA(obj, pkey) do { \
-    GetPKey(obj, pkey); \
-    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_RSA) { /* PARANOIA? */ \
-	ossl_raise(rb_eRuntimeError, "THIS IS NOT A RSA!") ; \
-    } \
-} while (0)
-
-#define RSA_HAS_PRIVATE(rsa) ((rsa)->p && (rsa)->q)
-
-#ifdef OSSL_ENGINE_ENABLED
-#  define RSA_PRIVATE(rsa) (RSA_HAS_PRIVATE(rsa) || (rsa)->engine)
-#else
-#  define RSA_PRIVATE(rsa) RSA_HAS_PRIVATE(rsa)
-#endif
-
-/*
- * Classes
- */
-VALUE cRSA;
-VALUE eRSAError;
-
-/*
- * Public
- */
-static VALUE
-rsa_instance(VALUE klass, RSA *rsa)
-{
-    EVP_PKEY *pkey;
-    VALUE obj;
-	
-    if (!rsa) {
-	return Qfalse;
-    }
-    if (!(pkey = EVP_PKEY_new())) {
-	return Qfalse;
-    }
-    if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
-	EVP_PKEY_free(pkey);
-	return Qfalse;
-    }
-    WrapPKey(klass, obj, pkey);
-	
-    return obj;
-}
-
-VALUE
-ossl_rsa_new(EVP_PKEY *pkey)
-{
-    VALUE obj;
-
-    if (!pkey) {
-	obj = rsa_instance(cRSA, RSA_new());
-    }
-    else {
-	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_RSA) {
-	    ossl_raise(rb_eTypeError, "Not a RSA key!");
-	}
-	WrapPKey(cRSA, obj, pkey);
-    }
-    if (obj == Qfalse) {
-	ossl_raise(eRSAError, NULL);
-    }
-
-    return obj;
-}
-
-/*
- * Private
- */
-static RSA *
-rsa_generate(int size, int exp)
-{
-    return RSA_generate_key(size, exp,
-	    rb_block_given_p() ? ossl_generate_cb : NULL,
-	    NULL);
-}
-
-static VALUE
-ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
-{
-    RSA *rsa;
-    VALUE size, exp;
-    VALUE obj;
-
-    rb_scan_args(argc, argv, "11", &size, &exp);
-
-    rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2INT(exp)); /* err handled by rsa_instance */
-    obj = rsa_instance(klass, rsa);
-
-    if (obj == Qfalse) {
-	RSA_free(rsa);
-	ossl_raise(eRSAError, NULL);
-    }
-
-    return obj;
-}
-
-static VALUE
-ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    RSA *rsa;
-    BIO *in;
-    char *passwd = NULL;
-    VALUE arg, pass;
-	
-    GetPKey(self, pkey);
-    rb_scan_args(argc, argv, "11", &arg, &pass);
-    if (FIXNUM_P(arg)) {
-	rsa = rsa_generate(FIX2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2INT(pass));
-	if (!rsa) ossl_raise(eRSAError, NULL);
-    }
-    else {
-	if (!NIL_P(pass)) passwd = StringValuePtr(pass);
-	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
-	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
-	if (!rsa) {
-	    BIO_reset(in);
-	    rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
-	}
-	if (!rsa) {
-	    BIO_reset(in);
-	    rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
-	}
-	if (!rsa) {
-	    BIO_reset(in);
-	    rsa = d2i_RSAPrivateKey_bio(in, NULL);
-	}
-	if (!rsa) {
-	    BIO_reset(in);
-	    rsa = d2i_RSAPublicKey_bio(in, NULL);
-	}
-	if (!rsa) {
-	    BIO_reset(in);
-	    rsa = d2i_RSA_PUBKEY_bio(in, NULL);
-	}
-	BIO_free(in);
-	if (!rsa) ossl_raise(eRSAError, "Neither PUB key nor PRIV key:");
-    }
-    if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
-	RSA_free(rsa);
-	ossl_raise(eRSAError, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_rsa_is_public(VALUE self)
-{
-    EVP_PKEY *pkey;
-
-    GetPKeyRSA(self, pkey);
-    /*
-     * SURPRISE! :-))
-     * Every key is public at the same time!
-     */
-    return Qtrue;
-}
-
-static VALUE
-ossl_rsa_is_private(VALUE self)
-{
-    EVP_PKEY *pkey;
-	
-    GetPKeyRSA(self, pkey);
-	
-    return (RSA_PRIVATE(pkey->pkey.rsa)) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_rsa_export(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    BIO *out;
-    const EVP_CIPHER *ciph = NULL;
-    char *passwd = NULL;
-    VALUE cipher, pass, str;
-
-    GetPKeyRSA(self, pkey);
-
-    rb_scan_args(argc, argv, "02", &cipher, &pass);
-
-    if (!NIL_P(cipher)) {
-	ciph = GetCipherPtr(cipher);
-	if (!NIL_P(pass)) {
-	    passwd = StringValuePtr(pass);
-	}
-    }
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eRSAError, NULL);
-    }
-    if (RSA_HAS_PRIVATE(pkey->pkey.rsa)) {
-	if (!PEM_write_bio_RSAPrivateKey(out, pkey->pkey.rsa, ciph,
-					 NULL, 0, ossl_pem_passwd_cb, passwd)) {
-	    BIO_free(out);
-	    ossl_raise(eRSAError, NULL);
-	}
-    } else {
-	if (!PEM_write_bio_RSAPublicKey(out, pkey->pkey.rsa)) {
-	    BIO_free(out);
-	    ossl_raise(eRSAError, NULL);
-	}
-    }
-    str = ossl_membio2str(out);
-    
-    return str;
-}
-
-#define ossl_rsa_buf_size(pkey) (RSA_size((pkey)->pkey.rsa)+16)
-
-static VALUE
-ossl_rsa_public_encrypt(VALUE self, VALUE buffer)
-{
-    EVP_PKEY *pkey;
-    int buf_len;
-    VALUE str;
-	
-    GetPKeyRSA(self, pkey);
-    StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
-    buf_len = RSA_public_encrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
-				 RSTRING(str)->ptr, pkey->pkey.rsa,
-				 RSA_PKCS1_PADDING);
-    if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
-
-    return str;
-}
-
-static VALUE
-ossl_rsa_public_decrypt(VALUE self, VALUE buffer)
-{
-    EVP_PKEY *pkey;
-    int buf_len;
-    VALUE str;
-
-    GetPKeyRSA(self, pkey);
-    StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
-    buf_len = RSA_public_decrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
-				 RSTRING(str)->ptr, pkey->pkey.rsa,
-				 RSA_PKCS1_PADDING);
-    if(buf_len < 0) ossl_raise(eRSAError, NULL);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
-    
-    return str;
-}
-
-static VALUE
-ossl_rsa_private_encrypt(VALUE self, VALUE buffer)
-{
-    EVP_PKEY *pkey;
-    int buf_len;
-    VALUE str;
-	
-    GetPKeyRSA(self, pkey);
-    if (!RSA_PRIVATE(pkey->pkey.rsa)) {
-	ossl_raise(eRSAError, "PRIVATE key needed for this operation!");
-    }	
-    StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
-    buf_len = RSA_private_encrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
-				  RSTRING(str)->ptr, pkey->pkey.rsa,
-				  RSA_PKCS1_PADDING);
-    if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
-    
-    return str;
-}
-
-static VALUE
-ossl_rsa_private_decrypt(VALUE self, VALUE buffer)
-{
-    EVP_PKEY *pkey;
-    int buf_len;
-    VALUE str;
-
-    GetPKeyRSA(self, pkey);
-    if (!RSA_PRIVATE(pkey->pkey.rsa)) {
-	ossl_raise(eRSAError, "Private RSA key needed!");
-    }
-    StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
-    buf_len = RSA_private_decrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
-				  RSTRING(str)->ptr, pkey->pkey.rsa,
-				  RSA_PKCS1_PADDING);
-    if (buf_len < 0) ossl_raise(eRSAError, NULL);
-    RSTRING(str)->len = buf_len;
-    RSTRING(str)->ptr[buf_len] = 0;
-
-    return str;
-}
-
-/*
- * Stores all parameters of key to the hash
- * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
- * Don't use :-)) (I's up to you)
- */
-static VALUE
-ossl_rsa_get_params(VALUE self)
-{
-    EVP_PKEY *pkey;
-    VALUE hash;
-
-    GetPKeyRSA(self, pkey);
-
-    hash = rb_hash_new();
-
-    rb_hash_aset(hash, rb_str_new2("n"), ossl_bn_new(pkey->pkey.rsa->n));
-    rb_hash_aset(hash, rb_str_new2("e"), ossl_bn_new(pkey->pkey.rsa->e));
-    rb_hash_aset(hash, rb_str_new2("d"), ossl_bn_new(pkey->pkey.rsa->d));
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.rsa->p));
-    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(pkey->pkey.rsa->q));
-    rb_hash_aset(hash, rb_str_new2("dmp1"), ossl_bn_new(pkey->pkey.rsa->dmp1));
-    rb_hash_aset(hash, rb_str_new2("dmq1"), ossl_bn_new(pkey->pkey.rsa->dmq1));
-    rb_hash_aset(hash, rb_str_new2("iqmp"), ossl_bn_new(pkey->pkey.rsa->iqmp));
-    
-    return hash;
-}
-
-/*
- * Prints all parameters of key to buffer
- * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
- * Don't use :-)) (It's up to you)
- */
-static VALUE
-ossl_rsa_to_text(VALUE self)
-{
-    EVP_PKEY *pkey;
-    BIO *out;
-    VALUE str;
-
-    GetPKeyRSA(self, pkey);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eRSAError, NULL);
-    }
-    if (!RSA_print(out, pkey->pkey.rsa, 0)) { /* offset = 0 */
-	BIO_free(out);
-	ossl_raise(eRSAError, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-/*
- * Makes new instance RSA PUBLIC_KEY from PRIVATE_KEY
- */
-static VALUE
-ossl_rsa_to_public_key(VALUE self)
-{
-    EVP_PKEY *pkey;
-    RSA *rsa;
-    VALUE obj;
-    
-    GetPKeyRSA(self, pkey);
-    /* err check performed by rsa_instance */
-    rsa = RSAPublicKey_dup(pkey->pkey.rsa);
-    obj = rsa_instance(CLASS_OF(self), rsa);
-    if (obj == Qfalse) {
-	RSA_free(rsa);
-	ossl_raise(eRSAError, NULL);
-    }
-    return obj;
-}
-
-/*
- * TODO: Test me
-extern BN_CTX *ossl_bn_ctx;
-
-static VALUE
-ossl_rsa_blinding_on(VALUE self)
-{
-    EVP_PKEY *pkey;
-    
-    GetPKeyRSA(self, pkey);
-
-    if (RSA_blinding_on(pkey->pkey.rsa, ossl_bn_ctx) != 1) {
-	ossl_raise(eRSAError, NULL);
-    }
-    return self;
-}
-
-static VALUE
-ossl_rsa_blinding_off(VALUE self)
-{
-    EVP_PKEY *pkey;
-    
-    GetPKeyRSA(self, pkey);
-    RSA_blinding_off(pkey->pkey.rsa);
-
-    return self;
-}
- */
-
-OSSL_PKEY_BN(rsa, n);
-OSSL_PKEY_BN(rsa, e);
-OSSL_PKEY_BN(rsa, d);
-OSSL_PKEY_BN(rsa, p);
-OSSL_PKEY_BN(rsa, q);
-OSSL_PKEY_BN(rsa, dmp1);
-OSSL_PKEY_BN(rsa, dmq1);
-OSSL_PKEY_BN(rsa, iqmp);
-
-/*
- * INIT
- */
-void
-Init_ossl_rsa()
-{
-    eRSAError = rb_define_class_under(mPKey, "RSAError", ePKeyError);
-
-    cRSA = rb_define_class_under(mPKey, "RSA", cPKey);
-
-    rb_define_singleton_method(cRSA, "generate", ossl_rsa_s_generate, -1);
-    rb_define_method(cRSA, "initialize", ossl_rsa_initialize, -1);
-	
-    rb_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
-    rb_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
-    rb_define_method(cRSA, "to_text", ossl_rsa_to_text, 0);
-    rb_define_method(cRSA, "export", ossl_rsa_export, -1);
-    rb_define_alias(cRSA, "to_pem", "export");
-    rb_define_alias(cRSA, "to_s", "export");
-    rb_define_method(cRSA, "public_key", ossl_rsa_to_public_key, 0);
-    rb_define_method(cRSA, "public_encrypt", ossl_rsa_public_encrypt, 1);
-    rb_define_method(cRSA, "public_decrypt", ossl_rsa_public_decrypt, 1);
-    rb_define_method(cRSA, "private_encrypt", ossl_rsa_private_encrypt, 1);
-    rb_define_method(cRSA, "private_decrypt", ossl_rsa_private_decrypt, 1);
-
-    DEF_OSSL_PKEY_BN(cRSA, rsa, n);
-    DEF_OSSL_PKEY_BN(cRSA, rsa, e);
-    DEF_OSSL_PKEY_BN(cRSA, rsa, d);
-    DEF_OSSL_PKEY_BN(cRSA, rsa, p);
-    DEF_OSSL_PKEY_BN(cRSA, rsa, q);
-    DEF_OSSL_PKEY_BN(cRSA, rsa, dmp1);
-    DEF_OSSL_PKEY_BN(cRSA, rsa, dmq1);
-    DEF_OSSL_PKEY_BN(cRSA, rsa, iqmp);
-
-    rb_define_method(cRSA, "params", ossl_rsa_get_params, 0);
-
-/*
- * TODO: Test it
-    rb_define_method(cRSA, "blinding_on!", ossl_rsa_blinding_on, 0);
-    rb_define_method(cRSA, "blinding_off!", ossl_rsa_blinding_off, 0);
- */
-}
-
-#else /* defined NO_RSA */
-#   warning >>> OpenSSL is compiled without RSA support <<<
-void
-Init_ossl_rsa()
-{
-    rb_warning("OpenSSL is compiled without RSA support");
-}
-#endif /* NO_RSA */
-
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
deleted file mode 100644
index ec9883d70a..0000000000
--- a/ext/openssl/ossl_rand.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-/*
- * Classes
- */
-VALUE mRandom;
-VALUE eRandomError;
-
-/*
- * Struct
- */
-
-/*
- * Public
- */
-
-/*
- * Private
- */
-static VALUE
-ossl_rand_seed(VALUE self, VALUE str)
-{
-    StringValue(str);
-    RAND_seed(RSTRING(str)->ptr, RSTRING(str)->len);
-
-    return str;
-}
-
-static VALUE
-ossl_rand_load_file(VALUE self, VALUE filename)
-{
-    SafeStringValue(filename);
-	
-    if(!RAND_load_file(RSTRING(filename)->ptr, -1)) {
-	ossl_raise(eRandomError, NULL);
-    }
-    return Qtrue;
-}
-
-static VALUE
-ossl_rand_write_file(VALUE self, VALUE filename)
-{
-    SafeStringValue(filename);
-    if (RAND_write_file(RSTRING(filename)->ptr) == -1) {
-	ossl_raise(eRandomError, NULL);
-    }
-    return Qtrue;
-}
-
-static VALUE
-ossl_rand_bytes(VALUE self, VALUE len)
-{
-    VALUE str;
-	
-    str = rb_str_new(0, FIX2INT(len));
-    if (!RAND_bytes(RSTRING(str)->ptr, FIX2INT(len))) {
-	ossl_raise(eRandomError, NULL);
-    }
-
-    return str;
-}
-
-static VALUE
-ossl_rand_pseudo_bytes(VALUE self, VALUE len)
-{
-    VALUE str;
-
-    str = rb_str_new(0, FIX2INT(len));
-    if (!RAND_pseudo_bytes(RSTRING(str)->ptr, FIX2INT(len))) {
-	ossl_raise(eRandomError, NULL);
-    }
-
-    return str;
-}
-
-static VALUE
-ossl_rand_egd(VALUE self, VALUE filename)
-{
-    SafeStringValue(filename);
-	
-    if(!RAND_egd(RSTRING(filename)->ptr)) {
-	ossl_raise(eRandomError, NULL);
-    }
-    return Qtrue;
-}
-
-static VALUE
-ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
-{
-    SafeStringValue(filename);
-
-    if (!RAND_egd_bytes(RSTRING(filename)->ptr, FIX2INT(len))) {
-	ossl_raise(eRandomError, NULL);
-    }
-    return Qtrue;
-}
-
-#define DEFMETH(class, name, func, argc) \
-	rb_define_method(class, name, func, argc); \
-	rb_define_singleton_method(class, name, func, argc);
-
-/*
- * INIT
- */
-void
-Init_ossl_rand()
-{
-    mRandom = rb_define_module_under(mOSSL, "Random");
-	
-    eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError);
-	
-    DEFMETH(mRandom, "seed", ossl_rand_seed, 1);
-    DEFMETH(mRandom, "load_random_file", ossl_rand_load_file, 1);
-    DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1);
-    DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1);
-    DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
-    DEFMETH(mRandom, "egd", ossl_rand_egd, 1);
-    DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);	
-}
-
diff --git a/ext/openssl/ossl_rand.h b/ext/openssl/ossl_rand.h
deleted file mode 100644
index ce2ae0d129..0000000000
--- a/ext/openssl/ossl_rand.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_RAND_H_)
-#define _OSSL_RAND_H_
-
-extern VALUE mRandom;
-extern VALUE eRandomError;
-
-void Init_ossl_rand(void);
-
-#endif /* _OSSL_RAND_H_ */
-
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
deleted file mode 100644
index 4fe2fc8088..0000000000
--- a/ext/openssl/ossl_ssl.c
+++ /dev/null
@@ -1,718 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2000-2002  GOTOU Yuuzou <gotoyuzo@notwork.org>
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-#include <rubysig.h>
-#include <rubyio.h>
-
-#if defined(HAVE_UNISTD_H)
-#  include <unistd.h> /* for read(), and write() */
-#endif
-
-#define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
-
-#ifdef _WIN32
-#  define TO_SOCKET(s) _get_osfhandle(s)
-#else
-#  define TO_SOCKET(s) s
-#endif
-
-VALUE mSSL;
-VALUE eSSLError;
-VALUE cSSLContext;
-VALUE cSSLSocket;
-
-/*
- * SSLContext class
- */
-#define ossl_sslctx_set_cert(o,v)        rb_iv_set((o),"@cert",(v))
-#define ossl_sslctx_set_key(o,v)         rb_iv_set((o),"@key",(v))
-#define ossl_sslctx_set_client_ca(o,v)   rb_iv_set((o),"@client_ca",(v))
-#define ossl_sslctx_set_ca_file(o,v)     rb_iv_set((o),"@ca_file",(v))
-#define ossl_sslctx_set_ca_path(o,v)     rb_iv_set((o),"@ca_path",(v))
-#define ossl_sslctx_set_timeout(o,v)     rb_iv_set((o),"@timeout",(v))
-#define ossl_sslctx_set_verify_mode(o,v) rb_iv_set((o),"@verify_mode",(v))
-#define ossl_sslctx_set_verify_dep(o,v)  rb_iv_set((o),"@verify_depth",(v))
-#define ossl_sslctx_set_verify_cb(o,v)   rb_iv_set((o),"@verify_callback",(v))
-#define ossl_sslctx_set_options(o,v)     rb_iv_set((o),"@options",(v))
-#define ossl_sslctx_set_cert_store(o,v)  rb_iv_set((o),"@cert_store",(v))
-#define ossl_sslctx_set_extra_cert(o,v)  rb_iv_set((o),"@extra_chain_cert",(v))
-
-#define ossl_sslctx_get_cert(o)          rb_iv_get((o),"@cert")
-#define ossl_sslctx_get_key(o)           rb_iv_get((o),"@key")
-#define ossl_sslctx_get_client_ca(o)     rb_iv_get((o),"@client_ca")
-#define ossl_sslctx_get_ca_file(o)       rb_iv_get((o),"@ca_file")
-#define ossl_sslctx_get_ca_path(o)       rb_iv_get((o),"@ca_path")
-#define ossl_sslctx_get_timeout(o)       rb_iv_get((o),"@timeout")
-#define ossl_sslctx_get_verify_mode(o)   rb_iv_get((o),"@verify_mode")
-#define ossl_sslctx_get_verify_dep(o)    rb_iv_get((o),"@verify_depth")
-#define ossl_sslctx_get_verify_cb(o)     rb_iv_get((o),"@verify_callback")
-#define ossl_sslctx_get_options(o)       rb_iv_get((o),"@options")
-#define ossl_sslctx_get_cert_store(o)    rb_iv_get((o),"@cert_store")
-#define ossl_sslctx_get_extra_cert(o)    rb_iv_get((o),"@extra_chain_cert")
-
-static char *ossl_sslctx_attrs[] = {
-    "cert", "key", "client_ca", "ca_file", "ca_path",
-    "timeout", "verify_mode", "verify_depth",
-    "verify_callback", "options", "cert_store", "extra_chain_cert"
-};
-
-struct {
-    const char *name;
-    SSL_METHOD *(*func)(void);
-} ossl_ssl_method_tab[] = {
-#define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
-    OSSL_SSL_METHOD_ENTRY(TLSv1),
-    OSSL_SSL_METHOD_ENTRY(TLSv1_server),
-    OSSL_SSL_METHOD_ENTRY(TLSv1_client),
-    OSSL_SSL_METHOD_ENTRY(SSLv2),
-    OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-    OSSL_SSL_METHOD_ENTRY(SSLv2_client),
-    OSSL_SSL_METHOD_ENTRY(SSLv3),
-    OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-    OSSL_SSL_METHOD_ENTRY(SSLv3_client),
-    OSSL_SSL_METHOD_ENTRY(SSLv23),
-    OSSL_SSL_METHOD_ENTRY(SSLv23_server),
-    OSSL_SSL_METHOD_ENTRY(SSLv23_client),
-#undef OSSL_SSL_METHOD_ENTRY
-};
-
-int ossl_ssl_ex_vcb_idx;
-int ossl_ssl_ex_store_p;
-
-static void
-ossl_sslctx_free(SSL_CTX *ctx)
-{
-    if(ctx && SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_store_p)== (void*)1)
-	ctx->cert_store = NULL;
-    SSL_CTX_free(ctx);
-}
-
-static VALUE
-ossl_sslctx_s_alloc(VALUE klass)
-{
-    SSL_CTX *ctx;
-
-    ctx = SSL_CTX_new(SSLv23_method());
-    if (!ctx) {
-        ossl_raise(eSSLError, "SSL_CTX_new:");
-    }
-    SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
-    SSL_CTX_set_options(ctx, SSL_OP_ALL);
-    return Data_Wrap_Struct(klass, 0, ossl_sslctx_free, ctx);
-}
-
-static VALUE
-ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE ssl_method;
-    SSL_METHOD *method = NULL;
-    SSL_CTX *ctx;
-    int i;
-    char *s;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-
-    for(i = 0; i < numberof(ossl_sslctx_attrs); i++){
-	char buf[32];
-	snprintf(buf, sizeof(buf), "@%s", ossl_sslctx_attrs[i]);
-	rb_iv_set(self, buf, Qnil);
-    }
-    if (rb_scan_args(argc, argv, "01", &ssl_method) == 0){
-        return self;
-    }
-    if(TYPE(ssl_method) == T_SYMBOL)
-	s = rb_id2name(SYM2ID(ssl_method));
-    else
-	s =  StringValuePtr(ssl_method);
-    for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
-        if (strcmp(ossl_ssl_method_tab[i].name, s) == 0) {
-            method = ossl_ssl_method_tab[i].func();
-            break;
-        }
-    }
-    if (!method) {
-        ossl_raise(rb_eArgError, "unknown SSL method `%s'.", s);
-    }
-    if (SSL_CTX_set_ssl_version(ctx, method) != 1) {
-        ossl_raise(eSSLError, "SSL_CTX_set_ssl_version:");
-    }
-
-    return self;
-}
-
-static int
-ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
-{
-    VALUE cb;
-    SSL *ssl;
-
-    ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
-    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx);
-    X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx, (void*)cb);
-    return ossl_verify_cb(preverify_ok, ctx);
-}
-
-static VALUE
-ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
-{
-    X509 *x509;
-    SSL_CTX *ctx;
-
-    Data_Get_Struct(arg, SSL_CTX, ctx);
-    x509 = DupX509CertPtr(i);
-    if(!SSL_CTX_add_extra_chain_cert(ctx, x509)){
-	ossl_raise(eSSLError, NULL);
-    }
-
-    return i;
-}
-
-static VALUE
-ossl_sslctx_setup(VALUE self)
-{
-    SSL_CTX *ctx;
-    X509 *cert = NULL, *client_ca = NULL;
-    X509_STORE *store;
-    EVP_PKEY *key = NULL;
-    char *ca_path = NULL, *ca_file = NULL;
-    int i, verify_mode;
-    VALUE val;
-
-    if(OBJ_FROZEN(self)) return Qnil;
-    Data_Get_Struct(self, SSL_CTX, ctx);
-
-    val = ossl_sslctx_get_cert_store(self);
-    if(!NIL_P(val)){
-	/*
-         * WORKAROUND:
-	 *   X509_STORE can count references, but
-	 *   X509_STORE_free() doesn't care it.
-	 *   So we won't increment it but mark it by ex_data.
-	 */
-        store = GetX509StorePtr(val); /* NO NEED TO DUP */
-        SSL_CTX_set_cert_store(ctx, store);
-        SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_store_p, (void*)1);
-    }
-
-    val = ossl_sslctx_get_extra_cert(self);
-    if(!NIL_P(val)){
-	rb_iterate(rb_each, val, ossl_sslctx_add_extra_chain_cert_i, self);
-    }
-
-    /* private key may be bundled in certificate file. */
-    val = ossl_sslctx_get_cert(self);
-    cert = NIL_P(val) ? NULL : GetX509CertPtr(val); /* NO DUP NEEDED */
-    val = ossl_sslctx_get_key(self);
-    key = NIL_P(val) ? NULL : GetPKeyPtr(val); /* NO DUP NEEDED */
-    if (cert && key) {
-        if (!SSL_CTX_use_certificate(ctx, cert)) {
-            /* Adds a ref => Safe to FREE */
-            ossl_raise(eSSLError, "SSL_CTX_use_certificate:");
-        }
-        if (!SSL_CTX_use_PrivateKey(ctx, key)) {
-            /* Adds a ref => Safe to FREE */
-            ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey:");
-        }
-        if (!SSL_CTX_check_private_key(ctx)) {
-            ossl_raise(eSSLError, "SSL_CTX_check_private_key:");
-        }
-    }
-
-    val = ossl_sslctx_get_client_ca(self);
-    if(!NIL_P(val)){
-	if(TYPE(val) == T_ARRAY){
-	    for(i = 0; i < RARRAY(val)->len; i++){
-		client_ca = GetX509CertPtr(RARRAY(val)->ptr[i]);
-        	if (!SSL_CTX_add_client_CA(ctx, client_ca)){
-		    /* Copies X509_NAME => FREE it. */
-        	    ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
-        	}
-	    }
-        }
-	else{
-	    client_ca = GetX509CertPtr(val); /* NO DUP NEEDED. */
-            if (!SSL_CTX_add_client_CA(ctx, client_ca)){
-		/* Copies X509_NAME => FREE it. */
-        	ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
-            }
-	}
-    }
-
-    val = ossl_sslctx_get_ca_file(self);
-    ca_file = NIL_P(val) ? NULL : StringValuePtr(val);
-    val = ossl_sslctx_get_ca_path(self);
-    ca_path = NIL_P(val) ? NULL : StringValuePtr(val);
-    if(ca_file || ca_path){
-	if (!SSL_CTX_load_verify_locations(ctx, ca_file, ca_path))
-	    rb_warning("can't set verify locations");
-    }
-
-    val = ossl_sslctx_get_verify_mode(self);
-    verify_mode = NIL_P(val) ? SSL_VERIFY_NONE : NUM2INT(val);
-    SSL_CTX_set_verify(ctx, verify_mode, ossl_ssl_verify_callback);
-
-    val = ossl_sslctx_get_timeout(self);
-    if(!NIL_P(val)) SSL_CTX_set_timeout(ctx, NUM2LONG(val));
-
-    val = ossl_sslctx_get_verify_dep(self);
-    if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2LONG(val));
-
-    val = ossl_sslctx_get_options(self);
-    if(!NIL_P(val)) SSL_CTX_set_options(ctx, NUM2LONG(val));
-    rb_obj_freeze(self);
-
-    return Qtrue;
-}
-
-static VALUE
-ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
-{
-    VALUE ary;
-    int bits, alg_bits;
-
-    ary = rb_ary_new2(4);
-    rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_name(cipher)));
-    rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_version(cipher)));
-    bits = SSL_CIPHER_get_bits(cipher, &alg_bits);
-    rb_ary_push(ary, INT2FIX(bits));
-    rb_ary_push(ary, INT2FIX(alg_bits));
-
-    return ary;
-}
-
-static VALUE
-ossl_sslctx_get_ciphers(VALUE self)
-{
-    SSL_CTX *ctx;
-    STACK_OF(SSL_CIPHER) *ciphers;
-    SSL_CIPHER *cipher;
-    VALUE ary;
-    int i, num;
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    if(!ctx){
-        rb_warning("SSL_CTX is not initialized.");
-        return Qnil;
-    }
-    ciphers = ctx->cipher_list;
-
-    if (!ciphers)
-        return rb_ary_new();
-
-    num = sk_num((STACK*)ciphers);
-    ary = rb_ary_new2(num);
-    for(i = 0; i < num; i++){
-        cipher = (SSL_CIPHER*)sk_value((STACK*)ciphers, i);
-        rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher));
-    }
-    return ary;
-}
-
-static VALUE
-ossl_sslctx_set_ciphers(VALUE self, VALUE v)
-{
-    SSL_CTX *ctx;
-    VALUE str, elem;
-    int i;
-
-    rb_check_frozen(self);
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    if(!ctx){
-        ossl_raise(eSSLError, "SSL_CTX is not initialized.");
-        return Qnil;
-    }
-
-    if (TYPE(v) == T_ARRAY) {
-        str = rb_str_new2(NULL);
-        for (i = 0; i < RARRAY(v)->len; i++) {
-            elem = rb_ary_entry(v, i);
-            if (TYPE(elem) == T_ARRAY) elem = rb_ary_entry(elem, 0);
-            elem = rb_String(elem);
-            rb_str_append(str, elem);
-            if (i < RARRAY(v)->len-1) rb_str_cat2(str, ":");
-        }
-    } else {
-        str = v;
-        StringValue(str);
-    }
-
-    if (!SSL_CTX_set_cipher_list(ctx, RSTRING(str)->ptr)) {
-        ossl_raise(eSSLError, "SSL_CTX_set_ciphers:");
-    }
-    return Qnil;
-}
-
-/*
- * SSLSocket class
- */
-#define ossl_ssl_get_io(o)           rb_iv_get((o),"@io")
-#define ossl_ssl_get_ctx(o)          rb_iv_get((o),"@context")
-#define ossl_ssl_get_sync_close(o)   rb_iv_get((o),"@sync_close")
-
-#define ossl_ssl_set_io(o,v)         rb_iv_set((o),"@io",(v))
-#define ossl_ssl_set_ctx(o,v)        rb_iv_set((o),"@context",(v))
-#define ossl_ssl_set_sync_close(o,v) rb_iv_set((o),"@sync_close",(v))
-
-static char *ossl_ssl_attr_readers[] = { "io", "context", };
-static char *ossl_ssl_attrs[] = { "sync_close", };
-
-static void
-ossl_ssl_shutdown(SSL *ssl)
-{
-    if (ssl) {
-        SSL_shutdown(ssl);
-        SSL_clear(ssl);
-    }
-}
-
-static void
-ossl_ssl_free(SSL *ssl)
-{
-    ossl_ssl_shutdown(ssl);
-    SSL_free(ssl);
-}
-
-static VALUE
-ossl_ssl_s_alloc(VALUE klass)
-{
-    return Data_Wrap_Struct(klass, 0, ossl_ssl_free, NULL);
-}
-
-static VALUE
-ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE io, ctx;
-
-    if (rb_scan_args(argc, argv, "11", &io, &ctx) == 1) {
-        ctx = rb_funcall(cSSLContext, rb_intern("new"), 0);
-    }
-    OSSL_Check_Kind(ctx, cSSLContext);
-    Check_Type(io, T_FILE);
-    ossl_ssl_set_io(self, io);
-    ossl_ssl_set_ctx(self, ctx);
-    ossl_ssl_set_sync_close(self, Qfalse);
-    ossl_sslctx_setup(ctx);
-    rb_call_super(0, 0);
-
-    return self;
-}
-
-static VALUE
-ossl_ssl_setup(VALUE self)
-{
-    VALUE io, v_ctx;
-    SSL_CTX *ctx;
-    SSL *ssl;
-    OpenFile *fptr;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if(!ssl){
-        v_ctx = ossl_ssl_get_ctx(self);
-        Data_Get_Struct(v_ctx, SSL_CTX, ctx);
-
-        ssl = SSL_new(ctx);
-        if (!ssl) {
-            ossl_raise(eSSLError, "SSL_new:");
-        }
-        DATA_PTR(self) = ssl;
-
-        io = ossl_ssl_get_io(self);
-        GetOpenFile(io, fptr);
-        rb_io_check_readable(fptr);
-        rb_io_check_writable(fptr);
-        SSL_set_fd(ssl, TO_SOCKET(fileno(fptr->f)));
-    }
-
-    return Qtrue;
-}
-
-static VALUE
-ossl_ssl_connect(VALUE self)
-{
-    SSL *ssl;
-    VALUE cb;
-
-    ossl_ssl_setup(self);
-    Data_Get_Struct(self, SSL, ssl);
-    cb = ossl_sslctx_get_verify_cb(ossl_ssl_get_ctx(self));
-    SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void *)cb);
-    if (SSL_connect(ssl) <= 0) {
-        ossl_raise(eSSLError, "SSL_connect:");
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_ssl_accept(VALUE self)
-{
-    SSL *ssl;
-    VALUE cb;
-
-    ossl_ssl_setup(self);
-    Data_Get_Struct(self, SSL, ssl);
-    cb = ossl_sslctx_get_verify_cb(ossl_ssl_get_ctx(self));
-    SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void *)cb);
-    if (SSL_accept(ssl) <= 0) {
-        ossl_raise(eSSLError, "SSL_accept:");
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_ssl_read(VALUE self, VALUE len)
-{
-    SSL *ssl;
-    int ilen, nread = 0;
-    VALUE str;
-    OpenFile *fptr;
-
-    Data_Get_Struct(self, SSL, ssl);
-    ilen = NUM2INT(len);
-    str = rb_str_new(0, ilen);
-
-    if (ssl) {
-        nread = SSL_read(ssl, RSTRING(str)->ptr, RSTRING(str)->len);
-        if (nread < 0) {
-            ossl_raise(eSSLError, "SSL_read:");
-        }
-    }
-    else {
-        rb_warning("SSL session is not started yet.");
-        GetOpenFile(ossl_ssl_get_io(self), fptr);
-        rb_io_check_readable(fptr);
-        TRAP_BEG;
-        nread = read(fileno(fptr->f), RSTRING(str)->ptr, RSTRING(str)->len);
-        TRAP_END;
-        if(nread < 0) {
-            ossl_raise(eSSLError, "read:%s", strerror(errno));
-        }
-    }
-
-    if (nread == 0) {
-        ossl_raise(rb_eEOFError, "End of file reached");
-    }
-
-    RSTRING(str)->len = nread;
-    RSTRING(str)->ptr[nread] = 0;
-    OBJ_TAINT(str);
-
-    return str;
-}
-
-static VALUE
-ossl_ssl_write(VALUE self, VALUE str)
-{
-    SSL *ssl;
-    int nwrite = 0;
-    OpenFile *fptr;
-    FILE *fp;
-
-    Data_Get_Struct(self, SSL, ssl);
-    StringValue(str);
-
-    if (ssl) {
-        nwrite = SSL_write(ssl, RSTRING(str)->ptr, RSTRING(str)->len);
-        if (nwrite <= 0) {
-            ossl_raise(eSSLError, "SSL_write:");
-        }
-    }
-    else {
-        rb_warning("SSL session is not started yet.");
-        GetOpenFile(ossl_ssl_get_io(self), fptr);
-        rb_io_check_writable(fptr);
-        fp = GetWriteFile(fptr);
-        nwrite = write(fileno(fp), RSTRING(str)->ptr, RSTRING(str)->len);
-        if (nwrite < 0) {
-            ossl_raise(eSSLError, "write:%s", strerror(errno));
-        }
-    }
-
-    return INT2NUM(nwrite);
-}
-
-static VALUE
-ossl_ssl_close(VALUE self)
-{
-    SSL *ssl;
-
-    Data_Get_Struct(self, SSL, ssl);
-    ossl_ssl_shutdown(ssl);
-    if (RTEST(ossl_ssl_get_sync_close(self)))
-	rb_funcall(ossl_ssl_get_io(self), rb_intern("close"), 0);
-
-    return Qnil;
-}
-
-static VALUE
-ossl_ssl_get_cert(VALUE self)
-{
-    SSL *ssl;
-    X509 *cert = NULL;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-
-    /*
-     * Is this OpenSSL bug? Should add a ref?
-     * TODO: Ask for.
-     */
-    cert = SSL_get_certificate(ssl); /* NO DUPs => DON'T FREE. */
-
-    if (!cert) {
-        return Qnil;
-    }
-    return ossl_x509_new(cert);
-}
-
-static VALUE
-ossl_ssl_get_peer_cert(VALUE self)
-{
-    SSL *ssl;
-    X509 *cert = NULL;
-    VALUE obj;
-
-    Data_Get_Struct(self, SSL, ssl);
-
-    if (!ssl){
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-
-    cert = SSL_get_peer_certificate(ssl); /* Adds a ref => Safe to FREE. */
-
-    if (!cert) {
-        return Qnil;
-    }
-    obj = ossl_x509_new(cert);
-    X509_free(cert);
-
-    return obj;
-}
-
-static VALUE
-ossl_ssl_get_cipher(VALUE self)
-{
-    SSL *ssl;
-    SSL_CIPHER *cipher;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-    cipher = SSL_get_current_cipher(ssl);
-
-    return ossl_ssl_cipher_to_ary(cipher);
-}
-
-static VALUE
-ossl_ssl_get_state(VALUE self)
-{
-    SSL *ssl;
-    VALUE ret;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-    ret = rb_str_new2(SSL_state_string(ssl));
-    if (ruby_verbose) {
-        rb_str_cat2(ret, ": ");
-        rb_str_cat2(ret, SSL_state_string_long(ssl));
-    }
-    return ret;
-}
-
-void
-Init_ossl_ssl()
-{
-    int i;
-
-    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_vcb_idx",0,0,0);
-    ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,"ossl_ssl_ex_store_p",0,0,0);
-
-    mSSL = rb_define_module_under(mOSSL, "SSL");
-    eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);
-
-    /* class SSLContext */
-    cSSLContext = rb_define_class_under(mSSL, "SSLContext", rb_cObject);
-    rb_define_alloc_func(cSSLContext, ossl_sslctx_s_alloc);
-    for(i = 0; i < numberof(ossl_sslctx_attrs); i++)
-        rb_attr(cSSLContext, rb_intern(ossl_sslctx_attrs[i]), 1, 1, Qfalse);
-    rb_define_method(cSSLContext, "initialize",  ossl_sslctx_initialize, -1);
-    rb_define_method(cSSLContext, "ciphers",     ossl_sslctx_get_ciphers, 0);
-    rb_define_method(cSSLContext, "ciphers=",    ossl_sslctx_set_ciphers, 1);
-
-    /* class SSLSocket */
-    cSSLSocket = rb_define_class_under(mSSL, "SSLSocket", rb_cObject);
-    rb_define_alloc_func(cSSLSocket, ossl_ssl_s_alloc);
-    for(i = 0; i < numberof(ossl_ssl_attr_readers); i++)
-        rb_attr(cSSLSocket, rb_intern(ossl_ssl_attr_readers[i]), 1, 0, Qfalse);
-    for(i = 0; i < numberof(ossl_ssl_attrs); i++)
-        rb_attr(cSSLSocket, rb_intern(ossl_ssl_attrs[i]), 1, 1, Qfalse);
-    rb_define_alias(cSSLSocket, "to_io", "io");
-    rb_define_method(cSSLSocket, "initialize", ossl_ssl_initialize, -1);
-    rb_define_method(cSSLSocket, "connect",    ossl_ssl_connect, 0);
-    rb_define_method(cSSLSocket, "accept",     ossl_ssl_accept, 0);
-    rb_define_method(cSSLSocket, "sysread",    ossl_ssl_read, 1);
-    rb_define_method(cSSLSocket, "syswrite",   ossl_ssl_write, 1);
-    rb_define_method(cSSLSocket, "sysclose",   ossl_ssl_close, 0);
-    rb_define_method(cSSLSocket, "cert",       ossl_ssl_get_cert, 0);
-    rb_define_method(cSSLSocket, "peer_cert",  ossl_ssl_get_peer_cert, 0);
-    rb_define_method(cSSLSocket, "cipher",     ossl_ssl_get_cipher, 0);
-    rb_define_method(cSSLSocket, "state",      ossl_ssl_get_state, 0);
-
-#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2FIX(SSL_##x))
-
-    ossl_ssl_def_const(VERIFY_NONE);
-    ossl_ssl_def_const(VERIFY_PEER);
-    ossl_ssl_def_const(VERIFY_FAIL_IF_NO_PEER_CERT);
-    ossl_ssl_def_const(VERIFY_CLIENT_ONCE);
-    /* Not introduce constants included in OP_ALL such as...
-     * ossl_ssl_def_const(OP_MICROSOFT_SESS_ID_BUG);
-     * ossl_ssl_def_const(OP_NETSCAPE_CHALLENGE_BUG);
-     * ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
-     * ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
-     * ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
-     * ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
-     * ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
-     * ossl_ssl_def_const(OP_TLS_D5_BUG);
-     * ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
-     * ossl_ssl_def_const(OP_DONT_INSERT_EMPTY_FRAGMENTS);
-     */
-    ossl_ssl_def_const(OP_ALL);
-#if defined(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)
-    ossl_ssl_def_const(OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-#endif
-#if defined(SSL_OP_SINGLE_ECDH_USE)
-    ossl_ssl_def_const(OP_SINGLE_ECDH_USE);
-#endif
-    ossl_ssl_def_const(OP_SINGLE_DH_USE);
-    ossl_ssl_def_const(OP_EPHEMERAL_RSA);
-#if defined(SSL_OP_CIPHER_SERVER_PREFERENCE)
-    ossl_ssl_def_const(OP_CIPHER_SERVER_PREFERENCE);
-#endif
-    ossl_ssl_def_const(OP_TLS_ROLLBACK_BUG);
-    ossl_ssl_def_const(OP_NO_SSLv2);
-    ossl_ssl_def_const(OP_NO_SSLv3);
-    ossl_ssl_def_const(OP_NO_TLSv1);
-    ossl_ssl_def_const(OP_PKCS1_CHECK_1);
-    ossl_ssl_def_const(OP_PKCS1_CHECK_2);
-    ossl_ssl_def_const(OP_NETSCAPE_CA_DN_BUG);
-    ossl_ssl_def_const(OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
-}
diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h
deleted file mode 100644
index 5929eef856..0000000000
--- a/ext/openssl/ossl_ssl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_SSL_H_)
-#define _OSSL_SSL_H_
-
-extern VALUE mSSL;
-extern VALUE eSSLError;
-extern VALUE cSSLSocket;
-extern VALUE cSSLContext;
-
-void Init_ossl_ssl(void);
-
-#endif /* _OSSL_SSL_H_ */
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
deleted file mode 100644
index 63878e0d8e..0000000000
--- a/ext/openssl/ossl_version.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_VERSION_H_)
-#define _OSSL_VERSION_H_
-
-#define OSSL_VERSION "1.0.0"
-
-#endif /* _OSSL_VERSION_H_ */
diff --git a/ext/openssl/ossl_x509.c b/ext/openssl/ossl_x509.c
deleted file mode 100644
index fd1d9b6c7e..0000000000
--- a/ext/openssl/ossl_x509.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-VALUE mX509;
-
-#define DefX509Const(x) rb_define_const(mX509, #x,INT2FIX(X509_##x))
-#define DefX509Default(x,i) \
-  rb_define_const(mX509, "DEFAULT_" #x, rb_str_new2(X509_get_default_##i()))
-
-void
-Init_ossl_x509()
-{
-    mX509 = rb_define_module_under(mOSSL, "X509");
-
-    Init_ossl_x509attr();
-    Init_ossl_x509cert();
-    Init_ossl_x509crl();
-    Init_ossl_x509ext();
-    Init_ossl_x509name();
-    Init_ossl_x509req();
-    Init_ossl_x509revoked();
-    Init_ossl_x509store();
-
-    DefX509Const(V_OK);
-    DefX509Const(V_ERR_UNABLE_TO_GET_ISSUER_CERT);
-    DefX509Const(V_ERR_UNABLE_TO_GET_CRL);
-    DefX509Const(V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE);
-    DefX509Const(V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE);
-    DefX509Const(V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
-    DefX509Const(V_ERR_CERT_SIGNATURE_FAILURE);
-    DefX509Const(V_ERR_CRL_SIGNATURE_FAILURE);
-    DefX509Const(V_ERR_CERT_NOT_YET_VALID);
-    DefX509Const(V_ERR_CERT_HAS_EXPIRED);
-    DefX509Const(V_ERR_CRL_NOT_YET_VALID);
-    DefX509Const(V_ERR_CRL_HAS_EXPIRED);
-    DefX509Const(V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD);
-    DefX509Const(V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD);
-    DefX509Const(V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD);
-    DefX509Const(V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
-    DefX509Const(V_ERR_OUT_OF_MEM);
-    DefX509Const(V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
-    DefX509Const(V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
-    DefX509Const(V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
-    DefX509Const(V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
-    DefX509Const(V_ERR_CERT_CHAIN_TOO_LONG);
-    DefX509Const(V_ERR_CERT_REVOKED);
-    DefX509Const(V_ERR_INVALID_CA);
-    DefX509Const(V_ERR_PATH_LENGTH_EXCEEDED);
-    DefX509Const(V_ERR_INVALID_PURPOSE);
-    DefX509Const(V_ERR_CERT_UNTRUSTED);
-    DefX509Const(V_ERR_CERT_REJECTED);
-    DefX509Const(V_ERR_SUBJECT_ISSUER_MISMATCH);
-    DefX509Const(V_ERR_AKID_SKID_MISMATCH);
-    DefX509Const(V_ERR_AKID_ISSUER_SERIAL_MISMATCH);
-    DefX509Const(V_ERR_KEYUSAGE_NO_CERTSIGN);
-    DefX509Const(V_ERR_APPLICATION_VERIFICATION);
-
-#if defined(X509_V_FLAG_CRL_CHECK)
-    DefX509Const(V_FLAG_CRL_CHECK);
-#endif
-#if defined(X509_V_FLAG_CRL_CHECK_ALL)
-    DefX509Const(V_FLAG_CRL_CHECK_ALL);
-#endif
-
-    DefX509Const(PURPOSE_SSL_CLIENT);
-    DefX509Const(PURPOSE_SSL_SERVER);
-    DefX509Const(PURPOSE_NS_SSL_SERVER);
-    DefX509Const(PURPOSE_SMIME_SIGN);
-    DefX509Const(PURPOSE_SMIME_ENCRYPT);
-    DefX509Const(PURPOSE_CRL_SIGN);
-    DefX509Const(PURPOSE_ANY);
-#if defined(X509_PURPOSE_OCSP_HELPER)
-    DefX509Const(PURPOSE_OCSP_HELPER);
-#endif
-
-    DefX509Const(TRUST_COMPAT);
-    DefX509Const(TRUST_SSL_CLIENT);
-    DefX509Const(TRUST_SSL_SERVER);
-    DefX509Const(TRUST_EMAIL);
-    DefX509Const(TRUST_OBJECT_SIGN);
-#if defined(X509_TRUST_OCSP_SIGN)
-    DefX509Const(TRUST_OCSP_SIGN);
-#endif
-#if defined(X509_TRUST_OCSP_REQUEST)
-    DefX509Const(TRUST_OCSP_REQUEST);
-#endif
-
-    DefX509Default(CERT_AREA, cert_area);
-    DefX509Default(CERT_DIR, cert_dir);
-    DefX509Default(CERT_FILE, cert_file);
-    DefX509Default(CERT_DIR_ENV, cert_dir_env);
-    DefX509Default(CERT_FILE_ENV, cert_file_env);
-    DefX509Default(PRIVATE_DIR, private_dir);
-}
-
diff --git a/ext/openssl/ossl_x509.h b/ext/openssl/ossl_x509.h
deleted file mode 100644
index 196ce06848..0000000000
--- a/ext/openssl/ossl_x509.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_X509_H_)
-#define _OSSL_X509_H_
-
-/*
- * X509 main module
- */
-extern VALUE mX509;
-
-void Init_ossl_x509(void);
-
-/*
- * X509Attr
- */
-extern VALUE cX509Attr;
-extern VALUE eX509AttrError;
-
-VALUE ossl_x509attr_new(X509_ATTRIBUTE *);
-X509_ATTRIBUTE *DupX509AttrPtr(VALUE);
-void Init_ossl_x509attr(void);
-
-/*
- * X509Cert
- */
-extern VALUE cX509Cert;
-extern VALUE eX509CertError;
-
-VALUE ossl_x509_new(X509 *);
-VALUE ossl_x509_new_from_file(VALUE);
-X509 *GetX509CertPtr(VALUE);
-X509 *DupX509CertPtr(VALUE);
-void Init_ossl_x509cert(void);
-
-/*
- * X509CRL
- */
-extern VALUE cX509CRL;
-extern VALUE eX509CRLError;
-
-VALUE ossl_x509crl_new(X509_CRL *);
-X509_CRL *GetX509CRLPtr(VALUE);
-X509_CRL *DupX509CRLPtr(VALUE);
-void Init_ossl_x509crl(void);
-
-/*
- * X509Extension
- */
-extern VALUE cX509Ext;
-extern VALUE cX509ExtFactory;
-extern VALUE eX509ExtError;
-
-VALUE ossl_x509ext_new(X509_EXTENSION *);
-X509_EXTENSION *GetX509ExtPtr(VALUE);
-X509_EXTENSION *DupX509ExtPtr(VALUE);
-void Init_ossl_x509ext(void);
-
-/*
- * X509Name
- */
-extern VALUE cX509Name;
-extern VALUE eX509NameError;
-
-VALUE ossl_x509name_new(X509_NAME *);
-X509_NAME *GetX509NamePtr(VALUE);
-void Init_ossl_x509name(void);
-
-/*
- * X509Request
- */
-extern VALUE cX509Req;
-extern VALUE eX509ReqError;
-
-VALUE ossl_x509req_new(X509_REQ *);
-X509_REQ *DupX509ReqPtr(VALUE);
-void Init_ossl_x509req(void);
-
-/*
- * X509Revoked
- */
-extern VALUE cX509Rev;
-extern VALUE eX509RevError;
-
-VALUE ossl_x509revoked_new(X509_REVOKED *);
-X509_REVOKED *DupX509RevokedPtr(VALUE);
-void Init_ossl_x509revoked(void);
-
-/*
- * X509Store and X509StoreContext
- */
-extern VALUE cX509Store;
-extern VALUE cX509StoreContext;
-extern VALUE eX509StoreError;
-
-VALUE ossl_x509store_new(X509_STORE *);
-X509_STORE *GetX509StorePtr(VALUE);
-X509_STORE *DupX509StorePtr(VALUE);
-
-VALUE ossl_x509stctx_new(X509_STORE_CTX *);
-VALUE ossl_x509stctx_clear_ptr(VALUE);
-X509_STORE_CTX *GetX509StCtxtPtr(VALUE);
-
-void Init_ossl_x509store(void);
-
-#endif /* _OSSL_X509_H_ */
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
deleted file mode 100644
index 576ad4c40a..0000000000
--- a/ext/openssl/ossl_x509attr.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapX509Attr(klass, obj, attr) do { \
-    if (!attr) { \
-	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, X509_ATTRIBUTE_free, attr); \
-} while (0)
-#define GetX509Attr(obj, attr) do { \
-    Data_Get_Struct(obj, X509_ATTRIBUTE, attr); \
-    if (!attr) { \
-	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
-    } \
-} while (0)
-#define SafeGetX509Attr(obj, attr) do { \
-    OSSL_Check_Kind(obj, cX509Attr); \
-    GetX509Attr(obj, attr); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cX509Attr;
-VALUE eX509AttrError;
-
-/*
- * Public
- */
-VALUE
-ossl_x509attr_new(X509_ATTRIBUTE *attr)
-{
-    X509_ATTRIBUTE *new;
-    VALUE obj;
-    
-    if (!attr) {
-	new = X509_ATTRIBUTE_new();
-    } else {
-	new = X509_ATTRIBUTE_dup(attr);
-    }
-    if (!new) {
-	ossl_raise(eX509AttrError, NULL);
-    }
-    WrapX509Attr(cX509Attr, obj, new);
-
-    return obj;
-}
-
-X509_ATTRIBUTE *
-DupX509AttrPtr(VALUE obj)
-{
-    X509_ATTRIBUTE *attr, *new;
-
-    SafeGetX509Attr(obj, attr);
-    if (!(new = X509_ATTRIBUTE_dup(attr))) {
-	ossl_raise(eX509AttrError, NULL);
-    }
-
-    return new;
-}
-
-/*
- * Private
- */
-static VALUE
-ossl_x509attr_alloc(VALUE klass)
-{
-    X509_ATTRIBUTE *attr;
-    VALUE obj;
-
-    if (!(attr = X509_ATTRIBUTE_new())) 
-	ossl_raise(eX509AttrError, NULL);
-    WrapX509Attr(klass, obj, attr);
-
-    return obj;
-}
-
-static VALUE
-ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE oid, value;
-    X509_ATTRIBUTE *attr;
-    unsigned char *p;
-
-    if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
-	GetX509Attr(self, attr);
-	oid = ossl_to_der_if_possible(oid);
-	StringValue(oid);
-	p = RSTRING(oid)->ptr;
-	if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING(oid)->len)){
-	    ossl_raise(eX509AttrError, NULL);
-	}
-	return self;
-    }
-    rb_funcall(self, rb_intern("oid="), 1, oid);
-    rb_funcall(self, rb_intern("value="), 1, value);
-
-    return self;
-}
-
-static VALUE
-ossl_x509attr_set_oid(VALUE self, VALUE oid)
-{
-    X509_ATTRIBUTE *attr;
-    ASN1_OBJECT *obj;
-    char *s;
- 
-    GetX509Attr(self, attr);
-    s = StringValuePtr(oid);
-    obj = OBJ_txt2obj(s, 0);
-    if(!obj) obj = OBJ_txt2obj(s, 1);
-    if(!obj) ossl_raise(eX509AttrError, NULL);
-    X509_ATTRIBUTE_set1_object(attr, obj);
- 
-    return oid;
-}
-
-static VALUE
-ossl_x509attr_get_oid(VALUE self)
-{
-    X509_ATTRIBUTE *attr;
-    ASN1_OBJECT *oid;
-    BIO *out;
-    VALUE ret;
-    int nid;
-
-    GetX509Attr(self, attr);
-    oid = X509_ATTRIBUTE_get0_object(attr);
-    if ((nid = OBJ_obj2nid(oid)) != NID_undef)
-	ret = rb_str_new2(OBJ_nid2sn(nid));
-    else{
-	if (!(out = BIO_new(BIO_s_mem())))
-	    ossl_raise(eX509AttrError, NULL);
-	i2a_ASN1_OBJECT(out, oid);
-	ret = ossl_membio2str(out);
-    }
-  
-    return ret;
-}
-
-#if defined(HAVE_ST_X509_ATTRIBUTE_SINGLE) || defined(HAVE_ST_SINGLE)
-#  define OSSL_X509ATTR_IS_SINGLE(attr)  ((attr)->single)
-#  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->single = 1)
-#else
-#  define OSSL_X509ATTR_IS_SINGLE(attr)  (!(attr)->set)
-#  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->set = 0)
-#endif
-
-static VALUE
-ossl_x509attr_set_value(VALUE self, VALUE value)
-{
-    X509_ATTRIBUTE *attr;
-    ASN1_TYPE *a1type;
-
-    GetX509Attr(self, attr);
-    if(!(a1type = ossl_asn1_get_asn1type(value)))
-	ossl_raise(eASN1Error, "could not get ASN1_TYPE");
-    if(ASN1_TYPE_get(a1type) == V_ASN1_SEQUENCE){
-	ASN1_TYPE_free(a1type);
-	ossl_raise(eASN1Error, "couldn't set SEQUENCE for attribute value.");
-    }
-    if(attr->value.set){
-	if(OSSL_X509ATTR_IS_SINGLE(attr)) ASN1_TYPE_free(attr->value.single);
-	else sk_ASN1_TYPE_free(attr->value.set);
-    }
-    OSSL_X509ATTR_SET_SINGLE(attr);
-    attr->value.single = a1type;
-
-    return value;
-}
-
-static VALUE
-ossl_x509attr_get_value(VALUE self)
-{
-    X509_ATTRIBUTE *attr;
-    VALUE str, asn1;
-    long length;
-    unsigned char *p;
-
-    GetX509Attr(self, attr);
-    if(attr->value.ptr == NULL) return Qnil;
-    if(OSSL_X509ATTR_IS_SINGLE(attr)){
-	length = i2d_ASN1_TYPE(attr->value.single, NULL);
-	str = rb_str_new(0, length);
-	p = RSTRING(str)->ptr;
-	i2d_ASN1_TYPE(attr->value.single, &p);
-	ossl_str_adjust(str, p);
-    }
-    else{
-	length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL,
-			i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
-	str = rb_str_new(0, length);
-	p = RSTRING(str)->ptr;
-	i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
-			i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
-	ossl_str_adjust(str, p);
-    }
-    asn1 = rb_funcall(mASN1, rb_intern("decode"), 1, str);
-
-    return asn1;
-}
-
-static VALUE
-ossl_x509attr_to_der(VALUE self)
-{
-    X509_ATTRIBUTE *attr;
-    VALUE str;
-    int len;
-    unsigned char *p;
-
-    GetX509Attr(self, attr);
-    if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
-	ossl_raise(eX509AttrError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
-	ossl_raise(eX509AttrError, NULL);
-    RSTRING(str)->len = p - (unsigned char*)RSTRING(str)->ptr; 
-
-    return str;
-}
-
-/*
- * X509_ATTRIBUTE init
- */
-void
-Init_ossl_x509attr()
-{
-    eX509AttrError = rb_define_class_under(mX509, "AttributeError", eOSSLError);
-
-    cX509Attr = rb_define_class_under(mX509, "Attribute", rb_cObject);
-    rb_define_alloc_func(cX509Attr, ossl_x509attr_alloc);
-    rb_define_method(cX509Attr, "initialize", ossl_x509attr_initialize, -1);
-    rb_define_method(cX509Attr, "oid=", ossl_x509attr_set_oid, 1);
-    rb_define_method(cX509Attr, "oid", ossl_x509attr_get_oid, 0);
-    rb_define_method(cX509Attr, "value=", ossl_x509attr_set_value, 1);
-    rb_define_method(cX509Attr, "value", ossl_x509attr_get_value, 0);
-    rb_define_method(cX509Attr, "to_der", ossl_x509attr_to_der, 0);
-}
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
deleted file mode 100644
index 443a2ba4c3..0000000000
--- a/ext/openssl/ossl_x509cert.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapX509(klass, obj, x509) do { \
-    if (!x509) { \
-	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, X509_free, x509); \
-} while (0)
-#define GetX509(obj, x509) do { \
-    Data_Get_Struct(obj, X509, x509); \
-    if (!x509) { \
-	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
-    } \
-} while (0)
-#define SafeGetX509(obj, x509) do { \
-    OSSL_Check_Kind(obj, cX509Cert); \
-    GetX509(obj, x509); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cX509Cert;
-VALUE eX509CertError;
-
-/*
- * Public
- */
-VALUE
-ossl_x509_new(X509 *x509)
-{
-    X509 *new;
-    VALUE obj;
-
-    if (!x509) {
-	new = X509_new();
-    } else {
-	new = X509_dup(x509);
-    }
-    if (!new) {
-	ossl_raise(eX509CertError, NULL);
-    }
-    WrapX509(cX509Cert, obj, new);
-	
-    return obj;
-}
-
-VALUE 
-ossl_x509_new_from_file(VALUE filename)
-{
-    X509 *x509;
-    FILE *fp;
-    VALUE obj;
-
-    SafeStringValue(filename);
-    if (!(fp = fopen(RSTRING(filename)->ptr, "r"))) {
-	ossl_raise(eX509CertError, "%s", strerror(errno));
-    }
-    x509 = PEM_read_X509(fp, NULL, NULL, NULL);
-    /*
-     * prepare for DER...
-#if !defined(OPENSSL_NO_FP_API)
-    if (!x509) {
-	rewind(fp);
-
-	x509 = d2i_X509_fp(fp, NULL);
-    }
-#endif
-    */
-    fclose(fp);
-    if (!x509) {
-	ossl_raise(eX509CertError, NULL);
-    }
-    WrapX509(cX509Cert, obj, x509);
-
-    return obj;
-}
-
-X509 *
-GetX509CertPtr(VALUE obj)
-{
-    X509 *x509;
-	
-    SafeGetX509(obj, x509);
-	
-    return x509;
-}
-
-X509 *
-DupX509CertPtr(VALUE obj)
-{
-    X509 *x509;
-	
-    SafeGetX509(obj, x509);
-	
-    CRYPTO_add(&x509->references, 1, CRYPTO_LOCK_X509);
-	
-    return x509;
-}
-
-/*
- * Private
- */
-static VALUE 
-ossl_x509_alloc(VALUE klass)
-{
-    X509 *x509;
-    VALUE obj;
-
-    x509 = X509_new();
-    if (!x509) ossl_raise(eX509CertError, NULL);
-
-    WrapX509(klass, obj, x509);
-
-    return obj;
-}
-
-static VALUE 
-ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
-{
-    BIO *in;
-    X509 *x509;
-    VALUE arg;
-
-    if (rb_scan_args(argc, argv, "01", &arg) == 0) {
-	/* create just empty X509Cert */
-	return self;
-    }
-    arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
-    x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL);
-    if (!x509) {
-	BIO_reset(in);
-	x509 = d2i_X509_bio(in, (X509 **)&DATA_PTR(self));
-    }
-    BIO_free(in);
-    if (!x509) ossl_raise(eX509CertError, NULL);
-    
-    return self;
-}
-
-static VALUE
-ossl_x509_copy(VALUE self, VALUE other)
-{
-    X509 *a, *b, *x509;
-	
-    rb_check_frozen(self);
-    if (self == other) return self;
-
-    GetX509(self, a);
-    SafeGetX509(other, b);
-
-    x509 = X509_dup(b);
-    if (!x509) ossl_raise(eX509CertError, NULL);
-    
-    DATA_PTR(self) = x509;
-    X509_free(a);
-
-    return self;
-}
-
-static VALUE 
-ossl_x509_to_der(VALUE self)
-{
-    X509 *x509;
-    VALUE str;
-    long len;
-    unsigned char *p;
-
-    GetX509(self, x509);
-    if ((len = i2d_X509(x509, NULL)) <= 0)
-	ossl_raise(eX509CertError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if (i2d_X509(x509, &p) <= 0)
-	ossl_raise(eX509CertError, NULL);
-    ossl_str_adjust(str, p);
-    
-    return str;
-}
-
-static VALUE 
-ossl_x509_to_pem(VALUE self)
-{
-    X509 *x509;
-    BIO *out;
-    VALUE str;
-	
-    GetX509(self, x509);
-    out = BIO_new(BIO_s_mem());
-    if (!out) ossl_raise(eX509CertError, NULL);
-
-    if (!PEM_write_bio_X509(out, x509)) {
-	BIO_free(out);
-	ossl_raise(eX509CertError, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-static VALUE
-ossl_x509_to_text(VALUE self)
-{
-    X509 *x509;
-    BIO *out;
-    VALUE str;
-	
-    GetX509(self, x509);
-
-    out = BIO_new(BIO_s_mem());
-    if (!out) ossl_raise(eX509CertError, NULL);
-
-    if (!X509_print(out, x509)) {
-	BIO_free(out);
-	ossl_raise(eX509CertError, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-#if 0
-/*
- * Makes from X509 X509_REQuest
- */
-static VALUE 
-ossl_x509_to_req(VALUE self)
-{
-    X509 *x509;
-    X509_REQ *req;
-    VALUE obj;
-
-    GetX509(self, x509);
-    if (!(req = X509_to_X509_REQ(x509, NULL, EVP_md5()))) {
-	ossl_raise(eX509CertError, NULL);
-    }
-    obj = ossl_x509req_new(req);
-    X509_REQ_free(req);
-
-    return obj;
-}
-#endif
-
-static VALUE 
-ossl_x509_get_version(VALUE self)
-{
-    X509 *x509;
-
-    GetX509(self, x509);
-	
-    return LONG2NUM(X509_get_version(x509));
-}
-
-static VALUE 
-ossl_x509_set_version(VALUE self, VALUE version)
-{
-    X509 *x509;
-    long ver;
-
-    GetX509(self, x509);
-    if ((ver = NUM2LONG(version)) < 0) {
-	ossl_raise(eX509CertError, "version must be >= 0!");
-    }
-    if (!X509_set_version(x509, ver)) {
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return version;
-}
-
-static VALUE 
-ossl_x509_get_serial(VALUE self)
-{
-    X509 *x509;
-
-    GetX509(self, x509);
-	
-    return asn1integer_to_num(X509_get_serialNumber(x509));
-}
-
-static VALUE 
-ossl_x509_set_serial(VALUE self, VALUE num)
-{
-    X509 *x509;
-
-    GetX509(self, x509);
-
-    x509->cert_info->serialNumber =
-	num_to_asn1integer(num, X509_get_serialNumber(x509));
-	
-    return num;
-}
-
-static VALUE 
-ossl_x509_get_signature_algorithm(VALUE self)
-{
-    X509 *x509;
-    BIO *out;
-    VALUE str;
-
-    GetX509(self, x509);
-	
-    out = BIO_new(BIO_s_mem());
-    if (!out) ossl_raise(eX509CertError, NULL);
-
-    if (!i2a_ASN1_OBJECT(out, x509->cert_info->signature->algorithm)) {
-	BIO_free(out);
-	ossl_raise(eX509CertError, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    return str;
-}
-
-static VALUE 
-ossl_x509_get_subject(VALUE self)
-{
-    X509 *x509;
-    X509_NAME *name;
-	
-    GetX509(self, x509);
-    if (!(name = X509_get_subject_name(x509))) { /* NO DUP - don't free! */
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return ossl_x509name_new(name);
-}
-
-static VALUE 
-ossl_x509_set_subject(VALUE self, VALUE subject)
-{
-    X509 *x509;
-	
-    GetX509(self, x509);
-    if (!X509_set_subject_name(x509, GetX509NamePtr(subject))) { /* DUPs name */
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return subject;
-}
-
-static VALUE 
-ossl_x509_get_issuer(VALUE self)
-{
-    X509 *x509;
-    X509_NAME *name;
-
-    GetX509(self, x509);
-    if(!(name = X509_get_issuer_name(x509))) { /* NO DUP - don't free! */
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return ossl_x509name_new(name);
-}
-
-static VALUE 
-ossl_x509_set_issuer(VALUE self, VALUE issuer)
-{
-    X509 *x509;
-
-    GetX509(self, x509);
-    if (!X509_set_issuer_name(x509, GetX509NamePtr(issuer))) { /* DUPs name */
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return issuer;
-}
-
-static VALUE 
-ossl_x509_get_not_before(VALUE self)
-{
-    X509 *x509;
-    ASN1_UTCTIME *asn1time;
-
-    GetX509(self, x509);
-    if (!(asn1time = X509_get_notBefore(x509))) { /* NO DUP - don't free! */
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return asn1time_to_time(asn1time);
-}
-
-static VALUE 
-ossl_x509_set_not_before(VALUE self, VALUE time)
-{
-    X509 *x509;
-    time_t sec;
-	
-    GetX509(self, x509);
-    sec = time_to_time_t(time);
-    if (!X509_time_adj(X509_get_notBefore(x509), 0, &sec)) {
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return time;
-}
-
-static VALUE 
-ossl_x509_get_not_after(VALUE self)
-{
-    X509 *x509;
-    ASN1_TIME *asn1time;
-
-    GetX509(self, x509);
-    if (!(asn1time = X509_get_notAfter(x509))) { /* NO DUP - don't free! */
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return asn1time_to_time(asn1time);
-}
-
-static VALUE 
-ossl_x509_set_not_after(VALUE self, VALUE time)
-{
-    X509 *x509;
-    time_t sec;
-	
-    GetX509(self, x509);
-    sec = time_to_time_t(time);
-    if (!X509_time_adj(X509_get_notAfter(x509), 0, &sec)) {
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return time;
-}
-
-static VALUE 
-ossl_x509_get_public_key(VALUE self)
-{
-    X509 *x509;
-    EVP_PKEY *pkey;
-
-    GetX509(self, x509);
-    if (!(pkey = X509_get_pubkey(x509))) { /* adds an reference */
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return ossl_pkey_new(pkey); /* NO DUP - OK */
-}
-
-static VALUE 
-ossl_x509_set_public_key(VALUE self, VALUE key)
-{
-    X509 *x509;
-
-    GetX509(self, x509);
-    if (!X509_set_pubkey(x509, GetPKeyPtr(key))) { /* DUPs pkey */
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return key;
-}
-
-static VALUE 
-ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
-{
-    X509 *x509;
-    EVP_PKEY *pkey;
-    const EVP_MD *md;
-
-    GetX509(self, x509);
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
-    if (!X509_sign(x509, pkey, md)) {
-	ossl_raise(eX509CertError, NULL);
-    }
-
-    return self;
-}
-
-/*
- * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
- */
-static VALUE 
-ossl_x509_verify(VALUE self, VALUE key)
-{
-    X509 *x509;
-    EVP_PKEY *pkey;
-    int i;
-
-    GetX509(self, x509);
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
-    if ((i = X509_verify(x509, pkey)) < 0) {
-	ossl_raise(eX509CertError, NULL);
-    } 
-    if (i > 0) {
-	return Qtrue;
-    }
-
-    return Qfalse;
-}
-
-/*
- * Checks if 'key' is PRIV key for this cert
- */
-static VALUE 
-ossl_x509_check_private_key(VALUE self, VALUE key)
-{
-    X509 *x509;
-    EVP_PKEY *pkey;
-	
-    GetX509(self, x509);
-    /* not needed private key, but should be */
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    if (!X509_check_private_key(x509, pkey)) {
-	OSSL_Warning("Check private key:%s", OSSL_ErrMsg());
-	return Qfalse;
-    }
-
-    return Qtrue;
-}
-
-/*
- * Gets X509v3 extensions as array of X509Ext objects
- */
-static VALUE 
-ossl_x509_get_extensions(VALUE self)
-{
-    X509 *x509;
-    int count, i;
-    X509_EXTENSION *ext;
-    VALUE ary;
-
-    GetX509(self, x509);
-    count = X509_get_ext_count(x509);
-    if (count < 0) {
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(count);
-    for (i=0; i<count; i++) {
-	ext = X509_get_ext(x509, i); /* NO DUP - don't free! */
-	rb_ary_push(ary, ossl_x509ext_new(ext));
-    }
-
-    return ary;
-}
-
-/*
- * Sets X509_EXTENSIONs
- */
-static VALUE 
-ossl_x509_set_extensions(VALUE self, VALUE ary)
-{
-    X509 *x509;
-    X509_EXTENSION *ext;
-    int i;
-	
-    GetX509(self, x509);
-    Check_Type(ary, T_ARRAY);
-    /* All ary's members should be X509Extension */
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
-    }
-    sk_X509_EXTENSION_pop_free(x509->cert_info->extensions, X509_EXTENSION_free);
-    x509->cert_info->extensions = NULL;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	ext = DupX509ExtPtr(RARRAY(ary)->ptr[i]);
-	
-	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
-	    X509_EXTENSION_free(ext);
-	    ossl_raise(eX509CertError, NULL);
-	}
-	X509_EXTENSION_free(ext);
-    }
-
-    return ary;
-}
-
-static VALUE 
-ossl_x509_add_extension(VALUE self, VALUE extension)
-{
-    X509 *x509;
-    X509_EXTENSION *ext;
-	
-    GetX509(self, x509);
-    ext = DupX509ExtPtr(extension);
-    if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
-	X509_EXTENSION_free(ext);
-	ossl_raise(eX509CertError, NULL);
-    }
-    X509_EXTENSION_free(ext);
-
-    return extension;
-}
-
-static VALUE
-ossl_x509_inspect(VALUE self)
-{
-    VALUE str;
-    char *cname = rb_class2name(rb_obj_class(self));
-
-    str = rb_str_new2("#<");
-    rb_str_cat2(str, cname);
-    rb_str_cat2(str, " ");
-
-    rb_str_cat2(str, "subject=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_subject(self)));
-    rb_str_cat2(str, ", ");
-
-    rb_str_cat2(str, "issuer=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_issuer(self)));
-    rb_str_cat2(str, ", ");
-
-    rb_str_cat2(str, "serial=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_serial(self)));
-    rb_str_cat2(str, ", ");
-
-    rb_str_cat2(str, "not_before=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_not_before(self)));
-    rb_str_cat2(str, ", ");
-
-    rb_str_cat2(str, "not_after=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_not_after(self)));
-
-    str = rb_str_cat2(str, ">");
-
-    return str;
-}
-
-/*
- * INIT
- */
-void 
-Init_ossl_x509cert()
-{
-    eX509CertError = rb_define_class_under(mX509, "CertificateError", eOSSLError);
-	
-    cX509Cert = rb_define_class_under(mX509, "Certificate", rb_cObject);
-	
-    rb_define_alloc_func(cX509Cert, ossl_x509_alloc);
-    rb_define_method(cX509Cert, "initialize", ossl_x509_initialize, -1);
-    rb_define_copy_func(cX509Cert, ossl_x509_copy);
-    
-    rb_define_method(cX509Cert, "to_der", ossl_x509_to_der, 0);
-    rb_define_method(cX509Cert, "to_pem", ossl_x509_to_pem, 0);
-    rb_define_alias(cX509Cert, "to_s", "to_pem");
-    rb_define_method(cX509Cert, "to_text", ossl_x509_to_text, 0);
-    rb_define_method(cX509Cert, "version", ossl_x509_get_version, 0);
-    rb_define_method(cX509Cert, "version=", ossl_x509_set_version, 1);
-    rb_define_method(cX509Cert, "signature_algorithm", ossl_x509_get_signature_algorithm, 0);
-    rb_define_method(cX509Cert, "serial", ossl_x509_get_serial, 0);
-    rb_define_method(cX509Cert, "serial=", ossl_x509_set_serial, 1);
-    rb_define_method(cX509Cert, "subject", ossl_x509_get_subject, 0);
-    rb_define_method(cX509Cert, "subject=", ossl_x509_set_subject, 1);
-    rb_define_method(cX509Cert, "issuer", ossl_x509_get_issuer, 0);
-    rb_define_method(cX509Cert, "issuer=", ossl_x509_set_issuer, 1);
-    rb_define_method(cX509Cert, "not_before", ossl_x509_get_not_before, 0);
-    rb_define_method(cX509Cert, "not_before=", ossl_x509_set_not_before, 1);
-    rb_define_method(cX509Cert, "not_after", ossl_x509_get_not_after, 0);
-    rb_define_method(cX509Cert, "not_after=", ossl_x509_set_not_after, 1);
-    rb_define_method(cX509Cert, "public_key", ossl_x509_get_public_key, 0);
-    rb_define_method(cX509Cert, "public_key=", ossl_x509_set_public_key, 1);
-    rb_define_method(cX509Cert, "sign", ossl_x509_sign, 2);
-    rb_define_method(cX509Cert, "verify", ossl_x509_verify, 1);
-    rb_define_method(cX509Cert, "check_private_key", ossl_x509_check_private_key, 1);
-    rb_define_method(cX509Cert, "extensions", ossl_x509_get_extensions, 0);
-    rb_define_method(cX509Cert, "extensions=", ossl_x509_set_extensions, 1);
-    rb_define_method(cX509Cert, "add_extension", ossl_x509_add_extension, 1);
-    rb_define_method(cX509Cert, "inspect", ossl_x509_inspect, 0);
-}
-
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
deleted file mode 100644
index a7746aa2b3..0000000000
--- a/ext/openssl/ossl_x509crl.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapX509CRL(klass, obj, crl) do { \
-    if (!crl) { \
-	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, X509_CRL_free, crl); \
-} while (0)
-#define GetX509CRL(obj, crl) do { \
-    Data_Get_Struct(obj, X509_CRL, crl); \
-    if (!crl) { \
-	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
-    } \
-} while (0)
-#define SafeGetX509CRL(obj, crl) do { \
-    OSSL_Check_Kind(obj, cX509CRL); \
-    GetX509CRL(obj, crl); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cX509CRL;
-VALUE eX509CRLError;
-
-/*
- * PUBLIC
- */
-X509_CRL *
-GetX509CRLPtr(VALUE obj)
-{
-    X509_CRL *crl;
-
-    SafeGetX509CRL(obj, crl);
-
-    return crl;
-}
-
-X509_CRL *
-DupX509CRLPtr(VALUE obj)
-{
-    X509_CRL *crl;
-
-    SafeGetX509CRL(obj, crl);
-    CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL);
-
-    return crl;
-}
-
-VALUE
-ossl_x509crl_new(X509_CRL *crl)
-{
-    X509_CRL *tmp;
-    VALUE obj;
-
-    tmp = crl ? X509_CRL_dup(crl) : X509_CRL_new();
-    if(!tmp) ossl_raise(eX509CRLError, NULL);
-    WrapX509CRL(cX509CRL, obj, tmp);
-        
-    return obj;
-}
-
-/*
- * PRIVATE
- */
-static VALUE 
-ossl_x509crl_alloc(VALUE klass)
-{
-    X509_CRL *crl;
-    VALUE obj;
-
-    if (!(crl = X509_CRL_new())) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-    WrapX509CRL(klass, obj, crl);
-
-    return obj;
-}
-
-static VALUE 
-ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
-{
-    BIO *in;
-    X509_CRL *crl;
-    VALUE arg;
-
-    if (rb_scan_args(argc, argv, "01", &arg) == 0) {
-	return self;
-    }
-    arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
-    crl = PEM_read_bio_X509_CRL(in, (X509_CRL **)&DATA_PTR(self), NULL, NULL);
-    if (!crl) {
-	BIO_reset(in);
-	crl = d2i_X509_CRL_bio(in, (X509_CRL **)&DATA_PTR(self));
-    }
-    BIO_free(in);
-    if (!crl) ossl_raise(eX509CRLError, NULL);
-
-    return self;
-}
-
-static VALUE
-ossl_x509crl_copy(VALUE self, VALUE other)
-{
-    X509_CRL *a, *b, *crl;
-	
-    rb_check_frozen(self);
-    if (self == other) return self;
-    GetX509CRL(self, a);
-    SafeGetX509CRL(other, b);
-    if (!(crl = X509_CRL_dup(b))) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-    X509_CRL_free(a);
-    DATA_PTR(self) = crl;
-
-    return self;
-}
-
-static VALUE 
-ossl_x509crl_get_version(VALUE self)
-{
-    X509_CRL *crl;
-    long ver;
-
-    GetX509CRL(self, crl);
-    ver = X509_CRL_get_version(crl);
-
-    return LONG2NUM(ver);
-}
-
-static VALUE 
-ossl_x509crl_set_version(VALUE self, VALUE version)
-{
-    X509_CRL *crl;
-    long ver;
-
-    GetX509CRL(self, crl);
-
-    if ((ver = NUM2LONG(version)) < 0) {
-	ossl_raise(eX509CRLError, "version must be >= 0!");
-    }
-    if (!X509_CRL_set_version(crl, ver)) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-
-    return version;
-}
-
-static VALUE 
-ossl_x509crl_get_signature_algorithm(VALUE self)
-{
-    X509_CRL *crl;
-    BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
-
-    GetX509CRL(self, crl);
-	
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-    if (!i2a_ASN1_OBJECT(out, crl->sig_alg->algorithm)) {
-	BIO_free(out);
-	ossl_raise(eX509CRLError, NULL);
-    }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-    return str;
-}
-
-static VALUE 
-ossl_x509crl_get_issuer(VALUE self)
-{
-    X509_CRL *crl;
-
-    GetX509CRL(self, crl);
-
-    return ossl_x509name_new(X509_CRL_get_issuer(crl)); /* NO DUP - don't free */
-}
-
-static VALUE 
-ossl_x509crl_set_issuer(VALUE self, VALUE issuer)
-{
-    X509_CRL *crl;
-
-    GetX509CRL(self, crl);
-
-    if (!X509_CRL_set_issuer_name(crl, GetX509NamePtr(issuer))) { /* DUPs name */
-	ossl_raise(eX509CRLError, NULL);
-    }
-    return issuer;
-}
-
-static VALUE 
-ossl_x509crl_get_last_update(VALUE self)
-{
-    X509_CRL *crl;
-
-    GetX509CRL(self, crl);
-
-    return asn1time_to_time(X509_CRL_get_lastUpdate(crl));
-}
-
-static VALUE 
-ossl_x509crl_set_last_update(VALUE self, VALUE time)
-{
-    X509_CRL *crl;
-    time_t sec;
-
-    GetX509CRL(self, crl);
-    sec = time_to_time_t(time);
-    if (!X509_time_adj(crl->crl->lastUpdate, 0, &sec)) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-
-    return time;
-}
-
-static VALUE 
-ossl_x509crl_get_next_update(VALUE self)
-{
-    X509_CRL *crl;
-
-    GetX509CRL(self, crl);
-
-    return asn1time_to_time(X509_CRL_get_nextUpdate(crl));
-}
-
-static VALUE 
-ossl_x509crl_set_next_update(VALUE self, VALUE time)
-{
-    X509_CRL *crl;
-    time_t sec;
-
-    GetX509CRL(self, crl);
-    sec = time_to_time_t(time);
-    /* This must be some thinko in OpenSSL */
-    if (!(crl->crl->nextUpdate = X509_time_adj(crl->crl->nextUpdate, 0, &sec))){
-	ossl_raise(eX509CRLError, NULL);
-    }
-
-    return time;
-}
-
-static VALUE
-ossl_x509crl_get_revoked(VALUE self)
-{
-    X509_CRL *crl;
-    int i, num;
-    X509_REVOKED *rev;
-    VALUE ary, revoked;
-
-    GetX509CRL(self, crl);
-    num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl));
-    if (num < 0) {
-	OSSL_Debug("num < 0???");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(num);
-    for(i=0; i<num; i++) {
-	/* NO DUP - don't free! */
-	rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i);
-	revoked = ossl_x509revoked_new(rev);
-	rb_ary_push(ary, revoked);
-    }
-
-    return ary;
-}
-
-static VALUE 
-ossl_x509crl_set_revoked(VALUE self, VALUE ary)
-{
-    X509_CRL *crl;
-    X509_REVOKED *rev;
-    int i;
-
-    GetX509CRL(self, crl);
-    Check_Type(ary, T_ARRAY);
-    /* All ary members should be X509 Revoked */
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Rev);
-    }
-    sk_X509_REVOKED_pop_free(crl->crl->revoked, X509_REVOKED_free);
-    crl->crl->revoked = NULL;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	rev = DupX509RevokedPtr(RARRAY(ary)->ptr[i]);
-	if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
-	    ossl_raise(eX509CRLError, NULL);
-	}
-    }
-    X509_CRL_sort(crl);
-
-    return ary;
-}
-
-static VALUE 
-ossl_x509crl_add_revoked(VALUE self, VALUE revoked)
-{
-    X509_CRL *crl;
-    X509_REVOKED *rev;
-
-    GetX509CRL(self, crl);
-    rev = DupX509RevokedPtr(revoked);
-    if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
-	ossl_raise(eX509CRLError, NULL);
-    }
-    X509_CRL_sort(crl);
-
-    return revoked;
-}
-
-static VALUE 
-ossl_x509crl_sign(VALUE self, VALUE key, VALUE digest)
-{
-    X509_CRL *crl;
-    EVP_PKEY *pkey;
-    const EVP_MD *md;
-
-    GetX509CRL(self, crl);
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
-    if (!X509_CRL_sign(crl, pkey, md)) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-
-    return self;
-}
-
-static VALUE 
-ossl_x509crl_verify(VALUE self, VALUE key)
-{
-    X509_CRL *crl;
-    int ret;
-
-    GetX509CRL(self, crl);
-    if ((ret = X509_CRL_verify(crl, GetPKeyPtr(key))) < 0) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-    if (ret == 1) {
-	return Qtrue;
-    }
-
-    return Qfalse;
-}
-
-static VALUE 
-ossl_x509crl_to_der(VALUE self)
-{
-    X509_CRL *crl;
-    BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
-
-    GetX509CRL(self, crl);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-    if (!i2d_X509_CRL_bio(out, crl)) {
-	BIO_free(out);
-	ossl_raise(eX509CRLError, NULL);
-    }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-
-    return str;
-}
-
-static VALUE 
-ossl_x509crl_to_pem(VALUE self)
-{
-    X509_CRL *crl;
-    BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
-
-    GetX509CRL(self, crl);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-    if (!PEM_write_bio_X509_CRL(out, crl)) {
-	BIO_free(out);
-	ossl_raise(eX509CRLError, NULL);
-    }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-
-    return str;
-}
-
-static VALUE 
-ossl_x509crl_to_text(VALUE self)
-{
-    X509_CRL *crl;
-    BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
-
-    GetX509CRL(self, crl);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-    if (!X509_CRL_print(out, crl)) {
-	BIO_free(out);
-	ossl_raise(eX509CRLError, NULL);
-    }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-	
-    return str;
-}
-
-/*
- * Gets X509v3 extensions as array of X509Ext objects
- */
-static VALUE 
-ossl_x509crl_get_extensions(VALUE self)
-{
-    X509_CRL *crl;
-    int count, i;
-    X509_EXTENSION *ext;
-    VALUE ary;
-
-    GetX509CRL(self, crl);
-    count = X509_CRL_get_ext_count(crl);
-    if (count < 0) {
-	OSSL_Debug("count < 0???");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(count);
-    for (i=0; i<count; i++) {
-	ext = X509_CRL_get_ext(crl, i); /* NO DUP - don't free! */
-	rb_ary_push(ary, ossl_x509ext_new(ext));
-    }
-
-    return ary;
-}
-
-/*
- * Sets X509_EXTENSIONs
- */
-static VALUE 
-ossl_x509crl_set_extensions(VALUE self, VALUE ary)
-{
-    X509_CRL *crl;
-    X509_EXTENSION *ext;
-    int i;
-	
-    GetX509CRL(self, crl);
-    Check_Type(ary, T_ARRAY);
-    /* All ary members should be X509 Extensions */
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
-    }
-    sk_X509_EXTENSION_pop_free(crl->crl->extensions, X509_EXTENSION_free);
-    crl->crl->extensions = NULL;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	ext = DupX509ExtPtr(RARRAY(ary)->ptr[i]);
-	if(!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
-	    X509_EXTENSION_free(ext);
-	    ossl_raise(eX509CRLError, NULL);
-	}
-	X509_EXTENSION_free(ext);
-    }
-
-    return ary;
-}
-
-static VALUE 
-ossl_x509crl_add_extension(VALUE self, VALUE extension)
-{
-    X509_CRL *crl;
-    X509_EXTENSION *ext;
-
-    GetX509CRL(self, crl);
-    ext = DupX509ExtPtr(extension);
-    if (!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
-	X509_EXTENSION_free(ext);
-	ossl_raise(eX509CRLError, NULL);
-    }
-    X509_EXTENSION_free(ext);
-
-    return extension;
-}
-
-/*
- * INIT
- */
-void 
-Init_ossl_x509crl()
-{
-    eX509CRLError = rb_define_class_under(mX509, "CRLError", eOSSLError);
-
-    cX509CRL = rb_define_class_under(mX509, "CRL", rb_cObject);
-	
-    rb_define_alloc_func(cX509CRL, ossl_x509crl_alloc);
-    rb_define_method(cX509CRL, "initialize", ossl_x509crl_initialize, -1);
-    rb_define_copy_func(cX509CRL, ossl_x509crl_copy);
-    
-    rb_define_method(cX509CRL, "version", ossl_x509crl_get_version, 0);
-    rb_define_method(cX509CRL, "version=", ossl_x509crl_set_version, 1);
-    rb_define_method(cX509CRL, "signature_algorithm", ossl_x509crl_get_signature_algorithm, 0);
-    rb_define_method(cX509CRL, "issuer", ossl_x509crl_get_issuer, 0);
-    rb_define_method(cX509CRL, "issuer=", ossl_x509crl_set_issuer, 1);
-    rb_define_method(cX509CRL, "last_update", ossl_x509crl_get_last_update, 0);
-    rb_define_method(cX509CRL, "last_update=", ossl_x509crl_set_last_update, 1);
-    rb_define_method(cX509CRL, "next_update", ossl_x509crl_get_next_update, 0);
-    rb_define_method(cX509CRL, "next_update=", ossl_x509crl_set_next_update, 1);
-    rb_define_method(cX509CRL, "revoked", ossl_x509crl_get_revoked, 0);
-    rb_define_method(cX509CRL, "revoked=", ossl_x509crl_set_revoked, 1);
-    rb_define_method(cX509CRL, "add_revoked", ossl_x509crl_add_revoked, 1);
-    rb_define_method(cX509CRL, "sign", ossl_x509crl_sign, 2);
-    rb_define_method(cX509CRL, "verify", ossl_x509crl_verify, 1);
-    rb_define_method(cX509CRL, "to_der", ossl_x509crl_to_der, 0);
-    rb_define_method(cX509CRL, "to_pem", ossl_x509crl_to_pem, 0);
-    rb_define_alias(cX509CRL, "to_s", "to_pem");
-    rb_define_method(cX509CRL, "to_text", ossl_x509crl_to_text, 0);
-    rb_define_method(cX509CRL, "extensions", ossl_x509crl_get_extensions, 0);
-    rb_define_method(cX509CRL, "extensions=", ossl_x509crl_set_extensions, 1);
-    rb_define_method(cX509CRL, "add_extension", ossl_x509crl_add_extension, 1);
-}
-
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
deleted file mode 100644
index 23e768a9b5..0000000000
--- a/ext/openssl/ossl_x509ext.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapX509Ext(klass, obj, ext) do { \
-    if (!ext) { \
-	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, X509_EXTENSION_free, ext); \
-} while (0)
-#define GetX509Ext(obj, ext) do { \
-    Data_Get_Struct(obj, X509_EXTENSION, ext); \
-    if (!ext) { \
-	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
-    } \
-} while (0)
-#define SafeGetX509Ext(obj, ext) do { \
-    OSSL_Check_Kind(obj, cX509Ext); \
-    GetX509Ext(obj, ext); \
-} while (0)
-
-#define MakeX509ExtFactory(klass, obj, ctx) \
-    obj = Data_Make_Struct(klass, X509V3_CTX, 0, ossl_x509extfactory_free, ctx)
-#define GetX509ExtFactory(obj, ctx) do { \
-    Data_Get_Struct(obj, X509V3_CTX, ctx); \
-    if (!ctx) { \
-	ossl_raise(rb_eRuntimeError, "CTX wasn't initialized!"); \
-    } \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cX509Ext;
-VALUE cX509ExtFactory;
-VALUE eX509ExtError;
-
-/*
- * Public
- */
-VALUE 
-ossl_x509ext_new(X509_EXTENSION *ext)
-{
-    X509_EXTENSION *new;
-    VALUE obj;
-
-    if (!ext) {
-	new = X509_EXTENSION_new();
-    } else {
-	new = X509_EXTENSION_dup(ext);
-    }
-    if (!new) {
-	ossl_raise(eX509ExtError, NULL);
-    }
-    WrapX509Ext(cX509Ext, obj, new);
-	
-    return obj;
-}
-
-X509_EXTENSION *
-GetX509ExtPtr(VALUE obj)
-{
-    X509_EXTENSION *ext;
-
-    SafeGetX509Ext(obj, ext);
-
-    return ext;
-}
-
-X509_EXTENSION *
-DupX509ExtPtr(VALUE obj)
-{
-    X509_EXTENSION *ext, *new;
-
-    SafeGetX509Ext(obj, ext);
-    if (!(new = X509_EXTENSION_dup(ext))) {
-	ossl_raise(eX509ExtError, NULL);
-    }
-
-    return new;
-}
-
-/*
- * Private
- */
-/*
- * Ext factory
- */
-static void
-ossl_x509extfactory_free(X509V3_CTX *ctx)
-{
-    OPENSSL_free(ctx);
-}
-
-static VALUE 
-ossl_x509extfactory_alloc(VALUE klass)
-{
-    X509V3_CTX *ctx;
-    VALUE obj;
-
-    MakeX509ExtFactory(klass, obj, ctx);
-
-    return obj;
-}
-
-static VALUE 
-ossl_x509extfactory_set_issuer_cert(VALUE self, VALUE cert)
-{
-    X509V3_CTX *ctx;
-
-    GetX509ExtFactory(self, ctx);
-    rb_iv_set(self, "@issuer_certificate", cert);
-    ctx->issuer_cert = DupX509CertPtr(cert); /* DUP NEEDED */
-
-    return cert;
-}
-
-static VALUE 
-ossl_x509extfactory_set_subject_cert(VALUE self, VALUE cert)
-{
-    X509V3_CTX *ctx;
-
-    GetX509ExtFactory(self, ctx);
-    rb_iv_set(self, "@subject_certificate", cert);
-    ctx->subject_cert = DupX509CertPtr(cert); /* DUP NEEDED */
-
-    return cert;
-}
-
-static VALUE 
-ossl_x509extfactory_set_subject_req(VALUE self, VALUE req)
-{
-    X509V3_CTX *ctx;
-
-    GetX509ExtFactory(self, ctx);
-    rb_iv_set(self, "@subject_request", req);
-    ctx->subject_req = DupX509ReqPtr(req);
-
-    return req;
-}
-
-static VALUE 
-ossl_x509extfactory_set_crl(VALUE self, VALUE crl)
-{
-    X509V3_CTX *ctx;
-
-    GetX509ExtFactory(self, ctx);
-    rb_iv_set(self, "@crl", crl);
-    ctx->crl = DupX509CRLPtr(crl);
-
-    return crl;
-}
-
-static VALUE
-ossl_x509extfactory_set_config(VALUE self, VALUE config)
-{
-#ifdef HAVE_X509V3_SET_NCONF
-    X509V3_CTX *ctx;
-    CONF *conf;
-
-    GetX509ExtFactory(self, ctx);
-    rb_iv_set(self, "@config", config);
-    conf = GetConfigPtr(config);
-    X509V3_set_nconf(ctx, conf);
-
-    return config;
-#else
-    rb_notimplement();
-#endif
-}
-
-static VALUE 
-ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
-{
-    /*X509V3_CTX *ctx;*/
-    VALUE issuer_cert, subject_cert, subject_req, crl;
-	
-    /*GetX509ExtFactory(self, ctx);*/
-
-    rb_scan_args(argc, argv, "04",
-		 &issuer_cert, &subject_cert, &subject_req, &crl);
-    if (!NIL_P(issuer_cert))
-	ossl_x509extfactory_set_issuer_cert(self, issuer_cert);
-    if (!NIL_P(subject_cert))
-	ossl_x509extfactory_set_subject_cert(self, subject_cert);
-    if (!NIL_P(subject_req))
-	ossl_x509extfactory_set_subject_req(self, subject_req);
-    if (!NIL_P(crl))
-	ossl_x509extfactory_set_crl(self, crl);
-
-    return self;
-}
-
-/*
- * Array to X509_EXTENSION
- * Structure:
- * ["ln", "value", bool_critical] or
- * ["sn", "value", bool_critical] or
- * ["ln", "critical,value"] or the same for sn
- * ["ln", "value"] => not critical
- */
-static VALUE 
-ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
-{
-    X509V3_CTX *ctx;
-    X509_EXTENSION *ext;
-    VALUE oid, value, critical, valstr, obj;
-    int nid;
-
-    GetX509ExtFactory(self, ctx);
-    rb_scan_args(argc, argv, "21", &oid, &value, &critical);
-    StringValue(oid);
-    StringValue(value);
-    if(NIL_P(critical)) critical = Qfalse;
-
-    nid = OBJ_ln2nid(RSTRING(oid)->ptr);
-    if(!nid) nid = OBJ_sn2nid(RSTRING(oid)->ptr);
-    if(!nid) ossl_raise(eX509ExtError, NULL);
-    valstr = rb_str_new2(RTEST(critical) ? "critical," : "");
-    rb_str_append(valstr, value);
-    ext = X509V3_EXT_conf_nid(NULL, ctx, nid, RSTRING(valstr)->ptr);
-    if (!ext) ossl_raise(eX509ExtError, NULL);
-    WrapX509Ext(cX509Ext, obj, ext);
-
-    return obj;
-}
-
-/*
- * Ext
- */
-static VALUE
-ossl_x509ext_alloc(VALUE klass)
-{
-    X509_EXTENSION *ext;
-    VALUE obj;
-
-    if(!(ext = X509_EXTENSION_new())){
-	ossl_raise(eX509ExtError, NULL);
-    }
-    WrapX509Ext(klass, obj, ext);
-
-    return obj;
-}
-
-static VALUE
-ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE oid, value, critical;
-    unsigned char *p;
-    X509_EXTENSION *ext;
-
-    if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
-	/* evaluate oid as a DER string */
-	oid = ossl_to_der_if_possible(oid);
-	StringValue(oid);
-	GetX509Ext(self, ext);
-	p  = RSTRING(oid)->ptr;
-	if(!d2i_X509_EXTENSION(&ext, &p, RSTRING(oid)->len))
-	    ossl_raise(eX509ExtError, NULL);
-	return self;
-    }
-    rb_funcall(self, rb_intern("oid="), 1, oid);
-    rb_funcall(self, rb_intern("value="), 1, value);
-    if(argc > 2) rb_funcall(self, rb_intern("critical="), 1, critical);
-
-    return self;
-}
-
-static VALUE
-ossl_x509ext_set_oid(VALUE self, VALUE oid)
-{
-    X509_EXTENSION *ext;
-    ASN1_OBJECT *obj;
-    char *s;
-
-    GetX509Ext(self, ext);
-    s = StringValuePtr(oid);
-    obj = OBJ_txt2obj(s, 0);
-    if(!obj) obj = OBJ_txt2obj(s, 1);
-    if(!obj) ossl_raise(eX509ExtError, NULL);
-    X509_EXTENSION_set_object(ext, obj);
-
-    return oid;
-}
-
-static VALUE
-ossl_x509ext_set_value(VALUE self, VALUE data)
-{
-    X509_EXTENSION *ext;
-    ASN1_OCTET_STRING *asn1s;
-    char *s;
-
-    GetX509Ext(self, ext);
-    data = ossl_to_der_if_possible(data);
-    StringValue(data);
-    if(!(s = OPENSSL_malloc(RSTRING(data)->len)))
-	ossl_raise(eX509ExtError, "malloc error");
-    memcpy(s, RSTRING(data)->ptr, RSTRING(data)->len);
-    if(!(asn1s = ASN1_OCTET_STRING_new())){
-	free(s);
-	ossl_raise(eX509ExtError, NULL);
-    }
-    if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING(data)->len)){
-	free(s);
-	ASN1_OCTET_STRING_free(asn1s);
-	ossl_raise(eX509ExtError, NULL);
-    }
-    X509_EXTENSION_set_data(ext, asn1s);
-
-    return data;
-}
-
-static VALUE
-ossl_x509ext_set_critical(VALUE self, VALUE flag)
-{
-    X509_EXTENSION *ext;
-
-    GetX509Ext(self, ext);
-    X509_EXTENSION_set_critical(ext, RTEST(flag) ? 1 : 0);
-
-    return flag;
-}
-
-static VALUE 
-ossl_x509ext_get_oid(VALUE obj)
-{
-    X509_EXTENSION *ext;
-    ASN1_OBJECT *extobj;
-    BIO *out;
-    VALUE ret;
-    int nid;
-
-    GetX509Ext(obj, ext);
-    extobj = X509_EXTENSION_get_object(ext);
-    if ((nid = OBJ_obj2nid(extobj)) != NID_undef)
-	ret = rb_str_new2(OBJ_nid2sn(nid));
-    else{
-	if (!(out = BIO_new(BIO_s_mem())))
-	    ossl_raise(eX509ExtError, NULL);
-	i2a_ASN1_OBJECT(out, extobj);
-	ret = ossl_membio2str(out);
-    }
-
-    return ret;
-}
-
-static VALUE
-ossl_x509ext_get_value(VALUE obj)
-{
-    X509_EXTENSION *ext;
-    BIO *out;
-    VALUE ret;
-
-    GetX509Ext(obj, ext);
-    if (!(out = BIO_new(BIO_s_mem())))
-	ossl_raise(eX509ExtError, NULL);
-    if (!X509V3_EXT_print(out, ext, 0, 0))
-	M_ASN1_OCTET_STRING_print(out, ext->value);
-    ret = ossl_membio2str(out);
-
-    return ret;
-}
-
-static VALUE
-ossl_x509ext_get_critical(VALUE obj)
-{
-    X509_EXTENSION *ext;
-    GetX509Ext(obj, ext);
-    return X509_EXTENSION_get_critical(ext) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_x509ext_to_der(VALUE obj)
-{
-    X509_EXTENSION *ext;
-    unsigned char *p;
-    long len;
-    VALUE str;
-
-    GetX509Ext(obj, ext);
-    if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0)
-	ossl_raise(eX509ExtError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_X509_EXTENSION(ext, &p) < 0)
-	ossl_raise(eX509ExtError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_x509ext()
-{
-    eX509ExtError = rb_define_class_under(mX509, "ExtensionError", eOSSLError);
-    
-    cX509ExtFactory = rb_define_class_under(mX509, "ExtensionFactory", rb_cObject);
-	
-    rb_define_alloc_func(cX509ExtFactory, ossl_x509extfactory_alloc);
-    rb_define_method(cX509ExtFactory, "initialize", ossl_x509extfactory_initialize, -1);
-	
-    rb_attr(cX509ExtFactory, rb_intern("issuer_certificate"), 1, 0, Qfalse);
-    rb_attr(cX509ExtFactory, rb_intern("subject_certificate"), 1, 0, Qfalse);
-    rb_attr(cX509ExtFactory, rb_intern("subject_request"), 1, 0, Qfalse);
-    rb_attr(cX509ExtFactory, rb_intern("crl"), 1, 0, Qfalse);
-    rb_attr(cX509ExtFactory, rb_intern("config"), 1, 0, Qfalse);
-
-    rb_define_method(cX509ExtFactory, "issuer_certificate=", ossl_x509extfactory_set_issuer_cert, 1);
-    rb_define_method(cX509ExtFactory, "subject_certificate=", ossl_x509extfactory_set_subject_cert, 1);
-    rb_define_method(cX509ExtFactory, "subject_request=", ossl_x509extfactory_set_subject_req, 1);
-    rb_define_method(cX509ExtFactory, "crl=", ossl_x509extfactory_set_crl, 1);
-    rb_define_method(cX509ExtFactory, "config=", ossl_x509extfactory_set_config, 1);
-    rb_define_method(cX509ExtFactory, "create_ext", ossl_x509extfactory_create_ext, -1);
-	
-    cX509Ext = rb_define_class_under(mX509, "Extension", rb_cObject);
-    rb_define_alloc_func(cX509Ext, ossl_x509ext_alloc);
-    rb_define_method(cX509Ext, "initialize", ossl_x509ext_initialize, -1);
-    rb_define_method(cX509Ext, "oid=", ossl_x509ext_set_oid, 1);
-    rb_define_method(cX509Ext, "value=", ossl_x509ext_set_value, 1);
-    rb_define_method(cX509Ext, "critical=", ossl_x509ext_set_critical, 1);
-    rb_define_method(cX509Ext, "oid", ossl_x509ext_get_oid, 0);
-    rb_define_method(cX509Ext, "value", ossl_x509ext_get_value, 0);
-    rb_define_method(cX509Ext, "critical?", ossl_x509ext_get_critical, 0);
-    rb_define_method(cX509Ext, "to_der", ossl_x509ext_to_der, 0);
-}
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
deleted file mode 100644
index 5964eec2ee..0000000000
--- a/ext/openssl/ossl_x509name.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapX509Name(klass, obj, name) do { \
-    if (!name) { \
-	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, X509_NAME_free, name); \
-} while (0)
-#define GetX509Name(obj, name) do { \
-    Data_Get_Struct(obj, X509_NAME, name); \
-    if (!name) { \
-	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
-    } \
-} while (0)
-#define SafeGetX509Name(obj, name) do { \
-    OSSL_Check_Kind(obj, cX509Name); \
-    GetX509Name(obj, name); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cX509Name;
-VALUE eX509NameError;
-
-/*
- * Public
- */
-VALUE 
-ossl_x509name_new(X509_NAME *name)
-{
-    X509_NAME *new;
-    VALUE obj;
-
-    if (!name) {
-	new = X509_NAME_new();
-    } else {
-	new = X509_NAME_dup(name);
-    }
-    if (!new) {
-	ossl_raise(eX509NameError, NULL);
-    }
-    WrapX509Name(cX509Name, obj, new);
-    
-    return obj;
-}
-
-X509_NAME *
-GetX509NamePtr(VALUE obj)
-{
-    X509_NAME *name;
-
-    SafeGetX509Name(obj, name);
-
-    return name;
-}
-
-/*
- * Private
- */
-static VALUE
-ossl_x509name_alloc(VALUE klass)
-{
-    X509_NAME *name;
-    VALUE obj;
-	
-    if (!(name = X509_NAME_new())) {
-	ossl_raise(eX509NameError, NULL);
-    }
-    WrapX509Name(klass, obj, name);
-
-    return obj;
-}
-
-static VALUE
-ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
-{
-    X509_NAME *name;
-    int i, type;
-    VALUE arg, str_type, item, key, value;
-
-    GetX509Name(self, name);
-    if (rb_scan_args(argc, argv, "02", &arg, &str_type) == 0) {
-	return self;
-    }
-    if (argc == 1 && rb_respond_to(arg, ossl_s_to_der)){
-	unsigned char *p;
-	VALUE str = rb_funcall(arg, ossl_s_to_der, 0);
-	StringValue(str);
-	p  = RSTRING(str)->ptr;
-	if(!d2i_X509_NAME(&name, &p, RSTRING(str)->len))
-	    ossl_raise(eX509NameError, NULL);
-        return self;
-    }
-    Check_Type(arg, T_ARRAY);
-    type = NIL_P(str_type) ? V_ASN1_UTF8STRING : NUM2INT(str_type);
-    for (i=0; i<RARRAY(arg)->len; i++) {
-	item = RARRAY(arg)->ptr[i];
-	Check_Type(item, T_ARRAY);
-	if (RARRAY(item)->len != 2) {
-	    ossl_raise(rb_eArgError, "Unsupported structure.");
-	}
-	key = RARRAY(item)->ptr[0];
-	value = RARRAY(item)->ptr[1];
-	StringValue(key);
-	StringValue(value);
-	if (!X509_NAME_add_entry_by_txt(name, RSTRING(key)->ptr, type,
-			RSTRING(value)->ptr, RSTRING(value)->len, -1, 0)) {
-	    ossl_raise(eX509NameError, NULL);
-	}
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_x509name_to_s(VALUE self)
-{
-    X509_NAME *name;
-    char *buf;
-    VALUE str;
-
-    GetX509Name(self, name);
-    buf = X509_NAME_oneline(name, NULL, 0);
-    str = rb_str_new2(buf);
-    OPENSSL_free(buf);
-
-    return str;
-}
-
-static VALUE 
-ossl_x509name_to_a(VALUE self)
-{
-    X509_NAME *name;
-    X509_NAME_ENTRY *entry;
-    int i,entries;
-    char long_name[512];
-    const char *short_name;
-    VALUE ary;
-	
-    GetX509Name(self, name);
-    entries = X509_NAME_entry_count(name);
-    if (entries < 0) {
-	OSSL_Debug("name entries < 0!");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(entries);
-    for (i=0; i<entries; i++) {
-	if (!(entry = X509_NAME_get_entry(name, i))) {
-	    ossl_raise(eX509NameError, NULL);
-	}
-	if (!i2t_ASN1_OBJECT(long_name, sizeof(long_name), entry->object)) {
-	    ossl_raise(eX509NameError, NULL);
-	}
-	short_name = OBJ_nid2sn(OBJ_ln2nid(long_name));
-	
-	rb_ary_push(ary, rb_assoc_new(rb_str_new2(short_name),
-		rb_str_new(entry->value->data, entry->value->length)));
-    }
-    return ary;
-}
-
-static int
-ossl_x509name_cmp0(VALUE self, VALUE other)
-{
-    X509_NAME *name1, *name2;
-
-    GetX509Name(self, name1);
-    SafeGetX509Name(other, name2);
-
-    return X509_NAME_cmp(name1, name2);
-}
-
-static VALUE
-ossl_x509name_cmp(VALUE self, VALUE other)
-{
-    int result;
-
-    result = ossl_x509name_cmp0(self, other);
-    if (result < 0) return INT2FIX(-1);
-    if (result > 1) return INT2FIX(1);
-
-    return INT2FIX(0);
-}
-
-static VALUE
-ossl_x509name_eql(VALUE self, VALUE other)
-{
-    int result;
-
-    if(CLASS_OF(other) != cX509Name) return Qfalse;
-    result = ossl_x509name_cmp0(self, other);
-
-    return (result == 0) ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_x509name_hash(VALUE self)
-{
-    X509_NAME *name;
-    unsigned long hash;
-
-    GetX509Name(self, name);
-
-    hash = X509_NAME_hash(name);
-
-    return ULONG2NUM(hash);
-}
-
-static VALUE
-ossl_x509name_to_der(VALUE self)
-{
-    X509_NAME *name;
-    VALUE str;
-    long len;
-    unsigned char *p;
-
-    GetX509Name(self, name);
-    if((len = i2d_X509_NAME(name, NULL)) <= 0)
-	ossl_raise(eX509NameError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_X509_NAME(name, &p) <= 0)
-	ossl_raise(eX509NameError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-/*
- * INIT
- */
-void 
-Init_ossl_x509name()
-{
-    eX509NameError = rb_define_class_under(mX509, "NameError", eOSSLError);
-
-    cX509Name = rb_define_class_under(mX509, "Name", rb_cObject);
-
-    rb_define_alloc_func(cX509Name, ossl_x509name_alloc);
-    rb_define_method(cX509Name, "initialize", ossl_x509name_initialize, -1);
-    rb_define_method(cX509Name, "to_s", ossl_x509name_to_s, 0);
-    rb_define_method(cX509Name, "to_a", ossl_x509name_to_a, 0);
-    rb_define_method(cX509Name, "cmp", ossl_x509name_cmp, 1);
-    rb_define_alias(cX509Name, "<=>", "cmp");
-    rb_define_method(cX509Name, "eql?", ossl_x509name_eql, 1);
-    rb_define_method(cX509Name, "hash", ossl_x509name_hash, 0);
-    rb_define_method(cX509Name, "to_der", ossl_x509name_to_der, 0);
-}
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
deleted file mode 100644
index b35bc2506e..0000000000
--- a/ext/openssl/ossl_x509req.c
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapX509Req(klass, obj, req) do { \
-    if (!req) { \
-	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, X509_REQ_free, req); \
-} while (0)
-#define GetX509Req(obj, req) do { \
-    Data_Get_Struct(obj, X509_REQ, req); \
-    if (!req) { \
-	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
-    } \
-} while (0)
-#define SafeGetX509Req(obj, req) do { \
-    OSSL_Check_Kind(obj, cX509Req); \
-    GetX509Req(obj, req); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cX509Req;
-VALUE eX509ReqError;
-
-/*
- * Public functions
- */
-VALUE
-ossl_x509req_new(X509_REQ *req)
-{
-    X509_REQ *new;
-    VALUE obj;
-
-    if (!req) {
-	new = X509_REQ_new();
-    } else {
-	new = X509_REQ_dup(req);
-    }
-    if (!new) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    WrapX509Req(cX509Req, obj, new);
-
-    return obj;
-}
-
-X509_REQ *
-DupX509ReqPtr(VALUE obj)
-{
-    X509_REQ *req, *new;
-
-    SafeGetX509Req(obj, req);
-    if (!(new = X509_REQ_dup(req))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return new;
-}
-
-/*
- * Private functions
- */
-static VALUE 
-ossl_x509req_alloc(VALUE klass)
-{
-    X509_REQ *req;
-    VALUE obj;
-
-    if (!(req = X509_REQ_new())) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    WrapX509Req(klass, obj, req);
-
-    return obj;
-}
-
-static VALUE 
-ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
-{
-    BIO *in;
-    X509_REQ *req;
-    VALUE arg;
-
-    if (rb_scan_args(argc, argv, "01", &arg) == 0) {
-	return self;
-    }
-    arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
-    req = PEM_read_bio_X509_REQ(in, (X509_REQ **)&DATA_PTR(self), NULL, NULL);
-    if (!req) {
-	BIO_reset(in);
-	req = d2i_X509_REQ_bio(in, (X509_REQ **)&DATA_PTR(self));
-    }
-    BIO_free(in);
-    if (!req) ossl_raise(eX509ReqError, NULL);
-
-    return self;
-}
-
-static VALUE
-ossl_x509req_copy(VALUE self, VALUE other)
-{
-    X509_REQ *a, *b, *req;
-	
-    rb_check_frozen(self);
-    if (self == other) return self;
-    GetX509Req(self, a);
-    SafeGetX509Req(other, b);
-    if (!(req = X509_REQ_dup(b))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    X509_REQ_free(a);
-    DATA_PTR(self) = req;
-
-    return self;
-}
-
-static VALUE 
-ossl_x509req_to_pem(VALUE self)
-{
-    X509_REQ *req;
-    BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
-	
-    GetX509Req(self, req);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    if (!PEM_write_bio_X509_REQ(out, req)) {
-	BIO_free(out);
-	ossl_raise(eX509ReqError, NULL);
-    }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-
-    return str;
-}
-
-static VALUE 
-ossl_x509req_to_text(VALUE self)
-{
-    X509_REQ *req;
-    BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
-
-    GetX509Req(self, req);
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    if (!X509_REQ_print(out, req)) {
-	BIO_free(out);
-	ossl_raise(eX509ReqError, NULL);
-    }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-
-    return str;
-}
-
-#if 0
-/*
- * Makes X509 from X509_REQuest
- */
-static VALUE 
-ossl_x509req_to_x509(VALUE self, VALUE days, VALUE key)
-{
-    X509_REQ *req;
-    X509 *x509;
-	
-    GetX509Req(self, req);
-    ...
-    if (!(x509 = X509_REQ_to_X509(req, d, pkey))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return ossl_x509_new(x509);
-}
-#endif
-
-static VALUE 
-ossl_x509req_get_version(VALUE self)
-{
-    X509_REQ *req;
-    long version;
-
-    GetX509Req(self, req);
-    version = X509_REQ_get_version(req);
-
-    return LONG2FIX(version);
-}
-
-static VALUE 
-ossl_x509req_set_version(VALUE self, VALUE version)
-{
-    X509_REQ *req;
-    long ver;
-
-    GetX509Req(self, req);
-    if ((ver = FIX2LONG(version)) < 0) {
-	ossl_raise(eX509ReqError, "version must be >= 0!");
-    }
-    if (!X509_REQ_set_version(req, ver)) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return version;
-}
-
-static VALUE 
-ossl_x509req_get_subject(VALUE self)
-{
-    X509_REQ *req;
-    X509_NAME *name;
-
-    GetX509Req(self, req);
-    if (!(name = X509_REQ_get_subject_name(req))) { /* NO DUP - don't free */
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return ossl_x509name_new(name);
-}
-
-static VALUE 
-ossl_x509req_set_subject(VALUE self, VALUE subject)
-{
-    X509_REQ *req;
-	
-    GetX509Req(self, req);
-    /* DUPs name */
-    if (!X509_REQ_set_subject_name(req, GetX509NamePtr(subject))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return subject;
-}
-
-static VALUE 
-ossl_x509req_get_signature_algorithm(VALUE self)
-{
-    X509_REQ *req;
-    BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
-
-    GetX509Req(self, req);
-	
-    if (!(out = BIO_new(BIO_s_mem()))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    if (!i2a_ASN1_OBJECT(out, req->sig_alg->algorithm)) {
-	BIO_free(out);
-	ossl_raise(eX509ReqError, NULL);
-    }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-    return str;
-}
-
-static VALUE 
-ossl_x509req_get_public_key(VALUE self)
-{
-    X509_REQ *req;
-    EVP_PKEY *pkey;
-
-    GetX509Req(self, req);
-    if (!(pkey = X509_REQ_get_pubkey(req))) { /* adds reference */
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return ossl_pkey_new(pkey); /* NO DUP - OK */
-}
-
-static VALUE 
-ossl_x509req_set_public_key(VALUE self, VALUE key)
-{
-    X509_REQ *req;
-    EVP_PKEY *pkey;
-
-    GetX509Req(self, req);
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
-    if (!X509_REQ_set_pubkey(req, pkey)) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return key;
-}
-
-static VALUE 
-ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
-{
-    X509_REQ *req;
-    EVP_PKEY *pkey;
-    const EVP_MD *md;
-
-    GetX509Req(self, req);
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
-    if (!X509_REQ_sign(req, pkey, md)) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return self;
-}
-
-/*
- * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
- */
-static VALUE 
-ossl_x509req_verify(VALUE self, VALUE key)
-{
-    X509_REQ *req;
-    EVP_PKEY *pkey;
-    int i;
-
-    GetX509Req(self, req);
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
-    if ((i = X509_REQ_verify(req, pkey)) < 0) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    if (i > 0) {
-	return Qtrue;
-    }
-
-    return Qfalse;
-}
-
-static VALUE 
-ossl_x509req_get_attributes(VALUE self)
-{
-    X509_REQ *req;
-    int count, i;
-    X509_ATTRIBUTE *attr;
-    VALUE ary;
-	
-    GetX509Req(self, req);
-
-    count = X509_REQ_get_attr_count(req);
-    if (count < 0) {
-	OSSL_Debug("count < 0???");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(count);
-    for (i=0; i<count; i++) {
-	attr = X509_REQ_get_attr(req, i);
-	rb_ary_push(ary, ossl_x509attr_new(attr));
-    }
-
-    return ary;
-}
-
-static VALUE 
-ossl_x509req_set_attributes(VALUE self, VALUE ary)
-{
-    X509_REQ *req;
-    X509_ATTRIBUTE *attr;
-    int i;
-    VALUE item;
-
-    GetX509Req(self, req);
-    Check_Type(ary, T_ARRAY);
-    for (i=0;i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Attr);
-    }
-    sk_X509_ATTRIBUTE_pop_free(req->req_info->attributes, X509_ATTRIBUTE_free);
-    req->req_info->attributes = NULL;
-    for (i=0;i<RARRAY(ary)->len; i++) {
-	item = RARRAY(ary)->ptr[i];
-	attr = DupX509AttrPtr(item);
-	if (!X509_REQ_add1_attr(req, attr)) {
-	    ossl_raise(eX509ReqError, NULL);
-	}
-    }
-    return ary;
-}
-
-static VALUE 
-ossl_x509req_add_attribute(VALUE self, VALUE attr)
-{
-    X509_REQ *req;
-
-    GetX509Req(self, req);
-    if (!X509_REQ_add1_attr(req, DupX509AttrPtr(attr))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return attr;
-}
-
-/*
- * X509_REQUEST init
- */
-void 
-Init_ossl_x509req()
-{
-    eX509ReqError = rb_define_class_under(mX509, "RequestError", eOSSLError);
-	
-    cX509Req = rb_define_class_under(mX509, "Request", rb_cObject);
-	
-    rb_define_alloc_func(cX509Req, ossl_x509req_alloc);
-    rb_define_method(cX509Req, "initialize", ossl_x509req_initialize, -1);
-    rb_define_copy_func(cX509Req, ossl_x509req_copy);
-	
-    rb_define_method(cX509Req, "to_pem", ossl_x509req_to_pem, 0);
-    rb_define_alias(cX509Req, "to_s", "to_pem");
-    rb_define_method(cX509Req, "to_text", ossl_x509req_to_text, 0);
-    rb_define_method(cX509Req, "version", ossl_x509req_get_version, 0);
-    rb_define_method(cX509Req, "version=", ossl_x509req_set_version, 1);
-    rb_define_method(cX509Req, "subject", ossl_x509req_get_subject, 0);
-    rb_define_method(cX509Req, "subject=", ossl_x509req_set_subject, 1);
-    rb_define_method(cX509Req, "signature_algorithm", ossl_x509req_get_signature_algorithm, 0);
-    rb_define_method(cX509Req, "public_key", ossl_x509req_get_public_key, 0);
-    rb_define_method(cX509Req, "public_key=", ossl_x509req_set_public_key, 1);
-    rb_define_method(cX509Req, "sign", ossl_x509req_sign, 2);
-    rb_define_method(cX509Req, "verify", ossl_x509req_verify, 1);
-    rb_define_method(cX509Req, "attributes", ossl_x509req_get_attributes, 0);
-    rb_define_method(cX509Req, "attributes=", ossl_x509req_set_attributes, 1);
-    rb_define_method(cX509Req, "add_attribute", ossl_x509req_add_attribute, 1);
-}
-
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
deleted file mode 100644
index 30ce75207f..0000000000
--- a/ext/openssl/ossl_x509revoked.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-
-#define WrapX509Rev(klass, obj, rev) do { \
-    if (!rev) { \
-	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, X509_REVOKED_free, rev); \
-} while (0)
-#define GetX509Rev(obj, rev) do { \
-    Data_Get_Struct(obj, X509_REVOKED, rev); \
-    if (!rev) { \
-	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
-    } \
-} while (0)
-#define SafeGetX509Rev(obj, rev) do { \
-    OSSL_Check_Kind(obj, cX509Rev); \
-    GetX509Rev(obj, rev); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cX509Rev;
-VALUE eX509RevError;
-
-/*
- * PUBLIC
- */
-VALUE 
-ossl_x509revoked_new(X509_REVOKED *rev)
-{
-    X509_REVOKED *new;
-    VALUE obj;
-
-    if (!rev) {
-	new = X509_REVOKED_new();
-    } else {
-	new = X509_REVOKED_dup(rev);
-    }
-    if (!new) {
-	ossl_raise(eX509RevError, NULL);
-    }
-    WrapX509Rev(cX509Rev, obj, new);
-
-    return obj;
-}
-
-X509_REVOKED *
-DupX509RevokedPtr(VALUE obj)
-{
-    X509_REVOKED *rev, *new;
-
-    SafeGetX509Rev(obj, rev);
-    if (!(new = X509_REVOKED_dup(rev))) {
-	ossl_raise(eX509RevError, NULL);
-    }
-
-    return new;
-}
-
-/*
- * PRIVATE
- */
-static VALUE 
-ossl_x509revoked_alloc(VALUE klass)
-{
-    X509_REVOKED *rev;
-    VALUE obj;
-
-    if (!(rev = X509_REVOKED_new())) {
-	ossl_raise(eX509RevError, NULL);
-    }
-    WrapX509Rev(klass, obj, rev);
-
-    return obj;
-}
-
-static VALUE 
-ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
-{
-    /* EMPTY */
-    return self;
-}
-
-static VALUE 
-ossl_x509revoked_get_serial(VALUE self)
-{
-    X509_REVOKED *rev;
-
-    GetX509Rev(self, rev);
-
-    return asn1integer_to_num(rev->serialNumber);
-}
-
-static VALUE 
-ossl_x509revoked_set_serial(VALUE self, VALUE num)
-{
-    X509_REVOKED *rev;
-
-    GetX509Rev(self, rev);
-    rev->serialNumber = num_to_asn1integer(num, rev->serialNumber);
-
-    return num;
-}
-
-static VALUE 
-ossl_x509revoked_get_time(VALUE self)
-{
-    X509_REVOKED *rev;
-	
-    GetX509Rev(self, rev);
-
-    return asn1time_to_time(rev->revocationDate);
-}
-
-static VALUE 
-ossl_x509revoked_set_time(VALUE self, VALUE time)
-{
-    X509_REVOKED *rev;
-    time_t sec;
-
-    GetX509Rev(self, rev);
-    sec = time_to_time_t(time);
-    if (!X509_time_adj(rev->revocationDate, 0, &sec)) {
-	ossl_raise(eX509RevError, NULL);
-    }
-
-    return time;
-}
-/*
- * Gets X509v3 extensions as array of X509Ext objects
- */
-static VALUE 
-ossl_x509revoked_get_extensions(VALUE self)
-{
-    X509_REVOKED *rev;
-    int count, i;
-    X509_EXTENSION *ext;
-    VALUE ary;
-
-    GetX509Rev(self, rev);
-    count = X509_REVOKED_get_ext_count(rev);
-    if (count < 0) {
-	OSSL_Debug("count < 0???");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(count);
-    for (i=0; i<count; i++) {
-	ext = X509_REVOKED_get_ext(rev, i);
-	rb_ary_push(ary, ossl_x509ext_new(ext));
-    }
-
-    return ary;
-}
-
-/*
- * Sets X509_EXTENSIONs
- */
-static VALUE 
-ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
-{
-    X509_REVOKED *rev;
-    X509_EXTENSION *ext;
-    int i;
-    VALUE item;
-
-    GetX509Rev(self, rev);
-    Check_Type(ary, T_ARRAY);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
-    }
-    sk_X509_EXTENSION_pop_free(rev->extensions, X509_EXTENSION_free);
-    rev->extensions = NULL;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	item = RARRAY(ary)->ptr[i];
-	ext = DupX509ExtPtr(item);
-	if(!X509_REVOKED_add_ext(rev, ext, -1)) {
-	    ossl_raise(eX509RevError, NULL);
-	}
-    }
-
-    return ary;
-}
-
-static VALUE
-ossl_x509revoked_add_extension(VALUE self, VALUE ext)
-{
-    X509_REVOKED *rev;
-    
-    GetX509Rev(self, rev);
-    if(!X509_REVOKED_add_ext(rev, DupX509ExtPtr(ext), -1)) {
-	ossl_raise(eX509RevError, NULL);
-    }
-
-    return ext;
-}
-
-/*
- * INIT
- */
-void
-Init_ossl_x509revoked()
-{
-    eX509RevError = rb_define_class_under(mX509, "RevokedError", eOSSLError);
-
-    cX509Rev = rb_define_class_under(mX509, "Revoked", rb_cObject);
-	
-    rb_define_alloc_func(cX509Rev, ossl_x509revoked_alloc);
-    rb_define_method(cX509Rev, "initialize", ossl_x509revoked_initialize, -1);
-	
-    rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
-    rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
-    rb_define_method(cX509Rev, "time", ossl_x509revoked_get_time, 0);
-    rb_define_method(cX509Rev, "time=", ossl_x509revoked_set_time, 1);
-    rb_define_method(cX509Rev, "extensions", ossl_x509revoked_get_extensions, 0);
-    rb_define_method(cX509Rev, "extensions=", ossl_x509revoked_set_extensions, 1);
-    rb_define_method(cX509Rev, "add_extension", ossl_x509revoked_add_extension, 1);
-}
-
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
deleted file mode 100644
index 4c5f0624a9..0000000000
--- a/ext/openssl/ossl_x509store.c
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include "ossl.h"
-#include <rubysig.h>
-
-#define WrapX509Store(klass, obj, st) do { \
-    if (!st) { \
-	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, X509_STORE_free, st); \
-} while (0)
-#define GetX509Store(obj, st) do { \
-    Data_Get_Struct(obj, X509_STORE, st); \
-    if (!st) { \
-	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
-    } \
-} while (0)
-#define SafeGetX509Store(obj, st) do { \
-    OSSL_Check_Kind(obj, cX509Store); \
-    GetX509Store(obj, st); \
-} while (0)
-
-#define WrapX509StCtx(klass, obj, ctx) do { \
-    if (!ctx) { \
-	ossl_raise(rb_eRuntimeError, "STORE_CTX wasn't initialized!"); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, ossl_x509stctx_free, ctx); \
-} while (0)
-#define GetX509StCtx(obj, ctx) do { \
-    Data_Get_Struct(obj, X509_STORE_CTX, ctx); \
-    if (!ctx) { \
-	ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \
-    } \
-} while (0)
-#define SafeGetX509StCtx(obj, storep) do { \
-    OSSL_Check_Kind(obj, cX509StoreContext); \
-    GetX509Store(obj, ctx); \
-} while (0)
-
-/*
- * Classes
- */
-VALUE cX509Store;
-VALUE cX509StoreContext;
-VALUE eX509StoreError;
-
-/*
- * Public functions
- */
-VALUE 
-ossl_x509store_new(X509_STORE *store)
-{
-    VALUE obj;
-
-    WrapX509Store(cX509Store, obj, store);
-
-    return obj;
-}
-
-X509_STORE *
-GetX509StorePtr(VALUE obj)
-{
-    X509_STORE *store;
-
-    SafeGetX509Store(obj, store);
-
-    return store;
-}
-
-X509_STORE *
-DupX509StorePtr(VALUE obj)
-{   
-    X509_STORE *store;
-
-    SafeGetX509Store(obj, store);
-    CRYPTO_add(&store->references, 1, CRYPTO_LOCK_X509_STORE);
-    
-    return store;
-}
-
-/*
- * Private functions
- */
-static VALUE 
-ossl_x509store_alloc(VALUE klass)
-{
-    X509_STORE *store;
-    VALUE obj;
-
-    if((store = X509_STORE_new()) == NULL){
-        ossl_raise(eX509StoreError, NULL);
-    }
-    WrapX509Store(klass, obj, store);
-
-    return obj;
-}
-
-/*
- * General callback for OpenSSL verify
- */
-static VALUE
-ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
-{
-    X509_STORE *store;
-
-    GetX509Store(self, store);
-    X509_STORE_set_ex_data(store, ossl_verify_cb_idx, (void*)cb);
-    rb_iv_set(self, "@verify_callback", cb);
-
-    return cb;
-}
-
-static VALUE
-ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
-{
-    X509_STORE *store;
-
-    GetX509Store(self, store);
-    X509_STORE_set_verify_cb_func(store, ossl_verify_cb);
-    ossl_x509store_set_vfy_cb(self, Qnil);
-
-#if (OPENSSL_VERSION_NUMBER < 0x00907000L)
-    rb_iv_set(self, "@flags", INT2NUM(0));
-    rb_iv_set(self, "@purpose", INT2NUM(0));
-    rb_iv_set(self, "@trust", INT2NUM(0));
-#endif
-
-    /* last verification status */
-    rb_iv_set(self, "@error", Qnil);
-    rb_iv_set(self, "@error_string", Qnil);
-    rb_iv_set(self, "@chain", Qnil);
-
-    return self;
-}
-
-static VALUE
-ossl_x509store_set_flags(VALUE self, VALUE flags)
-{
-#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
-    X509_STORE *store;
-
-    GetX509Store(self, store);
-    X509_STORE_set_flags(store, NUM2LONG(flags));
-#else
-    rb_iv_set(self, "@flags", flags);
-#endif
-
-    return flags;
-}
-
-static VALUE
-ossl_x509store_set_purpose(VALUE self, VALUE purpose)
-{
-#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
-    X509_STORE *store;
-    
-    GetX509Store(self, store);
-    X509_STORE_set_purpose(store, NUM2LONG(purpose));
-#else
-    rb_iv_set(self, "@purpose", purpose);
-#endif
-
-    return purpose;
-}
-
-static VALUE
-ossl_x509store_set_trust(VALUE self, VALUE trust)
-{
-#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
-    X509_STORE *store;
-
-    GetX509Store(self, store);
-    X509_STORE_set_trust(store, NUM2LONG(trust));
-#else
-    rb_iv_set(self, "@trust", trust);
-#endif
-
-    return trust;
-}
-
-static VALUE 
-ossl_x509store_add_file(VALUE self, VALUE file)
-{
-    X509_STORE *store;
-    X509_LOOKUP *lookup;
-    char *path = NULL;
-
-    if(file != Qnil){
-        Check_SafeStr(file);
-	path = RSTRING(file)->ptr;
-    }
-    GetX509Store(self, store);
-    lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
-    if(lookup == NULL) ossl_raise(eX509StoreError, NULL);
-    if(X509_LOOKUP_load_file(lookup, path, X509_FILETYPE_PEM) != 1){
-        ossl_raise(eX509StoreError, NULL);
-    }
-
-    return self;
-}
-
-static VALUE 
-ossl_x509store_add_path(VALUE self, VALUE dir)
-{
-    X509_STORE *store;
-    X509_LOOKUP *lookup;
-    char *path = NULL;
-
-    if(dir != Qnil){
-        Check_SafeStr(dir);
-	path = RSTRING(dir)->ptr;
-    }
-    GetX509Store(self, store);
-    lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
-    if(lookup == NULL) ossl_raise(eX509StoreError, NULL);
-    if(X509_LOOKUP_add_dir(lookup, path, X509_FILETYPE_PEM) != 1){
-        ossl_raise(eX509StoreError, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_x509store_add_cert(VALUE self, VALUE arg)
-{
-    X509_STORE *store;
-    X509 *cert;
-
-    cert = GetX509CertPtr(arg); /* NO NEED TO DUP */
-    GetX509Store(self, store);
-    X509_STORE_add_cert(store, cert);
-
-    return self;
-}
-
-static VALUE
-ossl_x509store_add_crl(VALUE self, VALUE arg)
-{
-    X509_STORE *store;
-    X509_CRL *crl;
-
-    crl = GetX509CRLPtr(arg); /* NO NEED TO DUP */
-    GetX509Store(self, store);
-    X509_STORE_add_crl(store, crl);
-
-    return self;
-}
-
-static VALUE ossl_x509stctx_get_err(VALUE);
-static VALUE ossl_x509stctx_get_err_string(VALUE);
-static VALUE ossl_x509stctx_get_chain(VALUE);
-
-static VALUE 
-ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
-{
-    VALUE cert, chain;
-    VALUE ctx, proc, result;
-
-    rb_scan_args(argc, argv, "11", &cert, &chain);
-    ctx = rb_funcall(cX509StoreContext, rb_intern("new"), 3, self, cert, chain);
-    proc = rb_block_given_p() ?  rb_block_proc() :
-	   rb_iv_get(self, "@verify_callback");
-    rb_iv_set(ctx, "@verify_callback", proc);
-    result = rb_funcall(ctx, rb_intern("verify"), 0);
-
-    rb_iv_set(self, "@error", ossl_x509stctx_get_err(ctx));
-    rb_iv_set(self, "@error_string", ossl_x509stctx_get_err_string(ctx));
-    rb_iv_set(self, "@chain", ossl_x509stctx_get_chain(ctx));
-
-    return result;
-}
-
-/*
- * Public Functions
- */
-static void ossl_x509stctx_free(X509_STORE_CTX*);
-
-VALUE
-ossl_x509stctx_new(X509_STORE_CTX *ctx)
-{
-    VALUE obj;
-
-    WrapX509StCtx(cX509StoreContext, obj, ctx);
-
-    return obj;
-}
-
-VALUE
-ossl_x509stctx_clear_ptr(VALUE obj)
-{
-    OSSL_Check_Kind(obj, cX509StoreContext);
-    RDATA(obj)->data = NULL;
-
-    return obj;
-}
-
-/*
- * Private functions
- */
-static void
-ossl_x509stctx_free(X509_STORE_CTX *ctx)
-{
-    if(ctx->untrusted)
-	sk_X509_pop_free(ctx->untrusted, X509_free);
-    if(ctx->cert)
-	X509_free(ctx->cert);
-    X509_STORE_CTX_free(ctx);
-}
-
-static VALUE 
-ossl_x509stctx_alloc(VALUE klass)
-{
-    X509_STORE_CTX *ctx;
-    VALUE obj;
-
-    if((ctx = X509_STORE_CTX_new()) == NULL){
-        ossl_raise(eX509StoreError, NULL);
-    }
-    WrapX509StCtx(klass, obj, ctx);
-
-    return obj;
-}
-
-static VALUE
-ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE store, cert, chain;
-    X509_STORE_CTX *ctx;
-    X509_STORE *x509st;
-    X509 *x509 = NULL;
-    STACK_OF(X509) *x509s = NULL;
-
-    GetX509StCtx(self, ctx);
-    rb_scan_args(argc, argv, "12", &store, &cert, &chain);
-    SafeGetX509Store(store, x509st);
-    if(!NIL_P(cert)) x509 = DupX509CertPtr(cert); /* NEED TO DUP */
-    if(!NIL_P(chain)) x509s = ossl_x509_ary2sk(chain);
-#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
-    if(X509_STORE_CTX_init(ctx, x509st, x509, x509s) != 1){
-        sk_X509_pop_free(x509s, X509_free);
-        ossl_raise(eX509StoreError, NULL);
-    }
-#else
-    X509_STORE_CTX_init(ctx, x509st, x509, x509s);
-    X509_STORE_CTX_set_flags(ctx, NUM2INT(rb_iv_get(store, "@flags")));
-    X509_STORE_CTX_set_purpose(ctx, NUM2INT(rb_iv_get(store, "@purpose")));
-    X509_STORE_CTX_set_trust(ctx, NUM2INT(rb_iv_get(store, "@trust")));
-#endif
-    rb_iv_set(self, "@verify_callback", rb_iv_get(store, "@verify_callback"));
-    rb_iv_set(self, "@cert", cert);
-
-    return self;
-}
-
-static VALUE
-ossl_x509stctx_verify(VALUE self)
-{
-    X509_STORE_CTX *ctx;
-    int result;
-
-    GetX509StCtx(self, ctx);
-    X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx,
-                               (void*)rb_iv_get(self, "@verify_callback"));
-    result = X509_verify_cert(ctx);
-
-    return result ? Qtrue : Qfalse;
-}
-
-static VALUE
-ossl_x509stctx_get_chain(VALUE self)
-{
-    X509_STORE_CTX *ctx;
-    STACK_OF(X509) *chain;
-    X509 *x509;
-    int i, num;
-    VALUE ary;
-
-    GetX509StCtx(self, ctx);
-    if((chain = X509_STORE_CTX_get_chain(ctx)) == NULL){
-        return Qnil;
-    }
-    if((num = sk_X509_num(chain)) < 0){
-	OSSL_Debug("certs in chain < 0???");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(num);
-    for(i = 0; i < num; i++) {
-	x509 = sk_X509_value(chain, i);
-	rb_ary_push(ary, ossl_x509_new(x509));
-    }
-
-    return ary;
-}
-
-static VALUE 
-ossl_x509stctx_get_err(VALUE self)
-{
-    X509_STORE_CTX *ctx;
-
-    GetX509StCtx(self, ctx);
-
-    return INT2FIX(X509_STORE_CTX_get_error(ctx));
-}
-
-static VALUE
-ossl_x509stctx_set_error(VALUE self, VALUE err)
-{
-    X509_STORE_CTX *ctx;
-
-    GetX509StCtx(self, ctx);
-    X509_STORE_CTX_set_error(ctx, FIX2INT(err));
-
-    return err;
-}
-
-static VALUE 
-ossl_x509stctx_get_err_string(VALUE self)
-{
-    X509_STORE_CTX *ctx;
-    long err;
-
-    GetX509StCtx(self, ctx);
-    err = X509_STORE_CTX_get_error(ctx);
-
-    return rb_str_new2(X509_verify_cert_error_string(err));
-}
-
-static VALUE 
-ossl_x509stctx_get_err_depth(VALUE self)
-{
-    X509_STORE_CTX *ctx;
-
-    GetX509StCtx(self, ctx);
-
-    return INT2FIX(X509_STORE_CTX_get_error_depth(ctx));
-}
-
-static VALUE 
-ossl_x509stctx_get_curr_cert(VALUE self)
-{
-    X509_STORE_CTX *ctx;
-
-    GetX509StCtx(self, ctx);
-
-    return ossl_x509_new(X509_STORE_CTX_get_current_cert(ctx));
-}
-
-static VALUE
-ossl_x509stctx_get_curr_crl(VALUE self)
-{
-#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
-    X509_STORE_CTX *ctx;
-
-    GetX509StCtx(self, ctx);
-    if(!ctx->current_crl) return Qnil;
-
-    return ossl_x509crl_new(ctx->current_crl);
-#else
-    return Qnil;
-#endif
-}
-
-static VALUE
-ossl_x509stctx_cleanup(VALUE self)
-{
-    X509_STORE_CTX *ctx;
-
-    GetX509StCtx(self, ctx);
-    X509_STORE_CTX_cleanup(ctx);
-
-    return self;
-}
-
-static VALUE
-ossl_x509stctx_set_flags(VALUE self, VALUE flags)
-{
-    X509_STORE_CTX *store;
-
-    GetX509StCtx(self, store);
-    X509_STORE_CTX_set_flags(store, NUM2LONG(flags));
-
-    return flags;
-}
-
-static VALUE
-ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
-{
-    X509_STORE_CTX *store;
-
-    GetX509StCtx(self, store);
-    X509_STORE_CTX_set_purpose(store, NUM2LONG(purpose));
-
-    return purpose;
-}
-
-static VALUE
-ossl_x509stctx_set_trust(VALUE self, VALUE trust)
-{
-    X509_STORE_CTX *store;
-
-    GetX509StCtx(self, store);
-    X509_STORE_CTX_set_trust(store, NUM2LONG(trust));
-
-    return trust;
-}
-
-/*
- * INIT
- */
-void 
-Init_ossl_x509store()
-{
-    VALUE x509stctx;
-
-    eX509StoreError = rb_define_class_under(mX509, "StoreError", eOSSLError);
-
-    cX509Store = rb_define_class_under(mX509, "Store", rb_cObject);
-    rb_attr(cX509Store, rb_intern("verify_callback"), 1, 0, Qfalse);
-    rb_attr(cX509Store, rb_intern("error"), 1, 0, Qfalse);
-    rb_attr(cX509Store, rb_intern("error_string"), 1, 0, Qfalse);
-    rb_attr(cX509Store, rb_intern("chain"), 1, 0, Qfalse);
-    rb_define_alloc_func(cX509Store, ossl_x509store_alloc);
-    rb_define_method(cX509Store, "initialize",   ossl_x509store_initialize, -1);
-    rb_define_method(cX509Store, "verify_callback=", ossl_x509store_set_vfy_cb, 1);
-    rb_define_method(cX509Store, "flags=",       ossl_x509store_set_flags, 1);
-    rb_define_method(cX509Store, "purpose=",     ossl_x509store_set_purpose, 1);
-    rb_define_method(cX509Store, "trust=",       ossl_x509store_set_trust, 1);
-    rb_define_method(cX509Store, "add_path",     ossl_x509store_add_path, 1);
-    rb_define_method(cX509Store, "add_file",     ossl_x509store_add_file, 1);
-    rb_define_method(cX509Store, "add_cert",     ossl_x509store_add_cert, 1);
-    rb_define_method(cX509Store, "add_crl",      ossl_x509store_add_crl, 1);
-    rb_define_method(cX509Store, "verify",       ossl_x509store_verify, -1);
-
-    cX509StoreContext = rb_define_class_under(mX509,"StoreContext",rb_cObject);
-    x509stctx = cX509StoreContext;
-    rb_define_alloc_func(cX509StoreContext, ossl_x509stctx_alloc);
-    rb_define_method(x509stctx,"initialize",  ossl_x509stctx_initialize, -1);
-    rb_define_method(x509stctx,"verify",      ossl_x509stctx_verify, 0);
-    rb_define_method(x509stctx,"chain",       ossl_x509stctx_get_chain,0);
-    rb_define_method(x509stctx,"error",       ossl_x509stctx_get_err, 0);
-    rb_define_method(x509stctx,"error=",      ossl_x509stctx_set_error, 1);
-    rb_define_method(x509stctx,"error_string",ossl_x509stctx_get_err_string,0);
-    rb_define_method(x509stctx,"error_depth", ossl_x509stctx_get_err_depth, 0);
-    rb_define_method(x509stctx,"current_cert",ossl_x509stctx_get_curr_cert, 0);
-    rb_define_method(x509stctx,"current_crl", ossl_x509stctx_get_curr_crl, 0);
-    rb_define_method(x509stctx,"cleanup",     ossl_x509stctx_cleanup, 0);
-    rb_define_method(x509stctx,"flags=",      ossl_x509stctx_set_flags, 1);
-    rb_define_method(x509stctx,"purpose=",    ossl_x509stctx_set_purpose, 1);
-    rb_define_method(x509stctx,"trust=",      ossl_x509stctx_set_trust, 1);
-
-}
diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
deleted file mode 100644
index 4bd08890f8..0000000000
--- a/ext/openssl/ruby_missing.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2003  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_RUBY_MISSING_H_)
-#define _OSS_RUBY_MISSING_H_
-
-#define rb_define_copy_func(klass, func) \
-	rb_define_method(klass, "initialize_copy", func, 1)
-
-#endif /* _OSS_RUBY_MISSING_H_ */
-
diff --git a/ext/pty/.cvsignore b/ext/pty/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/pty/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/pty/MANIFEST b/ext/pty/MANIFEST
index 0535a5b7ef..5e5af7dd6b 100644
--- a/ext/pty/MANIFEST
+++ b/ext/pty/MANIFEST
@@ -1,9 +1,8 @@
 MANIFEST
 README
 README.expect
-README.expect.ja
-README.ja
-depend
+README.expect.jp
+README.jp
 expect_sample.rb
 extconf.rb
 lib/expect.rb
diff --git a/ext/pty/README b/ext/pty/README
index 42c7d4f891..a09469d39c 100644
--- a/ext/pty/README
+++ b/ext/pty/README
@@ -33,15 +33,43 @@ following module fungtions:
       the array is passed to the block as block parameters, and the
       function itself returns nil.
 
-      When the child process is suspended or finished, an exception is
-      raised.  If this function is called with an iterator block,
-      exception is raised only within the block.  Child process
-      monitor is terminated on block exit.
+      While the process spawned by this function is active, SIGCHLD
+      is captured to handle the change of the child process. When the
+      child process is suspended or finished, an exception is raised.
+      As all SIGCHLD signal is captured and processed by PTY module,
+      you can't use other function or method which spawns subprosesses
+      (including signal() and IO.popen()) while the PTY subprocesses
+      are active. Otherwise, unexpected exception will occur. To avoid
+      this problem, see protect_signal() below.
+
+      If this function is called with an iterator block, SIGCHLD signal
+      is captured only within the block. Therefore, it is risky to use
+      File objects for PTY subprocess outside the iterator block.
+
 
    protect_signal
-   reset_signal
 
-      These functions are obsolete in this version of pty.
+      This function takes an iterator block. Within the iterator block,
+      no exception is raised even if any subprocess is terminated.
+      This function is used to enable functions like system() or IO.popen()
+      while PTY subprocess is active. For example,
+
+        PTY.spawn("command_foo") do |r,w|
+          ...
+          ...
+          PTY.protect_signal do
+            system "some other commands"
+          end
+          ...
+        end
+
+      disables to send exception when "some other commands" is 
+      terminated. 
+
+    reset_signal
+
+      Disables to handle SIGCHLD while PTY subprocess is active.
+
 
 4. License
 
diff --git a/ext/pty/README.expect.ja b/ext/pty/README.expect.jp
index db84695ee5..db84695ee5 100644
--- a/ext/pty/README.expect.ja
+++ b/ext/pty/README.expect.jp
diff --git a/ext/pty/README.ja b/ext/pty/README.jp
index 5ae4fb06a0..5ae4fb06a0 100644
--- a/ext/pty/README.ja
+++ b/ext/pty/README.jp
diff --git a/ext/pty/depend b/ext/pty/depend
deleted file mode 100644
index 888be6c301..0000000000
--- a/ext/pty/depend
+++ /dev/null
@@ -1 +0,0 @@
-pty.o: pty.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 5e126fe0cf..63383f7faf 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,15 +1,10 @@
 require 'mkmf'
 
-if /mswin32|mingw|bccwin32/ !~ RUBY_PLATFORM
-  have_header("sys/stropts.h")
-  have_func("setresuid")
-  have_header("libutil.h")
-  have_header("pty.h")
-  have_library("util", "openpty")
-  if have_func("openpty") or
-      have_func("_getpty") or
-      have_func("ptsname") or
-      have_func("ioctl")
-    create_makefile('pty')
-  end
+have_header("sys/stropts.h")
+have_func("setresuid")
+$CFLAGS << "-DHAVE_DEV_PTMX" if /cygwin/ === PLATFORM
+if have_func("openpty") or
+    have_func("_getpty") or
+    have_func("ioctl")
+  create_makefile('pty')
 end
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index aa9ab895d3..54c69edadb 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -20,12 +20,12 @@ class IO
         STDOUT.print c
         STDOUT.flush
       end
-      if mat=e_pat.match(buf) then
-        result = [buf,*mat.to_a[1..-1]]
+      if buf =~ e_pat then
+        result = [buf,$1,$2,$3,$4,$5,$6,$7,$8,$9]
         break
       end
     end
-    if block_given? then
+    if iterator? then
       yield result
     else
       return result
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index cea0de50a2..98be9044b7 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -1,7 +1,6 @@
 #include	"config.h"
 #include	<stdio.h>
 #include	<sys/types.h>
-#include	<sys/stat.h>
 #include	<sys/file.h>
 #include	<fcntl.h>
 #include	<errno.h>
@@ -9,12 +8,6 @@
 #if !defined(HAVE_OPENPTY) && !defined(HAVE__GETPTY)
 #include	<sys/ioctl.h>
 #endif
-#ifdef HAVE_LIBUTIL_H
-#include	<libutil.h>
-#endif
-#ifdef HAVE_PTY_H
-#include	<pty.h>
-#endif
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #else
@@ -22,8 +15,8 @@
 #endif
 #include <ctype.h>
 
-#include "ruby.h"
-#include "rubyio.h"
+#include <ruby.h>
+#include <rubyio.h>
 
 #include <signal.h>
 #ifdef HAVE_SYS_STROPTS_H
@@ -38,7 +31,6 @@
 
 #if !defined(HAVE_OPENPTY)
 #ifdef __hpux
-static
 char	*MasterDevice = "/dev/ptym/pty%s",
 	*SlaveDevice =  "/dev/pty/tty%s",
 	*deviceNo[] = {
@@ -62,7 +54,6 @@ char	*MasterDevice = "/dev/ptym/pty%s",
 	};
 #else  /* NOT HPUX */
 #ifdef _IBMESA  /* AIX/ESA */
-static 
 char	*MasterDevice = "/dev/ptyp%s",
   	*SlaveDevice = "/dev/ttyp%s",
 	*deviceNo[] = {
@@ -84,7 +75,6 @@ char	*MasterDevice = "/dev/ptyp%s",
 "f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
 		};
 #else
-static 
 char	*MasterDevice = "/dev/pty%s",
 	*SlaveDevice = "/dev/tty%s",
 	*deviceNo[] = {
@@ -94,18 +84,20 @@ char	*MasterDevice = "/dev/pty%s",
 		"q8","q9","qa","qb","qc","qd","qe","qf",
 		"r0","r1","r2","r3","r4","r5","r6","r7",
 		"r8","r9","ra","rb","rc","rd","re","rf",
-		"s0","s1","s2","s3","s4","s5","s6","s7",
-		"s8","s9","sa","sb","sc","sd","se","sf",
 		0,
 	};
 #endif /* _IBMESA */
 #endif /* HPUX */
 #endif /* !defined(HAVE_OPENPTY) */
 
-static char SlaveName[DEVICELEN];
+char	SlaveName[DEVICELEN];
 
 extern int errno;
 
+#define MAX_PTY 16
+static int n_pty,last_pty;
+static int chld_pid[MAX_PTY];
+
 #ifndef HAVE_SETEUID
 # ifdef HAVE_SETREUID
 #  define seteuid(e)	setreuid(-1, (e))
@@ -118,97 +110,109 @@ extern int errno;
 # endif /* HAVE_SETREUID */
 #endif /* NO_SETEUID */
 
-static VALUE eChildExited;
+struct pty_info {
+  int fd;
+  pid_t child_pid;
+};
 
-static VALUE
-echild_status(self)
-    VALUE self;
+static void
+set_signal_action(action)
+    RETSIGTYPE (*action)();
 {
-    return rb_ivar_get(self, rb_intern("status"));
-}
+#ifdef __hpux
+    struct sigvec sv;
+    /*
+     * signal SIGCHLD should be delivered on stop of the child
+     */
+    sv.sv_handler = action;
+    sv.sv_mask = sigmask(SIGCHLD);
+    sv.sv_flags = SV_BSDSIG;
+    sigvector(SIGCHLD, &sv, (struct sigvec *) 0);
+#else	/* not HPUX */
+#if defined(SA_NOCLDSTOP)
+    struct sigaction sa;
+    /*
+     * signal SIGCHLD should be delivered on stop of the child
+     * (for SVR4)
+     */
+    sa.sa_handler = action;
+    sigemptyset(&sa.sa_mask);
+    sigaddset(&sa.sa_mask, SIGCHLD);
+    sa.sa_flags = 0;	/* SA_NOCLDSTOP flag is removed */
+    sigaction(SIGCHLD, &sa, (struct sigaction *) 0);
+#else
+    signal(SIGCHLD,action);
+#endif
+#endif /* not HPUX */
 
-struct pty_info {
-    int fd;
-    pid_t child_pid;
-    VALUE thread;
-};
+}
 
 static void
-raise_from_wait(state, info)
-    struct pty_info *info;
-    char *state;
+reset_signal_action()
 {
-    extern VALUE rb_last_status;
-    char buf[1024];
-    VALUE exc;
-
-    snprintf(buf, sizeof(buf), "pty - %s: %d", state, info->child_pid);
-    exc = rb_exc_new2(eChildExited, buf);
-    rb_iv_set(exc, "status", rb_last_status);
-    rb_funcall(info->thread, rb_intern("raise"), 1, exc);
+    set_signal_action(SIG_DFL);
 }
 
-static VALUE
-pty_syswait(info)
-    struct pty_info *info;
+static RETSIGTYPE
+chld_changed()
 {
-    int cpid, status;
+    int cpid;
+    int i,n = -1;
+    int statusp;
 
     for (;;) {
-	cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
-	if (cpid == -1) return Qnil;
-
-#if defined(IF_STOPPED)
-	if (IF_STOPPED(status)) { /* suspend */
-	    raise_from_wait("stopped", info);
-	}
-#elif defined(WIFSTOPPED)
-	if (WIFSTOPPED(status)) { /* suspend */
-	    raise_from_wait("stopped", info);
+#ifdef HAVE_WAITPID
+	cpid = waitpid(-1, &statusp, WUNTRACED|WNOHANG);
+#else
+	cpid = wait3(&statusp, WUNTRACED|WNOHANG, 0);
+#endif
+	if (cpid == 0 || cpid == -1)
+	    return;
+        for (i = 0; i < last_pty; i++) {
+	    if (chld_pid[i] == cpid) {
+		n = i;
+		goto catched;
+	    }
 	}
+        rb_raise(rb_eRuntimeError, "fork: %d", cpid);
+    }
+  catched:
+
+#ifdef IF_STOPPED
+    if (IF_STOPPED(statusp)) { /* suspend */
+	rb_raise(rb_eRuntimeError, "Stopped: %d",cpid);
+    }
+#else
+#ifdef WIFSTOPPED
+    if (WIFSTOPPED(statusp)) { /* suspend */
+	rb_raise(rb_eRuntimeError, "Stopped: %d",cpid);
+    }
 #else
 ---->> Either IF_STOPPED or WIFSTOPPED is needed <<----
-#endif /* WIFSTOPPED | IF_STOPPED */
-	else if (kill(info->child_pid, 0) == 0) {
-	    raise_from_wait("changed", info);
-	}
-	else {
-	    raise_from_wait("exited", info);
-	    return Qnil;
-	}
+#endif /* WIFSTOPPED */
+#endif /* IF_STOPPED */
+    if (n >= 0) {
+	chld_pid[n] = 0;
+	n_pty--;
+	if (n_pty == 0)
+	    reset_signal_action();
     }
+    rb_raise(rb_eRuntimeError, "Child_changed: %d",cpid);
 }
 
 static void getDevice _((int*, int*));
 
-struct exec_info {
-    int argc;
-    VALUE *argv;
-};
-
-static VALUE
-pty_exec(arg)
-    struct exec_info *arg;
-{
-    return rb_f_exec(arg->argc, arg->argv);
-}
-
 static void
-establishShell(argc, argv, info)
-    int argc;
-    VALUE *argv;
+establishShell(shellname, info)
+    char *shellname;
     struct pty_info *info;
 {	
-    static int		i,master,slave,currentPid;
+    static int		i,j,master,slave,currentPid;
     char		*p,*getenv();
     struct passwd	*pwent;
-    VALUE		v;
-    struct exec_info	arg;
-    int			status;
-
-    if (argc == 0) {
-	char *shellname;
-
+    RETSIGTYPE		chld_changed();
+    
+    if (shellname[0] == '\0') {
 	if ((p = getenv("SHELL")) != NULL) {
 	    shellname = p;
 	}
@@ -219,19 +223,18 @@ establishShell(argc, argv, info)
 	    else
 		shellname = "/bin/sh";
 	}
-	v = rb_str_new2(shellname);
-	argc = 1;
-	argv = &v;
     }
     getDevice(&master,&slave);
 
-    info->thread = rb_thread_current();
     currentPid = getpid();
-    if((i = fork()) < 0) {
+    set_signal_action(chld_changed);
+    if((i = vfork()) < 0) {
 	rb_sys_fail("fork failed");
     }
 
     if(i == 0) {	/* child */
+	int argc;
+	char *argv[1024];
 	currentPid = getpid();	
 
 	/*
@@ -278,33 +281,44 @@ establishShell(argc, argv, info)
 	dup2(slave,1);
 	dup2(slave,2);
 	close(slave);
-#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
+
 	seteuid(getuid());
-#endif
 
-	arg.argc = argc;
-	arg.argv = argv;
-	rb_protect(pty_exec, (VALUE)&arg, &status);
+	argc = 0;
+	for (i = 0; shellname[i];) {
+	    while (isspace(shellname[i])) i++;
+	    for (j = i; shellname[j] && !isspace(shellname[j]); j++);
+	    argv[argc] = (char*)xmalloc(j-i+1);
+	    strncpy(argv[argc],&shellname[i],j-i);
+	    argv[argc][j-i] = 0;
+	    i = j;
+	    argc++;
+	}
+	argv[argc] = NULL;
+	execvp(argv[0],argv);
 	sleep(1);
 	_exit(1);
     }
 
     close(slave);
 
+    if (n_pty == last_pty) {
+	chld_pid[n_pty] = i;
+	n_pty++;
+	last_pty++;
+    }
+    else {
+	for (j = 0; j < last_pty; j++) {
+	    if (chld_pid[j] == 0) {
+		chld_pid[j] = i;
+		n_pty++;
+	    }
+	}
+    }
     info->child_pid = i;
     info->fd = master;
 }
 
-static VALUE
-pty_finalize_syswait(info)
-    struct pty_info *info;
-{
-    rb_thread_kill(info->thread);
-    rb_funcall(info->thread, rb_intern("value"), 0);
-    rb_detach_process(info->child_pid);
-    return Qnil;
-}
-
 #ifdef HAVE_OPENPTY
 /*
  * Use openpty(3) of 4.3BSD Reno and later,
@@ -343,7 +357,7 @@ getDevice(master,slave)
     int	 i,j;
     char MasterName[DEVICELEN];
 
-#ifdef HAVE_PTSNAME
+#ifdef HAVE_DEV_PTMX
     char *pn;
     void (*s)();
 
@@ -358,7 +372,7 @@ getDevice(master,slave)
 	    if(unlockpt(i) != -1) {
 		if((pn = ptsname(i)) != NULL) {
 		    if((j = open(pn, O_RDWR, 0)) != -1) {
-#if defined I_PUSH && !defined linux
+#if defined I_PUSH
 			if(ioctl(j, I_PUSH, "ptem") != -1) {
 			    if(ioctl(j, I_PUSH, "ldterm") != -1) {
 #endif
@@ -366,7 +380,7 @@ getDevice(master,slave)
 				*slave = j;
 				strcpy(SlaveName, pn);
 				return;
-#if defined I_PUSH && !defined linux
+#if defined I_PUSH
 			    }
 			}
 #endif
@@ -379,10 +393,10 @@ getDevice(master,slave)
     rb_raise(rb_eRuntimeError, "Cannot get Master/Slave device");
 #else
     for (p = deviceNo; *p != NULL; p++) {
-	sprintf(MasterName,MasterDevice,*p);
+	sprintf(MasterName ,MasterDevice,*p);
 	if ((i = open(MasterName,O_RDWR,0)) >= 0) {
 	    *master = i;
-	    sprintf(SlaveName,SlaveDevice,*p);
+	    sprintf(SlaveName ,SlaveDevice,*p);
 	    if ((j = open(SlaveName,O_RDWR,0)) >= 0) {
 		*slave = j;
 		chown(SlaveName, getuid(), getgid());
@@ -392,7 +406,7 @@ getDevice(master,slave)
 	    close(i);
 	}
     }
-    rb_raise(rb_eRuntimeError, "Cannot get %s", SlaveName);
+    rb_raise(rb_eRuntimeError, "Cannot get %s\n", SlaveDevice);
 #endif
 }
 #endif /* HAVE__GETPTY */
@@ -407,63 +421,66 @@ freeDevice()
 
 /* ruby function: getpty */
 static VALUE
-pty_getpty(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pty_getpty(self, shell)
+    VALUE self, shell;
 {
     VALUE res;
     struct pty_info info;
-    struct pty_info thinfo;
     OpenFile *wfptr,*rfptr;
-    VALUE rport = rb_obj_alloc(rb_cFile);
-    VALUE wport = rb_obj_alloc(rb_cFile);
+    NEWOBJ(rport, struct RFile);
+    NEWOBJ(wport, struct RFile);
   
+    if (n_pty == MAX_PTY+1) {
+	rb_raise(rb_eRuntimeError, "Too many ptys are open");
+    }
+
+    OBJSETUP(rport, rb_cFile, T_FILE);
     MakeOpenFile(rport, rfptr);
+
+    OBJSETUP(wport, rb_cFile, T_FILE);
     MakeOpenFile(wport, wfptr);
 
-    establishShell(argc, argv, &info);
+    establishShell(RSTRING(shell)->ptr,&info);
 
     rfptr->mode = rb_io_mode_flags("r");
     rfptr->f = fdopen(info.fd, "r");
-    rfptr->path = strdup(SlaveName);
+    rfptr->path = strdup(RSTRING(shell)->ptr);
 
-    wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
+    wfptr->mode = rb_io_mode_flags("w");
     wfptr->f = fdopen(dup(info.fd), "w");
-    wfptr->path = strdup(SlaveName);
+    wfptr->path = strdup(RSTRING(shell)->ptr);
 
-    res = rb_ary_new2(3);
+    res = rb_ary_new2(2);
     rb_ary_store(res,0,(VALUE)rport);
     rb_ary_store(res,1,(VALUE)wport);
     rb_ary_store(res,2,INT2FIX(info.child_pid));
 
-    thinfo.thread = rb_thread_create(pty_syswait, (void*)&info);
-    thinfo.child_pid = info.child_pid;
-    rb_thread_schedule();
-
-    if (rb_block_given_p()) {
-	rb_ensure(rb_yield, res, pty_finalize_syswait, (VALUE)&thinfo);
+    if (rb_iterator_p()) {
+	rb_yield((VALUE)res);
+	reset_signal_action();
 	return Qnil;
     }
-    return res;
+    else {
+	return (VALUE)res;
+    }
 }
 
-/* ruby function: protect_signal - obsolete */
+/* ruby function: protect_signal */
 static VALUE
 pty_protect(self)
     VALUE self;
 {
-    rb_warn("PTY::protect_signal is no longer needed");
+    reset_signal_action();
     rb_yield(Qnil);
+    set_signal_action(chld_changed);
     return self;
 }
 
-/* ruby function: reset_signal - obsolete */
 static VALUE
 pty_reset_signal(self)
     VALUE self;
 {
-    rb_warn("PTY::reset_signal is no longer needed");
+    reset_signal_action();
     return self;
 }
 
@@ -473,11 +490,8 @@ void
 Init_pty()
 {
     cPTY = rb_define_module("PTY");
-    rb_define_module_function(cPTY,"getpty",pty_getpty,-1);
-    rb_define_module_function(cPTY,"spawn",pty_getpty,-1);
+    rb_define_module_function(cPTY,"getpty",pty_getpty,1);
+    rb_define_module_function(cPTY,"spawn",pty_getpty,1);
     rb_define_module_function(cPTY,"protect_signal",pty_protect,0);
     rb_define_module_function(cPTY,"reset_signal",pty_reset_signal,0);
-
-    eChildExited = rb_define_class_under(cPTY,"ChildExited",rb_eRuntimeError);
-    rb_define_method(eChildExited,"status",echild_status,0);
 }
diff --git a/ext/pty/script.rb b/ext/pty/script.rb
index dbb933171f..6aaafec061 100644
--- a/ext/pty/script.rb
+++ b/ext/pty/script.rb
@@ -10,7 +10,8 @@ logfile = File.open(ofile,"a")
 
 system "stty -echo raw lnext ^_"
 
-PTY.spawn("/bin/csh") do |r_pty,w_pty,pid|
+PTY.spawn("/bin/csh") do
+  |r_pty,w_pty,pid|
 
   Thread.new do
     while true
@@ -21,11 +22,11 @@ PTY.spawn("/bin/csh") do |r_pty,w_pty,pid|
   
   begin
     while true
-      c = r_pty.sysread(512)
-      break if c.nil?
-      print c
+      c = r_pty.getc
+      next if c.nil?
+      print c.chr
       STDOUT.flush
-      logfile.print c
+      logfile.print c.chr
     end
   rescue
   #  print $@,':',$!,"\n"
diff --git a/ext/pty/shl.rb b/ext/pty/shl.rb
index cdaf8d7398..0c04a2735c 100644
--- a/ext/pty/shl.rb
+++ b/ext/pty/shl.rb
@@ -18,7 +18,9 @@ $r_pty = nil
 $w_pty = nil
 
 def writer
-  system "stty -echo raw"
+  PTY.protect_signal do
+    system "stty -echo raw"
+  end
   begin
     while true
       c = STDIN.getc
@@ -33,7 +35,9 @@ def writer
     $reader.raise(nil)
     return 'Exit'
   ensure
-    system "stty echo -raw"
+    PTY.protect_signal do
+      system "stty echo -raw"
+    end
   end
 end
 
diff --git a/ext/racc/cparse/.cvsignore b/ext/racc/cparse/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/racc/cparse/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/racc/cparse/MANIFEST b/ext/racc/cparse/MANIFEST
deleted file mode 100644
index 6827937750..0000000000
--- a/ext/racc/cparse/MANIFEST
+++ /dev/null
@@ -1,4 +0,0 @@
-MANIFEST
-cparse.c
-depend
-extconf.rb
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
deleted file mode 100644
index 3d75cc9ca7..0000000000
--- a/ext/racc/cparse/cparse.c
+++ /dev/null
@@ -1,824 +0,0 @@
-/*
-
-    cparse.c
-  
-    Copyright (c) 1999-2002 Minero Aoki <aamine@loveruby.net>
-  
-    This library is free software.
-    You can distribute/modify this program under the same terms of ruby.
-
-    $Id$
-
-*/
-
-#include "ruby.h"
-#include <stdio.h>
-
-
-/* -----------------------------------------------------------------------
-                        Important Constants
------------------------------------------------------------------------ */
-
-#define RACC_VERSION "1.4.2"
-
-#define DEFAULT_TOKEN -1
-#define ERROR_TOKEN    1
-#define FINAL_TOKEN    0
-
-#define vDEFAULT_TOKEN  INT2FIX(DEFAULT_TOKEN)
-#define vERROR_TOKEN    INT2FIX(ERROR_TOKEN)
-#define vFINAL_TOKEN    INT2FIX(FINAL_TOKEN)
-
-
-/* -----------------------------------------------------------------------
-                          Global Variables
------------------------------------------------------------------------ */
-
-static VALUE RaccBug;
-static VALUE CparseParams;
-
-static ID id_yydebug;
-static ID id_nexttoken;
-static ID id_onerror;
-static ID id_noreduce;
-static ID id_catch;
-static VALUE sym_raccjump;
-static ID id_errstatus;
-
-static ID id_d_shift;
-static ID id_d_reduce;
-static ID id_d_accept;
-static ID id_d_read_token;
-static ID id_d_next_state;
-static ID id_d_e_pop;
-
-
-/* -----------------------------------------------------------------------
-                              Utils
------------------------------------------------------------------------ */
-
-static ID value_to_id _((VALUE v));
-static inline long num_to_long _((VALUE n));
-
-#ifdef ID2SYM
-# define id_to_value(i) ID2SYM(i)
-#else
-# define id_to_value(i) ULONG2NUM(i)
-#endif
-
-static ID
-value_to_id(v)
-    VALUE v;
-{
-#ifndef SYMBOL_P
-#  define SYMBOL_P(v) FIXNUM_P(v)
-#endif
-    if (! SYMBOL_P(v)) {
-        rb_raise(rb_eTypeError, "not symbol");
-    }
-#ifdef SYM2ID
-    return SYM2ID(v);
-#else
-    return (ID)NUM2ULONG(v);
-#endif
-}
-
-#ifndef LONG2NUM
-#  define LONG2NUM(i) INT2NUM(i)
-#endif
-
-static inline long
-num_to_long(n)
-    VALUE n;
-{
-    return NUM2LONG(n);
-}
-
-#define AREF(s, idx) \
-    ((0 <= idx && idx < RARRAY(s)->len) ? RARRAY(s)->ptr[idx] : Qnil)
-
-
-/* -----------------------------------------------------------------------
-                        Parser Stack Interfaces
------------------------------------------------------------------------ */
-
-static VALUE get_stack_tail _((VALUE stack, long len));
-static void cut_stack_tail _((VALUE stack, long len));
-
-static VALUE
-get_stack_tail(stack, len)
-    VALUE stack;
-    long len;
-{
-    if (len < 0) return Qnil;  /* system error */
-    if (len > RARRAY(stack)->len) len = RARRAY(stack)->len;
-    return rb_ary_new4(len, RARRAY(stack)->ptr + RARRAY(stack)->len - len);
-}
-
-static void
-cut_stack_tail(stack, len)
-    VALUE stack;
-    long len;
-{
-    while (len > 0) {
-        rb_ary_pop(stack);
-        len--;
-    }
-}
-
-#define STACK_INIT_LEN 64
-#define NEW_STACK() rb_ary_new2(STACK_INIT_LEN)
-#define PUSH(s, i) rb_ary_store(s, RARRAY(s)->len, i)
-#define POP(s) rb_ary_pop(s)
-#define LAST_I(s) \
-    ((RARRAY(s)->len > 0) ? RARRAY(s)->ptr[RARRAY(s)->len - 1] : Qnil)
-#define GET_TAIL(s, len) get_stack_tail(s, len)
-#define CUT_TAIL(s, len) cut_stack_tail(s, len)
-
-
-/* -----------------------------------------------------------------------
-                       struct cparse_params
------------------------------------------------------------------------ */
-
-struct cparse_params {
-    VALUE value_v;         /* VALUE version of this struct */
-
-    VALUE parser;          /* parser object */
-
-    VALUE lexer;           /* receiver object of scan iterator */
-    ID    lexmid;          /* name of scan iterator method */
-
-    /* state transition tables (never change)
-       Using data structure is from Dragon Book 4.9 */
-    /* action table */
-    VALUE action_table;
-    VALUE action_check;
-    VALUE action_default;
-    VALUE action_pointer;
-    /* goto table */
-    VALUE goto_table;
-    VALUE goto_check;
-    VALUE goto_default;
-    VALUE goto_pointer;
-
-    long  nt_base;         /* NonTerminal BASE index */
-    VALUE reduce_table;    /* reduce data table */
-    VALUE token_table;     /* token conversion table */
-
-    /* parser stacks and parameters */
-    VALUE state;
-    long curstate;
-    VALUE vstack;
-    VALUE tstack;
-    VALUE t;
-    long shift_n;
-    long reduce_n;
-    long ruleno;
-
-    long errstatus;         /* nonzero in error recovering mode */
-    long nerr;              /* number of error */
-
-    /* runtime user option */
-    int use_result_var;     /* bool */
-    int iterator_p;         /* bool */
-
-    VALUE retval;           /* return value of parser routine */
-    long fin;               /* parse result status */
-#define CP_FIN_ACCEPT  1
-#define CP_FIN_EOT     2
-#define CP_FIN_CANTPOP 3
-
-    int debug;              /* user level debug */
-    int sys_debug;          /* system level debug */
-
-    long i;                 /* table index */
-};
-
-
-/* -----------------------------------------------------------------------
-                        Parser Main Routines
------------------------------------------------------------------------ */
-
-static VALUE racc_cparse _((VALUE parser, VALUE arg, VALUE sysdebug));
-static VALUE racc_yyparse _((VALUE parser, VALUE lexer, VALUE lexmid,
-                             VALUE arg, VALUE sysdebug));
-
-static void call_lexer _((struct cparse_params *v));
-static VALUE lexer_iter _((VALUE data));
-static VALUE lexer_i _((VALUE block_args, VALUE data, VALUE self));
-
-static VALUE check_array _((VALUE a));
-static long check_num _((VALUE n));
-static VALUE check_hash _((VALUE h));
-static void initialize_params _((struct cparse_params *v,
-                                 VALUE parser, VALUE arg,
-                                 VALUE lexer, VALUE lexmid));
-
-static void parse_main _((struct cparse_params *v,
-                         VALUE tok, VALUE val, int resume));
-static void extract_user_token _((struct cparse_params *v,
-                                  VALUE block_args, VALUE *tok, VALUE *val));
-static void shift _((struct cparse_params* v, long act, VALUE tok, VALUE val));
-static int reduce _((struct cparse_params* v, long act));
-static VALUE catch_iter _((VALUE dummy));
-static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
-
-#ifdef DEBUG
-# define D(code) if (v->sys_debug) code
-#else
-# define D(code)
-#endif
-
-static VALUE
-racc_cparse(parser, arg, sysdebug)
-    VALUE parser, arg, sysdebug;
-{
-    struct cparse_params params;
-
-    params.sys_debug = RTEST(sysdebug);
-    D(puts("start C doparse"));
-    initialize_params(&params, parser, arg, Qnil, Qnil);
-    params.iterator_p = Qfalse;
-    D(puts("params initialized"));
-    parse_main(&params, Qnil, Qnil, 0);
-    return params.retval;
-}
-
-static VALUE
-racc_yyparse(parser, lexer, lexmid, arg, sysdebug)
-    VALUE parser, lexer, lexmid, arg, sysdebug;
-{
-    struct cparse_params params;
-
-    params.sys_debug = RTEST(sysdebug);
-    D(puts("start C yyparse"));
-    initialize_params(&params, parser, arg, lexer, lexmid);
-    params.iterator_p = Qtrue;
-    D(puts("params initialized"));
-    parse_main(&params, Qnil, Qnil, 0);
-    call_lexer(&params);
-    if (! params.fin) {
-        rb_raise(rb_eArgError, "%s() is finished before EndOfToken",
-                 rb_id2name(params.lexmid));
-    }
-
-    return params.retval;
-}
-
-static void
-call_lexer(v)
-    struct cparse_params *v;
-{
-    rb_iterate(lexer_iter, v->value_v, lexer_i, v->value_v);
-}
-
-static VALUE
-lexer_iter(data)
-    VALUE data;
-{
-    struct cparse_params *v;
-
-    Data_Get_Struct(data, struct cparse_params, v);
-    rb_funcall(v->lexer, v->lexmid, 0);
-    return Qnil;
-}
-
-static VALUE
-lexer_i(block_args, data, self)
-    VALUE block_args, data, self;
-{
-    struct cparse_params *v;
-    VALUE tok, val;
-
-    Data_Get_Struct(data, struct cparse_params, v);
-    if (v->fin)
-        rb_raise(rb_eArgError, "extra token after EndOfToken");
-    extract_user_token(v, block_args, &tok, &val);
-    parse_main(v, tok, val, 1);
-    if (v->fin && v->fin != CP_FIN_ACCEPT)
-       rb_iter_break(); 
-    return Qnil;
-}
-
-static VALUE
-check_array(a)
-    VALUE a;
-{
-    Check_Type(a, T_ARRAY);
-    return a;
-}
-
-static VALUE
-check_hash(h)
-    VALUE h;
-{
-    Check_Type(h, T_HASH);
-    return h;
-}
-
-static long
-check_num(n)
-    VALUE n;
-{
-    return NUM2LONG(n);
-}
-
-static void
-initialize_params(v, parser, arg, lexer, lexmid)
-    struct cparse_params *v;
-    VALUE parser, arg, lexer, lexmid;
-{
-    v->value_v = Data_Wrap_Struct(CparseParams, 0, 0, v);
-
-    v->parser = parser;
-    v->lexer = lexer;
-    if (! NIL_P(lexmid))
-        v->lexmid = value_to_id(lexmid);
-
-    v->debug = RTEST(rb_ivar_get(parser, id_yydebug));
-
-    Check_Type(arg, T_ARRAY);
-    if (!(13 <= RARRAY(arg)->len && RARRAY(arg)->len <= 14))
-        rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY(arg)->len);
-    v->action_table   = check_array(RARRAY(arg)->ptr[ 0]);
-    v->action_check   = check_array(RARRAY(arg)->ptr[ 1]);
-    v->action_default = check_array(RARRAY(arg)->ptr[ 2]);
-    v->action_pointer = check_array(RARRAY(arg)->ptr[ 3]);
-    v->goto_table     = check_array(RARRAY(arg)->ptr[ 4]);
-    v->goto_check     = check_array(RARRAY(arg)->ptr[ 5]);
-    v->goto_default   = check_array(RARRAY(arg)->ptr[ 6]);
-    v->goto_pointer   = check_array(RARRAY(arg)->ptr[ 7]);
-    v->nt_base        = check_num  (RARRAY(arg)->ptr[ 8]);
-    v->reduce_table   = check_array(RARRAY(arg)->ptr[ 9]);
-    v->token_table    = check_hash (RARRAY(arg)->ptr[10]);
-    v->shift_n        = check_num  (RARRAY(arg)->ptr[11]);
-    v->reduce_n       = check_num  (RARRAY(arg)->ptr[12]);
-    if (RARRAY(arg)->len > 13) {
-        v->use_result_var = RTEST(RARRAY(arg)->ptr[13]);
-    }
-    else {
-        v->use_result_var = Qtrue;
-    }
-
-    v->tstack = v->debug ? NEW_STACK() : Qnil;
-    v->vstack = NEW_STACK();
-    v->state = NEW_STACK();
-    v->curstate = 0;
-    PUSH(v->state, INT2FIX(0));
-    v->t = INT2FIX(FINAL_TOKEN + 1);   /* must not init to FINAL_TOKEN */
-    v->nerr = 0;
-    v->errstatus = 0;
-    rb_ivar_set(parser, id_errstatus, LONG2NUM(v->errstatus));
-
-    v->retval = Qnil;
-    v->fin = 0;
-
-    v->iterator_p = Qfalse;
-}
-
-static void
-extract_user_token(v, block_args, tok, val)
-    struct cparse_params *v;
-    VALUE block_args;
-    VALUE *tok, *val;
-{
-    if (NIL_P(block_args)) {
-        /* EOF */
-        *tok = Qfalse;
-        *val = rb_str_new("$", 1);
-        return;
-    }
-
-    if (TYPE(block_args) != T_ARRAY) {
-        rb_raise(rb_eTypeError,
-                 "%s() %s %s (must be Array[2])",
-                 v->iterator_p ? rb_id2name(v->lexmid) : "next_token",
-                 v->iterator_p ? "yielded" : "returned",
-                 rb_class2name(CLASS_OF(block_args)));
-    }
-    if (RARRAY(block_args)->len != 2) {
-        rb_raise(rb_eArgError,
-                 "%s() %s wrong size of array (%ld for 2)",
-                 v->iterator_p ? rb_id2name(v->lexmid) : "next_token",
-                 v->iterator_p ? "yielded" : "returned",
-                 RARRAY(block_args)->len);
-    }
-    *tok = AREF(block_args, 0);
-    *val = AREF(block_args, 1);
-}
-
-#define SHIFT(v,act,tok,val) shift(v,act,tok,val)
-#define REDUCE(v,act) do {\
-    switch (reduce(v,act)) {  \
-      case 0: /* normal */    \
-        break;                \
-      case 1: /* yyerror */   \
-        goto user_yyerror;    \
-      case 2: /* yyaccept */  \
-        D(puts("u accept"));  \
-        goto accept;          \
-      default:                \
-        break;                \
-    }                         \
-} while (0)
-
-static void
-parse_main(v, tok, val, resume)
-    struct cparse_params *v;
-    VALUE tok, val;
-    int resume;
-{
-    long act;
-    long i;
-    int read_next = 1;
-    VALUE vact;
-    VALUE tmp;
-
-    if (resume)
-        goto resume;
-    
-    while (1) {
-        D(puts("enter new loop"));
-
-        D(printf("(act) k1=%ld\n", v->curstate));
-        tmp = AREF(v->action_pointer, v->curstate);
-        if (NIL_P(tmp)) goto notfound;
-        D(puts("(act) pointer[k1] true"));
-        i = NUM2LONG(tmp);
-
-        D(printf("read_next=%d\n", read_next));
-        if (read_next) {
-            if (v->t != vFINAL_TOKEN) {
-                /* Now read token really */
-                if (v->iterator_p) {
-                    /* scan routine is an iterator */
-                    D(puts("goto resume..."));
-                    if (v->fin)
-                        rb_raise(rb_eArgError, "token given after final token");
-                    v->i = i;  /* save i */
-                    return;
-                  resume:
-                    D(puts("resume"));
-                    i = v->i;  /* load i */
-                }
-                else {
-                    /* scan routine is next_token() */
-                    D(puts("next_token"));
-                    tmp = rb_funcall(v->parser, id_nexttoken, 0);
-                    extract_user_token(v, tmp, &tok, &val);
-                }
-                /* convert token */
-                tmp = rb_hash_aref(v->token_table, tok);
-                v->t = NIL_P(tmp) ? vERROR_TOKEN : tmp;
-                D(printf("(act) t(k2)=%ld\n", NUM2LONG(v->t)));
-                if (v->debug) {
-                    rb_funcall(v->parser, id_d_read_token,
-                               3, v->t, tok, val);
-                }
-            }
-            read_next = 0;
-        }
-
-        i += NUM2LONG(v->t);
-        D(printf("(act) i=%ld\n", i));
-        if (i < 0) goto notfound;
-
-        vact = AREF(v->action_table, i);
-        D(printf("(act) table[i]=%ld\n", NUM2LONG(vact)));
-        if (NIL_P(vact)) goto notfound;
-
-        tmp = AREF(v->action_check, i);
-        D(printf("(act) check[i]=%ld\n", NUM2LONG(tmp)));
-        if (NIL_P(tmp)) goto notfound;
-        if (NUM2LONG(tmp) != v->curstate) goto notfound;
-
-        D(puts("(act) found"));
-      act_fixed:
-        act = NUM2LONG(vact);
-        D(printf("act=%ld\n", act));
-        goto handle_act;
-    
-      notfound:
-        D(puts("(act) not found: use default"));
-        vact = AREF(v->action_default, v->curstate);
-        goto act_fixed;
-
-      handle_act:
-        if (act > 0 && act < v->shift_n) {
-            D(puts("shift"));
-            if (v->errstatus > 0) {
-                v->errstatus--;
-                rb_ivar_set(v->parser, id_errstatus, LONG2NUM(v->errstatus));
-            }
-            SHIFT(v, act, v->t, val);
-            read_next = 1;
-        }
-        else if (act < 0 && act > -(v->reduce_n)) {
-            D(puts("reduce"));
-            REDUCE(v, act);
-        }
-        else if (act == -(v->reduce_n)) {
-            goto error;
-          error_return:
-            ;   /* goto label requires stmt */
-        }
-        else if (act == v->shift_n) {
-            D(puts("accept"));
-            goto accept;
-        }
-        else {
-            rb_raise(RaccBug, "[Racc Bug] unknown act value %ld", act);
-        }
-
-        if (v->debug) {
-            rb_funcall(v->parser, id_d_next_state,
-                       2, LONG2NUM(v->curstate), v->state);
-        }
-    }
-    /* not reach */
-
-
-  accept:
-    if (v->debug) rb_funcall(v->parser, id_d_accept, 0);
-    v->retval = RARRAY(v->vstack)->ptr[0];
-    v->fin = CP_FIN_ACCEPT;
-    return;
-
-
-  error:
-    D(printf("error detected, status=%ld\n", v->errstatus));
-    if (v->errstatus == 0) {
-        v->nerr++;
-        rb_funcall(v->parser, id_onerror,
-                   3, v->t, val, v->vstack);
-    }
-  user_yyerror:
-    if (v->errstatus == 3) {
-        if (v->t == vFINAL_TOKEN) {
-            v->retval = Qfalse;
-            v->fin = CP_FIN_EOT;
-            return;
-        }
-        read_next = 1;
-    }
-    v->errstatus = 3;
-    rb_ivar_set(v->parser, id_errstatus, LONG2NUM(v->errstatus));
-
-    /* check if we can shift/reduce error token */
-    D(printf("(err) k1=%ld\n", v->curstate));
-    D(printf("(err) k2=%d (error)\n", ERROR_TOKEN));
-    while (1) {
-        tmp = AREF(v->action_pointer, v->curstate);
-        if (NIL_P(tmp)) goto e_notfound;
-        D(puts("(err) pointer[k1] true"));
-
-        i = NUM2LONG(tmp) + ERROR_TOKEN;
-        D(printf("(err) i=%ld\n", i));
-        if (i < 0) goto e_notfound;
-
-        vact = AREF(v->action_table, i);
-        if (NIL_P(vact)) {
-            D(puts("(err) table[i] == nil"));
-            goto e_notfound;
-        }
-        D(printf("(err) table[i]=%ld\n", NUM2LONG(vact)));
-
-        tmp = AREF(v->action_check, i);
-        if (NIL_P(tmp)) {
-            D(puts("(err) check[i] == nil"));
-            goto e_notfound;
-        }
-        if (NUM2LONG(tmp) != v->curstate) {
-            D(puts("(err) check[i]!=k1 or nil"));
-            goto e_notfound;
-        }
-
-        D(puts("(err) found: can handle error token"));
-        act = NUM2LONG(vact);
-        break;
-          
-      e_notfound:
-        D(puts("(err) not found: can't handle error token; pop"));
-
-        if (RARRAY(v->state)->len == 0) {
-            v->retval = Qnil;
-            v->fin = CP_FIN_CANTPOP;
-            return;
-        }
-        POP(v->state);
-        POP(v->vstack);
-        v->curstate = num_to_long(LAST_I(v->state));
-        if (v->debug) {
-            POP(v->tstack);
-            rb_funcall(v->parser, id_d_e_pop,
-                       3, v->state, v->tstack, v->vstack);
-        }
-    }
-
-    /* shift/reduce error token */
-    if (act > 0 && act < v->shift_n) {
-        D(puts("e shift"));
-        SHIFT(v, act, ERROR_TOKEN, val);
-    }
-    else if (act < 0 && act > -(v->reduce_n)) {
-        D(puts("e reduce"));
-        REDUCE(v, act);
-    }
-    else if (act == v->shift_n) {
-        D(puts("e accept"));
-        goto accept;
-    }
-    else {
-        rb_raise(RaccBug, "[Racc Bug] unknown act value %ld", act);
-    }
-    goto error_return;
-}
-
-static void
-shift(v, act, tok, val)
-    struct cparse_params *v;
-    long act;
-    VALUE tok, val;
-{
-    PUSH(v->vstack, val);
-    if (v->debug) {
-        PUSH(v->tstack, tok);
-        rb_funcall(v->parser, id_d_shift,
-                   3, tok, v->tstack, v->vstack);
-    }
-    v->curstate = act;
-    PUSH(v->state, LONG2NUM(v->curstate));
-}
-
-static int
-reduce(v, act)
-    struct cparse_params *v;
-    long act;
-{
-    VALUE code;
-    v->ruleno = -act * 3;
-    code = rb_iterate(catch_iter, Qnil, reduce0, v->value_v);
-    v->errstatus = num_to_long(rb_ivar_get(v->parser, id_errstatus));
-    return NUM2INT(code);
-}
-
-static VALUE
-catch_iter(dummy)
-    VALUE dummy;
-{
-    return rb_funcall(rb_mKernel, id_catch, 1, sym_raccjump);
-}
-
-static VALUE
-reduce0(val, data, self)
-    VALUE val, data, self;
-{
-    struct cparse_params *v;
-    VALUE reduce_to, reduce_len, method_id;
-    long len;
-    ID mid;
-    VALUE tmp, tmp_t, tmp_v;
-    long i, k1, k2;
-    VALUE goto_state;
-
-    Data_Get_Struct(data, struct cparse_params, v);
-    reduce_len = RARRAY(v->reduce_table)->ptr[v->ruleno];
-    reduce_to  = RARRAY(v->reduce_table)->ptr[v->ruleno+1];
-    method_id  = RARRAY(v->reduce_table)->ptr[v->ruleno+2];
-    len = NUM2LONG(reduce_len);
-    mid = value_to_id(method_id);
-
-    /* call action */
-    if (len == 0) {
-        tmp = Qnil;
-        if (mid != id_noreduce)
-            tmp_v = rb_ary_new();
-        if (v->debug)
-            tmp_t = rb_ary_new();
-    }
-    else {
-        if (mid != id_noreduce) {
-            tmp_v = GET_TAIL(v->vstack, len);
-            tmp = RARRAY(tmp_v)->ptr[0];
-        }
-        else {
-            tmp = RARRAY(v->vstack)->ptr[ RARRAY(v->vstack)->len - len ];
-        }
-        CUT_TAIL(v->vstack, len);
-        if (v->debug) {
-            tmp_t = GET_TAIL(v->tstack, len);
-            CUT_TAIL(v->tstack, len);
-        }
-        CUT_TAIL(v->state, len);
-    }
-    if (mid != id_noreduce) {
-        if (v->use_result_var) {
-            tmp = rb_funcall(v->parser, mid,
-                             3, tmp_v, v->vstack, tmp);
-        }
-        else {
-            tmp = rb_funcall(v->parser, mid,
-                             2, tmp_v, v->vstack);
-        }
-    }
-
-    /* then push result */
-    PUSH(v->vstack, tmp);
-    if (v->debug) {
-        PUSH(v->tstack, reduce_to);
-        rb_funcall(v->parser, id_d_reduce,
-                   4, tmp_t, reduce_to, v->tstack, v->vstack);
-    }
-
-    /* calculate transition state */
-    if (RARRAY(v->state)->len == 0)
-        rb_raise(RaccBug, "state stack unexpected empty");
-    k2 = num_to_long(LAST_I(v->state));
-    k1 = num_to_long(reduce_to) - v->nt_base;
-    D(printf("(goto) k1=%ld\n", k1));
-    D(printf("(goto) k2=%ld\n", k2));
-
-    tmp = AREF(v->goto_pointer, k1);
-    if (NIL_P(tmp)) goto notfound;
-
-    i = NUM2LONG(tmp) + k2;
-    D(printf("(goto) i=%ld\n", i));
-    if (i < 0) goto notfound;
-
-    goto_state = AREF(v->goto_table, i);
-    if (NIL_P(goto_state)) {
-        D(puts("(goto) table[i] == nil"));
-        goto notfound;
-    }
-    D(printf("(goto) table[i]=%ld (goto_state)\n", NUM2LONG(goto_state)));
-
-    tmp = AREF(v->goto_check, i);
-    if (NIL_P(tmp)) {
-        D(puts("(goto) check[i] == nil"));
-        goto notfound;
-    }
-    if (tmp != LONG2NUM(k1)) {
-        D(puts("(goto) check[i] != table[i]"));
-        goto notfound;
-    }
-    D(printf("(goto) check[i]=%ld\n", NUM2LONG(tmp)));
-
-    D(puts("(goto) found"));
-  transit:
-    PUSH(v->state, goto_state);
-    v->curstate = NUM2LONG(goto_state);
-    return INT2FIX(0);
-
-  notfound:
-    D(puts("(goto) not found: use default"));
-    /* overwrite `goto-state' by default value */
-    goto_state = AREF(v->goto_default, k1);
-    goto transit;
-}
-
-
-/* -----------------------------------------------------------------------
-                          Ruby Interface
------------------------------------------------------------------------ */
-
-void
-Init_cparse()
-{
-    VALUE Racc;
-    VALUE Parser;
-    ID id_racc = rb_intern("Racc");
-
-    if (rb_const_defined(rb_cObject, id_racc)) {
-        Racc = rb_const_get(rb_cObject, id_racc);
-        Parser = rb_const_get_at(Racc, rb_intern("Parser"));
-    }
-    else {
-        Racc = rb_define_module("Racc");
-        Parser = rb_define_class_under(Racc, "Parser", rb_cObject);
-    }
-    rb_define_private_method(Parser, "_racc_do_parse_c", racc_cparse, 2);
-    rb_define_private_method(Parser, "_racc_yyparse_c", racc_yyparse, 4);
-    rb_define_const(Parser, "Racc_Runtime_Core_Version_C",
-                    rb_str_new2(RACC_VERSION));
-    rb_define_const(Parser, "Racc_Runtime_Core_Id_C",
-        rb_str_new2("$Id$"));
-
-    CparseParams = rb_define_class_under(Racc, "CparseParams", rb_cObject);
-
-    RaccBug = rb_eRuntimeError;
-
-    id_yydebug      = rb_intern("@yydebug");
-    id_nexttoken    = rb_intern("next_token");
-    id_onerror      = rb_intern("on_error");
-    id_noreduce     = rb_intern("_reduce_none");
-    id_catch        = rb_intern("catch");
-    id_errstatus    = rb_intern("@racc_error_status");
-    sym_raccjump    = id_to_value(rb_intern("racc_jump"));
-
-    id_d_shift       = rb_intern("racc_shift");
-    id_d_reduce      = rb_intern("racc_reduce");
-    id_d_accept      = rb_intern("racc_accept");
-    id_d_read_token  = rb_intern("racc_read_token");
-    id_d_next_state  = rb_intern("racc_next_state");
-    id_d_e_pop       = rb_intern("racc_e_pop");
-}
diff --git a/ext/racc/cparse/depend b/ext/racc/cparse/depend
deleted file mode 100644
index 7b06a880f5..0000000000
--- a/ext/racc/cparse/depend
+++ /dev/null
@@ -1 +0,0 @@
-cparse.o: cparse.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb
deleted file mode 100644
index dd953a7e15..0000000000
--- a/ext/racc/cparse/extconf.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-require 'mkmf'
-create_makefile 'racc/cparse'
diff --git a/ext/readline/.cvsignore b/ext/readline/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/readline/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/readline/MANIFEST b/ext/readline/MANIFEST
index 4dd1d9e1a1..f73a899abb 100644
--- a/ext/readline/MANIFEST
+++ b/ext/readline/MANIFEST
@@ -1,6 +1,4 @@
 MANIFEST
 README
-README.ja
-depend
 extconf.rb
 readline.c
diff --git a/ext/readline/README b/ext/readline/README
index 9bbf325c99..8a5fe9120f 100644
--- a/ext/readline/README
+++ b/ext/readline/README
@@ -1,62 +1,55 @@
-Extension for GNU Readline Library
+GNU Readline Library�����Ѥ��뤿��γ�ĥ�⥸�塼��Ǥ���
 
-Example:
+require "readline"
+include Readline
 
-  require "readline"
-  include Readline
+line = readline("Prompt> ", TRUE)
 
-  line = readline("Prompt> ", true)
+�Τ褦�˻��Ѥ��Ƥ���������
 
 [Readline]
 
-<module function>
+<�⥸�塼��ؿ�>
 
-readline(prompt, add_history=nil)
+readline(prompt, add=nil)
 
-  Reads one line with line editing.  The inputted line is added to the
-  history if add_history is true.
+  ������Ϥ��ɤ߹��ߤޤ���
+  add��TRUE�ξ�硢�ҥ��ȥ���ɤ߹����ʸ������ɲä��ޤ���
 
-<class methods>
+<���饹�᥽�å�>
 
 completion_proc = proc
 
-  Specifies a Proc object to determine completion behavior.  It
-  should take input-string, and return an array of completion
-  candidates.
+  �䴰����ư�����ꤹ��Proc���֥������Ȥ���ꤷ�ޤ���
+  proc�ϰ���������ʸ������ꡢ����ʸ�����������֤��褦��
+  ���Ƥ���������
 
 completion_proc
 
-  Returns the completion Proc object.
+  �䴰����ư�����ꤹ��Proc���֥������Ȥ��֤��ޤ���
 
-completion_case_fold = bool
+completion_case_fold = case_fold
 
-  Sets whether or not to ignore case on completion.
+  �䴰������ʸ����ʸ������̤��ʤ���硢TRUE����ꤷ�ޤ���
 
 completion_case_fold
 
-  Returns true if completion ignores case.
-
-completion_append_character = char
-
-  Specifies a character to be appended on completion.
-  Nothing will be appended if an empty string ("") or nil is
-  specified.
-
-completion_append_character
-
-  Returns a string containing a character to be appended on
-  completion.  The default is a space (" ").
+  �䴰������ʸ����ʸ������̤��ʤ���硢TRUE���֤��ޤ���
 
 vi_editing_mode
 
-  Specifies VI editing mode.
+  VI�⡼�ɤˤʤ�ޤ���
 
 emacs_editing_mode
 
-  Specifies Emacs editing mode.
+  Emacs�⡼�ɤˤʤ�ޤ���
 
-<class constants>
+<���饹���>
 
 HISTORY
 
-The history buffer.  It behaves just like an array.
+�ҥ��ȥ���Ф������Ϥ���������̤��ƹԤäƤ���������
+�����Ʊ���褦�˰�����褦�ˤʤäƤ��ޤ���
+
+
+	
+\ No newline at end of file
diff --git a/ext/readline/README.ja b/ext/readline/README.ja
deleted file mode 100644
index beb951fbf0..0000000000
--- a/ext/readline/README.ja
+++ /dev/null
@@ -1,63 +0,0 @@
-GNU Readline Library�����Ѥ��뤿��γ�ĥ�⥸�塼��Ǥ���
-
-require "readline"
-include Readline
-
-line = readline("Prompt> ", true)
-
-�Τ褦�˻��Ѥ��Ƥ���������
-
-[Readline]
-
-<�⥸�塼��ؿ�>
-
-readline(prompt, add_history=nil)
-
-  ������Ϥ��ɤ߹��ߤޤ���
-  add_history��true�ξ�硢�ҥ��ȥ���ɤ߹����ʸ������ɲä��ޤ���
-
-<���饹�᥽�å�>
-
-completion_proc = proc
-
-  �䴰����ư�����ꤹ��Proc���֥������Ȥ���ꤷ�ޤ���
-  proc�ϰ���������ʸ������ꡢ����ʸ�����������֤��褦��
-  ���Ƥ���������
-
-completion_proc
-
-  �䴰����ư�����ꤹ��Proc���֥������Ȥ��֤��ޤ���
-
-completion_case_fold = case_fold
-
-  �䴰������ʸ����ʸ������̤��ʤ���硢true����ꤷ�ޤ���
-
-completion_case_fold
-
-  �䴰������ʸ����ʸ������̤��ʤ���硢true���֤��ޤ���
-
-completion_append_character = char
-
-  �䴰�����ղä����ʸ����ʸ����ǻ��ꤷ�ޤ�����Ƭ�ΰ�ʸ����
-  ���ꤵ�졢��ʸ���� ("") �ޤ��� nil ����ꤹ��Ȳ����ղ�
-  ����ʤ��ʤ�ޤ���
-
-completion_append_character
-
-  �䴰�����ղä����ʸ����ʸ������֤��ޤ����ǥե���Ȥ�
-  ���� (" ") �Ǥ���
-
-vi_editing_mode
-
-  VI�⡼�ɤˤʤ�ޤ���
-
-emacs_editing_mode
-
-  Emacs�⡼�ɤˤʤ�ޤ���
-
-<���饹���>
-
-HISTORY
-
-�ҥ��ȥ���Ф������Ϥ���������̤��ƹԤäƤ���������
-�����Ʊ���褦�˰�����褦�ˤʤäƤ��ޤ���
diff --git a/ext/readline/depend b/ext/readline/depend
deleted file mode 100644
index 6570c5a036..0000000000
--- a/ext/readline/depend
+++ /dev/null
@@ -1 +0,0 @@
-readline.o: readline.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index b883de3e01..3dd9c0fc1e 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -1,27 +1,11 @@
 require "mkmf"
 
 dir_config("readline")
-have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM
-have_library("ncurses", "tgetnum") or
-  have_library("termcap", "tgetnum") or
-  have_library("curses", "tgetnum")
-
+have_library("user32", nil) if /cygwin/ === PLATFORM
+have_library("termcap", "tgetnum")
+have_library("curses", "tgetnum")
 if have_header("readline/readline.h") and
     have_header("readline/history.h") and
     have_library("readline", "readline")
-  if have_func("rl_filename_completion_function")
-    $CFLAGS += " -DREADLINE_42_OR_LATER"
-  end
-  if have_func("rl_cleanup_after_signal")
-    $CFLAGS += " -DREADLINE_40_OR_LATER"
-  end
-  if try_link(<<EOF, $libs)
-#include <stdio.h>
-#include <readline/readline.h>
-main() {rl_completion_append_character = 1;}
-EOF
-    # this feature is implemented in readline-2.1 or later. 
-    $CFLAGS += " -DREADLINE_21_OR_LATER"
-  end
   create_makefile("readline")
 end
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index cac0b1d11c..02b29796af 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1,7 +1,6 @@
 /* readline.c -- GNU Readline module
-   Copyright (C) 1997-2001  Shugo Maeda */
+   Copyright (C) 1997-1998  Shugo Maeda */
 
-#include <errno.h>
 #include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
@@ -9,10 +8,6 @@
 #include "ruby.h"
 #include "rubysig.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 static VALUE mReadline;
 
 #define TOLOWER(c) (isupper(c) ? tolower(c) : c)
@@ -20,18 +15,11 @@ static VALUE mReadline;
 #define COMPLETION_PROC "completion_proc"
 #define COMPLETION_CASE_FOLD "completion_case_fold"
 
-#ifndef READLINE_42_OR_LATER
-# define rl_filename_completion_function filename_completion_function
-# define rl_username_completion_function username_completion_function
-# define rl_completion_matches completion_matches
-#endif
-
 static int
 readline_event()
 {
     CHECK_INTS;
     rb_thread_schedule();
-    return 0;
 }
 
 static VALUE
@@ -43,34 +31,16 @@ readline_readline(argc, argv, self)
     VALUE tmp, add_hist, result;
     char *prompt = NULL;
     char *buff;
-    int status;
 
     if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
-	prompt = StringValuePtr(tmp);
-    }
-
-    if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "stdin closed");
-
-    buff = (char*)rb_protect((VALUE(*)_((VALUE)))readline, (VALUE)prompt,
-                              &status);
-    if (status) {
-#if defined READLINE_40_OR_LATER
-        /* restore terminal mode and signal handler*/
-        rl_cleanup_after_signal();
-#elif defined READLINE_21_OR_LATER
-        /* restore terminal mode */
-        (*rl_deprep_term_function)();
-#else
-        rl_deprep_terminal();
-#endif
-        rb_jump_tag(status);
+	prompt = STR2CSTR(tmp);
     }
-
+    buff = readline(prompt);
     if (RTEST(add_hist) && buff) {
 	add_history(buff);
     }
     if (buff)
-	result = rb_tainted_str_new2(buff);
+	result = rb_str_new2(buff);
     else
 	result = Qnil;
     if (buff) free(buff);
@@ -125,7 +95,7 @@ readline_attempted_completion_function(text, start, end)
 	return NULL;
     rl_attempted_completion_over = 1;
     case_fold = RTEST(rb_iv_get(mReadline, COMPLETION_CASE_FOLD));
-    ary = rb_funcall(proc, rb_intern("call"), 1, rb_tainted_str_new2(text));
+    ary = rb_funcall(proc, rb_intern("call"), 1, rb_str_new2(text));
     if (TYPE(ary) != T_ARRAY)
 	ary = rb_Array(ary);
     matches = RARRAY(ary)->len;
@@ -191,254 +161,6 @@ readline_s_emacs_editing_mode(self)
 }
 
 static VALUE
-readline_s_set_completion_append_character(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    if (NIL_P(str) || !StringValuePtr(str) || !RSTRING(str)->len) {
-	rl_completion_append_character = '\0';
-    } else {
-	rl_completion_append_character = RSTRING(str)->ptr[0];
-    }
-
-    return self;
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_get_completion_append_character(self)
-    VALUE self;
-{
-#ifdef READLINE_21_OR_LATER
-    VALUE str;
-
-    if (rl_completion_append_character == '\0')
-	return Qnil;
-
-    str = rb_str_new("", 1);
-    RSTRING(str)->ptr[0] = rl_completion_append_character;
-
-    return str;
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_set_basic_word_break_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    static char *basic_word_break_characters = NULL;
-
-    StringValue(str);
-    if (basic_word_break_characters == NULL) {
-	basic_word_break_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
-    }
-    else {
-	REALLOC_N(basic_word_break_characters, char, RSTRING(str)->len + 1);
-    }
-    strncpy(basic_word_break_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    basic_word_break_characters[RSTRING(str)->len] = '\0';
-    rl_basic_word_break_characters = basic_word_break_characters;
-
-    return self;
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_get_basic_word_break_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    if (rl_basic_word_break_characters == NULL)
-	return Qnil;
-    return rb_str_new2(rl_basic_word_break_characters);
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_set_completer_word_break_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    static char *completer_word_break_characters = NULL;
-
-    StringValue(str);
-    if (completer_word_break_characters == NULL) {
-	completer_word_break_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
-    }
-    else {
-	REALLOC_N(completer_word_break_characters, char, RSTRING(str)->len + 1);
-    }
-    strncpy(completer_word_break_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    completer_word_break_characters[RSTRING(str)->len] = '\0';
-    rl_completer_word_break_characters = completer_word_break_characters;
-
-    return self;
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_get_completer_word_break_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    if (rl_completer_word_break_characters == NULL)
-	return Qnil;
-    return rb_str_new2(rl_completer_word_break_characters);
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_set_basic_quote_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    static char *basic_quote_characters = NULL;
-
-    StringValue(str);
-    if (basic_quote_characters == NULL) {
-	basic_quote_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
-    }
-    else {
-	REALLOC_N(basic_quote_characters, char, RSTRING(str)->len + 1);
-    }
-    strncpy(basic_quote_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    basic_quote_characters[RSTRING(str)->len] = '\0';
-    rl_basic_quote_characters = basic_quote_characters;
-
-    return self;
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_get_basic_quote_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    if (rl_basic_quote_characters == NULL)
-	return Qnil;
-    return rb_str_new2(rl_basic_quote_characters);
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_set_completer_quote_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    static char *completer_quote_characters = NULL;
-
-    StringValue(str);
-    if (completer_quote_characters == NULL) {
-	completer_quote_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
-    }
-    else {
-	REALLOC_N(completer_quote_characters, char, RSTRING(str)->len + 1);
-    }
-    strncpy(completer_quote_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    completer_quote_characters[RSTRING(str)->len] = '\0';
-    rl_completer_quote_characters = completer_quote_characters;
-
-    return self;
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_get_completer_quote_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    if (rl_completer_quote_characters == NULL)
-	return Qnil;
-    return rb_str_new2(rl_completer_quote_characters);
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_set_filename_quote_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    static char *filename_quote_characters = NULL;
-
-    StringValue(str);
-    if (filename_quote_characters == NULL) {
-	filename_quote_characters =
-	    ALLOC_N(char, RSTRING(str)->len + 1);
-    }
-    else {
-	REALLOC_N(filename_quote_characters, char, RSTRING(str)->len + 1);
-    }
-    strncpy(filename_quote_characters,
-	    RSTRING(str)->ptr, RSTRING(str)->len);
-    filename_quote_characters[RSTRING(str)->len] = '\0';
-    rl_filename_quote_characters = filename_quote_characters;
-
-    return self;
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-readline_s_get_filename_quote_characters(self, str)
-    VALUE self, str;
-{
-#ifdef READLINE_21_OR_LATER
-    if (rl_filename_quote_characters == NULL)
-	return Qnil;
-    return rb_str_new2(rl_filename_quote_characters);
-#else
-    rb_notimplement();
-#endif /* READLINE_21_OR_LATER */
-}
-
-static VALUE
-rb_remove_history(index)
-    int index;
-{
-    HIST_ENTRY *entry;
-    VALUE val;
-
-    entry = remove_history(index);
-    if (entry) {
-        val = rb_tainted_str_new2(entry->line);
-        free(entry->line);
-        free(entry);
-        return val;
-    }
-    return Qnil;
-}
-
-static VALUE
 hist_to_s(self)
     VALUE self;
 {
@@ -455,13 +177,10 @@ hist_get(self, index)
 
     state = history_get_history_state();
     i = NUM2INT(index);
-    if (i < 0) {
-        i += state->length;
-    }
     if (i < 0 || i > state->length - 1) {
 	rb_raise(rb_eIndexError, "Invalid index");
     }
-    return rb_tainted_str_new2(state->entries[i]->line);
+    return rb_str_new2(state->entries[i]->line);
 }
 
 static VALUE
@@ -471,18 +190,14 @@ hist_set(self, index, str)
     VALUE str;
 {
     HISTORY_STATE *state;
-    VALUE s = str;
     int i;
 
     state = history_get_history_state();
     i = NUM2INT(index);
-    if (i < 0) {
-        i += state->length;
-    }
     if (i < 0 || i > state->length - 1) {
 	rb_raise(rb_eIndexError, "Invalid index");
     }
-    replace_history_entry(i, StringValuePtr(s), NULL);
+    replace_history_entry(i, STR2CSTR(str), NULL);
     return str;
 }
 
@@ -491,7 +206,7 @@ hist_push(self, str)
     VALUE self;
     VALUE str;
 {
-    add_history(StringValuePtr(str));
+    add_history(STR2CSTR(str));
     return self;
 }
 
@@ -505,7 +220,7 @@ hist_push_method(argc, argv, self)
     
     while (argc--) {
 	str = *argv++;
-	add_history(StringValuePtr(str));
+	add_history(STR2CSTR(str));
     }
     return self;
 }
@@ -515,10 +230,12 @@ hist_pop(self)
     VALUE self;
 {
     HISTORY_STATE *state;
+    HIST_ENTRY *entry;
 
     state = history_get_history_state();
     if (state->length > 0) {
-	return rb_remove_history(state->length - 1);
+	entry = remove_history(state->length - 1);
+	return rb_str_new2(entry->line);
     } else {
 	return Qnil;
     }
@@ -529,10 +246,12 @@ hist_shift(self)
     VALUE self;
 {
     HISTORY_STATE *state;
+    HIST_ENTRY *entry;
 
     state = history_get_history_state();
     if (state->length > 0) {
-	return rb_remove_history(0);
+	entry = remove_history(0);
+	return rb_str_new2(entry->line);
     } else {
 	return Qnil;
     }
@@ -547,7 +266,7 @@ hist_each(self)
 
     state = history_get_history_state();
     for (i = 0; i < state->length; i++) {
-	rb_yield(rb_tainted_str_new2(state->entries[i]->line));
+	rb_yield(rb_str_new2(state->entries[i]->line));
     }
     return self;
 }
@@ -581,16 +300,16 @@ hist_delete_at(self, index)
     VALUE index;
 {
     HISTORY_STATE *state;
+    HIST_ENTRY *entry;
     int i;
 
     state = history_get_history_state();
     i = NUM2INT(index);
-    if (i < 0)
-        i += state->length;
     if (i < 0 || i > state->length - 1) {
 	rb_raise(rb_eIndexError, "Invalid index");
     }
-    return rb_remove_history(i);
+    entry = remove_history(NUM2INT(index));
+    return rb_str_new2(entry->line);
 }
 
 static VALUE
@@ -602,12 +321,12 @@ filename_completion_proc_call(self, str)
     char **matches;
     int i;
 
-    matches = rl_completion_matches(StringValuePtr(str),
-				    rl_filename_completion_function);
+    matches = completion_matches(STR2CSTR(str),
+				 filename_completion_function);
     if (matches) {
 	result = rb_ary_new();
 	for (i = 0; matches[i]; i++) {
-	    rb_ary_push(result, rb_tainted_str_new2(matches[i]));
+	    rb_ary_push(result, rb_str_new2(matches[i]));
 	    free(matches[i]);
 	}
 	free(matches);
@@ -629,12 +348,12 @@ username_completion_proc_call(self, str)
     char **matches;
     int i;
 
-    matches = rl_completion_matches(StringValuePtr(str),
-				    rl_username_completion_function);
+    matches = completion_matches(STR2CSTR(str),
+				 username_completion_function);
     if (matches) {
 	result = rb_ary_new();
 	for (i = 0; matches[i]; i++) {
-	    rb_ary_push(result, rb_tainted_str_new2(matches[i]));
+	    rb_ary_push(result, rb_str_new2(matches[i]));
 	    free(matches[i]);
 	}
 	free(matches);
@@ -650,10 +369,7 @@ username_completion_proc_call(self, str)
 void
 Init_readline()
 {
-    VALUE history, fcomp, ucomp;
-
-    /* Allow conditional parsing of the ~/.inputrc file. */
-    rl_readline_name = "Ruby";
+    VALUE histary, fcomp, ucomp;
 
     using_history();
 
@@ -672,47 +388,21 @@ Init_readline()
 			       readline_s_vi_editing_mode, 0);
     rb_define_singleton_method(mReadline, "emacs_editing_mode",
 			       readline_s_emacs_editing_mode, 0);
-    rb_define_singleton_method(mReadline, "completion_append_character=",
-			       readline_s_set_completion_append_character, 1);
-    rb_define_singleton_method(mReadline, "completion_append_character",
-			       readline_s_get_completion_append_character, 0);
-    rb_define_singleton_method(mReadline, "basic_word_break_characters=",
-			       readline_s_set_basic_word_break_characters, 1);
-    rb_define_singleton_method(mReadline, "basic_word_break_characters",
-			       readline_s_get_basic_word_break_characters, 0);
-    rb_define_singleton_method(mReadline, "completer_word_break_characters=",
-			       readline_s_set_completer_word_break_characters, 1);
-    rb_define_singleton_method(mReadline, "completer_word_break_characters",
-			       readline_s_get_completer_word_break_characters, 0);
-    rb_define_singleton_method(mReadline, "basic_quote_characters=",
-			       readline_s_set_basic_quote_characters, 1);
-    rb_define_singleton_method(mReadline, "basic_quote_characters",
-			       readline_s_get_basic_quote_characters, 0);
-    rb_define_singleton_method(mReadline, "completer_quote_characters=",
-			       readline_s_set_completer_quote_characters, 1);
-    rb_define_singleton_method(mReadline, "completer_quote_characters",
-			       readline_s_get_completer_quote_characters, 0);
-    rb_define_singleton_method(mReadline, "filename_quote_characters=",
-			       readline_s_set_filename_quote_characters, 1);
-    rb_define_singleton_method(mReadline, "filename_quote_characters",
-			       readline_s_get_filename_quote_characters, 0);
-
-    history = rb_obj_alloc(rb_cObject);
-    rb_extend_object(history, rb_mEnumerable);
-    rb_define_singleton_method(history,"to_s", hist_to_s, 0);
-    rb_define_singleton_method(history,"[]", hist_get, 1);
-    rb_define_singleton_method(history,"[]=", hist_set, 2);
-    rb_define_singleton_method(history,"<<", hist_push, 1);
-    rb_define_singleton_method(history,"push", hist_push_method, -1);
-    rb_define_singleton_method(history,"pop", hist_pop, 0);
-    rb_define_singleton_method(history,"shift", hist_shift, 0);
-    rb_define_singleton_method(history,"each", hist_each, 0);
-    rb_define_singleton_method(history,"length", hist_length, 0);
-    rb_define_singleton_method(history,"size", hist_length, 0);
-
-    rb_define_singleton_method(history,"empty?", hist_empty_p, 0);
-    rb_define_singleton_method(history,"delete_at", hist_delete_at, 1);
-    rb_define_const(mReadline, "HISTORY", history);
+
+    histary = rb_obj_alloc(rb_cObject);
+    rb_extend_object(histary, rb_mEnumerable);
+    rb_define_singleton_method(histary,"to_s", hist_to_s, 0);
+    rb_define_singleton_method(histary,"[]", hist_get, 1);
+    rb_define_singleton_method(histary,"[]=", hist_set, 2);
+    rb_define_singleton_method(histary,"<<", hist_push, 1);
+    rb_define_singleton_method(histary,"push", hist_push_method, -1);
+    rb_define_singleton_method(histary,"pop", hist_pop, 0);
+    rb_define_singleton_method(histary,"shift", hist_shift, 0);
+    rb_define_singleton_method(histary,"each", hist_each, 0);
+    rb_define_singleton_method(histary,"length", hist_length, 0);
+    rb_define_singleton_method(histary,"empty?", hist_empty_p, 0);
+    rb_define_singleton_method(histary,"delete_at", hist_delete_at, 1);
+    rb_define_const(mReadline, "HISTORY", histary);
 
     fcomp = rb_obj_alloc(rb_cObject);
     rb_define_singleton_method(fcomp, "call",
@@ -723,21 +413,9 @@ Init_readline()
     rb_define_singleton_method(ucomp, "call",
 			       username_completion_proc_call, 1);
     rb_define_const(mReadline, "USERNAME_COMPLETION_PROC", ucomp);
-#if defined READLINE_21_OR_LATER
-    rb_define_const(mReadline, "VERSION", rb_str_new2(rl_library_version));
-#else
-    rb_define_const(mReadline, "VERSION",
-                    rb_str_new2("2.0 or before version"));
-#endif
-
-#if defined READLINE_42_OR_LATER
-    rl_attempted_completion_function
-	= (rl_completion_func_t *)readline_attempted_completion_function;
-    rl_event_hook = (rl_hook_func_t *)readline_event;
-#else
+
     rl_attempted_completion_function
 	= (CPPFunction *) readline_attempted_completion_function;
     rl_event_hook = readline_event;
-#endif
     rl_clear_signals();
 }
diff --git a/ext/sdbm/.cvsignore b/ext/sdbm/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/sdbm/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/sdbm/MANIFEST b/ext/sdbm/MANIFEST
index 6e1dc6bebd..d0ed99ba77 100644
--- a/ext/sdbm/MANIFEST
+++ b/ext/sdbm/MANIFEST
@@ -1,7 +1,5 @@
 MANIFEST
 _sdbm.c
-depend
 extconf.rb
 init.c
 sdbm.h
-testsdbm.rb
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index d8bfae80b2..a07cc55f6b 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -103,9 +103,11 @@ static int   duppair proto((char *, datum));
 /*
  * externals
  */
-#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__
+#ifndef sun
+#ifndef MSDOS
 extern int errno;
 #endif
+#endif
 
 /*
  * forward
@@ -204,7 +206,9 @@ int mode;
  * open the files in sequence, and stat the dirfile.
  * If we fail anywhere, undo everything, return NULL.
  */
+#ifdef MSDOS
 	flags |= O_BINARY;
+#endif
 	if ((db->pagf = open(pagname, flags, mode)) > -1) {
 		if ((db->dirf = open(dirname, flags, mode)) > -1) {
 /*
@@ -357,7 +361,7 @@ int need;
 {
 	long newp;
 	char twin[PBLKSIZ];
-#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
+#ifdef MSDOS
 	char zer[PBLKSIZ];
 	long oldtail;
 #endif
@@ -384,7 +388,7 @@ int need;
  * here, as sdbm_store will do so, after it inserts the incoming pair.
  */
 
-#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
+#ifdef MSDOS
 	/*
 	 * Fill hole with 0 if made it.
 	 * (hole is NOT read as 0)
diff --git a/ext/sdbm/depend b/ext/sdbm/depend
deleted file mode 100644
index 1d8b13d13f..0000000000
--- a/ext/sdbm/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-_sdbm.o: _sdbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
-init.o: init.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index f473555840..5ebffcb9fd 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -6,7 +6,7 @@
   $Date$
   created at: Fri May  7 08:34:24 JST 1999
 
-  Copyright (C) 1995-2001 Yukihiro Matsumoto
+  Copyright (C) 1995-1998 Yukihiro Matsumoto
 
 ************************************************/
 
@@ -15,8 +15,11 @@
 #include "sdbm.h"
 #include <fcntl.h>
 #include <errno.h>
+#ifdef USE_CWGUSI
+# include <sys/errno.h>
+#endif
 
-static VALUE rb_cDBM, rb_eDBMError;
+VALUE cSDBM;
 
 struct dbmdata {
     int  di_size;
@@ -26,7 +29,7 @@ struct dbmdata {
 static void
 closed_sdbm()
 {
-    rb_raise(rb_eDBMError, "closed SDBM file");
+    rb_raise(rb_eRuntimeError, "closed SDBM file");
 }
 
 #define GetDBM(obj, dbmp) {\
@@ -44,36 +47,16 @@ free_sdbm(dbmp)
 }
 
 static VALUE
-fsdbm_close(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-
-    GetDBM(obj, dbmp);
-    sdbm_close(dbmp->di_dbm);
-    dbmp->di_dbm = 0;
-
-    return Qnil;
-}
-
-static VALUE fsdbm_alloc _((VALUE));
-static VALUE
-fsdbm_alloc(klass)
-    VALUE klass;
-{
-    return Data_Wrap_Struct(klass, 0, free_sdbm, 0);
-}
-
-static VALUE
-fsdbm_initialize(argc, argv, obj)
+fsdbm_s_open(argc, argv, klass)
     int argc;
     VALUE *argv;
-    VALUE obj;
+    VALUE klass;
 {
     VALUE file, vmode;
     DBM *dbm;
     struct dbmdata *dbmp;
     int mode;
+    VALUE obj;
 
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
 	mode = 0666;		/* default value */
@@ -84,23 +67,22 @@ fsdbm_initialize(argc, argv, obj)
     else {
 	mode = NUM2INT(vmode);
     }
-    SafeStringValue(file);
+    Check_SafeStr(file);
 
     dbm = 0;
     if (mode >= 0)
 	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
     if (!dbm)
-	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR, 0);
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR, mode);
     if (!dbm)
-	dbm = sdbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDONLY, mode);
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
 	rb_sys_fail(RSTRING(file)->ptr);
     }
 
-    dbmp = ALLOC(struct dbmdata);
-    DATA_PTR(obj) = dbmp;
+    obj = Data_Make_Struct(klass,struct dbmdata,0,free_sdbm,dbmp);
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
@@ -108,33 +90,28 @@ fsdbm_initialize(argc, argv, obj)
 }
 
 static VALUE
-fsdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+fsdbm_close(obj)
+    VALUE obj;
 {
-    VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
-
-    if (NIL_P(fsdbm_initialize(argc, argv, obj))) {
-	return Qnil;
-    }
+    struct dbmdata *dbmp;
 
-    if (rb_block_given_p()) {
-        return rb_ensure(rb_yield, obj, fsdbm_close, obj);
-    }
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
+    if (dbmp->di_dbm == 0) closed_sdbm();
+    sdbm_close(dbmp->di_dbm);
+    dbmp->di_dbm = 0;
 
-    return obj;
+    return Qnil;
 }
 
 static VALUE
-fsdbm_fetch(obj, keystr, ifnone)
-    VALUE obj, keystr, ifnone;
+fsdbm_fetch(obj, keystr)
+    VALUE obj, keystr;
 {
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(keystr);
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
@@ -142,60 +119,12 @@ fsdbm_fetch(obj, keystr, ifnone)
     dbm = dbmp->di_dbm;
     value = sdbm_fetch(dbm, key);
     if (value.dptr == 0) {
-	if (ifnone == Qnil && rb_block_given_p())
-	    return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
-	return ifnone;
+	return Qnil;
     }
     return rb_tainted_str_new(value.dptr, value.dsize);
 }
 
 static VALUE
-fsdbm_aref(obj, keystr)
-    VALUE obj, keystr;
-{
-    return fsdbm_fetch(obj, keystr, Qnil);
-}
-
-static VALUE
-fsdbm_fetch_m(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE keystr, valstr, ifnone;
-
-    rb_scan_args(argc, argv, "11", &keystr, &ifnone);
-    valstr = fsdbm_fetch(obj, keystr, ifnone);
-    if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
-	rb_raise(rb_eIndexError, "key not found");
-
-    return valstr;
-}
-
-static VALUE
-fsdbm_index(obj, valstr)
-    VALUE obj, valstr;
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    StringValue(valstr);
-    val.dptr = RSTRING(valstr)->ptr;
-    val.dsize = RSTRING(valstr)->len;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	val = sdbm_fetch(dbm, key);
-	if (val.dsize == RSTRING(valstr)->len &&
-	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
-	    return rb_tainted_str_new(key.dptr, key.dsize);
-    }
-    return Qnil;
-}
-
-static VALUE
 fsdbm_indexes(argc, argv, obj)
     int argc;
     VALUE *argv;
@@ -206,63 +135,7 @@ fsdbm_indexes(argc, argv, obj)
 
     new = rb_ary_new2(argc);
     for (i=0; i<argc; i++) {
-	rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
-    }
-
-    return new;
-}
-
-static VALUE
-fsdbm_select(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    if (rb_block_given_p()) {
-        datum key, val;
-        DBM *dbm;
-        struct dbmdata *dbmp;
-
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-	}
-        GetDBM(obj, dbmp);
-        dbm = dbmp->di_dbm;
-
-        for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-            VALUE assoc;
-            val = sdbm_fetch(dbm, key);
-            assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-                                 rb_tainted_str_new(val.dptr, val.dsize));
-            if (RTEST(rb_yield(assoc)))
-                rb_ary_push(new, assoc);
-        }
-    }
-    else {
-	rb_warn("SDBM#select(index..) is deprecated; use SDBM#values_at");
-
-        for (i=0; i<argc; i++) {
-            rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
-        }
-    }
-
-    return new;
-}
-
-static VALUE
-fsdbm_values_at(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    for (i=0; i<argc; i++) {
-        rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
+	rb_ary_push(new, fsdbm_fetch(obj, argv[i]));
     }
 
     return new;
@@ -275,34 +148,29 @@ fsdbm_delete(obj, keystr)
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
-    VALUE valstr;
 
     rb_secure(4);
-    StringValue(keystr);
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    dbmp->di_size = -1;
 
     value = sdbm_fetch(dbm, key);
     if (value.dptr == 0) {
-	if (rb_block_given_p()) return rb_yield(keystr);
+	if (rb_iterator_p()) rb_yield(keystr);
 	return Qnil;
     }
 
-    /* need to save value before sdbm_delete() */
-    valstr = rb_tainted_str_new(value.dptr, value.dsize);
-
     if (sdbm_delete(dbm, key)) {
 	dbmp->di_size = -1;
-	rb_raise(rb_eDBMError, "dbm_delete failed");
+	rb_raise(rb_eRuntimeError, "dbm_delete failed");
     }
     else if (dbmp->di_size >= 0) {
 	dbmp->di_size--;
     }
-    return valstr;
+    return obj;
 }
 
 static VALUE
@@ -321,13 +189,10 @@ fsdbm_shift(obj)
     key = sdbm_firstkey(dbm); 
     if (!key.dptr) return Qnil;
     val = sdbm_fetch(dbm, key);
-    keystr = rb_tainted_str_new(key.dptr, key.dsize);
-    valstr = rb_tainted_str_new(val.dptr, val.dsize);
     sdbm_delete(dbm, key);
-    if (dbmp->di_size >= 0) {
-	dbmp->di_size--;
-    }
 
+    keystr = rb_tainted_str_new(key.dptr, key.dsize);
+    valstr = rb_tainted_str_new(val.dptr, val.dsize);
     return rb_assoc_new(keystr, valstr);
 }
 
@@ -339,34 +204,20 @@ fsdbm_delete_if(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
     VALUE keystr, valstr;
-    VALUE ret, ary = rb_ary_new();
-    int i, status = 0, n;
 
     rb_secure(4);
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
-    n = dbmp->di_size;
-    dbmp->di_size = -1;
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
 	keystr = rb_tainted_str_new(key.dptr, key.dsize);
 	valstr = rb_tainted_str_new(val.dptr, val.dsize);
-        ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
-        if (status != 0) break;
-	if (RTEST(ret)) rb_ary_push(ary, keystr);
-    }
-
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	keystr = RARRAY(ary)->ptr[i];
-	key.dptr = RSTRING(keystr)->ptr;
-	key.dsize = RSTRING(keystr)->len;
-	if (sdbm_delete(dbm, key)) {
-	    rb_raise(rb_eDBMError, "sdbm_delete failed");
+	if (RTEST(rb_yield(rb_assoc_new(keystr, valstr)))) {
+	    if (sdbm_delete(dbm, key)) {
+		rb_raise(rb_eRuntimeError, "sdbm_delete failed");
+	    }
 	}
     }
-    if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
-
     return obj;
 }
 
@@ -382,13 +233,11 @@ fsdbm_clear(obj)
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
-    while (key = sdbm_firstkey(dbm), key.dptr) {
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	if (sdbm_delete(dbm, key)) {
-	    rb_raise(rb_eDBMError, "sdbm_delete failed");
+	    rb_raise(rb_eRuntimeError, "sdbm_delete failed");
 	}
     }
-    dbmp->di_size = 0;
-
     return obj;
 }
 
@@ -410,11 +259,9 @@ fsdbm_invert(obj)
 	valstr = rb_tainted_str_new(val.dptr, val.dsize);
 	rb_hash_aset(hash, valstr, keystr);
     }
-    return hash;
+    return obj;
 }
 
-static VALUE each_pair _((VALUE));
-
 static VALUE
 each_pair(obj)
     VALUE obj;
@@ -478,7 +325,7 @@ fsdbm_store(obj, keystr, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     dbmp->di_size = -1;
     dbm = dbmp->di_dbm;
     if (sdbm_store(dbm, key, val, DBM_REPLACE)) {
@@ -486,7 +333,7 @@ fsdbm_store(obj, keystr, valstr)
 	sdbm_clearerr(dbm);
 #endif
 	if (errno == EPERM) rb_sys_fail(0);
-	rb_raise(rb_eDBMError, "sdbm_store failed");
+	rb_raise(rb_eRuntimeError, "sdbm_store failed");
     }
 
     return valstr;
@@ -501,7 +348,7 @@ fsdbm_length(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
     dbm = dbmp->di_dbm;
 
@@ -522,7 +369,7 @@ fsdbm_empty_p(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM(obj, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp->di_size < 0) {
 	dbm = dbmp->di_dbm;
 
@@ -641,7 +488,7 @@ fsdbm_has_key(obj, keystr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(keystr);
+    Check_Type(keystr, T_STRING);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
@@ -660,7 +507,7 @@ fsdbm_has_value(obj, valstr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    StringValue(valstr);
+    Check_Type(valstr, T_STRING);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
@@ -697,82 +544,41 @@ fsdbm_to_a(obj)
     return ary;
 }
 
-static VALUE
-fsdbm_to_hash(obj)
-    VALUE obj;
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE hash;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-
-    hash = rb_hash_new();
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	val = sdbm_fetch(dbm, key);
-	rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
-		           rb_tainted_str_new(val.dptr, val.dsize));
-    }
-
-    return hash;
-}
-
-static VALUE
-fsdbm_reject(obj)
-    VALUE obj;
-{
-    return rb_hash_delete_if(fsdbm_to_hash(obj));
-}
-
 void
 Init_sdbm()
 {
-    rb_cDBM = rb_define_class("SDBM", rb_cObject);
-    rb_eDBMError = rb_define_class("SDBMError", rb_eStandardError);
-    rb_include_module(rb_cDBM, rb_mEnumerable);
-
-    rb_define_alloc_func(rb_cDBM, fsdbm_alloc);
-    rb_define_singleton_method(rb_cDBM, "open", fsdbm_s_open, -1);
-
-    rb_define_method(rb_cDBM, "initialize", fsdbm_initialize, -1);
-    rb_define_method(rb_cDBM, "close", fsdbm_close, 0);
-    rb_define_method(rb_cDBM, "[]", fsdbm_aref, 1);
-    rb_define_method(rb_cDBM, "fetch", fsdbm_fetch_m, -1);
-    rb_define_method(rb_cDBM, "[]=", fsdbm_store, 2);
-    rb_define_method(rb_cDBM, "store", fsdbm_store, 2);
-    rb_define_method(rb_cDBM, "index",  fsdbm_index, 1);
-    rb_define_method(rb_cDBM, "indexes",  fsdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "indices",  fsdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "select",  fsdbm_select, -1);
-    rb_define_method(rb_cDBM, "values_at",  fsdbm_values_at, -1);
-    rb_define_method(rb_cDBM, "length", fsdbm_length, 0);
-    rb_define_method(rb_cDBM, "size", fsdbm_length, 0);
-    rb_define_method(rb_cDBM, "empty?", fsdbm_empty_p, 0);
-    rb_define_method(rb_cDBM, "each", fsdbm_each_pair, 0);
-    rb_define_method(rb_cDBM, "each_value", fsdbm_each_value, 0);
-    rb_define_method(rb_cDBM, "each_key", fsdbm_each_key, 0);
-    rb_define_method(rb_cDBM, "each_pair", fsdbm_each_pair, 0);
-    rb_define_method(rb_cDBM, "keys", fsdbm_keys, 0);
-    rb_define_method(rb_cDBM, "values", fsdbm_values, 0);
-    rb_define_method(rb_cDBM, "shift", fsdbm_shift, 0);
-    rb_define_method(rb_cDBM, "delete", fsdbm_delete, 1);
-    rb_define_method(rb_cDBM, "delete_if", fsdbm_delete_if, 0);
-    rb_define_method(rb_cDBM, "reject!", fsdbm_delete_if, 0);
-    rb_define_method(rb_cDBM, "reject", fsdbm_reject, 0);
-    rb_define_method(rb_cDBM, "clear", fsdbm_clear, 0);
-    rb_define_method(rb_cDBM,"invert", fsdbm_invert, 0);
-    rb_define_method(rb_cDBM,"update", fsdbm_update, 1);
-    rb_define_method(rb_cDBM,"replace", fsdbm_replace, 1);
-
-    rb_define_method(rb_cDBM, "include?", fsdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "has_key?", fsdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "member?", fsdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "has_value?", fsdbm_has_value, 1);
-    rb_define_method(rb_cDBM, "key?", fsdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "value?", fsdbm_has_value, 1);
-
-    rb_define_method(rb_cDBM, "to_a", fsdbm_to_a, 0);
-    rb_define_method(rb_cDBM, "to_hash", fsdbm_to_hash, 0);
+    cSDBM = rb_define_class("SDBM", rb_cObject);
+    rb_include_module(cSDBM, rb_mEnumerable);
+
+    rb_define_singleton_method(cSDBM, "open", fsdbm_s_open, -1);
+    rb_define_singleton_method(cSDBM, "new", fsdbm_s_open, -1);
+    rb_define_method(cSDBM, "close", fsdbm_close, 0);
+    rb_define_method(cSDBM, "[]", fsdbm_fetch, 1);
+    rb_define_method(cSDBM, "[]=", fsdbm_store, 2);
+    rb_define_method(cSDBM, "indexes",  fsdbm_indexes, -1);
+    rb_define_method(cSDBM, "indices",  fsdbm_indexes, -1);
+    rb_define_method(cSDBM, "length", fsdbm_length, 0);
+    rb_define_alias(cSDBM,  "size", "length");
+    rb_define_method(cSDBM, "empty?", fsdbm_empty_p, 0);
+    rb_define_method(cSDBM, "each", fsdbm_each_pair, 0);
+    rb_define_method(cSDBM, "each_value", fsdbm_each_value, 0);
+    rb_define_method(cSDBM, "each_key", fsdbm_each_key, 0);
+    rb_define_method(cSDBM, "each_pair", fsdbm_each_pair, 0);
+    rb_define_method(cSDBM, "keys", fsdbm_keys, 0);
+    rb_define_method(cSDBM, "values", fsdbm_values, 0);
+    rb_define_method(cSDBM, "shift", fsdbm_shift, 1);
+    rb_define_method(cSDBM, "delete", fsdbm_delete, 1);
+    rb_define_method(cSDBM, "delete_if", fsdbm_delete_if, 0);
+    rb_define_method(cSDBM, "clear", fsdbm_clear, 0);
+    rb_define_method(cSDBM,"invert", fsdbm_invert, 0);
+    rb_define_method(cSDBM,"update", fsdbm_update, 1);
+    rb_define_method(cSDBM,"replace", fsdbm_replace, 1);
+
+    rb_define_method(cSDBM, "include?", fsdbm_has_key, 1);
+    rb_define_method(cSDBM, "has_key?", fsdbm_has_key, 1);
+    rb_define_method(cSDBM, "has_value?", fsdbm_has_value, 1);
+    rb_define_method(cSDBM, "key?", fsdbm_has_key, 1);
+    rb_define_method(cSDBM, "value?", fsdbm_has_value, 1);
+
+    rb_define_method(cSDBM, "to_a", fsdbm_to_a, 0);
 }
diff --git a/ext/sdbm/testsdbm.rb b/ext/sdbm/testsdbm.rb
deleted file mode 100644
index 5a185fd5c4..0000000000
--- a/ext/sdbm/testsdbm.rb
+++ /dev/null
@@ -1,556 +0,0 @@
-require 'runit/testcase'
-require 'runit/cui/testrunner'
-
-if $".grep(/\bsdbm.so\b/).empty?
-  begin
-    require './sdbm'
-  rescue LoadError
-    require 'sdbm'
-  end
-end
-
-def uname_s
-  require 'rbconfig'
-  case Config::CONFIG['host_os']
-  when 'cygwin'
-    require 'Win32API'
-    uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
-    utsname = ' ' * 100
-    raise 'cannot get system name' if uname.call(utsname) == -1
-
-    utsname.unpack('A20' * 5)[0]
-  else
-    Config::CONFIG['host_os']
-  end
-end
-
-SYSTEM = uname_s
-
-class TestSDBM < RUNIT::TestCase
-  def setup
-    @path = "tmptest_sdbm_"
-    assert_instance_of(SDBM, @sdbm = SDBM.new(@path))
-  end
-  def teardown
-    assert_nil(@sdbm.close)
-    GC.start
-    File.delete *Dir.glob("tmptest_sdbm*").to_a
-    p Dir.glob("tmptest_sdbm*") if $DEBUG
-  end
-
-  def check_size(expect, sdbm=@sdbm)
-    assert_equals(expect, sdbm.size)
-    n = 0
-    sdbm.each { n+=1 }
-    assert_equals(expect, n)
-    if expect == 0
-      assert_equals(true, sdbm.empty?)
-    else
-      assert_equals(false, sdbm.empty?)
-    end
-  end
-
-  def test_version
-    assert(! SDBM.const_defined?(:VERSION))
-  end
-
-  def test_s_new_has_no_block
-    # SDBM.new ignore the block
-    foo = true
-    assert_instance_of(SDBM, sdbm = SDBM.new("tmptest_sdbm") { foo = false })
-    assert_equals(foo, true)
-    assert_nil(sdbm.close)
-  end
-  def test_s_open_no_create
-    assert_nil(sdbm = SDBM.open("tmptest_sdbm", nil))
-  ensure
-    sdbm.close if sdbm
-  end
-  def test_s_open_with_block
-    assert_equals(SDBM.open("tmptest_sdbm") { :foo }, :foo)
-  end
-=begin
-  # Is it guaranteed on many OS?
-  def test_s_open_lock_one_process
-    # locking on one process
-    assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644))
-    assert_exception(Errno::EWOULDBLOCK) {
-      begin
-	SDBM.open("tmptest_sdbm", 0644)
-      rescue Errno::EAGAIN
-	raise Errno::EWOULDBLOCK
-      end
-    }
-  end
-=end
-
-  def test_s_open_nolock
-    # sdbm 1.8.0 specific
-    if not defined? SDBM::NOLOCK
-      return
-    end
-
-    fork() {
-      assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644,
-						SDBM::NOLOCK))
-      sleep 2
-    }
-    sleep 1
-    begin
-      sdbm2 = nil
-      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
-	assert_instance_of(SDBM, sdbm2 = SDBM.open("tmptest_sdbm", 0644))
-      }
-    ensure
-      Process.wait
-      sdbm2.close if sdbm2
-    end
-
-    p Dir.glob("tmptest_sdbm*") if $DEBUG
-
-    fork() {
-      assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644))
-      sleep 2
-    }
-    begin
-      sleep 1
-      sdbm2 = nil
-      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
-	# this test is failed on Cygwin98 (???)
-	assert_instance_of(SDBM, sdbm2 = SDBM.open("tmptest_sdbm", 0644,
-						   SDBM::NOLOCK))
-      }
-    ensure
-      Process.wait
-      sdbm2.close if sdbm2
-    end
-  end
-
-  def test_s_open_error
-    assert_instance_of(SDBM, sdbm = SDBM.open("tmptest_sdbm", 0))
-    assert_exception(Errno::EACCES) {
-      SDBM.open("tmptest_sdbm", 0)
-    }
-    sdbm.close
-  end
-
-  def test_close
-    assert_instance_of(SDBM, sdbm = SDBM.open("tmptest_sdbm"))
-    assert_nil(sdbm.close)
-
-    # closed SDBM file
-    assert_exception(SDBMError) { sdbm.close }
-  end
-
-  def test_aref
-    assert_equals('bar', @sdbm['foo'] = 'bar')
-    assert_equals('bar', @sdbm['foo'])
-
-    assert_nil(@sdbm['bar'])
-  end
-
-  def test_fetch
-    assert_equals('bar', @sdbm['foo']='bar')
-    assert_equals('bar', @sdbm.fetch('foo'))
-
-    # key not found
-    assert_exception(IndexError) {
-      @sdbm.fetch('bar')
-    }
-
-    # test for `ifnone' arg
-    assert_equals('baz', @sdbm.fetch('bar', 'baz'))
-
-    # test for `ifnone' block
-    assert_equals('foobar', @sdbm.fetch('bar') {|key| 'foo' + key })
-  end
-
-  def test_aset
-    num = 0
-    2.times {|i|
-      assert_equals('foo', @sdbm['foo'] = 'foo')
-      assert_equals('foo', @sdbm['foo'])
-      assert_equals('bar', @sdbm['foo'] = 'bar')
-      assert_equals('bar', @sdbm['foo'])
-
-      num += 1 if i == 0
-      assert_equals(num, @sdbm.size)
-
-      # assign nil
-      assert_equals('', @sdbm['bar'] = '')
-      assert_equals('', @sdbm['bar'])
-
-      num += 1 if i == 0
-      assert_equals(num, @sdbm.size)
-
-      # empty string
-      assert_equals('', @sdbm[''] = '')
-      assert_equals('', @sdbm[''])
-
-      num += 1 if i == 0
-      assert_equals(num, @sdbm.size)
-
-      # Fixnum
-      assert_equals('200', @sdbm['100'] = '200')
-      assert_equals('200', @sdbm['100'])
-
-      num += 1 if i == 0
-      assert_equals(num, @sdbm.size)
-
-      # Big key and value
-      assert_equals('y' * 100, @sdbm['x' * 100] = 'y' * 100)
-      assert_equals('y' * 100, @sdbm['x' * 100])
-
-      num += 1 if i == 0
-      assert_equals(num, @sdbm.size)
-    }
-  end
-
-  def test_index
-    assert_equals('bar', @sdbm['foo'] = 'bar')
-    assert_equals('foo', @sdbm.index('bar'))
-    assert_nil(@sdbm['bar'])
-  end
-
-  def test_indexes
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-    assert_equals(values.reverse, @sdbm.indexes(*keys.reverse))
-  end
-
-  def test_values_at
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-    assert_equals(values.reverse, @sdbm.values_at(*keys.reverse))
-  end
-
-  def test_select_with_block
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-    ret = @sdbm.select {|k,v|
-      assert_equals(k.upcase, v)
-      k != "bar"
-    }
-    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
-		  ret.sort)
-  end
-
-  def test_length
-    num = 10
-    assert_equals(0, @sdbm.size)
-    num.times {|i|
-      i = i.to_s
-      @sdbm[i] = i
-    }
-    assert_equals(num, @sdbm.size)
-
-    @sdbm.shift
-
-    assert_equals(num - 1, @sdbm.size)
-  end
-
-  def test_empty?
-    assert_equals(true, @sdbm.empty?)
-    @sdbm['foo'] = 'FOO'
-    assert_equals(false, @sdbm.empty?)
-  end
-
-  def test_each_pair
-    n = 0
-    @sdbm.each_pair { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-
-    n = 0
-    ret = @sdbm.each_pair {|key, val|
-      assert_not_nil(i = keys.index(key))
-      assert_equals(val, values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@sdbm, ret)
-  end
-
-  def test_each_value
-    n = 0
-    @sdbm.each_value { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-
-    n = 0
-    ret = @sdbm.each_value {|val|
-      assert_not_nil(key = @sdbm.index(val))
-      assert_not_nil(i = keys.index(key))
-      assert_equals(val, values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@sdbm, ret)
-  end
-
-  def test_each_key
-    n = 0
-    @sdbm.each_key { n += 1 }
-    assert_equals(0, n)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-
-    n = 0
-    ret = @sdbm.each_key {|key|
-      assert_not_nil(i = keys.index(key))
-      assert_equals(@sdbm[key], values[i])
-
-      n += 1
-    }
-    assert_equals(keys.size, n)
-    assert_equals(@sdbm, ret)
-  end
-
-  def test_keys
-    assert_equals([], @sdbm.keys)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-
-    assert_equals(keys.sort, @sdbm.keys.sort)
-    assert_equals(values.sort, @sdbm.values.sort)
-  end
-
-  def test_values
-    test_keys
-  end
-
-  def test_shift
-    assert_nil(@sdbm.shift)
-    assert_equals(0, @sdbm.size)
-
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-
-    ret_keys = []
-    ret_values = []
-    while ret = @sdbm.shift
-      ret_keys.push ret[0]
-      ret_values.push ret[1]
-
-      assert_equals(keys.size - ret_keys.size, @sdbm.size)
-    end
-
-    assert_equals(keys.sort, ret_keys.sort)
-    assert_equals(values.sort, ret_values.sort)
-  end
-
-  def test_delete
-    keys = %w(foo bar baz)
-    values = %w(FOO BAR BAZ)
-    key = keys[1]
-
-    assert_nil(@sdbm.delete(key))
-    assert_equals(0, @sdbm.size)
-
-    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-
-    assert_equals('BAR', @sdbm.delete(key))
-    assert_nil(@sdbm[key])
-    assert_equals(2, @sdbm.size)
-
-    assert_nil(@sdbm.delete(key))
-  end
-  def test_delete_with_block
-    key = 'no called block'
-    @sdbm[key] = 'foo'
-    assert_equals('foo', @sdbm.delete(key) {|k| k.replace 'called block'})
-    assert_equals('no called block', key)
-    assert_equals(0, @sdbm.size)
-
-    key = 'no called block'
-    assert_equals(:blockval,
-		  @sdbm.delete(key) {|k| k.replace 'called block'; :blockval})
-    assert_equals('called block', key)
-    assert_equals(0, @sdbm.size)
-  end
-
-  def test_delete_if
-    v = "0"
-    100.times {@sdbm[v] = v; v = v.next}
-
-    ret = @sdbm.delete_if {|key, val| key.to_i < 50}
-    assert_equals(@sdbm, ret)
-    check_size(50, @sdbm)
-
-    ret = @sdbm.delete_if {|key, val| key.to_i >= 50}
-    assert_equals(@sdbm, ret)
-    check_size(0, @sdbm)
-
-    # break
-    v = "0"
-    100.times {@sdbm[v] = v; v = v.next}
-    check_size(100, @sdbm)
-    n = 0;
-    @sdbm.delete_if {|key, val|
-      break if n > 50
-      n+=1
-      true
-    }
-    assert_equals(51, n)
-    check_size(49, @sdbm)
-
-    @sdbm.clear
-
-    # raise
-    v = "0"
-    100.times {@sdbm[v] = v; v = v.next}
-    check_size(100, @sdbm)
-    n = 0;
-    begin
-      @sdbm.delete_if {|key, val|
-	raise "runtime error" if n > 50
-	n+=1
-	true
-      }
-    rescue
-    end
-    assert_equals(51, n)
-    check_size(49, @sdbm)
-  end
-
-  def test_reject
-    v = "0"
-    100.times {@sdbm[v] = v; v = v.next}
-
-    hash = @sdbm.reject {|key, val| key.to_i < 50}
-    assert_instance_of(Hash, hash)
-    assert_equals(100, @sdbm.size)
-
-    assert_equals(50, hash.size)
-    hash.each_pair {|key,val|
-      assert_equals(false, key.to_i < 50)
-      assert_equals(key, val)
-    }
-
-    hash = @sdbm.reject {|key, val| key.to_i < 100}
-    assert_instance_of(Hash, hash)
-    assert_equals(true, hash.empty?)
-  end
-
-  def test_clear
-    v = "1"
-    100.times {v = v.next; @sdbm[v] = v}
-
-    assert_equals(@sdbm, @sdbm.clear)
-
-    # validate SDBM#size
-    i = 0
-    @sdbm.each { i += 1 }
-    assert_equals(@sdbm.size, i)
-    assert_equals(0, i)
-  end
-
-  def test_invert
-    v = "0"
-    100.times {@sdbm[v] = v; v = v.next}
-
-    hash = @sdbm.invert
-    assert_instance_of(Hash, hash)
-    assert_equals(100, hash.size)
-    hash.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_update
-    hash = {}
-    v = "0"
-    100.times {v = v.next; hash[v] = v}
-
-    @sdbm["101"] = "101"
-    @sdbm.update hash
-    assert_equals(101, @sdbm.size)
-    @sdbm.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_replace
-    hash = {}
-    v = "0"
-    100.times {v = v.next; hash[v] = v}
-
-    @sdbm["101"] = "101"
-    @sdbm.replace hash
-    assert_equals(100, @sdbm.size)
-    @sdbm.each_pair {|key, val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_haskey?
-    assert_equals('bar', @sdbm['foo']='bar')
-    assert_equals(true,  @sdbm.has_key?('foo'))
-    assert_equals(false, @sdbm.has_key?('bar'))
-  end
-
-  def test_has_value?
-    assert_equals('bar', @sdbm['foo']='bar')
-    assert_equals(true,  @sdbm.has_value?('bar'))
-    assert_equals(false, @sdbm.has_value?('foo'))
-  end
-
-  def test_to_a
-    v = "0"
-    100.times {v = v.next; @sdbm[v] = v}
-
-    ary = @sdbm.to_a
-    assert_instance_of(Array, ary)
-    assert_equals(100, ary.size)
-    ary.each {|key,val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-
-  def test_to_hash
-    v = "0"
-    100.times {v = v.next; @sdbm[v] = v}
-
-    hash = @sdbm.to_hash
-    assert_instance_of(Hash, hash)
-    assert_equals(100, hash.size)
-    hash.each {|key,val|
-      assert_equals(key.to_i, val.to_i)
-    }
-  end
-end
-
-if $0 == __FILE__
-  if ARGV.size == 0
-    suite = RUNIT::TestSuite.new
-    suite.add_test(TestSDBM.suite)
-  else
-    suite = RUNIT::TestSuite.new
-    ARGV.each do |testmethod|
-      suite.add_test(TestSDBM.new(testmethod))
-    end
-  end
-
-  RUNIT::CUI::TestRunner.run(suite)
-end
diff --git a/ext/socket/.cvsignore b/ext/socket/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/socket/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h
index a22615ee00..74fae207b9 100644
--- a/ext/socket/addrinfo.h
+++ b/ext/socket/addrinfo.h
@@ -115,10 +115,8 @@
 /*
  * Constants for getnameinfo()
  */
-#ifndef NI_MAXHOST
 #define	NI_MAXHOST	1025
 #define	NI_MAXSERV	32
-#endif
 
 /*
  * Flag values for getnameinfo()
@@ -129,6 +127,11 @@
 #define	NI_NUMERICSERV	0x00000008
 #define	NI_DGRAM	0x00000010
 
+#ifdef NT
+#define IN_EXPERIMENTAL(x) 0
+#define IN_LOOPBACKNET 0
+#endif
+
 struct addrinfo {
 	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME */
 	int	ai_family;	/* PF_xxx */
@@ -155,10 +158,7 @@ extern int getnameinfo __P((
 	int flags));
 
 extern void freehostent __P((struct hostent *));
-extern void freeaddrinfo __P((struct addrinfo *));
-#if defined __UCLIBC__
-const
-#endif
+extern void freeaddrent __P((struct addrinfo *));
 extern char *gai_strerror __P((int));
 
 /* In case there is no definition of offsetof() provided - though any proper
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 4f7b49407f..362679389f 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,20 +1,19 @@
 require 'mkmf'
+$LDFLAGS += " -L/usr/local/lib" if File.directory?("/usr/local/lib")
+$CFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len"
 
-case RUBY_PLATFORM
-when /bccwin32/
-  test_func = "WSACleanup"
-  have_library("ws2_32", "WSACleanup")
-  have_func("closesocket")
-when /mswin32|mingw/
+case PLATFORM
+when /mswin32/
   test_func = "WSACleanup"
   have_library("wsock32", "WSACleanup")
-  have_func("closesocket")
 when /cygwin/
+  $LDFLAGS << " -L/usr/lib" if File.directory?("/usr/lib")
+  $CFLAGS << " -I/usr/include"
   test_func = "socket"
+  have_library("bind", "gethostbyaddr")
 when /beos/
   test_func = "socket"
   have_library("net", "socket")
-  have_func("closesocket")
 when /i386-os2_emx/
   test_func = "socket"
   have_library("socket", "socket")
@@ -25,8 +24,7 @@ else
 end
 
 $ipv6 = false
-default_ipv6 = /cygwin/ !~ RUBY_PLATFORM
-if enable_config("ipv6", default_ipv6)
+if enable_config("ipv6", false)
   if try_link(<<EOF)
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -43,57 +41,66 @@ end
 $ipv6type = nil
 $ipv6lib = nil
 $ipv6libdir = nil
-$ipv6trylibc = nil
 if $ipv6
-  if macro_defined?("IPV6_INRIA_VERSION", <<EOF)
+  if egrep_cpp("yes", <<EOF)
 #include <netinet/in.h>
+#ifdef IPV6_INRIA_VERSION
+yes
+#endif
 EOF
     $ipv6type = "inria"
     $CFLAGS="-DINET6 "+$CFLAGS
-  elsif macro_defined?("__KAME__", <<EOF)
+  elsif egrep_cpp("yes", <<EOF)
 #include <netinet/in.h>
+#ifdef __KAME__
+yes
+#endif
 EOF
     $ipv6type = "kame"
     $ipv6lib="inet6"
     $ipv6libdir="/usr/local/v6/lib"
-    $ipv6trylibc=true
     $CFLAGS="-DINET6 "+$CFLAGS
   elsif File.directory? "/usr/inet6"
     $ipv6type = "linux"
     $ipv6lib="inet6"
     $ipv6libdir="/usr/inet6/lib"
     $CFLAGS="-DINET6 -I/usr/inet6/include "+$CFLAGS
-  elsif macro_defined?("_TOSHIBA_INET6", <<EOF)
+  elsif egrep_cpp("yes", <<EOF)
 #include <sys/param.h>
+#ifdef _TOSHIBA_INET6
+yes
+#endif
 EOF
     $ipv6type = "toshiba"
     $ipv6lib="inet6"
     $ipv6libdir="/usr/local/v6/lib"
     $CFLAGS="-DINET6 "+$CFLAGS
-  elsif macro_defined?("__V6D__", <<EOF)
+  elsif egrep_cpp("yes", <<EOF)
 #include </usr/local/v6/include/sys/v6config.h>
+#ifdef __V6D__
+yes
+#endif
 EOF
     $ipv6type = "v6d"
     $ipv6lib="v6"
     $ipv6libdir="/usr/local/v6/lib"
     $CFLAGS="-DINET6 -I/usr/local/v6/include "+$CFLAGS
-  elsif macro_defined?("_ZETA_MINAMI_INET6", <<EOF)
+  elsif egrep_cpp("yes", <<EOF)
 #include <sys/param.h>
+#ifdef _ZETA_MINAMI_INET6
+yes
+#endif
 EOF
     $ipv6type = "zeta"
     $ipv6lib="inet6"
     $ipv6libdir="/usr/local/v6/lib"
     $CFLAGS="-DINET6 "+$CFLAGS
-  else
-    $ipv6lib=with_config("ipv6-lib", nil)
-    $ipv6libdir=with_config("ipv6-libdir", nil)
-    $CFLAGS="-DINET6 "+$CFLAGS
   end
   
   if $ipv6lib
     if File.directory? $ipv6libdir and File.exist? "#{$ipv6libdir}/lib#{$ipv6lib}.a"
       $LOCAL_LIBS = " -L#$ipv6libdir -l#$ipv6lib"
-    elsif !$ipv6trylibc
+    else
       print <<EOS
 
 Fatal: no #$ipv6lib library found.  cannot continue.
@@ -106,16 +113,11 @@ EOS
 end
 
   if try_link(<<EOF)
-#ifdef _WIN32
-# include <windows.h>
-# include <winsock.h>
-#else
-# include <sys/types.h>
-# include <netdb.h>
-# include <string.h>
-# include <sys/socket.h>
-# include <netinet/in.h>
-#endif
+#include <sys/types.h>
+#include <netdb.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 int
 main()
 {
@@ -129,51 +131,6 @@ EOF
 end
 
   if try_link(<<EOF)
-#ifdef _WIN32
-# include <windows.h>
-# include <winsock.h>
-#else
-# include <sys/types.h>
-# include <netdb.h>
-# include <string.h>
-# include <sys/socket.h>
-#endif
-int
-main()
-{
-   struct sockaddr_storage ss;
-
-   ss.ss_family;
-   return 0;
-}
-EOF
-    $CFLAGS="-DHAVE_SOCKADDR_STORAGE "+$CFLAGS
-else      #   doug's fix, NOW add -Dss_family... only if required!
-$CPPFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len"
-  if try_link(<<EOF)
-#ifdef _WIN32
-# include <windows.h>
-# include <winsock.h>
-#else
-# include <sys/types.h>
-# include <netdb.h>
-# include <string.h>
-# include <sys/socket.h>
-#endif
-int
-main()
-{
-   struct sockaddr_storage ss;
-
-   ss.ss_family;
-   return 0;
-}
-EOF
-    $CFLAGS="-DHAVE_SOCKADDR_STORAGE "+$CFLAGS
-end
-end
-
-  if try_link(<<EOF)
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
@@ -191,26 +148,16 @@ EOF
     $CFLAGS="-DHAVE_SA_LEN "+$CFLAGS
 end
 
-have_header("netinet/tcp.h") if not /cygwin/ =~ RUBY_PLATFORM # for cygwin 1.1.5
-have_header("netinet/udp.h")
-
-if have_func("sendmsg") | have_func("recvmsg")
-  have_struct_member('struct msghdr', 'msg_control', ['sys/types.h', 'sys/socket.h'])
-  have_struct_member('struct msghdr', 'msg_accrights', ['sys/types.h', 'sys/socket.h'])
-end
+have_header("sys/sysctl.h")
 
 $getaddr_info_ok = false
-if !enable_config("wide-getaddrinfo", false) and try_run(<<EOF)
+if try_run(<<EOF)
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifndef AF_LOCAL
-#define AF_LOCAL AF_UNIX
-#endif
-
 main()
 {
   int passive, gaierr, inet4 = 0, inet6 = 0;
@@ -220,7 +167,6 @@ main()
   for (passive = 0; passive <= 1; passive++) {
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_UNSPEC;
-    hints.ai_protocol = IPPROTO_TCP;
     hints.ai_flags = passive ? AI_PASSIVE : 0;
     hints.ai_socktype = SOCK_STREAM;
     if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
@@ -228,7 +174,6 @@ main()
       goto bad;
     }
     for (ai = aitop; ai; ai = ai->ai_next) {
-      if (ai->ai_family == AF_LOCAL) continue;
       if (ai->ai_addr == NULL ||
           ai->ai_addrlen == 0 ||
           getnameinfo(ai->ai_addr, ai->ai_addrlen,
@@ -274,9 +219,7 @@ main()
     }
   }
 
-  if (!(inet4 == 0 || inet4 == 2))
-    goto bad;
-  if (!(inet6 == 0 || inet6 == 2))
+  if (inet6 != 2 || inet4 != 2)
     goto bad;
 
   if (aitop)
@@ -297,57 +240,15 @@ if $ipv6 and not $getaddr_info_ok
 Fatal: --enable-ipv6 is specified, and your OS seems to support IPv6 feature.
 But your getaddrinfo() and getnameinfo() are appeared to be broken.  Sorry,
 you cannot compile IPv6 socket classes with broken these functions.
-You can try --enable-wide-getaddrinfo.
 EOS
   exit
 end
       
-case with_config("lookup-order-hack", "UNSPEC")
-when "INET"
-  $CFLAGS="-DLOOKUP_ORDER_HACK_INET "+$CFLAGS
-when "INET6"
-  $CFLAGS="-DLOOKUP_ORDER_HACK_INET6 "+$CFLAGS
-when "UNSPEC"
-  # nothing special
-else
-  print <<EOS
-
-Fatal: invalid value for --with-lookup-order-hack (expected INET, INET6 or UNSPEC)
-EOS
-  exit
-end
 
 $objs = ["socket.#{$OBJEXT}"]
     
-if $getaddr_info_ok and have_func("getaddrinfo", "netdb.h") and have_func("getnameinfo", "netdb.h")
+if $getaddr_info_ok and have_func("getaddrinfo") and have_func("getnameinfo")
   have_getaddrinfo = true
-else
-  if try_link(<<EOF)
-#ifndef _WIN32
-#  include <sys/types.h>
-#  include <netdb.h>
-#  include <string.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#else
-#  include <windows.h>
-#  ifdef _WIN32_WCE
-#    include <winsock.h>
-#  else
-#    include <winsock.h>
-#  endif
-#endif
-int
-main()
-{
-   struct in6_addr addr;
-   unsigned char c;
-   c = addr.s6_addr8;
-   return 0;
-}
-EOF
-    $CFLAGS="-DHAVE_ADDR8 "+$CFLAGS
-  end
 end
 
 if have_getaddrinfo
@@ -358,42 +259,18 @@ else
   $objs += ["getnameinfo.#{$OBJEXT}"]
   have_func("inet_ntop") or have_func("inet_ntoa")
   have_func("inet_pton") or have_func("inet_aton")
-  have_func("getservbyport")
-  have_header("arpa/inet.h")
-  have_header("arpa/nameser.h")
-  have_header("resolv.h")
-end
-
-if !try_link(<<EOF)
-#include <sys/types.h>
-#include <netdb.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-int
-main()
-{
-   socklen_t len;
-   return 0;
-}
-EOF
-  $CFLAGS="-Dsocklen_t=int "+$CFLAGS
 end
 
 have_header("sys/un.h")
-have_header("sys/uio.h")
 
 if have_func(test_func)
   have_func("hsterror")
-  have_func("getipnodebyname") or have_func("gethostbyname2")
   unless have_func("gethostname")
     have_func("uname")
   end
-  if enable_config("socks", ENV["SOCKS_SERVER"])
-    if have_library("socks5", "SOCKSinit")
-      $CFLAGS+=" -DSOCKS5 -DSOCKS"
-    elsif have_library("socks", "Rconnect")
-      $CFLAGS+=" -DSOCKS"
+  if ENV["SOCKS_SERVER"] or enable_config("socks", false)
+    if have_library("socks", "Rconnect")
+      $CFLAGS="-DSOCKS"
     end
   end
   create_makefile("socket")
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 4f58a23d2d..d09d726516 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -38,26 +38,20 @@
  * - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag.
  */
 
-#include "config.h"
 #include <sys/types.h>
-#ifndef _WIN32
+#ifndef NT
 #include <sys/param.h>
-#if defined(__BEOS__)
-# include <net/socket.h>
-#else
-# include <sys/socket.h>
 #endif
+#ifdef HAVE_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+#ifndef NT
+#include <sys/socket.h>
 #include <netinet/in.h>
-#if defined(HAVE_ARPA_INET_H)
 #include <arpa/inet.h>
-#endif
-#if defined(HAVE_ARPA_NAMESER_H)
 #include <arpa/nameser.h>
-#endif
 #include <netdb.h>
-#if defined(HAVE_RESOLV_H)
 #include <resolv.h>
-#endif
 #include <unistd.h>
 #else
 #include <winsock2.h>
@@ -69,10 +63,7 @@
 #include <stddef.h>
 #include <ctype.h>
 
-#ifdef SOCKS5
-#include <socks.h>
-#endif
-
+#include "config.h"
 #include "addrinfo.h"
 #include "sockport.h"
 
@@ -105,7 +96,7 @@ struct sockinet {
 	u_short	si_port;
 };
 
-static const struct afd {
+static struct afd {
 	int a_af;
 	int a_addrlen;
 	int a_socklen;
@@ -136,14 +127,15 @@ static const struct afd {
 #define PTON_MAX	4
 #endif
 
-static int get_name __P((const char *, const struct afd *,
+
+static int get_name __P((const char *, struct afd *,
 			  struct addrinfo **, char *, struct addrinfo *,
 			  int));
 static int get_addr __P((const char *, int, struct addrinfo **,
 			struct addrinfo *, int));
 static int str_isnumber __P((const char *));
 	
-static const char *const ai_errlist[] = {
+static char *ai_errlist[] = {
 	"success.",
 	"address family for hostname not supported.",	/* EAI_ADDRFAMILY */
 	"temporary failure in name resolution.",	/* EAI_AGAIN      */
@@ -191,16 +183,13 @@ if (pai->ai_flags & AI_CANONNAME) {\
 
 #define ERR(err) { error = (err); goto bad; }
 
-#if defined __UCLIBC__
-const
-#endif
 char *
 gai_strerror(ecode)
 	int ecode;
 {
 	if (ecode < 0 || ecode > EAI_MAX)
 		ecode = EAI_MAX;
-	return (char *)ai_errlist[ecode];
+	return ai_errlist[ecode];
 }
 
 void
@@ -339,16 +328,12 @@ getaddrinfo(hostname, servname, hints, res)
 				pai->ai_socktype = SOCK_STREAM;
 				break;
 			default:
-#if defined(SOCK_RAW)
 				pai->ai_socktype = SOCK_RAW;
-#endif
 				break;
 			}
 			break;
-#if defined(SOCK_RAW)
 		case SOCK_RAW:
 			break;
-#endif
 		case SOCK_DGRAM:
 			if (pai->ai_protocol != IPPROTO_UDP &&
 			    pai->ai_protocol != ANY)
@@ -418,7 +403,7 @@ getaddrinfo(hostname, servname, hints, res)
 	 * non-passive socket -> localhost (127.0.0.1 or ::1)
 	 */
 	if (hostname == NULL) {
-		const struct afd *afd;
+		struct afd *afd;
 		int s;
 
 		for (afd = &afdl[0]; afd->a_af; afd++) {
@@ -434,11 +419,7 @@ getaddrinfo(hostname, servname, hints, res)
 			s = socket(afd->a_af, SOCK_DGRAM, 0);
 			if (s < 0)
 				continue;
-#if defined(HAVE_CLOSESOCKET)
-			closesocket(s);
-#else
 			close(s);
-#endif
 
 			if (pai->ai_flags & AI_PASSIVE) {
 				GET_AI(cur->ai_next, afd, afd->a_addrany, port);
@@ -480,11 +461,7 @@ getaddrinfo(hostname, servname, hints, res)
 				break;
 #ifdef INET6
 			case AF_INET6:
-#ifdef HAVE_ADDR8
 				pfx = ((struct in6_addr *)pton)->s6_addr8[0];
-#else
-				pfx = ((struct in6_addr *)pton)->s6_addr[0];
-#endif
 				if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
 					pai->ai_flags &= ~AI_CANONNAME;
 				break;
@@ -537,7 +514,7 @@ getaddrinfo(hostname, servname, hints, res)
 static int
 get_name(addr, afd, res, numaddr, pai, port0)
 	const char *addr;
-	const struct afd *afd;
+	struct afd *afd;
 	struct addrinfo **res;
 	char *numaddr;
 	struct addrinfo *pai;
@@ -592,9 +569,14 @@ get_addr(hostname, af, res, pai, port0)
 	struct addrinfo sentinel;
 	struct hostent *hp;
 	struct addrinfo *top, *cur;
-	const struct afd *afd;
+	struct afd *afd;
 	int i, error = 0, h_error;
 	char *ap;
+#ifndef INET6
+#ifndef NT
+	extern int h_errno;
+#endif
+#endif
 
 	top = NULL;
 	sentinel.ai_next = NULL;
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index a75f233a81..fbb39e059e 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -34,27 +34,16 @@
  *   but INRIA implementation returns EAI_xxx defined for getaddrinfo().
  */
 
-#include "config.h"
 #include <sys/types.h>
-#ifndef _WIN32
-#if defined(__BEOS__)
-# include <net/socket.h>
-#else
-# include <sys/socket.h>
-#endif
+#ifndef NT
+#include <sys/socket.h>
 #include <netinet/in.h>
-#if defined(HAVE_ARPA_INET_H)
 #include <arpa/inet.h>
-#endif
-#if defined(HAVE_ARPA_NAMESER_H)
 #include <arpa/nameser.h>
-#endif
 #include <netdb.h>
-#if defined(HAVE_RESOLV_H)
 #include <resolv.h>
 #endif
-#endif
-#ifdef _WIN32
+#ifdef NT
 #include <winsock2.h>
 #include <stdio.h>
 #define snprintf _snprintf
@@ -63,10 +52,7 @@
 #include <string.h>
 #include <stddef.h>
 
-#ifdef SOCKS5
-#include <socks.h>
-#endif
-
+#include "config.h"
 #include "addrinfo.h"
 #include "sockport.h"
 
@@ -155,6 +141,9 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 	int h_error;
 	char numserv[512];
 	char numaddr[512];
+#ifndef NT
+	extern int h_errno;
+#endif
 
 	if (sa == NULL)
 		return ENI_NOSOCKET;
@@ -180,39 +169,31 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 		/* what we should do? */
 	} else if (flags & NI_NUMERICSERV) {
 		snprintf(numserv, sizeof(numserv), "%d", ntohs(port));
-		if (strlen(numserv) + 1 > servlen)
+		if (strlen(numserv) > servlen)
 			return ENI_MEMORY;
 		strcpy(serv, numserv);
 	} else {
-#if defined(HAVE_GETSERVBYPORT)
 		sp = getservbyport(port, (flags & NI_DGRAM) ? "udp" : "tcp");
 		if (sp) {
-			if (strlen(sp->s_name) + 1 > servlen)
+			if (strlen(sp->s_name) > servlen)
 				return ENI_MEMORY;
 			strcpy(serv, sp->s_name);
 		} else
 			return ENI_NOSERVNAME;
-#else
-		return ENI_NOSERVNAME;
-#endif
 	}
 
 	switch (sa->sa_family) {
 	case AF_INET:
-		v4a = ntohl(((struct sockaddr_in *)sa)->sin_addr.s_addr);
+		v4a = ((struct sockaddr_in *)sa)->sin_addr.s_addr;
 		if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
 			flags |= NI_NUMERICHOST;
 		v4a >>= IN_CLASSA_NSHIFT;
-		if (v4a == 0)
+		if (v4a == 0 || v4a == IN_LOOPBACKNET)
 			flags |= NI_NUMERICHOST;			
 		break;
 #ifdef INET6
 	case AF_INET6:
-#ifdef HAVE_ADDR8
 		pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0];
-#else
-		pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[0];
-#endif
 		if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
 			flags |= NI_NUMERICHOST;
 		break;
@@ -240,7 +221,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 				p = strchr(hp->h_name, '.');
 				if (p) *p = '\0';
 			}
-			if (strlen(hp->h_name) + 1 > hostlen) {
+			if (strlen(hp->h_name) > hostlen) {
 #ifdef INET6
 				freehostent(hp);
 #endif
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index aa568cf6b3..90964663d1 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -6,8 +6,6 @@
   $Date$
   created at: Thu Mar 31 12:21:29 JST 1994
 
-  Copyright (C) 1993-2001 Yukihiro Matsumoto
-
 ************************************************/
 
 #include "ruby.h"
@@ -15,28 +13,9 @@
 #include "rubysig.h"
 #include <stdio.h>
 #include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
-#ifndef _WIN32
-#if defined(__BEOS__)
-# include <net/socket.h>
-#else
-# include <sys/socket.h>
-#endif
+#ifndef NT
+#include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef HAVE_NETINET_TCP_H
-# include <netinet/tcp.h>
-#endif
-#ifdef HAVE_NETINET_UDP_H
-# include <netinet/udp.h>
-#endif
 #include <netdb.h>
 #endif
 #include <errno.h>
@@ -44,6 +23,13 @@
 #include <sys/un.h>
 #endif
 
+#ifdef USE_CWGUSI
+extern int fileno(FILE *stream); /* <unix.mac.h> */
+extern int rb_thread_select(int, fd_set*, fd_set*, fd_set*, struct timeval*); /* thread.c */
+# include <sys/errno.h>
+# include <GUSI.h>
+#endif
+
 #if defined(HAVE_FCNTL)
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -77,118 +63,61 @@ static VALUE rb_eSocket;
 
 #ifdef SOCKS
 VALUE rb_cSOCKSSocket;
-#ifdef SOCKS5
-#include <socks.h>
-#else
 void SOCKSinit();
 int Rconnect();
 #endif
-#endif
 
 #define INET_CLIENT 0
 #define INET_SERVER 1
 #define INET_SOCKS  2
 
-#ifndef HAVE_SOCKADDR_STORAGE
-/*
- * RFC 2553: protocol-independent placeholder for socket addresses
- */
-#define _SS_MAXSIZE	128
-#define _SS_ALIGNSIZE	(sizeof(double))
-#define _SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
-#define _SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
-				_SS_PAD1SIZE - _SS_ALIGNSIZE)
-
-struct sockaddr_storage {
-#ifdef HAVE_SA_LEN
-	unsigned char ss_len;		/* address length */
-	unsigned char ss_family;	/* address family */
-#else
-	unsigned short ss_family;
+#ifndef INET6
+# undef  ss_family
+# define sockaddr_storage	sockaddr
+# define ss_family		sa_family
 #endif
-	char	__ss_pad1[_SS_PAD1SIZE];
-	double	__ss_align;	/* force desired structure storage alignment */
-	char	__ss_pad2[_SS_PAD2SIZE];
-};
-#endif
-
-#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
-#define LOOKUP_ORDERS		3
-static int lookup_order_table[LOOKUP_ORDERS] = {
-#if defined(LOOKUP_ORDER_HACK_INET)
-    PF_INET, PF_INET6, PF_UNSPEC,
-#elif defined(LOOKUP_ORDER_HACK_INET6)
-    PF_INET6, PF_INET, PF_UNSPEC,
-#else
-    /* should not happen */
-#endif
-};
 
-static int
-ruby_getaddrinfo(nodename, servname, hints, res)
-     char *nodename;
-     char *servname;
-     struct addrinfo *hints;
-     struct addrinfo **res;
+#ifdef NT
+static void
+sock_finalize(fptr)
+    OpenFile *fptr;
 {
-    struct addrinfo tmp_hints;
-    int i, af, error;
+    SOCKET s;
+	extern int errno;
 
-    if (hints->ai_family != PF_UNSPEC) {
-	return getaddrinfo(nodename, servname, hints, res);
-    }
-
-    for (i = 0; i < LOOKUP_ORDERS; i++) {
-	af = lookup_order_table[i];
-	MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
-	tmp_hints.ai_family = af;
-	error = getaddrinfo(nodename, servname, &tmp_hints, res);
-	if (error) {
-	    if (tmp_hints.ai_family == PF_UNSPEC) {
-		break;
-	    }
-	}
-	else {
-	    break;
-	}
-    }
+    if (!fptr->f) return;
 
-    return error;
+	myfdclose(fptr->f);
+	if(fptr->f2)  myfdclose(fptr->f);
+/*
+	s = get_osfhandle(fileno(fptr->f));
+    closesocket(s);
+*/
 }
-#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo((node),(serv),(hints),(res))
-#endif
-
-#ifdef HAVE_CLOSESOCKET
-#undef close
-#define close closesocket
 #endif
 
 static VALUE
-init_sock(sock, fd)
-    VALUE sock;
+sock_new(class, fd)
+    VALUE class;
     int fd;
 {
     OpenFile *fp;
+    NEWOBJ(sock, struct RFile);
+    OBJSETUP(sock, class, T_FILE);
 
+    rb_secure(4);
     MakeOpenFile(sock, fp);
     fp->f = rb_fdopen(fd, "r");
+#ifdef NT
+    fp->finalize = sock_finalize;
+#else
+    fd = dup(fd);
+#endif
     fp->f2 = rb_fdopen(fd, "w");
     fp->mode = FMODE_READWRITE;
-    rb_io_synchronized(fp);
+    rb_io_unbuffered(fp);
 
-    return sock;
-}
-
-static VALUE
-bsock_s_for_fd(klass, fd)
-    VALUE klass, fd;
-{
-    OpenFile *fptr;
-    VALUE sock = init_sock(rb_obj_alloc(klass), NUM2INT(fd));
-
-    GetOpenFile(sock, fptr);
-
-    return sock;
+    return (VALUE)sock;
 }
 
 static VALUE
@@ -201,9 +130,7 @@ bsock_shutdown(argc, argv, sock)
     int how;
     OpenFile *fptr;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket");
-    }
+    rb_secure(4);
     rb_scan_args(argc, argv, "01", &howto);
     if (howto == Qnil)
 	how = 2;
@@ -226,15 +153,21 @@ bsock_close_read(sock)
 {
     OpenFile *fptr;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
-    }
+    rb_secure(4);
     GetOpenFile(sock, fptr);
     shutdown(fileno(fptr->f), 0);
-    if (!(fptr->mode & FMODE_WRITABLE)) {
+    if (fptr->f2 == 0) {
 	return rb_io_close(sock);
     }
+    rb_thread_fd_close(fileno(fptr->f));
     fptr->mode &= ~FMODE_READABLE;
+#ifdef NT
+    free(fptr->f);
+#else
+    fclose(fptr->f);
+#endif
+    fptr->f = fptr->f2;
+    fptr->f2 = 0;
 
     return Qnil;
 }
@@ -245,15 +178,19 @@ bsock_close_write(sock)
 {
     OpenFile *fptr;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
-    }
+    rb_secure(4);
     GetOpenFile(sock, fptr);
-    if (!(fptr->mode & FMODE_READABLE)) {
+    if (fptr->f2 == 0) {
 	return rb_io_close(sock);
     }
     shutdown(fileno(fptr->f2), 1);
     fptr->mode &= ~FMODE_WRITABLE;
+#ifdef NT
+    free(fptr->f2);
+#else
+    fclose(fptr->f2);
+#endif
+    fptr->f2 = 0;
 
     return Qnil;
 }
@@ -284,10 +221,7 @@ bsock_setsockopt(sock, lev, optname, val)
 	v = (char*)&i; vlen = sizeof(i);
 	break;
       default:
-	StringValue(val);
-	v = RSTRING(val)->ptr;
-	vlen = RSTRING(val)->len;
-	break;
+	v = rb_str2cstr(val, &vlen);
     }
 
     GetOpenFile(sock, fptr);
@@ -302,8 +236,7 @@ bsock_getsockopt(sock, lev, optname)
     VALUE sock, lev, optname;
 {
 #if !defined(__BEOS__)
-    int level, option;
-    socklen_t len;
+    int level, option, len;
     char *buf;
     OpenFile *fptr;
 
@@ -324,10 +257,10 @@ bsock_getsockopt(sock, lev, optname)
 
 static VALUE
 bsock_getsockname(sock)
-    VALUE sock;
+   VALUE sock;
 {
     char buf[1024];
-    socklen_t len = sizeof buf;
+    int len = sizeof buf;
     OpenFile *fptr;
 
     GetOpenFile(sock, fptr);
@@ -338,10 +271,10 @@ bsock_getsockname(sock)
 
 static VALUE
 bsock_getpeername(sock)
-    VALUE sock;
+   VALUE sock;
 {
     char buf[1024];
-    socklen_t len = sizeof buf;
+    int len = sizeof buf;
     OpenFile *fptr;
 
     GetOpenFile(sock, fptr);
@@ -356,31 +289,41 @@ bsock_send(argc, argv, sock)
     VALUE *argv;
     VALUE sock;
 {
-    VALUE mesg, to;
+    VALUE msg, to;
     VALUE flags;
     OpenFile *fptr;
     FILE *f;
     int fd, n;
+    char *m, *t;
+    int mlen, tlen;
 
     rb_secure(4);
-    rb_scan_args(argc, argv, "21", &mesg, &flags, &to);
+    rb_scan_args(argc, argv, "21", &msg, &flags, &to);
 
     GetOpenFile(sock, fptr);
     f = GetWriteFile(fptr);
     fd = fileno(f);
-    rb_thread_fd_writable(fd);
-    StringValue(mesg);
   retry:
-    if (!NIL_P(to)) {
-	StringValue(to);
-	n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
-		   (struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len);
+    rb_thread_fd_writable(fd);
+    m = rb_str2cstr(msg, &mlen);
+    if (RTEST(to)) {
+	t = rb_str2cstr(to, &tlen);
+	n = sendto(fd, m, mlen, NUM2INT(flags),
+		   (struct sockaddr*)t, tlen);
     }
     else {
-	n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags));
+	n = send(fd, m, mlen, NUM2INT(flags));
     }
     if (n < 0) {
-	if (rb_io_wait_writable(fd)) {
+	switch (errno) {
+	  case EINTR:
+	    rb_thread_schedule();
+	    goto retry;
+	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+	  case EAGAIN:
+#endif
+	    rb_thread_fd_writable(fd);
 	    goto retry;
 	}
 	rb_sys_fail("send(2)");
@@ -388,20 +331,21 @@ bsock_send(argc, argv, sock)
     return INT2FIX(n);
 }
 
-static VALUE ipaddr _((struct sockaddr*));
+static VALUE ipaddr _((struct sockaddr *));
 #ifdef HAVE_SYS_UN_H
-static VALUE unixaddr _((struct sockaddr_un*));
+static VALUE unixaddr _((struct sockaddr_un *));
 #endif
 
 enum sock_recv_type {
     RECV_RECV,			/* BasicSocket#recv(no from) */
-    RECV_IP,			/* IPSocket#recvfrom */
+    RECV_TCP,			/* TCPSocket#recvfrom */
+    RECV_UDP,			/* UDPSocket#recvfrom */
     RECV_UNIX,			/* UNIXSocket#recvfrom */
-    RECV_SOCKET			/* Socket#recvfrom */
+    RECV_SOCKET,		/* Socket#recvfrom */
 };
 
 static VALUE
-s_recvfrom(sock, argc, argv, from)
+s_recv(sock, argc, argv, from)
     VALUE sock;
     int argc;
     VALUE *argv;
@@ -410,60 +354,65 @@ s_recvfrom(sock, argc, argv, from)
     OpenFile *fptr;
     VALUE str;
     char buf[1024];
-    socklen_t alen = sizeof buf;
+    int fd, alen = sizeof buf;
     VALUE len, flg;
-    long slen;
-    int fd, flags;
+    int flags;
 
     rb_scan_args(argc, argv, "11", &len, &flg);
 
     if (flg == Qnil) flags = 0;
     else             flags = NUM2INT(flg);
 
+    str = rb_str_new(0, NUM2INT(len));
+
     GetOpenFile(sock, fptr);
-    if (rb_read_pending(fptr->f)) {
-	rb_raise(rb_eIOError, "recv for buffered IO");
-    }
     fd = fileno(fptr->f);
-
-    slen = NUM2INT(len);
-    str = rb_tainted_str_new(0, slen);
-
-  retry:
     rb_thread_wait_fd(fd);
     TRAP_BEG;
-    slen = recvfrom(fd, RSTRING(str)->ptr, slen, flags, (struct sockaddr*)buf, &alen);
+  retry:
+    RSTRING(str)->len = recvfrom(fd, RSTRING(str)->ptr, RSTRING(str)->len, flags,
+				 (struct sockaddr*)buf, &alen);
     TRAP_END;
 
-    if (slen < 0) {
-	if (rb_io_wait_readable(fd)) {
+    if (RSTRING(str)->len < 0) {
+	switch (errno) {
+	  case EINTR:
+	    rb_thread_schedule();
+	    goto retry;
+
+	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+	  case EAGAIN:
+#endif
+	    rb_thread_wait_fd(fd);
 	    goto retry;
 	}
 	rb_sys_fail("recvfrom(2)");
     }
-    if (slen < RSTRING(str)->len) {
-	RSTRING(str)->len = slen;
-	RSTRING(str)->ptr[slen] = '\0';
-    }
     rb_obj_taint(str);
     switch (from) {
       case RECV_RECV:
 	return (VALUE)str;
-      case RECV_IP:
+      case RECV_TCP:
 #if 0
 	if (alen != sizeof(struct sockaddr_in)) {
 	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
 	}
 #endif
-	return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
+	return rb_assoc_new(str, ipaddr((struct sockaddr *)buf));
+      case RECV_UDP:
+        {
+	    VALUE addr = ipaddr((struct sockaddr *)buf);
+
+	    return rb_assoc_new(str, rb_assoc_new(RARRAY(addr)->ptr[2],
+						  RARRAY(addr)->ptr[1]));
+	}
 #ifdef HAVE_SYS_UN_H
       case RECV_UNIX:
-	return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf));
+	return rb_assoc_new(str, unixaddr((struct sockaddr_un *)buf));
 #endif
       case RECV_SOCKET:
 	return rb_assoc_new(str, rb_str_new(buf, alen));
-      default:
-	rb_bug("s_recvfrom called with bad value");
     }
 }
 
@@ -473,7 +422,7 @@ bsock_recv(argc, argv, sock)
     VALUE *argv;
     VALUE sock;
 {
-    return s_recvfrom(sock, argc, argv, RECV_RECV);
+    return s_recv(sock, argc, argv, RECV_RECV);
 }
 
 static VALUE
@@ -484,39 +433,38 @@ bsock_do_not_rev_lookup()
 
 static VALUE
 bsock_do_not_rev_lookup_set(self, val)
-    VALUE self, val;
 {
-    rb_secure(4);
     do_not_reverse_lookup = RTEST(val);
     return val;
 }
 
 static void
-make_ipaddr0(addr, buf, len)
+mkipaddr0(addr, buf, len)
     struct sockaddr *addr;
     char *buf;
     size_t len;
 {
     int error;
 
-    error = getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
+    error = getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0,
+			NI_NUMERICHOST);
     if (error) {
-	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+	rb_raise(rb_eSocket, "%s", gai_strerror(error));
     }
 }
 
 static VALUE
-make_ipaddr(addr)
+mkipaddr(addr)
     struct sockaddr *addr;
 {
     char buf[1024];
 
-    make_ipaddr0(addr, buf, sizeof(buf));
+    mkipaddr0(addr, buf, sizeof(buf));
     return rb_str_new2(buf);
 }
 
 static void
-make_inetaddr(host, buf, len)
+mkinetaddr(host, buf, len)
     long host;
     char *buf;
     size_t len;
@@ -527,128 +475,74 @@ make_inetaddr(host, buf, len)
     sin.sin_family = AF_INET;
     SET_SIN_LEN(&sin, sizeof(sin));
     sin.sin_addr.s_addr = host;
-    make_ipaddr0((struct sockaddr*)&sin, buf, len);
+    mkipaddr0((struct sockaddr *)&sin, buf, len);
 }
 
-static int
-str_isnumber(p)
-        const char *p;
+static struct addrinfo*
+ip_addrsetup(host, port)
+    VALUE host, port;
 {
-    char *ep;
-
-    if (!p || *p == '\0')
-       return 0;
-    ep = NULL;
-    (void)strtoul(p, &ep, 10);
-    if (ep && *ep == '\0')
-       return 1;
-    else
-       return 0;
-}
+    struct addrinfo hints, *res;
+    char *hostp, *portp;
+    int error;
+    char hbuf[1024], pbuf[16];
 
-static char *
-host_str(host, hbuf, len)
-    VALUE host;
-    char *hbuf;
-    size_t len;
-{
     if (NIL_P(host)) {
-	return NULL;
+	hostp = NULL;
     }
     else if (rb_obj_is_kind_of(host, rb_cInteger)) {
 	long i = NUM2LONG(host);
 
-	make_inetaddr(htonl(i), hbuf, len);
-	return hbuf;
+	mkinetaddr(htonl(i), hbuf, sizeof(hbuf));
     }
     else {
-	char *name;
+	char *name = STR2CSTR(host);
 
-	SafeStringValue(host);
-	name = RSTRING(host)->ptr;
-	if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
-	    make_inetaddr(INADDR_ANY, hbuf, len);
+	if (*name == 0) {
+	    mkinetaddr(INADDR_ANY, hbuf, sizeof(hbuf));
 	}
 	else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
-	    make_inetaddr(INADDR_BROADCAST, hbuf, len);
-	}
-	else if (strlen(name) >= len) {
-	    rb_raise(rb_eArgError, "hostname too long (%d)", strlen(name));
+	    mkinetaddr(INADDR_BROADCAST, hbuf, sizeof(hbuf));
 	}
 	else {
 	    strcpy(hbuf, name);
 	}
-	return hbuf;
     }
-}
-
-static char *
-port_str(port, pbuf, len)
-    VALUE port;
-    char *pbuf;
-    size_t len;
-{
+    hostp = hbuf;
     if (NIL_P(port)) {
-	return 0;
+	portp = 0;
     }
     else if (FIXNUM_P(port)) {
-	snprintf(pbuf, len, "%d", FIX2INT(port));
-	return pbuf;
+	snprintf(pbuf, sizeof(pbuf), "%d", FIX2INT(port));
+	portp = pbuf;
     }
     else {
-	char *serv;
-
-	SafeStringValue(port);
-	serv = RSTRING(port)->ptr;
-	if (strlen(serv) >= len) {
-	    rb_raise(rb_eArgError, "service name too long (%d)", strlen(serv));
-	}
-	strcpy(pbuf, serv);
-	return pbuf;
-    }
-}
-
-#ifndef NI_MAXHOST
-# define 1025
-#endif
-#ifndef NI_MAXSERV
-# define 32
-#endif
-
-static struct addrinfo*
-sock_addrinfo(host, port, socktype, flags)
-    VALUE host, port;
-    int socktype, flags;
-{
-    struct addrinfo hints, *hintsp, *res;
-    char *hostp, *portp;
-    int error;
-    char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
-
-    hostp = host_str(host, hbuf, sizeof(hbuf));
-    portp = port_str(port, pbuf, sizeof(pbuf));
-
-    if (socktype == 0 && flags == 0 && str_isnumber(portp)) {
-       socktype = SOCK_DGRAM;
+	portp = STR2CSTR(port);
     }
 
-    hintsp = &hints;
     MEMZERO(&hints, struct addrinfo, 1);
     hints.ai_family = PF_UNSPEC;
-    hints.ai_protocol = 0;
-    hints.ai_socktype = socktype;
-    hints.ai_flags = flags;
-    error = getaddrinfo(hostp, portp, hintsp, &res);
+    hints.ai_socktype = SOCK_DGRAM;
+    error = getaddrinfo(hostp, portp, &hints, &res);
     if (error) {
-	if (hostp && hostp[strlen(hostp)-1] == '\n') {
-	    rb_raise(rb_eSocket, "newline at the end of hostname");
-	}
-	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+	rb_raise(rb_eSocket, "%s", gai_strerror(error));
     }
 
     return res;
 }
 
+static void
+setipaddr(name, addr)
+    VALUE name;
+    struct sockaddr *addr;
+{
+    struct addrinfo *res = ip_addrsetup(name, Qnil);
+
+    /* just take the first one */
+    memcpy(addr, res->ai_addr, res->ai_addrlen);
+    freeaddrinfo(res);
+}
+
 static VALUE
 ipaddr(sockaddr)
     struct sockaddr *sockaddr;
@@ -659,9 +553,6 @@ ipaddr(sockaddr)
     char hbuf[1024], pbuf[1024];
 
     switch (sockaddr->sa_family) {
-    case AF_UNSPEC:
-	family = rb_str_new2("AF_UNSPEC");
-	break;
     case AF_INET:
 	family = rb_str_new2("AF_INET");
 	break;
@@ -670,32 +561,22 @@ ipaddr(sockaddr)
 	family = rb_str_new2("AF_INET6");
 	break;
 #endif
-#ifdef AF_LOCAL
-    case AF_LOCAL:
-	family = rb_str_new2("AF_LOCAL");
-	break;
-#elif  AF_UNIX
-    case AF_UNIX:
-	family = rb_str_new2("AF_UNIX");
-	break;
-#endif
     default:
-        sprintf(pbuf, "unknown:%d", sockaddr->sa_family);
-	family = rb_str_new2(pbuf);
+	family = 0;
 	break;
     }
     if (!do_not_reverse_lookup) {
 	error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
 			    NULL, 0, 0);
 	if (error) {
-	    rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+	    rb_raise(rb_eSocket, "%s", gai_strerror(error));
 	}
 	addr1 = rb_str_new2(hbuf);
     }
     error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
 			pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
     if (error) {
-	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+	rb_raise(rb_eSocket, "%s", gai_strerror(error));
     }
     addr2 = rb_str_new2(hbuf);
     if (do_not_reverse_lookup) {
@@ -707,6 +588,17 @@ ipaddr(sockaddr)
     return ary;
 }
 
+static void
+thread_write_select(fd)
+    int fd;
+{
+    fd_set fds;
+
+    FD_ZERO(&fds);
+    FD_SET(fd, &fds);
+    rb_thread_select(fd+1, 0, &fds, 0, 0);
+}
+
 static int
 ruby_socket(domain, type, proto)
     int domain, type, proto;
@@ -723,32 +615,6 @@ ruby_socket(domain, type, proto)
     return fd;
 }
 
-static void
-thread_write_select(fd)
-    int fd;
-{
-    fd_set fds;
-
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
-    rb_thread_select(fd+1, 0, &fds, 0, 0);
-}
-
-#ifdef __CYGWIN__
-#define WAIT_IN_PROGRESS 10
-#endif
-#ifdef __APPLE__
-#define WAIT_IN_PROGRESS 10
-#endif
-#ifdef __linux__
-/* returns correct error */
-#define WAIT_IN_PROGRESS 0
-#endif
-#ifndef WAIT_IN_PROGRESS
-/* BSD origin code apparently has a problem */
-#define WAIT_IN_PROGRESS 1
-#endif
-
 static int
 ruby_connect(fd, sockaddr, len, socks)
     int fd;
@@ -758,15 +624,11 @@ ruby_connect(fd, sockaddr, len, socks)
 {
     int status;
     int mode;
-#if WAIT_IN_PROGRESS > 0
-    int wait_in_progress = -1;
-    int sockerr, sockerrlen;
-#endif
 
 #if defined(HAVE_FCNTL)
     mode = fcntl(fd, F_GETFL, 0);
 
-#ifdef O_NDELAY
+#ifdef O_NDELAY 
 # define NONBLOCKING O_NDELAY
 #else
 #ifdef O_NBIO
@@ -775,14 +637,11 @@ ruby_connect(fd, sockaddr, len, socks)
 # define NONBLOCKING O_NONBLOCK
 #endif
 #endif
-#ifdef SOCKS5
-    if (!socks)
-#endif
     fcntl(fd, F_SETFL, mode|NONBLOCKING);
 #endif /* HAVE_FCNTL */
 
     for (;;) {
-#if defined(SOCKS) && !defined(SOCKS5)
+#ifdef SOCKS
 	if (socks) {
 	    status = Rconnect(fd, sockaddr, len);
 	}
@@ -797,201 +656,118 @@ ruby_connect(fd, sockaddr, len, socks)
 #ifdef EINPROGRESS
 	      case EINPROGRESS:
 #endif
-#if WAIT_IN_PROGRESS > 0
-		sockerrlen = sizeof(sockerr);
-		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
-		if (status) break;
-		if (sockerr) {
-		    status = -1;
-		    errno = sockerr;
-		    break;
-		}
-#endif
-#ifdef EALREADY
-	      case EALREADY:
-#endif
-#if WAIT_IN_PROGRESS > 0
-		wait_in_progress = WAIT_IN_PROGRESS;
-#endif
 		thread_write_select(fd);
 		continue;
 
-#if WAIT_IN_PROGRESS > 0
-	      case EINVAL:
-		if (wait_in_progress-- > 0) {
-		    /*
-		     * connect() after EINPROGRESS returns EINVAL on
-		     * some platforms, need to check true error
-		     * status.
-		     */
-		    sockerrlen = sizeof(sockerr);
-		    status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
-		    if (!status && !sockerr) {
-			struct timeval tv = {0, 100000};
-			rb_thread_wait_for(tv);
-			continue;
-		    }
-		    status = -1;
-		    errno = sockerr;
-		}
-		break;
-#endif
-
 #ifdef EISCONN
 	      case EISCONN:
 		status = 0;
 		errno = 0;
 		break;
 #endif
-	      default:
-		break;
 	    }
 	}
 #ifdef HAVE_FCNTL
+	mode &= ~NONBLOCKING;
 	fcntl(fd, F_SETFL, mode);
 #endif
 	return status;
     }
 }
 
-struct inetsock_arg
-{
-    VALUE sock;
-    struct {
-	VALUE host, serv;
-	struct addrinfo *res;
-    } remote, local;
-    int type;
-    int fd;
-};
-
-static VALUE
-inetsock_cleanup(arg)
-    struct inetsock_arg *arg;
-{
-    if (arg->remote.res) {
-	freeaddrinfo(arg->remote.res);
-	arg->remote.res = 0;
-    }
-    if (arg->local.res) {
-	freeaddrinfo(arg->local.res);
-	arg->local.res = 0;
-    }
-    if (arg->fd >= 0) {
-	close(arg->fd);
-    }
-    return Qnil;
-}
-
 static VALUE
-init_inetsock_internal(arg)
-    struct inetsock_arg *arg;
+open_inet(class, h, serv, type)
+    VALUE class, h, serv;
+    int type;
 {
-    int type = arg->type;
-    struct addrinfo *res;
+    struct addrinfo hints, *res, *res0;
     int fd, status;
     char *syscall;
+    char pbuf[1024], *portp;
+    char *host;
+    int error;
 
-    arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
-				    (type == INET_SERVER) ? AI_PASSIVE : 0);
-    /*
-     * Maybe also accept a local address
-     */
-
-    if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
-	arg->local.res = sock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
+    if (h) {
+	Check_SafeStr(h);
+	host = RSTRING(h)->ptr;
+    }
+    else {
+	host = NULL;
+    }
+    if (FIXNUM_P(serv)) {
+	snprintf(pbuf, sizeof(pbuf), "%d", FIX2UINT(serv));
+	portp = pbuf;
+    }
+    else {
+	strcpy(pbuf, STR2CSTR(serv));
+	portp = pbuf;
+    }
+    MEMZERO(&hints, struct addrinfo, 1);
+    hints.ai_family = PF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    if (type == INET_SERVER) {
+	hints.ai_flags = AI_PASSIVE;
+    }
+    error = getaddrinfo(host, portp, &hints, &res0);
+    if (error) {
+	rb_raise(rb_eSocket, "%s", gai_strerror(error));
     }
 
-    arg->fd = fd = -1;
-    for (res = arg->remote.res; res; res = res->ai_next) {
+    fd = -1;
+    for (res = res0; res; res = res->ai_next) {
 	status = ruby_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
 	syscall = "socket(2)";
 	fd = status;
 	if (fd < 0) {
 	    continue;
 	}
-	arg->fd = fd;
 	if (type == INET_SERVER) {
-#ifndef _WIN32
 	    status = 1;
 	    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
 		       (char*)&status, sizeof(status));
-#endif
 	    status = bind(fd, res->ai_addr, res->ai_addrlen);
 	    syscall = "bind(2)";
 	}
 	else {
-	    if (arg->local.res) {
-		status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
-		syscall = "bind(2)";
-	    }
-
-	    if (status >= 0) {
-		status = ruby_connect(fd, res->ai_addr, res->ai_addrlen,
-				      (type == INET_SOCKS));
-		syscall = "connect(2)";
-	    }
+	    status = ruby_connect(fd, res->ai_addr, res->ai_addrlen,
+				  (type == INET_SOCKS));
+	    syscall = "connect(2)";
 	}
 
 	if (status < 0) {
 	    close(fd);
-	    arg->fd = fd = -1;
+	    fd = -1;
 	    continue;
 	} else
 	    break;
     }
     if (status < 0) {
+	if (fd >= 0)
+	    close(fd);
+	freeaddrinfo(res0);
 	rb_sys_fail(syscall);
     }
 
-    arg->fd = -1;
-
     if (type == INET_SERVER)
 	listen(fd, 5);
 
     /* create new instance */
-    return init_sock(arg->sock, fd);
-}
-
-static VALUE
-init_inetsock(sock, remote_host, remote_serv, local_host, local_serv, type)
-    VALUE sock, remote_host, remote_serv, local_host, local_serv;
-    int type;
-{
-    struct inetsock_arg arg;
-    arg.sock = sock;
-    arg.remote.host = remote_host;
-    arg.remote.serv = remote_serv;
-    arg.remote.res = 0;
-    arg.local.host = local_host;
-    arg.local.serv = local_serv;
-    arg.local.res = 0;
-    arg.type = type;
-    arg.fd = -1;
-    return rb_ensure(init_inetsock_internal, (VALUE)&arg,
-		     inetsock_cleanup, (VALUE)&arg);
+    freeaddrinfo(res0);
+    return sock_new(class, fd);
 }
 
 static VALUE
-tcp_init(argc, argv, sock)
-     int argc;
-     VALUE *argv;
-     VALUE sock;
+tcp_s_open(class, host, serv)
+    VALUE class, host, serv;
 {
-    VALUE remote_host, remote_serv;
-    VALUE local_host, local_serv;
-
-    rb_scan_args(argc, argv, "22", &remote_host, &remote_serv,
-			&local_host, &local_serv);
-
-    return init_inetsock(sock, remote_host, remote_serv,
-			local_host, local_serv, INET_CLIENT);
+    Check_SafeStr(host);
+    return open_inet(class, host, serv, INET_CLIENT);
 }
 
 #ifdef SOCKS
 static VALUE
-socks_init(sock, host, serv)
-    VALUE sock, host, serv;
+socks_s_open(class, host, serv)
+    VALUE class, host, serv;
 {
     static init = 0;
 
@@ -999,136 +775,165 @@ socks_init(sock, host, serv)
 	SOCKSinit("ruby");
 	init = 1;
     }
-
-    return init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
+	
+    Check_SafeStr(host);
+    return open_inet(class, host, serv, INET_SOCKS);
 }
-
-#ifdef SOCKS5
-static VALUE
-socks_s_close(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
-    }
-    GetOpenFile(sock, fptr);
-    shutdown(fileno(fptr->f), 2);
-    shutdown(fileno(fptr->f2), 2);
-    return rb_io_close(sock);
-}
-#endif
 #endif
 
+/*
+ * NOTE: using gethostbyname() against AF_INET6 is a bad idea, as it
+ * does not initialize sin_flowinfo nor sin_scope_id properly.
+ */
 static VALUE
-make_hostent(addr, ipaddr)
-    struct addrinfo *addr;
-    VALUE (*ipaddr) _((struct sockaddr*, size_t));
+tcp_s_gethostbyname(obj, host)
+    VALUE obj, host;
 {
-    struct addrinfo *ai;
+    struct sockaddr_storage addr;
     struct hostent *h;
-    VALUE ary, names;
     char **pch;
+    VALUE ary, names;
+
+    if (rb_obj_is_kind_of(host, rb_cInteger)) {
+	long i = NUM2LONG(host);
+	struct sockaddr_in *sin;
+	sin = (struct sockaddr_in *)&addr;
+	MEMZERO(sin, struct sockaddr_in, 1);
+	sin->sin_family = AF_INET;
+	SET_SIN_LEN(sin, sizeof(*sin));
+	sin->sin_addr.s_addr = htonl(i);
+    }
+    else {
+	setipaddr(host, &addr);
+    }
+    switch (addr.ss_family) {
+    case AF_INET:
+      {
+	struct sockaddr_in *sin;
+	sin = (struct sockaddr_in *)&addr;
+	h = gethostbyaddr((char *)&sin->sin_addr,
+			  sizeof(sin->sin_addr),
+			  sin->sin_family);
+	break;
+      }
+#ifdef INET6
+    case AF_INET6:
+      {
+	struct sockaddr_in6 *sin6;
+	sin6 = (struct sockaddr_in6 *)&addr;
+	h = gethostbyaddr((char *)&sin6->sin6_addr,
+			  sizeof(sin6->sin6_addr),
+			  sin6->sin6_family);
+	break;
+      }
+#endif
+    default:
+	h = NULL;
+    }
 
+    if (h == NULL) {
+#ifdef HAVE_HSTERROR
+	extern int h_errno;
+	rb_raise(rb_eSocket, "%s", (char *)hsterror(h_errno));
+#else
+	rb_raise(rb_eSocket, "host not found");
+#endif
+    }
     ary = rb_ary_new();
-    rb_ary_push(ary, rb_str_new2(addr->ai_canonname));
+    rb_ary_push(ary, rb_str_new2(h->h_name));
     names = rb_ary_new();
     rb_ary_push(ary, names);
-#if defined(HAVE_GETIPNODEBYNAME)
-    {
-	int error;
-
-	h = getipnodebyname(addr->ai_canonname, addr->ai_family, AI_ALL, &error);
+    for (pch = h->h_aliases; *pch; pch++) {
+	rb_ary_push(names, rb_str_new2(*pch));
     }
-#elif defined(HAVE_GETHOSTBYNAME2)
-    h = gethostbyname2(addr->ai_canonname, addr->ai_family);
-#else
-    h = gethostbyname(addr->ai_canonname);
+    rb_ary_push(ary, INT2NUM(h->h_addrtype));
+#ifdef h_addr
+    for (pch = h->h_addr_list; *pch; pch++) {
+	switch (addr.ss_family) {
+	case AF_INET:
+	  {
+	    struct sockaddr_in sin;
+	    MEMZERO(&sin, struct sockaddr_in, 1);
+	    sin.sin_family = AF_INET;
+	    SET_SIN_LEN(&sin, sizeof(sin));
+	    memcpy((char *) &sin.sin_addr, *pch, h->h_length);
+	    h = gethostbyaddr((char *)&sin.sin_addr,
+			      sizeof(sin.sin_addr),
+			      sin.sin_family);
+	    rb_ary_push(ary, mkipaddr((struct sockaddr *)&sin));
+	    break;
+	  }
+#ifdef INET6
+	case AF_INET6:
+	  {
+	    struct sockaddr_in6 sin6;
+	    MEMZERO(&sin6, struct sockaddr_in6, 1);
+	    sin6.sin6_family = AF_INET;
+	    sin6.sin6_len = sizeof(sin6);
+	    memcpy((char *) &sin6.sin6_addr, *pch, h->h_length);
+	    h = gethostbyaddr((char *)&sin6.sin6_addr,
+			      sizeof(sin6.sin6_addr),
+			      sin6.sin6_family);
+	    rb_ary_push(ary, mkipaddr((struct sockaddr *)&sin6));
+	    break;
+	  }
 #endif
-    if (h->h_aliases != NULL) {
-	for (pch = h->h_aliases; *pch; pch++) {
-	    rb_ary_push(names, rb_str_new2(*pch));
+	default:
+	    h = NULL;
 	}
     }
-#if defined(HAVE_GETIPNODEBYNAME)
-    freehostent(h);
+#else
+    memcpy((char *)&addr.sin_addr, h->h_addr, h->h_length);
+    rb_ary_push(ary, mkipaddr((struct sockaddr *)&addr));
 #endif
-    rb_ary_push(ary, INT2NUM(addr->ai_family));
-    for (ai = addr; ai; ai = ai->ai_next) {
-	rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
-    }
 
     return ary;
 }
 
-VALUE
-tcp_sockaddr(addr, len)
-    struct sockaddr *addr;
-    size_t len;
-{
-    return make_ipaddr(addr);
-}
-
 static VALUE
-tcp_s_gethostbyname(obj, host)
-    VALUE obj, host;
-{
-    rb_secure(3);
-    return make_hostent(sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), tcp_sockaddr);
-}
-
-static VALUE
-tcp_svr_init(argc, argv, sock)
+tcp_svr_s_open(argc, argv, class)
     int argc;
     VALUE *argv;
-    VALUE sock;
+    VALUE class;
 {
     VALUE arg1, arg2;
 
     if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2)
-	return init_inetsock(sock, arg1, arg2, Qnil, Qnil, INET_SERVER);
+	return open_inet(class, arg1, arg2, INET_SERVER);
     else
-	return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER);
+	return open_inet(class, 0, arg1, INET_SERVER);
 }
 
 static VALUE
-s_accept(klass, fd, sockaddr, len)
-    VALUE klass;
+s_accept(class, fd, sockaddr, len)
+    VALUE class;
     int fd;
     struct sockaddr *sockaddr;
-    socklen_t *len;
+    int *len;
 {
     int fd2;
-    int retry = 0;
 
-    rb_secure(3);
   retry:
     rb_thread_wait_fd(fd);
-#if defined(_nec_ews)
-    fd2 = accept(fd, sockaddr, len);
-#else
     TRAP_BEG;
     fd2 = accept(fd, sockaddr, len);
     TRAP_END;
-#endif
     if (fd2 < 0) {
 	switch (errno) {
-	  case EMFILE:
-	  case ENFILE:
-	    if (retry) break;
-	    rb_gc();
-	    retry = 1;
+	  case EINTR:
+	    rb_thread_schedule();
 	    goto retry;
-	  default:
-	    if (!rb_io_wait_readable(fd)) break;
-	    retry = 0;
+
+	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+	  case EAGAIN:
+#endif
+	    rb_thread_wait_fd(fd);
 	    goto retry;
 	}
 	rb_sys_fail(0);
     }
-    if (!klass) return INT2NUM(fd2);
-    return init_sock(rb_obj_alloc(klass), fd2);
+    return sock_new(class, fd2);
 }
 
 static VALUE
@@ -1137,7 +942,7 @@ tcp_accept(sock)
 {
     OpenFile *fptr;
     struct sockaddr_storage from;
-    socklen_t fromlen;
+    int fromlen;
 
     GetOpenFile(sock, fptr);
     fromlen = sizeof(from);
@@ -1146,43 +951,27 @@ tcp_accept(sock)
 }
 
 static VALUE
-tcp_sysaccept(sock)
+tcp_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
     VALUE sock;
 {
-    OpenFile *fptr;
-    struct sockaddr_storage from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(from);
-    return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
+    return s_recv(sock, argc, argv, RECV_TCP);
 }
 
 #ifdef HAVE_SYS_UN_H
-struct unixsock_arg {
-    struct sockaddr_un *sockaddr;
-    int fd;
-};
-
 static VALUE
-unixsock_connect_internal(arg)
-    struct unixsock_arg *arg;
-{
-    return (VALUE)ruby_connect(arg->fd, arg->sockaddr, sizeof(*arg->sockaddr),
-			       0);
-}
-
-static VALUE
-init_unixsock(sock, path, server)
-    VALUE sock;
-    VALUE path;
+open_unix(class, path, server)
+    VALUE class;
+    struct RString *path;
     int server;
 {
     struct sockaddr_un sockaddr;
     int fd, status;
+    VALUE sock;
     OpenFile *fptr;
 
-    SafeStringValue(path);
+    Check_SafeStr(path);
     fd = ruby_socket(AF_UNIX, SOCK_STREAM, 0);
     if (fd < 0) {
 	rb_sys_fail("socket(2)");
@@ -1190,22 +979,14 @@ init_unixsock(sock, path, server)
 
     MEMZERO(&sockaddr, struct sockaddr_un, 1);
     sockaddr.sun_family = AF_UNIX;
-    strncpy(sockaddr.sun_path, RSTRING(path)->ptr, sizeof(sockaddr.sun_path)-1);
+    strncpy(sockaddr.sun_path, path->ptr, sizeof(sockaddr.sun_path)-1);
     sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
 
     if (server) {
         status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
     }
     else {
-	int prot;
-	struct unixsock_arg arg;
-	arg.sockaddr = &sockaddr;
-	arg.fd = fd;
-        status = rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
-	if (prot) {
-	    close(fd);
-	    rb_jump_tag(prot);
-	}
+        status = ruby_connect(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr), 0);
     }
 
     if (status < 0) {
@@ -1215,9 +996,9 @@ init_unixsock(sock, path, server)
 
     if (server) listen(fd, 5);
 
-    init_sock(sock, fd);
+    sock = sock_new(class, fd);
     GetOpenFile(sock, fptr);
-    fptr->path = strdup(RSTRING(path)->ptr);
+    fptr->path = strdup(path->ptr);
 
     return sock;
 }
@@ -1229,13 +1010,13 @@ ip_addr(sock)
 {
     OpenFile *fptr;
     struct sockaddr_storage addr;
-    socklen_t len = sizeof addr;
+    int len = sizeof addr;
 
     GetOpenFile(sock, fptr);
 
     if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    return ipaddr((struct sockaddr*)&addr);
+    return ipaddr((struct sockaddr *)&addr);
 }
 
 static VALUE
@@ -1244,22 +1025,13 @@ ip_peeraddr(sock)
 {
     OpenFile *fptr;
     struct sockaddr_storage addr;
-    socklen_t len = sizeof addr;
+    int len = sizeof addr;
 
     GetOpenFile(sock, fptr);
 
     if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getpeername(2)");
-    return ipaddr((struct sockaddr*)&addr);
-}
-
-static VALUE
-ip_recvfrom(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    return s_recvfrom(sock, argc, argv, RECV_IP);
+    return ipaddr((struct sockaddr *)&addr);
 }
 
 static VALUE
@@ -1267,26 +1039,21 @@ ip_s_getaddress(obj, host)
     VALUE obj, host;
 {
     struct sockaddr_storage addr;
-    struct addrinfo *res = sock_addrinfo(host, Qnil, SOCK_STREAM, 0);
 
-    /* just take the first one */
-    memcpy(&addr, res->ai_addr, res->ai_addrlen);
-    freeaddrinfo(res);
-
-    return make_ipaddr((struct sockaddr*)&addr);
+    setipaddr(host, &addr);
+    return mkipaddr((struct sockaddr *)&addr);
 }
 
 static VALUE
-udp_init(argc, argv, sock)
+udp_s_open(argc, argv, class)
     int argc;
     VALUE *argv;
-    VALUE sock;
+    VALUE class;
 {
     VALUE arg;
     int socktype = AF_INET;
     int fd;
 
-    rb_secure(3);
     if (rb_scan_args(argc, argv, "01", &arg) == 1) {
 	socktype = NUM2INT(arg);
     }
@@ -1295,28 +1062,7 @@ udp_init(argc, argv, sock)
 	rb_sys_fail("socket(2) - udp");
     }
 
-    return init_sock(sock, fd);
-}
-
-struct udp_arg
-{
-    struct addrinfo *res;
-    int fd;
-};
-
-static VALUE
-udp_connect_internal(arg)
-    struct udp_arg *arg;
-{
-    int fd = arg->fd;
-    struct addrinfo *res;
-
-    for (res = arg->res; res; res = res->ai_next) {
-	if (ruby_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
-	    return Qtrue;
-	}
-    }
-    return Qfalse;
+    return sock_new(class, fd);
 }
 
 static VALUE
@@ -1324,16 +1070,21 @@ udp_connect(sock, host, port)
     VALUE sock, host, port;
 {
     OpenFile *fptr;
-    struct udp_arg arg;
-    VALUE ret;
+    int fd;
+    struct addrinfo *res0, *res;
 
-    rb_secure(3);
     GetOpenFile(sock, fptr);
-    arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
-    arg.fd = fileno(fptr->f);
-    ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
-		    RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)arg.res);
-    if (!ret) rb_sys_fail("connect(2)");
+    fd = fileno(fptr->f);
+    res0 = ip_addrsetup(host, port);
+    for (res = res0; res; res = res->ai_next) {
+	if (ruby_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
+	    freeaddrinfo(res0);
+	    return INT2FIX(0);
+	}
+    }
+
+    freeaddrinfo(res0);
+    rb_sys_fail("connect(2)");
     return INT2FIX(0);
 }
 
@@ -1344,9 +1095,8 @@ udp_bind(sock, host, port)
     OpenFile *fptr;
     struct addrinfo *res0, *res;
 
-    rb_secure(3);
     GetOpenFile(sock, fptr);
-    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
+    res0 = ip_addrsetup(host, port);
     for (res = res0; res; res = res->ai_next) {
 	if (bind(fileno(fptr->f), res->ai_addr, res->ai_addrlen) < 0) {
 	    continue;
@@ -1369,27 +1119,37 @@ udp_send(argc, argv, sock)
     OpenFile *fptr;
     FILE *f;
     int n;
+    char *m;
+    int mlen;
     struct addrinfo *res0, *res;
 
-    if (argc == 2 || argc == 3) {
+    if (argc == 2) {
 	return bsock_send(argc, argv, sock);
     }
-    rb_secure(4);
     rb_scan_args(argc, argv, "4", &mesg, &flags, &host, &port);
 
     GetOpenFile(sock, fptr);
-    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
+    res0 = ip_addrsetup(host, port);
     f = GetWriteFile(fptr);
-    StringValue(mesg);
+    m = rb_str2cstr(mesg, &mlen);
     for (res = res0; res; res = res->ai_next) {
-      retry:
-	n = sendto(fileno(f), RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
-		   res->ai_addr, res->ai_addrlen);
+  retry:
+	n = sendto(fileno(f), m, mlen, NUM2INT(flags), res->ai_addr,
+		    res->ai_addrlen);
 	if (n >= 0) {
 	    freeaddrinfo(res0);
 	    return INT2FIX(n);
 	}
-	if (rb_io_wait_writable(fileno(f))) {
+	switch (errno) {
+	  case EINTR:
+	    rb_thread_schedule();
+	    goto retry;
+
+	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+	  case EAGAIN:
+#endif
+	    thread_write_select(fileno(f));
 	    goto retry;
 	}
     }
@@ -1398,12 +1158,21 @@ udp_send(argc, argv, sock)
     return INT2FIX(n);
 }
 
+static VALUE
+udp_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recv(sock, argc, argv, RECV_UDP);
+}
+
 #ifdef HAVE_SYS_UN_H
 static VALUE
-unix_init(sock, path)
+unix_s_sock_open(sock, path)
     VALUE sock, path;
 {
-    return init_unixsock(sock, path, 0);
+    return open_unix(sock, path, 0);
 }
 
 static VALUE
@@ -1415,7 +1184,7 @@ unix_path(sock)
     GetOpenFile(sock, fptr);
     if (fptr->path == 0) {
 	struct sockaddr_un addr;
-	socklen_t len = sizeof(addr);
+	int len = sizeof(addr);
 	if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	    rb_sys_fail(0);
 	fptr->path = strdup(addr.sun_path);
@@ -1424,10 +1193,10 @@ unix_path(sock)
 }
 
 static VALUE
-unix_svr_init(sock, path)
+unix_svr_s_open(sock, path)
     VALUE sock, path;
 {
-    return init_unixsock(sock, path, 1);
+    return open_unix(sock, path, 1);
 }
 
 static VALUE
@@ -1436,177 +1205,7 @@ unix_recvfrom(argc, argv, sock)
     VALUE *argv;
     VALUE sock;
 {
-    return s_recvfrom(sock, argc, argv, RECV_UNIX);
-}
-
-static VALUE
-unix_send_io(sock, val)
-    VALUE sock, val;
-{
-#if defined(HAVE_SENDMSG) && (defined(HAVE_ST_MSG_CONTROL) || defined(HAVE_ST_MSG_ACCRIGHTS))
-    int fd;
-    OpenFile *fptr;
-    struct msghdr msg;
-    struct iovec vec[1];
-    char buf[1];
-
-#if defined(HAVE_ST_MSG_CONTROL)
-    struct {
-	struct cmsghdr hdr;
-	int fd;
-    } cmsg;
-#endif
-
-    if (rb_obj_is_kind_of(val, rb_cIO)) {
-        OpenFile *valfptr;
-	GetOpenFile(val, valfptr);
-	fd = fileno(valfptr->f);
-    }
-    else if (FIXNUM_P(val)) {
-        fd = FIX2INT(val);
-    }
-    else {
-	rb_raise(rb_eTypeError, "IO nor file descriptor");
-    }
-
-    GetOpenFile(sock, fptr);
-
-    msg.msg_name = NULL;
-    msg.msg_namelen = 0;
-
-    /* Linux and Solaris doesn't work if msg_iov is NULL. */
-    buf[0] = '\0';
-    vec[0].iov_base = buf;
-    vec[0].iov_len = 1;
-    msg.msg_iov = vec;
-    msg.msg_iovlen = 1;
-
-#if defined(HAVE_ST_MSG_CONTROL)
-    msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
-    msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
-    cmsg.hdr.cmsg_level = SOL_SOCKET;
-    cmsg.hdr.cmsg_type = SCM_RIGHTS;
-    cmsg.fd = fd;
-#else
-    msg.msg_accrights = (caddr_t)&fd;
-    msg.msg_accrightslen = sizeof(fd);
-#endif
-
-    if (sendmsg(fileno(fptr->f), &msg, 0) == -1)
-	rb_sys_fail("sendmsg(2)");
-
-    return Qnil;
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
-}
-
-#if defined(HAVE_RECVMSG) && (defined(HAVE_ST_MSG_CONTROL) || defined(HAVE_ST_MSG_ACCRIGHTS))
-static void
-thread_read_select(fd)
-    int fd;
-{
-    fd_set fds;
-
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
-    rb_thread_select(fd+1, &fds, 0, 0, 0);
-}
-#endif
-
-static VALUE
-unix_recv_io(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-#if defined(HAVE_RECVMSG) && (defined(HAVE_ST_MSG_CONTROL) || defined(HAVE_ST_MSG_ACCRIGHTS))
-    VALUE klass, mode;
-    OpenFile *fptr;
-    struct msghdr msg;
-    struct iovec vec[2];
-    char buf[1];
-
-    int fd;
-#if defined(HAVE_ST_MSG_CONTROL)
-    struct {
-	struct cmsghdr hdr;
-	int fd;
-    } cmsg;
-#endif
-
-    rb_scan_args(argc, argv, "02", &klass, &mode);
-    if (argc == 0)
-	klass = rb_cIO;
-    if (argc <= 1)
-	mode = Qnil;
-
-    GetOpenFile(sock, fptr);
-
-    thread_read_select(fileno(fptr->f));
-
-    msg.msg_name = NULL;
-    msg.msg_namelen = 0;
-
-    vec[0].iov_base = buf;
-    vec[0].iov_len = sizeof(buf);
-    msg.msg_iov = vec;
-    msg.msg_iovlen = 1;
-
-#if defined(HAVE_ST_MSG_CONTROL)
-    msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
-    msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
-    cmsg.hdr.cmsg_level = SOL_SOCKET;
-    cmsg.hdr.cmsg_type = SCM_RIGHTS;
-    cmsg.fd = -1;
-#else
-    msg.msg_accrights = (caddr_t)&fd;
-    msg.msg_accrightslen = sizeof(fd);
-    fd = -1;
-#endif
-
-    if (recvmsg(fileno(fptr->f), &msg, 0) == -1)
-	rb_sys_fail("recvmsg(2)");
-
-    if (
-#if defined(HAVE_ST_MSG_CONTROL)
-	msg.msg_controllen != sizeof(struct cmsghdr) + sizeof(int) ||
-        cmsg.hdr.cmsg_len != sizeof(struct cmsghdr) + sizeof(int) ||
-	cmsg.hdr.cmsg_level != SOL_SOCKET ||
-	cmsg.hdr.cmsg_type != SCM_RIGHTS
-#else
-        msg.msg_accrightslen != sizeof(fd)
-#endif
-	) {
-	rb_raise(rb_eSocket, "File descriptor was not passed");
-    }
-
-#if defined(HAVE_ST_MSG_CONTROL)
-    fd = cmsg.fd;
-#endif
-
-    if (klass == Qnil)
-	return INT2FIX(fd);
-    else {
-	static ID for_fd = 0;
-	int ff_argc;
-	VALUE ff_argv[2];
-	if (!for_fd)
-	    for_fd = rb_intern("for_fd");
-	ff_argc = mode == Qnil ? 1 : 2;
-	ff_argv[0] = INT2FIX(fd);
-	ff_argv[1] = mode;
-        return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
-    }
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
+    return s_recv(sock, argc, argv, RECV_UNIX);
 }
 
 static VALUE
@@ -1615,7 +1214,7 @@ unix_accept(sock)
 {
     OpenFile *fptr;
     struct sockaddr_un from;
-    socklen_t fromlen;
+    int fromlen;
 
     GetOpenFile(sock, fptr);
     fromlen = sizeof(struct sockaddr_un);
@@ -1624,24 +1223,10 @@ unix_accept(sock)
 }
 
 static VALUE
-unix_sysaccept(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_un from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(struct sockaddr_un);
-    return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
-}
-
-static VALUE
 unixaddr(sockaddr)
     struct sockaddr_un *sockaddr;
 {
-    return rb_assoc_new(rb_str_new2("AF_UNIX"),
-			rb_str_new2(sockaddr->sun_path));
+    return rb_assoc_new(rb_str_new2("AF_UNIX"),rb_str_new2(sockaddr->sun_path));
 }
 
 static VALUE
@@ -1650,14 +1235,12 @@ unix_addr(sock)
 {
     OpenFile *fptr;
     struct sockaddr_un addr;
-    socklen_t len = sizeof addr;
+    int len = sizeof addr;
 
     GetOpenFile(sock, fptr);
 
     if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    if (len == 0)
-        addr.sun_path[0] = '\0';
     return unixaddr(&addr);
 }
 
@@ -1667,14 +1250,12 @@ unix_peeraddr(sock)
 {
     OpenFile *fptr;
     struct sockaddr_un addr;
-    socklen_t len = sizeof addr;
+    int len = sizeof addr;
 
     GetOpenFile(sock, fptr);
 
     if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    if (len == 0)
-        addr.sun_path[0] = '\0';
     return unixaddr(&addr);
 }
 #endif
@@ -1687,7 +1268,6 @@ setup_domain_and_type(domain, dv, type, tv)
     char *ptr;
 
     if (TYPE(domain) == T_STRING) {
-	SafeStringValue(domain);
 	ptr = RSTRING(domain)->ptr;
 	if (strcmp(ptr, "AF_INET") == 0)
 	    *dv = AF_INET;
@@ -1736,7 +1316,6 @@ setup_domain_and_type(domain, dv, type, tv)
 	*dv = NUM2INT(domain);
     }
     if (TYPE(type) == T_STRING) {
-	SafeStringValue(type);
 	ptr = RSTRING(type)->ptr;
 	if (strcmp(ptr, "SOCK_STREAM") == 0)
 	    *tv = SOCK_STREAM;
@@ -1767,25 +1346,31 @@ setup_domain_and_type(domain, dv, type, tv)
 }
 
 static VALUE
-sock_initialize(sock, domain, type, protocol)
-    VALUE sock, domain, type, protocol;
+sock_s_open(class, domain, type, protocol)
+    VALUE class, domain, type, protocol;
 {
     int fd;
     int d, t;
 
-    rb_secure(3);
     setup_domain_and_type(domain, &d, type, &t);
     fd = ruby_socket(d, t, NUM2INT(protocol));
     if (fd < 0) rb_sys_fail("socket(2)");
 
-    return init_sock(sock, fd);
+    return sock_new(class, fd);
 }
 
 static VALUE
-sock_s_socketpair(klass, domain, type, protocol)
-    VALUE klass, domain, type, protocol;
+sock_s_for_fd(class, fd)
+    VALUE class, fd;
 {
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(__EMX__) && !defined(__QNXNTO__)
+    return sock_new(class, NUM2INT(fd));
+}
+
+static VALUE
+sock_s_socketpair(class, domain, type, protocol)
+    VALUE class, domain, type, protocol;
+{
+#if !defined(NT) && !defined(__BEOS__) && !defined(__EMX__)
     int d, t, sp[2];
 
     setup_domain_and_type(domain, &d, type, &t);
@@ -1798,33 +1383,12 @@ sock_s_socketpair(klass, domain, type, protocol)
 	rb_sys_fail("socketpair(2)");
     }
 
-    return rb_assoc_new(init_sock(rb_obj_alloc(klass), sp[0]),
-			init_sock(rb_obj_alloc(klass), sp[1]));
+    return rb_assoc_new(sock_new(class, sp[0]), sock_new(class, sp[1]));
 #else
     rb_notimplement();
 #endif
 }
 
-#ifdef HAVE_SYS_UN_H
-static VALUE
-unix_s_socketpair(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE domain, type, protocol;
-    domain = INT2FIX(PF_UNIX);
-
-    rb_scan_args(argc, argv, "02", &type, &protocol);
-    if (argc == 0)
-	type = INT2FIX(SOCK_STREAM);
-    if (argc <= 1)
-	protocol = INT2FIX(0);
-
-    return sock_s_socketpair(klass, domain, type, protocol);
-}
-#endif
-
 static VALUE
 sock_connect(sock, addr)
     VALUE sock, addr;
@@ -1832,7 +1396,7 @@ sock_connect(sock, addr)
     OpenFile *fptr;
     int fd;
 
-    StringValue(addr);
+    Check_Type(addr, T_STRING);
     rb_str_modify(addr);
 
     GetOpenFile(sock, fptr);
@@ -1850,7 +1414,7 @@ sock_bind(sock, addr)
 {
     OpenFile *fptr;
 
-    StringValue(addr);
+    Check_Type(addr, T_STRING);
     rb_str_modify(addr);
 
     GetOpenFile(sock, fptr);
@@ -1862,11 +1426,10 @@ sock_bind(sock, addr)
 
 static VALUE
 sock_listen(sock, log)
-    VALUE sock, log;
+   VALUE sock, log;
 {
     OpenFile *fptr;
 
-    rb_secure(4);
     GetOpenFile(sock, fptr);
     if (listen(fileno(fptr->f), NUM2INT(log)) < 0)
 	rb_sys_fail("listen(2)");
@@ -1880,17 +1443,17 @@ sock_recvfrom(argc, argv, sock)
     VALUE *argv;
     VALUE sock;
 {
-    return s_recvfrom(sock, argc, argv, RECV_SOCKET);
+    return s_recv(sock, argc, argv, RECV_SOCKET);
 }
 
 static VALUE
 sock_accept(sock)
-    VALUE sock;
+   VALUE sock;
 {
     OpenFile *fptr;
     VALUE sock2;
     char buf[1024];
-    socklen_t len = sizeof buf;
+    int len = sizeof buf;
 
     GetOpenFile(sock, fptr);
     sock2 = s_accept(rb_cSocket,fileno(fptr->f),(struct sockaddr*)buf,&len);
@@ -1898,21 +1461,6 @@ sock_accept(sock)
     return rb_assoc_new(sock2, rb_str_new(buf, len));
 }
 
-static VALUE
-sock_sysaccept(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    VALUE sock2;
-    char buf[1024];
-    socklen_t len = sizeof buf;
-
-    GetOpenFile(sock, fptr);
-    sock2 = s_accept(0,fileno(fptr->f),(struct sockaddr*)buf,&len);
-
-    return rb_assoc_new(sock2, rb_str_new(buf, len));
-}
-
 #ifdef HAVE_GETHOSTNAME
 static VALUE
 sock_gethostname(obj)
@@ -1920,7 +1468,6 @@ sock_gethostname(obj)
 {
     char buf[1024];
 
-    rb_secure(3);
     if (gethostname(buf, (int)sizeof buf - 1) < 0)
 	rb_sys_fail("gethostname");
 
@@ -1936,11 +1483,10 @@ static VALUE
 sock_gethostname(obj)
     VALUE obj;
 {
-    struct utsname un;
+  struct utsname un;
 
-    rb_secure(3);
-    uname(&un);
-    return rb_str_new2(un.nodename);
+  uname(&un);
+  return rb_str_new2(un.nodename);
 }
 #else
 static VALUE
@@ -1953,7 +1499,41 @@ sock_gethostname(obj)
 #endif
 
 static VALUE
-make_addrinfo(res0)
+mkhostent(h)
+    struct hostent *h;
+{
+    char **pch;
+    VALUE ary, names;
+
+    if (h == NULL) {
+#ifdef HAVE_HSTRERROR
+	extern int h_errno;
+	rb_raise(rb_eSocket, "%s", (char *)hstrerror(h_errno));
+#else
+	rb_raise(rb_eSocket, "host not found");
+#endif
+    }
+    ary = rb_ary_new();
+    rb_ary_push(ary, rb_str_new2(h->h_name));
+    names = rb_ary_new();
+    rb_ary_push(ary, names);
+    for (pch = h->h_aliases; *pch; pch++) {
+	rb_ary_push(names, rb_str_new2(*pch));
+    }
+    rb_ary_push(ary, INT2NUM(h->h_addrtype));
+#ifdef h_addr
+    for (pch = h->h_addr_list; *pch; pch++) {
+	rb_ary_push(ary, rb_str_new(*pch, h->h_length));
+    }
+#else
+    rb_ary_push(ary, rb_str_new(h->h_addr, h->h_length));
+#endif
+
+    return ary;
+}
+
+static VALUE
+mkaddrinfo(res0)
     struct addrinfo *res0;
 {
     VALUE base, ary;
@@ -1973,20 +1553,55 @@ make_addrinfo(res0)
     return base;
 }
 
-VALUE
-sock_sockaddr(addr, len)
-    struct sockaddr *addr;
-    size_t len;
-{
-    return rb_str_new((char*)addr, len);
-}
-
+/*
+ * NOTE: using gethostbyname() against AF_INET6 is a bad idea, as it
+ * does not initialize sin_flowinfo nor sin_scope_id properly.
+ */
 static VALUE
 sock_s_gethostbyname(obj, host)
     VALUE obj, host;
 {
-    rb_secure(3);
-    return make_hostent(sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
+    struct sockaddr_storage addr;
+    struct hostent *h;
+
+    if (rb_obj_is_kind_of(host, rb_cInteger)) {
+	long i = NUM2LONG(host);
+	struct sockaddr_in *sin;
+	sin = (struct sockaddr_in *)&addr;
+	MEMZERO(sin, struct sockaddr_in, 1);
+	sin->sin_family = AF_INET;
+	SET_SIN_LEN(sin, sizeof(*sin));
+	sin->sin_addr.s_addr = htonl(i);
+    }
+    else {
+	setipaddr(host, (struct sockaddr *)&addr);
+    }
+    switch (addr.ss_family) {
+    case AF_INET:
+      {
+	struct sockaddr_in *sin;
+	sin = (struct sockaddr_in *)&addr;
+	h = gethostbyaddr((char *)&sin->sin_addr,
+			  sizeof(sin->sin_addr),
+			  sin->sin_family);
+	break;
+      }
+#ifdef INET6
+    case AF_INET6:
+      {
+	struct sockaddr_in6 *sin6;
+	sin6 = (struct sockaddr_in6 *)&addr;
+	h = gethostbyaddr((char *)&sin6->sin6_addr,
+			  sizeof(sin6->sin6_addr),
+			  sin6->sin6_family);
+	break;
+      }
+#endif
+    default:
+	h = NULL;
+    }
+
+    return mkhostent(h);
 }
 
 static VALUE
@@ -1994,51 +1609,24 @@ sock_s_gethostbyaddr(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE addr, type;
+    VALUE vaddr, vtype;
+    int type;
+    int alen;
+    char *addr;
     struct hostent *h;
-    struct sockaddr *sa;
-    char **pch;
-    VALUE ary, names;
-    int t = AF_INET;
 
-    rb_scan_args(argc, argv, "11", &addr, &type);
-    sa = (struct sockaddr*)StringValuePtr(addr);
-    if (!NIL_P(type)) {
-	t = NUM2INT(type);
+    rb_scan_args(argc, argv, "11", &vaddr, &vtype);
+    addr = rb_str2cstr(vaddr, &alen);
+    if (!NIL_P(vtype)) {
+	type = NUM2INT(vtype);
     }
-#ifdef INET6
-    else if (RSTRING(addr)->len == 16) {
-	t = AF_INET6;
-    }
-#endif
-    h = gethostbyaddr(RSTRING(addr)->ptr, RSTRING(addr)->len, t);
-    if (h == NULL) {
-#ifdef HAVE_HSTRERROR
-	extern int h_errno;
-	rb_raise(rb_eSocket, "%s", (char*)hstrerror(h_errno));
-#else
-	rb_raise(rb_eSocket, "host not found");
-#endif
-    }
-    ary = rb_ary_new();
-    rb_ary_push(ary, rb_str_new2(h->h_name));
-    names = rb_ary_new();
-    rb_ary_push(ary, names);
-    if (h->h_aliases != NULL) {
-	for (pch = h->h_aliases; *pch; pch++) {
-	    rb_ary_push(names, rb_str_new2(*pch));
-	}
-    }
-    rb_ary_push(ary, INT2NUM(h->h_addrtype));
-#ifdef h_addr
-    for (pch = h->h_addr_list; *pch; pch++) {
-	rb_ary_push(ary, rb_str_new(*pch, h->h_length));
+    else {
+	type = AF_INET;
     }
-#else
-    rb_ary_push(ary, rb_str_new(h->h_addr, h->h_length));
-#endif
 
-    return ary;
+    h = gethostbyaddr(addr, alen, type);
+
+    return mkhostent(h);
 }
 
 static VALUE
@@ -2053,22 +1641,22 @@ sock_s_getservbyaname(argc, argv)
 
     rb_scan_args(argc, argv, "11", &service, &protocol);
     if (NIL_P(protocol)) proto = "tcp";
-    else proto = StringValuePtr(protocol);
+    else proto = STR2CSTR(protocol);
 
-    StringValue(service);
-    sp = getservbyname(RSTRING(service)->ptr, proto);
+    sp = getservbyname(STR2CSTR(service), proto);
     if (sp) {
 	port = ntohs(sp->s_port);
     }
     else {
-	char *s = RSTRING(service)->ptr;
+	char *s = STR2CSTR(service);
 	char *end;
 
 	port = strtoul(s, &end, 0);
 	if (*end != '\0') {
-	    rb_raise(rb_eSocket, "no such service %s/%s", s, proto);
+	    rb_raise(rb_eSocket, "no such servce %s/%s", s, proto);
 	}
     }
+    
     return INT2FIX(port);
 }
 
@@ -2079,17 +1667,18 @@ sock_s_getaddrinfo(argc, argv)
 {
     VALUE host, port, family, socktype, protocol, flags, ret;
     char hbuf[1024], pbuf[1024];
-    char *hptr, *pptr, *ap;
+    char *hptr, *pptr;
     struct addrinfo hints, *res;
     int error;
 
     host = port = family = socktype = protocol = flags = Qnil;
-    rb_scan_args(argc, argv, "24", &host, &port, &family, &socktype, &protocol, &flags);
+    rb_scan_args(argc, argv, "24", &host, &port, &family, &socktype, &protocol,
+		 &flags);
     if (NIL_P(host)) {
 	hptr = NULL;
     }
     else {
-	strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
+	strncpy(hbuf, STR2CSTR(host), sizeof(hbuf));
 	hbuf[sizeof(hbuf) - 1] = '\0';
 	hptr = hbuf;
     }
@@ -2101,29 +1690,18 @@ sock_s_getaddrinfo(argc, argv)
 	pptr = pbuf;
     }
     else {
-	strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
+	strncpy(pbuf, STR2CSTR(port), sizeof(pbuf));
 	pbuf[sizeof(pbuf) - 1] = '\0';
 	pptr = pbuf;
     }
 
     MEMZERO(&hints, struct addrinfo, 1);
-    if (NIL_P(family)) {
-	hints.ai_family = PF_UNSPEC;
+    if (!NIL_P(family)) {
+	hints.ai_family = NUM2INT(family);
     }
-    else if (FIXNUM_P(family)) {
-	hints.ai_family = FIX2INT(family);
-    }
-    else if ((ap = StringValuePtr(family)) != 0) {
-	if (strcmp(ap, "AF_INET") == 0) {
-	    hints.ai_family = PF_INET;
-	}
-#ifdef INET6
-	else if (strcmp(ap, "AF_INET6") == 0) {
-	    hints.ai_family = PF_INET6;
-	}
-#endif
+    else {
+	hints.ai_family = PF_UNSPEC;
     }
-
     if (!NIL_P(socktype)) {
 	hints.ai_socktype = NUM2INT(socktype);
     }
@@ -2135,10 +1713,10 @@ sock_s_getaddrinfo(argc, argv)
     }
     error = getaddrinfo(hptr, pptr, &hints, &res);
     if (error) {
-	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+	rb_raise(rb_eSocket, "%s", gai_strerror(error));
     }
 
-    ret = make_addrinfo(res);
+    ret = mkaddrinfo(res);
     freeaddrinfo(res);
     return ret;
 }
@@ -2148,35 +1726,29 @@ sock_s_getnameinfo(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags;
+    VALUE sa, af, host, port, flags;
+    static char hbuf[1024], pbuf[1024];
     char *hptr, *pptr;
-    char hbuf[1024], pbuf[1024];
     int fl;
-    struct addrinfo hints, *res = NULL, *r;
+    struct addrinfo hints, *res = NULL;
     int error;
     struct sockaddr_storage ss;
     struct sockaddr *sap;
-    char *ap;
 
     sa = flags = Qnil;
     rb_scan_args(argc, argv, "11", &sa, &flags);
 
-    fl = 0;
-    if (!NIL_P(flags)) {
-	fl = NUM2INT(flags);
-    }
     if (TYPE(sa) == T_STRING) {
 	if (sizeof(ss) < RSTRING(sa)->len) {
 	    rb_raise(rb_eTypeError, "sockaddr length too big");
 	}
 	memcpy(&ss, RSTRING(sa)->ptr, RSTRING(sa)->len);
-	if (RSTRING(sa)->len != SA_LEN((struct sockaddr*)&ss)) {
+	if (RSTRING(sa)->len != SA_LEN((struct sockaddr *)&ss)) {
 	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
 	}
-	sap = (struct sockaddr*)&ss;
+	sap = (struct sockaddr *)&ss;
     }
     else if (TYPE(sa) == T_ARRAY) {
-	MEMZERO(&hints, struct addrinfo, 1);
 	if (RARRAY(sa)->len == 3) {
 	    af = RARRAY(sa)->ptr[0];
 	    port = RARRAY(sa)->ptr[1];
@@ -2189,158 +1761,66 @@ sock_s_getnameinfo(argc, argv)
 	    if (NIL_P(host)) {
 		host = RARRAY(sa)->ptr[2];
 	    }
-	    else {
-		/*
-		 * 4th element holds numeric form, don't resolve.
-		 * see ipaddr().
-		 */
-		hints.ai_flags |= AI_NUMERICHOST;
-	    }
-	}
-	else {
-	    rb_raise(rb_eArgError, "array size should be 3 or 4, %ld given",
-		     RARRAY(sa)->len);
 	}
-	/* host */
 	if (NIL_P(host)) {
 	    hptr = NULL;
 	}
 	else {
-	    strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
+	    strncpy(hbuf, STR2CSTR(host), sizeof(hbuf));
 	    hbuf[sizeof(hbuf) - 1] = '\0';
 	    hptr = hbuf;
 	}
-	/* port */
 	if (NIL_P(port)) {
 	    strcpy(pbuf, "0");
 	    pptr = NULL;
 	}
-	else if (FIXNUM_P(port)) {
+	else if (!NIL_P(port)) {
 	    snprintf(pbuf, sizeof(pbuf), "%d", NUM2INT(port));
 	    pptr = pbuf;
 	}
 	else {
-	    strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
+	    strncpy(pbuf, STR2CSTR(port), sizeof(pbuf));
 	    pbuf[sizeof(pbuf) - 1] = '\0';
 	    pptr = pbuf;
 	}
-	hints.ai_socktype = (fl & NI_DGRAM) ? SOCK_DGRAM : SOCK_STREAM;
-	/* af */
-	if (NIL_P(af)) {
-	    hints.ai_family = PF_UNSPEC;
-	}
-	else if (FIXNUM_P(af)) {
-	    hints.ai_family = FIX2INT(af);
+	MEMZERO(&hints, struct addrinfo, 1);
+	if (strcmp(STR2CSTR(af), "AF_INET") == 0) {
+	    hints.ai_family = PF_INET;
 	}
-	else if ((ap = StringValuePtr(af)) != 0) {
-	    if (strcmp(ap, "AF_INET") == 0) {
-		hints.ai_family = PF_INET;
-	    }
 #ifdef INET6
-	    else if (strcmp(ap, "AF_INET6") == 0) {
-		hints.ai_family = PF_INET6;
-	    }
+	else if (strcmp(STR2CSTR(af), "AF_INET6") == 0) {
+	    hints.ai_family = PF_INET6;
+	}
 #endif
+	else {
+	    hints.ai_family = PF_UNSPEC;
 	}
 	error = getaddrinfo(hptr, pptr, &hints, &res);
-	if (error) goto error_exit_addr;
+	if (error) {
+	    rb_raise(rb_eSocket, "%s", gai_strerror(error));
+	}
 	sap = res->ai_addr;
     }
     else {
 	rb_raise(rb_eTypeError, "expecting String or Array");
     }
 
+    fl = 0;
+    if (!NIL_P(flags)) {
+	fl = NUM2INT(flags);
+    }
+
+  gotsap:
     error = getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
 			pbuf, sizeof(pbuf), fl);
-    if (error) goto error_exit_name;
-    if (res) {
-	for (r = res->ai_next; r; r = r->ai_next) {
-	    char hbuf2[1024], pbuf2[1024];
-
-	    sap = r->ai_addr;
-	    error = getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2),
-				pbuf2, sizeof(pbuf2), fl);
-	    if (error) goto error_exit_name;
-	    if (strcmp(hbuf, hbuf2) != 0|| strcmp(pbuf, pbuf2) != 0) {
-		freeaddrinfo(res);
-		rb_raise(rb_eSocket, "sockaddr resolved to multiple nodename");
-	    }
-	}
-	freeaddrinfo(res);
+    if (error) {
+	rb_raise(rb_eSocket, "%s", gai_strerror(error));
     }
-    return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));
-
-  error_exit_addr:
-    if (res) freeaddrinfo(res);
-    rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
-
-  error_exit_name:
-    if (res) freeaddrinfo(res);
-    rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
-}
-
-static VALUE
-sock_s_pack_sockaddr_in(self, port, host)
-    VALUE self, port, host;
-{
-    struct addrinfo *res = sock_addrinfo(host, port, 0, 0);
-    VALUE addr = rb_str_new((char*)res->ai_addr, res->ai_addrlen);
-
-    freeaddrinfo(res);
-    OBJ_INFECT(addr, port);
-    OBJ_INFECT(addr, host);
-
-    return addr;
-}
-
-static VALUE
-sock_s_unpack_sockaddr_in(self, addr)
-    VALUE self, addr;
-{
-    struct sockaddr_in * sockaddr;
-    VALUE host;
-
-    sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
-    host = make_ipaddr((struct sockaddr*)sockaddr);
-    OBJ_INFECT(host, addr);
-    return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
-}
-
-#ifdef HAVE_SYS_UN_H
-static VALUE
-sock_s_pack_sockaddr_un(self, path)
-    VALUE self, path;
-{
-    struct sockaddr_un sockaddr;
-    VALUE addr;
-
-    MEMZERO(&sockaddr, struct sockaddr_un, 1);
-    sockaddr.sun_family = AF_UNIX;
-    strncpy(sockaddr.sun_path, StringValuePtr(path), sizeof(sockaddr.sun_path)-1);
-    addr = rb_str_new((char*)&sockaddr, sizeof(sockaddr));
-    OBJ_INFECT(addr, path);
-
-    return addr;
-}
-
-static VALUE
-sock_s_unpack_sockaddr_un(self, addr)
-    VALUE self, addr;
-{
-    struct sockaddr_un * sockaddr;
-    VALUE path;
+    if (res)
+	freeaddrinfo(res);
 
-    sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
-    if (RSTRING(addr)->len != sizeof(struct sockaddr_un)) {
-	rb_raise(rb_eTypeError, "sockaddr_un size differs - %ld required; %d given",
-		 RSTRING(addr)->len, sizeof(struct sockaddr_un));
-    }
-    /* xxx: should I check against sun_path size? */
-    path = rb_str_new2(sockaddr->sun_path);
-    OBJ_INFECT(path, addr);
-    return path;
+    return rb_ary_new3(2, rb_str_new2(hbuf), rb_str_new2(pbuf));
 }
-#endif
 
 static VALUE mConst;
 
@@ -2359,13 +1839,13 @@ Init_socket()
     rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
 
     rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO);
-    rb_undef_method(rb_cBasicSocket, "initialize");
+    rb_undef_method(CLASS_OF(rb_cBasicSocket), "new");
+    rb_undef_method(CLASS_OF(rb_cBasicSocket), "open");
 
     rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup",
 			       bsock_do_not_rev_lookup, 0);
     rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup=",
 			       bsock_do_not_rev_lookup_set, 1);
-    rb_define_singleton_method(rb_cBasicSocket, "for_fd", bsock_s_for_fd, 1);
 
     rb_define_method(rb_cBasicSocket, "close_read", bsock_close_read, 0);
     rb_define_method(rb_cBasicSocket, "close_write", bsock_close_write, 0);
@@ -2381,66 +1861,63 @@ Init_socket()
     rb_define_global_const("IPsocket", rb_cIPSocket);
     rb_define_method(rb_cIPSocket, "addr", ip_addr, 0);
     rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, 0);
-    rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
     rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1);
 
     rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket);
     rb_define_global_const("TCPsocket", rb_cTCPSocket);
+    rb_define_singleton_method(rb_cTCPSocket, "open", tcp_s_open, 2);
+    rb_define_singleton_method(rb_cTCPSocket, "new", tcp_s_open, 2);
     rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1);
-    rb_define_method(rb_cTCPSocket, "initialize", tcp_init, -1);
+    rb_define_method(rb_cTCPSocket, "recvfrom", tcp_recvfrom, -1);
 
 #ifdef SOCKS
     rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
     rb_define_global_const("SOCKSsocket", rb_cSOCKSSocket);
-    rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
-#ifdef SOCKS5
-    rb_define_method(rb_cSOCKSSocket, "close", socks_s_close, 0);
-#endif
+    rb_define_singleton_method(rb_cSOCKSSocket, "open", socks_s_open, 2);
+    rb_define_singleton_method(rb_cSOCKSSocket, "new", socks_s_open, 2);
 #endif
 
     rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
     rb_define_global_const("TCPserver", rb_cTCPServer);
+    rb_define_singleton_method(rb_cTCPServer, "open", tcp_svr_s_open, -1);
+    rb_define_singleton_method(rb_cTCPServer, "new", tcp_svr_s_open, -1);
     rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
-    rb_define_method(rb_cTCPServer, "sysaccept", tcp_sysaccept, 0);
-    rb_define_method(rb_cTCPServer, "initialize", tcp_svr_init, -1);
-    rb_define_method(rb_cTCPServer, "listen", sock_listen, 1);
 
     rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket);
     rb_define_global_const("UDPsocket", rb_cUDPSocket);
-    rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1);
+    rb_define_singleton_method(rb_cUDPSocket, "open", udp_s_open, -1);
+    rb_define_singleton_method(rb_cUDPSocket, "new", udp_s_open, -1);
     rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2);
     rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2);
     rb_define_method(rb_cUDPSocket, "send", udp_send, -1);
+    rb_define_method(rb_cUDPSocket, "recvfrom", udp_recvfrom, -1);
 
 #ifdef HAVE_SYS_UN_H
     rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
     rb_define_global_const("UNIXsocket", rb_cUNIXSocket);
-    rb_define_method(rb_cUNIXSocket, "initialize", unix_init, 1);
+    rb_define_singleton_method(rb_cUNIXSocket, "open", unix_s_sock_open, 1);
+    rb_define_singleton_method(rb_cUNIXSocket, "new", unix_s_sock_open, 1);
     rb_define_method(rb_cUNIXSocket, "path", unix_path, 0);
     rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0);
     rb_define_method(rb_cUNIXSocket, "peeraddr", unix_peeraddr, 0);
     rb_define_method(rb_cUNIXSocket, "recvfrom", unix_recvfrom, -1);
-    rb_define_method(rb_cUNIXSocket, "send_io", unix_send_io, 1);
-    rb_define_method(rb_cUNIXSocket, "recv_io", unix_recv_io, -1);
-    rb_define_singleton_method(rb_cUNIXSocket, "socketpair", unix_s_socketpair, -1);
-    rb_define_singleton_method(rb_cUNIXSocket, "pair", unix_s_socketpair, -1);
 
     rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
     rb_define_global_const("UNIXserver", rb_cUNIXServer);
-    rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
+    rb_define_singleton_method(rb_cUNIXServer, "open", unix_svr_s_open, 1);
+    rb_define_singleton_method(rb_cUNIXServer, "new", unix_svr_s_open, 1);
     rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
-    rb_define_method(rb_cUNIXServer, "sysaccept", unix_sysaccept, 0);
-    rb_define_method(rb_cUNIXServer, "listen", sock_listen, 1);
 #endif
 
     rb_cSocket = rb_define_class("Socket", rb_cBasicSocket);
+    rb_define_singleton_method(rb_cSocket, "open", sock_s_open, 3);
+    rb_define_singleton_method(rb_cSocket, "new", sock_s_open, 3);
+    rb_define_singleton_method(rb_cSocket, "for_fd", sock_s_for_fd, 1);
 
-    rb_define_method(rb_cSocket, "initialize", sock_initialize, 3);
     rb_define_method(rb_cSocket, "connect", sock_connect, 1);
     rb_define_method(rb_cSocket, "bind", sock_bind, 1);
     rb_define_method(rb_cSocket, "listen", sock_listen, 1);
     rb_define_method(rb_cSocket, "accept", sock_accept, 0);
-    rb_define_method(rb_cSocket, "sysaccept", sock_sysaccept, 0);
 
     rb_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1);
 
@@ -2452,14 +1929,6 @@ Init_socket()
     rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyaname, -1);
     rb_define_singleton_method(rb_cSocket, "getaddrinfo", sock_s_getaddrinfo, -1);
     rb_define_singleton_method(rb_cSocket, "getnameinfo", sock_s_getnameinfo, -1);
-    rb_define_singleton_method(rb_cSocket, "sockaddr_in", sock_s_pack_sockaddr_in, 2);
-    rb_define_singleton_method(rb_cSocket, "pack_sockaddr_in", sock_s_pack_sockaddr_in, 2);
-    rb_define_singleton_method(rb_cSocket, "unpack_sockaddr_in", sock_s_unpack_sockaddr_in, 1);
-#ifdef HAVE_SYS_UN_H
-    rb_define_singleton_method(rb_cSocket, "sockaddr_un", sock_s_pack_sockaddr_un, 1);
-    rb_define_singleton_method(rb_cSocket, "pack_sockaddr_un", sock_s_pack_sockaddr_un, 1);
-    rb_define_singleton_method(rb_cSocket, "unpack_sockaddr_un", sock_s_unpack_sockaddr_un, 1);
-#endif
 
     /* constants */
     mConst = rb_define_module_under(rb_cSocket, "Constants");
@@ -2537,165 +2006,6 @@ Init_socket()
     sock_define_const("SOL_UDP", SOL_UDP);
 #endif
 
-#ifdef	IPPROTO_IP
-    sock_define_const("IPPROTO_IP", IPPROTO_IP);
-#else
-    sock_define_const("IPPROTO_IP", 0);
-#endif
-#ifdef	IPPROTO_ICMP
-    sock_define_const("IPPROTO_ICMP", IPPROTO_ICMP);
-#else
-    sock_define_const("IPPROTO_ICMP", 1);
-#endif
-#ifdef	IPPROTO_IGMP
-    sock_define_const("IPPROTO_IGMP", IPPROTO_IGMP);
-#endif
-#ifdef	IPPROTO_GGP
-    sock_define_const("IPPROTO_GGP", IPPROTO_GGP);
-#endif
-#ifdef	IPPROTO_TCP
-    sock_define_const("IPPROTO_TCP", IPPROTO_TCP);
-#else
-    sock_define_const("IPPROTO_TCP", 6);
-#endif
-#ifdef	IPPROTO_EGP
-    sock_define_const("IPPROTO_EGP", IPPROTO_EGP);
-#endif
-#ifdef	IPPROTO_PUP
-    sock_define_const("IPPROTO_PUP", IPPROTO_PUP);
-#endif
-#ifdef	IPPROTO_UDP
-    sock_define_const("IPPROTO_UDP", IPPROTO_UDP);
-#else
-    sock_define_const("IPPROTO_UDP", 17);
-#endif
-#ifdef	IPPROTO_IDP
-    sock_define_const("IPPROTO_IDP", IPPROTO_IDP);
-#endif
-#ifdef	IPPROTO_HELLO
-    sock_define_const("IPPROTO_HELLO", IPPROTO_HELLO);
-#endif
-#ifdef	IPPROTO_ND
-    sock_define_const("IPPROTO_ND", IPPROTO_ND);
-#endif
-#ifdef	IPPROTO_TP
-    sock_define_const("IPPROTO_TP", IPPROTO_TP);
-#endif
-#ifdef	IPPROTO_XTP
-    sock_define_const("IPPROTO_XTP", IPPROTO_XTP);
-#endif
-#ifdef	IPPROTO_EON
-    sock_define_const("IPPROTO_EON", IPPROTO_EON);
-#endif
-#ifdef	IPPROTO_BIP
-    sock_define_const("IPPROTO_BIP", IPPROTO_BIP);
-#endif
-/**/
-#ifdef	IPPROTO_RAW
-    sock_define_const("IPPROTO_RAW", IPPROTO_RAW);
-#else
-    sock_define_const("IPPROTO_RAW", 255);
-#endif
-#ifdef	IPPROTO_MAX
-    sock_define_const("IPPROTO_MAX", IPPROTO_MAX);
-#endif
-
-	/* Some port configuration */
-#ifdef	IPPORT_RESERVED
-    sock_define_const("IPPORT_RESERVED", IPPORT_RESERVED);
-#else
-    sock_define_const("IPPORT_RESERVED", 1024);
-#endif
-#ifdef	IPPORT_USERRESERVED
-    sock_define_const("IPPORT_USERRESERVED", IPPORT_USERRESERVED);
-#else
-    sock_define_const("IPPORT_USERRESERVED", 5000);
-#endif
-	/* Some reserved IP v.4 addresses */
-#ifdef	INADDR_ANY
-    sock_define_const("INADDR_ANY", INADDR_ANY);
-#else
-    sock_define_const("INADDR_ANY", 0x00000000);
-#endif
-#ifdef	INADDR_BROADCAST
-    sock_define_const("INADDR_BROADCAST", INADDR_BROADCAST);
-#else
-    sock_define_const("INADDR_BROADCAST", 0xffffffff);
-#endif
-#ifdef	INADDR_LOOPBACK
-    sock_define_const("INADDR_LOOPBACK", INADDR_LOOPBACK);
-#else
-    sock_define_const("INADDR_LOOPBACK", 0x7F000001);
-#endif
-#ifdef	INADDR_UNSPEC_GROUP
-    sock_define_const("INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
-#else
-    sock_define_const("INADDR_UNSPEC_GROUP", 0xe0000000);
-#endif
-#ifdef	INADDR_ALLHOSTS_GROUP
-    sock_define_const("INADDR_ALLHOSTS_GROUP", INADDR_ALLHOSTS_GROUP);
-#else
-    sock_define_const("INADDR_ALLHOSTS_GROUP", 0xe0000001);
-#endif
-#ifdef	INADDR_MAX_LOCAL_GROUP
-    sock_define_const("INADDR_MAX_LOCAL_GROUP", INADDR_MAX_LOCAL_GROUP);
-#else
-    sock_define_const("INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
-#endif
-#ifdef	INADDR_NONE
-    sock_define_const("INADDR_NONE", INADDR_NONE);
-#else
-    sock_define_const("INADDR_NONE", 0xffffffff);
-#endif
-	/* IP [gs]etsockopt options */
-#ifdef	IP_OPTIONS
-    sock_define_const("IP_OPTIONS", IP_OPTIONS);
-#endif
-#ifdef	IP_HDRINCL
-    sock_define_const("IP_HDRINCL", IP_HDRINCL);
-#endif
-#ifdef	IP_TOS
-    sock_define_const("IP_TOS", IP_TOS);
-#endif
-#ifdef	IP_TTL
-    sock_define_const("IP_TTL", IP_TTL);
-#endif
-#ifdef	IP_RECVOPTS
-    sock_define_const("IP_RECVOPTS", IP_RECVOPTS);
-#endif
-#ifdef	IP_RECVRETOPTS
-    sock_define_const("IP_RECVRETOPTS", IP_RECVRETOPTS);
-#endif
-#ifdef	IP_RECVDSTADDR
-    sock_define_const("IP_RECVDSTADDR", IP_RECVDSTADDR);
-#endif
-#ifdef	IP_RETOPTS
-    sock_define_const("IP_RETOPTS", IP_RETOPTS);
-#endif
-#ifdef	IP_MULTICAST_IF
-    sock_define_const("IP_MULTICAST_IF", IP_MULTICAST_IF);
-#endif
-#ifdef	IP_MULTICAST_TTL
-    sock_define_const("IP_MULTICAST_TTL", IP_MULTICAST_TTL);
-#endif
-#ifdef	IP_MULTICAST_LOOP
-    sock_define_const("IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
-#endif
-#ifdef	IP_ADD_MEMBERSHIP
-    sock_define_const("IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
-#endif
-#ifdef	IP_DROP_MEMBERSHIP
-    sock_define_const("IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
-#endif
-#ifdef	IP_DEFAULT_MULTICAST_TTL
-    sock_define_const("IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL);
-#endif
-#ifdef	IP_DEFAULT_MULTICAST_LOOP
-    sock_define_const("IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP);
-#endif
-#ifdef	IP_MAX_MEMBERSHIPS
-    sock_define_const("IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
-#endif
 #ifdef SO_DEBUG
     sock_define_const("SO_DEBUG", SO_DEBUG);
 #endif
@@ -2733,59 +2043,38 @@ Init_socket()
 #ifdef SO_LINGER
     sock_define_const("SO_LINGER", SO_LINGER);
 #endif
-#ifdef SO_PASSCRED
-    sock_define_const("SO_PASSCRED", SO_PASSCRED);
-#endif
-#ifdef SO_PEERCRED
-    sock_define_const("SO_PEERCRED", SO_PEERCRED);
-#endif
-#ifdef SO_RCVLOWAT
-    sock_define_const("SO_RCVLOWAT", SO_RCVLOWAT);
-#endif
-#ifdef SO_SNDLOWAT
-    sock_define_const("SO_SNDLOWAT", SO_SNDLOWAT);
-#endif
-#ifdef SO_RCVTIMEO
-    sock_define_const("SO_RCVTIMEO", SO_RCVTIMEO);
-#endif
-#ifdef SO_SNDTIMEO
-    sock_define_const("SO_SNDTIMEO", SO_SNDTIMEO);
-#endif
 
-#ifdef SO_SECURITY_AUTHENTICATION
-    sock_define_const("SO_SECURITY_AUTHENTICATION", SO_SECURITY_AUTHENTICATION);
+#ifdef SOPRI_INTERACTIVE
+    sock_define_const("SOPRI_INTERACTIVE", SOPRI_INTERACTIVE);
 #endif
-#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
-    sock_define_const("SO_SECURITY_ENCRYPTION_TRANSPORT", SO_SECURITY_ENCRYPTION_TRANSPORT);
+#ifdef SOPRI_NORMAL
+    sock_define_const("SOPRI_NORMAL", SOPRI_NORMAL);
 #endif
-#ifdef SO_SECURITY_ENCRYPTION_NETWORK
-    sock_define_const("SO_SECURITY_ENCRYPTION_NETWORK", SO_SECURITY_ENCRYPTION_NETWORK);
+#ifdef SOPRI_BACKGROUND
+    sock_define_const("SOPRI_BACKGROUND", SOPRI_BACKGROUND);
 #endif
 
-#ifdef SO_BINDTODEVICE
-    sock_define_const("SO_BINDTODEVICE", SO_BINDTODEVICE);
-#endif
-#ifdef SO_ATTACH_FILTER
-    sock_define_const("SO_ATTACH_FILTER", SO_ATTACH_FILTER);
+#ifdef IP_MULTICAST_IF
+    sock_define_const("IP_MULTICAST_IF", IP_MULTICAST_IF);
 #endif
-#ifdef SO_DETACH_FILTER
-    sock_define_const("SO_DETACH_FILTER", SO_DETACH_FILTER);
+#ifdef IP_MULTICAST_TTL
+    sock_define_const("IP_MULTICAST_TTL", IP_MULTICAST_TTL);
 #endif
-#ifdef SO_PEERNAME
-    sock_define_const("SO_PEERNAME", SO_PEERNAME);
+#ifdef IP_MULTICAST_LOOP
+    sock_define_const("IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
 #endif
-#ifdef SO_TIMESTAMP
-    sock_define_const("SO_TIMESTAMP", SO_TIMESTAMP);
+#ifdef IP_ADD_MEMBERSHIP
+    sock_define_const("IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
 #endif
 
-#ifdef SOPRI_INTERACTIVE
-    sock_define_const("SOPRI_INTERACTIVE", SOPRI_INTERACTIVE);
+#ifdef IP_DEFAULT_MULTICAST_TTL
+    sock_define_const("IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL);
 #endif
-#ifdef SOPRI_NORMAL
-    sock_define_const("SOPRI_NORMAL", SOPRI_NORMAL);
+#ifdef IP_DEFAULT_MULTICAST_LOOP
+    sock_define_const("IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP);
 #endif
-#ifdef SOPRI_BACKGROUND
-    sock_define_const("SOPRI_BACKGROUND", SOPRI_BACKGROUND);
+#ifdef IP_MAX_MEMBERSHIPS
+    sock_define_const("IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
 #endif
 
 #ifdef IPX_TYPE
@@ -2889,19 +2178,4 @@ Init_socket()
 #ifdef NI_DGRAM
     sock_define_const("NI_DGRAM", NI_DGRAM);
 #endif
-#ifdef SHUT_RD
-    sock_define_const("SHUT_RD", SHUT_RD);
-#else
-    sock_define_const("SHUT_RD", 0);
-#endif
-#ifdef SHUT_WR
-    sock_define_const("SHUT_WR", SHUT_WR);
-#else
-    sock_define_const("SHUT_WR", 1);
-#endif
-#ifdef SHUT_RDWR
-    sock_define_const("SHUT_RDWR", SHUT_RDWR);
-#else
-    sock_define_const("SHUT_RDWR", 2);
-#endif
 }
diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h
index e1cddf53f4..99bec91a1a 100644
--- a/ext/socket/sockport.h
+++ b/ext/socket/sockport.h
@@ -37,40 +37,7 @@
 # define SET_SIN_LEN(si,len) (si)->sin_len = (len)
 #else
 # define SIN_LEN(si) sizeof(struct sockaddr_in)
-# define SET_SIN_LEN(si,len)
-#endif
-
-#ifndef IN_MULTICAST
-# define IN_CLASSD(i)	(((long)(i) & 0xf0000000) == 0xe0000000)
-# define IN_MULTICAST(i)	IN_CLASSD(i)
-#endif
-
-#ifndef IN_EXPERIMENTAL
-# define IN_EXPERIMENTAL(i) ((((long)(i)) & 0xe0000000) == 0xe0000000)
-#endif
-
-#ifndef IN_CLASSA_NSHIFT
-# define IN_CLASSA_NSHIFT 24
-#endif
-
-#ifndef IN_LOOPBACKNET
-# define IN_LOOPBACKNET 127
-#endif
-
-#ifndef AF_UNSPEC
-# define AF_UNSPEC 0
-#endif
-
-#ifndef PF_UNSPEC
-# define PF_UNSPEC AF_UNSPEC
-#endif
-
-#ifndef PF_INET
-# define PF_INET AF_INET
-#endif
-
-#if defined(HOST_NOT_FOUND) && !defined(h_errno) && !defined(__CYGWIN__)
-extern int h_errno;
+# define SET_SIN_LEN(si,len) (len)
 #endif
 
 #endif
diff --git a/ext/stringio/.cvsignore b/ext/stringio/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/stringio/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/stringio/MANIFEST b/ext/stringio/MANIFEST
deleted file mode 100644
index 4f3a7dc6d0..0000000000
--- a/ext/stringio/MANIFEST
+++ /dev/null
@@ -1,4 +0,0 @@
-MANIFEST
-README
-stringio.c
-depend
diff --git a/ext/stringio/README b/ext/stringio/README
deleted file mode 100644
index c4031f7e97..0000000000
--- a/ext/stringio/README
+++ /dev/null
@@ -1,19 +0,0 @@
--*- rd -*-
-$Author$
-$Date$
-
-=begin
-
-= StringIO
-Pseudo (({IO})) class from/to (({String})).
-
-This library is based on MoonWolf version written in Ruby.  Thanks a lot.
-
-= Differences to (({IO}))
-
-* not implemented: (({fcntl})), (({reopen})).
-* (({fileno})) returns nil.
-* (({pos=})) returns new position, not 0.
-* (({ungetc})) does nothing at start of the string. 
-
-=end
diff --git a/ext/stringio/depend b/ext/stringio/depend
deleted file mode 100644
index cc9eae3f55..0000000000
--- a/ext/stringio/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-stringio.o: stringio.c $(hdrdir)/ruby.h $(topdir)/config.h \
-  $(hdrdir)/defines.h $(hdrdir)/intern.h $(hdrdir)/rubyio.h
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
deleted file mode 100644
index 5f824e3f58..0000000000
--- a/ext/stringio/stringio.c
+++ /dev/null
@@ -1,962 +0,0 @@
-/**********************************************************************
-
-  stringio.c -
-
-  $Author$
-  $Date$
-  $RoughId: stringio.c,v 1.13 2002/03/14 03:24:18 nobu Exp $
-  created at: Tue Feb 19 04:10:38 JST 2002
-
-  All the files in this distribution are covered under the Ruby's
-  license (see the file COPYING).
-
-**********************************************************************/
-
-#include "ruby.h"
-#include "rubyio.h"
-
-#define STRIO_APPEND 4
-
-struct StringIO {
-    VALUE string;
-    long pos;
-    long lineno;
-    int flags;
-    int count;
-};
-
-static struct StringIO* strio_alloc _((void));
-static void strio_mark _((struct StringIO *));
-static void strio_free _((struct StringIO *));
-static struct StringIO* check_strio _((VALUE));
-static struct StringIO* get_strio _((VALUE));
-static struct StringIO* readable _((struct StringIO *));
-static struct StringIO* writable _((struct StringIO *));
-static void check_modifiable _((struct StringIO *));
-
-#define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark)
-#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
-
-static struct StringIO *
-strio_alloc()
-{
-    struct StringIO *ptr = ALLOC(struct StringIO);
-    ptr->string = Qnil;
-    ptr->pos = 0;
-    ptr->lineno = 0;
-    ptr->flags = 0;
-    ptr->count = 1;
-    return ptr;
-}
-
-static void
-strio_mark(ptr)
-    struct StringIO *ptr;
-{
-    if (ptr) {
-	rb_gc_mark(ptr->string);
-    }
-}
-
-static void
-strio_free(ptr)
-    struct StringIO *ptr;
-{
-    if (--ptr->count <= 0) {
-	xfree(ptr);
-    }
-}
-
-static struct StringIO*
-check_strio(self)
-    VALUE self;
-{
-    Check_Type(self, T_DATA);
-    if (!IS_STRIO(self)) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected String::IO)",
-		 rb_class2name(CLASS_OF(self)));
-    }
-    return DATA_PTR(self);
-}
-
-static struct StringIO*
-get_strio(self)
-    VALUE self;
-{
-    struct StringIO *ptr = check_strio(self);
-
-    if (!ptr) {
-	rb_raise(rb_eIOError, "uninitialized stream");
-    }
-    return ptr;
-}
-
-#define StringIO(obj) get_strio(obj)
-
-#define CLOSED(ptr) NIL_P((ptr)->string)
-#define READABLE(ptr) (!CLOSED(ptr) && ((ptr)->flags & FMODE_READABLE))
-#define WRITABLE(ptr) (!CLOSED(ptr) && ((ptr)->flags & FMODE_WRITABLE))
-
-static struct StringIO*
-readable(ptr)
-    struct StringIO *ptr;
-{
-    if (!READABLE(ptr)) {
-	rb_raise(rb_eIOError, "not opened for reading");
-    }
-    return ptr;
-}
-
-static struct StringIO*
-writable(ptr)
-    struct StringIO *ptr;
-{
-    if (!WRITABLE(ptr)) {
-	rb_raise(rb_eIOError, "not opened for writing");
-    }
-    if (!OBJ_TAINTED(ptr->string)) {
-	rb_secure(4);
-    }
-    return ptr;
-}
-
-static void
-check_modifiable(ptr)
-    struct StringIO *ptr;
-{
-    if (OBJ_FROZEN(ptr->string)) {
-	rb_raise(rb_eIOError, "not modifiable string");
-    }
-}
-
-static VALUE strio_s_allocate _((VALUE));
-static VALUE strio_s_open _((int, VALUE *, VALUE));
-static VALUE strio_initialize _((int, VALUE *, VALUE));
-static VALUE strio_finalize _((VALUE));
-static VALUE strio_self _((VALUE));
-static VALUE strio_false _((VALUE));
-static VALUE strio_nil _((VALUE));
-static VALUE strio_0 _((VALUE));
-static VALUE strio_first _((VALUE, VALUE));
-static VALUE strio_unimpl _((int, VALUE *, VALUE));
-static VALUE strio_get_string _((VALUE));
-static VALUE strio_set_string _((VALUE, VALUE));
-static VALUE strio_close _((VALUE));
-static VALUE strio_close_read _((VALUE));
-static VALUE strio_close_write _((VALUE));
-static VALUE strio_closed _((VALUE));
-static VALUE strio_closed_read _((VALUE));
-static VALUE strio_closed_write _((VALUE));
-static VALUE strio_eof _((VALUE));
-/* static VALUE strio_become _((VALUE, VALUE)); NOT USED */
-static VALUE strio_get_lineno _((VALUE));
-static VALUE strio_set_lineno _((VALUE, VALUE));
-static VALUE strio_get_pos _((VALUE));
-static VALUE strio_set_pos _((VALUE, VALUE));
-static VALUE strio_rewind _((VALUE));
-static VALUE strio_seek _((int, VALUE *, VALUE));
-static VALUE strio_get_sync _((VALUE));
-/* static VALUE strio_set_sync _((VALUE, VALUE)); NOT USED */
-static VALUE strio_each_byte _((VALUE));
-static VALUE strio_getc _((VALUE));
-static VALUE strio_ungetc _((VALUE, VALUE));
-static VALUE strio_readchar _((VALUE));
-static VALUE strio_getline _((int, VALUE *, struct StringIO *));
-static VALUE strio_gets _((int, VALUE *, VALUE));
-static VALUE strio_readline _((int, VALUE *, VALUE));
-static VALUE strio_each _((int, VALUE *, VALUE));
-static VALUE strio_readlines _((int, VALUE *, VALUE));
-static VALUE strio_write _((VALUE, VALUE));
-/* static VALUE strio_print _((int, VALUE *, VALUE)); NOT USED */
-/* static VALUE strio_printf _((int, VALUE *, VALUE)); NOT USED */
-static VALUE strio_putc _((VALUE, VALUE));
-static VALUE strio_read _((int, VALUE *, VALUE));
-static VALUE strio_size _((VALUE));
-static VALUE strio_truncate _((VALUE, VALUE));
-void Init_stringio _((void));
-
-/* Boyer-Moore search: copied from regex.c */
-static void bm_init_skip _((long *, const char *, long));
-static long bm_search _((const char *, long, const char *, long, const long *));
-
-static VALUE
-strio_s_allocate(klass)
-    VALUE klass;
-{
-    return Data_Wrap_Struct(klass, strio_mark, strio_free, 0);
-}
-
-static VALUE
-strio_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE obj = rb_class_new_instance(argc, argv, klass);
-    if (!rb_block_given_p()) return obj;
-    return rb_ensure(rb_yield, obj, strio_finalize, obj);
-}
-
-static VALUE
-strio_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct StringIO *ptr = check_strio(self);
-    VALUE string, mode;
-    const char* m;
-
-    if (!ptr) {
-	DATA_PTR(self) = ptr = strio_alloc();
-    }
-    rb_call_super(0, 0);
-    switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
-      case 2:
-	StringValue(mode);
-	StringValue(string);
-	if (!(m = RSTRING(mode)->ptr)) m = "";
-	ptr->flags = rb_io_mode_flags(m);
-	if ((ptr->flags & FMODE_WRITABLE) && OBJ_FROZEN(string)) {
-	    errno = EACCES;
-	    rb_sys_fail(0);
-	}
-	switch (*m) {
-	  case 'a':
-	    ptr->flags |= STRIO_APPEND;
-	    break;
-	  case 'w':
-	    rb_str_resize(string, 0);
-	    break;
-	}
-	break;
-      case 1:
-	StringValue(string);
-	ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
-	break;
-      case 0:
-	string = rb_str_new("", 0);
-	ptr->flags = FMODE_READWRITE;
-	break;
-    }
-    ptr->string = string;
-    return self;
-}
-
-static VALUE
-strio_finalize(self)
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    ptr->string = Qnil;
-    ptr->flags &= ~FMODE_READWRITE;
-    return self;
-}
-
-static VALUE
-strio_false(self)
-    VALUE self;
-{
-    StringIO(self);
-    return Qfalse;
-}
-
-static VALUE
-strio_nil(self)
-    VALUE self;
-{
-    StringIO(self);
-    return Qnil;
-}
-
-static VALUE
-strio_self(self)
-    VALUE self;
-{
-    StringIO(self);
-    return self;
-}
-
-static VALUE
-strio_0(self)
-    VALUE self;
-{
-    StringIO(self);
-    return INT2FIX(0);
-}
-
-static VALUE
-strio_first(self, arg)
-    VALUE self, arg;
-{
-    StringIO(self);
-    return arg;
-}
-
-static VALUE
-strio_unimpl(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    StringIO(self);
-    rb_notimplement();
-    return Qnil;		/* not reached */
-}
-
-static VALUE
-strio_get_string(self)
-    VALUE self;
-{
-    return StringIO(self)->string;
-}
-
-static VALUE
-strio_set_string(self, string)
-    VALUE self, string;
-{
-    struct StringIO *ptr = StringIO(self);
-
-    ptr->flags &= ~FMODE_READWRITE;
-    if (!NIL_P(string)) {
-	StringValue(string);
-	ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
-    }
-    ptr->pos = 0;
-    ptr->lineno = 0;
-    return ptr->string = string;
-}
-
-static VALUE
-strio_close(self)
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    if (CLOSED(ptr)) {
-	rb_raise(rb_eIOError, "closed stream");
-    }
-    ptr->string = Qnil;
-    ptr->flags &= ~FMODE_READWRITE;
-    return self;
-}
-
-static VALUE
-strio_close_read(self)
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    if (!READABLE(ptr)) {
-	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
-    }
-    if (!((ptr->flags &= ~FMODE_READABLE) & FMODE_READWRITE)) {
-	ptr->string = Qnil;
-    }
-    return self;
-}
-
-static VALUE
-strio_close_write(self)
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    if (!WRITABLE(ptr)) {
-	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
-    }
-    if (!((ptr->flags &= ~FMODE_WRITABLE) & FMODE_READWRITE)) {
-	ptr->string = Qnil;
-    }
-    return self;
-}
-
-static VALUE
-strio_closed(self)
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    if (!CLOSED(ptr)) return Qfalse;
-    return Qtrue;
-}
-
-static VALUE
-strio_closed_read(self)
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    if (READABLE(ptr)) return Qfalse;
-    return Qtrue;
-}
-
-static VALUE
-strio_closed_write(self)
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    if (WRITABLE(ptr)) return Qfalse;
-    return Qtrue;
-}
-
-static VALUE
-strio_eof(self)
-    VALUE self;
-{
-    struct StringIO *ptr = readable(StringIO(self));
-    if (ptr->pos < RSTRING(ptr->string)->len) return Qfalse;
-    return Qtrue;
-}
-
-static VALUE
-strio_copy(copy, orig)
-    VALUE copy, orig;
-{
-    struct StringIO *ptr;
-
-    orig = rb_convert_type(orig, T_DATA, "StringIO", "to_strio");
-    if (copy == orig) return copy;
-    ptr = StringIO(orig);
-    if (check_strio(copy)) {
-	strio_free(DATA_PTR(copy));
-    }
-    DATA_PTR(copy) = ptr;
-    ++ptr->count;
-    return copy;
-}
-
-static VALUE
-strio_get_lineno(self)
-    VALUE self;
-{
-    return LONG2NUM(StringIO(self)->lineno);
-}
-
-static VALUE
-strio_set_lineno(self, lineno)
-    VALUE self, lineno;
-{
-    StringIO(self)->lineno = NUM2LONG(lineno);
-    return lineno;
-}
-
-#define strio_binmode strio_self
-
-#define strio_fcntl strio_unimpl
-
-#define strio_flush strio_self
-
-#define strio_fsync strio_0
-
-static VALUE
-strio_reopen(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    rb_secure(4);
-    if (argc == 1 && TYPE(*argv) != T_STRING) {
-	return strio_copy(self, *argv);
-    }
-    return strio_initialize(argc, argv, self);
-}
-
-static VALUE
-strio_get_pos(self)
-    VALUE self;
-{
-    return LONG2NUM(StringIO(self)->pos);
-}
-
-static VALUE
-strio_set_pos(self, pos)
-    VALUE self;
-    VALUE pos;
-{
-    struct StringIO *ptr = StringIO(self);
-    long p = NUM2LONG(pos);
-    if (p < 0) {
-	error_inval(0);
-    }
-    ptr->pos = p;
-    return pos;
-}
-
-static VALUE
-strio_rewind(self)
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    ptr->pos = 0;
-    ptr->lineno = 0;
-    return INT2FIX(0);
-}
-
-static VALUE
-strio_seek(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE whence;
-    struct StringIO *ptr = StringIO(self);
-    long offset;
-
-    rb_scan_args(argc, argv, "11", NULL, &whence);
-    offset = NUM2LONG(argv[0]);
-    switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
-      case 0:
-	break;
-      case 1:
-	offset += ptr->pos;
-	break;
-      case 2:
-	offset += RSTRING(ptr->string)->len;
-	break;
-      default:
-	rb_raise(rb_eArgError, "invalid whence %ld", NUM2LONG(whence));
-    }
-    if (offset < 0) {
-	error_inval(0);
-    }
-    ptr->pos = offset;
-    return INT2FIX(0);
-}
-
-static VALUE
-strio_get_sync(self)
-    VALUE self;
-{
-    StringIO(self);
-    return Qtrue;
-}
-
-#define strio_set_sync strio_first
-
-#define strio_tell strio_get_pos
-
-static VALUE
-strio_each_byte(self)
-    VALUE self;
-{
-    struct StringIO *ptr = readable(StringIO(self));
-    while (ptr->pos < RSTRING(ptr->string)->len) {
-	char c = RSTRING(ptr->string)->ptr[ptr->pos++];
-	rb_yield(CHR2FIX(c));
-    }
-    return Qnil;
-}
-
-static VALUE
-strio_getc(self)
-    VALUE self;
-{
-    struct StringIO *ptr = readable(StringIO(self));
-    int c;
-    if (ptr->pos >= RSTRING(ptr->string)->len) {
-	return Qnil;
-    }
-    c = RSTRING(ptr->string)->ptr[ptr->pos++];
-    return CHR2FIX(c);
-}
-
-static VALUE
-strio_ungetc(self, ch)
-    VALUE self, ch;
-{
-    struct StringIO *ptr = readable(StringIO(self));
-    int cc = NUM2INT(ch);
-    long len, pos = ptr->pos;
-
-    if (cc != EOF && pos > 0) {
-	if ((len = RSTRING(ptr->string)->len) < pos ||
-	    (unsigned char)RSTRING(ptr->string)->ptr[pos - 1] !=
-	    (unsigned char)cc) {
-	    check_modifiable(ptr);
-	    if (len < pos) {
-		rb_str_resize(ptr->string, pos);
-		MEMZERO(RSTRING(ptr->string)->ptr + len, char, pos - len - 1);
-	    }
-	    else {
-		rb_str_modify(ptr->string);
-	    }
-	    RSTRING(ptr->string)->ptr[pos - 1] = cc;
-	}
-	--ptr->pos;
-    }
-    return Qnil;
-}
-
-static VALUE
-strio_readchar(self)
-    VALUE self;
-{
-    VALUE c = strio_getc(self);
-    if (NIL_P(c)) rb_eof_error();
-    return c;
-}
-
-static void
-bm_init_skip(skip, pat, m)
-     long *skip;
-     const char *pat;
-     long m;
-{
-    int c;
-
-    for (c = 0; c < (1 << CHAR_BIT); c++) {
-	skip[c] = m;
-    }
-    while (--m) {
-	skip[(unsigned char)*pat++] = m;
-    }
-}
-
-static long
-bm_search(little, llen, big, blen, skip)
-    const char *little;
-    long llen;
-    const char *big;
-    long blen;
-    const long *skip;
-{
-    long i, j, k;
-
-    i = llen - 1;
-    while (i < blen) {
-	k = i;
-	j = llen - 1;
-	while (j >= 0 && big[k] == little[j]) {
-	    k--;
-	    j--;
-	}
-	if (j < 0) return k + 1;
-	i += skip[(unsigned char)big[i]];
-    }
-    return -1;
-}
-
-static VALUE
-strio_getline(argc, argv, ptr)
-    int argc;
-    VALUE *argv;
-    struct StringIO *ptr;
-{
-    const char *s, *e, *p;
-    long n;
-    VALUE str;
-
-    if (argc == 0) {
-	str = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &str);
-	if (!NIL_P(str)) StringValue(str);
-    }
-
-    if (ptr->pos >= (n = RSTRING(ptr->string)->len)) return Qnil;
-    s = RSTRING(ptr->string)->ptr;
-    e = s + RSTRING(ptr->string)->len;
-    s += ptr->pos;
-    if (NIL_P(str)) {
-	str = rb_str_substr(ptr->string, ptr->pos, e - s);
-    }
-    else if ((n = RSTRING(str)->len) == 0) {
-	p = s;
-	while (*p == '\n') {
-	    if (++p == e) return Qnil;
-	}
-	s = p;
-	while (p = memchr(p, '\n', e - p)) {
-	    if (p == e) break;
-	    if (*++p == '\n') {
-		e = p;
-		break;
-	    }
-	}
-	str = rb_str_substr(ptr->string, s - RSTRING(ptr->string)->ptr, e - s); 
-    }
-    else if (n == 1) {
-	if (p = memchr(s, RSTRING(str)->ptr[0], e - s)) {
-	    e = p + 1;
-	}
-	str = rb_str_substr(ptr->string, ptr->pos, e - s);
-    }
-    else {
-	if (n < e - s) {
-	    if (e - s < 1024) {
-		for (p = s; p + n <= e; ++p) {
-		    if (MEMCMP(p, RSTRING(str)->ptr, char, n) == 0) {
-			e = p + n;
-			break;
-		    }
-		}
-	    }
-	    else {
-		long skip[1 << CHAR_BIT], pos;
-		p = RSTRING(str)->ptr;
-		bm_init_skip(skip, p, n);
-		if ((pos = bm_search(p, n, s, e - s, skip)) >= 0) {
-		    e = s + pos + n;
-		}
-	    }
-	}
-	str = rb_str_substr(ptr->string, ptr->pos, e - s);
-    }
-    ptr->pos = e - RSTRING(ptr->string)->ptr;
-    ptr->lineno++;
-    return str;
-}
-
-static VALUE
-strio_gets(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE str = strio_getline(argc, argv, readable(StringIO(self)));
-
-    rb_lastline_set(str);
-    return str;
-}
-
-static VALUE
-strio_readline(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE line = strio_getline(argc, argv, readable(StringIO(self)));
-    if (NIL_P(line)) rb_eof_error();
-    return line;
-}
-
-static VALUE
-strio_each(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    VALUE line;
-
-    while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
-	rb_yield(line);
-    }
-    return self;
-}
-
-static VALUE
-strio_readlines(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct StringIO *ptr = StringIO(self);
-    VALUE ary = rb_ary_new(), line;
-    while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
-	rb_ary_push(ary, line);
-    }
-    return ary;
-}
-
-static VALUE
-strio_write(self, str)
-    VALUE self, str;
-{
-    struct StringIO *ptr = writable(StringIO(self));
-    long len;
-
-    if (TYPE(str) != T_STRING)
-	str = rb_obj_as_string(str);
-    len = RSTRING(str)->len;
-    if (!len) return INT2FIX(0);
-    check_modifiable(ptr);
-    if (ptr->flags & STRIO_APPEND) {
-	ptr->pos = RSTRING(ptr->string)->len;
-    }
-    if (ptr->pos == RSTRING(ptr->string)->len) {
-	rb_str_cat(ptr->string, RSTRING(str)->ptr, len);
-    }
-    else {
-	if (ptr->pos + len > RSTRING(ptr->string)->len) {
-	    rb_str_resize(ptr->string, ptr->pos + len);
-	}
-	else {
-	    rb_str_modify(ptr->string);
-	}
-	rb_str_update(ptr->string, ptr->pos, len, str);
-    }
-    ptr->pos += len;
-    return LONG2NUM(len);
-}
-
-#define strio_addstr rb_io_addstr
-
-#define strio_print rb_io_print
-
-#define strio_printf rb_io_printf
-
-static VALUE
-strio_putc(self, ch)
-    VALUE self, ch;
-{
-    struct StringIO *ptr = writable(StringIO(self));
-    int c = NUM2CHR(ch);
-
-    check_modifiable(ptr);
-    if (ptr->flags & STRIO_APPEND) {
-	ptr->pos = RSTRING(ptr->string)->len;
-    }
-    if (ptr->pos >= RSTRING(ptr->string)->len) {
-	rb_str_resize(ptr->string, ptr->pos + 1);
-    }
-    else {
-	rb_str_modify(ptr->string);
-    }
-    RSTRING(ptr->string)->ptr[ptr->pos++] = c;
-    return ch;
-}
-
-#define strio_puts rb_io_puts
-
-static VALUE
-strio_read(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct StringIO *ptr = readable(StringIO(self));
-    VALUE str;
-    long len;
-
-    if (ptr->pos >= RSTRING(ptr->string)->len) {
-	return Qnil;
-    }
-    switch (argc) {
-      case 1:
-	if (!NIL_P(argv[0])) {
-	    len = NUM2LONG(argv[0]);
-	    break;
-	}
-	/* fall through */
-      case 0:
-	len = RSTRING(ptr->string)->len - ptr->pos;
-	break;
-      default:
-	rb_raise(rb_eArgError, "wrong number arguments (%d for 0)", argc);
-    }
-    str = rb_str_substr(ptr->string, ptr->pos, len);
-    ptr->pos += len;
-    return str;
-}
-
-static VALUE
-strio_sysread(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val)) {
-	rb_eof_error();
-    }
-    return val;
-}
-
-#define strio_syswrite strio_write
-
-#define strio_path rb_inspect
-
-#define strio_isatty strio_false
-
-#define strio_pid strio_nil
-
-#define strio_fileno strio_nil
-
-static VALUE
-strio_size(self)
-    VALUE self;
-{
-    VALUE string = StringIO(self)->string;
-    if (NIL_P(string)) {
-	rb_raise(rb_eIOError, "not opened");
-    }
-    return ULONG2NUM(RSTRING(string)->len);
-}
-
-static VALUE
-strio_truncate(self, len)
-    VALUE self, len;
-{
-    VALUE string = writable(StringIO(self))->string;
-    long l = NUM2LONG(len);
-    if (l < 0) {
-	error_inval("negative legnth");
-    }
-    rb_str_resize(string, l);
-    return len;
-}
-
-void
-Init_stringio()
-{
-    VALUE StringIO = rb_define_class("StringIO", rb_cData);
-
-    rb_include_module(StringIO, rb_mEnumerable);
-    rb_define_alloc_func(StringIO, strio_s_allocate);
-    rb_define_singleton_method(StringIO, "open", strio_s_open, -1);
-    rb_define_method(StringIO, "initialize", strio_initialize, -1);
-    rb_define_method(StringIO, "initialize_copy", strio_copy, 1);
-    rb_define_method(StringIO, "reopen", strio_reopen, -1);
-
-    rb_define_method(StringIO, "string", strio_get_string, 0);
-    rb_define_method(StringIO, "string=", strio_set_string, 1);
-    rb_define_method(StringIO, "lineno", strio_get_lineno, 0);
-    rb_define_method(StringIO, "lineno=", strio_set_lineno, 1);
-
-    rb_define_method(StringIO, "binmode", strio_binmode, 0);
-    rb_define_method(StringIO, "close", strio_close, 0);
-    rb_define_method(StringIO, "close_read", strio_close_read, 0);
-    rb_define_method(StringIO, "close_write", strio_close_write, 0);
-    rb_define_method(StringIO, "closed?", strio_closed, 0);
-    rb_define_method(StringIO, "closed_read?", strio_closed_read, 0);
-    rb_define_method(StringIO, "closed_write?", strio_closed_write, 0);
-    rb_define_method(StringIO, "eof", strio_eof, 0);
-    rb_define_method(StringIO, "eof?", strio_eof, 0);
-    rb_define_method(StringIO, "fcntl", strio_fcntl, -1);
-    rb_define_method(StringIO, "flush", strio_flush, 0);
-    rb_define_method(StringIO, "fsync", strio_fsync, 0);
-    rb_define_method(StringIO, "pos", strio_get_pos, 0);
-    rb_define_method(StringIO, "pos=", strio_set_pos, 1);
-    rb_define_method(StringIO, "rewind", strio_rewind, 0);
-    rb_define_method(StringIO, "seek", strio_seek, -1);
-    rb_define_method(StringIO, "sync", strio_get_sync, 0);
-    rb_define_method(StringIO, "sync=", strio_set_sync, 1);
-    rb_define_method(StringIO, "tell", strio_tell, 0);
-    rb_define_method(StringIO, "path", strio_path, 0);
-
-    rb_define_method(StringIO, "each", strio_each, -1);
-    rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
-    rb_define_method(StringIO, "each_line", strio_each, -1);
-    rb_define_method(StringIO, "getc", strio_getc, 0);
-    rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
-    rb_define_method(StringIO, "readchar", strio_readchar, 0);
-    rb_define_method(StringIO, "gets", strio_gets, -1);
-    rb_define_method(StringIO, "readline", strio_readline, -1);
-    rb_define_method(StringIO, "readlines", strio_readlines, -1);
-    rb_define_method(StringIO, "read", strio_read, -1);
-    rb_define_method(StringIO, "sysread", strio_sysread, -1);
-
-    rb_define_method(StringIO, "write", strio_write, 1);
-    rb_define_method(StringIO, "<<", strio_addstr, 1);
-    rb_define_method(StringIO, "print", strio_print, -1);
-    rb_define_method(StringIO, "printf", strio_printf, -1);
-    rb_define_method(StringIO, "putc", strio_putc, 1);
-    rb_define_method(StringIO, "puts", strio_puts, -1);
-    rb_define_method(StringIO, "syswrite", strio_syswrite, 1);
-
-    rb_define_method(StringIO, "isatty", strio_isatty, 0);
-    rb_define_method(StringIO, "tty?", strio_isatty, 0);
-    rb_define_method(StringIO, "pid", strio_pid, 0);
-    rb_define_method(StringIO, "fileno", strio_fileno, 0);
-    rb_define_method(StringIO, "size", strio_size, 0);
-    rb_define_method(StringIO, "length", strio_size, 0);
-    rb_define_method(StringIO, "truncate", strio_truncate, 1);
-}
diff --git a/ext/strscan/.cvsignore b/ext/strscan/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/strscan/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/strscan/MANIFEST b/ext/strscan/MANIFEST
deleted file mode 100644
index 5fdf598f2c..0000000000
--- a/ext/strscan/MANIFEST
+++ /dev/null
@@ -1,4 +0,0 @@
-MANIFEST
-strscan.c
-extconf.rb
-depend
diff --git a/ext/strscan/depend b/ext/strscan/depend
deleted file mode 100644
index 9199574c3f..0000000000
--- a/ext/strscan/depend
+++ /dev/null
@@ -1 +0,0 @@
-strscan.o: strscan.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/strscan/extconf.rb b/ext/strscan/extconf.rb
deleted file mode 100644
index 0d21966fc2..0000000000
--- a/ext/strscan/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile 'strscan'
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
deleted file mode 100644
index 7169c2e163..0000000000
--- a/ext/strscan/strscan.c
+++ /dev/null
@@ -1,801 +0,0 @@
-/*
-
-    strscan.c
-
-    Copyright (c) 1999-2003 Minero Aoki <aamine@loveruby.net>
-
-    This program is free software.
-    You can distribute/modify this program under the terms of
-    the Ruby License. For details, see the file COPYING.
-
-    $Id$
-
-*/
-
-
-#include "ruby.h"
-#include "re.h"
-#include "version.h"
-
-#if (RUBY_VERSION_CODE < 150)
-#  define rb_eRangeError rb_eArgError
-#  define rb_obj_freeze(obj) rb_str_freeze(obj)
-#endif
-
-#define STRSCAN_VERSION "0.7.0"
-
-/* =======================================================================
-                         Data Type Definitions
-   ======================================================================= */
-
-static VALUE StringScanner;
-static VALUE ScanError;
-
-struct strscanner
-{
-    /* multi-purpose flags */
-    unsigned long flags;
-#define FLAG_MATCHED (1 << 0)
-
-    /* the string to scan */
-    VALUE str;
-    
-    /* scan pointers */
-    long prev;   /* legal only when MATCHED_P(s) */
-    long curr;   /* always legal */
-
-    /* the regexp register; legal only when MATCHED_P(s) */
-    struct re_registers regs;
-};
-
-#define MATCHED_P(s)          ((s)->flags & FLAG_MATCHED)
-#define MATCHED(s)             (s)->flags |= FLAG_MATCHED
-#define CLEAR_MATCH_STATUS(s)  (s)->flags &= ~FLAG_MATCHED
-
-#define S_PTR(s)  (RSTRING((s)->str)->ptr)
-#define S_LEN(s)  (RSTRING((s)->str)->len)
-#define S_END(s)  (S_PTR(s) + S_LEN(s))
-#define CURPTR(s) (S_PTR(s) + (s)->curr)
-#define S_RESTLEN(s) (S_LEN(s) - (s)->curr)
-
-#define EOS_P(s) ((s)->curr >= RSTRING(p->str)->len)
-
-#define GET_SCANNER(obj,var) do {\
-    Data_Get_Struct(obj, struct strscanner, var);\
-    if (NIL_P(var->str)) rb_raise(rb_eArgError, "uninitialized StringScanner object");\
-} while (0)
-
-/* =======================================================================
-                            Function Prototypes
-   ======================================================================= */
-
-static VALUE infect _((VALUE str, struct strscanner *p));
-static VALUE extract_range _((struct strscanner *p, long beg_i, long end_i));
-static VALUE extract_beg_len _((struct strscanner *p, long beg_i, long len));
-
-static void strscan_mark _((struct strscanner *p));
-static void strscan_free _((struct strscanner *p));
-static VALUE strscan_s_allocate _((VALUE klass));
-static VALUE strscan_initialize _((int argc, VALUE *argv, VALUE self));
-
-static VALUE strscan_s_mustc _((VALUE self));
-static VALUE strscan_terminate _((VALUE self));
-static VALUE strscan_get_string _((VALUE self));
-static VALUE strscan_set_string _((VALUE self, VALUE str));
-static VALUE strscan_get_pos _((VALUE self));
-static VALUE strscan_set_pos _((VALUE self, VALUE pos));
-static VALUE strscan_do_scan _((VALUE self, VALUE regex,
-                                int succptr, int getstr, int headonly));
-static VALUE strscan_scan _((VALUE self, VALUE re));
-static VALUE strscan_match_p _((VALUE self, VALUE re));
-static VALUE strscan_skip _((VALUE self, VALUE re));
-static VALUE strscan_check _((VALUE self, VALUE re));
-static VALUE strscan_scan_full _((VALUE self, VALUE re,
-                                  VALUE succp, VALUE getp));
-static VALUE strscan_scan_until _((VALUE self, VALUE re));
-static VALUE strscan_skip_until _((VALUE self, VALUE re));
-static VALUE strscan_check_until _((VALUE self, VALUE re));
-static VALUE strscan_search_full _((VALUE self, VALUE re,
-                                    VALUE succp, VALUE getp));
-static void adjust_registers_to_matched _((struct strscanner *p));
-static VALUE strscan_getch _((VALUE self));
-static VALUE strscan_get_byte _((VALUE self));
-static VALUE strscan_peek _((VALUE self, VALUE len));
-static VALUE strscan_unscan _((VALUE self));
-static VALUE strscan_eos_p _((VALUE self));
-static VALUE strscan_rest_p _((VALUE self));
-static VALUE strscan_matched_p _((VALUE self));
-static VALUE strscan_matched _((VALUE self));
-static VALUE strscan_matched_size _((VALUE self));
-static VALUE strscan_aref _((VALUE self, VALUE idx));
-static VALUE strscan_pre_match _((VALUE self));
-static VALUE strscan_post_match _((VALUE self));
-static VALUE strscan_rest _((VALUE self));
-static VALUE strscan_rest_size _((VALUE self));
-
-static VALUE strscan_inspect _((VALUE self));
-static char* inspect_before _((struct strscanner *p, char *buf));
-static char* inspect_after _((struct strscanner *p, char *buf));
-
-/* =======================================================================
-                                   Utils
-   ======================================================================= */
-
-static VALUE
-infect(str, p)
-    VALUE str;
-    struct strscanner *p;
-{
-    OBJ_INFECT(str, p->str);
-    return str;
-}
-
-static VALUE
-extract_range(p, beg_i, end_i)
-    struct strscanner *p;
-    long beg_i, end_i;
-{
-    return infect(rb_str_new(S_PTR(p) + beg_i, end_i - beg_i), p);
-}
-
-static VALUE
-extract_beg_len(p, beg_i, len)
-    struct strscanner *p;
-    long beg_i, len;
-{
-    return infect(rb_str_new(S_PTR(p) + beg_i, len), p);
-}
-
-
-/* =======================================================================
-                               Constructor
-   ======================================================================= */
-
-
-static void
-strscan_mark(p)
-    struct strscanner *p;
-{
-    rb_gc_mark(p->str);
-}
-
-static void
-strscan_free(p)
-    struct strscanner *p;
-{
-    re_free_registers(&(p->regs));
-    memset(p, sizeof(struct strscanner), 0);
-    free(p);
-}
-
-static VALUE
-strscan_s_allocate(klass)
-    VALUE klass;
-{
-    struct strscanner *p;
-    
-    p = ALLOC(struct strscanner);
-    MEMZERO(p, struct strscanner, 1);
-    CLEAR_MATCH_STATUS(p);
-    MEMZERO(&(p->regs), struct re_registers, 1);
-    p->str = Qnil;
-    return Data_Wrap_Struct(klass, strscan_mark, strscan_free, p);
-}
-
-static VALUE
-strscan_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct strscanner *p;
-    VALUE str, need_dup;
-
-    Data_Get_Struct(self, struct strscanner, p);
-    if (rb_scan_args(argc, argv, "11", &str, &need_dup) == 1)
-        need_dup = Qtrue;
-    StringValue(str);
-    p->str = RTEST(need_dup) ? rb_str_dup(str) : str;
-    rb_obj_freeze(p->str);
-
-    return self;
-}
-
-
-/* =======================================================================
-                          Instance Methods
-   ======================================================================= */
-
-static VALUE
-strscan_s_mustc(self)
-    VALUE self;
-{
-    return self;
-}
-
-static VALUE
-strscan_reset(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    p->curr = 0;
-    CLEAR_MATCH_STATUS(p);
-    return self;
-}
-
-static VALUE
-strscan_terminate(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    p->curr = S_LEN(p);
-    CLEAR_MATCH_STATUS(p);
-    return self;
-}
-
-static VALUE
-strscan_get_string(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    return p->str;
-}
-
-static VALUE
-strscan_set_string(self, str)
-    VALUE self, str;
-{
-    struct strscanner *p;
-
-    Data_Get_Struct(self, struct strscanner, p);
-    StringValue(str);
-    p->str = rb_str_dup(str);
-    rb_obj_freeze(p->str);
-    p->curr = 0;
-    CLEAR_MATCH_STATUS(p);
-    return str;
-}
-
-static VALUE
-strscan_get_pos(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    return INT2FIX(p->curr);
-}
-
-static VALUE
-strscan_set_pos(self, v)
-    VALUE self, v;
-{
-    struct strscanner *p;
-    long i;
-
-    GET_SCANNER(self, p);
-    i = NUM2INT(v);
-    if (i < 0) i += S_LEN(p);
-    if (i < 0) rb_raise(rb_eRangeError, "index out of range");
-    if (i > S_LEN(p)) rb_raise(rb_eRangeError, "index out of range");
-    p->curr = i;
-    return INT2NUM(i);
-}
-
-
-/* I should implement this function? */
-#define strscan_prepare_re(re)  /* none */
-
-static VALUE
-strscan_do_scan(self, regex, succptr, getstr, headonly)
-    VALUE self, regex;
-    int succptr, getstr, headonly;
-{
-    struct strscanner *p;
-    int ret;
-
-    Check_Type(regex, T_REGEXP);
-    GET_SCANNER(self, p);
-
-    CLEAR_MATCH_STATUS(p);
-    strscan_prepare_re(regex);
-    if (headonly) {
-        ret = re_match(RREGEXP(regex)->ptr,
-                       CURPTR(p), S_RESTLEN(p),
-                       0,
-                       &(p->regs));
-    }
-    else {
-        ret = re_search(RREGEXP(regex)->ptr,
-                        CURPTR(p), S_RESTLEN(p),
-                        0,
-                        S_RESTLEN(p),
-                        &(p->regs));
-    }
-
-    if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
-    if (ret < 0) {
-        /* not matched */
-        return Qnil;
-    }
-
-    MATCHED(p);
-    p->prev = p->curr;
-    if (succptr) {
-        p->curr += p->regs.end[0];
-    }
-    if (getstr) {
-        return extract_beg_len(p, p->prev, p->regs.end[0]);
-    }
-    else {
-        return INT2FIX(p->regs.end[0]);
-    }
-}
-
-static VALUE
-strscan_scan(self, re)
-    VALUE self, re;
-{
-    return strscan_do_scan(self, re, 1, 1, 1);
-}
-
-static VALUE
-strscan_match_p(self, re)
-    VALUE self, re;
-{
-    return strscan_do_scan(self, re, 0, 0, 1);
-}
-
-static VALUE
-strscan_skip(self, re)
-    VALUE self, re;
-{
-    return strscan_do_scan(self, re, 1, 0, 1);
-}
-
-static VALUE
-strscan_check(self, re)
-    VALUE self, re;
-{
-    return strscan_do_scan(self, re, 0, 1, 1);
-}
-
-static VALUE
-strscan_scan_full(self, re, s, f)
-    VALUE self, re, s, f;
-{
-    return strscan_do_scan(self, re, RTEST(s), RTEST(f), 1);
-}
-
-
-static VALUE
-strscan_scan_until(self, re)
-    VALUE self, re;
-{
-    return strscan_do_scan(self, re, 1, 1, 0);
-}
-
-static VALUE
-strscan_exist_p(self, re)
-    VALUE self, re;
-{
-    return strscan_do_scan(self, re, 0, 0, 0);
-}
-
-static VALUE
-strscan_skip_until(self, re)
-    VALUE self, re;
-{
-    return strscan_do_scan(self, re, 1, 0, 0);
-}
-
-static VALUE
-strscan_check_until(self, re)
-    VALUE self, re;
-{
-    return strscan_do_scan(self, re, 0, 1, 0);
-}
-
-static VALUE
-strscan_search_full(self, re, s, f)
-    VALUE self, re, s, f;
-{
-    return strscan_do_scan(self, re, RTEST(s), RTEST(f), 0);
-}
-
-/* DANGEROUS; need to synchronize with regex.c */
-static void
-adjust_registers_to_matched(p)
-    struct strscanner *p;
-{
-    if (p->regs.allocated == 0) {
-        p->regs.beg = ALLOC_N(int, RE_NREGS);
-        p->regs.end = ALLOC_N(int, RE_NREGS);
-        p->regs.allocated = RE_NREGS;
-    }
-    p->regs.num_regs = 1;
-    p->regs.beg[0] = 0;
-    p->regs.end[0] = p->curr - p->prev;
-}
-
-static VALUE
-strscan_getch(self)
-    VALUE self;
-{
-    struct strscanner *p;
-    long len;
-
-    GET_SCANNER(self, p);
-    CLEAR_MATCH_STATUS(p);
-    if (EOS_P(p))
-        return Qnil;
-
-    len = mbclen(*CURPTR(p));
-    if (p->curr + len > S_LEN(p))
-        len = S_LEN(p) - p->curr;
-    p->prev = p->curr;
-    p->curr += len;
-    MATCHED(p);
-    adjust_registers_to_matched(p);
-    return extract_range(p, p->prev + p->regs.beg[0],
-                            p->prev + p->regs.end[0]);
-}
-
-static VALUE
-strscan_get_byte(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    CLEAR_MATCH_STATUS(p);
-    if (EOS_P(p))
-        return Qnil;
-
-    p->prev = p->curr;
-    p->curr++;
-    MATCHED(p);
-    adjust_registers_to_matched(p);
-    return extract_range(p, p->prev + p->regs.beg[0],
-                            p->prev + p->regs.end[0]);
-}
-
-
-static VALUE
-strscan_peek(self, vlen)
-    VALUE self, vlen;
-{
-    struct strscanner *p;
-    long len;
-
-    GET_SCANNER(self, p);
-
-    len = NUM2LONG(vlen);
-    if (EOS_P(p))
-        return infect(rb_str_new("", 0), p);
-
-    if (p->curr + len > S_LEN(p))
-        len = S_LEN(p) - p->curr;
-    return extract_beg_len(p, p->curr, len);
-}
-
-
-static VALUE
-strscan_unscan(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (! MATCHED_P(p))
-        rb_raise(ScanError, "cannot unscan: prev match had failed");
-
-    p->curr = p->prev;
-    CLEAR_MATCH_STATUS(p);
-    return self;
-}
-
-
-static VALUE
-strscan_eos_p(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (EOS_P(p))
-        return Qtrue;
-    else
-        return Qfalse;
-}
-
-static VALUE
-strscan_rest_p(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (EOS_P(p))
-        return Qfalse;
-    else
-        return Qtrue;
-}
-
-
-static VALUE
-strscan_matched_p(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (MATCHED_P(p))
-        return Qtrue;
-    else
-        return Qfalse;
-}
-
-static VALUE
-strscan_matched(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (! MATCHED_P(p)) return Qnil;
-
-    return extract_range(p, p->prev + p->regs.beg[0],
-                            p->prev + p->regs.end[0]);
-}
-
-static VALUE
-strscan_matched_size(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (! MATCHED_P(p)) return Qnil;
-
-    return INT2NUM(p->regs.end[0] - p->regs.beg[0]);
-}
-
-static VALUE
-strscan_aref(self, idx)
-    VALUE self, idx;
-{
-    struct strscanner *p;
-    long i;
-
-    GET_SCANNER(self, p);
-    if (! MATCHED_P(p))        return Qnil;
-    
-    i = NUM2LONG(idx);
-    if (i < 0)
-        i += p->regs.num_regs;
-    if (i < 0)                 return Qnil;
-    if (i >= p->regs.num_regs) return Qnil;
-    if (p->regs.beg[i] == -1)  return Qnil;
-
-    return extract_range(p, p->prev + p->regs.beg[i],
-                            p->prev + p->regs.end[i]);
-}
-
-static VALUE
-strscan_pre_match(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (! MATCHED_P(p)) return Qnil;
-
-    return extract_range(p, 0, p->prev + p->regs.beg[0]);
-}
-
-static VALUE
-strscan_post_match(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (! MATCHED_P(p)) return Qnil;
-
-    return extract_range(p, p->prev + p->regs.end[0], S_LEN(p));
-}
-
-
-static VALUE
-strscan_rest(self)
-    VALUE self;
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    if (EOS_P(p)) {
-        return infect(rb_str_new("", 0), p);
-    }
-    return extract_range(p, p->curr, S_LEN(p));
-}
-
-static VALUE
-strscan_rest_size(self)
-    VALUE self;
-{
-    struct strscanner *p;
-    long i;
-
-    GET_SCANNER(self, p);
-    if (EOS_P(p)) {
-        return INT2FIX(0);
-    }
-
-    i = S_LEN(p) - p->curr;
-    return INT2FIX(i);
-}
-
-
-#define INSPECT_LENGTH 5
-#define BUFSIZE 256
-
-static VALUE
-strscan_inspect(self)
-    VALUE self;
-{
-    struct strscanner *p;
-    char buf[BUFSIZE];
-    char buf_before[16];
-    char buf_after[16];
-    long len;
-
-    Data_Get_Struct(self, struct strscanner, p);
-    if (NIL_P(p->str)) {
-        len = snprintf(buf, BUFSIZE, "#<%s (uninitialized)>",
-                       rb_class2name(CLASS_OF(self)));
-        return infect(rb_str_new(buf, len), p);
-    }
-    if (EOS_P(p)) {
-        len = snprintf(buf, BUFSIZE, "#<%s fin>",
-                       rb_class2name(CLASS_OF(self)));
-        return infect(rb_str_new(buf, len), p);
-    }
-    len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld %s@%s>",
-                   rb_class2name(CLASS_OF(self)),
-                   p->curr, S_LEN(p),
-                   inspect_before(p, buf_before),
-                   inspect_after(p, buf_after));
-    return infect(rb_str_new(buf, len), p);
-}
-
-static char*
-inspect_before(p, buf)
-    struct strscanner *p;
-    char *buf;
-{
-    char *bp = buf;
-    long len;
-
-    if (p->curr == 0) return "";
-    *bp++ = '"';
-    if (p->curr > INSPECT_LENGTH) {
-        strcpy(bp, "..."); bp += 3;
-        len = INSPECT_LENGTH;
-    }
-    else {
-        len = p->curr;
-    }
-    memcpy(bp, CURPTR(p) - len, len); bp += len;
-    *bp++ = '"';
-    *bp++ = ' ';
-    *bp++ = '\0';
-    return buf;
-}
-
-static char*
-inspect_after(p, buf)
-    struct strscanner *p;
-    char *buf;
-{
-    char *bp = buf;
-    long len;
-
-    *bp++ = ' ';
-    *bp++ = '"';
-    len = S_LEN(p) - p->curr;
-    if (len > INSPECT_LENGTH) {
-        len = INSPECT_LENGTH;
-        memcpy(bp, CURPTR(p), len); bp += len;
-        strcpy(bp, "..."); bp += 3;
-    }
-    else {
-        memcpy(bp, CURPTR(p), len); bp += len;
-    }
-    *bp++ = '"';
-    *bp++ = '\0';
-    return buf;
-}
-
-/* =======================================================================
-                              Ruby Interface
-   ======================================================================= */
-
-void
-Init_strscan()
-{
-    ID id_scanerr = rb_intern("ScanError");
-    volatile VALUE tmp;
-
-    if (rb_const_defined(rb_cObject, id_scanerr)) {
-        ScanError = rb_const_get(rb_cObject, id_scanerr);
-    }
-    else {
-        ScanError = rb_define_class_id(id_scanerr, rb_eStandardError);
-    }
-
-    StringScanner = rb_define_class("StringScanner", rb_cObject);
-    tmp = rb_str_new2(STRSCAN_VERSION);
-    rb_obj_freeze(tmp);
-    rb_const_set(StringScanner, rb_intern("Version"), tmp);
-    tmp = rb_str_new2("$Id$");
-    rb_obj_freeze(tmp);
-    rb_const_set(StringScanner, rb_intern("Id"), tmp);
-    
-    rb_define_alloc_func(StringScanner, strscan_s_allocate);
-    rb_define_private_method(StringScanner, "initialize", strscan_initialize, -1);
-    rb_define_singleton_method(StringScanner, "must_C_version", strscan_s_mustc, 0);
-    rb_define_method(StringScanner, "reset",       strscan_reset,       0);
-    rb_define_method(StringScanner, "terminate",   strscan_terminate,   0);
-    rb_define_method(StringScanner, "clear",       strscan_terminate,   0);
-    rb_define_method(StringScanner, "string",      strscan_get_string,  0);
-    rb_define_method(StringScanner, "string=",     strscan_set_string,  1);
-    rb_define_method(StringScanner, "pos",         strscan_get_pos,     0);
-    rb_define_method(StringScanner, "pos=",        strscan_set_pos,     1);
-    rb_define_method(StringScanner, "pointer",     strscan_get_pos,     0);
-    rb_define_method(StringScanner, "pointer=",    strscan_set_pos,     1);
-
-    rb_define_method(StringScanner, "scan",        strscan_scan,        1);
-    rb_define_method(StringScanner, "skip",        strscan_skip,        1);
-    rb_define_method(StringScanner, "match?",      strscan_match_p,     1);
-    rb_define_method(StringScanner, "check",       strscan_check,       1);
-    rb_define_method(StringScanner, "scan_full",   strscan_scan_full,   3);
-
-    rb_define_method(StringScanner, "scan_until",  strscan_scan_until,  1);
-    rb_define_method(StringScanner, "skip_until",  strscan_skip_until,  1);
-    rb_define_method(StringScanner, "exist?",      strscan_exist_p,     1);
-    rb_define_method(StringScanner, "check_until", strscan_check_until, 1);
-    rb_define_method(StringScanner, "search_full", strscan_search_full, 3);
-
-    rb_define_method(StringScanner, "getch",       strscan_getch,       0);
-    rb_define_method(StringScanner, "get_byte",    strscan_get_byte,    0);
-    rb_define_method(StringScanner, "getbyte",     strscan_get_byte,    0);
-    rb_define_method(StringScanner, "peek",        strscan_peek,        1);
-    rb_define_method(StringScanner, "peep",        strscan_peek,        1);
-
-    rb_define_method(StringScanner, "unscan",      strscan_unscan,      0);
-
-    rb_define_method(StringScanner, "eos?",        strscan_eos_p,       0);
-    rb_define_method(StringScanner, "empty?",      strscan_eos_p,       0);
-    rb_define_method(StringScanner, "rest?",       strscan_rest_p,      0);
-
-    rb_define_method(StringScanner, "matched?",    strscan_matched_p,   0);
-    rb_define_method(StringScanner, "matched",     strscan_matched,     0);
-    rb_define_method(StringScanner, "matched_size", strscan_matched_size, 0);
-    rb_define_method(StringScanner, "matchedsize", strscan_matched_size, 0);
-    rb_define_method(StringScanner, "[]",          strscan_aref,        1);
-    rb_define_method(StringScanner, "pre_match",   strscan_pre_match,   0);
-    rb_define_method(StringScanner, "post_match",  strscan_post_match,  0);
-
-    rb_define_method(StringScanner, "rest",        strscan_rest,        0);
-    rb_define_method(StringScanner, "rest_size",   strscan_rest_size,   0);
-    rb_define_method(StringScanner, "restsize",    strscan_rest_size,   0);
-
-    rb_define_method(StringScanner, "inspect",     strscan_inspect,     0);
-}
diff --git a/ext/syck/.cvsignore b/ext/syck/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/syck/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/syck/MANIFEST b/ext/syck/MANIFEST
deleted file mode 100644
index bb126fa530..0000000000
--- a/ext/syck/MANIFEST
+++ /dev/null
@@ -1,15 +0,0 @@
-MANIFEST
-extconf.rb
-bytecode.c
-emitter.c
-gram.c
-gram.h
-handler.c
-implicit.c
-node.c
-rubyext.c
-syck.c
-syck.h
-token.c
-yaml2byte.c
-yamlbyte.h
diff --git a/ext/syck/bytecode.c b/ext/syck/bytecode.c
deleted file mode 100644
index 848f69f918..0000000000
--- a/ext/syck/bytecode.c
+++ /dev/null
@@ -1,1093 +0,0 @@
-/* Generated by re2c 0.5 on Fri Oct 17 12:13:58 2003 */
-#line 1 "bytecode.re"
-/*
- * bytecode.re
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include "syck.h"
-#include "ruby.h"
-#include "gram.h"
-
-#define QUOTELEN 128
-
-/*
- * They do my bidding...
- */
-#define YYCTYPE     char
-#define YYCURSOR    parser->cursor
-#define YYMARKER    parser->marker
-#define YYLIMIT     parser->limit
-#define YYTOKEN     parser->token
-#define YYTOKTMP    parser->toktmp
-#define YYLINEPTR   parser->lineptr
-#define YYLINECTPTR parser->linectptr
-#define YYLINE      parser->linect
-#define YYFILL(n)   syck_parser_read(parser)
-
-extern SyckParser *syck_parser_ptr;
-
-char *get_inline( SyckParser *parser );
-
-/*
- * Repositions the cursor at `n' offset from the token start.
- * Only works in `Header' and `Document' sections.
- */
-#define YYPOS(n)    YYCURSOR = YYTOKEN + n
-
-/*
- * I like seeing the level operations as macros...
- */
-#define ADD_LEVEL(len, status)  syck_parser_add_level( parser, len, status )
-#define POP_LEVEL()     syck_parser_pop_level( parser )
-#define CURRENT_LEVEL() syck_parser_current_level( parser )
-
-/*
- * Force a token next time around sycklex()
- */
-#define FORCE_NEXT_TOKEN(tok)    parser->force_token = tok;
-
-/*
- * Adding levels in bytecode requires us to make sure
- * we've got all our tokens worked out.
- */
-#define ADD_BYTE_LEVEL(lvl, len, s ) \
-        switch ( lvl->status ) \
-        { \
-            case syck_lvl_seq: \
-                lvl->ncount++; \
-                ADD_LEVEL(len, syck_lvl_open); \
-                YYPOS(0); \
-            return '-'; \
-        \
-            case syck_lvl_map: \
-                lvl->ncount++; \
-                ADD_LEVEL(len, s); \
-            break; \
-        \
-            case syck_lvl_open: \
-                lvl->status = s; \
-            break; \
-        \
-            default: \
-                ADD_LEVEL(len, s); \
-            break; \
-        }
-
-/*
- * Nice little macro to ensure we're YAML_IOPENed to the current level.
- * * Only use this macro in the "Document" section *
- */
-#define ENSURE_YAML_IOPEN(last_lvl, lvl_type, to_len, reset) \
-        if ( last_lvl->spaces < to_len ) \
-        { \
-            if ( last_lvl->status == syck_lvl_inline ) \
-            { \
-                goto Document; \
-            } \
-            else \
-            { \
-                ADD_LEVEL( to_len, lvl_type ); \
-                if ( reset == 1 ) YYPOS(0); \
-                return YAML_IOPEN; \
-            } \
-        } 
-
-/*
- * Nice little macro to ensure closure of levels.
- * * Only use this macro in the "Document" section *
- */
-#define ENSURE_YAML_IEND(last_lvl, to_len) \
-        if ( last_lvl->spaces > to_len ) \
-        { \
-            syck_parser_pop_level( parser ); \
-            YYPOS(0); \
-            return YAML_IEND; \
-        }
-
-/*
- * Concatenates string items and manages allocation
- * to the string
- */
-#define CAT(s, c, i, l) \
-        { \
-            if ( i + 1 >= c ) \
-            { \
-                c += QUOTELEN; \
-                S_REALLOC_N( s, char, c ); \
-            } \
-            s[i++] = l; \
-            s[i] = '\0'; \
-        }
-
-/*
- * Parser for standard YAML Bytecode [UTF-8]
- */
-int
-sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
-{
-    SyckLevel *lvl;
-    int doc_level = 0;
-    syck_parser_ptr = parser;
-    if ( YYCURSOR == NULL ) 
-    {
-        syck_parser_read( parser );
-    }
-
-    if ( parser->force_token != 0 )
-    {
-        int t = parser->force_token;
-        parser->force_token = 0;
-        return t;
-    }
-
-#line 168
-
-
-    lvl = CURRENT_LEVEL();
-    if ( lvl->status == syck_lvl_doc )
-    {
-        goto Document;
-    }
-
-Header:
-
-    YYTOKEN = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy0;
-yy1:	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy2;
-	case 'D':	goto yy3;
-	default:	goto yy5;
-	}
-yy2:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy4;
-	}
-yy3:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\n':	goto yy6;
-	case '\r':	goto yy8;
-	default:	goto yy4;
-	}
-yy4:
-#line 194
-	{   YYPOS(0);
-            goto Document;
-        }
-yy5:	yych = *++YYCURSOR;
-	goto yy4;
-yy6:	yych = *++YYCURSOR;
-yy7:
-#line 182
-	{   if ( lvl->status == syck_lvl_header )
-            {
-                goto Directive;
-            }
-            else
-            {
-                ENSURE_YAML_IEND(lvl, -1);
-                YYPOS(0);
-                return 0;
-            }
-        }
-yy8:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy6;
-	default:	goto yy2;
-	}
-}
-#line 198
-
-
-    lvl->status = syck_lvl_doc;
-
-Document:
-    {
-        lvl = CURRENT_LEVEL();
-        if ( lvl->status == syck_lvl_header )
-        {
-            lvl->status = syck_lvl_doc;
-        }
-
-        YYTOKEN = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy9;
-yy10:	++YYCURSOR;
-yy9:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy30;
-	case '\n':	goto yy27;
-	case '\r':	goto yy29;
-	case 'A':	goto yy19;
-	case 'D':	goto yy12;
-	case 'E':	goto yy16;
-	case 'M':	goto yy14;
-	case 'P':	goto yy13;
-	case 'Q':	goto yy15;
-	case 'R':	goto yy21;
-	case 'S':	goto yy17;
-	case 'T':	goto yy23;
-	case 'c':	goto yy25;
-	default:	goto yy11;
-	}
-yy11:yy12:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy41;
-	case '\r':	goto yy44;
-	default:	goto yy11;
-	}
-yy13:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy41;
-	case '\r':	goto yy43;
-	default:	goto yy11;
-	}
-yy14:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy38;
-	case '\r':	goto yy40;
-	default:	goto yy11;
-	}
-yy15:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy35;
-	case '\r':	goto yy37;
-	default:	goto yy11;
-	}
-yy16:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy32;
-	case '\r':	goto yy34;
-	default:	goto yy11;
-	}
-yy17:	yych = *++YYCURSOR;
-yy18:
-#line 282
-	{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str); 
-            goto Scalar;
-        }
-yy19:	yych = *++YYCURSOR;
-yy20:
-#line 286
-	{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
-            sycklval->name = get_inline( parser );
-            syck_hdlr_remove_anchor( parser, sycklval->name );
-            return YAML_ANCHOR;
-        }
-yy21:	yych = *++YYCURSOR;
-yy22:
-#line 292
-	{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
-            sycklval->name = get_inline( parser );
-            POP_LEVEL();
-            if ( *( YYCURSOR - 1 ) == '\n' ) YYCURSOR--;
-            return YAML_ALIAS;
-        }
-yy23:	yych = *++YYCURSOR;
-yy24:
-#line 299
-	{   char *qstr;
-            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
-            qstr = get_inline( parser );
-            if ( qstr[0] == '!' )
-            {
-                int qidx = strlen( qstr );
-                if ( qstr[1] == '\0' )
-                {
-                    free( qstr );
-                    return YAML_ITRANSFER;
-                }
-
-                lvl = CURRENT_LEVEL();
-
-                /*
-                 * URL Prefixing
-                 */
-                if ( qstr[1] == '^' )
-                {
-                    sycklval->name = S_ALLOC_N( char, qidx + strlen( lvl->domain ) );
-                    sycklval->name[0] = '\0';
-                    strcat( sycklval->name, lvl->domain );
-                    strncat( sycklval->name, qstr + 2, qidx - 2 );
-                    free( qstr );
-                }
-                else
-                {
-                    char *carat = qstr + 1;
-                    char *qend = qstr + qidx;
-                    while ( (++carat) < qend )
-                    {
-                        if ( *carat == '^' )
-                            break;
-                    }
-
-                    if ( carat < qend )
-                    {
-                        free( lvl->domain );
-                        lvl->domain = syck_strndup( qstr + 1, carat - ( qstr + 1 ) );
-                        sycklval->name = S_ALLOC_N( char, ( qend - carat ) + strlen( lvl->domain ) );
-                        sycklval->name[0] = '\0';
-                        strcat( sycklval->name, lvl->domain );
-                        strncat( sycklval->name, carat + 1, ( qend - carat ) - 1 );
-                        free( qstr );
-                    }
-                    else
-                    {
-                        sycklval->name = S_ALLOC_N( char, strlen( qstr ) );
-                        sycklval->name[0] = '\0';
-                        S_MEMCPY( sycklval->name, qstr + 1, char, strlen( qstr ) );
-                        free( qstr );
-                    }
-                }
-                return YAML_TRANSFER;
-            }
-            sycklval->name = qstr;
-            return YAML_TAGURI;
-        }
-yy25:	yych = *++YYCURSOR;
-yy26:
-#line 358
-	{   goto Comment; }
-yy27:	yych = *++YYCURSOR;
-yy28:
-#line 360
-	{   if ( lvl->status == syck_lvl_seq )
-            {
-                return YAML_INDENT; 
-            }
-            else if ( lvl->status == syck_lvl_map )
-            {
-                if ( lvl->ncount % 2 == 1 ) return ':';
-                else                        return YAML_INDENT;
-            }
-            goto Document;
-        }
-yy29:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy27;
-	default:	goto yy11;
-	}
-yy30:	yych = *++YYCURSOR;
-yy31:
-#line 372
-	{   ENSURE_YAML_IEND(lvl, -1);
-            YYPOS(0);
-            return 0;
-        }
-yy32:	yych = *++YYCURSOR;
-yy33:
-#line 247
-	{   if ( lvl->status == syck_lvl_seq && lvl->ncount == 0 )
-            {
-                lvl->ncount++;
-                YYPOS(0);
-                FORCE_NEXT_TOKEN( ']' );
-                return '[';
-            }
-            else if ( lvl->status == syck_lvl_map && lvl->ncount == 0 )
-            {
-                lvl->ncount++;
-                YYPOS(0);
-                FORCE_NEXT_TOKEN( '}' );
-                return '{';
-            }
-            
-            POP_LEVEL();
-            lvl = CURRENT_LEVEL();
-            if ( lvl->status == syck_lvl_seq )
-            {
-                FORCE_NEXT_TOKEN(YAML_INDENT);   
-            }
-            else if ( lvl->status == syck_lvl_map )
-            {
-                if ( lvl->ncount % 2 == 1 )
-                {
-                    FORCE_NEXT_TOKEN(':');
-                }
-                else
-                {
-                    FORCE_NEXT_TOKEN(YAML_INDENT);
-                }
-            }
-            return YAML_IEND;
-        }
-yy34:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy32;
-	default:	goto yy11;
-	}
-yy35:	yych = *++YYCURSOR;
-yy36:
-#line 233
-	{   int complex = 0;
-            if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
-            {
-                complex = 1;
-            }
-            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_seq);
-            if ( complex )
-            {
-                FORCE_NEXT_TOKEN( YAML_IOPEN );
-                return '?';
-            }
-            return YAML_IOPEN;
-        }
-yy37:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy35;
-	default:	goto yy11;
-	}
-yy38:	yych = *++YYCURSOR;
-yy39:
-#line 219
-	{   int complex = 0;
-            if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
-            {
-                complex = 1;
-            }
-            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_map); 
-            if ( complex )
-            {
-                FORCE_NEXT_TOKEN( YAML_IOPEN );
-                return '?';
-            }
-            return YAML_IOPEN;
-        }
-yy40:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy38;
-	default:	goto yy11;
-	}
-yy41:	yych = *++YYCURSOR;
-yy42:
-#line 214
-	{   ENSURE_YAML_IEND(lvl, -1);
-                YYPOS(0);
-                return 0;
-            }
-yy43:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy41;
-	default:	goto yy11;
-	}
-yy44:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy41;
-	default:	goto yy11;
-	}
-}
-#line 377
-
-
-    }
-
-Directive:
-    {
-        YYTOKTMP = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy45;
-yy46:	++YYCURSOR;
-yy45:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy47;
-	case 'V':	goto yy48;
-	default:	goto yy50;
-	}
-yy47:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy49;
-	}
-yy48:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '[':
-	case '\\':
-	case ']':
-	case '^':
-	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy51;
-	default:	goto yy49;
-	}
-yy49:
-#line 389
-	{   YYCURSOR = YYTOKTMP;
-               return YAML_DOCSEP;
-           }
-yy50:	yych = *++YYCURSOR;
-	goto yy49;
-yy51:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy52:	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '[':
-	case '\\':
-	case ']':
-	case '^':
-	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy51;
-	case ':':	goto yy53;
-	default:	goto yy47;
-	}
-yy53:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '[':
-	case '\\':
-	case ']':
-	case '^':
-	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy54;
-	default:	goto yy47;
-	}
-yy54:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy55:	switch(yych){
-	case '\n':	goto yy56;
-	case '\r':	goto yy58;
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '[':
-	case '\\':
-	case ']':
-	case '^':
-	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy54;
-	default:	goto yy47;
-	}
-yy56:	yych = *++YYCURSOR;
-yy57:
-#line 387
-	{   goto Directive; }
-yy58:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy56;
-	default:	goto yy47;
-	}
-}
-#line 392
-
-
-    }
-
-Comment:
-    {
-        YYTOKTMP = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy59;
-yy60:	++YYCURSOR;
-yy59:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy61;
-	case '\n':	goto yy62;
-	case '\r':	goto yy64;
-	default:	goto yy66;
-	}
-yy61:yy62:	yych = *++YYCURSOR;
-yy63:
-#line 402
-	{   goto Document; }
-yy64:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy67;
-	default:	goto yy65;
-	}
-yy65:
-#line 404
-	{   goto Comment; }
-yy66:	yych = *++YYCURSOR;
-	goto yy65;
-yy67:	yych = *++YYCURSOR;
-	goto yy63;
-}
-#line 406
-
-
-    }
-
-Scalar:
-    {
-    int idx = 0;
-    int cap = 100;
-    char *str = S_ALLOC_N( char, cap );
-    char *tok;
-
-    str[0] = '\0';
-
-Scalar2:
-    tok = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy68;
-yy69:	++YYCURSOR;
-yy68:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy74;
-	case '\n':	goto yy70;
-	case '\r':	goto yy72;
-	default:	goto yy76;
-	}
-yy70:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'C':	goto yy78;
-	case 'N':	goto yy80;
-	case 'Z':	goto yy83;
-	default:	goto yy71;
-	}
-yy71:
-#line 447
-	{   YYCURSOR = tok;
-            goto ScalarEnd; 
-        }
-yy72:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy77;
-	default:	goto yy73;
-	}
-yy73:
-#line 455
-	{   CAT(str, cap, idx, tok[0]);
-            goto Scalar2; 
-        }
-yy74:	yych = *++YYCURSOR;
-yy75:
-#line 451
-	{   YYCURSOR = tok;
-            goto ScalarEnd;
-        }
-yy76:	yych = *++YYCURSOR;
-	goto yy73;
-yy77:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'C':	goto yy78;
-	case 'N':	goto yy80;
-	case 'Z':	goto yy83;
-	default:	goto yy71;
-	}
-yy78:	yych = *++YYCURSOR;
-yy79:
-#line 424
-	{   goto Scalar2; }
-yy80:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy81:	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy80;
-	default:	goto yy82;
-	}
-yy82:
-#line 426
-	{   if ( tok + 2 < YYCURSOR )
-            {
-                char *count = tok + 2;
-                int total = strtod( count, NULL );
-                int i;
-                for ( i = 0; i < total; i++ )
-                {
-                    CAT(str, cap, idx, '\n');
-                }
-            }
-            else
-            {
-                CAT(str, cap, idx, '\n');
-            }
-            goto Scalar2;
-        }
-yy83:	yych = *++YYCURSOR;
-yy84:
-#line 443
-	{   CAT(str, cap, idx, '\0');
-            goto Scalar2; 
-        }
-}
-#line 459
-
-
-ScalarEnd:
-        {
-            SyckNode *n = syck_alloc_str();
-            n->data.str->ptr = str;
-            n->data.str->len = idx;
-            sycklval->nodeData = n;
-            POP_LEVEL();
-            if ( parser->implicit_typing == 1 )
-            {
-                try_tag_implicit( sycklval->nodeData, parser->taguri_expansion );
-            }
-            return YAML_PLAIN;
-        }
-    }
-
-}
-
-char *
-get_inline( SyckParser *parser )
-{
-    int idx = 0;
-    int cap = 100;
-    char *str = S_ALLOC_N( char, cap );
-    char *tok;
-
-    str[0] = '\0';
-
-Inline:
-    {
-        tok = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy85;
-yy86:	++YYCURSOR;
-yy85:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy91;
-	case '\n':	goto yy87;
-	case '\r':	goto yy89;
-	default:	goto yy93;
-	}
-yy87:	yych = *++YYCURSOR;
-yy88:
-#line 494
-	{   return str; }
-yy89:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy94;
-	default:	goto yy90;
-	}
-yy90:
-#line 500
-	{   CAT(str, cap, idx, tok[0]);
-                goto Inline; 
-            }
-yy91:	yych = *++YYCURSOR;
-yy92:
-#line 496
-	{   YYCURSOR = tok;
-                return str;
-            }
-yy93:	yych = *++YYCURSOR;
-	goto yy90;
-yy94:	yych = *++YYCURSOR;
-	goto yy88;
-}
-#line 504
-
-
-    }
-
-}
-
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
deleted file mode 100644
index 1cc0ea5075..0000000000
--- a/ext/syck/emitter.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * emitter.c
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- * 
- * All Base64 code from Ruby's pack.c.
- * Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto 
- */
-#include <stdio.h>
-#include <string.h>
-
-#include "syck.h"
-#include "ruby.h"
-
-#define DEFAULT_ANCHOR_FORMAT "id%03d"
-
-static char b64_table[] =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-struct adjust_arg {
-    /* Position to start adjusting */
-    long startpos;
-    /* Adjusting by an offset */
-    int offset;
-};
-
-/*
- * Built-in base64 (from Ruby's pack.c)
- */
-char *
-syck_base64enc( char *s, long len )
-{
-    long i = 0;
-    int padding = '=';
-    char *buff = S_ALLOCA_N(char, len * 4 / 3 + 6);
-
-    while (len >= 3) {
-        buff[i++] = b64_table[077 & (*s >> 2)];
-        buff[i++] = b64_table[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
-        buff[i++] = b64_table[077 & (((s[1] << 2) & 074) | ((s[2] >> 6) & 03))];
-        buff[i++] = b64_table[077 & s[2]];
-        s += 3;
-        len -= 3;
-    }
-    if (len == 2) {
-        buff[i++] = b64_table[077 & (*s >> 2)];
-        buff[i++] = b64_table[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
-        buff[i++] = b64_table[077 & (((s[1] << 2) & 074) | (('\0' >> 6) & 03))];
-        buff[i++] = padding;
-    }
-    else if (len == 1) {
-        buff[i++] = b64_table[077 & (*s >> 2)];
-        buff[i++] = b64_table[077 & (((*s << 4) & 060) | (('\0' >> 4) & 017))];
-        buff[i++] = padding;
-        buff[i++] = padding;
-    }
-    buff[i++] = '\n';
-    return buff;
-}
-
-char *
-syck_base64dec( char *s, long len )
-{
-    int a = -1,b = -1,c = 0,d;
-    static int first = 1;
-    static int b64_xtable[256];
-    char *ptr = syck_strndup( s, len );
-    char *end = ptr;
-    char *send = s + len;
-
-    if (first) {
-        int i;
-        first = 0;
-
-        for (i = 0; i < 256; i++) {
-        b64_xtable[i] = -1;
-        }
-        for (i = 0; i < 64; i++) {
-        b64_xtable[(int)b64_table[i]] = i;
-        }
-    }
-    while (s < send) {
-        while (s[0] == '\r' || s[0] == '\n') { s++; }
-        if ((a = b64_xtable[(int)s[0]]) == -1) break;
-        if ((b = b64_xtable[(int)s[1]]) == -1) break;
-        if ((c = b64_xtable[(int)s[2]]) == -1) break;
-        if ((d = b64_xtable[(int)s[3]]) == -1) break;
-        *end++ = a << 2 | b >> 4;
-        *end++ = b << 4 | c >> 2;
-        *end++ = c << 6 | d;
-        s += 4;
-    }
-    if (a != -1 && b != -1) {
-        if (s + 2 < send && s[2] == '=')
-        *end++ = a << 2 | b >> 4;
-        if (c != -1 && s + 3 < send && s[3] == '=') {
-        *end++ = a << 2 | b >> 4;
-        *end++ = b << 4 | c >> 2;
-        }
-    }
-    *end = '\0';
-    /*RSTRING(buf)->len = ptr - RSTRING(buf)->ptr;*/
-    return ptr;
-}
-
-/*
- * Allocate an emitter
- */
-SyckEmitter *
-syck_new_emitter()
-{
-    SyckEmitter *e;
-    e = S_ALLOC( SyckEmitter );
-    e->headless = 0;
-    e->seq_map = 0;
-    e->use_header = 0;
-    e->use_version = 0;
-    e->sort_keys = 0;
-    e->anchor_format = NULL;
-    e->explicit_typing = 0;
-    e->best_width = 80;
-    e->block_style = block_arbitrary;
-    e->stage = doc_open;
-    e->indent = 2;
-    e->level = -1;
-    e->ignore_id = 0;
-    e->anchors = NULL;
-    e->markers = NULL;
-    e->bufsize = SYCK_BUFFERSIZE;
-    e->buffer = NULL;
-    e->marker = NULL;
-    e->bufpos = 0;
-    e->handler = NULL;
-    e->bonus = NULL;
-    return e;
-}
-
-int
-syck_st_free_anchors( char *key, char *name, char *arg )
-{
-    S_FREE( name );
-    return ST_CONTINUE;
-}
-
-int
-syck_st_free_markers( char *key, SyckEmitterNode *n, char *arg )
-{
-    S_FREE( n );
-    return ST_CONTINUE;
-}
-
-void
-syck_emitter_st_free( SyckEmitter *e )
-{
-    /*
-     * Free the anchor tables
-     */
-    if ( e->anchors != NULL )
-    {
-        st_foreach( e->anchors, syck_st_free_anchors, 0 );
-        st_free_table( e->anchors );
-        e->anchors = NULL;
-    }
-
-    /*
-     * Free the markers tables
-     */
-    if ( e->markers != NULL )
-    {
-        st_foreach( e->markers, syck_st_free_markers, 0 );
-        st_free_table( e->markers );
-        e->markers = NULL;
-    }
-}
-
-void
-syck_emitter_ignore_id( SyckEmitter *e, SYMID id )
-{
-    e->ignore_id = id;
-}
-
-void
-syck_emitter_handler( SyckEmitter *e, SyckOutputHandler hdlr )
-{
-    e->handler = hdlr;
-}
-
-void
-syck_free_emitter( SyckEmitter *e )
-{
-    /*
-     * Free tables
-     */
-    syck_emitter_st_free( e );
-    if ( e->buffer != NULL )
-    {
-        S_FREE( e->buffer );
-    }
-    S_FREE( e );
-}
-
-void
-syck_emitter_clear( SyckEmitter *e )
-{
-    if ( e->buffer == NULL )
-    {
-        e->buffer = S_ALLOC_N( char, e->bufsize );
-        S_MEMZERO( e->buffer, char, e->bufsize );
-    }
-    e->buffer[0] = '\0';
-    e->marker = e->buffer;
-    e->bufpos = 0;
-}
-
-/*
- * Raw write to the emitter buffer.
- */
-void
-syck_emitter_write( SyckEmitter *e, char *str, long len )
-{
-    long at;
-    ASSERT( str != NULL )
-    if ( e->buffer == NULL )
-    {
-        syck_emitter_clear( e );
-    }
-    
-    /*
-     * Flush if at end of buffer
-     */
-    at = e->marker - e->buffer;
-    if ( len + at > e->bufsize )
-    {
-        syck_emitter_flush( e, 0 );
-    }
-
-    /*
-     * Write to buffer
-     */
-    S_MEMCPY( e->marker, str, char, len );
-    e->marker += len;
-}
-
-/*
- * Write a chunk of data out.
- */
-void
-syck_emitter_flush( SyckEmitter *e, long check_room )
-{
-    /*
-     * Check for enough space in the buffer for check_room length.
-     */
-    if ( check_room > 0 )
-    {
-        if ( e->bufsize > ( e->marker - e->buffer ) + check_room )
-        {
-            return;
-        }
-    }
-    else
-    {
-        check_room = e->bufsize;
-    }
-
-    /*
-     * Determine headers.
-     */
-    if ( ( e->stage == doc_open && ( e->headless == 0 || e->use_header == 1 ) ) || 
-         e->stage == doc_need_header )
-    {
-        if ( e->use_version == 1 )
-        {
-            char *header = S_ALLOC_N( char, 64 );
-            S_MEMZERO( header, char, 64 );
-            sprintf( header, "--- %%YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR );
-            (e->handler)( e, header, strlen( header ) );
-            S_FREE( header );
-        }
-        else
-        {
-            (e->handler)( e, "--- ", 4 );
-        }
-        e->stage = doc_processing;
-    }
-
-    /*
-     * Commit buffer.
-     */
-    if ( check_room > e->marker - e->buffer )
-    {
-        check_room = e->marker - e->buffer;
-    }
-    (e->handler)( e, e->buffer, check_room );
-    e->bufpos += check_room;
-    e->marker -= check_room;
-}
-
-/*
- * Emit a simple, unquoted string.
- */
-void
-syck_emitter_simple( SyckEmitter *e, char *str, long len )
-{
-    e->seq_map = 0;
-    syck_emitter_write( e, str, len );
-}
-
-/*
- * Shift the offsets of all applicable anchors
- */
-int
-syck_adjust_anchors( char *key, SyckEmitterNode *n, struct adjust_arg *arg )
-{
-    if ( arg->startpos < n->pos )
-    {
-        n->pos += arg->offset;
-    }
-    return ST_CONTINUE;
-}
-
-/*
- * call on start of an object's marshalling
- * (handles anchors, returns an alias)
- */
-char *
-syck_emitter_start_obj( SyckEmitter *e, SYMID oid )
-{
-    SyckEmitterNode *n = NULL;
-    char *anchor_name = NULL;
-
-    e->level++;
-    if ( oid != e->ignore_id )
-    {
-        /*
-         * Look for anchors
-         */
-        if ( e->markers == NULL )
-        {
-            e->markers = st_init_numtable();
-        }
-
-        /*
-         * Markers table initially marks the string position of the
-         * object.  Doesn't yet create an anchor, simply notes the
-         * position.
-         */
-        if ( ! st_lookup( e->markers, (st_data_t)oid, (st_data_t *)&n ) )
-        {
-            /*
-             * Store all markers
-             */
-            n = S_ALLOC( SyckEmitterNode );
-            n->is_shortcut = 0;
-            n->indent = e->level * e->indent;
-            n->pos = e->bufpos + ( e->marker - e->buffer );
-            st_insert( e->markers, (st_data_t)oid, (st_data_t)n );
-        }
-        else
-        {
-            if ( e->anchors == NULL )
-            {
-                e->anchors = st_init_numtable();
-            }
-
-            if ( ! st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
-            {
-                int idx = 0;
-                /*
-                 * Second time hitting this object, let's give it an anchor
-                 */
-                idx = e->anchors->num_entries + 1;
-
-                /*
-                 * Create the anchor tag
-                 */
-                if ( n->pos >= e->bufpos )
-                {
-                    int alen;
-                    struct adjust_arg *args = S_ALLOC( struct adjust_arg );
-                    char *start = e->buffer + ( n->pos - e->bufpos );
-
-                    char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
-                    anchor_name = S_ALLOC_N( char, strlen( anc ) + 10 );
-                    S_MEMZERO( anchor_name, char, strlen( anc ) + 10 );
-                    sprintf( anchor_name, anc, idx );
-
-                    /*
-                     * Need to flush the buffer some, if there is not room for the anchor.
-                     */
-                    alen = strlen( anchor_name ) + 2;
-                    syck_emitter_flush( e, alen );
-
-                    /*
-                     * Write the anchor into the buffer
-                     */
-                    S_MEMMOVE( start + alen, start, char, e->marker - start );
-                    S_MEMCPY( start + 1, anchor_name, char, strlen( anchor_name ) );
-                    start[0] = '&';
-                    start[alen - 1] = ' ';
-                    e->marker += alen;
-
-                    /*
-                     * Cycle through anchors, modify for the size of the anchor.
-                     */
-                    args->startpos = n->pos;
-                    args->offset = alen;
-                    st_foreach( e->markers, syck_adjust_anchors, (st_data_t)args );
-                    S_FREE( args );
-
-                    /*
-                     * Insert into anchors table
-                     */
-                    st_insert( e->anchors, (st_data_t)oid, (st_data_t)anchor_name );
-                }
-            }
-
-        }
-    }
-
-    return anchor_name;
-}
-
-/*
- * call on completion of an object's marshalling
- */
-void
-syck_emitter_end_obj( SyckEmitter *e )
-{
-    e->level--;
-}
-
diff --git a/ext/syck/extconf.rb b/ext/syck/extconf.rb
deleted file mode 100644
index 6c10448c70..0000000000
--- a/ext/syck/extconf.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'mkmf'
-
-have_header( "st.h" )
-create_makefile( "syck" )
-
diff --git a/ext/syck/gram.c b/ext/syck/gram.c
deleted file mode 100644
index 5bdd025629..0000000000
--- a/ext/syck/gram.c
+++ /dev/null
@@ -1,1776 +0,0 @@
-/* A Bison parser, made from gram.y, by GNU bison 1.75.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON	1
-
-/* Pure parsers.  */
-#define YYPURE	1
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
-#define yyparse syckparse
-#define yylex   sycklex
-#define yyerror syckerror
-#define yylval  sycklval
-#define yychar  syckchar
-#define yydebug syckdebug
-#define yynerrs sycknerrs
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     YAML_ANCHOR = 258,
-     YAML_ALIAS = 259,
-     YAML_TRANSFER = 260,
-     YAML_TAGURI = 261,
-     YAML_ITRANSFER = 262,
-     YAML_WORD = 263,
-     YAML_PLAIN = 264,
-     YAML_BLOCK = 265,
-     YAML_DOCSEP = 266,
-     YAML_IOPEN = 267,
-     YAML_INDENT = 268,
-     YAML_IEND = 269
-   };
-#endif
-#define YAML_ANCHOR 258
-#define YAML_ALIAS 259
-#define YAML_TRANSFER 260
-#define YAML_TAGURI 261
-#define YAML_ITRANSFER 262
-#define YAML_WORD 263
-#define YAML_PLAIN 264
-#define YAML_BLOCK 265
-#define YAML_DOCSEP 266
-#define YAML_IOPEN 267
-#define YAML_INDENT 268
-#define YAML_IEND 269
-
-
-
-
-/* Copy the first part of user declarations.  */
-#line 14 "gram.y"
-
-
-#include "syck.h"
-
-#define YYPARSE_PARAM   parser
-#define YYLEX_PARAM     parser
-
-
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-#ifndef YYSTYPE
-#line 23 "gram.y"
-typedef union {
-    SYMID nodeId;
-    SyckNode *nodeData;
-    char *name;
-} yystype;
-/* Line 193 of /usr/local/share/bison/yacc.c.  */
-#line 125 "y.tab.c"
-# define YYSTYPE yystype
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-#ifndef YYLTYPE
-typedef struct yyltype
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} yyltype;
-# define YYLTYPE yyltype
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-/* Copy the second part of user declarations.  */
-int sycklex( YYSTYPE *, SyckParser * );
-
-
-/* Line 213 of /usr/local/share/bison/yacc.c.  */
-#line 146 "y.tab.c"
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
-# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short yyss;
-  YYSTYPE yyvs;
-  };
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAX)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  register YYSIZE_T yyi;		\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];	\
-	}					\
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
-
-#endif
-
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  38
-#define YYLAST   414
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  23
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  25
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  69
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  121
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   269
-
-#define YYTRANSLATE(X) \
-  ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,    21,    15,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    16,     2,
-       2,     2,     2,    22,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    17,     2,    18,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    19,     2,    20,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14
-};
-
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const unsigned char yyprhs[] =
-{
-       0,     0,     3,     5,     8,     9,    11,    13,    15,    18,
-      22,    26,    28,    31,    32,    34,    37,    39,    41,    43,
-      46,    49,    52,    55,    58,    60,    62,    64,    67,    70,
-      72,    74,    76,    78,    80,    84,    87,    89,    93,    96,
-     100,   103,   107,   110,   112,   116,   119,   123,   126,   128,
-     132,   136,   140,   144,   147,   151,   154,   158,   161,   165,
-     167,   173,   175,   179,   183,   186,   190,   194,   197,   199
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
-{
-      24,     0,    -1,    33,    -1,    11,    27,    -1,    -1,    32,
-      -1,    26,    -1,    33,    -1,     3,    26,    -1,    28,    32,
-      31,    -1,    28,    26,    31,    -1,    25,    -1,    28,    29,
-      -1,    -1,    12,    -1,    28,    13,    -1,    14,    -1,    13,
-      -1,    14,    -1,    30,    31,    -1,     5,    32,    -1,     6,
-      32,    -1,     7,    32,    -1,     3,    32,    -1,     4,    -1,
-       8,    -1,     9,    -1,     5,    33,    -1,     6,    33,    -1,
-      10,    -1,    34,    -1,    38,    -1,    40,    -1,    46,    -1,
-      28,    36,    29,    -1,    15,    27,    -1,    37,    -1,     5,
-      30,    36,    -1,     5,    36,    -1,     6,    30,    36,    -1,
-       6,    36,    -1,     3,    30,    36,    -1,     3,    36,    -1,
-      35,    -1,    37,    30,    35,    -1,    37,    30,    -1,    17,
-      39,    18,    -1,    17,    18,    -1,    25,    -1,    39,    21,
-      25,    -1,    28,    41,    29,    -1,    28,    44,    29,    -1,
-       5,    30,    44,    -1,     5,    41,    -1,     6,    30,    44,
-      -1,     6,    41,    -1,     3,    30,    44,    -1,     3,    41,
-      -1,    32,    16,    27,    -1,    42,    -1,    22,    25,    30,
-      16,    27,    -1,    43,    -1,    44,    30,    35,    -1,    44,
-      30,    43,    -1,    44,    30,    -1,    25,    16,    27,    -1,
-      19,    47,    20,    -1,    19,    20,    -1,    45,    -1,    47,
-      21,    45,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
-{
-       0,    44,    44,    48,    52,    58,    59,    62,    63,    72,
-      76,    82,    83,    96,   114,   115,   118,   121,   124,   125,
-     133,   138,   143,   151,   155,   163,   176,   183,   188,   193,
-     194,   195,   196,   197,   203,   209,   215,   216,   221,   226,
-     231,   236,   240,   246,   250,   255,   264,   268,   274,   278,
-     288,   293,   300,   305,   310,   315,   320,   324,   330,   345,
-     346,   354,   355,   367,   374,   383,   391,   395,   401,   402
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "YAML_ANCHOR", "YAML_ALIAS", 
-  "YAML_TRANSFER", "YAML_TAGURI", "YAML_ITRANSFER", "YAML_WORD", 
-  "YAML_PLAIN", "YAML_BLOCK", "YAML_DOCSEP", "YAML_IOPEN", "YAML_INDENT", 
-  "YAML_IEND", "'-'", "':'", "'['", "']'", "'{'", "'}'", "','", "'?'", 
-  "$accept", "doc", "atom", "ind_rep", "atom_or_empty", "indent_open", 
-  "indent_end", "indent_sep", "indent_flex_end", "word_rep", "struct_rep", 
-  "implicit_seq", "basic_seq", "top_imp_seq", "in_implicit_seq", 
-  "inline_seq", "in_inline_seq", "implicit_map", "top_imp_map", 
-  "basic_mapping", "complex_mapping", "in_implicit_map", "basic_mapping2", 
-  "inline_map", "in_inline_map", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,    45,    58,    91,    93,   123,
-     125,    44,    63
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
-{
-       0,    23,    24,    24,    24,    25,    25,    26,    26,    26,
-      26,    27,    27,    27,    28,    28,    29,    30,    31,    31,
-      32,    32,    32,    32,    32,    32,    32,    33,    33,    33,
-      33,    33,    33,    33,    34,    35,    36,    36,    36,    36,
-      36,    36,    36,    37,    37,    37,    38,    38,    39,    39,
-      40,    40,    41,    41,    41,    41,    41,    41,    42,    43,
-      43,    44,    44,    44,    44,    45,    46,    46,    47,    47
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
-{
-       0,     2,     1,     2,     0,     1,     1,     1,     2,     3,
-       3,     1,     2,     0,     1,     2,     1,     1,     1,     2,
-       2,     2,     2,     2,     1,     1,     1,     2,     2,     1,
-       1,     1,     1,     1,     3,     2,     1,     3,     2,     3,
-       2,     3,     2,     1,     3,     2,     3,     2,     1,     3,
-       3,     3,     3,     2,     3,     2,     3,     2,     3,     1,
-       5,     1,     3,     3,     2,     3,     3,     2,     1,     3
-};
-
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const unsigned char yydefact[] =
-{
-       4,     0,     0,    29,    13,    14,     0,     0,     0,     0,
-       2,    30,    31,    32,    33,    27,    28,     0,    24,     0,
-       0,     0,    25,    26,    11,     6,     3,     0,     5,     7,
-      47,    48,     0,     0,    67,     0,    68,     0,     1,     0,
-       0,     0,    15,    13,     0,     0,    43,     0,    36,     0,
-      59,    61,     0,     8,    23,     0,    20,    21,     0,     0,
-      22,     0,     0,     0,    16,     0,    12,     0,    46,     0,
-      13,    66,     0,    17,     0,    42,    57,     0,    38,    53,
-       0,    40,    55,    35,     0,    13,    34,    45,    50,    51,
-      64,    18,     0,    10,     9,    49,    65,    69,     0,     0,
-       0,    41,    56,    37,    52,    39,    54,     0,    58,    44,
-      62,    63,    19,     0,     0,     0,    13,     0,     0,     0,
-      60
-};
-
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yysigned_char yydefgoto[] =
-{
-      -1,     8,    24,    25,    26,    32,    66,    90,    93,    28,
-      29,    11,    46,    75,    48,    12,    33,    13,    49,    50,
-      51,    52,    36,    14,    37
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -68
-static const short yypact[] =
-{
-     133,   177,   177,   -68,   352,   -68,   335,   283,    27,   223,
-     -68,   -68,   -68,   -68,   -68,   -68,   -68,   352,   -68,   369,
-     369,    97,   -68,   -68,   -68,   -68,   -68,   154,   -68,   -68,
-     -68,   -68,   203,   -12,   -68,    17,   -68,    46,   -68,   386,
-     386,   386,   -68,   352,   352,    25,   -68,    30,    33,    30,
-     -68,   -68,    67,   -68,   -68,    97,   -68,   -68,    97,    97,
-     -68,   301,   318,   318,   -68,   107,   -68,    37,   -68,   352,
-     352,   -68,   352,   -68,   243,   -68,   -68,   243,   -68,   -68,
-     243,   -68,   -68,   -68,    33,   352,   -68,    40,   -68,   -68,
-     263,   -68,   107,   -68,   -68,   -68,   -68,   -68,   399,   399,
-     399,   -68,    33,   -68,    33,   -68,    33,    42,   -68,   -68,
-     -68,   -68,   -68,    84,    84,    84,   352,     9,     9,     9,
-     -68
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yysigned_char yypgoto[] =
-{
-     -68,   -68,    10,    -9,   -38,     0,    -7,    86,   -56,    56,
-      29,   -68,   -62,    -6,   -68,   -68,   -68,   -68,    -2,   -68,
-     -26,   -67,    -3,   -68,   -68
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, parse error.  */
-#define YYTABLE_NINF -1
-static const unsigned char yytable[] =
-{
-       9,     9,     9,    47,    27,    83,    68,   102,    53,    69,
-     104,    94,   117,   106,   118,   119,    31,    35,    65,     9,
-       9,    47,    73,    65,    43,   109,    47,    38,   110,    10,
-      15,    16,    96,    70,    78,    81,   112,    76,    79,    82,
-      86,    85,    88,    27,    64,    89,    73,   108,    15,    16,
-      73,    91,    53,    85,    84,    43,    78,    81,   116,    76,
-      79,    82,     9,     9,   111,    45,    71,    72,   101,    97,
-      27,   103,     0,    54,   105,    56,    57,    60,   120,    95,
-      73,    64,    35,    67,     0,    27,     0,   117,    67,   118,
-     119,    15,    16,    78,    81,    54,    56,    57,     0,    43,
-      55,    18,    58,    59,    21,    22,    23,   101,   103,   105,
-       0,    54,    78,    81,    56,    57,    27,    54,    56,    57,
-      73,    91,     0,     0,     0,    74,    77,    80,     0,     0,
-      45,     0,     0,    45,    87,     0,    45,     0,     1,     2,
-       0,     0,     0,     3,     4,     5,    45,    74,    77,    80,
-       6,    92,     7,    92,    54,    56,    57,    61,    18,    62,
-      63,    21,    22,    23,     3,     0,     5,    42,    64,    43,
-     107,     6,     0,     7,     0,     0,    44,     0,    92,     0,
-       0,     0,     1,     2,   113,   114,   115,     3,     0,     5,
-       0,     0,     0,     0,     6,     0,     7,     0,     0,     0,
-       0,     0,     0,   113,   114,   115,    61,    18,    62,    63,
-      21,    22,    23,     3,     0,     5,    42,     0,    43,     0,
-       6,     0,     7,     0,     0,    44,    39,    18,    40,    41,
-      21,    22,    23,     0,     0,     0,    42,     0,    43,     0,
-       0,     0,     0,     0,     0,    44,    98,    18,    99,   100,
-      21,    22,    23,     0,     0,     0,     0,     0,    43,     0,
-       0,     0,     0,     0,     0,    44,    55,    18,    58,    59,
-      21,    22,    23,     0,     0,     0,     0,     0,    43,     0,
-       0,     0,     0,     0,     0,    44,    17,    18,    19,    20,
-      21,    22,    23,     3,     0,     5,     0,     0,     0,     0,
-       6,     0,     7,    34,    61,    18,    62,    63,    21,    22,
-      23,     3,     0,     5,    73,     0,    43,     0,     6,     0,
-       7,    39,    18,    62,    63,    21,    22,    23,     3,     0,
-       5,    73,     0,    43,     0,     6,     0,     7,    17,    18,
-      19,    20,    21,    22,    23,     3,     0,     5,     0,     0,
-       0,     0,     6,    30,     7,    17,    18,    19,    20,    21,
-      22,    23,     3,     0,     5,     0,     0,     0,     0,     6,
-       0,     7,    55,    18,    19,    20,    21,    22,    23,     3,
-       0,     5,     0,     0,     0,     0,     6,     0,     7,    39,
-      18,    40,    41,    21,    22,    23,     0,     0,     0,    73,
-       0,    43,    98,    18,    99,   100,    21,    22,    23,     0,
-       0,     0,    73,     0,    43
-};
-
-static const yysigned_char yycheck[] =
-{
-       0,     1,     2,     9,     4,    43,    18,    74,    17,    21,
-      77,    67,     3,    80,     5,     6,     6,     7,    27,    19,
-      20,    27,    13,    32,    15,    87,    32,     0,    90,     0,
-       1,     2,    70,    16,    40,    41,    92,    39,    40,    41,
-      47,    16,    49,    43,    14,    52,    13,    85,    19,    20,
-      13,    14,    61,    16,    44,    15,    62,    63,    16,    61,
-      62,    63,    62,    63,    90,     9,    20,    21,    74,    72,
-      70,    77,    -1,    17,    80,    19,    20,    21,   116,    69,
-      13,    14,    72,    27,    -1,    85,    -1,     3,    32,     5,
-       6,    62,    63,    99,   100,    39,    40,    41,    -1,    15,
-       3,     4,     5,     6,     7,     8,     9,   113,   114,   115,
-      -1,    55,   118,   119,    58,    59,   116,    61,    62,    63,
-      13,    14,    -1,    -1,    -1,    39,    40,    41,    -1,    -1,
-      74,    -1,    -1,    77,    48,    -1,    80,    -1,     5,     6,
-      -1,    -1,    -1,    10,    11,    12,    90,    61,    62,    63,
-      17,    65,    19,    67,    98,    99,   100,     3,     4,     5,
-       6,     7,     8,     9,    10,    -1,    12,    13,    14,    15,
-      84,    17,    -1,    19,    -1,    -1,    22,    -1,    92,    -1,
-      -1,    -1,     5,     6,    98,    99,   100,    10,    -1,    12,
-      -1,    -1,    -1,    -1,    17,    -1,    19,    -1,    -1,    -1,
-      -1,    -1,    -1,   117,   118,   119,     3,     4,     5,     6,
-       7,     8,     9,    10,    -1,    12,    13,    -1,    15,    -1,
-      17,    -1,    19,    -1,    -1,    22,     3,     4,     5,     6,
-       7,     8,     9,    -1,    -1,    -1,    13,    -1,    15,    -1,
-      -1,    -1,    -1,    -1,    -1,    22,     3,     4,     5,     6,
-       7,     8,     9,    -1,    -1,    -1,    -1,    -1,    15,    -1,
-      -1,    -1,    -1,    -1,    -1,    22,     3,     4,     5,     6,
-       7,     8,     9,    -1,    -1,    -1,    -1,    -1,    15,    -1,
-      -1,    -1,    -1,    -1,    -1,    22,     3,     4,     5,     6,
-       7,     8,     9,    10,    -1,    12,    -1,    -1,    -1,    -1,
-      17,    -1,    19,    20,     3,     4,     5,     6,     7,     8,
-       9,    10,    -1,    12,    13,    -1,    15,    -1,    17,    -1,
-      19,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
-      12,    13,    -1,    15,    -1,    17,    -1,    19,     3,     4,
-       5,     6,     7,     8,     9,    10,    -1,    12,    -1,    -1,
-      -1,    -1,    17,    18,    19,     3,     4,     5,     6,     7,
-       8,     9,    10,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      -1,    19,     3,     4,     5,     6,     7,     8,     9,    10,
-      -1,    12,    -1,    -1,    -1,    -1,    17,    -1,    19,     3,
-       4,     5,     6,     7,     8,     9,    -1,    -1,    -1,    13,
-      -1,    15,     3,     4,     5,     6,     7,     8,     9,    -1,
-      -1,    -1,    13,    -1,    15
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
-{
-       0,     5,     6,    10,    11,    12,    17,    19,    24,    28,
-      33,    34,    38,    40,    46,    33,    33,     3,     4,     5,
-       6,     7,     8,     9,    25,    26,    27,    28,    32,    33,
-      18,    25,    28,    39,    20,    25,    45,    47,     0,     3,
-       5,     6,    13,    15,    22,    32,    35,    36,    37,    41,
-      42,    43,    44,    26,    32,     3,    32,    32,     5,     6,
-      32,     3,     5,     6,    14,    26,    29,    32,    18,    21,
-      16,    20,    21,    13,    30,    36,    41,    30,    36,    41,
-      30,    36,    41,    27,    25,    16,    29,    30,    29,    29,
-      30,    14,    30,    31,    31,    25,    27,    45,     3,     5,
-       6,    36,    44,    36,    44,    36,    44,    30,    27,    35,
-      35,    43,    31,    30,    30,    30,    16,     3,     5,     6,
-      27
-};
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-
-#define YYFAIL		goto yyerrlab
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");			\
-      YYERROR;							\
-    }								\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)           \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
-#endif
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX	yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX	yylex (&yylval)
-#endif
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (0)
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-#endif /* !YYDEBUG */
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-#endif /* !YYERROR_VERBOSE */
-
-
-
-#if YYDEBUG
-/*-----------------------------.
-| Print this symbol on YYOUT.  |
-`-----------------------------*/
-
-static void
-#if defined (__STDC__) || defined (__cplusplus)
-yysymprint (FILE* yyout, int yytype, YYSTYPE yyvalue)
-#else
-yysymprint (yyout, yytype, yyvalue)
-    FILE* yyout;
-    int yytype;
-    YYSTYPE yyvalue;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvalue;
-
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyout, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyout, yytoknum[yytype], yyvalue);
-# endif
-    }
-  else
-    YYFPRINTF (yyout, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-  YYFPRINTF (yyout, ")");
-}
-#endif /* YYDEBUG. */
-
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-static void
-#if defined (__STDC__) || defined (__cplusplus)
-yydestruct (int yytype, YYSTYPE yyvalue)
-#else
-yydestruct (yytype, yyvalue)
-    int yytype;
-    YYSTYPE yyvalue;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvalue;
-
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-}
-
-
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
-# else
-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
-int yyparse (void);
-# endif
-#endif
-
-
-
-
-int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  /* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of parse errors so far.  */
-int yynerrs;
-
-  register int yystate;
-  register int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yychar1 = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
-
-
-
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack. Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
-
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
-# else
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	goto yyoverflowlab;
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	short *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyoverflowlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with.  */
-
-  if (yychar <= 0)		/* This means end of input.  */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more.  */
-
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE (yychar);
-
-      /* We have to keep this `#if YYDEBUG', since we use variables
-	 which are defined only if `YYDEBUG' is set.  */
-      YYDPRINTF ((stderr, "Next token is "));
-      YYDSYMPRINT ((stderr, yychar1, yylval));
-      YYDPRINTF ((stderr, "\n"));
-    }
-
-  /* If the proper action on seeing token YYCHAR1 is to reduce or to
-     detect an error, take that action.  */
-  yyn += yychar1;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yychar1)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-	      yychar, yytname[yychar1]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-
-
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
-    {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn - 1, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] >= 0; yyi++)
-	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-  switch (yyn)
-    {
-        case 2:
-#line 45 "gram.y"
-    {
-           ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-        }
-    break;
-
-  case 3:
-#line 49 "gram.y"
-    {
-           ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-        }
-    break;
-
-  case 4:
-#line 53 "gram.y"
-    {
-           ((SyckParser *)parser)->eof = 1;
-        }
-    break;
-
-  case 8:
-#line 64 "gram.y"
-    { 
-           /*
-            * _Anchors_: The language binding must keep a separate symbol table
-            * for anchors.  The actual ID in the symbol table is returned to the
-            * higher nodes, though.
-            */
-           yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-        }
-    break;
-
-  case 9:
-#line 73 "gram.y"
-    {
-           yyval.nodeData = yyvsp[-1].nodeData;
-        }
-    break;
-
-  case 10:
-#line 77 "gram.y"
-    {
-           yyval.nodeData = yyvsp[-1].nodeData;
-        }
-    break;
-
-  case 12:
-#line 84 "gram.y"
-    {
-                   SyckNode *n = syck_new_str( "" ); 
-                   if ( ((SyckParser *)parser)->taguri_expansion == 1 )
-                   {
-                       n->type_id = syck_taguri( YAML_DOMAIN, "null", 4 );
-                   }
-                   else
-                   {
-                       n->type_id = syck_strndup( "null", 4 );
-                   }
-                   yyval.nodeData = n;
-                }
-    break;
-
-  case 13:
-#line 97 "gram.y"
-    {
-                   SyckNode *n = syck_new_str( "" ); 
-                   if ( ((SyckParser *)parser)->taguri_expansion == 1 )
-                   {
-                       n->type_id = syck_taguri( YAML_DOMAIN, "null", 4 );
-                   }
-                   else
-                   {
-                       n->type_id = syck_strndup( "null", 4 );
-                   }
-                   yyval.nodeData = n;
-                }
-    break;
-
-  case 20:
-#line 134 "gram.y"
-    { 
-               syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-               yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 21:
-#line 139 "gram.y"
-    { 
-               syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-               yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 22:
-#line 144 "gram.y"
-    { 
-               if ( ((SyckParser *)parser)->implicit_typing == 1 )
-               {
-                  try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-               }
-               yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 23:
-#line 152 "gram.y"
-    { 
-               yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-            }
-    break;
-
-  case 24:
-#line 156 "gram.y"
-    {
-               /*
-                * _Aliases_: The anchor symbol table is scanned for the anchor name.
-                * The anchor's ID in the language's symbol table is returned.
-                */
-               yyval.nodeData = syck_hdlr_get_anchor( (SyckParser *)parser, yyvsp[0].name );
-            }
-    break;
-
-  case 25:
-#line 164 "gram.y"
-    { 
-               SyckNode *n = yyvsp[0].nodeData;
-               if ( ((SyckParser *)parser)->taguri_expansion == 1 )
-               {
-                   n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
-               }
-               else
-               {
-                   n->type_id = syck_strndup( "str", 3 );
-               }
-               yyval.nodeData = n;
-            }
-    break;
-
-  case 27:
-#line 184 "gram.y"
-    { 
-                syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 28:
-#line 189 "gram.y"
-    {
-                syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 34:
-#line 204 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 35:
-#line 210 "gram.y"
-    { 
-                    yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 37:
-#line 217 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 38:
-#line 222 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 39:
-#line 227 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 40:
-#line 232 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 41:
-#line 237 "gram.y"
-    { 
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 42:
-#line 241 "gram.y"
-    { 
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 43:
-#line 247 "gram.y"
-    {
-                    yyval.nodeData = syck_new_seq( yyvsp[0].nodeId );
-                }
-    break;
-
-  case 44:
-#line 251 "gram.y"
-    { 
-                    syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId );
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-  case 45:
-#line 256 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-				}
-    break;
-
-  case 46:
-#line 265 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 47:
-#line 269 "gram.y"
-    { 
-                    yyval.nodeData = syck_alloc_seq();
-                }
-    break;
-
-  case 48:
-#line 275 "gram.y"
-    {
-                    yyval.nodeData = syck_new_seq( syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                }
-    break;
-
-  case 49:
-#line 279 "gram.y"
-    { 
-                    syck_seq_add( yyvsp[-2].nodeData, syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-  case 50:
-#line 289 "gram.y"
-    { 
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 51:
-#line 294 "gram.y"
-    { 
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 52:
-#line 301 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 53:
-#line 306 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 54:
-#line 311 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 55:
-#line 316 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 56:
-#line 321 "gram.y"
-    { 
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 57:
-#line 325 "gram.y"
-    { 
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 58:
-#line 331 "gram.y"
-    {
-                    yyval.nodeData = syck_new_map( 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                }
-    break;
-
-  case 60:
-#line 347 "gram.y"
-    {
-                    yyval.nodeData = syck_new_map( 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-3].nodeData ), 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                }
-    break;
-
-  case 62:
-#line 356 "gram.y"
-    { 
-                    if ( yyvsp[-2].nodeData->shortcut == NULL )
-                    {
-                        yyvsp[-2].nodeData->shortcut = syck_new_seq( yyvsp[0].nodeId );
-                    }
-                    else
-                    {
-                        syck_seq_add( yyvsp[-2].nodeData->shortcut, yyvsp[0].nodeId );
-                    }
-                    yyval.nodeData = yyvsp[-2].nodeData;
-                }
-    break;
-
-  case 63:
-#line 368 "gram.y"
-    { 
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-2].nodeData );
-                    syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
-                    syck_free_node( yyvsp[0].nodeData );
-                    yyval.nodeData = yyvsp[-2].nodeData;
-                }
-    break;
-
-  case 64:
-#line 375 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 65:
-#line 384 "gram.y"
-    {
-                    yyval.nodeData = syck_new_map( 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                }
-    break;
-
-  case 66:
-#line 392 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 67:
-#line 396 "gram.y"
-    {
-                    yyval.nodeData = syck_alloc_map();
-                }
-    break;
-
-  case 69:
-#line 403 "gram.y"
-    {
-                    syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
-                    syck_free_node( yyvsp[0].nodeData );
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-
-    }
-
-/* Line 1016 of /usr/local/share/bison/yacc.c.  */
-#line 1538 "y.tab.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("parse error");
-    }
-  goto yyerrlab1;
-
-
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
-        {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyssp > yyss)
-	    {
-	      YYDPRINTF ((stderr, "Error: popping "));
-	      YYDSYMPRINT ((stderr,
-			    yystos[*yyssp],
-			    *yyvsp));
-	      YYDPRINTF ((stderr, "\n"));
-	      yydestruct (yystos[*yyssp], *yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
-        }
-
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-		  yychar, yytname[yychar1]));
-      yydestruct (yychar1, yylval);
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
-
-      YYDPRINTF ((stderr, "Error: popping "));
-      YYDSYMPRINT ((stderr,
-		    yystos[*yyssp], *yyvsp));
-      YYDPRINTF ((stderr, "\n"));
-
-      yydestruct (yystos[yystate], *yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
-
-
-#if YYDEBUG
-      if (yydebug)
-	{
-	  short *yyssp1 = yyss - 1;
-	  YYFPRINTF (stderr, "Error: state stack now");
-	  while (yyssp1 != yyssp)
-	    YYFPRINTF (stderr, " %d", *++yyssp1);
-	  YYFPRINTF (stderr, "\n");
-	}
-#endif
-    }
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
-  *++yyvsp = yylval;
-
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-  return yyresult;
-}
-
-
-#line 410 "gram.y"
-
-
-void
-apply_seq_in_map( SyckParser *parser, SyckNode *n )
-{
-    long map_len;
-    if ( n->shortcut == NULL )
-    {
-        return;
-    }
-
-    map_len = syck_map_count( n );
-    syck_map_assign( n, map_value, map_len - 1,
-        syck_hdlr_add_node( parser, n->shortcut ) );
-
-    n->shortcut = NULL;
-}
-
-
diff --git a/ext/syck/gram.h b/ext/syck/gram.h
deleted file mode 100644
index d1e577b0ee..0000000000
--- a/ext/syck/gram.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* A Bison parser, made from gram.y, by GNU bison 1.75.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-#ifndef BISON_Y_TAB_H
-# define BISON_Y_TAB_H
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     YAML_ANCHOR = 258,
-     YAML_ALIAS = 259,
-     YAML_TRANSFER = 260,
-     YAML_TAGURI = 261,
-     YAML_ITRANSFER = 262,
-     YAML_WORD = 263,
-     YAML_PLAIN = 264,
-     YAML_BLOCK = 265,
-     YAML_DOCSEP = 266,
-     YAML_IOPEN = 267,
-     YAML_INDENT = 268,
-     YAML_IEND = 269
-   };
-#endif
-#define YAML_ANCHOR 258
-#define YAML_ALIAS 259
-#define YAML_TRANSFER 260
-#define YAML_TAGURI 261
-#define YAML_ITRANSFER 262
-#define YAML_WORD 263
-#define YAML_PLAIN 264
-#define YAML_BLOCK 265
-#define YAML_DOCSEP 266
-#define YAML_IOPEN 267
-#define YAML_INDENT 268
-#define YAML_IEND 269
-
-
-
-
-#ifndef YYSTYPE
-#line 23 "gram.y"
-typedef union {
-    SYMID nodeId;
-    SyckNode *nodeData;
-    char *name;
-} yystype;
-/* Line 1281 of /usr/local/share/bison/yacc.c.  */
-#line 74 "y.tab.h"
-# define YYSTYPE yystype
-#endif
-
-
-
-
-#endif /* not BISON_Y_TAB_H */
-
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
deleted file mode 100644
index eddc6465af..0000000000
--- a/ext/syck/handler.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * handler.c
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "syck.h"
-#include "ruby.h"
-
-SYMID 
-syck_hdlr_add_node( SyckParser *p, SyckNode *n )
-{
-    SYMID id;
-
-    if ( ! n->id ) 
-    {
-        n->id = (p->handler)( p, n );
-    }
-    id = n->id;
-
-    if ( n->anchor == NULL )
-    {
-        syck_free_node( n );
-    }
-    return id;
-}
-
-SyckNode *
-syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
-{
-    n->anchor = a;
-    if ( p->bad_anchors != NULL )
-    {
-        SyckNode *bad;
-        if ( st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&bad ) )
-        {
-            if ( n->kind != syck_str_kind )
-            {
-                n->id = bad->id;
-                (p->handler)( p, n );
-            }
-        }
-    }
-    if ( p->anchors == NULL )
-    {
-        p->anchors = st_init_strtable();
-    }
-    st_insert( p->anchors, (st_data_t)a, (st_data_t)n );
-    return n;
-}
-
-void
-syck_hdlr_remove_anchor( SyckParser *p, char *a )
-{
-    if ( p->anchors == NULL )
-    {
-        p->anchors = st_init_strtable();
-    }
-    st_insert( p->anchors, (st_data_t)a, (st_data_t)1 );
-}
-
-SyckNode *
-syck_hdlr_get_anchor( SyckParser *p, char *a )
-{
-    SyckNode *n = NULL;
-
-    if ( p->anchors != NULL )
-    {
-        if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&n ) )
-        {
-            if ( n != (void *)1 )
-            {    
-                S_FREE( a );
-                return n;
-            }
-            else
-            {
-                if ( p->bad_anchors == NULL )
-                {
-                    p->bad_anchors = st_init_strtable();
-                }
-                if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&n ) )
-                {
-                    n = (p->bad_anchor_handler)( p, a );
-                    st_insert( p->bad_anchors, (st_data_t)a, (st_data_t)n );
-                }
-            }
-        }
-    }
-
-    if ( n == NULL )
-    {
-        n = (p->bad_anchor_handler)( p, a );
-    }
-
-    if ( n->anchor )
-    {
-        S_FREE( a );
-    } 
-    else
-    {
-        n->anchor = a;
-    }
-
-    return n;
-}
-
-void
-syck_add_transfer( char *uri, SyckNode *n, int taguri )
-{
-    if ( n->type_id != NULL )
-    {
-        S_FREE( n->type_id );
-    }
-
-    if ( taguri == 0 )
-    {
-        n->type_id = uri;
-        return;
-    }
-
-    n->type_id = syck_type_id_to_uri( uri );
-    S_FREE( uri );
-}
-
-char *
-syck_xprivate( char *type_id, int type_len )
-{
-    char *uri = S_ALLOC_N( char, type_len + 14 );
-    uri[0] = '\0';
-    strcat( uri, "x-private:" );
-    strncat( uri, type_id, type_len );
-    return uri;
-}
-
-char *
-syck_taguri( char *domain, char *type_id, int type_len )
-{
-    char *uri = S_ALLOC_N( char, strlen( domain ) + type_len + 14 );
-    uri[0] = '\0';
-    strcat( uri, "tag:" );
-    strcat( uri, domain );
-    strcat( uri, ":" );
-    strncat( uri, type_id, type_len );
-    return uri;
-}
-
-int 
-syck_try_implicit( SyckNode *n )
-{
-    return 1;
-}
-
diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c
deleted file mode 100644
index 1dfeac3953..0000000000
--- a/ext/syck/implicit.c
+++ /dev/null
@@ -1,2808 +0,0 @@
-/* Generated by re2c 0.5 on Thu Oct 16 14:12:57 2003 */
-#line 1 "implicit.re"
-/*
- * implicit.re
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "syck.h"
-#include "ruby.h"
-
-#define YYCTYPE     char
-#define YYCURSOR    cursor
-#define YYMARKER    marker
-#define YYLIMIT     limit
-#define YYFILL(n)
-
-void
-try_tag_implicit( SyckNode *n, int taguri )
-{
-    char *tid = "";
-    switch ( n->kind )
-    {
-        case syck_str_kind:
-            tid = syck_match_implicit( n->data.str->ptr, n->data.str->len );
-        break;
-
-        case syck_seq_kind:
-            tid = "seq";
-        break;
-
-        case syck_map_kind:
-            tid = "map";
-        break;
-    }
-    if ( taguri == 1 )
-    {
-        n->type_id = syck_taguri( YAML_DOMAIN, tid, strlen( tid ) );
-    } else {
-        n->type_id = syck_strndup( tid, strlen( tid ) );
-    }
-}
-
-char *syck_match_implicit( char *str, size_t len )
-{
-    char *cursor, *limit, *marker;
-    cursor = str;
-    limit = str + len;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy0;
-yy1:	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy6;
-	case '+':	goto yy16;
-	case '-':	goto yy17;
-	case '.':	goto yy20;
-	case '0':	goto yy18;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy19;
-	case '<':	goto yy22;
-	case '=':	goto yy21;
-	case 'F':	goto yy15;
-	case 'N':	goto yy5;
-	case 'O':	goto yy13;
-	case 'T':	goto yy9;
-	case 'Y':	goto yy11;
-	case 'f':	goto yy14;
-	case 'n':	goto yy4;
-	case 'o':	goto yy12;
-	case 't':	goto yy8;
-	case 'y':	goto yy10;
-	case '~':	goto yy2;
-	default:	goto yy23;
-	}
-yy2:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy6;
-yy3:
-#line 116
-	{   return "str"; }
-yy4:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'o':	goto yy163;
-	case 'u':	goto yy191;
-	default:	goto yy3;
-	}
-yy5:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'O':	case 'o':	goto yy163;
-	case 'U':	goto yy186;
-	case 'u':	goto yy187;
-	default:	goto yy3;
-	}
-yy6:	yych = *++YYCURSOR;
-yy7:
-#line 82
-	{   return "null"; }
-yy8:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'r':	goto yy184;
-	default:	goto yy3;
-	}
-yy9:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'R':	goto yy180;
-	case 'r':	goto yy181;
-	default:	goto yy3;
-	}
-yy10:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'e':	goto yy179;
-	default:	goto yy3;
-	}
-yy11:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'E':	goto yy177;
-	case 'e':	goto yy178;
-	default:	goto yy3;
-	}
-yy12:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'f':	goto yy176;
-	case 'n':	goto yy173;
-	default:	goto yy3;
-	}
-yy13:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'F':	goto yy171;
-	case 'N':	case 'n':	goto yy173;
-	case 'f':	goto yy172;
-	default:	goto yy3;
-	}
-yy14:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'a':	goto yy168;
-	default:	goto yy3;
-	}
-yy15:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'A':	goto yy159;
-	case 'a':	goto yy160;
-	default:	goto yy3;
-	}
-yy16:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':	goto yy158;
-	case '0':	goto yy149;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy47;
-	default:	goto yy3;
-	}
-yy17:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':	goto yy148;
-	case '0':	goto yy149;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy47;
-	default:	goto yy3;
-	}
-yy18:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\000':	goto yy51;
-	case ',':	goto yy133;
-	case '.':	goto yy49;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy131;
-	case '8':
-	case '9':	goto yy132;
-	case 'x':	goto yy135;
-	default:	goto yy3;
-	}
-yy19:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\000':	goto yy51;
-	case ',':	goto yy47;
-	case '.':	goto yy49;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy46;
-	default:	goto yy3;
-	}
-yy20:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'I':	goto yy33;
-	case 'N':	goto yy31;
-	case 'i':	goto yy32;
-	case 'n':	goto yy30;
-	default:	goto yy3;
-	}
-yy21:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy28;
-	goto yy3;
-yy22:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '<':	goto yy24;
-	default:	goto yy3;
-	}
-yy23:	yych = *++YYCURSOR;
-	goto yy3;
-yy24:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy26;
-yy25:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy3;
-	}
-yy26:	yych = *++YYCURSOR;
-yy27:
-#line 114
-	{   return "merge"; }
-yy28:	yych = *++YYCURSOR;
-yy29:
-#line 112
-	{   return "default"; }
-yy30:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'a':	goto yy45;
-	default:	goto yy25;
-	}
-yy31:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'A':	goto yy40;
-	case 'a':	goto yy41;
-	default:	goto yy25;
-	}
-yy32:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'n':	goto yy39;
-	default:	goto yy25;
-	}
-yy33:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy34;
-	case 'n':	goto yy35;
-	default:	goto yy25;
-	}
-yy34:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'F':	goto yy36;
-	default:	goto yy25;
-	}
-yy35:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy36;
-	default:	goto yy25;
-	}
-yy36:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy25;
-yy37:	yych = *++YYCURSOR;
-yy38:
-#line 98
-	{   return "float#inf"; }
-yy39:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy36;
-	default:	goto yy25;
-	}
-yy40:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy42;
-	default:	goto yy25;
-	}
-yy41:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy42;
-	default:	goto yy25;
-	}
-yy42:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy25;
-yy43:	yych = *++YYCURSOR;
-yy44:
-#line 102
-	{   return "float#nan"; }
-yy45:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'n':	goto yy42;
-	default:	goto yy25;
-	}
-yy46:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy65;
-	default:	goto yy48;
-	}
-yy47:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy48:	switch(yych){
-	case '\000':	goto yy51;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy47;
-	case '.':	goto yy49;
-	default:	goto yy25;
-	}
-yy49:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy50:	switch(yych){
-	case '\000':	goto yy55;
-	case ',':	goto yy53;
-	case '.':	goto yy57;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy49;
-	case 'E':	case 'e':	goto yy59;
-	default:	goto yy25;
-	}
-yy51:	yych = *++YYCURSOR;
-yy52:
-#line 92
-	{   return "int"; }
-yy53:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy54:	switch(yych){
-	case '\000':	goto yy55;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy53;
-	default:	goto yy25;
-	}
-yy55:	yych = *++YYCURSOR;
-yy56:
-#line 94
-	{   return "float#fix"; }
-yy57:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy58:	switch(yych){
-	case '.':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy57;
-	case 'E':	case 'e':	goto yy59;
-	default:	goto yy25;
-	}
-yy59:	yych = *++YYCURSOR;
-	switch(yych){
-	case '+':	case '-':	goto yy60;
-	default:	goto yy25;
-	}
-yy60:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy25;
-	goto yy62;
-yy61:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy62:	switch(yych){
-	case '\000':	goto yy63;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy61;
-	default:	goto yy25;
-	}
-yy63:	yych = *++YYCURSOR;
-yy64:
-#line 96
-	{   return "float#exp"; }
-yy65:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy66;
-	default:	goto yy48;
-	}
-yy66:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy67;
-	default:	goto yy48;
-	}
-yy67:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy68;
-	default:	goto yy25;
-	}
-yy68:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy69;
-	default:	goto yy25;
-	}
-yy69:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy70;
-	default:	goto yy25;
-	}
-yy70:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy71;
-	default:	goto yy25;
-	}
-yy71:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy72;
-	default:	goto yy25;
-	}
-yy72:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy73;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy25;
-	case 'T':	goto yy75;
-	case 't':	goto yy76;
-	default:	goto yy78;
-	}
-yy73:	yych = *++YYCURSOR;
-yy74:
-#line 104
-	{   return "timestamp#ymd"; }
-yy75:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy117;
-	default:	goto yy25;
-	}
-yy76:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy99;
-	default:	goto yy25;
-	}
-yy77:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy78:	switch(yych){
-	case '\t':	case ' ':	goto yy77;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy79;
-	default:	goto yy25;
-	}
-yy79:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy80;
-	default:	goto yy25;
-	}
-yy80:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy81;
-	default:	goto yy25;
-	}
-yy81:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy82;
-	default:	goto yy25;
-	}
-yy82:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy83;
-	default:	goto yy25;
-	}
-yy83:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy84;
-	default:	goto yy25;
-	}
-yy84:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy85;
-	default:	goto yy25;
-	}
-yy85:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy86;
-	default:	goto yy25;
-	}
-yy86:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\t':	case ' ':	goto yy89;
-	case '.':	goto yy87;
-	default:	goto yy25;
-	}
-yy87:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy88:	switch(yych){
-	case '\t':	case ' ':	goto yy89;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy87;
-	default:	goto yy25;
-	}
-yy89:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy90:	switch(yych){
-	case '\t':	case ' ':	goto yy89;
-	case '+':	case '-':	goto yy92;
-	case 'Z':	goto yy91;
-	default:	goto yy25;
-	}
-yy91:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy96;
-	goto yy25;
-yy92:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy93;
-	default:	goto yy25;
-	}
-yy93:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy94;
-	default:	goto yy25;
-	}
-yy94:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy96;
-	case ':':	goto yy95;
-	default:	goto yy25;
-	}
-yy95:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy98;
-	default:	goto yy25;
-	}
-yy96:	yych = *++YYCURSOR;
-yy97:
-#line 108
-	{   return "timestamp#spaced"; }
-yy98:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy91;
-	default:	goto yy25;
-	}
-yy99:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy100;
-	default:	goto yy25;
-	}
-yy100:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy101;
-	default:	goto yy25;
-	}
-yy101:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy102;
-	default:	goto yy25;
-	}
-yy102:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy103;
-	default:	goto yy25;
-	}
-yy103:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy104;
-	default:	goto yy25;
-	}
-yy104:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy105;
-	default:	goto yy25;
-	}
-yy105:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy106;
-	default:	goto yy25;
-	}
-yy106:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':	goto yy107;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy25;
-	default:	goto yy108;
-	}
-yy107:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy108:	switch(yych){
-	case '+':	case '-':	goto yy110;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy107;
-	case 'Z':	goto yy109;
-	default:	goto yy25;
-	}
-yy109:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy114;
-	goto yy25;
-yy110:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy111;
-	default:	goto yy25;
-	}
-yy111:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy112;
-	default:	goto yy25;
-	}
-yy112:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy114;
-	case ':':	goto yy113;
-	default:	goto yy25;
-	}
-yy113:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy116;
-	default:	goto yy25;
-	}
-yy114:	yych = *++YYCURSOR;
-yy115:
-#line 106
-	{   return "timestamp#iso8601"; }
-yy116:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy109;
-	default:	goto yy25;
-	}
-yy117:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy118;
-	default:	goto yy25;
-	}
-yy118:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy119;
-	default:	goto yy25;
-	}
-yy119:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy120;
-	default:	goto yy25;
-	}
-yy120:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy121;
-	default:	goto yy25;
-	}
-yy121:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy122;
-	default:	goto yy25;
-	}
-yy122:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy123;
-	default:	goto yy25;
-	}
-yy123:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy124;
-	default:	goto yy25;
-	}
-yy124:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':	goto yy125;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy25;
-	case 'Z':	goto yy127;
-	default:	goto yy126;
-	}
-yy125:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-yy126:	switch(yych){
-	case '+':	case '-':	goto yy110;
-	case '0':	goto yy125;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy129;
-	case 'Z':	goto yy109;
-	default:	goto yy25;
-	}
-yy127:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy25;
-yy128:	yych = *++YYCURSOR;
-	goto yy115;
-yy129:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-yy130:	switch(yych){
-	case '+':	case '-':	goto yy110;
-	case '0':	goto yy125;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy129;
-	case 'Z':	goto yy127;
-	default:	goto yy25;
-	}
-yy131:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy146;
-	case '8':
-	case '9':	goto yy144;
-	default:	goto yy134;
-	}
-yy132:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy144;
-	default:	goto yy143;
-	}
-yy133:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy134:	switch(yych){
-	case '\000':	goto yy140;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy133;
-	case '.':	goto yy49;
-	case '8':
-	case '9':	goto yy142;
-	default:	goto yy25;
-	}
-yy135:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy25;
-	goto yy137;
-yy136:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy137:	switch(yych){
-	case '\000':	goto yy138;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy136;
-	default:	goto yy25;
-	}
-yy138:	yych = *++YYCURSOR;
-yy139:
-#line 88
-	{   return "int#hex"; }
-yy140:	yych = *++YYCURSOR;
-yy141:
-#line 90
-	{   return "int#oct"; }
-yy142:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy143:	switch(yych){
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy142;
-	case '.':	goto yy49;
-	default:	goto yy25;
-	}
-yy144:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy145;
-	default:	goto yy143;
-	}
-yy145:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy67;
-	default:	goto yy143;
-	}
-yy146:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy147;
-	case '8':
-	case '9':	goto yy145;
-	default:	goto yy134;
-	}
-yy147:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy67;
-	default:	goto yy134;
-	}
-yy148:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'I':	goto yy151;
-	case 'i':	goto yy150;
-	default:	goto yy25;
-	}
-yy149:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy51;
-	case 'x':	goto yy135;
-	default:	goto yy134;
-	}
-yy150:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'n':	goto yy157;
-	default:	goto yy25;
-	}
-yy151:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy152;
-	case 'n':	goto yy153;
-	default:	goto yy25;
-	}
-yy152:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'F':	goto yy154;
-	default:	goto yy25;
-	}
-yy153:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy154;
-	default:	goto yy25;
-	}
-yy154:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy25;
-yy155:	yych = *++YYCURSOR;
-yy156:
-#line 100
-	{   return "float#neginf"; }
-yy157:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy154;
-	default:	goto yy25;
-	}
-yy158:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'I':	goto yy33;
-	case 'i':	goto yy32;
-	default:	goto yy25;
-	}
-yy159:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy166;
-	default:	goto yy25;
-	}
-yy160:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy161;
-	default:	goto yy25;
-	}
-yy161:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy162;
-	default:	goto yy25;
-	}
-yy162:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy163;
-	default:	goto yy25;
-	}
-yy163:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy25;
-yy164:	yych = *++YYCURSOR;
-yy165:
-#line 86
-	{   return "bool#no"; }
-yy166:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'S':	goto yy167;
-	default:	goto yy25;
-	}
-yy167:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'E':	goto yy163;
-	default:	goto yy25;
-	}
-yy168:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy169;
-	default:	goto yy25;
-	}
-yy169:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy170;
-	default:	goto yy25;
-	}
-yy170:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy163;
-	default:	goto yy25;
-	}
-yy171:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'F':	goto yy163;
-	default:	goto yy25;
-	}
-yy172:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy163;
-	default:	goto yy25;
-	}
-yy173:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy25;
-yy174:	yych = *++YYCURSOR;
-yy175:
-#line 84
-	{   return "bool#yes"; }
-yy176:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy163;
-	default:	goto yy25;
-	}
-yy177:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'S':	goto yy173;
-	default:	goto yy25;
-	}
-yy178:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy173;
-	default:	goto yy25;
-	}
-yy179:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy173;
-	default:	goto yy25;
-	}
-yy180:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'U':	goto yy183;
-	default:	goto yy25;
-	}
-yy181:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'u':	goto yy182;
-	default:	goto yy25;
-	}
-yy182:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy173;
-	default:	goto yy25;
-	}
-yy183:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'E':	goto yy173;
-	default:	goto yy25;
-	}
-yy184:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'u':	goto yy185;
-	default:	goto yy25;
-	}
-yy185:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy173;
-	default:	goto yy25;
-	}
-yy186:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy190;
-	default:	goto yy25;
-	}
-yy187:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy188;
-	default:	goto yy25;
-	}
-yy188:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy189;
-	default:	goto yy25;
-	}
-yy189:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy6;
-	goto yy25;
-yy190:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy189;
-	default:	goto yy25;
-	}
-yy191:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy192;
-	default:	goto yy25;
-	}
-yy192:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy189;
-	default:	goto yy25;
-	}
-}
-#line 118
-
-
-}
-
-char *
-syck_type_id_to_uri( char *type_id )
-{
-    char *cursor, *limit, *marker;
-
-    cursor = type_id;
-    limit = type_id + strlen( type_id );
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy193;
-yy194:	++YYCURSOR;
-yy193:
-	if((YYLIMIT - YYCURSOR) < 21) YYFILL(21);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy195;
-	case '!':	goto yy199;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':	case 'u':
-	case 'v':
-	case 'w':	case 'y':
-	case 'z':	goto yy201;
-	case 't':	goto yy196;
-	case 'x':	goto yy198;
-	default:	goto yy202;
-	}
-yy195:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy197;
-	}
-yy196:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case ',':	goto yy207;
-	case '-':	goto yy203;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy205;
-	case 'a':	goto yy237;
-	default:	goto yy197;
-	}
-yy197:
-#line 170
-	{   return syck_taguri( YAML_DOMAIN, type_id, strlen( type_id ) ); }
-yy198:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case ',':	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy206;
-	case '-':	goto yy227;
-	default:	goto yy197;
-	}
-yy199:	yych = *++YYCURSOR;
-yy200:
-#line 144
-	{   return syck_xprivate( type_id + 1, strlen( type_id ) - 1 ); }
-yy201:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case ',':	goto yy207;
-	case '-':	goto yy203;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy205;
-	default:	goto yy197;
-	}
-yy202:	yych = *++YYCURSOR;
-	goto yy197;
-yy203:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy204:	switch(yych){
-	case '-':	goto yy203;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy205;
-	default:	goto yy195;
-	}
-yy205:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy206:	switch(yych){
-	case ',':	goto yy207;
-	case '-':	goto yy203;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy205;
-	default:	goto yy195;
-	}
-yy207:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy215;
-	default:	goto yy195;
-	}
-yy208:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy211;
-	default:	goto yy195;
-	}
-yy209:	yych = *++YYCURSOR;
-yy210:
-#line 146
-	{   char *domain = S_ALLOC_N( char, ( YYCURSOR - type_id ) + 15 );
-                    char *uri;
-
-                    domain[0] = '\0';
-                    strncat( domain, type_id, ( YYCURSOR - type_id ) - 1 );
-                    strcat( domain, "." );
-                    strcat( domain, YAML_DOMAIN );
-                    uri = syck_taguri( domain, YYCURSOR, YYLIMIT - YYCURSOR );
-
-                    S_FREE( domain );
-                    return uri;
-                }
-yy211:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-yy212:	switch(yych){
-	case ',':	goto yy207;
-	case '-':	goto yy213;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy211;
-	default:	goto yy195;
-	}
-yy213:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy214:	switch(yych){
-	case '-':	goto yy213;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy211;
-	default:	goto yy195;
-	}
-yy215:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy216;
-	default:	goto yy195;
-	}
-yy216:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy217;
-	default:	goto yy195;
-	}
-yy217:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy218;
-	default:	goto yy195;
-	}
-yy218:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy219;
-	case '/':	goto yy220;
-	default:	goto yy195;
-	}
-yy219:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy222;
-	default:	goto yy195;
-	}
-yy220:	yych = *++YYCURSOR;
-yy221:
-#line 159
-	{   char *domain = S_ALLOC_N( char, YYCURSOR - type_id );
-                               char *uri;
-
-                               domain[0] = '\0';
-                               strncat( domain, type_id, ( YYCURSOR - type_id ) - 1 );
-                               uri = syck_taguri( domain, YYCURSOR, YYLIMIT - YYCURSOR );
-
-                               S_FREE( domain );
-                               return uri;
-                            }
-yy222:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy223;
-	default:	goto yy195;
-	}
-yy223:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy224;
-	case '/':	goto yy220;
-	default:	goto yy195;
-	}
-yy224:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy225;
-	default:	goto yy195;
-	}
-yy225:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy226;
-	default:	goto yy195;
-	}
-yy226:	yych = *++YYCURSOR;
-	switch(yych){
-	case '/':	goto yy220;
-	default:	goto yy195;
-	}
-yy227:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'p':	goto yy228;
-	default:	goto yy204;
-	}
-yy228:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case 'r':	goto yy229;
-	default:	goto yy204;
-	}
-yy229:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case 'i':	goto yy230;
-	default:	goto yy204;
-	}
-yy230:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case 'v':	goto yy231;
-	default:	goto yy204;
-	}
-yy231:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case 'a':	goto yy232;
-	default:	goto yy204;
-	}
-yy232:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case 't':	goto yy233;
-	default:	goto yy204;
-	}
-yy233:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case 'e':	goto yy234;
-	default:	goto yy204;
-	}
-yy234:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case ':':	goto yy235;
-	default:	goto yy204;
-	}
-yy235:	yych = *++YYCURSOR;
-yy236:
-#line 142
-	{   return type_id; }
-yy237:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case 'g':	goto yy238;
-	default:	goto yy204;
-	}
-yy238:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy207;
-	case '.':	goto yy208;
-	case '/':	goto yy209;
-	case ':':	goto yy239;
-	default:	goto yy204;
-	}
-yy239:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':
-	case '-':
-	case '.':	goto yy195;
-	default:	goto yy241;
-	}
-yy240:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy241:	switch(yych){
-	case ',':	goto yy244;
-	case '-':	goto yy242;
-	case '.':	goto yy245;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy240;
-	default:	goto yy195;
-	}
-yy242:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy243:	switch(yych){
-	case '-':	goto yy242;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy240;
-	default:	goto yy195;
-	}
-yy244:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy250;
-	default:	goto yy195;
-	}
-yy245:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy246;
-	default:	goto yy195;
-	}
-yy246:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-yy247:	switch(yych){
-	case ',':	goto yy244;
-	case '-':	goto yy248;
-	case '.':	goto yy245;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy246;
-	default:	goto yy195;
-	}
-yy248:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy249:	switch(yych){
-	case '-':	goto yy248;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy246;
-	default:	goto yy195;
-	}
-yy250:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy251;
-	default:	goto yy195;
-	}
-yy251:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy252;
-	default:	goto yy195;
-	}
-yy252:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy253;
-	default:	goto yy195;
-	}
-yy253:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy254;
-	case ':':	goto yy255;
-	default:	goto yy195;
-	}
-yy254:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy257;
-	default:	goto yy195;
-	}
-yy255:	yych = *++YYCURSOR;
-yy256:
-#line 140
-	{   return type_id; }
-yy257:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy258;
-	default:	goto yy195;
-	}
-yy258:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy259;
-	case ':':	goto yy255;
-	default:	goto yy195;
-	}
-yy259:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy260;
-	default:	goto yy195;
-	}
-yy260:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy261;
-	default:	goto yy195;
-	}
-yy261:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy255;
-	default:	goto yy195;
-	}
-}
-#line 172
-
-
-}
-
diff --git a/ext/syck/node.c b/ext/syck/node.c
deleted file mode 100644
index f999700554..0000000000
--- a/ext/syck/node.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * node.c
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "syck.h"
-#include "ruby.h"
-
-/*
- * Node allocation functions
- */
-SyckNode *
-syck_alloc_node( enum syck_kind_tag type )
-{
-    SyckNode *s;
-
-    s = S_ALLOC( SyckNode );
-    s->kind = type;
-    s->id = 0;
-    s->type_id = NULL;
-    s->anchor = NULL;
-    s->shortcut = NULL;
-
-    return s;
-}
-
-void
-syck_free_node( SyckNode *n )
-{
-    syck_free_members( n );
-    if ( n->type_id != NULL )
-        S_FREE( n->type_id );
-    if ( n->anchor != NULL )
-        S_FREE( n->anchor );
-    S_FREE( n );
-}
-
-SyckNode *
-syck_alloc_map()
-{
-    SyckNode *n;
-    struct SyckMap *m;
-
-    m = S_ALLOC( struct SyckMap );
-    m->idx = 0;
-    m->capa = ALLOC_CT;
-    m->keys = S_ALLOC_N( SYMID, m->capa );
-    m->values = S_ALLOC_N( SYMID, m->capa );
-
-    n = syck_alloc_node( syck_map_kind );
-    n->data.pairs = m;
-    
-    return n;
-}
-
-SyckNode *
-syck_alloc_seq()
-{
-    SyckNode *n;
-    struct SyckSeq *s;
-
-    s = S_ALLOC( struct SyckSeq );
-    s->idx = 0;
-    s->capa = ALLOC_CT;
-    s->items = S_ALLOC_N( SYMID, s->capa );
-
-    n = syck_alloc_node( syck_seq_kind );
-    n->data.list = s;
-
-    return n;
-}
-
-SyckNode *
-syck_alloc_str()
-{
-    SyckNode *n;
-    struct SyckStr *s;
-
-    s = S_ALLOC( struct SyckStr );
-    s->len = 0;
-    s->ptr = NULL;
-
-    n = syck_alloc_node( syck_str_kind );
-    n->data.str = s;
-    
-    return n;
-}
-
-SyckNode *
-syck_new_str( char *str )
-{
-    return syck_new_str2( str, strlen( str ) );
-}
-
-SyckNode *
-syck_new_str2( char *str, long len )
-{
-    SyckNode *n;
-
-    n = syck_alloc_str();
-    n->data.str->ptr = S_ALLOC_N( char, len + 1 );
-    n->data.str->len = len;
-    memcpy( n->data.str->ptr, str, len );
-    n->data.str->ptr[len] = '\0';
-
-    return n;
-}
-
-void
-syck_str_blow_away_commas( SyckNode *n )
-{
-    char *go, *end;
-
-    go = n->data.str->ptr;
-    end = go + n->data.str->len;
-    while ( *(++go) != '\0' )
-    {
-        if ( *go == ',' )
-        {
-            n->data.str->len -= 1;
-            memmove( go, go + 1, end - go );
-            end -= 1;
-        }
-    }
-}
-
-char *
-syck_str_read( SyckNode *n )
-{
-    ASSERT( n != NULL );
-    return n->data.str->ptr;
-}
-
-SyckNode *
-syck_new_map( SYMID key, SYMID value )
-{
-    SyckNode *n;
-
-    n = syck_alloc_map();
-    syck_map_add( n, key, value );
-
-    return n;
-}
-
-void
-syck_map_add( SyckNode *map, SYMID key, SYMID value )
-{
-    struct SyckMap *m;
-    long idx;
-
-    ASSERT( map != NULL );
-    ASSERT( map->data.pairs != NULL );
-    
-    m = map->data.pairs;
-    idx = m->idx;
-    m->idx += 1;
-    if ( m->idx > m->capa )
-    {
-        m->capa += ALLOC_CT;
-        S_REALLOC_N( m->keys, SYMID, m->capa );
-        S_REALLOC_N( m->values, SYMID, m->capa );
-    }
-    m->keys[idx] = key;
-    m->values[idx] = value;
-}
-
-void
-syck_map_update( SyckNode *map1, SyckNode *map2 )
-{
-    struct SyckMap *m1, *m2;
-    long new_idx, new_capa;
-    ASSERT( map1 != NULL );
-    ASSERT( map2 != NULL );
-
-    m1 = map1->data.pairs;
-    m2 = map2->data.pairs;
-    if ( m2->idx < 1 ) return;
-        
-    new_idx = m1->idx;
-    new_idx += m2->idx;
-    new_capa = m1->capa;
-    while ( new_idx > new_capa )
-    {
-        new_capa += ALLOC_CT;
-    }
-    if ( new_capa > m1->capa )
-    {
-        m1->capa = new_capa;
-        S_REALLOC_N( m1->keys, SYMID, m1->capa );
-        S_REALLOC_N( m1->values, SYMID, m1->capa );
-    }
-    for ( new_idx = 0; new_idx < m2->idx; m1->idx++, new_idx++ )
-    {
-        m1->keys[m1->idx] = m2->keys[new_idx]; 
-        m1->values[m1->idx] = m2->values[new_idx]; 
-    }
-}
-
-long
-syck_map_count( SyckNode *map )
-{
-    ASSERT( map != NULL );
-    ASSERT( map->data.pairs != NULL );
-    return map->data.pairs->idx;
-}
-
-void
-syck_map_assign( SyckNode *map, enum map_part p, long idx, SYMID id )
-{
-    struct SyckMap *m;
-
-    ASSERT( map != NULL );
-    m = map->data.pairs;
-    ASSERT( m != NULL );
-    if ( p == map_key )
-    {
-        m->keys[idx] = id;
-    }
-    else
-    {
-        m->values[idx] = id;
-    }
-}
-
-SYMID
-syck_map_read( SyckNode *map, enum map_part p, long idx )
-{
-    struct SyckMap *m;
-
-    ASSERT( map != NULL );
-    m = map->data.pairs;
-    ASSERT( m != NULL );
-    if ( p == map_key )
-    {
-        return m->keys[idx];
-    }
-    else
-    {
-        return m->values[idx];
-    }
-}
-
-SyckNode *
-syck_new_seq( SYMID value )
-{
-    SyckNode *n;
-
-    n = syck_alloc_seq();
-    syck_seq_add( n, value );
-
-    return n;
-}
-
-void
-syck_seq_add( SyckNode *arr, SYMID value )
-{
-    struct SyckSeq *s;
-    long idx;
-
-    ASSERT( arr != NULL );
-    ASSERT( arr->data.list != NULL );
-    
-    s = arr->data.list;
-    idx = s->idx;
-    s->idx += 1;
-    if ( s->idx > s->capa )
-    {
-        s->capa += ALLOC_CT;
-        S_REALLOC_N( s->items, SYMID, s->capa );
-    }
-    s->items[idx] = value;
-}
-
-long
-syck_seq_count( SyckNode *seq )
-{
-    ASSERT( seq != NULL );
-    ASSERT( seq->data.list != NULL );
-    return seq->data.list->idx;
-}
-
-SYMID
-syck_seq_read( SyckNode *seq, long idx )
-{
-    struct SyckSeq *s;
-
-    ASSERT( seq != NULL );
-    s = seq->data.list;
-    ASSERT( s != NULL );
-    return s->items[idx];
-}
-
-void
-syck_free_members( SyckNode *n )
-{
-    switch ( n->kind  )
-    {
-        case syck_str_kind:
-            if ( n->data.str->ptr != NULL ) 
-            {
-                S_FREE( n->data.str->ptr );
-                n->data.str->ptr = NULL;
-                n->data.str->len = 0;
-                S_FREE( n->data.str );
-            }
-        break;
-
-        case syck_seq_kind:
-            S_FREE( n->data.list->items );
-            S_FREE( n->data.list );
-        break;
-
-        case syck_map_kind:
-            S_FREE( n->data.pairs->keys );
-            S_FREE( n->data.pairs->values );
-            S_FREE( n->data.pairs );
-        break;
-    }
-}
-
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
deleted file mode 100644
index 4f5d4610e8..0000000000
--- a/ext/syck/rubyext.c
+++ /dev/null
@@ -1,1451 +0,0 @@
-/*
- * rubyext.c
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "ruby.h"
-#include "syck.h"
-#include <sys/types.h>
-#include <time.h>
-
-typedef struct RVALUE {
-    union {
-#if 0
-	struct {
-	    unsigned long flags;	/* always 0 for freed obj */
-	    struct RVALUE *next;
-	} free;
-#endif
-	struct RBasic  basic;
-	struct RObject object;
-	struct RClass  klass;
-	/*struct RFloat  flonum;*/
-	/*struct RString string;*/
-	struct RArray  array;
-	/*struct RRegexp regexp;*/
-	struct RHash   hash;
-	/*struct RData   data;*/
-	struct RStruct rstruct;
-	/*struct RBignum bignum;*/
-	/*struct RFile   file;*/
-    } as;
-} RVALUE;
-
-typedef struct {
-   long hash;
-   char *buffer;
-   long length;
-   long remaining;
-   int  printed;
-} bytestring_t;
-
-#define RUBY_DOMAIN   "ruby.yaml.org,2002"
-
-#ifndef StringValue
-#define StringValue(v)
-#endif
-
-/*
- * symbols and constants
- */
-static ID s_new, s_utc, s_at, s_to_f, s_read, s_binmode, s_call, s_transfer, s_update, s_dup, s_match, s_keys, s_to_str, s_unpack, s_tr_bang, s_anchors, s_default_set;
-static VALUE sym_model, sym_generic, sym_input, sym_bytecode;
-static VALUE sym_scalar, sym_seq, sym_map;
-VALUE cDate, cParser, cLoader, cNode, cPrivateType, cDomainType, cBadAlias, cDefaultKey, cMergeKey, cEmitter;
-VALUE oDefaultLoader;
-
-/*
- * my private collection of numerical oddities.
- */
-static double S_zero()    { return 0.0; }
-static double S_one() { return 1.0; }
-static double S_inf() { return S_one() / S_zero(); }
-static double S_nan() { return S_zero() / S_zero(); }
-
-static VALUE syck_node_transform( VALUE );
-
-/*
- * handler prototypes
- */
-SYMID rb_syck_parse_handler _((SyckParser *, SyckNode *));
-SYMID rb_syck_load_handler _((SyckParser *, SyckNode *));
-void rb_syck_err_handler _((SyckParser *, char *));
-SyckNode * rb_syck_bad_anchor_handler _((SyckParser *, char *));
-void rb_syck_output_handler _((SyckEmitter *, char *, long));
-
-struct parser_xtra {
-    VALUE data;  /* Borrowed this idea from marshal.c to fix [ruby-core:8067] problem */
-    VALUE proc;
-    int taint;
-};
-
-/*
- * Convert YAML to bytecode
- */
-VALUE
-rb_syck_compile(self, port)
-	VALUE self, port;
-{
-    SYMID oid;
-    int taint;
-    char *ret;
-    VALUE bc;
-    bytestring_t *sav; 
-
-    SyckParser *parser = syck_new_parser();
-	taint = syck_parser_assign_io(parser, port);
-    syck_parser_handler( parser, syck_yaml2byte_handler );
-    syck_parser_error_handler( parser, NULL );
-    syck_parser_implicit_typing( parser, 0 );
-    syck_parser_taguri_expansion( parser, 0 );
-    oid = syck_parse( parser );
-    syck_lookup_sym( parser, oid, (char **)&sav );
-
-    ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
-    ret[0] = '\0';
-    strcat( ret, "D\n" );
-    strcat( ret, sav->buffer );
-
-    syck_free_parser( parser );
-
-    bc = rb_str_new2( ret );
-    if ( taint )      OBJ_TAINT( bc );
-    return bc;
-}
-
-/*
- * read from io.
- */
-long
-rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
-{
-    long len = 0;
-
-    ASSERT( str != NULL );
-    max_size -= skip;
-    if ( max_size < 0 ) max_size = 0;
-
-    if ( max_size > 0 )
-    {
-        /*
-         * call io#read.
-         */
-        VALUE src = (VALUE)str->ptr;
-        VALUE n = LONG2NUM(max_size);
-        VALUE str = rb_funcall2(src, s_read, 1, &n);
-        if (!NIL_P(str))
-        {
-            len = RSTRING(str)->len;
-            memcpy( buf + skip, RSTRING(str)->ptr, len );
-        }
-    }
-    len += skip;
-    buf[len] = '\0';
-    return len;
-}
-
-/*
- * determine: are we reading from a string or io?
- * (returns tainted? boolean)
- */
-int
-syck_parser_assign_io(parser, port)
-	SyckParser *parser;
-	VALUE port;
-{
-    int taint = Qtrue;
-    if (rb_respond_to(port, s_to_str)) {
-	    taint = OBJ_TAINTED(port); /* original taintedness */
-	    StringValue(port);	       /* possible conversion */
-	    syck_parser_str( parser, RSTRING(port)->ptr, RSTRING(port)->len, NULL );
-    }
-    else if (rb_respond_to(port, s_read)) {
-        if (rb_respond_to(port, s_binmode)) {
-            rb_funcall2(port, s_binmode, 0, 0);
-        }
-        syck_parser_str( parser, (char *)port, 0, rb_syck_io_str_read );
-    }
-    else {
-        rb_raise(rb_eTypeError, "instance of IO needed");
-    }
-    return taint;
-}
-
-/*
- * Get value in hash by key, forcing an empty hash if nil.
- */
-VALUE
-syck_get_hash_aref(hsh, key)
-    VALUE hsh, key;
-{
-   VALUE val = rb_hash_aref( hsh, key );
-   if ( NIL_P( val ) ) 
-   {
-       val = rb_hash_new();
-       rb_hash_aset(hsh, key, val);
-   }
-   return val;
-}
-
-/*
- * creating timestamps
- */
-SYMID
-rb_syck_mktime(str)
-    char *str;
-{
-    VALUE time;
-    char *ptr = str;
-    VALUE year, mon, day, hour, min, sec, usec;
-
-    /* Year*/
-    ptr[4] = '\0';
-    year = INT2FIX(strtol(ptr, NULL, 10));
-
-    /* Month*/
-    ptr += 4;
-    while ( !isdigit( *ptr ) ) ptr++;
-    mon = INT2FIX(strtol(ptr, NULL, 10));
-
-    /* Day*/
-    ptr += 2;
-    while ( !isdigit( *ptr ) ) ptr++;
-    day = INT2FIX(strtol(ptr, NULL, 10));
-
-    /* Hour*/
-    ptr += 2;
-    while ( !isdigit( *ptr ) ) ptr++;
-    hour = INT2FIX(strtol(ptr, NULL, 10));
-
-    /* Minute */
-    ptr += 2;
-    while ( !isdigit( *ptr ) ) ptr++;
-    min = INT2FIX(strtol(ptr, NULL, 10));
-
-    /* Second */
-    ptr += 2;
-    while ( !isdigit( *ptr ) ) ptr++;
-    sec = INT2FIX(strtol(ptr, NULL, 10));
-
-    /* Millisecond */
-    ptr += 2;
-    if ( *ptr == '.' )
-    {
-        usec = INT2FIX( strtod( ptr, NULL ) * 1000000 );
-    }
-    else
-    {
-        usec = INT2FIX( 0 );
-    }
-
-    /* Make UTC time*/
-    time = rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, usec);
-
-    /* Time Zone*/
-    while ( *ptr != 'Z' && *ptr != '+' && *ptr != '-' && *ptr != '\0' ) ptr++;
-    if ( *ptr == '-' || *ptr == '+' )
-    {
-        double tz_offset = 0;
-        double utc_time = 0;
-        tz_offset += strtod(ptr, NULL) * 3600;
-
-        while ( *ptr != ':' && *ptr != '\0' ) ptr++;
-        if ( *ptr == ':' )
-        {
-            ptr += 1;
-            if ( tz_offset < 0 )
-            {
-                tz_offset -= strtod(ptr, NULL) * 60;
-            }
-            else
-            {
-                tz_offset += strtod(ptr, NULL) * 60;
-            }
-        }
-
-        /* Make TZ time*/
-        utc_time = NUM2DBL(rb_funcall(time, s_to_f, 0));
-        utc_time -= tz_offset;
-        time = rb_funcall(rb_cTime, s_at, 1, rb_float_new(utc_time));
-    }
-
-    return time;
-}
-
-/*
- * {generic mode} node handler
- * - Loads data into Node classes
- */
-SYMID
-rb_syck_parse_handler(p, n)
-    SyckParser *p;
-    SyckNode *n;
-{
-    VALUE t, obj, v = Qnil;
-    int i;
-    struct parser_xtra *bonus;
-
-    obj = rb_obj_alloc(cNode);
-    if ( n->type_id != NULL )
-    {
-        t = rb_str_new2(n->type_id);
-        rb_iv_set(obj, "@type_id", t);
-    }
-
-    switch (n->kind)
-    {
-        case syck_str_kind:
-            rb_iv_set(obj, "@kind", sym_scalar);
-            v = rb_str_new( n->data.str->ptr, n->data.str->len );
-        break;
-
-        case syck_seq_kind:
-            rb_iv_set(obj, "@kind", sym_seq);
-            v = rb_ary_new2( n->data.list->idx );
-            for ( i = 0; i < n->data.list->idx; i++ )
-            {
-                rb_ary_store( v, i, syck_seq_read( n, i ) );
-            }
-        break;
-
-        case syck_map_kind:
-            rb_iv_set(obj, "@kind", sym_map);
-            v = rb_hash_new();
-            for ( i = 0; i < n->data.pairs->idx; i++ )
-            {
-                VALUE key = syck_node_transform( syck_map_read( n, map_key, i ) );
-                VALUE val = rb_ary_new();
-                rb_ary_push(val, syck_map_read( n, map_key, i ));
-                rb_ary_push(val, syck_map_read( n, map_value, i ));
-
-                rb_hash_aset( v, key, val );
-            }
-        break;
-    }
-
-    bonus = (struct parser_xtra *)p->bonus;
-    if ( bonus->taint)      OBJ_TAINT( obj );
-	if ( bonus->proc != 0 ) rb_funcall(bonus->proc, s_call, 1, v);
-
-    rb_iv_set(obj, "@value", v);
-    rb_hash_aset(bonus->data, INT2FIX(RHASH(bonus->data)->tbl->num_entries), obj);
-    return obj;
-}
-
-/*
- * handles merging of an array of hashes
- * (see http://www.yaml.org/type/merge/)
- */
-VALUE
-syck_merge_i( entry, hsh )
-    VALUE entry, hsh;
-{
-	if ( rb_obj_is_kind_of( entry, rb_cHash ) )
-	{
-		rb_funcall( hsh, s_update, 1, entry );
-	}
-    return Qnil;
-}
-
-/*
- * build a syck node from a Ruby VALUE
- */
-SyckNode *
-rb_new_syck_node( obj, type_id )
-    VALUE obj, type_id;
-{
-    long i = 0;
-    SyckNode *n = NULL;
-
-    if (rb_respond_to(obj, s_to_str)) 
-    {
-	    StringValue(obj);	       /* possible conversion */
-        n = syck_alloc_str();
-        n->data.str->ptr = RSTRING(obj)->ptr;
-        n->data.str->len = RSTRING(obj)->len;
-    }
-	else if ( rb_obj_is_kind_of( obj, rb_cArray ) )
-    {
-        n = syck_alloc_seq();
-        for ( i = 0; i < RARRAY(obj)->len; i++ )
-        {
-            syck_seq_add(n, rb_ary_entry(obj, i));
-        }
-    }
-    else if ( rb_obj_is_kind_of( obj, rb_cHash ) )
-    {
-        VALUE keys;
-        n = syck_alloc_map();
-        keys = rb_funcall( obj, s_keys, 0 );
-        for ( i = 0; i < RARRAY(keys)->len; i++ )
-        {
-            VALUE key = rb_ary_entry(keys, i);
-            syck_map_add(n, key, rb_hash_aref(obj, key));
-        }
-    }
-
-    if ( n!= NULL && rb_respond_to( type_id, s_to_str ) ) 
-    {
-        StringValue(type_id);
-        n->type_id = syck_strndup( RSTRING(type_id)->ptr, RSTRING(type_id)->len );
-    }
-
-    return n;
-}
-
-/*
- * default handler for ruby.yaml.org types
- */
-int
-yaml_org_handler( n, ref )
-    SyckNode *n;
-    VALUE *ref;
-{
-    char *type_id = n->type_id;
-    int transferred = 0;
-    long i = 0;
-    VALUE obj = Qnil;
-
-    switch (n->kind)
-    {
-        case syck_str_kind:
-            transferred = 1;
-            if ( type_id == NULL || strcmp( type_id, "str" ) == 0 )
-            {
-                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-            }
-            else if ( strcmp( type_id, "null" ) == 0 )
-            {
-                obj = Qnil;
-            }
-            else if ( strcmp( type_id, "binary" ) == 0 )
-            {
-                VALUE arr;
-                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-                rb_funcall( obj, s_tr_bang, 2, rb_str_new2( "\n\t " ), rb_str_new2( "" ) );
-                arr = rb_funcall( obj, s_unpack, 1, rb_str_new2( "m" ) );
-                obj = rb_ary_shift( arr );
-            }
-            else if ( strcmp( type_id, "bool#yes" ) == 0 )
-            {
-                obj = Qtrue;
-            }
-            else if ( strcmp( type_id, "bool#no" ) == 0 )
-            {
-                obj = Qfalse;
-            }
-            else if ( strcmp( type_id, "int#hex" ) == 0 )
-            {
-                obj = rb_cstr2inum( n->data.str->ptr, 16 );
-            }
-            else if ( strcmp( type_id, "int#oct" ) == 0 )
-            {
-                obj = rb_cstr2inum( n->data.str->ptr, 8 );
-            }
-            else if ( strncmp( type_id, "int", 3 ) == 0 )
-            {
-                syck_str_blow_away_commas( n );
-                obj = rb_cstr2inum( n->data.str->ptr, 10 );
-            }
-            else if ( strcmp( type_id, "float#nan" ) == 0 )
-            {
-                obj = rb_float_new( S_nan() );
-            }
-            else if ( strcmp( type_id, "float#inf" ) == 0 )
-            {
-                obj = rb_float_new( S_inf() );
-            }
-            else if ( strcmp( type_id, "float#neginf" ) == 0 )
-            {
-                obj = rb_float_new( -S_inf() );
-            }
-            else if ( strncmp( type_id, "float", 5 ) == 0 )
-            {
-                double f;
-                syck_str_blow_away_commas( n );
-                f = strtod( n->data.str->ptr, NULL );
-                obj = rb_float_new( f );
-            }
-            else if ( strcmp( type_id, "timestamp#iso8601" ) == 0 )
-            {
-                obj = rb_syck_mktime( n->data.str->ptr );
-            }
-            else if ( strcmp( type_id, "timestamp#spaced" ) == 0 )
-            {
-                obj = rb_syck_mktime( n->data.str->ptr );
-            }
-            else if ( strcmp( type_id, "timestamp#ymd" ) == 0 )
-            {
-                char *ptr = n->data.str->ptr;
-                VALUE year, mon, day;
-
-                /* Year*/
-                ptr[4] = '\0';
-                year = INT2FIX(strtol(ptr, NULL, 10));
-
-                /* Month*/
-                ptr += 4;
-                while ( !isdigit( *ptr ) ) ptr++;
-                mon = INT2FIX(strtol(ptr, NULL, 10));
-
-                /* Day*/
-                ptr += 2;
-                while ( !isdigit( *ptr ) ) ptr++;
-                day = INT2FIX(strtol(ptr, NULL, 10));
-
-                obj = rb_funcall( cDate, s_new, 3, year, mon, day );
-            }
-            else if ( strncmp( type_id, "timestamp", 9 ) == 0 )
-            {
-                obj = rb_syck_mktime( n->data.str->ptr );
-            }
-			else if ( strncmp( type_id, "merge", 5 ) == 0 )
-			{
-				obj = rb_funcall( cMergeKey, s_new, 0 );
-			}
-			else if ( strncmp( type_id, "default", 7 ) == 0 )
-			{
-				obj = rb_funcall( cDefaultKey, s_new, 0 );
-			}
-            else
-            {
-                transferred = 0;
-                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-            }
-        break;
-
-        case syck_seq_kind:
-            if ( type_id == NULL || strcmp( type_id, "seq" ) == 0 )
-            {
-                transferred = 1;
-            }
-            obj = rb_ary_new2( n->data.list->idx );
-            for ( i = 0; i < n->data.list->idx; i++ )
-            {
-                rb_ary_store( obj, i, syck_seq_read( n, i ) );
-            }
-        break;
-
-        case syck_map_kind:
-            if ( type_id == NULL || strcmp( type_id, "map" ) == 0 )
-            {
-                transferred = 1;
-            }
-            obj = rb_hash_new();
-            for ( i = 0; i < n->data.pairs->idx; i++ )
-            {
-				VALUE k = syck_map_read( n, map_key, i );
-				VALUE v = syck_map_read( n, map_value, i );
-				int skip_aset = 0;
-
-				/*
-				 * Handle merge keys
-				 */
-				if ( rb_obj_is_kind_of( k, cMergeKey ) )
-				{
-					if ( rb_obj_is_kind_of( v, rb_cHash ) )
-					{
-						VALUE dup = rb_funcall( v, s_dup, 0 );
-						rb_funcall( dup, s_update, 1, obj );
-						obj = dup;
-						skip_aset = 1;
-					}
-					else if ( rb_obj_is_kind_of( v, rb_cArray ) )
-					{
-						VALUE end = rb_ary_pop( v );
-						if ( rb_obj_is_kind_of( end, rb_cHash ) )
-						{
-							VALUE dup = rb_funcall( end, s_dup, 0 );
-							v = rb_ary_reverse( v );
-							rb_ary_push( v, obj );
-							rb_iterate( rb_each, v, syck_merge_i, dup );
-							obj = dup;
-							skip_aset = 1;
-						}
-					}
-				}
-                else if ( rb_obj_is_kind_of( k, cDefaultKey ) )
-                {
-                    rb_funcall( obj, s_default_set, 1, v );
-                    skip_aset = 1;
-                }
-
-				if ( ! skip_aset )
-				{
-					rb_hash_aset( obj, k, v );
-				}
-            }
-        break;
-    }
-
-    *ref = obj;
-    return transferred;
-}
-
-/*
- * {native mode} node handler
- * - Converts data into native Ruby types
- */
-SYMID
-rb_syck_load_handler(p, n)
-    SyckParser *p;
-    SyckNode *n;
-{
-    VALUE obj = Qnil;
-    struct parser_xtra *bonus;
-
-    /*
-     * Attempt common transfers
-     */
-    int transferred = yaml_org_handler(n, &obj);
-    if ( transferred == 0 && n->type_id != NULL )
-    {
-        obj = rb_funcall( oDefaultLoader, s_transfer, 2, rb_str_new2( n->type_id ), obj );
-    }
-
-    /*
-     * ID already set, let's alter the symbol table to accept the new object
-     */
-    if (n->id > 0)
-    {
-        MEMCPY((void *)n->id, (void *)obj, RVALUE, 1);
-        MEMZERO((void *)obj, RVALUE, 1);
-        obj = n->id;
-    }
-
-    bonus = (struct parser_xtra *)p->bonus;
-    if ( bonus->taint)      OBJ_TAINT( obj );
-	if ( bonus->proc != 0 ) rb_funcall(bonus->proc, s_call, 1, obj);
-
-    rb_hash_aset(bonus->data, INT2FIX(RHASH(bonus->data)->tbl->num_entries), obj);
-    return obj;
-}
-
-/*
- * friendly errors.
- */
-void
-rb_syck_err_handler(p, msg)
-    SyckParser *p;
-    char *msg;
-{
-    char *endl = p->cursor;
-
-    while ( *endl != '\0' && *endl != '\n' )
-        endl++;
-
-    endl[0] = '\0';
-    rb_raise(rb_eArgError, "%s on line %d, col %d: `%s'",
-           msg,
-           p->linect,
-           p->cursor - p->lineptr, 
-           p->lineptr); 
-}
-
-/*
- * provide bad anchor object to the parser.
- */
-SyckNode *
-rb_syck_bad_anchor_handler(p, a)
-    SyckParser *p;
-    char *a;
-{
-    SyckNode *badanc = syck_new_map( rb_str_new2( "name" ), rb_str_new2( a ) );
-    badanc->type_id = syck_strndup( "tag:ruby.yaml.org,2002:object:YAML::Syck::BadAlias", 53 );
-    return badanc;
-}
-
-/*
- * data loaded based on the model requested.
- */
-void
-syck_set_model( parser, input, model )
-	SyckParser *parser;
-	VALUE input, model;
-{
-	if ( model == sym_generic )
-	{
-		syck_parser_handler( parser, rb_syck_parse_handler );
-		syck_parser_implicit_typing( parser, 1 );
-		syck_parser_taguri_expansion( parser, 1 );
-	}
-	else
-	{
-		syck_parser_handler( parser, rb_syck_load_handler );
-		syck_parser_implicit_typing( parser, 1 );
-		syck_parser_taguri_expansion( parser, 0 );
-	}
-    if ( input == sym_bytecode )
-    {
-        syck_parser_set_input_type( parser, syck_bytecode_utf8 );
-    }
-    syck_parser_error_handler( parser, rb_syck_err_handler );
-    syck_parser_bad_anchor_handler( parser, rb_syck_bad_anchor_handler );
-}
-
-/*
- * mark parser nodes
- */
-static void
-syck_mark_parser(parser)
-    SyckParser *parser;
-{
-    rb_gc_mark(parser->root);
-    rb_gc_mark(parser->root_on_error);
-}
-
-/*
- * YAML::Syck::Parser.new
- */
-VALUE 
-syck_parser_new(argc, argv, class)
-    int argc;
-    VALUE *argv;
-	VALUE class;
-{
-	VALUE pobj, options, init_argv[1];
-    SyckParser *parser = syck_new_parser();
-
-    rb_scan_args(argc, argv, "01", &options);
-	pobj = Data_Wrap_Struct( class, syck_mark_parser, syck_free_parser, parser );
-
-    syck_parser_set_root_on_error( parser, Qnil );
-
-    if ( ! rb_obj_is_instance_of( options, rb_cHash ) )
-    {
-        options = rb_hash_new();
-    }
-	init_argv[0] = options;
-	rb_obj_call_init(pobj, 1, init_argv);
-	return pobj;
-}
-
-/*
- * YAML::Syck::Parser.initialize( options )
- */
-static VALUE
-syck_parser_initialize( self, options )
-    VALUE self, options;
-{
-	rb_iv_set(self, "@options", options);
-	return self;
-}
-
-/*
- * YAML::Syck::Parser.load( IO or String )
- */
-VALUE
-syck_parser_load(argc, argv, self)
-    int argc;
-    VALUE *argv;
-	VALUE self;
-{
-    VALUE port, proc, model, input;
-	SyckParser *parser;
-    struct parser_xtra bonus;
-    volatile VALUE hash;	/* protect from GC */
-
-    rb_scan_args(argc, argv, "11", &port, &proc);
-	Data_Get_Struct(self, SyckParser, parser);
-
-	input = rb_hash_aref( rb_iv_get( self, "@options" ), sym_input );
-	model = rb_hash_aref( rb_iv_get( self, "@options" ), sym_model );
-	syck_set_model( parser, input, model );
-
-	bonus.taint = syck_parser_assign_io(parser, port);
-    bonus.data = hash = rb_hash_new();
-	if ( NIL_P( proc ) ) bonus.proc = 0;
-    else                 bonus.proc = proc;
-    
-	parser->bonus = (void *)&bonus;
-
-    return syck_parse( parser );
-}
-
-/*
- * YAML::Syck::Parser.load_documents( IO or String ) { |doc| }
- */
-VALUE
-syck_parser_load_documents(argc, argv, self)
-    int argc;
-    VALUE *argv;
-	VALUE self;
-{
-    VALUE port, proc, v, input, model;
-	SyckParser *parser;
-    struct parser_xtra bonus;
-    volatile VALUE hash;
-
-    rb_scan_args(argc, argv, "1&", &port, &proc);
-	Data_Get_Struct(self, SyckParser, parser);
-
-	input = rb_hash_aref( rb_iv_get( self, "@options" ), sym_input );
-	model = rb_hash_aref( rb_iv_get( self, "@options" ), sym_model );
-	syck_set_model( parser, input, model );
-    
-	bonus.taint = syck_parser_assign_io(parser, port);
-    while ( 1 )
-	{
-        /* Reset hash for tracking nodes */
-        bonus.data = hash = rb_hash_new();
-        bonus.proc = 0;
-        parser->bonus = (void *)&bonus;
-
-        /* Parse a document */
-    	v = syck_parse( parser );
-        if ( parser->eof == 1 )
-        {
-            break;
-        }
-
-        /* Pass document to block */
-		rb_funcall( proc, s_call, 1, v );
-	}
-
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Loader.initialize
- */
-static VALUE
-syck_loader_initialize( self )
-    VALUE self;
-{
-    VALUE families;
-
-       rb_iv_set(self, "@families", rb_hash_new() );
-    rb_iv_set(self, "@private_types", rb_hash_new() );
-    rb_iv_set(self, "@anchors", rb_hash_new() );
-    families = rb_iv_get(self, "@families");
-
-    rb_hash_aset(families, rb_str_new2( YAML_DOMAIN ), rb_hash_new());
-    rb_hash_aset(families, rb_str_new2( RUBY_DOMAIN ), rb_hash_new());
-
-       return self;
-}
-
-/*
- * Add type family, used by add_*_type methods.
- */
-VALUE
-syck_loader_add_type_family( self, domain, type_re, proc )
-    VALUE self, domain, type_re, proc;
-{
-    VALUE families, domain_types;
-
-    families = rb_iv_get(self, "@families");
-    domain_types = syck_get_hash_aref(families, domain);
-    rb_hash_aset( domain_types, type_re, proc );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Loader.add_domain_type
- */
-VALUE
-syck_loader_add_domain_type( argc, argv, self )
-    int argc;
-    VALUE *argv;
-       VALUE self;
-{
-    VALUE domain, type_re, proc;
-
-    rb_scan_args(argc, argv, "2&", &domain, &type_re, &proc);
-    syck_loader_add_type_family( self, domain, type_re, proc );
-    return Qnil;
-}
-
-
-/*
- * YAML::Syck::Loader.add_builtin_type
- */
-VALUE
-syck_loader_add_builtin_type( argc, argv, self )
-    int argc;
-    VALUE *argv;
-       VALUE self;
-{
-    VALUE type_re, proc;
-
-    rb_scan_args(argc, argv, "1&", &type_re, &proc);
-    syck_loader_add_type_family( self, rb_str_new2( YAML_DOMAIN ), type_re, proc );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Loader.add_ruby_type
- */
-VALUE
-syck_loader_add_ruby_type( argc, argv, self )
-    int argc;
-    VALUE *argv;
-       VALUE self;
-{
-    VALUE type_re, proc;
-
-    rb_scan_args(argc, argv, "1&", &type_re, &proc);
-    syck_loader_add_type_family( self, rb_str_new2( RUBY_DOMAIN ), type_re, proc );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Loader.add_private_type
- */
-VALUE
-syck_loader_add_private_type( argc, argv, self )
-    int argc;
-    VALUE *argv;
-       VALUE self;
-{
-    VALUE type_re, proc, priv_types;
-
-    rb_scan_args(argc, argv, "1&", &type_re, &proc);
-
-    priv_types = rb_iv_get(self, "@private_types");
-    rb_hash_aset( priv_types, type_re, proc );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Loader#detect 
- */
-VALUE
-syck_loader_detect_implicit( self, val )
-    VALUE self, val;
-{
-    char *type_id;
-
-    if ( TYPE(val) == T_STRING )
-    {
-        type_id = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
-        return rb_str_new2( type_id );
-    }
-
-    return rb_str_new2( "" );
-}
-
-/*
- * iterator to search a type hash for a match.
- */
-static VALUE
-transfer_find_i(entry, col)
-    VALUE entry, col;
-{
-    VALUE key = rb_ary_entry( entry, 0 );
-    VALUE tid = rb_ary_entry( col, 0 );
-	if ( rb_respond_to( key, s_match ) )
-	{
-		VALUE match = rb_funcall( key, rb_intern("match"), 1, tid );
-		if ( ! NIL_P( match ) )
-		{
-			rb_ary_push( col, rb_ary_entry( entry, 1 ) );
-			rb_iter_break();
-		}
-	}
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Loader#transfer
- */
-VALUE
-syck_loader_transfer( self, type, val )
-    VALUE self, type, val;
-{
-    char *taguri = NULL;
-
-    if (NIL_P(type) || !RSTRING(type)->ptr || RSTRING(type)->len == 0) 
-    {
-        /*
-         * Empty transfer, detect type
-         */
-        if ( TYPE(val) == T_STRING )
-        {
-            StringValue(val);
-            taguri = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
-            taguri = syck_taguri( YAML_DOMAIN, taguri, strlen( taguri ) );
-        }
-    }
-    else
-    {
-        taguri = syck_type_id_to_uri( RSTRING(type)->ptr );
-    }
-
-    if ( taguri != NULL )
-    {
-        int transferred = 0;
-        VALUE scheme, name, type_hash, domain = Qnil, type_proc = Qnil;
-        VALUE type_uri = rb_str_new2( taguri );
-        VALUE str_taguri = rb_str_new2("tag");
-        VALUE str_xprivate = rb_str_new2("x-private");
-        VALUE str_yaml_domain = rb_str_new2(YAML_DOMAIN);
-        VALUE parts = rb_str_split( type_uri, ":" );
-
-        scheme = rb_ary_shift( parts );
-
-        if ( rb_str_cmp( scheme, str_xprivate ) == 0 )
-        {
-            name = rb_ary_join( parts, rb_str_new2( ":" ) );
-            type_hash = rb_iv_get(self, "@private_types");
-        }
-        else if ( rb_str_cmp( scheme, str_taguri ) == 0 )
-        {
-            domain = rb_ary_shift( parts );
-            name = rb_ary_join( parts, rb_str_new2( ":" ) );
-            type_hash = rb_iv_get(self, "@families");
-            type_hash = rb_hash_aref(type_hash, domain);
-
-            /*
-             * Route yaml.org types through the transfer
-             * method here in this extension
-             */
-            if ( rb_str_cmp( domain, str_yaml_domain ) == 0 )
-            {
-                SyckNode *n = rb_new_syck_node(val, name);
-                if ( n != NULL )
-                {
-                    transferred = yaml_org_handler(n, &val);
-                    S_FREE( n );
-                }
-            }
-
-        }
-        else
-        {
-               rb_raise(rb_eTypeError, "invalid typing scheme: %s given",
-                       scheme);
-        }
-
-        if ( ! transferred )
-        {
-            if ( rb_obj_is_instance_of( type_hash, rb_cHash ) )
-            {
-                type_proc = rb_hash_aref( type_hash, name );
-                if ( NIL_P( type_proc ) )
-                {
-                    VALUE col = rb_ary_new();
-                    rb_ary_push( col, name );
-                    rb_iterate(rb_each, type_hash, transfer_find_i, col );
-                    name = rb_ary_shift( col );
-                    type_proc = rb_ary_shift( col );
-                }
-            }
-
-            if ( rb_respond_to( type_proc, s_call ) )
-            {
-                val = rb_funcall(type_proc, s_call, 2, type_uri, val);
-            }
-            else if ( rb_str_cmp( scheme, str_xprivate ) == 0 )
-            {
-                val = rb_funcall(cPrivateType, s_new, 2, name, val);
-            }
-            else 
-            {
-                val = rb_funcall(cDomainType, s_new, 3, domain, name, val);
-            }
-            transferred = 1;
-        }
-    }
-
-    return val;
-}
-
-/*
- * YAML::Syck::BadAlias.initialize
- */
-VALUE
-syck_badalias_initialize( self, val )
-    VALUE self, val;
-{
-    rb_iv_set( self, "@name", val );
-    return self;
-}
-
-/*
- * YAML::Syck::DomainType.initialize
- */
-VALUE
-syck_domaintype_initialize( self, domain, type_id, val )
-    VALUE self, type_id, val;
-{
-    rb_iv_set( self, "@domain", domain );
-    rb_iv_set( self, "@type_id", type_id );
-    rb_iv_set( self, "@value", val );
-    return self;
-}
-
-/*
- * YAML::Syck::PrivateType.initialize
- */
-VALUE
-syck_privatetype_initialize( self, type_id, val )
-    VALUE self, type_id, val;
-{
-    rb_iv_set( self, "@type_id", type_id );
-    rb_iv_set( self, "@value", val );
-    return self;
-}
-
-/*
- * YAML::Syck::Node.initialize
- */
-VALUE
-syck_node_initialize( self, type_id, val )
-    VALUE self, type_id, val;
-{
-    rb_iv_set( self, "@type_id", type_id );
-    rb_iv_set( self, "@value", val );
-    return self;
-}
-
-VALUE
-syck_node_thash( entry, t )
-    VALUE entry, t;
-{
-    VALUE key, val;
-    key = rb_ary_entry( entry, 0 );
-    val = syck_node_transform( rb_ary_entry( rb_ary_entry( entry, 1 ), 1 ) );
-    rb_hash_aset( t, key, val );
-    return Qnil;
-}
-
-VALUE
-syck_node_ahash( entry, t )
-    VALUE entry, t;
-{
-    VALUE val = syck_node_transform( entry );
-    rb_ary_push( t, val );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Node.transform
- */
-VALUE
-syck_node_transform( self )
-    VALUE self;
-{
-    VALUE t = Qnil;
-    VALUE type_id = rb_iv_get( self, "@type_id" );
-    VALUE val = rb_iv_get( self, "@value" );
-    if ( rb_obj_is_instance_of( val, rb_cHash ) )
-    {
-        t = rb_hash_new();
-        rb_iterate( rb_each, val, syck_node_thash, t );
-    }
-    else if ( rb_obj_is_instance_of( val, rb_cArray ) )
-    {
-        t = rb_ary_new();
-        rb_iterate( rb_each, val, syck_node_ahash, t );
-    }
-    else
-    {
-        t = val;
-    }
-    return rb_funcall( oDefaultLoader, s_transfer, 2, type_id, t );
-}
-
-/*
- * Handle output from the emitter
- */
-void 
-rb_syck_output_handler( emitter, str, len )
-    SyckEmitter *emitter;
-    char *str;
-    long len;
-{
-    VALUE dest = (VALUE)emitter->bonus;
-    if ( rb_respond_to( dest, s_to_str ) ) {
-        rb_str_cat( dest, str, len );
-    } else {
-        rb_io_write( dest, rb_str_new( str, len ) );
-    }
-}
-
-/*
- * Mark emitter values.
- */
-static void
-syck_mark_emitter(emitter)
-    SyckEmitter *emitter;
-{
-    rb_gc_mark(emitter->ignore_id);
-    if ( emitter->bonus != NULL )
-    {
-        rb_gc_mark( (VALUE)emitter->bonus );
-    }
-}
-
-/*
- * YAML::Syck::Emitter.new
- */
-VALUE 
-syck_emitter_new(argc, argv, class)
-    int argc;
-    VALUE *argv;
-	VALUE class;
-{
-	VALUE pobj, options, init_argv[1];
-    SyckEmitter *emitter = syck_new_emitter();
-    syck_emitter_ignore_id( emitter, Qnil );
-    syck_emitter_handler( emitter, rb_syck_output_handler );
-
-    emitter->bonus = (void *)rb_str_new2( "" );
-
-    rb_scan_args(argc, argv, "01", &options);
-	pobj = Data_Wrap_Struct( class, syck_mark_emitter, syck_free_emitter, emitter );
-
-    if ( ! rb_obj_is_instance_of( options, rb_cHash ) )
-    {
-        options = rb_hash_new();
-    }
-	init_argv[0] = options;
-	rb_obj_call_init(pobj, 1, init_argv);
-	return pobj;
-}
-
-/*
- * YAML::Syck::Emitter.initialize( options )
- */
-static VALUE
-syck_emitter_initialize( self, options )
-    VALUE self, options;
-{
-	rb_iv_set(self, "@options", options);
-	return self;
-}
-
-/*
- * YAML::Syck::Emitter.level
- */
-VALUE
-syck_emitter_level_m( self )
-    VALUE self;
-{
-    SyckEmitter *emitter;
-
-	Data_Get_Struct(self, SyckEmitter, emitter);
-    return LONG2NUM( emitter->level );
-}
-
-/*
- * YAML::Syck::Emitter.flush
- */
-VALUE
-syck_emitter_flush_m( self )
-    VALUE self;
-{
-    SyckEmitter *emitter;
-
-	Data_Get_Struct(self, SyckEmitter, emitter);
-    syck_emitter_flush( emitter, 0 );
-    return self;
-}
-
-/*
- * YAML::Syck::Emitter.write( str )
- */
-VALUE
-syck_emitter_write_m( self, str )
-    VALUE self, str;
-{
-    SyckEmitter *emitter;
-
-	Data_Get_Struct(self, SyckEmitter, emitter);
-    syck_emitter_write( emitter, RSTRING(str)->ptr, RSTRING(str)->len );
-    return self;
-}
-
-/*
- * YAML::Syck::Emitter.simple( str )
- */
-VALUE
-syck_emitter_simple_write( self, str )
-    VALUE self, str;
-{
-    SyckEmitter *emitter;
-
-	Data_Get_Struct(self, SyckEmitter, emitter);
-    syck_emitter_simple( emitter, RSTRING(str)->ptr, RSTRING(str)->len );
-    return self;
-}
-
-/*
- * YAML::Syck::Emitter.start_object( object_id )
- */
-VALUE
-syck_emitter_start_object( self, oid )
-    VALUE self, oid;
-{
-    char *anchor_name;
-    SyckEmitter *emitter;
-
-	Data_Get_Struct(self, SyckEmitter, emitter);
-    anchor_name = syck_emitter_start_obj( emitter, oid );
-
-    if ( anchor_name == NULL )
-    {
-        return Qnil;
-    }
-
-    return rb_str_new2( anchor_name );
-}
-
-/*
- * YAML::Syck::Emitter.end_object( object_id )
- */
-VALUE
-syck_emitter_end_object( self, oid )
-    VALUE self, oid;
-{
-    SyckEmitter *emitter;
-
-	Data_Get_Struct(self, SyckEmitter, emitter);
-    syck_emitter_end_obj( emitter );
-
-    if ( emitter->level < 0 )
-    {
-        syck_emitter_flush( emitter, 0 );
-    }
-    return (VALUE)emitter->bonus;
-}
-
-/*
- * Initialize Syck extension
- */
-void
-Init_syck()
-{
-    VALUE rb_yaml = rb_define_module( "YAML" );
-    VALUE rb_syck = rb_define_module_under( rb_yaml, "Syck" );
-    rb_define_const( rb_syck, "VERSION", rb_str_new2( SYCK_VERSION ) );
-    rb_define_module_function( rb_syck, "compile", rb_syck_compile, 1 );
-
-	/*
-	 * Global symbols
-	 */
-    s_new = rb_intern("new");
-    s_utc = rb_intern("utc");
-    s_at = rb_intern("at");
-    s_to_f = rb_intern("to_f");
-    s_read = rb_intern("read");
-    s_anchors = rb_intern("anchors");
-    s_binmode = rb_intern("binmode");
-    s_transfer = rb_intern("transfer");
-    s_call = rb_intern("call");
-	s_update = rb_intern("update");
-	s_dup = rb_intern("dup");
-    s_default_set = rb_intern("default=");
-	s_match = rb_intern("match");
-	s_keys = rb_intern("keys");
-	s_to_str = rb_intern("to_str");
-	s_tr_bang = rb_intern("tr!");
-    s_unpack = rb_intern("unpack");
-
-	sym_model = ID2SYM(rb_intern("Model"));
-	sym_generic = ID2SYM(rb_intern("Generic"));
-	sym_input = ID2SYM(rb_intern("Input"));
-	sym_bytecode = ID2SYM(rb_intern("Bytecode"));
-    sym_map = ID2SYM(rb_intern("map"));
-    sym_scalar = ID2SYM(rb_intern("scalar"));
-    sym_seq = ID2SYM(rb_intern("seq"));
-
-    /*
-     * Load Date module
-     */
-    rb_require( "date" );
-    cDate = rb_funcall( rb_cObject, rb_intern("const_get"), 1, rb_str_new2("Date") );
-
-    /*
-     * Define YAML::Syck::Loader class
-     */
-    cLoader = rb_define_class_under( rb_syck, "Loader", rb_cObject );
-    rb_define_attr( cLoader, "families", 1, 1 );
-    rb_define_attr( cLoader, "private_types", 1, 1 );
-    rb_define_attr( cLoader, "anchors", 1, 1 );
-    rb_define_method( cLoader, "initialize", syck_loader_initialize, 0 );
-    rb_define_method( cLoader, "add_domain_type", syck_loader_add_domain_type, -1 );
-    rb_define_method( cLoader, "add_builtin_type", syck_loader_add_builtin_type, -1 );
-    rb_define_method( cLoader, "add_ruby_type", syck_loader_add_ruby_type, -1 );
-    rb_define_method( cLoader, "add_private_type", syck_loader_add_private_type, -1 );
-    rb_define_method( cLoader, "detect_implicit", syck_loader_detect_implicit, 1 );
-    rb_define_method( cLoader, "transfer", syck_loader_transfer, 2 );
-
-    oDefaultLoader = rb_funcall( cLoader, rb_intern( "new" ), 0 );
-    rb_define_const( rb_syck, "DefaultLoader", oDefaultLoader );
-
-    /*
-     * Define YAML::Syck::Parser class
-     */
-    cParser = rb_define_class_under( rb_syck, "Parser", rb_cObject );
-    rb_define_attr( cParser, "options", 1, 1 );
-	rb_define_singleton_method( cParser, "new", syck_parser_new, -1 );
-    rb_define_method(cParser, "initialize", syck_parser_initialize, 1);
-    rb_define_method(cParser, "load", syck_parser_load, -1);
-    rb_define_method(cParser, "load_documents", syck_parser_load_documents, -1);
-
-    /*
-     * Define YAML::Syck::Node class
-     */
-    cNode = rb_define_class_under( rb_syck, "Node", rb_cObject );
-    rb_define_attr( cNode, "kind", 1, 1 );
-    rb_define_attr( cNode, "type_id", 1, 1 );
-    rb_define_attr( cNode, "value", 1, 1 );
-    rb_define_attr( cNode, "anchor", 1, 1 );
-    rb_define_method( cNode, "initialize", syck_node_initialize, 2);
-    rb_define_method( cNode, "transform", syck_node_transform, 0);
-
-    /*
-     * Define YAML::Syck::PrivateType class
-     */
-    cPrivateType = rb_define_class_under( rb_syck, "PrivateType", rb_cObject );
-    rb_define_attr( cPrivateType, "type_id", 1, 1 );
-    rb_define_attr( cPrivateType, "value", 1, 1 );
-    rb_define_method( cPrivateType, "initialize", syck_privatetype_initialize, 2);
-
-    /*
-     * Define YAML::Syck::DomainType class
-     */
-    cDomainType = rb_define_class_under( rb_syck, "DomainType", rb_cObject );
-    rb_define_attr( cDomainType, "domain", 1, 1 );
-    rb_define_attr( cDomainType, "type_id", 1, 1 );
-    rb_define_attr( cDomainType, "value", 1, 1 );
-    rb_define_method( cDomainType, "initialize", syck_domaintype_initialize, 3);
-
-    /*
-     * Define YAML::Syck::BadAlias class
-     */
-    cBadAlias = rb_define_class_under( rb_syck, "BadAlias", rb_cObject );
-    rb_define_attr( cBadAlias, "name", 1, 1 );
-    rb_define_method( cBadAlias, "initialize", syck_badalias_initialize, 1);
-
-	/*
-	 * Define YAML::Syck::MergeKey class
-	 */
-	cMergeKey = rb_define_class_under( rb_syck, "MergeKey", rb_cObject );
-
-	/*
-	 * Define YAML::Syck::DefaultKey class
-	 */
-	cDefaultKey = rb_define_class_under( rb_syck, "DefaultKey", rb_cObject );
-
-    /*
-     * Define YAML::Syck::Emitter class
-     */
-    cEmitter = rb_define_class_under( rb_syck, "Emitter", rb_cObject );
-	rb_define_singleton_method( cEmitter, "new", syck_emitter_new, -1 );
-    rb_define_method( cEmitter, "initialize", syck_emitter_initialize, 1 );
-    rb_define_method( cEmitter, "level", syck_emitter_level_m, 0 );
-    rb_define_method( cEmitter, "write", syck_emitter_write_m, 1 );
-    rb_define_method( cEmitter, "<<", syck_emitter_write_m, 1 );
-    rb_define_method( cEmitter, "simple", syck_emitter_simple_write, 1 );
-    rb_define_method( cEmitter, "flush", syck_emitter_flush_m, 0 );
-    rb_define_method( cEmitter, "start_object", syck_emitter_start_object, 1 );
-    rb_define_method( cEmitter, "end_object", syck_emitter_end_object, 0 );
-}
-
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
deleted file mode 100644
index 8d319379a3..0000000000
--- a/ext/syck/syck.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * syck.c
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include <stdio.h>
-#include <string.h>
-
-#include "syck.h"
-#include "ruby.h"
-
-void syck_parser_pop_level( SyckParser * );
-
-/*
- * Custom assert
- */
-void 
-syck_assert( char *file_name, unsigned line_num )
-{
-    fflush( NULL );
-    fprintf( stderr, "\nAssertion failed: %s, line %u\n",
-             file_name, line_num );
-    fflush( stderr );
-    abort();
-}
-
-/*
- * Allocates and copies a string
- */
-char *
-syck_strndup( char *buf, long len )
-{
-    char *new = S_ALLOC_N( char, len + 1 );
-    S_MEMZERO( new, char, len + 1 );
-    S_MEMCPY( new, buf, char, len );
-    return new;
-}
-
-/*
- * Default FILE IO function
- */
-long
-syck_io_file_read( char *buf, SyckIoFile *file, long max_size, long skip )
-{
-    long len = 0;
-
-    ASSERT( file != NULL );
-
-    max_size -= skip;
-    len = fread( buf + skip, sizeof( char ), max_size, file->ptr );
-    len += skip;
-    buf[len] = '\0';
-
-    return len;
-}
-
-/*
- * Default string IO function
- */
-long
-syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
-{
-    char *beg;
-    long len = 0;
-
-    ASSERT( str != NULL );
-    beg = str->ptr;
-    if ( max_size >= 0 )
-    {
-        max_size -= skip;
-        if ( max_size < 0 ) max_size = 0;
-
-        str->ptr += max_size;
-        if ( str->ptr > str->end )
-        {
-            str->ptr = str->end;
-        }
-    }
-    else
-    {
-        /* Use exact string length */
-        while ( str->ptr < str->end ) {
-            if (*(str->ptr++) == '\n') break;
-        }
-    }
-    if ( beg < str->ptr )
-    {
-        len = ( str->ptr - beg ) + 1;
-        S_MEMCPY( buf + skip, beg, char, len );
-    }
-    len += skip;
-    buf[len] = '\0';
-
-    return len;
-}
-
-void
-syck_parser_reset_levels( SyckParser *p )
-{
-    while ( p->lvl_idx > 1 )
-    {
-        syck_parser_pop_level( p );
-    }
-
-    if ( p->lvl_idx < 1 )
-    {
-        p->lvl_idx = 1;
-        p->levels[0].spaces = -1;
-        p->levels[0].ncount = 0;
-        p->levels[0].domain = syck_strndup( "", 0 );
-    }
-    p->levels[0].status = syck_lvl_header;
-}
-
-void
-syck_parser_reset_cursor( SyckParser *p )
-{
-    if ( p->buffer == NULL )
-    {
-        p->buffer = S_ALLOC_N( char, p->bufsize );
-        S_MEMZERO( p->buffer, char, p->bufsize );
-    }
-    p->buffer[0] = '\0';
-
-    p->cursor = NULL;
-    p->lineptr = NULL;
-    p->linectptr = NULL;
-    p->token = NULL;
-    p->toktmp = NULL;
-    p->marker = NULL;
-    p->limit = NULL;
-
-    p->root = 0;
-    p->root_on_error = 0;
-    p->linect = 0;
-    p->eof = 0;
-    p->last_token = 0;
-    p->force_token = 0;
-}
-
-/*
- * Value to return on a parse error
- */
-void
-syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
-{
-    p->root_on_error = roer;
-}
-
-/*
- * Allocate the parser
- */
-SyckParser *
-syck_new_parser()
-{
-    SyckParser *p;
-    p = S_ALLOC( SyckParser );
-    p->lvl_capa = ALLOC_CT;
-    p->levels = S_ALLOC_N( SyckLevel, p->lvl_capa ); 
-    p->input_type = syck_yaml_utf8;
-    p->io_type = syck_io_str;
-    p->io.str = NULL;
-    p->syms = NULL;
-    p->anchors = NULL;
-    p->bad_anchors = NULL;
-    p->implicit_typing = 1;
-    p->taguri_expansion = 0;
-    p->bufsize = SYCK_BUFFERSIZE;
-    p->buffer = NULL;
-    p->lvl_idx = 0;
-    syck_parser_reset_levels( p );
-    return p;
-}
-
-int
-syck_add_sym( SyckParser *p, char *data )
-{
-    SYMID id = 0;
-    if ( p->syms == NULL )
-    {
-        p->syms = st_init_numtable();
-    }
-    id = p->syms->num_entries + 1;
-    st_insert( p->syms, id, (st_data_t)data );
-    return id;
-}
-
-int
-syck_lookup_sym( SyckParser *p, SYMID id, char **data )
-{
-    if ( p->syms == NULL ) return 0;
-    return st_lookup( p->syms, id, (st_data_t *)data );
-}
-
-int
-syck_st_free_nodes( char *key, SyckNode *n, char *arg )
-{
-    syck_free_node( n );
-    return ST_CONTINUE;
-}
-
-void
-syck_st_free( SyckParser *p )
-{
-    /*
-     * Free the adhoc symbol table
-     */
-    if ( p->syms != NULL )
-    {
-        st_free_table( p->syms );
-        p->syms = NULL;
-    }
-
-    /*
-     * Free the anchor tables
-     */
-    if ( p->anchors != NULL )
-    {
-        st_foreach( p->anchors, syck_st_free_nodes, 0 );
-        st_free_table( p->anchors );
-        p->anchors = NULL;
-    }
-
-    if ( p->bad_anchors != NULL )
-    {
-        st_foreach( p->bad_anchors, syck_st_free_nodes, 0 );
-        st_free_table( p->bad_anchors );
-        p->bad_anchors = NULL;
-    }
-}
-
-void
-syck_free_parser( SyckParser *p )
-{
-    /*
-     * Free tables, levels
-     */
-    syck_st_free( p );
-    syck_parser_reset_levels( p );
-    S_FREE( p->levels[0].domain );
-    S_FREE( p->levels );
-
-    if ( p->buffer != NULL )
-    {
-        S_FREE( p->buffer );
-    }
-    free_any_io( p );
-    S_FREE( p );
-}
-
-void
-syck_parser_handler( SyckParser *p, SyckNodeHandler hdlr )
-{
-    ASSERT( p != NULL );
-    p->handler = hdlr;
-}
-
-void
-syck_parser_implicit_typing( SyckParser *p, int flag )
-{
-    p->implicit_typing = ( flag == 0 ? 0 : 1 );
-}
-
-void
-syck_parser_taguri_expansion( SyckParser *p, int flag )
-{
-    p->taguri_expansion = ( flag == 0 ? 0 : 1 );
-}
-
-void
-syck_parser_error_handler( SyckParser *p, SyckErrorHandler hdlr )
-{
-    ASSERT( p != NULL );
-    p->error_handler = hdlr;
-}
-
-void
-syck_parser_bad_anchor_handler( SyckParser *p, SyckBadAnchorHandler hdlr )
-{
-    ASSERT( p != NULL );
-    p->bad_anchor_handler = hdlr;
-}
-
-void
-syck_parser_set_input_type( SyckParser *p, enum syck_parser_input input_type )
-{
-    ASSERT( p != NULL );
-    p->input_type = input_type;
-}
-
-void
-syck_parser_file( SyckParser *p, FILE *fp, SyckIoFileRead read )
-{
-    ASSERT( p != NULL );
-    free_any_io( p );
-	syck_parser_reset_cursor( p );
-    p->io_type = syck_io_file;
-    p->io.file = S_ALLOC( SyckIoFile );
-    p->io.file->ptr = fp;
-    if ( read != NULL )
-    {
-        p->io.file->read = read;
-    }
-    else
-    {
-        p->io.file->read = syck_io_file_read;
-    }
-}
-
-void
-syck_parser_str( SyckParser *p, char *ptr, long len, SyckIoStrRead read )
-{
-    ASSERT( p != NULL );
-    free_any_io( p );
-	syck_parser_reset_cursor( p );
-    p->io_type = syck_io_str;
-    p->io.str = S_ALLOC( SyckIoStr );
-    p->io.str->beg = ptr;
-    p->io.str->ptr = ptr;
-    p->io.str->end = ptr + len;
-    if ( read != NULL )
-    {
-        p->io.str->read = read;
-    }
-    else
-    {
-        p->io.str->read = syck_io_str_read;
-    }
-}
-
-void
-syck_parser_str_auto( SyckParser *p, char *ptr, SyckIoStrRead read )
-{
-    syck_parser_str( p, ptr, strlen( ptr ), read );
-}
-
-SyckLevel *
-syck_parser_current_level( SyckParser *p )
-{
-    return &p->levels[p->lvl_idx-1];
-}
-
-void
-syck_parser_pop_level( SyckParser *p )
-{
-    ASSERT( p != NULL );
-
-    /* The root level should never be popped */
-    if ( p->lvl_idx <= 1 ) return;
-
-    p->lvl_idx -= 1;
-    free( p->levels[p->lvl_idx].domain );
-}
-
-void 
-syck_parser_add_level( SyckParser *p, int len, enum syck_level_status status )
-{
-    ASSERT( p != NULL );
-    if ( p->lvl_idx + 1 > p->lvl_capa )
-    {
-        p->lvl_capa += ALLOC_CT;
-        S_REALLOC_N( p->levels, SyckLevel, p->lvl_capa );
-    }
-
-    ASSERT( len > p->levels[p->lvl_idx-1].spaces );
-    p->levels[p->lvl_idx].spaces = len;
-    p->levels[p->lvl_idx].ncount = 0;
-    p->levels[p->lvl_idx].domain = syck_strndup( p->levels[p->lvl_idx-1].domain, strlen( p->levels[p->lvl_idx-1].domain ) );
-    p->levels[p->lvl_idx].status = status;
-    p->lvl_idx += 1;
-}
-
-void
-free_any_io( SyckParser *p )
-{
-    ASSERT( p != NULL );
-    switch ( p->io_type )
-    {
-        case syck_io_str:
-            if ( p->io.str != NULL ) 
-            {
-                S_FREE( p->io.str );
-                p->io.str = NULL;
-            }
-        break;
-
-        case syck_io_file:
-            if ( p->io.file != NULL ) 
-            {
-                S_FREE( p->io.file );
-                p->io.file = NULL;
-            }
-        break;
-    }
-}
-
-long
-syck_move_tokens( SyckParser *p )
-{
-    long count, skip;
-    ASSERT( p->buffer != NULL );
-
-    if ( p->token == NULL )
-        return 0;
-
-    skip = p->limit - p->token;
-    if ( skip < 1 )
-        return 0;
-
-    if ( ( count = p->token - p->buffer ) )
-    {
-        S_MEMMOVE( p->buffer, p->token, char, skip );
-        p->token = p->buffer;
-        p->marker -= count;
-        p->cursor -= count;
-        p->toktmp -= count;
-        p->limit -= count;
-        p->lineptr -= count;
-        p->linectptr -= count;
-    }
-    return skip;
-}
-
-void
-syck_check_limit( SyckParser *p, long len )
-{
-    if ( p->cursor == NULL )
-    {
-        p->cursor = p->buffer;
-        p->lineptr = p->buffer;
-        p->linectptr = p->buffer;
-        p->marker = p->buffer;
-    }
-    p->limit = p->buffer + len;
-}
-
-long
-syck_parser_read( SyckParser *p )
-{
-    long len = 0;
-    long skip = 0;
-    ASSERT( p != NULL );
-    switch ( p->io_type )
-    {
-        case syck_io_str:
-            skip = syck_move_tokens( p );
-            len = (p->io.str->read)( p->buffer, p->io.str, SYCK_BUFFERSIZE - 1, skip );
-            break;
-
-        case syck_io_file:
-            skip = syck_move_tokens( p );
-            len = (p->io.file->read)( p->buffer, p->io.file, SYCK_BUFFERSIZE - 1, skip );
-            break;
-    }
-    syck_check_limit( p, len );
-    return len;
-}
-
-long
-syck_parser_readlen( SyckParser *p, long max_size )
-{
-    long len = 0;
-    long skip = 0;
-    ASSERT( p != NULL );
-    switch ( p->io_type )
-    {
-        case syck_io_str:
-            skip = syck_move_tokens( p );
-            len = (p->io.str->read)( p->buffer, p->io.str, max_size, skip );
-            break;
-
-        case syck_io_file:
-            skip = syck_move_tokens( p );
-            len = (p->io.file->read)( p->buffer, p->io.file, max_size, skip );
-            break;
-    }
-    syck_check_limit( p, len );
-    return len;
-}
-
-SYMID
-syck_parse( SyckParser *p )
-{
-    ASSERT( p != NULL );
-
-    syck_st_free( p );
-    syck_parser_reset_levels( p );
-    syckparse( p );
-    return p->root;
-}
-
-void
-syck_default_error_handler( SyckParser *p, char *msg )
-{
-    printf( "Error at [Line %d, Col %d]: %s\n", 
-        p->linect,
-        p->cursor - p->lineptr,
-        msg );
-}
-
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
deleted file mode 100644
index 5b42b778b0..0000000000
--- a/ext/syck/syck.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * syck.h
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#ifndef SYCK_H
-#define SYCK_H
-
-#define SYCK_YAML_MAJOR 1
-#define SYCK_YAML_MINOR 0
-
-#define SYCK_VERSION    "0.41"
-#define YAML_DOMAIN     "yaml.org,2002"
-
-#include <stdio.h>
-#include <ctype.h>
-#include "st.h"
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * Memory Allocation
- */
-#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
-#include <alloca.h>
-#endif
-
-#if DEBUG
-  void syck_assert( char *, unsigned );
-# define ASSERT(f) \
-    if ( f ) \
-        {}   \
-    else     \
-        syck_assert( __FILE__, __LINE__ )
-#else
-# define ASSERT(f)
-#endif
-
-#ifndef NULL
-# define NULL (void *)0
-#endif
-
-#define ALLOC_CT 8
-#define SYCK_BUFFERSIZE 16384
-#define S_ALLOC_N(type,n) (type*)malloc(sizeof(type)*(n))
-#define S_ALLOC(type) (type*)malloc(sizeof(type))
-#define S_REALLOC_N(var,type,n) (var)=(type*)realloc((char*)(var),sizeof(type)*(n))
-#define S_FREE(n) free(n); n = NULL;
-
-#define S_ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
-
-#define S_MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
-#define S_MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
-#define S_MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
-#define S_MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
-
-#define BLOCK_FOLD  10
-#define BLOCK_LIT   20
-#define BLOCK_PLAIN 30
-#define NL_CHOMP    130
-#define NL_KEEP     140
-
-/*
- * Node definitions
- */
-#define SYMID unsigned long
-
-typedef struct _syck_node SyckNode;
-
-enum syck_kind_tag {
-    syck_map_kind,
-    syck_seq_kind,
-    syck_str_kind
-};
-
-enum map_part {
-    map_key,
-    map_value
-};
-
-/*
- * Node metadata struct
- */
-struct _syck_node {
-    /* Symbol table ID */
-    SYMID id;
-    /* Underlying kind */
-    enum syck_kind_tag kind;
-    /* Fully qualified tag-uri for type */
-    char *type_id;
-    /* Anchor name */
-    char *anchor;
-    union {
-        /* Storage for map data */
-        struct SyckMap {
-            SYMID *keys;
-            SYMID *values;
-            long capa;
-            long idx;
-        } *pairs;
-        /* Storage for sequence data */
-        struct SyckSeq {
-            SYMID *items;
-            long capa;
-            long idx;
-        } *list;
-        /* Storage for string data */
-        struct SyckStr {
-            char *ptr;
-            long len;
-        } *str;
-    } data;
-    /* Shortcut node */
-    void *shortcut;
-};
-
-/*
- * Parser definitions
- */
-typedef struct _syck_parser SyckParser;
-typedef struct _syck_file SyckIoFile;
-typedef struct _syck_str SyckIoStr;
-typedef struct _syck_level SyckLevel;
-
-typedef SYMID (*SyckNodeHandler)(SyckParser *, SyckNode *);
-typedef void (*SyckErrorHandler)(SyckParser *, char *);
-typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *, char *);
-typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long); 
-typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
-
-enum syck_io_type {
-    syck_io_str,
-    syck_io_file
-};
-
-enum syck_parser_input {
-    syck_yaml_utf8,
-    syck_yaml_utf16,
-    syck_yaml_utf32,
-    syck_bytecode_utf8
-};
-
-enum syck_level_status {
-    syck_lvl_header,
-    syck_lvl_doc,
-    syck_lvl_open,
-    syck_lvl_seq,
-    syck_lvl_map,
-    syck_lvl_block,
-    syck_lvl_str,
-    syck_lvl_inline,
-    syck_lvl_end,
-    syck_lvl_pause
-};
-
-/*
- * Parser structs
- */
-struct _syck_file {
-    /* File pointer */
-    FILE *ptr;
-    /* Function which FILE -> buffer */
-    SyckIoFileRead read;
-};
-
-struct _syck_str {
-    /* String buffer pointers */
-    char *beg, *ptr, *end;
-    /* Function which string -> buffer */
-    SyckIoStrRead read;
-};
-
-struct _syck_level {
-    int spaces;
-    int ncount;
-    char *domain;
-    enum syck_level_status status;
-};
-
-struct _syck_parser {
-    /* Root node */
-    SYMID root, root_on_error;
-    /* Implicit typing flag */
-    int implicit_typing, taguri_expansion;
-    /* Scripting language function to handle nodes */
-    SyckNodeHandler handler;
-    /* Error handler */
-    SyckErrorHandler error_handler;
-    /* InvalidAnchor handler */
-    SyckBadAnchorHandler bad_anchor_handler;
-    /* Parser input type */
-    enum syck_parser_input input_type;
-    /* IO type */
-    enum syck_io_type io_type;
-    /* Custom buffer size */
-    size_t bufsize;
-    /* Buffer pointers */
-    char *buffer, *linectptr, *lineptr, *toktmp, *token, *cursor, *marker, *limit;
-    /* Line counter */
-    int linect;
-    /* Last token from yylex() */
-    int last_token;
-    /* Force a token upon next call to yylex() */
-    int force_token;
-    /* EOF flag */
-    int eof;
-    union {
-        SyckIoFile *file;
-        SyckIoStr *str;
-    } io;
-    /* Symbol table for anchors */
-    st_table *anchors, *bad_anchors;
-    /* Optional symbol table for SYMIDs */
-    st_table *syms;
-    /* Levels of indentation */
-    SyckLevel *levels;
-    int lvl_idx;
-    int lvl_capa;
-    void *bonus;
-};
-
-/*
- * Emitter definitions
- */
-typedef struct _syck_emitter SyckEmitter;
-typedef struct _syck_emitter_node SyckEmitterNode;
-
-typedef void (*SyckOutputHandler)(SyckEmitter *, char *, long); 
-
-enum doc_stage {
-    doc_open,
-    doc_need_header,
-    doc_processing
-};
-
-enum block_styles {
-    block_arbitrary,
-    block_fold,
-    block_literal
-};
-
-/*
- * Emitter struct
- */
-struct _syck_emitter {
-    /* Headerless doc flag */
-    int headless;
-    /* Sequence map shortcut flag */
-    int seq_map;
-    /* Force header? */
-    int use_header;
-    /* Force version? */
-    int use_version;
-    /* Sort hash keys */
-    int sort_keys;
-    /* Anchor format */
-    char *anchor_format;
-    /* Explicit typing on all collections? */
-    int explicit_typing;
-    /* Best width on folded scalars */
-    int best_width;
-    /* Use literal[1] or folded[2] blocks on all text? */
-    enum block_styles block_style;
-    /* Stage of written document */
-    enum doc_stage stage;
-    /* Level counter */
-    int level;
-    /* Default indentation */
-    int indent;
-    /* Object ignore ID */
-    SYMID ignore_id;
-    /* Symbol table for anchors */
-    st_table *markers, *anchors;
-    /* Custom buffer size */
-    size_t bufsize;
-    /* Buffer */
-    char *buffer, *marker;
-    /* Absolute position of the buffer */
-    long bufpos;
-    /* Handler for output */
-    SyckOutputHandler handler;
-    /* Pointer for extension's use */
-    void *bonus;
-};
-
-/*
- * Emitter node metadata struct
- */
-struct _syck_emitter_node {
-    /* Node buffer position */
-    long pos;
-    /* Current indent */
-    long indent;
-    /* Collection? */
-    int is_shortcut;
-};
-
-/*
- * Handler prototypes
- */
-SYMID syck_hdlr_add_node( SyckParser *, SyckNode * );
-SyckNode *syck_hdlr_add_anchor( SyckParser *, char *, SyckNode * );
-void syck_hdlr_remove_anchor( SyckParser *, char * );
-SyckNode *syck_hdlr_get_anchor( SyckParser *, char * );
-void syck_add_transfer( char *, SyckNode *, int );
-char *syck_xprivate( char *, int );
-char *syck_taguri( char *, char *, int );
-int syck_add_sym( SyckParser *, char * );
-int syck_lookup_sym( SyckParser *, SYMID, char ** );
-int syck_try_implicit( SyckNode * );
-char *syck_type_id_to_uri( char * );
-void try_tag_implicit( SyckNode *, int );
-char *syck_match_implicit( char *, size_t );
-
-/*
- * API prototypes
- */
-char *syck_strndup( char *, long );
-long syck_io_file_read( char *, SyckIoFile *, long, long );
-long syck_io_str_read( char *, SyckIoStr *, long, long );
-char *syck_base64enc( char *, long );
-char *syck_base64dec( char *, long );
-SyckEmitter *syck_new_emitter();
-void syck_emitter_ignore_id( SyckEmitter *, SYMID );
-void syck_emitter_handler( SyckEmitter *, SyckOutputHandler );
-void syck_free_emitter( SyckEmitter * );
-void syck_emitter_clear( SyckEmitter * );
-void syck_emitter_simple( SyckEmitter *, char *, long );
-void syck_emitter_write( SyckEmitter *, char *, long );
-void syck_emitter_flush( SyckEmitter *, long );
-char *syck_emitter_start_obj( SyckEmitter *, SYMID );
-void syck_emitter_end_obj( SyckEmitter * );
-SyckParser *syck_new_parser();
-void syck_free_parser( SyckParser * );
-void syck_parser_set_root_on_error( SyckParser *, SYMID );
-void syck_parser_implicit_typing( SyckParser *, int );
-void syck_parser_taguri_expansion( SyckParser *, int );
-void syck_parser_handler( SyckParser *, SyckNodeHandler );
-void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
-void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
-void syck_parser_file( SyckParser *, FILE *, SyckIoFileRead );
-void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead );
-void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead );
-SyckLevel *syck_parser_current_level( SyckParser * );
-void syck_parser_add_level( SyckParser *, int, enum syck_level_status );
-void syck_parser_pop_level( SyckParser * );
-void free_any_io( SyckParser * );
-long syck_parser_read( SyckParser * );
-long syck_parser_readlen( SyckParser *, long );
-void syck_parser_init( SyckParser *, int );
-SYMID syck_parse( SyckParser * );
-void syck_default_error_handler( SyckParser *, char * );
-SYMID syck_yaml2byte_handler( SyckParser *, SyckNode * );
-char *syck_yaml2byte( char * );
-
-/*
- * Allocation prototypes
- */
-SyckNode *syck_alloc_map();
-SyckNode *syck_alloc_seq();
-SyckNode *syck_alloc_str();
-void syck_free_node( SyckNode * );
-void syck_free_members( SyckNode * );
-SyckNode *syck_new_str( char * );
-SyckNode *syck_new_str2( char *, long );
-void syck_str_blow_away_commas( SyckNode * );
-char *syck_str_read( SyckNode * );
-SyckNode *syck_new_map( SYMID, SYMID );
-void syck_map_add( SyckNode *, SYMID, SYMID );
-SYMID syck_map_read( SyckNode *, enum map_part, long );
-void syck_map_assign( SyckNode *, enum map_part, long, SYMID );
-long syck_map_count( SyckNode * );
-void syck_map_update( SyckNode *, SyckNode * );
-SyckNode *syck_new_seq( SYMID );
-void syck_seq_add( SyckNode *, SYMID );
-SYMID syck_seq_read( SyckNode *, long );
-long syck_seq_count( SyckNode * );
-
-void apply_seq_in_map( SyckParser *, SyckNode * );
-
-/*
- * Lexer prototypes
- */
-void syckerror( char * );
-
-#ifndef ST_DATA_T_DEFINED
-typedef long st_data_t;
-#endif
-
-#if defined(__cplusplus)
-}  /* extern "C" { */
-#endif
-
-#endif /* ifndef SYCK_H */
diff --git a/ext/syck/token.c b/ext/syck/token.c
deleted file mode 100644
index aa7771de75..0000000000
--- a/ext/syck/token.c
+++ /dev/null
@@ -1,2396 +0,0 @@
-/* Generated by re2c 0.5 on Thu Oct 16 14:12:55 2003 */
-#line 1 "token.re"
-/*
- * token.re
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include "syck.h"
-#include "ruby.h"
-#include "gram.h"
-
-/*
- * Allocate quoted strings in chunks
- */
-#define QUOTELEN    1024
-
-/*
- * They do my bidding...
- */
-#define YYCTYPE     char
-#define YYCURSOR    parser->cursor
-#define YYMARKER    parser->marker
-#define YYLIMIT     parser->limit
-#define YYTOKEN     parser->token
-#define YYTOKTMP    parser->toktmp
-#define YYLINEPTR   parser->lineptr
-#define YYLINECTPTR parser->linectptr
-#define YYLINE      parser->linect
-#define YYFILL(n)   syck_parser_read(parser)
-
-/*
- * Repositions the cursor at `n' offset from the token start.
- * Only works in `Header' and `Document' sections.
- */
-#define YYPOS(n)    YYCURSOR = YYTOKEN + n
-
-/*
- * Track line numbers
- */
-#define NEWLINE(ptr)    YYLINEPTR = ptr + 1; if ( YYLINEPTR > YYLINECTPTR ) { YYLINE++; YYLINECTPTR = YYLINEPTR; }
-
-/*
- * I like seeing the level operations as macros...
- */
-#define ADD_LEVEL(len, status)  syck_parser_add_level( parser, len, status )
-#define POP_LEVEL()     syck_parser_pop_level( parser )
-#define CURRENT_LEVEL() syck_parser_current_level( parser )
-
-/*
- * Force a token next time around sycklex()
- */
-#define FORCE_NEXT_TOKEN(tok)    parser->force_token = tok;
-
-/*
- * Nice little macro to ensure we're YAML_IOPENed to the current level.
- * * Only use this macro in the "Document" section *
- */
-#define ENSURE_YAML_IOPEN(last_lvl, to_len, reset) \
-        if ( last_lvl->spaces < to_len ) \
-        { \
-            if ( last_lvl->status == syck_lvl_inline ) \
-            { \
-                goto Document; \
-            } \
-            else \
-            { \
-                ADD_LEVEL( to_len, syck_lvl_doc ); \
-                if ( reset == 1 ) YYPOS(0); \
-                return YAML_IOPEN; \
-            } \
-        } 
-
-/*
- * Nice little macro to ensure closure of levels.
- * * Only use this macro in the "Document" section *
- */
-#define ENSURE_YAML_IEND(last_lvl, to_len) \
-        if ( last_lvl->spaces > to_len ) \
-        { \
-            syck_parser_pop_level( parser ); \
-            YYPOS(0); \
-            return YAML_IEND; \
-        }
-
-/*
- * Concatenates quoted string items and manages allocation
- * to the quoted string
- */
-#define QUOTECAT(s, c, i, l) \
-        { \
-            if ( i + 1 >= c ) \
-            { \
-                c += QUOTELEN; \
-                S_REALLOC_N( s, char, c ); \
-            } \
-            s[i++] = l; \
-            s[i] = '\0'; \
-        }
-
-#define QUOTECATS(s, c, i, cs, cl) \
-        { \
-            while ( i + cl >= c ) \
-            { \
-                c += QUOTELEN; \
-                S_REALLOC_N( s, char, c ); \
-            } \
-            S_MEMCPY( s + i, cs, char, cl ); \
-            i += cl; \
-            s[i] = '\0'; \
-        }
-
-/*
- * Tags a plain scalar with a transfer method
- * * Use only in "Plain" section *
- */
-#define RETURN_IMPLICIT() \
-    { \
-        SyckNode *n = syck_alloc_str(); \
-        YYCURSOR = YYTOKTMP; \
-        n->data.str->ptr = qstr; \
-        n->data.str->len = qidx; \
-        sycklval->nodeData = n; \
-        if ( parser->implicit_typing == 1 ) \
-        { \
-            try_tag_implicit( sycklval->nodeData, parser->taguri_expansion ); \
-        } \
-        return YAML_PLAIN; \
-    }
-
-/*
- * Keep or chomp block?
- * * Use only in "ScalarBlock" section *
- */
-#define RETURN_YAML_BLOCK() \
-    { \
-        SyckNode *n = syck_alloc_str(); \
-        n->type_id = syck_strndup( "str", 3 ); \
-        n->data.str->ptr = qstr; \
-        n->data.str->len = qidx; \
-        if ( qidx > 0 ) \
-        { \
-            if ( nlDoWhat != NL_KEEP ) \
-            { \
-                char *fc = n->data.str->ptr + n->data.str->len - 1; \
-                while ( is_newline( fc ) ) fc--; \
-                if ( nlDoWhat != NL_CHOMP ) \
-                    fc += 1; \
-                n->data.str->len = fc - n->data.str->ptr + 1; \
-            } \
-        } \
-        sycklval->nodeData = n; \
-        return YAML_BLOCK; \
-    }
-
-/*
- * Handles newlines, calculates indent
- */
-#define GOBBLE_UP_YAML_INDENT( ict, start ) \
-    char *indent = start; \
-    NEWLINE(indent); \
-    while ( indent < YYCURSOR ) \
-    { \
-        if ( is_newline( ++indent ) ) \
-        { \
-            NEWLINE(indent); \
-        } \
-    } \
-    ict = 0; \
-    if ( *YYCURSOR == '\0' ) \
-    { \
-        ict = -1; \
-        start = YYCURSOR - 1; \
-    } \
-    else if ( *YYLINEPTR == ' ' ) \
-    { \
-        ict = YYCURSOR - YYLINEPTR; \
-    }
-
-/*
- * If an indent exists at the current level, back up.
- */
-#define GET_TRUE_YAML_INDENT(indt_len) \
-    { \
-        SyckLevel *lvl_deep = CURRENT_LEVEL(); \
-        indt_len = lvl_deep->spaces; \
-        if ( indt_len == YYTOKEN - YYLINEPTR ) \
-        { \
-            SyckLevel *lvl_over; \
-            parser->lvl_idx--; \
-            lvl_over = CURRENT_LEVEL(); \
-            indt_len = lvl_over->spaces; \
-            parser->lvl_idx++; \
-        } \
-    }
-
-/*
- * Argjh!  I hate globals!  Here for syckerror() only!
- */
-SyckParser *syck_parser_ptr = NULL;
-
-/*
- * Accessory funcs later in this file.
- */
-void eat_comments( SyckParser * );
-int is_newline( char *ptr );
-int sycklex_yaml_utf8( YYSTYPE *, SyckParser * );
-int sycklex_bytecode_utf8( YYSTYPE *, SyckParser * );
-int syckwrap();
-
-/*
- * My own re-entrant sycklex() using re2c.
- * You really get used to the limited regexp.
- * It's really nice to not rely on backtracking and such.
- */
-int
-sycklex( YYSTYPE *sycklval, SyckParser *parser )
-{
-    switch ( parser->input_type )
-    {
-        case syck_yaml_utf8:
-        return sycklex_yaml_utf8( sycklval, parser );
-
-        case syck_yaml_utf16:
-            syckerror( "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
-        break;
-
-        case syck_yaml_utf32:
-            syckerror( "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
-        break;
-
-        case syck_bytecode_utf8:
-        return sycklex_bytecode_utf8( sycklval, parser );
-    }
-}
-
-/*
- * Parser for standard YAML [UTF-8]
- */
-int
-sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser )
-{
-    int doc_level = 0;
-    syck_parser_ptr = parser;
-    if ( YYCURSOR == NULL ) 
-    {
-        syck_parser_read( parser );
-    }
-
-    if ( parser->force_token != 0 )
-    {
-        int t = parser->force_token;
-        parser->force_token = 0;
-        return t;
-    }
-
-#line 274
-
-
-    if ( YYLINEPTR != YYCURSOR )
-    {
-        goto Document;
-    }
-
-Header:
-
-    YYTOKEN = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy0;
-yy1:	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy7;
-	case '\n':	goto yy9;
-	case '\r':	goto yy11;
-	case ' ':	goto yy12;
-	case '#':	goto yy5;
-	case '-':	goto yy2;
-	case '.':	goto yy4;
-	default:	goto yy14;
-	}
-yy2:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '-':	goto yy28;
-	default:	goto yy3;
-	}
-yy3:
-#line 333
-	{   YYPOS(0);
-                        goto Document; 
-                    }
-yy4:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':	goto yy21;
-	default:	goto yy3;
-	}
-yy5:	yych = *++YYCURSOR;
-yy6:
-#line 315
-	{   eat_comments( parser ); 
-                        goto Header;
-                    }
-yy7:	yych = *++YYCURSOR;
-yy8:
-#line 319
-	{   SyckLevel *lvl = CURRENT_LEVEL();
-                        ENSURE_YAML_IEND(lvl, -1);
-                        YYPOS(0);
-                        return 0; 
-                    }
-yy9:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy18;
-yy10:
-#line 325
-	{   GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN );
-                        goto Header; 
-                    }
-yy11:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy17;
-	default:	goto yy3;
-	}
-yy12:	yych = *++YYCURSOR;
-	goto yy16;
-yy13:
-#line 329
-	{   doc_level = YYCURSOR - YYLINEPTR;
-                        goto Header;
-                    }
-yy14:	yych = *++YYCURSOR;
-	goto yy3;
-yy15:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy16:	switch(yych){
-	case ' ':	goto yy15;
-	default:	goto yy13;
-	}
-yy17:	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy18:	switch(yych){
-	case '\n':	case ' ':	goto yy17;
-	case '\r':	goto yy19;
-	default:	goto yy10;
-	}
-yy19:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy17;
-	default:	goto yy20;
-	}
-yy20:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 1:	goto yy10;
-	case 0:	goto yy3;
-	}
-yy21:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':	goto yy22;
-	default:	goto yy20;
-	}
-yy22:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy23;
-	case '\r':	goto yy27;
-	case ' ':	goto yy25;
-	default:	goto yy20;
-	}
-yy23:	yych = *++YYCURSOR;
-yy24:
-#line 301
-	{   SyckLevel *lvl = CURRENT_LEVEL();
-                        if ( lvl->status == syck_lvl_header )
-                        {
-                            goto Header; 
-                        }
-                        else
-                        {
-                            ENSURE_YAML_IEND(lvl, -1);
-                            YYPOS(0);
-                            return 0; 
-                        }
-                        return 0; 
-                    }
-yy25:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy26:	switch(yych){
-	case ' ':	goto yy25;
-	default:	goto yy24;
-	}
-yy27:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy23;
-	default:	goto yy20;
-	}
-yy28:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy29;
-	default:	goto yy20;
-	}
-yy29:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy30;
-	case '\r':	goto yy34;
-	case ' ':	goto yy32;
-	default:	goto yy20;
-	}
-yy30:	yych = *++YYCURSOR;
-yy31:
-#line 287
-	{   SyckLevel *lvl = CURRENT_LEVEL();
-                        if ( lvl->status == syck_lvl_header )
-                        {
-                            YYPOS(3);
-                            goto Directive; 
-                        }
-                        else
-                        {
-                            ENSURE_YAML_IEND(lvl, -1);
-                            YYPOS(0);
-                            return 0; 
-                        }
-                    }
-yy32:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy33:	switch(yych){
-	case ' ':	goto yy32;
-	default:	goto yy31;
-	}
-yy34:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy30;
-	default:	goto yy20;
-	}
-}
-#line 337
-
-
-Document:
-    {
-        SyckLevel *lvl = CURRENT_LEVEL();
-        if ( lvl->status == syck_lvl_header )
-        {
-            lvl->status = syck_lvl_doc;
-        }
-
-        YYTOKEN = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy35;
-yy36:	++YYCURSOR;
-yy35:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy60;
-	case '\n':	goto yy37;
-	case '\r':	goto yy39;
-	case ' ':	goto yy58;
-	case '!':	goto yy49;
-	case '"':	goto yy53;
-	case '#':	goto yy56;
-	case '&':	goto yy47;
-	case '\'':	goto yy51;
-	case '*':	goto yy48;
-	case ',':	case ':':	goto yy45;
-	case '-':	case '?':	goto yy46;
-	case '>':	case '|':	goto yy55;
-	case '[':	case '{':	goto yy41;
-	case ']':	case '}':	goto yy43;
-	default:	goto yy62;
-	}
-yy37:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy90;
-yy38:
-#line 351
-	{   /* Isolate spaces */
-                        int indt_len;
-                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
-                        lvl = CURRENT_LEVEL();
-                        doc_level = 0;
-
-                        /* XXX: Comment lookahead */
-                        if ( *YYCURSOR == '#' )
-                        {
-                            goto Document;
-                        }
-
-                        /* Check for open indent */
-                        ENSURE_YAML_IEND(lvl, indt_len);
-                        ENSURE_YAML_IOPEN(lvl, indt_len, 0);
-                        if ( indt_len == -1 )
-                        {
-                            return 0;
-                        }
-                        return YAML_INDENT;
-                    }
-yy39:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy89;
-	default:	goto yy40;
-	}
-yy40:
-#line 445
-	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto Plain; 
-                    }
-yy41:	yych = *++YYCURSOR;
-yy42:
-#line 373
-	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        lvl = CURRENT_LEVEL();
-                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_inline);
-                        return YYTOKEN[0]; 
-                    }
-yy43:	yych = *++YYCURSOR;
-yy44:
-#line 379
-	{   POP_LEVEL();
-                        return YYTOKEN[0]; 
-                    }
-yy45:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\n':	goto yy84;
-	case '\r':	goto yy88;
-	case ' ':	goto yy86;
-	default:	goto yy40;
-	}
-yy46:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\n':	goto yy79;
-	case '\r':	goto yy83;
-	case ' ':	goto yy81;
-	default:	goto yy40;
-	}
-yy47:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy76;
-	default:	goto yy40;
-	}
-yy48:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy73;
-	default:	goto yy40;
-	}
-yy49:	yych = *++YYCURSOR;
-yy50:
-#line 418
-	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto TransferMethod; }
-yy51:	yych = *++YYCURSOR;
-yy52:
-#line 421
-	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto SingleQuote; }
-yy53:	yych = *++YYCURSOR;
-yy54:
-#line 424
-	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto DoubleQuote; }
-yy55:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\n':	goto yy68;
-	case '\r':	goto yy72;
-	case ' ':	goto yy70;
-	case '+':	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy65;
-	default:	goto yy40;
-	}
-yy56:	yych = *++YYCURSOR;
-yy57:
-#line 434
-	{   eat_comments( parser ); 
-                        goto Document;
-                    }
-yy58:	yych = *++YYCURSOR;
-	goto yy64;
-yy59:
-#line 438
-	{   goto Document; }
-yy60:	yych = *++YYCURSOR;
-yy61:
-#line 440
-	{   ENSURE_YAML_IEND(lvl, -1);
-                        YYPOS(0);
-                        return 0; 
-                    }
-yy62:	yych = *++YYCURSOR;
-	goto yy40;
-yy63:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy64:	switch(yych){
-	case ' ':	goto yy63;
-	default:	goto yy59;
-	}
-yy65:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy66:	switch(yych){
-	case '\n':	goto yy68;
-	case '\r':	goto yy72;
-	case ' ':	goto yy70;
-	case '+':	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy65;
-	default:	goto yy67;
-	}
-yy67:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy38;
-	case 1:	goto yy40;
-	}
-yy68:	yych = *++YYCURSOR;
-yy69:
-#line 427
-	{   if ( is_newline( YYCURSOR - 1 ) ) 
-                        {
-                            YYCURSOR--;
-                        }
-                        goto ScalarBlock; 
-                    }
-yy70:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy71:	switch(yych){
-	case ' ':	goto yy70;
-	default:	goto yy69;
-	}
-yy72:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy68;
-	default:	goto yy67;
-	}
-yy73:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy74:	switch(yych){
-	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy73;
-	default:	goto yy75;
-	}
-yy75:
-#line 413
-	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
-                        return YAML_ALIAS;
-                    }
-yy76:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy77:	switch(yych){
-	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy76;
-	default:	goto yy78;
-	}
-yy78:
-#line 401
-	{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
-
-                        /*
-                         * Remove previous anchors of the same name.  Since the parser will likely
-                         * construct deeper nodes first, we want those nodes to be placed in the
-                         * queue for matching at a higher level of indentation.
-                         */
-                        syck_hdlr_remove_anchor(parser, sycklval->name);
-                        return YAML_ANCHOR;
-                    }
-yy79:	yych = *++YYCURSOR;
-yy80:
-#line 387
-	{   ENSURE_YAML_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
-                        FORCE_NEXT_TOKEN(YAML_IOPEN);
-                        if ( is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
-                        {
-                            YYCURSOR--; 
-                            ADD_LEVEL((YYTOKEN + 1) - YYLINEPTR, syck_lvl_doc);
-                        }
-                        else
-                        {
-                            ADD_LEVEL(YYCURSOR - YYLINEPTR, syck_lvl_doc);
-                        }
-                        return YYTOKEN[0]; 
-                    }
-yy81:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy82:	switch(yych){
-	case ' ':	goto yy81;
-	default:	goto yy80;
-	}
-yy83:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy79;
-	default:	goto yy67;
-	}
-yy84:	yych = *++YYCURSOR;
-yy85:
-#line 383
-	{   YYPOS(1); 
-                        return YYTOKEN[0]; 
-                    }
-yy86:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy87:	switch(yych){
-	case ' ':	goto yy86;
-	default:	goto yy85;
-	}
-yy88:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy84;
-	default:	goto yy67;
-	}
-yy89:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy90:	switch(yych){
-	case '\n':	case ' ':	goto yy89;
-	case '\r':	goto yy91;
-	default:	goto yy38;
-	}
-yy91:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy89;
-	default:	goto yy67;
-	}
-}
-#line 449
-
-    }
-
-Directive:
-    {
-        YYTOKTMP = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy92;
-yy93:	++YYCURSOR;
-yy92:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy94;
-	case ' ':	goto yy97;
-	case '%':	goto yy95;
-	default:	goto yy99;
-	}
-yy94:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy96;
-	}
-yy95:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '[':
-	case '\\':
-	case ']':
-	case '^':
-	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy102;
-	default:	goto yy96;
-	}
-yy96:
-#line 462
-	{   YYCURSOR = YYTOKTMP;
-                        return YAML_DOCSEP;
-                    }
-yy97:	yych = *++YYCURSOR;
-	goto yy101;
-yy98:
-#line 460
-	{   goto Directive; }
-yy99:	yych = *++YYCURSOR;
-	goto yy96;
-yy100:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy101:	switch(yych){
-	case ' ':	goto yy100;
-	default:	goto yy98;
-	}
-yy102:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy103:	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '[':
-	case '\\':
-	case ']':
-	case '^':
-	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy102;
-	case ':':	goto yy104;
-	default:	goto yy94;
-	}
-yy104:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '[':
-	case '\\':
-	case ']':
-	case '^':
-	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy105;
-	default:	goto yy94;
-	}
-yy105:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy106:	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '[':
-	case '\\':
-	case ']':
-	case '^':
-	case '_':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy105;
-	default:	goto yy107;
-	}
-yy107:
-#line 458
-	{   goto Directive; }
-}
-#line 465
-
-
-    }
-
-Plain:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-        SyckLevel *plvl;
-        int parentIndent;
-
-        YYCURSOR = YYTOKEN;
-        plvl = CURRENT_LEVEL();
-        GET_TRUE_YAML_INDENT(parentIndent);
-
-Plain2: 
-        YYTOKTMP = YYCURSOR;
-
-Plain3:
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy108;
-yy109:	++YYCURSOR;
-yy108:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy120;
-	case '\n':	goto yy110;
-	case '\r':	goto yy112;
-	case ' ':	goto yy118;
-	case ',':	goto yy117;
-	case ':':	goto yy114;
-	case ']':	case '}':	goto yy115;
-	default:	goto yy122;
-	}
-yy110:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy136;
-yy111:
-#line 488
-	{   int indt_len, nl_count = 0;
-                        SyckLevel *lvl;
-                        char *tok = YYTOKTMP;
-                        GOBBLE_UP_YAML_INDENT( indt_len, tok );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( indt_len <= parentIndent )
-                        {
-                            RETURN_IMPLICIT();
-                        }
-
-                        while ( YYTOKTMP < YYCURSOR )
-                        {
-                            if ( is_newline( YYTOKTMP++ ) )
-                                nl_count++;
-                        }
-                        if ( nl_count <= 1 )
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, ' ');
-                        }
-                        else
-                        {
-                            int i;
-                            for ( i = 0; i < nl_count - 1; i++ )
-                            {
-                                QUOTECAT(qstr, qcapa, qidx, '\n');
-                            }
-                        }
-
-                        goto Plain2; 
-                    }
-yy112:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy135;
-	default:	goto yy113;
-	}
-yy113:
-#line 542
-	{   QUOTECATS(qstr, qcapa, qidx, YYTOKTMP, YYCURSOR - YYTOKTMP);
-                        goto Plain2;
-                    }
-yy114:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\n':	goto yy130;
-	case '\r':	goto yy134;
-	case ' ':	goto yy132;
-	default:	goto yy113;
-	}
-yy115:	yych = *++YYCURSOR;
-yy116:
-#line 522
-	{   if ( plvl->status != syck_lvl_inline )
-                        {
-                            if ( *(YYCURSOR - 1) == ' ' || is_newline( YYCURSOR - 1 ) )
-                            {
-                                YYCURSOR--;
-                            }
-                            QUOTECATS(qstr, qcapa, qidx, YYTOKTMP, YYCURSOR - YYTOKTMP);
-                            goto Plain2;
-                        }
-                        RETURN_IMPLICIT();
-                    }
-yy117:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\n':	goto yy125;
-	case '\r':	goto yy128;
-	case ' ':	goto yy126;
-	default:	goto yy113;
-	}
-yy118:	yych = *++YYCURSOR;
-	switch(yych){
-	case '#':	goto yy123;
-	default:	goto yy119;
-	}
-yy119:
-#line 540
-	{   goto Plain3; }
-yy120:	yych = *++YYCURSOR;
-yy121:
-#line 538
-	{   RETURN_IMPLICIT(); }
-yy122:	yych = *++YYCURSOR;
-	goto yy113;
-yy123:	yych = *++YYCURSOR;
-yy124:
-#line 534
-	{   eat_comments( parser ); 
-                        RETURN_IMPLICIT();
-                    }
-yy125:	yych = *++YYCURSOR;
-	goto yy116;
-yy126:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy127:	switch(yych){
-	case ' ':	goto yy126;
-	default:	goto yy116;
-	}
-yy128:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy125;
-	default:	goto yy129;
-	}
-yy129:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy111;
-	case 1:	goto yy113;
-	}
-yy130:	yych = *++YYCURSOR;
-yy131:
-#line 520
-	{   RETURN_IMPLICIT(); }
-yy132:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy133:	switch(yych){
-	case ' ':	goto yy132;
-	default:	goto yy131;
-	}
-yy134:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy130;
-	default:	goto yy129;
-	}
-yy135:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy136:	switch(yych){
-	case '\n':	case ' ':	goto yy135;
-	case '\r':	goto yy137;
-	default:	goto yy111;
-	}
-yy137:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy135;
-	default:	goto yy129;
-	}
-}
-#line 546
-
-    }
-
-SingleQuote:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-SingleQuote2:
-        YYTOKTMP = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy138;
-yy139:	++YYCURSOR;
-yy138:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy146;
-	case '\n':	goto yy140;
-	case '\r':	goto yy142;
-	case '\'':	goto yy144;
-	default:	goto yy147;
-	}
-yy140:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy151;
-yy141:
-#line 560
-	{   int indt_len;
-                        int nl_count = 0;
-                        SyckLevel *lvl;
-                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKTMP );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status != syck_lvl_str )
-                        {
-                            ADD_LEVEL( indt_len, syck_lvl_str );
-                        }
-                        else if ( indt_len < lvl->spaces )
-                        {
-                            /* Error! */
-                        }
-
-                        while ( YYTOKTMP < YYCURSOR )
-                        {
-                            if ( is_newline( YYTOKTMP++ ) )
-                                nl_count++;
-                        }
-                        if ( nl_count <= 1 )
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, ' ');
-                        }
-                        else
-                        {
-                            int i;
-                            for ( i = 0; i < nl_count - 1; i++ )
-                            {
-                                QUOTECAT(qstr, qcapa, qidx, '\n');
-                            }
-                        }
-
-                        goto SingleQuote2; 
-                    }
-yy142:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy150;
-	default:	goto yy143;
-	}
-yy143:
-#line 615
-	{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
-                        goto SingleQuote2; 
-                    }
-yy144:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\'':	goto yy148;
-	default:	goto yy145;
-	}
-yy145:
-#line 600
-	{   SyckLevel *lvl;
-                        SyckNode *n = syck_alloc_str();
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status == syck_lvl_str )
-                        {
-                            POP_LEVEL();
-                        }
-                        n->type_id = syck_strndup( "str", 3 );
-                        n->data.str->ptr = qstr;
-                        n->data.str->len = qidx;
-                        sycklval->nodeData = n;
-                        return YAML_PLAIN; 
-                    }
-yy146:	yych = *++YYCURSOR;
-	goto yy145;
-yy147:	yych = *++YYCURSOR;
-	goto yy143;
-yy148:	yych = *++YYCURSOR;
-yy149:
-#line 596
-	{   QUOTECAT(qstr, qcapa, qidx, '\'');
-                        goto SingleQuote2; 
-                    }
-yy150:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy151:	switch(yych){
-	case '\n':	case ' ':	goto yy150;
-	case '\r':	goto yy152;
-	default:	goto yy141;
-	}
-yy152:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy150;
-	default:	goto yy153;
-	}
-yy153:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy141;
-	}
-}
-#line 619
-
-
-    }
-
-
-DoubleQuote:
-    {
-        int keep_nl = 1;
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-DoubleQuote2:
-        YYTOKTMP = YYCURSOR;
-
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy154;
-yy155:	++YYCURSOR;
-yy154:
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy161;
-	case '\n':	goto yy156;
-	case '\r':	goto yy158;
-	case '"':	goto yy163;
-	case '\\':	goto yy160;
-	default:	goto yy164;
-	}
-yy156:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy178;
-yy157:
-#line 637
-	{   int indt_len;
-                        int nl_count = 0;
-                        SyckLevel *lvl;
-                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKTMP );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status != syck_lvl_str )
-                        {
-                            ADD_LEVEL( indt_len, syck_lvl_str );
-                        }
-                        else if ( indt_len < lvl->spaces )
-                        {
-                            /* FIXME */
-                        }
-
-                        if ( keep_nl == 1 )
-                        {
-                            while ( YYTOKTMP < YYCURSOR )
-                            {
-                                if ( is_newline( YYTOKTMP++ ) )
-                                    nl_count++;
-                            }
-                            if ( nl_count <= 1 )
-                            {
-                                QUOTECAT(qstr, qcapa, qidx, ' ');
-                            }
-                            else
-                            {
-                                int i;
-                                for ( i = 0; i < nl_count - 1; i++ )
-                                {
-                                    QUOTECAT(qstr, qcapa, qidx, '\n');
-                                }
-                            }
-                        }
-
-                        keep_nl = 1;
-                        goto DoubleQuote2; 
-                    }
-yy158:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy177;
-	default:	goto yy159;
-	}
-yy159:
-#line 722
-	{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
-                        goto DoubleQuote2; 
-                    }
-yy160:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\n':	goto yy168;
-	case '\r':	goto yy170;
-	case ' ':	goto yy165;
-	case '"':	case '\\':	case 'a':
-	case 'b':	case 'e':
-	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy172;
-	case 'x':	goto yy171;
-	default:	goto yy159;
-	}
-yy161:	yych = *++YYCURSOR;
-yy162:
-#line 707
-	{   SyckLevel *lvl;
-                        SyckNode *n = syck_alloc_str();
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status == syck_lvl_str )
-                        {
-                            POP_LEVEL();
-                        }
-                        n->type_id = syck_strndup( "str", 3 );
-                        n->data.str->ptr = qstr;
-                        n->data.str->len = qidx;
-                        sycklval->nodeData = n;
-                        return YAML_PLAIN; 
-                    }
-yy163:	yych = *++YYCURSOR;
-	goto yy162;
-yy164:	yych = *++YYCURSOR;
-	goto yy159;
-yy165:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy166:	switch(yych){
-	case '\n':	goto yy168;
-	case '\r':	goto yy170;
-	case ' ':	goto yy165;
-	default:	goto yy167;
-	}
-yy167:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy157;
-	case 1:	goto yy159;
-	}
-yy168:	yych = *++YYCURSOR;
-yy169:
-#line 702
-	{   keep_nl = 0;
-                        YYCURSOR--;
-                        goto DoubleQuote2; 
-                    }
-yy170:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy168;
-	default:	goto yy167;
-	}
-yy171:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy174;
-	default:	goto yy167;
-	}
-yy172:	yych = *++YYCURSOR;
-yy173:
-#line 677
-	{  char ch = *( YYCURSOR - 1 );
-                        switch ( ch )
-                        {
-                            case 'a': ch = 7; break;
-                            case 'b': ch = '\010'; break;
-                            case 'e': ch = '\033'; break;
-                            case 'f': ch = '\014'; break;
-                            case 'n': ch = '\n'; break;
-                            case 'r': ch = '\015'; break;
-                            case 't': ch = '\t'; break;
-                            case 'v': ch = '\013'; break;
-                        }
-                        QUOTECAT(qstr, qcapa, qidx, ch);
-                        goto DoubleQuote2; 
-                    }
-yy174:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy175;
-	default:	goto yy167;
-	}
-yy175:	yych = *++YYCURSOR;
-yy176:
-#line 693
-	{   long ch;
-                        char *chr_text = syck_strndup( YYTOKTMP, 4 );
-                        chr_text[0] = '0';
-                        ch = strtol( chr_text, NULL, 16 );
-                        free( chr_text );
-                        QUOTECAT(qstr, qcapa, qidx, ch);
-                        goto DoubleQuote2; 
-                    }
-yy177:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy178:	switch(yych){
-	case '\n':	case ' ':	goto yy177;
-	case '\r':	goto yy179;
-	default:	goto yy157;
-	}
-yy179:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy177;
-	default:	goto yy167;
-	}
-}
-#line 726
-
-    }
-
-TransferMethod:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-TransferMethod2:
-        YYTOKTMP = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy180;
-yy181:	++YYCURSOR;
-yy180:
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy182;
-	case '\n':	goto yy183;
-	case '\r':	goto yy186;
-	case ' ':	goto yy185;
-	case '\\':	goto yy188;
-	default:	goto yy189;
-	}
-yy182:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy187;
-	}
-yy183:	yych = *++YYCURSOR;
-yy184:
-#line 740
-	{   SyckLevel *lvl;
-                        YYCURSOR = YYTOKTMP;
-                        if ( YYCURSOR == YYTOKEN + 1 )
-                        {
-                            free( qstr );
-                            return YAML_ITRANSFER;
-                        }
-
-                        lvl = CURRENT_LEVEL();
-
-                        /*
-                         * URL Prefixing
-                         */
-                        if ( *qstr == '^' )
-                        {
-                            sycklval->name = S_ALLOC_N( char, qidx + strlen( lvl->domain ) );
-                            sycklval->name[0] = '\0';
-                            strcat( sycklval->name, lvl->domain );
-                            strncat( sycklval->name, qstr + 1, qidx - 1 );
-                            free( qstr );
-                        }
-                        else
-                        {
-                            char *carat = qstr;
-                            char *qend = qstr + qidx;
-                            while ( (++carat) < qend )
-                            {
-                                if ( *carat == '^' )
-                                    break;
-                            }
-
-                            if ( carat < qend )
-                            {
-                                free( lvl->domain );
-                                lvl->domain = syck_strndup( qstr, carat - qstr );
-                                sycklval->name = S_ALLOC_N( char, ( qend - carat ) + strlen( lvl->domain ) );
-                                sycklval->name[0] = '\0';
-                                strcat( sycklval->name, lvl->domain );
-                                strncat( sycklval->name, carat + 1, ( qend - carat ) - 1 );
-                                free( qstr );
-                            }
-                            else
-                            {
-                                sycklval->name = qstr;
-                            }
-                        }
-
-                        return YAML_TRANSFER; 
-                    }
-yy185:	yych = *++YYCURSOR;
-	goto yy196;
-yy186:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy194;
-	default:	goto yy187;
-	}
-yy187:
-#line 802
-	{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
-                        goto TransferMethod2;
-                    }
-yy188:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'x':	goto yy190;
-	default:	goto yy187;
-	}
-yy189:	yych = *++YYCURSOR;
-	goto yy187;
-yy190:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy191;
-	default:	goto yy182;
-	}
-yy191:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy192;
-	default:	goto yy182;
-	}
-yy192:	yych = *++YYCURSOR;
-yy193:
-#line 793
-	{   long ch;
-                        char *chr_text = syck_strndup( YYTOKTMP, 4 );
-                        chr_text[0] = '0';
-                        ch = strtol( chr_text, NULL, 16 );
-                        free( chr_text );
-                        QUOTECAT(qstr, qcapa, qidx, ch);
-                        goto TransferMethod2;
-                    }
-yy194:	yych = *++YYCURSOR;
-	goto yy184;
-yy195:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy196:	switch(yych){
-	case ' ':	goto yy195;
-	default:	goto yy184;
-	}
-}
-#line 807
-
-    }
-
-ScalarBlock:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-        int blockType = 0;
-        int nlDoWhat = 0;
-        int lastIndent = 0;
-        int forceIndent = -1;
-        char *yyt = YYTOKEN;
-        SyckLevel *lvl = CURRENT_LEVEL();
-        int parentIndent;
-        GET_TRUE_YAML_INDENT(parentIndent);
-
-        switch ( *yyt )
-        {
-            case '|': blockType = BLOCK_LIT; break;
-            case '>': blockType = BLOCK_FOLD; break;
-        }
-
-        while ( ++yyt <= YYCURSOR )
-        {
-            if ( *yyt == '-' )
-            {
-                nlDoWhat = NL_CHOMP;
-            }
-            else if ( *yyt == '+' )
-            {
-                nlDoWhat = NL_KEEP;
-            }
-            else if ( isdigit( *yyt ) )
-            {
-                forceIndent = strtol( yyt, NULL, 10 ) + parentIndent;
-            }
-        }
-
-        qstr[0] = '\0';
-        YYTOKEN = YYCURSOR;
-
-ScalarBlock2:
-        YYTOKTMP = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy197;
-yy198:	++YYCURSOR;
-yy197:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy205;
-	case '\n':	goto yy199;
-	case '\r':	goto yy201;
-	case '#':	goto yy203;
-	default:	goto yy207;
-	}
-yy199:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy209;
-yy200:
-#line 854
-	{   char *pacer;
-                        char *tok = YYTOKTMP;
-                        int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0;
-                        GOBBLE_UP_YAML_INDENT( indt_len, tok );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( indt_len > parentIndent && lvl->status != syck_lvl_block )
-                        {
-                            int new_spaces = forceIndent > 0 ? forceIndent : indt_len;
-                            ADD_LEVEL( new_spaces, syck_lvl_block );
-                            lastIndent = indt_len - new_spaces;
-                            nl_begin = 1;
-                            lvl = CURRENT_LEVEL();
-                        }
-                        else if ( lvl->status != syck_lvl_block )
-                        {
-                            YYCURSOR = YYTOKTMP;
-                            RETURN_YAML_BLOCK();
-                        }
-
-                        /*
-                         * Fold only in the event of two lines being on the leftmost
-                         * indentation.
-                         */
-                        if ( blockType == BLOCK_FOLD && lastIndent == 0 && ( indt_len - lvl->spaces ) == 0 )
-                        {
-                            fold_nl = 1;
-                        }
-
-                        pacer = YYTOKTMP;
-                        while ( pacer < YYCURSOR )
-                        {
-                            if ( is_newline( pacer++ ) )
-                                nl_count++;
-                        }
-
-                        if ( fold_nl == 1 || nl_begin == 1 )
-                        {
-                            nl_count--;
-                        }
-
-                        if ( nl_count < 1 && nl_begin == 0 )
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, ' ');
-                        }
-                        else
-                        {
-                            int i;
-                            for ( i = 0; i < nl_count; i++ )
-                            {
-                                QUOTECAT(qstr, qcapa, qidx, '\n');
-                            }
-                        }
-
-                        lastIndent = indt_len - lvl->spaces;
-                        YYCURSOR -= lastIndent;
-
-                        if ( indt_len < lvl->spaces )
-                        {
-                            POP_LEVEL();
-                            YYCURSOR = YYTOKTMP;
-                            RETURN_YAML_BLOCK();
-                        }
-                        goto ScalarBlock2;
-                    }
-yy201:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy208;
-	default:	goto yy202;
-	}
-yy202:
-#line 940
-	{   QUOTECAT(qstr, qcapa, qidx, *YYTOKTMP);
-                        goto ScalarBlock2;
-                    }
-yy203:	yych = *++YYCURSOR;
-yy204:
-#line 921
-	{   lvl = CURRENT_LEVEL();
-                        if ( lvl->status != syck_lvl_block )
-                        {
-                            eat_comments( parser );
-                            YYTOKTMP = YYCURSOR;
-                        }
-                        else
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, *YYTOKTMP);
-                        }
-                        goto ScalarBlock2;
-                    }
-yy205:	yych = *++YYCURSOR;
-yy206:
-#line 935
-	{   YYCURSOR--;
-                        POP_LEVEL();
-                        RETURN_YAML_BLOCK(); 
-                    }
-yy207:	yych = *++YYCURSOR;
-	goto yy202;
-yy208:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy209:	switch(yych){
-	case '\n':	case ' ':	goto yy208;
-	case '\r':	goto yy210;
-	default:	goto yy200;
-	}
-yy210:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy208;
-	default:	goto yy211;
-	}
-yy211:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy200;
-	}
-}
-#line 945
-
-    }
-
-    return 0;
-
-}
-
-void
-eat_comments( SyckParser *parser )
-{
-    char *tok;
-
-Comment:
-    {
-        tok = YYCURSOR;
-
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy212;
-yy213:	++YYCURSOR;
-yy212:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\000':	goto yy214;
-	case '\n':	goto yy216;
-	case '\r':	goto yy217;
-	default:	goto yy219;
-	}
-yy214:	yych = *++YYCURSOR;
-yy215:
-#line 963
-	{   YYCURSOR = tok;
-                        return;
-                    }
-yy216:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy221;
-yy217:	yych = *++YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy220;
-	default:	goto yy218;
-	}
-yy218:
-#line 967
-	{   goto Comment; 
-                    }
-yy219:	yych = *++YYCURSOR;
-	goto yy218;
-yy220:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-yy221:	switch(yych){
-	case '\n':	goto yy220;
-	case '\r':	goto yy222;
-	default:	goto yy215;
-	}
-yy222:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '\n':	goto yy220;
-	default:	goto yy223;
-	}
-yy223:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy215;
-	}
-}
-#line 970
-
-
-    }
-
-}
-
-int
-is_newline( char *ptr )
-{
-    if ( *ptr == '\n' )
-        return 1;
-    
-    if ( *ptr == '\r' && *( ptr + 1 ) == '\n' )
-        return 1;
-
-    return 0;
-}
-
-int 
-syckwrap()
-{
-    return 1;
-}
-
-void 
-syckerror( char *msg )
-{
-    if ( syck_parser_ptr->error_handler == NULL )
-        syck_parser_ptr->error_handler = syck_default_error_handler;
-
-    syck_parser_ptr->root = syck_parser_ptr->root_on_error;
-    (syck_parser_ptr->error_handler)(syck_parser_ptr, msg);
-}
-
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
deleted file mode 100644
index d55d1083b4..0000000000
--- a/ext/syck/yaml2byte.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * ybext.c
- *
- * $Author$
- * $Date$
- *
- * Copyright (C) 2003 why the lucky stiff, clark evans
- *
- *   WARNING WARNING WARNING  --- THIS IS *NOT JUST* PLAYING
- *   ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
- */ 
-#include <syck.h>
-#include <assert.h>
-#define YAMLBYTE_UTF8
-#include "yamlbyte.h"
-#include "ruby.h"
-
-#include <stdio.h>
-#define TRACE0(a)  \
-    do { printf(a); printf("\n"); fflush(stdout); } while(0)
-#define TRACE1(a,b) \
-    do { printf(a,b); printf("\n"); fflush(stdout); } while(0)
-#define TRACE2(a,b,c) \
-    do { printf(a,b,c); printf("\n"); fflush(stdout); } while(0)
-#define TRACE3(a,b,c,d) \
-    do { printf(a,b,c,d); printf("\n"); fflush(stdout); } while(0)
-
-/* Reinvent the wheel... */
-#define CHUNKSIZE 64
-#define HASH ((long)0xCAFECAFE)
-typedef struct {
-   long hash;
-   char *buffer;
-   long length;
-   long remaining;
-   int  printed;
-} bytestring_t;
-bytestring_t *bytestring_alloc() {
-    bytestring_t *ret; 
-    /*TRACE0("bytestring_alloc()");*/
-    ret = S_ALLOC(bytestring_t);
-    ret->hash   = HASH;
-    ret->length = CHUNKSIZE;
-    ret->remaining = ret->length;
-    ret->buffer = S_ALLOC_N(char, ret->length + 1 );
-    ret->buffer[0] = 0;
-    ret->printed = 0;
-    return ret;
-}
-void bytestring_append(bytestring_t *str, char code, 
-                       char *start, char *finish) 
-{
-    long grow;
-    long length = 2;   /* CODE + LF */
-    char *curr;
-    assert(str && HASH == str->hash);
-    /*TRACE0("bytestring_append()");*/
-    if(start) {
-        if(!finish)
-            finish = start + strlen(start);
-        length += (finish-start);
-    }
-    if(length > str->remaining) {
-        grow = (length - str->remaining) + CHUNKSIZE;
-        str->remaining += grow;
-        str->length    += grow; 
-        str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
-        assert(str->buffer);
-    }
-    curr = str->buffer + (str->length - str->remaining);
-    *curr = code;
-    curr += 1;
-    if(start) 
-        while(start < finish)
-            *curr ++ = *start ++;
-    *curr = '\n';
-    curr += 1;
-    *curr = 0;
-    str->remaining = str->remaining - length;
-    assert( (str->buffer + str->length) - str->remaining );
-}
-void bytestring_extend(bytestring_t *str, bytestring_t *ext)
-{
-    char *from;
-    char *curr;
-    char *stop;
-    long grow;
-    long length;
-    assert(str && HASH == str->hash);
-    assert(ext && HASH == ext->hash);
-    if(ext->printed) {
-        assert(ext->buffer[0] ==YAMLBYTE_ANCHOR);
-        curr = ext->buffer;
-        while( '\n' != *curr)
-            curr++;
-        bytestring_append(str, YAMLBYTE_ALIAS, ext->buffer + 1, curr);
-    } else {
-        ext->printed = 1;
-        length  = (ext->length - ext->remaining);
-        if(length > str->remaining) {
-            grow = (length - str->remaining) + CHUNKSIZE;
-            str->remaining += grow;
-            str->length    += grow; 
-            str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
-        }
-        curr = str->buffer + (str->length - str->remaining);
-        from = ext->buffer;
-        stop = ext->buffer + length;
-        while( from < stop )
-            *curr ++ = *from ++;
-        *curr = 0;
-        str->remaining = str->remaining - length;
-        assert( (str->buffer + str->length) - str->remaining );
-    }
-}
-
-/* convert SyckNode into yamlbyte_buffer_t objects */
-SYMID
-syck_yaml2byte_handler(p, n)
-    SyckParser *p;
-    SyckNode *n;
-{
-    SYMID oid;
-    long i;
-    char ch;
-    char nextcode;
-    char *start;
-    char *current;
-    char *finish;
-    bytestring_t *val = NULL;
-    bytestring_t *sav = NULL;
-    /*TRACE0("syck_yaml2byte_handler()");*/
-    val = bytestring_alloc();
-    if(n->anchor) bytestring_append(val,YAMLBYTE_ANCHOR, n->anchor, NULL);
-    if ( n->type_id )
-    {
-        if ( p->taguri_expansion )
-        {
-            bytestring_append(val,YAMLBYTE_TRANSFER, n->type_id, NULL);
-        }
-        else
-        {
-            char *type_tag = S_ALLOC_N( char, strlen( n->type_id ) + 1 );
-            type_tag[0] = '\0';
-            strcat( type_tag, "!" );
-            strcat( type_tag, n->type_id );
-            bytestring_append( val, YAMLBYTE_TRANSFER, type_tag, NULL);
-        }
-    }
-    switch (n->kind)
-    {
-        case syck_str_kind:
-            nextcode = YAMLBYTE_SCALAR;
-            start  = n->data.str->ptr;
-            finish = start + n->data.str->len - 1;
-            current = start;
-            /*TRACE2("SCALAR: %s %d", start, n->data.str->len); */
-            while(1) {
-                ch = *current;
-                if('\n' == ch || 0 == ch || current > finish) {
-                    if(current >= start) {
-                        bytestring_append(val, nextcode, start, current);
-                        nextcode = YAMLBYTE_CONTINUE;
-                    }
-                    start = current + 1;
-                    if(current > finish)
-                    {
-                        break;
-                    }
-                    else if('\n' == ch )
-                    {
-                        bytestring_append(val,YAMLBYTE_NEWLINE,NULL,NULL);
-                    }
-                    else if(0 == ch)
-                    {
-                        bytestring_append(val,YAMLBYTE_NULLCHAR,NULL,NULL);
-                    }
-                    else 
-                    {
-                        assert("oops");
-                    }
-                }
-                current += 1;
-            }
-        break;
-        case syck_seq_kind:
-            bytestring_append(val,YAMLBYTE_SEQUENCE,NULL,NULL);
-            for ( i = 0; i < n->data.list->idx; i++ )
-            {
-                oid = syck_seq_read( n, i );
-                syck_lookup_sym( p, oid, (char **)&sav );
-                bytestring_extend(val, sav);
-            }
-            bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
-        break;
-        case syck_map_kind:
-            bytestring_append(val,YAMLBYTE_MAPPING,NULL,NULL);
-            for ( i = 0; i < n->data.pairs->idx; i++ )
-            {
-                oid = syck_map_read( n, map_key, i );
-                syck_lookup_sym( p, oid, (char **)&sav );
-                bytestring_extend(val, sav);
-                oid = syck_map_read( n, map_value, i );
-                syck_lookup_sym( p, oid, (char **)&sav );
-                bytestring_extend(val, sav);
-            }
-            bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
-        break;
-    }
-    oid = syck_add_sym( p, (char *) val );
-    /*TRACE1("Saving: %s", val->buffer );*/
-    return oid;
-}
-
-char *
-syck_yaml2byte(char *yamlstr)
-{
-    SYMID oid;
-    char *ret;
-    bytestring_t *sav; 
-
-    SyckParser *parser = syck_new_parser();
-    syck_parser_str_auto( parser, yamlstr, NULL );
-    syck_parser_handler( parser, syck_yaml2byte_handler );
-    syck_parser_error_handler( parser, NULL );
-    syck_parser_implicit_typing( parser, 1 );
-    syck_parser_taguri_expansion( parser, 1 );
-    oid = syck_parse( parser );
-    syck_lookup_sym( parser, oid, (char **)&sav );
-
-    ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
-    ret[0] = '\0';
-    strcat( ret, "D\n" );
-    strcat( ret, sav->buffer );
-
-    syck_free_parser( parser );
-    return ret;
-}
-
-#ifdef TEST_YBEXT
-#include <stdio.h>
-int main() {
-   char *yaml = "test: 1\nand: \"with new\\nline\\n\"\nalso: &3 three\nmore: *3";
-   printf("--- # YAML \n");
-   printf(yaml);
-   printf("\n...\n");
-   printf(syck_yaml2byte(yaml));
-   return 0;
-}
-#endif
-
diff --git a/ext/syck/yamlbyte.h b/ext/syck/yamlbyte.h
deleted file mode 100644
index 0fe4e7b576..0000000000
--- a/ext/syck/yamlbyte.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  yamlbyte.h
- *
- *  The YAML bytecode "C" interface header file.   See the YAML bytecode
- *  reference for bytecode sequence rules and for the meaning of each
- *  bytecode.
- */
-
-#ifndef YAMLBYTE_H
-#define YAMLBYTE_H
-#include <stddef.h>
-
-/* define what a character is */
-typedef unsigned char yamlbyte_utf8_t;
-typedef unsigned short yamlbyte_utf16_t;
-#ifdef YAMLBYTE_UTF8
-  #ifdef YAMLBYTE_UTF16
-    #error Must only define YAMLBYTE_UTF8 or YAMLBYTE_UTF16
-  #endif
-  typedef yamlbyte_utf8_t yamlbyte_char_t;
-#else
-  #ifdef YAMLBYTE_UTF16
-    typedef yamlbyte_utf16_t yamlbyte_char_t;
-  #else
-    #error Must define YAMLBYTE_UTF8 or YAMLBYTE_UTF16
-  #endif
-#endif
-
-/* specify list of bytecodes */
-#define YAMLBYTE_FINISH          ((yamlbyte_char_t) 0)
-#define YAMLBYTE_DOCUMENT        ((yamlbyte_char_t)'D')
-#define YAMLBYTE_DIRECTIVE       ((yamlbyte_char_t)'V')
-#define YAMLBYTE_PAUSE           ((yamlbyte_char_t)'P')
-#define YAMLBYTE_MAPPING         ((yamlbyte_char_t)'M')
-#define YAMLBYTE_SEQUENCE        ((yamlbyte_char_t)'Q')
-#define YAMLBYTE_END_BRANCH      ((yamlbyte_char_t)'E')
-#define YAMLBYTE_SCALAR          ((yamlbyte_char_t)'S')
-#define YAMLBYTE_CONTINUE        ((yamlbyte_char_t)'C')
-#define YAMLBYTE_NEWLINE         ((yamlbyte_char_t)'N')
-#define YAMLBYTE_NULLCHAR        ((yamlbyte_char_t)'Z')
-#define YAMLBYTE_ANCHOR          ((yamlbyte_char_t)'A')
-#define YAMLBYTE_ALIAS           ((yamlbyte_char_t)'R')
-#define YAMLBYTE_TRANSFER        ((yamlbyte_char_t)'T')
-/* formatting bytecodes */
-#define YAMLBYTE_COMMENT         ((yamlbyte_char_t)'c')
-#define YAMLBYTE_INDENT          ((yamlbyte_char_t)'i')
-#define YAMLBYTE_STYLE           ((yamlbyte_char_t)'s')
-/* other bytecodes */
-#define YAMLBYTE_LINE_NUMBER     ((yamlbyte_char_t)'#')
-#define YAMLBYTE_WHOLE_SCALAR    ((yamlbyte_char_t)'<')
-#define YAMLBYTE_NOTICE          ((yamlbyte_char_t)'!')
-#define YAMLBYTE_SPAN            ((yamlbyte_char_t)')')
-#define YAMLBYTE_ALLOC           ((yamlbyte_char_t)'@')
-
-/* second level style bytecodes, ie "s>" */
-#define YAMLBYTE_FLOW            ((yamlbyte_char_t)'>')
-#define YAMLBYTE_LITERAL         ((yamlbyte_char_t)'|')
-#define YAMLBYTE_BLOCK           ((yamlbyte_char_t)'b')
-#define YAMLBYTE_PLAIN           ((yamlbyte_char_t)'p')
-#define YAMLBYTE_INLINE_MAPPING  ((yamlbyte_char_t)'{')
-#define YAMLBYTE_INLINE_SEQUENCE ((yamlbyte_char_t)'[')
-#define YAMLBYTE_SINGLE_QUOTED   ((yamlbyte_char_t)39)
-#define YAMLBYTE_DOUBLE_QUOTED   ((yamlbyte_char_t)'"')
-
-/*
- * The "C" API has two variants, one based on instructions,
- * with events delivered via pointers; and the other one
- * is character based where one or more instructions are
- * serialized into a buffer.
- *
- * Note: In the instruction based API, WHOLE_SCALAR does
- *       not have the '<here' marshalling stuff.
- */
-
-typedef void * yamlbyte_consumer_t;
-typedef void * yamlbyte_producer_t;
-
-/* push and pull APIs need a way to communicate results */
-typedef enum {
-    YAMLBYTE_OK          = 0,     /* proceed                        */
-    YAMLBYTE_E_MEMORY    = 'M',   /* could not allocate memory      */
-    YAMLBYTE_E_READ      = 'R',   /* input stream read error        */
-    YAMLBYTE_E_WRITE     = 'W',   /* output stream write error      */
-    YAMLBYTE_E_OTHER     = '?',   /* some other error condition     */
-    YAMLBYTE_E_PARSE     = 'P',   /* parse error, check bytecodes   */
-} yamlbyte_result_t;
- 
-typedef const yamlbyte_char_t *yamlbyte_buff_t; 
-
-/* 
- *  The "Instruction" API 
- */
-
-typedef struct yaml_instruction {
-    yamlbyte_char_t bytecode;
-    yamlbyte_buff_t start;
-    yamlbyte_buff_t finish;  /* open range, *finish is _not_ part */
-} *yamlbyte_inst_t;
-
-/* producer pushes the instruction with one bytecode event to the 
- * consumer; if the consumer's result is not YAMLBYTE_OK, then
- * the producer should stop */
-typedef
-  yamlbyte_result_t
-   (*yamlbyte_push_t)(
-     yamlbyte_consumer_t self,
-     yamlbyte_inst_t  inst
-   );
-
-/* consumer pulls a bytecode instruction from the producer; in this
- * case the instruction (and is buffer) are owned by the producer and
- * will remain valid till the pull function is called once again;
- * if the instruction is NULL, then there are no more results; and
- * it is important to call the pull function till it returns NULL so 
- * that the producer can clean up its memory allocations */
-typedef 
-   yamlbyte_result_t
-    (*yamlbyte_pull_t)(
-      yamlbyte_producer_t self,
-      yamlbyte_inst_t *inst   /* to be filled in by the producer */
-    ); 
-
-/*
- *  Buffer based API
- */
-
-/* producer pushes a null terminated buffer filled with one or more
- * bytecode events to the consumer; if the consumer's result is not
- * YAMLBYTE_OK, then the producer should stop */
-typedef
-  yamlbyte_result_t
-   (*yamlbyte_pushbuff_t)(
-     yamlbyte_consumer_t self,
-     yamlbyte_buff_t  buff
-   );
-
-/* consumer pulls bytecode events from the producer; in this case
- * the buffer is owned by the producer, and will remain valid till
- * the pull function is called once again; if the buffer pointer
- * is set to NULL, then there are no more results; it is important
- * to call the pull function till it returns NULL so that the
- * producer can clean up its memory allocations */
-typedef 
-   yamlbyte_result_t
-    (*yamlbyte_pullbuff_t)(
-      yamlbyte_producer_t self,
-      yamlbyte_buff_t *buff   /* to be filled in by the producer */
-    ); 
-
-/* convert a pull interface to a push interface; the reverse process
- * requires threads and thus is language dependent */
-#define YAMLBYTE_PULL2PUSH(pull,producer,push,consumer,result)       \
-    do {                                                         \
-        yamlbyte_pullbuff_t _pull = (pull);                              \
-        yamlbyte_pushbuff_t _push = (push);                              \
-        yamlbyte_result_t _result = YAMLBYTE_OK;                         \
-        yamlbyte_producer_t _producer = (producer);                  \
-        yamlbyte_consumer_t _consumer = (consumer);                  \
-        while(1) {                                               \
-            yamlbyte_buff_t buff = NULL;                           \
-            _result = _pull(_producer,&buff);                    \
-            if(YAMLBYTE_OK != result || NULL == buff)                \
-                break;                                           \
-            _result = _push(_consumer,buff);                     \
-            if(YAMLBYTE_OK != result)                                \
-                break;                                           \
-        }                                                        \
-        (result) = _result;                                      \
-    } while(0)
-
-#endif
diff --git a/ext/syslog/.cvsignore b/ext/syslog/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/syslog/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/syslog/MANIFEST b/ext/syslog/MANIFEST
deleted file mode 100644
index b5306034b7..0000000000
--- a/ext/syslog/MANIFEST
+++ /dev/null
@@ -1,6 +0,0 @@
-MANIFEST
-extconf.rb
-syslog.c
-syslog.txt
-test.rb
-depend
diff --git a/ext/syslog/depend b/ext/syslog/depend
deleted file mode 100644
index 45cbea293a..0000000000
--- a/ext/syslog/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-syslog.o: syslog.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/intern.h
diff --git a/ext/syslog/extconf.rb b/ext/syslog/extconf.rb
deleted file mode 100644
index 0fa0bc339b..0000000000
--- a/ext/syslog/extconf.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# $RoughId: extconf.rb,v 1.3 2001/11/24 17:49:26 knu Exp $
-# $Id$
-
-require 'mkmf'
-
-have_header("syslog.h") &&
-  have_func("openlog") &&
-  have_func("setlogmask") &&
-  create_makefile("syslog")
-
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
deleted file mode 100644
index 5ee2c6b89a..0000000000
--- a/ext/syslog/syslog.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/* 
- * UNIX Syslog extension for Ruby
- * Amos Gouaux, University of Texas at Dallas
- * <amos+ruby@utdallas.edu>
- *
- * $RoughId: syslog.c,v 1.21 2002/02/25 12:21:17 knu Exp $
- * $Id$
- */
-
-#include "ruby.h"
-#include <syslog.h>
-
-/* Syslog class */
-static VALUE mSyslog, mSyslogConstants;
-static const char *syslog_ident = NULL;
-static int syslog_options = -1, syslog_facility = -1, syslog_mask = -1;
-static int syslog_opened = 0;
-
-/* Package helper routines */
-static void syslog_write(int pri, int argc, VALUE *argv)
-{
-    VALUE str;
-
-    if (argc < 1) {
-        rb_raise(rb_eArgError, "no log message supplied");
-    }
-
-    if (!syslog_opened) {
-        rb_raise(rb_eRuntimeError, "must open syslog before write");
-    }
-
-    str = rb_f_sprintf(argc, argv);
-
-    syslog(pri, "%s", RSTRING(str)->ptr);
-}
-
-/* Syslog module methods */
-static VALUE mSyslog_close(VALUE self)
-{
-    if (!syslog_opened) {
-        rb_raise(rb_eRuntimeError, "syslog not opened");
-    }
-
-    closelog();
-
-    free((void *)syslog_ident);
-    syslog_ident = NULL;
-    syslog_options = syslog_facility = syslog_mask = -1;
-    syslog_opened = 0;
-
-    return Qnil;
-}
-
-static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
-{
-    VALUE ident, opt, fac;
-
-    if (syslog_opened) {
-        rb_raise(rb_eRuntimeError, "syslog already open");
-    }
-
-    rb_scan_args(argc, argv, "03", &ident, &opt, &fac);
-
-    if (NIL_P(ident)) {
-        ident = rb_gv_get("$0"); 
-    }
-#ifdef SafeStringValue
-    SafeStringValue(ident);
-#else
-    Check_SafeStr(ident);
-#endif
-    syslog_ident = strdup(RSTRING(ident)->ptr);
-
-    if (NIL_P(opt)) {
-	syslog_options = LOG_PID | LOG_CONS;
-    } else {
-	syslog_options = NUM2INT(opt);
-    }
-
-    if (NIL_P(fac)) {
-	syslog_facility = LOG_USER;
-    } else {
-	syslog_facility = NUM2INT(fac);
-    }
-
-    openlog(syslog_ident, syslog_options, syslog_facility);
-
-    syslog_opened = 1;
-
-    setlogmask(syslog_mask = setlogmask(0));
-
-    /* be like File.new.open {...} */
-    if (rb_block_given_p()) {
-        rb_ensure(rb_yield, self, mSyslog_close, self);
-    }
-
-    return self;
-}
-
-static VALUE mSyslog_reopen(int argc, VALUE *argv, VALUE self)
-{
-    mSyslog_close(self);
-
-    return mSyslog_open(argc, argv, self);
-}
-
-static VALUE mSyslog_isopen(VALUE self)
-{
-    return syslog_opened ? Qtrue : Qfalse;
-}
-
-static VALUE mSyslog_ident(VALUE self)
-{
-    return syslog_opened ? rb_str_new2(syslog_ident) : Qnil;
-}
-
-static VALUE mSyslog_options(VALUE self)
-{
-    return syslog_opened ? INT2NUM(syslog_options) : Qnil;
-}
-
-static VALUE mSyslog_facility(VALUE self)
-{
-    return syslog_opened ? INT2NUM(syslog_facility) : Qnil;
-}
-
-static VALUE mSyslog_get_mask(VALUE self)
-{
-    return syslog_opened ? INT2NUM(syslog_mask) : Qnil;
-}
-
-static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
-{
-    if (!syslog_opened) {
-        rb_raise(rb_eRuntimeError, "must open syslog before setting log mask");
-    }
-
-    setlogmask(syslog_mask = NUM2INT(mask));
-
-    return mask;
-}
-
-static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
-{
-    VALUE pri;
-
-    if (argc < 2) {
-        rb_raise(rb_eArgError, "wrong # of arguments(%d for 2+)", argc);
-    }
-
-    argc--;
-    pri = *argv++;
-
-    if (!FIXNUM_P(pri)) {
-      rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(pri)));
-    }
-
-    syslog_write(FIX2INT(pri), argc, argv);
-
-    return self;
-}
-
-static VALUE mSyslog_inspect(VALUE self)
-{
-    char buf[1024];
-
-    if (syslog_opened) {
-	snprintf(buf, sizeof(buf),
-	  "<#%s: opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
-	  rb_class2name(self),
-	  syslog_ident,
-	  syslog_options,
-	  syslog_facility,
-	  syslog_mask);
-    } else {
-	snprintf(buf, sizeof(buf),
-	  "<#%s: opened=false>", rb_class2name(self));
-    }
-
-    return rb_str_new2(buf);
-}
-
-static VALUE mSyslog_instance(VALUE self)
-{
-    return self;
-}
-
-#define define_syslog_shortcut_method(pri, name) \
-static VALUE mSyslog_##name(int argc, VALUE *argv, VALUE self) \
-{ \
-    syslog_write(pri, argc, argv); \
-\
-    return self; \
-}
-
-#ifdef LOG_EMERG
-define_syslog_shortcut_method(LOG_EMERG, emerg)
-#endif
-#ifdef LOG_ALERT
-define_syslog_shortcut_method(LOG_ALERT, alert)
-#endif
-#ifdef LOG_CRIT
-define_syslog_shortcut_method(LOG_CRIT, crit)
-#endif
-#ifdef LOG_ERR
-define_syslog_shortcut_method(LOG_ERR, err)
-#endif
-#ifdef LOG_WARNING
-define_syslog_shortcut_method(LOG_WARNING, warning)
-#endif
-#ifdef LOG_NOTICE
-define_syslog_shortcut_method(LOG_NOTICE, notice)
-#endif
-#ifdef LOG_INFO
-define_syslog_shortcut_method(LOG_INFO, info)
-#endif
-#ifdef LOG_DEBUG
-define_syslog_shortcut_method(LOG_DEBUG, debug)
-#endif
-
-static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
-{
-    return INT2FIX(LOG_MASK(FIX2INT(pri)));
-}
-
-static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri)
-{
-    return INT2FIX(LOG_UPTO(FIX2INT(pri)));
-}
-
-/* Init for package syslog */
-void Init_syslog()
-{
-    mSyslog = rb_define_module("Syslog");
- 
-    mSyslogConstants = rb_define_module_under(mSyslog, "Constants");
-
-    rb_include_module(mSyslog, mSyslogConstants);
-
-    rb_define_module_function(mSyslog, "open", mSyslog_open, -1);
-    rb_define_module_function(mSyslog, "reopen", mSyslog_reopen, -1);
-    rb_define_module_function(mSyslog, "open!", mSyslog_reopen, -1);
-    rb_define_module_function(mSyslog, "opened?", mSyslog_isopen, 0);
-
-    rb_define_module_function(mSyslog, "ident", mSyslog_ident, 0);
-    rb_define_module_function(mSyslog, "options", mSyslog_options, 0);
-    rb_define_module_function(mSyslog, "facility", mSyslog_facility, 0);
-
-    rb_define_module_function(mSyslog, "log", mSyslog_log, -1);
-    rb_define_module_function(mSyslog, "close", mSyslog_close, 0);
-    rb_define_module_function(mSyslog, "mask", mSyslog_get_mask, 0);
-    rb_define_module_function(mSyslog, "mask=", mSyslog_set_mask, 1);
-
-    rb_define_module_function(mSyslog, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
-    rb_define_module_function(mSyslog, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
-
-    rb_define_module_function(mSyslog, "inspect", mSyslog_inspect, 0);
-    rb_define_module_function(mSyslog, "instance", mSyslog_instance, 0);
-
-    rb_define_module_function(mSyslogConstants, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
-    rb_define_module_function(mSyslogConstants, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
-
-#define rb_define_syslog_const(id) \
-    rb_define_const(mSyslogConstants, #id, INT2NUM(id))
-
-    /* Various options when opening log */
-#ifdef LOG_PID
-    rb_define_syslog_const(LOG_PID);
-#endif
-#ifdef LOG_CONS
-    rb_define_syslog_const(LOG_CONS);
-#endif
-#ifdef LOG_ODELAY
-    rb_define_syslog_const(LOG_ODELAY); /* deprecated */
-#endif
-#ifdef LOG_NDELAY
-    rb_define_syslog_const(LOG_NDELAY);
-#endif
-#ifdef LOG_NOWAIT
-    rb_define_syslog_const(LOG_NOWAIT); /* deprecated */
-#endif
-#ifdef LOG_PERROR
-    rb_define_syslog_const(LOG_PERROR);
-#endif
-
-    /* Various syslog facilities */
-#ifdef LOG_AUTH
-    rb_define_syslog_const(LOG_AUTH);
-#endif
-#ifdef LOG_AUTHPRIV
-    rb_define_syslog_const(LOG_AUTHPRIV);
-#endif
-#ifdef LOG_CONSOLE
-    rb_define_syslog_const(LOG_CONSOLE);
-#endif
-#ifdef LOG_CRON
-    rb_define_syslog_const(LOG_CRON);
-#endif
-#ifdef LOG_DAEMON
-    rb_define_syslog_const(LOG_DAEMON);
-#endif
-#ifdef LOG_FTP
-    rb_define_syslog_const(LOG_FTP);
-#endif
-#ifdef LOG_KERN
-    rb_define_syslog_const(LOG_KERN);
-#endif
-#ifdef LOG_LPR
-    rb_define_syslog_const(LOG_LPR);
-#endif
-#ifdef LOG_MAIL
-    rb_define_syslog_const(LOG_MAIL);
-#endif
-#ifdef LOG_NEWS
-    rb_define_syslog_const(LOG_NEWS);
-#endif
-#ifdef LOG_NTP
-   rb_define_syslog_const(LOG_NTP);
-#endif
-#ifdef LOG_SECURITY
-    rb_define_syslog_const(LOG_SECURITY);
-#endif
-#ifdef LOG_SYSLOG
-    rb_define_syslog_const(LOG_SYSLOG);
-#endif
-#ifdef LOG_USER
-    rb_define_syslog_const(LOG_USER);
-#endif
-#ifdef LOG_UUCP
-    rb_define_syslog_const(LOG_UUCP);
-#endif
-#ifdef LOG_LOCAL0
-    rb_define_syslog_const(LOG_LOCAL0);
-#endif
-#ifdef LOG_LOCAL1
-    rb_define_syslog_const(LOG_LOCAL1);
-#endif
-#ifdef LOG_LOCAL2
-    rb_define_syslog_const(LOG_LOCAL2);
-#endif
-#ifdef LOG_LOCAL3
-    rb_define_syslog_const(LOG_LOCAL3);
-#endif
-#ifdef LOG_LOCAL4
-    rb_define_syslog_const(LOG_LOCAL4);
-#endif
-#ifdef LOG_LOCAL5
-    rb_define_syslog_const(LOG_LOCAL5);
-#endif
-#ifdef LOG_LOCAL6
-    rb_define_syslog_const(LOG_LOCAL6);
-#endif
-#ifdef LOG_LOCAL7
-    rb_define_syslog_const(LOG_LOCAL7);
-#endif
-
-#define rb_define_syslog_shortcut(name) \
-    rb_define_module_function(mSyslog, #name, mSyslog_##name, -1)
-
-    /* Various syslog priorities and the shortcut methods */
-#ifdef LOG_EMERG
-    rb_define_syslog_const(LOG_EMERG);
-    rb_define_syslog_shortcut(emerg);
-#endif
-#ifdef LOG_ALERT
-    rb_define_syslog_const(LOG_ALERT);
-    rb_define_syslog_shortcut(alert);
-#endif
-#ifdef LOG_CRIT
-    rb_define_syslog_const(LOG_CRIT);
-    rb_define_syslog_shortcut(crit);
-#endif
-#ifdef LOG_ERR
-    rb_define_syslog_const(LOG_ERR);
-    rb_define_syslog_shortcut(err);
-#endif
-#ifdef LOG_WARNING
-    rb_define_syslog_const(LOG_WARNING);
-    rb_define_syslog_shortcut(warning);
-#endif
-#ifdef LOG_NOTICE
-    rb_define_syslog_const(LOG_NOTICE);
-    rb_define_syslog_shortcut(notice);
-#endif
-#ifdef LOG_INFO
-    rb_define_syslog_const(LOG_INFO);
-    rb_define_syslog_shortcut(info);
-#endif
-#ifdef LOG_DEBUG
-    rb_define_syslog_const(LOG_DEBUG);
-    rb_define_syslog_shortcut(debug);
-#endif
-}
diff --git a/ext/syslog/syslog.txt b/ext/syslog/syslog.txt
deleted file mode 100644
index 9aed35133d..0000000000
--- a/ext/syslog/syslog.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" syslog.txt -  -*- Indented-Text -*-
-$RoughId: syslog.txt,v 1.18 2002/02/25 08:20:14 knu Exp $
-$Id$
-
-UNIX Syslog extension for Ruby
-Amos Gouaux, University of Texas at Dallas
-<amos+ruby@utdallas.edu>
-&
-Akinori MUSHA
-<knu@ruby-lang.org>
-
-** Syslog(Module)
-
-Included Modules: Syslog::Constants
-
-require 'syslog'
-
-A Simple wrapper for the UNIX syslog system calls that might be handy
-if you're writing a server in Ruby.  For the details of the syslog(8)
-architecture and constants, see the syslog(3) manual page of your
-platform.
-
-Module Methods:
-
-   open(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
-		facility = Syslog::LOG_USER) [{ |syslog| ... }]
-
-	Opens syslog with the given options and returns the module
-	itself.  If a block is given, calls it with an argument of
-	itself.  If syslog is already opened, raises RuntimeError.
-
-	Example:
-	  Syslog.open('ftpd', Syslog::LOG_PID | Syslog::LOG_NDELAY,
-			      Syslog::LOG_FTP)
-
-   open!(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
-		facility = Syslog::LOG_USER)
-   reopen(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
-		facility = Syslog::LOG_USER)
-
-	Same as open, but does a close first.
-
-   opened?
-
-	Returns true if syslog opened, otherwise false.
-
-   ident
-   options
-   facility
-
-	Returns the parameters given in the last open, respectively.
-	Every call of Syslog::open resets these values.
-
-   log(pri, message, ...)
-
-	Writes message to syslog.
-
-	Example:
-	  Syslog.log(Syslog::LOG_CRIT, "the sky is falling in %d seconds!", 10)
-
-   crit(message, ...)
-   emerg(message, ...)
-   alert(message, ...)
-   err(message, ...)
-   warning(message, ...)
-   notice(message, ...)
-   info(message, ...)
-   debug(message, ...)
-
-	These are shortcut methods of Syslog::log().  The lineup may
-	vary depending on what priorities are defined on your system.
-
-	Example:
-	  Syslog.crit("the sky is falling in %d seconds!", 5)
- 
-   mask
-   mask=(mask)
-
-	Returns or sets the log priority mask.  The value of the mask
-	is persistent and will not be reset by Syslog::open or
-	Syslog::close.
-
-	Example:
-	  Syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_ERR)
-
-   close 
-
-	Closes syslog.
-
-   inspect
-
-	Returns the "inspect" string of the Syslog module.
-
-   instance
-
-	Returns the module itself. (Just for backward compatibility)
-
-   LOG_MASK(pri)
-
-	Creates a mask for one priority.
-
-   LOG_UPTO(pri)
-
-	Creates a mask for all priorities up to pri.
-
-** Syslog::Constants(Module)
-
-require 'syslog'
-include Syslog::Constants
-
-This module includes the LOG_* constants available on the system.
-
-Module Methods:
-
-   LOG_MASK(pri)
-
-	Creates a mask for one priority.
-
-   LOG_UPTO(pri)
-
-	Creates a mask for all priorities up to pri.
diff --git a/ext/syslog/test.rb b/ext/syslog/test.rb
deleted file mode 100644
index cfa33eff8f..0000000000
--- a/ext/syslog/test.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env ruby
-# $RoughId: test.rb,v 1.9 2002/02/25 08:20:14 knu Exp $
-# $Id$
-
-# Please only run this test on machines reasonable for testing.
-# If in doubt, ask your admin.
-
-require 'test/unit'
-
-# Prepend current directory to load path for testing.
-$:.unshift('.')
-
-require 'syslog'
-
-class TestSyslog < Test::Unit::TestCase
-  def test_new
-    assert_raises(NoMethodError) {
-      Syslog.new
-    }
-  end
-
-  def test_instance
-    sl1 = Syslog.instance
-    sl2 = Syslog.open
-    sl3 = Syslog.instance
-
-    assert_equal(Syslog, sl1)
-    assert_equal(Syslog, sl2)
-    assert_equal(Syslog, sl3)
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def test_open
-    # default parameters
-    Syslog.open
-
-    assert_equal($0, Syslog.ident)
-    assert_equal(Syslog::LOG_PID | Syslog::LOG_CONS, Syslog.options)
-    assert_equal(Syslog::LOG_USER, Syslog.facility)
-
-    # open without close
-    assert_raises(RuntimeError) {
-      Syslog.open
-    }
-
-    Syslog.close
-
-    # given parameters
-    Syslog.open("foo", Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog::LOG_DAEMON) 
-
-    assert_equal('foo', Syslog.ident)
-    assert_equal(Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog.options)
-    assert_equal(Syslog::LOG_DAEMON, Syslog.facility)
-
-    Syslog.close
-
-    # default parameters again (after close)
-    Syslog.open
-    Syslog.close
-
-    assert_equal(nil, Syslog.ident)
-    assert_equal(nil, Syslog.options)
-    assert_equal(nil, Syslog.facility)
-
-    # block
-    param = nil
-    Syslog.open { |param| }
-    assert_equal(Syslog, param)
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def test_opened?
-    assert_equal(false, Syslog.opened?)
-
-    Syslog.open
-    assert_equal(true, Syslog.opened?)
-
-    Syslog.close
-    assert_equal(false, Syslog.opened?)
-
-    Syslog.open {
-      assert_equal(true, Syslog.opened?)
-    }
-
-    assert_equal(false, Syslog.opened?)
-  end
-
-  def test_close
-    assert_raises(RuntimeError) {
-      Syslog.close
-    }
-  end
-
-  def test_mask
-    assert_equal(nil, Syslog.mask)
-
-    Syslog.open
-
-    orig = Syslog.mask
-
-    Syslog.mask = Syslog.LOG_UPTO(Syslog::LOG_ERR)
-    assert_equal(Syslog.LOG_UPTO(Syslog::LOG_ERR), Syslog.mask)
-
-    Syslog.mask = Syslog.LOG_MASK(Syslog::LOG_CRIT)
-    assert_equal(Syslog.LOG_MASK(Syslog::LOG_CRIT), Syslog.mask)
-
-    Syslog.mask = orig
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def test_log
-    stderr = IO::pipe
-
-    pid = fork {
-      stderr[0].close
-      STDERR.reopen(stderr[1])
-      stderr[1].close
-
-      options = Syslog::LOG_PERROR | Syslog::LOG_NDELAY
-
-      Syslog.open("syslog_test", options) { |sl|
-	sl.log(Syslog::LOG_NOTICE, "test1 - hello, %s!", "world")
-	sl.notice("test1 - hello, %s!", "world")
-      }
-
-      Syslog.open("syslog_test", options | Syslog::LOG_PID) { |sl|
-	sl.log(Syslog::LOG_CRIT, "test2 - pid")
-	sl.crit("test2 - pid")
-      }
-      exit!
-    }
-
-    stderr[1].close
-    Process.waitpid(pid)
-
-    # LOG_PERROR is not yet implemented on Cygwin.
-    return if RUBY_PLATFORM =~ /cygwin/
-
-    2.times {
-      assert_equal("syslog_test: test1 - hello, world!\n", stderr[0].gets)
-    }
-
-    2.times {
-      assert_equal(format("syslog_test[%d]: test2 - pid\n", pid), stderr[0].gets)
-    }
-  end
-
-  def test_inspect
-    Syslog.open { |sl|
-      assert_equal(format('<#%s: opened=true, ident="%s", options=%d, facility=%d, mask=%d>',
-			  Syslog,
-			  sl.ident,
-			  sl.options,
-			  sl.facility,
-			  sl.mask),
-		   sl.inspect)
-    }
-
-    assert_equal(format('<#%s: opened=false>', Syslog), Syslog.inspect)
-  end
-end
diff --git a/ext/tcltklib/.cvsignore b/ext/tcltklib/.cvsignore
deleted file mode 100644
index 90c83ed9b1..0000000000
--- a/ext/tcltklib/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-*.log
-*.def
diff --git a/ext/tcltklib/MANIFEST b/ext/tcltklib/MANIFEST
index e06547a6aa..b5e88278e0 100644
--- a/ext/tcltklib/MANIFEST
+++ b/ext/tcltklib/MANIFEST
@@ -1,19 +1,15 @@
 MANIFEST
-README.1st
 README.euc
 MANUAL.euc
-MANUAL.eng
 tcltklib.c
-stubs.c
 depend
 extconf.rb
 lib/tcltk.rb
-demo/lines0.tcl
 demo/lines1.rb
+demo/lines0.tcl
 demo/lines2.rb
-demo/safeTk.rb
-sample/sample0.rb
 sample/sample1.rb
 sample/sample2.rb
 sample/maru.gif
 sample/batsu.gif
+sample/sample0.rb
diff --git a/ext/tcltklib/MANUAL.eng b/ext/tcltklib/MANUAL.eng
deleted file mode 100644
index a037d18d41..0000000000
--- a/ext/tcltklib/MANUAL.eng
+++ /dev/null
@@ -1,264 +0,0 @@
-(tof)
-                                    2003/10/17  Hidetoshi NAGAI
-
-This document discribes about the 'tcltklib' library. Although there
-is the 'tcltk' library (tcltk.rb) under this directory, no description
-in this document (because it is not maintained recently). 
-
-==============================================================
-module TclTklib
-  : Defines methods to do operations which are independed on 
-  : Tcl/Tk interpreters
-
-  module TclTkLib::EventFlag
-    : Defines flags to define taget events on 'do_one_event' methos. 
-    : When to give, please use bit-operator (e.g. WINDOW | DONT_WAIT). 
-
-    [constants]
-       NONE
-         : Is 0. It means "there is no target". But on the real
-         : operation, it is same to ALL.
-
-       WINDOW
-         : 'window' event is processed.
-
-       FILE
-         : 'file' event is processed.
-
-       TIMER
-         : 'timer' event is processed.
-
-       IDLE
-         : 'idle' operation (e.g. 're-draw'; the operations when the
-         : other kinds of events doesn't occur) is processed. 
-
-       ALL
-         : All kinds of events are processed. 
-         : Same to 'WINDOW | FILE | TIMER | IDLE'. 
-
-       DONT_WAIT
-         : Without this flag, 'do_one_event' waits the occurence of 
-         : a target event. With this flag, doesn't wait and returns 
-         : false if there is no target event for processing. 
-
-    [module methods]
-       mainloop(check_root = true)
-         : Starts the eventloop. If 'check_root' is true, this method 
-	 : doesn't return when a root widget exists. 
-         : If 'check_root' is false, doen't return by the other
-         : reasons than exceptions.
-
-      mainloop_watchdog(check_root = true)
-         : On the normal eventloop, some kinds of callback operations 
-         : cause deadlock. To avoid some of such deadlocks, this
-         : method starts an eventloop and a watchdog-thread.
-
-      do_one_event(flag = TclTkLib::EventFlag::ALL | 
-                            TclTkLib::EventFlag::DONT_WAIT)
-         : Do one event for processing. When processed an event, 
-         : returns true. 
-         : If NOT set DONT_WAIT flag, this method waits occurrence of
-         : a target event. 
-         : If set DONT_WAIT flag and no event for processing, returns 
-         : false immediately. 
-         : If $SAFE >= 4,  or $SAFE >= 1 and the flag is tainted, 
-         : force to set DONT_WAIT flag.
-
-      set_eventloop_tick(timer_tick)
-         : Define the interval of thread-switching with an integer
-         : value of mili-seconds. 
-         : Default timer_tick is 0. It means that thread-switching 
-         : is based on the count of processed events. 
-         : ( see 'set_eventloop_weight' method )
-         : However, if the eventloop thread is the only thread, 
-         : timer_tick cannt be set to 0. If 0, then is set to 100 ms 
-         : automatically (see NO_THREAD_INTERRUPT_TIME on tcltklib.c). 
-         : On $SAFE >= 4, cannot call this method. 
-
-      get_eventloop_tick
-         : Get current value of 'timer_tick'
-
-      set_no_event_wait(no_event_wait)
-         : Define sleeping time of the eventloop when two or more 
-         : thread are running and there is no event for processing. 
-         : Default value is 20 (ms).
-         : If the eventloop thread is the only thread, this value is 
-         : invalid. 
-         : On $SAFE >= 4, cannot call this method. 
-
-      get_no_event_wait
-         : Get current value of 'no_event_wait'.
-
-      set_eventloop_weight(loop_max, no_event_tick)
-         : Define the weight parameters for the eventloop thread. 
-         : That is invalid when the eventloop is the only thread. 
-         : 'loop_max' is the max events for thread-switching. 
-         : 'no_event_tick' is the increment value of the event count 
-         : when no event for processing (And then, the eventloop thead
-         : sleeps 'no_event_wait' mili-seconds). 
-         : 'loop_max == 800' and 'no_event_tick == 10' are defalut. 
-         : On $SAFE >= 4, cannot call this method. 
-
-      get_eventloop_weight
-         : Get current values of 'loop_max' and 'no_event_tick'.
-
-      mainloop_abort_on_exception=(bool)
-         : Define whether the eventloop stops on exception or not. 
-         : If true (default value), stops on exception. 
-         : If false, show a warinig message but ignore the exception.
-         : If nil, no warning message and ignore the excepsion. 
-         : This parameter is sometimes useful when multiple Tk
-         : interpreters are working. Because the only one eventloop 
-         : admins all Tk interpreters, sometimes exception on a
-         : interpreter kills the eventloop thread. Even if such
-         : situation, when abort_on_exception == false or nil, 
-         : the eventloop ignores the exception and continue to working. 
-         : On $SAFE >= 4, cannot call this method. 
-
-      mainloop_abort_on_exception
-         : Get current status of that. 
-
-      num_of_mainwindows
-         : Returns the number of main-windows (root-widget). 
-         : Because there is only one main-window for one Tk interpreter, 
-         : the value is same to the number of interpreters which has 
-         : available Tk functions.
-
-
-class TclTkIp
-  [class methods]
-      new(ip_name=nil, options='')
-         : Generate an instance of TclTkIp class. 
-         : If 'ip_name' argument is given as a string, it is the name
-         : of the Tk interpreter which is shown by 'winfo interps'
-         : command. 
-         : 'options' argument accepts a string which is the command 
-         : line options of wish; such as '-geometry' or '-use'. 
-         : The information is used to generate the root widget of the 
-         : interpreter. 
-         : ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
-         : If is given nil or falsr for the 'option' argument, generates
-         : the Tcl interpreter without Tk library. Then the interpreter 
-         : doesn't need GUI environment. Therefore, even if a window
-         : system doesn't exist or cannot be used, Ruby can control the
-         : Tcl interpreter and the extention libraries loaded on the 
-         : interpreter. 
-
-   [instance methods]
-      create_slave(name, safe=false)
-         : Create a slave interpreter. 
-         : The parent of the interpreter is the receiver of this method.
-         : The name of the slave interpreter is given by 'name' argument. 
-         : The 'safe' argument decides whether the slave interpreter is
-         : created as a safe interpreter or not. If true, create a safe
-         : interpreter. Default is false. However, if the parent
-         : interpreter is a safe interpreter, the created interpreter is
-         : a safe interpreter (ignore 'safe' argument value). 
-         : If $SAFE >= 4, can create a safe interpreter only. 
-
-      make_safe
-         : Make the interpreter to the safe interpreter, and returns
-         : self. If fail, raise RuntimeError.
-
-      safe?
-         : Check whether the interpreter is the safe interpreter. 
-         : If is the safe interpreter, returns true. 
-
-      delete
-         : Delete the interpreter. 
-         : The deleted interpreter doesn't accept command and then
-         : raise an exception.
-
-      deleted?
-         : Check whether the interpreter is already deleted.
-         : If deleted, returns true. 
-
-      restart
-         : Restart Tk part of the interpreter. 
-         : Use this when you need Tk functions after destroying the
-         : root widget. 
-         : On $SAFE >= 4, cannot call this method. 
-
-      _eval(str)
-      _invoke(*args)
-         : Estimates the arguments as a command on the Tk interpreter. 
-         : The argument of _eval is a script of Tcl/Tk.
-         : Each argument of _invoke is a token of one command line of
-         : Tcl/Tk. 
-         : Because the operation of _invoke doesn't through the
-         : command line parser of Tk interpreter, the cost of
-         : estimation is smaller than _eval. However, auto_load
-         : mechanism of the Tk interpreter doesn't work on _invoke. 
-         : So _invoke can call only the command which already
-         : registered on the interpreter by 'load' command and so on. 
-         : On _eval command, auto_load mechanism words. So if succeed 
-         : to _eval and regist the command once, after that, the
-         : command can be called by _invoke. 
-
-      _toUTF8(str, encoding)
-      _fromUTF8(str, encoding)
-         : Call the function (which is internal function of Tcl/Tk) to
-         : convert to/from a UTF8 string.
-
-      _thread_vwait(var_name)
-      _thread_tkwait(mode, target)
-         : 'vwait' or 'tkwait' with thread support. 
-         : The difference from normal 'vwait' or 'tkwait' command is 
-         : doing independent wait from the vwait stack when they are
-         : called on the other thread than the eventloop thread.
-         : In the case of Tcl/Tk's vwait / tkwait, if 2nd vwait /
-         : tkwait is called on waiting for 1st vwait / tkwait, 
-         : returns the order of [2nd]->[1st] regardless of the order
-         : of when the wait condition was fulfilled.  
-         : If _thread_vwait / _thread_tkwait is called on the
-         : eventloop thread, there is no difference from vwait /
-         : tkwait. But if called on the other thread than the
-         : eventloop, stops the thread.  And when the wait condition 
-         : is fulfilled, the thread restarts. The meaning of
-         : "independent from the vwait stack" is that the timing of 
-         : restarting is independent from the waiting status of the 
-         : other threads. That is, even if the eventloop thread is 
-         : waiting by vwait and is not fulfilled the condition, 
-         : _thread_vwait completes the waiting when its waiting
-         : condition is fulfilled and the thread which stopped by
-         : _thread_vwait can continue the operation. 
-
-      _return_value
-         : Get the last result value on the interpreter. 
-
-      mainloop
-      mainloop_watchdog
-         : If on the slave interpreter, never start an eventloop and
-         : returns nil. 
-         : With the exception that, same to the TclTkLib module method
-         : with the same name. 
-
-      do_one_event
-         : With the exception that the argument is forced to set
-         : DONT_WAIT flag on the slave interpreter, same to
-         : TclTkLib#do_one_event. 
-
-      set_eventloop_tick
-      get_eventloop_tick
-      set_no_event_wait
-      get_no_event_wait
-      set_eventloop_weight
-      get_eventloop_weight
-      mainloop_abort_on_exception
-      mainloop_abort_on_exception=
-         : With the exception that it is ignored to set value on the
-         : slave interpreter, same to the TclTkLib module method with
-         : the same name. 
-
-class TkCallbackBreak < StandardError
-class TkCallbackContinue < StandardError
-   : They are exception classes to break or continue the Tk callback 
-   : operation. 
-   : If raise TkCallbackBreak on the callback procedure, Ruby returns 
-   : 'break' code to Tk interpreter (Then the Tk interpreter will 
-   : break the operation for the current event). 
-   : If raise TkCallbackContinue, returns 'continue' code (Then the Tk
-   : interpreter will break the operateion for the current bindtag and 
-   : starts the operation for the next buindtag for the current event).
-
-(eof)
diff --git a/ext/tcltklib/MANUAL.euc b/ext/tcltklib/MANUAL.euc
index 9f9c77da02..789e85a9de 100644
--- a/ext/tcltklib/MANUAL.euc
+++ b/ext/tcltklib/MANUAL.euc
@@ -1,20 +1,4 @@
 (tof)
-                                    2003/10/17  Hidetoshi NAGAI
-
-�ܥɥ�����ȤˤϸŤ� tcltk �饤�֥�ꡤtcltklib �饤�֥�������
-���ޤޤ�Ƥ��ޤ��������ε������ƤϸŤ���ΤȤʤäƤ��ޤ���
-
-tcltk �饤�֥���tcltk.rb�ˤϸ��ߤǤϥ��ƥʥ󥹤����¾�Ԥ���
-���ʤ����ᡤ�Ť��ɥ�����Ȥ����������Τޤ�ͭ���Ǥ���������Ф���
-tcltklib �饤�֥��ˤĤ��Ƥϡ����ߤ� Ruby/Tk��tk.rb �ʲ��Υ饤�֥�
-�귲�ˤ��Ư�����뤿����濴�Ȥ��ƥ��ƥʥ󥹤���Ƥ��뤿�ᡤ����
-�㤤�������Ƥ��ޤ���
-
-�����ǡ��ޤ��Ť�����ʸ��򼨤����塤���ߤ� tcltklib �饤�֥��ˤ�
-���Ƥ�������ä��ޤ���
-
-�ʲ����饤�֥��θŤ�����ʸ��Ǥ���
-==============================================================
 	MANUAL.euc
 		Sep. 19, 1997	Y. Shigehiro
 
@@ -137,272 +121,4 @@ require "tcltklib" �����, �ʲ��Υ⥸�塼��, ���饹�����Ѳ�ǽ�Ǥ�.
     ����: ̵��
     ����� (Fixnum): ľ���� Tcl_Eval() ���֤�����.
 
-==============================================================
-
-�ʲ����ܥɥ�����Ⱥ��������Ǥ� tcltklib �饤�֥��������Ǥ���
-==============================================================
-�⥸�塼�� TclTkLib
-   : �ġ��� Tcl/Tk ���󥿡��ץ꥿�˰�¸���ʤ����� ( == ���٥�ȥ롼
-   : �פ˴ؤ������ ) ��ƤӽФ��᥽�åɤ���������⥸�塼�롥
-
-   �⥸�塼�� TclTkLib::EventFlag
-      : do_one_event ��ƤӽФ��ݤν����оݥ��٥�Ȥ���ꤹ�뤿���
-      : �ե饰 ( WINDOW|DONT_WAIT �Ȥ����褦�˥ӥåȱ黻�Ҥ�Ϣ�뤷��
-      : ���� ) ������Ȥ�����������⥸�塼�롥�ʲ���������ޤޤ�롥
-
-      ���  NONE
-         : �ͤ� 0 �ǡ��ͤȤ��ƤϤ����ʤ����Υ��٥�Ȥ���ꤷ�Ƥ��ʤ�
-         : ���Ȥˤʤ뤬���ºݤν������ ALL ��Ʊ���Ȥ��ư����롥
-
-      ���  WINDOW
-         : window ���٥�Ȥ�����оݤȤ���
-
-      ���  FILE
-         : file ���٥�Ȥ�����оݤȤ���
-
-      ���  TIMER
-         : timer ���٥�Ȥ�����оݤȤ���
-
-      ���  IDLE
-         : �����ɥ�롼�׽��� ( ������ʤɡ�¾�μ���Υ��٥�Ȥ�ȯ��
-         : ���Ƥ��ʤ��Ȥ��˹Ԥ������ ) ������оݤȤ���
-
-      ���  ALL
-         : ���٤Ƥμ���Υ��٥�Ȥ�����оݤȤ���
-         : WINDOW|FILE|TIMER|IDLE ��Ʊ��
-
-      ���  DONT_WAIT
-         : �����оݥ��٥�Ȥ�¸�ߤ��ʤ����ˡ����٥��ȯ�����Ԥ���
-         : �� do_one_event ��λ ( false ���֤� ) ���� 
-
-   �⥸�塼��᥽�å�
-      mainloop(check_root = true)
-         : ���٥�ȥ롼�פ�ư���롥check_root �� true �Ǥ���С�
-         : root widget ��¸�ߤ���¤ꡤ���Υ᥽�åɤϽ�λ���ʤ���
-         : check_root �� false �ξ��ϡ�root widget �����Ǥ��Ƥ�
-         : ���Υ᥽�åɤϽ�λ���ʤ� ( root widget �����Ǥ��Ƥ⡤
-         : WINDOW �ʳ��Υ��٥�Ȥ�ȯ�������뤿�� )����λ�ˤϡ�����
-         : �����Ư���ݤ� ( ����åɤ���Ѥ���ʤ� ) ��ɬ�ס�
-
-      mainloop_watchdog(check_root = true)
-         : �̾�Υ��٥�ȥ롼�פǤϡ����٥�Ƚ��������Ƥˤ�äƤ�
-         : �ǥåɥ��å��������������ǽ�������� (�㤨�Х��٥�Ȥ�
-         : �Ф��륳����Хå�������� widget ���򤷡����ν�λ��
-         : �ԤĤʤ�)�����Υ᥽�åɤϡ����������ǥåɥ��å������
-         : �뤿��δƻ륹��å��դ��ǥ��٥�ȥ롼�פ�ư����
-         : ( �ƻ륹��åɤ�����������˥��٥�ȥ롼�פ�¹Ԥ��� )��
-         : �����ΰ�̣�� mainloop ��Ʊ���Ǥ��롥
-
-      do_one_event(flag = TclTkLib::EventFlag::ALL | 
-                            TclTkLib::EventFlag::DONT_WAIT)
-         : �����Ԥ��Υ��٥�� 1 �Ĥ�¹Ԥ��롥
-         : ���٥�Ȥ������������ true ���֤���
-         : �ե饰�� DONT_WAIT ����ꤷ�Ƥ��ʤ���硤�ե饰�ǽ�����
-         : �ݤȤʤäƤ������Υ��٥�Ȥ�ȯ������ޤ��Ԥ�³���롥
-         : DONT_WAIT ����ꤷ�Ƥ�����硤�����оݥ��٥�Ȥ��ʤ��Ƥ�
-         : �����˽�λ�� false ���֤���
-         : $SAFE >= 4 ����$SAFE >= 1 ���� flag ����������Ƥ���ʤ��
-         : flag �ˤ� DONT_WAIT ������Ū���դ����롥
-
-      set_eventloop_tick(timer_tick)
-         : ���٥�ȥ롼�פ�Ʊ�����̥���åɤ���Ư���Ƥ�����ˡ���
-         : �֤˴�Ť�������Ū�ʥ���åɥ����å��󥰤�ɤ����٤�����
-         : ( ���ֳִ� ) ��ȯ�������뤫��ߥ���ñ�̤������ͤǻ��ꤹ�롥
-         : 0 ����ꤹ��ȡ����ζ���Ū�ʥ����å��󥰤ϹԤ��ʤ���
-         : ɸ��Ǥ� 0 �����ꤵ��Ƥ��ꡤ���٥�Ƚ������˴�Ť�������
-         : ���󥰤������Ԥ��� ( see set_eventloop_weight )��
-         : ����������Ư���Ƥ��륹��åɤ����٥�ȥ롼�פ����ξ�硤
-         : timer_tick �� 0 �����ꤹ�뤳�ȤϤǤ��ʤ����⤷���ꤵ���
-         : �����顤100 ms ( see NO_THREAD_INTERRUPT_TIME ) �˼�ư��
-         : �ꤵ��롥
-         : �ܺ٤�������ά����������� CPU �ѥ�����󤷤Ĥİ�����
-         : ���ꤷ��ư���¸����뤿��˼����������ͤǤ��롥
-         : $SAFE >= 4 �Ǥϼ¹Ԥ��ػߤ���롥
-
-      get_eventloop_tick
-         : timer_tick �θ����ͤ��֤���
-
-      set_no_event_wait(no_event_wait)
-         : ʣ���Υ���åɤ���Ư���Ƥ�����ǡ������Ԥ����٥�Ȥ���
-         : ��¸�ߤ��ʤ��ä��ݤ� sleep ���֤��������Ĺ����ꤹ�롥
-         : ��Ư����åɤ����٥�ȥ롼�פ����ξ��ˤϰ�̣��ʤ��ʤ���
-         : �ǥե���Ȥ��ͤ� 20 (ms)
-         : $SAFE >= 4 �Ǥϼ¹Ԥ��ػߤ���롥
-
-      get_no_event_wait
-         : no_event_wait �θ����ͤ��֤���
-
-      set_eventloop_weight(loop_max, no_event_tick)
-         : ʣ���Υ���åɤ���Ư���Ƥ���ݤ� Ruby/Tk �Υ��٥�ȥ롼
-         : �פ˳�����Ƥ���Ť����뤿��Υѥ�᡼�������ꤹ�롥
-         : ��Ư����åɤ����٥�ȥ롼�פ����ξ��ˤϰ�̣��ʤ��ʤ���
-         : ���٤Υ���å��ڤ��ؤ��δ֤˽������륤�٥�Ȥκ�����ȡ�
-         : �����Ԥ��Υ��٥�Ȥ�¸�ߤ��ʤ��ݤβû����Ȥ����ꤹ�롥
-         : �����Ԥ����٥�Ȥ�¸�ߤ��ʤ����� no_event_wait ( see 
-         : set_no_event_wait ) �����δ� sleep ���֤����롥
-         : �ǥե���ȤǤϤ��줾�� 800 ��� 10 �󡤤Ĥޤꡤ800 �ĤΥ�
-         : �٥�� (�����ɥ륤�٥�Ȥ�ޤ�) ���������Ȥ������٥��
-         : ������ȯ�����ʤ��ޤޤ� 80 ��ν����Ԥ����٥�ȸ�������λ
-	 : ����Ȥ��ǥ�����Ȥ� 800 �ʾ�ˤʤ�ȥ���åɥ����å���
-         : ��ȯ�����뤳�Ȥˤʤ롥
-         : $SAFE >= 4 �Ǥϼ¹Ԥ��ػߤ���롥
-
-      get_eventloop_weight
-         : ���ߤ� loop_max �� no_event_tick �Ȥ��ͤ��֤���
-         : ( see set_eventloop_wait )
-
-      mainloop_abort_on_exception=(bool)
-         : Tk ���󥿡��ץ꥿����㳰��ȯ�������ݤˡ����٥�ȥ롼�פ�
-         : ���顼��ߤ����뤫�ɤ�������ꤹ�롥true ����ꤷ������
-         : ���顼��ߤ��뤬��false �ξ����㳰��̵�뤷�ƥ��٥�ȥ롼
-         : �פ��³���롥����� nil �ξ��Ϸٹ�⡼�ɤǤʤ��¤�ϥ�
-         : �顼��å������ν��Ϥ����ά���ơ��㳰��̵�뤹�롥
-	 : �ǥե���ȤǤ� true �����ꤵ��Ƥ��롥
-         : ���ĤΥ��󥿡��ץ꥿������ȤäƤ�����ˤϥ��顼���ˤ���
-         : �ޤ���ߤ��Ƥ��̾������ʤ�����ʣ���Υ��󥿡��ץ꥿��Ʊ��
-         : ��ư��Ƥ�����ˤϡ�������������륤�٥�ȥ롼�פϣ�
-         : �Ĥ����Ǥ��뤿�ᡤ�����줫�Υ��󥿡��ץ꥿�Υ��顼�������ǡ�
-         : ¾�Υ��󥿡��ץ꥿�ν�����³���Բ�ǽ�ˤʤ뤳�Ȥ����롥����
-         : �褦�ʾ��Ǥ⥨�顼��̵�뤷�ƥ��٥�ȥ롼�פ���Ư��³����
-         : ���Ȥǡ�¾�Υ��󥿡��ץ꥿�������ư�³���뤳�Ȥ��Ǥ��롥
-         : $SAFE >= 4 �Ǥϼ¹Ԥ��ػߤ���롥
-
-      mainloop_abort_on_exception
-         : Tk ���󥿡��ץ꥿����㳰��ȯ�������ݤˡ����٥�ȥ롼�פ�
-         : �顼��ߤ����뤫�ɤ�����������֤� true/false �����롥
-
-      num_of_mainwindows
-         : ���ߤΥᥤ�󥦥���ɥ� (�롼�ȥ��������å�) �ο����֤���
-         : �ᥤ�󥦥���ɥ��ϰ�ĤΥ��󥿡��ץ꥿���դ������ĤǤ���
-         : �Τǡ������ͤϸ��� Tk �ε�ǽ��ͭ���Ǥ��륤�󥿡��ץ꥿����
-         : ������������
-
-
-���饹 TclTkIp
-   ���饹�᥽�å�
-      new(ip_name=nil, options='')
-         : TclTkIp ���饹�Υ��󥹥��󥹤��������롥
-         : ip_name ��ʸ�����Ϳ�������ϡ����줬 winfo interps �ʤɤ�
-         : ɽ�������̾���ˤʤ롥
-         : options �ˤϡ�-geometry �� -use �ʤɡ�wish �Υ��ޥ�ɥ饤��
-         : �����Ȥ���Ϳ���륪�ץ�����Ʊ�ͤξ����ʸ����Ȥ���Ϳ���롥
-         : Ϳ����줿����ϡ�root widget �����κݤ��Ѥ����롥
-         : ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
-         : �⤷ options �˴����� nil �ޤ��� false ��Ϳ������硤Tk �饤
-         : �֥�꤬Ƴ������Ƥ��ʤ� (�Ĥޤ�� Tcl �Τߤ�) ���󥿡��ץ�
-         : �����������롥���ξ��� GUI �Ķ���ɬ�פʤ����ᡤ������ɥ�
-         : �����ƥब¸�ߤ��ʤ����ޤ��ϻ��ѤǤ��ʤ��Ķ��Ǥ� Tcl ���󥿡�
-         : �ץ꥿����������Tcl �䤽�γ�ĥ�饤�֥�����Ѥ��뤳�Ȥ��Ǥ��롥
-
-   ���󥹥��󥹥᥽�å�
-      create_slave(name, safe=false)
-         : �쥷���Ф�ƤȤ��� name �Ȥ���̾���Υ��졼�֥��󥿡��ץ꥿��
-	 : �������롥
-	 : safe �ˤ��������륤�󥿡��ץ꥿�� safe ���󥿡��ץ꥿�Ȥ���
-         : ������ꤹ�롥�ǥե���Ȥ� false �Ȥ������ȤˤʤäƤ��뤬��
-         : ���Ȥ����Τ� false ����ꤷ�Ƥ����Ȥ��Ƥ⡤�ƤȤʤ륤�󥿡�
-         : �ץ꥿�� safe ���󥿡��ץ꥿�Ǥ���С��������������Ѥ��� 
-         : safe ���󥿡��ץ꥿�Ȥ�����������롥
-         : $SAFE >= 4 �Ǥϡ�safe ���󥿡��ץ꥿�ʳ����������ػߤ���롥
-
-      make_safe
-         : Tcl/Tk ���󥿡��ץ꥿�� safe ���󥿡��ץ꥿���ѹ����롥
-         : ����ͤϥ쥷���ФǤ��륤�󥿡��ץ꥿���ȤǤ��롥
-         : ���Ԥ������� RuntimeError ���㳰��ȯ�����롥
-
-      safe?
-         : Tcl/Tk ���󥿡��ץ꥿�� safe ���󥿡��ץ꥿�Ǥ��뤫��Ĵ�٤롥
-         : safe ���󥿡��ץ꥿�Ǥ���� true ���֤���
-
-      delete
-         : Tcl/Tk ���󥿡��ץ꥿�� delete ���롥
-         : delete ���줿���󥿡��ץ꥿�ϡ��ʸ���ڤ����Ǥ��ʤ��ʤꡤ
-         : ���ޥ�ɤ����äƤ��㳰��ȯ������褦�ˤʤ롥
-
-      deleted?
-         : Tcl/Tk ���󥿡��ץ꥿�����Ǥ� delete ����Ƥ��뤫��Ĵ�٤롥
-         : delete �Ѥߤǥ��ޥ�ɤ�����դ��ʤ����֤ˤʤäƤ���ʤ��
-         : true ���֤���
-
-      restart
-         : Tcl/Tk ���󥿡��ץ꥿�� Tk ��ʬ�ν�������Ƶ�ư��Ԥ���
-         : ��ö root widget ���˲�������˺��� Tk �ε�ǽ��ɬ�פ�
-         : �ʤä������Ѥ��롥
-         : $SAFE >= 4 �Ǥϼ¹Ԥ��ػߤ���롥
-
-      _eval(str)
-      _invoke(*args)
-         : Tcl/Tk ���󥿡��ץ꥿���ɾ����Ԥ���
-         : _eval ��ɾ��������ץȤ���Ĥ�ʸ����Ǥ��뤳�Ȥ��Ф���
-         : _invoke ��ɾ��������ץȤ� token ���Ȥ˰�Ĥΰ����Ȥ�
-         : ��褦��Ϳ���롥
-         : _invoke ������ Tcl/Tk ���󥿡��ץ꥿�λ�����ϴ���Ѥ�
-         : �ʤ����ᡤɾ������٤���꾯�ʤ��Ƥ��ࡥ��������������
-         : ���� auto_load �Τ褦�ʵ�����Ư������load ���ˤ�ä�
-         : Tcl/Tk ���󥿡��ץ꥿��˴�����Ͽ�ѤߤΥ��ޥ�ɤ�����
-         : �ӽФ����Ȥ��Ǥ��ʤ���
-         : _eval �Ǥ� auto_load ������Ư�����ᡤ���� _eval ��¹�
-         : ������Ͽ����������������С��ʹߤ� _invoke �Ǥ����Ѥ�
-         : ����褦�ˤʤ롥
-
-      _toUTF8(str, encoding)
-      _fromUTF8(str, encoding)
-         : Tcl/Tk ����¢���Ƥ��� UTF8 �Ѵ�������ƤӽФ���
-
-      _thread_vwait(var_name)
-      _thread_tkwait(mode, target)
-         : ����å��б��� vwait ���뤤�� tkwait �����Υ᥽�åɡ�
-         : �̾�� vwait ���뤤�� tkwait ���ޥ�ɤȰۤʤ�Τϡ����٥�
-         : �ȥ롼�פȤϰۤʤ륹��åɤ���ƤӽФ������� vwait ����
-         : �����å��Ȥ���Ω�˾�����Ω�Ԥ����ʤ���뤳�ȤǤ��롥
-         : �̾�� vwait / tkwait �Ǥϡ�vwait / tkwait (1) ���Ԥ�����
-         : ��Ǥ���� vwait / tkwait (2) ���ƤФ줿��硤�Ԥ����о�
-         : �ȤʤäƤ��������Ω������ɤ����졤(2)->(1) �ν���Ԥ�
-         : ��λ������äƤ��롥
-         : _thread_vwait / _thread_tkwait �ϡ����٥�ȥ롼�פΥ����
-         : �ɤǸƤФ줿�����̾�� vwait / tkwait ��Ʊ�ͤ�ư���
-         : �������٥�ȥ롼�װʳ��Υ���åɤǸƤФ줿���ˤϤ��Υ�
-         : ��åɤ���ߤ������Ԥ������ꡤ��郎��Ω�������˥���å�
-         : �μ¹Ԥ�Ƴ����롥��vwait �����Ԥ������å��Ȥ���Ω�פȤ�
-         : ����̣�ϡ����κƳ��Υ����ߥ󥰤�¾�Υ���åɤǤ��Ԥ�����
-         : �Ȥ�̵�ط��Ȥ������ȤǤ��롥�Ĥޤꡤ���٥�ȥ롼������¾
-         : �Υ���åɤ� vwait �����Ԥ��ξ��֤ˤ��ä��Ȥ��Ƥ⤽�δ�λ
-         : ���ԤĤ��Ȥʤ���������Ԥ���郎��Ω���衤�������³����
-         : ���Ȥˤʤ롥
-
-      _return_value
-         : ľ���� Tcl/Tk ��Ǥ�ɾ���μ¹Է�̤Ȥ��Ƥ�����ͤ��֤���
-
-      mainloop
-      mainloop_watchdog
-         : ���졼�� IP �ξ��ˤϥ��٥�ȥ롼�פ�ư������ nil ���֤���
-         : ����ʳ������Ǥϰ�����ޤ�� TclTkLib ��Ʊ̾�᥽�åɤ�Ʊ����
-
-      do_one_event
-         : ���졼�� IP �ξ��ˤϰ����Υ��٥�ȥե饰�� DONT_WAIT ��
-         : ����Ū���ɲä���� (���٥���Ԥ��ǥ��꡼�פ��뤳�Ȥ϶ػ�)��
-         : ����ʳ������Ǥϰ�����ޤ�� TclTkLib ��Ʊ̾�᥽�åɤ�Ʊ����
-
-      set_eventloop_tick
-      get_eventloop_tick
-      set_no_event_wait
-      get_no_event_wait
-      set_eventloop_weight
-      get_eventloop_weight
-      mainloop_abort_on_exception
-      mainloop_abort_on_exception=
-         : ���졼�� IP �ξ��ˤ��ͤ����꤬������ʤ� (̵�뤵���)��
-         : ����ʳ������Ǥϰ�����ޤ�� TclTkLib ��Ʊ̾�᥽�åɤ�Ʊ����
-
-���饹 TkCallbackBreak < StandardError
-���饹 TkCallbackContinue < StandardError
-   : �����ϥ��٥�ȥ�����Хå��ˤ����ơ�������Хå�������Ŭ�ڤ���
-   : �Ǥ����ꡤ���ΥХ���ɥ����ΥХ���ǥ��󥰽����˿ʤ᤿�ꤹ�뤳��
-   : ���ǽ�ˤ��뤿����㳰���饹�Ǥ��롥
-   : ������Хå��� break �� continue ��¸����뤿��ˤϡ�������Хå�
-   : �Ǥ��� Ruby ��³���� Tcl/Tk ���󥿡��ץ꥿¦��Ŭ�ڤʥ꥿���󥳡�
-   : �ɤ��֤�ɬ�פ����롥Ruby �μ�³�������̤��ͤ��֤��ΤǤϡ����줬��
-   : �̤�����ͤǤ���Τ��ݤ�����̤��Ǥ��ʤ����ᡤ�㳰ȯ�������Ѥ���
-   : ������ԤäƤ��롥
-
 (eof)
diff --git a/ext/tcltklib/README.1st b/ext/tcltklib/README.1st
deleted file mode 100644
index 14c56fd410..0000000000
--- a/ext/tcltklib/README.1st
+++ /dev/null
@@ -1,33 +0,0 @@
-To compile 'tcltklib', you must have Tcl/Tk libraries on your environment. 
-Although 'extconf.rb' script searches Tcl/Tk libraries and header files, 
-sometimes fails to find them. And then, 'tcltklib' cannot be compiled. If 
-Tcl/Tk libraries or header files are installed but are not found, you can 
-give the information by arguments of the 'configure' script. Please give 
-some or all of the following options. 
-
- --with-tcllib=<libname>    (e.g. libtcl8.3.so ==> --with-tcllib=tcl8.3)
- --with-tklib=<libname>     (e.g. libtk8.3.so  ==> --with-tklib=tk8.3)
-
- --enable_tcltk_stubs       (if you force to enable stubs)
-
- --with-tcl-dir=<path> 
-      equal to "--with-tcl-include=<path>/include --with-tcl-lib=<path>/lib"
-
- --with-tk-dir=<path> 
-      equal to "--with-tk-include=<path>/include --with-tk-lib=<path>/lib"
-
- --with-tcl-include=<dir>   the directry containts 'tcl.h'
- --with-tk-include=<dir>    the directry containts 'tk.h'
-
- --with-tcl-lib=<dir>       the directry containts 'libtcl<version>.so'
- --with-tk-lib=<dir>        the directry containts 'libtk<version>.so'
-
-If you forgot to give the options when do 'configure' on toplevel
-directry of Ruby sources, please try something like as the followings.
-
- $ cd ext/tcltklib
- $ rm Makefile
- $ CONFIGURE_ARGS='--with-tcl-include=/usr/local/include/tcl8.3/ --with-tcllib=tcl8.3 --with-tklib=tk8.3 --enable-tcltk_stubs' ruby extconf.rb
-
-==========================================================
-                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tcltklib/README.euc b/ext/tcltklib/README.euc
index fd75202c18..290ffb0b60 100644
--- a/ext/tcltklib/README.euc
+++ b/ext/tcltklib/README.euc
@@ -1,30 +1,4 @@
 (tof)
-                                    2003/06/19  Hidetoshi NAGAI
-
-�ܥɥ�����ȤˤϸŤ� tcltk �饤�֥�ꡤtcltklib �饤�֥�������
-���ޤޤ�Ƥ��ޤ��������ε������ƤϸŤ���ΤȤʤäƤ��ޤ���
-
-�ޤ������ߤ� Ruby/Tk ���濴�Ǥ��� tk.rb �� wish ��ƤӽФ�����Ϥ�
-����tcltklib �饤�֥��� wrap ����ư����ΤȤʤäƤ��ޤ�������
-���ᡤ�Ť��������ҤǽҤ٤��Ƥ���褦�ʥץ��������̿��ˤ�륪����
-�إåɤ�¸�ߤ��ޤ���
-
-���ߤ� tcltklib �饤�֥��Ǥ⡤Tcl/Tk �� C �饤�֥����󥯤���
-ľ�ܤ�ư�������Ȥǡ������Хإåɤ򲡤����Ĥ� Tcl/Tk ���󥿡��ץ꥿
-�Τۤ�����ǽ�ʳ�ĥ�饤�֥���ޤ�ˤ�Ȥ�������Ʊ���Ǥ�����������
-�������Ϥۤܡ�tk.rb �ʲ��Υ饤�֥������Ū��Ư�����뤿��Τ�Ρ�
-�ȸ��ʤ���Ƥ��ꡤ������Ū�ǥ��ƥʥ󥹤���Ƥ��ޤ���
-
-tk.rb �ιⵡǽ����ȼ�äơ�����Υ饤�֥��Ǥ��� tcltk �饤�֥��
-��tcltk.rb�ˤϤ���¸�߰յ��򸺤��Ƥ��ꡤ���ߤǤϥ��ƥʥ󥹤ϹԤ�
-��Ƥ��ޤ���
-
-�ʤ����Ť������ǤϥХ���ǥ��󥰤ˤ����륹����ץȤ��ɲäϤǤ��ʤ���
-�ȤȤʤäƤ��ޤ��������ߤ� tk.rb �ǤϤ�����ǽ�Ǥ��뤳�Ȥ�������
-�����ޤ���
-
-�ʲ����饤�֥��θŤ�����ʸ��Ǥ���
-==============================================================
 	tcltk �饤�֥��
 	tcltklib �饤�֥��
 		Sep. 19, 1997	Y. Shigehiro
diff --git a/ext/tcltklib/demo/safeTk.rb b/ext/tcltklib/demo/safeTk.rb
deleted file mode 100644
index 5d2c60e700..0000000000
--- a/ext/tcltklib/demo/safeTk.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-require 'tcltklib'
-
-master = TclTkIp.new
-slave_name = 'slave0'
-slave = master.create_slave(slave_name, true)
-master._eval("::safe::interpInit #{slave_name}")
-master._eval("::safe::loadTk #{slave_name}")
-
-master._invoke('label', '.l1', '-text', 'master')
-master._invoke('pack', '.l1', '-padx', '30', '-pady', '50')
-master._eval('label .l2 -text {root widget of master-ip}')
-master._eval('pack .l2 -padx 30 -pady 50')
-
-slave._invoke('label', '.l1', '-text', 'slave')
-slave._invoke('pack', '.l1', '-padx', '30', '-pady', '50')
-slave._eval('label .l2 -text {root widget of slave-ip}')
-slave._eval('pack .l2 -padx 30 -pady 20')
-slave._eval('label .l3 -text {( container frame widget of master-ip )}')
-slave._eval('pack .l3 -padx 30 -pady 20')
-
-TclTkLib.mainloop
diff --git a/ext/tcltklib/depend b/ext/tcltklib/depend
index 2cd9c400f7..e91f9dacbf 100644
--- a/ext/tcltklib/depend
+++ b/ext/tcltklib/depend
@@ -1,2 +1 @@
 tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
-stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb
index 575bf78034..ec06f8b245 100644
--- a/ext/tcltklib/extconf.rb
+++ b/ext/tcltklib/extconf.rb
@@ -2,12 +2,10 @@
 
 require 'mkmf'
 
-if RUBY_PLATFORM !~ /mswin32|mingw|cygwin|bccwin32/
-  have_library("nsl", "t_open")
-  have_library("socket", "socket")
-  have_library("dl", "dlopen")
-  have_library("m", "log") 
-end
+have_library("nsl", "t_open")
+have_library("socket", "socket")
+have_library("dl", "dlopen")
+have_library("m", "log") 
 
 dir_config("tk")
 dir_config("tcl")
@@ -15,44 +13,35 @@ dir_config("X11")
 
 tklib = with_config("tklib")
 tcllib = with_config("tcllib")
-stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
 
-def find_tcl(tcllib, stubs)
-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  func = stubs ? "Tcl_InitStubs" : "Tcl_FindExecutable"
+def find_tcl(tcllib)
+  paths = ["/usr/local/lib", "/usr/pkg"]
+  func = "Tcl_FindExecutable"
   if tcllib
     find_library(tcllib, func, *paths)
-  elsif find_library("tcl", func, *paths)
-    true
   else
-    %w[8.4 8.3 8.2 8.0 7.6].find { |ver|
-      find_library("tcl#{ver}", func, *paths) or
-	find_library("tcl#{ver.delete('.')}", func, *paths)
-    }
+    find_library("tcl", func, *paths) or
+      find_library("tcl8.0", func, *paths) or
+      find_library("tcl7.6", func, *paths)
   end
 end
 
-def find_tk(tklib, stubs)
-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  func = stubs ? "Tk_InitStubs" : "Tk_Init"
+def find_tk(tklib)
+  paths = ["/usr/local/lib", "/usr/pkg"]
+  func = "Tk_Init"
   if tklib
     find_library(tklib, func, *paths)
-  elsif find_library("tk", func, *paths)
-    true
   else
-    %w[8.4 8.3 8.2 8.0 4.2].find { |ver|
-      find_library("tk#{ver}", func, *paths) or
-	find_library("tk#{ver.delete('.')}", func, *paths)
-    }
+    find_library("tk", func, *paths) or
+      find_library("tk8.0", func, *paths) or
+      find_library("tk4.2", func, *paths)
   end
 end
 
 if have_header("tcl.h") && have_header("tk.h") &&
-    (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM || find_library("X11", "XOpenDisplay",
-	"/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) &&
-    find_tcl(tcllib, stubs) &&
-    find_tk(tklib, stubs)
-  $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
-  $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
+    find_library("X11", "XOpenDisplay",
+		 "/usr/X11/lib", "/usr/X11R6/lib", "/usr/openwin/lib") &&
+    find_tcl(tcllib) &&
+    find_tk(tklib)
   create_makefile("tcltklib")
 end
diff --git a/ext/tcltklib/lib/tcltk.rb b/ext/tcltklib/lib/tcltk.rb
index a6bc773b96..54a00e8f3c 100644
--- a/ext/tcltklib/lib/tcltk.rb
+++ b/ext/tcltklib/lib/tcltk.rb
@@ -93,9 +93,9 @@ class TclTkInterpreter
     # ruby_fmt command format arguments by `format' and call `ruby' command
     # (notice ruby command receives only one argument)
     if $DEBUG
-      @ip._eval("proc ruby_fmt {fmt args} { puts \"ruby_fmt: $fmt $args\" ; set cmd [list ruby [format $fmt $args]] ; uplevel $cmd }")
+      @ip._eval("proc ruby_fmt {fmt args} { puts \"ruby_fmt: $fmt $args\" ; ruby [format $fmt $args] }")
     else
-      @ip._eval("proc ruby_fmt {fmt args} { set cmd [list ruby [format $fmt $args]] ; uplevel $cmd }")
+      @ip._eval("proc ruby_fmt {fmt args} { ruby [format $fmt $args] }")
     end
 
     # @ip._get_eval_string(*args): generate string to evaluate in tcl interpreter
diff --git a/ext/tcltklib/sample/sample1.rb b/ext/tcltklib/sample/sample1.rb
index 21ee0f29d5..28ba7b547a 100644
--- a/ext/tcltklib/sample/sample1.rb
+++ b/ext/tcltklib/sample/sample1.rb
@@ -535,7 +535,7 @@ class Test1
       # clipboard �򥯥ꥢ.
       clipboard.e("clear")
       # selection ����ʸ������ɤ߹��� clipboard ���ɲä���.
-      clipboard.e("append {#{selection.e('get')}}")}))
+      clipboard.e("append {#{selection.e(\"get\")}}")}))
     me1.e("add command -label {selection -> clipboard} -command",c)
     cb.push(c = TclTkCallback.new(ip, proc{
       # li1 �򥯥ꥢ.
diff --git a/ext/tcltklib/stubs.c b/ext/tcltklib/stubs.c
deleted file mode 100644
index 56cc8ca921..0000000000
--- a/ext/tcltklib/stubs.c
+++ /dev/null
@@ -1,97 +0,0 @@
-int ruby_tcltk_stubs();
-
-#if defined USE_TCL_STUBS && defined USE_TK_STUBS
-#include "ruby.h"
-
-#if defined _WIN32 || defined __CYGWIN__
-# include "util.h"
-# include <windows.h>
-  typedef HINSTANCE DL_HANDLE;
-# define DL_OPEN LoadLibrary
-# define DL_SYM GetProcAddress
-# define TCL_INDEX 4
-# define TK_INDEX 3
-# define TCL_NAME "tcl89%s"
-# define TK_NAME "tk89%s"
-# undef DLEXT
-# define DLEXT ".dll"
-#elif defined HAVE_DLOPEN
-# include <dlfcn.h>
-  typedef void *DL_HANDLE;
-# define DL_OPEN(file) dlopen(file, RTLD_LAZY|RTLD_GLOBAL)
-# define DL_SYM dlsym
-# define TCL_INDEX 8
-# define TK_INDEX 7
-# define TCL_NAME "libtcl8.9%s"
-# define TK_NAME "libtk8.9%s"
-#endif
-
-#include <tcl.h>
-#include <tk.h>
-
-int
-ruby_tcltk_stubs()
-{
-    DL_HANDLE tcl_dll;
-    DL_HANDLE tk_dll;
-    Tcl_Interp *(*p_Tcl_CreateInterp)();
-    int (*p_Tk_Init) _((Tcl_Interp *));
-    Tcl_Interp *tcl_ip;
-    int n;
-    char *ruby_tcl_dll = 0;
-    char *ruby_tk_dll = 0;
-    char tcl_name[20];
-    char tk_name[20];
-
-    ruby_tcl_dll = getenv("RUBY_TCL_DLL");
-#if defined _WIN32
-    if (ruby_tcl_dll) ruby_tcl_dll = ruby_strdup(ruby_tcl_dll);
-#endif
-    ruby_tk_dll = getenv("RUBY_TK_DLL");
-    if (ruby_tcl_dll && ruby_tk_dll) {
-	tcl_dll = (DL_HANDLE)DL_OPEN(ruby_tcl_dll);
-	tk_dll = (DL_HANDLE)DL_OPEN(ruby_tk_dll);
-    } else {
-	snprintf(tcl_name, sizeof tcl_name, TCL_NAME, DLEXT);
-	snprintf(tk_name, sizeof tk_name, TK_NAME, DLEXT);
-	/* examine from 8.9 to 8.1 */
-	for (n = '9'; n > '0'; n--) {
-	    tcl_name[TCL_INDEX] = n;
-	    tk_name[TK_INDEX] = n;
-	    tcl_dll = (DL_HANDLE)DL_OPEN(tcl_name);
-	    tk_dll = (DL_HANDLE)DL_OPEN(tk_name);
-	    if (tcl_dll && tk_dll)
-		break;
-	}
-    }
-
-#if defined _WIN32
-    if (ruby_tcl_dll) ruby_xfree(ruby_tcl_dll);
-#endif
-
-    if (!tcl_dll || !tk_dll)
-	return -1;
-
-    p_Tcl_CreateInterp = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_CreateInterp");
-    if (!p_Tcl_CreateInterp)
-	return -2;
-
-    tcl_ip = (*p_Tcl_CreateInterp)();
-    if (!tcl_ip)
-	return -3;
-
-    p_Tk_Init = (int (*) _((Tcl_Interp *)))DL_SYM(tk_dll, "Tk_Init");
-    if (!p_Tk_Init)
-	return -4;
-    (*p_Tk_Init)(tcl_ip);
-
-    if (!Tcl_InitStubs(tcl_ip, "8.1", 0))
-	return -5;
-    if (!Tk_InitStubs(tcl_ip, "8.1", 0))
-	return -6;
-
-    Tcl_DeleteInterp(tcl_ip);
-
-    return 0;
-}
-#endif
diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
index 2102e56274..314246869e 100644
--- a/ext/tcltklib/tcltklib.c
+++ b/ext/tcltklib/tcltklib.c
@@ -4,40 +4,18 @@
  *		Oct. 24, 1997	Y. Matsumoto
  */
 
-#include "ruby.h"
-#include "rubysig.h"
-#undef EXTERN	/* avoid conflict with tcl.h of tcl8.2 or before */
 #include <stdio.h>
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
 #include <string.h>
 #include <tcl.h>
 #include <tk.h>
+#include "ruby.h"
+#include "rubysig.h"
 
 #ifdef __MACOS__
 # include <tkMac.h>
 # include <Quickdraw.h>
 #endif
 
-#if TCL_MAJOR_VERSION >= 8
-# ifndef CONST84
-#  if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 4 /* Tcl8.0.x -- 8.4b1 */
-#   define CONST84
-#  else /* unknown (maybe TCL_VERSION >= 8.5) */
-#   ifdef CONST
-#    define CONST84 CONST
-#   else
-#    define CONST84
-#   endif
-#  endif
-# endif
-#endif
-
 /* for ruby_debug */
 
 #define DUMP1(ARG1) if (ruby_debug) { fprintf(stderr, "tcltklib: %s\n", ARG1);}
@@ -53,11 +31,9 @@ static VALUE eTkCallbackBreak;
 static VALUE eTkCallbackContinue;
 
 static VALUE ip_invoke_real _((int, VALUE*, VALUE));
-static VALUE ip_invoke _((int, VALUE*, VALUE));
 
 /* from tkAppInit.c */
 
-#if !defined __MINGW32__
 /*
  * The following variable is a special hack that is needed in order for
  * Sun shared libraries to be used for Tcl.
@@ -65,674 +41,73 @@ static VALUE ip_invoke _((int, VALUE*, VALUE));
 
 extern int matherr();
 int *tclDummyMathPtr = (int *) matherr;
-#endif
 
 /*---- module TclTkLib ----*/
 
 struct invoke_queue {
-    Tcl_Event ev;
     int argc;
     VALUE *argv;
     VALUE obj;
     int done;
-    int safe_level;
-    VALUE *result;
+    VALUE result;
     VALUE thread;
+    struct invoke_queue *next;
 };
  
-static VALUE eventloop_thread;
-static VALUE watchdog_thread;
-Tcl_Interp  *current_interp;
-
-/* 
- *  'event_loop_max' is a maximum events which the eventloop processes in one 
- *  term of thread scheduling. 'no_event_tick' is the count-up value when 
- *  there are no event for processing. 
- *  'timer_tick' is a limit of one term of thread scheduling. 
- *  If 'timer_tick' == 0, then not use the timer for thread scheduling.
- */
-#define DEFAULT_EVENT_LOOP_MAX    800/*counts*/
-#define DEFAULT_NO_EVENT_TICK      10/*counts*/
-#define DEFAULT_NO_EVENT_WAIT      20/*milliseconds ( 1 -- 999 ) */
-#define WATCHDOG_INTERVAL          10/*milliseconds ( 1 -- 999 ) */
-#define DEFAULT_TIMER_TICK          0/*milliseconds ( 0 -- 999 ) */
-#define NO_THREAD_INTERRUPT_TIME  100/*milliseconds ( 1 -- 999 ) */
-
-static int event_loop_max = DEFAULT_EVENT_LOOP_MAX;
-static int no_event_tick  = DEFAULT_NO_EVENT_TICK;
-static int no_event_wait  = DEFAULT_NO_EVENT_WAIT;
-static int timer_tick     = DEFAULT_TIMER_TICK;
-static int req_timer_tick = DEFAULT_TIMER_TICK;
-static int run_timer_flag = 0;
-
-static int event_loop_wait_event   = 0;
-static int event_loop_abort_on_exc = 1;
-static int loop_counter = 0;
-
-static int check_rootwidget_flag = 0;
-
-#if TCL_MAJOR_VERSION >= 8
-static int ip_ruby _((ClientData, Tcl_Interp *, int, Tcl_Obj *CONST*));
-#else
-static int ip_ruby _((ClientData, Tcl_Interp *, int, char **));
-#endif
-
-/*---- class TclTkIp ----*/
-struct tcltkip {
-    Tcl_Interp *ip;		/* the interpreter */
-    int return_value;		/* return value */
-};
-
-static struct tcltkip *
-get_ip(self)
-    VALUE self;
-{
-    struct tcltkip *ptr;
-
-    Data_Get_Struct(self, struct tcltkip, ptr);
-    if (ptr == 0) {
-	rb_raise(rb_eTypeError, "uninitialized TclTkIp");
-    }
-    return ptr;
-}
+static struct invoke_queue *iqueue;
+static VALUE main_thread;
 
 /* Tk_ThreadTimer */
-static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL;
+static Tcl_TimerToken timer_token;
 
 /* timer callback */
-static void _timer_for_tcl _((ClientData));
 static void
 _timer_for_tcl(clientData)
     ClientData clientData;
 {
-    /* struct invoke_queue *q, *tmp; */
-    /* VALUE thread; */
-
-    DUMP1("called timer_for_tcl");
-    Tk_DeleteTimerHandler(timer_token);
-
-    run_timer_flag = 1;
-
-    if (timer_tick > 0) {
-	timer_token = Tk_CreateTimerHandler(timer_tick, _timer_for_tcl, 
-					    (ClientData)0);
-    } else {
-	timer_token = (Tcl_TimerToken)NULL;
-    }
-
-    /* rb_thread_schedule(); */
-    /* tick_counter += event_loop_max; */
-}
-
-static VALUE
-set_eventloop_tick(self, tick)
-    VALUE self;
-    VALUE tick;
-{
-    int ttick = NUM2INT(tick);
-
-    rb_secure(4);
-
-    if (ttick < 0) {
-	rb_raise(rb_eArgError, 
-		 "timer-tick parameter must be 0 or positive number");
-    }
-
-    /* delete old timer callback */
-    Tk_DeleteTimerHandler(timer_token);
-
-    timer_tick = req_timer_tick = ttick;
-    if (timer_tick > 0) {
-	/* start timer callback */
-	timer_token = Tk_CreateTimerHandler(timer_tick, _timer_for_tcl, 
-					    (ClientData)0);
-    } else {
-	timer_token = (Tcl_TimerToken)NULL;
-    }
-
-    return tick;
-}
-
-static VALUE
-get_eventloop_tick(self)
-    VALUE self;
-{
-    return INT2NUM(timer_tick);
-}
-
-static VALUE
-ip_set_eventloop_tick(self, tick)
-    VALUE self;
-    VALUE tick;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-	/* slave IP */
-	return get_eventloop_tick(self);
-    }
-    return set_eventloop_tick(self, tick);
-}
-
-static VALUE
-ip_get_eventloop_tick(self)
-    VALUE self;
-{
-    return get_eventloop_tick(self);
-}
-
-static VALUE
-set_no_event_wait(self, wait)
-    VALUE self;
-    VALUE wait;
-{
-    int t_wait = NUM2INT(wait);
-
-    rb_secure(4);
-
-    if (t_wait <= 0) {
-	rb_raise(rb_eArgError, 
-		 "no_event_wait parameter must be positive number");
-    }
-
-    no_event_wait = t_wait;
-
-    return wait;
-}
-
-static VALUE
-get_no_event_wait(self)
-    VALUE self;
-{
-    return INT2NUM(no_event_wait);
-}
-
-static VALUE
-ip_set_no_event_wait(self, wait)
-    VALUE self;
-    VALUE wait;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-	/* slave IP */
-	return get_no_event_wait(self);
-    }
-    return set_no_event_wait(self, wait);
-}
-
-static VALUE
-ip_get_no_event_wait(self)
-    VALUE self;
-{
-    return get_no_event_wait(self);
-}
-
-static VALUE
-set_eventloop_weight(self, loop_max, no_event)
-    VALUE self;
-    VALUE loop_max;
-    VALUE no_event;
-{
-    int lpmax = NUM2INT(loop_max);
-    int no_ev = NUM2INT(no_event);
-
-    rb_secure(4);
-
-    if (lpmax <= 0 || no_ev <= 0) {
-	rb_raise(rb_eArgError, "weight parameters must be positive numbers");
-    }
-
-    event_loop_max = lpmax;
-    no_event_tick  = no_ev;
-
-    return rb_ary_new3(2, loop_max, no_event);
-}
-
-static VALUE
-get_eventloop_weight(self)
-    VALUE self;
-{
-    return rb_ary_new3(2, INT2NUM(event_loop_max), INT2NUM(no_event_tick));
-}
-
-static VALUE
-ip_set_eventloop_weight(self, loop_max, no_event)
-    VALUE self;
-    VALUE loop_max;
-    VALUE no_event;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-	/* slave IP */
-	return get_eventloop_weight(self);
-    }
-    return set_eventloop_weight(self, loop_max, no_event);
-}
-
-static VALUE
-ip_get_eventloop_weight(self)
-    VALUE self;
-{
-    return get_eventloop_weight(self);
-}
-
-static VALUE
-lib_evloop_abort_on_exc(self)
-    VALUE self;
-{
-    if (event_loop_abort_on_exc > 0) {
-	return Qtrue;
-    } else if (event_loop_abort_on_exc == 0) {
-	return Qfalse;
-    } else {
-	return Qnil;
-    }
-}
-
-static VALUE
-ip_evloop_abort_on_exc(self)
-    VALUE self;
-{
-    return lib_evloop_abort_on_exc(self);
-}
-
-static VALUE
-lib_evloop_abort_on_exc_set(self, val)
-    VALUE self, val;
-{
-    rb_secure(4);
-    if (RTEST(val)) {
-	event_loop_abort_on_exc =  1;
-    } else if (val == Qnil) {
-	event_loop_abort_on_exc = -1;
-    } else {
-	event_loop_abort_on_exc =  0;
-    }
-    return lib_evloop_abort_on_exc(self);
-}
-
-static VALUE
-ip_evloop_abort_on_exc_set(self, val)
-    VALUE self, val;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    rb_secure(4);
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-	/* slave IP */
-	return lib_evloop_abort_on_exc(self);
-    }
-    return lib_evloop_abort_on_exc_set(self, val);
-}
-
-static VALUE
-lib_num_of_mainwindows(self)
-    VALUE self;
-{
-    return INT2FIX(Tk_GetNumMainWindows());
-}
-
-static int
-lib_eventloop_core(check_root, check_var)
-    int check_root;
-    int *check_var;
-{
-    VALUE current = eventloop_thread;
-    int found_event = 1;
-    struct timeval t;
-
-    t.tv_sec = (time_t)0;
-    t.tv_usec = (time_t)(no_event_wait*1000.0);
+    struct invoke_queue *q, *tmp;
+    VALUE thread;
 
     Tk_DeleteTimerHandler(timer_token);
-    run_timer_flag = 0;
-    if (timer_tick > 0) {
-	timer_token = Tk_CreateTimerHandler(timer_tick, _timer_for_tcl, 
-					    (ClientData)0);
-    } else {
-	timer_token = (Tcl_TimerToken)NULL;
-    }
-
-    for(;;) {
-	if (rb_thread_alone()) {
-	    DUMP1("no other thread");
-	    event_loop_wait_event = 0;
-
-	    if (timer_tick == 0) {
-		timer_tick = NO_THREAD_INTERRUPT_TIME;
-		timer_token = Tk_CreateTimerHandler(timer_tick, 
-						    _timer_for_tcl, 
-						    (ClientData)0);
-	    }
-
-	    if (check_var != (int *)NULL) {
-		if (*check_var || !found_event) {
-		    return found_event;
-		}
-	    }
-
-	    found_event = Tcl_DoOneEvent(TCL_ALL_EVENTS);
-
-	    if (loop_counter++ > 30000) {
-		loop_counter = 0;
-	    }
-
-	    if (run_timer_flag) {
-		/* 
-		DUMP1("timer interrupt");
-		run_timer_flag = 0;
-		DUMP1("call rb_trap_exec()");
-		rb_trap_exec();
-		*/
-		DUMP1("check Root Widget");
-		if (check_root && Tk_GetNumMainWindows() == 0) {
-		    run_timer_flag = 0;
-		    rb_trap_exec();
-		    return 1;
-		}
-	    }
-
-	} else {
-	    int tick_counter;
-
-	    DUMP1("there are other threads");
-	    event_loop_wait_event = 1;
-
-	    found_event = 1;
-
-	    timer_tick = req_timer_tick;
-	    tick_counter = 0;
-	    while(tick_counter < event_loop_max) {
-		if (check_var != (int *)NULL) {
-		    if (*check_var || !found_event) {
-			return found_event;
-		    }
-		}
-
-		if (Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT)) {
-		    tick_counter++;
-		} else {
-		    tick_counter += no_event_tick;
-
-		    DUMP1("check Root Widget");
-		    if (check_root && Tk_GetNumMainWindows() == 0) {
-			return 1;
-		    }
-
-		    rb_thread_wait_for(t);
-		}
-
-		if (loop_counter++ > 30000) {
-		    loop_counter = 0;
-		}
-
-		if (watchdog_thread != 0 && eventloop_thread != current) {
-		    return 1;
-		}
-
-		if (run_timer_flag) {
-		    /*
-		    DUMP1("timer interrupt");
-		    run_timer_flag = 0;
-		    */
-		    break; /* switch to other thread */
-		}
-	    }
-
-	    DUMP1("check Root Widget");
-	    if (check_root && Tk_GetNumMainWindows() == 0) {
-		return 1;
-	    }
+    timer_token = Tk_CreateTimerHandler(100, _timer_for_tcl, 
+					(ClientData)0);
+
+    CHECK_INTS;
+    q = iqueue;
+    while (q) {
+	tmp = q;
+	q = q->next;
+	if (!tmp->done) {
+	    tmp->done = 1;
+	    tmp->result = ip_invoke_real(tmp->argc, tmp->argv, tmp->obj);
+	    thread = tmp->thread;
+	    tmp = tmp->next;
+	    rb_thread_run(thread);
 	}
-
-	/* rb_thread_schedule(); */
-	if (run_timer_flag) {
-	    run_timer_flag = 0;
-	    rb_trap_exec();
-	} else {
-            DUMP1("thread scheduling");
-	    rb_thread_schedule();
-	}
-    }
-    return 1;
-}
-
-VALUE
-lib_eventloop_main(check_rootwidget)
-    VALUE check_rootwidget;
-{
-    check_rootwidget_flag = RTEST(check_rootwidget);
-
-    if (lib_eventloop_core(check_rootwidget_flag, (int *)NULL)) {
-	return Qtrue;
-    } else {
-	return Qfalse;
-    }
-}
-
-VALUE
-lib_eventloop_ensure(parent_evloop)
-    VALUE parent_evloop;
-{
-    Tk_DeleteTimerHandler(timer_token);
-    timer_token = (Tcl_TimerToken)NULL;
-    DUMP2("eventloop-ensure: current-thread : %lx\n", rb_thread_current());
-    DUMP2("eventloop-ensure: eventloop-thread : %lx\n", eventloop_thread);
-    if (eventloop_thread == rb_thread_current()) {
-	DUMP2("eventloop-thread -> %lx\n", parent_evloop);
-	eventloop_thread = parent_evloop;
     }
-    return Qnil;
-}
-
-static VALUE
-lib_eventloop_launcher(check_rootwidget)
-    VALUE check_rootwidget;
-{
-    VALUE parent_evloop = eventloop_thread;
-
-    eventloop_thread = rb_thread_current();
-
-    if (ruby_debug) { 
-	fprintf(stderr, "tcltklib: eventloop-thread : %lx -> %lx\n", 
-		parent_evloop, eventloop_thread);
-    }
-
-    return rb_ensure(lib_eventloop_main, check_rootwidget, 
-		     lib_eventloop_ensure, parent_evloop);
+    rb_thread_schedule();
 }
 
 /* execute Tk_MainLoop */
 static VALUE
-lib_mainloop(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE check_rootwidget;
-
-    if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
-	check_rootwidget = Qtrue;
-    } else if (RTEST(check_rootwidget)) {
-	check_rootwidget = Qtrue;
-    } else {
-	check_rootwidget = Qfalse;
-    }
-
-    return lib_eventloop_launcher(check_rootwidget);
-}
-
-static VALUE
-ip_mainloop(argc, argv, self)
-    int   argc;
-    VALUE *argv;
+lib_mainloop(self)
     VALUE self;
 {
-    struct tcltkip *ptr = get_ip(self);
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-	/* slave IP */
-	return Qnil;
-    }
-    return lib_mainloop(argc, argv, self);
-}
-
-VALUE
-lib_watchdog_core(check_rootwidget)
-    VALUE check_rootwidget;
-{
-    VALUE evloop;
-    int   prev_val = -1;
-    int   chance = 0;
-    int   check = RTEST(check_rootwidget);
-    struct timeval t0, t1;
-
-    t0.tv_sec  = (time_t)0;
-    t0.tv_usec = (time_t)((NO_THREAD_INTERRUPT_TIME)*1000.0);
-    t1.tv_sec  = (time_t)0;
-    t1.tv_usec = (time_t)((WATCHDOG_INTERVAL)*1000.0);
-
-    /* check other watchdog thread */
-    if (watchdog_thread != 0) {
-	if (RTEST(rb_funcall(watchdog_thread, rb_intern("stop?"), 0))) {
-	    rb_funcall(watchdog_thread, rb_intern("kill"), 0);
-	} else {
-	    return Qnil;
-	}
-    }
-    watchdog_thread = rb_thread_current();
-
-    /* watchdog start */
-    do {
-	if (eventloop_thread == 0 
-	    || (loop_counter == prev_val
-		&& RTEST(rb_funcall(eventloop_thread, rb_intern("stop?"), 0))
-		&& ++chance >= 3 )
-	    ) {
-	    /* start new eventloop thread */
-	    DUMP2("eventloop thread %lx is sleeping or dead", 
-		  eventloop_thread);
-	    evloop = rb_thread_create(lib_eventloop_launcher, 
-				      (void*)&check_rootwidget);
-	    DUMP2("create new eventloop thread %lx", evloop);
-	    loop_counter = -1;
-	    chance = 0;
-	    rb_thread_run(evloop);
-	} else {
-	    loop_counter = prev_val;
-	    chance = 0;
-	    if (event_loop_wait_event) {
-		rb_thread_wait_for(t0);
-	    } else {
-		rb_thread_wait_for(t1);
-	    }
-	    /* rb_thread_schedule(); */
-	}
-    } while(!check || Tk_GetNumMainWindows() != 0);
-
-    return Qnil;
-}
+    timer_token = Tk_CreateTimerHandler(100, _timer_for_tcl, 
+					(ClientData)0);
+    DUMP1("start Tk_Mainloop");
+    Tk_MainLoop();
+    DUMP1("stop Tk_Mainloop");
+    Tk_DeleteTimerHandler(timer_token);
 
-VALUE
-lib_watchdog_ensure(arg)
-    VALUE arg;
-{
-    eventloop_thread = 0; /* stop eventloops */
     return Qnil;
 }
 
-static VALUE
-lib_mainloop_watchdog(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE check_rootwidget;
-
-    if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
-	check_rootwidget = Qtrue;
-    } else if (RTEST(check_rootwidget)) {
-	check_rootwidget = Qtrue;
-    } else {
-	check_rootwidget = Qfalse;
-    }
-
-    return rb_ensure(lib_watchdog_core, check_rootwidget, 
-		     lib_watchdog_ensure, Qnil);
-}
-
-static VALUE
-ip_mainloop_watchdog(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-	/* slave IP */
-	return Qnil;
-    }
-    return lib_mainloop_watchdog(argc, argv, self);
-}
-
-static VALUE
-lib_do_one_event_core(argc, argv, self, is_ip)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-    int   is_ip;
-{
-    VALUE vflags;
-    int flags;
-
-    if (rb_scan_args(argc, argv, "01", &vflags) == 0) {
-	flags = TCL_ALL_EVENTS | TCL_DONT_WAIT;
-    } else {
-	Check_Type(vflags, T_FIXNUM);
-	flags = FIX2INT(vflags);
-    }
-
-    if (rb_safe_level() >= 4 || (rb_safe_level() >=1 && OBJ_TAINTED(vflags))) {
-      flags |= TCL_DONT_WAIT;
-    }
-
-    if (is_ip) {
-	/* check IP */
-	struct tcltkip *ptr = get_ip(self);
-	if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-	    /* slave IP */
-	    flags |= TCL_DONT_WAIT;
-	}
-    }
-
-    if (Tcl_DoOneEvent(flags)) {
-	return Qtrue;
-    } else {
-	return Qfalse;
-    }
-}
-
-static VALUE
-lib_do_one_event(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return lib_do_one_event_core(argc, argv, self, 0);
-}
-
-static VALUE
-ip_do_one_event(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return lib_do_one_event_core(argc, argv, self, 0);
-}
-
+/*---- class TclTkIp ----*/
+struct tcltkip {
+    Tcl_Interp *ip;		/* the interpreter */
+    int return_value;		/* return value */
+};
 
 /* Tcl command `ruby' */
 static VALUE
@@ -744,57 +119,6 @@ ip_eval_rescue(failed, einfo)
     return Qnil;
 }
 
-/* restart Tk */
-static VALUE
-lib_restart(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    rb_secure(4);
-
-    /* destroy the root wdiget */
-    ptr->return_value = Tcl_Eval(ptr->ip, "destroy .");
-    /* ignore ERROR */
-    DUMP2("(TCL_Eval result) %d", ptr->return_value);
-
-    /* execute Tk_Init of Tk_SafeInit */
-#if TCL_MAJOR_VERSION >= 8
-    if (Tcl_IsSafe(ptr->ip)) {
-	DUMP1("Tk_SafeInit");
-	if (Tk_SafeInit(ptr->ip) == TCL_ERROR) {
-	    rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
-	}
-    } else {
-	DUMP1("Tk_Init");
-	if (Tk_Init(ptr->ip) == TCL_ERROR) {
-	    rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
-	}
-    }
-#else
-    DUMP1("Tk_Init");
-    if (Tk_Init(ptr->ip) == TCL_ERROR) {
-	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
-    }
-#endif
-
-    return Qnil;
-}
-
-static VALUE
-ip_restart(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    rb_secure(4);
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-	/* slave IP */
-	return Qnil;
-    }
-    return lib_restart(self);
-}
-
 static int
 #if TCL_MAJOR_VERSION >= 8
 ip_ruby(clientData, interp, argc, argv)
@@ -832,25 +156,17 @@ ip_ruby(clientData, interp, argc, argv)
     DUMP2("rb_eval_string(%s)", arg);
     old_trapflg = rb_trap_immediate;
     rb_trap_immediate = 0;
-    res = rb_rescue2(rb_eval_string, (VALUE)arg, 
-                     ip_eval_rescue, (VALUE)&failed,
-                     rb_eStandardError, rb_eScriptError, rb_eSystemExit, 
-		     (VALUE)0);
+    res = rb_rescue(rb_eval_string, (VALUE)arg, ip_eval_rescue, (VALUE)&failed);
     rb_trap_immediate = old_trapflg;
 
-    /* status check */
+    Tcl_ResetResult(interp);
     if (failed) {
         VALUE eclass = CLASS_OF(failed);
-	DUMP1("(rb_eval_string result) failed");
-	Tcl_ResetResult(interp);
-	Tcl_AppendResult(interp, StringValuePtr(failed), (char*)NULL);
+	Tcl_AppendResult(interp, STR2CSTR(failed), (char*)NULL);
         if (eclass == eTkCallbackBreak) {
 	    return TCL_BREAK;
 	} else if (eclass == eTkCallbackContinue) {
 	    return TCL_CONTINUE;
-	} else if (eclass == rb_eSystemExit) {
-	    Tcl_Eval(interp, "destroy .");
-	    rb_raise(rb_eSystemExit, StringValuePtr(failed));
 	} else {
 	    return TCL_ERROR;
 	}
@@ -859,888 +175,68 @@ ip_ruby(clientData, interp, argc, argv)
     /* result must be string or nil */
     if (NIL_P(res)) {
 	DUMP1("(rb_eval_string result) nil");
-	Tcl_ResetResult(interp);
 	return TCL_OK;
     }
 
     /* copy result to the tcl interpreter */
-    DUMP2("(rb_eval_string result) %s", StringValuePtr(res));
+    DUMP2("(rb_eval_string result) %s", STR2CSTR(res));
     DUMP1("Tcl_AppendResult");
-    Tcl_ResetResult(interp);
-    Tcl_AppendResult(interp, StringValuePtr(res), (char *)NULL);
+    Tcl_AppendResult(interp, STR2CSTR(res), (char *)NULL);
 
     return TCL_OK;
 }
 
-
-/**************************/
-/*  based on tclEvent.c   */
-/**************************/
-static char *VwaitVarProc _((ClientData, Tcl_Interp *, CONST84 char *,
-			     CONST84 char *, int));
-static char *
-VwaitVarProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST84 char *name1;        /* Name of variable. */
-    CONST84 char *name2;        /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-{
-    int *donePtr = (int *) clientData;
-
-    *donePtr = 1;
-    return (char *) NULL;
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int ip_rbVwaitObjCmd _((ClientData, Tcl_Interp *, int,
-			       Tcl_Obj *CONST []));
-static int
-ip_rbVwaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp; 
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else
-static int ip_rbVwaitCommand _((ClientData, Tcl_Interp *, int, char *[]));
-static int
-ip_rbVwaitCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    int  done, foundEvent;
-    char *nameString;
-    int  dummy;
-
-    DUMP1("Ruby's 'vwait' is called");
-    if (objc != 2) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "name");
-#else
-#if TCL_MAJOR_VERSION >= 8
-	/* nameString = Tcl_GetString(objv[0]); */
-	nameString = Tcl_GetStringFromObj(objv[0], &dummy);
-#else
-	nameString = objv[0];
-#endif
-        Tcl_AppendResult(interp, "wrong # args: should be \"",
-			 nameString, " name\"", (char *) NULL);
-#endif
-        return TCL_ERROR;
-    }
-#if TCL_MAJOR_VERSION >= 8
-    /* nameString = Tcl_GetString(objv[1]); */
-    nameString = Tcl_GetStringFromObj(objv[1], &dummy);
-#else
-    nameString = objv[1];
-#endif
-
-    if (Tcl_TraceVar(interp, nameString,
-		     TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		     VwaitVarProc, (ClientData) &done) != TCL_OK) {
-        return TCL_ERROR;
-    };
-    done = 0;
-    foundEvent = lib_eventloop_core(/* not check root-widget */0, &done);
-    Tcl_UntraceVar(interp, nameString,
-		   TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		   VwaitVarProc, (ClientData) &done);
-
-    /*
-     * Clear out the interpreter's result, since it may have been set
-     * by event handlers.
-     */
-
-    Tcl_ResetResult(interp);
-    if (!foundEvent) {
-        Tcl_AppendResult(interp, "can't wait for variable \"", nameString,
-			 "\":  would wait forever", (char *) NULL);
-        return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-
-/**************************/
-/*  based on tkCmd.c      */
-/**************************/
-static char *WaitVariableProc _((ClientData, Tcl_Interp *, CONST84 char *,
-				 CONST84 char *, int));
-static char *
-WaitVariableProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST84 char *name1;        /* Name of variable. */
-    CONST84 char *name2;        /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-{
-    int *donePtr = (int *) clientData;
-
-    *donePtr = 1;
-    return (char *) NULL;
-}
-
-static void WaitVisibilityProc _((ClientData, XEvent *));
-static void
-WaitVisibilityProc(clientData, eventPtr)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    XEvent *eventPtr;           /* Information about event (not used). */
-{
-    int *donePtr = (int *) clientData;
-
-    if (eventPtr->type == VisibilityNotify) {
-        *donePtr = 1;
-    }
-    if (eventPtr->type == DestroyNotify) {
-        *donePtr = 2;
-    }
-}
-
-static void WaitWindowProc _((ClientData, XEvent *));
-static void
-WaitWindowProc(clientData, eventPtr)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    XEvent *eventPtr;           /* Information about event. */
-{
-    int *donePtr = (int *) clientData;
-
-    if (eventPtr->type == DestroyNotify) {
-        *donePtr = 1;
-    }
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int ip_rbTkWaitObjCmd _((ClientData, Tcl_Interp *, int,
-				Tcl_Obj *CONST []));
-static int
-ip_rbTkWaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp; 
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else
-static int ip_rbTkWaitCommand _((ClientData, Tcl_Interp *, int, char *[]));
-static int
-ip_rbTkWaitCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    Tk_Window tkwin = (Tk_Window) clientData;
-    int done, index;
-    static CONST char *optionStrings[] = { "variable", "visibility", "window",
-					   (char *) NULL };
-    enum options { TKWAIT_VARIABLE, TKWAIT_VISIBILITY, TKWAIT_WINDOW };
-    char *nameString;
-    int  dummy;
-
-    DUMP1("Ruby's 'tkwait' is called");
-
-    if (objc != 3) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
-#else
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_AppendResult(interp, "wrong # args: should be \"",
-			 Tcl_GetStringFromObj(objv[0], &dummy), 
-			 " variable|visibility|window name\"", 
-			 (char *) NULL);
-#else
-        Tcl_AppendResult(interp, "wrong # args: should be \"",
-			 objv[0], " variable|visibility|window name\"", 
-			 (char *) NULL);
-#endif
-#endif
-        return TCL_ERROR;
-    }
-
-#if TCL_MAJOR_VERSION >= 8
-    if (Tcl_GetIndexFromObj(interp, objv[1], 
-                            (CONST84 char **)optionStrings, 
-			    "option", 0, &index) != TCL_OK) {
-        return TCL_ERROR;
-    }
-#else
-    {
-	int c = objv[1][0];
-	size_t length = strlen(objv[1]);
-
-	if ((c == 'v') && (strncmp(objv[1], "variable", length) == 0)
-	    && (length >= 2)) {
-	    index = TKWAIT_VARIABLE;
-	} else if ((c == 'v') && (strncmp(objv[1], "visibility", length) == 0)
-		   && (length >= 2)) {
-	    index = TKWAIT_VISIBILITY;
-	} else if ((c == 'w') && (strncmp(objv[1], "window", length) == 0)) {
-	    index = TKWAIT_WINDOW;
-	} else {
-	    Tcl_AppendResult(interp, "bad option \"", objv[1],
-			     "\": must be variable, visibility, or window", 
-			     (char *) NULL);
-	    return TCL_ERROR;
-	}
-    }
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-    /* nameString = Tcl_GetString(objv[2]); */
-    nameString = Tcl_GetStringFromObj(objv[2], &dummy);
-#else
-    nameString = objv[2];
-#endif
-
-    switch ((enum options) index) {
-    case TKWAIT_VARIABLE: {
-	if (Tcl_TraceVar(interp, nameString,
-			 TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-			 WaitVariableProc, (ClientData) &done) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	done = 0;
-	lib_eventloop_core(check_rootwidget_flag, &done);
-	Tcl_UntraceVar(interp, nameString,
-		       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		       WaitVariableProc, (ClientData) &done);
-	break;
-    }
-
-    case TKWAIT_VISIBILITY: {
-	Tk_Window window;
-
-	window = Tk_NameToWindow(interp, nameString, tkwin);
-	if (window == NULL) {
-	    return TCL_ERROR;
-	}
-	Tk_CreateEventHandler(window,
-			      VisibilityChangeMask|StructureNotifyMask,
-			      WaitVisibilityProc, (ClientData) &done);
-	done = 0;
-	lib_eventloop_core(check_rootwidget_flag, &done);
-	if (done != 1) {
-	    /*
-	     * Note that we do not delete the event handler because it
-	     * was deleted automatically when the window was destroyed.
-	     */
-
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, "window \"", nameString,
-			     "\" was deleted before its visibility changed",
-			     (char *) NULL);
-	    return TCL_ERROR;
-	}
-	Tk_DeleteEventHandler(window,
-			      VisibilityChangeMask|StructureNotifyMask,
-			      WaitVisibilityProc, (ClientData) &done);
-	break;
-    }
-
-    case TKWAIT_WINDOW: {
-	Tk_Window window;
-            
-	window = Tk_NameToWindow(interp, nameString, tkwin);
-	if (window == NULL) {
-	    return TCL_ERROR;
-	}
-	Tk_CreateEventHandler(window, StructureNotifyMask,
-			      WaitWindowProc, (ClientData) &done);
-	done = 0;
-	lib_eventloop_core(check_rootwidget_flag, &done);
-	/*
-	 * Note:  there's no need to delete the event handler.  It was
-	 * deleted automatically when the window was destroyed.
-	 */
-	break;
-    }
-    }
-
-    /*
-     * Clear out the interpreter's result, since it may have been set
-     * by event handlers.
-     */
-
-    Tcl_ResetResult(interp);
-    return TCL_OK;
-}
-
-/****************************/
-/* vwait/tkwait with thread */
-/****************************/
-struct th_vwait_param {
-    VALUE thread;
-    int   done;
-};
-
-static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *, CONST84 char *,
-				   CONST84 char *, int));
-static char *
-rb_threadVwaitProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST84 char *name1;        /* Name of variable. */
-    CONST84 char *name2;        /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-{
-    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
-
-    param->done = 1;
-    rb_thread_run(param->thread);
-
-    return (char *)NULL;
-}
-
-static void rb_threadWaitVisibilityProc _((ClientData, XEvent *));
-static void
-rb_threadWaitVisibilityProc(clientData, eventPtr)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    XEvent *eventPtr;           /* Information about event (not used). */
-{
-    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
-
-    if (eventPtr->type == VisibilityNotify) {
-        param->done = 1;
-    }
-    if (eventPtr->type == DestroyNotify) {
-        param->done = 2;
-    }
-}
-
-static void rb_threadWaitWindowProc _((ClientData, XEvent *));
-static void
-rb_threadWaitWindowProc(clientData, eventPtr)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    XEvent *eventPtr;           /* Information about event. */
-{
-    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
-
-    if (eventPtr->type == DestroyNotify) {
-        param->done = 1;
-    }
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int ip_rb_threadVwaitObjCmd _((ClientData, Tcl_Interp *, int,
-				      Tcl_Obj *CONST []));
-static int
-ip_rb_threadVwaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp; 
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else
-static int ip_rb_threadVwaitCommand _((ClientData, Tcl_Interp *, int,
-				       char *[]));
-static int
-ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    struct th_vwait_param *param;
-    char *nameString;
-    int  dummy;
-
-    DUMP1("Ruby's 'thread_vwait' is called");
-
-    if (eventloop_thread == rb_thread_current()) {
-#if TCL_MAJOR_VERSION >= 8
-	DUMP1("call ip_rbVwaitObjCmd");
-	return ip_rbVwaitObjCmd(clientData, interp, objc, objv);
-#else
-	DUMP1("call ip_rbVwaitCommand");
-	return ip_rbVwaitCommand(clientData, interp, objc, objv);
-#endif
-    }
-
-    if (objc != 2) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "name");
-#else
-#if TCL_MAJOR_VERSION >= 8
-	/* nameString = Tcl_GetString(objv[0]); */
-	nameString = Tcl_GetStringFromObj(objv[0], &dummy);
-#else
-	nameString = objv[0];
-#endif
-        Tcl_AppendResult(interp, "wrong # args: should be \"",
-			 nameString, " name\"", (char *) NULL);
-#endif
-        return TCL_ERROR;
-    }
-#if TCL_MAJOR_VERSION >= 8
-    /* nameString = Tcl_GetString(objv[1]); */
-    nameString = Tcl_GetStringFromObj(objv[1], &dummy);
-#else
-    nameString = objv[1];
-#endif
-
-    param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param));
-    param->thread = rb_thread_current();
-    param->done = 0;
-
-    if (Tcl_TraceVar(interp, nameString,
-		     TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		     rb_threadVwaitProc, (ClientData) param) != TCL_OK) {
-        return TCL_ERROR;
-    };
-
-    if (!param->done) {
-	rb_thread_stop();
-    }
-
-    Tcl_UntraceVar(interp, nameString,
-		   TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		   rb_threadVwaitProc, (ClientData) param);
-
-    Tcl_Free((char *)param);
-
-    return TCL_OK;
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int ip_rb_threadTkWaitObjCmd _((ClientData, Tcl_Interp *, int,
-				       Tcl_Obj *CONST []));
-static int
-ip_rb_threadTkWaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp; 
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else
-static int ip_rb_threadTkWaitCommand _((ClientData, Tcl_Interp *, int,
-					char *[]));
-static int
-ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    struct th_vwait_param *param;
-    Tk_Window tkwin = (Tk_Window) clientData;
-    int index;
-    static CONST char *optionStrings[] = { "variable", "visibility", "window",
-					   (char *) NULL };
-    enum options { TKWAIT_VARIABLE, TKWAIT_VISIBILITY, TKWAIT_WINDOW };
-    char *nameString;
-    int  dummy;
-
-    DUMP1("Ruby's 'thread_tkwait' is called");
-
-    if (eventloop_thread == rb_thread_current()) {
-#if TCL_MAJOR_VERSION >= 8
-	DUMP1("call ip_rbTkWaitObjCmd");
-	return ip_rbTkWaitObjCmd(clientData, interp, objc, objv);
-#else
-	DUMP1("call rb_VwaitCommand");
-	return ip_rbTkWaitCommand(clientData, interp, objc, objv);
-#endif
-    }
-
-    if (objc != 3) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
-#else
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_AppendResult(interp, "wrong # args: should be \"",
-			 Tcl_GetStringFromObj(objv[0], &dummy), 
-			 " variable|visibility|window name\"", 
-			 (char *) NULL);
-#else
-        Tcl_AppendResult(interp, "wrong # args: should be \"",
-			 objv[0], " variable|visibility|window name\"", 
-			 (char *) NULL);
-#endif
-#endif
-        return TCL_ERROR;
-    }
-
-#if TCL_MAJOR_VERSION >= 8
-    if (Tcl_GetIndexFromObj(interp, objv[1], 
-                            (CONST84 char **)optionStrings, 
-			    "option", 0, &index) != TCL_OK) {
-        return TCL_ERROR;
-    }
-#else
-    {
-	int c = objv[1][0];
-	size_t length = strlen(objv[1]);
-
-	if ((c == 'v') && (strncmp(objv[1], "variable", length) == 0)
-	    && (length >= 2)) {
-	    index = TKWAIT_VARIABLE;
-	} else if ((c == 'v') && (strncmp(objv[1], "visibility", length) == 0)
-		   && (length >= 2)) {
-	    index = TKWAIT_VISIBILITY;
-	} else if ((c == 'w') && (strncmp(objv[1], "window", length) == 0)) {
-	    index = TKWAIT_WINDOW;
-	} else {
-	    Tcl_AppendResult(interp, "bad option \"", objv[1],
-			     "\": must be variable, visibility, or window", 
-			     (char *) NULL);
-	    return TCL_ERROR;
-	}
-    }
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-    /* nameString = Tcl_GetString(objv[2]); */
-    nameString = Tcl_GetStringFromObj(objv[2], &dummy);
-#else
-    nameString = objv[2];
-#endif
-
-    param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param));
-    param->thread = rb_thread_current();
-    param->done = 0;
-
-    switch ((enum options) index) {
-    case TKWAIT_VARIABLE: {
-	if (Tcl_TraceVar(interp, nameString,
-			 TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-			 rb_threadVwaitProc, (ClientData) param) != TCL_OK) {
-	    return TCL_ERROR;
-	};
-
-	if (!param->done) {
-	    rb_thread_stop();
-	}
-
-	Tcl_UntraceVar(interp, nameString,
-		       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		       rb_threadVwaitProc, (ClientData) param);
-	break;
-    }
-
-    case TKWAIT_VISIBILITY: {
-	Tk_Window window;
-
-	window = Tk_NameToWindow(interp, nameString, tkwin);
-	if (window == NULL) {
-	    return TCL_ERROR;
-	}
-	Tk_CreateEventHandler(window,
-			      VisibilityChangeMask|StructureNotifyMask,
-			      rb_threadWaitVisibilityProc, (ClientData) param);
-	if (!param->done) {
-	    rb_thread_stop();
-	}
-	if (param->done != 1) {
-	    /*
-	     * Note that we do not delete the event handler because it
-	     * was deleted automatically when the window was destroyed.
-	     */
-
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, "window \"", nameString,
-			     "\" was deleted before its visibility changed",
-			     (char *) NULL);
-	    return TCL_ERROR;
-	}
-	Tk_DeleteEventHandler(window,
-			      VisibilityChangeMask|StructureNotifyMask,
-			      rb_threadWaitVisibilityProc, (ClientData) param);
-	break;
-    }
-
-    case TKWAIT_WINDOW: {
-	Tk_Window window;
-            
-	window = Tk_NameToWindow(interp, nameString, tkwin);
-	if (window == NULL) {
-	    return TCL_ERROR;
-	}
-	Tk_CreateEventHandler(window, StructureNotifyMask,
-			      rb_threadWaitWindowProc, (ClientData) param);
-	if (!param->done) {
-	    rb_thread_stop();
-	}
-	/*
-	 * Note:  there's no need to delete the event handler.  It was
-	 * deleted automatically when the window was destroyed.
-	 */
-	break;
-    }
-    }
-
-    Tcl_Free((char *)param);
-
-    /*
-     * Clear out the interpreter's result, since it may have been set
-     * by event handlers.
-     */
-
-    Tcl_ResetResult(interp);
-    return TCL_OK;
-}
-
-static VALUE
-ip_thread_vwait(self, var)
-    VALUE self;
-    VALUE var;
-{
-    VALUE argv[2];
-
-    argv[0] = rb_str_new2("thread_vwait");
-    argv[1] = var;
-    return ip_invoke_real(2, argv, self);
-}
-
-static VALUE
-ip_thread_tkwait(self, mode, target)
-    VALUE self;
-    VALUE mode;
-    VALUE target;
-{
-    VALUE argv[3];
-
-    argv[0] = rb_str_new2("thread_tkwait");
-    argv[1] = mode;
-    argv[2] = target;
-    return ip_invoke_real(3, argv, self);
-}
-
-
 /* destroy interpreter */
 static void
 ip_free(ptr)
     struct tcltkip *ptr;
 {
     DUMP1("Tcl_DeleteInterp");
-    if (ptr) {
-	Tcl_Release((ClientData)ptr->ip);
-	Tcl_DeleteInterp(ptr->ip);
-	free(ptr);
-    }
+    Tcl_DeleteInterp(ptr->ip);
+    free(ptr);
 }
 
 /* create and initialize interpreter */
-static VALUE ip_alloc _((VALUE));
 static VALUE
-ip_alloc(self)
-    VALUE self;
-{
-    return Data_Wrap_Struct(self, 0, ip_free, 0);
-}
-
-static VALUE
-ip_init(argc, argv, self)
-    int   argc;
-    VALUE *argv;
+ip_new(self)
     VALUE self;
 {
     struct tcltkip *ptr;	/* tcltkip data struct */
-    VALUE argv0, opts;
-    int cnt;
-    int with_tk = 1;
+    VALUE obj;			/* newly created object */
 
     /* create object */
-    Data_Get_Struct(self, struct tcltkip, ptr);
-    ptr = ALLOC(struct tcltkip);
-    DATA_PTR(self) = ptr;
+    obj = Data_Make_Struct(self, struct tcltkip, 0, ip_free, ptr);
     ptr->return_value = 0;
 
     /* from Tk_Main() */
     DUMP1("Tcl_CreateInterp");
     ptr->ip = Tcl_CreateInterp();
-    Tcl_Preserve((ClientData)ptr->ip);
-    current_interp = ptr->ip;
 
     /* from Tcl_AppInit() */
     DUMP1("Tcl_Init");
     if (Tcl_Init(ptr->ip) == TCL_ERROR) {
 	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
     }
-
-    /* set variables */
-    cnt = rb_scan_args(argc, argv, "02", &argv0, &opts);
-    switch(cnt) {
-    case 2:
-	/* options */
-	if (opts == Qnil || opts == Qfalse) {
-	    /* without Tk */
-	    with_tk = 0;
-	} else {
-	    Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0);
-	}
-    case 1:
-	/* argv0 */
-	if (argv0 != Qnil) {
-	    Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0);
-	}
-    case 0:
-	/* no args */
-	;
-    }
-
-    /* from Tcl_AppInit() */
-    if (with_tk) {
-	DUMP1("Tk_Init");
-	if (Tk_Init(ptr->ip) == TCL_ERROR) {
-	    rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
-	}
-	DUMP1("Tcl_StaticPackage(\"Tk\")");
-#if TCL_MAJOR_VERSION >= 8
-	Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init, Tk_SafeInit);
-#else
-	Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init,
-			  (Tcl_PackageInitProc *) NULL);
-#endif
+    DUMP1("Tk_Init");
+    if (Tk_Init(ptr->ip) == TCL_ERROR) {
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
     }
+    DUMP1("Tcl_StaticPackage(\"Tk\")");
+    Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init,
+		      (Tcl_PackageInitProc *) NULL);
 
     /* add ruby command to the interpreter */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"ruby\")");
-    Tcl_CreateObjCommand(ptr->ip, "ruby", ip_ruby, (ClientData)NULL,
+    Tcl_CreateObjCommand(ptr->ip, "ruby", ip_ruby, (ClientData *)NULL,
 			 (Tcl_CmdDeleteProc *)NULL);
 #else
     DUMP1("Tcl_CreateCommand(\"ruby\")");
-    Tcl_CreateCommand(ptr->ip, "ruby", ip_ruby, (ClientData)NULL,
+    Tcl_CreateCommand(ptr->ip, "ruby", ip_ruby, (ClientData *)NULL,
 		      (Tcl_CmdDeleteProc *)NULL);
 #endif
 
-    /* replace 'vwait' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"vwait\")");
-    Tcl_CreateObjCommand(ptr->ip, "vwait", ip_rbVwaitObjCmd, 
-			 (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else
-    DUMP1("Tcl_CreateCommand(\"vwait\")");
-    Tcl_CreateCommand(ptr->ip, "vwait", ip_rbVwaitCommand, 
-		      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* replace 'tkwait' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"tkwait\")");
-    Tcl_CreateObjCommand(ptr->ip, "tkwait", ip_rbTkWaitObjCmd, 
-			 (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else
-    DUMP1("Tcl_CreateCommand(\"tkwait\")");
-    Tcl_CreateCommand(ptr->ip, "tkwait", ip_rbTkWaitCommand, 
-		      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* add 'thread_vwait' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"thread_vwait\")");
-    Tcl_CreateObjCommand(ptr->ip, "thread_vwait", ip_rb_threadVwaitObjCmd, 
-			 (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else
-    DUMP1("Tcl_CreateCommand(\"thread_vwait\")");
-    Tcl_CreateCommand(ptr->ip, "thread_vwait", ip_rb_threadVwaitCommand, 
-		      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* add 'thread_tkwait' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"thread_tkwait\")");
-    Tcl_CreateObjCommand(ptr->ip, "thread_tkwait", ip_rb_threadTkWaitObjCmd, 
-			 (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else
-    DUMP1("Tcl_CreateCommand(\"thread_tkwait\")");
-    Tcl_CreateCommand(ptr->ip, "thread_tkwait", ip_rb_threadTkWaitCommand, 
-		      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    return self;
-}
-
-static VALUE
-ip_create_slave(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct tcltkip *master = get_ip(self);
-    struct tcltkip *slave = ALLOC(struct tcltkip);
-    VALUE name;
-    VALUE safemode;
-    int safe;
-
-    /* safe-mode check */
-    if (rb_scan_args(argc, argv, "11", &name, &safemode) == 1) {
-	safemode = Qfalse;
-    }
-    if (Tcl_IsSafe(master->ip) == 1) {
-	safe = 1;
-    } else if (safemode == Qfalse || safemode == Qnil) {
-	safe = 0;
-	rb_secure(4);
-    } else {
-	safe = 1;
-    }
-
-    /* create slave-ip */
-    if ((slave->ip = Tcl_CreateSlave(master->ip, StringValuePtr(name), safe)) 
-	== NULL) {
-	rb_raise(rb_eRuntimeError, "fail to create the new slave interpreter");
-    }
-    Tcl_Preserve((ClientData)slave->ip);
-    slave->return_value = 0;
-
-    return Data_Wrap_Struct(CLASS_OF(self), 0, ip_free, slave);
-}
-
-/* make ip "safe" */
-static VALUE
-ip_make_safe(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-    
-    if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) {
-	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
-    }
-
-    return self;
-}
-
-/* is safe? */
-static VALUE
-ip_is_safe_p(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-    
-    if (Tcl_IsSafe(ptr->ip)) {
-	return Qtrue;
-    } else {
-	return Qfalse;
-    }
-}
-
-/* delete interpreter */
-static VALUE
-ip_delete(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    Tcl_DeleteInterp(ptr->ip);
-
-    return Qnil;
-}
-
-/* is deleted? */
-static VALUE
-ip_is_deleted_p(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    if (Tcl_InterpDeleted(ptr->ip)) {
-	return Qtrue;
-    } else {
-	return Qfalse;
-    }
+    return obj;
 }
 
 /* eval string in tcl by Tcl_Eval() */
@@ -1750,11 +246,14 @@ ip_eval(self, str)
     VALUE str;
 {
     char *s;
-    char *buf;	/* Tcl_Eval requires re-writable string region */
-    struct tcltkip *ptr = get_ip(self);
+    char *buf;			/* Tcl_Eval requires re-writable string region */
+    struct tcltkip *ptr;	/* tcltkip data struct */
+
+    /* get the data struct */
+    Data_Get_Struct(self, struct tcltkip, ptr);
 
     /* call Tcl_Eval() */
-    s = StringValuePtr(str);
+    s = STR2CSTR(str);
     buf = ALLOCA_N(char, strlen(s)+1);
     strcpy(buf, s);
     DUMP2("Tcl_Eval(%s)", buf);
@@ -1765,10 +264,10 @@ ip_eval(self, str)
     DUMP2("(TCL_Eval result) %d", ptr->return_value);
 
     /* pass back the result (as string) */
-    /* return(rb_str_new2(ptr->ip->result)); */
-    return(rb_tainted_str_new2(ptr->ip->result));
+    return(rb_str_new2(ptr->ip->result));
 }
 
+
 static VALUE
 ip_toUTF8(self, str, encodename)
     VALUE self;
@@ -1782,21 +281,17 @@ ip_toUTF8(self, str, encodename)
     struct tcltkip *ptr;
     char *buf;
 
-    ptr = get_ip(self);
+    Data_Get_Struct(self,struct tcltkip, ptr);
     interp = ptr->ip;
 
-    StringValue(encodename);
-    StringValue(str);
-    encoding = Tcl_GetEncoding(interp, RSTRING(encodename)->ptr);
-    if (!RSTRING(str)->len) return str;
-    buf = ALLOCA_N(char,strlen(RSTRING(str)->ptr)+1);
-    strcpy(buf, RSTRING(str)->ptr);
+    encoding = Tcl_GetEncoding(interp,STR2CSTR(encodename));
+    buf = ALLOCA_N(char,strlen(STR2CSTR(str))+1);
+    strcpy(buf,STR2CSTR(str));
 
     Tcl_DStringInit(&dstr);
     Tcl_DStringFree(&dstr);
     Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr);
-    /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
-    str = rb_tainted_str_new2(Tcl_DStringValue(&dstr));
+    str = rb_str_new2(Tcl_DStringValue(&dstr));
 
     Tcl_FreeEncoding(encoding);
     Tcl_DStringFree(&dstr);
@@ -1817,21 +312,17 @@ ip_fromUTF8(self, str, encodename)
     struct tcltkip *ptr;
     char *buf;
 
-    ptr = get_ip(self);
+    Data_Get_Struct(self,struct tcltkip, ptr);
     interp = ptr->ip;
 
-    StringValue(encodename);
-    StringValue(str);
-    encoding = Tcl_GetEncoding(interp,RSTRING(encodename)->ptr);
-    if (!RSTRING(str)->len) return str;
-    buf = ALLOCA_N(char,strlen(RSTRING(str)->ptr)+1);
-    strcpy(buf,RSTRING(str)->ptr);
+    encoding = Tcl_GetEncoding(interp,STR2CSTR(encodename));
+    buf = ALLOCA_N(char,strlen(STR2CSTR(str))+1);
+    strcpy(buf,STR2CSTR(str));
 
     Tcl_DStringInit(&dstr);
     Tcl_DStringFree(&dstr);
     Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr);
-    /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
-    str = rb_tainted_str_new2(Tcl_DStringValue(&dstr));
+    str = rb_str_new2(Tcl_DStringValue(&dstr));
 
     Tcl_FreeEncoding(encoding);
     Tcl_DStringFree(&dstr);
@@ -1842,81 +333,31 @@ ip_fromUTF8(self, str, encodename)
 
 
 static VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-create_ip_exc(VALUE interp, VALUE exc, const char *fmt, ...)
-#else
-create_ip_exc(interp, exc, fmt, va_alist)
-    VALUE interp:
-    VALUE exc;
-    const char *fmt;
-    va_dcl
-#endif
-{
-    va_list args;
-    char buf[BUFSIZ];
-    VALUE einfo;
-
-    va_init_list(args,fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
-    buf[BUFSIZ - 1] = '\0';
-    va_end(args);
-    einfo = rb_exc_new2(exc, buf);
-    rb_iv_set(einfo, "interp", interp);
-    Tcl_ResetResult(get_ip(interp)->ip);
-    return einfo;
-}
-
-
-static VALUE
 ip_invoke_real(argc, argv, obj)
     int argc;
     VALUE *argv;
     VALUE obj;
 {
-    VALUE v;
     struct tcltkip *ptr;	/* tcltkip data struct */
     int i;
     Tcl_CmdInfo info;
-    char *cmd, *s;
+    char *cmd;
     char **av = (char **)NULL;
 #if TCL_MAJOR_VERSION >= 8
     Tcl_Obj **ov = (Tcl_Obj **)NULL;
     Tcl_Obj *resultPtr;
 #endif
 
-    DUMP2("invoke_real called by thread:%lx", rb_thread_current());
-    /* get the command name string */
-    v = argv[0];
-    cmd = StringValuePtr(v);
-
     /* get the data struct */
-    ptr = get_ip(obj);
+    Data_Get_Struct(obj, struct tcltkip, ptr);
 
-    /* ip is deleted? */
-    if (Tcl_InterpDeleted(ptr->ip)) {
-	return rb_tainted_str_new2("");
-    }
+    /* get the command name string */
+    cmd = STR2CSTR(argv[0]);
 
     /* map from the command name to a C procedure */
-    DUMP2("call Tcl_GetCommandInfo, %s", cmd);
     if (!Tcl_GetCommandInfo(ptr->ip, cmd, &info)) {
-    DUMP1("error Tcl_GetCommandInfo");
-	/* if (event_loop_abort_on_exc || cmd[0] != '.') { */
-	if (event_loop_abort_on_exc > 0) {
-	    /*rb_ip_raise(obj,rb_eNameError,"invalid command name `%s'",cmd);*/
-	    return create_ip_exc(obj, rb_eNameError, 
-				 "invalid command name `%s'", cmd);
-	} else {
-	    if (event_loop_abort_on_exc < 0) {
-		rb_warning("invalid command name `%s' (ignore)", cmd);
-	    } else {
-		rb_warn("invalid command name `%s' (ignore)", cmd);
-	    }
-	    Tcl_ResetResult(ptr->ip);
-	    return rb_tainted_str_new2("");
-	}
+	rb_raise(rb_eNameError, "invalid command name `%s'", cmd);
     }
-    DUMP1("end Tcl_GetCommandInfo");
 
     /* memory allocation for arguments of this command */
 #if TCL_MAJOR_VERSION >= 8
@@ -1924,9 +365,8 @@ ip_invoke_real(argc, argv, obj)
 	/* object interface */
 	ov = (Tcl_Obj **)ALLOCA_N(Tcl_Obj *, argc+1);
 	for (i = 0; i < argc; ++i) {
-	    v = argv[i];
-	    s = StringValuePtr(v);
-	    ov[i] = Tcl_NewStringObj(s, RSTRING(v)->len);
+	    char *s = STR2CSTR(argv[i]);
+	    ov[i] = Tcl_NewStringObj(s, strlen(s));
 	    Tcl_IncrRefCount(ov[i]);
 	}
 	ov[argc] = (Tcl_Obj *)NULL;
@@ -1934,11 +374,11 @@ ip_invoke_real(argc, argv, obj)
     else
 #endif
     {
-	/* string interface */
+      /* string interface */
 	av = (char **)ALLOCA_N(char *, argc+1);
 	for (i = 0; i < argc; ++i) {
-	    v = argv[i];
-	    s = StringValuePtr(v);
+	    char *s = STR2CSTR(argv[i]);
+
 	    av[i] = ALLOCA_N(char, strlen(s)+1);
 	    strcpy(av[i], s);
 	}
@@ -1966,92 +406,16 @@ ip_invoke_real(argc, argv, obj)
     else
 #endif
     {
-	TRAP_BEG;
-#if TCL_MAJOR_VERSION >= 8
-	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, 
-					 argc, (CONST84 char **)av);
-#else /* TCL_MAJOR_VERSION < 8 */
-	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, argc, av);
-#endif
-	TRAP_END;
+	ptr->return_value = (*info.proc)(info.clientData,
+					 ptr->ip, argc, av);
     }
 
-    /* exception on mainloop */
     if (ptr->return_value == TCL_ERROR) {
-	if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
-	    /*rb_ip_raise(obj, rb_eRuntimeError, "%s", ptr->ip->result);*/
-	    return create_ip_exc(obj, rb_eRuntimeError, "%s", ptr->ip->result);
-	} else {
-	    if (event_loop_abort_on_exc < 0) {
-		rb_warning("%s (ignore)", ptr->ip->result);
-	    } else {
-		rb_warn("%s (ignore)", ptr->ip->result);
-	    }
-	    Tcl_ResetResult(ptr->ip);
-	    return rb_tainted_str_new2("");
-	}
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
     }
 
     /* pass back the result (as string) */
-    /* return rb_str_new2(ptr->ip->result); */
-    return rb_tainted_str_new2(ptr->ip->result);
-}
-
-VALUE
-ivq_safelevel_handler(arg, ivq)
-    VALUE arg;
-    VALUE ivq;
-{
-    struct invoke_queue *q;
-
-    Data_Get_Struct(ivq, struct invoke_queue, q);
-    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
-    rb_set_safe_level(q->safe_level);
-    return ip_invoke_real(q->argc, q->argv, q->obj);
-}
-
-int invoke_queue_handler _((Tcl_Event *, int));
-int
-invoke_queue_handler(evPtr, flags)
-    Tcl_Event *evPtr;
-    int flags;
-{
-    struct invoke_queue *q = (struct invoke_queue *)evPtr;
-
-    DUMP2("do_invoke_queue_handler : evPtr = %lx", evPtr);
-    DUMP2("invoke queue_thread : %lx", rb_thread_current());
-    DUMP2("added by thread : %lx", q->thread);
-
-    if (q->done) {
-	DUMP1("processed by another event-loop");
-	return 0;
-    } else {
-	DUMP1("process it on current event-loop");
-    }
-
-    /* process it */
-    q->done = 1;
-
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-	*(q->result) 
-	    = rb_funcall(rb_proc_new(ivq_safelevel_handler, 
-				     Data_Wrap_Struct(rb_cData,0,0,q)), 
-			 rb_intern("call"), 0);
-    } else {
-    DUMP2("call invoke_real (for caller thread:%lx)", q->thread);
-    DUMP2("call invoke_real (current thread:%lx)", rb_thread_current());
-	*(q->result) = ip_invoke_real(q->argc, q->argv, q->obj);
-    }
-
-    /* back to caller */
-    DUMP2("back to caller (caller thread:%lx)", q->thread);
-    DUMP2("               (current thread:%lx)", rb_thread_current());
-    rb_thread_run(q->thread);
-    DUMP1("finish back to caller");
-
-    /* end of handler : remove it */
-    return 1;
+    return rb_str_new2(ptr->ip->result);
 }
 
 static VALUE
@@ -2060,66 +424,42 @@ ip_invoke(argc, argv, obj)
     VALUE *argv;
     VALUE obj;
 {
-    struct invoke_queue *tmp;
-    VALUE current = rb_thread_current();
-    VALUE result;
-    VALUE *alloc_argv, *alloc_result;
-    Tcl_QueuePosition position;
+    struct invoke_queue *tmp, *p;
+    VALUE result = rb_thread_current();
 
-    if (argc < 1) {
-	rb_raise(rb_eArgError, "command name missing");
+    if (result == main_thread) {
+	return ip_invoke_real(argc, argv, obj);
     }
-    if (eventloop_thread == 0 || current == eventloop_thread) {
-	if (eventloop_thread) {
-	    DUMP2("invoke from current eventloop %lx", current);
-	} else {
-	    DUMP2("invoke from thread:%lx but no eventloop", current);
-	}
-	result = ip_invoke_real(argc, argv, obj);
-	if (rb_obj_is_kind_of(result, rb_eException)) {
-	    rb_exc_raise(result);
-	}
-	return result;
-    }
-
-    DUMP2("invoke from thread %lx (NOT current eventloop)", current);
-
-    /* allocate memory (protected from Tcl_ServiceEvent) */
-    alloc_argv =  ALLOC_N(VALUE,argc);
-    MEMCPY(alloc_argv, argv, VALUE, argc);
-    alloc_result = ALLOC(VALUE);
-
-    /* allocate memory (freed by Tcl_ServiceEvent) */
-    tmp = (struct invoke_queue *)Tcl_Alloc(sizeof(struct invoke_queue));
-
-    /* construct event data */
-    tmp->done = 0;
+    tmp = ALLOC(struct invoke_queue);
     tmp->obj = obj;
     tmp->argc = argc;
-    tmp->argv = alloc_argv;
-    tmp->result = alloc_result;
-    tmp->thread = current;
-    tmp->safe_level = rb_safe_level();
-    tmp->ev.proc = invoke_queue_handler;
-    position = TCL_QUEUE_TAIL;
-
-    /* add the handler to Tcl event queue */
-    DUMP1("add handler");
-    Tcl_QueueEvent(&(tmp->ev), position);
-
-    /* wait for the handler to be processed */
-    DUMP2("wait for handler (current thread:%lx)", current);
+    tmp->argv = ALLOC_N(VALUE, argc);
+    MEMCPY(tmp->argv, argv, VALUE, argc);
+    tmp->thread = result;
+    tmp->done = 0;
+
+    tmp->next = iqueue;
+    iqueue = tmp;
+
     rb_thread_stop();
-    DUMP2("back from handler (current thread:%lx)", current);
-
-    /* get result & free allocated memory */
-    result = *alloc_result;
-    free(alloc_argv);
-    free(alloc_result);
-    if (rb_obj_is_kind_of(result, rb_eException)) {
-	rb_exc_raise(result);
+    result = tmp->result;
+    if (iqueue == tmp) {
+	iqueue = tmp->next;
+	free(tmp->argv);
+	free(tmp);
+	return result;
     }
 
+    p = iqueue;
+    while (p->next) {
+	if (p->next == tmp) {
+	    p->next = tmp->next;
+	    free(tmp->argv);
+	    free(tmp);
+	    break;
+	}
+	p = p->next;
+    }
     return result;
 }
 
@@ -2131,7 +471,7 @@ ip_retval(self)
     struct tcltkip *ptr;	/* tcltkip data struct */
 
     /* get the data strcut */
-    ptr = get_ip(self);
+    Data_Get_Struct(self, struct tcltkip, ptr);
 
     return (INT2FIX(ptr->return_value));
 }
@@ -2149,82 +489,25 @@ _macinit()
 void
 Init_tcltklib()
 {
+    extern VALUE rb_argv0;	/* the argv[0] */
+
     VALUE lib = rb_define_module("TclTkLib");
     VALUE ip = rb_define_class("TclTkIp", rb_cObject);
 
-    VALUE ev_flag = rb_define_module_under(lib, "EventFlag");
-
-#if defined USE_TCL_STUBS && defined USE_TK_STUBS
-    extern int ruby_tcltk_stubs();
-    int ret = ruby_tcltk_stubs();
-    if (ret)
-	rb_raise(rb_eLoadError, "tcltklib: tcltk_stubs init error(%d)", ret);
-#endif
+    eTkCallbackBreak = rb_define_class("TkCallbackBreak", rb_eStandardError);
+    eTkCallbackContinue = rb_define_class("TkCallbackContinue",rb_eStandardError);
 
-    rb_define_const(ev_flag, "NONE",      INT2FIX(0));
-    rb_define_const(ev_flag, "WINDOW",    INT2FIX(TCL_WINDOW_EVENTS));
-    rb_define_const(ev_flag, "FILE",      INT2FIX(TCL_FILE_EVENTS));
-    rb_define_const(ev_flag, "TIMER",     INT2FIX(TCL_TIMER_EVENTS));
-    rb_define_const(ev_flag, "IDLE",      INT2FIX(TCL_IDLE_EVENTS));
-    rb_define_const(ev_flag, "ALL",       INT2FIX(TCL_ALL_EVENTS));
-    rb_define_const(ev_flag, "DONT_WAIT", INT2FIX(TCL_DONT_WAIT));
+    rb_define_module_function(lib, "mainloop", lib_mainloop, 0);
 
-    eTkCallbackBreak = rb_define_class("TkCallbackBreak", rb_eStandardError);
-    eTkCallbackContinue = rb_define_class("TkCallbackContinue",
-                                          rb_eStandardError);
-
-    rb_define_module_function(lib, "mainloop", lib_mainloop, -1);
-    rb_define_module_function(lib, "mainloop_watchdog", 
-			      lib_mainloop_watchdog, -1);
-    rb_define_module_function(lib, "do_one_event", lib_do_one_event, -1);
-    rb_define_module_function(lib, "mainloop_abort_on_exception", 
-                             lib_evloop_abort_on_exc, 0);
-    rb_define_module_function(lib, "mainloop_abort_on_exception=",  
-                             lib_evloop_abort_on_exc_set, 1);
-    rb_define_module_function(lib, "set_eventloop_tick",set_eventloop_tick,1);
-    rb_define_module_function(lib, "get_eventloop_tick",get_eventloop_tick,0);
-    rb_define_module_function(lib, "set_no_event_wait", set_no_event_wait, 1);
-    rb_define_module_function(lib, "get_no_event_wait", get_no_event_wait, 0);
-    rb_define_module_function(lib, "set_eventloop_weight", 
-			      set_eventloop_weight, 2);
-    rb_define_module_function(lib, "get_eventloop_weight", 
-			      get_eventloop_weight, 0);
-    rb_define_module_function(lib, "num_of_mainwindows", 
-			      lib_num_of_mainwindows, 0);
-
-    rb_define_alloc_func(ip, ip_alloc);
-    rb_define_method(ip, "initialize", ip_init, -1);
-    rb_define_method(ip, "create_slave", ip_create_slave, -1);
-    rb_define_method(ip, "make_safe", ip_make_safe, 0);
-    rb_define_method(ip, "safe?", ip_is_safe_p, 0);
-    rb_define_method(ip, "delete", ip_delete, 0);
-    rb_define_method(ip, "deleted?", ip_is_deleted_p, 0);
+    rb_define_singleton_method(ip, "new", ip_new, 0);
     rb_define_method(ip, "_eval", ip_eval, 1);
-    rb_define_method(ip, "_toUTF8",ip_toUTF8, 2);
-    rb_define_method(ip, "_fromUTF8",ip_fromUTF8, 2);
-    rb_define_method(ip, "_thread_vwait", ip_thread_vwait, 1);
-    rb_define_method(ip, "_thread_tkwait", ip_thread_tkwait, 2);
+    rb_define_method(ip, "_toUTF8",ip_toUTF8,2);
+    rb_define_method(ip, "_fromUTF8",ip_fromUTF8,2);
     rb_define_method(ip, "_invoke", ip_invoke, -1);
     rb_define_method(ip, "_return_value", ip_retval, 0);
+    rb_define_method(ip, "mainloop", lib_mainloop, 0);
 
-    rb_define_method(ip, "mainloop", ip_mainloop, -1);
-    rb_define_method(ip, "mainloop_watchdog", ip_mainloop_watchdog, -1);
-    rb_define_method(ip, "do_one_event", ip_do_one_event, -1);
-    rb_define_method(ip, "mainloop_abort_on_exception", 
-		    ip_evloop_abort_on_exc, 0);
-    rb_define_method(ip, "mainloop_abort_on_exception=", 
-		    ip_evloop_abort_on_exc_set, 1);
-    rb_define_method(ip, "set_eventloop_tick", ip_set_eventloop_tick, 1);
-    rb_define_method(ip, "get_eventloop_tick", ip_get_eventloop_tick, 0);
-    rb_define_method(ip, "set_no_event_wait", ip_set_no_event_wait, 1);
-    rb_define_method(ip, "get_no_event_wait", ip_get_no_event_wait, 0);
-    rb_define_method(ip, "set_eventloop_weight", ip_set_eventloop_weight, 2);
-    rb_define_method(ip, "get_eventloop_weight", ip_get_eventloop_weight, 0);
-    rb_define_method(ip, "restart", ip_restart, 0);
-
-    eventloop_thread = 0;
-    watchdog_thread  = 0;
-
+    main_thread = rb_thread_current();
 #ifdef __MACOS__
     _macinit();
 #endif
diff --git a/ext/tk/.cvsignore b/ext/tk/.cvsignore
deleted file mode 100644
index 44e7f262dc..0000000000
--- a/ext/tk/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.log
diff --git a/ext/tk/MANIFEST b/ext/tk/MANIFEST
index 1f46c670ec..9689186bf0 100644
--- a/ext/tk/MANIFEST
+++ b/ext/tk/MANIFEST
@@ -1,198 +1,25 @@
 MANIFEST
-README.1st
 extconf.rb
 depend
 tkutil.c
-lib/README
-lib/multi-tk.rb
 lib/tk.rb
 lib/tkafter.rb
 lib/tkbgerror.rb
 lib/tkcanvas.rb
 lib/tkclass.rb
-lib/tkconsole.rb
 lib/tkdialog.rb
 lib/tkentry.rb
 lib/tkfont.rb
-lib/tkmacpkg.rb
 lib/tkmenubar.rb
 lib/tkmngfocus.rb
 lib/tkpalette.rb
 lib/tkscrollbox.rb
 lib/tktext.rb
 lib/tkvirtevent.rb
-lib/tkwinpkg.rb
-sample/safe-tk.rb
 sample/tkbiff.rb
 sample/tkbrowse.rb
 sample/tkdialog.rb
 sample/tkfrom.rb
 sample/tkhello.rb
 sample/tkline.rb
-sample/tkmenubutton.rb
-sample/tkoptdb-safeTk.rb
-sample/tkoptdb.rb
-sample/resource.ja
-sample/resource.en
 sample/tktimer.rb
-sample/tktimer2.rb
-sample/tktimer3.rb
-sample/demos-en/ChangeLog
-sample/demos-en/ChangeLog.prev
-sample/demos-en/README
-sample/demos-en/README.tkencoding
-sample/demos-en/arrow.rb
-sample/demos-en/bind.rb
-sample/demos-en/bitmap.rb
-sample/demos-en/browse1
-sample/demos-en/browse2
-sample/demos-en/button.rb
-sample/demos-en/check.rb
-sample/demos-en/clrpick.rb
-sample/demos-en/colors.rb
-sample/demos-en/cscroll.rb
-sample/demos-en/ctext.rb
-sample/demos-en/dialog1.rb
-sample/demos-en/dialog2.rb
-sample/demos-en/doc.org/README
-sample/demos-en/doc.org/README.JP
-sample/demos-en/doc.org/README.tk80
-sample/demos-en/doc.org/license.terms
-sample/demos-en/doc.org/license.terms.tk80
-sample/demos-en/entry1.rb
-sample/demos-en/entry2.rb
-sample/demos-en/entry3.rb
-sample/demos-en/filebox.rb
-sample/demos-en/floor.rb
-sample/demos-en/form.rb
-sample/demos-en/hello
-sample/demos-en/hscale.rb
-sample/demos-en/icon.rb
-sample/demos-en/image1.rb
-sample/demos-en/image2.rb
-sample/demos-en/image3.rb
-sample/demos-en/images/earth.gif
-sample/demos-en/images/earthris.gif
-sample/demos-en/images/face.xbm
-sample/demos-en/images/flagdown.xbm
-sample/demos-en/images/flagup.xbm
-sample/demos-en/images/gray25.xbm
-sample/demos-en/images/grey.25
-sample/demos-en/images/grey.5
-sample/demos-en/images/letters.xbm
-sample/demos-en/images/noletter.xbm
-sample/demos-en/images/pattern.xbm
-sample/demos-en/images/tcllogo.gif
-sample/demos-en/images/teapot.ppm
-sample/demos-en/items.rb
-sample/demos-en/ixset
-sample/demos-en/ixset2
-sample/demos-en/label.rb
-sample/demos-en/labelframe.rb
-sample/demos-en/menu.rb
-sample/demos-en/menu84.rb
-sample/demos-en/menubu.rb
-sample/demos-en/msgbox.rb
-sample/demos-en/patch_1.1c1
-sample/demos-en/paned1.rb
-sample/demos-en/paned2.rb
-sample/demos-en/plot.rb
-sample/demos-en/puzzle.rb
-sample/demos-en/radio.rb
-sample/demos-en/radio2.rb
-sample/demos-en/rmt
-sample/demos-en/rolodex
-sample/demos-en/rolodex-j
-sample/demos-en/ruler.rb
-sample/demos-en/sayings.rb
-sample/demos-en/search.rb
-sample/demos-en/spin.rb
-sample/demos-en/square
-sample/demos-en/states.rb
-sample/demos-en/style.rb
-sample/demos-en/tcolor
-sample/demos-en/tcolor.bak
-sample/demos-en/text.rb
-sample/demos-en/timer
-sample/demos-en/tkencoding.rb
-sample/demos-en/twind.rb
-sample/demos-en/unicodeout.rb
-sample/demos-en/vscale.rb
-sample/demos-en/widget
-sample/demos-jp/README
-sample/demos-jp/arrow.rb
-sample/demos-jp/bind.rb
-sample/demos-jp/bitmap.rb
-sample/demos-jp/browse1
-sample/demos-jp/browse2
-sample/demos-jp/button.rb
-sample/demos-jp/check.rb
-sample/demos-jp/clrpick.rb
-sample/demos-jp/colors.rb
-sample/demos-jp/cscroll.rb
-sample/demos-jp/ctext.rb
-sample/demos-jp/dialog1.rb
-sample/demos-jp/dialog2.rb
-sample/demos-jp/doc.org/README
-sample/demos-jp/doc.org/README.JP
-sample/demos-jp/doc.org/README.tk80
-sample/demos-jp/doc.org/license.terms
-sample/demos-jp/doc.org/license.terms.tk80
-sample/demos-jp/entry1.rb
-sample/demos-jp/entry2.rb
-sample/demos-jp/entry3.rb
-sample/demos-jp/filebox.rb
-sample/demos-jp/floor.rb
-sample/demos-jp/form.rb
-sample/demos-jp/hello
-sample/demos-jp/hscale.rb
-sample/demos-jp/icon.rb
-sample/demos-jp/image1.rb
-sample/demos-jp/image2.rb
-sample/demos-jp/image3.rb
-sample/demos-jp/images/earth.gif
-sample/demos-jp/images/earthris.gif
-sample/demos-jp/images/face.bmp
-sample/demos-jp/images/flagdown.bmp
-sample/demos-jp/images/flagup.bmp
-sample/demos-jp/images/gray25.bmp
-sample/demos-jp/images/grey.25
-sample/demos-jp/images/grey.5
-sample/demos-jp/images/letters.bmp
-sample/demos-jp/images/noletter.bmp
-sample/demos-jp/images/pattern.bmp
-sample/demos-jp/images/tcllogo.gif
-sample/demos-jp/images/teapot.ppm
-sample/demos-jp/items.rb
-sample/demos-jp/ixset
-sample/demos-jp/ixset2
-sample/demos-jp/label.rb
-sample/demos-jp/labelframe.rb
-sample/demos-jp/menu.rb
-sample/demos-jp/menu8x.rb
-sample/demos-jp/menu84.rb
-sample/demos-jp/menubu.rb
-sample/demos-jp/msgbox.rb
-sample/demos-jp/paned1.rb
-sample/demos-jp/paned2.rb
-sample/demos-jp/plot.rb
-sample/demos-jp/puzzle.rb
-sample/demos-jp/radio.rb
-sample/demos-jp/radio2.rb
-sample/demos-jp/rmt
-sample/demos-jp/rolodex
-sample/demos-jp/rolodex-j
-sample/demos-jp/ruler.rb
-sample/demos-jp/sayings.rb
-sample/demos-jp/search.rb
-sample/demos-jp/spin.rb
-sample/demos-jp/square
-sample/demos-jp/states.rb
-sample/demos-jp/style.rb
-sample/demos-jp/tcolor
-sample/demos-jp/text.rb
-sample/demos-jp/timer
-sample/demos-jp/twind.rb
-sample/demos-jp/unicodeout.rb
-sample/demos-jp/vscale.rb
-sample/demos-jp/widget
diff --git a/ext/tk/README.1st b/ext/tk/README.1st
deleted file mode 100644
index ff92fdd8a3..0000000000
--- a/ext/tk/README.1st
+++ /dev/null
@@ -1,21 +0,0 @@
-If you want to use Ruby/Tk (tk.rb and so on), you must have
-tcltklib.so which is working collectry. If you fail to call 
-'require "tcltklib"', you may not have tcltklib.so. 
-Even if there is a tcltklib.so on your Ruby library directry, 
-it will not work without Tcl/Tk libraries (e.g. libtcl8.4.so) 
-on your environment. You must also check that your Tcl/Tk is 
-installed properly. 
-
---------------------------------------------
- ( the following is written in EUC-JP )
-
-Ruby/Tk (tk.rb �ʤ�) ��Ȥ��������ˤϡ�tcltklib.so ��������
-ư���Ƥ��ʤ���Фʤ�ޤ��󡥤⤷ require "tcltklib" �˼��Ԥ���
-�褦�ʤ顤tcltklib.so ��¸�ߤ��Ƥ��ʤ��Τ��⤷��ޤ���
-���Ȥ� Ruby �Υ饤�֥��ǥ��쥯�ȥ�� tcltklib.so ��¸�ߤ���
-�����Ȥ��Ƥ⡤�¹ԴĶ��� Tcl/Tk �饤�֥�� (libtcl8.4.so �ʤ�) 
-���ʤ���е�ǽ���ޤ���Tcl/Tk �����������󥹥ȡ��뤵��Ƥ��뤫
-�ɤ���������å����Ƥ���������
-
-==========================================================
-                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/lib/README b/ext/tk/lib/README
deleted file mode 100644
index c003adb2c8..0000000000
--- a/ext/tk/lib/README
+++ /dev/null
@@ -1,19 +0,0 @@
-README		this file
-multi-tk.rb	multiple Tk interpreter (included safe-Tk) support
-tk.rb		Tk interface
-tkafter.rb	handles Tcl after
-tkbgerror.rb	Tk error module
-tkcanvas.rb	Tk canvas interface
-tkclass.rb	provides generic names for Tk classes
-tkconsole.rb	console command support
-tkdialog.rb	Tk dialog class
-tkentry.rb	Tk entry class
-tkfont.rb	Tk font support
-tkmacpkg.rb	Mac resource support
-tkmenubar.rb	TK menubar utility
-tkmngfocus.rb	focus manager
-tkpalette.rb	pallete support
-tkscrollbox.rb	scroll box, also example of compound widget
-tktext.rb	text classes
-tkvirtevent.rb	virtual event support
-tkwinpkg.rb	Win DDE and registry support
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
deleted file mode 100644
index 288b5be443..0000000000
--- a/ext/tk/lib/multi-tk.rb
+++ /dev/null
@@ -1,1363 +0,0 @@
-#
-#		multi-tk.rb - supports multi Tk interpreters
-#			by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-require 'tcltklib'
-require 'thread'
-
-################################################
-# ignore exception on the mainloop?
-
-TclTkLib.mainloop_abort_on_exception = true
-# TclTkLib.mainloop_abort_on_exception = false
-# TclTkLib.mainloop_abort_on_exception = nil
-
-
-
-################################################
-# exceptiopn to treat the return value from IP
-class MultiTkIp_OK < Exception
-  def self.send(thred, ret=nil)
-    thread.raise self.new(ret)
-  end
-
-  def initialize(ret=nil)
-    super('succeed')
-    @return_value = ret
-  end
-
-  attr_reader :return_value
-  alias value return_value
-end
-MultiTkIp_OK.freeze
-
-
-################################################
-# methods for construction
-class MultiTkIp
-  SLAVE_IP_ID = ['slave'.freeze, '0'.taint].freeze
-
-  @@IP_TABLE = {}.taint
-
-  @@INIT_IP_ENV  = [].taint # table of Procs
-  @@ADD_TK_PROCS = [].taint # table of [name, args, body]
-
-  @@TK_TABLE_LIST = [].taint
-
-  @@TK_CMD_TBL = {}.taint
-
-  ######################################
-
-  @@CB_ENTRY_CLASS = Class.new{|c|
-    def initialize(ip, cmd)
-      @ip = ip
-      @cmd = cmd
-    end
-    attr_reader :ip, :cmd
-    def call(*args)
-      begin
-	 unless @ip.deleted?
-	   @ip.cb_eval(@cmd, *args)
-	 end
-      rescue TkCallbackBreak, TkCallbackContinue
-	fail
-      rescue Exception
-      end
-    end
-  }.freeze
-
-  ######################################
-
-  def _keys2opts(keys)
-    keys.collect{|k,v| "-#{k} #{v}"}.join(' ')
-  end
-  private :_keys2opts
-
-  def _check_and_return(thread, exception, wait=0)
-    return nil unless thread
-
-    if wait == 0
-      # no wait
-      thread.raise exception
-      return thread
-    end
-
-    # wait to stop the caller thread
-    wait.times{
-      if thread.stop?
-	# ready to send exception
-	thread.raise exception
-	return thread
-      end
-
-      # wait
-      Thread.pass
-    }
-
-    # unexpected error
-    thread.raise RuntimeError, "the thread may not wait for the return value"
-    return thread
-  end
-
-  ######################################
-
-  def set_safe_level(safe)
-    @cmd_queue.enq([@system, 'set_safe_level', safe])
-    self
-  end
-  def self.set_safe_level(safe)
-    __getip.set_safe_level(safe)
-    self
-  end
-
-  def _create_receiver_and_watchdog()
-    # command-procedures receiver
-    receiver = Thread.new{
-      safe_level = $SAFE
-      loop do
-	thread, cmd, *args = @cmd_queue.deq
-	if thread == @system
-	  # control command
-	  case cmd
-	  when 'set_safe_level'
-	    begin
-	      safe_level = args[0] if safe_level < args[0] 
-	    rescue Exception
-	      nil
-	    end
-	  else
-	    # ignore
-	  end
-
-	else
-	  # procedure
-	  begin
-	    ret = proc{$SAFE = safe_level; cmd.call(*args)}.call
-	  rescue SystemExit
-	    # delete IP
-	    unless @interp.deleted?
-	      if @interp._invoke('info', 'command', '.') != ""
-		@interp._invoke('destroy', '.')
-	      end
-	      @interp.delete
-	    end
-	    _check_and_return(thread, MultiTkIp_OK.new(nil))
-	    break
-	  rescue Exception => e
-	    # raise exception
-	    _check_and_return(thread, e)
-	  else
-	    # no exception
-	    _check_and_return(thread, MultiTkIp_OK.new(ret))
-	  end
-	end
-      end
-    }
-
-    # watchdog of receiver
-    watchdog = Thread.new{
-      begin
-	loop do
-	  sleep 1
-	  break unless receiver.alive?
-	end
-      rescue Exception
-	# ignore all kind of Exception
-      end
-      # receiver is dead
-      loop do
-	thread, cmd, *args = @cmd_queue.deq
-	next unless thread
-	if thread.alive?
-	  if @interp.deleted?
-	    thread.raise RuntimeError, 'the interpreter is already deleted'
-	  else
-	    thread.raise RuntimeError, 
-	      'the interpreter no longer receives command procedures'
-	  end
-	end
-      end
-    }
-
-    # return threads
-    [receiver, watchdog]
-  end
-  private :_check_and_return, :_create_receiver_and_watchdog
-
-  ######################################
-
-  if self.const_defined? :DEFAULT_MASTER_NAME
-    name = DEFAULT_MASTER_NAME.to_s
-  else
-    name = nil
-  end
-  if self.const_defined?(:DEFAULT_MASTER_OPTS) &&
-      DEFAULT_MASTER_OPTS.kind_of?(Hash)
-    keys = DEFAULT_MASTER_OPTS
-  else
-    keys = {}
-  end
-
-  @@DEFAULT_MASTER = self.allocate
-  @@DEFAULT_MASTER.instance_eval{
-    @encoding = [].taint
-
-    @tk_windows = {}.taint
-
-    @tk_table_list = [].taint
-
-    @slave_ip_tbl = {}.taint
-
-    unless keys.kind_of? Hash
-      fail ArgumentError, "expecting a Hash object for the 2nd argument"
-    end
-
-    @interp = TclTkIp.new(name, _keys2opts(keys))
-    @ip_name = nil
-
-    @system = Object.new
-
-    @threadgroup  = Thread.current.group
-
-    @cmd_queue = Queue.new
-
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    # NOT enclose @threadgroup for @@DEFAULT_MASTER
-
-    @@IP_TABLE[ThreadGroup::Default] = self
-    @@IP_TABLE[@threadgroup] = self
-  }
-  @@DEFAULT_MASTER.freeze # defend against modification
-
-  ######################################
-
-  def self.inherited(subclass)
-    # trust if on ThreadGroup::Default or @@DEFAULT_MASTER's ThreadGroup
-    if @@IP_TABLE[Thread.current.group] == @@DEFAULT_MASTER
-      begin
-	class << subclass
-	  self.methods.each{|m|
-	    begin
-	      unless m == '__id__' || m == '__send__' || m == 'freeze'
-		undef_method(m)
-	      end
-	    rescue Exception
-	      # ignore all exceptions
-	    end
-	  }
-	end
-      ensure
-	subclass.freeze
-	fail SecurityError, 
-	  "cannot create subclass of MultiTkIp on a untrusted ThreadGroup"
-      end
-    end
-  end
-
-  ######################################
-
-  SAFE_OPT_LIST = [
-    'accessPath'.freeze, 
-    'statics'.freeze, 
-    'nested'.freeze, 
-    'deleteHook'.freeze
-  ].freeze
-
-  def _parse_slaveopts(keys)
-    name = nil
-    safe = false
-    safe_opts = {}
-    tk_opts   = {}
-
-    keys.each{|k,v|
-      if k.to_s == 'name'
-	name = v 
-      elsif k.to_s == 'safe'
-	safe = v
-      elsif SAFE_OPT_LIST.member?(k.to_s)
-	safe_opts[k] = v
-      else
-	tk_opts[k] = v
-      end
-    }
-
-    [name, safe, safe_opts, tk_opts]
-  end
-  private :_parse_slaveopts
-
-  def _create_slave_ip_name
-    name = SLAVE_IP_ID.join
-    SLAVE_IP_ID[1].succ!
-    name
-  end
-  private :_create_slave_ip_name
-
-  ######################################
-
-  def __check_safetk_optkeys(optkeys)
-    # based on 'safetk.tcl'
-    new_keys = {}
-    optkeys.each{|k,v| new_keys[k.to_s] = v}
-
-    # check 'display'
-    if !new_keys.key?('display')
-      begin
-	#new_keys['display'] = @interp._invoke('winfo screen .')
-	new_keys['display'] = @interp._invoke('winfo', 'screen', '.')
-      rescue
-	if ENV[DISPLAY]
-	  new_keys['display'] = ENV[DISPLAY]
-	elsif !new_keys.key?('use')
-	  warn "Warning: no screen info or ENV[DISPLAY], so use ':0.0'"
-	  new_keys['display'] = ':0.0'
-	end
-      end
-    end
-
-    # check 'use'
-    if new_keys.key?('use')
-      # given 'use'
-      case new_keys['use']
-      when TkWindow
-	new_keys['use'] = TkWinfo.id(new_keys['use'])
-	#assoc_display = @interp._eval('winfo screen .')
-	assoc_display = @interp._invoke('winfo', 'screen', '.')
-      when /^\..*/
-	new_keys['use'] = @interp._invoke('winfo', 'id', new_keys['use'])
-	assoc_display = @interp._invoke('winfo', 'screen', new_keys['use'])
-      else
-	begin
-	  pathname = @interp._invoke('winfo', 'pathname', new_keys['use'])
-	  assco_display = @interp._invoke('winfo', 'screen', pathname)
-	rescue
-	  assoc_display = new_keys['display']
-	end
-      end
-
-      # match display?
-      if assoc_display != new_keys['display']
-	if optkeys.keys?(:display) || optkeys.keys?('display')
-	  fail RuntimeError, 
-	    "conflicting 'display'=>#{new_keys['display']} " + 
-	    "and display '#{assoc_display}' on 'use'=>#{new_keys['use']}"
-	else
-	  new_keys['display'] = assoc_display
-	end
-      end
-    end
-
-    # return
-    new_keys
-  end
-  private :__check_safetk_optkeys
-
-  def __create_safetk_frame(slave_ip, slave_name, app_name, keys)
-    # display option is used by ::safe::loadTk
-    loadTk_keys = {}
-    loadTk_keys['display'] = keys['display']
-    dup_keys = keys.dup
-
-    # keys for toplevel : allow followings
-    toplevel_keys = {}
-    ['height', 'width', 'background', 'menu'].each{|k|
-      toplevel_keys[k] = dup_keys.delete(k) if dup_keys.key?(k)
-    }
-    toplevel_keys['classname'] = 'SafeTk'
-    toplevel_keys['screen'] = dup_keys.delete('display')
-
-    # other keys used by pack option of container frame
-
-    # create toplevel widget
-    begin
-      top = TkToplevel.new(toplevel_keys)
-    rescue NameError
-      fail unless @interp.safe?
-      fail SecurityError, "unable create toplevel on the safe interpreter"
-    end
-    msg = "Untrusted Ruby/Tk applet (#{slave_name})"
-    if app_name.kind_of?(String)
-      top.title "#{app_name} (#{slave_name})"
-    else
-      top.title msg
-    end
-
-    # procedure to delete slave interpreter
-    slave_delete_proc = proc{
-      unless slave_ip.deleted?
-	if slave_ip._invoke('info', 'command', '.') != ""
-	  slave_ip._invoke('destroy', '.')
-	end
-	slave_ip.delete
-      end
-    }
-    tag = TkBindTag.new.bind('Destroy', slave_delete_proc)
-
-    # create control frame
-    TkFrame.new(top, :bg=>'red', :borderwidth=>3, :relief=>'ridge') {|fc|
-      fc.bindtags = fc.bindtags.unshift(tag)
-
-      TkFrame.new(fc, :bd=>0){|f|
-	TkButton.new(f, 
-		     :text=>'Delete', :bd=>1, :padx=>2, :pady=>0, 
-		     :highlightthickness=>0, :command=>slave_delete_proc
-		     ).pack(:side=>:right, :fill=>:both)
-	f.pack(:side=>:right, :fill=>:both, :expand=>true)
-      }
-
-      TkLabel.new(fc, :text=>msg, :padx=>2, :pady=>0, 
-		  :anchor=>:w).pack(:side=>:left, :fill=>:both, :expand=>true)
-
-      fc.pack(:side=>:bottom, :fill=>:x)
-    }
-
-    # container frame for slave interpreter
-    dup_keys['fill'] = :both  unless dup_keys.key?('fill')
-    dup_keys['expand'] = true unless dup_keys.key?('expand')
-    c = TkFrame.new(top, :container=>true).pack(dup_keys)
-
-    # return keys
-    loadTk_keys['use'] = TkWinfo.id(c)
-    loadTk_keys
-  end
-  private :__create_safetk_frame
-
-  def __create_safe_slave_obj(safe_opts, app_name, tk_opts)
-    # safe interpreter
-    # at present, not enough support for '-deleteHook' option
-    ip_name = _create_slave_ip_name
-    slave_ip = @interp.create_slave(ip_name, true)
-    @interp._eval("::safe::interpInit #{ip_name} "+_keys2opts(safe_opts))
-    tk_opts = __check_safetk_optkeys(tk_opts)
-    unless tk_opts.key?('use')
-      tk_opts = __create_safetk_frame(slave_ip, ip_name, app_name, tk_opts)
-    end
-    slave_ip._invoke('set', 'argv0', app_name) if app_name.kind_of?(String)
-    @interp._eval("::safe::loadTk #{ip_name} #{_keys2opts(tk_opts)}")
-    @slave_ip_tbl[ip_name] = slave_ip
-    [slave_ip, ip_name]
-  end
-
-  def __create_trusted_slave_obj(name, keys)
-    ip_name = _create_slave_ip_name
-    slave_ip = @interp.create_slave(ip_name, false)
-    slave_ip._invoke('set', 'argv0', name) if name.kind_of?(String)
-    slave_ip._invoke('set', 'argv', _keys2opts(keys))
-    @interp._invoke('load', '', 'Tk', ip_name)
-    @slave_ip_tbl[ip_name] = slave_ip
-    [slave_ip, ip_name]
-  end
-
-  ######################################
-
-  def _create_slave_object(keys={})
-    ip = MultiTkIp.new_slave(self, keys={})
-    @slave_ip_tbl[ip.name] = ip
-  end
-
-  ######################################
-
-  def initialize(master, safeip=true, keys={})
-    if $SAFE >= 4
-      fail SecurityError, "cannot create a new interpreter at level #{$SAFE}"
-    end
-
-    if safeip == nil && $SAFE >= 2
-      fail SecurityError, "cannot create a master-ip at level #{$SAFE}"
-    end
-
-    if !master.master? && master.safe?
-      fail SecurityError, "safe-slave-ip cannot create a new interpreter"
-    end
-
-    if safeip == nil && !master.master?
-      fail SecurityError, "slave-ip cannot create a master-ip"
-    end
-
-    unless keys.kind_of? Hash
-      fail ArgumentError, "expecting a Hash object for the 2nd argument"
-    end
-
-    @encoding = []
-    @tk_windows = {}
-    @tk_table_list = []
-    @slave_ip_tbl = {}
-
-    @encoding.taint unless @encoding.tainted?
-    @tk_windows.taint unless @tk_windows.tainted?
-    @tk_table_list.taint unless @tk_table_list.tainted?
-    @slave_ip_tbl.taint unless @slave_ip_tbl.tainted?
-
-    name, safe, safe_opts, tk_opts = _parse_slaveopts(keys)
-
-    if safeip == nil
-      # create master-ip
-      @interp = TclTkIp.new(name, _keys2opts(tk_opts))
-      @ip_name = nil
-    else
-      # create slave-ip
-      if safeip || master.safe?
-	@interp, @ip_name = master.__create_safe_slave_obj(safe_opts, 
-							   name, tk_opts)
-      else
-	@interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts)
-      end
-      @set_alias_proc = proc{|name| 
-	master._invoke('interp', 'alias', @ip_name, name, '', name)
-      }.freeze
-    end
-
-    @system = Object.new
-
-    @threadgroup  = ThreadGroup.new
-
-    @cmd_queue = Queue.new
-
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    @threadgroup.enclose
-
-    @@IP_TABLE[@threadgroup] = self
-    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
-    @@TK_TABLE_LIST.size.times{ 
-      (tbl = {}).tainted? || tbl.taint
-      @tk_table_list << tbl
-    }
-
-    self.freeze  # defend against modification
-  end
-end
-
-
-# get target IP
-class MultiTkIp
-  def self.__getip
-    if Thread.current.group == ThreadGroup::Default
-      @@DEFAULT_MASTER
-    else
-      ip = @@IP_TABLE[Thread.current.group]
-      unless ip
-	fail SecurityError, 
-	  "cannot call Tk methods on #{Thread.current.inspect}"
-      end
-      ip
-    end
-  end
-end
-
-
-# aliases of constructor
-class << MultiTkIp
-  alias __new new
-  private :__new
-
-  def new_master(keys={}, &b)
-    ip = __new(__getip, nil, keys)
-    ip.eval_proc(&b) if b
-    ip
-  end
-
-  alias new new_master
-
-  def new_slave(keys={}, &b)
-    ip = __new(__getip, false, keys)
-    ip.eval_proc(&b) if b
-    ip
-  end
-  alias new_trusted_slave new_master
-
-  def new_safe_slave(keys={},&b)
-    ip = __new(__getip, true, keys)
-    ip.eval_proc(&b) if b
-    ip
-  end
-  alias new_safeTk new_safe_slave
-end
-
-
-# get info
-class MultiTkIp
-  def inspect
-    s = self.to_s.chop!
-    if master?
-      s << ':master'
-    else
-      if @interp.safe?
-	s << ':safe-slave'
-      else
-	s << ':trusted-slave'
-      end
-    end
-    s << '>'
-  end
-
-  def master?
-    if @ip_name
-      false
-    else
-      true
-    end
-  end
-  def self.master?
-    __getip.master?
-  end
-
-  def slave?
-    not master?
-  end
-  def self.slave?
-  end
-
-  def alive?
-    begin
-      return false unless @cmd_receiver.alive?
-      return false if @interp.deleted?
-      return false if @interp._invoke('interp', 'exists', '') == '0'
-    rescue Exception
-      return false
-    end
-    true
-  end
-  def self.alive?
-    __getip.alive?
-  end
-
-  def path
-    @ip_name || ''
-  end
-  def self.path
-    __getip.path
-  end
-  def ip_name
-    @ip_name || ''
-  end
-  def self.ip_name
-    __getip.ip_name
-  end
-  def to_eval
-    @ip_name || ''
-  end
-  def self.to_eval
-    __getip.to_eval
-  end
-
-  def slaves(all = false)
-    @interp._invoke('interp','slaves').split.map!{|name| 
-      if @slave_ip_tbl.key?(name)
-	@slave_ip_tbl[name]
-      elsif all
-	name
-      else
-	nil
-      end
-    }.compact!
-  end
-  def self.slaves(all = false)
-    __getip.slaves(all)
-  end
-end
-
-
-# instance methods to treat tables
-class MultiTkIp
-  def _tk_cmd_tbl
-    tbl = {}
-    MultiTkIp.tk_cmd_tbl.each{|id, ent| tbl[id] = ent if ent.ip == self }
-    tbl
-  end
-
-  def _tk_windows
-    @tk_windows
-  end
-
-  def _tk_table_list
-    @tk_table_list
-  end
-
-  def _add_new_tables
-    (@@TK_TABLE_LIST.size - @tk_table_list.size).times{ 
-      (tbl = {}).tainted? || tbl.taint
-      @tk_table_list << tbl
-    }
-  end
-
-  def _init_ip_env(script)
-    script.call(self)
-  end
-
-  def _add_tk_procs(name, args, body)
-    return if slave?
-    @interp._invoke('proc', name, args, body) if args && body
-    @interp._invoke('interp', 'slaves').split.each{|slave|
-      @interp._invoke('interp', 'alias', slave, name, '', name)
-    }
-  end
-
-  def _init_ip_internal(init_ip_env, add_tk_procs)
-    init_ip_env.each{|script| script.call(self)}
-    add_tk_procs.each{|name, args, body| 
-      if master?
-	@interp._invoke('proc', name, args, body) if args && body
-      else
-	@set_alias_proc.call(name)
-      end
-    }
-  end
-end
-
-
-# class methods to treat tables
-class MultiTkIp
-  def self.tk_cmd_tbl
-    @@TK_CMD_TBL
-  end
-  def self.tk_windows
-    __getip._tk_windows
-  end
-  def self.tk_object_table(id)
-    __getip._tk_table_list[id]
-  end
-  def self.create_table
-    #if __getip.slave?
-    #  raise SecurityError, "slave-IP has no permission creating a new table"
-    #end
-    id = @@TK_TABLE_LIST.size
-    obj = Object.new
-    @@TK_TABLE_LIST << obj
-    obj.instance_eval <<-EOD
-      def self.method_missing(m, *args)
-	 MultiTkIp.tk_object_table(#{id}).send(m, *args)
-      end
-    EOD
-    obj.freeze
-    @@IP_TABLE.each{|tg, ip| ip._add_new_tables }
-    return obj
-  end
-
-  def self.init_ip_env(script = Proc.new)
-    @@INIT_IP_ENV << script
-    @@IP_TABLE.each{|tg, ip| 
-      ip._init_ip_env(script)
-    }
-  end
-
-  def self.add_tk_procs(name, args=nil, body=nil)
-    @@ADD_TK_PROCS << [name, args, body]
-    @@IP_TABLE.each{|tg, ip| 
-      ip._add_tk_procs(name, args, body)
-    }
-  end
-
-  def self.init_ip_internal
-    __getip._init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
-  end
-end
-
-
-# for callback operation
-class MultiTkIp
-  def self.get_cb_entry(cmd)
-    @@CB_ENTRY_CLASS.new(__getip, cmd).freeze
-  end
-
-  def cb_eval(cmd, *args)
-    self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
-  end
-end
-
-
-# evaluate a procedure on the proper interpreter
-class MultiTkIp
-  # instance method
-  def eval_proc_core(req_val, cmd, *args)
-    # cmd string ==> proc
-    if cmd.kind_of?(String)
-      xcmd  = cmd
-      xargs = args
-      cmd = proc{ TkComm._get_eval_string(TkUtil.eval_cmd(xcmd, *xargs)) }
-      args = []
-    end
-
-    # check
-    unless cmd.kind_of?(Proc)
-      raise RuntimeError, "A Proc object is expected for the 'cmd' argument"
-    end
-
-    # on IP thread
-    if (@cmd_receiver == Thread.current)
-      begin
-	ret = cmd.call(*args)
-      rescue SystemExit
-	# exit IP
-	warn("Warning: "+ $! + " on " + self.inspect) if $DEBUG
-	self.delete
-	ret = nil
-      rescue Exception => e
-	warn("Warning: " + e.class.inspect + 
-	     ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-	     " on " + self.inspect)
-	ret =  nil
-      end
-      return ret
-    end
-    
-    # send cmd to the proc-queue
-    unless req_val
-      @cmd_queue.enq([nil, cmd, *args])
-      return nil
-    end
-
-    # send and get return value by exception
-    begin
-      @cmd_queue.enq([Thread.current, cmd, *args])
-      Thread.stop
-    rescue MultiTkIp_OK => ret
-      # return value
-      return ret.value
-    rescue SystemExit
-      # exit IP
-      warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
-      self.delete
-    rescue Exception => e
-      # others --> warning
-	warn("Warning: " + e.class.inspect + 
-	     ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-	     " on " + self.inspect) 
-    end
-    return nil
-  end
-  private :eval_proc_core
-
-  def eval_callback(cmd = Proc.new, *args)
-    eval_proc_core(false, cmd, *args)
-  end
-
-  def eval_proc(cmd = Proc.new, *args)
-    eval_proc_core(true, cmd, *args)
-  end
-  alias call eval_proc
-  alias eval_string eval_proc
-end
-class << MultiTkIp
-  # class method
-  def eval_proc(cmd = Proc.new, *args)
-    # class ==> interp object
-    __getip.eval_proc(cmd, *args)
-  end
-  alias call eval_proc
-  alias eval_string eval_proc
-end
-
-
-# event loop
-# all master/slave IPs are controled by only one event-loop
-class << MultiTkIp
-  def mainloop(check_root = true)
-    __getip.mainloop(check_root)
-  end
-  def mainloop_watchdog(check_root = true)
-    __getip.mainloop_watchdog(check_root)
-  end
-  def do_one_event(flag = TclTkLib::EventFlag::ALL)
-    __getip.do_one_event(flag)
-  end
-  def mainloop_abort_on_exception
-    __getip.mainloop_abort_on_exception
-  end
-  def mainloop_abort_on_exception=(mode)
-    __getip.mainloop_abort_on_exception=(mode)
-  end
-  def set_eventloop_tick(tick)
-    __getip.set_eventloop_tick(tick)
-  end
-  def get_eventloop_tick
-    __getip.get_eventloop_tick
-  end
-  def set_no_event_wait(tick)
-    __getip.set_no_event_wait(tick)
-  end
-  def get_no_event_wait
-    __getip.get_no_event_wait
-  end
-  def set_eventloop_weight(loop_max, no_event_tick)
-    __getip.set_eventloop_weight(loop_max, no_event_tick)
-  end
-  def get_eventloop_weight
-    __getip.get_eventloop_weight
-  end
-end
-
-# class methods to delegate to TclTkIp
-class << MultiTkIp
-  def method_missing(id, *args)
-    __getip.send(id, *args)
-  end
-
-  def make_safe
-    __getip.make_safe
-  end
-
-  def safe?
-    __getip.safe?
-  end
-
-  def restart
-    __getip.restart
-  end
-
-  def _eval(str)
-    __getip._eval(str)
-  end
-
-  def _invoke(*args)
-    __getip._invoke(*args)
-  end
-
-  def _toUTF8(str, encoding)
-    __getip._toUTF8(str, encoding)
-  end
-
-  def _fromUTF8(str, encoding)
-    __getip._fromUTF8(str, encoding)
-  end
-
-  def _thread_vwait(var)
-    __getip._thread_vwait(var)
-  end
-
-  def _thread_tkwait(mode, target)
-    __getip._thread_tkwait(mode, target)
-  end
-
-  def _return_value
-    __getip._return_value
-  end
-end
-
-
-# wrap methods on TclTkLib : not permit calling TclTkLib module methods
-class << TclTkLib
-  def mainloop(check_root = true)
-    MultiTkIp.mainloop(check_root)
-  end
-  def mainloop_watchdog(check_root = true)
-    MultiTkIp.mainloop_watchdog(check_root)
-  end
-  def do_one_event(flag = TclTkLib::EventFlag::ALL)
-    MultiTkIp.do_one_event(flag)
-  end
-  def mainloop_abort_on_exception
-    MultiTkIp.mainloop_abort_on_exception
-  end
-  def mainloop_abort_on_exception=(mode)
-    MultiTkIp.mainloop_abort_on_exception=(mode)
-  end
-  def set_eventloop_tick(tick)
-    MultiTkIp.set_eventloop_tick(tick)
-  end
-  def get_eventloop_tick
-    MultiTkIp.get_eventloop_tick
-  end
-  def set_no_event_wait(tick)
-    MultiTkIp.set_no_event_wait(tick)
-  end
-  def get_no_event_wait
-    MultiTkIp.get_no_event_wait
-  end
-  def set_eventloop_weight(loop_max, no_event_tick)
-    MultiTkIp.set_eventloop_weight(loop_max, no_event_tick)
-  end
-  def get_eventloop_weight
-    MultiTkIp.get_eventloop_weight
-  end
-  def restart
-    MultiTkIp.restart
-  end
-end
-
-
-# depend on TclTkIp
-class MultiTkIp
-  def mainloop(check_root = true, restart_on_dead = true)
-    return self if self.slave?
-    unless restart_on_dead
-      @interp.mainloop(check_root)
-    else
-      begin
-	loop do
-	  break unless self.alive?
-	  if check_root
-	    begin
-	      break if TclTkLib.num_of_mainwindows == 0
-	    rescue Exception
-	      break
-	    end
-	  end
-	  @interp.mainloop(check_root)
-	end
-      rescue StandardError
-	if TclTkLib.mainloop_abort_on_exception != nil
-	  STDERR.print("Warning: Tk mainloop on ", @interp.inspect, 
-		       " receives ", $!.class.inspect, 
-		       " exception (ignore) : ", $!.message, "\n");
-	end
-	retry
-      end
-    end
-    self
-  end
-
-  def make_safe
-    @interp.make_safe
-  end
-
-  def safe?
-    @interp.safe?
-  end
-
-  def delete
-    @interp.delete
-  end
-
-  def deleted?
-    @interp.deleted?
-  end
-
-  def restart
-    @interp.restart
-  end
-
-  def _eval(str)
-    @interp._eval(str)
-  end
-
-  def _invoke(*args)
-    @interp._invoke(*args)
-  end
-
-  def _toUTF8(str, encoding)
-    @interp._toUTF8(str, encoding)
-  end
-
-  def _fromUTF8(str, encoding)
-    @interp._fromUTF8(str, encoding)
-  end
-
-  def _thread_vwait(var)
-    @interp._thread_vwait(var)
-  end
-
-  def _thread_tkwait(mode, target)
-    @interp._thread_tkwait(mode, target)
-  end
-
-  def _return_value
-    @interp._return_value
-  end
-end
-
-
-# interp command support
-class MultiTkIp
-  def _lst2ary(str)
-    return [] if str == ""
-    idx = str.index('{')
-    while idx and idx > 0 and str[idx-1] == ?\\
-      idx = str.index('{', idx+1)
-    end
-    return str.split unless idx
-
-    list = str[0,idx].split
-    str = str[idx+1..-1]
-    i = -1
-    brace = 1
-    str.each_byte {|c|
-      i += 1
-      brace += 1 if c == ?{
-      brace -= 1 if c == ?}
-      break if brace == 0
-    }
-    if i == 0
-      list.push ''
-    elsif str[0, i] == ' '
-      list.push ' '
-    else
-      list.push str[0..i-1]
-    end
-    list += tk_split_simplelist(str[i+1..-1])
-    list
-  end
-  private :_lst2ary
-
-  def _slavearg(slave)
-    if slave.kind_of?(MultiTkIp)
-      slave.path
-    elsif slave.kind_of?(String)
-      slave
-    else
-      cmd_name.to_s
-    end
-  end
-  private :_slavearg
-
-  def alias_info(slave, cmd_name)
-    _lst2ary(@interp._invoke('interp', 'alias', _slavearg(slave), cmd_name))
-  end
-  def self.alias_info(slave, cmd_name)
-    __getip.alias_info(slave, cmd_name)
-  end
-
-  def alias_delete(slave, cmd_name)
-    @interp._invoke('interp', 'alias', _slavearg(slave), cmd_name, '')
-    self
-  end
-  def self.alias_delete(slave, cmd_name)
-    __getip.alias_delete(slave, cmd_name)
-    self
-  end
-
-  def def_alias(slave, new_cmd, org_cmd, *args)
-    ret = @interp._invoke('interp', 'alias', _slavearg(slave), new_cmd, 
-			  '', org_cmd, *args)
-    (ret == new_cmd)? self: nil
-  end
-  def self.def_alias(slave, new_cmd, org_cmd, *args)
-    ret = __getip.def_alias(slave, new_cmd, org_cmd, *args)
-    (ret == new_cmd)? self: nil
-  end
-
-  def aliases(slave = '')
-    _lst2ary(@interp._invoke('interp', 'aliases', _slavearg(slave)))
-  end
-  def self.aliases(slave = '')
-    __getip.aliases(slave)
-  end
-
-  def delete_slaves(*args)
-    slaves = args.collect{|s| _slavearg(s)}
-    @interp._invoke('interp', 'delete', *slaves) if slaves.size > 0
-    self
-  end
-  def self.delete_slaves(*args)
-    __getip.delete_slaves(*args)
-    self
-  end
-
-  def exist?(slave = '')
-    ret = @interp._invoke('interp', 'exists', _slavearg(slave))
-    (ret == '1')? true: false
-  end
-  def self.exist?(slave = '')
-    __getip.exist?(slave)
-  end
-
-  def delete_cmd(slave, cmd)
-    slave_invoke = @interp._invoke('list', 'rename', cmd, '')
-    @interp._invoke('interp', 'eval', _slavearg(slave), slave_invoke)
-    self
-  end
-  def self.delete_cmd(slave, cmd)
-    __getip.delete_cmd(slave, cmd)
-    self
-  end
-
-  def expose_cmd(slave, cmd, aliasname = nil)
-    if aliasname
-      @interp._invoke('interp', 'expose', _slavearg(slave), cmd, aliasname)
-    else
-      @interp._invoke('interp', 'expose', _slavearg(slave), cmd)
-    end
-    self
-  end
-  def self.expose_cmd(slave, cmd, aliasname = nil)
-    __getip.expose_cmd(slave, cmd, aliasname)
-    self
-  end
-
-  def hide_cmd(slave, cmd, aliasname = nil)
-    if aliasname
-      @interp._invoke('interp', 'hide', _slavearg(slave), cmd, aliasname)
-    else
-      @interp._invoke('interp', 'hide', _slavearg(slave), cmd)
-    end
-    self
-  end
-  def self.hide_cmd(slave, cmd, aliasname = nil)
-    __getip.hide_cmd(slave, cmd, aliasname)
-    self
-  end
-
-  def hidden_cmds(slave = '')
-    _lst2ary(@interp._invoke('interp', 'hidden', _slavearg(slave)))
-  end
-  def self.hidden_cmds(slave = '')
-    __getip.hidden_cmds(slave)
-  end
-
-  def invoke_hidden(slave, cmd, *args)
-    @interp._invoke('interp', 'invokehidden', _slavearg(slave), cmd, *args)
-  end
-  def self.invoke_hidden(slave, cmd, *args)
-    __getip.invoke_hidden(slave, cmd, *args)
-  end
-
-  def invoke_hidden_on_global(slave, cmd, *args)
-    @interp._invoke('interp', 'invokehidden', _slavearg(slave), 
-		    '-global', cmd, *args)
-  end
-  def self.invoke_hidden_on_global(slave, cmd, *args)
-    __getip.invoke_hidden_on_global(slave, cmd, *args)
-  end
-
-  def mark_trusted(slave = '')
-    @interp._invoke('interp', 'marktrusted', _slavearg(slave))
-    self
-  end
-  def self.mark_trusted(slave = '')
-    __getip.mark_trusted(slave)
-    self
-  end
-
-  def alias_target(aliascmd, slave = '')
-    @interp._invoke('interp', 'target', _slavearg(slave), aliascmd)
-  end
-  def self.alias_target(aliascmd, slave = '')
-    __getip.alias_target(aliascmd, slave)
-  end
-
-  def share_stdin(dist, src = '')
-    @interp._invoke('interp', 'share', src, 'stdin', dist)
-    self
-  end
-  def self.share_stdin(dist, src = '')
-    __getip.share_stdin(dist, src)
-    self
-  end
-
-  def share_stdout(dist, src = '')
-    @interp._invoke('interp', 'share', src, 'stdout', dist)
-    self
-  end
-  def self.share_stdout(dist, src = '')
-    __getip.share_stdout(dist, src)
-    self
-  end
-
-  def share_stderr(dist, src = '')
-    @interp._invoke('interp', 'share', src, 'stderr', dist)
-    self
-  end
-  def self.share_stderr(dist, src = '')
-    __getip.share_stderr(dist, src)
-    self
-  end
-
-  def transfer_stdin(dist, src = '')
-    @interp._invoke('interp', 'transfer', src, 'stdin', dist)
-    self
-  end
-  def self.transfer_stdin(dist, src = '')
-    __getip.transfer_stdin(dist, src)
-    self
-  end
-
-  def transfer_stdout(dist, src = '')
-    @interp._invoke('interp', 'transfer', src, 'stdout', dist)
-    self
-  end
-  def self.transfer_stdout(dist, src = '')
-    __getip.transfer_stdout(dist, src)
-    self
-  end
-
-  def transfer_stderr(dist, src = '')
-    @interp._invoke('interp', 'transfer', src, 'stderr', dist)
-    self
-  end
-  def self.transfer_stderr(dist, src = '')
-    __getip.transfer_stderr(dist, src)
-    self
-  end
-
-  def share_stdio(dist, src = '')
-    @interp._invoke('interp', 'share', src, 'stdin',  dist)
-    @interp._invoke('interp', 'share', src, 'stdout', dist)
-    @interp._invoke('interp', 'share', src, 'stderr', dist)
-    self
-  end
-  def self.share_stdio(dist, src = '')
-    __getip.share_stdio(dist, src)
-    self
-  end
-
-  def transfer_stdio(dist, src = '')
-    @interp._invoke('interp', 'transfer', src, 'stdin',  dist)
-    @interp._invoke('interp', 'transfer', src, 'stdout', dist)
-    @interp._invoke('interp', 'transfer', src, 'stderr', dist)
-    self
-  end
-  def self.transfer_stdio(dist, src = '')
-    __getip.transfer_stdio(dist, src)
-    self
-  end
-end
-
-
-# encoding convert
-class MultiTkIp
-  # from tkencoding.rb by ttate@jaist.ac.jp
-  alias __eval _eval
-  alias __invoke _invoke
-
-  def encoding
-    @encoding[0]
-  end
-  def encoding=(enc)
-    @encoding[0] = enc
-  end
-    
-  def _eval(cmd)
-    if @encoding[0] != nil
-      _fromUTF8(__eval(_toUTF8(cmd, @encoding[0])), @encoding[0])
-    else
-      __eval(cmd)
-    end
-  end
-
-  def _invoke(*cmds)
-    if defined?(@encoding[0]) && @encoding[0] != nil
-      cmds = cmds.collect{|cmd| _toUTF8(cmd, @encoding[0])}
-      _fromUTF8(__invoke(*cmds), @encoding[0])
-    else
-      __invoke(*cmds)
-    end
-  end
-end
-
-
-# remove methods for security
-class MultiTkIp
-  undef_method :instance_eval
-  undef_method :instance_variable_get
-  undef_method :instance_variable_set
-end
-
-
-# end of MultiTkIp definition
-
-# defend against modification
-MultiTkIp.freeze
-TclTkLib.freeze
-
-########################################
-#  start Tk which depends on MultiTkIp
-module TkCore
-  INTERP = MultiTkIp
-end
-require 'tk'
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 9cdd3b918e..2b4b504b0a 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -1,40 +1,20 @@
 #
-#		tk.rb - Tk interface module using tcltklib
+#		tk.rb - Tk interface modue using tcltklib
 #			$Date$
-#			by Yukihiro Matsumoto <matz@netlab.jp>
+#			by Yukihiro Matsumoto <matz@netlab.co.jp>
 
 # use Shigehiro's tcltklib
 require "tcltklib"
 require "tkutil"
 
 module TkComm
-  WidgetClassNames = {}.taint
-
   None = Object.new
   def None.to_s
     'None'
   end
-  None.freeze
-
-  #Tk_CMDTBL = {}
-  #Tk_WINDOWS = {}
-  Tk_IDs = ["00000".taint, "00000".taint].freeze  # [0]-cmdid, [1]-winid
 
-  # for backward compatibility
-  Tk_CMDTBL = Object.new
-  def Tk_CMDTBL.method_missing(id, *args)
-    TkCore::INTERP.tk_cmd_tbl.send(id, *args)
-  end
-  Tk_CMDTBL.freeze
-  Tk_WINDOWS = Object.new
-  def Tk_WINDOWS.method_missing(id, *args)
-    TkCore::INTERP.tk_windows.send(id, *args)
-  end
-  Tk_WINDOWS.freeze
-
-  self.instance_eval{
-    @cmdtbl = [].taint
-  }
+  Tk_CMDTBL = {}
+  Tk_WINDOWS = {}
 
   def error_at
     frames = caller()
@@ -49,43 +29,27 @@ module TkComm
     return TkRoot.new if path == '.'
 
     begin
-      #tk_class = TkCore::INTERP._invoke('winfo', 'class', path)
-      tk_class = Tk.ip_invoke('winfo', 'class', path)
+      tk_class = TkCore::INTERP._invoke('winfo', 'class', path)
     rescue
       return path
     end
 
-    if ruby_class = WidgetClassNames[tk_class]
-      ruby_class_name = ruby_class.name
-      # gen_class_name = ruby_class_name + 'GeneratedOnTk'
-      gen_class_name = ruby_class_name
-      classname_def = ''
-    elsif Object.const_defined?('Tk' + tk_class)
-      ruby_class_name = 'Tk' + tk_class
-      # gen_class_name = ruby_class_name + 'GeneratedOnTk'
-      gen_class_name = ruby_class_name
-      classname_def = ''
-    else
-      ruby_class_name = 'TkWindow'
-      # gen_class_name = ruby_class_name + tk_class + 'GeneratedOnTk'
-      gen_class_name = 'TkWidget_' + tk_class
-      classname_def = "WidgetClassName = '#{tk_class}'.freeze"
-    end
+    ruby_class = TkClassBind::WidgetClassNameTBL[tk_class]
+    gen_class_name = ruby_class.name + 'GeneratedOnTk'
     unless Object.const_defined? gen_class_name
-      Object.class_eval "class #{gen_class_name}<#{ruby_class_name}
-                           #{classname_def}
-                         end"
+      eval "class #{gen_class_name}<#{ruby_class.name}
+              def initialize(path)
+                @path=path
+                Tk_WINDOWS[@path] = self
+              end
+            end"
     end
-    Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}', 
-                                             'without_creating'=>true)"
+    eval "#{gen_class_name}.new('#{path}')"
   end
-  private :_genobj_for_tkwidget
-  module_function :_genobj_for_tkwidget
 
   def tk_tcl2ruby(val)
     if val =~ /^rb_out (c\d+)/
-      #return Tk_CMDTBL[$1]
-      return TkCore::INTERP.tk_cmd_tbl[$1]
+      return Tk_CMDTBL[$1]
     end
     if val.include? ?\s
       return val.split.collect{|v| tk_tcl2ruby(v)}
@@ -96,16 +60,12 @@ module TkComm
     when /^-?\d+$/
       val.to_i
     when /^\./
-      #Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
-      TkCore::INTERP.tk_windows[val]? 
-           TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
-    when /^i\d+$/
-      TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+      Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
     when / /
       val.split.collect{|elt|
 	tk_tcl2ruby(elt)
       }
-    when /^-?\d+\.?\d*(e[-+]?\d+)?$/
+    when /^-?\d+\.\d*$/
       val.to_f
     else
       val
@@ -115,16 +75,7 @@ module TkComm
   def tk_split_list(str)
     return [] if str == ""
     idx = str.index('{')
-    while idx and idx > 0 and str[idx-1] == ?\\
-      idx = str.index('{', idx+1)
-    end
-    unless idx
-      list = tk_tcl2ruby(str)
-      unless Array === list
-        list = [list]
-      end
-      return list
-    end
+    return tk_tcl2ruby(str) unless idx
 
     list = tk_tcl2ruby(str[0,idx])
     list = [] if list == ""
@@ -137,9 +88,6 @@ module TkComm
       brace -= 1 if c == ?}
       break if brace == 0
     }
-    if str.size == i + 1
-      return tk_split_list(str[0, i])
-    end
     if str[0, i] == ' '
       list.push ' '
     else
@@ -152,9 +100,6 @@ module TkComm
   def tk_split_simplelist(str)
     return [] if str == ""
     idx = str.index('{')
-    while idx and idx > 0 and str[idx-1] == ?\\
-      idx = str.index('{', idx+1)
-    end
     return str.split unless idx
 
     list = str[0,idx].split
@@ -179,13 +124,6 @@ module TkComm
   end
   private :tk_tcl2ruby, :tk_split_list, :tk_split_simplelist
 
-  def _symbolkey2str(keys)
-    h = {}
-    keys.each{|key,value| h[key.to_s] = value}
-    h
-  end
-  private :_symbolkey2str
-
   def hash_kv(keys)
     conf = []
     if keys and keys != None
@@ -197,7 +135,6 @@ module TkComm
     conf
   end
   private :hash_kv
-  module_function :hash_kv
 
   def array2tk_list(ary)
     ary.collect{|e|
@@ -212,24 +149,23 @@ module TkComm
     }.join(" ")
   end
   private :array2tk_list
-  module_function :array2tk_list
 
   def bool(val)
     case val
     when "1", 1, 'yes', 'true'
-      true
+      TRUE
     else
-      false
+      FALSE
     end
   end
   def number(val)
     case val
     when /^-?\d+$/
       val.to_i
-    when /^-?\d+\.?\d*(e[-+]?\d+)?$/
+    when /^-?\d+\.\d*$/
       val.to_f
     else
-      fail ArgumentError, format('invalid value for Number:"%s"', val.to_s)
+      val
     end
   end
   def string(val)
@@ -242,41 +178,23 @@ module TkComm
     end
   end
   def list(val)
-    tk_split_list(val)
-  end
-  def simplelist(val)
-    tk_split_simplelist(val)
+    tk_split_list(val).to_a
   end
   def window(val)
-    if val =~ /^\./
-      #Tk_WINDOWS[val]? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
-      TkCore::INTERP.tk_windows[val]? 
-           TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
-    else
-      nil
-    end
+    Tk_WINDOWS[val]
   end
   def procedure(val)
     if val =~ /^rb_out (c\d+)/
-      #Tk_CMDTBL[$1]
-      #TkCore::INTERP.tk_cmd_tbl[$1]
-      TkCore::INTERP.tk_cmd_tbl[$1].cmd
+      Tk_CMDTBL[$1]
     else
-      #nil
-      val
+      nil
     end
   end
-  private :bool, :number, :string, :list, :simplelist, :window, :procedure
-  module_function :bool, :number, :string, :list, :simplelist
-  module_function :window, :procedure
+  private :bool, :number, :string, :list, :window, :procedure
 
   def _get_eval_string(str)
     return nil if str == None
-    if str.kind_of?(String)
-      # do nothing
-    elsif str.kind_of?(Symbol)
-      str = str.id2name
-    elsif str.kind_of?(Hash)
+    if str.kind_of?(Hash)
       str = hash_kv(str).join(" ")
     elsif str.kind_of?(Array)
       str = array2tk_list(str)
@@ -291,219 +209,85 @@ module TkComm
     elsif (str.respond_to?(:to_eval))
       str = str.to_eval()
     else
-      str = str.to_s() || ''
-      unless str.kind_of? String
-	fail RuntimeError, "fail to convert the object to a string" 
-      end
-      str
+      str = str.to_s()
     end
     return str
   end
   private :_get_eval_string
-  module_function :_get_eval_string
-
-  def ruby2tcl(v)
-    if v.kind_of?(Hash)
-      v = hash_kv(v)
-      v.flatten!
-      v.collect{|e|ruby2tcl(e)}
-    else
-      _get_eval_string(v)
-    end
-  end
-  private :ruby2tcl
 
+  Tk_IDs = [0, 0]		# [0]-cmdid, [1]-winid
   def _curr_cmd_id
-    #id = format("c%.4d", Tk_IDs[0])
-    id = "c" + TkComm::Tk_IDs[0]
+    id = format("c%.4d", Tk_IDs[0])
   end
   def _next_cmd_id
     id = _curr_cmd_id
-    #Tk_IDs[0] += 1
-    TkComm::Tk_IDs[0].succ!
+    Tk_IDs[0] += 1
     id
   end
-  private :_curr_cmd_id, :_next_cmd_id
-  module_function :_curr_cmd_id, :_next_cmd_id
-
   def install_cmd(cmd)
     return '' if cmd == ''
     id = _next_cmd_id
-    #Tk_CMDTBL[id] = cmd
-    TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
-    @cmdtbl = [] unless defined? @cmdtbl
-    @cmdtbl.taint unless @cmdtbl.tainted?
+    Tk_CMDTBL[id] = cmd
+    @cmdtbl = [] unless @cmdtbl
     @cmdtbl.push id
     return format("rb_out %s", id);
   end
   def uninstall_cmd(id)
-    id = $1 if /rb_out (c\d+)/ =~ id
-    #Tk_CMDTBL.delete(id)
-    TkCore::INTERP.tk_cmd_tbl.delete(id)
+    id = $1 if /rb_out (c\d+)/
+    Tk_CMDTBL[id] = nil
   end
   private :install_cmd, :uninstall_cmd
-  module_function :install_cmd
-
-  def install_win(ppath,name=nil)
-    if !name or name == ''
-      #name = format("w%.4d", Tk_IDs[1])
-      #Tk_IDs[1] += 1
-      name = "w" + Tk_IDs[1]
-      Tk_IDs[1].succ!
-    end
-    if name[0] == ?.
-      @path = name.dup
-    elsif !ppath or ppath == "."
-      @path = format(".%s", name);
+
+  def install_win(ppath)
+    id = format("w%.4d", Tk_IDs[1])
+    Tk_IDs[1] += 1
+    if !ppath or ppath == "."
+      @path = format(".%s", id);
     else
-      @path = format("%s.%s", ppath, name)
+      @path = format("%s.%s", ppath, id)
     end
-    #Tk_WINDOWS[@path] = self
-    TkCore::INTERP.tk_windows[@path] = self
+    Tk_WINDOWS[@path] = self
   end
 
   def uninstall_win()
-    #Tk_WINDOWS.delete(@path)
-    TkCore::INTERP.tk_windows.delete(@path)
+    Tk_WINDOWS[@path] = nil
   end
-  private :install_win, :uninstall_win
 
   class Event
-    module TypeNum
-      KeyPress         =  2
-      KeyRelease       =  3
-      ButtonPress      =  4
-      ButtonRelease    =  5
-      MotionNotify     =  6
-      EnterNotify      =  7
-      LeaveNotify      =  8
-      FocusIn          =  9
-      FocusOut         = 10
-      KeymapNotify     = 11
-      Expose           = 12
-      GraphicsExpose   = 13
-      NoExpose         = 14
-      VisibilityNotify = 15
-      CreateNotify     = 16
-      DestroyNotify    = 17
-      UnmapNotify      = 18
-      MapNotify	       = 19
-      MapRequest       = 20
-      ReparentNotify   = 21
-      ConfigureNotify  = 22
-      ConfigureRequest = 23
-      GravityNotify    = 24
-      ResizeRequest    = 25
-      CirculateNotify  = 26
-      CirculateRequest = 27
-      PropertyNotify   = 28
-      SelectionClear   = 29
-      SelectionRequest = 30
-      SelectionNotify  = 31
-      ColormapNotify   = 32
-      ClientMessage    = 33
-      MappingNotify    = 34
-    end
-
-    EV_KEY  = '#abcdfhikmopstwxyABDEKNRSTWXY'
-    EV_TYPE = 'nsnnsbnsnsbsxnnnnsnnbsnssnwnn'
-
-    def self.scan_args(arg_str, arg_val)
-      arg_cnv = []
-      arg_str.strip.split(/\s+/).each_with_index{|kwd,idx|
-	if kwd =~ /^%(.)$/
-	  if num = EV_KEY.index($1)
-	    case EV_TYPE[num]
-	    when ?n
-	      begin
-		val = TkComm::number(arg_val[idx])
-	      rescue ArgumentError
-		# ignore --> no convert
-		val = TkComm::string(arg_val[idx])
-	      end
-	      arg_cnv << val
-	    when ?s
-	      arg_cnv << TkComm::string(arg_val[idx])
-	    when ?b
-	      arg_cnv << TkComm::bool(arg_val[idx])
-	    when ?w
-	      arg_cnv << TkComm::window(arg_val[idx])
-	    when ?x
-	      begin
-		arg_cnv << TkComm::number(arg_val[idx])
-	      rescue ArgumentError
-		arg_cnv << arg_val[idx]
-	      end
-	    else
-	      arg_cnv << arg_val[idx]
-	    end
-	  else
-	    arg_cnv << arg_val[idx]
-	  end
-	else
-	  arg_cnv << arg_val[idx]
-	end
-      }
-      arg_cnv
-    end
-
-    def initialize(seq,a,b,c,d,f,h,i,k,m,o,p,s,t,w,x,y,
-	           aa,bb,dd,ee,kk,nn,rr,ss,tt,ww,xx,yy)
+    def initialize(seq,b,f,h,k,s,t,w,x,y,aa,ee,kk,nn,ww,tt,xx,yy)
       @serial = seq
-      @above = a
       @num = b
-      @count = c
-      @detail = d
-      @focus = f
+      @focus = (f == 1)
       @height = h
-      @win_hex = i
       @keycode = k
-      @mode = m
-      @override = o
-      @place = p
       @state = s
       @time = t
       @width = w
       @x = x
       @y = y
       @char = aa
-      @borderwidth = bb
-      @wheel_delta = dd
-      @send_event = ee
+      @send_event = (ee == 1)
       @keysym = kk
       @keysym_num = nn
-      @rootwin_id = rr
-      @subwindow = ss
       @type = tt
       @widget = ww
       @x_root = xx
       @y_root = yy
     end
     attr :serial
-    attr :above
     attr :num
-    attr :count
-    attr :detail
     attr :focus
     attr :height
-    attr :win_hex
     attr :keycode
-    attr :mode
-    attr :override
-    attr :place
     attr :state
     attr :time
     attr :width
     attr :x
     attr :y
     attr :char
-    attr :borderwidth
-    attr :wheel_delta
     attr :send_event
     attr :keysym
     attr :keysym_num
-    attr :rootwin_id
-    attr :subwindow
     attr :type
     attr :widget
     attr :x_root
@@ -512,17 +296,15 @@ module TkComm
 
   def install_bind(cmd, args=nil)
     if args
-      id = install_cmd(proc{|*arg|
-	TkUtil.eval_cmd(cmd, *Event.scan_args(args, arg))
+      id = install_cmd(proc{|arg|
+	TkUtil.eval_cmd cmd, *arg
       })
       id + " " + args
     else
-      args = ' %# %a %b %c %d %f %h %i %k %m %o %p %s %t %w %x %y' + 
-             ' %A %B %D %E %K %N %R %S %T %W %X %Y'
-      id = install_cmd(proc{|*arg|
-	TkUtil.eval_cmd(cmd, Event.new(*Event.scan_args(args, arg)))
+      id = install_cmd(proc{|arg|
+	TkUtil.eval_cmd cmd, Event.new(*arg)
       })
-      id + args
+      id + ' %# %b %f %h %k %s %t %w %x %y %A %E %K %N %W %T %X %Y'
     end
   end
 
@@ -532,7 +314,7 @@ module TkComm
     end
     if context.kind_of? Array
       context = context.collect{|ev|
-	if ev.kind_of? TkVirtualEvent
+	if context.kind_of? TkVirtualEvent
 	  ev.path
 	else
 	  ev
@@ -546,101 +328,68 @@ module TkComm
     end
   end
 
-  def _bind_core(mode, what, context, cmd, args=nil)
-    id = install_bind(cmd, args) if cmd
+  def _bind_core(mode, path, context, cmd, args=nil)
+    id = install_bind(cmd, args)
     begin
-      tk_call(*(what + ["<#{tk_event_sequence(context)}>", mode + id]))
+      tk_call 'bind', path, "<#{tk_event_sequence(context)}>", mode + id
     rescue
-      uninstall_cmd(id) if cmd
+      uninstall_cmd(id)
       fail
     end
   end
 
-  def _bind(what, context, cmd, args=nil)
-    _bind_core('', what, context, cmd, args)
+  def _bind(path, context, cmd, args=nil)
+    _bind_core('', path, context, cmd, args)
+  end
+
+  def _bind_append(path, context, cmd, args=nil)
+    _bind_core('+', path, context, cmd, args)
+  end
+  private :install_bind, :tk_event_sequence, :_bind_core, :_bind, :_bind_append
+
+  def bind_all(context, cmd=Proc.new, args=nil)
+    _bind 'all', context, cmd, args
+  end
+
+  def bind_append_all(context, cmd=Proc.new, args=nil)
+    _bind_append 'all', context, cmd, args
   end
 
-  def _bind_append(what, context, cmd, args=nil)
-    _bind_core('+', what, context, cmd, args)
+  def bind(tagOrClass, context, cmd=Proc.new, args=nil)
+    _bind tagOrClass, context, cmd, args
   end
 
-  def _bind_remove(what, context)
-    tk_call(*(what + ["<#{tk_event_sequence(context)}>", '']))
+  def bind_append(tagOrClass, context, cmd=Proc.new, args=nil)
+    _bind_append tagOrClass, context, cmd, args
   end
 
-  def _bindinfo(what, context=nil)
+  def _bindinfo(tagOrClass, context=nil)
     if context
-      tk_call(*what+["<#{tk_event_sequence(context)}>"]).collect {|cmdline|
+      (tk_call('bind', tagOrClass, 
+	       "<#{tk_event_sequence(context)}>")).collect{|cmdline|
 	if cmdline =~ /^rb_out (c\d+)\s+(.*)$/
-	  #[Tk_CMDTBL[$1], $2]
-	  [TkCore::INTERP.tk_cmd_tbl[$1], $2]
+	  [Tk_CMDTBL[$1], $2]
 	else
 	  cmdline
 	end
       }
     else
-      tk_split_simplelist(tk_call(*what)).collect!{|seq|
-	l = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
-	  case (subseq)
-	  when /^<<[^<>]+>>$/
-	    TkVirtualEvent.getobj(subseq[1..-2])
-	  when /^<[^<>]+>$/
-	    subseq[1..-2]
-	  else
-	    subseq.split('')
-	  end
-	}.flatten
-	(l.size == 1) ? l[0] : l
+      tk_split_list(tk_call 'bind', tagOrClass).collect{|seq|
+	seq[1..-2].gsub(/></,',')
       }
     end
   end
-  private :install_bind, :tk_event_sequence, 
-          :_bind_core, :_bind, :_bind_append, :_bind_remove, :_bindinfo
-
-  def bind(tagOrClass, context, cmd=Proc.new, args=nil)
-    _bind(["bind", tagOrClass], context, cmd, args)
-    tagOrClass
-  end
-
-  def bind_append(tagOrClass, context, cmd=Proc.new, args=nil)
-    _bind_append(["bind", tagOrClass], context, cmd, args)
-    tagOrClass
-  end
-
-  def bind_remove(tagOrClass, context)
-    _bind_remove(['bind', tagOrClass], context)
-    tagOrClass
-  end
 
   def bindinfo(tagOrClass, context=nil)
-    _bindinfo(['bind', tagOrClass], context)
-  end
-
-  def bind_all(context, cmd=Proc.new, args=nil)
-    _bind(['bind', 'all'], context, cmd, args)
-    TkBindTag::ALL
-  end
-
-  def bind_append_all(context, cmd=Proc.new, args=nil)
-    _bind_append(['bind', 'all'], context, cmd, args)
-    TkBindTag::ALL
-  end
-
-  def bind_remove_all(context)
-    _bind_remove(['bind', 'all'], context)
-    TkBindTag::ALL
-  end
-
-  def bindinfo_all(context=nil)
-    _bindinfo(['bind', 'all'], context)
+    _bindinfo tagOrClass, context
   end
 
   def pack(*args)
-    TkPack.configure(*args)
+    TkPack.configure *args
   end
 
   def grid(*args)
-    TkGrid.configure(*args)
+    TkGrid.configure *args
   end
 
   def update(idle=nil)
@@ -657,229 +406,39 @@ module TkCore
   include TkComm
   extend TkComm
 
-  unless self.const_defined? :INTERP
-    if self.const_defined? :IP_NAME
-      name = IP_NAME.to_s
-    else
-      name = nil
-    end
-    if self.const_defined? :IP_OPTS
-      if IP_OPTS.kind_of?(Hash)
-	opts = hash_kv(IP_OPTS).join(' ')
-      else
-	opts = IP_OPTS.to_s
-      end
-    else
-      opts = ''
-    end
-
-    INTERP = TclTkIp.new(name, opts)
-
-    def INTERP.__getip
-      self
-    end
-
-    INTERP.instance_eval{
-      @tk_cmd_tbl = {}.taint
-      @tk_windows = {}.taint
-
-      @tk_table_list = [].taint
-
-      @init_ip_env  = [].taint  # table of Procs
-      @add_tk_procs = [].taint  # table of [name, args, body]
-
-      @cb_entry_class = Class.new{|c|
-	def initialize(ip, cmd)
-	  @ip = ip
-	  @cmd = cmd
-	end
-	attr_reader :ip, :cmd
-	def call(*args)
-	  @ip.cb_eval(@cmd, *args)
-	end
-      }
-    }
+  INTERP = TclTkIp.new
 
-    def INTERP.tk_cmd_tbl
-      @tk_cmd_tbl
-    end
-    def INTERP.tk_windows
-      @tk_windows
-    end
-
-    def INTERP.tk_object_table(id)
-      @tk_table_list[id]
-    end
-    def INTERP.create_table
-      id = @tk_table_list.size
-      (tbl = {}).tainted? || tbl.taint
-      @tk_table_list << tbl
-      obj = Object.new
-      obj.instance_eval <<-EOD
-        def self.method_missing(m, *args)
-	  TkCore::INTERP.tk_object_table(#{id}).send(m, *args)
-        end
-      EOD
-      return obj
-    end
-
-    def INTERP.get_cb_entry(cmd)
-      @cb_entry_class.new(__getip, cmd).freeze
-    end
-    def INTERP.cb_eval(cmd, *args)
-      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args))
-    end
-
-    def INTERP.init_ip_env(script = Proc.new)
-      @init_ip_env << script
-      script.call(self)
-    end
-    def INTERP.add_tk_procs(name, args = nil, body = nil)
-      @add_tk_procs << [name, args, body]
-      self._invoke('proc', name, args, body) if args && body
-    end
-    def INTERP.init_ip_internal
-      ip = self
-      @init_ip_env.each{|script| script.call(ip)}
-      @add_tk_procs.each{|name,args,body| ip._invoke('proc',name,args,body)}
-    end
-  end
-
-  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
-    regsub -all {!} $args {\\!} args
-    regsub -all "{" $args "\\{" args
-    if {[set st [catch {ruby [format "TkCore.callback %%Q!%s!" $args]} ret]] != 0} {
-	return -code $st $ret
-    } {
-	return $ret
-    }
-  EOL
-
-  EventFlag = TclTkLib::EventFlag
+  INTERP._invoke("proc", "rb_out", "args", "if {[set st [catch {ruby [format \"TkCore.callback %%Q!%s!\" $args]} ret]] != 0} {return -code $st $ret} {return $ret}")
 
   def callback_break
-    fail TkCallbackBreak, "Tk callback returns 'break' status"
+    raise TkCallbackBreak, "Tk callback returns 'break' status"
   end
 
   def callback_continue
-    fail TkCallbackContinue, "Tk callback returns 'continue' status"
-  end
-
-  def TkCore.callback(arg)
-    # arg = tk_split_list(arg)
-    arg = tk_split_simplelist(arg)
-    #_get_eval_string(TkUtil.eval_cmd(Tk_CMDTBL[arg.shift], *arg))
-    #_get_eval_string(TkUtil.eval_cmd(TkCore::INTERP.tk_cmd_tbl[arg.shift], 
-    #  			     *arg))
-    cb_obj = TkCore::INTERP.tk_cmd_tbl[arg.shift]
-    unless $DEBUG
-      cb_obj.call(*arg)
-    else
-      begin
-	raise 'check backtrace'
-      rescue
-	# ignore backtrace before 'callback'
-	pos = -($!.backtrace.size)
-      end
-      begin
-	cb_obj.call(*arg)
-      rescue
-	trace = $!.backtrace
-	raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" + 
-	          "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
-      end
-    end
-  end
-
-  def load_cmd_on_ip(tk_cmd)
-    bool(tk_call('auto_load', tk_cmd))
+    raise TkCallbackContinue, "Tk callback returns 'continue' status"
   end
 
   def after(ms, cmd=Proc.new)
     myid = _curr_cmd_id
     cmdid = install_cmd(cmd)
     tk_call("after",ms,cmdid)
-#    return
-#    if false #defined? Thread
-#      Thread.start do
-#	ms = Float(ms)/1000
-#	ms = 10 if ms == 0
-#	sleep ms/1000
-#	cmd.call
-#      end
-#    else
-#      cmdid = install_cmd(cmd)
-#      tk_call("after",ms,cmdid)
-#    end
-  end
-
-  def after_idle(cmd=Proc.new)
-    myid = _curr_cmd_id
-    cmdid = install_cmd(cmd)
-    tk_call('after','idle',cmdid)
-  end
-
-  def clock_clicks(ms=nil)
-    if ms
-      tk_call('clock','clicks','-milliseconds').to_i
-    else
-      tk_call('clock','clicks').to_i
-    end
-  end
-
-  def clock_format(clk, form=nil)
-    if form
-      tk_call('clock','format',clk,'-format',form).to_i
-    else
-      tk_call('clock','format',clk).to_i
-    end
-  end
-
-  def clock_formatGMT(clk, form=nil)
-    if form
-      tk_call('clock','format',clk,'-format',form,'-gmt','1').to_i
-    else
-      tk_call('clock','format',clk,'-gmt','1').to_i
-    end
-  end
-
-  def clock_scan(str, base=nil)
-    if base
-      tk_call('clock','scan',str,'-base',base).to_i
-    else
-      tk_call('clock','scan',str).to_i
-    end
-  end
-
-  def clock_scanGMT(str, base=nil)
-    if base
-      tk_call('clock','scan',str,'-base',base,'-gmt','1').to_i
+    return
+    if false #defined? Thread
+      Thread.start do
+	ms = Float(ms)/1000
+	ms = 10 if ms == 0
+	sleep ms/1000
+	cmd.call
+      end
     else
-      tk_call('clock','scan',str,'-gmt','1').to_i
+      cmdid = install_cmd(cmd)
+      tk_call("after",ms,cmdid)
     end
   end
 
-  def clock_seconds
-    tk_call('clock','seconds').to_i
-  end
-
-  def windowingsystem
-    tk_call('tk', 'windowingsystem')
-  end
-
-  def scaling(scale=nil)
-    if scale
-      tk_call('tk', 'scaling', scale)
-    else
-      Float(number(tk_call('tk', 'scaling')))
-    end
-  end
-  def scaling_displayof(win, scale=nil)
-    if scale
-      tk_call('tk', 'scaling', '-displayof', win, scale)
-    else
-      Float(number(tk_call('tk', '-displayof', win, 'scaling')))
-    end
+  def TkCore.callback(arg)
+    arg = Array(tk_split_list(arg))
+    _get_eval_string(TkUtil.eval_cmd(Tk_CMDTBL[arg.shift], *arg))
   end
 
   def appname(name=None)
@@ -895,7 +454,7 @@ module TkCore
   end
 
   def rb_appsend(interp, async, *args)
-    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+    args = args.filter{|c| _get_eval_string(c).gsub(/[][$"]/, '\\\\\&')}
     args.push(').to_s"')
     appsend(interp, async, 'ruby "(', *args)
   end
@@ -910,7 +469,7 @@ module TkCore
   end
 
   def rb_appsend_displayof(interp, win, async, *args)
-    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+    args = args.filter{|c| _get_eval_string(c).gsub(/[][$"]/, '\\\\\&')}
     args.push(').to_s"')
     appsend_displayof(interp, win, async, 'ruby "(', *args)
   end
@@ -919,54 +478,8 @@ module TkCore
     tk_call('info', *args)
   end
 
-  def mainloop(check_root = true)
-    TclTkLib.mainloop(check_root)
-  end
-
-  def mainloop_watchdog(check_root = true)
-    # watchdog restarts mainloop when mainloop is dead
-    TclTkLib.mainloop_watchdog(check_root)
-  end
-
-  def do_one_event(flag = TclTkLib::EventFlag::ALL)
-    TclTkLib.do_one_event(flag)
-  end
-
-  def set_eventloop_tick(timer_tick)
-    TclTkLib.set_eventloop_tick(timer_tick)
-  end
-
-  def get_eventloop_tick()
-    TclTkLib.get_eventloop_tick
-  end
-
-  def set_no_event_wait(wait)
-    TclTkLib.set_no_even_wait(wait)
-  end
-
-  def get_no_event_wait()
-    TclTkLib.get_no_eventloop_wait
-  end
-
-  def set_eventloop_weight(loop_max, no_event_tick)
-    TclTkLib.set_eventloop_weight(loop_max, no_event_tick)
-  end
-
-  def get_eventloop_weight()
-    TclTkLib.get_eventloop_weight
-  end
-
-  def restart(app_name = nil, keys = {})
-    TkCore::INTERP.init_ip_internal
-
-    tk_call('set', 'argv0', app_name) if app_name
-    if keys.kind_of?(Hash)
-      # tk_call('set', 'argc', keys.size * 2)
-      tk_call('set', 'argv', hash_kv(keys).join(' '))
-    end
-
-    INTERP.restart
-    nil
+  def mainloop
+    TclTkLib.mainloop
   end
 
   def event_generate(window, context, keys=nil)
@@ -983,285 +496,77 @@ module TkCore
     tk_call 'tk_messageBox', *hash_kv(keys)
   end
 
-  def getOpenFile(keys = nil)
+  def getOpenFile(keys)
     tk_call 'tk_getOpenFile', *hash_kv(keys)
   end
 
-  def getSaveFile(keys = nil)
+  def getSaveFile(keys)
     tk_call 'tk_getSaveFile', *hash_kv(keys)
   end
 
-  def chooseColor(keys = nil)
+  def chooseColor(keys)
     tk_call 'tk_chooseColor', *hash_kv(keys)
   end
 
-  def chooseDirectory(keys = nil)
-    tk_call 'tk_chooseDirectory', *hash_kv(keys)
-  end
-
-  def ip_eval(cmd_string)
-    res = INTERP._eval(cmd_string)
-    if  INTERP._return_value() != 0
-      fail RuntimeError, res, error_at
-    end
-    return res
-  end
-
-  def ip_invoke(*args)
-    res = INTERP._invoke(*args)
-    if  INTERP._return_value() != 0
-      fail RuntimeError, res, error_at
-    end
-    return res
-  end
-
   def tk_call(*args)
-    puts args.inspect if $DEBUG
-    args.collect! {|x|ruby2tcl(x)}
+    print args.join(" "), "\n" if $DEBUG
+    args.filter {|x|_get_eval_string(x)}
     args.compact!
     args.flatten!
-    print "=> ", args.join(" ").inspect, "\n" if $DEBUG
     begin
-      # res = INTERP._invoke(*args).taint
-      res = INTERP._invoke(*args)   # _invoke returns a TAINTED string
-    rescue NameError => err
-#      err = $!
+      res = INTERP._invoke(*args)
+    rescue NameError
+      err = $!
       begin
         args.unshift "unknown"
-        #res = INTERP._invoke(*args).taint 
-        res = INTERP._invoke(*args)   # _invoke returns a TAINTED string
-      rescue StandardError => err2
-	fail err2 unless /^invalid command/ =~ err2
-	fail err
+        res = INTERP._invoke(*args)
+      rescue
+	raise unless /^invalid command/ =~ $!
+	raise err
       end
     end
     if  INTERP._return_value() != 0
       fail RuntimeError, res, error_at
     end
-    print "==> ", res.inspect, "\n" if $DEBUG
+    print "==> ", res, "\n" if $DEBUG
     return res
   end
 end
 
-module TkPackage
-  include TkCore
-  extend TkPackage
-
-  TkCommandNames = ['package'.freeze].freeze
-
-  def add_path(path)
-    Tk::AUTO_PATH.value = Tk::AUTO_PATH.to_a << path
-  end
-
-  def forget(package)
-    tk_call('package', 'forget', package)
-    nil
-  end
-
-  def names
-    tk_split_simplelist(tk_call('package', 'names'))
-  end
-
-  def provide(package, version=nil)
-    if version
-      tk_call('package', 'provide', package, version)
-      nil
-    else
-      tk_call('package', 'provide', package)
-    end
-  end
-
-  def present(package, version=None)
-    tk_call('package', 'present', package, version)
-  end
-
-  def present_exact(package, version)
-    tk_call('package', 'present', '-exact', package, version)
-  end
-
-  def require(package, version=None)
-    tk_call('package', 'require', package, version)
-  end
-
-  def require_exact(package, version)
-    tk_call('package', 'require', '-exact', package, version)
-  end
-
-  def versions(package)
-    tk_split_simplelist(tk_call('package', 'versions', package))
-  end
-
-  def vcompare(version1, version2)
-    Integer(tk_call('package', 'vcompare', version1, version2))
-  end
-
-  def vsatisfies(version1, version2)
-    bool(tk_call('package', 'vsatisfies', version1, version2))
-  end
-end
-
 module Tk
   include TkCore
   extend Tk
 
-  TCL_VERSION = INTERP._invoke("info", "tclversion").freeze
-  TCL_PATCHLEVEL = INTERP._invoke("info", "patchlevel").freeze
-
-  TK_VERSION  = INTERP._invoke("set", "tk_version").freeze
-  TK_PATCHLEVEL  = INTERP._invoke("set", "tk_patchLevel").freeze
-
-  JAPANIZED_TK = (INTERP._invoke("info", "commands", "kanji") != "").freeze
-
-  def Tk.const_missing(sym)
-    case(sym)
-    when :TCL_LIBRARY
-      INTERP._invoke("set", "tcl_library").freeze
-
-    when :TK_LIBRARY
-      INTERP._invoke("set", "tk_library").freeze
-
-    when :LIBRARY
-      INTERP._invoke("info", "library").freeze
-
-    #when :PKG_PATH, :PACKAGE_PATH, :TCL_PACKAGE_PATH
-    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_pkgPath'))
-
-    #when :LIB_PATH, :LIBRARY_PATH, :TCL_LIBRARY_PATH
-    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_libPath'))
-
-    when :PLATFORM, :TCL_PLATFORM
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 
-					       'tcl_platform'))]
-
-    when :ENV
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'env'))]
-
-    #when :AUTO_PATH   #<=== 
-    #  tk_split_simplelist(INTERP._invoke('set', 'auto_path'))
-
-    #when :AUTO_OLDPATH
-    #  tk_split_simplelist(INTERP._invoke('set', 'auto_oldpath'))
-
-    when :AUTO_INDEX
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'auto_index'))]
-
-    when :PRIV, :PRIVATE, :TK_PRIV
-      priv = {}
-      if INTERP._invoke('info', 'vars', 'tk::Priv') != ""
-	var_nam = 'tk::Priv'
-      else
-	var_nam = 'tkPriv'
-      end
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 
-					       var_nam))].each{|k,v|
-	k.freeze
-	case v
-	when /^-?\d+$/
-	  priv[k] = v.to_i
-	when /^-?\d+\.?\d*(e[-+]?\d+)?$/
-	  priv[k] = v.to_f
-	else
-	  priv[k] = v.freeze
-	end
-      }
-      priv
-
-    else
-      raise NameError, 'uninitialized constant Tk::' + sym.id2name
-    end
-  end
+  TCL_VERSION = INTERP._invoke("info", "tclversion")
+  TK_VERSION  = INTERP._invoke("set", "tk_version")
+  JAPANIZED_TK = (INTERP._invoke("info", "commands", "kanji") != "")
 
   def root
     TkRoot.new
   end
 
-  def Tk.bell(nice = false)
-    if nice
-      tk_call 'bell', '-nice'
-    else
-      tk_call 'bell'
-    end
-  end
-
-  def Tk.bell_on_display(win, nice = false)
-    if nice
-      tk_call('bell', '-displayof', win, '-nice')
-    else
-      tk_call('bell', '-displayof', win)
-    end
-  end
-
-  def Tk.destroy(*wins)
-    tk_call('destroy', *wins)
-  end
-
-  def Tk.exit
-    tk_call('destroy', '.')
-  end
-
-  def Tk.current_grabs
-    tk_split_list(tk_call('grab', 'current'))
+  def bell
+    tk_call 'bell'
   end
 
   def Tk.focus(display=nil)
     if display == nil
-      window(tk_call('focus'))
+      r = tk_call('focus')
     else
-      window(tk_call('focus', '-displayof', display))
+      r = tk_call('focus', '-displayof', display)
     end
+    tk_tcl2ruby(r)
   end
 
   def Tk.focus_lastfor(win)
-    window(tk_call('focus', '-lastfor', win))
-  end
-
-  def Tk.focus_next(win)
-    TkManageFocus.next(win)
-  end
-
-  def Tk.focus_prev(win)
-    TkManageFocus.prev(win)
-  end
-
-  def Tk.strictMotif(bool=None)
-    bool(tk_call('set', 'tk_strictMotif', bool))
+    tk_tcl2ruby(tk_call('focus', '-lastfor', win))
   end
 
-  def Tk.show_kinsoku(mode='both')
-    begin
-      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
-        tk_split_simplelist(tk_call('kinsoku', 'show', mode))
-      end
-    rescue
-    end
-  end
-  def Tk.add_kinsoku(chars, mode='both')
-    begin
-      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
-        tk_split_simplelist(tk_call('kinsoku', 'add', mode, 
-                                    *(chars.split(''))))
-      else
-        []
-      end
-    rescue
-      []
-    end
-  end
-  def Tk.delete_kinsoku(chars, mode='both')
-    begin
-      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
-        tk_split_simplelist(tk_call('kinsoku', 'delete', mode, 
-                            *(chars.split(''))))
-      end
-    rescue
-    end
-  end
-
-  def Tk.toUTF8(str,encoding)
+  def toUTF8(str,encoding)
     INTERP._toUTF8(str,encoding)
   end
   
-  def Tk.fromUTF8(str,encoding)
+  def fromUTF8(str,encoding)
     INTERP._fromUTF8(str,encoding)
   end
 
@@ -1272,210 +577,83 @@ module Tk
     def yscrollcommand(cmd=Proc.new)
       configure_cmd 'yscrollcommand', cmd
     end
-    def xview(*index)
-      v = tk_send('xview', *index)
-      list(v) if index.size == 0
-    end
-    def yview(*index)
-      v = tk_send('yview', *index)
-      list(v) if index.size == 0
-    end
-    def xscrollbar(bar=nil)
-      if bar
-	@xscrollbar = bar
-	@xscrollbar.orient 'horizontal'
-	self.xscrollcommand {|*arg| @xscrollbar.set(*arg)}
-	@xscrollbar.command {|*arg| self.xview(*arg)}
-      end
-      @xscrollbar
-    end
-    def yscrollbar(bar=nil)
-      if bar
-	@yscrollbar = bar
-	@yscrollbar.orient 'vertical'
-	self.yscrollcommand {|*arg| @yscrollbar.set(*arg)}
-	@yscrollbar.command {|*arg| self.yview(*arg)}
-      end
-      @yscrollbar
-    end
   end
 
   module Wm
     include TkComm
-
-    TkCommandNames = ['wm'.freeze].freeze
-
     def aspect(*args)
-      w = tk_call('wm', 'aspect', path, *args)
-      if args.length == 0
-	list(w) 
-      else
-	self
-      end
-    end
-    def attributes(slot=nil,value=None)
-      if slot == nil
-	lst = tk_split_list(tk_call('wm', 'attributes', path))
-	info = {}
-	while key = lst.shift
-	  info[key[1..-1]] = lst.shift
-	end
-	info
-      elsif slot.kind_of? Hash
-	tk_call('wm', 'attributes', path, *hash_kv(slot))
-	self
-      elsif value == None
-	tk_call('wm', 'attributes', path, "-#{slot}")
-      else
-	tk_call('wm', 'attributes', path, "-#{slot}", value)
-	self
-      end
+      w = window(tk_call('wm', 'grid', path, *args))
+      w.split.collect{|s|s.to_i} if args.length == 0
     end
     def client(name=None)
-      if name == None
-	tk_call 'wm', 'client', path
-      else
-        name = '' if name == nil
-	tk_call 'wm', 'client', path, name
-	self
-      end
+      tk_call 'wm', 'client', path, name
     end
     def colormapwindows(*args)
-      r = tk_call('wm', 'colormapwindows', path, *args)
-      if args.size == 0
-	list(r)
-      else
-	self
-      end
+      list(tk_call('wm', 'colormapwindows', path, *args))
     end
-    def wm_command(value=nil)
-      if value
-	tk_call('wm', 'command', path, value)
-	self
-      else
-	procedure(tk_call('wm', 'command', path))
-      end
+    def wm_command(value=None)
+      string(tk_call('wm', 'command', path, value))
     end
-    def deiconify(ex = true)
-      tk_call('wm', 'deiconify', path) if ex
-      self
+    def deiconify
+      tk_call 'wm', 'deiconify', path
     end
-    def focusmodel(mode = nil)
-      if mode
-	tk_call 'wm', 'focusmodel', path, mode
-	self
-      else
-	tk_call 'wm', 'focusmodel', path
-      end
+    def focusmodel(*args)
+      tk_call 'wm', 'focusmodel', path, *args
     end
     def frame
-      tk_call('wm', 'frame', path)
+      tk_call 'wm', 'frame', path
     end
-    def geometry(geom=nil)
-      if geom
-	tk_call('wm', 'geometry', path, geom)
-	self
-      else
-	tk_call('wm', 'geometry', path)
-      end
+    def geometry(*args)
+      list(tk_call('wm', 'geometry', path, *args))
     end
     def grid(*args)
       w = tk_call('wm', 'grid', path, *args)
-      if args.size == 0
-	list(w) 
-      else
-	self
-      end
+      list(w) if args.size == 0
     end
     def group(*args)
-      w = tk_call('wm', 'group', path, *args)
-      if args.size == 0
-	window(w) 
-      else
-	self
-      end
+      tk_call 'wm', 'group', path, *args
     end
-    def iconbitmap(bmp=nil)
-      if bmp
-	tk_call 'wm', 'iconbitmap', path, bmp
-	self
-      else
-	tk_call 'wm', 'iconbitmap', path
-      end
+    def iconbitmap(*args)
+      tk_call 'wm', 'iconbitmap', path, *args
     end
-    def iconify(ex = true)
-      tk_call('wm', 'iconify', path) if ex
-      self
+    def iconify
+      tk_call 'wm', 'iconify', path
     end
-    def iconmask(bmp=nil)
-      if bmp
-	tk_call 'wm', 'iconmask', path, bmp
-	self
-      else
-	tk_call 'wm', 'iconmask', path
-      end
+    def iconmask(*args)
+      tk_call 'wm', 'iconmask', path, *args
     end
-    def iconname(name=nil)
-      if name
-	tk_call 'wm', 'iconname', path, name
-	self
-      else
-	tk_call 'wm', 'iconname', path
-      end
+    def iconname(*args)
+      tk_call 'wm', 'iconname', path, *args
     end
     def iconposition(*args)
       w = tk_call('wm', 'iconposition', path, *args)
-      if args.size == 0
-	list(w) 
-      else
-	self
-      end
+      list(w) if args.size == 0
     end
     def iconwindow(*args)
       w = tk_call('wm', 'iconwindow', path, *args)
-      if args.size == 0
-	window(w)
-      else
-	self
-      end
+      window(w) if args.size == 0
     end
     def maxsize(*args)
       w = tk_call('wm', 'maxsize', path, *args)
-      if args.size == 0
-	list(w) 
-      else
-	self
-      end
+      list(w) if not args.size == 0
     end
     def minsize(*args)
       w = tk_call('wm', 'minsize', path, *args)
-      if args.size == 0
-	list(w) 
-      else
-	self
-      end
+      list(w) if args.size == 0
     end
     def overrideredirect(bool=None)
       if bool == None
 	bool(tk_call('wm', 'overrideredirect', path))
       else
 	tk_call 'wm', 'overrideredirect', path, bool
-	self
       end
     end
-    def positionfrom(who=None)
-      if who == None
-	r = tk_call('wm', 'positionfrom', path)
-	(r == "")? nil: r
-      else
-	tk_call('wm', 'positionfrom', path, who)
-	self
-      end
+    def positionfrom(*args)
+      tk_call 'wm', 'positionfrom', path, *args
     end
     def protocol(name=nil, cmd=nil)
       if cmd
 	tk_call('wm', 'protocol', path, name, cmd)
-	self
       elsif name
 	result = tk_call('wm', 'protocol', path, name)
 	(result == "")? nil : tk_tcl2ruby(result)
@@ -1487,328 +665,23 @@ module Tk
       w = tk_call('wm', 'resizable', path, *args)
       if args.length == 0
 	list(w).collect{|e| bool(e)}
-      else
-	self
-      end
-    end
-    def sizefrom(who=None)
-      if who == None
-	r = tk_call('wm', 'sizefrom', path)
-	(r == "")? nil: r
-      else
-	tk_call('wm', 'sizefrom', path, who)
-	self
       end
     end
-    def stackorder
-      list(tk_call('wm', 'stackorder', path))
+    def sizefrom(*args)
+      list(tk_call('wm', 'sizefrom', path, *args))
     end
-    def stackorder_isabove(win)
-      bool(tk_call('wm', 'stackorder', path, 'isabove', win))
+    def state
+      tk_call 'wm', 'state', path
     end
-    def stackorder_isbelow(win)
-      bool(tk_call('wm', 'stackorder', path, 'isbelow', win))
+    def title(*args)
+      tk_call 'wm', 'title', path, *args
     end
-    def state(state=nil)
-      if state
-	tk_call 'wm', 'state', path, state
-	self
-      else
-	tk_call 'wm', 'state', path
-      end
-    end
-    def title(str=nil)
-      if str
-	tk_call('wm', 'title', path, str)
-	self
-      else
-	tk_call('wm', 'title', path)
-      end
-    end
-    def transient(master=nil)
-      if master
-	tk_call('wm', 'transient', path, master)
-	self
-      else
-	window(tk_call('wm', 'transient', path, master))
-      end
-    end
-    def withdraw(ex = true)
-      tk_call('wm', 'withdraw', path) if ex
-      self
-    end
-  end
-end
-
-###########################################
-#  string with Tcl's encoding
-###########################################
-module Tk
-  class EncodedString < String
-    @@enc_buf = '__rb_encoding_buffer__'
-
-    def self.tk_escape(str)
-      s = '"' + str.gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      TkCore::INTERP.__eval(format('global %s; set %s %s', 
-				   @@enc_buf, @@enc_buf, s))
-    end
-
-    def self.new(str, enc = Tk.encoding_system)
-      obj = super(self.tk_escape(str))
-      obj.instance_eval{@enc = enc}
-      obj
-    end
-
-    def self.new_without_escape(str, enc = Tk.encoding_system)
-      obj = super(str)
-      obj.instance_eval{@enc = enc}
-      obj
-    end
-
-    def encoding
-      @enc
-    end
-  end
-  def Tk.EncodedString(str, enc = Tk.encoding_system)
-    Tk::EncodedString.new(str, enc)
-  end
-
-  class UTF8_String < EncodedString
-    def self.new(str)
-      super(str, 'utf-8')
+    def transient(*args)
+      tk_call 'wm', 'transient', path, *args
     end
-    def self.new_without_escape(str)
-      super(str, 'utf-8')
-    end
-  end
-  def Tk.UTF8_String(str)
-    Tk::UTF8_String.new(str)
-  end
-end
-
-
-###########################################
-#  convert kanji string to/from utf-8
-###########################################
-if /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
-  class TclTkIp
-    # from tkencoding.rb by ttate@jaist.ac.jp
-    alias __eval _eval
-    alias __invoke _invoke
-    
-    attr_accessor :encoding
-    
-    def _eval(cmd)
-      if defined? @encoding
-	if cmd.kind_of?(Tk::EncodedString)
-	  _fromUTF8(__eval(_toUTF8(cmd, cmd.encoding)), @encoding)
-	else
-	  _fromUTF8(__eval(_toUTF8(cmd, @encoding)), @encoding)
-	end
-      else
-	__eval(cmd)
-      end
-    end
-
-    def _invoke(*cmds)
-      if defined? @encoding
-	cmds = cmds.collect{|cmd|
-	  if cmd.kind_of?(Tk::EncodedString)
-	    _toUTF8(cmd, cmd.encoding)
-	  else
-	    _toUTF8(cmd, @encoding)
-	  end
-	}
-	_fromUTF8(__invoke(*cmds), @encoding)
-      else
-	__invoke(*cmds)
-	end
-    end
-  end
-
-  module Tk
-    module Encoding
-      extend Encoding
-
-      TkCommandNames = ['encoding'.freeze].freeze
-
-      def encoding=(name)
-	TkCore::INTERP.encoding = name
-      end
-
-      def encoding
-	TkCore::INTERP.encoding
-      end
-
-      def encoding_names
-	tk_split_simplelist(tk_call('encoding', 'names'))
-      end
-
-      def encoding_system
-	tk_call('encoding', 'system')
-      end
-
-      def encoding_system=(enc)
-	tk_call('encoding', 'system', enc)
-      end
-
-      def encoding_convertfrom(str, enc=None)
-	TkCore::INTERP.__invoke('encoding', 'convertfrom', enc, str)
-      end
-      alias encoding_convert_from encoding_convertfrom
-
-      def encoding_convertto(str, enc=None)
-	TkCore::INTERP.__invoke('encoding', 'convertto', enc, str)
-      end
-      alias encoding_convert_to encoding_convertto
-    end
-
-    extend Encoding
-  end
-
-  # estimate encoding
-  case $KCODE
-  when /^e/i  # EUC
-    Tk.encoding = 'euc-jp'
-  when /^s/i  # SJIS
-    Tk.encoding = 'shiftjis'
-  when /^u/i  # UTF8
-    Tk.encoding = 'utf-8'
-  else        # NONE
-    begin
-      Tk.encoding = Tk.encoding_system
-    rescue StandardError, NameError
-      Tk.encoding = 'utf-8'
-    end
-  end
-
-else
-  # dummy methods
-  class TclTkIp
-    alias __eval _eval
-    alias __invoke _invoke
-  end
-
-  module Tk
-    module Encoding
-      extend Encoding
-
-      def encoding=(name)
-	nil
-      end
-      def encoding
-	nil
-      end
-      def encoding_names
-	nil
-      end
-      def encoding_system
-	nil
-      end
-      def encoding_system=(enc)
-	nil
-      end
-
-      def encoding_convertfrom(str, enc=None)
-	str
-      end
-      alias encoding_convert_from encoding_convertfrom
-
-      def encoding_convertto(str, enc=None)
-	str
-      end
-      alias encoding_convert_to encoding_convertto
+    def withdraw
+      tk_call 'wm', 'withdraw', path
     end
-
-    extend Encoding
-  end
-end
-
-module TkBindCore
-  def bind(context, cmd=Proc.new, args=nil)
-    Tk.bind(self, context, cmd, args)
-  end
-
-  def bind_append(context, cmd=Proc.new, args=nil)
-    Tk.bind_append(self, context, cmd, args)
-  end
-
-  def bind_remove(context)
-    Tk.bind_remove(self, context)
-  end
-
-  def bindinfo(context=nil)
-    Tk.bindinfo(self, context)
-  end
-end
-
-class TkBindTag
-  include TkBindCore
-
-  #BTagID_TBL = {}
-  BTagID_TBL = TkCore::INTERP.create_table
-  Tk_BINDTAG_ID = ["btag".freeze, "00000".taint].freeze
-
-  TkCore::INTERP.init_ip_env{ BTagID_TBL.clear }
-
-  def TkBindTag.id2obj(id)
-    BTagID_TBL[id]? BTagID_TBL[id]: id
-  end
-
-  def TkBindTag.new_by_name(name, *args, &b)
-    return BTagID_TBL[name] if BTagID_TBL[name]
-    self.new(*args, &b).instance_eval{
-      BTagID_TBL.delete @id
-      @id = name
-      BTagID_TBL[@id] = self
-    }
-  end
-
-  def initialize(*args, &b)
-    @id = Tk_BINDTAG_ID.join
-    Tk_BINDTAG_ID[1].succ!
-    BTagID_TBL[@id] = self
-    bind(*args, &b) if args != []
-  end
-
-  ALL = self.new_by_name('all')
-
-  def name
-    @id
-  end
-
-  def to_eval
-    @id
-  end
-
-  def inspect
-    format "#<TkBindTag: %s>", @id
-  end
-end
-
-class TkBindTagAll<TkBindTag
-  def TkBindTagAll.new(*args, &b)
-    $stderr.puts "Warning: TkBindTagALL is obsolete. Use TkBindTag::ALL\n"
-
-    TkBindTag::ALL.bind(*args, &b) if args != []
-    TkBindTag::ALL
-  end
-end
-
-class TkDatabaseClass<TkBindTag
-  def self.new(name, *args, &b)
-    return BTagID_TBL[name] if BTagID_TBL[name]
-    super(name, *args, &b)
-  end
-
-  def initialize(name, *args, &b)
-    @id = name
-    BTagID_TBL[@id] = self
-    bind(*args, &b) if args != []
-  end
-
-  def inspect
-    format "#<TkDatabaseClass: %s>", @id
   end
 end
 
@@ -1816,19 +689,10 @@ class TkVariable
   include Tk
   extend TkCore
 
-  include Comparable
-
-  #TkCommandNames = ['tkwait'.freeze].freeze
-  TkCommandNames = ['vwait'.freeze].freeze
-
-  #TkVar_CB_TBL = {}
-  #TkVar_ID_TBL = {}
-  TkVar_CB_TBL = TkCore::INTERP.create_table
-  TkVar_ID_TBL = TkCore::INTERP.create_table
-  Tk_VARIABLE_ID = ["v".freeze, "00000".taint].freeze
+  TkVar_CB_TBL = {}
+  Tk_VARIABLE_ID = ["v00000"]
 
-  TkCore::INTERP.add_tk_procs('rb_var', 'args', 
-	"ruby [format \"TkVariable.callback %%Q!%s!\" $args]")
+  INTERP._invoke("proc", "rb_var", "args", "ruby [format \"TkVariable.callback %%Q!%s!\" $args]")
 
   def TkVariable.callback(args)
     name1,name2,op = tk_split_list(args)
@@ -1840,76 +704,28 @@ class TkVariable
   end
 
   def initialize(val="")
-    @id = Tk_VARIABLE_ID.join
-    Tk_VARIABLE_ID[1].succ!
-    TkVar_ID_TBL[@id] = self
-
-    @trace_var  = nil
-    @trace_elem = nil
-    @trace_opts = nil
-
-=begin
+    @id = Tk_VARIABLE_ID[0]
+    Tk_VARIABLE_ID[0] = Tk_VARIABLE_ID[0].succ
     if val == []
-      # INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)', 
-      #	                    @id, @id, @id))
+      INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)', 
+			  @id, @id, @id))
     elsif val.kind_of?(Array)
       a = []
-      # val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
-      # s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      val.each_with_index{|e,i| a.push(i); a.push(e)}
-      s = '"' + array2tk_list(a).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
+      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(/[\[\]$"]/, '\\\\\&') + '"'
-      INTERP._eval(format('global %s; set %s %s', @id, @id, s))
-    end
-=end
-    if  val.kind_of?(Hash)
-      s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
-                   .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
 
-  def wait(on_thread = false, check_root = false)
-    if $SAFE >= 4
-      fail SecurityError, "can't wait variable at $SAFE >= 4"
-    end
-    if on_thread
-      if check_root
-	INTERP._thread_tkwait('variable', @id)
-      else
-	INTERP._thread_vwait(@id)
-      end
-    else 
-      if check_root
-	INTERP._invoke('tkwait', 'variable', @id)
-      else
-	INTERP._invoke('vwait', @id)
-      end
-    end
-  end
-  def eventloop_wait(check_root = false)
-    wait(false, check_root)
-  end
-  def thread_wait(check_root = false)
-    wait(true, check_root)
-  end
-  def tkwait(on_thread = true)
-    wait(on_thread, true)
-  end
-  def eventloop_tkwait
-    wait(false, true)
-  end
-  def thread_tkwait
-    wait(true, true)
+  def wait
+    INTERP._eval("tkwait variable #{@id}")
   end
 
   def id
@@ -1921,22 +737,21 @@ class TkVariable
       INTERP._eval(format('global %s; set %s', @id, @id))
     rescue
       if INTERP._eval(format('global %s; array exists %s', @id, @id)) != "1"
-	fail
+	raise
       else
-	Hash[*tk_split_simplelist(INTERP.
-				  _eval(format('global %s; array get %s', 
-					       @id, @id)))]
+	Hash[*tk_split_simplelist(INTERP._eval(format('global %s; array get %s', 
+						      @id, @id)))]
       end
     end
   end
 
   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"
-	fail
+	raise
       else
 	if val == []
 	  INTERP._eval(format('global %s; unset %s; set %s(0) 0; unset %s(0)', 
@@ -1944,16 +759,16 @@ 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
-	  fail
+	  raise
 	end
       end
     end
@@ -1969,180 +784,41 @@ class TkVariable
 			_get_eval_string(index), _get_eval_string(val)))
   end
 
-  def numeric
-    number(value)
-  end
-  def numeric=(val)
-    case val
-    when Numeric
-      self.value=(val)
-    when TkVariable
-      self.value=(val.numeric)
-    else
-      raise ArgumentError, "Numeric is expected"
-    end
-  end
-
   def to_i
-    number(value).to_i
+    Integer(number(value))
   end
 
   def to_f
-    number(value).to_f
+    Float(number(value))
   end
 
   def to_s
-    string(value).to_s
-  end
-
-  def to_sym
-    value.intern
-  end
-
-  def list
-    tk_split_list(value)
-  end
-  alias to_a list
-
-  def list=(val)
-    case val
-    when Array
-      self.value=(val)
-    when TkVariable
-      self.value=(val.list)
-    else
-      raise ArgumentError, "Array is expected"
-    end
+    String(string(value))
   end
 
   def inspect
-    format "#<TkVariable: %s>", @id
-  end
-
-  def coerce(other)
-    case other
-    when TkVariable
-      [other.value, self.value]
-    when String
-      [other, self.to_s]
-    when Symbol
-      [other, self.to_sym]
-    when Integer
-      [other, self.to_i]
-    when Float
-      [other, self.to_f]
-    when Array
-      [other, self.to_a]
-    else
-      [other, self.value]
-    end
-  end
-
-  def &(other)
-    if other.kind_of?(Array)
-      self.to_a & other.to_a
-    else
-      self.to_i & other.to_i
-    end
-  end
-  def |(other)
-    if other.kind_of?(Array)
-      self.to_a | other.to_a
-    else
-      self.to_i | other.to_i
-    end
-  end
-  def +(other)
-    case other
-    when Array
-      self.to_a + other
-    when String
-      self.value + other
-    else
-      begin
-	number(self.value) + other
-      rescue
-	self.value + other.to_s
-      end
-    end
-  end
-  def -(other)
-    if other.kind_of?(Array)
-      self.to_a - other
-    else
-      number(self.value) - other
-    end
-  end
-  def *(other)
-    begin
-      number(self.value) * other
-    rescue
-      self.value * other
-    end
-  end
-  def /(other)
-    number(self.value) / other
-  end
-  def %(other)
-    begin
-      number(self.value) % other
-    rescue
-      self.value % other
-    end
-  end
-  def **(other)
-    number(self.value) ** other
-  end
-  def =~(other)
-    self.value =~ other
+    format "<TkVariable: %s>", @id
   end
 
   def ==(other)
     case other
     when TkVariable
-      self.equal?(other)
+      self.equal(self)
     when String
       self.to_s == other
-    when Symbol
-      self.to_sym == other
     when Integer
       self.to_i == other
     when Float
       self.to_f == other
     when Array
       self.to_a == other
-    when Hash
-      self.value == other
     else
       false
     end
   end
 
-  def zero?
-    numeric.zero?
-  end
-  def nonzero?
-    !(numeric.zero?)
-  end
-
-  def <=>(other)
-    if other.kind_of?(TkVariable)
-      begin
-	val = other.numeric
-	other = val
-      rescue
-	other = other.value
-      end
-    end
-    if other.kind_of?(Numeric)
-      begin
-	return self.numeric <=> other
-      rescue
-	return self.value <=> other.to_s
-      end
-    else
-      return self.value <=> other
-    end
+  def to_a
+    list(value)
   end
 
   def to_eval
@@ -2224,7 +900,7 @@ class TkVariable
     opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
     idx = -1
     newopts = ''
-    @trace_var.each_with_index{|e,i| 
+    @trace_var.each_with_index{|i,e| 
       if idx < 0 && e[0] == opts && e[1] == cmd
 	idx = i
 	next
@@ -2258,7 +934,7 @@ class TkVariable
     return unless @trace_elem[elem].kind_of? Array
     opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
     idx = -1
-    @trace_elem[elem].each_with_index{|e,i| 
+    @trace_elem[elem].each_with_index{|i,e| 
       if idx < 0 && e[0] == opts && e[1] == cmd
 	idx = i
 	next
@@ -2292,136 +968,46 @@ class TkVariable
 end
 
 class TkVarAccess<TkVariable
-  def self.new(name, *args)
-    return TkVar_ID_TBL[name] if TkVar_ID_TBL[name]
-    super(name, *args)
-  end
-
   def initialize(varname, val=nil)
     @id = varname
-    TkVar_ID_TBL[@id] = self
     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
 end
 
-module Tk
-  begin
-    auto_path = INTERP._invoke('set', 'auto_path')
-  rescue
-    begin
-      auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)')
-    rescue
-      auto_path = Tk::LIBRARY
-    end
-  end
-
-  AUTO_PATH = TkVarAccess.new('auto_path', auto_path)
-
-=begin
-  AUTO_OLDPATH = tk_split_simplelist(INTERP._invoke('set', 'auto_oldpath'))
-  AUTO_OLDPATH.each{|s| s.freeze}
-  AUTO_OLDPATH.freeze
-=end
-
-  TCL_PACKAGE_PATH = TkVarAccess.new('tcl_pkgPath')
-  PACKAGE_PATH = TCL_PACKAGE_PATH
-
-  TCL_LIBRARY_PATH = TkVarAccess.new('tcl_libPath')
-  LIBRARY_PATH = TCL_LIBRARY_PATH
-
-  TCL_PRECISION = TkVarAccess.new('tcl_precision')
-end
-
 module TkSelection
   include Tk
   extend Tk
-
-  TkCommandNames = ['selection'.freeze].freeze
-
-  def self.clear(sel=nil)
-    if sel
-      tk_call 'selection', 'clear', '-selection', sel
-    else
-      tk_call 'selection', 'clear'
-    end
-  end
-  def self.clear_on_display(win, sel=nil)
-    if sel
-      tk_call 'selection', 'clear', '-displayof', win, '-selection', sel
-    else
-      tk_call 'selection', 'clear', '-displayof', win
-    end
-  end
-  def clear(sel=nil)
-    TkSelection.clear_on_display(self, sel)
-    self
-  end
-
-  def self.get(keys=nil)
-    tk_call 'selection', 'get', *hash_kv(keys)
-  end
-  def self.get_on_display(win, keys=nil)
-    tk_call 'selection', 'get', '-displayof', win, *hash_kv(keys)
-  end
-  def get(keys=nil)
-    TkSelection.get_on_display(self, sel)
+  def clear(win=Tk.root)
+    tk_call 'selection', 'clear', win.path
   end
-
-  def self.handle(win, func=Proc.new, keys=nil, &b)
-    if func.kind_of?(Hash) && keys == nil
-      keys = func
-      func = Proc.new(&b)
-    end
-    args = ['selection', 'handle']
-    args += hash_kv(keys)
-    args += [win, func]
-    tk_call(*args)
+  def get(type=None)
+    tk_call 'selection', 'get', type
   end
-  def handle(func=Proc.new, keys=nil, &b)
-    TkSelection.handle(self, func, keys, &b)
+  def TkSelection.handle(win, func, type=None, format=None)
+    id = install_cmd(func)
+    tk_call 'selection', 'handle', win.path, id, type, format
   end
-
-  def self.get_owner(sel=nil)
-    if sel
-      window(tk_call('selection', 'own', '-selection', sel))
-    else
-      window(tk_call('selection', 'own'))
-    end
+  def handle(func, type=None, format=None)
+    TkSelection.handle self, func, type, format
   end
-  def self.get_owner_on_display(win, sel=nil)
-    if sel
-      window(tk_call('selection', 'own', '-displayof', win, '-selection', sel))
-    else
-      window(tk_call('selection', 'own', '-displayof', win))
-    end
+  def TkSelection.own(win, func=None)
+    id = install_cmd(func)
+    tk_call 'selection', 'own', win.path, id
   end
-  def get_owner(sel=nil)
-    TkSelection.get_owner_on_display(self, sel)
-    self
+  def own(func=None)
+    TkSelection.own self, func
   end
 
-  def self.set_owner(win, keys=nil)
-    tk_call('selection', 'own', *(hash_kv(keys) << win))
-  end
-  def set_owner(keys=nil)
-    TkSelection.set_owner(self, keys)
-    self
-  end
+  module_function :clear, :get
 end
 
 module TkKinput
   include Tk
   extend Tk
 
-  TkCommandNames = [
-    'kinput_start'.freeze, 
-    'kinput_send_spot'.freeze, 
-    'kanjiInput'.freeze
-  ].freeze
-
   def TkKinput.start(window, style=None)
     tk_call 'kinput_start', window.path, style
   end
@@ -2480,128 +1066,27 @@ module TkKinput
   end
 end
 
-module TkXIM
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['imconfigure'.freeze].freeze
-
-  def TkXIM.useinputmethods(window=nil, value=nil)
-    if window
-      if value
-        tk_call 'tk', 'useinputmethods', '-displayof', window.path, value
-      else
-        tk_call 'tk', 'useinputmethods', '-displayof', window.path
-      end
-    else
-      if value
-        tk_call 'tk', 'useinputmethods', value
-      else
-        tk_call 'tk', 'useinputmethods'
-      end
-    end
-  end
-
-  def TkXIM.caret(window, keys=nil)
-    if keys
-      tk_call('tk', 'caret', window, *hash_kv(keys))
-      self
-    else
-      lst = tk_split_list(tk_call('tk', 'caret', window))
-      info = {}
-      while key = lst.shift
-	info[key[1..-1]] = lst.shift
-      end
-      info
-    end
-  end
-
-  def TkXIM.configure(window, slot, value=None)
-    begin
-      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        if slot.kind_of? Hash
-          tk_call 'imconfigure', window.path, *hash_kv(slot)
-        else
-          tk_call 'imconfigure', window.path, "-#{slot}", value
-        end
-      end
-    rescue
-    end
-  end
-
-  def TkXIM.configinfo(window, slot=nil)
-    begin
-      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        if slot
-          conf = tk_split_list(tk_call('imconfigure', window.path, "-#{slot}"))
-          conf[0] = conf[0][1..-1]
-          conf
-        else
-          tk_split_list(tk_call('imconfigure', window.path)).collect{|conf|
-            conf[0] = conf[0][1..-1]
-            conf
-          }
-        end
-      else
-        []
-      end
-    rescue
-      []
-    end
-  end
-
-  def useinputmethods(value=nil)
-    TkXIM.useinputmethods(self, value)
-  end
-
-  def caret(keys=nil)
-    TkXIM.caret(self, keys=nil)
-  end
-
-  def imconfigure(slot, value=None)
-    TkXIM.configinfo(self, slot, value)
-  end
-
-  def imconfiginfo(slot=nil)
-    TkXIM.configinfo(self, slot)
-  end
-end
-
 module TkWinfo
   include Tk
   extend Tk
-
-  TkCommandNames = ['winfo'.freeze].freeze
-
-  def TkWinfo.atom(name, win=nil)
-    if win
-      number(tk_call('winfo', 'atom', '-displayof', win, name))
-    else
-      number(tk_call('winfo', 'atom', name))
-    end
+  def TkWinfo.atom(name)
+    tk_call 'winfo', name
   end
   def winfo_atom(name)
-    TkWinfo.atom(name, self)
+    TkWinfo.atom name
   end
-
-  def TkWinfo.atomname(id, win=nil)
-    if win
-      tk_call('winfo', 'atomname', '-displayof', win, id)
-    else
-      tk_call('winfo', 'atomname', id)
-    end
+  def TkWinfo.atomname(id)
+    tk_call 'winfo', id
   end
   def winfo_atomname(id)
-    TkWinfo.atomname(id, self)
+    TkWinfo.atomname id
   end
-
   def TkWinfo.cells(window)
-    number(tk_call('winfo', 'cells', window.path))
+    number(tk_call('winfo', window.path))
   end
   def winfo_cells
     TkWinfo.cells self
   end
-
   def TkWinfo.children(window)
     c = tk_call('winfo', 'children', window.path)
     list(c)
@@ -2609,79 +1094,59 @@ module TkWinfo
   def winfo_children
     TkWinfo.children self
   end
-
   def TkWinfo.classname(window)
     tk_call 'winfo', 'class', window.path
   end
   def winfo_classname
     TkWinfo.classname self
   end
-  alias winfo_class winfo_classname
-
-  def TkWinfo.colormapfull(window)
-     bool(tk_call('winfo', 'colormapfull', window.path))
-  end
-  def winfo_colormapfull
-    TkWinfo.colormapfull self
-  end
-
-  def TkWinfo.containing(rootX, rootY, win=nil)
-    if win
-      window(tk_call('winfo', 'containing', '-displayof', win, rootX, rootY))
-    else
-      window(tk_call('winfo', 'containing', rootX, rootY))
-    end
+  def TkWinfo.containing(rootX, rootY)
+    path = tk_call('winfo', 'containing', rootX, rootY)
+    window(path)
   end
   def winfo_containing(x, y)
-    TkWinfo.containing(x, y, self)
+    TkWinfo.containing x, y
   end
-
   def TkWinfo.depth(window)
     number(tk_call('winfo', 'depth', window.path))
   end
   def winfo_depth
     TkWinfo.depth self
   end
-
   def TkWinfo.exist?(window)
     bool(tk_call('winfo', 'exists', window.path))
   end
   def winfo_exist?
     TkWinfo.exist? self
   end
-
-  def TkWinfo.fpixels(window, dist)
-    number(tk_call('winfo', 'fpixels', window.path, dist))
+  def TkWinfo.fpixels(window, number)
+    number(tk_call('winfo', 'fpixels', window.path, number))
   end
-  def winfo_fpixels(dist)
-    TkWinfo.fpixels self, dist
+  def winfo_fpixels(number)
+    TkWinfo.fpixels self, number
   end
-
   def TkWinfo.geometry(window)
-    tk_call('winfo', 'geometry', window.path)
+    list(tk_call('winfo', 'geometry', window.path))
   end
   def winfo_geometry
     TkWinfo.geometry self
   end
-
   def TkWinfo.height(window)
     number(tk_call('winfo', 'height', window.path))
   end
   def winfo_height
     TkWinfo.height self
   end
-
   def TkWinfo.id(window)
-    tk_call('winfo', 'id', window.path)
+    number(tk_call('winfo', 'id', window.path))
   end
   def winfo_id
     TkWinfo.id self
   end
-
   def TkWinfo.interps(window=nil)
     if window
-      tk_split_simplelist(tk_call('winfo', 'interps',
-				  '-displayof', window.path))
+      tk_split_simplelist(tk_call('winfo', '-displayof', window.path, 
+				  'interps'))
     else
       tk_split_simplelist(tk_call('winfo', 'interps'))
     end
@@ -2689,253 +1154,186 @@ module TkWinfo
   def winfo_interps
     TkWinfo.interps self
   end
-
   def TkWinfo.mapped?(window)
     bool(tk_call('winfo', 'ismapped', window.path))
   end
   def winfo_mapped?
     TkWinfo.mapped? self
   end
-
-  def TkWinfo.manager(window)
-    tk_call('winfo', 'manager', window.path)
-  end
-  def winfo_manager
-    TkWinfo.manager self
-  end
-
   def TkWinfo.appname(window)
-    tk_call('winfo', 'name', window.path)
+    bool(tk_call('winfo', 'name', window.path))
   end
   def winfo_appname
     TkWinfo.appname self
   end
-
   def TkWinfo.parent(window)
     window(tk_call('winfo', 'parent', window.path))
   end
   def winfo_parent
     TkWinfo.parent self
   end
-
-  def TkWinfo.widget(id, win=nil)
-    if win
-      window(tk_call('winfo', 'pathname', '-displayof', win, id))
-    else
-      window(tk_call('winfo', 'pathname', id))
-    end
+  def TkWinfo.widget(id)
+    window(tk_call('winfo', 'pathname', id))
   end
   def winfo_widget(id)
-    TkWinfo.widget id, self
+    TkWinfo.widget id
   end
-
-  def TkWinfo.pixels(window, dist)
-    number(tk_call('winfo', 'pixels', window.path, dist))
+  def TkWinfo.pixels(window, number)
+    number(tk_call('winfo', 'pixels', window.path, number))
   end
-  def winfo_pixels(dist)
-    TkWinfo.pixels self, dist
+  def winfo_pixels(number)
+    TkWinfo.pixels self, number
   end
-
   def TkWinfo.reqheight(window)
     number(tk_call('winfo', 'reqheight', window.path))
   end
   def winfo_reqheight
     TkWinfo.reqheight self
   end
-
   def TkWinfo.reqwidth(window)
     number(tk_call('winfo', 'reqwidth', window.path))
   end
   def winfo_reqwidth
     TkWinfo.reqwidth self
   end
-
   def TkWinfo.rgb(window, color)
     list(tk_call('winfo', 'rgb', window.path, color))
   end
   def winfo_rgb(color)
     TkWinfo.rgb self, color
   end
-
   def TkWinfo.rootx(window)
     number(tk_call('winfo', 'rootx', window.path))
   end
   def winfo_rootx
     TkWinfo.rootx self
   end
-
   def TkWinfo.rooty(window)
     number(tk_call('winfo', 'rooty', window.path))
   end
   def winfo_rooty
     TkWinfo.rooty self
   end
-
   def TkWinfo.screen(window)
     tk_call 'winfo', 'screen', window.path
   end
   def winfo_screen
     TkWinfo.screen self
   end
-
   def TkWinfo.screencells(window)
     number(tk_call('winfo', 'screencells', window.path))
   end
   def winfo_screencells
     TkWinfo.screencells self
   end
-
   def TkWinfo.screendepth(window)
     number(tk_call('winfo', 'screendepth', window.path))
   end
   def winfo_screendepth
     TkWinfo.screendepth self
   end
-
   def TkWinfo.screenheight (window)
     number(tk_call('winfo', 'screenheight', window.path))
   end
   def winfo_screenheight
     TkWinfo.screenheight self
   end
-
   def TkWinfo.screenmmheight(window)
     number(tk_call('winfo', 'screenmmheight', window.path))
   end
   def winfo_screenmmheight
     TkWinfo.screenmmheight self
   end
-
   def TkWinfo.screenmmwidth(window)
     number(tk_call('winfo', 'screenmmwidth', window.path))
   end
   def winfo_screenmmwidth
     TkWinfo.screenmmwidth self
   end
-
   def TkWinfo.screenvisual(window)
-    tk_call('winfo', 'screenvisual', window.path)
+    tk_call 'winfo', 'screenvisual', window.path
   end
   def winfo_screenvisual
     TkWinfo.screenvisual self
   end
-
   def TkWinfo.screenwidth(window)
     number(tk_call('winfo', 'screenwidth', window.path))
   end
   def winfo_screenwidth
     TkWinfo.screenwidth self
   end
-
-  def TkWinfo.server(window)
-    tk_call 'winfo', 'server', window.path
-  end
-  def winfo_server
-    TkWinfo.server self
-  end
-
   def TkWinfo.toplevel(window)
     window(tk_call('winfo', 'toplevel', window.path))
   end
   def winfo_toplevel
     TkWinfo.toplevel self
   end
-
   def TkWinfo.visual(window)
-    tk_call('winfo', 'visual', window.path)
+    tk_call 'winfo', 'visual', window.path
   end
   def winfo_visual
     TkWinfo.visual self
   end
-
-  def TkWinfo.visualid(window)
-    tk_call('winfo', 'visualid', window.path)
-  end
-  def winfo_visualid
-    TkWinfo.visualid self
-  end
-
-  def TkWinfo.visualsavailable(window, includeids=false)
-    if includeids
-      list(tk_call('winfo', 'visualsavailable', window.path, "includeids"))
-    else
-      list(tk_call('winfo', 'visualsavailable', window.path))
-    end
-  end
-  def winfo_visualsavailable(includeids=false)
-    TkWinfo.visualsavailable self, includeids
-  end
-
-  def TkWinfo.vrootheight(window)
+  def TkWinfo.vrootheigh(window)
     number(tk_call('winfo', 'vrootheight', window.path))
   end
   def winfo_vrootheight
     TkWinfo.vrootheight self
   end
-
   def TkWinfo.vrootwidth(window)
     number(tk_call('winfo', 'vrootwidth', window.path))
   end
   def winfo_vrootwidth
     TkWinfo.vrootwidth self
   end
-
   def TkWinfo.vrootx(window)
     number(tk_call('winfo', 'vrootx', window.path))
   end
   def winfo_vrootx
     TkWinfo.vrootx self
   end
-
   def TkWinfo.vrooty(window)
     number(tk_call('winfo', 'vrooty', window.path))
   end
   def winfo_vrooty
     TkWinfo.vrooty self
   end
-
   def TkWinfo.width(window)
     number(tk_call('winfo', 'width', window.path))
   end
   def winfo_width
     TkWinfo.width self
   end
-
   def TkWinfo.x(window)
     number(tk_call('winfo', 'x', window.path))
   end
   def winfo_x
     TkWinfo.x self
   end
-
   def TkWinfo.y(window)
     number(tk_call('winfo', 'y', window.path))
   end
   def winfo_y
     TkWinfo.y self
   end
-
   def TkWinfo.viewable(window)
-    bool(tk_call('winfo', 'viewable', window.path))
+    bool(tk_call 'winfo', 'viewable', window.path)
   end
   def winfo_viewable
     TkWinfo.viewable self
   end
-
   def TkWinfo.pointerx(window)
     number(tk_call('winfo', 'pointerx', window.path))
   end
   def winfo_pointerx
     TkWinfo.pointerx self
   end
-
   def TkWinfo.pointery(window)
     number(tk_call('winfo', 'pointery', window.path))
   end
   def winfo_pointery
     TkWinfo.pointery self
   end
-
   def TkWinfo.pointerxy(window)
     list(tk_call('winfo', 'pointerxy', window.path))
   end
@@ -2947,9 +1345,6 @@ end
 module TkPack
   include Tk
   extend Tk
-
-  TkCommandNames = ['pack'.freeze].freeze
-
   def configure(win, *args)
     if args[-1].kind_of?(Hash)
       keys = args.pop
@@ -2965,36 +1360,16 @@ module TkPack
     tk_call 'pack', 'forget' *args
   end
 
-  def info(slave)
-    ilist = list(tk_call('pack', 'info', slave.epath))
-    info = {}
-    while key = ilist.shift
-      info[key[1..-1]] = ilist.shift
-    end
-    return info
-  end
-
   def propagate(master, bool=None)
-    if bool == None
-      bool(tk_call('pack', 'propagate', master.epath))
-    else
-      tk_call('pack', 'propagate', master.epath, bool)
-    end
+    bool(tk_call('pack', 'propagate', master.epath, bool))
   end
-
-  def slaves(master)
-    list(tk_call('pack', 'slaves', master.epath))
-  end
-
-  module_function :configure, :forget, :info, :propagate, :slaves
+  module_function :configure, :forget, :propagate
 end
 
 module TkGrid
   include Tk
   extend Tk
 
-  TkCommandNames = ['grid'.freeze].freeze
-
   def bbox(*args)
     list(tk_call('grid', 'bbox', *args))
   end
@@ -3003,15 +1378,9 @@ module TkGrid
     if args[-1].kind_of?(Hash)
       keys = args.pop
     end
-    wins = []
-    args.unshift(widget)
+    wins = [widget.epath]
     for i in args
-      case i
-      when '-', 'x', '^'  # RELATIVE PLACEMENT
-	wins.push(i)
-      else
-	wins.push(i.epath)
-      end
+      wins.push i.epath
     end
     tk_call "grid", 'configure', *(wins+hash_kv(keys))
   end
@@ -3024,32 +1393,6 @@ module TkGrid
     tk_call "grid", 'rowconfigure', master, index, *hash_kv(args)
   end
 
-  def columnconfiginfo(master, index, slot=nil)
-    if slot
-      tk_call('grid', 'columnconfigure', master, index, "-#{slot}").to_i
-    else
-      ilist = list(tk_call('grid', 'columnconfigure', master, index))
-      info = {}
-      while key = ilist.shift
-	info[key[1..-1]] = ilist.shift
-      end
-      info
-    end
-  end
-
-  def rowconfiginfo(master, index, slot=nil)
-    if slot
-      tk_call('grid', 'rowconfigure', master, index, "-#{slot}").to_i
-    else
-      ilist = list(tk_call('grid', 'rowconfigure', master, index))
-      info = {}
-      while key = ilist.shift
-	info[key[1..-1]] = ilist.shift
-      end
-      info
-    end
-  end
-
   def add(widget, *args)
     configure(widget, *args)
   end
@@ -3067,11 +1410,7 @@ module TkGrid
   end
 
   def propagate(master, bool=None)
-    if bool == None
-      bool(tk_call('grid', 'propagate', master.epath))
-    else
-      tk_call('grid', 'propagate', master.epath, bool)
-    end
+    bool(tk_call('grid', 'propagate', master.epath, bool))
   end
 
   def remove(*args)
@@ -3082,359 +1421,37 @@ module TkGrid
     tk_call 'grid', 'size', master
   end
 
-  def slaves(master, args)
-    list(tk_call('grid', 'slaves', master, *hash_kv(args)))
+  def slaves(args)
+    list(tk_call('grid', 'slaves', *hash_kv(args)))
   end
 
   module_function :bbox, :forget, :propagate, :info
   module_function :remove, :size, :slaves, :location
   module_function :configure, :columnconfigure, :rowconfigure
-  module_function :columnconfiginfo, :rowconfiginfo
 end
 
-module TkPlace
+module TkOption
   include Tk
   extend Tk
-
-  TkCommandNames = ['place'.freeze].freeze
-
-  def configure(win, slot, value=None)
-    if slot.kind_of? Hash
-      tk_call 'place', 'configure', win.epath, *hash_kv(slot)
-    else
-      tk_call 'place', 'configure', win.epath, "-#{slot}", value
-    end
-  end
-
-  def configinfo(win, slot = nil)
-    # for >= Tk8.4a2 ?
-    if slot
-      conf = tk_split_list(tk_call('place', 'configure', 
-				   win.epath, "-#{slot}") )
-      conf[0] = conf[0][1..-1]
-      conf
-    else
-      tk_split_simplelist(tk_call('place', 'configure', 
-				  win.epath)).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
-	conf[0] = conf[0][1..-1]
-	conf
-      }
-    end
-  end
-
-  def forget(win)
-    tk_call 'place', 'forget', win
-  end
-
-  def info(win)
-    ilist = list(tk_call('place', 'info', win.epath))
-    info = {}
-    while key = ilist.shift
-      info[key[1..-1]] = ilist.shift
-    end
-    return info
-  end
-
-  def slaves(master)
-    list(tk_call('place', 'slaves', master.epath))
-  end
-
-  module_function :configure, :configinfo, :forget, :info, :slaves
-end
-
-module TkOptionDB
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['option'.freeze].freeze
-
-  module Priority
-    WidgetDefault = 20
-    StartupFile   = 40
-    UserDefault   = 60
-    Interactive   = 80
-  end
-
-  def add(pat, value, pri=None)
-    if $SAFE >= 4
-      fail SecurityError, "can't call 'TkOptionDB.add' at $SAFE >= 4"
-    end
+  def add pat, value, pri=None
     tk_call 'option', 'add', pat, value, pri
   end
   def clear
-    if $SAFE >= 4
-      fail SecurityError, "can't call 'TkOptionDB.crear' at $SAFE >= 4"
-    end
     tk_call 'option', 'clear'
   end
-  def get(win, name, klass)
-    tk_call('option', 'get', win ,name, klass)
+  def get win, name, klass
+    tk_call 'option', 'get', win ,name, klass
   end
-  def readfile(file, pri=None)
+  def readfile file, pri=None
     tk_call 'option', 'readfile', file, pri
   end
   module_function :add, :clear, :get, :readfile
-
-  def read_entries(file, f_enc=nil)
-    if TkCore::INTERP.safe?
-      fail SecurityError, 
-	"can't call 'TkOptionDB.read_entries' on a safe interpreter"
-    end
-
-    i_enc = Tk.encoding()
-
-    unless f_enc
-      f_enc = i_enc
-    end
-
-    ent = []
-    cline = ''
-    open(file, 'r') {|f|
-      while line = f.gets
-	cline += line.chomp!
-	case cline
-	when /\\$/    # continue
-	  cline.chop!
-	  next
-	when /^!/     # coment
-	  cline = ''
-	  next
-	when /^([^:]+):\s(.*)$/
-	  pat = $1
-	  val = $2
-	  p "ResourceDB: #{[pat, val].inspect}" if $DEBUG
-	  pat = TkCore::INTERP._toUTF8(pat, f_enc)
-	  pat = TkCore::INTERP._fromUTF8(pat, i_enc)
-	  val = TkCore::INTERP._toUTF8(val, f_enc)
-	  val = TkCore::INTERP._fromUTF8(val, i_enc)
-	  ent << [pat, val]
-	  cline = ''
-	else          # unknown --> ignore
-	  cline = ''
-	  next
-	end
-      end
-    }
-    ent
-  end
-  module_function :read_entries
-      
-  def read_with_encoding(file, f_enc=nil, pri=None)
-    # try to read the file as an OptionDB file
-    readfile(file, pri).each{|pat, val|
-      add(pat, val, pri)
-    }
-
-=begin
-    i_enc = Tk.encoding()
-
-    unless f_enc
-      f_enc = i_enc
-    end
-
-    cline = ''
-    open(file, 'r') {|f|
-      while line = f.gets
-	cline += line.chomp!
-	case cline
-	when /\\$/    # continue
-	  cline.chop!
-	  next
-	when /^!/     # coment
-	  cline = ''
-	  next
-	when /^([^:]+):\s(.*)$/
-	  pat = $1
-	  val = $2
-	  p "ResourceDB: #{[pat, val].inspect}" if $DEBUG
-	  pat = TkCore::INTERP._toUTF8(pat, f_enc)
-	  pat = TkCore::INTERP._fromUTF8(pat, i_enc)
-	  val = TkCore::INTERP._toUTF8(val, f_enc)
-	  val = TkCore::INTERP._fromUTF8(val, i_enc)
-	  add(pat, val, pri)
-	  cline = ''
-	else          # unknown --> ignore
-	  cline = ''
-	  next
-	end
-      end
-    }
-=end
-  end
-  module_function :read_with_encoding
-
-  # support procs on the resource database
-  @@resource_proc_class = Class.new
-  class << @@resource_proc_class
-    private :new
- 
-    CARRIER    = '.'.freeze
-    METHOD_TBL = TkCore::INTERP.create_table
-    ADD_METHOD = false
-    SAFE_MODE  = 4
-
-    def __closed_block_check__(str)
-      depth = 0
-      str.scan(/[{}]/){|x|
-	if x == "{"
-	  depth += 1
-	elsif x == "}"
-	  depth -= 1
-	end
-	if depth <= 0 && !($' =~ /\A\s*\Z/)
-	  fail RuntimeError, "bad string for procedure : #{str.inspect}"
-	end
-      }
-      str
-    end
-
-    def __check_proc_string__(str)
-      # If you want to check the proc_string, do it in this method.
-      # Please define this in the block given to 'new_proc_class' method. 
-      str
-    end
-
-    def method_missing(id, *args)
-      res_proc = self::METHOD_TBL[id]
-      unless res_proc.kind_of? Proc
-        if id == :new || !(self::METHOD_TBL.has_key?(id) || self::ADD_METHOD)
-          raise NoMethodError, 
-                "not support resource-proc '#{id.id2name}' for #{self.name}"
-        end
-        proc_str = TkOptionDB.get(self::CARRIER, id.id2name, '').strip
-        proc_str = '{' + proc_str + '}' unless /\A\{.*\}\Z/ =~ proc_str
-	proc_str = __closed_block_check__(proc_str)
-        proc_str = __check_proc_string__(proc_str)
-        res_proc = eval('Proc.new' + proc_str)
-        self::METHOD_TBL[id] = res_proc
-      end
-      proc{
-         $SAFE = self::SAFE_MODE
-         res_proc.call(*args)
-      }.call
-    end
-
-    private :__closed_block_check__, :__check_proc_string__, :method_missing
-  end
-  @@resource_proc_class.freeze
-
-  def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
-    klass = klass.to_s if klass.kind_of? Symbol
-    unless (?A..?Z) === klass[0]
-      fail ArgumentError, "bad string '#{klass}' for class name"
-    end
-    unless func.kind_of? Array
-      fail ArgumentError, "method-list must be Array"
-    end
-    func_str = func.join(' ')
-    if parent == nil
-      install_win(parent)
-    elsif parent <= @@resource_proc_class
-      install_win(parent::CARRIER)
-    else
-      fail ArgumentError, "parent must be Resource-Proc class"
-    end
-    carrier = Tk.tk_call('frame', @path, '-class', klass)
-
-    body = <<-"EOD"
-      class #{klass} < TkOptionDB.module_eval('@@resource_proc_class')
-        CARRIER    = '#{carrier}'.freeze
-        METHOD_TBL = TkCore::INTERP.create_table
-        ADD_METHOD = #{add}
-        SAFE_MODE  = #{safe}
-        %w(#{func_str}).each{|f| METHOD_TBL[f.intern] = nil }
-      end
-    EOD
-
-    if parent.kind_of?(Class) && parent <= @@resource_proc_class
-      parent.class_eval(body)
-      eval(parent.name + '::' + klass)
-    else
-      eval(body)
-      eval('TkOptionDB::' + klass)
-    end
-  end
-  module_function :__create_new_class
-  private_class_method :__create_new_class
-
-  def __remove_methods_of_proc_class(klass)
-    # for security, make these methods invalid
-    class << klass
-      attr_reader :class_eval, :name, :superclass, 
-	:ancestors, :const_defined?, :const_get, :const_set, 
-	:constants, :included_modules, :instance_methods, 
-	:method_defined?, :module_eval, :private_instance_methods, 
-	:protected_instance_methods, :public_instance_methods, 
-	:remove_const, :remove_method, :undef_method, 
-	:to_s, :inspect, :display, :method, :methods, 
-	:instance_eval, :instance_variables, :kind_of?, :is_a?,
-	:private_methods, :protected_methods, :public_methods
-    end
-  end
-  module_function :__remove_methods_of_proc_class
-  private_class_method :__remove_methods_of_proc_class
-
-  RAND_BASE_CNT = [0]
-  RAND_BASE_HEAD = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-  RAND_BASE_CHAR = RAND_BASE_HEAD + 'abcdefghijklmnopqrstuvwxyz0123456789_'
-  def __get_random_basename
-    name = '%s%03d' % [RAND_BASE_HEAD[rand(RAND_BASE_HEAD.size),1], 
-                       RAND_BASE_CNT[0]]
-    len = RAND_BASE_CHAR.size
-    (6+rand(10)).times{
-      name << RAND_BASE_CHAR[rand(len),1]
-    }
-    RAND_BASE_CNT[0] = RAND_BASE_CNT[0] + 1
-    name
-  end
-  module_function :__get_random_basename
-  private_class_method :__get_random_basename
-
-  # define new proc class :
-  # If you want to modify the new class or create a new subclass, 
-  # you must do such operation in the block parameter. 
-  # Because the created class is flozen after evaluating the block. 
-  def new_proc_class(klass, func, safe = 4, add = false, parent = nil, &b)
-    new_klass = __create_new_class(klass, func, safe, add, parent)
-    new_klass.class_eval(&b) if block_given?
-    __remove_methods_of_proc_class(new_klass)
-    new_klass.freeze
-    new_klass
-  end
-  module_function :new_proc_class
-
-  def eval_under_random_base(parent = nil, &b)
-    new_klass = __create_new_class(__get_random_basename(), 
-				   [], 4, false, parent)
-    ret = new_klass.class_eval(&b) if block_given?
-    __remove_methods_of_proc_class(new_klass)
-    new_klass.freeze
-    ret
-  end
-  module_function :eval_under_random_base
-
-  def new_proc_class_random(klass, func, safe = 4, add = false, &b)
-    eval_under_random_base(){
-      TkOption.new_proc_class(klass, func, safe, add, self, &b)
-    }
-  end
-  module_function :new_proc_class_random
 end
-TkOption = TkOptionDB
-TkResourceDB = TkOptionDB
 
 module TkTreatFont
-  def font_configinfo(name = nil)
+  def font_configinfo
     ret = TkFont.used_on(self.path)
     if ret == nil
-=begin
-      if name
-	ret = name
-      else
-	ret = TkFont.init_widget_font(self.path, self.path, 'configure')
-      end
-=end
       ret = TkFont.init_widget_font(self.path, self.path, 'configure')
     end
     ret
@@ -3442,322 +1459,98 @@ module TkTreatFont
   alias fontobj font_configinfo
 
   def font_configure(slot)
-    slot = _symbolkey2str(slot)
-
-    if slot.key?('font')
-      fnt = slot.delete('font')
+    if (fnt = slot['font'])
+      slot['font'] = nil
       if fnt.kind_of? TkFont
 	return fnt.call_font_configure(self.path, self.path,'configure',slot)
       else
-	if fnt 
-	  if (slot.key?('kanjifont') || 
-	      slot.key?('latinfont') || 
-	      slot.key?('asciifont'))
-	    fnt = TkFont.new(fnt)
-
-	    lfnt = slot.delete('latinfont')
-	    lfnt = slot.delete('asciifont') if slot.key?('asciifont')
-	    kfnt = slot.delete('kanjifont')
-
-	    fnt.latin_replace(lfnt) if lfnt
-	    fnt.kanji_replace(kfnt) if kfnt
-	  else
-	    slot['font'] = fnt
-	    tk_call(self.path, 'configure', *hash_kv(slot))
-	  end
-	end
-	return self
+	latinfont_configure(fnt) if fnt
       end
     end
-
-    lfnt = slot.delete('latinfont')
-    lfnt = slot.delete('asciifont') if slot.key?('asciifont')
-    kfnt = slot.delete('kanjifont')
-
-    if lfnt && kfnt
-      return TkFont.new(lfnt, kfnt).call_font_configure(self.path, self.path, 
-							'configure', slot)
+    if (ltn = slot['latinfont'])
+      slot['latinfont'] = nil
+      latinfont_configure(ltn) if ltn
+    end
+    if (ltn = slot['asciifont'])
+      slot['asciifont'] = nil
+      latinfont_configure(ltn) if ltn
+    end
+    if (knj = slot['kanjifont'])
+      slot['kanjifont'] = nil
+      kanjifont_configure(knj) if knj
     end
 
-    latinfont_configure(lfnt) if lfnt
-    kanjifont_configure(kfnt) if kfnt
-      
     tk_call(self.path, 'configure', *hash_kv(slot)) if slot != {}
     self
   end
 
   def latinfont_configure(ltn, keys=nil)
-    if (fobj = TkFont.used_on(self.path))
-      fobj = TkFont.new(fobj) # create a new TkFont object
-    elsif Tk::JAPANIZED_TK
-      fobj = fontobj          # create a new TkFont object
-    else
-      tk_call(self.path, 'configure', '-font', ltn)
-      return self
-    end
-
-    if fobj.kind_of?(TkFont)
-      if ltn.kind_of? TkFont
-	conf = {}
-	ltn.latin_configinfo.each{|key,val| conf[key] = val}
-	if keys
-	  fobj.latin_configure(conf.update(keys))
-	else
-	  fobj.latin_configure(conf)
-	end
+    fobj = fontobj
+    if ltn.kind_of? TkFont
+      conf = {}
+      ltn.latin_configinfo.each{|key,val| conf[key] = val}
+      if keys
+	fobj.latin_configure(conf.update(keys))
       else
-	fobj.latin_replace(ltn)
+	fobj.latin_configure(conf)
       end
+    else
+      fobj.latin_replace(ltn)
     end
-
-    return fobj.call_font_configure(self.path, self.path, 'configure', {})
   end
   alias asciifont_configure latinfont_configure
 
   def kanjifont_configure(knj, keys=nil)
-    if (fobj = TkFont.used_on(self.path))
-      fobj = TkFont.new(fobj) # create a new TkFont object
-    elsif Tk::JAPANIZED_TK
-      fobj = fontobj          # create a new TkFont object
-    else
-      tk_call(self.path, 'configure', '-font', knj)
-      return self
-    end
-
-    if fobj.kind_of?(TkFont)
-      if knj.kind_of? TkFont
-	conf = {}
-	knj.kanji_configinfo.each{|key,val| conf[key] = val}
-	if keys
-	  fobj.kanji_configure(conf.update(keys))
-	else
-	  fobj.kanji_configure(conf)
-	end
+    fobj = fontobj
+    if knj.kind_of? TkFont
+      conf = {}
+      knj.kanji_configinfo.each{|key,val| conf[key] = val}
+      if keys
+	fobj.kanji_configure(conf.update(keys))
       else
-	fobj.kanji_replace(knj)
+	fobj.kanji_configure(cond)
       end
+    else
+      fobj.kanji_replace(knj)
     end
-
-    return fobj.call_font_configure(self.path, self.path, 'configure', {})
   end
 
   def font_copy(window, tag=nil)
     if tag
-      fnt = window.tagfontobj(tag).dup
+      window.tagfontobj(tag).configinfo.each{|key,value|
+	fontobj.configure(key,value)
+      }
+      fontobj.replace(window.tagfontobj(tag).latin_font, 
+		      window.tagfontobj(tag).kanji_font)
     else
-      fnt = window.fontobj.dup
+      window.fontobj.configinfo.each{|key,value|
+	fontobj.configure(key,value)
+      }
+      fontobj.replace(window.fontobj.latin_font, window.fontobj.kanji_font)
     end
-    fnt.call_font_configure(self.path, self.path, 'configure', {})
-    self
   end
 
   def latinfont_copy(window, tag=nil)
-    fontobj.dup.call_font_configure(self.path, self.path, 'configure', {})
     if tag
-      fontobj.latin_replace(window.tagfontobj(tag).latin_font_id)
+      fontobj.latin_replace(window.tagfontobj(tag).latin_font)
     else
-      fontobj.latin_replace(window.fontobj.latin_font_id)
+      fontobj.latin_replace(window.fontobj.latin_font)
     end
-    self
   end
   alias asciifont_copy latinfont_copy
 
   def kanjifont_copy(window, tag=nil)
-    fontobj.dup.call_font_configure(self.path, self.path, 'configure', {})
     if tag
-      fontobj.kanji_replace(window.tagfontobj(tag).kanji_font_id)
+      fontobj.kanji_replace(window.tagfontobj(tag).kanji_font)
     else
-      fontobj.kanji_replace(window.fontobj.kanji_font_id)
+      fontobj.kanji_replace(window.fontobj.kanji_font)
     end
-    self
-  end
-end
-
-module TkTreatItemFont
-  def __conf_cmd(idx)
-    raise NotImplementedError, "need to define `__conf_cmd'"
-  end
-  def __item_pathname(tagOrId)
-    raise NotImplementedError, "need to define `__item_pathname'"
-  end
-  private :__conf_cmd, :__item_pathname
-
-  def tagfont_configinfo(tagOrId, name = nil)
-    pathname = __item_pathname(tagOrId)
-    ret = TkFont.used_on(pathname)
-    if ret == nil
-=begin
-      if name
-	ret = name
-      else
-	ret = TkFont.init_widget_font(pathname, self.path, 
-				      __conf_cmd(0), __conf_cmd(1), tagOrId)
-      end
-=end
-      ret = TkFont.init_widget_font(pathname, self.path, 
-				    __conf_cmd(0), __conf_cmd(1), tagOrId)
-    end
-    ret
-  end
-  alias tagfontobj tagfont_configinfo
-
-  def tagfont_configure(tagOrId, slot)
-    pathname = __item_pathname(tagOrId)
-    slot = _symbolkey2str(slot)
-
-    if slot.key?('font')
-      fnt = slot.delete('font')
-      if fnt.kind_of? TkFont
-	return fnt.call_font_configure(pathname, self.path,
-				       __conf_cmd(0), __conf_cmd(1), 
-				       tagOrId, slot)
-      else
-	if fnt 
-	  if (slot.key?('kanjifont') || 
-	      slot.key?('latinfont') || 
-	      slot.key?('asciifont'))
-	    fnt = TkFont.new(fnt)
-
-	    lfnt = slot.delete('latinfont')
-	    lfnt = slot.delete('asciifont') if slot.key?('asciifont')
-	    kfnt = slot.delete('kanjifont')
-
-	    fnt.latin_replace(lfnt) if lfnt
-	    fnt.kanji_replace(kfnt) if kfnt
-	  end
-
-	  slot['font'] = fnt
-	  tk_call(self.path, __conf_cmd(0), __conf_cmd(1), 
-		  tagOrId, *hash_kv(slot))
-	end
-	return self
-      end
-    end
-
-    lfnt = slot.delete('latinfont')
-    lfnt = slot.delete('asciifont') if slot.key?('asciifont')
-    kfnt = slot.delete('kanjifont')
-
-    if lfnt && kfnt
-      return TkFont.new(lfnt, kfnt).call_font_configure(pathname, self.path,
-							__conf_cmd(0), 
-							__conf_cmd(1), 
-							tagOrId, slot)
-    end
-
-    latintagfont_configure(tagOrId, lfnt) if lfnt
-    kanjitagfont_configure(tagOrId, kfnt) if kfnt
-      
-    tk_call(self.path, __conf_cmd(0), __conf_cmd(1), 
-	    tagOrId, *hash_kv(slot)) if slot != {}
-    self
-  end
-
-  def latintagfont_configure(tagOrId, ltn, keys=nil)
-    pathname = __item_pathname(tagOrId)
-    if (fobj = TkFont.used_on(pathname))
-      fobj = TkFont.new(fobj)    # create a new TkFont object
-    elsif Tk::JAPANIZED_TK
-      fobj = tagfontobj(tagOrId) # create a new TkFont object
-    else
-      tk_call(self.path, __conf_cmd(0), __conf_cmd(1), tagOrId, '-font', ltn)
-      return self
-    end
-
-    if fobj.kind_of?(TkFont)
-      if ltn.kind_of? TkFont
-	conf = {}
-	ltn.latin_configinfo.each{|key,val| conf[key] = val}
-	if keys
-	  fobj.latin_configure(conf.update(keys))
-	else
-	  fobj.latin_configure(conf)
-	end
-      else
-	fobj.latin_replace(ltn)
-      end
-    end
-
-    return fobj.call_font_configure(pathname, self.path,
-				    __conf_cmd(0), __conf_cmd(1), tagOrId, {})
-  end
-  alias asciitagfont_configure latintagfont_configure
-
-  def kanjitagfont_configure(tagOrId, knj, keys=nil)
-    pathname = __item_pathname(tagOrId)
-    if (fobj = TkFont.used_on(pathname))
-      fobj = TkFont.new(fobj)    # create a new TkFont object
-    elsif Tk::JAPANIZED_TK
-      fobj = tagfontobj(tagOrId) # create a new TkFont object
-    else
-      tk_call(self.path, __conf_cmd(0), __conf_cmd(1), tagOrId, '-font', knj)
-      return self
-    end
-
-    if fobj.kind_of?(TkFont)
-      if knj.kind_of? TkFont
-	conf = {}
-	knj.kanji_configinfo.each{|key,val| conf[key] = val}
-	if keys
-	  fobj.kanji_configure(conf.update(keys))
-	else
-	  fobj.kanji_configure(conf)
-	end
-      else
-	fobj.kanji_replace(knj)
-      end
-    end
-
-    return fobj.call_font_configure(pathname, self.path,
-				    __conf_cmd(0), __conf_cmd(1), tagOrId, {})
-  end
-
-  def tagfont_copy(tagOrId, window, wintag=nil)
-    pathname = __item_pathname(tagOrId)
-    if wintag
-      fnt = window.tagfontobj(wintag).dup
-    else
-      fnt = window.fontobj.dup
-    end
-    fnt.call_font_configure(pathname, self.path, 
-			    __conf_cmd(0), __conf_cmd(1), tagOrId, {})
-    return self
-  end
-
-  def latintagfont_copy(tagOrId, window, wintag=nil)
-    pathname = __item_pathname(tagOrId)
-    tagfontobj(tagOrId).dup.call_font_configure(pathname, self.path, 
-						__conf_cmd(0), __conf_cmd(1), 
-						tagOrId, {})
-    if wintag
-      tagfontobj(tagOrId).
-	latin_replace(window.tagfontobj(wintag).latin_font_id)
-    else
-      tagfontobj(tagOrId).latin_replace(window.fontobj.latin_font_id)
-    end
-    self
-  end
-  alias asciitagfont_copy latintagfont_copy
-
-  def kanjitagfont_copy(tagOrId, window, wintag=nil)
-    pathname = __item_pathname(tagOrId)
-    tagfontobj(tagOrId).dup.call_font_configure(pathname, self.path, 
-						__conf_cmd(0), __conf_cmd(1), 
-						tagOrId, {})
-    if wintag
-      tagfontobj(tagOrId).
-	kanji_replace(window.tagfontobj(wintag).kanji_font_id)
-    else
-      tagfontobj(tagOrId).kanji_replace(window.fontobj.kanji_font_id)
-    end
-    self
   end
 end
 
 class TkObject<TkKernel
   include Tk
   include TkTreatFont
-  include TkBindCore
 
   def path
     return @path
@@ -3785,9 +1578,7 @@ class TkObject<TkKernel
       begin
 	cget name
       rescue
-	fail NameError, 
-	     "undefined local variable or method `#{name}' for #{self.to_s}", 
-	     error_at
+	fail NameError, "undefined local variable or method `#{name}' for #{self.to_s}", error_at
       end
     else
       fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
@@ -3803,42 +1594,21 @@ class TkObject<TkKernel
   end
 
   def cget(slot)
-    case slot.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      tk_call path, 'cget', "-#{slot}"
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_call(path, 'cget', "-#{slot}"))
-      fnt = tk_tcl2ruby(tk_call(path, 'cget', "-font"))
-      unless fnt.kind_of?(TkFont)
-	fnt = fontobj(fnt)
-      end
-      if slot == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-	# obsolete; just for compatibility
-	fnt.kanji_font
-      else
-	fnt
-      end
-    else
-      tk_tcl2ruby tk_call(path, 'cget', "-#{slot}")
-    end
+    tk_tcl2ruby tk_call path, 'cget', "-#{slot}"
   end
 
   def configure(slot, value=None)
     if slot.kind_of? Hash
-      if (slot['font'] || slot[:font] || 
-          slot['kanjifont'] || slot[:kanjifont] || 
-	  slot['latinfont'] || slot[:latinfont] || 
-          slot['asciifont'] || slot[:asciifont] )
-	font_configure(slot)
-      elsif slot.size > 0
+      if (slot['font'] || slot['kanjifont'] ||
+	  slot['latinfont'] || slot['asciifont'] )
+	font_configure(slot.dup)
+      else
 	tk_call path, 'configure', *hash_kv(slot)
       end
 
     else
-      if (slot == 'font' || slot == :font || 
-          slot == 'kanjifont' || slot == :kanjifont || 
-	  slot == 'latinfont' || slot == :latinfont || 
-          slot == 'asciifont' || slot == :asciifont )
+      if (slot == 'font' || slot == 'kanjifont' ||
+	  slot == 'latinfont' || slot == 'asciifont')
 	if value == None
 	  fontobj
 	else
@@ -3848,7 +1618,6 @@ class TkObject<TkKernel
 	tk_call path, 'configure', "-#{slot}", value
       end
     end
-    self
   end
 
   def configure_cmd(slot, value)
@@ -3856,51 +1625,21 @@ class TkObject<TkKernel
   end
 
   def configinfo(slot = nil)
-    if slot == 'font' || slot == :font || 
-       slot == 'kanjifont' || slot == :kanjifont
-      conf = tk_split_simplelist(tk_send('configure', "-#{slot}") )
-      conf[0] = conf[0][1..-1]
-      conf[4] = fontobj(conf[4])
-      conf
+    if slot == 'font' || slot == 'kanjifont'
+      fontobj
     else
       if slot
-	case slot.to_s
-	when 'text', 'label', 'show', 'data', 'file'
-	  conf = tk_split_simplelist(tk_send('configure', "-#{slot}") )
-	else
-	  conf = tk_split_list(tk_send('configure', "-#{slot}") )
-	end
+	conf = tk_split_list(tk_send('configure', "-#{slot}") )
 	conf[0] = conf[0][1..-1]
 	conf
       else
-	ret = tk_split_simplelist(tk_send('configure') ).collect{|conflist|
-	  conf = tk_split_simplelist(conflist)
+	ret = tk_split_list(tk_send('configure') ).collect{|conf|
 	  conf[0] = conf[0][1..-1]
-	  case conf[0]
-	  when 'text', 'label', 'show', 'data', 'file'
-	  else
-	    if conf[3]
-	      if conf[3].index('{')
-		conf[3] = tk_split_list(conf[3]) 
-	      else
-		conf[3] = tk_tcl2ruby(conf[3]) 
-	      end
-	    end
-	    if conf[4]
-	      if conf[4].index('{')
-		conf[4] = tk_split_list(conf[4]) 
-	      else
-		conf[4] = tk_tcl2ruby(conf[4]) 
-	      end
-	    end
-	  end
 	  conf
 	}
-	fontconf = ret.assoc('font')
-	if fontconf
+	if ret.assoc('font')
 	  ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-	  fontconf[4] = fontobj(fontconf[4])
-	  ret.push(fontconf)
+	  ret.push(['font', fontobj])
 	else
 	  ret
 	end
@@ -3908,6 +1647,18 @@ class TkObject<TkKernel
     end
   end
 
+  def bind(context, cmd=Proc.new, args=nil)
+    _bind path, context, cmd, args
+  end
+
+  def bind_append(context, cmd=Proc.new, args=nil)
+    _bind_append path, context, cmd, args
+  end
+
+  def bindinfo(context=nil)
+    _bindinfo path, context
+  end
+
   def event_generate(context, keys=nil)
     if keys
       tk_call('event', 'generate', path, 
@@ -3919,296 +1670,103 @@ class TkObject<TkKernel
 
   def tk_trace_variable(v)
     unless v.kind_of?(TkVariable)
-      fail ArgumentError, 
-	format("type error (%s); must be TkVariable object", v.class)
+      fail ArgumentError, format("requires TkVariable given %s", v.type)
     end
     v
   end
   private :tk_trace_variable
 
   def destroy
-    # tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
+    tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
   end
 end
 
-class TkWindow<TkObject
-  include TkWinfo
-  extend TkBindCore
+module TkClassBind
+  WidgetClassNameTBL = {}
 
-  WidgetClassName = ''.freeze
-  def self.to_eval
-    self::WidgetClassName
+  def TkClassBind.name2class(name)
+    WidgetClassNameTBL[name]
   end
 
-  def initialize(parent=nil, keys=nil)
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      keydup = true
-      parent = keys.delete('parent')
-      widgetname = keys.delete('widgetname')
-      install_win(if parent then parent.path end, widgetname)
-      without_creating = keys.delete('without_creating')
-      if without_creating && !widgetname 
-        fail ArgumentError, 
-             "if set 'without_creating' to true, need to define 'widgetname'"
-      end
-    elsif keys
-      keys = _symbolkey2str(keys)
-      widgetname = keys.delete('widgetname')
-      install_win(if parent then parent.path end, widgetname)
-      without_creating = keys.delete('without_creating')
-      if without_creating && !widgetname 
-        fail ArgumentError, 
-             "if set 'without_creating' to true, need to define 'widgetname'"
-      end
-    else
-      install_win(if parent then parent.path end)
-    end
-    if self.method(:create_self).arity == 0
-      p 'create_self has no arg' if $DEBUG
-      create_self unless without_creating
-      if keys
-        # tk_call @path, 'configure', *hash_kv(keys)
-        configure(keys)
-      end
-    else
-      p 'create_self has args' if $DEBUG
-      fontkeys = {}
-      if keys
-        ['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
-          fontkeys[key] = keys.delete(key) if keys.key?(key)
-        }
-      end
-      if without_creating && keys
-        configure(keys)
-      else
-        create_self(keys)
-      end
-      font_configure(fontkeys) unless fontkeys.empty?
-    end
+  def bind(context, cmd=Proc.new, args=nil)
+    Tk.bind to_eval, context, cmd, args
   end
 
-  def create_self
+  def bind_append(context, cmd=Proc.new, args=nil)
+    Tk.bind_append to_eval, context, cmd, args
   end
-  private :create_self
 
-  def bind_class
-    @db_class || self.class()
+  def bindinfo(context=nil)
+    Tk.bindinfo to_eval, context
   end
+end
 
-  def database_classname
-    TkWinfo.classname(self)
-  end
-  def database_class
-    name = database_classname()
-    if WidgetClassNames[name]
-      WidgetClassNames[name]
-    else
-      TkDatabaseClass.new(name)
+class TkWindow<TkObject
+  extend TkClassBind
+
+  def initialize(parent=nil, keys=nil)
+    install_win(if parent then parent.path end)
+    create_self
+    if keys
+      # tk_call @path, 'configure', *hash_kv(keys)
+      configure(keys)
     end
   end
-  def self.database_classname
-    self::WidgetClassName
-  end
-  def self.database_class
-    WidgetClassNames[self::WidgetClassName]
-  end
 
-  def pack(keys = nil)
-    tk_call 'pack', epath, *hash_kv(keys)
-    self
+  def create_self
   end
+  private :create_self
 
-  def pack_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
-    else
-      keys = {'in'=>target}
-    end
+  def pack(keys = nil)
     tk_call 'pack', epath, *hash_kv(keys)
     self
   end
 
-  def unpack
+  def unpack(keys = nil)
     tk_call 'pack', 'forget', epath
     self
   end
-  alias pack_forget unpack
-
-  def pack_config(slot, value=None)
-    if slot.kind_of? Hash
-      tk_call 'pack', 'configure', epath, *hash_kv(slot)
-    else
-      tk_call 'pack', 'configure', epath, "-#{slot}", value
-    end
-  end
-
-  def pack_info()
-    ilist = list(tk_call('pack', 'info', epath))
-    info = {}
-    while key = ilist.shift
-      info[key[1..-1]] = ilist.shift
-    end
-    return info
-  end
-
-  def pack_propagate(mode = nil)
-    if mode
-      tk_call('pack', 'propagate', epath, mode)
-    else
-      bool(tk_call('pack', 'propagate', epath))
-    end
-  end
-
-  def pack_slaves()
-    list(tk_call('pack', 'slaves', epath))
-  end
 
   def grid(keys = nil)
     tk_call 'grid', epath, *hash_kv(keys)
     self
   end
 
-  def grid_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
-    else
-      keys = {'in'=>target}
-    end
-    tk_call 'grid', epath, *hash_kv(keys)
-    self
-  end
-
-  def ungrid
+  def ungrid(keys = nil)
     tk_call 'grid', 'forget', epath
     self
   end
-  alias grid_forget ungrid
-
-  def grid_bbox(*args)
-    list(tk_call('grid', 'bbox', epath, *args))
-  end
-
-  def grid_config(slot, value=None)
-    if slot.kind_of? Hash
-      tk_call 'grid', 'configure', epath, *hash_kv(slot)
-    else
-      tk_call 'grid', 'configure', epath, "-#{slot}", value
-    end
-  end
-
-  def grid_columnconfig(index, keys)
-    tk_call('grid', 'columnconfigure', epath, index, *hash_kv(keys))
-  end
-
-  def grid_rowconfig(index, keys)
-    tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
-  end
-
-  def grid_columnconfiginfo(index, slot=nil)
-    if slot
-      tk_call('grid', 'columnconfigure', epath, index, "-#{slot}").to_i
-    else
-      ilist = list(tk_call('grid', 'columnconfigure', epath, index))
-      info = {}
-      while key = ilist.shift
-	info[key[1..-1]] = ilist.shift
-      end
-      info
-    end
-  end
-
-  def grid_rowconfiginfo(index, slot=nil)
-    if slot
-      tk_call('grid', 'rowconfigure', epath, index, "-#{slot}").to_i
-    else
-      ilist = list(tk_call('grid', 'rowconfigure', epath, index))
-      info = {}
-      while key = ilist.shift
-	info[key[1..-1]] = ilist.shift
-      end
-      info
-    end
-  end
-
-  def grid_info()
-    list(tk_call('grid', 'info', epath))
-  end
-
-  def grid_location(x, y)
-    list(tk_call('grid', 'location', epath, x, y))
-  end
-
-  def grid_propagate(mode=nil)
-    if mode
-      tk_call('grid', 'propagate', epath, mode)
-    else
-      bool(tk_call('grid', 'propagate', epath))
-    end
-  end
-
-  def grid_remove()
-    tk_call 'grid', 'remove', epath
-  end
-
-  def grid_size()
-    tk_call 'grid', 'size', epath
-  end
-
-  def grid_slaves(args)
-    list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
-  end
 
   def place(keys = nil)
     tk_call 'place', epath, *hash_kv(keys)
     self
   end
 
-  def place_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
-    else
-      keys = {'in'=>target}
-    end
-    tk_call 'place', epath, *hash_kv(keys)
+  def unplace(keys = nil)
+    tk_call 'place', 'forget', epath, *hash_kv(keys)
     self
   end
+  alias place_forget unplace
 
-  def unplace
-    tk_call 'place', 'forget', epath
-    self
+  def place_config(keys)
+    tk_call "place", 'configure', epath, *hash_kv(keys)
   end
-  alias place_forget unplace
 
-  def place_config(slot, value=None)
-    if slot.kind_of? Hash
-      tk_call 'place', 'configure', epath, *hash_kv(slot)
-    else
-      tk_call 'place', 'configure', epath, "-#{slot}", value
+  def place_info()
+    ilist = list(tk_call('place', 'info', epath))
+    info = {}
+    while key = ilist.shift
+      info[key[1..-1]] = ilist.shift
     end
+    return info
   end
 
-  def place_configinfo(slot = nil)
-    # for >= Tk8.4a2 ?
-    if slot
-      conf = tk_split_list(tk_call('place', 'configure', epath, "-#{slot}") )
-      conf[0] = conf[0][1..-1]
-      conf
-    else
-      tk_split_simplelist(tk_call('place', 
-				  'configure', epath)).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
-	conf[0] = conf[0][1..-1]
-	conf
-      }
-    end
+  def pack_slaves()
+    list(tk_call('pack', 'slaves', epath))
   end
 
-  def place_info()
-    ilist = list(tk_call('place', 'info', epath))
+  def pack_info()
+    ilist = list(tk_call('pack', 'info', epath))
     info = {}
     while key = ilist.shift
       info[key[1..-1]] = ilist.shift
@@ -4232,51 +1790,30 @@ class TkWindow<TkObject
   def grab(*args)
     if !args or args.length == 0
       tk_call 'grab', 'set', path
-      self
     elsif args.length == 1
       case args[0]
-      when 'global', :global
-	#return(tk_call('grab', 'set', '-global', path))
-	tk_call('grab', 'set', '-global', path)
-	return self
-      when 'release', :release
-	#return tk_call('grab', 'release', path)
-	tk_call('grab', 'release', path)
-	return self
+      when 'global'
+	tk_call 'grab', 'set', '-global', path
       else
 	val = tk_call('grab', args[0], path)
       end
       case args[0]
-      when 'current', :current
+      when 'current'
 	return window(val)
-      when 'status', :status
+      when 'status'
 	return val
       end
-      self
     else
       fail ArgumentError, 'wrong # of args'
     end
   end
 
-  def grab_current
-    grab('current')
-  end
-  def grab_set
-    grab('set')
-  end
-  def grab_set_global
-    grab('global')
-  end
-  def grab_status
-    grab('status')
-  end
-
   def lower(below=None)
-    tk_call 'lower', epath, below
+    tk_call 'lower', path, below
     self
   end
   def raise(above=None)
-    tk_call 'raise', epath, above
+    tk_call 'raise', path, above
     self
   end
 
@@ -4290,162 +1827,57 @@ class TkWindow<TkObject
   end
 
   def destroy
-    super
-    children = []
-    rexp = /^#{self.path}\.[^.]+$/
-    TkCore::INTERP.tk_windows.each{|path, obj|
-      children << [path, obj] if path =~ rexp
-    }
-    if defined?(@cmdtbl)
+    tk_call 'destroy', path
+    if @cmdtbl
       for id in @cmdtbl
 	uninstall_cmd id
       end
     end
-
-    children.each{|path, obj|
-      if defined?(@cmdtbl)
-	for id in @cmdtbl
-	  uninstall_cmd id
-	end
-      end
-      TkCore::INTERP.tk_windows.delete(path)
-    }
-
-    begin
-      tk_call 'destroy', epath
-    rescue
-    end
     uninstall_win
   end
 
-  def wait_visibility(on_thread = true)
-    if $SAFE >= 4
-      fail SecurityError, "can't wait visibility at $SAFE >= 4"
-    end
-    if on_thread
-      INTERP._thread_tkwait('visibility', path)
-    else
-      INTERP._invoke('tkwait', 'visibility', path)
-    end
-  end
-  def eventloop_wait_visibility
-    wait_visibility(false)
-  end
-  def thread_wait_visibility
-    wait_visibility(true)
+  def wait_visibility
+    tk_call 'tkwait', 'visibility', path
   end
   alias wait wait_visibility
-  alias tkwait wait_visibility
-  alias eventloop_wait eventloop_wait_visibility
-  alias eventloop_tkwait eventloop_wait_visibility
-  alias eventloop_tkwait_visibility eventloop_wait_visibility
-  alias thread_wait thread_wait_visibility
-  alias thread_tkwait thread_wait_visibility
-  alias thread_tkwait_visibility thread_wait_visibility
-
-  def wait_destroy(on_thread = true)
-    if $SAFE >= 4
-      fail SecurityError, "can't wait destroy at $SAFE >= 4"
-    end
-    if on_thread
-      INTERP._thread_tkwait('window', epath)
-    else
-      INTERP._invoke('tkwait', 'window', epath)
-    end
-  end
-  def eventloop_wait_destroy
-    wait_destroy(false)
-  end
-  def thread_wait_destroy
-    wait_destroy(true)
+
+  def wait_destroy
+    tk_call 'tkwait', 'window', path
   end
-  alias tkwait_destroy wait_destroy
-  alias eventloop_tkwait_destroy eventloop_wait_destroy
-  alias thread_tkwait_destroy thread_wait_destroy
 
   def bindtags(taglist=nil)
     if taglist
-      fail ArgumentError, "taglist must be Array" unless taglist.kind_of? Array
+      fail unless taglist.kind_of? Array
       tk_call('bindtags', path, taglist)
-      taglist
     else
-      list(tk_call('bindtags', path)).collect{|tag|
-	if tag.kind_of?(String) 
-	  if cls = WidgetClassNames[tag]
-	    cls
-	  elsif btag = TkBindTag.id2obj(tag)
-	    btag
-	  else
-	    tag
-	  end
+      tk_split_list(tk_call('bindtags', path)).collect{|tag|
+	if tag == nil
+	  '.'
+	elsif tag.kind_of?(String) && (cls = TkClassBind.name2class(tag))
+	  cls
 	else
 	  tag
 	end
       }
     end
   end
-
-  def bindtags=(taglist)
-    bindtags(taglist)
-  end
-
-  def bindtags_shift
-    taglist = bindtags
-    tag = taglist.shift
-    bindtags(taglist)
-    tag
-  end
-
-  def bindtags_unshift(tag)
-    bindtags(bindtags().unshift(tag))
-  end
 end
 
 class TkRoot<TkWindow
   include Wm
-
-=begin
   ROOT = []
-  def TkRoot.new(keys=nil)
-    if ROOT[0]
-      Tk_WINDOWS["."] = ROOT[0]
-      return ROOT[0]
-    end
-    new = super(:without_creating=>true, :widgetname=>'.')
-    if keys  # wm commands
-      keys.each{|k,v|
-	if v.kind_of? Array
-	  new.send(k,*v)
-	else
-	  new.send(k,v)
-	end
-      }
-    end
+  def TkRoot.new
+    return ROOT[0] if ROOT[0]
+    new = super
     ROOT[0] = new
     Tk_WINDOWS["."] = new
   end
-=end
-  def TkRoot.new(keys=nil, &b)
-    unless TkCore::INTERP.tk_windows['.']
-      TkCore::INTERP.tk_windows['.'] = 
-	super(:without_creating=>true, :widgetname=>'.')
-    end
-    root = TkCore::INTERP.tk_windows['.']
-    if keys  # wm commands
-      keys.each{|k,v|
-	if v.kind_of? Array
-	  root.send(k,*v)
-	else
-	  root.send(k,v)
-	end
-      }
-    end
-    root.instance_eval(&b) if block_given?
-    root
-  end
 
   WidgetClassName = 'Tk'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
+  end
 
   def create_self
     @path = '.'
@@ -4453,473 +1885,118 @@ class TkRoot<TkWindow
   def path
     "."
   end
-
-  def TkRoot.destroy
-    TkCore::INTERP._invoke('destroy', '.')
-  end
 end
 
 class TkToplevel<TkWindow
   include Wm
 
-  TkCommandNames = ['toplevel'.freeze].freeze
   WidgetClassName = 'Toplevel'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-################# old version
-#  def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
-#    if screen.kind_of? Hash
-#      keys = screen.dup
-#    else
-#      @screen = screen
-#    end
-#    @classname = classname
-#    if keys.kind_of? Hash
-#      keys = keys.dup
-#      @classname = keys.delete('classname') if keys.key?('classname')
-#      @colormap  = keys.delete('colormap')  if keys.key?('colormap')
-#      @container = keys.delete('container') if keys.key?('container')
-#      @screen    = keys.delete('screen')    if keys.key?('screen')
-#      @use       = keys.delete('use')       if keys.key?('use')
-#      @visual    = keys.delete('visual')    if keys.key?('visual')
-#    end
-#    super(parent, keys)
-#  end
-#
-#  def create_self
-#    s = []
-#    s << "-class"     << @classname if @classname
-#    s << "-colormap"  << @colormap  if @colormap
-#    s << "-container" << @container if @container
-#    s << "-screen"    << @screen    if @screen 
-#    s << "-use"       << @use       if @use
-#    s << "-visual"    << @visual    if @visual
-#    tk_call 'toplevel', @path, *s
-#  end
-#################
-
-  def _wm_command_option_chk(keys)
-    keys = {} unless keys
-    new_keys = {}
-    wm_cmds = {}
-    keys.each{|k,v|
-      if Wm.method_defined?(k)
-	case k
-	when 'screen','class','colormap','container','use','visual'
-	  new_keys[k] = v
-	else
-	  case self.method(k).arity
-	  when -1,1
-	    wm_cmds[k] = v
-	  else
-	    new_keys[k] = v
-	  end
-	end
-      else
-	new_keys[k] = v
-      end
-    }
-    [new_keys, wm_cmds]
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
   end
-  private :_wm_command_option_chk
 
   def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
-    my_class_name = nil
-    if self.class < WidgetClassNames[WidgetClassName]
-      my_class_name = self.class.name
-      my_class_name = nil if my_class_name == ''
-    end
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      if keys.key?('classname')
-	keys['class'] = keys.delete('classname')
-      end
-      @classname = keys['class']
-      @colormap  = keys['colormap']
-      @container = keys['container']
-      @screen    = keys['screen']
-      @use       = keys['use']
-      @visual    = keys['visual']
-      if !@classname && my_class_name
-	keys['class'] = @classname = my_class_name 
-      end
-      if @classname.kind_of? TkBindTag
-	@db_class = @classname
-	@classname = @classname.id
-      elsif @classname
-	@db_class = TkDatabaseClass.new(@classname)
-      else
-	@db_class = self.class
-	@classname = @db_class::WidgetClassName
-      end
-      keys, cmds = _wm_command_option_chk(keys)
-      super(keys)
-      cmds.each{|k,v| 
-	if v.kind_of? Array
-	  self.send(k,*v)
-	else
-	  self.send(k,v)
-	end
-      }
-      return
-    end
-
     if screen.kind_of? Hash
-      keys = screen
+      keys = screen.dup
     else
       @screen = screen
-      if classname.kind_of? Hash
-	keys = classname
-      else
-	@classname = classname
-      end
     end
+    @classname = classname
     if keys.kind_of? Hash
-      keys = _symbolkey2str(keys)
-      if keys.key?('classname')
-	keys['class'] = keys.delete('classname')
+      keys = keys.dup
+      if keys['classname']
+	@classname = keys['classname']
+	keys['classname'] = nil
+      end
+      if keys['colormap']
+	@colormap = keys['colormap']
+	keys['colormap'] = nil
+      end
+      if keys['container']
+	@classname = keys['container']
+	keys['classname'] = nil
+      end
+      if keys['screen']
+	@screen = keys['screen']
+	keys['screen'] = nil
+      end
+      if keys['use']
+	@use = keys['use']
+	keys['use'] = nil
+      end
+      if keys['visual']
+	@screen = keys['visual']
+	keys['visual'] = nil
       end
-      @classname = keys['class']  unless @classname
-      @colormap  = keys['colormap']
-      @container = keys['container']
-      @screen    = keys['screen'] unless @screen
-      @use       = keys['use']
-      @visual    = keys['visual']
-    else
-      keys = {}
-    end
-    if !@classname && my_class_name
-      keys['class'] = @classname = my_class_name 
-    end
-    if @classname.kind_of? TkBindTag
-      @db_class = @classname
-      @classname = @classname.id
-    elsif @classname
-      @db_class = TkDatabaseClass.new(@classname)
-    else
-      @db_class = self.class
-      @classname = @db_class::WidgetClassName
     end
-    keys, cmds = _wm_command_option_chk(keys)
     super(parent, keys)
-    cmds.each{|k,v| 
-      if v.kind_of? Array
-	self.send(k,*v)
-      else
-	self.send(k,v)
-      end
-    }
   end
 
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'toplevel', @path, *hash_kv(keys)
-    else
-      tk_call 'toplevel', @path
-    end
+  def create_self
+    s = []
+    s.push << "-class"     << @classname if @classname
+    s.push << "-colormap"  << @colormap  if @colormap
+    s.push << "-container" << @container if @container
+    s.push << "-screen"    << @screen    if @screen 
+    s.push << "-use"       << @use       if @use
+    s.push << "-visual"    << @visual    if @visual
+    tk_call 'toplevel', @path, *s
   end
 
   def specific_class
     @classname
   end
-
-  def self.database_class
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      self
-    else
-      TkDatabaseClass.new(self.name)
-    end
-  end
-  def self.database_classname
-    self.database_class.name
-  end
-
-  def self.bind(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bind(*args)
-    end
-  end
-  def self.bind_append(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bind_append(*args)
-    end
-  end
-  def self.bind_remove(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bind_remove(*args)
-    end
-  end
-  def self.bindinfo(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bindinfo(*args)
-    end
-  end
 end
 
 class TkFrame<TkWindow
-  TkCommandNames = ['frame'.freeze].freeze
   WidgetClassName = 'Frame'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-################# old version
-#  def initialize(parent=nil, keys=nil)
-#    if keys.kind_of? Hash
-#      keys = keys.dup
-#      @classname = keys.delete('classname') if keys.key?('classname')
-#      @colormap  = keys.delete('colormap')  if keys.key?('colormap')
-#      @container = keys.delete('container') if keys.key?('container')
-#      @visual    = keys.delete('visual')    if keys.key?('visual')
-#    end
-#    super(parent, keys)
-#  end
-#
-#  def create_self
-#    s = []
-#    s << "-class"     << @classname if @classname
-#    s << "-colormap"  << @colormap  if @colormap
-#    s << "-container" << @container if @container
-#    s << "-visual"    << @visual    if @visual
-#    tk_call 'frame', @path, *s
-#  end
-#################
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
+  end
 
   def initialize(parent=nil, keys=nil)
-    my_class_name = nil
-    if self.class < WidgetClassNames[WidgetClassName]
-      my_class_name = self.class.name
-      my_class_name = nil if my_class_name == ''
-    end
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-    else
-      if keys
-        keys = _symbolkey2str(keys)
-        keys['parent'] = parent
-      else
-        keys = {'parent'=>parent}
+    if keys.kind_of? Hash
+      keys = keys.dup
+      if keys['classname']
+	@classname = keys['classname']
+	keys['classname'] = nil
+      end
+      if keys['colormap']
+	@colormap = keys['colormap']
+	keys['colormap'] = nil
+      end
+      if keys['container']
+      @classname = keys['container']
+	keys['classname'] = nil
+      end
+      if keys['visual']
+	@screen = keys['visual']
+	keys['visual'] = nil
       end
     end
-    if keys.key?('classname')
-       keys['class'] = keys.delete('classname')
-    end
-    @classname = keys['class']
-    @colormap  = keys['colormap']
-    @container = keys['container']
-    @visual    = keys['visual']
-    if !@classname && my_class_name
-      keys['class'] = @classname = my_class_name
-    end
-    if @classname.kind_of? TkBindTag
-      @db_class = @classname
-      @classname = @classname.id
-    elsif @classname
-      @db_class = TkDatabaseClass.new(@classname)
-    else
-      @db_class = self.class
-      @classname = @db_class::WidgetClassName
-    end
-    super(keys)
-  end
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'frame', @path, *hash_kv(keys)
-    else
-      tk_call 'frame', @path
-    end
-  end
-
-  def database_classname
-    @classname
-  end
-
-  def self.database_class
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      self
-    else
-      TkDatabaseClass.new(self.name)
-    end
-  end
-  def self.database_classname
-    self.database_class.name
-  end
-
-  def self.bind(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bind(*args)
-    end
-  end
-  def self.bind_append(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bind_append(*args)
-    end
-  end
-  def self.bind_remove(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bind_remove(*args)
-    end
-  end
-  def self.bindinfo(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bindinfo(*args)
-    end
-  end
-end
-
-class TkLabelFrame<TkFrame
-  TkCommandNames = ['labelframe'.freeze].freeze
-  WidgetClassName = 'Labelframe'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'labelframe', @path, *hash_kv(keys)
-    else
-      tk_call 'labelframe', @path
-    end
-  end
-end
-TkLabelframe = TkLabelFrame
-
-class TkPanedWindow<TkWindow
-  TkCommandNames = ['panedwindow'.freeze].freeze
-  WidgetClassName = 'Panedwindow'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'panedwindow', @path, *hash_kv(keys)
-    else
-      tk_call 'panedwindow', @path
-    end
-  end
-
-  def add(*args)
-    keys = args.pop
-    fail ArgumentError, "no window in arguments" unless keys
-    if keys && keys.kind_of?(Hash)
-      fail ArgumentError, "no window in arguments" if args == []
-      args += hash_kv(keys)
-    else
-      args.push(keys) if keys
-    end
-    tk_send('add', *args)
-    self
-  end
-
-  def forget(win, *wins)
-    tk_send('forget', win, *wins)
-    self
-  end
-  alias del forget
-  alias delete forget
-  alias remove forget
-
-  def identify(x, y)
-    list(tk_send('identify', x, y))
-  end
-
-  def proxy_coord
-    list(tk_send('proxy', 'coord'))
-  end
-  def proxy_forget
-    tk_send('proxy', 'forget')
-    self
-  end
-  def proxy_place(x, y)
-    tk_send('proxy', 'place', x, y)
-    self
-  end
-
-  def sash_coord(index)
-    list(tk_send('sash', 'coord', index))
-  end
-  def sash_dragto(index)
-    tk_send('sash', 'dragto', index, x, y)
-    self
-  end
-  def sash_mark(index, x, y)
-    tk_send('sash', 'mark', index, x, y)
-    self
-  end
-  def sash_place(index, x, y)
-    tk_send('sash', 'place', index, x, y)
-    self
-  end
-
-  def panecget(win, key)
-    tk_tcl2ruby(tk_send('panecget', win, "-#{key}"))
-  end
-
-  def paneconfigure(win, key, value=nil)
-    if key.kind_of? Hash
-      tk_send('paneconfigure', win, *hash_kv(key))
-    else
-      tk_send('paneconfigure', win, "-#{key}", value)
-    end
-    self
-  end
-  alias pane_config paneconfigure
-
-  def paneconfiginfo(win, key=nil)
-    if key
-      conf = tk_split_list(tk_send('paneconfigure', win, "-#{key}"))
-      conf[0] = conf[0][1..-1]
-      conf
-    else
-      tk_split_simplelist(tk_send('paneconfigure', win)).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
-	conf[0] = conf[0][1..-1]
-	if conf[3]
-	  if conf[3].index('{')
-	    conf[3] = tk_split_list(conf[3]) 
-	  else
-	    conf[3] = tk_tcl2ruby(conf[3]) 
-	  end
-	end
-	if conf[4]
-	  if conf[4].index('{')
-	    conf[4] = tk_split_list(conf[4]) 
-	  else
-	    conf[4] = tk_tcl2ruby(conf[4]) 
-	  end
-	end
-	conf
-      }
-    end
+    super(parent, keys)
   end
-  alias pane_configinfo paneconfiginfo
 
-  def panes
-    list(tk_send('panes'))
+  def create_self
+    s = []
+    s.push << "-class"     << @classname if @classname
+    s.push << "-colormap"  << @colormap  if @colormap
+    s.push << "-container" << @container if @container
+    s.push << "-visual"    << @visual    if @visual
+    tk_call 'frame', @path, *s
   end
 end
-TkPanedwindow = TkPanedWindow
 
 class TkLabel<TkWindow
-  TkCommandNames = ['label'.freeze].freeze
   WidgetClassName = 'Label'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'label', @path, *hash_kv(keys)
-    else
-      tk_call 'label', @path
-    end
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
+  end
+  def create_self
+    tk_call 'label', @path
   end
   def textvariable(v)
     configure 'textvariable', tk_trace_variable(v)
@@ -4927,142 +2004,80 @@ class TkLabel<TkWindow
 end
 
 class TkButton<TkLabel
-  TkCommandNames = ['button'.freeze].freeze
-  WidgetClassName = 'Button'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'button', @path, *hash_kv(keys)
-    else
-      tk_call 'button', @path
-    end
+  TkClassBind::WidgetClassNameTBL['Button'] = self
+  def TkButton.to_eval
+    'Button'
+  end
+  def create_self
+    tk_call 'button', @path
   end
   def invoke
     tk_send 'invoke'
   end
   def flash
     tk_send 'flash'
-    self
   end
 end
 
 class TkRadioButton<TkButton
-  TkCommandNames = ['radiobutton'.freeze].freeze
-  WidgetClassName = 'Radiobutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'radiobutton', @path, *hash_kv(keys)
-    else
-      tk_call 'radiobutton', @path
-    end
+  TkClassBind::WidgetClassNameTBL['Radiobutton'] = self
+  def TkRadioButton.to_eval
+    'Radiobutton'
+  end
+  def create_self
+    tk_call 'radiobutton', @path
   end
   def deselect
     tk_send 'deselect'
-    self
   end
   def select
     tk_send 'select'
-    self
   end
   def variable(v)
     configure 'variable', tk_trace_variable(v)
   end
 end
-TkRadiobutton = TkRadioButton
 
 class TkCheckButton<TkRadioButton
-  TkCommandNames = ['checkbutton'.freeze].freeze
-  WidgetClassName = 'Checkbutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'checkbutton', @path, *hash_kv(keys)
-    else
-      tk_call 'checkbutton', @path
-    end
+  TkClassBind::WidgetClassNameTBL['Checkbutton'] = self
+  def TkCheckButton.to_eval
+    'Checkbutton'
+  end
+  def create_self
+    tk_call 'checkbutton', @path
   end
   def toggle
     tk_send 'toggle'
-    self
   end
 end
-TkCheckbutton = TkCheckButton
 
 class TkMessage<TkLabel
-  TkCommandNames = ['message'.freeze].freeze
-  WidgetClassName = 'Message'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'message', @path, *hash_kv(keys)
-    else
-      tk_call 'message', @path
-    end
+  TkClassBind::WidgetClassNameTBL['Message'] = self
+  def TkMessage.to_eval
+    'Message'
+  end
+  def create_self
+    tk_call 'message', @path
   end
 end
 
 class TkScale<TkWindow
-  TkCommandNames = ['scale'.freeze].freeze
   WidgetClassName = 'Scale'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def create_self(keys)
-    if keys and keys != None
-      if keys.key?('command')
-	cmd = keys.delete('command')
-	keys['command'] = proc{|val| cmd.call(val.to_f)}
-      end
-      tk_call 'scale', @path, *hash_kv(keys)
-    else
-      tk_call 'scale', @path
-    end
-  end
-
-  def _wrap_command_arg(cmd)
-    proc{|val|
-      if val.kind_of?(String)
-	cmd.call(number(val))
-      else
-	cmd.call(val)
-      end
-    }
-  end
-  private :_wrap_command_arg
-
-  def configure_cmd(slot, value)
-    configure(slot=>value)
-  end
-
-  def configure(slot, value=None)
-    if (slot == 'command' || slot == :command)
-      configure('command'=>value)
-    elsif slot.kind_of?(Hash) && 
-	(slot.key?('command') || slot.key?(:command))
-      slot = _symbolkey2str(slot)
-      slot['command'] = _wrap_command_arg(slot.delete('command'))
-    end
-    super(slot, value)
-  end
-
-  def command(cmd=Proc.new)
-    configure('command'=>cmd)
-  end
-
-  def get(x=None, y=None)
-    number(tk_send('get', x, y))
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
   end
 
-  def coords(val=None)
-    tk_split_list(tk_send('coords', val))
+  def create_self
+    tk_call 'scale', path
   end
 
-  def identify(x, y)
-    tk_send('identify', x, y)
+  def get
+    number(tk_send('get'))
   end
 
   def set(val)
-    tk_send("set", val)
+    tk_send "set", val
   end
 
   def value
@@ -5070,21 +2085,19 @@ class TkScale<TkWindow
   end
 
   def value= (val)
-    set(val)
+    set val
   end
 end
 
 class TkScrollbar<TkWindow
-  TkCommandNames = ['scrollbar'.freeze].freeze
   WidgetClassName = 'Scrollbar'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
+  end
 
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'scrollbar', @path, *hash_kv(keys)
-    else
-      tk_call 'scrollbar', @path
-    end
+  def create_self
+    tk_call 'scrollbar', path
   end
 
   def delta(deltax=None, deltay=None)
@@ -5095,8 +2108,8 @@ class TkScrollbar<TkWindow
     number(tk_send('fraction', x, y))
   end
 
-  def identify(x, y)
-    tk_send('identify', x, y)
+  def identify(x=None, y=None)
+    tk_send('fraction', x, y)
   end
 
   def get
@@ -5110,299 +2123,231 @@ class TkScrollbar<TkWindow
 
   def set(first, last)
     tk_send "set", first, last
-    self
-  end
-
-  def activate(element=None)
-    tk_send('activate', element)
   end
 end
 
 class TkTextWin<TkWindow
   def create_self
-    fail TypeError, "TkTextWin is abstract class"
+    raise TypeError, "TkTextWin is abstract class"
   end
 
   def bbox(index)
-    list(tk_send('bbox', index))
+    tk_send 'bbox', index
   end
   def delete(first, last=None)
     tk_send 'delete', first, last
-    self
   end
   def get(*index)
     tk_send 'get', *index
   end
-  def insert(index, *args)
-    tk_send 'insert', index, *args
-    self
+  def index(index)
+    tk_send 'index', index
+  end
+  def insert(index, chars, *args)
+    tk_send 'insert', index, chars, *args
   end
   def scan_mark(x, y)
     tk_send 'scan', 'mark', x, y
-    self
   end
   def scan_dragto(x, y)
     tk_send 'scan', 'dragto', x, y
-    self
   end
   def see(index)
     tk_send 'see', index
-    self
-  end
-end
-
-module TkTreatListItemFont
-  include TkTreatItemFont
-
-  ItemCMD = ['itemconfigure'.freeze, TkComm::None].freeze
-  def __conf_cmd(idx)
-    ItemCMD[idx]
-  end
-
-  def __item_pathname(tagOrId)
-    self.path + ';' + tagOrId.to_s
   end
 end
 
 class TkListbox<TkTextWin
-  include TkTreatListItemFont
-  include Scrollable
-
-  TkCommandNames = ['listbox'.freeze].freeze
-  WidgetClassName = 'Listbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'listbox', @path, *hash_kv(keys)
-    else
-      tk_call 'listbox', @path
-    end
+  TkClassBind::WidgetClassNameTBL['Listbox'] = self
+  def TkListbox.to_eval
+    'Listbox'
+  end
+  def create_self
+    tk_call 'listbox', path
   end
 
   def activate(y)
     tk_send 'activate', y
-    self
   end
   def curselection
     list(tk_send('curselection'))
   end
-  def get(*index)
-    v = tk_send('get', *index)
-    if index.size == 1
-      v
-    else
-      tk_split_simplelist(v)
-    end
-  end
   def nearest(y)
     tk_send('nearest', y).to_i
   end
-  def size
+  def size(y)
     tk_send('size').to_i
   end
   def selection_anchor(index)
     tk_send 'selection', 'anchor', index
-    self
   end
   def selection_clear(first, last=None)
     tk_send 'selection', 'clear', first, last
-    self
   end
-  def selection_includes(index)
-    bool(tk_send('selection', 'includes', index))
+  def selection_includes
+    bool(tk_send('selection', 'includes'))
   end
   def selection_set(first, last=None)
     tk_send 'selection', 'set', first, last
-    self
   end
+  def xview(cmd, *more)
+    v = tk_send('xview', cmd, *more)
+    v.to_i if more.size == 0
+  end
+  def yview(cmd, *more)
+    v = tk_send('yview', cmd, *more)
+    v.to_i if more.size == 0
+  end
+end
 
-  def index(index)
-    tk_send('index', index).to_i
-  end
-
-  def itemcget(index, key)
-    case key.to_s
-    when 'text', 'label', 'show'
-      tk_send('itemcget', index, "-#{key}")
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('itemcget', index, "-#{key}"))
-      fnt = tk_tcl2ruby(tk_send('itemcget', index, '-font'))
-      unless fnt.kind_of?(TkFont)
-	fnt = tagfontobj(index, fnt)
-      end
-      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-	# obsolete; just for compatibility
-	fnt.kanji_font
-      else
-	fnt
-      end
-    else
-      tk_tcl2ruby(tk_send('itemcget', index, "-#{key}"))
+module TkTreatMenuEntryFont
+  def tagfont_configinfo(index)
+    pathname = self.path + ';' + index
+    ret = TkFont.used_on(pathname)
+    if ret == nil
+      ret = TkFont.init_widget_font(pathname, 
+				    self.path, 'entryconfigure', index)
     end
+    ret
   end
-  def itemconfigure(index, key, val=None)
-    if key.kind_of? Hash
-      if (key['font'] || key[:font] || 
-          key['kanjifont'] || key[:kanjifont] || 
-	  key['latinfont'] || key[:latinfont] || 
-          key['asciifont'] || key[:asciifont] )
-	tagfont_configure(index, _symbolkey2str(key))
-      else
-	tk_send 'itemconfigure', index, *hash_kv(key)
-      end
+  alias tagfontobj tagfont_configinfo
 
-    else
-      if (key == 'font' || key == :font || 
-          key == 'kanjifont' || key == :kanjifont || 
-	  key == 'latinfont' || key == :latinfont || 
-          key == 'asciifont' || key == :asciifont )
-	if val == None
-	  tagfontobj(index)
-	else
-	  tagfont_configure(index, {key=>val})
-	end
+  def tagfont_configure(index, slot)
+    pathname = self.path + ';' + index
+    if (fnt = slot['font'])
+      slot['font'] = nil
+      if fnt.kind_of? TkFont
+	return fnt.call_font_configure(pathname, 
+				       self.path,'entryconfigure',index,slot)
       else
-	tk_call 'itemconfigure', index, "-#{key}", val
+	latintagfont_configure(index, fnt) if fnt
       end
     end
+    if (ltn = slot['latinfont'])
+      slot['latinfont'] = nil
+      latintagfont_configure(index, ltn) if ltn
+    end
+    if (ltn = slot['asciifont'])
+      slot['asciifont'] = nil
+      latintagfont_configure(index, ltn) if ltn
+    end
+    if (knj = slot['kanjifont'])
+      slot['kanjifont'] = nil
+      kanjitagfont_configure(index, knj) if knj
+    end
+
+    tk_call(self.path, 'entryconfigure', index, *hash_kv(slot)) if slot != {}
     self
   end
 
-  def itemconfiginfo(index, key=nil)
-    if key
-      case key.to_s
-      when 'text', 'label', 'show'
-	conf = tk_split_simplelist(tk_send('itemconfigure',index,"-#{key}"))
-      when 'font', 'kanjifont'
-	conf = tk_split_simplelist(tk_send('itemconfigure',index,"-#{key}") )
-	conf[4] = tagfont_configinfo(index, conf[4])
+  def latintagfont_configure(index, ltn, keys=nil)
+    fobj = tagfontobj(index)
+    if ltn.kind_of? TkFont
+      conf = {}
+      ltn.latin_configinfo.each{|key,val| conf[key] = val if val != []}
+      if conf == {}
+	fobj.latin_replace(ltn)
+	fobj.latin_configure(keys) if keys
+      elsif keys
+	fobj.latin_configure(conf.update(keys))
       else
-	conf = tk_split_list(tk_send('itemconfigure',index,"-#{key}"))
+	fobj.latin_configure(conf)
       end
-      conf[0] = conf[0][1..-1]
-      conf
     else
-      ret = tk_split_simplelist(tk_send('itemconfigure', 
-					index)).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
-	conf[0] = conf[0][1..-1]
-	case conf[0]
-	when 'text', 'label', 'show'
-	else
-	  if conf[3]
-	    if conf[3].index('{')
-	      conf[3] = tk_split_list(conf[3]) 
-	    else
-	      conf[3] = tk_tcl2ruby(conf[3]) 
-	    end
-	  end
-	  if conf[4]
-	    if conf[4].index('{')
-	      conf[4] = tk_split_list(conf[4]) 
-	    else
-	      conf[4] = tk_tcl2ruby(conf[4]) 
-	    end
-	  end
-	end
-	conf
-      }
-      fontconf = ret.assoc('font')
-      if fontconf
-	ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-	fontconf[4] = tagfont_configinfo(index, fontconf[4])
-	ret.push(fontconf)
+      fobj.latin_replace(ltn)
+    end
+  end
+  alias asciitagfont_configure latintagfont_configure
+
+  def kanjitagfont_configure(index, knj, keys=nil)
+    fobj = tagfontobj(index)
+    if knj.kind_of? TkFont
+      conf = {}
+      knj.kanji_configinfo.each{|key,val| conf[key] = val if val != []}
+      if conf == {}
+	fobj.kanji_replace(knj)
+	fobj.kanji_configure(keys) if keys
+      elsif keys
+	fobj.kanji_configure(conf.update(keys))
       else
-	ret
+	fobj.kanji_configure(conf)
       end
+    else
+      fobj.kanji_replace(knj)
     end
   end
-end
 
-module TkTreatMenuEntryFont
-  include TkTreatItemFont
+  def tagfont_copy(index, window, wintag=nil)
+    if wintag
+      window.tagfontobj(wintag).configinfo.each{|key,value|
+	tagfontobj(index).configure(key,value)
+      }
+      tagfontobj(index).replace(window.tagfontobj(wintag).latin_font, 
+			      window.tagfontobj(wintag).kanji_font)
+    else
+      window.tagfont(wintag).configinfo.each{|key,value|
+	tagfontobj(index).configure(key,value)
+      }
+      tagfontobj(index).replace(window.fontobj.latin_font, 
+			      window.fontobj.kanji_font)
+    end
+  end
 
-  ItemCMD = ['entryconfigure'.freeze, TkComm::None].freeze
-  def __conf_cmd(idx)
-    ItemCMD[idx]
+  def latintagfont_copy(index, window, wintag=nil)
+    if wintag
+      tagfontobj(index).latin_replace(window.tagfontobj(wintag).latin_font)
+    else
+      tagfontobj(index).latin_replace(window.fontobj.latin_font)
+    end
   end
-  
-  def __item_pathname(tagOrId)
-    self.path + ';' + tagOrId.to_s
+  alias asciitagfont_copy latintagfont_copy
+
+  def kanjitagfont_copy(index, window, wintag=nil)
+    if wintag
+      tagfontobj(index).kanji_replace(window.tagfontobj(wintag).kanji_font)
+    else
+      tagfontobj(index).kanji_replace(window.fontobj.kanji_font)
+    end
   end
 end
 
 class TkMenu<TkWindow
   include TkTreatMenuEntryFont
 
-  TkCommandNames = ['menu'.freeze].freeze
   WidgetClassName = 'Menu'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'menu', @path, *hash_kv(keys)
-    else
-      tk_call 'menu', @path
-    end
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
+  end
+  def create_self
+    tk_call 'menu', path
   end
   def activate(index)
     tk_send 'activate', index
-    self
   end
   def add(type, keys=nil)
     tk_send 'add', type, *hash_kv(keys)
-    self
-  end
-  def add_cascade(keys=nil)
-    add('cascade', keys)
-  end
-  def add_checkbutton(keys=nil)
-    add('checkbutton', keys)
-  end
-  def add_command(keys=nil)
-    add('command', keys)
-  end
-  def add_radiobutton(keys=nil)
-    add('radiobutton', keys)
-  end
-  def add_separator(keys=nil)
-    add('separator', keys)
   end
   def index(index)
-    ret = tk_send('index', index)
-    (ret == 'none')? nil: number(ret)
+    tk_send 'index', index
   end
   def invoke(index)
     tk_send 'invoke', index
   end
   def insert(index, type, keys=nil)
-    tk_send 'insert', index, type, *hash_kv(keys)
-    self
+    tk_send 'add', index, type, *hash_kv(keys)
   end
   def delete(index, last=None)
     tk_send 'delete', index, last
-    self
-  end
-  def popup(x, y, index=None)
-    tk_call('tk_popup', path, x, y, index)
-    self
   end
   def post(x, y)
     tk_send 'post', x, y
-    self
   end
   def postcascade(index)
     tk_send 'postcascade', index
-    self
   end
   def postcommand(cmd=Proc.new)
     configure_cmd 'postcommand', cmd
-    self
-  end
-  def tearoffcommand(cmd=Proc.new)
-    configure_cmd 'tearoffcommand', cmd
-    self
   end
   def menutype(index)
     tk_send 'type', index
@@ -5414,254 +2359,48 @@ class TkMenu<TkWindow
     number(tk_send('yposition', index))
   end
   def entrycget(index, key)
-    case key.to_s
-    when 'text', 'label', 'show'
-      tk_send 'entrycget', index, "-#{key}"
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
-      fnt = tk_tcl2ruby(tk_send('entrycget', index, '-font'))
-      unless fnt.kind_of?(TkFont)
-	fnt = tagfontobj(index, fnt)
-      end
-      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-	# obsolete; just for compatibility
-	fnt.kanji_font
-      else
-	fnt
-      end
-    else
-      tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
-    end
+    tk_tcl2ruby tk_send 'entrycget', index, "-#{key}"
   end
   def entryconfigure(index, key, val=None)
     if key.kind_of? Hash
-      if (key['font'] || key[:font] || 
-          key['kanjifont'] || key[:kanjifont] || 
-	  key['latinfont'] || key[:latinfont] || 
-          key['asciifont'] || key[:asciifont])
-	tagfont_configure(index, _symbolkey2str(key))
+      if (key['font'] || key['kanjifont'] ||
+	  key['latinfont'] || key['asciifont'])
+	tagfont_configure(index, key.dup)
       else
 	tk_send 'entryconfigure', index, *hash_kv(key)
       end
 
     else
-      if (key == 'font' || key == :font || 
-          key == 'kanjifont' || key == :kanjifont || 
-	  key == 'latinfont' || key == :latinfont || 
-          key == 'asciifont' || key == :asciifont )
-	if val == None
-	  tagfontobj(index)
-	else
-	  tagfont_configure(index, {key=>val})
-	end
+      if (key == 'font' || key == 'kanjifont' ||
+	  key == 'latinfont' || key == 'asciifont' )
+	tagfont_configure({key=>val})
       else
 	tk_call 'entryconfigure', index, "-#{key}", val
       end
     end
-    self
   end
 
   def entryconfiginfo(index, key=nil)
     if key
-      case key.to_s
-      when 'text', 'label', 'show'
-	conf = tk_split_simplelist(tk_send('entryconfigure',index,"-#{key}"))
-      when 'font', 'kanjifont'
-	conf = tk_split_simplelist(tk_send('entryconfigure',index,"-#{key}"))
-	conf[4] = tagfont_configinfo(index, conf[4])
-      else
-	conf = tk_split_list(tk_send('entryconfigure',index,"-#{key}"))
-      end
+      conf = tk_split_list(tk_send('entryconfigure',index,"-#{key}"))
       conf[0] = conf[0][1..-1]
       conf
     else
-      ret = tk_split_simplelist(tk_send('entryconfigure', 
-					index)).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
+      tk_split_list(tk_send('entryconfigure', index)).collect{|conf|
 	conf[0] = conf[0][1..-1]
-	case conf[0]
-	when 'text', 'label', 'show'
-	else
-	  if conf[3]
-	    if conf[3].index('{')
-	      conf[3] = tk_split_list(conf[3]) 
-	    else
-	      conf[3] = tk_tcl2ruby(conf[3]) 
-	    end
-	  end
-	  if conf[4]
-	    if conf[4].index('{')
-	      conf[4] = tk_split_list(conf[4]) 
-	    else
-	      conf[4] = tk_tcl2ruby(conf[4]) 
-	    end
-	  end
-	end
 	conf
       }
-      if fontconf
-	ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-	  fontconf[4] = tagfont_configinfo(index, fontconf[4])
-	ret.push(fontconf)
-      else
-	ret
-      end
-    end
-  end
-end
-
-class TkMenuClone<TkMenu
-  def initialize(parent, type=None)
-    widgetname = nil
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-      widgetname = keys.delete('widgetname')
-      type = keys.delete('type'); type = None unless type
-    end
-    unless parent.kind_of?(TkMenu)
-      fail ArgumentError, "parent must be TkMenu"
-    end
-    @parent = parent
-    install_win(@parent.path, widgetname)
-    tk_call @parent.path, 'clone', @path, type
-  end
-end
-
-module TkSystemMenu
-  def initialize(parent, keys=nil)
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-    end
-    unless parent.kind_of? TkMenu
-      fail ArgumentError, "parent must be a TkMenu object"
-    end
-    @path = format("%s.%s", parent.path, self.class::SYSMENU_NAME)
-    #TkComm::Tk_WINDOWS[@path] = self
-    TkCore::INTERP.tk_windows[@path] = self
-    if self.method(:create_self).arity == 0
-      p 'create_self has no arg' if $DEBUG
-      create_self
-      configure(keys) if keys
-    else
-      p 'create_self has an arg' if $DEBUG
-      create_self(keys)
     end
   end
 end
 
-class TkSysMenu_Help<TkMenu
-  # for all platform
-  include TkSystemMenu
-  SYSMENU_NAME = 'help'
-end
-
-class TkSysMenu_System<TkMenu
-  # for Windows
-  include TkSystemMenu
-  SYSMENU_NAME = 'system'
-end
-
-class TkSysMenu_Apple<TkMenu
-  # for Machintosh
-  include TkSystemMenu
-  SYSMENU_NAME = 'apple'
-end
-
 class TkMenubutton<TkLabel
-  TkCommandNames = ['menubutton'.freeze].freeze
-  WidgetClassName = 'Menubutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'menubutton', @path, *hash_kv(keys)
-    else
-      tk_call 'menubutton', @path
-    end
-  end
-end
-
-class TkOptionMenubutton<TkMenubutton
-  TkCommandNames = ['tk_optionMenu'.freeze].freeze
-
-  class OptionMenu<TkMenu
-    def initialize(path)  #==> return value of tk_optionMenu
-      @path = path
-      #TkComm::Tk_WINDOWS[@path] = self
-      TkCore::INTERP.tk_windows[@path] = self
-    end
-  end
-
-  def initialize(parent=nil, var=TkVariable.new, firstval=nil, *vals)
-    if parent.kind_of? Hash
-       keys = _symbolkey2str(parent)
-       parent = keys['parent']
-       var = keys['variable'] if keys['variable']
-       firstval, *vals = keys['values']
-    end
-    fail 'variable option must be TkVariable' unless var.kind_of? TkVariable
-    @variable = var
-    firstval = @variable.value unless firstval
-    @variable.value = firstval
-    install_win(if parent then parent.path end)
-    @menu = OptionMenu.new(tk_call('tk_optionMenu', @path, @variable.id, 
-				   firstval, *vals))
-  end
-
-  def value
-    @variable.value
-  end
-
-  def activate(index)
-    @menu.activate(index)
-    self
-  end
-  def add(value)
-    @menu.add('radiobutton', 'variable'=>@variable, 
-	      'label'=>value, 'value'=>value)
-    self
-  end
-  def index(index)
-    @menu.index(index)
-  end
-  def invoke(index)
-    @menu.invoke(index)
-  end
-  def insert(index, value)
-    @menu.add(index, 'radiobutton', 'variable'=>@variable, 
-	      'label'=>value, 'value'=>value)
-    self
-  end
-  def delete(index, last=None)
-    @menu.delete(index, last)
-    self
+  TkClassBind::WidgetClassNameTBL['Menubutton'] = self
+  def TkMenubutton.to_eval
+    'Menubutton'
   end
-  def yposition(index)
-    @menu.yposition(index)
-  end
-  def menu
-    @menu
-  end
-  def menucget(key)
-    @menu.cget(key)
-  end
-  def menuconfigure(key, val=None)
-    @menu.configure(key, val)
-    self
-  end
-  def menuconfiginfo(key=nil)
-    @menu.configinfo(key)
-  end
-  def entrycget(index, key)
-    @menu.entrycget(index, key)
-  end
-  def entryconfigure(index, key, val=None)
-    @menu.entryconfigure(index, key, val)
-    self
-  end
-  def entryconfiginfo(index, key=nil)
-    @menu.entryconfiginfo(index, key)
+  def create_self
+    tk_call 'menubutton', path
   end
 end
 
@@ -5670,21 +2409,9 @@ module TkComposite
   extend Tk
 
   def initialize(parent=nil, *args)
-    @delegates = {} 
-
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      parent = keys['parent']
-      keys['parent'] = @frame = TkFrame.new(parent)
-      @delegates['DEFAULT'] = @frame
-      @path = @epath = @frame.path
-      initialize_composite(keys)
-    else
-      @frame = TkFrame.new(parent)
-      @delegates['DEFAULT'] = @frame
-      @path = @epath = @frame.path
-      initialize_composite(*args)
-    end
+    @frame = TkFrame.new(parent)
+    @path = @epath = @frame.path
+    initialize_composite(*args)
   end
 
   def epath
@@ -5695,6 +2422,10 @@ module TkComposite
   private :initialize_composite
 
   def delegate(option, *wins)
+    unless @delegates
+      @delegates = {} 
+      @delegates['DEFAULT'] = @frame
+    end
     if @delegates[option].kind_of?(Array)
       for i in wins
 	@delegates[option].push(i)
@@ -5729,118 +2460,36 @@ module TkClipboard
   include Tk
   extend Tk
 
-  TkCommandNames = ['clipboard'.freeze].freeze
-
-  def self.clear(win=nil)
-    if win
-      tk_call 'clipboard', 'clear', '-displayof', win
-    else
-      tk_call 'clipboard', 'clear'
-    end
-  end
-  def self.clear_on_display(win)
-    tk_call 'clipboard', 'clear', '-displayof', win
-  end
-
-  def self.get(type=nil)
-    if type
-      tk_call 'clipboard', 'get', '-type', type
-    else
-      tk_call 'clipboard', 'get'
-    end
+  def clear
+    tk_call 'clipboard', 'clear'
   end
-  def self.get_on_display(win, type=nil)
-    if type
-      tk_call 'clipboard', 'get', '-displayof', win, '-type', type
-    else
-      tk_call 'clipboard', 'get', '-displayof', win
+  def get
+    begin
+      tk_call 'selection', 'get', '-selection', 'CLIPBOARD'
+    rescue
+      ''
     end
   end
-
-  def self.set(data, keys=nil)
+  def set(data)
     clear
-    append(data, keys)
+    append(data)
   end
-  def self.set_on_display(win, data, keys=nil)
-    clear(win)
-    append_on_display(win, data, keys)
+  def append(data)
+    tk_call 'clipboard', 'append', data
   end
 
-  def self.append(data, keys=nil)
-    args = ['clipboard', 'append']
-    args += hash_kv(keys)
-    args += ['--', data]
-    tk_call(*args)
-  end
-  def self.append_on_display(win, data, keys=nil)
-    args = ['clipboard', 'append', '-displayof', win]
-    args += hash_kv(keys)
-    args += ['--', data]
-    tk_call(*args)
-  end
-
-  def clear
-    TkClipboard.clear_on_display(self)
-    self
-  end
-  def get(type=nil)
-    TkClipboard.get_on_display(self, type)
-  end
-  def set(data, keys=nil)
-    TkClipboard.set_on_display(self, data, keys)
-    self
-  end
-  def append(data, keys=nil)
-    TkClipboard.append_on_display(self, data, keys)
-    self
-  end
+  module_function :clear, :set, :get, :append
 end
 
-# widget_destroy_hook
-require 'tkvirtevent'
-TkBindTag::ALL.bind(TkVirtualEvent.new('Destroy'), proc{|xpath| 
-		      path = xpath[1..-1]
-		      if (widget = TkCore::INTERP.tk_windows[path])
-			if widget.respond_to?(:__destroy_hook__)
-			  begin
-			    widget.__destroy_hook__
-			  rescue Exception
-			  end
-			end
-		      end
-		    }, 'x%W')
-
-# freeze core modules
-TclTkLib.freeze
-TclTkIp.freeze
-TkUtil.freeze
-TkKernel.freeze
-TkComm.freeze
-TkComm::Event.freeze
-TkCore.freeze
-Tk.freeze
-
-# autoload
 autoload :TkCanvas, 'tkcanvas'
 autoload :TkImage, 'tkcanvas'
 autoload :TkBitmapImage, 'tkcanvas'
 autoload :TkPhotoImage, 'tkcanvas'
 autoload :TkEntry, 'tkentry'
-autoload :TkSpinbox, 'tkentry'
 autoload :TkText, 'tktext'
 autoload :TkDialog, 'tkdialog'
-autoload :TkDialog2, 'tkdialog'
-autoload :TkWarning, 'tkdialog'
-autoload :TkWarning2, 'tkdialog'
 autoload :TkMenubar, 'tkmenubar'
 autoload :TkAfter, 'tkafter'
-autoload :TkTimer, 'tkafter'
 autoload :TkPalette, 'tkpalette'
 autoload :TkFont, 'tkfont'
-autoload :TkBgError, 'tkbgerror'
-autoload :TkManageFocus, 'tkmngfocus'
-autoload :TkPalette, 'tkpalette'
-autoload :TkWinDDE, 'tkwinpkg'
-autoload :TkWinRegistry, 'tkwinpkg'
-autoload :TkMacResource, 'tkmacpkg'
-autoload :TkConsole, 'tkconsole'
+autoload :TkVirtualEvent, 'tkvirtevent'
diff --git a/ext/tk/lib/tkafter.rb b/ext/tk/lib/tkafter.rb
index 663b977ed2..be2e50ff3a 100644
--- a/ext/tk/lib/tkafter.rb
+++ b/ext/tk/lib/tkafter.rb
@@ -1,46 +1,32 @@
 #
 #   tkafter.rb : methods for Tcl/Tk after command
-#
-#   $Id$
+#                     1998/07/02 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
 require 'tk'
 
-class TkTimer
+class TkAfter
   include TkCore
   extend TkCore
 
-  TkCommandNames = ['after'.freeze].freeze
-
-  Tk_CBID = ['a'.freeze, '00000'.taint].freeze
-  Tk_CBTBL = {}.taint
-
-  TkCore::INTERP.add_tk_procs('rb_after', 'id', <<-'EOL')
-    if {[set st [catch {ruby [format "TkTimer.callback %%Q!%s!" $id]} ret]] != 0} {
-	return -code $st $ret
-    } {
-	return $ret
-    }
-  EOL
+  Tk_CBID = [0]
+  Tk_CBTBL = {}
 
+  INTERP._invoke("proc", "rb_after", "args", "ruby [format \"TkAfter.callback %%Q!%s!\" $args]")
 
   ###############################
   # class methods
   ###############################
-  def self.callback(obj_id)
+  def TkAfter.callback(arg)
     @after_id = nil
+    arg = Array(tk_split_list(arg))
+    obj_id = arg.shift
     ex_obj = Tk_CBTBL[obj_id]
-    return "" if ex_obj == nil; # canceled
-    #_get_eval_string(ex_obj.do_callback)
-    begin
-      ex_obj.cb_call
-    rescue Exception
-      ex_obj.cancel
-      ""
-    end
+    return nil if ex_obj == nil; # canceled
+    _get_eval_string(ex_obj.do_callback(*arg))
   end
 
-  def self.info
-    tk_call('after', 'info').split(' ').collect!{|id|
+  def TkAfter.info
+    tk_call('after', 'info').split(' ').filter{|id|
       ret = Tk_CBTBL.find{|key,val| val.after_id == id}
       (ret == nil)? id: ret[1]
     }
@@ -49,49 +35,36 @@ class TkTimer
   ###############################
   # instance methods
   ###############################
-  def do_callback
+  def do_callback(*args)
     @in_callback = true
-    begin
-      @return_value = @current_proc.call(self)
-    rescue Exception
-      if @cancel_on_exception
-	cancel
-	return nil
-      else
-	fail $!
-      end
-    end
+    ret = @current_proc.call(*args)
     if @set_next
-      set_next_callback(@current_args)
+      set_next_callback(*args)
     else
       @set_next = true
     end
     @in_callback = false
-    @return_value
+    ret
   end
 
   def set_callback(sleep, args=nil)
-    @after_script = "rb_after #{@id}"
+    @after_script = "rb_after #{@id} #{_get_eval_string(args)}"
     @after_id = tk_call('after', sleep, @after_script)
-    @current_args = args
     @current_script = [sleep, @after_script]
-    self
   end
 
-  def set_next_callback(args)
+  def set_next_callback(*args)
     if @running == false || @proc_max == 0 || @do_loop == 0
-      Tk_CBTBL.delete(@id) ;# for GC
+      Tk_CBTBL[@id] = nil ;# for GC
       @running = false
-      @wait_var.value = 0
       return
     end
     if @current_pos >= @proc_max
       if @do_loop < 0 || (@do_loop -= 1) > 0
 	@current_pos = 0
       else
-	Tk_CBTBL.delete(@id) ;# for GC
+	Tk_CBTBL[@id] = nil ;# for GC
 	@running = false
-	@wait_var.value = 0
 	return
       end
     end
@@ -99,7 +72,7 @@ class TkTimer
     @current_args = args
 
     if @sleep_time.kind_of? Proc
-      sleep = @sleep_time.call(self)
+      sleep = @sleep_time.call(*args)
     else
       sleep = @sleep_time
     end
@@ -109,23 +82,20 @@ class TkTimer
     @current_pos += 1
     @current_proc = cmd
 
-    set_callback(sleep, cmd_args)
+    if cmd_args[0].kind_of? Proc
+      #c = cmd_args.shift
+      #cb_args = c.call(*(cmd_args + args))
+      cb_args = cmd_args[0].call(*args)
+    else
+      cb_args = cmd_args
+    end
+
+    set_callback(sleep, cb_args)
   end
 
   def initialize(*args)
-    @id = Tk_CBID.join
-    Tk_CBID[1].succ!
-
-    @wait_var = TkVariable.new(0)
-
-    # @cb_cmd = TkCore::INTERP.get_cb_entry(self.method(:do_callback))
-    @cb_cmd = TkCore::INTERP.get_cb_entry(proc{
-					    begin
-					      self.do_callback
-					    rescue
-					      self.cancel
-					    end
-					  })
+    @id = format("a%.4d", Tk_CBID[0])
+    Tk_CBID[0] += 1
 
     @set_next = true
 
@@ -136,7 +106,6 @@ class TkTimer
     @current_script = []
     @current_proc = nil
     @current_args = nil
-    @return_value = nil
 
     @sleep_time = 0
     @current_sleep = 0
@@ -149,43 +118,24 @@ class TkTimer
     @after_id = nil
     @after_script = nil
 
-    @cancel_on_exception = true
-
     set_procs(*args) if args != []
 
     @running = false
-    @in_callback = false
   end
 
   attr :after_id
   attr :after_script
   attr :current_proc
-  attr :current_args
   attr :current_sleep
-  alias :current_interval :current_sleep
-  attr :return_value
 
   attr_accessor :loop_exec
 
-  def cb_call
-    @cb_cmd.call
-  end
-
   def get_procs
     [@init_sleep, @init_proc, @init_args, @sleep_time, @loop_exec, @loop_proc]
   end
 
   def current_status
-    [@running, @current_sleep, @current_proc, @current_args, 
-      @do_loop, @cancel_on_exception]
-  end
-
-  def cancel_on_exception?
-    @cancel_on_exception
-  end
-
-  def cancel_on_exception=(mode)
-    @cancel_on_exception = mode
+    [@running, @current_sleep, @current_proc, @current_args, @do_loop]
   end
 
   def running?
@@ -249,28 +199,6 @@ class TkTimer
     self
   end
 
-  def delete_procs(*procs)
-    procs.each{|e|
-      if e.kind_of? Proc
-	@loop_proc.delete([e])
-      else
-	@loop_proc.delete(e)
-      end
-    }
-    @proc_max = @loop_proc.size
-
-    cancel if @proc_max == 0
-
-    self
-  end
-
-  def delete_at(n)
-    @loop_proc.delete_at(n)
-    @proc_max = @loop_proc.size
-    cancel if @proc_max == 0
-    self
-  end
-
   def set_start_proc(sleep, init_proc, *init_args)
     if !sleep == 'idle' && !sleep.kind_of?(Integer)
       fail format("%s need to be Integer", sleep.inspect)
@@ -309,25 +237,9 @@ class TkTimer
       set_callback(sleep, @init_args)
       @set_next = false if @in_callback
     else
-      set_next_callback(@init_args)
-    end
-
-    self
-  end
-
-  def reset(*reset_args)
-    restart() if @running
-
-    if @init_proc
-      @return_value = @init_proc.call(self)
-    else
-      @return_value = nil
+      set_next_callback(*@init_args)
     end
 
-    @current_pos   = 0
-    @current_args  = @init_args
-    @set_next = false if @in_callback
-
     self
   end
 
@@ -342,21 +254,19 @@ class TkTimer
 
   def cancel
     @running = false
-    @wait_var.value = 0
     tk_call 'after', 'cancel', @after_id if @after_id
     @after_id = nil
-    Tk_CBTBL.delete(@id) ;# for GC
+    Tk_CBTBL[@id] = nil ;# for GC
     self
   end
   alias stop cancel
 
   def continue(wait=nil)
-    fail RuntimeError, "is already running" if @running
     sleep, cmd = @current_script
-    fail RuntimeError, "no procedure to continue" unless cmd
+    return nil if cmd == nil || @running == true
     if wait
       if not wait.kind_of? Integer
-	fail RuntimeError, format("%s need to be Integer", wait.inspect)
+	fail format("%s need to be Integer", wait.inspect)
       end
       sleep = wait
     end
@@ -367,7 +277,7 @@ class TkTimer
   end
 
   def skip
-    fail RuntimeError, "is not running now" unless @running
+    return nil if @running == false
     cancel
     Tk_CBTBL[@id] = self
     @running = true
@@ -383,30 +293,4 @@ class TkTimer
       nil
     end
   end
-
-  def wait(on_thread = true, check_root = false)
-    if $SAFE >= 4
-      fail SecurityError, "can't wait timer at $SAFE >= 4"
-    end
-    return self unless @running
-    @wait_var.wait(on_thread, check_root)
-    self
-  end
-  def eventloop_wait(check_root = false)
-    wait(false, check_root)
-  end
-  def thread_wait(check_root = false)
-    wait(true, check_root)
-  end
-  def tkwait(on_thread = true)
-    wait(on_thread, true)
-  end
-  def eventloop_tkwait
-    wait(false, true)
-  end
-  def thread_tkwait
-    wait(true, true)
-  end
 end
-
-TkAfter = TkTimer
diff --git a/ext/tk/lib/tkbgerror.rb b/ext/tk/lib/tkbgerror.rb
index 760a3901b3..8022077a3f 100644
--- a/ext/tk/lib/tkbgerror.rb
+++ b/ext/tk/lib/tkbgerror.rb
@@ -7,23 +7,11 @@ require 'tk'
 module TkBgError
   extend Tk
 
-  TkCommandNames = ['bgerror'.freeze].freeze
-
   def bgerror(message)
     tk_call 'bgerror', message
   end
   alias tkerror bgerror
   alias show bgerror
-  module_function :bgerror, :tkerror, :show
 
-  def set_handler(hdlr = Proc.new) #==> handler :: proc{|msg| ...body... }
-    tk_call('proc', 'bgerror', 'msg', install_cmd(hdlr) + ' $msg')
-  end
-  def set_default
-    begin
-      tk_call('rename', 'bgerror', '')
-    rescue RuntimeError
-    end
-  end
-  module_function :set_handler, :set_default
+  module_function :bgerror, :tkerror, :show
 end
diff --git a/ext/tk/lib/tkcanvas.rb b/ext/tk/lib/tkcanvas.rb
index 687f521655..1cf24eeb7b 100644
--- a/ext/tk/lib/tkcanvas.rb
+++ b/ext/tk/lib/tkcanvas.rb
@@ -9,40 +9,135 @@ require "tk"
 require 'tkfont'
 
 module TkTreatCItemFont
-  include TkTreatItemFont
-
-  ItemCMD = ['itemconfigure'.freeze, TkComm::None].freeze
-  def __conf_cmd(idx)
-    ItemCMD[idx]
+  def tagfont_configinfo(tagOrId)
+    if tagOrId.kind_of?(TkcItem) || tagOrId.kind_of?(TkcTag)
+      pathname = self.path + ';' + tagOrId.id.to_s
+    else
+      pathname = self.path + ';' + tagOrId.to_s
+    end
+    ret = TkFont.used_on(pathname)
+    if ret == nil
+      ret = TkFont.init_widget_font(pathname, 
+				    self.path, 'itemconfigure', tagOrId)
+    end
+    ret
   end
+  alias tagfontobj tagfont_configinfo
 
-  def __item_pathname(tagOrId)
+  def tagfont_configure(tagOrId, slot)
     if tagOrId.kind_of?(TkcItem) || tagOrId.kind_of?(TkcTag)
-      self.path + ';' + tagOrId.id.to_s
+      pathname = self.path + ';' + tagOrId.id.to_s
+    else
+      pathname = self.path + ';' + tagOrId.to_s
+    end
+    if (fnt = slot['font'])
+      slot['font'] = nil
+      if fnt.kind_of? TkFont
+	return fnt.call_font_configure(pathname, 
+				       self.path,'itemconfigure',tagOrId,slot)
+      else
+	latintagfont_configure(tagOrId, fnt) if fnt
+      end
+    end
+    if (ltn = slot['latinfont'])
+      slot['latinfont'] = nil
+      latintagfont_configure(tagOrId, ltn) if ltn
+    end
+    if (ltn = slot['asciifont'])
+      slot['asciifont'] = nil
+      latintagfont_configure(tagOrId, ltn) if ltn
+    end
+    if (knj = slot['kanjifont'])
+      slot['kanjifont'] = nil
+      kanjitagfont_configure(tagOrId, knj) if knj
+    end
+
+    tk_call(self.path, 'itemconfigure', tagOrId, *hash_kv(slot)) if slot != {}
+    self
+  end
+
+  def latintagfont_configure(tagOrId, ltn, keys=nil)
+    fobj = tagfontobj(tagOrId)
+    if ltn.kind_of? TkFont
+      conf = {}
+      ltn.latin_configinfo.each{|key,val| conf[key] = val if val != []}
+      if conf == {}
+	fobj.latin_replace(ltn)
+	fobj.latin_configure(keys) if keys
+      elsif keys
+	fobj.latin_configure(conf.update(keys))
+      else
+	fobj.latin_configure(conf)
+      end
+    else
+      fobj.latin_replace(ltn)
+    end
+  end
+  alias asciitagfont_configure latintagfont_configure
+
+  def kanjitagfont_configure(tagOrId, knj, keys=nil)
+    fobj = tagfontobj(tagOrId)
+    if knj.kind_of? TkFont
+      conf = {}
+      knj.kanji_configinfo.each{|key,val| conf[key] = val if val != []}
+      if conf == {}
+	fobj.kanji_replace(knj)
+	fobj.kanji_configure(keys) if keys
+      elsif keys
+	fobj.kanji_configure(conf.update(keys))
+      else
+	fobj.kanji_configure(conf)
+      end
+    else
+      fobj.kanji_replace(knj)
+    end
+  end
+
+  def tagfont_copy(tagOrId, window, wintag=nil)
+    if wintag
+      window.tagfontobj(wintag).configinfo.each{|key,value|
+	tagfontobj(tagOrId).configure(key,value)
+      }
+      tagfontobj(tagOrId).replace(window.tagfontobj(wintag).latin_font, 
+				  window.tagfontobj(wintag).kanji_font)
     else
-      self.path + ';' + tagOrId.to_s
+      window.tagfont(tagOrId).configinfo.each{|key,value|
+	tagfontobj(tagOrId).configure(key,value)
+      }
+      tagfontobj(tagOrId).replace(window.fontobj.latin_font, 
+				  window.fontobj.kanji_font)
+    end
+  end
+
+  def latintagfont_copy(tagOrId, window, wintag=nil)
+    if wintag
+      tagfontobj(tagOrId).latin_replace(window.tagfontobj(wintag).latin_font)
+    else
+      tagfontobj(tagOrId).latin_replace(window.fontobj.latin_font)
+    end
+  end
+  alias asciitagfont_copy latintagfont_copy
+
+  def kanjitagfont_copy(tagOrId, window, wintag=nil)
+    if wintag
+      tagfontobj(tagOrId).kanji_replace(window.tagfontobj(wintag).kanji_font)
+    else
+      tagfontobj(tagOrId).kanji_replace(window.fontobj.kanji_font)
     end
   end
 end
 
 class TkCanvas<TkWindow
   include TkTreatCItemFont
-  include Scrollable
 
-  TkCommandNames = ['canvas'.freeze].freeze
   WidgetClassName = 'Canvas'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def __destroy_hook__
-    TkcItem::CItemID_TBL.delete(@path)
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
   end
 
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'canvas', @path, *hash_kv(keys)
-    else
-      tk_call 'canvas', @path
-    end
+  def create_self
+    tk_call 'canvas', path
   end
 
   def tagid(tag)
@@ -56,7 +151,6 @@ class TkCanvas<TkWindow
 
   def addtag(tag, mode, *args)
     tk_send 'addtag', tagid(tag), mode, *args
-    self
   end
   def addtag_above(tagOrId, target)
     addtag(tagOrId, 'above', tagid(target))
@@ -81,67 +175,68 @@ class TkCanvas<TkWindow
   end
 
   def bbox(tagOrId, *tags)
-    list(tk_send('bbox', tagid(tagOrId), *tags.collect{|t| tagid(t)}))
+    list(tk_send('bbox', tagid(tagOrId), *tags))
   end
 
   def itembind(tag, context, cmd=Proc.new, args=nil)
-    _bind([path, "bind", tagid(tag)], context, cmd, args)
-    self
-  end
-
-  def itembind_append(tag, context, cmd=Proc.new, args=nil)
-    _bind_append([path, "bind", tagid(tag)], context, cmd, args)
-    self
-  end
-
-  def itembind_remove(tag, context)
-    _bind_remove([path, "bind", tagid(tag)], context)
-    self
+    id = install_bind(cmd, args)
+    begin
+      tk_send 'bind', tagid(tag), "<#{tk_event_sequence(context)}>", id
+    rescue
+      uninstall_cmd(cmd)
+      fail
+    end
+    # @cmdtbl.push id
   end
 
   def itembindinfo(tag, context=nil)
-    _bindinfo([path, "bind", tagid(tag)], context)
+    if context
+      (tk_send('bind', tagid(tag), 
+	       "<#{tk_event_sequence(context)}>")).collect{|cmdline|
+	if cmdline =~ /^rb_out (c\d+)\s+(.*)$/
+	  [Tk_CMDTBL[$1], $2]
+	else
+	  cmdline
+	end
+      }
+    else
+      tk_split_list(tk_send 'bind', tagid(tag)).filter{|seq|
+	seq[1..-2].gsub(/></,',')
+      }
+    end
   end
 
   def canvasx(x, *args)
-    tk_tcl2ruby(tk_send('canvasx', x, *args))
+    tk_tcl2ruby(tk_send 'canvasx', x, *args)
   end
   def canvasy(y, *args)
-    tk_tcl2ruby(tk_send('canvasy', y, *args))
+    tk_tcl2ruby(tk_send 'canvasy', y, *args)
   end
 
   def coords(tag, *args)
     if args == []
       tk_split_list(tk_send('coords', tagid(tag)))
     else
-      tk_send('coords', tagid(tag), *(args.flatten))
+      tk_send('coords', tagid(tag), *args)
     end
   end
 
   def dchars(tag, first, last=None)
     tk_send 'dchars', tagid(tag), first, last
-    self
   end
 
   def delete(*args)
-    if TkcItem::CItemID_TBL[self.path]
-      find('withtag', *args).each{|item| 
-	TkcItem::CItemID_TBL[self.path].delete(item.id)
-      }
-    end
-    tk_send 'delete', *args.collect{|t| tagid(t)}
-    self
+    tk_send 'delete', *args
   end
   alias remove delete
 
   def dtag(tag, tag_to_del=None)
     tk_send 'dtag', tagid(tag), tag_to_del
-    self
   end
 
   def find(mode, *args)
-    list(tk_send('find', mode, *args)).collect!{|id| 
-      TkcItem.id2obj(self, id)
+    list(tk_send 'find', mode, *args).filter{|id| 
+      TkcItem.id2obj(id)
     }
   end
   def find_above(target)
@@ -169,90 +264,55 @@ class TkCanvas<TkWindow
   def itemfocus(tagOrId=nil)
     if tagOrId
       tk_send 'focus', tagid(tagOrId)
-      self
     else
       ret = tk_send('focus')
       if ret == ""
 	nil
       else
-	TkcItem.id2obj(self, ret)
+	TkcItem.id2obj(ret)
       end
     end
   end
 
   def gettags(tagOrId)
     list(tk_send('gettags', tagid(tagOrId))).collect{|tag|
-      TkcTag.id2obj(self, tag)
+      TkcTag.id2obj(tag)
     }
   end
 
   def icursor(tagOrId, index)
     tk_send 'icursor', tagid(tagOrId), index
-    self
   end
 
   def index(tagOrId, index)
-    number(tk_send('index', tagid(tagOrId), index))
+    tk_send 'index', tagid(tagOrId), index
   end
 
   def insert(tagOrId, index, string)
     tk_send 'insert', tagid(tagOrId), index, string
-    self
   end
 
   def itemcget(tagOrId, option)
-    case option.to_s
-    when 'dash', 'activedash', 'disableddash'
-      conf = tk_send('itemcget', tagid(tagOrId), "-#{option}")
-      if conf =~ /^[0-9]/
-	list(conf)
-      else
-	conf
-      end
-    when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-      tk_send 'itemcget', tagid(tagOrId), "-#{option}"
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('itemcget', tagid(tagOrId), "-#{option}"))
-      fnt = tk_tcl2ruby(tk_send('itemcget', tagid(tagOrId), '-font'))
-      unless fnt.kind_of?(TkFont)
-	fnt = tagfontobj(tagid(tagOrId), fnt)
-      end
-      if option.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-	# obsolete; just for compatibility
-	fnt.kanji_font
-      else
-	fnt
-      end
-    else
-      tk_tcl2ruby tk_send('itemcget', tagid(tagOrId), "-#{option}")
-    end
+    tk_tcl2ruby tk_send 'itemcget', tagid(tagOrId), "-#{option}"
   end
 
   def itemconfigure(tagOrId, key, value=None)
     if key.kind_of? Hash
-      key = _symbolkey2str(key)
       if ( key['font'] || key['kanjifont'] \
 	  || key['latinfont'] || key['asciifont'] )
-	tagfont_configure(tagid(tagOrId), key.dup)
+	tagfont_configure(tagOrId, key.dup)
       else
 	tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(key)
       end
 
     else
-      if ( key == 'font' || key == :font || 
-           key == 'kanjifont' || key == :kanjifont || 
-	   key == 'latinfont' || key == :latinfont || 
-           key == 'asciifont' || key == :asciifont )
-	if value == None
-	  tagfontobj(tagid(tagOrId))
-	else
-	  tagfont_configure(tagid(tagOrId), {key=>value})
-	end
+      if ( key == 'font' || key == 'kanjifont' \
+	  || key == 'latinfont' || key == 'asciifont' )
+	tagfont_configure(tagid(tagOrId), {key=>value})
       else
 	tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
       end
     end
-    self
   end
 #  def itemconfigure(tagOrId, key, value=None)
 #    if key.kind_of? Hash
@@ -267,80 +327,23 @@ class TkCanvas<TkWindow
 
   def itemconfiginfo(tagOrId, key=nil)
     if key
-      case key.to_s
-      when 'dash', 'activedash', 'disableddash'
-	conf = tk_split_simplelist(tk_send('itemconfigure', 
-					   tagid(tagOrId), "-#{key}"))
-	if conf[3] && conf[3] =~ /^[0-9]/
-	  conf[3] = list(conf[3])
-	end
-	if conf[4] && conf[4] =~ /^[0-9]/
-	  conf[4] = list(conf[4])
-	end
-      when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-	conf = tk_split_simplelist(tk_send('itemconfigure', 
-					   tagid(tagOrId), "-#{key}"))
-      when 'font', 'kanjifont'
-	conf = tk_split_simplelist(tk_send('itemconfigure',
-					   tagid(tagOrId),"-#{key}") )
-	conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
-      else
-	conf = tk_split_list(tk_send('itemconfigure', 
-				     tagid(tagOrId), "-#{key}"))
-      end
+      conf = tk_split_list(tk_send 'itemconfigure', tagid(tagOrId), "-#{key}")
       conf[0] = conf[0][1..-1]
       conf
     else
-      ret = tk_split_simplelist(tk_send('itemconfigure', 
-					tagid(tagOrId))).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
+      tk_split_list(tk_send 'itemconfigure', tagid(tagOrId)).collect{|conf|
 	conf[0] = conf[0][1..-1]
-	case conf[0]
-	when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-	when 'dash', 'activedash', 'disableddash'
-	  if conf[3] && conf[3] =~ /^[0-9]/
-	    conf[3] = list(conf[3])
-	  end
-	  if conf[4] && conf[4] =~ /^[0-9]/
-	    conf[4] = list(conf[4])
-	  end
-	else
-	  if conf[3]
-	    if conf[3].index('{')
-	      conf[3] = tk_split_list(conf[3]) 
-	    else
-	      conf[3] = tk_tcl2ruby(conf[3]) 
-	    end
-	  end
-	  if conf[4]
-	    if conf[4].index('{')
-	      conf[4] = tk_split_list(conf[4]) 
-	    else
-	      conf[4] = tk_tcl2ruby(conf[4]) 
-	    end
-	  end
-	end
 	conf
       }
-      fontconf = ret.assoc('font')
-      if fontconf
-	ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-	fontconf[4] = tagfont_configinfo(tagid(tagOrId), fontconf[4])
-	ret.push(fontconf)
-      else
-	ret
-      end
     end
   end
 
   def lower(tag, below=None)
-    tk_send 'lower', tagid(tag), tagid(below)
-    self
+    tk_send 'lower', tagid(tag), below
   end
 
   def move(tag, x, y)
     tk_send 'move', tagid(tag), x, y
-    self
   end
 
   def postscript(keys)
@@ -348,27 +351,22 @@ class TkCanvas<TkWindow
   end
 
   def raise(tag, above=None)
-    tk_send 'raise', tagid(tag), tagid(above)
-    self
+    tk_send 'raise', tagid(tag), above
   end
 
   def scale(tag, x, y, xs, ys)
     tk_send 'scale', tagid(tag), x, y, xs, ys
-    self
   end
 
   def scan_mark(x, y)
     tk_send 'scan', 'mark', x, y
-    self
   end
   def scan_dragto(x, y)
     tk_send 'scan', 'dragto', x, y
-    self
   end
 
   def select(mode, *args)
-    r = tk_send('select', mode, *args)
-    (mode == 'item')? TkcItem.id2obj(self, r): self
+    tk_send 'select', mode, *args
   end
   def select_adjust(tagOrId, index)
     select('adjust', tagid(tagOrId), index)
@@ -387,7 +385,14 @@ class TkCanvas<TkWindow
   end
 
   def itemtype(tag)
-    TkcItem.type2class(tk_send('type', tagid(tag)))
+    TkcItem.type2class(tk_send 'type', tagid(tag))
+  end
+
+  def xview(*index)
+    tk_send 'xview', *index
+  end
+  def yview(*index)
+    tk_send 'yview', *index
   end
 end
 
@@ -397,7 +402,6 @@ module TkcTagAccess
 
   def addtag(tag)
     @c.addtag(tag, 'with', @id)
-    self
   end
 
   def bbox
@@ -406,17 +410,6 @@ module TkcTagAccess
 
   def bind(seq, cmd=Proc.new, args=nil)
     @c.itembind @id, seq, cmd, args
-    self
-  end
-
-  def bind_append(seq, cmd=Proc.new, args=nil)
-    @c.itembind_append @id, seq, cmd, args
-    self
-  end
-
-  def bind_remove(seq)
-    @c.itembind_remove @id, seq
-    self
   end
 
   def bindinfo(seq=nil)
@@ -429,7 +422,6 @@ module TkcTagAccess
 
   def configure(key, value=None)
     @c.itemconfigure @id, key, value
-    self
   end
 #  def configure(keys)
 #    @c.itemconfigure @id, keys
@@ -445,12 +437,10 @@ module TkcTagAccess
 
   def dchars(first, last=None)
     @c.dchars @id, first, last
-    self
   end
 
   def dtag(tag_to_del=None)
     @c.dtag @id, tag_to_del
-    self
   end
 
   def find
@@ -468,7 +458,6 @@ module TkcTagAccess
 
   def icursor(index)
     @c.icursor @id, index
-    self
   end
 
   def index(index)
@@ -477,200 +466,116 @@ module TkcTagAccess
 
   def insert(beforethis, string)
     @c.insert @id, beforethis, string
-    self
   end
 
   def lower(belowthis=None)
     @c.lower @id, belowthis
-    self
   end
 
   def move(xamount, yamount)
     @c.move @id, xamount, yamount
-    self
   end
 
   def raise(abovethis=None)
     @c.raise @id, abovethis
-    self
   end
 
   def scale(xorigin, yorigin, xscale, yscale)
     @c.scale @id, xorigin, yorigin, xscale, yscale
-    self
   end
 
   def select_adjust(index)
     @c.select('adjust', @id, index)
-    self
   end
   def select_from(index)
     @c.select('from', @id, index)
-    self
   end
   def select_to(index)
     @c.select('to', @id, index)
-    self
   end
 
   def itemtype
     @c.itemtype @id
   end
-
-  # Following operators support logical expressions of canvas tags
-  # (for Tk8.3+).
-  # If tag1.path is 't1' and tag2.path is 't2', then
-  #      ltag = tag1 & tag2; ltag.path => "(t1)&&(t2)"
-  #      ltag = tag1 | tag2; ltag.path => "(t1)||(t2)"
-  #      ltag = tag1 ^ tag2; ltag.path => "(t1)^(t2)"
-  #      ltag = - tag1;      ltag.path => "!(t1)"
-  def & (tag)
-    if tag.kind_of? TkObject
-      TkcTagString.new(@c, '(' + @id + ')&&(' + tag.path + ')')
-    else
-      TkcTagString.new(@c, '(' + @id + ')&&(' + tag.to_s + ')')
-    end
-  end
-
-  def | (tag)
-    if tag.kind_of? TkObject
-      TkcTagString.new(@c, '(' + @id + ')||(' + tag.path + ')')
-    else
-      TkcTagString.new(@c, '(' + @id + ')||(' + tag.to_s + ')')
-    end
-  end
-
-  def ^ (tag)
-    if tag.kind_of? TkObject
-      TkcTagString.new(@c, '(' + @id + ')^(' + tag.path + ')')
-    else
-      TkcTagString.new(@c, '(' + @id + ')^(' + tag.to_s + ')')
-    end
-  end
-
-  def -@
-    TkcTagString.new(@c, '!(' + @id + ')')
-  end
 end
 
 class TkcTag<TkObject
   include TkcTagAccess
 
-  CTagID_TBL = TkCore::INTERP.create_table
-  Tk_CanvasTag_ID = ['ctag'.freeze, '00000'.taint].freeze
+  CTagID_TBL = {}
 
-  TkCore::INTERP.init_ip_env{ CTagID_TBL.clear }
-
-  def TkcTag.id2obj(canvas, id)
-    cpath = canvas.path
-    return id unless CTagID_TBL[cpath]
-    CTagID_TBL[cpath][id]? CTagID_TBL[cpath][id]: id
+  def TkcTag.id2obj(id)
+    CTagID_TBL[id]? CTagID_TBL[id]: id
   end
 
+  $tk_canvas_tag = 'ctag0000'
   def initialize(parent, mode=nil, *args)
     if not parent.kind_of?(TkCanvas)
       fail format("%s need to be TkCanvas", parent.inspect)
     end
     @c = parent
-    @cpath = parent.path
-    @path = @id = Tk_CanvasTag_ID.join
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-    Tk_CanvasTag_ID[1].succ!
+    @path = @id = $tk_canvas_tag
+    CTagID_TBL[@id] = self
+    $tk_canvas_tag = $tk_canvas_tag.succ
     if mode
       tk_call @c.path, "addtag", @id, mode, *args
     end
   end
   def id
-    @id
+    return @id
   end
 
   def delete
     @c.delete @id
-    CTagID_TBL[@cpath].delete(@id) if CTagID_TBL[@cpath]
-    self
+    CTagID_TBL[@id] = nil
   end
   alias remove  delete
   alias destroy delete
 
   def set_to_above(target)
     @c.addtag_above(@id, target)
-    self
   end
   alias above set_to_above
 
   def set_to_all
     @c.addtag_all(@id)
-    self
   end
   alias all set_to_all
 
   def set_to_below(target)
     @c.addtag_below(@id, target)
-    self
   end
   alias below set_to_below
 
   def set_to_closest(x, y, halo=None, start=None)
     @c.addtag_closest(@id, x, y, halo, start)
-    self
   end
   alias closest set_to_closest
 
   def set_to_enclosed(x1, y1, x2, y2)
-    @c.addtag_enclosed(@id, x1, y1, x2, y2)
-    self
+    @c.addtag_enclosest(@id, x1, y1, x2, y2)
   end
   alias enclosed set_to_enclosed
 
   def set_to_overlapping(x1, y1, x2, y2)
     @c.addtag_overlapping(@id, x1, y1, x2, y2)
-    self
   end
   alias overlapping set_to_overlapping
 
   def set_to_withtag(target)
     @c.addtag_withtag(@id, target)
-    self
   end
   alias withtag set_to_withtag
 end
 
-class TkcTagString<TkcTag
-  def self.new(parent, name, *args)
-    if CTagID_TBL[parent.path] && CTagID_TBL[parent.path][name]
-      return CTagID_TBL[parent.path][name]
-    else
-      super(parent, name, *args)
-    end
-  end
-
-  def initialize(parent, name, mode=nil, *args)
-    if not parent.kind_of?(TkCanvas)
-      fail format("%s need to be TkCanvas", parent.inspect)
-    end
-    @c = parent
-    @cpath = parent.path
-    @path = @id = name
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-    if mode
-      tk_call @c.path, "addtag", @id, mode, *args
-    end
-  end
-end
-TkcNamedTag = TkcTagString
-
 class TkcTagAll<TkcTag
   def initialize(parent)
     if not parent.kind_of?(TkCanvas)
       fail format("%s need to be TkCanvas", parent.inspect)
     end
     @c = parent
-    @cpath = parent.path
     @path = @id = 'all'
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
+    CTagID_TBL[@id] = self
   end
 end
 
@@ -680,25 +585,21 @@ class TkcTagCurrent<TkcTag
       fail format("%s need to be TkCanvas", parent.inspect)
     end
     @c = parent
-    @cpath = parent.path
     @path = @id = 'current'
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
+    CTagID_TBL[@id] = self
   end
 end
 
 class TkcGroup<TkcTag
-  Tk_cGroup_ID = ['tkcg'.freeze, '00000'.taint].freeze
+  $tk_group_id = 'tkg00000'
   def create_self(parent, *args)
     if not parent.kind_of?(TkCanvas)
       fail format("%s need to be TkCanvas", parent.inspect)
     end
     @c = parent
-    @cpath = parent.path
-    @path = @id = Tk_cGroup_ID.join
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-    Tk_cGroup_ID[1].succ!
+    @path = @id = $tk_group_id
+    CTagID_TBL[@id] = self
+    $tk_group_id = $tk_group_id.succ
     add(*args) if args != []
   end
   
@@ -706,33 +607,28 @@ class TkcGroup<TkcTag
     for i in tags
       i.addtag @id
     end
-    self
   end
 
   def exclude(*tags)
     for i in tags
       i.delete @id
     end
-    self
   end
 end
 
+
 class TkcItem<TkObject
   include TkcTagAccess
 
   CItemTypeToClass = {}
-  CItemID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{ CItemID_TBL.clear }
+  CItemID_TBL = {}
 
   def TkcItem.type2class(type)
     CItemTypeToClass[type]
   end
 
-  def TkcItem.id2obj(canvas, id)
-    cpath = canvas.path
-    return id unless CItemID_TBL[cpath]
-    CItemID_TBL[cpath][id]? CItemID_TBL[cpath][id]: id
+  def TkcItem.id2obj(id)
+    CItemID_TBL[id]? CItemID_TBL[id]: id
   end
 
   def initialize(parent, *args)
@@ -741,50 +637,25 @@ class TkcItem<TkObject
     end
     @parent = @c = parent
     @path = parent.path
-    fontkeys = {}
-    if args.size == 1 && args[0].kind_of?(Hash)
-      args[0] = _symbolkey2str(args[0])
-      coords = args[0].delete('coords')
-      if not coords.kind_of?(Array)
-        fail "coords parameter must be given by an Array"
-      end
-      args[0,0] = coords.flatten
-    end
     if args[-1].kind_of? Hash
-      keys = _symbolkey2str(args.pop)
-      ['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
-	fontkeys[key] = keys.delete(key) if keys.key?(key)
-      }
-      args += hash_kv(keys)
+      keys = args.pop
     end
     @id = create_self(*args).to_i ;# 'canvas item id' is integer number
-    CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
-    CItemID_TBL[@path][@id] = self
-    configure(fontkeys) unless fontkeys.empty?
-
-######## old version
-#    if args[-1].kind_of? Hash
-#      keys = args.pop
-#    end
-#    @id = create_self(*args).to_i ;# 'canvas item id' is integer number
-#    CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
-#    CItemID_TBL[@path][@id] = self
-#    if keys
-#      # tk_call @path, 'itemconfigure', @id, *hash_kv(keys)
-#      configure(keys) if keys
-#    end
-########
+    CItemID_TBL[@id] = self
+    if keys
+      # tk_call @path, 'itemconfigure', @id, *hash_kv(keys)
+      configure(keys) if keys
+    end
   end
   def create_self(*args); end
   private :create_self
   def id
-    @id
+    return @id
   end
 
   def delete
     @c.delete @id
-    CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
-    self
+    CItemID_TBL[@id] = nil
   end
   alias remove  delete
   alias destroy delete
@@ -848,31 +719,23 @@ end
 class TkImage<TkObject
   include Tk
 
-  TkCommandNames = ['image'.freeze].freeze
-
-  Tk_IMGTBL = TkCore::INTERP.create_table
-  Tk_Image_ID = ['i'.freeze, '00000'.taint].freeze
-
-  TkCore::INTERP.init_ip_env{ Tk_IMGTBL.clear }
+  Tk_IMGTBL = {}
 
+  $tk_image_id = 'i00000'
   def initialize(keys=nil)
-    @path = Tk_Image_ID.join
-    Tk_Image_ID[1].succ!
+    @path = $tk_image_id
+    $tk_image_id = $tk_image_id.succ
     tk_call 'image', 'create', @type, @path, *hash_kv(keys)
     Tk_IMGTBL[@path] = self
   end
 
   def delete
-    Tk_IMGTBL.delete(@id) if @id
+    Tk_IMGTBL[@id] = nil if @id
     tk_call('image', 'delete', @path)
-    self
   end
   def height
     number(tk_call('image', 'height', @path))
   end
-  def inuse
-    bool(tk_call('image', 'inuse', @path))
-  end
   def itemtype
     tk_call('image', 'type', @path)
   end
@@ -881,7 +744,7 @@ class TkImage<TkObject
   end
 
   def TkImage.names
-    Tk.tk_call('image', 'names').split.collect!{|id|
+    Tk.tk_call('image', 'names').split.filter{|id|
       (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
     }
   end
@@ -906,16 +769,10 @@ class TkPhotoImage<TkImage
 
   def blank
     tk_send 'blank'
-    self
   end
 
   def cget(option)
-    case option.to_s
-    when 'data', 'file'
-      tk_send 'cget', option
-    else
-      tk_tcl2ruby tk_send('cget', option)
-    end
+    tk_tcl2ruby tk_send 'cget', option
   end
 
   def copy(source, *opts)
@@ -928,16 +785,10 @@ class TkPhotoImage<TkImage
     }.flatten
 
     tk_send 'copy', source, *args
-
-    self
-  end
-
-  def data(keys=nil)
-    tk_send('data', *hash_kv(keys))
   end
 
   def get(x, y)
-    tk_send('get', x, y).split.collect{|n| n.to_i}
+    tk_send 'get', x, y
   end
 
   def put(data, *to)
@@ -946,7 +797,6 @@ class TkPhotoImage<TkImage
     else
       tk_send 'put', data, '-to', *to
     end
-    self
   end
 
   def read(file, *opts)
@@ -959,21 +809,10 @@ class TkPhotoImage<TkImage
     }.flatten
   
     tk_send 'read', file, *args
-
-    self
   end
 
   def redither
     tk_send 'redither'
-    self
-  end
-
-  def get_transparency(x, y)
-    bool(tk_send('transparency', 'get', x, y))
-  end
-  def set_transparency(x, y, st)
-    tk_send('transparency', 'set', x, y, st)
-    self
   end
 
   def write(file, *opts)
@@ -986,7 +825,5 @@ class TkPhotoImage<TkImage
     }.flatten
   
     tk_send 'write', file, *args
-
-    self
   end
 end
diff --git a/ext/tk/lib/tkclass.rb b/ext/tk/lib/tkclass.rb
index 9ea275e560..0b33d4ec8b 100644
--- a/ext/tk/lib/tkclass.rb
+++ b/ext/tk/lib/tkclass.rb
@@ -1,9 +1,7 @@
 #
 #		tkclass.rb - Tk classes
-#			Date: 2000/11/27 09:23:36
+#			$Date$
 #			by Yukihiro Matsumoto <matz@caelum.co.jp>
-#
-#			$Id$
 
 require "tk"
 
@@ -15,7 +13,6 @@ Radiobutton = TkRadioButton
 Checkbutton = TkCheckButton
 Message = TkMessage
 Entry = TkEntry
-Spinbox = TkSpinbox
 Text = TkText
 Scale = TkScale
 Scrollbar = TkScrollbar
@@ -31,16 +28,10 @@ Polygon = TkcPolygon
 Rectangle = TkcRectangle
 TextItem = TkcText
 WindowItem = TkcWindow
-BitmapImage = TkBitmapImage
-PhotoImage = TkPhotoImage
 Selection = TkSelection
 Winfo = TkWinfo
 Pack = TkPack
-Grid = TkGrid
-Place = TkPlace
 Variable = TkVariable
-Font = TkFont
-VirtualEvent = TkVirtualEvent
 
 def Mainloop
   Tk.mainloop
diff --git a/ext/tk/lib/tkconsole.rb b/ext/tk/lib/tkconsole.rb
deleted file mode 100644
index d97df159fc..0000000000
--- a/ext/tk/lib/tkconsole.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#   tkconsole.rb : control the console on system without a real console
-#
-require 'tk'
-
-module TkConsole
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['console'.freeze].freeze
-
-  def self.title(str=None)
-    tk_call 'console', str
-  end
-  def self.hide
-    tk_call 'console', 'hide'
-  end
-  def self.show
-    tk_call 'console', 'show'
-  end
-  def self.eval(tcl_script)
-    #
-    # supports a Tcl script only
-    # I have no idea to support a Ruby script seamlessly.
-    #
-    tk_call 'console', 'eval', tcl_script
-  end
-end
diff --git a/ext/tk/lib/tkdialog.rb b/ext/tk/lib/tkdialog.rb
index febe470376..1133db6ae9 100644
--- a/ext/tk/lib/tkdialog.rb
+++ b/ext/tk/lib/tkdialog.rb
@@ -1,63 +1,18 @@
 require "tk"
 
-class TkDialog2 < TkWindow
+class TkDialog < TkWindow
   extend Tk
 
-  TkCommandNames = ['tk_dialog'.freeze].freeze
-
-  def self.show(*args)
-    dlog = self.new(*args)
-    dlog.show
-    dlog
-  end
-
-  def _set_button_config(configs)
-    set_config = proc{|c,i|
-      if $VERBOSE && (c.has_key?('command') || c.has_key?(:command))
-	STDERR.print("Warning: cannot give a command option " + 
-		     "to the dialog button#{i}. It was removed.\n")
-      end
-      c.delete('command'); c.delete(:command)
-      @config << format("%s.button%s configure %s; ", 
-			@path, i, hash_kv(c).join(' '))
-    }
-    case configs
-    when Proc
-      @buttons.each_index{|i|
-	if (c = configs.call(i)).kind_of? Hash
-	  set_config.call(c,i)
-	end
-      }
-
-    when Array
-      @buttons.each_index{|i|
-	if (c = configs[i]).kind_of? Hash
-	  set_config.call(c,i)
-	end
-      }
-
-    when Hash
-      @buttons.each_with_index{|s,i|
-	if (c = configs[s]).kind_of? Hash
-	  set_config.call(c,i)
-	end
-      }
-    end
-    @config = 'after idle {' + @config + '};' if @config != ""
-  end
-  private :_set_button_config
-
   # initialize tk_dialog
   def initialize(keys = nil)
     super()
-
     @var = TkVariable.new
+    id = @var.id
 
     @title   = title
 
     @message = message
     @message_config = message_config
-    @msgframe_config = msgframe_config
 
     @bitmap  = bitmap
     @bitmap_config = message_config
@@ -65,46 +20,27 @@ class TkDialog2 < TkWindow
     @default_button = default_button
 
     @buttons = buttons
-    @button_configs = proc{|num| button_configs(num)}
-    @btnframe_config = btnframe_config
-
-    #@config = "puts [winfo children .w0000];"
-    @config = ""
-
-    @command = nil
+    @button_configs = proc{|num| button_configs num}
 
     if keys.kind_of? Hash
-      keys = _symbolkey2str(keys)
-      @title   = keys['title'] if keys.key? 'title'
-      @message = keys['message'] if keys.key? 'message'
-      @bitmap  = keys['bitmap'] if keys.key? 'bitmap'
-      @bitmap  = '{}' if @bitmap == nil || @bitmap == ""
-      @default_button = keys['default'] if keys.key? 'default'
-      @buttons = keys['buttons'] if keys.key? 'buttons'
+      @title   = keys['title'] if keys['title']
+      @message = keys['message'] if keys['message']
+      @bitmap  = keys['bitmap'] if keys['bitmap']
+      @default_button = keys['default'] if keys['default']
+      @buttons = keys['buttons'] if keys['buttons']
 
       @command = keys['prev_command']
 
-      @message_config = keys['message_config'] if keys.key? 'message_config'
-      @msgframe_config = keys['msgframe_config'] if keys.key? 'msgframe_config'
-      @bitmap_config  = keys['bitmap_config']  if keys.key? 'bitmap_config'
-      @button_configs = keys['button_configs'] if keys.key? 'button_configs'
-      @btnframe_config = keys['btnframe_config'] if keys.key? 'btnframe_config'
+      @message_config = keys['message_config'] if keys['message_config']
+      @bitmap_config  = keys['bitmap_config']  if keys['bitmap_config']
+      @button_configs = keys['button_configs'] if keys['button_configs']
     end
 
     if @title.include? ?\s
       @title = '{' + @title + '}'
     end
 
-    if @buttons.kind_of? Array
-      _set_button_config(@buttons.collect{|cfg| 
-			   (cfg.kind_of? Array)? cfg[1]: nil})
-      @buttons = @buttons.collect{|cfg| (cfg.kind_of? Array)? cfg[0]: cfg}
-    end
-    if @buttons.kind_of? Hash 
-      _set_button_config(@buttons)
-      @buttons = @buttons.keys
-    end
-    @buttons = tk_split_simplelist(@buttons) if @buttons.kind_of? String
+    @buttons = tk_split_list(@buttons) if @buttons.kind_of? String
     @buttons = @buttons.collect{|s|
       if s.kind_of? Array
 	s = s.join(' ')
@@ -116,46 +52,34 @@ class TkDialog2 < TkWindow
       end
     }
 
+    config = ""
     if @message_config.kind_of? Hash
-      @config << format("%s.msg configure %s;", 
+      config << format("%s.msg configure %s\n", 
 		       @path, hash_kv(@message_config).join(' '))
     end
-
-    if @msgframe_config.kind_of? Hash
-      @config << format("%s.top configure %s;", 
-		       @path, hash_kv(@msgframe_config).join(' '))
-    end
-
-    if @btnframe_config.kind_of? Hash
-      @config << format("%s.bot configure %s;", 
-		       @path, hash_kv(@btnframe_config).join(' '))
-    end
-
     if @bitmap_config.kind_of? Hash
-      @config << format("%s.bitmap configure %s;", 
+      config << format("%s.msg configure %s\n", 
 		       @path, hash_kv(@bitmap_config).join(' '))
     end
-
-    _set_button_config(@button_configs) if @button_configs
+    if @button_configs.kind_of? Proc
+      @buttons.each_index{|i|
+	if (c = @button_configs.call(i)).kind_of? Hash
+	  config << format("%s.button%s configure %s\n", 
+			   @path, i, hash_kv(c).join(' '))
+	end
+      }
+    end
+    config = 'after idle {' + config + '};' if config != ""
 
     if @command.kind_of? Proc
       @command.call(self)
     end
-  end
 
-  def show
-    if @default_button.kind_of? String
-      default_button = @buttons.index(@default_button)
-    else
-      default_button = @default_button
-    end
-    default_button = '{}' if default_button == nil
-    Tk.ip_eval('eval {global '+@var.id+';'+@config+
-	       'set '+@var.id+' [tk_dialog '+ 
-	       @path+" "+@title+" {#{@message}} "+@bitmap+" "+
-	       String(default_button)+" "+@buttons.join(' ')+']}')
+    INTERP._eval('eval {global '+id+';'+config+
+		 'set '+id+' [tk_dialog '+ 
+		 @path+" "+@title+" {#{@message}} "+@bitmap+" "+
+		 String(@default_button)+" "+@buttons.join(' ')+']}')
   end
-
   def value
     return @var.value.to_i
   end
@@ -164,36 +88,22 @@ class TkDialog2 < TkWindow
   # these methods must be overridden for each dialog   #
   #                                                    #
   ######################################################
-  private
-
   def title
-    # returns a title string of the dialog window
     return "DIALOG"
   end
   def message
-    # returns a message text to display on the dialog
     return "MESSAGE"
   end
   def message_config
-    # returns a Hash {option=>value, ...} for the message text
-    return nil
-  end
-  def msgframe_config
-    # returns a Hash {option=>value, ...} for the message text frame
     return nil
   end
   def bitmap
-    # returns a bitmap name or a bitmap file path 
-    # (@ + path ; e.g. '@/usr/share/bitmap/sample.xbm')
     return "info"
   end
   def bitmap_config
-    # returns nil or a Hash {option=>value, ...} for the bitmap
     return nil
   end
   def default_button
-    # returns a default button's number or name
-    # if nil or null string, set no-default
     return 0
   end
   def buttons
@@ -201,50 +111,21 @@ class TkDialog2 < TkWindow
     return ["BUTTON1", "BUTTON2"]
   end
   def button_configs(num)
-    # returns nil / Proc / Array or Hash (see _set_button_config)
-    return nil
-  end
-  def btnframe_config
-    # returns nil or a Hash {option=>value, ...} for the button frame
     return nil
   end
 end
 
-
-#
-# TkDialog : with showing at initialize
-#
-class TkDialog < TkDialog2
-  def self.show(*args)
-    self.new(*args)
-  end
-
-  def initialize(*args)
-    super(*args)
-    show
-  end
-end
-
-
 #
 # dialog for warning
 #
-class TkWarning2 < TkDialog2
+class TkWarning < TkDialog
   def initialize(mes)
-    super(:message=>mes)
+    @mes = mes
+    super()
   end
-
-  def show(mes = nil)
-    mes_bup = @message
-    @message = mes if mes
-    ret = super()
-    @message = mes_bup
-    ret
+  def message
+    return @mes
   end
-
-  #######
-  private
-
   def title
     return "WARNING";
   end
@@ -258,13 +139,3 @@ class TkWarning2 < TkDialog2
     return "OK";
   end
 end
-
-class TkWarning < TkWarning2
-  def self.show(*args)
-    self.new(*args)
-  end
-  def initialize(mes)
-    super(mes)
-    show
-  end
-end
diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
index fc52b9435d..b834c455c6 100644
--- a/ext/tk/lib/tkentry.rb
+++ b/ext/tk/lib/tkentry.rb
@@ -6,241 +6,62 @@
 require 'tk.rb'
 
 class TkEntry<TkLabel
-  include Scrollable
-
-  TkCommandNames = ['entry'.freeze].freeze
   WidgetClassName = 'Entry'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  class ValidateCmd
-    include TkComm
-
-    module Action
-      Insert = 1
-      Delete = 0
-      Others = -1
-      Focus  = -1
-      Forced = -1
-      Textvariable = -1
-      TextVariable = -1
-    end
-
-    class ValidateArgs
-      VARG_KEY  = 'disvPSVW'
-      VARG_TYPE = 'nxsssssw'
-
-      def self.scan_args(arg_str, arg_val)
-	arg_cnv = []
-	arg_str.strip.split(/\s+/).each_with_index{|kwd,idx|
-	  if kwd =~ /^%(.)$/
-	    if num = VARG_KEY.index($1)
-	      case VARG_TYPE[num]
-	      when ?n
-		arg_cnv << TkComm::number(arg_val[idx])
-	      when ?s
-		arg_cnv << TkComm::string(arg_val[idx])
-	      when ?w
-		arg_cnv << TkComm::window(arg_val[idx])
-	      when ?x
-		idx = TkComm::number(arg_val[idx])
-		if idx < 0
-		  arg_cnv << nil
-		else
-		  arg_cnv << idx
-		end
-	      else
-		arg_cnv << arg_val[idx]
-	      end
-	    else
-	      arg_cnv << arg_val[idx]
-	    end
-	  else
-	    arg_cnv << arg_val[idx]
-	  end
-	}
-	arg_cnv
-      end
-
-      def initialize(d,i,s,v,pp,ss,vv,ww)
-	@action = d
-	@index = i
-	@current = s
-	@type = v
-	@value = pp
-	@string = ss
-	@triggered = vv
-	@widget = ww
-      end
-      attr :action
-      attr :index
-      attr :current
-      attr :type
-      attr :value
-      attr :string
-      attr :triggered
-      attr :widget
-    end
-
-    def initialize(cmd = Proc.new, args=nil)
-      if args
-	@id = 
-	  install_cmd(proc{|*arg|
-			TkUtil.eval_cmd(proc{|*v| (cmd.call(*v))? '1': '0'}, 
-					*ValidateArgs.scan_args(args, arg))
-		      }) + " " + args
-      else
-	args = ' %d %i %s %v %P %S %V %W'
-	@id = 
-	  install_cmd(proc{|*arg|
-			TkUtil.eval_cmd(proc{|*v| (cmd.call(*v))? '1': '0'}, 
-					ValidateArgs.new(*ValidateArgs \
-							 .scan_args(args,arg)))
-	  }) + args
-      end
-    end
-
-    def to_eval
-      @id
-    end
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
   end
 
-  def create_self(keys)
+  def create_self
     tk_call 'entry', @path
-    if keys and keys != None
-      configure(keys)
-    end
   end
-
-  def configure(slot, value=None)
-    if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
-      if slot['vcmd'].kind_of? Array
-	cmd, *args = slot['vcmd']
-	slot['vcmd'] = ValidateCmd.new(cmd, args.join(' '))
-      elsif slot['vcmd'].kind_of? Proc
-	slot['vcmd'] = ValidateCmd.new(slot['vcmd'])
-      end
-      if slot['validatecommand'].kind_of? Array
-	cmd, *args = slot['validatecommand']
-	slot['validatecommand'] = ValidateCmd.new(cmd, args.join(' '))
-      elsif slot['validatecommand'].kind_of? Proc
-	slot['validatecommand'] = ValidateCmd.new(slot['validatecommand'])
-      end
-      if slot['invcmd'].kind_of? Array
-	cmd, *args = slot['invcmd']
-	slot['invcmd'] = ValidateCmd.new(cmd, args.join(' '))
-      elsif slot['invcmd'].kind_of? Proc
-	slot['invcmd'] = ValidateCmd.new(slot['invcmd'])
-      end
-      if slot['invalidcommand'].kind_of? Array
-	cmd, *args = slot['invalidcommand']
-	slot['invalidcommand'] = ValidateCmd.new(cmd, args.join(' '))
-      elsif slot['invalidcommand'].kind_of? Proc
-	slot['invalidcommand'] = ValidateCmd.new(slot['invalidcommand'])
-      end
-      super(slot)
-    else
-      if (slot == 'vcmd' || slot == :vcmd || 
-          slot == 'validatecommand' || slot == :validatecommand || 
-	  slot == 'invcmd' || slot == :invcmd || 
-          slot == 'invalidcommand' || slot == :invalidcommand)
-	if value.kind_of? Array
-	  cmd, *args = value
-	  value = ValidateCmd.new(cmd, args.join(' '))
-	elsif value.kind_of? Proc
-	  value = ValidateCmd.new(value)
-	end
-      end
-      super(slot, value)
-    end
-    self
+  def scrollcommand(cmd)
+    configure 'scrollcommand', cmd
   end
 
-  def bbox(index)
-    list(tk_send('bbox', index))
+  def delete(s, e=None)
+    tk_send 'delete', s, e
   end
+
   def cursor
-    number(tk_send('index', 'insert'))
+    tk_send 'index', 'insert'
   end
   def cursor=(index)
     tk_send 'icursor', index
-    self
   end
   def index(index)
     number(tk_send('index', index))
   end
   def insert(pos,text)
     tk_send 'insert', pos, text
-    self
-  end
-  def delete(first, last=None)
-    tk_send 'delete', first, last
-    self
   end
   def mark(pos)
     tk_send 'scan', 'mark', pos
-    self
   end
   def dragto(pos)
     tk_send 'scan', 'dragto', pos
-    self
   end
   def selection_adjust(index)
     tk_send 'selection', 'adjust', index
-    self
   end
   def selection_clear
-    tk_send 'selection', 'clear'
-    self
+    tk_send 'selection', 'clear', 'end'
   end
   def selection_from(index)
     tk_send 'selection', 'from', index
-    self
   end
   def selection_present()
-    bool(tk_send('selection', 'present'))
+    tk_send('selection', 'present') == 1
   end
   def selection_range(s, e)
     tk_send 'selection', 'range', s, e
-    self
   end
   def selection_to(index)
     tk_send 'selection', 'to', index
-    self
   end
-
-  def invoke_validate
-    bool(tk_send('validate'))
-  end
-  def validate(mode = nil)
-    if mode
-      configure 'validate', mode
-    else
-      invoke_validate
-    end
-  end
-
-  def validatecommand(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('validatecommand', cmd)
-    elsif args
-      configure('validatecommand', [cmd, args])
-    else
-      configure('validatecommand', cmd)
-    end
+  def xview(*index)
+    tk_send 'xview', *index
   end
-  alias vcmd validatecommand
-
-  def invalidcommand(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('invalidcommand', cmd)
-    elsif args
-      configure('invalidcommand', [cmd, args])
-    else
-      configure('invalidcommand', cmd)
-    end
-  end
-  alias invcmd invalidcommand
 
   def value
     tk_send 'get'
@@ -250,34 +71,3 @@ class TkEntry<TkLabel
     tk_send 'insert', 0, val
   end
 end
-
-class TkSpinbox<TkEntry
-  TkCommandNames = ['spinbox'.freeze].freeze
-  WidgetClassName = 'Spinbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def create_self(keys)
-    tk_call 'spinbox', @path
-    if keys and keys != None
-      configure(keys)
-    end
-  end
-
-  def identify(x, y)
-    tk_send 'identify', x, y
-  end
-
-  def spinup
-    tk_send 'invoke', 'spinup'
-    self
-  end
-
-  def spindown
-    tk_send 'invoke', 'spindown'
-    self
-  end
-
-  def set(str)
-    tk_send 'set', str
-  end
-end
diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb
index ff7bbc74e4..c680d166e7 100644
--- a/ext/tk/lib/tkfont.rb
+++ b/ext/tk/lib/tkfont.rb
@@ -9,147 +9,12 @@ class TkFont
   include Tk
   extend TkCore
 
-  TkCommandNames = ['font'.freeze].freeze
-
-  Tk_FontID = ["@font".freeze, "00000".taint].freeze
-  Tk_FontNameTBL = TkCore::INTERP.create_table
-  Tk_FontUseTBL  = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{ 
-    Tk_FontNameTBL.clear
-    Tk_FontUseTBL.clear
-  }
-
-  # set default font
-  case Tk::TK_VERSION
-  when /^4\.*/
-    DEFAULT_LATIN_FONT_NAME = 'a14'.freeze
-    DEFAULT_KANJI_FONT_NAME = 'k14'.freeze
-
-  when /^8\.*/
-    if JAPANIZED_TK
-      begin
-        fontnames = tk_call('font', 'names')
-	case fontnames
-	when /defaultgui/
-          # Tcl/Tk-JP for Windows
-          ltn = 'defaultgui'
-          knj = 'defaultgui'
-	when /Mincho:Helvetica-Bold-12/
-          # Tcl/Tk-JP for UNIX/X
-          ltn, knj = tk_split_simplelist(tk_call('font', 'configure', 
-                                                 'Mincho:Helvetica-Bold-12', 
-                                                 '-compound'))
-        else
-          # unknown Tcl/Tk-JP
-	  platform = tk_call('set', 'tcl_platform(platform)')
-	  case platform
-	  when 'unix'
-	    ltn = {'family'=>'Helvetica'.freeze, 
-	           'size'=>-12, 'weight'=>'bold'.freeze}
-	    #knj = 'k14'
-	    #knj = '-misc-fixed-medium-r-normal--14-*-*-*-c-*-jisx0208.1983-0'
-	    knj = '-*-fixed-bold-r-normal--12-*-*-*-c-*-jisx0208.1983-0'
-	  when 'windows'
-	    ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
-	    knj = 'mincho'
-	  when 'macintosh'
-	    ltn = 'system'
-	    knj = 'mincho'
-	  else # unknown
-	    ltn = 'Helvetica'
-	    knj = 'mincho'
-	  end
-        end
-      rescue
-        ltn = 'Helvetica'
-        knj = 'mincho'
-      end
-
-    else # not JAPANIZED_TK
-      begin
-	platform = tk_call('set', 'tcl_platform(platform)')
-	case platform
-	when 'unix'
-	  ltn = {'family'=>'Helvetica'.freeze, 
-	         'size'=>-12, 'weight'=>'bold'.freeze}
-	  #knj = 'k14'
-	  #knj = '-misc-fixed-medium-r-normal--14-*-*-*-c-*-jisx0208.1983-0'
-	  knj = '-*-fixed-bold-r-normal--12-*-*-*-c-*-jisx0208.1983-0'
-	when 'windows'
-	  ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
-	  knj = 'mincho'
-	when 'macintosh'
-	  ltn = 'system'
-	  knj = 'mincho'
-	else # unknown
-	  ltn = 'Helvetica'
-	  knj = 'mincho'
-	end
-      rescue
-	ltn = 'Helvetica'
-	knj = 'mincho'
-      end
-
-      knj = ltn
-    end
-
-    DEFAULT_LATIN_FONT_NAME = ltn.freeze
-    DEFAULT_KANJI_FONT_NAME = knj.freeze
-
-  else # unknown version
-    DEFAULT_LATIN_FONT_NAME = 'Helvetica'.freeze
-    DEFAULT_KANJI_FONT_NAME = 'mincho'.freeze
-
-  end
-
-  if $DEBUG
-    print "default latin font = "; p DEFAULT_LATIN_FONT_NAME
-    print "default kanji font = "; p DEFAULT_KANJI_FONT_NAME
-  end
-
-
-  ###################################
-  class DescendantFont
-    def initialize(compound, type)
-      unless compound.kind_of?(TkFont)
-	fail ArgumentError, "a TkFont object is expected for the 1st argument"
-      end
-      @compound = compound
-      case type
-      when 'kanji', 'latin', 'ascii'
-	@type = type
-      else
-	fail ArgumentError, "unknown type '#{type}'"
-      end
-    end
-
-    def dup
-      fail RuntimeError, "cannot dupulicate a descendant font"
-    end
-    def clone
-      fail RuntimeError, "cannot clone a descendant font"
-    end
-
-    def to_eval
-      @compound.__send__(@type + '_font_id')
-    end
-    def font
-      @compound.__send__(@type + '_font_id')
-    end
-
-    def [](slot)
-      @compound.__send__(@type + '_configinfo', slot)
-    end
-    def []=(slot, value=None)
-      @compound.__send__(@type + '_configure', slot, value)
-    end
-
-    def method_missing(id, *args)
-      @compound.__send__(@type + '_' + id.id2name, *args)
-    end
-  end
+  Tk_FontID = [0]
+  Tk_FontNameTBL = {}
+  Tk_FontUseTBL = {}
 
+  DEFAULT_LATIN_FONT_NAME = 'a14'.freeze
+  DEFAULT_KANJI_FONT_NAME = 'k14'.freeze
 
   ###################################
   # class methods
@@ -183,10 +48,9 @@ class TkFont
   end
 
   def TkFont.create_copy(font)
-    fail 'source-font must be a TkFont object' unless font.kind_of? TkFont
     keys = {}
-    font.configinfo.each{|key,value| keys[key] = value }
-    TkFont.new(font.latin_font_id, font.kanji_font_id, keys)
+    font.configure.each{|key,value| keys[key] = value }
+    new_font = TkFont.new(font.latin_font, font.kanji_font, keys)
   end
 
   def TkFont.get_obj(name)
@@ -230,18 +94,16 @@ class TkFont
 	TkFont.new(nil, nil).call_font_configure(path, *(args + [{}]))
       else
 	begin
-	  compound = tk_split_simplelist(
-            Hash[*tk_split_simplelist(tk_call('font', 'configure', 
-					       fnt))].collect{|key,value|
-              [key[1..-1], value]
-            }.assoc('compound')[1])
+	  compound = Hash[*list(tk_call('font', 'configure', 
+					fnt))].collect{|key,value|
+	    [key[1..-1], value]
+	  }.assoc('compound')[1]
 	rescue
 	  compound = []
 	end
 	if compound == []
-	  #TkFont.new(fnt, DEFAULT_KANJI_FONT_NAME) \
-	  #.call_font_configure(path, *(args + [{}]))
-	  TkFont.new(fnt).call_font_configure(path, *(args + [{}]))
+	  TkFont.new(fnt, DEFAULT_KANJI_FONT_NAME) \
+	  .call_font_configure(path, *(args + [{}]))
 	else
 	  TkFont.new(compound[0], compound[1]) \
 	  .call_font_configure(path, *(args + [{}]))
@@ -258,68 +120,24 @@ class TkFont
     end
   end
 
-  def TkFont.failsafe(font)
-    begin
-      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        tk_call('font', 'failsafe', font)
-      end
-    rescue
-    end
-  end
-
-  ###################################
-  # instance methods
   ###################################
   private
   ###################################
   def initialize(ltn=nil, knj=nil, keys=nil)
-    @id = Tk_FontID.join
-    Tk_FontID[1].succ!
+    @id = format("@font%.4d", Tk_FontID[0])
+    Tk_FontID[0] += 1
     Tk_FontNameTBL[@id] = self
 
-    @latin_desscendant = nil
-    @kanji_desscendant = nil
-
-    if knj.kind_of?(Hash) && !keys
-      keys = knj
-      knj = nil
-    end
-
-    # compound font check
-    if Tk::TK_VERSION == '8.0' && JAPANIZED_TK
-      begin
-	compound = tk_split_simplelist(tk_call('font', 'configure', 
-					       ltn, '-compound'))
-	if knj == nil
-	  if compound != []
-	    ltn, knj = compound
-	  end
-	else
-	  if compound != []
-	    ltn = compound[0]
-	  end
-	  compound = tk_split_simplelist(tk_call('font', 'configure', 
-						 knj, '-compound'))
-	  if compound != []
-	    knj = compound[1]
-	  end
-	end
-      rescue
-      end
-    end
+    ltn = DEFAULT_LATIN_FONT_NAME unless ltn
+    create_latinfont(ltn)
 
-    if ltn
-      knj = ltn if JAPANIZED_TK && !knj
-    else
-      ltn = DEFAULT_LATIN_FONT_NAME
-      knj = DEFAULT_KANJI_FONT_NAME if JAPANIZED_TK && !knj
-    end
+    knj = DEFAULT_KANJI_FONT_NAME unless knj
+    create_kanjifont(knj)
 
-    create_compoundfont(ltn, knj, keys)
+    create_compoundfont(keys)
   end
 
   def _get_font_info_from_hash(font)
-    font = _symbolkey2str(font)
     foundry  = (info = font['foundry'] .to_s)?  info: '*'
     family   = (info = font['family']  .to_s)?  info: '*'
     weight   = (info = font['weight']  .to_s)?  info: '*'
@@ -377,11 +195,7 @@ class TkFont
       @latinfont = font.latin_font
 
     else
-      if font
-        @latinfont = font
-      else
-        @latinfont = DEFAULT_LATIN_FONT_NAME
-      end
+      @latinfont = font
 
     end
   end
@@ -425,20 +239,13 @@ class TkFont
 
       @kanjifont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
     elsif font.kind_of? TkFont
-      @kanjifont = font.kanji_font_id
+      @kanjifont = font.kanji_font
     else
-      if font
-        @kanjifont = font
-      else
-        @kanjifont = DEFAULT_KANJI_FONT_NAME
-      end
+      @kanjifont = font
     end
   end
 
-  def create_compoundfont_tk4x(ltn, knj, keys)
-    create_latinfont(ltn)
-    create_kanjifont(knj)
-
+  def create_compoundfont_tk4x(keys)
     if JAPANIZED_TK
       @compoundfont = [[@latinfont], [@kanjifont]]
       @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
@@ -453,22 +260,13 @@ class TkFont
 
     if JAPANIZED_TK
       if font.kind_of? Hash
-	if font[:charset] || font['charset']
-	  tk_call('font', 'create', @latinfont, *hash_kv(font))
-	else
-	  tk_call('font', 'create', @latinfont, 
-                  '-charset', 'iso8859', *hash_kv(font))
-	end
+	tk_call('font', 'create', @latinfont, *hash_kv(font))
       elsif font.kind_of? Array
 	tk_call('font', 'create', @latinfont, '-copy', array2tk_list(font))
-        tk_call('font', 'configure', @latinfont, '-charset', 'iso8859')
       elsif font.kind_of? TkFont
 	tk_call('font', 'create', @latinfont, '-copy', font.latin_font)
-      elsif font
-	tk_call('font', 'create', @latinfont, '-copy', font, 
-                '-charset', 'iso8859')
       else
-	tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
+	tk_call('font', 'create', @latinfont, '-copy', font)
       end
     else
       if font.kind_of? Hash
@@ -479,135 +277,74 @@ class TkFont
 	  actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
 	elsif font.kind_of? TkFont
 	  actual_core(font.latin_font).each{|key,val| keys[key] = val}
-	elsif font
+	else
 	  actual_core(font).each{|key,val| keys[key] = val}
 	end
 	tk_call('font', 'create', @latinfont, *hash_kv(keys))
       end
-
-      if font && @compoundfont
-        keys = {}
-        actual_core(@latinfont).each{|key,val| keys[key] = val}
-	tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
-      end
     end
   end
 
-  def create_kanjifont_tk8x(font)
+  def create_kanjifont_tk80(font)
+    unless JAPANIZED_TK
+      @kanjifont = ""
+      return
+    end
+
     @kanjifont = @id + 'k'
 
-    if JAPANIZED_TK
-      if font.kind_of? Hash
-        if font[:charset] || font['charset']
-	  tk_call('font', 'create', @kanjifont, *hash_kv(font))
-        else
-	  tk_call('font', 'create', @kanjifont, 
-		  '-charset', 'jisx0208.1983', *hash_kv(font))
-        end
-      elsif font.kind_of? Array
-        tk_call('font', 'create', @kanjifont, '-copy', array2tk_list(font))
-        tk_call('font', 'configure', @kanjifont, '-charset', 'jisx0208.1983')
-      elsif font.kind_of? TkFont
-        tk_call('font', 'create', @kanjifont, '-copy', font.kanji_font_id)
-      elsif font
-        tk_call('font', 'create', @kanjifont, '-copy', font, 
-	        '-charset', 'jisx0208.1983')
+    if font.kind_of? Hash
+      if font['charset']
+	tk_call('font', 'create', @kanjifont, *hash_kv(font))
       else
-        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
+	tk_call('font', 'create', @kanjifont, 
+		'-charset', 'jisx0208.1983', *hash_kv(font))
       end
-      # end of JAPANIZED_TK
+    elsif font.kind_of? Array
+      tk_call('font', 'create', @kanjifont, '-copy', array2tk_list(font))
+      tk_call('font', 'configure', @kanjifont, '-charset', 'jisx0208.1983')
 
+    elsif font.kind_of? TkFont
+      tk_call('font', 'create', @kanjifont, '-copy', font.kanji_font)
     else
-      if font.kind_of? Hash
-        tk_call('font', 'create', @kanjifont, *hash_kv(font))
+      tk_call('font', 'create', @kanjifont, '-copy', font, 
+	      '-charset', 'jisx0208.1983')
+    end
+  end
+
+  def create_kanjifont_tk81(font)
+    @kanjifont = @id + 'k'
+
+    if font.kind_of? Hash
+      tk_call('font', 'create', @kanjifont, *hash_kv(font))
+    else
+      keys = {}
+      if font.kind_of? Array
+	actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
+      elsif font.kind_of? TkFont
+	actual_core(font.kanji_font).each{|key,val| keys[key] = val}
       else
-        keys = {}
-        if font.kind_of? Array
-	  actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
-        elsif font.kind_of? TkFont
-	  actual_core(font.kanji_font_id).each{|key,val| keys[key] = val}
-        elsif font
-	  actual_core(font).each{|key,val| keys[key] = val}
-        end
-        tk_call('font', 'create', @kanjifont, *hash_kv(keys))
+	actual_core(font).each{|key,val| keys[key] = val}
       end
+      tk_call('font', 'create', @kanjifont, *hash_kv(keys))
+    end
 
-      if font && @compoundfont
-        keys = {}
-        actual_core(@kanjifont).each{|key,val| keys[key] = val}
-        tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
-      end
+    keys = {}
+    actual_core(@kanjifont).each{|key,val| keys[key] = val}
+    begin
+      tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+    rescue
     end
   end
 
-  def create_compoundfont_tk8x(ltn, knj, keys)
-    create_latinfont(ltn)
-    create_kanjifont(knj)
-
+  def create_compoundfont_tk80(keys)
     @compoundfont = @id + 'c'
     if JAPANIZED_TK
-      unless keys
-	keys = {}
-      else
-	keys = keys.dup
-      end
-      if (tk_call('font', 'configure', @latinfont, '-underline') == '1' &&
-	  tk_call('font', 'configure', @kanjifont, '-underline') == '1' &&
-	  !keys.key?('underline'))
-	keys['underline'] = true
-      end
-      if (tk_call('font', 'configure', @latinfont, '-overstrike') == '1' &&
-	  tk_call('font', 'configure', @kanjifont, '-overstrike') == '1' &&
-	  !keys.key?('overstrike'))
-	keys['overstrike'] = true
-      end
-
       @fontslot = {'font'=>@compoundfont}
-      begin
-	tk_call('font', 'create', @compoundfont, 
-		'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-      rescue RuntimeError => e
-	if ltn == knj
-	  if e.message =~ /kanji font .* specified/
-	    tk_call('font', 'delete', @latinfont)
-	    create_latinfont(DEFAULT_LATIN_FONT_NAME)
-	    opts = []
-	    Hash[*(tk_split_simplelist(tk_call('font', 'configure', 
-					       @kanjifont)))].each{|k,v|
-	      case k
-	      when '-size', '-weight', '-slant', '-underline', '-overstrike'
-		opts << k << v
-	      end
-	    }
-	    tk_call('font', 'configure', @latinfont, *opts)
-	    tk_call('font', 'create', @compoundfont, 
-		    '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-
-	  elsif e.message =~ /ascii font .* specified/
-	    tk_call('font', 'delete', @kanjifont)
-	    create_kanjifont(DEFAULT_KANJI_FONT_NAME)
-	    opts = []
-	    Hash[*(tk_split_simplelist(tk_call('font', 'configure', 
-					       @latinfont)))].each{|k,v|
-	      case k
-	      when '-size', '-weight', '-slant', '-underline', '-overstrike'
-		opts << k << v
-	      end
-	    }
-	    tk_call('font', 'configure', @kanjifont, *opts)
-	    tk_call('font', 'create', @compoundfont, 
-		    '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-
-	  else
-	    raise e
-	  end
-	else
-	  raise e
-	end
-      end
+      tk_call('font', 'create', @compoundfont, 
+	      '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
     else
       tk_call('font', 'create', @compoundfont)
-
       latinkeys = {}
       begin
 	actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
@@ -617,24 +354,39 @@ class TkFont
       if latinkeys != {}
 	tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
       end
-
-      if knj
-	kanjikeys = {}
-	begin
-	  actual_core(@kanjifont).each{|key,val| kanjikeys[key] = val}
-	rescue
-	  kanjikeys {}
-	end
-	if kanjikeys != {}
-	  tk_call('font', 'configure', @compoundfont, *hash_kv(kanjikeys))
-	end
-      end
-
       @fontslot = {'font'=>@compoundfont}
       tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
     end
   end
 
+  def create_compoundfont_tk81(keys)
+    @compoundfont = @id + 'c'
+    tk_call('font', 'create', @compoundfont)
+
+    latinkeys = {}
+    begin
+      actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
+    rescue
+      latinkeys {}
+    end
+    if latinkeys != {}
+      tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
+    end
+
+    kanjikeys = {}
+    begin
+      actual_core(@kanjifont).each{|key,val| kanjikeys[key] = val}
+    rescue
+      kanjikeys {}
+    end
+    if kanjikeys != {}
+      tk_call('font', 'configure', @compoundfont, *hash_kv(kanjikeys))
+    end
+
+    @fontslot = {'font'=>@compoundfont}
+    tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+  end
+
   def actual_core_tk4x(font, window=nil, option=nil)
     # dummy
     if option
@@ -651,9 +403,9 @@ class TkFont
       ""
     elsif option
       if window
-	tk_call('font', 'actual', font, "-displayof", window, "-#{option}")
-      else
 	tk_call('font', 'actual', font, "-#{option}")
+      else
+	tk_call('font', 'actual', font, "-displayof", window, "-#{option}")
       end
     else
       l = tk_split_simplelist(if window
@@ -675,8 +427,7 @@ class TkFont
   end
 
   def configure_core_tk4x(font, slot, value=None)
-    #""
-    self
+    ""
   end
 
   def configinfo_core_tk4x(font, option=nil)
@@ -691,70 +442,11 @@ class TkFont
   end
 
   def configure_core_tk8x(font, slot, value=None)
-    if JAPANIZED_TK
-      begin
-	padjust = tk_call('font', 'configure', font, '-pointadjust')
-      rescue
-	padjust = nil
-      end
-    else
-      padjust = nil
-    end
     if slot.kind_of? Hash
-      if JAPANIZED_TK && (slot.key?('family') || slot.key?(:family))
-	slot = _symbolkey2str(slot)
-	configure_core_tk8x(font, 'family', slot.delete('family'))
-      end
-
-      if ((slot.key?('size') || slot.key?(:size)) && 
-	  padjust && !slot.key?('pointadjust') && !slot.key?(:pointadjust))
-	tk_call('font', 'configure', font, 
-		'-pointadjust', padjust, *hash_kv(slot))
-      else
-	tk_call('font', 'configure', font, *hash_kv(slot))
-      end
-    elsif (slot == 'size' || slot == :size) && padjust != nil
-      tk_call('font', 'configure', font, 
-	      "-#{slot}", value, '-pointadjust', padjust)
-    elsif JAPANIZED_TK && (slot == 'family' || slot == :family)
-      # coumpund font?
-      begin
-	compound = tk_split_simplelist(tk_call('font', 'configure', 
-					       font, '-compound'))
-      rescue
-	tk_call('font', 'configure', font, '-family', value)
-	return self
-      end
-      if compound == []
-	tk_call('font', 'configure', font, '-family', value)
-	return self
-      end
-      ltn, knj = compound
-
-      lfnt = tk_call('font', 'create', '-copy', ltn)
-      begin
-	tk_call('font', 'configure', lfnt, '-family', value)
-	latin_replace_core_tk8x(lfnt)
-      rescue RuntimeError => e
-	fail e if $DEBUG
-      ensure
-	tk_call('font', 'delete', lfnt) if lfnt != ''
-      end
-
-      kfnt = tk_call('font', 'create', '-copy', knj)
-      begin
-	tk_call('font', 'configure', kfnt, '-family', value)
-	kanji_replace_core_tk8x(lfnt)
-      rescue RuntimeError => e
-	fail e if $DEBUG
-      ensure
-	tk_call('font', 'delete', kfnt) if kfnt != ''
-      end
-      
+      tk_call 'font', 'configure', font, *hash_kv(slot)
     else
-      tk_call('font', 'configure', font, "-#{slot}", value)
+      tk_call 'font', 'configure', font, "-#{slot}", value
     end
-    self
   end
 
   def configinfo_core_tk8x(font, option=nil)
@@ -777,7 +469,7 @@ class TkFont
   end
 
   def delete_core_tk4x
-    Tk_FontNameTBL.delete(@id)
+    Tk_FontNameTBL[@id] = nil
     Tk_FontUseTBL.delete_if{|key,value| value == self}
   end
 
@@ -794,7 +486,7 @@ class TkFont
       tk_call('font', 'delete', @compoundfont)
     rescue
     end
-    Tk_FontNameTBL.delete(@id)
+    Tk_FontNameTBL[@id] = nil
     Tk_FontUseTBL.delete_if{|key,value| value == self}
   end
 
@@ -823,7 +515,7 @@ class TkFont
 	    tk_call(w, 'configure', '-font', @latinfont)
 	  end
 	rescue
-	  Tk_FontUseTBL.delete(w)
+	  Tk_FontUseTBL[w] = nil
 	end
       end
     }
@@ -857,7 +549,7 @@ class TkFont
 	    tk_call(w, 'configure', '-kanjifont', @kanjifont)
 	  end
 	rescue
-	  Tk_FontUseTBL.delete(w)
+	  Tk_FontUseTBL[w] = nil
 	end
       end
     }
@@ -865,106 +557,39 @@ class TkFont
   end
 
   def latin_replace_core_tk8x(ltn)
-    if JAPANIZED_TK
-      begin
-	tk_call('font', 'delete', '@font_tmp')
-      rescue
-      end
-      begin
-	fnt_bup = tk_call('font', 'create', '@font_tmp', '-copy', @latinfont)
-      rescue
-	#fnt_bup = ''
-	fnt_bup = DEFAULT_LATIN_FONT_NAME
-      end
-    end
-
     begin
       tk_call('font', 'delete', @latinfont)
     rescue
     end
     create_latinfont(ltn)
-
-    if JAPANIZED_TK
-      keys = self.configinfo
-      tk_call('font', 'delete', @compoundfont)
-      begin
-	tk_call('font', 'create', @compoundfont, 
-		'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-=begin
-	latinkeys = {}
-	begin
-	  actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
-	rescue
-	  latinkeys {}
-	end
-	if latinkeys != {}
-	  tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
-	end
-=end
-      rescue RuntimeError => e
-	tk_call('font', 'delete', @latinfont)
-	if fnt_bup && fnt_bup != ''
-	  tk_call('font', 'create', @latinfont, '-copy', fnt_bup)
-	  tk_call('font', 'create', @compoundfont, 
-		  '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-	  tk_call('font', 'delete', fnt_bup)
-	else
-	  fail e
-	end
-      end
-
-    else
-      latinkeys = {}
-      begin
-	actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
-      rescue
-	latinkeys {}
-      end
-      if latinkeys != {}
-	tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
-      end
-    end    
     self
   end
 
-  def kanji_replace_core_tk8x(knj)
-    if JAPANIZED_TK
-      begin
-	tk_call('font', 'delete', '@font_tmp')
-      rescue
-      end
-      begin
-	fnt_bup = tk_call('font', 'create', '@font_tmp', '-copy', @kanjifont)
-      rescue
-	#fnt_bup = ''
-	fnt_bup = DEFAULT_KANJI_FONT_NAME
-      end
-    end
+  def kanji_replace_core_tk80(knj)
+    return self unless JAPANIZED_TK
 
     begin
       tk_call('font', 'delete', @kanjifont)
     rescue
     end
     create_kanjifont(knj)
+    self
+  end
 
-    if JAPANIZED_TK
-      keys = self.configinfo
-      tk_call('font', 'delete', @compoundfont)
-      begin
-	tk_call('font', 'create', @compoundfont, 
-		'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-      rescue RuntimeError => e
-	tk_call('font', 'delete', @kanjifont)
-	if fnt_bup && fnt_bup != ''
-	  tk_call('font', 'create', @kanjifont, '-copy', fnt_bup)
-	  tk_call('font', 'create', @compoundfont, 
-		  '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-	  tk_call('font', 'delete', fnt_bup)
-	else
-	  fail e
-	end
+  def kanji_replace_core_tk81(knj)
+    if font.kind_of? Hash
+      tk_call('font', 'configure', @compoundfont, *hash_kv(knj))
+    else
+      keys = {}
+      if knj.kind_of? Array
+	actual_core(array2tk_list(knj)).each{|key,val| keys[key] = val}
+      elsif knj.kind_of? TkFont
+	actual_core(knj.latin_font).each{|key,val| keys[key] = val}
+      else
+	actual_core(knj).each{|key,val| keys[key] = val}
       end
-    end    
+      tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+    end
     self
   end
 
@@ -993,10 +618,10 @@ class TkFont
   def metrics_core_tk8x(font, window, option=nil)
     if option
       if window
+	number(tk_call('font', 'metrics', font, "-#{option}"))
+      else
 	number(tk_call('font', 'metrics', font, 
 		       "-displayof", window, "-#{option}"))
-      else
-	number(tk_call('font', 'metrics', font, "-#{option}"))
       end
     else
       l = tk_split_list(if window
@@ -1029,29 +654,29 @@ class TkFont
     alias measure_core        measure_core_tk4x
     alias metrics_core        metrics_core_tk4x
 
-  when /^8\.[0-4]/
+  when /^8\.0/
     alias create_latinfont    create_latinfont_tk8x
-    alias create_kanjifont    create_kanjifont_tk8x
-    alias create_compoundfont create_compoundfont_tk8x
+    alias create_kanjifont    create_kanjifont_tk80
+    alias create_compoundfont create_compoundfont_tk80
     alias actual_core         actual_core_tk8x
     alias configure_core      configure_core_tk8x
     alias configinfo_core     configinfo_core_tk8x
     alias delete_core         delete_core_tk8x
     alias latin_replace_core  latin_replace_core_tk8x
-    alias kanji_replace_core  kanji_replace_core_tk8x
+    alias kanji_replace_core  kanji_replace_core_tk80
     alias measure_core        measure_core_tk8x
     alias metrics_core        metrics_core_tk8x
 
-  when /^8\.*/
+  when /^8\.1/
     alias create_latinfont    create_latinfont_tk8x
-    alias create_kanjifont    create_kanjifont_tk8x
-    alias create_compoundfont create_compoundfont_tk8x
+    alias create_kanjifont    create_kanjifont_tk81
+    alias create_compoundfont create_compoundfont_tk81
     alias actual_core         actual_core_tk8x
     alias configure_core      configure_core_tk8x
     alias configinfo_core     configinfo_core_tk8x
     alias delete_core         delete_core_tk8x
     alias latin_replace_core  latin_replace_core_tk8x
-    alias kanji_replace_core  kanji_replace_core_tk8x
+    alias kanji_replace_core  kanji_replace_core_tk81
     alias measure_core        measure_core_tk8x
     alias metrics_core        metrics_core_tk8x
 
@@ -1060,25 +685,9 @@ class TkFont
   ###################################
   public
   ###################################
-  def method_missing(id, *args)
-    name = id.id2name
-    case args.length
-    when 1
-      configure name, args[0]
-    when 0
-      begin
-	configinfo name
-      rescue
-	fail NameError, "undefined local variable or method `#{name}' for #{self.to_s}", error_at
-      end
-    else
-      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
-    end
-  end
-
   def call_font_configure(path, *args)
     args += hash_kv(args.pop.update(@fontslot))
-    tk_call(*args)
+    tk_call *args
     Tk_FontUseTBL[path] = self
     self
   end
@@ -1092,7 +701,7 @@ class TkFont
 	if winobj.kind_of? TkText
 	  ret.push([winobj, winobj.tagid2obj(tag)])
 	elsif winobj.kind_of? TkCanvas
-	  if (tagobj = TkcTag.id2obj(winobj, tag)).kind_of? TkcTag
+	  if (tagobj = TkcTag.id2obj(tag)).kind_of? TkcTag
 	    ret.push([winobj, tagobj])
 	  elsif (tagobj = TkcItem.id2obj(tag)).kind_of? TkcItem
 	    ret.push([winobj, tagobj])
@@ -1122,35 +731,14 @@ class TkFont
   def font
     @compoundfont
   end
-  alias font_id font
-
-  def latin_font_id
-    @latinfont
-  end
 
   def latin_font
-    # @latinfont
-    if @latin_descendant
-      @latin_descendant
-    else
-      @latin_descendant = DescendantFont.new(self, 'latin')
-    end
-  end
-  alias latinfont latin_font
-
-  def kanji_font_id
-    @kanjifont
+    @latinfont
   end
 
   def kanji_font
-    # @kanjifont
-    if @kanji_descendant
-      @kanji_descendant
-    else
-      @kanji_descendant = DescendantFont.new(self, 'kanji')
-    end
+    @kanjifont
   end
-  alias kanjifont kanji_font
 
   def actual(option=nil)
     actual_core(@compoundfont, nil, option)
@@ -1199,7 +787,6 @@ class TkFont
 
   def configure(slot, value=None)
     configure_core(@compoundfont, slot, value)
-    self
   end
 
   def configinfo(slot=nil)
@@ -1216,14 +803,13 @@ class TkFont
     else
       configure(slot, value)
     end
-    self
   end
 
   def latin_configinfo(slot=nil)
     if JAPANIZED_TK
       configinfo_core(@latinfont, slot)
     else
-      configinfo(slot)
+      configure(slot, value)
     end
   end
 
@@ -1236,7 +822,6 @@ class TkFont
       #""
       configure(slot, value)
     end
-    self
   end
 
   def kanji_configinfo(slot=nil)
@@ -1258,13 +843,11 @@ class TkFont
   def latin_replace(ltn)
     latin_replace_core(ltn)
     reset_pointadjust
-    self
   end
 
   def kanji_replace(knj)
     kanji_replace_core(knj)
     reset_pointadjust
-    self
   end
 
   def measure(text)
@@ -1326,7 +909,6 @@ class TkFont
   # public alias
   ###################################
   alias ascii_font             latin_font
-  alias asciifont              latinfont
   alias create_asciifont       create_latinfont
   alias ascii_actual           latin_actual
   alias ascii_actual_displayof latin_actual_displayof
@@ -1335,56 +917,37 @@ class TkFont
   alias ascii_replace          latin_replace
   alias ascii_metrics          latin_metrics
 
-  ###################################
-  def dup
-    src = self
-    obj = super()
-    obj.instance_eval{ initialize(src) }
-    obj
-  end
-  def clone
-    src = self
-    obj = super()
-    obj.instance_eval{ initialize(src) }
-    obj
-  end
 end
 
 module TkTreatTagFont
   def font_configinfo
     @parent.tagfont_configinfo(@id)
   end
-#  alias font font_configinfo
+  alias font font_configinfo
 
   def font_configure(slot)
     @parent.tagfont_configure(@id, slot)
-    self
   end
 
   def latinfont_configure(ltn, keys=nil)
     @parent.latintagfont_configure(@id, ltn, keys)
-    self
   end
   alias asciifont_configure latinfont_configure
 
   def kanjifont_configure(knj, keys=nil)
     @parent.kanjitagfont_configure(@id, ltn, keys)
-    self
   end
 
   def font_copy(window, wintag=nil)
     @parent.tagfont_copy(@id, window, wintag)
-    self
   end
 
   def latinfont_copy(window, wintag=nil)
     @parent.latintagfont_copy(@id, window, wintag)
-    self
   end
   alias asciifont_copy latinfont_copy
 
   def kanjifont_copy(window, wintag=nil)
     @parent.kanjitagfont_copy(@id, window, wintag)
-    self
   end
 end
diff --git a/ext/tk/lib/tkmacpkg.rb b/ext/tk/lib/tkmacpkg.rb
deleted file mode 100644
index 3bac5e6c3e..0000000000
--- a/ext/tk/lib/tkmacpkg.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#   tkmacpkg.rb : methods for Tcl/Tk packages for Macintosh
-#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-#     ATTENTION !!
-#         This is NOT TESTED. Because I have no test-environment.
-#
-#
-require 'tk'
-
-module TkMacResource
-  extend Tk
-  extend TkMacResource
-
-  TkCommandNames = ['resource'.freeze].freeze
-
-  tk_call('package', 'require', 'resource')
-
-  def close(rsrcRef)
-    tk_call('resource', 'close', rsrcRef)
-  end
-
-  def delete(rsrcType, opts=nil)
-    tk_call('resource', 'delete', *(hash_kv(opts) + rsrcType))
-  end
-
-  def files(rsrcRef=nil)
-    if rsrcRef
-      tk_call('resource', 'files', rsrcRef)
-    else
-      tk_split_simplelist(tk_call('resource', 'files'))
-    end
-  end
-
-  def list(rsrcType, rsrcRef=nil)
-    tk_split_simplelist(tk_call('resource', 'list', rsrcType, rsrcRef))
-  end
-
-  def open(fname, access=nil)
-    tk_call('resource', 'open', fname, access)
-  end
-
-  def read(rsrcType, rsrcID, rsrcRef=nil)
-    tk_call('resource', 'read', rsrcType, rsrcID, rsrcRef)
-  end
-
-  def types(rsrcRef=nil)
-    tk_split_simplelist(tk_call('resource', 'types', rsrcRef))
-  end
-
-  def write(rsrcType, data, opts=nil)
-    tk_call('resource', 'write', *(hash_kv(opts) + rsrcType + data))
-  end
-
-  module_function :close, :delete, :files, :list, :open, :read, :types, :write
-end
diff --git a/ext/tk/lib/tkmenubar.rb b/ext/tk/lib/tkmenubar.rb
index 0d29571eb7..441f3f5c03 100644
--- a/ext/tk/lib/tkmenubar.rb
+++ b/ext/tk/lib/tkmenubar.rb
@@ -66,14 +66,8 @@ class TkMenubar<TkFrame
   include TkComposite
   
   def initialize(parent = nil, spec = nil, options = nil)
-    if parent.kind_of? Hash
-      options = _symbolkey2str(parent)
-      spec = options.delete('spec')
-      super(options)
-    else
-      super(parent, options)
-    end
-
+    super(parent, options)
+    
     @menus = []
     
     if spec
diff --git a/ext/tk/lib/tkmngfocus.rb b/ext/tk/lib/tkmngfocus.rb
index 461525009f..921fb646e7 100644
--- a/ext/tk/lib/tkmngfocus.rb
+++ b/ext/tk/lib/tkmngfocus.rb
@@ -1,31 +1,25 @@
 #
 #   tkmngfocus.rb : methods for Tcl/Tk standard library 'focus.tcl'
-#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
 #
 require 'tk'
 
 module TkManageFocus
   extend Tk
 
-  TkCommandNames = [
-    'tk_focusFollowMouse'.freeze, 
-    'tk_focusNext'.freeze, 
-    'tk_focusPrev'.freeze
-  ].freeze
-
   def TkManageFocus.followsMouse
     tk_call 'tk_focusFollowsMouse'
   end
 
   def TkManageFocus.next(window)
-    tk_tcl2ruby(tk_call('tk_focusNext', window))
+    tk_call 'tk_focusNext', window
   end
   def focusNext
     TkManageFocus.next(self)
   end
 
   def TkManageFocus.prev(window)
-    tk_tcl2ruby(tk_call('tk_focusPrev', window))
+    tk_call 'tk_focusPrev', window
   end
   def focusPrev
     TkManageFocus.prev(self)
diff --git a/ext/tk/lib/tkpalette.rb b/ext/tk/lib/tkpalette.rb
index dc2fd47e5c..a2dc7c87cb 100644
--- a/ext/tk/lib/tkpalette.rb
+++ b/ext/tk/lib/tkpalette.rb
@@ -8,12 +8,6 @@ module TkPalette
   include Tk
   extend Tk
 
-  TkCommandNames = [
-    'tk_setPalette'.freeze, 
-    'tk_bisque'.freeze, 
-    'tkDarken'.freeze
-  ].freeze
-
   def TkPalette.set(*args)
     args = args.to_a.flatten if args.kind_of? Hash
     tk_call 'tk_setPalette', *args
diff --git a/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb
index 109afad924..324af90f85 100644
--- a/ext/tk/lib/tktext.rb
+++ b/ext/tk/lib/tktext.rb
@@ -7,220 +7,190 @@ require 'tk.rb'
 require 'tkfont'
 
 module TkTreatTextTagFont
-  include TkTreatItemFont
-
-  ItemCMD = ['tag'.freeze, 'configure'.freeze].freeze
-  def __conf_cmd(idx)
-    ItemCMD[idx]
+  def tagfont_configinfo(tag)
+    if tag.kind_of? TkTextTag
+      pathname = self.path + ';' + tag.id
+    else
+      pathname = self.path + ';' + tag
+    end
+    ret = TkFont.used_on(pathname)
+    if ret == nil
+      ret = TkFont.init_widget_font(pathname, 
+				    self.path, 'tag', 'configure', tag)
+    end
+    ret
   end
+  alias tagfontobj tagfont_configinfo
 
-  def __item_pathname(tagOrId)
-    if tagOrId.kind_of?(TkTextTag)
-      self.path + ';' + tagOrId.id
+  def tagfont_configure(tag, slot)
+    if tag.kind_of? TkTextTag
+      pathname = self.path + ';' + tag.id
     else
-      self.path + ';' + tagOrId
+      pathname = self.path + ';' + tag
+    end
+    if (fnt = slot['font'])
+      slot['font'] = nil
+      if fnt.kind_of? TkFont
+	return fnt.call_font_configure(pathname, 
+				       self.path,'tag','configure',tag,slot)
+      else
+	latintagfont_configure(tag, fnt) if fnt
+      end
+    end
+    if (ltn = slot['latinfont'])
+      slot['latinfont'] = nil
+      latintagfont_configure(tag, ltn) if ltn
+    end
+    if (ltn = slot['asciifont'])
+      slot['asciifont'] = nil
+      latintagfont_configure(tag, ltn) if ltn
+    end
+    if (knj = slot['kanjifont'])
+      slot['kanjifont'] = nil
+      kanjitagfont_configure(tag, knj) if knj
     end
-  end
-end
 
-class TkText<TkTextWin
-  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
-  include TkTreatTextTagFont
-  include Scrollable
+    tk_call(self.path, 'tag', 'configure', tag, *hash_kv(slot)) if slot != {}
+    self
+  end
 
-  TkCommandNames = ['text'.freeze].freeze
-  WidgetClassName = 'Text'.freeze
-  WidgetClassNames[WidgetClassName] = self
+  def latintagfont_configure(tag, ltn, keys=nil)
+    fobj = tagfontobj(tag)
+    if ltn.kind_of? TkFont
+      conf = {}
+      ltn.latin_configinfo.each{|key,val| conf[key] = val if val != []}
+      if conf == {}
+	fobj.latin_replace(ltn)
+	fobj.latin_configure(keys) if keys
+      elsif keys
+	fobj.latin_configure(conf.update(keys))
+      else
+	fobj.latin_configure(conf)
+      end
+    else
+      fobj.latin_replace(ltn)
+    end
+  end
+  alias asciitagfont_configure latintagfont_configure
 
-  def self.new(*args, &block)
-    obj = super(*args){}
-    obj.init_instance_variable
-    obj.instance_eval(&block) if defined? yield
-    obj
+  def kanjitagfont_configure(tag, knj, keys=nil)
+    fobj = tagfontobj(tag)
+    if knj.kind_of? TkFont
+      conf = {}
+      knj.kanji_configinfo.each{|key,val| conf[key] = val if val != []}
+      if conf == {}
+	fobj.kanji_replace(knj)
+	fobj.kanji_configure(keys) if keys
+      elsif keys
+	fobj.kanji_configure(conf.update(keys))
+      else
+	fobj.kanji_configure(conf)
+      end
+    else
+      fobj.kanji_replace(knj)
+    end
   end
 
-  def init_instance_variable
-    @cmdtbl = []
-    @tags = {}
+  def tagfont_copy(tag, window, wintag=nil)
+    if wintag
+      window.tagfontobj(wintag).configinfo.each{|key,value|
+	tagfontobj(tag).configure(key,value)
+      }
+      tagfontobj(tag).replace(window.tagfontobj(wintag).latin_font, 
+			      window.tagfontobj(wintag).kanji_font)
+    else
+      window.tagfont(wintag).configinfo.each{|key,value|
+	tagfontobj(tag).configure(key,value)
+      }
+      tagfontobj(tag).replace(window.fontobj.latin_font, 
+			      window.fontobj.kanji_font)
+    end
   end
 
-  def __destroy_hook__
-    TTagID_TBL.delete(@path)
-    TMarkID_TBL.delete(@path)
+  def latintagfont_copy(tag, window, wintag=nil)
+    if wintag
+      tagfontobj(tag).latin_replace(window.tagfontobj(wintag).latin_font)
+    else
+      tagfontobj(tag).latin_replace(window.fontobj.latin_font)
+    end
   end
+  alias asciitagfont_copy latintagfont_copy
 
-  def create_self(keys)
-    if keys and keys != None
-      tk_call 'text', @path, *hash_kv(keys)
+  def kanjitagfont_copy(tag, window, wintag=nil)
+    if wintag
+      tagfontobj(tag).kanji_replace(window.tagfontobj(wintag).kanji_font)
     else
-      tk_call 'text', @path
+      tagfontobj(tag).kanji_replace(window.fontobj.kanji_font)
     end
-    init_instance_variable
   end
+end
 
+class TkText<TkTextWin
+  include TkTreatTextTagFont
+
+  WidgetClassName = 'Text'.freeze
+  TkClassBind::WidgetClassNameTBL[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
+  end
+  include Scrollable
+  def create_self
+    tk_call 'text', @path
+    @tags = {}
+  end
   def index(index)
     tk_send 'index', index
   end
-
   def value
     tk_send 'get', "1.0", "end - 1 char"
   end
-
   def value= (val)
     tk_send 'delete', "1.0", 'end'
     tk_send 'insert', "1.0", val
   end
-
   def _addcmd(cmd)
     @cmdtbl.push cmd
   end
-
   def _addtag(name, obj)
     @tags[name] = obj
   end
 
   def tagid2obj(tagid)
-    if @tags[tagid]
-      @tags[tagid]
-    else
+    if not @tags[tagid]
       tagid
+    else
+      @tags[tagid]
     end
   end
 
   def tag_names(index=None)
-    tk_split_simplelist(tk_send('tag', 'names', index)).collect{|elt|
+    tk_split_list(tk_send('tag', 'names', index)).collect{|elt|
       tagid2obj(elt)
     }
   end
-
-  def mark_names
-    tk_split_simplelist(tk_send('mark', 'names')).collect{|elt|
+  def window_names
+    tk_send('window', 'names').collect{|elt|
       tagid2obj(elt)
     }
   end
-
-  def mark_gravity(mark, direction=nil)
-    if direction
-      tk_send 'mark', 'gravity', mark, direction
-      self
-    else
-      tk_send 'mark', 'gravity', mark
-    end
-  end
-
-  def mark_set(mark, index)
-    tk_send 'mark', 'set', mark, index
-    self
-  end
-  alias set_mark mark_set
-
-  def mark_unset(*marks)
-    tk_send 'mark', 'unset', *marks
-    self
-  end
-  alias unset_mark mark_unset
-
-  def mark_next(index)
-    tagid2obj(tk_send('mark', 'next', index))
-  end
-  alias next_mark mark_next
-
-  def mark_previous(index)
-    tagid2obj(tk_send('mark', 'previous', index))
-  end
-  alias previous_mark mark_previous
-
-  def image_cget(index, slot)
-    case slot.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      tk_send('image', 'cget', index, "-#{slot}")
-    else
-      tk_tcl2ruby(tk_send('image', 'cget', index, "-#{slot}"))
-    end
-  end
-
-  def image_configure(index, slot, value=None)
-    if slot.kind_of? Hash
-      tk_send('image', 'configure', index, *hash_kv(slot))
-    else
-      tk_send('image', 'configure', index, "-#{slot}", value)
-    end
-    self
-  end
-
-  def image_configinfo(index, slot = nil)
-    if slot
-      case slot.to_s
-      when 'text', 'label', 'show', 'data', 'file'
-	conf = tk_split_simplelist(tk_send('image', 'configure', 
-					   index, "-#{slot}"))
-      else
-	conf = tk_split_list(tk_send('image', 'configure', 
-				     index, "-#{slot}"))
-      end
-      conf[0] = conf[0][1..-1]
-      conf
-    else
-      tk_split_simplelist(tk_send('image', 'configure', 
-				  index)).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
-	conf[0] = conf[0][1..-1]
-	case conf[0]
-	when 'text', 'label', 'show', 'data', 'file'
-	else
-	  if conf[3]
-	    if conf[3].index('{')
-	      conf[3] = tk_split_list(conf[3]) 
-	    else
-	      conf[3] = tk_tcl2ruby(conf[3]) 
-	    end
-	  end
-	  if conf[4]
-	    if conf[4].index('{')
-	      conf[4] = tk_split_list(conf[4]) 
-	    else
-	      conf[4] = tk_tcl2ruby(conf[4]) 
-	    end
-	  end
-	end
-	conf
-      }
-    end
-  end
-
   def image_names
-    tk_split_simplelist(tk_send('image', 'names')).collect{|elt|
+    tk_send('image', 'names').collect{|elt|
       tagid2obj(elt)
     }
   end
 
   def set_insert(index)
     tk_send 'mark', 'set', 'insert', index
-    self
   end
-
   def set_current(index)
     tk_send 'mark', 'set', 'current', index
-    self
   end
 
   def insert(index, chars, *tags)
-    if tags[0].kind_of? Array
-      # multiple chars-taglist argument
-      args = [chars]
-      while tags.size > 0
-	tags.shift.collect{|x|_get_eval_string(x)}.join(' ')  # taglist
-	args << tags.shift if tags.size > 0                   # chars
-      end
-      super index, *args
-    else
-      # single chars-taglist argument
-      super index, chars, tags.collect{|x|_get_eval_string(x)}.join(' ')
-    end
+    super index, chars, tags.collect{|x|_get_eval_string(x)}.join(' ')
   end
 
   def destroy
-    @tags = {} unless @tags
     @tags.each_value do |t|
       t.destroy
     end
@@ -240,202 +210,113 @@ class TkText<TkTextWin
   end
   def debug=(boolean)
     tk_send 'debug', boolean
-    self
   end
+
   def bbox(index)
-    list(tk_send('bbox', index))
+    inf = tk_send('bbox', index)
+    (inf == "")?  [0,0,0,0]: inf
   end
-
   def dlineinfo(index)
-    list(tk_send('dlineinfo', index))
+    inf = tk_send('dlineinfo', index)
+    (inf == "")?  [0,0,0,0,0]: inf
   end
 
-  def modified?
-    bool(tk_send('edit', 'modified'))
-  end
-  def modified(mode)
-    tk_send('edit', 'modified', mode)
-    self
-  end
-  def edit_redo
-    tk_send('edit', 'redo')
-    self
-  end
-  def edit_reset
-    tk_send('edit', 'reset')
-    self
-  end
-  def edit_separator
-    tk_send('edit', 'separator')
-    self
-  end
-  def edit_undo
-    tk_send('edit', 'undo')
-    self
+  def yview(*what)
+    tk_send 'yview', *what
   end
-
   def yview_pickplace(*what)
     tk_send 'yview', '-pickplace', *what
-    self
   end
 
+  def xview(*what)
+    tk_send 'xview', *what
+  end
   def xview_pickplace(*what)
     tk_send 'xview', '-pickplace', *what
-    self
   end
 
-  def tag_add(tag, index1, index2=None)
+  def tag_add(tag,index1,index2=None)
     tk_send 'tag', 'add', tag, index1, index2
-    self
   end
-  alias addtag tag_add
-  alias add_tag tag_add
 
-  def tag_delete(*tags)
-    tk_send 'tag', 'delete', *tags
-    if TkTextTag::TTagID_TBL[@path]
-      tags.each{|tag|
-	if tag.kind_of? TkTextTag
-	  TTagID_TBL[@path].delete(tag.id) 
-	else
-	  TTagID_TBL[@path].delete(tag) 
-	end
-      }
-    end
-    self
+  def _tag_bind_core(mode, tag, seq, cmd=Proc.new, args=nil)
+    id = install_bind(cmd, args)
+    tk_send 'tag', 'bind', tag, "<#{tk_event_sequence(seq)}>", mode + id
+    # _addcmd cmd
   end
-  alias deltag tag_delete
-  alias delete_tag tag_delete
+  private :_tag_bind_core
 
   def tag_bind(tag, seq, cmd=Proc.new, args=nil)
-    _bind([@path, 'tag', 'bind', tag], seq, cmd, args)
-    self
+    _tag_bind_core('', tag, seq, cmd, args=nil)
   end
 
   def tag_bind_append(tag, seq, cmd=Proc.new, args=nil)
-    _bind_append([@path, 'tag', 'bind', tag], seq, cmd, args)
-    self
-  end
-
-  def tag_bind_remove(tag, seq)
-    _bind_remove([@path, 'tag', 'bind', tag], seq)
-    self
+    _tag_bind_core('+', tag, seq, cmd, args=nil)
   end
 
   def tag_bindinfo(tag, context=nil)
-    _bindinfo([@path, 'tag', 'bind', tag], context)
+    if context
+      (tk_send('tag', 'bind', tag, 
+	       "<#{tk_event_sequence(context)}>")).collect{|cmdline|
+	if cmdline =~ /^rb_out (c\d+)\s+(.*)$/
+	  [Tk_CMDTBL[$1], $2]
+	else
+	  cmdline
+	end
+      }
+    else
+      tk_split_list(tk_send('tag', 'bind', tag)).filter{|seq|
+	seq[1..-2].gsub(/></,',')
+      }
+    end
   end
 
   def tag_cget(tag, key)
-    case key.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      tk_call(@path, 'tag', 'cget', tag, "-#{key}")
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('tag', 'cget', tag, "-#{key}"))
-      fnt = tk_tcl2ruby(tk_send('tag', 'cget', tag, '-font'))
-      unless fnt.kind_of?(TkFont)
-	fnt = tagfontobj(tag, fnt)
-      end
-      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-	# obsolete; just for compatibility
-	fnt.kanji_font
-      else
-	fnt
-      end
-    else
-      tk_tcl2ruby(tk_call(@path, 'tag', 'cget', tag, "-#{key}"))
-    end
+    tk_tcl2ruby tk_call @path, 'tag', 'cget', tag, "-#{key}"
   end
 
   def tag_configure(tag, key, val=None)
     if key.kind_of? Hash
-      key = _symbolkey2str(key)
       if ( key['font'] || key['kanjifont'] \
 	  || key['latinfont'] || key['asciifont'] )
-	tagfont_configure(tag, key)
+	tagfont_configure(tag, key.dup)
       else
 	tk_send 'tag', 'configure', tag, *hash_kv(key)
       end
 
     else
-      if  key == 'font' || key == :font || 
-          key == 'kanjifont' || key == :kanjifont ||
-	  key == 'latinfont' || key == :latinfont || 
-          key == 'asciifont' || key == :asciifont
-	if val == None
-	  tagfontobj(tag)
-	else
-	  tagfont_configure(tag, {key=>val})
-	end
+      if  key == 'font' || key == 'kanjifont' ||
+	  key == 'latinfont' || key == 'asciifont'
+	tagfont_configure({key=>val})
       else
 	tk_send 'tag', 'configure', tag, "-#{key}", val
       end
     end
-    self
   end
 
   def tag_configinfo(tag, key=nil)
     if key
-      case key.to_s
-      when 'text', 'label', 'show', 'data', 'file'
-	conf = tk_split_simplelist(tk_send('tag','configure',tag,"-#{key}"))
-      when 'font', 'kanjifont'
-	conf = tk_split_simplelist(tk_send('tag','configure',tag,"-#{key}") )
-	conf[4] = tagfont_configinfo(tag, conf[4])
-      else
-	conf = tk_split_list(tk_send('tag','configure',tag,"-#{key}"))
-      end
+      conf = tk_split_list(tk_send('tag','configure',tag,"-#{key}"))
       conf[0] = conf[0][1..-1]
       conf
     else
-      ret = tk_split_simplelist(tk_send('tag', 'configure', 
-					tag)).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
+      tk_split_list(tk_send('tag', 'configure', tag)).collect{|conf|
 	conf[0] = conf[0][1..-1]
-	case conf[0]
-	when 'text', 'label', 'show', 'data', 'file'
-	else
-	  if conf[3]
-	    if conf[3].index('{')
-	      conf[3] = tk_split_list(conf[3]) 
-	    else
-	      conf[3] = tk_tcl2ruby(conf[3]) 
-	    end
-	  end
-	  if conf[4]
-	    if conf[4].index('{')
-	      conf[4] = tk_split_list(conf[4]) 
-	    else
-	      conf[4] = tk_tcl2ruby(conf[4]) 
-	    end
-	  end
-	end
 	conf
       }
-      fontconf = ret.assoc('font')
-      if fontconf
-	ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-	fontconf[4] = tagfont_configinfo(tag, fontconf[4])
-	ret.push(fontconf)
-      else
-	ret
-      end
     end
   end
 
   def tag_raise(tag, above=None)
     tk_send 'tag', 'raise', tag, above
-    self
   end
 
   def tag_lower(tag, below=None)
     tk_send 'tag', 'lower', tag, below
-    self
   end
 
   def tag_remove(tag, *index)
     tk_send 'tag', 'remove', tag, *index
-    self
   end
 
   def tag_ranges(tag)
@@ -448,129 +329,24 @@ class TkText<TkTextWin
   end
 
   def tag_nextrange(tag, first, last=None)
-    tk_split_list(tk_send('tag', 'nextrange', tag, first, last))
+    tk_split_simplelist(tk_send('tag', 'nextrange', tag, first, last))
   end
 
   def tag_prevrange(tag, first, last=None)
-    tk_split_list(tk_send('tag', 'prevrange', tag, first, last))
-  end
-
-  def window_cget(index, slot)
-    case slot.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      tk_send('window', 'cget', index, "-#{slot}")
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('window', 'cget', index, "-#{slot}"))
-      fnt = tk_tcl2ruby(tk_send('window', 'cget', index, '-font'))
-      unless fnt.kind_of?(TkFont)
-	fnt = tagfontobj(index, fnt)
-      end
-      if slot.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-	# obsolete; just for compatibility
-	fnt.kanji_font
-      else
-	fnt
-      end
-    else
-      tk_tcl2ruby(tk_send('window', 'cget', index, "-#{slot}"))
-    end
-  end
-
-  def window_configure(index, slot, value=None)
-    if index.kind_of? TkTextWindow
-      index.configure(slot, value)
-    else
-      if slot.kind_of? Hash
-	tk_send('window', 'configure', index, *hash_kv(slot))
-      else
-	tk_send('window', 'configure', index, "-#{slot}", value)
-      end
-    end
-    self
-  end
-
-  def window_configinfo(win, slot = nil)
-    if slot
-      case slot.to_s
-      when 'text', 'label', 'show', 'data', 'file'
-	conf = tk_split_simplelist(tk_send('window', 'configure', 
-					   win, "-#{slot}"))
-      else
-	conf = tk_split_list(tk_send('window', 'configure', 
-				     win, "-#{slot}"))
-      end
-      conf[0] = conf[0][1..-1]
-      conf
-    else
-      tk_split_simplelist(tk_send('window', 'configure', 
-				  win)).collect{|conflist|
-	conf = tk_split_simplelist(conflist)
-	conf[0] = conf[0][1..-1]
-	case conf[0]
-	when 'text', 'label', 'show', 'data', 'file'
-	else
-	  if conf[3]
-	    if conf[3].index('{')
-	      conf[3] = tk_split_list(conf[3]) 
-	    else
-	      conf[3] = tk_tcl2ruby(conf[3]) 
-	    end
-	  end
-	  if conf[4]
-	    if conf[4].index('{')
-	      conf[4] = tk_split_list(conf[4]) 
-	    else
-	      conf[4] = tk_tcl2ruby(conf[4]) 
-	    end
-	  end
-	end
-	conf
-      }
-    end
+    tk_split_simplelist(tk_send('tag', 'prevrange', tag, first, last))
   end
 
-  def window_names
-    tk_split_simplelist(tk_send('window', 'names')).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def _ktext_length(txt)
-    if $KCODE !~ /n/i
-      return txt.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
-    end
-
-    # $KCODE == 'NONE'
-    if JAPANIZED_TK
-      tk_call('kstring', 'length', txt).to_i
-    else
-      begin
-	tk_call('encoding', 'convertto', 'ascii', txt).length
-      rescue StandardError, NameError
-	# sorry, I have no plan
-	txt.length
-      end
-    end
-  end
-  private :_ktext_length
-
   def search_with_length(pat,start,stop=None)
-    pat = pat.chr if pat.kind_of? Integer
+    pat = pat.char if pat.kind_of? Integer
     if stop != None
       return ["", 0] if compare(start,'>=',stop)
       txt = get(start,stop)
       if (pos = txt.index(pat))
-	match = $&
-	#pos = txt[0..(pos-1)].split('').length if pos > 0
-	pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+	pos = txt[0..(pos-1)].split('').length if pos > 0
 	if pat.kind_of? String
-	  #return [index(start + " + #{pos} chars"), pat.split('').length]
-	  return [index(start + " + #{pos} chars"), 
-		  _ktext_length(pat), pat.dup]
+	  return [index(start + " + #{pos} chars"), pat.split('').length]
 	else
-	  #return [index(start + " + #{pos} chars"), $&.split('').length]
-	  return [index(start + " + #{pos} chars"), 
-		  _ktext_length(match), match]
+	  return [index(start + " + #{pos} chars"), $&.split('').length]
 	end
       else
 	return ["", 0]
@@ -578,31 +354,20 @@ class TkText<TkTextWin
     else
       txt = get(start,'end - 1 char')
       if (pos = txt.index(pat))
-	match = $&
-	#pos = txt[0..(pos-1)].split('').length if pos > 0
-	pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+	pos = txt[0..(pos-1)].split('').length if pos > 0
 	if pat.kind_of? String
-	  #return [index(start + " + #{pos} chars"), pat.split('').length]
-	  return [index(start + " + #{pos} chars"), 
-		  _ktext_length(pat), pat.dup]
+	  return [index(start + " + #{pos} chars"), pat.split('').length]
 	else
-	  #return [index(start + " + #{pos} chars"), $&.split('').length]
-	  return [index(start + " + #{pos} chars"), 
-		  _ktext_length(match), match]
+	  return [index(start + " + #{pos} chars"), $&.split('').length]
 	end
       else
 	txt = get('1.0','end - 1 char')
 	if (pos = txt.index(pat))
-	  match = $&
-	  #pos = txt[0..(pos-1)].split('').length if pos > 0
-	  pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+	  pos = txt[0..(pos-1)].split('').length if pos > 0
 	  if pat.kind_of? String
-	    #return [index("1.0 + #{pos} chars"), pat.split('').length]
-	    return [index("1.0 + #{pos} chars"), 
-		    _ktext_length(pat), pat.dup]
+	    return [index("1.0 + #{pos} chars"), pat.split('').length]
 	  else
-	    #return [index("1.0 + #{pos} chars"), $&.split('').length]
-	    return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+	    return [index("1.0 + #{pos} chars"), $&.split('').length]
 	  end
 	else
 	  return ["", 0]
@@ -616,20 +381,16 @@ class TkText<TkTextWin
   end
 
   def rsearch_with_length(pat,start,stop=None)
-    pat = pat.chr if pat.kind_of? Integer
+    pat = pat.char if pat.kind_of? Integer
     if stop != None
       return ["", 0] if compare(start,'<=',stop)
       txt = get(stop,start)
       if (pos = txt.rindex(pat))
-	match = $&
-	#pos = txt[0..(pos-1)].split('').length if pos > 0
-	pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+	pos = txt[0..(pos-1)].split('').length if pos > 0
 	if pat.kind_of? String
-	  #return [index(stop + " + #{pos} chars"), pat.split('').length]
-	  return [index(stop + " + #{pos} chars"), _ktext_length(pat), pat.dup]
+	  return [index(stop + " + #{pos} chars"), pat.split('').length]
 	else
-	  #return [index(stop + " + #{pos} chars"), $&.split('').length]
-	  return [index(stop + " + #{pos} chars"), _ktext_length(match), match]
+	  return [index(stop + " + #{pos} chars"), $&.split('').length]
 	end
       else
 	return ["", 0]
@@ -637,28 +398,20 @@ class TkText<TkTextWin
     else
       txt = get('1.0',start)
       if (pos = txt.rindex(pat))
-	match = $&
-	#pos = txt[0..(pos-1)].split('').length if pos > 0
-	pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+	pos = txt[0..(pos-1)].split('').length if pos > 0
 	if pat.kind_of? String
-	  #return [index("1.0 + #{pos} chars"), pat.split('').length]
-	  return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
+	  return [index("1.0 + #{pos} chars"), pat.split('').length]
 	else
-	  #return [index("1.0 + #{pos} chars"), $&.split('').length]
-	  return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+	  return [index("1.0 + #{pos} chars"), $&.split('').length]
 	end
       else
 	txt = get('1.0','end - 1 char')
 	if (pos = txt.rindex(pat))
-	  match = $&
-	  #pos = txt[0..(pos-1)].split('').length if pos > 0
-	  pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+	  pos = txt[0..(pos-1)].split('').length if pos > 0
 	  if pat.kind_of? String
-	    #return [index("1.0 + #{pos} chars"), pat.split('').length]
-	    return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
+	    return [index("1.0 + #{pos} chars"), pat.split('').length]
 	  else
-	    #return [index("1.0 + #{pos} chars"), $&.split('').length]
-	    return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+	    return [index("1.0 + #{pos} chars"), $&.split('').length]
 	  end
 	else
 	  return ["", 0]
@@ -670,164 +423,19 @@ class TkText<TkTextWin
   def rsearch(pat,start,stop=None)
     rsearch_with_length(pat,start,stop)[0]
   end
-
-  def dump(type_info, *index, &block)
-    args = type_info.collect{|inf| '-' + inf}
-    args << '-command' << block if block
-    str = tk_send('dump', *(args + index))
-    result = []
-    sel = nil
-    i = 0
-    while i < str.size
-      # retrieve key
-      idx = str.index(/ /, i)
-      result.push str[i..(idx-1)]
-      i = idx + 1
-      
-      # retrieve value
-      case result[-1]
-      when 'text'
-	if str[i] == ?{
-	  # text formed as {...}
-	  val, i = _retrieve_braced_text(str, i)
-	  result.push val
-	else
-	  # text which may contain backslahes
-	  val, i = _retrieve_backslashed_text(str, i)
-	  result.push val
-	end
-      else
-	idx = str.index(/ /, i)
-	val = str[i..(idx-1)]
-	case result[-1]
-	when 'mark'
-	  case val
-	  when 'insert'
-	    result.push TkTextMarkInsert.new(self)
-	  when 'current'
-	    result.push TkTextMarkCurrent.new(self)
-	  when 'anchor'
-	    result.push TkTextMarkAnchor.new(self)
-	  else
-	    result.push tk_tcl2ruby(val)
-	  end
-	when 'tagon'
-	  if val == 'sel'
-	    if sel
-	      result.push sel
-	    else
-	      result.push TkTextTagSel.new(self)
-	    end
-	  else
-	    result.push tk_tcl2ruby(val)
-	  end
-	when 'tagoff'
-	    result.push tk_tcl2ruby(val)
-	when 'window'
-	  result.push tk_tcl2ruby(val)
-	end
-	i = idx + 1
-      end
-
-      # retrieve index
-      idx = str.index(/ /, i)
-      if idx
-	result.push str[i..(idx-1)]
-	i = idx + 1
-      else
-	result.push str[i..-1]
-	break
-      end
-    end
-    
-    kvis = []
-    until result.empty?
-      kvis.push [result.shift, result.shift, result.shift]
-    end
-    kvis  # result is [[key1, value1, index1], [key2, value2, index2], ...]
-  end
-
-  def _retrieve_braced_text(str, i)
-    cnt = 0
-    idx = i
-    while idx < str.size
-      case str[idx]
-      when ?{
-	cnt += 1
-      when ?}
-	cnt -= 1
-	if cnt == 0
-	  break
-	end
-      end
-      idx += 1
-    end
-    return str[i+1..idx-1], idx + 2
-  end
-  private :_retrieve_braced_text
-
-  def _retrieve_backslashed_text(str, i)
-    j = i
-    idx = nil
-    loop {
-      idx = str.index(/ /, j)
-      if str[idx-1] == ?\\
-	j += 1
-      else
-	break
-      end
-    }
-    val = str[i..(idx-1)]
-    val.gsub!(/\\( |\{|\})/, '\1')
-    return val, idx + 1
-  end
-  private :_retrieve_backslashed_text
-
-  def dump_all(*index, &block)
-    dump(['all'], *index, &block)
-  end
-  def dump_mark(*index, &block)
-    dump(['mark'], *index, &block)
-  end
-  def dump_tag(*index, &block)
-    dump(['tag'], *index, &block)
-  end
-  def dump_text(*index, &block)
-    dump(['text'], *index, &block)
-  end
-  def dump_window(*index, &block)
-    dump(['window'], *index, &block)
-  end
-  def dump_image(*index, &block)
-    dump(['image'], *index, &block)
-  end
 end
 
 class TkTextTag<TkObject
   include TkTreatTagFont
 
-  TTagID_TBL = TkCore::INTERP.create_table
-  Tk_TextTag_ID = ['tag'.freeze, '00000'.taint].freeze
-
-  TkCore::INTERP.init_ip_env{ TTagID_TBL.clear }
-
-  def TkTextTag.id2obj(text, id)
-    tpath = text.path
-    return id unless TTagID_TBL[tpath]
-    TTagID_TBL[tpath][id]? TTagID_TBL[tpath][id]: id
-  end
-
+  $tk_text_tag = 'tag0000'
   def initialize(parent, *args)
     if not parent.kind_of?(TkText)
       fail format("%s need to be TkText", parent.inspect)
     end
     @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = Tk_TextTag_ID.join
-    TTagID_TBL[@id] = self
-    TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-    TTagID_TBL[@tpath][@id] = self
-    Tk_TextTag_ID[1].succ!
+    @path = @id = $tk_text_tag
+    $tk_text_tag = $tk_text_tag.succ
     #tk_call @t.path, "tag", "configure", @id, *hash_kv(keys)
     if args != [] then
       keys = args.pop
@@ -843,7 +451,7 @@ class TkTextTag<TkObject
   end
 
   def id
-    @id
+    return @id
   end
 
   def first
@@ -856,12 +464,10 @@ class TkTextTag<TkObject
 
   def add(*index)
     tk_call @t.path, 'tag', 'add', @id, *index
-    self
   end
 
   def remove(*index)
     tk_call @t.path, 'tag', 'remove', @id, *index
-    self
   end
 
   def ranges
@@ -874,11 +480,11 @@ class TkTextTag<TkObject
   end
 
   def nextrange(first, last=None)
-    tk_split_list(tk_call(@t.path, 'tag', 'nextrange', @id, first, last))
+    tk_split_simplelist(tk_call(@t.path, 'tag', 'nextrange', @id, first, last))
   end
 
   def prevrange(first, last=None)
-    tk_split_list(tk_call(@t.path, 'tag', 'prevrange', @id, first, last))
+    tk_split_simplelist(tk_call(@t.path, 'tag', 'prevrange', @id, first, last))
   end
 
   def [](key)
@@ -890,24 +496,7 @@ class TkTextTag<TkObject
   end
 
   def cget(key)
-    case key.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      tk_call @t.path, 'tag', 'cget', @id, "-#{key}"
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
-      fnt = tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, '-font'))
-      unless fnt.kind_of?(TkFont)
-	fnt = tagfontobj(@id, fnt)
-      end
-      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-	# obsolete; just for compatibility
-	fnt.kanji_font
-      else
-	fnt
-      end
-    else
-      tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
-    end
+    tk_tcl2ruby tk_call @t.path, 'tag', 'cget', @id, "-#{key}"
   end
 
   def configure(key, val=None)
@@ -932,141 +521,90 @@ class TkTextTag<TkObject
   def configinfo(key=nil)
     @t.tag_configinfo @id, key
   end
+#  def configinfo(key=nil)
+#    if key
+#      conf = tk_split_list(tk_call(@t.path, 'tag','configure',@id,"-#{key}"))
+#      conf[0] = conf[0][1..-1]
+#      conf
+#    else
+#      tk_split_list(tk_call(@t.path, 'tag', 'configure', @id)).collect{|conf|
+#	conf[0] = conf[0][1..-1]
+#	conf
+#      }
+#    end
+#  end
 
   def bind(seq, cmd=Proc.new, args=nil)
-    _bind([@t.path, 'tag', 'bind', @id], seq, cmd, args)
-    self
-  end
-
-  def bind_append(seq, cmd=Proc.new, args=nil)
-    _bind_append([@t.path, 'tag', 'bind', @id], seq, cmd, args)
-    self
-  end
-
-  def bind_remove(seq)
-    _bind_remove([@t.path, 'tag', 'bind', @id], seq)
-    self
+    id = install_bind(cmd, args)
+    tk_call @t.path, 'tag', 'bind', @id, "<#{tk_event_sequence(seq)}>", id
+    # @t._addcmd cmd
   end
 
   def bindinfo(context=nil)
-    _bindinfo([@t.path, 'tag', 'bind', @id], context)
+    if context
+      (tk_call(@t.path, 'tag', 'bind', @id, 
+	       "<#{tk_event_sequence(context)}>")).collect{|cmdline|
+	if cmdline =~ /^rb_out (c\d+)\s+(.*)$/
+	  [Tk_CMDTBL[$1], $2]
+	else
+	  cmdline
+	end
+      }
+    else
+      tk_split_list(tk_call(@t.path, 'tag', 'bind', @id)).filter{|seq|
+	seq[1..-2].gsub(/></,',')
+      }
+    end
   end
 
   def raise(above=None)
     tk_call @t.path, 'tag', 'raise', @id, above
-    self
   end
 
   def lower(below=None)
     tk_call @t.path, 'tag', 'lower', @id, below
-    self
   end
 
   def destroy
     tk_call @t.path, 'tag', 'delete', @id
-    TTagID_TBL[@tpath].delete(@id) if TTagID_TBL[@tpath]
-    self
   end
 end
 
-class TkTextNamedTag<TkTextTag
-  def self.new(parent, name, *args)
-    if TTagID_TBL[parent.path] && TTagID_TBL[parent.path][name]
-      tagobj = TTagID_TBL[parent.path][name]
-      if args != [] then
-	keys = args.pop
-	if keys.kind_of? Hash then
-	  tagobj.add(*args) if args != []
-	  tagobj.configure(keys)
-	else
-	  args.push keys
-	  tagobj.add(*args)
-	end
-      end
-      return tagobj
-    else
-      super(parent, name, *args)
-    end
-  end
-
-  def initialize(parent, name, *args)
+class TkTextTagSel<TkTextTag
+  def initialize(parent, keys=nil)
     if not parent.kind_of?(TkText)
       fail format("%s need to be TkText", parent.inspect)
     end
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-    TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-    TTagID_TBL[@tpath][@id] = self unless TTagID_TBL[@tpath][@id]
-    #if mode
-    #  tk_call @t.path, "addtag", @id, *args
-    #end
-    if args != [] then
-      keys = args.pop
-      if keys.kind_of? Hash then
-	add(*args) if args != []
-	configure(keys)
-      else
-	args.push keys
-	add(*args)
-      end
-    end
+    @t = parent
+    @path = @id = 'sel'
+    #tk_call @t.path, "tag", "configure", @id, *hash_kv(keys)
+    configure(keys) if keys
     @t._addtag id, self
   end
 end
 
-class TkTextTagSel<TkTextNamedTag
-  def self.new(parent, *args)
-    super(parent, 'sel', *args)
-  end
-end
-
 class TkTextMark<TkObject
-  TMarkID_TBL = TkCore::INTERP.create_table
-  Tk_TextMark_ID = ['mark'.freeze, '00000'.taint].freeze
-
-  TkCore::INTERP.init_ip_env{ TMarkID_TBL.clear }
-
-  def TkTextMark.id2obj(text, id)
-    tpath = text.path
-    return id unless TMarkID_TBL[tpath]
-    TMarkID_TBL[tpath][id]? TMarkID_TBL[tpath][id]: id
-  end
-
+  $tk_text_mark = 'mark0000'
   def initialize(parent, index)
     if not parent.kind_of?(TkText)
       fail format("%s need to be TkText", parent.inspect)
     end
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = Tk_TextMark_ID.join
-    TMarkID_TBL[@id] = self
-    TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
-    TMarkID_TBL[@tpath][@id] = self
-    Tk_TextMark_ID[1].succ!
+    @t = parent
+    @path = @id = $tk_text_mark
+    $tk_text_mark = $tk_text_mark.succ
     tk_call @t.path, 'mark', 'set', @id, index
     @t._addtag id, self
   end
-
   def id
-    @id
-  end
-
-  def +(mod)
-    @id + ' + ' + mod
-  end
-  def -(mod)
-    @id + ' - ' + mod
+    return @id
   end
 
   def set(where)
     tk_call @t.path, 'mark', 'set', @id, where
-    self
   end
 
   def unset
     tk_call @t.path, 'mark', 'unset', @id
-    self
   end
   alias destroy unset
 
@@ -1076,65 +614,42 @@ class TkTextMark<TkObject
 
   def gravity=(direction)
     tk_call @t.path, 'mark', 'gravity', @id, direction
-    self
-  end
-
-  def next(index = nil)
-    if index
-      @t.tagid2obj(tk_call(@t.path, 'mark', 'next', index))
-    else
-      @t.tagid2obj(tk_call(@t.path, 'mark', 'next', @id))
-    end
-  end
-
-  def previous(index = nil)
-    if index
-      @t.tagid2obj(tk_call(@t.path, 'mark', 'previous', index))
-    else
-      @t.tagid2obj(tk_call(@t.path, 'mark', 'previous', @id))
-    end
   end
 end
 
-class TkTextNamedMark<TkTextMark
-  def self.new(parent, name, *args)
-    if TMarkID_TBL[parent.path] && TMarkID_TBL[parent.path][name]
-      return TMarkID_TBL[parent.path][name]
-    else
-      super(parent, name, *args)
-    end
-  end
-
-  def initialize(parent, name, index=nil)
+class TkTextMarkInsert<TkTextMark
+  def initialize(parent, index=nil)
     if not parent.kind_of?(TkText)
       fail format("%s need to be TkText", parent.inspect)
     end
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-    TMarkID_TBL[@id] = self
-    TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
-    TMarkID_TBL[@tpath][@id] = self unless TMarkID_TBL[@tpath][@id]
+    @t = parent
+    @path = @id = 'insert'
     tk_call @t.path, 'mark', 'set', @id, index if index
     @t._addtag id, self
   end
 end
 
-class TkTextMarkInsert<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'insert', *args)
-  end
-end
-
 class TkTextMarkCurrent<TkTextMark
-  def self.new(parent,*args)
-    super(parent, 'current', *args)
+  def initialize(parent,index=nil)
+    if not parent.kind_of?(TkText)
+      fail format("%s need to be TkText", parent.inspect)
+    end
+    @t = parent
+    @path = @id = 'current'
+    tk_call @t.path, 'mark', 'set', @id, index if index
+    @t._addtag id, self
   end
 end
 
 class TkTextMarkAnchor<TkTextMark
-  def self.new(parent,*args)
-    super(parent, 'anchor', *args)
+  def initialize(parent,index=nil)
+    if not parent.kind_of?(TkText)
+      fail format("%s need to be TkText", parent.inspect)
+    end
+    @t = parent
+    @path = @id = 'anchor'
+    tk_call @t.path, 'mark', 'set', @id, index if index
+    @t._addtag id, self
   end
 end
 
@@ -1157,7 +672,6 @@ class TkTextWindow<TkObject
     end
     @path.gravity = 'left'
     @index = @path.path
-    keys = _symbolkey2str(keys)
     @id = keys['window']
     if keys['create']
       @p_create = keys['create']
@@ -1176,33 +690,27 @@ class TkTextWindow<TkObject
   end
 
   def cget(slot)
-    @t.window_cget(@index, slot)
+    tk_tcl2ruby tk_call @t.path, 'window', 'cget', @index, "-#{slot}"
   end
 
   def configure(slot, value=None)
     if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
       @id = slot['window'] if slot['window']
       if slot['create']
 	self.create=value
 	slot['create']=nil
       end
       if slot.size > 0
-	tk_call(@t.path, 'window', 'configure', @index, *hash_kv(slot))
+	tk_call @t.path, 'window', 'configure', @index, *hash_kv(slot)
       end
     else
-      @id = value if slot == 'window' || slot == :window
-      if slot == 'create' || slot == :create
+      @id = value if slot == 'window'
+      if slot == 'create'
 	self.create=value
       else
-	tk_call(@t.path, 'window', 'configure', @index, "-#{slot}", value)
+	tk_call @t.path, 'window', 'configure', @index, "-#{slot}", value
       end
     end
-    self
-  end
-
-  def configinfo(slot = nil)
-    @t.window_configinfo(@index, slot)
   end
 
   def window
@@ -1225,6 +733,148 @@ class TkTextWindow<TkObject
     end
     tk_call @t.path, 'window', 'configure', @index, '-create', value
   end
+
+  def configinfo(slot = nil)
+    if slot
+      conf = tk_split_list(tk_call @t.path, 'window', 'configure', 
+			   @index, "-#{slot}")
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_list(tk_call @t.path, 'window', 'configure', 
+		    @index).collect{|conf|
+	conf[0] = conf[0][1..-1]
+	conf
+      }
+    end
+  end
+
+  def _dump(type, *index)
+    str = tk_send('dump', type, *index)
+    result = []
+    sel = nil
+    i = 0
+    while i < str.size
+      # retrieve key
+      idx = str.index(/ /, i)
+      result.push str[i..(idx-1)]
+      i = idx + 1
+      
+      # retrieve value
+      case result[-1]
+      when 'text'
+	if str[i] == ?{
+	  # text formed as {...}
+	  val, i = _retrieve_braced_text(str, i)
+	  result.push val
+	else
+	  # text which may contain backslahes
+	  val, i = _retrieve_backslashed_text(str, i)
+	  result.push val
+	end
+      else
+	idx = str.index(/ /, i)
+	val = str[i..(idx-1)]
+	case result[-1]
+	when 'mark'
+	  case val
+	  when 'insert'
+	    result.push TkTextMarkInsert.new(self)
+	  when 'current'
+	    result.push TkTextMarkCurrent.new(self)
+	  when 'anchor'
+	    result.push TkTextMarkAnchor.new(self)
+	  else
+	    result.push tk_tcl2rb(val)
+	  end
+	when 'tagon'
+	  if val == 'sel'
+	    if sel
+	      result.push sel
+	    else
+	      result.push TkTextTagSel.new(self)
+	    end
+	  else
+	    result.push tk_tcl2rb val
+	  end
+	when 'tagoff'
+	    result.push tk_tcl2rb sel
+	when 'window'
+	  result.push tk_tcl2rb val
+	end
+	i = idx + 1
+      end
+
+      # retrieve index
+      idx = str.index(/ /, i)
+      if idx
+	result.push str[i..(idx-1)]
+	i = idx + 1
+      else
+	result.push str[i..-1]
+	break
+      end
+    end
+    
+    kvis = []
+    until result.empty?
+      kvis.push [result.shift, result.shift, result.shift]
+    end
+    kvis  # result is [[key1, value1, index1], [key2, value2, index2], ...]
+  end
+  private :_dump
+
+  def _retrieve_braced_text(str, i)
+    cnt = 0
+    idx = i
+    while idx < str.size
+      case str[idx]
+      when ?{
+	cnt += 1
+      when ?}
+	cnt -= 1
+	if cnt == 0
+	  break
+	end
+      end
+      idx += 1
+    end
+    return str[i+1..idx-1], idx + 2
+  end
+  private :_retrieve_braced_text
+
+  def _retrieve_backslashed_text(str, i)
+    j = i
+    idx = nil
+    loop {
+      idx = str.index(/ /, j)
+      if str[idx-1] == ?\\
+	j += 1
+      else
+	break
+      end
+    }
+    val = str[i..(idx-1)]
+    val.gsub!(/\\( |\{|\})/, '\1')
+    return val, idx + 1
+  end
+  private :_retrieve_backslashed_text
+
+  def dump_all(*index)
+    _dump('-all', *index)
+  end
+  def dump_mark(*index)
+    _dump('-mark', *index)
+  end
+  def dump_tag(*index)
+    _dump('-tag', *index)
+  end
+  def dump_text(*index)
+    _dump('-text', *index)
+  end
+  def dump_window(*index)
+    _dump('-window', *index)
+  end
 end
 
 class TkTextImage<TkObject
@@ -1257,28 +907,40 @@ class TkTextImage<TkObject
   end
 
   def cget(slot)
-    @t.image_cget(@index, slot)
+    tk_tcl2ruby tk_call @t.path, 'image', 'cget', @index, "-#{slot}"
   end
 
   def configure(slot, value=None)
-    @t.image_configure(@index, slot, value)
-    self
+    if slot.kind_of? Hash
+      tk_call @t.path, 'image', 'configure', @index, *hash_kv(slot)
+    else
+      tk_call @t.path, 'image', 'configure', @index, "-#{slot}", value
+    end
   end
 #  def configure(slot, value)
 #    tk_call @t.path, 'image', 'configure', @index, "-#{slot}", value
 #  end
 
-  def configinfo(slot = nil)
-    @t.image_configinfo(@index, slot)
-  end
-
   def image
-    img = tk_call(@t.path, 'image', 'configure', @index, '-image')
-    TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
+    tk_call @t.path, 'image', 'configure', @index, '-image'
   end
 
   def image=(value)
     tk_call @t.path, 'image', 'configure', @index, '-image', value
-    self
+  end
+
+  def configinfo(slot = nil)
+    if slot
+      conf = tk_split_list(tk_call @t.path, 'image', 'configure', 
+			   @index, "-#{slot}")
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_list(tk_call @t.path, 'image', 'configure', 
+		    @index).collect{|conf|
+	conf[0] = conf[0][1..-1]
+	conf
+      }
+    end
   end
 end
diff --git a/ext/tk/lib/tkvirtevent.rb b/ext/tk/lib/tkvirtevent.rb
index ccd3448434..0d100c2186 100644
--- a/ext/tk/lib/tkvirtevent.rb
+++ b/ext/tk/lib/tkvirtevent.rb
@@ -7,42 +7,23 @@ require 'tk'
 class TkVirtualEvent<TkObject
   extend Tk
 
-  TkCommandNames = ['event'.freeze].freeze
-
-  TkVirtualEventID = ["<VirtEvent".freeze, "00000".taint, ">".freeze].freeze
-  TkVirtualEventTBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{ TkVirtualEventTBL.clear }
-
-  class PreDefVirtEvent<self
-    def initialize(event)
-      @path = @id = event
-      TkVirtualEvent::TkVirtualEventTBL[@id] = self
-    end
-  end
+  TkVirturlEventID = [0]
+  TkVirturlEventTBL = {}
 
   def TkVirtualEvent.getobj(event)
-    obj = TkVirtualEventTBL[event]
-    if obj
-      obj
-    else
-      if tk_call('event', 'info').index("<#{event}>")
-	PreDefVirtEvent.new(event)
-      else
-	fail ArgumentError, "undefined virtual event '<#{event}>'"
-      end
-    end
+    obj = TkVirturlEventTBL[event]
+    obj ? obj : event
   end
 
   def TkVirtualEvent.info
-    tk_call('event', 'info').split(/\s+/).collect!{|seq|
+    tk_call('event', 'info').split(/\s+/).filter{|seq|
       TkVirtualEvent.getobj(seq[1..-2])
     }
   end
 
   def initialize(*sequences)
-    @path = @id = TkVirtualEventID.join
-    TkVirtualEventID[1].succ!
+    @path = @id = format("<VirtEvent%.4d>", TkVirturlEventID[0])
+    TkVirturlEventID[0] += 1
     add(*sequences)
   end
 
@@ -50,7 +31,7 @@ class TkVirtualEvent<TkObject
     if sequences != []
       tk_call('event', 'add', "<#{@id}>", 
 	      *(sequences.collect{|seq| "<#{tk_event_sequence(seq)}>"}) )
-      TkVirtualEventTBL[@id] = self
+      TkVirturlEventTBL[@id] = self
     end
     self
   end
@@ -58,18 +39,18 @@ class TkVirtualEvent<TkObject
   def delete(*sequences)
     if sequences == []
       tk_call('event', 'delete', "<#{@id}>")
-      TkVirtualEventTBL.delete(@id)
+      TkVirturlEventTBL[@id] = nil
     else
       tk_call('event', 'delete', "<#{@id}>", 
 	      *(sequences.collect{|seq| "<#{tk_event_sequence(seq)}>"}) )
-      TkVirtualEventTBL.delete(@id) if info == []
+      TkVirturlEventTBL[@id] = nil if info == []
     end
     self
   end
 
   def info
-    tk_call('event', 'info', "<#{@id}>").split(/\s+/).collect!{|seq|
-      l = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
+    tk_call('event', 'info', "<#{@id}>").split(/\s+/).filter{|seq|
+      l = seq.scan(/<*[^<>]+>*/).filter{|subseq|
 	case (subseq)
 	when /^<<[^<>]+>>$/
 	  TkVirtualEvent.getobj(subseq[1..-2])
diff --git a/ext/tk/lib/tkwinpkg.rb b/ext/tk/lib/tkwinpkg.rb
deleted file mode 100644
index 7762b3a596..0000000000
--- a/ext/tk/lib/tkwinpkg.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-#   tkwinpkg.rb : methods for Tcl/Tk packages for Microsoft Windows
-#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-#     ATTENTION !!
-#         This is NOT TESTED. Because I have no test-environment.
-#
-#
-require 'tk'
-
-module TkWinDDE
-  extend Tk
-  extend TkWinDDE
-
-  TkCommandNames = ['dde'.freeze].freeze
-
-  tk_call('package', 'require', 'dde')
-
-  def servername(topic=nil)
-    tk_call('dde', 'servername', topic)
-  end
-
-  def execute(service, topic, data)
-    tk_call('dde', 'execute', service, topic, data)
-  end
-
-  def async_execute(service, topic, data)
-    tk_call('dde', '-async', 'execute', service, topic, data)
-  end
-
-  def poke(service, topic, item, data)
-    tk_call('dde', 'poke', service, topic, item, data)
-  end
-
-  def request(service, topic, item)
-    tk_call('dde', 'request', service, topic, item)
-  end
-
-  def services(service, topic)
-    tk_call('dde', 'services', service, topic)
-  end
-
-  def eval(topic, cmd, *args)
-    tk_call('dde', 'eval', topic, cmd, *args)
-  end
-
-  module_function :servername, :execute, :async_execute, 
-                  :poke, :request, :services, :eval
-end
-
-module TkWinRegistry
-  extend Tk
-  extend TkWinRegistry
-
-  TkCommandNames = ['registry'.freeze].freeze
-
-  tk_call('package', 'require', 'registry')
-
-  def delete(keynam, valnam=nil)
-    tk_call('registry', 'delete', keynam, valnam)
-  end
-
-  def get(keynam, valnam)
-    tk_call('registry', 'get', keynam, valnam)
-  end
-
-  def keys(keynam)
-    tk_split_simplelist(tk_call('registry', 'keys', keynam))
-  end
-
-  def set(keynam, valnam=nil, data=nil, dattype=nil)
-    tk_call('registry', 'set', keynam, valnam, data, dattype)
-  end
-
-  def type(keynam, valnam)
-    tk_call('registry', 'type', keynam, valnam)
-  end
-
-  def values(keynam)
-    tk_split_simplelist(tk_call('registry', 'values', keynam))
-  end
-
-  module_function :delete, :get, :keys, :set, :type, :values
-end
diff --git a/ext/tk/sample/demos-en/ChangeLog b/ext/tk/sample/demos-en/ChangeLog
deleted file mode 100644
index c3f66cf409..0000000000
--- a/ext/tk/sample/demos-en/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2002-08-29 16:30  matt
-
-	* ChangeLog: ChangeLog is auto-generated *from* CVS log.
-
-2002-08-29 16:27  matt
-
-	* ChangeLog.prev: [no log message]
-
-2002-08-28 18:07  matt
-
-	* browse1, browse2, hello, ixset, rmt, rolodex, rolodex-j, square,
-	tcolor, timer, widget: Changed #! lines to the slightly more
-	portable '#!/usr/bin/env ruby'.
-
-2002-08-28 17:56  matt
-
-	* icon.rb, items.rb, label.rb, menu.rb, ruler.rb: Changed bitmap
-	file extensions from .bmp to .xbm.
-
-2002-08-28 17:55  matt
-
-	* images/: face.bmp, face.xbm, flagdown.bmp, flagdown.xbm,
-	flagup.bmp, flagup.xbm, gray25.bmp, gray25.xbm, letters.bmp,
-	letters.xbm, noletter.bmp, noletter.xbm, pattern.bmp, pattern.xbm:
-	Changed X bitmap file extensions from .bmp to the more intuitive
-	.xbm.
-
-2002-08-28 17:35  matt
-
-	* bitmap.rb, colors.rb, cscroll.rb, ctext.rb, hello, ixset,
-	menubu.rb, patch_1.1c1, rmt, style.rb, timer, ChangeLog, README,
-	README.tkencoding, arrow.rb, bind.rb, browse1, browse2, button.rb,
-	check.rb, clrpick.rb, dialog1.rb, dialog2.rb, entry1.rb, entry2.rb,
-	filebox.rb, floor.rb, form.rb, hscale.rb, icon.rb, image1.rb,
-	image2.rb, items.rb, label.rb, menu.rb, msgbox.rb, plot.rb,
-	puzzle.rb, radio.rb, rolodex, rolodex-j, ruler.rb, sayings.rb,
-	search.rb, square, states.rb, tcolor, text.rb, tkencoding.rb,
-	twind.rb, vscale.rb, widget, doc.org/README, doc.org/README.JP,
-	doc.org/README.tk80, doc.org/license.terms,
-	doc.org/license.terms.tk80, images/earth.gif, images/earthris.gif,
-	images/face.bmp, images/flagdown.bmp, images/flagup.bmp,
-	images/gray25.bmp, images/grey.25, images/grey.5,
-	images/letters.bmp, images/noletter.bmp, images/pattern.bmp,
-	images/tcllogo.gif, images/teapot.ppm: Initial revision
-
-2002-08-28 17:35  matt
-
-	* bitmap.rb, colors.rb, cscroll.rb, ctext.rb, hello, ixset,
-	menubu.rb, patch_1.1c1, rmt, style.rb, timer, ChangeLog, README,
-	README.tkencoding, arrow.rb, bind.rb, browse1, browse2, button.rb,
-	check.rb, clrpick.rb, dialog1.rb, dialog2.rb, entry1.rb, entry2.rb,
-	filebox.rb, floor.rb, form.rb, hscale.rb, icon.rb, image1.rb,
-	image2.rb, items.rb, label.rb, menu.rb, msgbox.rb, plot.rb,
-	puzzle.rb, radio.rb, rolodex, rolodex-j, ruler.rb, sayings.rb,
-	search.rb, square, states.rb, tcolor, text.rb, tkencoding.rb,
-	twind.rb, vscale.rb, widget, doc.org/README, doc.org/README.JP,
-	doc.org/README.tk80, doc.org/license.terms,
-	doc.org/license.terms.tk80, images/earth.gif, images/earthris.gif,
-	images/face.bmp, images/flagdown.bmp, images/flagup.bmp,
-	images/gray25.bmp, images/grey.25, images/grey.5,
-	images/letters.bmp, images/noletter.bmp, images/pattern.bmp,
-	images/tcllogo.gif, images/teapot.ppm: Taking over demo package
-	from Jonathan Conway.
-
diff --git a/ext/tk/sample/demos-en/ChangeLog.prev b/ext/tk/sample/demos-en/ChangeLog.prev
deleted file mode 100644
index 536ce30abe..0000000000
--- a/ext/tk/sample/demos-en/ChangeLog.prev
+++ /dev/null
@@ -1,9 +0,0 @@
-2001-07-26      <rise@leannan.knavery.net>
-
-	* Moved files to directory ruby-tk81-demos-english in tarball.
-
-2001-07-26      <rise@knavery.net>
-
-	* Added test to widget and hello versus Tk::TCL_VERSION & Tk::JAPANIZED_TK (per Guy Decoux in [ruby-talk:18559]) before requiring tkencoding.rb.
-
-	
-\ No newline at end of file
diff --git a/ext/tk/sample/demos-en/README b/ext/tk/sample/demos-en/README
deleted file mode 100644
index 2908aa38e4..0000000000
--- a/ext/tk/sample/demos-en/README
+++ /dev/null
@@ -1,138 +0,0 @@
-Current Maintainer: 
-	Jonathan Conway
-	rise@knavery.net
-
-	Please direct all bug reports/requests/suggestions to the above 
-	address.
-
-
-Notes:
-
-* 	The files hello and widget have been changed to test Tk::TCL_VERSION 
-	and Tk::JAPANIZED_TK before requiring tkencoding.rb to prevent an
-	infinite loop.  This test was taken from a message in
-	[ruby-talk:18559] by Guy Decoux.
-
-*	The .bmp files in the images directory are X bitmaps (i.e. XBM to many
-	graphics packages), not Windows bitmaps (.bmp).  You will not be
-	able to use images exported by a graphics program as Windows
-	bitmaps with this demo collection nor will you be able to edit the
-	included images without setting the file type correctly.
-	
--- Jonathan Conway, 2001-07-26
-
-
-#------------------------------------------------------------------------------
-# ==== Introduction. ====
-#
-# To create this version of the Ruby/Tk widget demo, I took the
-# ruby-tk81-demos and removed all the Kanji strings and comments.  I
-# have tried to restore the original English strings and comments
-# using the Tcl/Tk8.2.2 version of the widget demo. 
-#
-# When I tried running the Kanji version, all I got was a mostly blank
-# panel with a non-functional "File" button. I disovered that if all
-# non-ASCII characters were replaced with blanks, then I could get the
-# gutted stuff running.  
-#
-# Since English Ruby/Tk documentation is lacking and I needed this
-# code to see how it worked and to use as the basis of my try-it
-# prototype (The Ruby Yielding Interactive Toolkit), plus the fact
-# that no help was forthcoming for making the Kanji version work (plus
-# the fact that I can't read Kanji anyway), I decided to embark on
-# this English restoration project. 
-#
-# Thanks to everyone who worked on the original Ruby/Tk widget demo
-# (and the preceding Tcl/Tk version for that matter).  The
-# comparatively simple task of changing text strings and comments has
-# made me appreciate the great amount of original work that went into
-# this.
-#
-# -- Conrad Schneiker, 2000-07-23.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# ==== Known bugs. ====
-#
-# ^C-ing the demo gives Ruby interrupt and stack message; clean exit needed.
-# Font settings don't work correctly.
-# Dismissing the embedded windows demo (tkwind.rb) kills the widget demo.
-# Rerunning the canvas item demo from the code widow get errors.
-# The "press me" button in the canvas item demo doesn't time out.
-# The simple 2 d plot starts up extremely slow compared to the Tcl version.
-# The first item message on the icon menu on the menu and cascades demo doesn't work.
-#------------------------------------------------------------------------------
-
-
-###################### Original README ########################################
-
-  Ruby/Tk81 widget-demo			1999/08/13
-
-					��Φ��ü�����ʳظ����
-					Ω�� <ttate@jaist.ac.jp>
-
-Tcl/Tk8.1�Ǥ�unicode(UTF8)�����Ѥ��졢unicode���Ѵ����줿���ܸ�Ǥ����
-Widget��ɽ�������뤳�Ȥ���ǽ�Ǥ����ܥ��������֤ˤϰ����˱ʰ椵���濴��
-�ʤ��ƺ������줿Ruby/Tk�Υ���ץ�˽�����ä����ʲ��δĶ��ˤ����Ƥ�ư��
-���ǧ������ΤǤ���
-
-* ruby-1.3.7,ruby-1.4.0
-* tcl8.1, tk8.1
-* linux-2.2
-
-Windows(Cygwin)�ˤ����ơ�����ץ��ư�����ˤ�ruby��-Ke�Ȥ������ץ�������
-���Ƶ�ư��������ɤ������Ǥ���
-					�����󶡡����դ���
-					<eban@os.rim.or.jp>
-
-----------------------------------------------------------------------------
-  Ruby/Tk widget-demo 
-                              version 1.1 ( 1998/07/24 )
-                              �ʰ����ǽ���幩�� (nagai@ai.kyutech.ac.jp)
-
-ɸ�����ۤ� Tcl/Tk ��ĥ�ѥå������������� Ruby (�ʲ� Ruby/Tk �ȸƤӤޤ�) 
-�Ǥϡ�Tk widget ���Ѥ��� GUI �κ�����Ԥ����Ȥ��Ǥ��ޤ����ºݤ� GUI �����
-���Ƥ������ˤ��͡��ʼ��㤬����ץ�Ȥ���¸�ߤ���������ʤΤǤ�����Ruby/Tk 
-�ˤϤ��Τ褦��Ŭ���ʥ���ץ륹����ץȽ����¸�ߤ��ޤ���Ǥ�����������Ф���
-��ĥ�ѥå������θ��Ǥ��� Tcl/Tk �ˤϡ�Tk widget ���Ѥ��ƤɤΤ褦�ʤ��Ȥ���
-���뤫�򼨤���ΤȤ��� widget-demo ��¸�ߤ����ꡤTcl/Tk ���Ѥ��� GUI �κ���
-��������ݤ���ɽŪ����ץ�ȤʤäƤ��ޤ����ܥ��������֤ϡ�Ruby/Tk �ν�����
-�������ɽŪ�ʥ���ץ륹����ץȤȤ��٤���Tcl/Tk �� widget-demo ��ܿ�������
-�ΤǤ���
-
-�ܥ��������֤˴ޤޤ�륹����ץȤ�¹Ԥ��뤿��ˤϡ�ruby-1.1c2 �ʾ�Ǥ��뤳
-�Ȥ�ɬ�פǤ���1.1c1 �ξ��ϡ��ܥ��������֤˴ޤޤ�� patck_1.1c1 �� Ruby ��
-�饤�֥��ˤ��ƤƤ����������Ȥ߹��� Tk �ΥС������ϡ�4.2 �Ǥ� 8.0 �Ǥ⽤
-���ʤ�ư������Ϥ��Ǥ��������������ܸ��ǤǤΰܿ��ȤʤäƤ��뤿�ᡤ���ܸ첽��
-�줿 Tk �����Ѥ���������������ץȤΥƥ��Ȥϡ�Tk4.2jp �� Tk8.0jp �ξ�ǹ�
-���ޤ��� (�����ˤǤϤʤ��Ǥ���)��
-
-�ܥ��������֤˴ޤޤ�륹����ץȤ�¿���ϡ����ȤʤäƤ��� Tcl/Tk �Ǥ����Ū��
-��������ץȵ��ҤȤʤ�褦�ˤ��Ƥ��ޤ������Τ��ᡤRuby/Tk �Υ���ץ�ȸ�����
-�ϡ����ޤ� Ruby �餷���ʤ��Ȥ������Ǥ��礦���ˤ⤫����餺�����Τ褦�ʵ���
-���äƤ�����ͳ�ϡ�Ruby/Tk �Υɥ���������ˤ���ޤ���
-
-Tcl/Tk �ˤ�Ŭ���ʻ��ͽ񤬲�����¸�ߤ��Ƥ��ޤ����顤Ruby/Tk ������ץȤ����
-����ݤϡ����Τ褦�� Tcl/Tk �λ��ͽ�Ǿ�����䤤�ʤ���������뤳�Ȥˤʤ�Ȼ�
-���ޤ����� widget �λ�����Ȥ��ơ�Tcl/Tk �� widget-demo �򻲾Ȥ��뤳�Ȥ⤢��
-�Ǥ��礦��Ruby/Tk �Ǥε��Ҥ� widget-demo �� Tcl/Tk �Ǥε��Ҥ˶ᤤ��Τˤ���
-�����С���������ˤ�äơ�Ruby/Tk ����������뤳�Ȥ��Ǥ���ȹͤ����ޤ���
-��ö Ruby/Tk �Ǥ� �� widget �λ�����ˡ�������Ƥ��ޤ��С�Ruby �餷��������
-�ץȤ�������뤳�Ȥ��񤷤��ʤ��Ǥ��礦���ܥ��������֤Υ�����ץȤϡ�Ruby/Tk 
-��ǽ�˽�������ޤǤ�Ƨ��Ȥ������Ѥ��Ƥ���������й����Ǥ���
-
-widget-demo �ΰܿ��ˤ����äƤϡ��������ˤ�ܿ�����������ץȤ��󶡤��Ƥ�����
-���ޤ����������˴��դΰդ�ɽ���ޤ���
-
-    Ω�С�JAIST (ttate@jaist.ac.jp) ���� 
-    ʿ���ͻ� (hiramatu@cdrom.co.jp) ����
-
-ʿ������ˤ�� Ruby/Tk ����� Web page (http://www.cdrom.co.jp/~hiramatu/) 
-�� Ruby/Tk �ν�����ͭ�ѤȻפ��ޤ��Τǡ����Ҥ����Ȥ���������
-
-�ޤ������� (maebashi@iij.ad.jp) �����Ϥ���Ȥ��ơ�widget-demo �ΰܿ��˺ݤ�
-��ɬ�פȤʤä� Ruby �� Tk ��Ϣ�饤�֥�꽤���ˤĤ��ơ����������Х��λ�Ŧ��
-�Ƥ��������������ˤⴶ���פ��ޤ���
-
-�����ƺǸ�˺���δ��դ� Ruby �߷׼Ԥ� �ޤĤ�� �椭�Ҥ� (matz@netlab.co.jp) 
-��������������Ȼפ��ޤ���
diff --git a/ext/tk/sample/demos-en/README.tkencoding b/ext/tk/sample/demos-en/README.tkencoding
deleted file mode 100644
index 8fcb494c03..0000000000
--- a/ext/tk/sample/demos-en/README.tkencoding
+++ /dev/null
@@ -1,24 +0,0 @@
-tkencoding.rb���Ѥ������ܸ��ɽ���ˤĤ���
-
-Copyright (C) 1999/07, Takaaki Tateishi <ttate@jaist.ac.jp>
-
-
-1. tkencoding.rb�Ȥϡ�
-
-tkencoding.rb��Tcl/Tk8.1�����Ѥ���Ruby/Tk�Τ���Υ饤�֥��
-�Ǥ���tkencoding.rb��require���뤳�Ȥˤ�ä�Wedget��ɽ����
-���ƥ����Ȥ�����unicode(UTF8)���Ѵ�����ޤ���
-
-
-2. �Ȥ���
-
-tkencoding.rb��require����Tk.encoding�ǻ��Ѥ��Ƥ���ʸ��������
-����ꤷ�Ʋ��������㤨�аʲ��Τ褦�ʴ����ˤʤ�ޤ���
-
-----
-require 'tk'
-require 'tkencoding'
-
-Tk.encoding = "euc-jp"
-# Tk.encoding = "shiftjis"
----
diff --git a/ext/tk/sample/demos-en/arrow.rb b/ext/tk/sample/demos-en/arrow.rb
deleted file mode 100644
index 8ee13254ea..0000000000
--- a/ext/tk/sample/demos-en/arrow.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-# arrow.rb
-#
-# This demonstration script creates a canvas widget that displays a
-# large line with an arrowhead whose shape can be edited interactively.
-#
-# arrowhead widget demo (called by 'widget')
-#
-
-# arrowSetup --
-# This method regenerates all the text and graphics in the canvas
-# window.  It's called when the canvas is initially created, and also
-# whenever any of the parameters of the arrow head are changed
-# interactively.
-#
-# Arguments:
-# c -		Name of the canvas widget.
-
-def arrowSetup(c)
-  v = $demo_arrowInfo
-
-  # Remember the current box, if there is one.
-  tags = c.gettags('current')
-  if tags != []
-    cur = tags.find{|t| t.kind_of?(String) && t =~ /^box[1-3]$/ }
-  else
-    cur = nil
-  end
-
-  # Create the arrow and outline.
-  c.delete('all')
-  TkcLine.new(c, v.x1, v.y, v.x2, v.y, 
-	      { 'width'=>10 * v.width, 
-		'arrowshape'=>[10*v.a, 10*v.b, 10*v.c], 
-		'arrow'=>'last' 
-	      }.update(v.bigLineStyle) )
-  xtip = v.x2 - 10*v.b
-  deltaY = 10*v.c + 5*v.width
-  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY, 
-	      v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y, 
-	      'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
-
-  # Create the boxes for reshaping the line and arrowhead.
-  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5, 
-		   {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5, 
-		   {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5, 
-		   {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
-  c.itemconfigure cur, v.activeStyle if cur
-
-  # Create three arrows in actual size with the same parameters
-  TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
-  tmp = v.x2+100
-  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width, 
-	      'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width, 
-	      'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width, 
-	      'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-
-  # Create a bunch of other arrows and text items showing the 
-  # current dimensions.
-  tmp = v.x2+10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY, 
-	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
-  tmp = v.x1-10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width, 
-	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
-  tmp = v.y+5*v.width+10*v.c+10
-  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp, 
-	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
-  tmp = tmp+25
-  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp, 
-	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
-
-  TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
-	      'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  TkcText.new(c, v.x1, 330, 
-	      'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]", 'anchor'=>'w', 
-	      'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-
-  v.count += 1
-end
-
-# toplevel widget
-if defined?($arrow_demo) && $arrow_demo
-  $arrow_demo.destroy 
-  $arrow_demo = nil
-end
-
-# demo toplevel widget
-$arrow_demo = TkToplevel.new {|w|
-  title("Arrowhead Editor Demonstration")
-  iconname("arrow")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($arrow_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-	    'text'=>"This widget allows you to experiment with different widths and arrowhead shapes for lines in canvases.  To change the line width or the shape of the arrowhead, drag any of the three boxes attached to the oversized arrow.  The arrows on the right give examples at normal scale.  The text at the bottom shows the configuration options as you'd enter them for a canvas line item."){
-  pack('side'=>'top')
-}
-
-# frame
-$arrow_buttons = TkFrame.new($arrow_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $arrow_demo
-      $arrow_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'arrow'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas 
-$arrow_canvas = TkCanvas.new($arrow_demo, 'width'=>500, 'height'=>350, 
-			     'relief'=>'sunken', 'borderwidth'=>2)
-$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-# 
-unless Struct.const_defined?("ArrowInfo")
-  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc, 
-			       :x1, :x2, :y, :smallTips, :count, 
-			       :bigLineStyle, :boxStyle, :activeStyle).new
-end
-$demo_arrowInfo.a = 8
-$demo_arrowInfo.b = 10
-$demo_arrowInfo.c = 3
-$demo_arrowInfo.width = 2
-$demo_arrowInfo.motionProc = proc{}
-$demo_arrowInfo.x1 = 40
-$demo_arrowInfo.x2 = 350
-$demo_arrowInfo.y = 150
-$demo_arrowInfo.smallTips = [5, 5, 2]
-$demo_arrowInfo.count = 0
-if TkWinfo.depth($arrow_canvas) > 1
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'SkyBlue1'}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
-else
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'black', 
-    'stipple'=>'@'+[$demo_dir, 'images', 'grey.25'].join(File::Separator)}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
-end
-$arrowTag_box = TkcTag.new($arrow_canvas)
-arrowSetup $arrow_canvas
-$arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.activeStyle)})
-$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
-$arrowTag_box.bind('B1-Enter', proc{})
-$arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1', 
-		       proc{$demo_arrowInfo.motionProc \
-			 = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1', 
-		       proc{$demo_arrowInfo.motionProc \
-			 = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1', 
-		       proc{$demo_arrowInfo.motionProc \
-			 = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion', 
-		  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
-$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
-
-# arrowMove1 --
-# This method is called for each mouse motion event on box1 (the
-# one at the vertex of the arrow).  It updates the controlling parameters
-# for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-def arrowMove1(c,x,y)
-  v = $demo_arrowInfo
-  newA = (v.x2+5-c.canvasx(x).round)/10
-  newA = 0 if newA < 0
-  newA = 25 if newA > 25
-  if newA != v.a
-    c.move('box1', 10*(v.a-newA), 0)
-    v.a = newA
-  end
-end
-
-# arrowMove2 --
-# This method is called for each mouse motion event on box2 (the
-# one at the trailing tip of the arrowhead).  It updates the controlling
-# parameters for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-def arrowMove2(c,x,y)
-  v = $demo_arrowInfo
-  newB = (v.x2+5-c.canvasx(x).round)/10
-  newB = 0 if newB < 0
-  newB = 25 if newB > 25
-  newC = (v.y+5-c.canvasy(y).round-5*v.width)/10
-  newC = 0 if newC < 0
-  newC = 20 if newC > 20
-  if newB != v.b || newC != v.c
-    c.move('box2', 10*(v.b-newB), 10*(v.c-newC))
-    v.b = newB
-    v.c = newC
-  end
-end
-
-# arrowMove3 --
-# This method is called for each mouse motion event on box3 (the
-# one that controls the thickness of the line).  It updates the
-# controlling parameters for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-def arrowMove3(c,x,y)
-  v = $demo_arrowInfo
-  newWidth = (v.y+2-c.canvasy(y).round)/5
-  newWidth = 0 if newWidth < 0
-  newWidth = 20 if newWidth > 20
-  if newWidth != v.width
-    c.move('box3', 0, 5*(v.width-newWidth))
-    v.width = newWidth
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/bind.rb b/ext/tk/sample/demos-en/bind.rb
deleted file mode 100644
index 5d30d228f0..0000000000
--- a/ext/tk/sample/demos-en/bind.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-# bind.rb
-#
-# This demonstration script creates a text widget with bindings set
-# up for hypertext-like effects.
-#
-# text (tag bindings) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($bind_demo) && $bind_demo
-  $bind_demo.destroy 
-  $bind_demo = nil
-end
-
-# demo toplevel widget
-$bind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Tag Bindings")
-  iconname("bind")
-  positionWindow(w)
-}
-
-# frame
-TkFrame.new($bind_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $bind_demo
-      $bind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'bind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# bind 
-def tag_binding_for_bind_demo(tag, enter_style, leave_style)
-  tag.bind('Any-Enter', proc{tag.configure enter_style})
-  tag.bind('Any-Leave', proc{tag.configure leave_style})
-end
-
-# text 
-TkText.new($bind_demo){|t|
-  # 
-  setgrid 'true'
-  width  60
-  height 24
-  font $font
-  wrap 'word'
-  TkScrollbar.new($bind_demo) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # 
-  if TkWinfo.depth($root).to_i > 1
-    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised', 
-                     'borderwidth'=>1}
-    tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
-  else
-    tagstyle_bold = {'foreground'=>'white', 'background'=>'black'}
-    tagstyle_normal = {'foreground'=>'', 'background'=>''}
-  end
-
-  # �ƥ���������
-  insert 'insert', "The same tag mechanism that controls display styles in text widgets can also be used to associate Tcl commands with regions of text, so that mouse or keyboard actions on the text cause particular Tcl commands to be invoked.  For example, in the text below the descriptions of the canvas demonstrations have been tagged.  When you move the mouse over a demo description the description lights up, and when you press button 1 over a description then that particular demonstration is invoked.
-
-"
-  insert('end', '1. Samples of all the different types of items that can be created in canvas widgets.', (d1 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '2. A simple two-dimensional plot that allows you to adjust the positions of the data points.', (d2 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '3. Anchoring and justification modes for text items.', 
-	 (d3 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '4. An editor for arrow-head shapes for line items.', 
-	 (d4 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '5. A ruler with facilities for editing tab stops.', 
-	 (d5 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', 
-	 '6. A grid that demonstrates how canvases can be scrolled.', 
-	 (d6 = TkTextTag.new(t)) )
-
-  # binding
-  [d1, d2, d3, d4, d5, d6].each{|tag|
-    tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
-  }
-  d1.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'items.rb'].join(File::Separator)}`})
-  d2.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`})
-  d3.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`})
-  d4.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`})
-  d5.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`})
-  d6.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`})
-
-  TkTextMarkInsert.new(t, '0.0')
-  configure('state','disabled')
-}
diff --git a/ext/tk/sample/demos-en/bitmap.rb b/ext/tk/sample/demos-en/bitmap.rb
deleted file mode 100644
index c81e4ac595..0000000000
--- a/ext/tk/sample/demos-en/bitmap.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# bitmap.rb
-#
-# This demonstration script creates a toplevel window that displays
-# all of Tk's built-in bitmaps.#
-# bitmap widget demo (called by 'widget')
-#
-
-# bitmapRow --
-# Create a row of bitmap items in a window.
-#
-# Arguments:
-# w -		The parent window that is to contain the row.
-# args -	The names of one or more bitmaps, which will be displayed
-#		in a new row across the bottom of w along with their
-#		names.
-
-def bitmapRow(w,*args)
-  TkFrame.new(w){|row|
-    pack('side'=>'top', 'fill'=>'both')
-    for bitmap in args 
-      TkFrame.new(row){|base|
-	pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
-	TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
-	TkLabel.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
-      }
-    end
-  }
-end
-
-# toplevel widget
-if defined?($bitmap_demo) && $bitmap_demo
-  $bitmap_demo.destroy 
-  $bitmap_demo = nil
-end
-
-# demo toplevel widget
-$bitmap_demo = TkToplevel.new {|w|
-  title("Bitmap Demonstration")
-  iconname("bitmap")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($bitmap_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left', 
-	    'text'=>"This window displays all of Tk's built-in bitmaps, along with the names you can use for them in Tcl scripts."){
-  pack('side'=>'top')
-}
-
-# frame
-$bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $bitmap_demo
-      $bitmap_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'bitmap'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 
-TkFrame.new($bitmap_demo){|f|
-  bitmapRow(f,'error','gray25','gray50','hourglass')
-  bitmapRow(f,'info','question','questhead','warning')
-  pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-}
-
diff --git a/ext/tk/sample/demos-en/browse1 b/ext/tk/sample/demos-en/browse1
deleted file mode 100644
index 03e251035a..0000000000
--- a/ext/tk/sample/demos-en/browse1
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working 
-# directory and allow you to open files or subdirectories by 
-# double-clicking. 
-
-require 'tk'
-
-# Create a scrollbar on the right side of the main window and a listbox 
-# on the left side.
-
-listbox = TkListbox.new(nil, 'relief'=>'sunken', 
-			'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-  TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    l.yscrollcommand(proc{|first,last| s.set(first,last)})
-  }
-
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-root = TkRoot.new
-root.minsize(1,1)
-
-# The procedure below is invoked to open a browser on a given file;  if the 
-# file is a directory then another instance of this program is invoked; if 
-# the file is a regular file then the Mx editor is invoked to display 
-# the file. 
-
-def browse (dir, file)
-  file = dir + File::Separator + file if dir != '.'
-  type = File.ftype(file)
-  if type == 'directory'
-    system($0 + ' ' + file + ' &')
-  else
-    if type == 'file'
-      if ENV['EDITOR']
-	system(ENV['EDITOR'] + ' ' + file + ' &')
-      else
-	system('xedit ' + file + ' &')
-      end
-    else
-      STDOUT.print "\"#{file}\" isn't a directory or regular file"
-    end
-  end
-end
-
-# Fill the listbox with a list of all the files in the directory (run 
-# the "ls" command to get that information).
-
-dir = ARGV[0] ?  ARGV[0] : '.'
-open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-  listbox.insert('end', fname.chomp)
-}
-
-# Set up bindings for the browser.
-
-Tk.bind_all('Control-c', proc{root.destroy})
-listbox.bind('Double-Button-1', 
-	     proc{TkSelection.get.each{|f| browse dir, f}})
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/browse2 b/ext/tk/sample/demos-en/browse2
deleted file mode 100644
index 304a5f547e..0000000000
--- a/ext/tk/sample/demos-en/browse2
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working 
-# directory and allow you to open files or subdirectories by 
-# double-clicking. 
-
-require 'tk'
-
-class Browse
-  BROWSE_WIN_COUNTER = TkVariable.new(0)
-
-  def initialize(dir)
-    BROWSE_WIN_COUNTER.value = BROWSE_WIN_COUNTER.to_i + 1
-
-    # create base frame
-    base = TkToplevel.new {
-      minsize(1,1)
-      title('Browse : ' + dir)
-    }
-
-    # Create a scrollbar on the right side of the main window and a listbox 
-    # on the left side.
-    list = TkListbox.new(base, 'relief'=>'sunken', 
-			 'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-      TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
-	pack('side'=>'right', 'fill'=>'y')
-	l.yscrollcommand(proc{|first,last| s.set(first,last)})
-      }
-
-      pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-
-      # Fill the listbox with a list of all the files in the directory (run 
-      # the "ls" command to get that information).
-      open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-	l.insert('end', fname.chomp)
-      }
-
-    }
-
-    # Set up bindings for the browser.
-    base.bind('Control-c', 
-	      proc{
-		base.destroy
-		Browse::BROWSE_WIN_COUNTER.value = \
-		                Browse::BROWSE_WIN_COUNTER.to_i - 1})
-    list.bind('Double-Button-1', 
-	 proc{TkSelection.get.each{|f| self.browse dir, f}})
-  end
-
-  # The method below is invoked to open a browser on a given file;  if the 
-  # file is a directory then another instance of this program is invoked; if 
-  # the file is a regular file then the Mx editor is invoked to display 
-  # the file. 
-  def browse (dir, file)
-    file = dir + File::Separator + file if dir != '.'
-    type = File.ftype(file)
-    if type == 'directory'
-      Browse.new(file)
-    else
-      if type == 'file'
-	if ENV['EDITOR']
-	  system(ENV['EDITOR'] + ' ' + file + ' &')
-	else
-	  system('xedit ' + file + ' &')
-	end
-      else
-	STDOUT.print "\"#{file}\" isn't a directory or regular file"
-      end
-    end
-  end
-
-end
-
-Browse.new(ARGV[0] ? ARGV[0] : '.')
-
-TkRoot.new {
-  withdraw
-  Browse::BROWSE_WIN_COUNTER.trace('w', proc{exit if Browse::BROWSE_WIN_COUNTER.to_i == 0})
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/button.rb b/ext/tk/sample/demos-en/button.rb
deleted file mode 100644
index 6614d99c92..0000000000
--- a/ext/tk/sample/demos-en/button.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# button.rb
-#
-# This demonstration script creates a toplevel window containing
-# several button widgets.
-#
-# button widget demo (called by 'widget')
-#
-
-# toplevel widget 
-if defined?($button_demo) && $button_demo
-  $button_demo.destroy 
-  $button_demo = nil
-end
-
-# demo toplevel widget 
-$button_demo = TkToplevel.new {|w|
-  title("Button Demonstration")
-  iconname("button")
-  positionWindow(w)
-}
-
-# label 
-msg = TkLabel.new($button_demo) {
-  font $kanji_font
-  wraplength '4i'
-  justify 'left'
-  text "If you click on any of the four buttons below, the background of the button area will change to the color indicated in the button.  You can press Tab to move among the buttons, then press Space to invoke the current button."
-}
-msg.pack('side'=>'top')
-
-# frame 
-$button_buttons = TkFrame.new($button_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $button_demo
-      $button_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'button'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button
-TkButton.new($button_demo){
-  text "Peach Puff"
-  width 10
-  command proc{
-    $button_demo.configure('bg','PeachPuff1')
-    $button_buttons.configure('bg','PeachPuff1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Light Blue"
-  width 10
-  command proc{
-    $button_demo.configure('bg','LightBlue1')
-    $button_buttons.configure('bg','LightBlue1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Sea Green"
-  width 10
-  command proc{
-    $button_demo.configure('bg','SeaGreen2')
-    $button_buttons.configure('bg','SeaGreen2')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Yellow"
-  width 10
-  command proc{
-    $button_demo.configure('bg','Yellow1')
-    $button_buttons.configure('bg','Yellow1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
diff --git a/ext/tk/sample/demos-en/check.rb b/ext/tk/sample/demos-en/check.rb
deleted file mode 100644
index b5def6a89b..0000000000
--- a/ext/tk/sample/demos-en/check.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# check.rb
-#
-# This demonstration script creates a toplevel window containing
-# several checkbuttons.
-#
-# checkbutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($check_demo) && $check_demo
-  $check_demo.destroy 
-  $check_demo = nil
-end
-
-# demo toplevel widget
-$check_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration")
-  iconname("check")
-  positionWindow(w)
-}
-
-# label 
-msg = TkLabel.new($check_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Three checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-# 
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame 
-TkFrame.new($check_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $check_demo
-      $check_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'check'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars($check_demo, 
-	       ['wipers', wipers], ['brakes', brakes], ['sober', sober])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# checkbutton
-[ TkCheckButton.new($check_demo, 'text'=>'Wipers  OK', 'variable'=>wipers),
-  TkCheckButton.new($check_demo, 'text'=>'Brakes  OK', 'variable'=>brakes),
-  TkCheckButton.new($check_demo, 'text'=>'Driver Sober', 'variable'=>sober)
-].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
-
diff --git a/ext/tk/sample/demos-en/clrpick.rb b/ext/tk/sample/demos-en/clrpick.rb
deleted file mode 100644
index 72c52a4394..0000000000
--- a/ext/tk/sample/demos-en/clrpick.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# clrpick.rb
-#
-# This demonstration script prompts the user to select a color.
-#
-# widget demo prompts the user to select a color (called by 'widget')
-#
-
-# toplevel widget
-if defined?($clrpick_demo) && $clrpick_demo
-  $clrpick_demo.destroy 
-  $clrpick_demo = nil
-end
-
-# demo toplevel widget
-$clrpick_demo = TkToplevel.new {|w|
-  title("Color Selection Dialogs")
-  iconname("colors")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-	    'text'=>"Press the buttons below to choose the foreground and background colors for the widgets in this window.").pack('side'=>'top')
-
-# frame
-TkFrame.new($clrpick_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $clrpick_demo
-      $clrpick_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'clrpick'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button 
-TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'background', 
-	      ['background', 'highlightbackground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-def setColor(w,button,name,options)
-  w.grab
-  initialColor = button[name]
-  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w, 
-			 'initialcolor'=>initialColor)
-  if color != ""
-    setColor_helper(w,options,color)
-  end
-
-  w.grab('release')
-end
-
-def setColor_helper(w, options, color)
-  options.each{|opt|
-    begin
-      w[opt] = color
-    rescue
-    end
-  }
-  TkWinfo.children(w).each{|child|
-    setColor_helper child, options, color
-  }
-end
-
diff --git a/ext/tk/sample/demos-en/colors.rb b/ext/tk/sample/demos-en/colors.rb
deleted file mode 100644
index 66fb0afa36..0000000000
--- a/ext/tk/sample/demos-en/colors.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-# colors.rb
-#
-# This demonstration script creates a listbox widget that displays
-# many of the colors from the X color database.  You can click on
-# a color to change the application's palette.
-#
-# listbox widget demo 'colors' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($colors_demo) && $colors_demo
-  $colors_demo.destroy 
-  $colors_demo = nil
-end
-
-# demo toplevel widget
-$colors_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (colors)")
-  iconname("colors")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($colors_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A listbox containing several color names is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by dragging in the listbox window with button 2 pressed.  If you double-click button 1 on a color, then the application's color palette will be set to match that color"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($colors_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $colors_demo
-      $colors_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'colors'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-colors_lbox = nil
-TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
-  s = TkScrollbar.new(w)
-  colors_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  10
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| colors_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
-
-ins_data = [
-  'gray60','gray70','gray80','gray85','gray90','gray95',
-  'snow1','snow2','snow3','snow4','seashell1','seashell2',
-  'seashell3','seashell4','AntiqueWhite1','AntiqueWhite2',
-  'AntiqueWhite3','AntiqueWhite4','bisque1','bisque2',
-  'bisque3','bisque4','PeachPuff1','PeachPuff2',
-  'PeachPuff3','PeachPuff4','NavajoWhite1','NavajoWhite2',
-  'NavajoWhite3','NavajoWhite4','LemonChiffon1',
-  'LemonChiffon2','LemonChiffon3','LemonChiffon4',
-  'cornsilk1','cornsilk2','cornsilk3','cornsilk4',
-  'ivory1','ivory2','ivory3','ivory4','honeydew1',
-  'honeydew2','honeydew3','honeydew4','LavenderBlush1',
-  'LavenderBlush2','LavenderBlush3','LavenderBlush4',
-  'MistyRose1','MistyRose2','MistyRose3','MistyRose4',
-  'azure1','azure2','azure3','azure4','SlateBlue1',
-  'SlateBlue2','SlateBlue3','SlateBlue4','RoyalBlue1',
-  'RoyalBlue2','RoyalBlue3','RoyalBlue4','blue1','blue2',
-  'blue3','blue4','DodgerBlue1','DodgerBlue2',
-  'DodgerBlue3','DodgerBlue4','SteelBlue1','SteelBlue2',
-  'SteelBlue3','SteelBlue4','DeepSkyBlue1','DeepSkyBlue2',
-  'DeepSkyBlue3','DeepSkyBlue4','SkyBlue1','SkyBlue2',
-  'SkyBlue3','SkyBlue4','LightSkyBlue1','LightSkyBlue2',
-  'LightSkyBlue3','LightSkyBlue4','SlateGray1',
-  'SlateGray2','SlateGray3','SlateGray4',
-  'LightSteelBlue1','LightSteelBlue2','LightSteelBlue3',
-  'LightSteelBlue4','LightBlue1','LightBlue2',
-  'LightBlue3','LightBlue4','LightCyan1','LightCyan2',
-  'LightCyan3','LightCyan4','PaleTurquoise1',
-  'PaleTurquoise2','PaleTurquoise3','PaleTurquoise4',
-  'CadetBlue1','CadetBlue2','CadetBlue3','CadetBlue4',
-  'turquoise1','turquoise2','turquoise3','turquoise4',
-  'cyan1','cyan2','cyan3','cyan4','DarkSlateGray1',
-  'DarkSlateGray2','DarkSlateGray3','DarkSlateGray4',
-  'aquamarine1','aquamarine2','aquamarine3','aquamarine4',
-  'DarkSeaGreen1','DarkSeaGreen2','DarkSeaGreen3',
-  'DarkSeaGreen4','SeaGreen1','SeaGreen2','SeaGreen3',
-  'SeaGreen4','PaleGreen1','PaleGreen2','PaleGreen3',
-  'PaleGreen4','SpringGreen1','SpringGreen2',
-  'SpringGreen3','SpringGreen4','green1','green2',
-  'green3','green4','chartreuse1','chartreuse2',
-  'chartreuse3','chartreuse4','OliveDrab1','OliveDrab2',
-  'OliveDrab3','OliveDrab4','DarkOliveGreen1',
-  'DarkOliveGreen2','DarkOliveGreen3','DarkOliveGreen4',
-  'khaki1','khaki2','khaki3','khaki4','LightGoldenrod1',
-  'LightGoldenrod2','LightGoldenrod3','LightGoldenrod4',
-  'LightYellow1','LightYellow2','LightYellow3',
-  'LightYellow4','yellow1','yellow2','yellow3','yellow4',
-  'gold1','gold2','gold3','gold4','goldenrod1',
-  'goldenrod2','goldenrod3','goldenrod4','DarkGoldenrod1',
-  'DarkGoldenrod2','DarkGoldenrod3','DarkGoldenrod4',
-  'RosyBrown1','RosyBrown2','RosyBrown3','RosyBrown4',
-  'IndianRed1','IndianRed2','IndianRed3','IndianRed4',
-  'sienna1','sienna2','sienna3','sienna4','burlywood1',
-  'burlywood2','burlywood3','burlywood4','wheat1',
-  'wheat2','wheat3','wheat4','tan1','tan2','tan3','tan4',
-  'chocolate1','chocolate2','chocolate3','chocolate4',
-  'firebrick1','firebrick2','firebrick3','firebrick4',
-  'brown1','brown2','brown3','brown4','salmon1','salmon2',
-  'salmon3','salmon4','LightSalmon1','LightSalmon2',
-  'LightSalmon3','LightSalmon4','orange1','orange2',
-  'orange3','orange4','DarkOrange1','DarkOrange2',
-  'DarkOrange3','DarkOrange4','coral1','coral2','coral3',
-  'coral4','tomato1','tomato2','tomato3','tomato4',
-  'OrangeRed1','OrangeRed2','OrangeRed3','OrangeRed4',
-  'red1','red2','red3','red4','DeepPink1','DeepPink2',
-  'DeepPink3','DeepPink4','HotPink1','HotPink2',
-  'HotPink3','HotPink4','pink1','pink2','pink3','pink4',
-  'LightPink1','LightPink2','LightPink3','LightPink4',
-  'PaleVioletRed1','PaleVioletRed2','PaleVioletRed3',
-  'PaleVioletRed4','maroon1','maroon2','maroon3',
-  'maroon4','VioletRed1','VioletRed2','VioletRed3',
-  'VioletRed4','magenta1','magenta2','magenta3',
-  'magenta4','orchid1','orchid2','orchid3','orchid4',
-  'plum1','plum2','plum3','plum4','MediumOrchid1',
-  'MediumOrchid2','MediumOrchid3','MediumOrchid4',
-  'DarkOrchid1','DarkOrchid2','DarkOrchid3',
-  'DarkOrchid4','purple1','purple2','purple3','purple4',
-  'MediumPurple1','MediumPurple2','MediumPurple3',
-  'MediumPurple4','thistle1','thistle2','thistle3', 'thistle4'
-]
-
-colors_lbox.insert(0, *ins_data)
diff --git a/ext/tk/sample/demos-en/cscroll.rb b/ext/tk/sample/demos-en/cscroll.rb
deleted file mode 100644
index 2f2be60da2..0000000000
--- a/ext/tk/sample/demos-en/cscroll.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-# cscroll.rb
-#
-# This demonstration script creates a simple canvas that can be
-# scrolled in two dimensions.
-#
-# simple scrollable canvas widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($cscroll_demo) && $cscroll_demo
-  $cscroll_demo.destroy 
-  $cscroll_demo = nil
-end
-
-# demo toplevel widget
-$cscroll_demo = TkToplevel.new {|w|
-  title("Scrollable Canvas Demonstration")
-  iconname("cscroll")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($cscroll_demo, 'font'=>$font, 'wraplength'=>'4i', 
-	    'justify'=>'left', 'text'=>"This window displays a canvas widget that can be scrolled either using the scrollbars or by dragging with button 2 in the canvas.  If you click button 1 on one of the rectangles, its indices will be printed on stdout."){
-  pack('side'=>'top')
-}
-
-# frame
-$cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $cscroll_demo
-      $cscroll_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'cscroll'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 
-unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new($cscroll_demo) {
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-  }
-  TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-  TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-end
-
-# canvas ����
-$cscroll_canvas = TkCanvas.new($cscroll_demo, 
-			       'relief'=>'sunken', 'borderwidth'=>2,
-			       'scrollregion'=>['-11c', '-11c', '50c', '20c']
-			       ) {|c|
-  if $tk_version =~ /^4\.[01]/
-    pack('expand'=>'yes', 'fill'=>'both') 
-  else
-    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
-	 'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-  end
-
-  TkScrollbar.new($cscroll_demo, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
-    c.yscrollcommand(proc{|first,last| vs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'right', 'fill'=>'y')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-
-  TkScrollbar.new($cscroll_demo, 'orient'=>'horiz', 
-		  'command'=>proc{|*args| c.xview(*args)}) {|hs|
-    c.xscrollcommand(proc{|first,last| hs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'bottom', 'fill'=>'x') 
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-}
-
-bg = $cscroll_canvas.configinfo('bg')[4]
-(0..19).each{|i|
-  x = -10+3*i
-  y = -10
-  (0..9).each{|j|
-    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c", 
-		     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
-    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c", 
-		'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
-    y += 3
-  }
-}
-
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
-$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion', 
-		     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
-
-def scrollEnter(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  $oldFill = c.itemconfiginfo(id, 'fill')[4]
-  if TkWinfo.depth(c) > 1
-    c.itemconfigure(id, 'fill'=>'SeaGreen1')
-  else
-    c.itemconfigure(id, 'fill'=>'black')
-    c.itemconfigure(id+1, 'fill'=>'white')
-  end
-end
-
-def scrollLeave(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  c.itemconfigure(id, 'fill'=>$oldFill)
-  c.itemconfigure(id+1, 'fill'=>'black')
-end
-
-def scrollButton(c)
-  id = c.find_withtag('current')[0].id
-  id += 1 unless c.gettags('current').include?('text')
-  print "You buttoned at #{c.itemconfiginfo(id,'text')[4]}\n"
-end
-
diff --git a/ext/tk/sample/demos-en/ctext.rb b/ext/tk/sample/demos-en/ctext.rb
deleted file mode 100644
index 13f8de7218..0000000000
--- a/ext/tk/sample/demos-en/ctext.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-# ctext.rb
-#
-# This demonstration script creates a canvas widget with a text
-# item that can be edited and reconfigured in various ways.
-#
-# Canvas Text widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($ctext_demo) && $ctext_demo
-  $ctext_demo.destroy 
-  $ctext_demo = nil
-end
-
-# demo toplevel widget
-$ctext_demo = TkToplevel.new {|w|
-  title("Canvas Text Demonstration")
-  iconname("Text")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-	    'text'=>"This window displays a string of text to demonstrate the text facilities of canvas widgets.  You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification.  The text also supports the following simple bindings for editing:
-  1. You can point, click, and type.
-  2. You can also select with button 1.
-  3. You can copy the selection to the mouse position with button 2.
-  4. Backspace and Control+h delete the selection if there is one;
-     otherwise they delete the character just before the insertion cursor.
-  5. Delete deletes the selection if there is one; otherwise it deletes
-     the character just after the insertion cursor."){
-  pack('side'=>'top')
-}
-
-# frame
-$ctext_buttons = TkFrame.new($ctext_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $ctext_demo
-      $ctext_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'ctext'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas 
-$ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat', 
-			     'borderwidth'=>0, 'width'=>500, 'height'=>350)
-$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-
-# font 
-textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-
-# canvas 
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
-		 'outline'=>'black', 'fill'=>'red')
-
-$ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, 
-			       'text'=>"This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above).",
-			       'width'=>440, 'anchor'=>'n', 
-			       'font'=>'-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*', 
-			       'kanjifont'=>'-*--24-*-jisx0208.1983-0', 
-			       'justify'=>'left') )
-
-$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1', 
-	proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"}, 
-	"%x %y")
-$ctag_text.bind('Shift-B1-Motion', 
-		proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
-$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
-$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
-$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
-$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"}, 
-		"%x %y")
-
-# Next, create some items that allow the text's anchor position 
-# to be edited.
-
-def mkTextConfig(w,x,y,option,value,color)
-  item = TkcRectangle.new(w, x, y, x+30, y+30, 
-			  'outline'=>'black', 'fill'=>color, 'width'=>1)
-  item.bind('1', proc{$ctag_text.configure option, value})
-  w.addtag_withtag('config', item)
-end
-
-x = 50
-y = 50
-color = 'LightSkyBlue1'
-mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
-mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
-mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
-mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
-mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
-mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
-mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
-mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
-mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50, 
-			'outline'=>'black', 'fill'=>'red')
-item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 'anchor'=>'s', 
-	    'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-	    'fill'=>'brown')
-
-# Lastly, create some items that allow the text's justification to be
-# changed.
-
-x = 350
-y = 50
-color = 'SeaGreen2'
-mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
-mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
-mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 'anchor'=>'s', 
-	    'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-	    'fill'=>'brown')
-
-$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave', 
-		       proc{$ctext_canvas\
-			     .itemconfigure('current', 
-					    'fill'=>$textConfigFill)})
-
-$textConfigFill = ''
-
-def textEnter(w)
-  $textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
-  w.itemconfigure 'current', 'fill', 'black'
-end
-
-def textInsert(w, string)
-  return if string == ""
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-  end
-  $ctag_text.insert 'insert', string
-end
-
-def textPaste(w, pos)
-  begin
-    $ctag_text.insert pos, TkSelection.get
-  rescue
-  end
-end
-
-def textB1Press(w,x,y)
-  w.icursor 'current', "@#{x},#{y}"
-  w.itemfocus 'current'
-  w.focus
-  w.select_from 'current', "@#{x},#{y}"
-end
-
-def textB1Move(w,x,y)
-  w.select_to 'current', "@#{x},#{y}"
-end
-
-def textBs(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    char = $ctag_text.index('insert').to_i - 1
-    $ctag_text.dchars(char) if char >= 0
-  end
-end
-
-def textDel(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    $ctag_text.dchars 'insert'
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/dialog1.rb b/ext/tk/sample/demos-en/dialog1.rb
deleted file mode 100644
index d2b34e6b46..0000000000
--- a/ext/tk/sample/demos-en/dialog1.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# a dialog box with a local grab (called by 'widget')
-#
-class TkDialog_Demo1 < TkDialog
-  def title
-    "Dialog with local grab"
-  end
-
-  def message
-    'This is a modal dialog box.  It uses Tk\'s "grab" command to create a "local grab" on the dialog box.  The grab prevents any pointer-related events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-    ["Dismiss", "", "Show Code"]
-    ["OK", "Cancel", "Show Code"]
-  end
-end
-
-ret =  TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
-case ret
-when 0
-  print "You pressed OK\n"
-when 1
-  print "You pressed Cancel\n"
-when 2
-  showCode 'dialog1'
-end
diff --git a/ext/tk/sample/demos-en/dialog2.rb b/ext/tk/sample/demos-en/dialog2.rb
deleted file mode 100644
index c441dda62f..0000000000
--- a/ext/tk/sample/demos-en/dialog2.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# a dialog box with a global grab (called by 'widget')
-#
-class TkDialog_Demo2 < TkDialog
-  def title
-    "Dialog with global grab"
-  end
-
-  def message
-    "This dialog box uses a global grab, so it prevents you from interacting with anything on your display until you invoke one of the buttons below.  Global grabs are almost always a bad idea; don't use them unless you're truly desperate."
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-    ["OK", "Cancel", "Show Code"]
-  end
-end
-
-ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
-			  'prev_command'=>proc{|dialog|
-			    Tk.after 100, proc{dialog.grab('global')}
-			  }).value
-case ret
-when 0
-  print "\You pressed OK\n"
-when 1
-  print "You pressed Cancel\n"
-when 2
-  showCode 'dialog2'
-end
-
diff --git a/ext/tk/sample/demos-en/doc.org/README b/ext/tk/sample/demos-en/doc.org/README
deleted file mode 100644
index 90677d3316..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains a collection of demonstration programs that
-are translated into Japanese.  You need to use a Japanized "wish" to
-see these Japanese-translated demonstration programs.  You also need
-to put this directory ("demos.jp") at the next to "demos" since some
-of the programs refer to the image files at "demos".
-
-Please refer to the README file at "demos" for more detail.
diff --git a/ext/tk/sample/demos-en/doc.org/README.JP b/ext/tk/sample/demos-en/doc.org/README.JP
deleted file mode 100644
index 42b4929378..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README.JP
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains "widget" demo for the Japanized Tcl7.6/Tk4.2.
-Most of the messages in the original are translated to Japanese.
-But other tools in this directory are not translated.
-
-Following 2 kanji fonts are defined at the beginning of the file "widget."
-
-	-*--24-*-jisx0208.1983-0
-	-*--16-*-jisx0208.1983-0
-
-These fonts are all part of the core distribution of X11R5, so
-if you are running X11R5, you don't have to modify the file.
-
-But if you don't have these fonts, replace them with appropriate ones.
-"-*--14-*-jisx0208.1983-0" will be a good choice.
diff --git a/ext/tk/sample/demos-en/doc.org/README.tk80 b/ext/tk/sample/demos-en/doc.org/README.tk80
deleted file mode 100644
index c71f977d74..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README.tk80
+++ /dev/null
@@ -1,46 +0,0 @@
-This directory contains a collection of programs to demonstrate
-the features of the Tk toolkit.  The programs are all scripts for
-"wish", a windowing shell.  If wish has been installed in /usr/local
-then you can invoke any of the programs in this directory just
-by typing its file name to your command shell.  Otherwise invoke
-wish with the file as its first argument, e.g., "wish hello".
-The rest of this file contains a brief description of each program.
-Files with names ending in ".tcl" are procedure packages used by one
-or more of the demo programs;  they can't be used as programs by
-themselves so they aren't described below.
-
-hello -		Creates a single button;  if you click on it, a message
-		is typed and the application terminates.
-
-widget -	Contains a collection of demonstrations of the widgets
-		currently available in the Tk library.  Most of the .tcl
-		files are scripts for individual demos available through
-		the "widget" program.
-
-ixset -		A simple Tk-based wrapper for the "xset" program, which
-		allows you to interactively query and set various X options
-		such as mouse acceleration and bell volume.  Thanks to
-		Pierre David for contributing this example.
-
-rolodex -	A mock-up of a simple rolodex application.  It has much of
-		the user interface for such an application but no back-end
-		database.  This program was written in response to Tom
-		LaStrange's toolkit benchmark challenge.
-
-tcolor -	A color editor.  Allows you to edit colors in several
-		different ways, and will also perform automatic updates
-		using "send".
-
-rmt -		Allows you to "hook-up" remotely to any Tk application
-		on the display.  Select an application with the menu,
-		then just type commands:  they'll go to that application.
-
-timer -		Displays a seconds timer with start and stop buttons.
-		Control-c and control-q cause it to exit.
-
-browse -	A simple directory browser.  Invoke it with and argument
-		giving the name of the directory you'd like to browse.
-		Double-click on files or subdirectories to browse them.
-		Control-c and control-q cause the program to exit.
-
-sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14
diff --git a/ext/tk/sample/demos-en/doc.org/license.terms b/ext/tk/sample/demos-en/doc.org/license.terms
deleted file mode 100644
index 03ca6fcb31..0000000000
--- a/ext/tk/sample/demos-en/doc.org/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-en/doc.org/license.terms.tk80 b/ext/tk/sample/demos-en/doc.org/license.terms.tk80
deleted file mode 100644
index 03ca6fcb31..0000000000
--- a/ext/tk/sample/demos-en/doc.org/license.terms.tk80
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-en/entry1.rb b/ext/tk/sample/demos-en/entry1.rb
deleted file mode 100644
index 29bc693395..0000000000
--- a/ext/tk/sample/demos-en/entry1.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# entry (no scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($entry1_demo) && $entry1_demo
-  $entry1_demo.destroy 
-  $entry1_demo = nil
-end
-
-# demo toplevel widget
-$entry1_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (no scrollbars)")
-  iconname("entry1")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($entry1_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three different entries are displayed below.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse button2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($entry1_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $entry1_demo
-      $entry1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'entry1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# 
-e1 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-e2 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-e3 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
-
-# 
-e1.insert(0, 'Initial value')
-e2.insert('end', "This entry contains a long value, much too long ")
-e2.insert('end', "to fit in the window at one time, so long in fact ")
-e2.insert('end', "that you'll have to scan or scroll to see the end.")
-e2.insert('end', "")
-
diff --git a/ext/tk/sample/demos-en/entry2.rb b/ext/tk/sample/demos-en/entry2.rb
deleted file mode 100644
index d4e58d7dd5..0000000000
--- a/ext/tk/sample/demos-en/entry2.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# entry2.rb
-#
-# This demonstration script is the same as the entry1.tcl script
-# except that it creates scrollbars for the entries.
-#
-# entry (with scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($entry2_demo) && $entry2_demo
-  $entry2_demo.destroy 
-  $entry2_demo = nil
-end
-
-# demo toplevel widget
-$entry2_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (with scrollbars)")
-  iconname("entry2")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($entry2_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three different entries are displayed below, with a scrollbar for each entry.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with mouse button2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($entry2_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $entry2_demo
-      $entry2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'entry2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
-  # entry 1
-  s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e1 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s1.set first,last}
-  }
-  s1.command(proc{|*args| e1.xview(*args)})
-  e1.pack('side'=>'top', 'fill'=>'x')
-  s1.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 2
-  s2 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e2 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s2.set first,last}
-  }
-  s2.command(proc{|*args| e2.xview(*args)})
-  e2.pack('side'=>'top', 'fill'=>'x')
-  s2.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 3
-  s3 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e3 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s3.set first,last}
-  }
-  s3.command(proc{|*args| e3.xview(*args)})
-  e3.pack('side'=>'top', 'fill'=>'x')
-  s3.pack('side'=>'top', 'fill'=>'x')
-
-  # 
-  e1.insert(0, 'Initial value')
-  e2.insert('end', "This entry contains a long value, much too long ")
-  e2.insert('end', "to fit in the window at one time, so long in fact ")
-  e2.insert('end', "that you'll have to scan or scroll to see the end.")
-  e2.insert('end', "")
-
-}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
-
diff --git a/ext/tk/sample/demos-en/entry3.rb b/ext/tk/sample/demos-en/entry3.rb
deleted file mode 100644
index 44f788225c..0000000000
--- a/ext/tk/sample/demos-en/entry3.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-# entry3.rb --
-#
-# This demonstration script creates several entry widgets whose
-# permitted input is constrained in some way.  It also shows off a
-# password entry.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($entry3_demo) && $entry3_demo
-  $entry3_demo.destroy 
-  $entry3_demo = nil
-end
-
-$entry3_demo = TkToplevel.new {|w|
-  title("Constrained Entry Demonstration")
-  iconname("entry3")
-  positionWindow(w)
-}
-
-TkLabel.new($entry3_demo, 
-	    :font=>$font, :wraplength=>'5i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-Four different entries are displayed below.  You can add characters \
-by pointing, clicking and typing, though each is constrained in what \
-it will accept.  The first only accepts integers or the empty string \
-(checking when focus leaves it) and will flash to indicate any \
-problem.  The second only accepts strings with fewer than ten \
-characters and sounds the bell when an attempt to go over the limit \
-is made.  The third accepts US phone numbers, mapping letters to \
-their digit equivalent and sounding the bell on encountering an \
-illegal character or if trying to type over a character that is not \
-a digit.  The fourth is a password field that accepts up to eight \
-characters (silently ignoring further ones), and displaying them as \
-asterisk characters.
-EOL
-
-TkFrame.new($entry3_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-		 $entry3_demo.destroy
-		 $entry3_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-		 showCode 'entry3'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-# focusAndFlash --
-# Error handler for entry widgets that forces the focus onto the
-# widget and makes the widget flash by exchanging the foreground and
-# background colours at intervals of 200ms (i.e. at approximately
-# 2.5Hz).
-#
-# Arguments:
-# widget -	entry widget to flash
-# fg -		Initial foreground colour
-# bg -		Initial background colour
-# count -	Counter to control the number of times flashed
-def focusAndFlash(widget, fg, bg, count=5)
-  return if count <= 0
-  TkTimer.new(200, count, 
-	      proc{widget.configure(:foreground=>bg, :background=>fg)}, 
-	      proc{widget.configure(:foreground=>fg, :background=>bg)}
-	      ).start
-  widget.focus(true)
-end
-
-l1 = TkLabelFrame.new($entry3_demo, :text=>"Integer Entry")
-TkEntry.new(l1, :validate=>:focus, 
-	    :vcmd=>[
-	      proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-	    ]) {|e|
-  invalidcommand [proc{|w| focusAndFlash(w, e.fg, e.bg)}, '%W']
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l2 = TkLabelFrame.new($entry3_demo, :text=>"Length-Constrained Entry")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell}, 
-	    :vcmd=>[proc{|s| s.length < 10}, '%P']
-	    ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-### PHONE NUMBER ENTRY ###
-# Note that the source to this is quite a bit longer as the behaviour
-# demonstrated is a lot more ambitious than with the others.
-
-# Initial content for the third entry widget
-entry3content = TkVariable.new("1-(000)-000-0000")
-
-# Mapping from alphabetic characters to numbers.
-$phoneNumberMap = {}
-Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
-  chars.split('').each{|c|
-    $phoneNumberMap[c] = n
-    $phoneNumberMap[c.upcase] = n
-  }
-}
-
-# phoneSkipLeft --
-# Skip over fixed characters in a phone-number string when moving left.
-#
-# Arguments:
-# widget -	The entry widget containing the phone-number.
-def phoneSkipLeft(widget)
-  idx = widget.index('insert')
-  if idx == 8
-    # Skip back two extra characters
-    widget.cursor = idx - 2
-  elsif idx == 7 || idx == 12
-    # Skip back one extra character
-    widget.cursor = idx - 1
-  elsif idx <= 3
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# phoneSkipRight --
-# Skip over fixed characters in a phone-number string when moving right.
-#
-# Arguments:
-# widget -	The entry widget containing the phone-number.
-# add - Offset to add to index before calculation (used by validation.)
-def phoneSkipRight(widget, add = 0)
-  idx = widget.index('insert')
-  if (idx + add == 5)
-    # Skip forward two extra characters
-    widget.cursor = idx + 2
-  elsif (idx + add == 6 || idx + add == 10)
-    # Skip forward one extra character
-    widget.cursor = idx + 1
-  elsif (idx + add == 15 && add == 0)
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# validatePhoneChange --
-# Checks that the replacement (mapped to a digit) of the given
-# character in an entry widget at the given position will leave a
-# valid phone number in the widget.
-#
-# widget - entry widget to validate
-# vmode -  The widget's validation mode
-# idx -	   The index where replacement is to occur
-# char -   The character (or string, though that will always be
-#	   refused) to be overwritten at that point.
-
-def validatePhoneChange(widget, vmode, idx, char)
-  return true if idx == nil
-  Tk.after_idle(proc{widget.configure(:validate=>vmode, 
-				      :invcmd=>proc{Tk.bell})})
-  if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
-    widget.delete(idx)
-    widget.insert(idx, $phoneNumberMap[char] || char)
-    Tk.after_idle(proc{phoneSkipRight(widget, -1)})
-    return true
-  end
-  return false
-end
-
-
-l3 = TkLabelFrame.new($entry3_demo, :text=>"US Phone-Number Entry")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell}, 
-	    :textvariable=>entry3content, 
-	    :vcmd=>[
-	      proc{|w,v,i,s| validatePhoneChange(w,v,i,s)}, 
-	      "%W %v %i %S"
-	    ]){|e|
-  # Click to focus goes to the first editable character...
-  bind('FocusIn', proc{|d,w|
-	 if d != "NotifyAncestor"
-	   w.cursor = 3
-	   Tk.after_idle(proc{w.selection_clear})
-	 end
-       }, '%d %W')
-  bind('Left',  proc{|w| phoneSkipLeft(w)},  '%W')
-  bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l4 = TkLabelFrame.new($entry3_demo, :text=>"Password Entry")
-TkEntry.new(l4, :validate=>:key, :show=>'*', 
-	    :vcmd=>[
-	      proc{|s| s.length <= 8}, 
-	      '%P'
-	    ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-TkFrame.new($entry3_demo){|f|
-  lower
-  TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.columnconfigure(f, [0,1], :uniform=>1)
-  pack(:fill=>:both, :expand=>true)
-}
diff --git a/ext/tk/sample/demos-en/filebox.rb b/ext/tk/sample/demos-en/filebox.rb
deleted file mode 100644
index 7caaaf0ede..0000000000
--- a/ext/tk/sample/demos-en/filebox.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# filebox.rb
-#
-# This demonstration script prompts the user to select a file.#
-# widget demo prompts the user to select a file (called by 'widget')
-#
-
-# toplevel widget
-if defined?($filebox_demo) && $filebox_demo
-  $filebox_demo.destroy 
-  $filebox_demo = nil
-end
-
-# demo toplevel widget
-$filebox_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("filebox")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($filebox_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-	    'text'=>"Enter a file name in the entry box or click on the \"Browse\" buttons to select a file name using the file selection dialog.").pack('side'=>'top')
-
-# frame
-TkFrame.new($filebox_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $filebox_demo
-      $filebox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'filebox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-['open', 'save'].each{|type|
-  TkFrame.new($filebox_demo) {|f|
-    TkLabel.new(f, 'text'=>"Select a file to #{type}: ", 'anchor'=>'e')\
-    .pack('side'=>'left')
-
-    TkEntry.new(f, 'width'=>20) {|e|
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-
-      TkButton.new(f, 'text'=>'Browse ...', 
-		   'command'=>proc{fileDialog $filebox_demo,e,type})\
-      .pack('side'=>'left')
-    }
-
-    pack('fill'=>'x', 'padx'=>'1c', 'pady'=>3)
-  }
-}
-
-$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
-if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new($filebox_demo, 
-		    'text'=>'Use Motif Style Dialog', 
-		    'variable'=>$tk_strictMotif, 
-		    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
-end
-
-def fileDialog(w,ent,operation)
-  #    Type names         Extension(s)             Mac File Type(s)
-  #
-  #--------------------------------------------------------
-  types = [
-    ['Text files',       ['.txt','.doc']          ], 
-    ['Text files',       [],                      'TEXT' ], 
-    ['Ruby Scripts',     ['.rb'],                 'TEXT' ], 
-    ['Tcl Scripts',      ['.tcl'],                'TEXT' ], 
-    ['C Source Files',   ['.c','.h']              ], 
-    ['All Source Files', ['.rb','.tcl','.c','.h'] ], 
-    ['Image Files',      ['.gif']                 ], 
-    ['Image Files',      ['.jpeg','.jpg']         ], 
-    ['Image Files',      [],                      ['GIFF','JPEG']], 
-    ['All files',        '*'                      ]
-  ]
-
-  if operation == 'open'
-    file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
-  else
-    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w, 
-			  'initialfile'=>'Untitled', 
-			  'defaultextension'=>'.txt')
-  end
-  if file != ""
-    ent.delete 0, 'end'
-    ent.insert 0, file
-    ent.xview 'end'
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/floor.rb b/ext/tk/sample/demos-en/floor.rb
deleted file mode 100644
index db4d59fe73..0000000000
--- a/ext/tk/sample/demos-en/floor.rb
+++ /dev/null
@@ -1,1721 +0,0 @@
-# floor.rb
-#
-# This demonstration script creates a canvas widet that displays the
-# floorplan for DEC's Western Research Laboratory.
-#
-# floorDisplay widget demo (called by 'widget')
-#
-
-# floorDisplay --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -		Name of the canvas window.
-# active -	Number of active floor (1, 2, or 3).
-
-def floorDisplay(w,active)
-  return if $activeFloor == active
-
-  w.delete('all')
-  $activeFloor = active
-
-  # First go through the three floors, displaying the backgrounds for 
-  # each floor.
-
-  floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
-  floor_bg2(w,$floor_colors['bg2'],$floor_colors['outline2'])
-  floor_bg3(w,$floor_colors['bg3'],$floor_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list, 
-  # so we can insert highlights here.
-
-  TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with 
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels.clear
-  $floorItems.clear
-  send("floor_fg#{active}", w, $floor_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
-  TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"Room: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -		The name of the canvas window.
-
-def newRoom(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom.value = $floorLabels[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -		The canvas window displaying the floorplan.
-# args -	Not used.
-
-def roomChanged(w,*args)
-  w.delete('highlight')
-  item = $floorItems[$currentRoom.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-def floor_bg1(w,fill,outline)
-  TkcPolygon.new(w,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-		 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-		 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-		 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-		 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-		 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-		 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-		 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-		 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-		 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-		 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-		 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-		 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  TkcLine.new(w,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-def floor_bg2(w,fill,outline)
-  TkcPolygon.new(w,559,129,484,129,484,162,398,162,398,129,315,129,
-		 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-		 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-		 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-		 367,802,367,802,129,725,129,725,133,559,133,559,129,
-		 'tags'=>['floor2','bg'], 'fill'=>fill)
-  TkcLine.new(w,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-def floor_bg3(w,fill,outline)
-  TkcPolygon.new(w,159,300,107,300,107,248,159,248,159,129,96,129,96,
-		 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-		 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcPolygon.new(w,258,370,258,329,350,329,350,311,399,311,399,129,
-		 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-		 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300, 
-	      'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-def floor_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '101'
-  $floorItems['101'] = i
-  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Pub Lift1'
-  $floorItems['Pub Lift1'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Priv Lift1'
-  $floorItems['Priv Lift1'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '110'
-  $floorItems['110'] = i
-  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '109'
-  $floorItems['109'] = i
-  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '111'
-  $floorItems['111'] = i
-  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117B'
-  $floorItems['117B'] = i
-  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '112'
-  $floorItems['112'] = i
-  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '113'
-  $floorItems['113'] = i
-  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117A'
-  $floorItems['117A'] = i
-  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117'
-  $floorItems['117'] = i
-  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '114'
-  $floorItems['114'] = i
-  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '115'
-  $floorItems['115'] = i
-  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '116'
-  $floorItems['116'] = i
-  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '118'
-  $floorItems['118'] = i
-  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-		     163,91,163,112,149,112,149,128, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '120'
-  $floorItems['120'] = i
-  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-		     156,192,156,169,175,169,175,246,79,246, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '122'
-  $floorItems['122'] = i
-  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '121'
-  $floorItems['121'] = i
-  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106A'
-  $floorItems['106A'] = i
-  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '105'
-  $floorItems['105'] = i
-  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106B'
-  $floorItems['106B'] = i
-  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '104'
-  $floorItems['104'] = i
-  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '108'
-  $floorItems['108'] = i
-  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '107'
-  $floorItems['107'] = i
-  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Smoking'
-  $floorItems['Smoking'] = i
-  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '123'
-  $floorItems['123'] = i
-  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '103'
-  $floorItems['103'] = i
-  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '124'
-  $floorItems['124'] = i
-  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '125'
-  $floorItems['125'] = i
-  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '126'
-  $floorItems['126'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-		     486,253,486,239,474,239,474,209, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '127'
-  $floorItems['127'] = i
-  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-		     490,188,490,204,476,204,476,164, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'MShower'
-  $floorItems['MShower'] = i
-  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Closet'
-  $floorItems['Closet'] = i
-  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'WShower'
-  $floorItems['WShower'] = i
-  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-		     697,166,697,275,553,275,531,254,515,254,
-		     515,174,503,174,503,161,486,161, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '130'
-  $floorItems['130'] = i
-  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-		     342,246,397,246,397,276,393,276,
-		     393,309,300,309,300,248,308,248, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '102'
-  $floorItems['102'] = i
-  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '128'
-  $floorItems['128'] = i
-  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-		     552,277,561,277,561,325,510,325,
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '129'
-  $floorItems['129'] = i
-  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-		     642,389,561,389,561,277,696,277, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '133'
-  $floorItems['133'] = i
-  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '132'
-  $floorItems['132'] = i
-  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '134'
-  $floorItems['134'] = i
-  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '135'
-  $floorItems['135'] = i
-  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-		     304,312,396,312,396,288,400,288,404,288,
-		     409,290,413,292,418,297,421,302,422,309,
-		     421,318,417,325,411,330,405,332,397,333,
-		     344,333,340,334,336,336,335,338,332,342,
-		     331,347,332,351,334,354,336,357,341,359, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Ramona Stair'
-  $floorItems['Ramona Stair'] = i
-  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-		     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'University Stair'
-  $floorItems['University Stair'] = i
-  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-		     358,48,363,39,365,29,348,25,335,22,321,14,
-		     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-		     227,13,223,17,221,22,220,34,260,34, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Stair'
-  $floorItems['Plaza Stair'] = i
-  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-		     323,56,337,70,350,83,365,94,377,100,
-		     386,104,386,128,220,128, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Deck'
-  $floorItems['Plaza Deck'] = i
-  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106'
-  $floorItems['106'] = i
-  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-		     95,128,114,128,114,151,157,151,157,153,112,153,
-		     112,130,97,130,97,168,175,168,175,131,146,131, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '119'
-  $floorItems['119'] = i
-  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-def floor_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-		     800,222,800,168,748,168, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '238'
-  $floorItems['238'] = i
-  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '237'
-  $floorItems['237'] = i
-  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-		     643,324,643,291,641,291,641,205,696,205,
-		     696,291,694,291,694,314,715,314,715,291,
-		     715,205,755,205,755,190,724,190,724,187, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '246'
-  $floorItems['246'] = i
-  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '247'
-  $floorItems['247'] = i
-  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-		     397,246,397,255,476,255,476,250,482,250,559,250,
-		     559,274,482,274,482,278,396,278,396,274,232,274, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '202'
-  $floorItems['202'] = i
-  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-		     306,196,306,180,175,180,175,169,156,169,
-		     156,196,176,196,176,228, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '206'
-  $floorItems['206'] = i
-  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '212'
-  $floorItems['212'] = i
-  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '245'
-  $floorItems['245'] = i
-  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '244'
-  $floorItems['244'] = i
-  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '243'
-  $floorItems['243'] = i
-  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '242'
-  $floorItems['242'] = i
-  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Barbecue Deck'
-  $floorItems['Barbecue Deck'] = i
-  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '240'
-  $floorItems['240'] = i
-  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '241'
-  $floorItems['241'] = i
-  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '239'
-  $floorItems['239'] = i
-  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '248'
-  $floorItems['248'] = i
-  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '236'
-  $floorItems['236'] = i
-  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '235'
-  $floorItems['235'] = i
-  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-		     572,143,579,143,579,185,626,185, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '234'
-  $floorItems['234'] = i
-  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-		     578,185,527,185,527,131,557,131, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '233'
-  $floorItems['233'] = i
-  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '230'
-  $floorItems['230'] = i
-  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '232'
-  $floorItems['232'] = i
-  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '229'
-  $floorItems['229'] = i
-  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '227'
-  $floorItems['227'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '228'
-  $floorItems['228'] = i
-  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '226'
-  $floorItems['226'] = i
-  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '225'
-  $floorItems['225'] = i
-  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '224'
-  $floorItems['224'] = i
-  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '223'
-  $floorItems['223'] = i
-  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '222'
-  $floorItems['222'] = i
-  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '221'
-  $floorItems['221'] = i
-  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '204'
-  $floorItems['204'] = i
-  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '205'
-  $floorItems['205'] = i
-  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '207'
-  $floorItems['207'] = i
-  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '208'
-  $floorItems['208'] = i
-  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '209'
-  $floorItems['209'] = i
-  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217'
-  $floorItems['217'] = i
-  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217A'
-  $floorItems['217A'] = i
-  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '216'
-  $floorItems['216'] = i
-  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '215'
-  $floorItems['215'] = i
-  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '214'
-  $floorItems['214'] = i
-  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '213'
-  $floorItems['213'] = i
-  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '210'
-  $floorItems['210'] = i
-  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '211'
-  $floorItems['211'] = i
-  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '203'
-  $floorItems['203'] = i
-  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-		     154,198,154,192,109,192,109,169,99,169, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '220'
-  $floorItems['220'] = i
-  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Priv Lift2'
-  $floorItems['Priv Lift2'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Pub Lift 2'
-  $floorItems['Pub Lift 2'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '218'
-  $floorItems['218'] = i
-  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '219'
-  $floorItems['219'] = i
-  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '201'
-  $floorItems['201'] = i
-  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-def floor_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316'
-  $floorItems['316'] = i
-  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '309'
-  $floorItems['309'] = i
-  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '308'
-  $floorItems['308'] = i
-  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '307'
-  $floorItems['307'] = i
-  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '305'
-  $floorItems['305'] = i
-  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324B'
-  $floorItems['324B'] = i
-  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324A'
-  $floorItems['324A'] = i
-  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '320'
-  $floorItems['320'] = i
-  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '310'
-  $floorItems['310'] = i
-  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '312'
-  $floorItems['312'] = i
-  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '313'
-  $floorItems['313'] = i
-  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '314'
-  $floorItems['314'] = i
-  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '315'
-  $floorItems['315'] = i
-  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316B'
-  $floorItems['316B'] = i
-  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316A'
-  $floorItems['316A'] = i
-  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-		     174,198,174,226,101,226,101,179,97,179, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '319'
-  $floorItems['319'] = i
-  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '311'
-  $floorItems['311'] = i
-  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '318'
-  $floorItems['318'] = i
-  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '317'
-  $floorItems['317'] = i
-  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '323'
-  $floorItems['323'] = i
-  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '325'
-  $floorItems['325'] = i
-  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '321'
-  $floorItems['321'] = i
-  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-		     264,181,264,135,314,135, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '322'
-  $floorItems['322'] = i
-  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Pub Lift3'
-  $floorItems['Pub Lift3'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Priv Lift3'
-  $floorItems['Priv Lift3'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '303'
-  $floorItems['303'] = i
-  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-		     244,230,244,221,252,221,252,203, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324'
-  $floorItems['324'] = i
-  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '304'
-  $floorItems['304'] = i
-  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '301'
-  $floorItems['301'] = i
-  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '327'
-  $floorItems['327'] = i
-  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '326'
-  $floorItems['326'] = i
-  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-		     375,274,397,274,397,248,339,248,339,242,308,242, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '302'
-  $floorItems['302'] = i
-  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-		     272,193,263,180,242,180,175,180,175,169,156,169,
-		     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-		     107,248,160,248,160,301,107,301,107,275,70,275, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '306'
-  $floorItems['306'] = i
-  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget
-if defined?($floor_demo) && $floor_demo
-  $floor_demo.destroy 
-  $floor_demo = nil
-end
-
-# demo toplevel widget
-$floor_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration")
-  iconname("Floorplan")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-# label
-TkLabel.new($floor_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
-	    'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
-  pack('side'=>'top')
-}
-
-# frame
-$floor_buttons = TkFrame.new($floor_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $floor_demo
-      $floor_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'floor'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# 
-$floorLabels = {}
-$floorItems = {}
-
-# canvas 
-if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new($floor_demo,'bd'=>2,'relief'=>'sunken',
-				    'highlightthickness'=>2)
-  $floor_canvas = TkCanvas.new($floor_canvas_frame, 
-			       'width'=>900, 'height'=>500, 'borderwidth'=>0, 
-			       'highlightthickness'=>0) {|c|
-    TkScrollbar.new($floor_demo, 'orient'=>'horiz', 
-		    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new($floor_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new($floor_demo) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
-				   'borderwidth'=>0, 
-				   'highlightthickness'=>0) {
-	xscrollcommand(proc{|first,last| h.set first,last})
-	yscrollcommand(proc{|first,last| v.set first,last})
-	pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| c.yview(*args)})
-    h.command(proc{|*args| c.xview(*args)})
-  }
-end
-
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken', 
-			   'bd'=>2, 'textvariable'=>$currentRoom)
-
-# Choose colors, then fill in the floorplan.
-
-$floor_colors = {}
-if TkWinfo.depth($floor_canvas) > 1
-  $floor_colors['bg1'] = '#a9c1da'
-  $floor_colors['outline1'] = '#77889a'
-  $floor_colors['bg2'] = '#9ab0c6'
-  $floor_colors['outline2'] = '#687786'
-  $floor_colors['bg3'] = '#8ba0b3'
-  $floor_colors['outline3'] = '#596673'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = '#c4d1df'
-else
-  $floor_colors['bg1'] = 'white'
-  $floor_colors['outline1'] = 'black'
-  $floor_colors['bg2'] = 'white'
-  $floor_colors['outline2'] = 'black'
-  $floor_colors['bg3'] = 'white'
-  $floor_colors['outline3'] = 'black'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = 'black'
-end
-
-$activeFloor = ''
-floorDisplay $floor_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor_canvas.itembind('floor1', '1', proc{floorDisplay $floor_canvas,1})
-$floor_canvas.itembind('floor2', '1', proc{floorDisplay $floor_canvas,2})
-$floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
-$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
-$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
-$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion', 
-		   proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
-$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
-$currentRoom.value = ''
-$currentRoom.trace('w',proc{roomChanged $floor_canvas})
-
diff --git a/ext/tk/sample/demos-en/form.rb b/ext/tk/sample/demos-en/form.rb
deleted file mode 100644
index dbb14302dc..0000000000
--- a/ext/tk/sample/demos-en/form.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# form widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($form_demo) && $form_demo
-  $form_demo.destroy 
-  $form_demo = nil
-end
-
-# demo toplevel widget
-$form_demo = TkToplevel.new {|w|
-  title("Form Demonstration")
-  iconname("form")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($form_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This window contains a simple form where you can type in the various entries and use tabs to move circularly between the entries."
-}
-msg.pack('side'=>'top', 'fill'=>'x')
-
-# frame
-TkFrame.new($form_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $form_demo
-      $form_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'form'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry 
-form_data = []
-(1..5).each{|i|
-  f = TkFrame.new($form_demo, 'bd'=>2)
-  e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
-  l = TkLabel.new(f)
-  e.pack('side'=>'right')
-  l.pack('side'=>'left')
-  form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
-}
-
-# 
-form_data[1]['label'].text('Name:')
-form_data[2]['label'].text('Address:')
-form_data[5]['label'].text('Phone:')
-
-# pack
-(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
-
diff --git a/ext/tk/sample/demos-en/hello b/ext/tk/sample/demos-en/hello
deleted file mode 100644
index f06eabe518..0000000000
--- a/ext/tk/sample/demos-en/hello
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-
-unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
-  require 'tkencoding'
-end
-
-TkButton.new(nil,
-	'text'=>"Hello Ruby world!",
-	'font'=>TkFont.new('k14'),
-	'command'=>proc{print "Hello Ruby world!\n"; exit}
-).pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/hscale.rb b/ext/tk/sample/demos-en/hscale.rb
deleted file mode 100644
index 14e395b61a..0000000000
--- a/ext/tk/sample/demos-en/hscale.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require "tkcanvas"
-
-if defined?($hscale_demo) && $hscale_demo
-  $hscale_demo.destroy
-  $hscale_demo = nil
-end
-
-$hscale_demo = TkToplevel.new {|w|
-  title("Horizontal Scale Demonstration")
-  iconname("hscale")
-}
-positionWindow($hscale_demo)
-
-
-msg = TkLabel.new($hscale_demo) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "An arrow and a horizontal scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the length of the arrow."
-}
-msg.pack('side'=>'top')
-
-TkFrame.new($hscale_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $hscale_demo
-      $hscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'hscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-TkFrame.new($hscale_demo) {|frame|
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, '0', '0', '1', '1', '2', '2') {
-      fill 'DeepSkyBlue'
-      tags 'poly'
-    }
-    TkcLine.new(c, '0', '0', '1', '1', '2', '2', '0', '0') {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'top', 'expand'=>'yes', 'anchor'=>'s', 'fill'=>'x', 'padx'=>'15')
-  scale = TkScale.new(frame) {
-    orient 'horizontal'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setWidth(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
-  scale.set 75
-}.pack('side'=>'top', 'fill'=>'x')
-
-
-def setWidth(w, width)
-  width = width + 21
-  x2 = width - 30
-  if x2 < 21
-    x2 = 21
-  end
-  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-end
diff --git a/ext/tk/sample/demos-en/icon.rb b/ext/tk/sample/demos-en/icon.rb
deleted file mode 100644
index 7557257ef4..0000000000
--- a/ext/tk/sample/demos-en/icon.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# icon.rb
-#
-# This demonstration script creates a toplevel window containing
-# buttons that display bitmaps instead of text.
-#
-# iconic button widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($icon_demo) && $icon_demo
-  $icon_demo.destroy 
-  $icon_demo = nil
-end
-
-# demo toplevel widget
-$icon_demo = TkToplevel.new {|w|
-  title("Iconic Button Demonstration")
-  iconname("icon")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($icon_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "This window shows three ways of using bitmaps or images in radiobuttons and checkbuttons.  On the left are two radiobuttons, each of which displays a bitmap and an indicator.  In the middle is a checkbutton that displays a different image depending on whether it is selected or not.  On the right is a checkbutton that displays a single bitmap but changes its background color to indicate whether or not it is selected. (This change is visible when the mouse pointer is not directy over the button.)"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($icon_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $icon_demo
-      $icon_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'icon'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image 
-flagup = \
-TkBitmapImage.new('file'=>[$demo_dir,
-                           'images','flagup.xbm'].join(File::Separator),
-		  'maskfile'=>\
-		  [$demo_dir,'images','flagup.xbm'].join(File::Separator))
-flagdown = \
-TkBitmapImage.new('file'=>[$demo_dir,
-                           'images','flagdown.xbm'].join(File::Separator),
-		  'maskfile'=>\
-		  [$demo_dir,'images','flagdown.xbm'].join(File::Separator))
-
-# �ѿ�����
-letters = TkVariable.new
-
-# frame
-TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
-  TkFrame.new(w) {|f|
-    TkRadioButton.new(f){
-      bitmap '@' + [$demo_dir,'images','letters.xbm'].join(File::Separator)
-      variable letters
-      value 'full'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-    TkRadioButton.new(f){
-      bitmap '@' + [$demo_dir,'images','noletter.xbm'].join(File::Separator)
-      variable letters
-      value 'empty'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  TkCheckButton.new(w) {
-    image flagdown
-    selectimage flagup
-    indicatoron 0
-    selectcolor self['background']
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  TkCheckButton.new(w) {
-    bitmap '@' + [$demo_dir,'images','letters.xbm'].join(File::Separator)
-    indicatoron 0
-    selectcolor 'SeaGreen1'
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-}.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-en/image1.rb b/ext/tk/sample/demos-en/image1.rb
deleted file mode 100644
index 8d39b20049..0000000000
--- a/ext/tk/sample/demos-en/image1.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-## image1.rb
-#
-# This demonstration script displays two image widgets.
-#
-# two image widgets demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image1_demo) && $image1_demo
-  $image1_demo.destroy 
-  $image1_demo = nil
-end
-
-# demo toplevel widget
-$image1_demo = TkToplevel.new {|w|
-  title('Image Demonstration #1')
-  iconname("Image1")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($image1_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration displays two images, each in a separate label widget."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($image1_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image1_demo
-      $image1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image
-image1a = \
-TkPhotoImage.new('file'=>[$demo_dir,
-                          'images','earth.gif'].join(File::Separator))
-image1b = \
-TkPhotoImage.new('file'=>[$demo_dir,
-                          'images','earthris.gif'].join(File::Separator))
-
-# label
-[ TkLabel.new($image1_demo, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  TkLabel.new($image1_demo, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-
diff --git a/ext/tk/sample/demos-en/image2.rb b/ext/tk/sample/demos-en/image2.rb
deleted file mode 100644
index 9924195675..0000000000
--- a/ext/tk/sample/demos-en/image2.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# image2.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image2_demo) && $image2_demo
-  $image2_demo.destroy 
-  $image2_demo = nil
-end
-
-# demo toplevel widget
-$image2_demo = TkToplevel.new {|w|
-  title('Image Demonstration #2')
-  iconname("Image2")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($image2_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then press Enter to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($image2_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image2_demo
-      $image2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# �ѿ�����
-$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
-
-# image
-$image2a = TkPhotoImage.new
-
-#
-TkLabel.new($image2_demo, 'text'=>'Directory:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-image2_e = TkEntry.new($image2_demo) {
-  width 30
-  textvariable $dirName
-}.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkLabel.new($image2_demo, 'text'=>'File:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new($image2_demo){|w|
-  s = TkScrollbar.new(w)
-  l = TkListbox.new(w) {
-    width 20
-    height 10
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| l.yview(*args)})
-  l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  #l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
-  l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
-  l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
-
-  image2_e.bind 'Return', proc{loadDir l}
-
-}.pack('side'=>'top', 'anchor'=>'w')
-
-# image 
-[ TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20),
-  TkLabel.new($image2_demo, 'text'=>'Image:'),
-  TkLabel.new($image2_demo, 'image'=>$image2a)
-].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
-
-# 
-def loadDir(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-def loadImage(img,w,x,y)
-  img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
diff --git a/ext/tk/sample/demos-en/image3.rb b/ext/tk/sample/demos-en/image3.rb
deleted file mode 100644
index d997ef7772..0000000000
--- a/ext/tk/sample/demos-en/image3.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# image3.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image3_demo) && $image3_demo
-  $image3_demo.destroy 
-  $image3_demo = nil
-end
-
-# demo toplevel widget
-$image3_demo = TkToplevel.new {|w|
-  title('Image Demonstration #3')
-  iconname("Image3")
-  positionWindow(w)
-}
-
-# 
-def loadDir(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-# selectAndLoadDir --
-# This procedure pops up a dialog to ask for a directory to load into
-# the listobx and (if the user presses OK) reloads the directory
-# listbox from the directory named in the demo's entry.
-#
-# Arguments:
-# w -			Name of the toplevel window of the demo.
-def selectAndLoadDir(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName, :parent=>w, :mustexist=>true)
-  if dir.length > 0
-    $dirName.value = dir 
-    loadDir(lbox)
-  end
-end
-
-def loadImage(w,x,y)
-  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
-
-# label
-msg = TkLabel.new($image3_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then type Return to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($image3_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image3_demo
-      $image3_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image3'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# variable
-$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
-
-# image
-begin
-  $image3a.delete
-rescue
-end
-$image3a = TkPhotoImage.new
-
-#
-image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-
-image3_df = TkLabelFrame.new($image3_demo, :text=>'Directory:')
-
-image3_ff = TkLabelFrame.new($image3_demo, :text=>'File:', 
-			     :padx=>'2m', :pady=>'2m')
-image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
-  pack(:side=>:left, :fill=>:y, :expand=>true)
-  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y, 
-					     :expand=>true))
-  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
-  bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
-}
-
-image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
-  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
-  bind('Return', proc{loadDir(image3_lbx)})
-}
-
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.", 
-	     :command=>proc{selectAndLoadDir(image3_ent, image3_lbx)}) {
-  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
-}
-
-image3_if = TkLabelFrame.new($image3_demo, :text=>'Image:') {|f|
-  TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-}
-
-Tk.grid(image3_df,  '-',
-	:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if, 
-	:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-TkGrid.columnconfigure(image3_f, 1, :weight=>1)
-
diff --git a/ext/tk/sample/demos-en/images/earth.gif b/ext/tk/sample/demos-en/images/earth.gif
deleted file mode 100644
index 3ae4a9ce01..0000000000
--- a/ext/tk/sample/demos-en/images/earth.gif
+++ /dev/null
diff --git a/ext/tk/sample/demos-en/images/earthris.gif b/ext/tk/sample/demos-en/images/earthris.gif
deleted file mode 100644
index 48f08c4421..0000000000
--- a/ext/tk/sample/demos-en/images/earthris.gif
+++ /dev/null
diff --git a/ext/tk/sample/demos-en/images/face.xbm b/ext/tk/sample/demos-en/images/face.xbm
deleted file mode 100644
index 03d829f4d1..0000000000
--- a/ext/tk/sample/demos-en/images/face.xbm
+++ /dev/null
@@ -1,173 +0,0 @@
-#define face_width 108
-#define face_height 144
-#define face_x_hot 48
-#define face_y_hot 80
-static char face_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09,
-   0x20, 0x80, 0x24, 0x05, 0x00, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x88,
-   0x24, 0x20, 0x80, 0x24, 0x00, 0x00, 0x00, 0x10, 0x80, 0x04, 0x00, 0x01,
-   0x00, 0x01, 0x40, 0x0a, 0x09, 0x00, 0x92, 0x04, 0x80, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x10, 0x40, 0x12, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x84,
-   0x24, 0x40, 0x22, 0xa8, 0x02, 0x14, 0x84, 0x92, 0x40, 0x42, 0x12, 0x04,
-   0x10, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x52, 0x11, 0x00, 0x12, 0x00,
-   0x40, 0x02, 0x00, 0x20, 0x00, 0x08, 0x00, 0xaa, 0x02, 0x54, 0x85, 0x24,
-   0x00, 0x10, 0x12, 0x00, 0x00, 0x81, 0x44, 0x00, 0x90, 0x5a, 0x00, 0xea,
-   0x1b, 0x00, 0x80, 0x40, 0x40, 0x02, 0x00, 0x08, 0x00, 0x20, 0xa2, 0x05,
-   0x8a, 0xb4, 0x6e, 0x45, 0x12, 0x04, 0x08, 0x00, 0x00, 0x00, 0x10, 0x02,
-   0xa8, 0x92, 0x00, 0xda, 0x5f, 0x10, 0x00, 0x10, 0xa1, 0x04, 0x20, 0x41,
-   0x02, 0x00, 0x5a, 0x25, 0xa0, 0xff, 0xfb, 0x05, 0x41, 0x02, 0x04, 0x00,
-   0x00, 0x08, 0x40, 0x80, 0xec, 0x9b, 0xec, 0xfe, 0x7f, 0x01, 0x04, 0x20,
-   0x90, 0x02, 0x04, 0x00, 0x08, 0x20, 0xfb, 0x2e, 0xf5, 0xff, 0xff, 0x57,
-   0x00, 0x04, 0x02, 0x00, 0x00, 0x20, 0x01, 0xc1, 0x6e, 0xab, 0xfa, 0xff,
-   0xff, 0x05, 0x90, 0x20, 0x48, 0x02, 0x00, 0x04, 0x20, 0xa8, 0xdf, 0xb5,
-   0xfe, 0xff, 0xff, 0x0b, 0x01, 0x00, 0x01, 0x00, 0x80, 0x80, 0x04, 0xe0,
-   0xbb, 0xef, 0xff, 0xff, 0x7f, 0x01, 0x00, 0x04, 0x48, 0x02, 0x00, 0x20,
-   0x80, 0xf4, 0x6f, 0xfb, 0xff, 0xff, 0xff, 0x20, 0x90, 0x40, 0x02, 0x00,
-   0x00, 0x04, 0x08, 0xb8, 0xf6, 0xff, 0xff, 0xdf, 0xbe, 0x12, 0x45, 0x10,
-   0x90, 0x04, 0x90, 0x00, 0x22, 0xfa, 0xff, 0xff, 0xff, 0xbb, 0xd7, 0xe9,
-   0x3a, 0x02, 0x02, 0x00, 0x04, 0x90, 0x80, 0xfe, 0xdf, 0xf6, 0xb7, 0xef,
-   0xbe, 0x56, 0x57, 0x40, 0x48, 0x09, 0x00, 0x04, 0x00, 0xfa, 0xf5, 0xdf,
-   0xed, 0x5a, 0xd5, 0xea, 0xbd, 0x09, 0x00, 0x00, 0x40, 0x00, 0x92, 0xfe,
-   0xbf, 0x7d, 0xb7, 0x6a, 0x55, 0xbf, 0xf7, 0x02, 0x11, 0x01, 0x00, 0x91,
-   0x00, 0xff, 0xff, 0xaf, 0x55, 0x55, 0x5b, 0xeb, 0xef, 0x22, 0x04, 0x04,
-   0x04, 0x00, 0xa4, 0xff, 0xf7, 0xad, 0xaa, 0xaa, 0xaa, 0xbe, 0xfe, 0x03,
-   0x20, 0x00, 0x10, 0x44, 0x80, 0xff, 0x7f, 0x55, 0x12, 0x91, 0x2a, 0xeb,
-   0xbf, 0x0b, 0x82, 0x02, 0x00, 0x00, 0xd1, 0x7f, 0xdf, 0xa2, 0xa4, 0x54,
-   0x55, 0xfd, 0xfd, 0x47, 0x08, 0x08, 0x00, 0x21, 0xe4, 0xff, 0x37, 0x11,
-   0x09, 0xa5, 0xaa, 0xb6, 0xff, 0x0d, 0x80, 0x00, 0x00, 0x04, 0xd0, 0xff,
-   0x4f, 0x44, 0x20, 0x48, 0x55, 0xfb, 0xff, 0x27, 0x11, 0x02, 0x40, 0x40,
-   0xe2, 0xfb, 0x15, 0x11, 0x4a, 0x55, 0x4a, 0x7d, 0xf7, 0x0f, 0x00, 0x00,
-   0x04, 0x08, 0xf8, 0xdf, 0x52, 0x44, 0x01, 0x52, 0xb5, 0xfa, 0xff, 0x0f,
-   0x49, 0x02, 0x00, 0x02, 0xe9, 0xf6, 0x0a, 0x11, 0xa4, 0x88, 0x4a, 0x6d,
-   0xff, 0x5f, 0x00, 0x00, 0x10, 0x20, 0xf0, 0x2f, 0x21, 0x44, 0x10, 0x52,
-   0xb5, 0xfa, 0xff, 0x0f, 0x44, 0x04, 0x80, 0x08, 0xf8, 0xab, 0x8a, 0x00,
-   0x81, 0xa4, 0xd4, 0xd6, 0xfe, 0x2f, 0x00, 0x00, 0x04, 0x40, 0xb5, 0x2d,
-   0x21, 0x08, 0x04, 0x90, 0xaa, 0xfa, 0xff, 0x1f, 0x11, 0x01, 0x00, 0x04,
-   0xf0, 0x57, 0x0a, 0x22, 0x40, 0x4a, 0xda, 0x5e, 0xfb, 0x1f, 0x40, 0x00,
-   0x40, 0x20, 0xba, 0x95, 0x90, 0x00, 0x01, 0xa0, 0xaa, 0xea, 0xff, 0x5f,
-   0x02, 0x02, 0x00, 0x01, 0xe8, 0x57, 0x05, 0x00, 0x00, 0x12, 0xd5, 0xfe,
-   0xfd, 0x1f, 0x48, 0x00, 0x04, 0x48, 0x7a, 0x95, 0x08, 0x02, 0x10, 0x40,
-   0xaa, 0x55, 0xf7, 0x1f, 0x00, 0x09, 0x20, 0x00, 0xf8, 0x57, 0x22, 0x10,
-   0x00, 0x28, 0xa9, 0xfa, 0xff, 0x5f, 0x02, 0x00, 0x00, 0x49, 0xdd, 0x29,
-   0x01, 0x00, 0x80, 0x80, 0xaa, 0xd7, 0xff, 0x0f, 0x10, 0x00, 0x08, 0x00,
-   0xf8, 0x96, 0x08, 0x00, 0x00, 0x20, 0x54, 0xfa, 0xee, 0x3f, 0x81, 0x04,
-   0x40, 0x24, 0xfe, 0x55, 0x82, 0x00, 0x00, 0x82, 0xd2, 0xad, 0xff, 0x0f,
-   0x08, 0x00, 0x04, 0x80, 0x6c, 0x97, 0x00, 0x00, 0x02, 0x20, 0xa9, 0xf6,
-   0xdf, 0x5f, 0x00, 0x02, 0x20, 0x09, 0xfa, 0x49, 0x12, 0x00, 0x20, 0x84,
-   0x54, 0xdb, 0xfe, 0x1f, 0x91, 0x00, 0x00, 0x00, 0xf8, 0x2b, 0x00, 0x20,
-   0x00, 0x40, 0xa4, 0xf6, 0xbb, 0x1f, 0x04, 0x00, 0x44, 0x92, 0x7e, 0x95,
-   0x02, 0x00, 0x00, 0x89, 0xaa, 0xdd, 0xff, 0x1f, 0x20, 0x09, 0x10, 0x00,
-   0xf4, 0x57, 0x20, 0x01, 0x08, 0x20, 0xa9, 0x76, 0xff, 0x5f, 0x02, 0x00,
-   0x00, 0x21, 0xfc, 0x4a, 0x05, 0x00, 0x01, 0x80, 0x54, 0xdb, 0xff, 0x1e,
-   0x08, 0x02, 0x04, 0x08, 0xf9, 0x2b, 0x00, 0x00, 0x40, 0x28, 0xd2, 0xf6,
-   0xff, 0xbf, 0x80, 0x00, 0x90, 0x00, 0xbc, 0x92, 0x08, 0x10, 0x00, 0x82,
-   0x54, 0xdb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x44, 0xf9, 0x55, 0x02, 0x01,
-   0x00, 0x20, 0xaa, 0xbd, 0xfd, 0x3f, 0x08, 0x04, 0x04, 0x10, 0xf4, 0x2a,
-   0x01, 0x00, 0x22, 0x80, 0xd4, 0xf6, 0xff, 0x5f, 0x82, 0x00, 0x40, 0x02,
-   0xf8, 0x55, 0x20, 0x00, 0x00, 0x50, 0x6a, 0xdf, 0xfe, 0x3f, 0x00, 0x00,
-   0x00, 0x48, 0xe9, 0x4a, 0x05, 0x08, 0x00, 0xa5, 0xd5, 0xf5, 0xff, 0x3f,
-   0x10, 0x01, 0x10, 0x01, 0xb0, 0xab, 0x92, 0x02, 0x40, 0xf8, 0xbf, 0xde,
-   0xfe, 0x5f, 0x02, 0x04, 0x04, 0x48, 0xfa, 0xd4, 0x6f, 0x20, 0x84, 0xef,
-   0xff, 0xfb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x00, 0xe0, 0xed, 0xbf, 0x0b,
-   0xa1, 0x7e, 0xff, 0xbf, 0xfd, 0x5f, 0x04, 0x01, 0x20, 0x49, 0xd2, 0xfb,
-   0xfe, 0x55, 0xd4, 0xff, 0xff, 0xf6, 0xff, 0x07, 0x00, 0x04, 0x00, 0x00,
-   0xc0, 0xaa, 0xfb, 0x2b, 0xa2, 0xfe, 0xff, 0xdf, 0xee, 0x1f, 0x91, 0x00,
-   0x82, 0xa4, 0xa4, 0xf5, 0xff, 0x57, 0xd5, 0xff, 0xbf, 0xfd, 0xff, 0x4d,
-   0x00, 0x00, 0x20, 0x00, 0x88, 0x5b, 0xff, 0x2f, 0x69, 0xff, 0xff, 0xdb,
-   0xfe, 0x1f, 0x24, 0x02, 0x00, 0x49, 0xa2, 0xd6, 0xff, 0x5f, 0xea, 0xff,
-   0x7f, 0x7f, 0x7f, 0x0d, 0x00, 0x00, 0x10, 0x00, 0x40, 0xab, 0xf7, 0xbb,
-   0xf0, 0xdf, 0xff, 0xd5, 0xff, 0xbf, 0x82, 0x04, 0x42, 0x24, 0x91, 0xd5,
-   0xaa, 0xae, 0xd4, 0xaa, 0x52, 0x7b, 0xff, 0x15, 0x08, 0x00, 0x00, 0x01,
-   0x04, 0x55, 0xd5, 0x55, 0x70, 0x5b, 0x75, 0xdd, 0xdf, 0x1f, 0x40, 0x00,
-   0x08, 0x48, 0xa0, 0x4a, 0xa9, 0x56, 0xea, 0x56, 0xad, 0x6a, 0x7d, 0x9b,
-   0x04, 0x01, 0x00, 0x02, 0x42, 0x2a, 0xd5, 0xaa, 0xa8, 0xaa, 0xaa, 0xfa,
-   0xdf, 0x2f, 0x10, 0x04, 0x22, 0x48, 0x08, 0x45, 0x2a, 0x15, 0x68, 0x55,
-   0x55, 0xd7, 0x76, 0x1b, 0x00, 0x00, 0x00, 0x01, 0x40, 0x2a, 0x80, 0xa0,
-   0xb2, 0x09, 0x48, 0xb9, 0xdf, 0x17, 0x22, 0x01, 0x00, 0x24, 0x45, 0x8a,
-   0x24, 0x4a, 0x54, 0x51, 0x91, 0xf6, 0x6e, 0x4b, 0x00, 0x04, 0x90, 0x00,
-   0x80, 0x52, 0x00, 0x20, 0x69, 0x05, 0xa4, 0xaa, 0xff, 0x1e, 0x48, 0x00,
-   0x02, 0x92, 0x08, 0x05, 0x81, 0x94, 0xd4, 0x92, 0x40, 0xfd, 0xb6, 0x8b,
-   0x00, 0x01, 0x40, 0x00, 0x82, 0x54, 0x00, 0x48, 0x68, 0x05, 0x90, 0xa4,
-   0xef, 0x06, 0x24, 0x00, 0x08, 0x12, 0x10, 0x05, 0x00, 0x10, 0xb5, 0x01,
-   0x42, 0xfb, 0xbf, 0x43, 0x00, 0x09, 0x00, 0x40, 0x81, 0xa8, 0x08, 0x4a,
-   0xaa, 0x96, 0x90, 0xac, 0x6d, 0x15, 0x22, 0x00, 0x20, 0x09, 0x04, 0x15,
-   0x80, 0x28, 0xdc, 0x01, 0x24, 0xfb, 0xbf, 0x01, 0x80, 0x04, 0x09, 0x00,
-   0x40, 0x48, 0x02, 0x45, 0xb2, 0x2e, 0x41, 0x6d, 0xef, 0x05, 0x11, 0x00,
-   0x40, 0x52, 0x02, 0x15, 0x29, 0x2a, 0xac, 0x42, 0x54, 0xfb, 0x3b, 0x51,
-   0x84, 0x00, 0x08, 0x00, 0x20, 0x54, 0x80, 0x05, 0xb5, 0x3d, 0xa2, 0xb6,
-   0xdf, 0x00, 0x20, 0x04, 0x20, 0x49, 0x89, 0xa8, 0x6a, 0x29, 0xac, 0xd6,
-   0x54, 0xff, 0x3f, 0x84, 0x00, 0x01, 0x04, 0x10, 0x00, 0x94, 0xa8, 0x56,
-   0xda, 0x5f, 0xab, 0xd5, 0x1e, 0x10, 0x48, 0x00, 0x90, 0x82, 0x48, 0xa8,
-   0xb2, 0xac, 0xfd, 0x55, 0xd5, 0xfe, 0x9f, 0x80, 0x00, 0x0a, 0x02, 0x08,
-   0x02, 0x55, 0x5a, 0x75, 0xff, 0xaf, 0xb6, 0xf7, 0x2d, 0x12, 0x92, 0x00,
-   0x10, 0x20, 0x10, 0xa8, 0x54, 0xd5, 0xbf, 0x5d, 0xad, 0xdd, 0x0f, 0x00,
-   0x00, 0x04, 0x40, 0x09, 0x84, 0xa8, 0xaa, 0x5a, 0xed, 0xeb, 0x6a, 0xff,
-   0x9f, 0xa4, 0x24, 0x01, 0x02, 0xa0, 0x20, 0x50, 0x55, 0xd5, 0xbe, 0xae,
-   0xad, 0xfd, 0x16, 0x00, 0x10, 0x04, 0x20, 0x0a, 0x08, 0xb4, 0xaa, 0x95,
-   0xaa, 0x7b, 0xb7, 0xdb, 0x5f, 0x92, 0x04, 0x01, 0x84, 0x20, 0x21, 0x51,
-   0xd5, 0x2a, 0xa9, 0xee, 0xd5, 0xfe, 0x0d, 0x00, 0x20, 0x04, 0x10, 0x00,
-   0x08, 0x50, 0xe9, 0xd7, 0xd4, 0xfb, 0xb5, 0xff, 0x9f, 0x24, 0x09, 0x01,
-   0x42, 0x4a, 0xa2, 0x64, 0xd5, 0x55, 0x7b, 0x7f, 0xda, 0x7d, 0x4f, 0x00,
-   0x20, 0x04, 0x00, 0x80, 0x00, 0xa0, 0x2a, 0x13, 0x84, 0x6a, 0x55, 0xff,
-   0x1d, 0x48, 0x8a, 0x00, 0x94, 0x24, 0x8a, 0xc8, 0xaa, 0x42, 0x20, 0x5d,
-   0xf5, 0xff, 0x5f, 0x01, 0x00, 0x02, 0x01, 0x00, 0x20, 0xa2, 0x4a, 0x1a,
-   0x82, 0x56, 0xda, 0xbd, 0x3f, 0x92, 0x92, 0x00, 0x90, 0x92, 0x00, 0x40,
-   0x95, 0x6a, 0xf4, 0x55, 0x6d, 0xff, 0xd6, 0x00, 0x00, 0x0a, 0x04, 0x20,
-   0x14, 0x49, 0x4b, 0xaa, 0xaa, 0x56, 0xf5, 0xff, 0xbf, 0xab, 0xa4, 0x00,
-   0x20, 0x89, 0x40, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xde, 0xbf, 0xeb, 0x03,
-   0x00, 0x02, 0x04, 0x02, 0x0a, 0x10, 0x2b, 0x2a, 0x55, 0x5b, 0xf5, 0xff,
-   0xd7, 0x2f, 0x92, 0x00, 0x10, 0x28, 0x21, 0x01, 0x56, 0x95, 0xa0, 0x56,
-   0xdf, 0xef, 0xea, 0x87, 0x40, 0x0a, 0x42, 0x41, 0x00, 0x90, 0xaa, 0x52,
-   0xb6, 0xad, 0xfa, 0xff, 0xd5, 0x2f, 0x14, 0x00, 0x00, 0x04, 0x95, 0x04,
-   0xaa, 0xac, 0x55, 0x6b, 0xff, 0xb7, 0xea, 0x9f, 0x40, 0x02, 0x28, 0x51,
-   0x00, 0x40, 0x58, 0xd5, 0xda, 0xd6, 0x6e, 0x7f, 0xf9, 0x3f, 0x12, 0x04,
-   0x02, 0x04, 0x49, 0x25, 0x55, 0xaa, 0x77, 0xab, 0xff, 0x2b, 0xfd, 0x3f,
-   0x48, 0x01, 0x20, 0x41, 0x00, 0x00, 0x58, 0xa9, 0xda, 0xea, 0xfd, 0xaf,
-   0xfa, 0xff, 0x02, 0x04, 0x08, 0x14, 0x29, 0x49, 0x52, 0x55, 0x55, 0x55,
-   0xff, 0x8d, 0xfe, 0x3f, 0xa8, 0x00, 0x02, 0x41, 0x00, 0x02, 0xa0, 0xa2,
-   0xaa, 0xea, 0xff, 0x53, 0xfd, 0xff, 0x02, 0x04, 0x50, 0x04, 0x25, 0xa8,
-   0x54, 0x49, 0x52, 0xb5, 0xbf, 0x8a, 0xfe, 0xff, 0xa9, 0x08, 0x04, 0x50,
-   0x80, 0x02, 0xa1, 0x2a, 0x95, 0xea, 0xff, 0xa1, 0xff, 0xff, 0x03, 0x02,
-   0x90, 0x02, 0x09, 0x08, 0x44, 0x49, 0x52, 0xbd, 0x7f, 0xca, 0xff, 0xff,
-   0x2b, 0x09, 0x04, 0x48, 0x40, 0x82, 0x90, 0x56, 0xa9, 0xf6, 0xbf, 0xd0,
-   0xff, 0xff, 0x47, 0x00, 0x50, 0x02, 0x15, 0x11, 0x40, 0x95, 0xaa, 0xfd,
-   0x2f, 0xe9, 0xff, 0xff, 0x8f, 0x0a, 0x84, 0x50, 0x40, 0x84, 0x14, 0xaa,
-   0x6a, 0xff, 0x5f, 0xf2, 0xff, 0xff, 0x7f, 0x00, 0x10, 0x02, 0x09, 0x10,
-   0x40, 0x7d, 0xf7, 0xff, 0x0b, 0xfc, 0xff, 0xff, 0xaf, 0x02, 0x84, 0x50,
-   0x42, 0x85, 0x12, 0xd0, 0xdd, 0xff, 0xa7, 0xf2, 0xff, 0xff, 0xff, 0x04,
-   0x00, 0x0a, 0x08, 0x10, 0x48, 0xf8, 0xff, 0xff, 0x0a, 0xfe, 0xff, 0xff,
-   0x7f, 0x03, 0xa4, 0x80, 0xa2, 0x8a, 0x02, 0x68, 0xff, 0xff, 0x52, 0xfd,
-   0xff, 0xff, 0xff, 0x07, 0x00, 0x2a, 0x08, 0x20, 0x28, 0xdc, 0xff, 0x5f,
-   0x05, 0xff, 0xff, 0xff, 0xff, 0x0d, 0x92, 0x40, 0x22, 0x09, 0x02, 0xea,
-   0xfb, 0xaf, 0x48, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x12, 0x81, 0xa0,
-   0x48, 0x9c, 0x6e, 0x93, 0xa2, 0xff, 0xff, 0xff, 0xff, 0x07, 0xa8, 0x40,
-   0x28, 0x0a, 0x02, 0x74, 0xb5, 0x45, 0x81, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x02, 0x0a, 0x81, 0x20, 0x08, 0xae, 0xaa, 0x90, 0xe8, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x90, 0x40, 0x28, 0x88, 0x12, 0x58, 0x15, 0x50, 0xd0, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x44, 0x0a, 0x41, 0x21, 0x08, 0xae, 0x04, 0x14,
-   0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40, 0x14, 0x88, 0x04, 0xba,
-   0x02, 0x28, 0xe8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x42, 0x15, 0x41, 0x21,
-   0x05, 0xad, 0x00, 0x05, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40,
-   0x24, 0x8a, 0x0e, 0x36, 0x00, 0x0a, 0xf4, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x42, 0x25, 0x90, 0xd0, 0x8b, 0xc2, 0x41, 0x05, 0xfc, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x10, 0x08, 0x05, 0xe8, 0x8e, 0x58, 0x80, 0x02, 0xfa, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x4a, 0x20, 0xa8, 0xba, 0x0b, 0x2b, 0x51, 0x01,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x8a, 0x02, 0xe8, 0xaf, 0x84,
-   0x90, 0x04, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x52, 0x21, 0x54, 0xbf,
-   0x1f, 0x15, 0xa5, 0x02, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x08,
-   0x01, 0xfa, 0xb6, 0xa4, 0x52, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x4a, 0xa2, 0x54, 0xef, 0x5f, 0x4b, 0xa4, 0x80, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x80, 0x10, 0x82, 0xfe, 0xbf, 0x92, 0x52, 0x42, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x12, 0x42, 0xa8, 0xbf, 0x1f, 0x24, 0x80, 0xa0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28, 0x8a, 0xf7, 0x37, 0x80,
-   0x52, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x82, 0xe0, 0xff,
-   0x1f, 0x00, 0x20, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28,
-   0xca, 0xff, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x10, 0x42, 0xf0, 0xfd, 0x1b, 0x00, 0x50, 0xf0, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0xa4, 0x10, 0xc5, 0xff, 0x1f, 0x00, 0x00, 0xe0, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x00, 0x22, 0xf8, 0xff, 0x0e, 0x00, 0x00, 0xf0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xaa, 0x88, 0xe2, 0xff, 0x0f, 0x10,
-   0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x25, 0xfa, 0xff,
-   0x0f, 0x01, 0x11, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xfb,
-   0xfb, 0xff, 0x7f, 0x5d, 0xd5, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f};
diff --git a/ext/tk/sample/demos-en/images/flagdown.xbm b/ext/tk/sample/demos-en/images/flagdown.xbm
deleted file mode 100644
index 55abc51825..0000000000
--- a/ext/tk/sample/demos-en/images/flagdown.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagdown_width 48
-#define flagdown_height 48
-static char flagdown_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe1, 0x00, 0x00,
-   0x00, 0x00, 0x70, 0x80, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x03, 0x00,
-   0x00, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04,
-   0x00, 0x00, 0x03, 0x00, 0x06, 0x06, 0x00, 0x80, 0x01, 0x00, 0x06, 0x07,
-   0x00, 0xc0, 0x1f, 0x00, 0x87, 0x07, 0x00, 0xe0, 0x7f, 0x80, 0xc7, 0x07,
-   0x00, 0x70, 0xe0, 0xc0, 0xe5, 0x07, 0x00, 0x38, 0x80, 0xe1, 0x74, 0x07,
-   0x00, 0x18, 0x80, 0x71, 0x3c, 0x07, 0x00, 0x0c, 0x00, 0x3b, 0x1e, 0x03,
-   0x00, 0x0c, 0x00, 0x1f, 0x0f, 0x00, 0x00, 0x86, 0x1f, 0x8e, 0x07, 0x00,
-   0x00, 0x06, 0x06, 0xc6, 0x05, 0x00, 0x00, 0x06, 0x00, 0xc6, 0x05, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x7f, 0x06, 0x00, 0x06, 0xe4, 0xff, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x06, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x00, 0x00, 0x00, 0x06, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0x06, 0x00, 0x36, 0x00, 0x00, 0x00, 0x06, 0x00, 0x3e, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0x2f, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x27, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0xf7, 0xbf, 0x8e, 0xfc, 0xdf, 0xf8, 0x9d, 0xeb, 0x9b, 0x76, 0xd2, 0x7a,
-   0x46, 0x30, 0xe2, 0x0f, 0xe1, 0x47, 0x55, 0x84, 0x48, 0x11, 0x84, 0x19};
diff --git a/ext/tk/sample/demos-en/images/flagup.xbm b/ext/tk/sample/demos-en/images/flagup.xbm
deleted file mode 100644
index 6eb0d846a3..0000000000
--- a/ext/tk/sample/demos-en/images/flagup.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagup_width 48
-#define flagup_height 48
-static char flagup_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xef, 0x6a, 0x00,
-   0x00, 0x00, 0xc0, 0x7b, 0x75, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x6a, 0x00,
-   0x00, 0x00, 0x30, 0x60, 0x75, 0x00, 0x00, 0x00, 0x18, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x0c, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x06, 0xe0, 0x04, 0x00,
-   0x00, 0x00, 0x03, 0xe0, 0x04, 0x00, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00,
-   0x00, 0xc0, 0x1f, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x7f, 0xe0, 0x07, 0x00,
-   0x00, 0x70, 0xe0, 0xe0, 0x05, 0x00, 0x00, 0x38, 0x80, 0xe1, 0x04, 0x00,
-   0x00, 0x18, 0x80, 0xf1, 0x04, 0x00, 0x00, 0x0c, 0x00, 0xfb, 0x04, 0x00,
-   0x00, 0x0c, 0x00, 0xff, 0x04, 0x00, 0x00, 0x86, 0x1f, 0xee, 0x04, 0x00,
-   0x00, 0x06, 0x06, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0xe6, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x66, 0x04, 0x00,
-   0x7f, 0x56, 0x52, 0x06, 0xe4, 0xff, 0x00, 0x76, 0x55, 0x06, 0x04, 0x00,
-   0x00, 0x56, 0x57, 0x06, 0x04, 0x00, 0x00, 0x56, 0x55, 0x06, 0x06, 0x00,
-   0x00, 0x56, 0xd5, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x54, 0x06, 0x00, 0xc6, 0x54, 0x55, 0xaa, 0x06, 0x00, 0x66, 0xaa, 0x2a,
-   0x54, 0x06, 0x00, 0x36, 0x55, 0x55, 0xaa, 0x06, 0x00, 0xbe, 0xaa, 0x2a,
-   0x54, 0xfe, 0xff, 0x6f, 0x55, 0x55, 0xaa, 0xfc, 0xff, 0xa7, 0xaa, 0x2a,
-   0x54, 0x01, 0x88, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x50, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa8, 0xaa, 0x2a,
-   0x54, 0x55, 0x95, 0x54, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
-   0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/demos-en/images/gray25.xbm b/ext/tk/sample/demos-en/images/gray25.xbm
deleted file mode 100644
index b234b3cb0b..0000000000
--- a/ext/tk/sample/demos-en/images/gray25.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ext/tk/sample/demos-en/images/grey.25 b/ext/tk/sample/demos-en/images/grey.25
deleted file mode 100644
index b234b3cb0b..0000000000
--- a/ext/tk/sample/demos-en/images/grey.25
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ext/tk/sample/demos-en/images/grey.5 b/ext/tk/sample/demos-en/images/grey.5
deleted file mode 100644
index 37688893f0..0000000000
--- a/ext/tk/sample/demos-en/images/grey.5
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa};
diff --git a/ext/tk/sample/demos-en/images/letters.xbm b/ext/tk/sample/demos-en/images/letters.xbm
deleted file mode 100644
index 0f12568d1a..0000000000
--- a/ext/tk/sample/demos-en/images/letters.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define letters_width 48
-#define letters_height 48
-static char letters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20,
-   0x00, 0xfa, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a,
-   0x00, 0x3a, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2e,
-   0xe0, 0xff, 0xff, 0xff, 0xff, 0x21, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21,
-   0xa0, 0x03, 0x00, 0x00, 0x70, 0x21, 0x20, 0x00, 0x00, 0x00, 0x50, 0x21,
-   0xa0, 0x1f, 0x00, 0x00, 0x50, 0x21, 0x20, 0x00, 0x00, 0x00, 0x70, 0x21,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0xfa, 0x01, 0x00, 0x80, 0x0b, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0a, 0x21,
-   0xba, 0x01, 0x00, 0x80, 0x0a, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0b, 0x21,
-   0x3a, 0x00, 0x00, 0x00, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0x02, 0xc0, 0xfb, 0x03, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x3f,
-   0x02, 0xc0, 0xbd, 0x0f, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0xc0, 0x7f, 0x7b, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/demos-en/images/noletter.xbm b/ext/tk/sample/demos-en/images/noletter.xbm
deleted file mode 100644
index 5774124efe..0000000000
--- a/ext/tk/sample/demos-en/images/noletter.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define noletters_width 48
-#define noletters_height 48
-static char noletters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0xe0, 0x07,
-   0xe0, 0x01, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x00, 0x00, 0x00, 0x78, 0x0e,
-   0xf0, 0x00, 0x00, 0x00, 0x3c, 0x1e, 0x70, 0x00, 0x00, 0x00, 0x1e, 0x1c,
-   0x38, 0x00, 0x00, 0x00, 0x0f, 0x38, 0x38, 0x00, 0x00, 0x80, 0x07, 0x38,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x1c, 0x04, 0x00, 0xe0, 0x41, 0x70,
-   0x1c, 0x04, 0x00, 0xf0, 0x40, 0x70, 0x1c, 0x74, 0x00, 0x78, 0x4e, 0x70,
-   0x0e, 0x04, 0x00, 0x3c, 0x4a, 0xe0, 0x0e, 0x74, 0x03, 0x1e, 0x4a, 0xe0,
-   0x0e, 0x04, 0x00, 0x0f, 0x4e, 0xe0, 0x0e, 0x04, 0x80, 0x07, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x0f, 0x40, 0xe0, 0x0e, 0x04, 0xe0, 0x01, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x00, 0x40, 0xe0, 0x0e, 0x04, 0x78, 0x00, 0x40, 0xe0,
-   0x0e, 0x04, 0xfc, 0xf3, 0x40, 0xe0, 0x1c, 0x04, 0x1e, 0x00, 0x40, 0x70,
-   0x1c, 0x04, 0x0f, 0x00, 0x40, 0x70, 0x1c, 0x84, 0x07, 0x00, 0x40, 0x70,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x38, 0xe0, 0x01, 0x00, 0x00, 0x38,
-   0x38, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x70, 0x78, 0x00, 0x00, 0x00, 0x1c,
-   0xf0, 0x3c, 0x00, 0x00, 0x00, 0x1e, 0xe0, 0x1e, 0x00, 0x00, 0x00, 0x0e,
-   0xe0, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0x00, 0x00, 0x80, 0x07,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00};
diff --git a/ext/tk/sample/demos-en/images/pattern.xbm b/ext/tk/sample/demos-en/images/pattern.xbm
deleted file mode 100644
index df31baf789..0000000000
--- a/ext/tk/sample/demos-en/images/pattern.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define foo_width 16
-#define foo_height 16
-static char foo_bits[] = {
-   0x60, 0x06, 0x90, 0x09, 0x90, 0x09, 0xb0, 0x0d, 0x4e, 0x72, 0x49, 0x92,
-   0x71, 0x8e, 0x8e, 0x71, 0x8e, 0x71, 0x71, 0x8e, 0x49, 0x92, 0x4e, 0x72,
-   0xb0, 0x0d, 0x90, 0x09, 0x90, 0x09, 0x60, 0x06};
diff --git a/ext/tk/sample/demos-en/images/tcllogo.gif b/ext/tk/sample/demos-en/images/tcllogo.gif
deleted file mode 100644
index 3fc7720b17..0000000000
--- a/ext/tk/sample/demos-en/images/tcllogo.gif
+++ /dev/null
diff --git a/ext/tk/sample/demos-en/images/teapot.ppm b/ext/tk/sample/demos-en/images/teapot.ppm
deleted file mode 100644
index 78afefbf82..0000000000
--- a/ext/tk/sample/demos-en/images/teapot.ppm
+++ /dev/null
@@ -1,56 +0,0 @@
-P6
-256 256
-255
-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�[7 eOLjQLmSMoTMnSMlRMhPL_9 \�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�nSMtVMzYN~[N~[N\N\O�\O�]O�]O�]O�]O�\O�\O}[NyYNtVM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-wXN}[N�]O�^O�_O�`O�`O�`O�`O�aO�aO�aO�aO�aO�aO�aO�aO�`O�_O�^O\N\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�aMLyYN�_O�aP�bP�cP�cP�dP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�cP�_OpUM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�wXN�_O�dP�fP�gQ�hQ�hQ�iQ�iQ�iQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�iQ�fP�`O\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJiQL�bP�hQ�kQ�mR�nR�oR�oR�oR�oR�oR�oR�oR�oR�pR�pS�qS�qS�rS�rS�rS�qS�oR�jQ�]O\KK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�fOLrUM�cP�lR�qS�tS�uT�wT�xT�xT�yT�yT�zT�zU�zU�zU�zU�zU�yT�xT�wT�tS�mR�aOhPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�a0	cNLqUM�\O�fQ�pS�wV�zV�|V�}V�V�VǀVɂW̅[Տe�w���ꪅĈg�qT�fQ{ZNYIK9\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�O1{G#�JkRMqUMtVN�iS�v\��d��b�zZ�vU�uT�sS�qS�nR�jQ�eP�^OrUM�Hh>!T4\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-V5wE"~I#�M%�U+�e7�l:�g2�b*�a(�`(�^(�])�^-�]1�S,qC$`9 R3G-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�@)J/i>!pA"tD"wF$yH&xH&tE$wE#yG%}M+�T4S5mE*Z7!K/B*;'\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��aO�oR�{UǀVυX<(F-a: e<!h>!j@#k@$h>"d<!c=$hD-fF2[<)K0@);'5$˂VǀV�|U_LKYIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��_O�xTɂW����֒k�|X�>�f-�^(�Z'�W&�T&�N>)F-J/b; g>#nD(jB&c<!b=%jH2_A/I0!<(8&5$�J�Y�S%8&;'?)E,<:HA=HE?IJAISFJYIKXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��nR�}Uܘqʊe�vU�e,�V&�V�C
-�@|>y<u:r9o7l6
-j5
-h4
-g3
-5$D,K/b; h>"wM1tK.e="a<#cA,U8&E-<(9&.!a0	b1	c1				
-
-+3#@)46G<:HMCIXHK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�U*�vT�~X�{Y�k+�W&�N$|>u:p8k5
-f3
-a0	_/	].	[-	�I�\*�_(�LkRMmSMmSMnSMnSMD,R3W5mA"|O0|P1j?"c<!a=%Y7"N1F,;'NCJNCJNDJODJODJODJh>!a: X/K%
-g3
-a0	Z-	\/T*Q(�H�m8kRMmSMnTMoTMpTMpUM15G15G05G04G04GpUMpTM5^9 d<!yF#�O+�N,rC#qB"pB#k?"a: Z7 6ODJPDJPEJQEJQEJREJREJREJRFJSFJSFJSFJSFJe<!X/
-^/	V+Q(L&I$r9�TlRMnSM46G47G47G46G46G46G46G46G36G36G25G25G15G04G/4F.3F
-�`O~[NqUM[-	�HUGJUGJVGJVGJVHJWHJWHJWHKWHKXHKXHKXHKXHKXHKXIKXIKXIKXIKXIKh>!Y0
-
-L&C!:4
-�X&pUMuWMwXNxXN<:H<:H<:H<:H<;H<;H<;H<;H=;H=;H=;H=;H>;H>;H?<H@<HA=HC>HG@ILBIREJ[JKcNLjQL�pR�uT�zU�~VȁW˂X֎c�sҎe�{V�vT�pS�kR�gQ�bP�_O�^O�]O�\O�\O�\O�\O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�\O�\O~\N}[N|ZNxXN�T%H$
-�W&rVMvWNyYNzYN|ZN}[N}[N><H?<H?<H?<H?<H?<H@<H@<H@<HA=HA=HB=HC>HE?IG@IIAIKBIODJSFJWHK�hQ�lR�pR�b(�i*�n+�|7�|6�r,�q+�p-�l+�g)�b(�sS�pS�lR�iQ�gQ�eP�cP�aP�aO�`O�`O�_O�_O�_O�_O�_O�_O�_O�_O�_O�_O�^O�^O�^O�^O�]O�]O�\O~[N{ZN�T%
-
-
-
-	
-@%<-$G?@�pfdNLuWM\NdNL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�TFJvWN�aP./01�E}[N�]O�_O�`O�aP�bP�bP�cP�cP�cP�dP�dP�dP�eP�eP�eP�eP�fP�fQ�fQ�gQ�gQ�gQ�hQ�hQ�hQ�iQ�iQ�jQ�jQ�kQ�kR�lR�lR�Y&�\'�^'�^�b�c�e�i �g�c�b�a�`�^�]�X�['�Z'�Y&�mR�mR�mR�lR�lR�lR�kR�kQ�kQ�jQ�jQ�jQ�iQ�iQ�iQ�iQ�hQ�hQ�hQ�hQ�gQ�gQ�gQ�gQ�gQ�fQ�fQ�fQ�fP�eP�eP�dP�cP�aP�O
- B\�\�\�\�\�\�\�\�\�\�%7!!C*F#P){dY�ze��p�\OgPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ`LKvWN�aPm6
-
-\�\�\�\�\�\�\�\�\� B B
-$5 �`(�e)�nR�jQ�^OJAI\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�XIK^KKdNLhPLuWM�]O�bP�fQ�eP
-m6
-�`O�cP�fQ�hQ�hQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�kQ�kQ�kQ�kR�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�g)�c(�c(�b(�V�c�e�i!�i!�d�b�`�`�_�_�^�Q�]'�_(�`(�f)�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�mR�mR�nR�mR�mR�mR�mR�kR�hQ�Ga0	�bP�mR�jQ�fQ�aP}[NrUMmSM�L$\�\�\�\�\�\�\�\� B B
-#C, 8&H.Z7 �pR�jQ{ZN\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�QEJ[JK`LKdNLhQLqUM{ZN�_O�cP�gQ�hQ
-�bP�eP�hQ�iQ�jQ�jQ�kQ�kQ�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�nR�j*�g)�e)�d)�d�X�g�h�e�c�b�b�b�U�`(�a(�a(�c(�i*�oR�oR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�nR�mR�jQ�Q%Z-	�jQ�nR�lR�hQ�dP�_OuWMpTMnSMkRLa: \�\�\�\�\�\�\� B B&D2
-@*S6#G@IPDJ�hQmSM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ]KKbMLeOLiQLlRMvWN\O�aO�eP�hQ�jQ�gQ
-\�\�\�\�\� B'D+E$(1J/jH1NCJUGJYIKUGJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�XHK]KKbNLfOLiQLkRMmSMoTMqUMxXN\N�_O�bP�fP�hQ�kQ�mR�oR�pS�pR�hQ�mR�oR�pS�qS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�sS�sS�sS�sS�sS�sS�sS�sS�sS�sS�sS�sS�tS�tS�tS�uS�uS�uT�uT�uT�uT�uT�vT�wT�vT�vT�uT�tS�mR�tS�uT�uS�tS�rS�pR�mR�kQ�hQ�eP�aP�^O\N{ZNvXNqUMpTMnSMlRM�P%\�\�\�\� B#C*E$.E- .!G$Y:%d<"SFJYIKZIKNCJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�PDJZIK_LKdNLgPLjQLlRMnSMpTMqUMuWMyYN�\O�`O�cP�fP�hQ�jQ�mR�oR�qS�rS�rS�rS�mR
-!C+E'0F.4F7%8%U/lG.SFJZIK]KKZIKB=H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�REJZJK`LKdNLgPLjQLlRMnSMpTMqUMtWMxXN{ZN~[N�]O�^O�`O�aO�bP�dP�gQ�iQ�kQ�lR�nR�pS�rS�sS�tT�uT�vT�wT�xT�yT�yT�yT�yT�yT�xT�vT�rS�nR�hQ�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�}U�}U�}U�}U�}U�}U�}U�~U�~U�~V�~V�VŀWƁX�a(�lR�rS�vT�yT�zU�|U�~V�XƂ[Ɇ_΋dӑjԓmԓnБlʌhĆd��_�{[�vW�sU�pS�nR�kR�iQ�hQ�gQ�fQ�eP�dP�bP�aO�_O�^O�\O|ZNxXNsVMpTMnTMmSMjQL�C B)D&/F-3F47G6%>"Y7 kA$YIK]KK^KKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ\KKbMLeOLhPLkRLmSMnTMpTMrUMuWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�eP�fP�hQ�jQ�lR�nR�oS�qT�sT�uU�vU�wV�xV�yV�yU�zU�zU�{U�{U�{U�|U�|U�|U�|U�|U�{U�{U�{U�zU�zT�yT�yT�xT�wT�vT�vT�vT�vT�wT�wT�wT�xT�yT�zT�zU�{U�{U�|U�|U�}U�VŀWǂYɄ\͈_ьdٔl�u�|쩂ﬅ명榁ޟ{՗sˎld�^�yZ�uW�qU�oS�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWMpTMoTMmSMkRLgPL&D#.E,3F46G;'<(D"iB(VGJ]KK`LK[JKB>H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRMmSMoTMqUMsVMvXNzYN}[N�\O�^O�_O�`O�aP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�mS�oT�rU�tW�wY�zZ�}\�]��^��^��^^\��Z�Y�X�~W�~W�~V�~V�~V�~V�~U�~U�~U�~U�U�U�V�V�V�V�VƀVƀVǀWǁWȂXɃZ˅[͇^ЊaӍdؒiܗn�t�z�����������������驅�~֘vˏmÇf��`�z[�vX�rU�pT�oS�nS�lR�kR�kR�jQ�iQ�hQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzYNvWNpTMoTMnSMkRMhQLo7,2F36G99HC+@ ]8 nA"\JK`ML_LKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMpTMqUMtVMwXNzZN}[N�]O�^O�_O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�jR�lR�mS�oU�rW�vZ�{]��a��fŊjˏnГqӕsՖsՖrՖqՔoӒmяjύg͊cˈaɆ^Ȅ\ǂ[ƁYŀXŀW�W�W�V�V�WŀWƀWǁXȂYɃ[ʅ\͇_ϊaҍeՑhٕmݙq�v�z�}꧀멃몄騃奀ߠ|ٛwӕȑmƉh��c�~^�yZ�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�cP�bP�aO�_O�^O\N{ZNwXNsVMoTMnSMlRMiQL~I#26G99G?<HA*E$	i@$ZIKaMLbML[JK;:H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�WHJ]KKbMLeOLhPLjRLlSMnTMpTMrUMuWMxXN{ZN~\N�]O�^O�`O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�lS�mT�oU�rW�uZ�y]�~a��fl˒sԚzܡ�㧆諉뮋������묈訄�~ߞyڙt֕oҐjΌfˈbȅ_ƃ\ŁZĀY�X�W�~W�~W�~W�XÀXĀYŁZƃ\ǅ^Ɇ`ˈb̊d͋f΍gΎiΎjΎj͎jˌiǉgÆd��a�^�}]�|\�{[�yZ�xY�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�dP�bP�aO�_O�^O�\O|ZNxXNtVMpTMnSMmSMjQLgPL99G?<HG-E&b;!YIK`MLdOM`LKNCJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��lR�yT�~UʂXʃY�X�{W�tU�W'�[(�hQ�lR�cP�\OhQL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRLmSMoTMqUMrVMvWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�dP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pU�sW�vZ�z]�b��glɑsИy؞ޤ�㩊譍챐ﳑﳑ뭊穅⣀ݞzؘtғn΍iɉdƅ`Â]��[�~Y�}X�|W�|V�{V�{V�{V�{V�{V�|W�|W�}X�}Y�~Z�~Z�~Z�}[�}[�}[�~\�~\�~]�~]�~]�~]�}]�|\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWNpTMnTMmSMkRLhPL|H$D>IQ2P+XHK_LLfQOcNLXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��qS�yT�~VΈ`遲ޜv��]�qS�L�G|>g3
-S)?*%.�hQ�hQ�eP�`OuWM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMoTMqUMsVMwXNzYN}[N�\O�^O�_O�`O�aP�bP�dP�eP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pV�sX�vZ�z^�b��gËmʒsјz؟�ޤ�㩊譍ꯏ및ꯎ謋娇ं۞|֙wѓq̎lǉgÅb��_�\�}Z�{X�zW�yV�yU�xU�xU�xT�xT�xU�xU�xU�yV�yV�yW�zW�{X�{Y�|Z�}[�}[�}\�~\�~]�~]�}]�|\�{\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzZNvWNrUMoTMmSMlRMiQLeOLJAIJ(h>!]KKfQOgQN_LKD>I\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��iQ�tS�yT�{U�YΌeרּ���՗u�|\�Z'�L�D
-|>
-
-+,!.! "`E6�iY�lZ�o\�q]�s^�^J�va�wb�yc�zd�{e�}foTMqUMsVMuWNwXNyYN{ZN|ZN~[N\O�]O�]O�^O�_O�_O�`O�`O�aO�aP�bP�bP�cP�cP�cP�dP�dP�dP�dP�eP�eP�eP�eP�eP�eP�eP�eP�fP�fP�fP�fP�fP�fP�fP�eP�eP�eP�eP�eP�eP�eP�dP�dP�dP�dP�cP�cP�cP�bP�bP�aP�aO�`O�`O�_O�_O�^O�]O�]O\O~[N|[N{ZNyYNwXN��i��i��i��i��h�hR�fQ�dQ�bP�wfx]O�pdkbtd_m`]OEDG?A;:@.S�.S�.S�.S�.S�/S�/S�/S�/S�/S�/S�/S�/S�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�/S�Gl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl���܅�܅��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl���܅��������������������Ei���ր�ր�ր�ր�ր�ր�ր�ր�ր�ր�ր�ր�׀�׀�׀�׀�׀�׀��Bg�Bg�Bg�Bg�Bg�&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Af�Af�%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|%I|%I|%I|%I|
-+,YA5jPBpSD�l[�o]�q^�t`�_K�wb�yc�ze�{f�}g�h��i�lSrVMtWMvWNxXNyYN{ZN|[N~[N\O�]O�]O�^O�_O�_O�`O�`O�`O�aP�aP�bP�bP�bP�cP�cP�cP�cP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�dP�dP�dP�dP�dP�dP�cP�cP�cP�cP�bP�bP�bP�aP�aO�`O�`O�`O�_O�^O�^O�]O�]O\O~[N|[N{ZNyYNxXN��j��j��j��j��j��j�hS�gS�eR�cR|`Q�sf�oe}jcrd`k_]LCDC=@,,3(4F(4F.S�.S�/S�/S�/S�/S�/S�/S�/S�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�Ty�Ty����Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl����Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Ch�Ch��ր�ր�ր�ր��Ei�Ei�Ei���ր�ր�ր�ր�ր�ր�׀�׀�׀��Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Bg�Bg�&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�&J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|%I|%I|%I|#5H71O;3V?4iOBoSDsVF�o]{[I^K�`L�bN�dO�{f�}g�~h��j�kT�mU�oV�qW�rWwXNxXNzYN{ZN}[N~[N\O�]O�]O�^O�^O�_O�_O�`O�`O�`O�aO�aP�aP�bP�bP�bP�bP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�bP�bP�bP�bP�aP�aP�aO�`O�`O�_O�_O�_O�^O�^O�]O�\O\N~[N|ZN{ZNyYN�oT�oT�oT�nT��l��l��l�jU�iT�hT�fT�cS�vi�rg�nfyidqdah^^HBD?<@)+3OZkMYk(5F(5F(5F/S�/S�/S�/S�/S�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�Ty�Ty�Ty�Uy���܆�܆�܆��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl���܆�܆�܆�܆��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Dh�Dh�Dh�Ch�&K}&K}&K}&K}&K}&K}Ch�Ch�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�&J|&J|&J|&J|&J|&J|Bg�Bg�Bg�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�&J|&J|&J|&J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|A99N?;L:2T>4gNBlRD�k\�n^z[J~^L�aN�cO�dP�fQ�gR�hT�jU�lV�nW�pX�rX�sY��q��q��r��r��r��s�z[�z[�z[�{[�{[�{ZœrŒqŒqŒpŒpőo�yV�xV�xU�wT�wT�aP�bP�bP�bP�bP�bP�bP�bP�bP�bP�bP�bP�bP�bP�aP�aP�aP�aP�aO�aO�`O�`O�`O�_O�_O�^O�^O�^O�]O�]O�\O~\N}[N|ZNzYN�pT�pU�pU�pU�oV�oV�nV�mV�lV�kV�jV�hV�fU~cU�uj�qh~mfugdkaad\^E@D98?$(2minffm^blV^lMYk(5F(5F/S�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�Ty�Ty�Uy�Uy���܆�܆�܆�܆�܆�܆�܆��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl���݆�݆�݆�݆�݆�݆�݆�݆�݆��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�'K}'K}'K}'K}'K}'K}'K}'K}'K}&K}&K}Ch�Ch�Ch�Ch�Ch�Ch�Ch�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�&J|Cg�Cg�Cg�Cg�Cg�Bg�Bg�Bg�Bg�Bg�Bg�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�&J|&J|&J|&J|&J|&J|&J|%J|%J|%J|%J|%J|%J|%J|Ae�Ae�;GY<68I=:I82Q=4XA6~fZ�j\�m^�p`|]L�`N�cP�eQ�gS�j��l��m��n�oX�qY�rZ�t[��r��s��s��t��t��t�z]�{]�{]�{\�{\�{\�{[ēsērĒrĒqĒpđp�yWĐoÐnÏmÏllk��k�aO�aO�aO�aO�aO�aO�aO�`O�`O�`O�`O�`O�`O�_O�_O�_O�_O�^O�^O�]O�]O�]O\O~\N}[N|ZN��l��l��m�qV�qV�qV�pW�pW�oW��n��n��n��n��n�~n�eW�xl�tk�piykfodcf_`JDG@>C*,5$1MYk�tr~tstmolinadmX_lNZkMZkTx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�Ty�Ty�Uy�Uy�Uy���݆�݆�݆�݆�݆�݆�݆�݆�݆��Hl�Hl�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm���݆�݆�݇�݇�݇�݇�݇�݇�݇�݇�݇�݇��Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}Dh�Dh�Dh�Dh�Ch�Ch�Ch�Ch�Ch�Ch�Ch�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�&J}&J}&J}Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Bg�Bg�Bg�Bg�Bg�Bg�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Af�Af�Af�Af�;GY;GY;GY1'!D:9N?;N;3]I?zdY�h[�l^�oa�sc�ue�bQ�dR�fT�l��m��n��o��p��q��r��s�v]�w]��u��u��u��u��v�{^�{^�|^�|]�|]�{\�{\�{[�{[�zZ�zZ�yY�yX�xXonn��m��m�uT�uS�tS�tS�tR�sR�sQ�_O�_O�_O�^O�^O�^O�^O�^O�]O�]O�]O�rS�rS�rS��k��l��l��m��m��m��n��n�qW�qX�qX��o��o��p��p��p��p�p�}o{cXv`Vp]U}nishfhaba\_DAF::B$)4
-., 7(8'A1&F4(L8*oXIw]Jpdasfcvhexkg{mi~oj�qll\Xn^Yp`Zpa[qa\rb]rc^sc^sd_ue`wf`xgayhayhayhb�x�y�y�y�y�y�y�~ywgbvfateasd`qd`pc`nb_la_�ut|ssxqrunpZUXVRWROUMMSHIRIC@967-/3'+0(*-ACF?AD;=@#%(
-.+>1(B3)B2&F4'E4)gTGlXJs^OzcTzaPqfethgvjhbVTcWUdXVeYWfZXg[Yh\Zi]Zi][j^\�us�ususts~tt~tt}tt|st{stut~tt|sszrsyqrwpquoqsmpqloXTXTQWPOULLSSJEA<:=99757335./2113)+.'),)+.8:="(
-"6*#5*">2)>0&A2'C3(I8-^OFbRHfUJjXMq^RwcVzfYfRDfQCdN@zdTqijrjksklrklrklrklqjmpjmpjmojmojmnimmimkhliflscYm`Xg\VbYT^VRE>;A<:>98:77645:873220/0,-/)+.*,/#%( &
-
-&3#.$-% .% .& /&!,#,#@70A71XNHXNHWNHWNHZRLYQLYQLXQLWQLWPLUOLSNLQMKOLJMJJ0//.-.,,-&(+"(!'			
-
-%' %$#" ! !$
-
-
-						
-
-
-* 															
-	;?E7CU;HY=I[
diff --git a/ext/tk/sample/demos-en/items.rb b/ext/tk/sample/demos-en/items.rb
deleted file mode 100644
index 8447430694..0000000000
--- a/ext/tk/sample/demos-en/items.rb
+++ /dev/null
@@ -1,374 +0,0 @@
-# items.rb
-#
-# This demonstration script creates a canvas that displays the
-# canvas item types.
-#
-# canvas item types widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($items_demo) && $items_demo
-  $items_demo.destroy 
-  $items_demo = nil
-end
-
-# demo toplevel widget
-$items_demo = TkToplevel.new {|w|
-  title("Canvas Item Demonstration")
-  iconname("Items")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($items_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Button-1 drag:\tmoves item under pointer.\n  Button-2 drag:\trepositions view.\n  Button-3 drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new($items_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $items_demo
-      $items_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'items'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-cvs = nil
-TkFrame.new($items_demo) {|cf|
-  # canvas 
-  cvs = TkCanvas.new(cf) {|c|
-    focus
-    scrollregion '0c 0c 30c 24c'
-    width  '15c'
-    height '10c'
-    relief 'sunken'
-    borderwidth 2
-
-    hs = TkScrollbar.new(cf) {|s|
-      orient 'horizontal'
-      command proc{|*args| c.xview(*args)}
-      c.xscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    vs = TkScrollbar.new(cf) {|s|
-      command proc{|*args| c.yview(*args)}
-      c.yscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    if $tk_version =~ /^4\.[01]/
-      hs.pack('side'=>'bottom', 'fill'=>'x')
-      vs.pack('side'=>'right', 'fill'=>'y')
-      c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
-
-    else
-      c.grid('in'=>cf, 'row'=>0, 'column'=>0, 
-	     'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      vs.grid('row'=>0, 'column'=>1, 
-	      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      hs.grid('row'=>1, 'column'=>0, 
-	      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-      TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-
-    end
-
-  }
-}.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-# Display a 3x3 rectangular grid
-TkcRectangle.new(cvs, '0c', '0c', '30c', '24c', 'width'=>2)
-TkcLine.new(cvs, '0c', '8c', '30c', '8c', 'width'=>2)
-TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
-TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
-TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
-
-font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
-if TkWinfo.depth($root).to_i > 1
-  blue   = 'DeepSkyBlue3'
-  red    = 'red'
-  bisque = 'bisque3'
-  green  = 'SeaGreen3'
-else
-  blue   = 'black'
-  red    = 'black'
-  bisque = 'black'
-  green  = 'black'
-end
-
-# tag 
-$tag_item = TkcGroup.new(cvs)
-
-# Set up demos within each of the areas of the grid.
-TkcText.new(cvs, '5c', '.2c', 'text'=>'Lines', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c', 
-	    'width'=>2, 'fill'=>blue, 'capstyle'=>'butt', 
-	    'join'=>'miter', 'tags'=>$tag_item )
-TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
-TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
-TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
-	    '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
-	    '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
-	    'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c', 
-	    'stipple'=>'@'+[$demo_dir,
-	                    'images','gray25.xbm'].join(File::Separator), 
-	    'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
-	    'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round', 
-	    'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '.2c', 
-	    'text'=>'Curves (smoothed lines)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c', 
-	    'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c', 
-	    'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c', 
-	    '16.5c','4.5c','13.5c','7.5c','12c','6c',
-	    'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round', 
-	    'stipple'=>'@'+[$demo_dir, 
-	                    'images', 'gray25.xbm'].join(File::Separator), 
-	    'fill'=>red, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '.2c', 'text'=>'Polygons', 'anchor'=>'n')
-TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
-	       '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
-	       'fill'=>'green', 'outline'=>'black', 'width'=>4, 
-	       'tags'=>$tag_item )
-TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
-	       '28c','1c','29c','1c','29c','4c','29c','4c',
-	       'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
-TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
-	       '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
-	       '7.5c','22c','7.5c', 
-	       'stipple'=>'@' + [$demo_dir, 
-                                 'images', 'gray25.xbm'].join(File::Separator),
-	       'outline'=>'black', 'tags'=>$tag_item )
-
-TkcText.new(cvs, '5c', '8.2c', 'text'=>'Rectangles', 'anchor'=>'n')
-TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
-		 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c', 
-		 'fill'=>green, 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
-		 'stipple'=>'@'+[$demo_dir,
-	                         'images','gray25.xbm'].join(File::Separator),
-		 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '8.2c', 'text'=>'Ovals', 'anchor'=>'n')
-TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
-		 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c', 
-		 'fill'=>green, 'tags'=>$tag_item )
-TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
-		 'stipple'=>'@'+[$demo_dir,
-	                         'images','gray25.xbm'].join(File::Separator),
-		 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '8.2c', 'text'=>'Text', 'anchor'=>'n')
-TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c', 
-	    'text'=>'A short string of text, word-wrapped, justified left, and anchored north (at the top).  The rectangles show the anchor points for each piece of text.', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue, 
-	    'text'=>'Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge.', 'justify'=>'center', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
-if $tk_version =~ /^4\.[01]/
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
-	      'stipple'=>'@' + [$demo_dir, 
-                                'images', 'grey.5'].join(File::Separator),
-	      'text'=>'Stippled characters', 'tags'=>$tag_item )
-else
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
-	      'stipple'=>'gray50', 'text'=>'Stippled characters', 
-	      'tags'=>$tag_item )
-end
-
-TkcText.new(cvs, '5c', '16.2c', 'text'=>'Arcs', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black', 
-	   'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
-#	   'outline'=>blue, 'start'=>135, 'extent'=>270, 
-#	   'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
-#	   'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
-	   'outline'=>blue, 'start'=>135, 'extent'=>270, 
-	   'outlinestipple'=>'@'+[$demo_dir, 
-                                  'images','gray25.xbm'].join(File::Separator),
-	   'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice', 
-	   'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90, 
-	   'tags'=>$tag_item)
-TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
-	   'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270, 
-	   'tags'=>$tag_item)
-
-TkcText.new(cvs, '15c', '16.2c', 'text'=>'Bitmaps', 'anchor'=>'n')
-#TkcBitmap.new(cvs, '13c','20c',
-#	      'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
-#	      'tags'=>$tag_item)
-TkcBitmap.new(cvs, '13c','20c',
-	      'bitmap'=>'@' + [$demo_dir, 
-                               'images', 'face.xbm'].join(File::Separator),
-	      'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','18.5c',
-#	      'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
-#	      'tags'=>$tag_item)
-TkcBitmap.new(cvs, '17c','18.5c',
-	      'bitmap'=>'@' + [$demo_dir, 
-	                       'images', 'noletter.xbm'].join(File::Separator),
-	      'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','21.5c',
-#	      'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
-#	      'tags'=>$tag_item)
-# 
-TkcBitmap.new(cvs, '17c','21.5c') {
-  bitmap '@' + [$demo_dir, 'images', 'letters.xbm'].join(File::Separator)
-  tags $tag_item
-}
-#TkcBitmap.new(cvs, '17c','21.5c') {
-#  bitmap '@' + ['images', 'letters'].join(File::Separator)
-#  tags $tag_item
-#}
-
-TkcText.new(cvs, '25c', '16.2c', 'text'=>'Windows', 'anchor'=>'n')
-TkButton.new(cvs) {|b|
-  text 'Press Me'
-  command proc{butPress cvs, red}
-  TkcWindow.new(cvs, '21c','18c', 
-		'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
-  insert 'end', 'Edit this text'
-  TkcWindow.new(cvs, '21c','21c', 
-		'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c', 
-	    'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
-  TkcWindow.new(cvs, '28.5c','17.5c', 
-		'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
-}
-TkcText.new(cvs, '21c', '17.9c', 'text'=>'Button:', 'anchor'=>'sw')
-TkcText.new(cvs, '21c', '20.9c', 'text'=>'Entry:', 'anchor'=>'sw')
-TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'Scale:', 'anchor'=>'s')
-
-# Set up event bindings for canvas:
-cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
-cvs.itembind($tag_item, 'Any-Leave', proc{itemLeave cvs})
-cvs.bind('2', proc{|x,y| cvs.scan_mark x,y}, '%x %y')
-cvs.bind('B2-Motion', proc{|x,y| cvs.scan_dragto x,y}, '%x %y')
-cvs.bind('3', proc{|x,y| itemMark cvs,x,y}, '%x %y')
-cvs.bind('B3-Motion', proc{|x,y| itemStroke cvs,x,y}, '%x %y')
-cvs.bind('Control-f', proc{itemsUnderArea cvs})
-cvs.bind('1', proc{|x,y| itemStartDrag cvs,x,y}, '%x %y')
-cvs.bind('B1-Motion', proc{|x,y| itemDrag cvs,x,y}, '%x %y')
-# Utility methods for highlighting the item under the pointer
-
-$restoreCmd = nil
-def itemEnter (c)
-  if TkWinfo.depth(c).to_i == 1
-    $restoreCmd = nil
-    return
-  end
-  type = c.itemtype('current')
-  if type == TkcWindow
-    $restoreCmd = nil
-    return
-  end
-  if type == TkcBitmap
-    bg = (c.itemconfiginfo('current', 'background'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'background', bg}
-    c.itemconfigure 'current', 'background', 'SteelBlue2'
-    return
-  end
-  fill = (c.itemconfiginfo('current', 'fill'))[4]
-  if (type == TkcRectangle || type == TkcOval || type == TkcArc) && fill == []
-    outline = (c.itemconfiginfo('current', 'outline'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'outline', outline}
-    c.itemconfigure 'current', 'outline', 'SteelBlue2'
-  else
-    $restoreCmd = proc{c.itemconfigure 'current', 'fill', fill}
-    c.itemconfigure 'current', 'fill', 'SteelBlue2'
-  end
-end
-
-def itemLeave(c)
-  $restoreCmd.call if $restoreCmd
-end
-
-# Utility methods for stroking out a rectangle and printing what's 
-# underneath the rectangle's area.
-
-def itemMark(c,x,y)
-  $areaX1 = c.canvasx(x)
-  $areaY1 = c.canvasy(y)
-  c.delete 'area'
-end
-
-def itemStroke(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  if $areaX1 != x && $areaY1 != y
-    c.delete 'area'
-    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y, 
-					      '-outline', 'black')
-    $areaX2 = x
-    $areaY2 = y
-  end
-end
-
-def itemsUnderArea(c)
-  area = c.find_withtag('area')
-  items = []
-  c.find_enclosed($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items enclosed by area: #{items.inspect}\n"; STDOUT.flush
-  items.clear
-  c.find_overlapping($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items overlapping area: #{items.inspect}\n"; STDOUT.flush
-end
-
-$areaX1 = 0
-$areaY1 = 0
-$areaX2 = 0
-$areaY2 = 0
-
-# Utility methods to support dragging of items.
-
-def itemStartDrag(c,x,y)
-  $lastX = c.canvasx(x)
-  $lastY = c.canvasy(y)
-end
-
-def itemDrag(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  c.move 'current', x - $lastX, y - $lastY
-  $lastX = x
-  $lastY = y
-end
-
-# Method that's invoked when the button embedded in the canvas 
-# is invoked.
-
-def butPress(w,color)
-  i = TkcText.new(w, '25c', '18.1c', 
-		  'text'=>'Ouch!!', 'fill'=>color, 'anchor'=>'n')
-  Tk.after(500, proc{w.delete i})
-end
diff --git a/ext/tk/sample/demos-en/ixset b/ext/tk/sample/demos-en/ixset
deleted file mode 100644
index 979894fcb8..0000000000
--- a/ext/tk/sample/demos-en/ixset
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/env ruby
-
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-  end
-
-  # apply is just "writesettings"
-
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length)
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left','expand'=>'y')
-      @entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken') {
-	pack('side'=>'left','expand'=>'y')
-      }
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    buttons = TkFrame.new(@root) {|f|
-      [ TkButton.new(f, 'command'=>proc{win.ok}, 'text'=>'Ok'),
-	TkButton.new(f, 'command'=>proc{win.writesettings}, 'text'=>'Apply'),
-	TkButton.new(f, 'command'=>proc{win.cancel}, 'text'=>'Cancel'),
-	TkButton.new(f, 'command'=>proc{win.quit}, 'text'=>'Quit') ].each{|b|
-	b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5)
-      }
-    }
-
-    #
-    # Bell settings
-    #
-    bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(bell, 'text'=>'Bell Settings')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200, 
-			     'tickinterval'=>20, 'orient'=>'horizontal', 
-			     'label'=>"Volume (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6)
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    l.pack('side'=>'top', 'expand'=>'yes')
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    # 
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat', 
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200, 
-			 'tickinterval'=>20, 'orient'=>'horizontal', 
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
-    l.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(mouse, 'text'=>'Mouse Settings')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 3)
-    @w_mouseacc.pack('side'=>'left')
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3)
-    @w_mousethr.pack('side'=>'right')
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
-    f = TkFrame.new(screen)
-    ff1 = TkFrame.new(f)
-    [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank', 
-					 'relief'=>'flat', 
-					 'variable'=>@w_screenbla, 
-					 'value'=>'blank') {
-	def self.set(value)
-	  if value == 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      }, 
-      @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern', 
-				       'relief'=>'flat', 
-				       'variable'=>@w_screenbla, 
-				       'value'=>'noblank') {
-	def self.set(value)
-	  if value != 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      }
-    ].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
-
-    ff2 = TkFrame.new(f)
-    [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5), 
-      @w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
-      w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
-    }
-
-    ff1.pack('side'=>'left')
-    ff2.pack('side'=>'left')
-
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Main window
-    #
-    buttons.pack('side'=>'top', 'fill'=>'both')
-    bell.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    kbd.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    mouse.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    screen.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize
-    @root = TkRoot.new
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/ixset2 b/ext/tk/sample/demos-en/ixset2
deleted file mode 100644
index ce8472abe0..0000000000
--- a/ext/tk/sample/demos-en/ixset2
+++ /dev/null
@@ -1,367 +0,0 @@
-#!/usr/bin/env ruby
-#
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  # apply is just "writesettings"
-  def apply
-    writesettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length, range=[])
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
-      if range.size > 0 
-	@entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken', 
-			       'from'=>range[0], 'to'=>range[1])
-      else
-	@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
-      end
-      @entry.pack('side'=>'right','expand'=>'y', 'fill'=>'x')
-    end
-    def epath
-      @frame
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    btn_frame = TkFrame.new(@root)
-    buttons = [ 
-      @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok}, 
-			     'default'=>'active', 'text'=>'Ok'),
-      @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings}, 
-				'default'=>'normal', 'text'=>'Apply', 
-				'state'=>'disabled'),
-      @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel}, 
-				 'default'=>'normal', 'text'=>'Cancel', 
-				'state'=>'disabled'),
-      @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit}, 
-			       'default'=>'normal', 'text'=>'Quit')
-    ]
-    buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
-
-    @root.bind('Return', proc{@btn_OK.flash; @btn_OK.invoke})
-    @root.bind('Escape', proc{@btn_QUIT.flash; @btn_QUIT.invoke})
-    @root.bind('1', proc{|w|
-		 unless buttons.index(w)
-		   @btn_APPLY.state(:normal)
-		   @btn_CANCEL.state(:normal)
-		 end
-	       }, '%W')
-    @root.bind('Key', proc{|w, k|
-		 unless buttons.index(w)
-		   case k
-		   when 'Return', 'Escape', 'Tab', /.*Shift.*/
-		     # do nothing
-		   else
-		     @btn_APPLY.state(:normal)
-		     @btn_CANCEL.state(:normal)
-		   end
-		 end
-	       }, '%W %K')
-
-    #
-    # Bell settings
-    #
-    bell = TkLabelframe.new(@root, 'text'=>'Bell Settings', 
-			    'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200, 
-			     'tickinterval'=>20, 'orient'=>'horizontal', 
-			     'label'=>"Volume (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6, [25, 20000])
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6, [1, 10000])
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    # 
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkLabelframe.new(@root, 'text'=>'Keyboard Repeat Settings', 
-			   'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat', 
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200, 
-			 'tickinterval'=>20, 'orient'=>'horizontal', 
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes', 
-		   'fill'=>'x', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkLabelframe.new(@root, 'text'=>'Mouse Settings', 
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 5)
-    @w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3, [1, 2000])
-    @w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkLabelframe.new(@root, 'text'=>'Screen-saver Settings', 
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_screenblank = TkRadioButton.new(screen, 'text'=>'Blank', 
-				       'relief'=>'flat', 'anchor'=>'w', 
-				       'variable'=>@w_screenbla, 
-				       'value'=>'blank') {
-      def self.set(value)
-	if value == 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screenpat = TkRadioButton.new(screen, 'text'=>'Pattern', 
-				     'relief'=>'flat', 'anchor'=>'w', 
-				     'variable'=>@w_screenbla, 
-				     'value'=>'noblank') {
-      def self.set(value)
-	if value != 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screentim = LabelEntry.new(screen, 'Timeout (s)', 5, [1, 100000])
-    @w_screencyc = LabelEntry.new(screen, 'Cycle (s)', 5, [1, 100000])
-
-    Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
-    Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
-    TkGrid.configure(@w_screenblank, @w_screenpat, 'sticky'=>'ew')
-
-    #
-    # Main window
-    #
-    param = {
-      'side'=>'top', 'fill'=>'both', 'expand'=>'yes', 
-      'padx'=>'1m', 'pady'=>'1m'
-    }
-    btn_frame.pack('side'=>'top', 'fill'=>'both')
-    bell.pack(param)
-    kbd.pack(param)
-    mouse.pack(param)
-    screen.pack(param)
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize(title)
-    @root = TkRoot.new('title'=>title)
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new(File.basename($0,'.rb'))
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/label.rb b/ext/tk/sample/demos-en/label.rb
deleted file mode 100644
index ef1bfa6f8a..0000000000
--- a/ext/tk/sample/demos-en/label.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# label.rb
-#
-# This demonstration script creates a toplevel window containing
-# several label widgets.
-#
-# label widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($label_demo) && $label_demo
-  $label_demo.destroy 
-  $label_demo = nil
-end
-
-# demo toplevel widget 
-$label_demo = TkToplevel.new {|w|
-  title("Label Demonstration")
-  iconname("label")
-  positionWindow(w)
-}
-
-# label 
-msg = TkLabel.new($label_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Five labels are displayed below: three textual ones on the left, and a bitmap label and a text label on the right.  Labels are pretty boring because you can't do anything with them."
-}
-msg.pack('side'=>'top')
-
-# frame 
-TkFrame.new($label_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $label_demo
-      $label_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'label'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# label demo 
-f_left = TkFrame.new($label_demo)
-f_right = TkFrame.new($label_demo)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes', 
-				  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
-
-# label 
-[ TkLabel.new(f_left, 'text'=>'First label'),
-  TkLabel.new(f_left, 'text'=>'Second label, raised', 
-	      'relief'=>'raised'),
-  TkLabel.new(f_left, 'text'=>'Third label, sunken', 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
-
-TkLabel.new(f_right) {
-  bitmap('@' + [$demo_dir,'images','face.xbm'].join(File::Separator))
-  borderwidth 2
-  relief 'sunken'
-}.pack('side'=>'top')
-
-TkLabel.new(f_right) { text 'Tcl/Tk Proprietor' }.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-en/labelframe.rb b/ext/tk/sample/demos-en/labelframe.rb
deleted file mode 100644
index 8636a4a9b9..0000000000
--- a/ext/tk/sample/demos-en/labelframe.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-# labelframe.rb
-#
-# This demonstration script creates a toplevel window containing
-# several labelframe widgets.
-#
-# based on "Id: labelframe.tcl,v 1.2 2001/10/30 11:21:50 dkf Exp"
-
-
-if defined?($labelframe_demo) && $labelframe_demo
-  $labelframe_demo.destroy 
-  $labelframe_demo = nil
-end
-
-$labelframe_demo = TkToplevel.new {|w|
-  title("Labelframe Demonstration")
-  iconname("labelframe")
-  positionWindow(w)
-}
-
-# Some information
-TkLabel.new($labelframe_demo, 
-	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-Labelframes are used to group related widgets together. \
-The label may be either plain text or another widget. \
-If your Tk library linked to Ruby doesn't include a 'labelframe' widget, \
-this demo doesn't work. Please use later version of Tk \
-which supports a 'labelframe' widget.
-EOL
-
-# The bottom buttons
-TkFrame.new($labelframe_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-		 $labelframe_demo.destroy
-		 $labelframe_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-		 showCode 'labelframe'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-# Demo area
-w = TkFrame.new($labelframe_demo).pack(:side=>:bottom, :fill=>:both, 
-				       :expand=>true)
-
-# A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'Value', 
-		 :padx=>2, :pady=>2) {|f|
-  grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
-
-  v = TkVariable.new
-  (1..4).each{|i|
-    TkRadiobutton.new(f, :text=>"This is value #{i}", 
-		      :variable=>v, :value=>i) {
-      pack(:side=>:top, :fill=>:x, :pady=>2)
-    }
-  }
-}
-
-
-# Using a label window to control a group of options.
-$lfdummy = TkVariable.new(0)
-
-def lfEnableButtons(w)
-  TkWinfo.children(w).each{|child|
-    next if child.path =~ /\.cb$/
-    if $lfdummy == 1
-      child.state(:normal)
-    else
-      child.state(:disabled)
-    end
-  }
-end
-
-TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
-  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy, 
-		    :text=>"Use this option.", :padx=>0) {|cb|
-    command proc{lfEnableButtons(f)}
-    f.labelwidget(cb)
-  }
-  grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
-
-  %w(Option1 Option2 Option3).each{|str|
-    TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
-  }
-
-  lfEnableButtons(f)
-}
-
-TkGrid.columnconfigure(w, [0,1], :weight=>1)
diff --git a/ext/tk/sample/demos-en/menu.rb b/ext/tk/sample/demos-en/menu.rb
deleted file mode 100644
index 7ea3fd2ebb..0000000000
--- a/ext/tk/sample/demos-en/menu.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu_demo) && $menu_demo
-  $menu_demo.destroy 
-  $menu_demo = nil
-end
-
-# demo toplevel widget
-$menu_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu")
-  positionWindow(w)
-}
-
-# menu frame ����
-$menu_frame = TkFrame.new($menu_demo, 'relief'=>'raised', 'bd'=>2)
-$menu_frame.pack('side'=>'top', 'fill'=>'x')
-
-# label
-TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh'
-    text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
-  else
-    text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
-  end
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new($menu_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menu_demo
-      $menu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu 
-TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.configure('menu'=>file_menu)
-    add('command', 'label'=>'Open...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Open..." entry'})
-    add('command', 'label'=>'New', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "New" entry'})
-    add('command', 'label'=>'Save', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save" entry'})
-    add('command', 'label'=>'Save As...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save As..." entry'})
-    add('separator')
-    add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print Setup..." entry'})
-    add('command', 'label'=>'Print...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print..." entry'})
-    add('separator')
-    add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu_demo.destroy})
-  }
-}
-
-if $tk_platform['platform'] == 'macintosh'
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.configure('menu'=>basic_menu)
-    add('command', 'label'=>'Long entry that does nothing')
-    ['A','B','C','D','E','F','G'].each{|c|
-      add('command', 'label'=>"Print letter \"#{c}\"", 
-	  'underline'=>14, 'accelerator'=>"Meta+#{c}", 
-	  'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.configure('menu'=>cascade_menu)
-    add('command', 'label'=>'Print hello', 
-	'command'=>proc{print "Hello\n"}, 
-	'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-    add('command', 'label'=>'Print goodbye', 
-	'command'=>proc{print "Goodbye\n"}, 
-	'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons', 
-		       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'Oil checked', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'Transmission checked', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'Brakes checked', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'Lights checked', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'Show current values', 
-	  'command'=>proc{showVars($menu_demo, 
-				   ['oil', oil], 
-				   ['trans', trans], 
-				   ['brakes', brakes], 
-				   ['lights', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons', 
-		       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'Show current values', 
-	  'command'=>proc{showVars($menu_demo, 
-				   ['pointSize', pointSize], 
-				   ['style', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.configure('menu'=>icon_menu)
-    add('command', 
-	'bitmap'=>'@'+[$demo_dir,'images','pattern.xbm'].join(File::Separator),
-	'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
-				     'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
-				     'bitmap'=>'', 'default'=>0, 
-				     'buttons'=>'Dismiss')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon, 
-	  'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.configure('menu'=>more_menu)
-    [ 'An entry','Another entry','Does nothing','Does almost nothing',
-      'Make life meaningful' ].each{|i|
-      add('command', 'label'=>i, 
-	  'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m) {|colors_menu|
-    m.configure('menu'=>colors_menu)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c, 
-	  'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-}
diff --git a/ext/tk/sample/demos-en/menu84.rb b/ext/tk/sample/demos-en/menu84.rb
deleted file mode 100644
index 82e29f6475..0000000000
--- a/ext/tk/sample/demos-en/menu84.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu84_demo) && $menu84_demo
-  $menu84_demo.destroy 
-  $menu84_demo = nil
-end
-
-# demo toplevel widget
-$menu84_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu84")
-  positionWindow(w)
-}
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label
-TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
-  else
-    text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
-  end
-}.pack('side'=>'top')
-
-
-menustatus = TkVariable.new("    ")
-TkFrame.new($menu84_demo) {|frame|
-  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken', 
-	      'bd'=>1, 'font'=>['Helvetica', '10'], 
-	      'anchor'=>'w').pack('side'=>'left', 'padx'=>2, 
-				  'expand'=>true, 'fill'=>'both')
-  pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-}
-
-
-# frame
-TkFrame.new($menu84_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menu84_demo
-      $menu84_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menu84'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# create menu frame
-$menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
-
-# menu
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Open...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Open..." entry'})
-  add('command', 'label'=>'New', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "New" entry'})
-  add('command', 'label'=>'Save', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save" entry'})
-  add('command', 'label'=>'Save As...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save As..." entry'})
-  add('separator')
-  add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print Setup..." entry'})
-  add('command', 'label'=>'Print...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print..." entry'})
-  add('separator')
-  add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem = "classic" || windowingsystem = "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Long entry that does nothing')
-  ['A','B','C','D','E','F','G'].each{|c|
-    add('command', 'label'=>"Print letter \"#{c}\"", 
-	'underline'=>14, 'accelerator'=>"Meta+#{c}", 
-	'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-    $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Print hello', 
-      'command'=>proc{print "Hello\n"}, 
-      'accelerator'=>"#{modifier}+H", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-  add('command', 'label'=>'Print goodbye', 
-      'command'=>proc{print "Goodbye\n"}, 
-      'accelerator'=>"#{modifier}+G", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    m.add('cascade', 'label'=>'Check buttons', 
-	  'menu'=>cascade_check, 'underline'=>0)
-    oil = TkVariable.new(0)
-    add('check', 'label'=>'Oil checked', 'variable'=>oil)
-    trans = TkVariable.new(0)
-    add('check', 'label'=>'Transmission checked', 'variable'=>trans)
-    brakes = TkVariable.new(0)
-    add('check', 'label'=>'Brakes checked', 'variable'=>brakes)
-    lights = TkVariable.new(0)
-    add('check', 'label'=>'Lights checked', 'variable'=>lights)
-    add('separator')
-    add('command', 'label'=>'Show current values', 
-	'command'=>proc{showVars($menu84_demo, 
-				 ['oil', oil], 
-				 ['trans', trans], 
-				 ['brakes', brakes], 
-				 ['lights', lights])} )
-    invoke 1
-    invoke 3
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    m.add('cascade', 'label'=>'Radio buttons', 
-	  'menu'=>cascade_radio, 'underline'=>0)
-    pointSize = TkVariable.new
-    add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-    add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-    add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-    add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-    add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-    add('separator')
-    style = TkVariable.new
-    add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-    add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-    add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-    add('separator')
-    add('command', 'label'=>'Show current values', 
-	'command'=>proc{showVars($menu84_demo, 
-				 ['pointSize', pointSize], 
-				 ['style', style])} )
-    invoke 1
-    invoke 7
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
-  add('command', 'hidemargin'=>1, 
-      'bitmap'=>'@'+[$demo_dir,'images','pattern.xbm'].join(File::Separator),
-      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
-				   'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
-				   'bitmap'=>'', 'default'=>0, 
-				   'buttons'=>'Dismiss')} )
-  ['info', 'questhead', 'error'].each{|icon|
-    add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
-	'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-  }
-
-  entryconfigure(2, :columnbreak=>true)
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
-  [ 'An entry','Another entry','Does nothing','Does almost nothing',
-    'Make life meaningful' ].each{|i|
-    add('command', 'label'=>i, 
-	'command'=>proc{print "You invoked \"#{i}\"\n"})
-  }
-
-  m.entryconfigure('Does almost nothing', 
-		   'bitmap'=>'questhead', 'compound'=>'left', 
-		   'command'=>proc{
-		     TkDialog.new('title'=>'Compound Menu Entry', 
-				  'message'=>'The menu entry you invoked'+
-				             'displays both a bitmap and '+
-				             'a text string.  Other than '+
-				             'this, it isjust like any '+
-				             'other menu entry.', 
-				  'buttons'=>['OK'], 'bitmap'=>'')
-		   })
-}
-
-TkMenu.new($menu84_frame) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
-  ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-    add('command', 'label'=>c, 'background'=>c, 
-	'command'=>proc{print "You invoked \"#{c}\"\n"})
-  }
-}
-
-$menu84_demo.menu($menu84_frame)
-
-TkMenu.bind('<MenuSelect>', proc{|w|
-	      begin
-		label = w.entrycget('active', 'label')
-	      rescue
-		label = "    "
-	      end
-	      menustatus.value = label
-	      Tk.update(true)
-	    }, '%W')
diff --git a/ext/tk/sample/demos-en/menubu.rb b/ext/tk/sample/demos-en/menubu.rb
deleted file mode 100644
index 42a5931dd1..0000000000
--- a/ext/tk/sample/demos-en/menubu.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-# menubutton.rb
-#
-# This demonstration script creates a window with a bunch of menus
-# and cascaded menus using menubuttons.
-
-require "tkcanvas"
-
-def optionMenu(menubutton, varName, firstValue, *rest)
-  varName.value = firstValue
-  configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
-    'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
-    'anchor'=>'c','direction'=>'flush'}
-  configoptions.each {|key, value|
-    menubutton.configure(key, value)
-  }
-  menu = TkMenu.new(menubutton) {
-    tearoff 'off'
-    add 'radio', 'label'=>firstValue, 'variable'=>varName
-  }
-  menubutton.menu(menu)
-  for i in rest
-    menu.add 'radio', 'label'=>i, 'variable'=>varName
-  end
-  
-  return menu
-end
-
-if defined?($menubu_demo) && $menubu_demo
-  $menubu_demo.destroy
-  $menubu_demo = nil
-end
-
-$menubu_demo = TkToplevel.new {|w|
-  title("Menu Button Demonstration")
-  iconname("menubutton")
-}
-
-positionWindow($menubu_demo)
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label
-TkLabel.new($menubu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette.")
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new($menubu_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-body = TkFrame.new($menubu_demo)
-body.pack('expand'=>'yes', 'fill'=>'both')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-right = TkMenubutton.new(body) {
-  text "Right"
-  underline 0
-  direction 'right'
-  relief 'raised'
-}
-rightMenu = TkMenu.new(right) {
-  tearoff 0
-  add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
-}
-right.menu(rightMenu)
-right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
-
-left = TkMenubutton.new(body) {
-  text "Left"
-  underline 0
-  direction 'left'
-  relief 'raised'
-}
-leftMenu = TkMenu.new(left) {
-  tearoff 0
-  add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
-}
-left.menu(leftMenu)
-left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-above = TkMenubutton.new(body) {
-  text "Above"
-  underline 0
-  direction 'above'
-  relief 'raised'
-}
-aboveMenu = TkMenu.new(above) {
-  tearoff 0
-  add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
-  add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
-}
-above.menu(aboveMenu)
-above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-TkFrame.new($menubu_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'menubu' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
-
-msg = TkLabel.new(center) {
-#  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette."
-}
-msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
-
-TkFrame.new(center) {|f|
-  menubuttonoptions = TkVariable.new
-  mbutton = TkMenubutton.new(f)
-  options = optionMenu(mbutton, menubuttonoptions, 
-		       'one', 'two', 'three')
-  mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  paletteColor = TkVariable.new
-  colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
-    'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
-    'White','Brown','DarkSeaGreen','DarkViolet']
-  colorMenuButton = TkMenubutton.new(f)
-  m = optionMenu(colorMenuButton, paletteColor, *colors)
-  begin
-    windowingsystem = Tk.windowingsystem()
-  rescue
-    windowingsystem = ""
-  end
-  if windowingsystem == "classic" || windowingsystem == "aqua"
-    topBorderColor = 'Black'
-    bottomBorderColor = 'Black'
-  else
-    topBorderColor = 'gray50'
-    bottomBorderColor = 'gray75'
-  end
-  for i in 0..15
-    image = TkPhotoImage.new('height'=>16, 'width'=>16)
-    image.put(topBorderColor, 0, 0, 16, 1)
-    image.put(topBorderColor, 0, 1, 1, 16)
-    image.put(bottomBorderColor, 0, 15, 16, 16)
-    image.put(bottomBorderColor, 15, 1, 16, 16)
-    image.put(colors[i], 1, 1, 15, 15)
-
-    selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
-    selectimage.put('Black', 0, 0, 16, 2)
-    selectimage.put('Black', 0, 2, 2, 16)
-    selectimage.put('Black', 2, 14, 16, 16)
-    selectimage.put('Black', 14, 2, 16, 14)
-    selectimage.put(colors[i], 2, 2, 14, 14)
-
-    m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
-  end
-  m.configure('tearoff', 'on')
-  for c in ['Black', 'gray75', 'gray50', 'White']
-    m.entryconfigure(c, 'columnbreak'=>1)
-  end
-  colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  pack 'padx'=>25, 'pady'=>25
-}
-
-end ; # Tk8.x
diff --git a/ext/tk/sample/demos-en/msgbox.rb b/ext/tk/sample/demos-en/msgbox.rb
deleted file mode 100644
index 4152477e67..0000000000
--- a/ext/tk/sample/demos-en/msgbox.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# msgbox.rb
-#
-# This demonstration script creates message boxes of various type
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($msgbox_demo) && $msgbox_demo
-  $msgbox_demo.destroy 
-  $msgbox_demo = nil
-end
-
-# demo toplevel widget
-$msgbox_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($msgbox_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-	    'text'=>"Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box.").pack('side'=>'top')
-
-# frame
-TkFrame.new($msgbox_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $msgbox_demo
-      $msgbox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'msgbox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Message Box'
-    command proc{showMessageBox $msgbox_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$msgbox_leftframe  = TkFrame.new($msgbox_demo)
-$msgbox_rightframe = TkFrame.new($msgbox_demo)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
-			'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
-			'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon, 
-		    'relief'=>'flat', 'value'=>icon, 'width'=>16, 
-		    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
-					'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'Type').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel', 
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType, 
-		    'relief'=>'flat', 'value'=>type, 'width'=>16, 
-		    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
-					'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value, 
-			 'title'=>'Message', 'parent'=>w,
-			 'message'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
-		'message'=>"You have selected  \"#{button}\"")
-end
-
diff --git a/ext/tk/sample/demos-en/paned1.rb b/ext/tk/sample/demos-en/paned1.rb
deleted file mode 100644
index 8c25de0ef3..0000000000
--- a/ext/tk/sample/demos-en/paned1.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# paned1.rb
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows horizontally.
-#
-# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned1_demo) && $paned1_demo
-  $paned1_demo.destroy 
-  $paned1_demo = nil
-end
-
-$paned1_demo = TkToplevel.new {|w|
-  title("Horizontal Paned Window Demonstration")
-  iconname("paned1")
-  positionWindow(w)
-}
-
-TkLabel.new($paned1_demo, 
-	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-The sash between the two coloured windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
-If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
-EOL
-
-# The bottom buttons
-TkFrame.new($paned1_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-		 $paned1_demo.destroy
-		 $paned1_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-		 showCode 'paned1'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-TkPanedwindow.new($paned1_demo){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-
-  add(TkLabel.new(f, :text=>"This is the\nleft side", :bg=>'yellow'), 
-      TkLabel.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
-}
diff --git a/ext/tk/sample/demos-en/paned2.rb b/ext/tk/sample/demos-en/paned2.rb
deleted file mode 100644
index c8c5abb470..0000000000
--- a/ext/tk/sample/demos-en/paned2.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# paned2.rb --
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows vertically.
-#
-# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned2_demo) && $paned2_demo
-  $paned2_demo.destroy 
-  $paned2_demo = nil
-end
-
-$paned2_demo = TkToplevel.new {|w|
-  title("Vertical Paned Window Demonstration")
-  iconname("paned2")
-  positionWindow(w)
-}
-
-TkLabel.new($paned2_demo, 
-	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-The sash between the two scrolled windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
-If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
-EOL
-
-# The bottom buttons
-TkFrame.new($paned2_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-		 $paned2_demo.destroy
-		 $paned2_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-		 showCode 'paned2'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-paneList = TkVariable.new  # define as normal variable (not array)
-paneList.value = [         # ruby's array --> tcl's list
-    'List of Ruby/Tk Widgets',
-    'TkButton', 
-    'TkCanvas', 
-    'TkCheckbutton', 
-    'TkEntry', 
-    'TkFrame', 
-    'TkLabel', 
-    'TkLabelframe', 
-    'TkListbox', 
-    'TkMenu', 
-    'TkMenubutton', 
-    'TkMessage', 
-    'TkPanedwindow', 
-    'TkRadiobutton', 
-    'TkScale', 
-    'TkScrollbar', 
-    'TkSpinbox', 
-    'TkText', 
-    'TkToplevel'
-]
-
-# Create the pane itself
-TkPanedwindow.new($paned2_demo, :orient=>:vertical){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-
-  add(TkFrame.new(f){|paned2_top|
-	TkListbox.new(paned2_top, :listvariable=>paneList) {
-	  # Invert the first item to highlight it
-	  itemconfigure(0, :background=>self.cget(:foreground), 
-			   :foreground=>self.cget(:background) )
-	  yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right, 
-						      :fill=>:y))
-	  pack(:fill=>:both, :expand=>true)
-	}
-      }, 
-
-      TkFrame.new(f) {|paned2_bottom|
-	# The bottom window is a text widget with scrollbar
-	paned2_xscr = TkScrollbar.new(paned2_bottom)
-	paned2_yscr = TkScrollbar.new(paned2_bottom)
-	paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
-	  insert('1.0', "This is just a normal text widget")
-	  xscrollbar(paned2_xscr)
-	  yscrollbar(paned2_yscr)
-	}
-	Tk.grid(paned2_text, paned2_yscr, :sticky=>'nsew')
-	Tk.grid(paned2_xscr, :sticky=>'nsew')
-	TkGrid.columnconfigure(paned2_bottom, 0, :weight=>1)
-	TkGrid.rowconfigure(paned2_bottom, 0, :weight=>1)
-      } )
-}
diff --git a/ext/tk/sample/demos-en/patch_1.1c1 b/ext/tk/sample/demos-en/patch_1.1c1
deleted file mode 100644
index d3952e71eb..0000000000
--- a/ext/tk/sample/demos-en/patch_1.1c1
+++ /dev/null
@@ -1,93 +0,0 @@
---- /usr/src/ruby-1.1c1/lib/tkcanvas.rb	Tue Jul 21 18:18:02 1998
-+++ tkcanvas.rb	Fri Jul 24 20:38:24 1998
-@@ -310,7 +310,7 @@
- 	  || key == 'latinfont' || key == 'asciifont' )
- 	tagfont_configure(tagid(tagOrId), {key=>value})
-       else
--	tk_call 'itemconfigure', tagid(tagOrId), "-#{key}", value
-+	tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
-       end
-     end
-   end
---- /usr/src/ruby-1.1c1/lib/tkfont.rb	Fri Jul 17 23:43:28 1998
-+++ tkfont.rb	Fri Jul 24 17:46:22 1998
-@@ -42,7 +42,7 @@
-       r | []
- 
-     when /^8\.*/
--      list(tk_call('font', 'names'))
-+      tk_split_simplelist(tk_call('font', 'names'))
- 
-     end
-   end
-@@ -89,10 +89,14 @@
-       if fnt == []
- 	TkFont.new(nil, nil).call_font_configure(path, *(args + [{}]))
-       else
--	compound = Hash[*list(tk_call('font', 'configure', 
--				      fnt))].collect{|key,value|
--	  [key[1..-1], value]
--	}.assoc('compound')[1]
-+	begin
-+	  compound = Hash[*list(tk_call('font', 'configure', 
-+					fnt))].collect{|key,value|
-+	    [key[1..-1], value]
-+	  }.assoc('compound')[1]
-+	rescue
-+	  compound = []
-+	end
- 	if compound == []
- 	  TkFont.new(fnt, DEFAULT_KANJI_FONT_NAME) \
- 	  .call_font_configure(path, *(args + [{}]))
-@@ -156,14 +160,19 @@
-     elsif font.kind_of? Array
-       finfo = {}
-       finfo['family'] = font[0].to_s
--      if font[1] && font[1] != '0' && font[1] =~ /^(|\+|-)([0-9]+)$/
--	if $1 == '-'
--	  finfo['pixels'] = font[1].to_s
-+      if font[1]
-+	fsize = font[1].to_s
-+	if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
-+	  if $1 == '-'
-+	    finfo['pixels'] = $2
-+	  else
-+	    finfo['points'] = $2
-+	  end
- 	else
--	  finfo['points'] = font[1].to_s
-+	  finfo['points'] = '13'
- 	end
-       end
--      finfo[2..-1].each{|style|
-+      font[2..-1].each{|style|
- 	case (style)
- 	when 'normal'
- 	  finfo['weight'] = style
-@@ -199,16 +208,19 @@
-     elsif font.kind_of? Array
-       finfo = {}
-       finfo['family'] = font[0].to_s
--      if font[1] && font[1] != '0' && font[1] =~ /^(|\+|-)([0-9]+)$/
--	if $1 == '-'
--	  finfo['pixels'] = $2
-+      if font[1]
-+	fsize = font[1].to_s
-+	if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
-+	  if $1 == '-'
-+	    finfo['pixels'] = $2
-+	  else
-+	    finfo['points'] = $2
-+	  end
- 	else
--	  finfo['points'] = $2
-+	  finfo['points'] = '13'
- 	end
--      else
--	finfo['points'] = '13'
-       end
--      finfo[2..-1].each{|style|
-+      font[2..-1].each{|style|
- 	case (style)
- 	when 'normal'
- 	  finfo['weight'] = style
diff --git a/ext/tk/sample/demos-en/plot.rb b/ext/tk/sample/demos-en/plot.rb
deleted file mode 100644
index fb887011a7..0000000000
--- a/ext/tk/sample/demos-en/plot.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-# plot.rb
-#
-# This demonstration script creates a canvas widget showing a 2-D
-# plot with data points that can be dragged with the mouse.
-#
-# 2-D plot widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($plot_demo) && $plot_demo
-  $plot_demo.destroy 
-  $plot_demo = nil
-end
-
-# demo toplevel widget
-$plot_demo = TkToplevel.new {|w|
-  title("Plot Demonstration")
-  iconname("Plot")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($plot_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left', 
-	    'text'=>"This window displays a canvas widget containing a simple 2-dimensional plot.  You can doctor the data by dragging any of the points with mouse button 1."){
-  pack('side'=>'top')
-}
-
-# frame
-$plot_buttons = TkFrame.new($plot_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $plot_demo
-      $plot_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'plot'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# font 
-plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-
-# canvas 
-$plot_canvas = TkCanvas.new($plot_demo,'relief'=>'raised','width'=>450,'height'=>300)
-$plot_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# plot 
-TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
-TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20, 
-	    'text'=>"A Simple Plot", 'font'=>plotFont, 'fill'=>'brown')
-
-(0..10).each {|i|
-  x = 100 + (i * 30)
-  TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
-  TkcText.new($plot_canvas, x, 254, 
-	      'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
-}
-(0..5).each {|i|
-  y = 250 - (i * 40)
-  TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
-  TkcText.new($plot_canvas, 96, y, 
-	      'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
-}
-
-for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-  x = 100 + (3*xx)
-  y = 250 - (4*yy)/5
-  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6, 
-		     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-  item.addtag 'point'
-end
-
-$plot_canvas.itembind('point', 'Any-Enter', 
-		      proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave', 
-		      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1', 
-		      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1', 
-		      proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion', 
-		  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
-
-$plot = {'lastX'=>0, 'lastY'=>0}
-
-# plotDown --
-# This method is invoked when the mouse is pressed over one of the 
-# data points.  It sets up state to allow the point to be dragged.
-#
-# Arguments:
-# w -		The canvas window.
-# x, y -	The coordinates of the mouse press.
-
-def plotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
-# plotMove --
-# This method is invoked during mouse motion events.  It drags the
-# current item.
-#
-# Arguments:
-# w -		The canvas window.
-# x, y -	The coordinates of the mouse.
-
-def plotMove (w, x, y)
-  w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
diff --git a/ext/tk/sample/demos-en/puzzle.rb b/ext/tk/sample/demos-en/puzzle.rb
deleted file mode 100644
index d206efe34b..0000000000
--- a/ext/tk/sample/demos-en/puzzle.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# puzzle.rb
-#
-# This demonstration script creates a 15-puzzle game using a collection
-# of buttons.
-#
-# widet demo 'puzzle' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($puzzle_demo) && $puzzle_demo
-  $puzzle_demo.destroy 
-  $puzzle_demo = nil
-end
-
-# demo toplevel widget
-$puzzle_demo = TkToplevel.new {|w|
-  title("15-Puzzle Demonstration")
-  iconname("15-Puzzle")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($puzzle_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A 15-puzzle appears below as a collection of buttons.  Click on any of the pieces next to the space, and that piece will slide over the space.  Continue this until the pieces are arranged in numerical order from upper-left to lower-right."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($puzzle_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $puzzle_demo
-      $puzzle_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'puzzle'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-
-# Special trick: select a darker color for the space by creating a
-# scrollbar widget and using its trough color.
-begin
-  if Tk.windowingsystem() == 'aqua'
-    frameSize = 160
-  else
-    frameSize = 120
-  end
-rescue
-  frameSize = 120
-end
- 
-s = TkScrollbar.new($puzzle_demo)
-base = TkFrame.new($puzzle_demo) {
-  width  frameSize
-  height frameSize
-  borderwidth 2
-  relief 'sunken'
-  bg s['troughcolor']
-}
-s.destroy
-base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
-
-def def_puzzleswitch_proc(w, num)
-  proc{puzzleSwitch w, num}
-end
-
-$xpos = {}
-$ypos = {}
-order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
-(0..14).each{|i|
-  num = order[i]
-  $xpos[num] = (i % 4) * 0.25
-  $ypos[num] = (i / 4) * 0.25
-  TkButton.new(base) {|w|
-    relief 'raised'
-    text num
-    highlightthickness 0
-    command def_puzzleswitch_proc(w, num)
-  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num], 
-	  'relwidth'=>0.25, 'relheight'=>0.25)
-}
-$xpos['space'] = 0.75
-$ypos['space'] = 0.75
-
-
-# puzzleSwitch --
-# This procedure is invoked when the user clicks on a particular button;
-# if the button is next to the empty space, it moves the button into the
-# empty space.
-
-def puzzleSwitch(w, num)
-  if ( ($ypos[num] >= ($ypos['space'] - 0.01))     \
-      && ($ypos[num] <= ($ypos['space'] + 0.01))   \
-      && ($xpos[num] >= ($xpos['space'] - 0.26))   \
-      && ($xpos[num] <= ($xpos['space'] + 0.26)))  \
-    || (($xpos[num] >= ($xpos['space'] - 0.01))    \
-	&& ($xpos[num] <= ($xpos['space'] + 0.01)) \
-	&& ($ypos[num] >= ($ypos['space'] - 0.26)) \
-	&& ($ypos[num] <= ($ypos['space'] + 0.26)))
-    tmp = $xpos['space']
-    $xpos['space'] = $xpos[num]
-    $xpos[num] = tmp
-    tmp = $ypos['space']
-    $ypos['space'] = $ypos[num]
-    $ypos[num] = tmp
-    w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/radio.rb b/ext/tk/sample/demos-en/radio.rb
deleted file mode 100644
index 96cdc4c54a..0000000000
--- a/ext/tk/sample/demos-en/radio.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# radio.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio_demo) && $radio_demo
-  $radio_demo.destroy 
-  $radio_demo = nil
-end
-
-# demo toplevel widget
-$radio_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration")
-  iconname("radio")
-  positionWindow(w)
-}
-
-# label 
-msg = TkLabel.new($radio_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Two groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-# 
-size = TkVariable.new
-color = TkVariable.new
-
-# frame 
-TkFrame.new($radio_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $radio_demo
-      $radio_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'radio'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars($radio_demo, ['size', size], ['color', color])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 
-f_left = TkFrame.new($radio_demo)
-f_right = TkFrame.new($radio_demo)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton 
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "Point Size #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_right) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
diff --git a/ext/tk/sample/demos-en/radio2.rb b/ext/tk/sample/demos-en/radio2.rb
deleted file mode 100644
index aefd81bdca..0000000000
--- a/ext/tk/sample/demos-en/radio2.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# radio.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio2_demo) && $radio2_demo
-  $radio2_demo.destroy 
-  $radio2_demo = nil
-end
-
-# demo toplevel widget
-$radio2_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration")
-  iconname("radio")
-  positionWindow(w)
-}
-
-# label 
-msg = TkLabel.new($radio2_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-# 
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame 
-TkFrame.new($radio2_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $radio2_demo
-      $radio2_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'radio'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars($radio2_demo, 
-	       ['size', size], ['color', color], ['compound', align])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 
-f_left  = TkLabelFrame.new($radio2_demo, 'text'=>'Point Size', 
-			   'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new($radio2_demo, 'text'=>'Color', 
-			   'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new($radio2_demo, 'text'=>'Alignment', 
-			   'pady'=>2, 'padx'=>2)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton 
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "Point Size #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead', 
-		    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  lower = a.downcase
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
-		    'value'=>lower, 'indicatoron'=>0, 'width'=>7, 
-		    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', abtn[0])
-Tk.grid(abtn[1], label, abtn[2])
-Tk.grid('x', abtn[3])
diff --git a/ext/tk/sample/demos-en/rmt b/ext/tk/sample/demos-en/rmt
deleted file mode 100644
index 73f631180a..0000000000
--- a/ext/tk/sample/demos-en/rmt
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/env ruby
-
-# rmt -- 
-# This script implements a simple remote-control mechanism for 
-# Tk applications.  It allows you to select an application and 
-# then type commands to that application. 
-
-require 'tk'
-
-class Rmt
-  def initialize(parent=nil)
-    win = self
-
-    unless parent
-      parent = TkRoot.new
-    end
-    root = TkWinfo.toplevel(parent)
-    root.minsize(1,1)
-
-    # The instance variable below keeps track of the remote application 
-    # that we're sending to.  If it's an empty string then we execute 
-    # the commands locally. 
-    @app = 'local'
-    @mode = 'Ruby'
-
-    # The instance variable below keeps track of whether we're in the 
-    # middle of executing a command entered via the text. 
-    @executing = 0
-
-    # The instance variable below keeps track of the last command executed, 
-    # so it can be re-executed in response to !! commands. 
-    @lastCommand = ""
-
-    # Create menu bar.  Arrange to recreate all the information in the 
-    # applications sub-menu whenever it is cascaded to. 
-
-    TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
-      pack('side'=>'top', 'fill'=>'x')
-      TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
-	TkMenu.new(mb) {|mf|
-	  mb.menu(mf)
-	  TkMenu.new(mf) {|ma| 
-	    postcommand proc{win.fillAppsMenu ma}
-	    mf.add('cascade', 'label'=>'Select Application', 
-		   'menu'=>ma, 'underline'=>0)
-	  }
-	  add('command', 'label'=>'Quit', 
-	      'command'=>proc{root.destroy}, 'underline'=>0)
-	}
-	pack('side'=>'left')
-      }
-    }
-
-    # Create text window and scrollbar. 
-
-    @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
-      yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
-      pack('side'=>'left')
-    }
-
-    @promptEnd = TkTextMark.new(@txt, 'insert')
-
-    # Create a binding to forward commands to the target application, 
-    # plus modify many of the built-in bindings so that only information 
-    # in the current command can be deleted (can still set the cursor 
-    # earlier in the text and select and insert;  just can't delete).
-
-    @txt.bindtags([@txt, TkText, root, 'all'])
-    @txt.bind('Return', proc{
-		@txt.set_insert('end - 1c')
-		@txt.insert('insert', "\n")
-		win.invoke
-		Tk.callback_break
-	      })
-    @txt.bind('Delete', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('BackSpace', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('Control-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-k', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  @txt.set_insert(@promptEnd)
-		end
-	      })
-    @txt.bind('Control-t', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-BackSpace', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-h', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-
-    @txt.tag_configure('bold', 'font'=>['Courier', 12, 'bold'])
-
-    @app = Tk.appname('rmt')
-    if (@app =~ /^rmt(.*)$/)
-      root.title("Tk Remote Controller#{$1}")
-      root.iconname("Tk Remote#{$1}")
-    end
-    prompt
-    @txt.focus
-    #@app = TkWinfo.appname(TkRoot.new)
-  end
-
-  def tkTextInsert(w,s)
-    return if s == ""
-    begin
-      if w.compare('sel.first','<=','insert') \
-	&& w.compare('sel.last','>=','insert')
-	w.tag_remove('sel', 'sel.first', @promptEnd)
-	w.delete('sel.first', 'sel.last')
-      end
-    rescue
-    end
-    w.insert('insert', s)
-    w.see('insert')
-  end
-
-  # The method below is used to print out a prompt at the 
-  # insertion point (which should be at the beginning of a line 
-  # right now).
-
-  def prompt
-    @txt.insert('insert', "#{@app}: ")
-    @promptEnd.set('insert')
-    @promptEnd.gravity = 'left'
-    @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-  end
-
-  # The method below executes a command (it takes everything on the 
-  # current line after the prompt and either sends it to the remote 
-  # application or executes it locally, depending on "app".
-
-  def invoke
-    cmd = @txt.get(@promptEnd, 'insert')
-    @executing += 1
-    case (@mode)
-    when 'Tcl'
-      if Tk.info('complete', cmd)
-	if (cmd == "!!\n")
-	  cmd = @lastCommand
-	else
-	  @lastCommand = cmd
-	end
-	begin
-	  msg = Tk.appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-
-    when 'Ruby'
-      if (cmd == "!!\n")
-	cmd = @lastCommand
-      end
-      complete = true
-      begin
-	eval("proc{#{cmd}}")
-      rescue
-	complete = false
-      end
-      if complete
-	@lastCommand = cmd
-	begin
-#	  msg = Tk.appsend(@app, false, 
-#			   'ruby', 
-#			   '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
-	  msg = Tk.rb_appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-    end
-
-    @executing -= 1
-    @txt.yview_pickplace('insert')
-  end
-
-  # The following method is invoked to change the application that
-  # we're talking to.  It also updates the prompt for the current 
-  # command, unless we're in the middle of executing a command from 
-  # the text item (in which case a new prompt is about to be output 
-  # so there's no need to change the old one). 
-
-  def newApp(appName, mode)
-    @app = appName
-    @mode = mode
-    if @executing == 0
-      @promptEnd.gravity = 'right'
-      @txt.delete("#{@promptEnd.path} linestart", @promptEnd)
-      @txt.insert(@promptEnd, "#{appName}: ")
-      @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-      @promptEnd.gravity = 'left'
-    end
-  end
-
-  # The method below will fill in the applications sub-menu with a list
-  # of all the applications that currently exist. 
-
-  def fillAppsMenu(menu)
-    win = self
-    begin
-      menu.delete(0,'last')
-    rescue
-    end
-    TkWinfo.interps.sort.each{|ip|
-      begin
-	if Tk.appsend(ip, false, 'info commands ruby') == ""
-	  mode = 'Tcl'
-	else
-	  mode = 'Ruby'
-	end
-	menu.add('command', 'label'=>format("%s    (#{mode}/Tk)", ip), 
-		 'command'=>proc{win.newApp ip, mode})
-      rescue
-	menu.add('command', 'label'=>format("%s (unknown Tk)", ip), 
-		 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
-      end
-    }
-    menu.add('command', 'label'=>format("local    (Ruby/Tk)"), 
-	     'command'=>proc{win.newApp 'local', 'Ruby'})
-  end
-end
-
-Rmt.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/rolodex b/ext/tk/sample/demos-en/rolodex
deleted file mode 100644
index 9a4030e902..0000000000
--- a/ext/tk/sample/demos-en/rolodex
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# This script is a part of Tom LaStrange's rolodex
-# 
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 06:23:06 nagai"
-#
-
-require "tk"
-
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( TkWinfo.exist?(w) )
-      topic = w
-    end
-  end
-  
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "Sorry, but no help is available for this topic"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"Information on #{topic}:\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0,"Takaaki Tateishi")
-  $root.frame.entry[2].insert(0,"Japan Advanced Institute of Science and Techonology")
-  $root.frame.entry[3].insert(0,"1-1 Asahidai, Tatsunokuchi")
-  $root.frame.entry[4].insert(0,"Ishikawa 923-1292, Japan")
-  $root.frame.entry[5].insert(0,"private")
-    $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"This is a dummy file selection dialog box.\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"Are you sure?",
-			"default_button"=>0,
-			"buttons"=>["Cancel"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","Name:","Address:","","","Home Phone:","Work Phone:","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-    
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,
-			  "text" => "Clear")
-    @add = TkButton.new(self,
-			"text" => "Add")
-    @search = TkButton.new(self,
-			   "text" => "Search")
-    @delete = TkButton.new(self,
-			   "text" => "Delete")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=>"File",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "Load ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "Exit",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=>"Help",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=>"On Context...",
-		   "command"=>proc{show_help("context")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Help...",
-		   "command"=>proc{show_help("help")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Window...",
-		   "command"=>proc{show_help("window")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Keys...",
-		   "command"=>proc{show_help("keys")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On version...",
-		   "command"=>proc{show_help("version")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=>"Clear   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=>"Add   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=>"Search   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=>"Delete...   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-This is the "file" menu. It can be used to invoke\
-some overall operations on the rolodex applications,\
-such as loading a file or exiting.
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-The "Load" entry in the "File" menu posts a dialog box\
-that you can use to select a rolodex file
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-The "Exit" entry in the "File" menu causes the rolodex\
-application to terminate
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's name
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-In this field of the rolodex entry you should\
-type the first line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-In this field of the rolodex entry you should\
-type the second line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-In this field of the rolodex entry you should\
-type the third line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's home phone number, or "private"\
-if the person doesn't want his or he number publicized
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's work phone number
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-In this field of the rolodex entry you should\
-type the phone number for the person's FAX machine
-EOF
-
-$helpTopics["context"] = <<EOF
-Unfortunately, this application doesn't support context-sensitive\
-help in the usual way, because when this demo was written Ruby/Tk\
-didn't have a grab mechanism and this is needed for context-sensitive\
-help. Instead, you can achive much the same effect by simply moving\
-the mouse over the window you're curious about and pressing the\
-Help or F1 keys. You can do this anytime.
-EOF
-
-$helpTopics["help"] = <<EOF
-This application provides only very crude help. Besides the\
-entries in this menu, you can get help on individual windows\
-by moving the mouse cursor over the window and pressing the\
-Help or F1 keys.
-EOF
-
-$helpTopics["window"] = <<EOF
-This window is a dummy rolodex application created as part of\
-Tom LaStrange's toolkit benchmark. It doesn't really do anything\
-useful except to demonstrate a few features of the Ruby/Tk.
-EOF
-
-$helpTopics["keys"] = <<EOF
-The following accelerator keys are defined for this application\
-(in addition to those already available for the entry windows):
-Ctrl+A:		Add
-Ctrl+C:		Clear
-Ctrl+D:		Delete
-Ctrl+F:		Enter file name
-Ctrl+Q:		Exit application (quit)
-Ctrl+S:		Search (dummy operation)
-EOF
-
-$helpTopics["version"] = <<EOF
-This is version 1.0.1.
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/rolodex-j b/ext/tk/sample/demos-en/rolodex-j
deleted file mode 100644
index 27e2bc9da0..0000000000
--- a/ext/tk/sample/demos-en/rolodex-j
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# ���Υ�����ץȤ� Tom LaStrange �� rolodex �ΰ����Ǥ���
-# 
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 14:02:04 nagai"
-#
-
-require "tk"
-
-Tk.encoding = "euc-jp"
-$font = TkFont.new('k14')
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( w.is_a?(TkWindow) )
-      if( TkWinfo.exist?(w) )
-	topic = w
-      end
-    end
-  end
-  
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "���Υȥԥå��ˤĤ��ƤΥإ�פϤޤ����ѤǤ��ޤ���"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"��#{topic}��\n\n#{msg}",
-	       "font"=>$font,
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0, "Ω�� ����")
-  $root.frame.entry[2].insert(0, "923-1292 ���")
-  $root.frame.entry[3].insert(0, "ä��Į ���� 1-1")
-  $root.frame.entry[4].insert(0, "��Φ��ü�ʳص�����ر����")
-  $root.frame.entry[5].insert(0,"private")
-  $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"����ϥե�������������������Υ��ߡ��Ǥ���\n",
-	       "font"=>$font,
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"��������Ǥ�����",
-			"font"=>$font,
-			"default_button"=>0,
-			"buttons"=>["����󥻥�"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","̾��:","����","","","����(����):","����(���):","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e",
-			      "font" => $font)
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken",
-			      "font" => $font)
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,
-			  "text" => "���ꥢ��",
-			  "font" => $font)
-    @add = TkButton.new(self,
-			"text" => "�ɲ�",
-			"font" => $font)
-    @search = TkButton.new(self,
-			   "text" => "����",
-			   "font" => $font)
-    @delete = TkButton.new(self,
-			   "text" => "�õ�",
-			   "font" => $font)
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=> "�ե�����",
-			     "font"=> $font,
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "�ɤ߹��� ...",
-		   "font" => $font,
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "��λ",
-		   "font" => $font,
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=> "�إ��",
-			     "font"=> $font,
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=> "����ƥ����ȤˤĤ���",
-		   "font" => $font,
-		   "command"=>proc{show_help("����ƥ�����")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�إ�פˤĤ���",
-		   "font" => $font,
-		   "command"=>proc{show_help("�إ��")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "������ɥ��ˤĤ���",
-		   "font" => $font,
-		   "command"=>proc{show_help("������ɥ�")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�������ˤĤ���",
-		   "font" => $font,
-		   "command"=>proc{show_help("�������")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�С���������",
-		   "font" => $font,
-		   "command"=>proc{show_help("�С���������")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=> "���ꥢ��   Ctrl+C", "font" => $font)
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=> "�ɲ�   Ctrl+A", "font" => $font)
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=> "����   Ctrl+S", "font" => $font)
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=> "�õ�   Ctrl+D", "font" => $font)
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-����ϡ֥ե�����ץ�˥塼�Ǥ������ɤ߹��ߡפ�ֽ�λ�פʤɤ�
-�Ԥʤ����Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-�ե�������ɤ߹��ߤ�Ԥʤ��Ȥ��˻Ȥ��ޤ���
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-���ץꥱ��������λ����Ȥ��˻Ȥ��ޤ���
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-̾���������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-����������ֹ�������륨��ȥ�Ǥ�������\
-�������ʤ��Ȥ��� private �ȵ������ޤ���
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-��Ҥ������ֹ�������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-FAX�ֹ�������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics["����ƥ�����"] = <<EOF
-Ruby/Tk�Ǥ�grab�ε������ʤ����ᤳ�Υ��ץꥱ�������Ǥ�\
-����ƥ����ȥإ�פϥ��ݡ��Ȥ���Ƥ��ޤ���
-������Ʊ���褦�ʸ��̤�bind�ȥޥ����ΰ��֤�Wedget���Τ�\
-���Ȥ����뤳�Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics["�إ��"] = <<EOF
-�ޥ����򥦥���ɥ��ˤ��碌��F1�����򲡤����Ȥˤ�ä�\
-���Υإ�פ򸫤뤳�Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics["������ɥ�"] = <<EOF
-���Υ�����ɥ��ϥ��ߡ��Ǥ���
-EOF
-
-$helpTopics["�������"] = <<EOF
-Ctrl+A:		�ɲ�
-Ctrl+C:		���ꥢ��
-Ctrl+D:		�õ�
-Ctrl+F:		�ե���������
-Ctrl+Q:		��λ
-Ctrl+S:		����
-EOF
-
-$helpTopics["�С���������"] = <<EOF
-�С������� 1.0.1e �Ǥ���
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/ruler.rb b/ext/tk/sample/demos-en/ruler.rb
deleted file mode 100644
index f5e7add516..0000000000
--- a/ext/tk/sample/demos-en/ruler.rb
+++ /dev/null
@@ -1,201 +0,0 @@
-# ruler.rb
-#
-# This demonstration script creates a canvas widget that displays a ruler
-# with tab stops that can be set, moved, and deleted.
-#
-# ruler widget demo (called by 'widget')
-#
-
-# rulerMkTab --
-# This method creates a new triangular polygon in a canvas to
-# represent a tab stop.
-#
-# Arguments:
-# c -		The canvas window.
-# x, y -	Coordinates at which to create the tab stop.
-
-def rulerMkTab(c,x,y)
-  v = $demo_rulerInfo
-  TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
-end
-
-# toplevel widget
-if defined?($ruler_demo) && $ruler_demo
-  $ruler_demo.destroy 
-  $ruler_demo = nil
-end
-
-# demo toplevel widget
-$ruler_demo = TkToplevel.new {|w|
-  title("Ruler Demonstration")
-  iconname("ruler")
-  positionWindow(w)
-}
-
-# label
-TkLabel.new($ruler_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-	    'text'=>"This canvas widget shows a mock-up of a ruler.  You can create tab stops by dragging them out of the well to the right of the ruler.  You can also drag existing tab stops.  If you drag a tab stop far enough up or down so that it turns dim, it will be deleted when you release the mouse button."){
-  pack('side'=>'top')
-}
-
-# frame
-$ruler_buttons = TkFrame.new($ruler_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $ruler_demo
-      $ruler_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'ruler'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas 
-$ruler_canvas = TkCanvas.new($ruler_demo, 'width'=>'14.8c', 'height'=>'2.5c')
-$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# 
-unless Struct.const_defined?("RulerInfo")
-  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y, 
-			       :top, :bottom, :size, :normalStyle, 
-			       :activeStyle, :deleteStyle).new
-end
-$demo_rulerInfo.grid = '.25c'
-$demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.right = TkWinfo.fpixels($ruler_canvas, '13c')
-$demo_rulerInfo.top = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.bottom = TkWinfo.fpixels($ruler_canvas, '1.5c')
-$demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
-$demo_rulerInfo.normalStyle = {'fill'=>'black'}
-if TkWinfo.depth($ruler_canvas) > 1
-  $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'red', 
-    'stipple'=>'@'+[$demo_dir, 'images', 'gray25.xbm'].join(File::Separator)}
-else
-  $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'black', 
-    'stipple'=>'@'+[$demo_dir, 'images', 'gray25.xbm'].join(File::Separator)}
-end
-
-TkcLine.new($ruler_canvas, 
-	    '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
-(0..11).each{|i|
-  x = i+1
-  TkcLine.new($ruler_canvas, "#{x}c", '1c', "#{x}c", '0.6c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.25c", '1c', "#{x}.25c", '0.8c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.5c", '1c', "#{x}.5c", '0.7c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.75c", '1c', "#{x}.75c", '0.8c', 'width'=>1)
-  TkcText.new($ruler_canvas, "#{x}.15c", '0.75c', 'text'=>i, 'anchor'=>'sw')
-}
-
-$rulerTag_well = TkcTag.new($ruler_canvas)
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-		TkcRectangle.new($ruler_canvas, 
-				 '13.2c', '1c', '13.8c', '0.5c', 
-				 'outline'=>'black', 
-				 'fill'=>($ruler_canvas\
-					  .configinfo('background'))[4]) )
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-		rulerMkTab($ruler_canvas, 
-			   TkWinfo.pixels($ruler_canvas, '13.5c'), 
-			   TkWinfo.pixels($ruler_canvas, '.65c') ) )
-
-$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1', 
-		       proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion', 
-		   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
-
-# rulerNewTab --
-# Does all the work of creating a tab stop, including creating the
-# triangle object and adding tags to it to give it tab behavior.
-#
-# Arguments:
-# c -		The canvas window.
-# x, y -	The coordinates of the tab stop.
-
-def rulerNewTab(c,x,y)
-  v = $demo_rulerInfo
-  c.addtag_withtag('active', rulerMkTab(c,x,y))
-  c.addtag_withtag('tab', 'active')
-  v.x = x
-  v.y = y
-  rulerMoveTab(c,x,y)
-end
-
-# rulerSelectTab --
-# This method is invoked when mouse button 1 is pressed over
-# a tab.  It remembers information about the tab so that it can
-# be dragged interactively.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse (identifies the point by
-#		which the tab was picked up for dragging).
-
-def rulerSelectTab(c,x,y)
-  v = $demo_rulerInfo
-  v.x = c.canvasx(x, v.grid)
-  v.y = v.top+2
-  c.addtag_withtag('active', 'current')
-  c.itemconfigure('active', v.activeStyle)
-  c.raise('active')
-end
-
-# rulerMoveTab --
-# This method is invoked during mouse motion events to drag a tab.
-# It adjusts the position of the tab, and changes its appearance if
-# it is about to be dragged out of the ruler.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse.
-
-def rulerMoveTab(c,x,y)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  cx = c.canvasx(x,v.grid)
-  cy = c.canvasy(y)
-  cx = v.left if cx < v.left
-  cx = v.right if cx > v.right
-  if (cy >= v.top && cy <= v.bottom)
-    cy = v.top+2
-    c.itemconfigure('active', v.activeStyle)
-  else
-    cy = cy-v.size-2
-    c.itemconfigure('active', v.deleteStyle)
-  end
-  c.move('active', cx-v.x, cy-v.y)
-  v.x = cx
-  v.y = cy
-end
-
-# rulerReleaseTab --
-# This method is invoked during button release events that end
-# a tab drag operation.  It deselects the tab and deletes the tab if
-# it was dragged out of the ruler.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse.
-
-def rulerReleaseTab(c)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  if v.y != v.top+2
-    c.delete('active')
-  else
-    c.itemconfigure('active', v.normalStyle)
-    c.dtag('active')
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/sayings.rb b/ext/tk/sample/demos-en/sayings.rb
deleted file mode 100644
index 4ba3097bed..0000000000
--- a/ext/tk/sample/demos-en/sayings.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# sayings.rb
-#
-# This demonstration script creates a listbox that can be scrolled
-# both horizontally and vertically.  It displays a collection of
-# well-known sayings.
-#
-# listbox widget demo 'sayings' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($sayings_demo) && $sayings_demo
-  $sayings_demo.destroy 
-  $sayings_demo = nil
-end
-
-# demo toplevel widget
-$sayings_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (well-known sayings)")
-  iconname("sayings")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($sayings_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "The listbox below contains a collection of well-known sayings.  You can scan the list using either of the scrollbars or by dragging in the listbox window with button 2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($sayings_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $sayings_demo
-      $sayings_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'sayings'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-sayings_lbox = nil
-TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
-  sv = TkScrollbar.new(w)
-  sh = TkScrollbar.new(w, 'orient'=>'horizontal')
-  sayings_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  20
-    height 10
-    yscrollcommand proc{|first,last| sv.set first,last}
-    xscrollcommand proc{|first,last| sh.set first,last}
-  }
-  sv.command(proc{|*args| sayings_lbox.yview(*args)})
-  sh.command(proc{|*args| sayings_lbox.xview(*args)})
-
-  if $tk_version =~ /^4\.[01]/
-    sv.pack('side'=>'right', 'fill'=>'y')
-    sh.pack('side'=>'bottom', 'fill'=>'x')
-    sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
-
-  else
-    sayings_lbox.grid('row'=>0, 'column'=>0, 
-		      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sv.grid('row'=>0, 'column'=>1, 
-	    'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sh.grid('row'=>1, 'column'=>0, 
-	    'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-  end
-
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-sayings_lbox.insert(0,
-"Waste not, want not",
-"Early to bed and early to rise makes a man healthy, wealthy, and wise",
-"Ask not what your country can do for you, ask what you can do for your country",
-"I shall return",
-"NOT",
-"A picture is worth a thousand words",
-"User interfaces are hard to build",
-"Thou shalt not steal",
-"A penny for your thoughts",
-"Fool me once, shame on you;  fool me twice, shame on me",
-"Every cloud has a silver lining",
-"Where there's smoke there's fire",
-"It takes one to know one",
-"Curiosity killed the cat; but satisfaction brought it back",
-"Take this job and shove it",
-"Up a creek without a paddle",
-"I'm mad as hell and I'm not going to take it any more",
-"An apple a day keeps the doctor away",
-"Don't look a gift horse in the mouth"
-)
-
diff --git a/ext/tk/sample/demos-en/search.rb b/ext/tk/sample/demos-en/search.rb
deleted file mode 100644
index 2b27cdbb42..0000000000
--- a/ext/tk/sample/demos-en/search.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# search.rb
-#
-# This demonstration script creates a collection of widgets that
-# allow you to load a file into a text widget, then perform searches
-# on that file.
-#
-# Text Search widget demo (called by 'widget')
-#
-
-# textLoadFile --
-# This method below loads a file into a text widget, discarding
-# the previous contents of the widget. Tags for the old widget are
-# not affected, however.
-#
-# Arguments:
-# w -		The window into which to load the file.  Must be a
-#		text widget.
-# file -	The name of the file to load.  Must be readable.
-
-def textLoadFile(w,file)
-  w.delete('1.0', 'end')
-  f = open(file, 'r')
-  while(!f.eof?)
-    w.insert('end', f.read(1000))
-  end
-  f.close
-end
-
-# textSearch --
-# Search for all instances of a given string in a text widget and
-# apply a given tag to each instance found.
-#
-# Arguments:
-# w -		The window in which to search.  Must be a text widget.
-# string -	The string to search for.  The search is done using
-#		exact matching only;  no special characters.
-# tag -		Tag to apply to each instance of a matching string.
-
-def textSearch(w, string, tag)
-  tag.remove('0.0', 'end')
-  return if string == ""
-  cur = '1.0'
-  loop {
-    cur, len = w.search_with_length(string, cur, 'end')
-    break if cur == ""
-    tag.add(cur, "#{cur} + #{len} char")
-    cur = w.index("#{cur} + #{len} char")
-  }
-end
-
-# textToggle --
-# This method is invoked repeatedly to invoke two commands at
-# periodic intervals.  It normally reschedules itself after each
-# execution but if an error occurs (e.g. because the window was
-# deleted) then it doesn't reschedule itself.
-#
-# Arguments:
-# cmd1 -	Command to execute when method is called.
-# sleep1 -	Ms to sleep after executing cmd1 before executing cmd2.
-# cmd2 -	Command to execute in the *next* invocation of this method.
-# sleep2 -	Ms to sleep after executing cmd2 before executing cmd1 again.
-
-def textToggle(cmd1,sleep1,cmd2,sleep2)
-  sleep_list = [sleep2, sleep1]
-  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep}, 
-	      -1, cmd1, cmd2).start(sleep1)
-end
-
-# toplevel widget
-if defined?($search_demo) && $search_demo
-  $search_demo.destroy 
-  $search_demo = nil
-end
-
-# demo toplevel widget
-$search_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Search and Highlight")
-  iconname("search")
-  positionWindow(w)
-}
-
-# frame
-$search_buttons = TkFrame.new($search_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $search_demo
-      $search_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'search'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-TkFrame.new($search_demo) {|f|
-  TkLabel.new(f, 'text'=>'File name:', 
-	      'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_fileName = TkVariable.new
-  TkEntry.new(f, 'width'=>40, 
-	      'textvariable'=>$search_fileName) {
-    pack('side'=>'left')
-    bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
-	                $search_string_entry.focus})
-    focus
-  }
-  TkButton.new(f, 'text'=>'Load File', 
-	       'command'=>proc{textLoadFile($search_text, 
-					    $search_fileName.value)})\
-  .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-}.pack('side'=>'top', 'fill'=>'x')
-
-TkFrame.new($search_demo) {|f|
-  TkLabel.new(f, 'text'=>'Search string:', 
-	      'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_searchString = TkVariable.new
-  $search_string_entry = TkEntry.new(f, 'width'=>40, 
-				     'textvariable'=>$search_searchString) {
-    pack('side'=>'left')
-    bind('Return', proc{textSearch($search_text, $search_searchString.value, 
-				   $search_Tag)})
-  }
-  TkButton.new(f, 'text'=>'Highlight', 
-	       'command'=>proc{textSearch($search_text, 
-					  $search_searchString.value, 
-					  $search_Tag)}) {
-    pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-  }
-}.pack('side'=>'top', 'fill'=>'x')
-
-$search_text = TkText.new($search_demo, 'setgrid'=>true) {|t|
-  $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new($search_demo, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
-    t.yscrollcommand(proc{|first,last| sc.set first,last})
-    pack('side'=>'right', 'fill'=>'y')
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-}  
-
-# Set up display styles for text highlighting.
-
-if TkWinfo.depth($search_demo) > 1
-  textToggle(proc{
-	       begin
-		 $search_Tag.configure('background'=>'#ce5555', 
-				       'foreground'=>'white')
-	       rescue
-	       end
-	     },
-	     800, 
-	     proc{
-	       begin
-		 $search_Tag.configure('background'=>'', 'foreground'=>'')
-	       rescue
-	       end
-	     },
-	     200 )
-else
-  textToggle(proc{
-	       begin
-		 $search_Tag.configure('background'=>'black', 
-				       'foreground'=>'white')
-	       rescue
-	       end
-	     },
-	     800, 
-	     proc{
-	       begin
-		 $search_Tag.configure('background'=>'', 'foreground'=>'')
-	       rescue
-	       end
-	     },
-	     200 )
-end
-$search_text.insert('1.0', '\
-This window demonstrates how to use the tagging facilities in text
-widgets to implement a searching mechanism.  First, type a file name
-in the top entry, then type <Return> or click on "Load File".  Then
-type a string in the lower entry and type <Return> or click on
-"Load File".  This will cause all of the instances of the string to
-be tagged with the tag "search", and it will arrange for the tag\'s
-display attributes to change to make all of the strings blink.')
-$search_text.set_insert '0.0'
-
-$search_fileName.value = ''
-$search_searchString.value = ''
-
diff --git a/ext/tk/sample/demos-en/spin.rb b/ext/tk/sample/demos-en/spin.rb
deleted file mode 100644
index 5d32454170..0000000000
--- a/ext/tk/sample/demos-en/spin.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# spin.rb --
-#
-# This demonstration script creates several spinbox widgets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($spin_demo) && $spin_demo
-  $spin_demo.destroy 
-  $spin_demo = nil
-end
-
-$spin_demo = TkToplevel.new {|w|
-  title("Spinbox Demonstration")
-  iconname("spin")
-  positionWindow(w)
-}
-
-TkLabel.new($spin_demo, 
-	    :font=>$font, :wraplength=>'5i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-Three different spin-boxes are displayed below.  \
-You can add characters by pointing, clicking and typing.  \
-The normal Motif editing characters are supported, along with \
-many Emacs bindings.  For example, Backspace and Control-h \
-delete the character to the left of the insertion cursor and \
-Delete and Control-d delete the chararacter to the right of the \
-insertion cursor.  For values that are too large to fit in the \
-window all at once, you can scan through the value by dragging \
-with mouse button2 pressed.  Note that the first spin-box will \
-only permit you to type in integers, and the third selects from \
-a list of Australian cities.
-If your Tk library linked to Ruby doesn't include a 'spinbox' widget, \
-this demo doesn't work. Please use later version of Tk \
-which supports a 'spinbox' widget.
-EOL
-
-TkFrame.new($spin_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-		 $spin_demo.destroy
-		 $spin_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-		 showCode 'spin'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-australianCities = [
-    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 
-    'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
-]
-
-[
-  TkSpinbox.new($spin_demo, :from=>1, :to=>10, :width=>10, :validate=>:key, 
-		:validatecommand=>[
-		  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-		]), 
-  TkSpinbox.new($spin_demo, :from=>0, :to=>3, :increment=>0.5, 
-		:format=>'%05.2f', :width=>10), 
-  TkSpinbox.new($spin_demo, :values=>australianCities, :width=>10)
-].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-en/square b/ext/tk/sample/demos-en/square
deleted file mode 100644
index 00bfde59ff..0000000000
--- a/ext/tk/sample/demos-en/square
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-
-# square --
-# This script generates a demo application containing only 
-# a "square" widget.  It's only usable if Tk has been compiled 
-# with tkSquare.c and with the -DSQUARE_DEMO compiler switch. 
-# This demo arranges the following bindings for the widget: 
-#
-# Button-1 press/drag:          moves square to mouse
-# "a":                          toggle size animation on/off
-#
-
-require 'tk'
-require 'tkafter'
-
-class TkSquare<TkWindow
-  def create_self
-    begin
-      tk_call 'square', path
-    rescue
-      STDERR.print "\nSorry. Your Tk interpreter does not contain " +
-	'a "square" demonstration widget.' + 
-	"\n ( See documents included the Tcl/Tk source archive. )\n\n"
-      exit
-    end
-  end
-  def size(amount=nil)
-    if amount
-      tk_send 'size', amount
-    else
-      number(tk_send('size'))
-    end
-  end
-  def position(x,y)
-    tk_send 'position', x, y
-  end
-end
-
-$s = TkSquare.new{
-  pack('expand'=>'yes', 'fill'=>'both')
-  bind('1', proc{|x,y| center(x,y)}, '%s %y')
-  bind('B1-Motion', proc{|x,y| center(x,y)}, '%s %y')
-  bind('a', proc{animate})
-  focus
-}
-TkRoot.new.minsize(1,1)
-
-# The procedure below centers the square on a given position.
-
-def center(x,y)
-  a = $s.size
-  $s.position(x-(a/2), y-(a/2))
-end
-
-# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger, 
-# and so on.
-
-$inc = 0
-
-def timer_proc
-  a = $s.size
-  return if $inc == 0
-  $inc = -3 if a >= 40
-  $inc =  3 if a <= 10
-  $s.size(a+$inc)
-end
-
-$timer = TkAfter.new(30, -1, proc{timer_proc})
-
-def animate
-  if $inc == 0
-    $inc = 3
-    $timer.start
-  else
-    $inc = 0
-    $timer.stop
-  end
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/states.rb b/ext/tk/sample/demos-en/states.rb
deleted file mode 100644
index d38c1245af..0000000000
--- a/ext/tk/sample/demos-en/states.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# states.rb
-#
-# This demonstration script creates a listbox widget that displays
-# the names of the 50 states in the United States of America.
-#
-# listbox widget demo 'states' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($states_demo) && $states_demo
-  $states_demo.destroy 
-  $states_demo = nil
-end
-
-# demo toplevel widget
-$states_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (states)")
-  iconname("states")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($states_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A listbox containing the 50 states is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by scanning.  To scan, press button 2 in the widget and drag up or down."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($states_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $states_demo
-      $states_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'states'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-states_lbox = nil
-TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
-  s = TkScrollbar.new(w)
-  states_lbox = TkListbox.new(w) {
-    setgrid 1
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| states_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  states_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-ins_data = [
-  'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California', 
-  'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia', 
-  'Hawaii', 'Idaho', 'Illinois', 
-  'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland', 
-  'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri', 
-  'Montana', 'Nebraska', 'Nevada', 'New_Hampshire', 'New_Jersey', 'New_Mexico', 
-  'New_York', 'North_Carolina', 'North_Dakota', 
-  'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode_Island', 
-  'South_Carolina', 'South_Dakota', 
-  'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington', 
-  'West_Virginia', 'Wisconsin', 'Wyoming'
-]
-
-states_lbox.insert(0, *ins_data)
-
diff --git a/ext/tk/sample/demos-en/style.rb b/ext/tk/sample/demos-en/style.rb
deleted file mode 100644
index 8bf9c09662..0000000000
--- a/ext/tk/sample/demos-en/style.rb
+++ /dev/null
@@ -1,211 +0,0 @@
-# style.rb
-#
-# This demonstration script creates a text widget that illustrates the
-# various display styles that may be set for tags.
-#
-# text (display styles) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($style_demo) && $style_demo
-  $style_demo.destroy 
-  $style_demo = nil
-end
-
-# demo toplevel widget
-$style_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Display Styles")
-  iconname("style")
-  positionWindow(w)
-}
-
-# frame
-TkFrame.new($style_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $style_demo
-      $style_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'style'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text 
-TkText.new($style_demo){|t|
-  # 
-  setgrid 'true'
-  width  70
-  height 32
-  wrap 'word'
-  TkScrollbar.new($style_demo) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # 
-  style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-  style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-    style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-###
-#  case($tk_version)
-#  when /^4.*/
-#    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-#  when /^8.*/
-#    unless $style_demo_do_first
-#      $style_demo_do_first = true
-#      Tk.tk_call('font', 'create', '@bigascii', 
-#		 '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-#      Tk.tk_call('font', 'create', '@smallascii', 
-#		 '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-#      Tk.tk_call('font', 'create', '@cBigFont', 
-#		 '-compound', '@bigascii @msg_knj')
-#      Tk.tk_call('font', 'create', '@cSmallFont', 
-#		 '-compound', '@smallascii @kanji')
-#    end
-#    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
-#  end
-
-  # 
-  if TkWinfo.depth($root).to_i > 1
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
-    style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
-    style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
-  else
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'black', 
-				     'foreground'=>'white')
-    style_tag_color2 = TkTextTag.new(t, 'background'=>'black', 
-				     'foreground'=>'white')
-    style_tag_raised = TkTextTag.new(t, 'background'=>'white', 
-				     'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'background'=>'white', 
-				     'relief'=>'sunken', 'borderwidth'=>1)
-  end
-
-  # �ƥ����ȥ������� (����¾)
-  if $tk_version =~ /^4\.[01]/
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-					'borderwidth'=>0, 
-					'bgstipple'=>'gray25')
-  else
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-					'borderwidth'=>0, 
-					'bgstipple'=>'gray12')
-  end
-  style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
-  style_tag_underline = TkTextTag.new(t, 'underline'=>'on')
-  style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
-  style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
-  style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
-				    'rmargin'=>'10m')
-  style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
-				    'lmargin1'=>'12m', 'lmargin2'=>'6m',
-				    'rmargin'=>'10m')
-
-  # 
-  insert('end', 'Text widgets like this one allow you to display information in a
-variety of styles.  Display styles are controlled using a mechanism
-called ')
-  insert('end', 'tags', style_tag_big)
-  insert('end', '. Tags are just textual names that you can apply to one
-or more ranges of characters within a text widget.  You can configure
-tags with various display styles.  If you do this, then the tagged
-characters will be displayed with the styles you chose.  The
-available display styles are:
-')
-  insert('end', "\n1. Font.", style_tag_big)
-  insert('end', "  You can choose any X font, ")
-  insert('end', "large", style_tag_verybig)
-  insert('end', " or ")
-  insert('end', "small.\n")
-  insert('end', "\n2. Color.", style_tag_big)
-  insert('end', "  You can change either the ")
-  insert('end', "background", style_tag_color1)
-  insert('end', " or ")
-  insert('end', "foreground", style_tag_color2)
-  insert('end', "\ncolor, or ")
-  insert('end', "both", style_tag_color1, style_tag_color2)
-  insert('end', ".\n")
-  insert('end', "\n3. Stippling.", style_tag_big)
-  insert('end', "  You can cause either the ")
-  insert('end', "background", style_tag_bgstipple)
-  insert('end', " or ")
-  insert('end', "foreground", style_tag_fgstipple)
-  insert('end', "\ninformation to be drawn with a stipple fill instead of a solid fill.\n")
-  insert('end', "\n4. Underlining.", style_tag_big)
-  insert('end', "  You can ")
-  insert('end', "underline", style_tag_underline)
-  insert('end', " ranges of text.\n")
-  insert('end', "\n5. Overstrikes.", style_tag_big)
-  insert('end', "  You can ")
-  insert('end', "draw lines through", style_tag_overstrike)
-  insert('end', " ranges of text.\n")
-  insert('end', "\n6. 3-D effects.", style_tag_big)
-  insert('end', "  You can arrange for the background to be drawn\nwith a border that makes characters appear either\n")
-  insert('end', "raised", style_tag_raised)
-  insert('end', " or ")
-  insert('end', "sunken", style_tag_sunken)
-  insert('end', ".\n")
-  insert('end', "\n7. Justification.", style_tag_big)
-  insert('end', " You can arrange for lines to be displayed\n")
-  insert('end', "left-justified,\n")
-  insert('end', "right-justified, or\n", style_tag_right)
-  insert('end', "centered.\n", style_tag_center)
-  insert('end', "\n8. Superscripts and subscripts.", style_tag_big)
-  insert('end', " You can control the vertical\n")
-  insert('end', "position of text to generate superscript effects like 10")
-  insert('end', "n", style_tag_super)
-  insert('end', " or\nsubscript effects like X")
-  insert('end', "i", style_tag_sub)
-  insert('end', ".\n")
-  insert('end', "\n9. Margins.", style_tag_big)
-  insert('end', " You can control the amount of extra space left")
-  insert('end', " on\neach side of the text:\n")
-  insert('end', "This paragraph is an example of the use of ", style_tag_margins)
-  insert('end', "margins.  It consists of a single line of text ", style_tag_margins)
-  insert('end', "that wraps around on the screen.  There are two ", style_tag_margins)
-  insert('end', "separate left margin values, one for the first ", style_tag_margins)
-  insert('end', "display line associated with the text line, ", style_tag_margins)
-  insert('end', "and one for the subsequent display lines, which ", style_tag_margins)
-  insert('end', "occur because of wrapping.  There is also a ", style_tag_margins)
-  insert('end', "separate specification for the right margin, ", style_tag_margins)
-  insert('end', "which is used to choose wrap points for lines.\n", style_tag_margins)
-  insert('end', "\n10. Spacing.", style_tag_big)
-  insert('end', " You can control the spacing of lines with three\n")
-  insert('end', "separate parameters.  \"Spacing1\" tells how much ")
-  insert('end', "extra space to leave\nabove a line, \"spacing3\" ")
-  insert('end', "tells how much space to leave below a line,\nand ")
-  insert('end', "if a text line wraps, \"spacing2\" tells how much ")
-  insert('end', "space to leave\nbetween the display lines that ")
-  insert('end', "make up the text line.\n")
-  insert('end', "These indented paragraphs illustrate how spacing ", style_tag_spacing)
-  insert('end', "can be used.  Each paragraph is actually a ", style_tag_spacing)
-  insert('end', "single line in the text widget, which is ", style_tag_spacing)
-  insert('end', "word-wrapped by the widget.\n", style_tag_spacing)
-  insert('end', "Spacing1 is set to 10 points for this text, ", style_tag_spacing)
-  insert('end', "which results in relatively large gaps between ", style_tag_spacing)
-  insert('end', "the paragraphs.  Spacing2 is set to 2 points, ", style_tag_spacing)
-  insert('end', "which results in just a bit of extra space ", style_tag_spacing)
-  insert('end', "within a pararaph.  Spacing3 isn't used ", style_tag_spacing)
-  insert('end', "in this example.\n", style_tag_spacing)
-  insert('end', "To see where the space is, select ranges of ", style_tag_spacing)
-  insert('end', "text within these paragraphs.  The selection ", style_tag_spacing)
-  insert('end', "highlight will cover the extra space.", style_tag_spacing)
-
-}
-
diff --git a/ext/tk/sample/demos-en/tcolor b/ext/tk/sample/demos-en/tcolor
deleted file mode 100644
index 6d023f0f8b..0000000000
--- a/ext/tk/sample/demos-en/tcolor
+++ /dev/null
@@ -1,519 +0,0 @@
-#!/usr/bin/env ruby
-#
-# tcolor --
-# ���Υ�����ץȤ�RGB,HSB,CYM�����򥵥ݡ��Ȥ���
-# �ʰץ��顼���ǥ����Ǥ���
-#
-# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
-# last update: Thu Jun 18 06:32:35 JST 1998
-#
-
-# �ޤ���tk.rb���ɤ߹��ࡣ
-
-require "tk"
-
-
-# Tk�ˤ�ä��ѹ�������ѿ���TkVariable�Υ��󥹥��󥹤�Ȥ���
-
-$colorSpace = TkVariable.new(:rgb)
-$red = 65535
-$green = 0
-$blue = 0
-$color = "#ffff00000000"
-$updating = TkVariable.new(0)
-$autoUpdate = TkVariable.new(1)
-$name = TkVariable.new("")
-# $command = TkVariable.new("print(%%,\"\n\")")
-$command = TkVariable.new("")
-$label1 = TkVariable.new("label1")
-$label2 = TkVariable.new("label2")
-$label3 = TkVariable.new("label3")
-
-
-# setup the entry of the resourc database
-if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
-  TkOptionDB.add('*Entry.background', 'white')
-end
-
-
-# �ƥ��٥���ѤΥ᥽�å�
-
-def rgbToHsv(red,green,blue)
-
-  if ( red > green )
-    max = red
-    min = green
-  else
-    max = green
-    min = red
-  end
-
-  if ( blue > max )
-    max = blue
-  else
-    if ( blue < min )
-      min = blue
-    end
-  end
-
-  range = max - min
-
-  if ( max == 0 )
-    sat = 0.0
-  else
-    sat = (max-min)/max
-  end
-
-  if ( sat == 0 )
-    hue = 0.0
-  else
-    rc = (max-red)/range
-    gc = (max-green)/range
-    bc = (max-blue)/range
-    if ( red == max )
-      hue = 0.166667 * (bc - gc)
-    else
-      if ( green == max )
-	hue = 0.166667 * (2.0 + rc - bc)
-      else
-	hue = 0.166667 * (4.0 + gc - rc)
-      end
-    end
-    if ( hue < 0.0 )
-      hue = hue + 1.0
-    end
-  end
-
-  [hue,sat,max/65535]
-end
-
-
-def hsbToRgb(hue,sat,value)
-  v = 65535.0 * value
-  if( sat == 0 )
-    ans = [v,v,v]
-  else
-    hue = hue*6.0
-    if ( hue >= 6 )
-      hue = 0.0
-    end
-    i = hue.to_i
-    f = hue - i
-    p = 65535.0 * value * (1.0 - sat)
-    q = 65535.0 * value * (1.0 - (sat * f))
-    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
-    case i
-    when 0
-      ans = [v,t,p]
-    when 1
-      ans = [q,v,p]
-    when 2
-      ans = [p,v,t]
-    when 3
-      ans = [p,q,v]
-    when 4
-      ans = [t,p,v]
-    when 5
-      ans = [v,p,q]
-    else
-      raise(eException,"i value #{i} is out of range")
-    end
-  end
-  return ans
-end
-
-
-def doUpdate 
-  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
-  eval(newCmd)
-end
-
-
-def tc_scaleChanged
-  if( $updating.to_i == 1 )
-    return 
-  end
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    $red = (scale1.get * 65.535).to_i
-    $green = (scale2.get * 65.535).to_i
-    $blue = (scale3.get * 65.535).to_i
-  when :cmy
-    $red = (65535 - scale1.get * 65.535).to_i
-    $green = (65535 - scale2.get * 65.535).to_i
-    $blue = (65535 - scale3.get * 65.535).to_i        
-  when :hsb
-    list = hsbToRgb(scale1.get / 1000.0,
-		    scale2.get / 1000.0,
-		    scale3.get / 1000.0)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
-  $root.middle.right.set_color($color)
-  if( $autoUpdate.to_i == 1 )
-    doUpdate
-  end
-  Tk.update(TRUE)
-end
-
-
-def tc_setScales
-  $updating.value = 1
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-  
-  case $colorSpace.value.intern
-  when :rgb
-    scale1.set($red / 65.535)
-    scale2.set($green / 65.535)
-    scale3.set($blue / 65.535)
-  when :cmy
-    scale1.set((65535 - $red) / 65.535)
-    scale2.set((65535 - $green) / 65.535)
-    scale3.set((65535 - $blue) / 65.535)
-  when :hsb
-    list = rgbToHsv($red,$green,$blue)
-    scale1.set( list[0] * 1000.0 )
-    scale2.set( list[1] * 1000.0 )
-    scale3.set( list[2] * 1000.0 )
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-
-  $updating.value = 0
-end
-
-
-def tc_loadNamedColor(name)
-  if name[0,1] != "#" 
-    list = TkWinfo.rgb($root.middle.right.swatch,name)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    case name.length
-    when 4
-      format = /#(.{1})(.{1})(.{1})/
-      shift = 12
-    when 7
-      format = /#(.{2})(.{2})(.{2})/
-      shift = 8
-    when 10
-      format = /#(.{3})(.{3})(.{3})/
-      shift = 4
-    when 13
-      format = /#(.{4})(.{4})(.{4})/
-      shift = 0
-    else
-      raise(eException,"syntax error in color name \"#{name}\"")
-    end
-    name.scan(format){|strlist|
-      if strlist.length != 3
-	raise(eException,"syntax error in color name \"#{name}\"")
-      end
-      $red = strlist[0].to_i
-      $green = strlist[1].to_i
-      $blue = strlist[2].to_i
-    }
-    $red = $red << shift
-    $green = $green << shift
-    $blue = $blue << shift
-  end
-  
-  tc_setScales
-  $color = format("#%04x%04x%04x",$red,$green,$blue)
-  $root.middle.right.set_color($color)
-  if $autoUpdate.to_i == 1
-    doUpdate
-  end
-end
-
-
-def changeColorSpace(space)
-  case space
-  when :rgb
-    $label1.value = "Red"
-    $label2.value = "Green"
-    $label3.value = "Blue"
-  when :cmy
-    $label1.value = "Cyan"
-    $label2.value = "Magenta"
-    $label3.value = "Yellow"
-  when :hsb
-    $label1.value = "Hue"
-    $label2.value = "Saturation"
-    $label3.value = "Brightness"
-  end
-  tc_setScales
-end
-
-
-
-
-
-# tcolor�ѤΥ�˥塼
-
-class TkColorMenuFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=>"raised",
-	  "borderwidth"=>"2")
-
-    # File��˥塼�ܥ��������
-    @file = TkMenubutton.new(self){|button|
-
-      # File��˥塼�κ���
-      @file_menu = TkMenu.new(button){
-	add "radio",
-	  "label" => "RGB color space",
-	  "variable" => $colorSpace,
-	  "value" => :rgb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:rgb)}
-	add "radio",
-	  "label" => "CMY color space",
-	  "variable" => $colorSpace,
-	  "value" => :cmy,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:cmy)}
-	add "radio",
-	  "label" => "HSB color space",
-	  "variable" => $colorSpace,
-	  "value" => :hsb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:hsb)}
-	add "separator"
-	add "radio",
-	  "label" => "Automatic updates",
-	  "variable" => $autoUpdate,
-	  "value" => "1",
-	  "underline" => "0"
-	add "radio",
-	  "label" => "Manual updates",
-	  "variable" => $autoUpdate,
-	  "value" => "0",
-	  "underline" => "0"
-	add "separator"
-	add "command",
-	  "label" => "Exit program",
-	  "underline" => "0",
-	  "command" => proc{exit}
-      }
-      
-      # File��˥塼��File�ܥ�����Ϣ�դ���
-      menu @file_menu
-
-      text "File"
-      underline "0"
-    }.pack("side"=>"left")
-
-    self
-  end
-end
-
-
-# �����Υե졼��Τ���Υ��饹
-class TkColorBotFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> 2)
-
-    @commandLabel = TkLabel.new(self,
-				"text"=> "Command:")
-    @command = TkEntry.new(self,
-			   "relief"=> "sunken",
-			   "borderwidth"=> "2",
-			   "textvariable"=> $command,
-			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @update = TkButton.new(self,
-			   "text"=> "Update",
-			   "command"=> proc{doUpdate})
-    @commandLabel.pack("side"=>"left")
-    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
-    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
-
-    self
-  end
-end    
-
-
-# ���ʺ��Υե졼��
-class TkColorMiddleLeftFrame<TkFrame
-  def initialize(parent)
-    super(parent)
-
-    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
-	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
-	"/usr/openwin/lib/X11/rgb.txt"]
-      if !File.readable?(i)
-	next
-      end
-      f = File.open(i)
-      @scroll = TkScrollbar.new(self,
-				"orient"=>"vertical",
-				"relief"=>"sunken",
-				"borderwidth"=>"2")
-      @scroll.pack("side"=>"right","fill"=>"y")
-      @names = TkListbox.new(self,
-			     "width"=>"20",
-			     "height"=>"12",
-			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
-			     "relief"=>"sunken",
-			     "borderwidth"=>"2",
-			     "exportselection"=>"false")
-      @scroll.command(proc{|*args| @names.yview(*args)})
-      @names.bind("Double-1",proc{
-		    tc_loadNamedColor(@names.get(@names.curselection))})
-      @names.pack("side"=>"left")
-      while (line = f.gets)
-	line.chop!
-	linelist = line.split(/[ \t]+/)
-	if linelist.length == 4
-	  @names.insert("end",linelist[3])
-	end
-      end
-      f.close
-      break
-    end
-
-    self
-  end
-end
-
-
-# ��������Υե졼��
-class TkColorMiddleMiddleFrame<TkFrame
-  # @scale1,@scale2,@scale3�������黲�ȤΤߵ��Ĥ��롣(�ѹ��Բ�)
-  attr_reader :scale1, :scale2, :scale3
-
-  def initialize(parent)
-    super(parent)
-
-    @f1 = TkFrame.new(self)
-    @f2 = TkFrame.new(self)
-    @f3 = TkFrame.new(self)
-    @f4 = TkFrame.new(self)
-
-    for f in [@f1,@f2,@f3]
-      f.pack("side"=>"top","expand"=>"yes")
-    end
-    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
-
-    @label1 = TkLabel.new(self,"textvariable"=>$label1)
-    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale1.pack("side"=>"top","anchor"=>"w")
-    @label1.pack("side"=>"top","anchor"=>"w")
-
-    @label2 = TkLabel.new(self,"textvariable"=>$label2)
-    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale2.pack("side"=>"top","anchor"=>"w")
-    @label2.pack("side"=>"top","anchor"=>"w")
-
-    @label3 = TkLabel.new(self,"textvariable"=>$label3)
-    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale3.pack("side"=>"top","anchor"=>"w")
-    @label3.pack("side"=>"top","anchor"=>"w")
-
-    @nameLabel = TkLabel.new(self,"text"=>"Name:")
-    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
-			"textvariable"=>$name,"width"=>"10",
-			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @nameLabel.pack("side"=>"left")
-    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
-    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
-
-    self
-  end
-end
-
-
-class TkColorMiddleRightFrame<TkFrame
-  attr_reader :swatch
-
-  def initialize(parent)
-    super(parent)
-    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
-			  "background"=>$color)
-    @value = TkLabel.new(self, 
-			 "text"=>$color,
-			 "width"=>"13",
-			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
-    @value.pack("side"=>"bottom","pady"=>".25c")
-
-    self
-  end
-
-  def set_color(color)
-    @swatch["background"] = color
-    @value["text"] = color
-  end
-end
-
-
-
-# ���ʤΥե졼��
-class TkColorMiddleFrame<TkFrame
-  attr_reader :left, :middle, :right
-
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> "2")
-
-    @left = TkColorMiddleLeftFrame.new(self)
-    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
-
-    @middle = TkColorMiddleMiddleFrame.new(self)
-    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
-
-    @right = TkColorMiddleRightFrame.new(self)
-    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
-
-    self
-  end
-end
-
-
-class TkColor<TkRoot
-  attr_reader :menu, :bottom, :middle
-
-  def initialize(*args)
-    super(*args)
-    @menu = TkColorMenuFrame.new(self)
-    @menu.pack("side"=>"top", "fill"=>"x")
-
-    @bottom = TkColorBotFrame.new(self)
-    @bottom.pack("side"=>"bottom","fill"=>"x")
-
-    @middle = TkColorMiddleFrame.new(self)
-    @middle.pack("side"=>"top","fill"=>"both")
-
-    self
-  end
-end
-
-
-$root = TkColor.new
-
-# ���٥�Ȥ��Ԥİ٤˥롼�פ����롣
-changeColorSpace :rgb
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/tcolor.bak b/ext/tk/sample/demos-en/tcolor.bak
deleted file mode 100644
index 5464aebae2..0000000000
--- a/ext/tk/sample/demos-en/tcolor.bak
+++ /dev/null
@@ -1,513 +0,0 @@
-#!/usr/local/bin/ruby
-#
-# tcolor --
-# ���Υ�����ץȤ�RGB,HSB,CYM�����򥵥ݡ��Ȥ���
-# �ʰץ��顼���ǥ����Ǥ���
-#
-# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
-# last update: Thu Jun 18 06:32:35 JST 1998
-#
-
-# �ޤ���tk.rb���ɤ߹��ࡣ
-
-require "tk"
-
-
-# Tk�ˤ�ä��ѹ�������ѿ���TkVariable�Υ��󥹥��󥹤�Ȥ���
-
-$colorSpace = TkVariable.new(:rgb)
-$red = 65535
-$green = 0
-$blue = 0
-$color = "#ffff00000000"
-$updating = TkVariable.new(0)
-$autoUpdate = TkVariable.new(1)
-$name = TkVariable.new("")
-# $command = TkVariable.new("print(%%,\"\n\")")
-$command = TkVariable.new("")
-$label1 = TkVariable.new("label1")
-$label2 = TkVariable.new("label2")
-$label3 = TkVariable.new("label3")
-
-
-# �ƥ��٥���ѤΥ᥽�å�
-
-def rgbToHsv(red,green,blue)
-
-  if ( red > green )
-    max = red
-    min = green
-  else
-    max = green
-    min = red
-  end
-
-  if ( blue > max )
-    max = blue
-  else
-    if ( blue < min )
-      min = blue
-    end
-  end
-
-  range = max - min
-
-  if ( max == 0 )
-    sat = 0.0
-  else
-    sat = (max-min)/max
-  end
-
-  if ( sat == 0 )
-    hue = 0.0
-  else
-    rc = (max-red)/range
-    gc = (max-green)/range
-    bc = (max-blue)/range
-    if ( red == max )
-      hue = 0.166667 * (bc - gc)
-    else
-      if ( green == max )
-	hue = 0.166667 * (2.0 + rc - bc)
-      else
-	hue = 0.166667 * (4.0 + gc - rc)
-      end
-    end
-    if ( hue < 0.0 )
-      hue = hue + 1.0
-    end
-  end
-
-  [hue,sat,max/65535]
-end
-
-
-def hsbToRgb(hue,sat,value)
-  v = 65535.0 * value
-  if( sat == 0 )
-    ans = [v,v,v]
-  else
-    hue = hue*6.0
-    if ( hue >= 6 )
-      hue = 0.0
-    end
-    i = hue.to_i
-    f = hue - i
-    p = 65535.0 * value * (1.0 - sat)
-    q = 65535.0 * value * (1.0 - (sat * f))
-    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
-    case i
-    when 0
-      ans = [v,t,p]
-    when 1
-      ans = [q,v,p]
-    when 2
-      ans = [p,v,t]
-    when 3
-      ans = [p,q,v]
-    when 4
-      ans = [t,p,v]
-    when 5
-      ans = [v,p,q]
-    else
-      raise(eException,"i value #{i} is out of range")
-    end
-  end
-  return ans
-end
-
-
-def doUpdate 
-  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
-  eval(newCmd)
-end
-
-
-def tc_scaleChanged
-  if( $updating.to_i == 1 )
-    return 
-  end
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.to_i
-  when :rgb
-    $red = (scale1.get * 65.535).to_i
-    $green = (scale2.get * 65.535).to_i
-    $blue = (scale3.get * 65.535).to_i
-  when :cmy
-    $red = (65535 - scale1.get * 65.535).to_i
-    $green = (65535 - scale2.get * 65.535).to_i
-    $blue = (65535 - scale3.get * 65.535).to_i        
-  when :hsb
-    list = hsbToRgb(scale1.get / 1000.0,
-		    scale2.get / 1000.0,
-		    scale3.get / 1000.0)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
-  $root.middle.right.set_color($color)
-  if( $autoUpdate.to_i == 1 )
-    doUpdate
-  end
-  Tk.update(TRUE)
-end
-
-
-def tc_setScales
-  $updating.value = 1
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-  
-  case $colorSpace.to_i
-  when :rgb
-    scale1.set($red / 65.535)
-    scale2.set($green / 65.535)
-    scale3.set($blue / 65.535)
-  when :cmy
-    scale1.set((65535 - $red) / 65.535)
-    scale2.set((65535 - $green) / 65.535)
-    scale3.set((65535 - $blue) / 65.535)
-  when :hsb
-    list = rgbToHsv($red,$green,$blue)
-    scale1.set( list[0] * 1000.0 )
-    scale2.set( list[1] * 1000.0 )
-    scale3.set( list[2] * 1000.0 )
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-
-  $updating.value = 0
-end
-
-
-def tc_loadNamedColor(name)
-  if name[0,1] != "#" 
-    list = TkWinfo.rgb($root.middle.right.swatch,name)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    case name.length
-    when 4
-      format = /#(.{1})(.{1})(.{1})/
-      shift = 12
-    when 7
-      format = /#(.{2})(.{2})(.{2})/
-      shift = 8
-    when 10
-      format = /#(.{3})(.{3})(.{3})/
-      shift = 4
-    when 13
-      format = /#(.{4})(.{4})(.{4})/
-      shift = 0
-    else
-      raise(eException,"syntax error in color name \"#{name}\"")
-    end
-    name.scan(format){|strlist|
-      if strlist.length != 3
-	raise(eException,"syntax error in color name \"#{name}\"")
-      end
-      $red = strlist[0].to_i
-      $green = strlist[1].to_i
-      $blue = strlist[2].to_i
-    }
-    $red = $red << shift
-    $green = $green << shift
-    $blue = $blue << shift
-  end
-  
-  tc_setScales
-  $color = format("#%04x%04x%04x",$red,$green,$blue)
-  $root.middle.right.set_color($color)
-  if $autoUpdate.to_i == 1
-    doUpdate
-  end
-end
-
-
-def changeColorSpace(space)
-  case space
-  when :rgb
-    $label1.value = "Red"
-    $label2.value = "Green"
-    $label3.value = "Blue"
-  when :cmy
-    $label1.value = "Cyan"
-    $label2.value = "Magenta"
-    $label3.value = "Yellow"
-  when :hsb
-    $label1.value = "Hue"
-    $label2.value = "Saturation"
-    $label3.value = "Brightness"
-  end
-  tc_setScales
-end
-
-
-
-
-
-# tcolor�ѤΥ�˥塼
-
-class TkColorMenuFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=>"raised",
-	  "borderwidth"=>"2")
-
-    # File��˥塼�ܥ��������
-    @file = TkMenubutton.new(self){|button|
-
-      # File��˥塼�κ���
-      @file_menu = TkMenu.new(button){
-	add "radio",
-	  "label" => "RGB color space",
-	  "variable" => $colorSpace,
-	  "value" => :rgb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:rgb)}
-	add "radio",
-	  "label" => "CMY color space",
-	  "variable" => $colorSpace,
-	  "value" => :cmy,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:cmy)}
-	add "radio",
-	  "label" => "HSB color space",
-	  "variable" => $colorSpace,
-	  "value" => :hsb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:hsb)}
-	add "separator"
-	add "radio",
-	  "label" => "Qutomatic updates",
-	  "variable" => $autoUpdate,
-	  "value" => "1",
-	  "underline" => "0"
-	add "radio",
-	  "label" => "Manual updates",
-	  "variable" => $autoUpdate,
-	  "value" => "0",
-	  "underline" => "0"
-	add "separator"
-	add "command",
-	  "label" => "Exit program",
-	  "underline" => "0",
-	  "command" => proc{exit}
-      }
-      
-      # File��˥塼��File�ܥ�����Ϣ�դ���
-      menu @file_menu
-
-      text "File"
-      underline "0"
-    }.pack("side"=>"left")
-
-    self
-  end
-end
-
-
-# �����Υե졼��Τ���Υ��饹
-class TkColorBotFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> 2)
-
-    @commandLabel = TkLabel.new(self,
-				"text"=> "Command:")
-    @command = TkEntry.new(self,
-			   "relief"=> "sunken",
-			   "borderwidth"=> "2",
-			   "textvariable"=> $command,
-			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @update = TkButton.new(self,
-			   "text"=> "Update",
-			   "command"=> proc{doUpdate})
-    @commandLabel.pack("side"=>"left")
-    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
-    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
-
-    self
-  end
-end    
-
-
-# ���ʺ��Υե졼��
-class TkColorMiddleLeftFrame<TkFrame
-  def initialize(parent)
-    super(parent)
-
-    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
-	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
-	"/usr/openwin/lib/X11/rgb.txt"]
-      if !File.readable?(i)
-	next
-      end
-      f = File.open(i)
-      @scroll = TkScrollbar.new(self,
-				"orient"=>"vertical",
-				"relief"=>"sunken",
-				"borderwidth"=>"2")
-      @scroll.pack("side"=>"right","fill"=>"y")
-      @names = TkListbox.new(self,
-			     "width"=>"20",
-			     "height"=>"12",
-			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
-			     "relief"=>"sunken",
-			     "borderwidth"=>"2",
-			     "exportselection"=>"false")
-      @scroll.command(proc{|*args| @names.yview *args})
-      @names.bind("Double-1",proc{
-		    tc_loadNamedColor(@names.get(@names.curselection))})
-      @names.pack("side"=>"left")
-      while (line = f.gets)
-	line.chop!
-	linelist = line.split(/[ \t]+/)
-	if linelist.length == 4
-	  @names.insert("end",linelist[3])
-	end
-      end
-      f.close
-      break
-    end
-
-    self
-  end
-end
-
-
-# ��������Υե졼��
-class TkColorMiddleMiddleFrame<TkFrame
-  # @scale1,@scale2,@scale3�������黲�ȤΤߵ��Ĥ��롣(�ѹ��Բ�)
-  attr_reader :scale1, :scale2, :scale3
-
-  def initialize(parent)
-    super(parent)
-
-    @f1 = TkFrame.new(self)
-    @f2 = TkFrame.new(self)
-    @f3 = TkFrame.new(self)
-    @f4 = TkFrame.new(self)
-
-    for f in [@f1,@f2,@f3]
-      f.pack("side"=>"top","expand"=>"yes")
-    end
-    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
-
-    @label1 = TkLabel.new(self,"textvariable"=>$label1)
-    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale1.pack("side"=>"top","anchor"=>"w")
-    @label1.pack("side"=>"top","anchor"=>"w")
-
-    @label2 = TkLabel.new(self,"textvariable"=>$label2)
-    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale2.pack("side"=>"top","anchor"=>"w")
-    @label2.pack("side"=>"top","anchor"=>"w")
-
-    @label3 = TkLabel.new(self,"textvariable"=>$label3)
-    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale3.pack("side"=>"top","anchor"=>"w")
-    @label3.pack("side"=>"top","anchor"=>"w")
-
-    @nameLabel = TkLabel.new(self,"text"=>"Name:")
-    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
-			"textvariable"=>$name,"width"=>"10",
-			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @nameLabel.pack("side"=>"left")
-    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
-    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
-
-    self
-  end
-end
-
-
-class TkColorMiddleRightFrame<TkFrame
-  attr_reader :swatch
-
-  def initialize(parent)
-    super(parent)
-    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
-			  "background"=>$color)
-    @value = TkLabel.new(self, 
-			 "text"=>$color,
-			 "width"=>"13",
-			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
-    @value.pack("side"=>"bottom","pady"=>".25c")
-
-    self
-  end
-
-  def set_color(color)
-    @swatch["background"] = color
-    @value["text"] = color
-  end
-end
-
-
-
-# ���ʤΥե졼��
-class TkColorMiddleFrame<TkFrame
-  attr_reader :left, :middle, :right
-
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> "2")
-
-    @left = TkColorMiddleLeftFrame.new(self)
-    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
-
-    @middle = TkColorMiddleMiddleFrame.new(self)
-    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
-
-    @right = TkColorMiddleRightFrame.new(self)
-    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
-
-    self
-  end
-end
-
-
-class TkColor<TkRoot
-  attr_reader :menu, :bottom, :middle
-
-  def initialize
-    super
-    @menu = TkColorMenuFrame.new(self)
-    @menu.pack("side"=>"top", "fill"=>"x")
-
-    @bottom = TkColorBotFrame.new(self)
-    @bottom.pack("side"=>"bottom","fill"=>"x")
-
-    @middle = TkColorMiddleFrame.new(self)
-    @middle.pack("side"=>"top","fill"=>"both")
-
-    self
-  end
-end
-
-
-$root = TkColor.new
-
-# ���٥�Ȥ��Ԥİ٤˥롼�פ����롣
-changeColorSpace :rgb
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/text.rb b/ext/tk/sample/demos-en/text.rb
deleted file mode 100644
index 2ed53e6938..0000000000
--- a/ext/tk/sample/demos-en/text.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# text.rb
-#
-# This demonstration script creates a text widget that describes
-# the basic editing functions.
-#
-# text (basic facilities) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($text_demo) && $text_demo
-  $text_demo.destroy 
-  $text_demo = nil
-end
-
-# demo toplevel widget
-$text_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Basic Facilities")
-  iconname("text")
-  positionWindow(w)
-}
-
-# version check
-if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
-  undo_support = false
-else
-  undo_support = true
-end
-
-# frame
-TkFrame.new($text_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $text_demo
-      $text_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'text'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text 
-TkText.new($text_demo){|t|
-  relief 'sunken'
-  bd 2
-  setgrid 1
-  height 30
-  if undo_support
-    undo true
-    autoseparators true
-  end
-  TkScrollbar.new($text_demo) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # 
-  insert('0.0', <<EOT)
-This window is a text widget.  It displays one or more lines of text
-and allows you to edit the text.  Here is a summary of the things you
-can do to a text widget:
-
-1. Scrolling. Use the scrollbar to adjust the view in the text window.
-
-2. Scanning. Press mouse button 2 in the text window and drag up or down.
-This will drag the text at high speed to allow you to scan its contents.
-
-3. Insert text. Press mouse button 1 to set the insertion cursor, then
-type text.  What you type will be added to the widget.
-
-4. Select. Press mouse button 1 and drag to select a range of characters.
-Once you've released the button, you can adjust the selection by pressing
-button 1 with the shift key down.  This will reset the end of the
-selection nearest the mouse cursor and you can drag that end of the
-selection by dragging the mouse before releasing the mouse button.
-You can double-click to select whole words or triple-click to select
-whole lines.
-
-5. Delete and replace. To delete text, select the characters you'd like
-to delete and type Backspace or Delete.  Alternatively, you can type new
-text, in which case it will replace the selected text.
-
-6. Copy the selection. To copy the selection into this window, select
-what you want to copy (either here or in another application), then
-click button 2 to copy the selection to the point of the mouse cursor.
-
-7. Edit.  Text widgets support the standard Motif editing characters
-plus many Emacs editing characters.  Backspace and Control-h erase the
-character to the left of the insertion cursor.  Delete and Control-d
-erase the character to the right of the insertion cursor.  Meta-backspace
-deletes the word to the left of the insertion cursor, and Meta-d deletes
-the word to the right of the insertion cursor.  Control-k deletes from
-the insertion cursor to the end of the line, or it deletes the newline
-character if that is the only thing left on the line.  Control-o opens
-a new line by inserting a newline character to the right of the insertion
-cursor.  Control-t transposes the two characters on either side of the
-insertion cursor. #{
-      if undo_support
-	undo_text = "Control-z undoes the last editing action performed,\nand "
-	case $tk_platform['platform']
-	when "unix", "macintosh"
-	  undo_text << "Control-Shift-z"
-	else # 'windows'
-	  undo_text << "Control-y"
-	end
-	undo_text << "redoes undone edits."
-      else
-	""
-      end
-}
-
-7. Resize the window.  This widget has been configured with the "setGrid"
-option on, so that if you resize the window it will always resize to an
-even number of characters high and wide.  Also, if you make the window
-narrow you can see that long lines automatically wrap around onto
-additional lines so that all the information is always visible.
-EOT
-
-  set_insert('0.0')
-}
diff --git a/ext/tk/sample/demos-en/timer b/ext/tk/sample/demos-en/timer
deleted file mode 100644
index 58a41d00c0..0000000000
--- a/ext/tk/sample/demos-en/timer
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-#
-# timer --
-# This script generates a counter with start,stop and reset buttons.
-#
-# Copyright (C) 1998 Takaaki Tateishi (ttate@jaist.ac.jp)
-# last update: Sat Jun 27 12:24:14 JST 1998
-#
-
-require "tk"
-require "thread"
-require "tkafter"
-
-$time = "0.00"
-$m = Mutex.new
-$loop = false
-
-def timer_stop
-  $loop = false
-  $m.lock
-end
-
-def timer_start
-  $loop = true
-  $m.unlock
-end
-
-def timer_reset
-  $time = "0.00"
-  $root.countframe.counter['text'] = $time
-end
-
-def timer_loop
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-  Tk.after(10,proc{timer_loop})
-end
-
-
-#
-# thread version
-#
-def timer_loop2
-  while true
-    $m.lock
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-    sleep(0.01)
-    $m.unlock
-  end
-end
-
-#
-# TkAfter
-#
-def timer_loop3
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-end
-
-
-class CountFrame < TkFrame
-  attr_reader :counter
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    @counter = TkLabel.new(self,
-			   'text'=>$time, 
-			   'relief'=>'raised')
-    @counter.pack('fill'=>'both')
-    self
-  end
-end
-
-
-class ButtonFrame < TkFrame
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-=begin
-    @stop = TkButton.new(self,
-			 'text'=>'Stop',
-			 'command'=>proc{timer_stop})
-    @start = TkButton.new(self,
-			  'text'=>'Start',
-			  'command'=>proc{timer_start})
-=end
-    @stop  = TkButton.new(self, :text=>'Stop',  :state=>:disabled)
-    @start = TkButton.new(self, :text=>'Start', :state=>:normal)
-
-    @stop.command proc{
-      timer_stop
-      @start.state(:normal)
-      @stop.state(:disabled)
-    }
-    @start.command proc{
-      timer_start
-      @stop.state(:normal)
-      @start.state(:disabled)
-    }
-
-    @reset = TkButton.new(self,
-			  'text'=>'Reset',
-			  'command'=>proc{timer_reset})
-    for b in [@stop,@start,@reset]
-      b.pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-    end
-  end
-end
-
-
-class Timer < TkRoot
-  attr_reader :countframe
-
-  def initialize(*args)
-    super(*args)
-    @countframe = CountFrame.new(self)
-    @buttonframe = ButtonFrame.new(self)
-    for f in [@buttonframe,@countframe]
-      f.pack('side'=>'top', 'fill'=>'both')
-    end
-    self
-  end
-end
-
-
-$root = Timer.new
-
-#$thread = Thread.start{timer_loop2}
-#timer_loop
-TkAfter.new(10,-1,proc{timer_loop3}).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/tkencoding.rb b/ext/tk/sample/demos-en/tkencoding.rb
deleted file mode 100644
index 727491a6ad..0000000000
--- a/ext/tk/sample/demos-en/tkencoding.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- ruby -*-
-#
-# tkencoding.rb
-# written by ttate@jaist.ac.jp
-
-class TclTkIp
-  alias __eval _eval
-  alias __invoke _invoke
-  private :__eval
-  private :__invoke
-
-  attr_accessor :encoding
-
-  def _eval(cmd)
-    if( @encoding )
-      _fromUTF8(__eval(_toUTF8(cmd,@encoding)),@encoding)
-    else
-      __eval(cmd)
-    end
-  end
-
-  def _invoke(*cmds)
-    if( @encoding )
-      cmds = cmds.collect{|cmd| _toUTF8(cmd,@encoding)}
-      _fromUTF8(__invoke(*cmds),@encoding)
-    else
-      __invoke(*cmds)
-    end
-  end
-end
-
-module Tk
-  INTERP = TkCore::INTERP
-
-  def encoding=(name)
-    INTERP.encoding = name
-  end
-
-  def encoding
-    INTERP.encoding
-  end
-end
diff --git a/ext/tk/sample/demos-en/twind.rb b/ext/tk/sample/demos-en/twind.rb
deleted file mode 100644
index c841b7c317..0000000000
--- a/ext/tk/sample/demos-en/twind.rb
+++ /dev/null
@@ -1,285 +0,0 @@
-# twind.rb
-#
-# This demonstration script creates a text widget with a bunch of
-# embedded windows.
-#
-# text (embedded windows) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($twind_demo) && $twind_demo
-  $twind_demo.destroy 
-  $twind_demo = nil
-end
-
-# demo toplevel widget
-$twind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-# frame
-$twind_buttons = TkFrame.new($twind_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $twind_demo
-      $twind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'twind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$twind_text = nil
-TkFrame.new($twind_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
-	    'relief'=>'sunken') {|f|
-  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font, 
-			  'width'=>'70', 'height'=>35, 'wrap'=>'word', 
-			  'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-# 
-$tag_center = TkTextTag.new($twind_text, 
-			    'justify' =>'center',
-			    'spacing1'=>'5m',
-			    'spacing3'=>'5m'  )
-$tag_buttons = TkTextTag.new($twind_text, 
-			     'lmargin1'=>'1c',
-			     'lmargin2'=>'1c',
-			     'rmargin' =>'1c',
-			     'spacing1'=>'3m',
-			     'spacing2'=>0,
-			     'spacing3'=>0 )
-
-$twind_text.insert('end', "A text widget can contain other widgets embedded ")
-$twind_text.insert('end', "it.  These are called \"embedded windows\", ")
-$twind_text.insert('end', "and they can consist of arbitrary widgets.  ")
-$twind_text.insert('end', "For example, here are two embedded button ")
-$twind_text.insert('end', "widgets.  You can click on the first button to ")
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {
-		   #text 'ON'
-		   text 'Turn On'
-		   command proc{textWindOn $twind_text,$twind_buttons}
-		   cursor 'top_left_arrow'
-		 })
-$twind_text.insert('end', " horizontal scrolling, which also turns off ")
-$twind_text.insert('end', "word wrapping.  Or, you can click on the second ")
-$twind_text.insert('end', "button to\n")
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {
-		   #text 'OFF'
-		   text 'Turn Off'
-		   command proc{textWindOff $twind_text}
-		   cursor 'top_left_arrow'
-		 })
-
-$twind_text.insert('end', " horizontal scrolling and turn back on word wrapping.\n\n")
-$twind_text.insert('end', "Or, here is another example.  If you ")
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {
-		   text 'Click Here'
-		   command proc{textWindPlot $twind_text}
-		   cursor 'top_left_arrow'
-		 })
-$twind_text.insert('end', " a canvas displaying an x-y plot will appear right here.")
-$mark_plot = TkTextMark.new($twind_text, 'insert')
-$mark_plot.gravity='left'
-$twind_text.insert('end', "  You can drag the data points around with the mouse, ")
-$twind_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {
-		   text 'Delete'
-		   command proc{textWindDel $twind_text}
-		   cursor 'top_left_arrow'
-		 })
-
-$twind_text.insert('end', " the plot again.\n\n")
-$twind_text.insert('end', "You may also find it useful to put embedded windows in ")
-$twind_text.insert('end', "a text without any actual text.  In this case the ")
-$twind_text.insert('end', "text widget acts like a geometry manager.  For ")
-$twind_text.insert('end', "example, here is a collection of buttons laid out ")
-$twind_text.insert('end', "neatly into rows by the text widget.  These buttons ")
-$twind_text.insert('end', "can be used to change the background color of the ")
-$twind_text.insert('end', "text widget (\"Default\" restores the color to ")
-$twind_text.insert('end', "its default).  If you click on the button labeled ")
-$twind_text.insert('end', "\"Short\", it changes to a longer string so that ")
-$twind_text.insert('end', "you can see how the text widget automatically ")
-$twind_text.insert('end', "changes the layout.  Click on the button again ")
-$twind_text.insert('end', "to restore the short string.\n")
-
-
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {|b|
-		   text 'Default'
-		   command proc{embDefBg $twind_text}
-		   cursor 'top_left_arrow'
-		   $tag_buttons.add('end')
-		 },
-		 'padx'=>3 )
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkCheckButton.new($twind_text) {
-		   textvariable embToggle
-		   indicatoron 0
-		   variable embToggle
-		   onvalue 'A much longer string'
-		   offvalue 'Short'
-		   cursor 'top_left_arrow'
-		   pady 5
-		   padx 2
-		 },
-		 'padx'=>3, 
-		 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
-].each{|twind_color|
-  TkTextWindow.new($twind_text, 'end', 
-		   'window'=>TkButton.new($twind_text) {
-		     text twind_color
-		     cursor 'top_left_arrow'
-		     command proc{$twind_text.bg twind_color}
-		   },
-		   'padx'=>3, 
-		   'pady'=>2 )
-}
-
-# 
-def textWindOn (w,f)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff (w)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-  w.xscrollcommand ''
-  w.wrap 'word'
-end
-
-def textWindPlot (t)
-  if (defined? $twind_plot) && TkWinfo.exist?($twind_plot)
-    return
-  end
-
-  $twind_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-
-  TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind_plot, 225, 20, 
-	      'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind_plot, x, 254, 
-		'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind_plot, 96, y, 
-		'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6, 
-		       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind_plot.itembind('point', 'Any-Enter', 
-			proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind_plot.itembind('point', 'Any-Leave', 
-			proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind_plot.itembind('point', '1', 
-			proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
-  $twind_plot.itembind('point', 'ButtonRelease-1', 
-			proc{$twind_plot.dtag 'selected'})
-  $twind_plot.bind('B1-Motion', 
-		    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
-  while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-    $twind_text.delete $mark_plot
-  end
-  $twind_text.insert $mark_plot,"\n"
-  TkTextWindow.new($twind_text, $mark_plot, 'window'=>$twind_plot)
-  $tag_center.add $mark_plot
-  $twind_text.insert $mark_plot,"\n"
-end
-
-$embPlot = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def embPlotMove (w, x, y)
-  w.move 'selected', x - $embPlot['lastX'], y - $embPlot['lastY']
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def textWindDel (w)
-  if (defined? $twind_text) && TkWinfo.exist?($twind_plot)
-    $twind_text.delete $twind_plot
-    $twind_plot = nil
-    while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-      $twind_text.delete $mark_plot
-    end
-    $twind_text.insert $mark_plot,"  "
-  end
-end
-
-def embDefBg (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-en/unicodeout.rb b/ext/tk/sample/demos-en/unicodeout.rb
deleted file mode 100644
index 7bb951c93c..0000000000
--- a/ext/tk/sample/demos-en/unicodeout.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# unicodeout.rb --
-#
-# This demonstration script shows how you can produce output (in label
-# widgets) using many different alphabets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($unicodeout_demo) && $unicodeout_demo
-  $unicodeout_demo.destroy 
-  $unicodeout_demo = nil
-end
-
-$unicodeout_demo = TkToplevel.new {|w|
-  title("Unicode Label Demonstration")
-  iconname("unicodeout")
-  positionWindow(w)
-}
-
-TkLabel.new($unicodeout_demo, 
-	    :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-This is a sample of Tk's support for languages that use non-Western \
-character sets.  However, what you will actually see below depends \
-largely on what character sets you have installed, and what you see \
-for characters that are not present varies greatly between platforms as well. \
-Please try to click the 'See Code' button, \
-and click the 'Rerun Demo' button after editing \
-(the source file is not changed) \
-the definition of @@font on the Unicodeout_SampleFrame class.
-The strings are written in Tcl using UNICODE characters \
-using the \\uXXXX escape so as to do so in a portable fashion.
-
-ATTENTION: 
-The strings are converted to the encoded string objects \
-(completed to rewrite Tcl's escapes) by Tk::UTF8_String method. \
-And the Tk::UTF8_String objects are passed to the label widgets. 
-EOL
-
-TkFrame.new($unicodeout_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-		 $unicodeout_demo.destroy
-		 $unicodeout_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-		 showCode 'unicodeout'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-wait_msg = TkLabel.new($unicodeout_demo, 
-		       :text=>"Please wait while loading fonts...", 
-		       :font=>"Helvetica 12 italic").pack
-
-class Unicodeout_SampleFrame < TkFrame
-  @@font = $font
-  # @@font = 'Helvetica 14'
-  # @@font = 'Courier 12'
-  # @@font = 'clearlyu 16'
-  # @@font = 'fixed 12'
-  # @@font = 'Times 12'
-  # @@font = 'Newspaper 12'
-  # @@font = '{New century schoolbook} 12'
-
-  def initialize()
-    super($unicodeout_demo)
-    grid_columnconfig(1, :weight=>1)
-  end
-
-  def add_sample(lang, *args)
-    sample_txt = Tk::UTF8_String(args.join(''))
-    l = TkLabel.new(self, :font=>@@font, :text=>lang+':', 
-		    :anchor=>:nw, :pady=>0)
-    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt, 
-    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt, 
-		    :anchor=>:nw, :width=>30, :pady=>0)
-    Tk.grid(l, s, :sticky=>:ew, :pady=>0)
-    l.grid_config(:padx, '1m')
-  end
-end
-f = Unicodeout_SampleFrame.new
-f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
-
-# Processing when some characters are missing might take a while, so make
-# sure we're displaying something in the meantime...
-
-oldCursor = $unicodeout_demo.cursor
-$unicodeout_demo.cursor('watch')
-Tk.update
-
-f.add_sample('Arabic', 
-	     '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94', 
-	     '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
-f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
-f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek', 
-	     '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ', 
-	     '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew', 
-	     '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ', 
-	     '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese', 
-	     '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ', 
-	     '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
-f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian', 
-	     '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ', 
-	     '\u044F\u0437\u044B\u043A')
-
-wait_msg.destroy
-$unicodeout_demo.cursor(oldCursor)
diff --git a/ext/tk/sample/demos-en/vscale.rb b/ext/tk/sample/demos-en/vscale.rb
deleted file mode 100644
index 636b85813b..0000000000
--- a/ext/tk/sample/demos-en/vscale.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# vscale.rb
-#
-# This demonstration script shows an example with a vertical scale.
-
-require "tkcanvas"
-
-if defined?($vscale_demo) && $vscale_demo
-  $vscale_demo.destroy
-  $vscale_demo = nil
-end
-
-$vscale_demo = TkToplevel.new {|w|
-  title("Vertical Scale Demonstration")
-  iconname("vscale")
-}
-positionWindow($vscale_demo)
-
-msg = TkLabel.new($vscale_demo) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "An arrow and a vertical scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the size of the arrow."
-}
-msg.pack('side'=>'top', 'padx'=>'.5c')
-
-TkFrame.new($vscale_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $vscale_demo
-      $vscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'vscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-TkFrame.new($vscale_demo) {|frame|
-  borderwidth 10
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, 0, 0, 1, 1, 2, 2) {
-      fill 'SeaGreen3'
-      tags 'poly'
-    }
-    TkcLine.new(c, 0, 0, 1, 1, 2, 2, 0, 0) {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'left',  'anchor'=>'nw', 'fill'=>'y')
-  scale = TkScale.new(frame) {
-    orient 'vertical'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setHeight(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'left', 'anchor'=>'ne')
-  scale.set 75
-}.pack
-
-
-def setHeight(w, height)
-  height = height + 21
-  y2 = height - 30
-  if y2 < 21
-    y2 = 21
-  end
-  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-end
diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
deleted file mode 100644
index aa702883de..0000000000
--- a/ext/tk/sample/demos-en/widget
+++ /dev/null
@@ -1,531 +0,0 @@
-#!/usr/bin/env ruby
-
-# widget --
-# This script demonstrates the various widgets provided by Tk,
-# along with many of the features of the Tk toolkit.  This file
-# only contains code to generate the main window for the
-# application, which invokes individual demonstrations.  The
-# code for the actual demonstrations is contained in separate
-# ".rb" files is this directory, which are sourced by this script
-# as needed.
-
-require 'tk'
-
-#unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
-#  require 'tkencoding'
-#end
-
-require 'tkafter'
-
-### $DEBUG=1 ##########
-
-#----------------------------------------------------------------
-# The code below create the main window, consisting of a menu bar
-# and a text widget that explains how to use the program, plus lists
-# all of the demos as hypertext items.
-#----------------------------------------------------------------
-
-# widget demo directory
-$demo_dir = File.dirname($0)
-
-# root 
-$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
-
-# tk 
-$tk_version = Tk::TK_VERSION
-
-# tcl_platform 
-$tk_platform = TkVarAccess.new('tcl_platform')
-
-#
-$font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
-
-# 
-TkMenubar.new($root, 
-	      [[['File', 0], 
-		  ['About ... ', proc{aboutBox}, 0, '<F1>'],
-		  '---', 
-		  ['Quit', proc{exit}, 0, 'Meta-Q']
-		]]).pack('side'=>'top', 'fill'=>'x')
-$root.bind('F1', proc{aboutBox})
-
-=begin
-TkFrame.new($root){|frame|
-  TkMenubutton.new(frame){|button|
-    m = TkMenu.new(button) {
-      add 'command', 'label'=>'Quit', 'command'=>proc{exit}, 'underline'=>0
-    }
-    menu m
-    text 'File'
-    underline 0
-  }.pack('side'=>'left')
-}.pack('side'=>'top', 'fill'=>'x')
-=end
-
-# 
-if $tk_version =~ /^4\.[01]/
-  scr = TkScrollbar.new($root, 'orient'=>'vertical')
-  txt = TkText.new($root) {
-    wrap 'word'
-    width 60
-    height 30
-    font $font
-    setgrid 'yes'
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-  scr.pack('side'=>'right', 'fill'=>'y')
-  txt.pack('expand'=>'yes', 'fill'=>'both')
-else
-  textFrame = TkFrame.new($root)
-  scr = TkScrollbar.new($root, 'orient'=>'vertical', 
-			'highlightthickness'=>0, 'takefocus'=>1) {
-    pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
-  }
-  txt = TkText.new($root) {
-    wrap 'word'
-    width 60
-    height 30
-    font $font
-    setgrid 'yes'
-    highlightthickness 0
-    padx 4
-    pady 2
-    takefocus 0
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-#  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
-  textFrame.pack('expand'=>'yes', 'fill'=>'both')
-
-  statusBar = TkFrame.new($root) {|f|
-    $statusBarLabel = \
-    TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-		'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
-	.pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-    TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-		'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
-	.pack('side'=>'left', 'padx'=>2)
-  }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-end
-
-# Create a bunch of tags to use in the text widget, such as those for
-# section titles and demo descriptions.  Also define the bindings for
-# tags.
-  
-tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
-
-# We put some "space" characters to the left and right of each demo description
-# so that the descriptions are highlighted only when the mouse cursor
-# is right over them (but not when the cursor is to their left or right)
-
-tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
-
-if TkWinfo.depth($root) == '1'
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-			   'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-			      'underline'=>1)
-  tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
-else
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-			   'foreground'=>'blue', 'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-			      'foreground'=>'#303080', 'underline'=>1)
-#  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1, 
-#			  'background'=>'SeaGreen3')
-  tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
-end
-
-#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
-tag_demo.bind('ButtonRelease-1', 
-	      proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
-
-lastLine = TkVariable.new("")
-newLine  = TkVariable.new("")
-tag_demo.bind('Enter', proc{|x,y|
-		lastLine.value = txt.index("@#{x},#{y} linestart")
-		tag_hot.add(lastLine.value, "#{lastLine.value} lineend")
-		showStatus txt, txt.index("@#{x},#{y}")
-	      },
-	      '%x %y')
-tag_demo.bind('Leave', 
-	      proc{
-		tag_hot.remove('1.0','end')
-		txt.configure('cursor','xterm')
-		$statusBarLabel.configure('text'=>"")
-	      })
-tag_demo.bind('Motion', proc{|x, y|
-		newLine.value = txt.index("@#{x},#{y} linestart")
-		if newLine.value != lastLine.value
-		  tag_hot.remove('1.0','end')
-		  lastLine.value = newLine.value
-		  if ( txt.tag_names("@#{x},#{y}").find{|t| 
-			t.kind_of?(String) && t =~ /^demo-/
-		      } )
-		    tag_hot.add(lastLine.value, 
-				"#{lastLine.value} lineend -1 chars")
-		  end
-		end
-		showStatus txt, txt.index("@#{x},#{y}")
-	      },
-	      '%x %y')
-
-# Create the text for the text widget.
-
-txt.insert('end', "Ruby/Tk Widget Demonstrations\n\n", tag_title)
-txt.insert('end', <<EOT)
-This application provides a front end for several short scripts that \
-demonstrate what you can do with Tk widgets.  Each of the numbered \
-lines below describes a demonstration;  you can click on it to invoke \
-the demonstration.  Once the demonstration window appears, you can \
-click the "See Code" button to see the Ruby/Tk code that created the \
-demonstration.  If you wish, you can edit the code and click the \
-"Rerun Demo" button in the code window to reinvoke the demonstration \
-with the modified code.
-
-Some demo scripts require the recent version of Tk library \
-(e.g. Tk8.4 or later) \
-If your Tk library linked to Ruby doesn't support the functions \
-required by the demo script, the demo doesn't work. \
-In such a case, please re-compile tcltklib with the later Tk library \
-which supports the required functions.
-
-
-EOT
-
-txt.insert('end', "Labels, buttons, checkbuttons, and radiobuttons.\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Labels (text and bitmaps).\n", tag_demo, "demo-label")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Labels and UNICODE text. (if supported)\n", tag_demo, "demo-unicodeout")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Buttons.\n", tag_demo, "demo-button")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Checkbuttons (select any of a group).\n", tag_demo, "demo-check")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Radiobuttons (select one of a group).\n", tag_demo, "demo-radio")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. Radiobuttons (if supported 'compound' option).\n", tag_demo, "demo-radio2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. A 15-puzzle game made out of buttons.\n", tag_demo, "demo-puzzle")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. Iconic buttons that use bitmaps.\n", tag_demo, "demo-icon")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. Two labels displaying images.\n", tag_demo, "demo-image1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. A simple user interface for viewing images.\n", tag_demo, "demo-image2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "11. A simple user interface for viewing images. (if supported)\n", tag_demo, "demo-image3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "12. Labelled frames (if supported)\n", tag_demo, "demo-labelframe")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Listboxes\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 50 states.\n", tag_demo, "demo-states")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Colors: change the color scheme for the application.\n", "#{tag_demo.id} demo-colors")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. A collection of famous sayings.\n", tag_demo, "demo-sayings")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Entries and Spin-boxes\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Without scrollbars.\n", tag_demo, "demo-entry1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. With scrollbars.\n", tag_demo, "demo-entry2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', 
-	   "3. Validated entries and password fields. (if supported)\n", 
-	   tag_demo, "demo-entry3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Spin-boxes. (if supported)\n", tag_demo, "demo-spin")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Simple Rolodex-like form.\n", tag_demo, "demo-form")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Text\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Basic editable text.\n", tag_demo, "demo-text")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Text display styles.\n", tag_demo, "demo-style")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Hypertext (tag bindings).\n", tag_demo, "demo-bind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A text widget with embedded windows.\n", tag_demo, "demo-twind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A search tool built with a text widget.\n", tag_demo, "demo-search")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Canvases\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. The canvas item types.\n", tag_demo, "demo-items")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. A simple 2-D plot.\n", tag_demo, "demo-plot")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Text items in canvases.\n", tag_demo, "demo-ctext")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. An editor for arrowheads on canvas lines.\n", tag_demo, "demo-arrow")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A ruler with adjustable tab stops.\n", tag_demo, "demo-ruler")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. A building floor plan.\n", tag_demo, "demo-floor")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. A simple scrollable canvas.\n", tag_demo, "demo-cscroll")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Scales\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Vertical scale.\n", tag_demo.id, "demo-vscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Horizontal scale.\n", tag_demo.id, "demo-hscale")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Paned Windows\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Horizontal paned window. (if supported)\n", tag_demo.id, "demo-paned1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Vertical paned window. (if supported)\n", tag_demo.id, "demo-paned2")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Menus\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Menus and cascades.\n", tag_demo, "demo-menu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Menus and cascades. (if supported)\n", tag_demo, "demo-menu84")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Menubuttons\n", tag_demo, "demo-menubu")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Common Dialogs\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Message boxes.\n", tag_demo, "demo-msgbox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. File selection dialog.\n", tag_demo, "demo-filebox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Color picker.\n", tag_demo, "demo-clrpick")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Miscellaneous\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. The built-in bitmaps.\n", tag_demo, "demo-bitmap")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. A dialog box with a local grab.\n", tag_demo, "demo-dialog1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. A dialog box with a global grab.\n", tag_demo, "demo-dialog2")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.state('disabled')
-scr.focus
-
-# positionWindow --
-# This procedure is invoked by most of the demos to position a
-# new demo window.
-#
-# Arguments:
-# w -		The name of the window to position.
-
-def positionWindow(w)
-  w.geometry('+300+300')
-end
-
-# showVars --
-# Displays the values of one or more variables in a window, and
-# updates the display whenever any of the variables changes.
-#
-# Arguments:
-# w -		Name of new window to create for display.
-# args -	Any number of names of variables.
-
-$showVarsWin = {}
-def showVars (parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy 
-    rescue
-    end
-  end
-  w = TkToplevel.new(parent) {|w|
-    title "Variable values"
-    TkLabel.new(w) {
-      text "Variable values:"
-      width 20
-      anchor 'center'
-      font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
-    }.pack('side'=>'top', 'fill'=>'x')
-    len = 1
-    args.each{|vnam,vbody|
-      len = vnam.to_s.length if vnam.to_s.length > len
-    }
-    args.each{|vnam,vbody|
-      TkFrame.new(w){|f|
-	#TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
-	TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
-	TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
-	           .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-      }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
-    }
-    TkButton.new(w) {
-      text "OK"
-      command proc{w.destroy}
-    }.pack('side'=>'bottom', 'pady'=>2)
-  }
-  $showVarsWin[parent.path] = w
-end
-
-# invoke --
-# This procedure is called when the user clicks on a demo description.
-# It is responsible for invoking the demonstration.
-#
-# Arguments:
-# index -	The index of the character that the user clicked on.
-
-def invoke (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-  cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update
-#  eval `cat #{tag[5..-1]}.rb`
-  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
-  Tk.update
-#  txt.cursor('xterm')
-  txt.cursor(cursor)
-
-  $tag_visited.add("#{index} linestart +1 chars", "#{index} lineend +1 chars")
-end
-
-# showStatus --
-#
-#	Show the name of the demo program in the status bar. This procedure
-#	is called when the user moves the cursor over a demo description.
-#
-
-def showStatus (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  cursor = txt.cget('cursor')
-  unless tag
-    $statusBarLabel.configure('text', " ")
-    newcursor = 'xterm'
-  else
-    demoname = tag[5..-1]
-    $statusBarLabel.configure('text', 
-			     "Run the \"#{demoname}\" sample program")
-    newcursor = 'hand2'
-  end
-  txt.configure('cursor'=>newcursor) if cursor != newcursor
-end
-
-# showCode --
-# This procedure creates a toplevel window that displays the code for
-# a demonstration and allows it to be edited and reinvoked.
-#
-# Arguments:
-# w -		The name of the demonstration's window, which can be
-#		used to derive the name of the file containing its code.
-
-def showCode (demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == '0'
-    $code_window = TkToplevel.new(nil)
-    f = TkFrame.new($code_window)
-    TkButton.new(f) {
-      text "Dismiss"
-      command proc{
-	$code_window.destroy
-	$code_window = nil
-      }
-    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
-    TkButton.new(f) {
-      text "Rerun Demo"
-      command proc{eval($code_text.get('1.0','end'))}
-    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
-#    f.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x')
-    f.pack('side'=>'bottom', 'fill'=>'x')
-
-    if $tk_version =~ /^4\.[01]/
-      s = TkScrollbar.new($code_window, 'orient'=>'vertical')
-      $code_text = TkText.new($code_window) {
-	height 40
-	setgrid 'yes'
-	yscrollcommand proc{|first,last| s.set first,last}
-      }
-      s.command(proc{|*args| $code_text.yview(*args)})
-      s.pack('side'=>'right', 'fill'=>'y')
-      $code_text.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    else
-      TkFrame.new($code_window) {|f|
-	pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-	hs = TkScrollbar.new($code_window, 'highlightthickness'=>0, 
-			     'orient'=>'horizontal')
-	vs = TkScrollbar.new($code_window, 'highlightthickness'=>0, 
-			     'orient'=>'vertical')
-	$code_text = TkText.new($code_window) {|t|
-	  height 40
-	  wrap 'word'
-	  xscrollcommand proc{|first,last| hs.set first,last}
-	  yscrollcommand proc{|first,last| vs.set first,last}
-	  setgrid 'yes'
-	  highlightthickness 0
-	  pady 2
-	  padx 3
-	  hs.command(proc{|*args| $code_text.xview(*args)})
-	  vs.command(proc{|*args| $code_text.yview(*args)})
-	}
-
-	$code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
-			'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-	vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
-		'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-#	xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
-#		'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-# JKC 2001-07-26: segfaults under 1.7.1 (2001-06-19) [i686-linux]
-	TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-	TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-      }
-    end
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-#  fid = open(file, 'r')
-  fid = open([$demo_dir, file].join(File::Separator), 'r')
-  $code_text.delete('1.0', 'end')
-  #$code_text.insert('1.0', `cat #{file}`)
-  $code_text.insert('1.0', fid.read)
-  #$code_mark = TkTextMark.new($code_text, '1.0')
-  #$code_text.set_insert('1.0')
-  TkTextMarkInsert.new($code_text,'1.0')
-  fid.close
-end
-
-# aboutBox
-#
-#      Pops up a message box with an "about" message
-#
-def aboutBox
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-		'message'=>"Ruby/Tk widget demonstration Ver.1.3.2-en\n\n( based on Tk 8.1 Copyright (c) 1996-1997 Sun Microsystems, Inc. )\n\nRunning Version :: Ruby#{VERSION}/Tk#{$tk_version}")
-end
-
-################################
-
-Tk.mainloop
-
diff --git a/ext/tk/sample/demos-jp/README b/ext/tk/sample/demos-jp/README
deleted file mode 100644
index 42bec16c60..0000000000
--- a/ext/tk/sample/demos-jp/README
+++ /dev/null
@@ -1,54 +0,0 @@
-
-  Ruby/Tk widget-demo 
-                              version 1.2 ( 2000/04/08 )
-                              �ʰ����ǽ���幩�� (nagai@ai.kyutech.ac.jp)
-
-ɸ�����ۤ� Tcl/Tk ��ĥ�ѥå������������� Ruby (�ʲ� Ruby/Tk �ȸƤӤޤ�) 
-�Ǥϡ�Tk widget ���Ѥ��� GUI �κ�����Ԥ����Ȥ��Ǥ��ޤ����ºݤ� GUI �����
-���Ƥ������ˤ��͡��ʼ��㤬����ץ�Ȥ���¸�ߤ���������ʤΤǤ�����Ruby/Tk 
-�ˤϤ��Τ褦��Ŭ���ʥ���ץ륹����ץȽ����¸�ߤ��ޤ���Ǥ�����������Ф���
-��ĥ�ѥå������θ��Ǥ��� Tcl/Tk �ˤϡ�Tk widget ���Ѥ��ƤɤΤ褦�ʤ��Ȥ���
-���뤫�򼨤���ΤȤ��� widget-demo ��¸�ߤ����ꡤTcl/Tk ���Ѥ��� GUI �κ���
-��������ݤ���ɽŪ����ץ�ȤʤäƤ��ޤ����ܥ��������֤ϡ�Ruby/Tk �ν�����
-�������ɽŪ�ʥ���ץ륹����ץȤȤ��٤���Tcl/Tk �� widget-demo ��ܿ�������
-�ΤǤ���
-
-����ΥС������� ruby-1.4.x ���б��Ȥ��Ƥ����ޤ�������С���������٤ơ�
-�ۤȤ���ѹ��Ϥ���ޤ���ruby-1.1c2 �ʾ�ʤ�ư���Ȼפ��ޤ���ruby-1.5.x �ˤ�
-���Ƥϥƥ��Ȥ��Ƥ��ޤ��󡥤��Τ��ᡤ��ߴ��αƶ����Ф뤳�Ȥ����뤫�⤷��ޤ�
-�󤬡����ξ��Ǥ⾯���ν�����ư������Ȼפ��ޤ����Ȥ߹��� Tk �ΥС������ϡ�
-4.2 �Ǥ� 8.0 �Ǥ⽤���ʤ�ư������Ϥ��Ǥ��������������ܸ��ǤǤΰܿ��Ȥʤä�
-���뤿�ᡤ���ܸ첽���줿 Tk �����Ѥ���������������ץȤΥƥ��Ȥϡ���С�����
-��κݤ� Tk4.2jp �� Tk8.0jp �ξ�ǹԤäƤ��ޤ� (�����ˤǤϤʤ��Ǥ���)������
-�ΥС������Ǥ� ruby-1.4.x + Tk8.0jp ��Ǥδ�ñ�ʥƥ��Ȥ����ԤäƤ��ޤ��󤬡�
-�����Ȥ����ۤɤν����Ϥ��Ƥ��ޤ���Τ�����Ϥʤ��ȹͤ��Ƥ��ޤ���
-
-�ܥ��������֤˴ޤޤ�륹����ץȤ�¿���ϡ����ȤʤäƤ��� Tcl/Tk �Ǥ����Ū��
-��������ץȵ��ҤȤʤ�褦�ˤ��Ƥ��ޤ������Τ��ᡤRuby/Tk �Υ���ץ�ȸ�����
-�ϡ����ޤ� Ruby �餷���ʤ��Ȥ������Ǥ��礦���ˤ⤫����餺�����Τ褦�ʵ���
-���äƤ�����ͳ�ϡ�Ruby/Tk �Υɥ���������ˤ���ޤ���
-
-Tcl/Tk �ˤ�Ŭ���ʻ��ͽ񤬲�����¸�ߤ��Ƥ��ޤ����顤Ruby/Tk ������ץȤ����
-����ݤϡ����Τ褦�� Tcl/Tk �λ��ͽ�Ǿ�����䤤�ʤ���������뤳�Ȥˤʤ�Ȼ�
-���ޤ����� widget �λ�����Ȥ��ơ�Tcl/Tk �� widget-demo �򻲾Ȥ��뤳�Ȥ⤢��
-�Ǥ��礦��Ruby/Tk �Ǥε��Ҥ� widget-demo �� Tcl/Tk �Ǥε��Ҥ˶ᤤ��Τˤ���
-�����С���������ˤ�äơ�Ruby/Tk ����������뤳�Ȥ��Ǥ���ȹͤ����ޤ���
-��ö Ruby/Tk �Ǥ� �� widget �λ�����ˡ�������Ƥ��ޤ��С�Ruby �餷��������
-�ץȤ�������뤳�Ȥ��񤷤��ʤ��Ǥ��礦���ܥ��������֤Υ�����ץȤϡ�Ruby/Tk 
-��ǽ�˽�������ޤǤ�Ƨ��Ȥ������Ѥ��Ƥ���������й����Ǥ���
-
-widget-demo �ΰܿ��ˤ����äƤϡ��������ˤ�ܿ�����������ץȤ��󶡤��Ƥ�����
-���ޤ����������˴��դΰդ�ɽ���ޤ���
-
-    Ω�С�JAIST (ttate@jaist.ac.jp) ���� 
-    ʿ���ͻ� (hiramatu@cdrom.co.jp) ����
-
-ʿ������ˤ�� Ruby/Tk ����� Web page (http://www.cdrom.co.jp/~hiramatu/) 
-�� Ruby/Tk �ν�����ͭ�ѤȻפ��ޤ��Τǡ����Ҥ����Ȥ���������
-
-�ޤ������� (maebashi@iij.ad.jp) �����Ϥ���Ȥ��ơ�widget-demo �ΰܿ��˺ݤ�
-��ɬ�פȤʤä� Ruby �� Tk ��Ϣ�饤�֥�꽤���ˤĤ��ơ����������Х��λ�Ŧ��
-�Ƥ��������������ˤⴶ���פ��ޤ���
-
-�����ƺǸ�˺���δ��դ� Ruby �߷׼Ԥ� �ޤĤ�� �椭�Ҥ� (matz@netlab.co.jp) 
-��������������Ȼפ��ޤ���
diff --git a/ext/tk/sample/demos-jp/arrow.rb b/ext/tk/sample/demos-jp/arrow.rb
deleted file mode 100644
index 3640798db1..0000000000
--- a/ext/tk/sample/demos-jp/arrow.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-#
-# arrowhead widget demo (called by 'widget')
-#
-
-# arrowSetup --
-# This method regenerates all the text and graphics in the canvas
-# window.  It's called when the canvas is initially created, and also
-# whenever any of the parameters of the arrow head are changed
-# interactively.
-#
-# Arguments:
-# c -		Name of the canvas widget.
-
-def arrowSetup(c)
-  v = $demo_arrowInfo
-
-  # Remember the current box, if there is one.
-  tags = c.gettags('current')
-  if tags != []
-    cur = tags.find{|t| t.kind_of?(String) && t =~ /^box[1-3]$/ }
-  else
-    cur = nil
-  end
-
-  # Create the arrow and outline.
-  c.delete('all')
-  TkcLine.new(c, v.x1, v.y, v.x2, v.y, 
-	      { 'width'=>10 * v.width, 
-		'arrowshape'=>[10*v.a, 10*v.b, 10*v.c], 
-		'arrow'=>'last' 
-	      }.update(v.bigLineStyle) )
-  xtip = v.x2 - 10*v.b
-  deltaY = 10*v.c + 5*v.width
-  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY, 
-	      v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y, 
-	      'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
-
-  # Create the boxes for reshaping the line and arrowhead.
-  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5, 
-		   {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5, 
-		   {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5, 
-		   {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
-  c.itemconfigure cur, v.activeStyle if cur
-
-  # Create three arrows in actual size with the same parameters
-  TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
-  tmp = v.x2+100
-  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width, 
-	      'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width, 
-	      'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width, 
-	      'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-
-  # Create a bunch of other arrows and text items showing the 
-  # current dimensions.
-  tmp = v.x2+10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY, 
-	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
-  tmp = v.x1-10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width, 
-	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
-  tmp = v.y+5*v.width+10*v.c+10
-  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp, 
-	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
-  tmp = tmp+25
-  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp, 
-	      'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
-
-  TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
-	      'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  TkcText.new(c, v.x1, 330, 
-	      'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]", 'anchor'=>'w', 
-	      'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-
-  v.count += 1
-end
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($arrow_demo) && $arrow_demo
-  $arrow_demo.destroy 
-  $arrow_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$arrow_demo = TkToplevel.new {|w|
-  title("Arrowhead Editor Demonstration")
-  iconname("arrow")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($arrow_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-	    'text'=>"���� widget �ǡ������Х��ǻȤ���饤��ˤĤ����͡������������Ƭ�η����Ƥߤ뤳�Ȥ��Ǥ��ޤ���������������η����Ѥ���ˤϡ����礵�줿����ˤĤ��Ƥ��� 3�ĤλͳѤ�ɥ�å����Ƥ�����������¦����������̤��礭���ǤΥ���ץ�򼨤��Ƥ��ޤ������Υƥ����Ȥϥ饤�󥢥��ƥ���Ф������ꥪ�ץ����Ǥ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$arrow_buttons = TkFrame.new($arrow_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $arrow_demo
-      $arrow_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'arrow'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas ����
-$arrow_canvas = TkCanvas.new($arrow_demo, 'width'=>500, 'height'=>350, 
-			     'relief'=>'sunken', 'borderwidth'=>2)
-$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-# ������
-unless Struct.const_defined?("ArrowInfo")
-  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc, 
-			       :x1, :x2, :y, :smallTips, :count, 
-			       :bigLineStyle, :boxStyle, :activeStyle).new
-end
-$demo_arrowInfo.a = 8
-$demo_arrowInfo.b = 10
-$demo_arrowInfo.c = 3
-$demo_arrowInfo.width = 2
-$demo_arrowInfo.motionProc = proc{}
-$demo_arrowInfo.x1 = 40
-$demo_arrowInfo.x2 = 350
-$demo_arrowInfo.y = 150
-$demo_arrowInfo.smallTips = [5, 5, 2]
-$demo_arrowInfo.count = 0
-if TkWinfo.depth($arrow_canvas) > 1
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'SkyBlue1'}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
-else
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'black', 
-    'stipple'=>'@'+[$demo_dir, 'images', 'grey.25'].join(File::Separator)}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
-end
-$arrowTag_box = TkcTag.new($arrow_canvas)
-arrowSetup $arrow_canvas
-$arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.activeStyle)})
-$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
-$arrowTag_box.bind('B1-Enter', proc{})
-$arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1', 
-		       proc{$demo_arrowInfo.motionProc \
-			 = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1', 
-		       proc{$demo_arrowInfo.motionProc \
-			 = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1', 
-		       proc{$demo_arrowInfo.motionProc \
-			 = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion', 
-		  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
-$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
-
-# arrowMove1 --
-# This method is called for each mouse motion event on box1 (the
-# one at the vertex of the arrow).  It updates the controlling parameters
-# for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-def arrowMove1(c,x,y)
-  v = $demo_arrowInfo
-  newA = (v.x2+5-c.canvasx(x).round)/10
-  newA = 0 if newA < 0
-  newA = 25 if newA > 25
-  if newA != v.a
-    c.move('box1', 10*(v.a-newA), 0)
-    v.a = newA
-  end
-end
-
-# arrowMove2 --
-# This method is called for each mouse motion event on box2 (the
-# one at the trailing tip of the arrowhead).  It updates the controlling
-# parameters for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-def arrowMove2(c,x,y)
-  v = $demo_arrowInfo
-  newB = (v.x2+5-c.canvasx(x).round)/10
-  newB = 0 if newB < 0
-  newB = 25 if newB > 25
-  newC = (v.y+5-c.canvasy(y).round-5*v.width)/10
-  newC = 0 if newC < 0
-  newC = 20 if newC > 20
-  if newB != v.b || newC != v.c
-    c.move('box2', 10*(v.b-newB), 10*(v.c-newC))
-    v.b = newB
-    v.c = newC
-  end
-end
-
-# arrowMove3 --
-# This method is called for each mouse motion event on box3 (the
-# one that controls the thickness of the line).  It updates the
-# controlling parameters for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-def arrowMove3(c,x,y)
-  v = $demo_arrowInfo
-  newWidth = (v.y+2-c.canvasy(y).round)/5
-  newWidth = 0 if newWidth < 0
-  newWidth = 20 if newWidth > 20
-  if newWidth != v.width
-    c.move('box3', 0, 5*(v.width-newWidth))
-    v.width = newWidth
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/bind.rb b/ext/tk/sample/demos-jp/bind.rb
deleted file mode 100644
index 1f221a6293..0000000000
--- a/ext/tk/sample/demos-jp/bind.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# text (tag bindings) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($bind_demo) && $bind_demo
-  $bind_demo.destroy 
-  $bind_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$bind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Tag Bindings")
-  iconname("bind")
-  positionWindow(w)
-}
-
-# frame ����
-TkFrame.new($bind_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $bind_demo
-      $bind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'bind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# bind �ѥ᥽�å�
-def tag_binding_for_bind_demo(tag, enter_style, leave_style)
-  tag.bind('Any-Enter', proc{tag.configure enter_style})
-  tag.bind('Any-Leave', proc{tag.configure leave_style})
-end
-
-# text ����
-TkText.new($bind_demo){|t|
-  # ����
-  setgrid 'true'
-  width  60
-  height 24
-  font $font
-  wrap 'word'
-  TkScrollbar.new($bind_demo) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # ������������
-  if TkWinfo.depth($root).to_i > 1
-    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised', 
-                     'borderwidth'=>1}
-    tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
-  else
-    tagstyle_bold = {'foreground'=>'white', 'background'=>'black'}
-    tagstyle_normal = {'foreground'=>'', 'background'=>''}
-  end
-
-  # �ƥ���������
-  insert 'insert', "�ƥ�����widget��ɽ��������������椹��Τ�Ʊ�������Υᥫ�˥����Ȥäơ��ƥ����Ȥ�Tcl�Υ��ޥ�ɤ������Ƥ뤳�Ȥ��Ǥ��ޤ�������ˤ�ꡢ�ޥ����䥭���ܡ��ɤΥ��������������Tcl�Υ��ޥ�ɤ��¹Ԥ����褦�ˤʤ�ޤ����㤨�С����Υ����Х��Υǥ�ץ������ˤĤ��Ƥ�����ʸ�ˤϤ��Τ褦�ʥ������Ĥ��Ƥ��ޤ����ޥ���������ʸ�ξ�˻��äƤ���������ʸ�����ꡢ�ܥ���1�򲡤��Ȥ��������Υǥ⤬�Ϥޤ�ޤ���
-
-"
-  insert('end', '1. �����Х� widget �˺�뤳�ȤΤǤ��륢���ƥ�μ������Ƥ˴ؤ��륵��ץ롣', (d1 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '2. ��ñ�� 2�����Υץ��åȡ��ǡ�����ɽ������ư�������Ȥ��Ǥ��롣', (d2 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '3. �ƥ����ȥ����ƥ�Υ��󥫡��ȹ�·����', 
-	 (d3 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '4. �饤�󥢥��ƥ�Τ���������Ƭ�η��Υ��ǥ�����', 
-	 (d4 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '5. ���֥��ȥåפ��ѹ����뤿��ε�ǽ�Ĥ��Υ롼�顼��', 
-	 (d5 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', 
-	 '6. �����Х����ɤ���äƥ��������뤹��Τ��򼨤�����åɡ�', 
-	 (d6 = TkTextTag.new(t)) )
-
-  # binding
-  [d1, d2, d3, d4, d5, d6].each{|tag|
-    tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
-  }
-  d1.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'items.rb'].join(File::Separator)}`})
-  d2.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`})
-  d3.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`})
-  d4.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`})
-  d5.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`})
-  d6.bind('1', 
-	  proc{eval `cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`})
-
-  TkTextMarkInsert.new(t, '0.0')
-  configure('state','disabled')
-}
diff --git a/ext/tk/sample/demos-jp/bitmap.rb b/ext/tk/sample/demos-jp/bitmap.rb
deleted file mode 100644
index a400862881..0000000000
--- a/ext/tk/sample/demos-jp/bitmap.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# bitmap widget demo (called by 'widget')
-#
-
-# bitmapRow --
-# Create a row of bitmap items in a window.
-#
-# Arguments:
-# w -		The parent window that is to contain the row.
-# args -	The names of one or more bitmaps, which will be displayed
-#		in a new row across the bottom of w along with their
-#		names.
-
-def bitmapRow(w,*args)
-  TkFrame.new(w){|row|
-    pack('side'=>'top', 'fill'=>'both')
-    for bitmap in args 
-      TkFrame.new(row){|base|
-	pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
-	TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
-	TkLabel.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
-      }
-    end
-  }
-end
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($bitmap_demo) && $bitmap_demo
-  $bitmap_demo.destroy 
-  $bitmap_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$bitmap_demo = TkToplevel.new {|w|
-  title("Bitmap Demonstration")
-  iconname("bitmap")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($bitmap_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left', 
-	    'text'=>"���Υ�����ɥ��ˤϡ�Tk ���Ȥ߹��ޤ줿���٤ƤΥӥåȥޥåפ���������̾���ȶ���ɽ������Ƥ��ޤ���Tcl �Υ�����ץ���Ǥϡ����줾���̾�����Ѥ��ƻ��Ȥ��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $bitmap_demo
-      $bitmap_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'bitmap'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-TkFrame.new($bitmap_demo){|f|
-  bitmapRow(f,'error','gray25','gray50','hourglass')
-  bitmapRow(f,'info','question','questhead','warning')
-  pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-}
-
diff --git a/ext/tk/sample/demos-jp/browse1 b/ext/tk/sample/demos-jp/browse1
deleted file mode 100644
index 03e251035a..0000000000
--- a/ext/tk/sample/demos-jp/browse1
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working 
-# directory and allow you to open files or subdirectories by 
-# double-clicking. 
-
-require 'tk'
-
-# Create a scrollbar on the right side of the main window and a listbox 
-# on the left side.
-
-listbox = TkListbox.new(nil, 'relief'=>'sunken', 
-			'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-  TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    l.yscrollcommand(proc{|first,last| s.set(first,last)})
-  }
-
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-root = TkRoot.new
-root.minsize(1,1)
-
-# The procedure below is invoked to open a browser on a given file;  if the 
-# file is a directory then another instance of this program is invoked; if 
-# the file is a regular file then the Mx editor is invoked to display 
-# the file. 
-
-def browse (dir, file)
-  file = dir + File::Separator + file if dir != '.'
-  type = File.ftype(file)
-  if type == 'directory'
-    system($0 + ' ' + file + ' &')
-  else
-    if type == 'file'
-      if ENV['EDITOR']
-	system(ENV['EDITOR'] + ' ' + file + ' &')
-      else
-	system('xedit ' + file + ' &')
-      end
-    else
-      STDOUT.print "\"#{file}\" isn't a directory or regular file"
-    end
-  end
-end
-
-# Fill the listbox with a list of all the files in the directory (run 
-# the "ls" command to get that information).
-
-dir = ARGV[0] ?  ARGV[0] : '.'
-open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-  listbox.insert('end', fname.chomp)
-}
-
-# Set up bindings for the browser.
-
-Tk.bind_all('Control-c', proc{root.destroy})
-listbox.bind('Double-Button-1', 
-	     proc{TkSelection.get.each{|f| browse dir, f}})
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/browse2 b/ext/tk/sample/demos-jp/browse2
deleted file mode 100644
index 304a5f547e..0000000000
--- a/ext/tk/sample/demos-jp/browse2
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working 
-# directory and allow you to open files or subdirectories by 
-# double-clicking. 
-
-require 'tk'
-
-class Browse
-  BROWSE_WIN_COUNTER = TkVariable.new(0)
-
-  def initialize(dir)
-    BROWSE_WIN_COUNTER.value = BROWSE_WIN_COUNTER.to_i + 1
-
-    # create base frame
-    base = TkToplevel.new {
-      minsize(1,1)
-      title('Browse : ' + dir)
-    }
-
-    # Create a scrollbar on the right side of the main window and a listbox 
-    # on the left side.
-    list = TkListbox.new(base, 'relief'=>'sunken', 
-			 'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-      TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
-	pack('side'=>'right', 'fill'=>'y')
-	l.yscrollcommand(proc{|first,last| s.set(first,last)})
-      }
-
-      pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-
-      # Fill the listbox with a list of all the files in the directory (run 
-      # the "ls" command to get that information).
-      open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-	l.insert('end', fname.chomp)
-      }
-
-    }
-
-    # Set up bindings for the browser.
-    base.bind('Control-c', 
-	      proc{
-		base.destroy
-		Browse::BROWSE_WIN_COUNTER.value = \
-		                Browse::BROWSE_WIN_COUNTER.to_i - 1})
-    list.bind('Double-Button-1', 
-	 proc{TkSelection.get.each{|f| self.browse dir, f}})
-  end
-
-  # The method below is invoked to open a browser on a given file;  if the 
-  # file is a directory then another instance of this program is invoked; if 
-  # the file is a regular file then the Mx editor is invoked to display 
-  # the file. 
-  def browse (dir, file)
-    file = dir + File::Separator + file if dir != '.'
-    type = File.ftype(file)
-    if type == 'directory'
-      Browse.new(file)
-    else
-      if type == 'file'
-	if ENV['EDITOR']
-	  system(ENV['EDITOR'] + ' ' + file + ' &')
-	else
-	  system('xedit ' + file + ' &')
-	end
-      else
-	STDOUT.print "\"#{file}\" isn't a directory or regular file"
-      end
-    end
-  end
-
-end
-
-Browse.new(ARGV[0] ? ARGV[0] : '.')
-
-TkRoot.new {
-  withdraw
-  Browse::BROWSE_WIN_COUNTER.trace('w', proc{exit if Browse::BROWSE_WIN_COUNTER.to_i == 0})
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/button.rb b/ext/tk/sample/demos-jp/button.rb
deleted file mode 100644
index 33247261f2..0000000000
--- a/ext/tk/sample/demos-jp/button.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# button widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($button_demo) && $button_demo
-  $button_demo.destroy 
-  $button_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$button_demo = TkToplevel.new {|w|
-  title("Button Demonstration")
-  iconname("button")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($button_demo) {
-  font $kanji_font
-  wraplength '4i'
-  justify 'left'
-  text "�ܥ���򥯥�å�����ȡ��ܥ�����طʿ������Υܥ���˽񤫤�Ƥ��뿧�ˤʤ�ޤ����ܥ��󤫤�ܥ���ؤΰ�ư�ϥ��֤򲡤����ȤǤ��ǽ�Ǥ����ޤ����ڡ����Ǽ¹Ԥ��뤳�Ȥ��Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-$button_buttons = TkFrame.new($button_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $button_demo
-      $button_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'button'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button ����
-TkButton.new($button_demo){
-  text "Peach Puff"
-  width 10
-  command proc{
-    $button_demo.configure('bg','PeachPuff1')
-    $button_buttons.configure('bg','PeachPuff1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Light Blue"
-  width 10
-  command proc{
-    $button_demo.configure('bg','LightBlue1')
-    $button_buttons.configure('bg','LightBlue1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Sea Green"
-  width 10
-  command proc{
-    $button_demo.configure('bg','SeaGreen2')
-    $button_buttons.configure('bg','SeaGreen2')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Yellow"
-  width 10
-  command proc{
-    $button_demo.configure('bg','Yellow1')
-    $button_buttons.configure('bg','Yellow1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
diff --git a/ext/tk/sample/demos-jp/check.rb b/ext/tk/sample/demos-jp/check.rb
deleted file mode 100644
index 50c21fac0e..0000000000
--- a/ext/tk/sample/demos-jp/check.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# checkbutton widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($check_demo) && $check_demo
-  $check_demo.destroy 
-  $check_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$check_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration")
-  iconname("check")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($check_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ� 3 �ĤΥ����å��ܥ���ɽ������Ƥ��ޤ�������å�����ȥܥ����������֤��Ѥ�ꡢTcl �ѿ��ˤ��Υܥ���ξ��֤򼨤��ͤ����ꤷ�ޤ������ߤ��ѿ����ͤ򸫤�ˤϡ��ѿ����ȡץܥ���򥯥�å����Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-# �ѿ�����
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame ����
-TkFrame.new($check_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $check_demo
-      $check_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'check'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-
-  TkButton.new(frame) {
-    text '�ѿ�����'
-    command proc{
-      showVars($check_demo, 
-	       ['wipers', wipers], ['brakes', brakes], ['sober', sober])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# checkbutton ����
-[ TkCheckButton.new($check_demo, 'text'=>'�磻�ѡ� OK', 'variable'=>wipers),
-  TkCheckButton.new($check_demo, 'text'=>'�֥졼�� OK', 'variable'=>brakes),
-  TkCheckButton.new($check_demo, 'text'=>'�ɥ饤�С�����', 'variable'=>sober)
-].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
-
diff --git a/ext/tk/sample/demos-jp/clrpick.rb b/ext/tk/sample/demos-jp/clrpick.rb
deleted file mode 100644
index 55cfd9c7c6..0000000000
--- a/ext/tk/sample/demos-jp/clrpick.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# widget demo prompts the user to select a color (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($clrpick_demo) && $clrpick_demo
-  $clrpick_demo.destroy 
-  $clrpick_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$clrpick_demo = TkToplevel.new {|w|
-  title("Color Selection Dialogs")
-  iconname("colors")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-	    'text'=>"�ʲ��Υܥ���򲡤��ơ����Υ�����ɥ���ˤ��륦�������åȤ����ʿ����طʿ������򤷤Ʋ�������").pack('side'=>'top')
-
-# frame ����
-TkFrame.new($clrpick_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $clrpick_demo
-      $clrpick_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'clrpick'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button ����
-TkButton.new($clrpick_demo, 'text'=>'�طʿ������� ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'background', 
-	      ['background', 'highlightbackground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-TkButton.new($clrpick_demo, 'text'=>'���ʿ������� ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-def setColor(w,button,name,options)
-  w.grab
-  initialColor = button[name]
-  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w, 
-			 'initialcolor'=>initialColor)
-  if color != ""
-    setColor_helper(w,options,color)
-  end
-
-  w.grab('release')
-end
-
-def setColor_helper(w, options, color)
-  options.each{|opt|
-    begin
-      w[opt] = color
-    rescue
-    end
-  }
-  TkWinfo.children(w).each{|child|
-    setColor_helper child, options, color
-  }
-end
-
diff --git a/ext/tk/sample/demos-jp/colors.rb b/ext/tk/sample/demos-jp/colors.rb
deleted file mode 100644
index f9a5983e75..0000000000
--- a/ext/tk/sample/demos-jp/colors.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# listbox widget demo 'colors' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($colors_demo) && $colors_demo
-  $colors_demo.destroy 
-  $colors_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$colors_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (colors)")
-  iconname("colors")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($colors_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤϿ���̾�������ä�����������С��դΥꥹ�ȥܥå�����ɽ������Ƥ��ޤ����ꥹ�Ȥ򥹥������뤵����Τϥ���������С��Ǥ�Ǥ��ޤ������ꥹ�ȥܥå�������ǥޥ����Υܥ���2(��ܥ���)�򲡤����ޤޥɥ�å����Ƥ�Ǥ��ޤ������뿧��ܥ���1(���ܥ���)�ǥ��֥륯��å�����ȥ��ץꥱ����������Τ����ο��ˤʤ�ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($colors_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $colors_demo
-      $colors_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'colors'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-colors_lbox = nil
-TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
-  s = TkScrollbar.new(w)
-  colors_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  10
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| colors_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
-
-ins_data = [
-  'gray60','gray70','gray80','gray85','gray90','gray95',
-  'snow1','snow2','snow3','snow4','seashell1','seashell2',
-  'seashell3','seashell4','AntiqueWhite1','AntiqueWhite2',
-  'AntiqueWhite3','AntiqueWhite4','bisque1','bisque2',
-  'bisque3','bisque4','PeachPuff1','PeachPuff2',
-  'PeachPuff3','PeachPuff4','NavajoWhite1','NavajoWhite2',
-  'NavajoWhite3','NavajoWhite4','LemonChiffon1',
-  'LemonChiffon2','LemonChiffon3','LemonChiffon4',
-  'cornsilk1','cornsilk2','cornsilk3','cornsilk4',
-  'ivory1','ivory2','ivory3','ivory4','honeydew1',
-  'honeydew2','honeydew3','honeydew4','LavenderBlush1',
-  'LavenderBlush2','LavenderBlush3','LavenderBlush4',
-  'MistyRose1','MistyRose2','MistyRose3','MistyRose4',
-  'azure1','azure2','azure3','azure4','SlateBlue1',
-  'SlateBlue2','SlateBlue3','SlateBlue4','RoyalBlue1',
-  'RoyalBlue2','RoyalBlue3','RoyalBlue4','blue1','blue2',
-  'blue3','blue4','DodgerBlue1','DodgerBlue2',
-  'DodgerBlue3','DodgerBlue4','SteelBlue1','SteelBlue2',
-  'SteelBlue3','SteelBlue4','DeepSkyBlue1','DeepSkyBlue2',
-  'DeepSkyBlue3','DeepSkyBlue4','SkyBlue1','SkyBlue2',
-  'SkyBlue3','SkyBlue4','LightSkyBlue1','LightSkyBlue2',
-  'LightSkyBlue3','LightSkyBlue4','SlateGray1',
-  'SlateGray2','SlateGray3','SlateGray4',
-  'LightSteelBlue1','LightSteelBlue2','LightSteelBlue3',
-  'LightSteelBlue4','LightBlue1','LightBlue2',
-  'LightBlue3','LightBlue4','LightCyan1','LightCyan2',
-  'LightCyan3','LightCyan4','PaleTurquoise1',
-  'PaleTurquoise2','PaleTurquoise3','PaleTurquoise4',
-  'CadetBlue1','CadetBlue2','CadetBlue3','CadetBlue4',
-  'turquoise1','turquoise2','turquoise3','turquoise4',
-  'cyan1','cyan2','cyan3','cyan4','DarkSlateGray1',
-  'DarkSlateGray2','DarkSlateGray3','DarkSlateGray4',
-  'aquamarine1','aquamarine2','aquamarine3','aquamarine4',
-  'DarkSeaGreen1','DarkSeaGreen2','DarkSeaGreen3',
-  'DarkSeaGreen4','SeaGreen1','SeaGreen2','SeaGreen3',
-  'SeaGreen4','PaleGreen1','PaleGreen2','PaleGreen3',
-  'PaleGreen4','SpringGreen1','SpringGreen2',
-  'SpringGreen3','SpringGreen4','green1','green2',
-  'green3','green4','chartreuse1','chartreuse2',
-  'chartreuse3','chartreuse4','OliveDrab1','OliveDrab2',
-  'OliveDrab3','OliveDrab4','DarkOliveGreen1',
-  'DarkOliveGreen2','DarkOliveGreen3','DarkOliveGreen4',
-  'khaki1','khaki2','khaki3','khaki4','LightGoldenrod1',
-  'LightGoldenrod2','LightGoldenrod3','LightGoldenrod4',
-  'LightYellow1','LightYellow2','LightYellow3',
-  'LightYellow4','yellow1','yellow2','yellow3','yellow4',
-  'gold1','gold2','gold3','gold4','goldenrod1',
-  'goldenrod2','goldenrod3','goldenrod4','DarkGoldenrod1',
-  'DarkGoldenrod2','DarkGoldenrod3','DarkGoldenrod4',
-  'RosyBrown1','RosyBrown2','RosyBrown3','RosyBrown4',
-  'IndianRed1','IndianRed2','IndianRed3','IndianRed4',
-  'sienna1','sienna2','sienna3','sienna4','burlywood1',
-  'burlywood2','burlywood3','burlywood4','wheat1',
-  'wheat2','wheat3','wheat4','tan1','tan2','tan3','tan4',
-  'chocolate1','chocolate2','chocolate3','chocolate4',
-  'firebrick1','firebrick2','firebrick3','firebrick4',
-  'brown1','brown2','brown3','brown4','salmon1','salmon2',
-  'salmon3','salmon4','LightSalmon1','LightSalmon2',
-  'LightSalmon3','LightSalmon4','orange1','orange2',
-  'orange3','orange4','DarkOrange1','DarkOrange2',
-  'DarkOrange3','DarkOrange4','coral1','coral2','coral3',
-  'coral4','tomato1','tomato2','tomato3','tomato4',
-  'OrangeRed1','OrangeRed2','OrangeRed3','OrangeRed4',
-  'red1','red2','red3','red4','DeepPink1','DeepPink2',
-  'DeepPink3','DeepPink4','HotPink1','HotPink2',
-  'HotPink3','HotPink4','pink1','pink2','pink3','pink4',
-  'LightPink1','LightPink2','LightPink3','LightPink4',
-  'PaleVioletRed1','PaleVioletRed2','PaleVioletRed3',
-  'PaleVioletRed4','maroon1','maroon2','maroon3',
-  'maroon4','VioletRed1','VioletRed2','VioletRed3',
-  'VioletRed4','magenta1','magenta2','magenta3',
-  'magenta4','orchid1','orchid2','orchid3','orchid4',
-  'plum1','plum2','plum3','plum4','MediumOrchid1',
-  'MediumOrchid2','MediumOrchid3','MediumOrchid4',
-  'DarkOrchid1','DarkOrchid2','DarkOrchid3',
-  'DarkOrchid4','purple1','purple2','purple3','purple4',
-  'MediumPurple1','MediumPurple2','MediumPurple3',
-  'MediumPurple4','thistle1','thistle2','thistle3', 'thistle4'
-]
-
-colors_lbox.insert(0, *ins_data)
diff --git a/ext/tk/sample/demos-jp/cscroll.rb b/ext/tk/sample/demos-jp/cscroll.rb
deleted file mode 100644
index 7f5ffa2f02..0000000000
--- a/ext/tk/sample/demos-jp/cscroll.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# simple scrollable canvas widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($cscroll_demo) && $cscroll_demo
-  $cscroll_demo.destroy 
-  $cscroll_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$cscroll_demo = TkToplevel.new {|w|
-  title("Scrollable Canvas Demonstration")
-  iconname("cscroll")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($cscroll_demo, 'font'=>$font, 'wraplength'=>'4i', 
-	    'justify'=>'left', 'text'=>"���Υ�����ɥ��ˤϥ���������С���ޥ����Υܥ���2 �ǥ���������Ǥ��륭���Х� widget ��ɽ������Ƥ��ޤ����ͳѤξ�ǥܥ���1 �򥯥�å�����ȡ����Υ���ǥå�����ɸ����Ϥ˽��Ϥ���ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $cscroll_demo
-      $cscroll_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'cscroll'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new($cscroll_demo) {
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-  }
-  TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-  TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-end
-
-# canvas ����
-$cscroll_canvas = TkCanvas.new($cscroll_demo, 
-			       'relief'=>'sunken', 'borderwidth'=>2,
-			       'scrollregion'=>['-11c', '-11c', '50c', '20c']
-			       ) {|c|
-  if $tk_version =~ /^4\.[01]/
-    pack('expand'=>'yes', 'fill'=>'both') 
-  else
-    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
-	 'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-  end
-
-  TkScrollbar.new($cscroll_demo, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
-    c.yscrollcommand(proc{|first,last| vs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'right', 'fill'=>'y')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-
-  TkScrollbar.new($cscroll_demo, 'orient'=>'horiz', 
-		  'command'=>proc{|*args| c.xview(*args)}) {|hs|
-    c.xscrollcommand(proc{|first,last| hs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'bottom', 'fill'=>'x') 
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-}
-
-bg = $cscroll_canvas.configinfo('bg')[4]
-(0..19).each{|i|
-  x = -10+3*i
-  y = -10
-  (0..9).each{|j|
-    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c", 
-		     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
-    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c", 
-		'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
-    y += 3
-  }
-}
-
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
-$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion', 
-		     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
-
-def scrollEnter(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  $oldFill = c.itemconfiginfo(id, 'fill')[4]
-  if TkWinfo.depth(c) > 1
-    c.itemconfigure(id, 'fill'=>'SeaGreen1')
-  else
-    c.itemconfigure(id, 'fill'=>'black')
-    c.itemconfigure(id+1, 'fill'=>'white')
-  end
-end
-
-def scrollLeave(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  c.itemconfigure(id, 'fill'=>$oldFill)
-  c.itemconfigure(id+1, 'fill'=>'black')
-end
-
-def scrollButton(c)
-  id = c.find_withtag('current')[0].id
-  id += 1 unless c.gettags('current').include?('text')
-  print "You buttoned at #{c.itemconfiginfo(id,'text')[4]}\n"
-end
-
diff --git a/ext/tk/sample/demos-jp/ctext.rb b/ext/tk/sample/demos-jp/ctext.rb
deleted file mode 100644
index 6d9355e2f8..0000000000
--- a/ext/tk/sample/demos-jp/ctext.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-#
-# Canvas Text widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($ctext_demo) && $ctext_demo
-  $ctext_demo.destroy 
-  $ctext_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$ctext_demo = TkToplevel.new {|w|
-  title("Canvas Text Demonstration")
-  iconname("Text")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-	    'text'=>"���Υ�����ɥ��ˤϥ����Х�widget�Υƥ����ȵ�ǽ��ǥ⤹�뤿��Υƥ�����ʸ����ɽ������Ƥ��ޤ����ޥ�����ͳѤ���˻��äƤ���������å�����Ȱ��֤����Ѥ�����������а��֤��Ѥ����ꡢ��·�����Ѥ����ꤹ�뤳�Ȥ��Ǥ��ޤ����ޤ��ʲ��Τ褦���Խ��Τ���δ�ñ�ʥХ���ǥ��󥰤򥵥ݡ��Ȥ��Ƥ��ޤ���
-
-  1. �ޥ�������äƤ���������å��������ϤǤ��ޤ���
-  2. �ܥ���1������Ǥ��ޤ���
-  3. �ޥ����ΰ��֤˥ܥ���2�����򤷤��ƥ����Ȥ򥳥ԡ��Ǥ��ޤ���
-  4.�Хå����ڡ����򥳥�ȥ�����-H���������������ľ����ʸ���������ޤ���
-  5. Delete�������������������ľ���ʸ���������ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$ctext_buttons = TkFrame.new($ctext_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $ctext_demo
-      $ctext_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'ctext'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas ����
-$ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat', 
-			     'borderwidth'=>0, 'width'=>500, 'height'=>350)
-$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-
-# font ����
-textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-
-# canvas ����
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
-		 'outline'=>'black', 'fill'=>'red')
-
-$ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, 
-			       'text'=>"����ϥ����Х�widget�Υƥ����ȵ�ǽ��ǥ⤹�뤿���ʸ����Ǥ����ޥ�������äƤ���������å��������ϤǤ��ޤ������򤷤ƥ���ȥ�����-D�Ǿõ�뤳�Ȥ�Ǥ��ޤ���",
-			       'width'=>440, 'anchor'=>'n', 
-			       'font'=>'-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*', 
-			       'kanjifont'=>'-*-r-*--24-*-jisx0208.1983-0', 
-			       'justify'=>'left') )
-
-$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1', 
-	proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"}, 
-	"%x %y")
-$ctag_text.bind('Shift-B1-Motion', 
-		proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
-$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
-$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
-$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
-$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"}, 
-		"%x %y")
-
-# Next, create some items that allow the text's anchor position 
-# to be edited.
-
-def mkTextConfig(w,x,y,option,value,color)
-  item = TkcRectangle.new(w, x, y, x+30, y+30, 
-			  'outline'=>'black', 'fill'=>color, 'width'=>1)
-  item.bind('1', proc{$ctag_text.configure option, value})
-  w.addtag_withtag('config', item)
-end
-
-x = 50
-y = 50
-color = 'LightSkyBlue1'
-mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
-mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
-mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
-mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
-mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
-mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
-mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
-mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
-mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50, 
-			'outline'=>'black', 'fill'=>'red')
-item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 'anchor'=>'s', 
-	    'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-	    'fill'=>'brown')
-
-# Lastly, create some items that allow the text's justification to be
-# changed.
-
-x = 350
-y = 50
-color = 'SeaGreen2'
-mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
-mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
-mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 'anchor'=>'s', 
-	    'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-	    'fill'=>'brown')
-
-$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave', 
-		       proc{$ctext_canvas\
-			     .itemconfigure('current', 
-					    'fill'=>$textConfigFill)})
-
-$textConfigFill = ''
-
-def textEnter(w)
-  $textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
-  w.itemconfigure 'current', 'fill', 'black'
-end
-
-def textInsert(w, string)
-  return if string == ""
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-  end
-  $ctag_text.insert 'insert', string
-end
-
-def textPaste(w, pos)
-  begin
-    $ctag_text.insert pos, TkSelection.get
-  rescue
-  end
-end
-
-def textB1Press(w,x,y)
-  w.icursor 'current', "@#{x},#{y}"
-  w.itemfocus 'current'
-  w.focus
-  w.select_from 'current', "@#{x},#{y}"
-end
-
-def textB1Move(w,x,y)
-  w.select_to 'current', "@#{x},#{y}"
-end
-
-def textBs(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    char = $ctag_text.index('insert').to_i - 1
-    $ctag_text.dchars(char) if char >= 0
-  end
-end
-
-def textDel(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    $ctag_text.dchars 'insert'
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/dialog1.rb b/ext/tk/sample/demos-jp/dialog1.rb
deleted file mode 100644
index 317b6d9eb3..0000000000
--- a/ext/tk/sample/demos-jp/dialog1.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# a dialog box with a local grab (called by 'widget')
-#
-class TkDialog_Demo1 < TkDialog
-  def title
-    "Dialog with local grab"
-  end
-
-  def message
-    '�⡼��������������ܥå����Ǥ���Tk �� "grab" ���ޥ�ɤ���Ѥ��ƥ����������ܥå����ǡ֥������륰��֡פ��Ƥ��ޤ������Τ����줫�Υܥ����¹Ԥ��뤳�Ȥˤ�äơ����Υ�����������������ޤǡ����Υ���֤ˤ�äƥ��ץꥱ��������¾�Υ�����ɥ��Ǥϡ��ݥ��󥿴ط��Υ��٥�Ȥ������뤳�Ȥ��Ǥ��ʤ��ʤäƤ��ޤ���'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-#    "λ�� ����󥻥� �����ɻ���"
-    ["λ��", "����󥻥�", "�����ɻ���"]
-  end
-end
-
-ret =  TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
-case ret
-when 0
-  print "���ʤ��ϡ�λ��פ򲡤��ޤ����͡�\n"
-when 1
-  print "���ʤ��ϡ֥���󥻥�פ򲡤��ޤ����͡�\n"
-when 2
-  showCode dialog1
-end
diff --git a/ext/tk/sample/demos-jp/dialog2.rb b/ext/tk/sample/demos-jp/dialog2.rb
deleted file mode 100644
index 295522e562..0000000000
--- a/ext/tk/sample/demos-jp/dialog2.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# a dialog box with a global grab (called by 'widget')
-#
-class TkDialog_Demo2 < TkDialog
-  def title
-    "Dialog with global grab"
-  end
-
-  def message
-    '���Υ����������ܥå����ϥ������Х륰��֤���Ѥ��Ƥ��ޤ������Υܥ����¹Ԥ���ޤǡ��ǥ����ץ쥤��Τ����ʤ��ΤȤ����äǤ��ޤ��󡣥������Х륰��֤���Ѥ��뤳�Ȥϡ��ޤ��ɤ��ͤ��ǤϤ���ޤ��󡣤ɤ����Ƥ�ɬ�פˤʤ�ޤǻȤ����Ȼפ�ʤ��ǲ�������'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-#    "λ�� ����󥻥� �����ɻ���"
-    ["λ��", "����󥻥�", "�����ɻ���"]
-  end
-end
-
-ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
-			  'prev_command'=>proc{|dialog|
-			    Tk.after 100, proc{dialog.grab('global')}
-			  }).value
-case ret
-when 0
-  print "���ʤ��ϡ�λ��פ򲡤��ޤ����͡�\n"
-when 1
-  print "���ʤ��ϡ֥���󥻥�פ򲡤��ޤ����͡�\n"
-when 2
-  showCode dialog2
-end
-
diff --git a/ext/tk/sample/demos-jp/doc.org/README b/ext/tk/sample/demos-jp/doc.org/README
deleted file mode 100644
index 90677d3316..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains a collection of demonstration programs that
-are translated into Japanese.  You need to use a Japanized "wish" to
-see these Japanese-translated demonstration programs.  You also need
-to put this directory ("demos.jp") at the next to "demos" since some
-of the programs refer to the image files at "demos".
-
-Please refer to the README file at "demos" for more detail.
diff --git a/ext/tk/sample/demos-jp/doc.org/README.JP b/ext/tk/sample/demos-jp/doc.org/README.JP
deleted file mode 100644
index 42b4929378..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README.JP
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains "widget" demo for the Japanized Tcl7.6/Tk4.2.
-Most of the messages in the original are translated to Japanese.
-But other tools in this directory are not translated.
-
-Following 2 kanji fonts are defined at the beginning of the file "widget."
-
-	-*--24-*-jisx0208.1983-0
-	-*--16-*-jisx0208.1983-0
-
-These fonts are all part of the core distribution of X11R5, so
-if you are running X11R5, you don't have to modify the file.
-
-But if you don't have these fonts, replace them with appropriate ones.
-"-*--14-*-jisx0208.1983-0" will be a good choice.
diff --git a/ext/tk/sample/demos-jp/doc.org/README.tk80 b/ext/tk/sample/demos-jp/doc.org/README.tk80
deleted file mode 100644
index c71f977d74..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README.tk80
+++ /dev/null
@@ -1,46 +0,0 @@
-This directory contains a collection of programs to demonstrate
-the features of the Tk toolkit.  The programs are all scripts for
-"wish", a windowing shell.  If wish has been installed in /usr/local
-then you can invoke any of the programs in this directory just
-by typing its file name to your command shell.  Otherwise invoke
-wish with the file as its first argument, e.g., "wish hello".
-The rest of this file contains a brief description of each program.
-Files with names ending in ".tcl" are procedure packages used by one
-or more of the demo programs;  they can't be used as programs by
-themselves so they aren't described below.
-
-hello -		Creates a single button;  if you click on it, a message
-		is typed and the application terminates.
-
-widget -	Contains a collection of demonstrations of the widgets
-		currently available in the Tk library.  Most of the .tcl
-		files are scripts for individual demos available through
-		the "widget" program.
-
-ixset -		A simple Tk-based wrapper for the "xset" program, which
-		allows you to interactively query and set various X options
-		such as mouse acceleration and bell volume.  Thanks to
-		Pierre David for contributing this example.
-
-rolodex -	A mock-up of a simple rolodex application.  It has much of
-		the user interface for such an application but no back-end
-		database.  This program was written in response to Tom
-		LaStrange's toolkit benchmark challenge.
-
-tcolor -	A color editor.  Allows you to edit colors in several
-		different ways, and will also perform automatic updates
-		using "send".
-
-rmt -		Allows you to "hook-up" remotely to any Tk application
-		on the display.  Select an application with the menu,
-		then just type commands:  they'll go to that application.
-
-timer -		Displays a seconds timer with start and stop buttons.
-		Control-c and control-q cause it to exit.
-
-browse -	A simple directory browser.  Invoke it with and argument
-		giving the name of the directory you'd like to browse.
-		Double-click on files or subdirectories to browse them.
-		Control-c and control-q cause the program to exit.
-
-sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14
diff --git a/ext/tk/sample/demos-jp/doc.org/license.terms b/ext/tk/sample/demos-jp/doc.org/license.terms
deleted file mode 100644
index 03ca6fcb31..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-jp/doc.org/license.terms.tk80 b/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
deleted file mode 100644
index 03ca6fcb31..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-jp/entry1.rb b/ext/tk/sample/demos-jp/entry1.rb
deleted file mode 100644
index 273b6728df..0000000000
--- a/ext/tk/sample/demos-jp/entry1.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# entry (no scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($entry1_demo) && $entry1_demo
-  $entry1_demo.destroy 
-  $entry1_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$entry1_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (no scrollbars)")
-  iconname("entry1")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($entry1_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "3����ΰۤʤ륨��ȥ꤬ɽ������Ƥ��ޤ���ʸ�������Ϥ���ˤϥݥ��󥿤���äƹԤ�������å����Ƥ��饿���פ��Ƥ���������ɸ��Ū��Motif���Խ���ǽ����Emacs�Υ����Х���ɤȤȤ�ˡ����ݡ��Ȥ���Ƥ��ޤ����㤨�С��Хå����ڡ����ȥ���ȥ�����-H�ϥ�������κ���ʸ�����������ǥ꡼�ȥ����ȥ���ȥ�����-D�ϥ�������α�¦��ʸ���������ޤ���Ĺ�᤮�ƥ�����ɥ��������ڤ�ʤ���Τϡ��ޥ����Υܥ���2�򲡤����ޤޥɥ�å����뤳�Ȥǥ��������뤵���뤳�Ȥ��Ǥ��ޤ������ܸ�����Ϥ���Τϥ���ȥ�����-�Хå�����å���Ǥ���kinput2��ư���Ƥ�������Ϥ��뤳�Ȥ��Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($entry1_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $entry1_demo
-      $entry1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'entry1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry ����
-e1 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-e2 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-e3 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
-[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
-
-# ���������
-e1.insert(0, '�����')
-e2.insert('end', "���Υ���ȥ�ˤ�Ĺ��ʸ�������äƤ��ơ�")
-e2.insert('end', "Ĺ�����ƥ�����ɥ��ˤ������ڤ�ʤ��Τǡ�")
-e2.insert('end', "�ºݤν꽪��ޤǸ���ˤϥ��������뤵���ʤ����")
-e2.insert('end', "�ʤ�ʤ��Ǥ��礦��")
-
diff --git a/ext/tk/sample/demos-jp/entry2.rb b/ext/tk/sample/demos-jp/entry2.rb
deleted file mode 100644
index 7efac005f0..0000000000
--- a/ext/tk/sample/demos-jp/entry2.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# entry (with scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($entry2_demo) && $entry2_demo
-  $entry2_demo.destroy 
-  $entry2_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$entry2_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (with scrollbars)")
-  iconname("entry2")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($entry2_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "3����ΰۤʤ륨��ȥ꤬�ơ�����������С��դ�ɽ������Ƥ��ޤ���ʸ�������Ϥ���ˤϥݥ��󥿤���äƹԤ�������å����Ƥ��饿���פ��Ƥ���������ɸ��Ū��Motif���Խ���ǽ����Emacs�Υ����Х���ɤȤȤ�ˡ����ݡ��Ȥ���Ƥ��ޤ����㤨�С��Хå����ڡ����ȥ���ȥ�����-H�ϥ�������κ���ʸ�����������ǥ꡼�ȥ����ȥ���ȥ�����-D�ϥ�������α�¦��ʸ���������ޤ���Ĺ�᤮�ƥ�����ɥ��������ڤ�ʤ���Τϡ��ޥ����Υܥ���2�򲡤����ޤޥɥ�å����뤳�Ȥǥ��������뤵���뤳�Ȥ��Ǥ��ޤ������ܸ�����Ϥ���Τϥ���ȥ�����-�Хå�����å���Ǥ���kinput2��ư���Ƥ�������Ϥ��뤳�Ȥ��Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($entry2_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $entry2_demo
-      $entry2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'entry2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
-  # entry 1
-  s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e1 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s1.set first,last}
-  }
-  s1.command(proc{|*args| e1.xview(*args)})
-  e1.pack('side'=>'top', 'fill'=>'x')
-  s1.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 2
-  s2 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e2 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s2.set first,last}
-  }
-  s2.command(proc{|*args| e2.xview(*args)})
-  e2.pack('side'=>'top', 'fill'=>'x')
-  s2.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 3
-  s3 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e3 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s3.set first,last}
-  }
-  s3.command(proc{|*args| e3.xview(*args)})
-  e3.pack('side'=>'top', 'fill'=>'x')
-  s3.pack('side'=>'top', 'fill'=>'x')
-
-  # ���������
-  e1.insert(0, '�����')
-  e2.insert('end', "���Υ���ȥ�ˤ�Ĺ��ʸ�������äƤ��ơ�")
-  e2.insert('end', "Ĺ�����ƥ�����ɥ��ˤ������ڤ�ʤ��Τǡ�")
-  e2.insert('end', "�ºݤν꽪��ޤǸ���ˤϥ��������뤵���ʤ����")
-  e2.insert('end', "�ʤ�ʤ��Ǥ��礦��")
-
-}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
-
diff --git a/ext/tk/sample/demos-jp/entry3.rb b/ext/tk/sample/demos-jp/entry3.rb
deleted file mode 100644
index 9bf3f62097..0000000000
--- a/ext/tk/sample/demos-jp/entry3.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-# entry3.rb --
-#
-# This demonstration script creates several entry widgets whose
-# permitted input is constrained in some way.  It also shows off a
-# password entry.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($entry3_demo) && $entry3_demo
-  $entry3_demo.destroy 
-  $entry3_demo = nil
-end
-
-$entry3_demo = TkToplevel.new {|w|
-  title("Constrained Entry Demonstration")
-  iconname("entry3")
-  positionWindow(w)
-}
-
-TkLabel.new($entry3_demo, 
-	    :font=>$font, :wraplength=>'5i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-�ʲ��ˤϣ�����Υ���ȥ�ܥå�����ɽ������Ƥ��ޤ����ƥ���ȥ�ܥå����ϡ�\
-�ޥ�������å�������ʸ�����Ǥ����ळ�Ȥ���ǽ�Ǥ��������줾�줬�ɤΤ褦��\
-���Ϥ�����դ��뤳�Ȥ��Ǥ��뤫�ˤ������ߤ����Ƥ��ޤ���\
-��Ĥ�Υ���ȥ�ܥå����������ȸ��ʤ����ʸ��������ʸ�����ʤ����ξ��֤�\
-�ξ�����������դ������꤬������ϥ���ȥ�ܥå��������Ǥ��ޤ�\
-�ʥե��������������˥����å�����ޤ��ˡ�\
-��Ĥ�Υ���ȥ�ܥå����ϡ����Ϥ��줿ʸ�����Ĺ����\
-����ʸ��̤���ξ�����������դ������¤�ۤ��ƽ񤭹��⤦�Ȥ����Ȥ��ˤ�\
-�٥���Ĥ餷���Τ餻�ޤ���\
-���Ĥ���ƹ�������ֹ������դ��륨��ȥ�ܥå����Ǥ���\
-����ե��٥åȤϡ����õ��Υ���������б��Ť����Ƥ���������Ѵ�����ޤ���\
-��Ŭ�ڤ�ʸ�������Ϥ��줿������ʳ���ʸ���ΰ��֤˿��������Ϥ��褦�Ȥ�����\
-�������ˤϷٹ�Υ٥뤬�Ĥ�ޤ���\
-�ͤĤ�Υ���ȥ�ܥå����ϡ���ʸ���ޤǤ����Ϥ�����դ���\
-�ѥ���ɥե�����ɤǤ��ʣ�ʸ���ʾ���ä˷ٹ��Ф����Ȥʤ�̵�뤵��ޤ��ˡ�\
-���Ϥ��줿ʸ���ϥ������ꥹ��������֤�������ɽ������ޤ���
-EOL
-
-TkFrame.new($entry3_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'λ��', :width=>15, :command=>proc{
-		 $entry3_demo.destroy
-		 $entry3_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-		 showCode 'entry3'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-# focusAndFlash --
-# Error handler for entry widgets that forces the focus onto the
-# widget and makes the widget flash by exchanging the foreground and
-# background colours at intervals of 200ms (i.e. at approximately
-# 2.5Hz).
-#
-# Arguments:
-# widget -	entry widget to flash
-# fg -		Initial foreground colour
-# bg -		Initial background colour
-# count -	Counter to control the number of times flashed
-def focusAndFlash(widget, fg, bg, count=5)
-  return if count <= 0
-  TkTimer.new(200, count, 
-	      proc{widget.configure(:foreground=>bg, :background=>fg)}, 
-	      proc{widget.configure(:foreground=>fg, :background=>bg)}
-	      ).start
-  widget.focus(true)
-end
-
-l1 = TkLabelFrame.new($entry3_demo, :text=>"��������ȥ�")
-TkEntry.new(l1, :validate=>:focus, 
-	    :vcmd=>[
-	      proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-	    ]) {|e|
-  invalidcommand [proc{|w| focusAndFlash(w, e.fg, e.bg)}, '%W']
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l2 = TkLabelFrame.new($entry3_demo, :text=>"Ĺ�������դ�����ȥ�")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell}, 
-	    :vcmd=>[proc{|s| s.length < 10}, '%P']
-	    ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-### PHONE NUMBER ENTRY ###
-# Note that the source to this is quite a bit longer as the behaviour
-# demonstrated is a lot more ambitious than with the others.
-
-# Initial content for the third entry widget
-entry3content = TkVariable.new("1-(000)-000-0000")
-
-# Mapping from alphabetic characters to numbers.
-$phoneNumberMap = {}
-Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
-  chars.split('').each{|c|
-    $phoneNumberMap[c] = n
-    $phoneNumberMap[c.upcase] = n
-  }
-}
-
-# phoneSkipLeft --
-# Skip over fixed characters in a phone-number string when moving left.
-#
-# Arguments:
-# widget -	The entry widget containing the phone-number.
-def phoneSkipLeft(widget)
-  idx = widget.index('insert')
-  if idx == 8
-    # Skip back two extra characters
-    widget.cursor = idx - 2
-  elsif idx == 7 || idx == 12
-    # Skip back one extra character
-    widget.cursor = idx - 1
-  elsif idx <= 3
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# phoneSkipRight --
-# Skip over fixed characters in a phone-number string when moving right.
-#
-# Arguments:
-# widget -	The entry widget containing the phone-number.
-# add - Offset to add to index before calculation (used by validation.)
-def phoneSkipRight(widget, add = 0)
-  idx = widget.index('insert')
-  if (idx + add == 5)
-    # Skip forward two extra characters
-    widget.cursor = idx + 2
-  elsif (idx + add == 6 || idx + add == 10)
-    # Skip forward one extra character
-    widget.cursor = idx + 1
-  elsif (idx + add == 15 && add == 0)
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# validatePhoneChange --
-# Checks that the replacement (mapped to a digit) of the given
-# character in an entry widget at the given position will leave a
-# valid phone number in the widget.
-#
-# widget - entry widget to validate
-# vmode -  The widget's validation mode
-# idx -	   The index where replacement is to occur
-# char -   The character (or string, though that will always be
-#	   refused) to be overwritten at that point.
-
-def validatePhoneChange(widget, vmode, idx, char)
-  return true if idx == nil
-  Tk.after_idle(proc{widget.configure(:validate=>vmode, 
-				      :invcmd=>proc{Tk.bell})})
-  if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
-    widget.delete(idx)
-    widget.insert(idx, $phoneNumberMap[char] || char)
-    Tk.after_idle(proc{phoneSkipRight(widget, -1)})
-    return true
-  end
-  return false
-end
-
-
-l3 = TkLabelFrame.new($entry3_demo, :text=>"�ƹ������ֹ楨��ȥ�")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell}, 
-	    :textvariable=>entry3content, 
-	    :vcmd=>[
-	      proc{|w,v,i,s| validatePhoneChange(w,v,i,s)}, 
-	      "%W %v %i %S"
-	    ]){|e|
-  # Click to focus goes to the first editable character...
-  bind('FocusIn', proc{|d,w|
-	 if d != "NotifyAncestor"
-	   w.cursor = 3
-	   Tk.after_idle(proc{w.selection_clear})
-	 end
-       }, '%d %W')
-  bind('Left',  proc{|w| phoneSkipLeft(w)},  '%W')
-  bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l4 = TkLabelFrame.new($entry3_demo, :text=>"�ѥ���ɥ���ȥ�")
-TkEntry.new(l4, :validate=>:key, :show=>'*', 
-	    :vcmd=>[
-	      proc{|s| s.length <= 8}, 
-	      '%P'
-	    ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-TkFrame.new($entry3_demo){|f|
-  lower
-  TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.columnconfigure(f, [0,1], :uniform=>1)
-  pack(:fill=>:both, :expand=>true)
-}
diff --git a/ext/tk/sample/demos-jp/filebox.rb b/ext/tk/sample/demos-jp/filebox.rb
deleted file mode 100644
index 1754596706..0000000000
--- a/ext/tk/sample/demos-jp/filebox.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# widget demo prompts the user to select a file (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($filebox_demo) && $entry2_demo
-  $filebox_demo.destroy 
-  $filebox_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$filebox_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("filebox")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($filebox_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-	    'text'=>"����ȥ�˥ե�����̾��ľ�����Ϥ��뤫��\"Browse\" �ܥ���򲡤��ƥե����������������������ե�����̾������ǲ�������").pack('side'=>'top')
-
-# frame ����
-TkFrame.new($filebox_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $filebox_demo
-      $filebox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'filebox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-['����', '��¸'].each{|type|
-  TkFrame.new($filebox_demo) {|f|
-    TkLabel.new(f, 'text'=>"�ե������#{type}: ", 'anchor'=>'e')\
-    .pack('side'=>'left')
-
-    TkEntry.new(f, 'width'=>20) {|e|
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-
-      TkButton.new(f, 'text'=>'Browse ...', 
-		   'command'=>proc{fileDialog $filebox_demo,e,type})\
-      .pack('side'=>'left')
-    }
-
-    pack('fill'=>'x', 'padx'=>'1c', 'pady'=>3)
-  }
-}
-
-$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
-if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new($filebox_demo, 
-		    'text'=>'Motif��������Υ������������Ѥ���', 
-		    'variable'=>$tk_strictMotif, 
-		    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
-end
-
-def fileDialog(w,ent,operation)
-  #    Type names         Extension(s)             Mac File Type(s)
-  #
-  #--------------------------------------------------------
-  types = [
-    ['Text files',       ['.txt','.doc']          ], 
-    ['Text files',       [],                      'TEXT' ], 
-    ['Ruby Scripts',     ['.rb'],                 'TEXT' ], 
-    ['Tcl Scripts',      ['.tcl'],                'TEXT' ], 
-    ['C Source Files',   ['.c','.h']              ], 
-    ['All Source Files', ['.rb','.tcl','.c','.h'] ], 
-    ['Image Files',      ['.gif']                 ], 
-    ['Image Files',      ['.jpeg','.jpg']         ], 
-    ['Image Files',      [],                      ['GIFF','JPEG']], 
-    ['All files',        '*'                      ]
-  ]
-
-  if operation == '����'
-    file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
-  else
-    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w, 
-			  'initialfile'=>'Untitled', 
-			  'defaultextension'=>'.txt')
-  end
-  if file != ""
-    ent.delete 0, 'end'
-    ent.insert 0, file
-    ent.xview 'end'
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/floor.rb b/ext/tk/sample/demos-jp/floor.rb
deleted file mode 100644
index bb655d5b55..0000000000
--- a/ext/tk/sample/demos-jp/floor.rb
+++ /dev/null
@@ -1,1717 +0,0 @@
-#
-# floorDisplay widget demo (called by 'widget')
-#
-
-# floorDisplay --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -		Name of the canvas window.
-# active -	Number of active floor (1, 2, or 3).
-
-def floorDisplay(w,active)
-  return if $activeFloor == active
-
-  w.delete('all')
-  $activeFloor = active
-
-  # First go through the three floors, displaying the backgrounds for 
-  # each floor.
-
-  floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
-  floor_bg2(w,$floor_colors['bg2'],$floor_colors['outline2'])
-  floor_bg3(w,$floor_colors['bg3'],$floor_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list, 
-  # so we can insert highlights here.
-
-  TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with 
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels.clear
-  $floorItems.clear
-  send("floor_fg#{active}", w, $floor_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
-  TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"�����ֹ�: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -		The name of the canvas window.
-
-def newRoom(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom.value = $floorLabels[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -		The canvas window displaying the floorplan.
-# args -	Not used.
-
-def roomChanged(w,*args)
-  w.delete('highlight')
-  item = $floorItems[$currentRoom.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-def floor_bg1(w,fill,outline)
-  TkcPolygon.new(w,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-		 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-		 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-		 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-		 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-		 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-		 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-		 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-		 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-		 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-		 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-		 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-		 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  TkcLine.new(w,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-def floor_bg2(w,fill,outline)
-  TkcPolygon.new(w,559,129,484,129,484,162,398,162,398,129,315,129,
-		 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-		 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-		 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-		 367,802,367,802,129,725,129,725,133,559,133,559,129,
-		 'tags'=>['floor2','bg'], 'fill'=>fill)
-  TkcLine.new(w,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-def floor_bg3(w,fill,outline)
-  TkcPolygon.new(w,159,300,107,300,107,248,159,248,159,129,96,129,96,
-		 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-		 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcPolygon.new(w,258,370,258,329,350,329,350,311,399,311,399,129,
-		 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-		 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300, 
-	      'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-def floor_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '101'
-  $floorItems['101'] = i
-  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Pub Lift1'
-  $floorItems['Pub Lift1'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Priv Lift1'
-  $floorItems['Priv Lift1'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '110'
-  $floorItems['110'] = i
-  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '109'
-  $floorItems['109'] = i
-  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '111'
-  $floorItems['111'] = i
-  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117B'
-  $floorItems['117B'] = i
-  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '112'
-  $floorItems['112'] = i
-  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '113'
-  $floorItems['113'] = i
-  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117A'
-  $floorItems['117A'] = i
-  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117'
-  $floorItems['117'] = i
-  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '114'
-  $floorItems['114'] = i
-  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '115'
-  $floorItems['115'] = i
-  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '116'
-  $floorItems['116'] = i
-  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '118'
-  $floorItems['118'] = i
-  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-		     163,91,163,112,149,112,149,128, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '120'
-  $floorItems['120'] = i
-  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-		     156,192,156,169,175,169,175,246,79,246, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '122'
-  $floorItems['122'] = i
-  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '121'
-  $floorItems['121'] = i
-  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106A'
-  $floorItems['106A'] = i
-  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '105'
-  $floorItems['105'] = i
-  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106B'
-  $floorItems['106B'] = i
-  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '104'
-  $floorItems['104'] = i
-  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '108'
-  $floorItems['108'] = i
-  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '107'
-  $floorItems['107'] = i
-  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Smoking'
-  $floorItems['Smoking'] = i
-  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '123'
-  $floorItems['123'] = i
-  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '103'
-  $floorItems['103'] = i
-  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '124'
-  $floorItems['124'] = i
-  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '125'
-  $floorItems['125'] = i
-  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '126'
-  $floorItems['126'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-		     486,253,486,239,474,239,474,209, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '127'
-  $floorItems['127'] = i
-  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-		     490,188,490,204,476,204,476,164, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'MShower'
-  $floorItems['MShower'] = i
-  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Closet'
-  $floorItems['Closet'] = i
-  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'WShower'
-  $floorItems['WShower'] = i
-  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-		     697,166,697,275,553,275,531,254,515,254,
-		     515,174,503,174,503,161,486,161, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '130'
-  $floorItems['130'] = i
-  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-		     342,246,397,246,397,276,393,276,
-		     393,309,300,309,300,248,308,248, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '102'
-  $floorItems['102'] = i
-  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '128'
-  $floorItems['128'] = i
-  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-		     552,277,561,277,561,325,510,325,
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '129'
-  $floorItems['129'] = i
-  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-		     642,389,561,389,561,277,696,277, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '133'
-  $floorItems['133'] = i
-  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '132'
-  $floorItems['132'] = i
-  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '134'
-  $floorItems['134'] = i
-  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '135'
-  $floorItems['135'] = i
-  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-		     304,312,396,312,396,288,400,288,404,288,
-		     409,290,413,292,418,297,421,302,422,309,
-		     421,318,417,325,411,330,405,332,397,333,
-		     344,333,340,334,336,336,335,338,332,342,
-		     331,347,332,351,334,354,336,357,341,359, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Ramona Stair'
-  $floorItems['Ramona Stair'] = i
-  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-		     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'University Stair'
-  $floorItems['University Stair'] = i
-  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-		     358,48,363,39,365,29,348,25,335,22,321,14,
-		     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-		     227,13,223,17,221,22,220,34,260,34, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Stair'
-  $floorItems['Plaza Stair'] = i
-  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-		     323,56,337,70,350,83,365,94,377,100,
-		     386,104,386,128,220,128, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Deck'
-  $floorItems['Plaza Deck'] = i
-  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106'
-  $floorItems['106'] = i
-  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-		     95,128,114,128,114,151,157,151,157,153,112,153,
-		     112,130,97,130,97,168,175,168,175,131,146,131, 
-		     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '119'
-  $floorItems['119'] = i
-  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor1','label'])
-  TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-def floor_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-		     800,222,800,168,748,168, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '238'
-  $floorItems['238'] = i
-  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '237'
-  $floorItems['237'] = i
-  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-		     643,324,643,291,641,291,641,205,696,205,
-		     696,291,694,291,694,314,715,314,715,291,
-		     715,205,755,205,755,190,724,190,724,187, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '246'
-  $floorItems['246'] = i
-  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '247'
-  $floorItems['247'] = i
-  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-		     397,246,397,255,476,255,476,250,482,250,559,250,
-		     559,274,482,274,482,278,396,278,396,274,232,274, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '202'
-  $floorItems['202'] = i
-  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-		     306,196,306,180,175,180,175,169,156,169,
-		     156,196,176,196,176,228, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '206'
-  $floorItems['206'] = i
-  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '212'
-  $floorItems['212'] = i
-  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '245'
-  $floorItems['245'] = i
-  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '244'
-  $floorItems['244'] = i
-  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '243'
-  $floorItems['243'] = i
-  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '242'
-  $floorItems['242'] = i
-  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Barbecue Deck'
-  $floorItems['Barbecue Deck'] = i
-  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '240'
-  $floorItems['240'] = i
-  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '241'
-  $floorItems['241'] = i
-  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '239'
-  $floorItems['239'] = i
-  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '248'
-  $floorItems['248'] = i
-  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '236'
-  $floorItems['236'] = i
-  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '235'
-  $floorItems['235'] = i
-  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-		     572,143,579,143,579,185,626,185, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '234'
-  $floorItems['234'] = i
-  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-		     578,185,527,185,527,131,557,131, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '233'
-  $floorItems['233'] = i
-  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '230'
-  $floorItems['230'] = i
-  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '232'
-  $floorItems['232'] = i
-  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '229'
-  $floorItems['229'] = i
-  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '227'
-  $floorItems['227'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '228'
-  $floorItems['228'] = i
-  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '226'
-  $floorItems['226'] = i
-  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '225'
-  $floorItems['225'] = i
-  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '224'
-  $floorItems['224'] = i
-  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '223'
-  $floorItems['223'] = i
-  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '222'
-  $floorItems['222'] = i
-  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '221'
-  $floorItems['221'] = i
-  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '204'
-  $floorItems['204'] = i
-  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '205'
-  $floorItems['205'] = i
-  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '207'
-  $floorItems['207'] = i
-  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '208'
-  $floorItems['208'] = i
-  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '209'
-  $floorItems['209'] = i
-  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217'
-  $floorItems['217'] = i
-  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217A'
-  $floorItems['217A'] = i
-  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '216'
-  $floorItems['216'] = i
-  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '215'
-  $floorItems['215'] = i
-  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '214'
-  $floorItems['214'] = i
-  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '213'
-  $floorItems['213'] = i
-  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '210'
-  $floorItems['210'] = i
-  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '211'
-  $floorItems['211'] = i
-  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '203'
-  $floorItems['203'] = i
-  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-		     154,198,154,192,109,192,109,169,99,169, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '220'
-  $floorItems['220'] = i
-  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Priv Lift2'
-  $floorItems['Priv Lift2'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Pub Lift 2'
-  $floorItems['Pub Lift 2'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '218'
-  $floorItems['218'] = i
-  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '219'
-  $floorItems['219'] = i
-  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-		     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '201'
-  $floorItems['201'] = i
-  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor2','label'])
-  TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-def floor_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316'
-  $floorItems['316'] = i
-  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '309'
-  $floorItems['309'] = i
-  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '308'
-  $floorItems['308'] = i
-  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '307'
-  $floorItems['307'] = i
-  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '305'
-  $floorItems['305'] = i
-  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324B'
-  $floorItems['324B'] = i
-  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324A'
-  $floorItems['324A'] = i
-  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '320'
-  $floorItems['320'] = i
-  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '310'
-  $floorItems['310'] = i
-  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '312'
-  $floorItems['312'] = i
-  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '313'
-  $floorItems['313'] = i
-  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '314'
-  $floorItems['314'] = i
-  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '315'
-  $floorItems['315'] = i
-  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316B'
-  $floorItems['316B'] = i
-  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316A'
-  $floorItems['316A'] = i
-  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-		     174,198,174,226,101,226,101,179,97,179, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '319'
-  $floorItems['319'] = i
-  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '311'
-  $floorItems['311'] = i
-  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '318'
-  $floorItems['318'] = i
-  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '317'
-  $floorItems['317'] = i
-  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '323'
-  $floorItems['323'] = i
-  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '325'
-  $floorItems['325'] = i
-  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '321'
-  $floorItems['321'] = i
-  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-		     264,181,264,135,314,135, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '322'
-  $floorItems['322'] = i
-  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Pub Lift3'
-  $floorItems['Pub Lift3'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Priv Lift3'
-  $floorItems['Priv Lift3'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '303'
-  $floorItems['303'] = i
-  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-		     244,230,244,221,252,221,252,203, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324'
-  $floorItems['324'] = i
-  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '304'
-  $floorItems['304'] = i
-  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '301'
-  $floorItems['301'] = i
-  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '327'
-  $floorItems['327'] = i
-  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '326'
-  $floorItems['326'] = i
-  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-		     375,274,397,274,397,248,339,248,339,242,308,242, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '302'
-  $floorItems['302'] = i
-  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-		     272,193,263,180,242,180,175,180,175,169,156,169,
-		     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-		     107,248,160,248,160,301,107,301,107,275,70,275, 
-		     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '306'
-  $floorItems['306'] = i
-  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color, 
-	      'anchor'=>'c', 'tags'=>['floor3','label'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($floor_demo) && $floor_demo
-  $floor_demo.destroy 
-  $floor_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$floor_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration")
-  iconname("Floorplan")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-# label ����
-TkLabel.new($floor_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
-	    'text'=>"���Υ�����ɥ��ˤϥǥ������륨�����åץ��ȼҤΥ���������ꥵ������ܥ�ȥ� (DECWRL) �δּ�꤬�񤫤줿�����Х� widget �����äƤ��ޤ�������� 3�����Ƥǡ���ˤ��Τ�����1��ʬ�����򡢤Ĥޤꤽ�δּ�꤬ɽ�������褦�ˤʤäƤ��ޤ������볬�����򤹤�ˤϡ����ξ�ǥޥ����κ��ܥ���򥯥�å����Ƥ����������ޥ��������򤵤�Ƥ��볬�ξ��ư���ȡ����β��ˤ��������ο����Ѥ�ꡢ�����ֹ椬�������ֹ�:�ץ���ȥ��ɽ������ޤ����ޤ�������ȥ�������ֹ��񤯤Ȥ��������ο����Ѥ��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$floor_buttons = TkFrame.new($floor_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $floor_demo
-      $floor_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'floor'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# �ѿ�����
-$floorLabels = {}
-$floorItems = {}
-
-# canvas ����
-if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new($floor_demo,'bd'=>2,'relief'=>'sunken',
-				    'highlightthickness'=>2)
-  $floor_canvas = TkCanvas.new($floor_canvas_frame, 
-			       'width'=>900, 'height'=>500, 'borderwidth'=>0, 
-			       'highlightthickness'=>0) {|c|
-    TkScrollbar.new($floor_demo, 'orient'=>'horiz', 
-		    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new($floor_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new($floor_demo) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
-				   'borderwidth'=>0, 
-				   'highlightthickness'=>0) {
-	xscrollcommand(proc{|first,last| h.set first,last})
-	yscrollcommand(proc{|first,last| v.set first,last})
-	pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
-	   'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| c.yview(*args)})
-    h.command(proc{|*args| c.xview(*args)})
-  }
-end
-
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken', 
-			   'bd'=>2, 'textvariable'=>$currentRoom)
-
-# Choose colors, then fill in the floorplan.
-
-$floor_colors = {}
-if TkWinfo.depth($floor_canvas) > 1
-  $floor_colors['bg1'] = '#a9c1da'
-  $floor_colors['outline1'] = '#77889a'
-  $floor_colors['bg2'] = '#9ab0c6'
-  $floor_colors['outline2'] = '#687786'
-  $floor_colors['bg3'] = '#8ba0b3'
-  $floor_colors['outline3'] = '#596673'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = '#c4d1df'
-else
-  $floor_colors['bg1'] = 'white'
-  $floor_colors['outline1'] = 'black'
-  $floor_colors['bg2'] = 'white'
-  $floor_colors['outline2'] = 'black'
-  $floor_colors['bg3'] = 'white'
-  $floor_colors['outline3'] = 'black'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = 'black'
-end
-
-$activeFloor = ''
-floorDisplay $floor_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor_canvas.itembind('floor1', '1', proc{floorDisplay $floor_canvas,1})
-$floor_canvas.itembind('floor2', '1', proc{floorDisplay $floor_canvas,2})
-$floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
-$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
-$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
-$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion', 
-		   proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
-$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
-$currentRoom.value = ''
-$currentRoom.trace('w',proc{roomChanged $floor_canvas})
-
diff --git a/ext/tk/sample/demos-jp/form.rb b/ext/tk/sample/demos-jp/form.rb
deleted file mode 100644
index 35baeed46b..0000000000
--- a/ext/tk/sample/demos-jp/form.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# form widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($form_demo) && $form_demo
-  $form_demo.destroy 
-  $form_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$form_demo = TkToplevel.new {|w|
-  title("Form Demonstration")
-  iconname("form")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($form_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υ�����ɥ��ϴ�ñ�ʥե����������ѤˤʤäƤ��ơ����ޤ��ޤʥ���ȥ�����Ϥ��Ǥ��ޤ������֤ǥ���ȥ�����ؤ����Ǥ��ޤ���"
-}
-msg.pack('side'=>'top', 'fill'=>'x')
-
-# frame ����
-TkFrame.new($form_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $form_demo
-      $form_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'form'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry ����
-form_data = []
-(1..5).each{|i|
-  f = TkFrame.new($form_demo, 'bd'=>2)
-  e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
-  l = TkLabel.new(f)
-  e.pack('side'=>'right')
-  l.pack('side'=>'left')
-  form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
-}
-
-# ʸ��������
-form_data[1]['label'].text('̾��:')
-form_data[2]['label'].text('����:')
-form_data[5]['label'].text('����:')
-
-# pack
-(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
-
diff --git a/ext/tk/sample/demos-jp/hello b/ext/tk/sample/demos-jp/hello
deleted file mode 100644
index 859ebd950e..0000000000
--- a/ext/tk/sample/demos-jp/hello
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-
-TkButton.new(nil,
-	'text'=>"����ˤ��ϡ�����",
-	'command'=>proc{print "����ˤ��ϡ�����\n"; exit}
-).pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/hscale.rb b/ext/tk/sample/demos-jp/hscale.rb
deleted file mode 100644
index 4333239c73..0000000000
--- a/ext/tk/sample/demos-jp/hscale.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require "tkcanvas"
-
-if defined?($hscale_demo) && $hscale_deom
-  $hscale_demo.destroy
-  $hscale_demo = nil
-end
-
-$hscale_demo = TkToplevel.new {|w|
-  title("Horizontal Scale Demonstration")
-  iconname("hscale")
-}
-positionWindow($hscale_demo)
-
-
-msg = TkLabel.new($hscale_demo) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "���ˤ������1�Ĥȿ�ʿ�ʥ������뤬ɽ������Ƥ��ޤ���\
-���������ǥޥ����ܥ���1�򥯥�å����ޤ��ϥɥ�å������\
-�����Ĺ�����Ѥ��뤳�Ȥ��Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-TkFrame.new($hscale_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc {
-      tmppath = $hscale_demo
-      $hscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc { showCode 'hscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-TkFrame.new($hscale_demo) {|frame|
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, '0', '0', '1', '1', '2', '2') {
-      fill 'DeepSkyBlue'
-      tags 'poly'
-    }
-    TkcLine.new(c, '0', '0', '1', '1', '2', '2', '0', '0') {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'top', 'expand'=>'yes', 'anchor'=>'s', 'fill'=>'x', 'padx'=>'15')
-  scale = TkScale.new(frame) {
-    orient 'horizontal'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setWidth(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
-  scale.set 75
-}.pack('side'=>'top', 'fill'=>'x')
-
-
-def setWidth(w, width)
-  width = width + 21
-  x2 = width - 30
-  if x2 < 21
-    x2 = 21
-  end
-  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-end
diff --git a/ext/tk/sample/demos-jp/icon.rb b/ext/tk/sample/demos-jp/icon.rb
deleted file mode 100644
index 9b39d33847..0000000000
--- a/ext/tk/sample/demos-jp/icon.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# iconic button widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($icon_demo) && $icon_demo
-  $icon_demo.destroy 
-  $icon_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$icon_demo = TkToplevel.new {|w|
-  title("Iconic Button Demonstration")
-  iconname("icon")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($icon_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "���Υ�����ɥ��ˤϥ饸���ܥ���ȥ����å��ܥ����˥ӥåȥޥåפ������ɽ������ 3 �Ĥ���ˡ�򼨤��Ƥ��ޤ������ˤ���Τ�2�ĤΥ饸���ܥ���ǡ����줾�줬���ӥåȥޥåפ�����򼨤����󥸥������ǤǤ��Ƥ��ޤ�������ˤ���Τϡ�����Ѥߤ��ɤ����ˤ�äưۤʤ������ɽ����������å��ܥ���Ǥ�����¦�ˤ���Τ�����Ѥߤ��ɤ����ˤ�ä��طʿ����Ѥ��ӥåȥޥåפ�ɽ����������å��ܥ���Ǥ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($icon_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $icon_demo
-      $icon_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'icon'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image ����
-flagup = \
-TkBitmapImage.new('file'=>[$demo_dir,
-                           'images','flagup.bmp'].join(File::Separator),
-		  'maskfile'=>\
-		  [$demo_dir,'images','flagup.bmp'].join(File::Separator))
-flagdown = \
-TkBitmapImage.new('file'=>[$demo_dir,
-                           'images','flagdown.bmp'].join(File::Separator),
-		  'maskfile'=>\
-		  [$demo_dir,'images','flagdown.bmp'].join(File::Separator))
-
-# �ѿ�����
-letters = TkVariable.new
-
-# frame ����
-TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
-  TkFrame.new(w) {|f|
-    TkRadioButton.new(f){
-      bitmap '@' + [$demo_dir,'images','letters.bmp'].join(File::Separator)
-      variable letters
-      value 'full'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-    TkRadioButton.new(f){
-      bitmap '@' + [$demo_dir,'images','noletter.bmp'].join(File::Separator)
-      variable letters
-      value 'empty'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  TkCheckButton.new(w) {
-    image flagdown
-    selectimage flagup
-    indicatoron 0
-    selectcolor self['background']
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  TkCheckButton.new(w) {
-    bitmap '@' + [$demo_dir,'images','letters.bmp'].join(File::Separator)
-    indicatoron 0
-    selectcolor 'SeaGreen1'
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-}.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-jp/image1.rb b/ext/tk/sample/demos-jp/image1.rb
deleted file mode 100644
index bfe47c47af..0000000000
--- a/ext/tk/sample/demos-jp/image1.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# two image widgets demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($image1_demo) && $image1_demo
-  $image1_demo.destroy 
-  $image1_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$image1_demo = TkToplevel.new {|w|
-  title('Image Demonstration #1')
-  iconname("Image1")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($image1_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υǥ�Ǥ�2�ĤΥ�٥��˲����򤽤줾��ɽ�����Ƥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($image1_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $image1_demo
-      $image1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'image1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image ����
-image1a = \
-TkPhotoImage.new('file'=>[$demo_dir,
-                          'images','earth.gif'].join(File::Separator))
-image1b = \
-TkPhotoImage.new('file'=>[$demo_dir,
-                          'images','earthris.gif'].join(File::Separator))
-
-# label ����
-[ TkLabel.new($image1_demo, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  TkLabel.new($image1_demo, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-
diff --git a/ext/tk/sample/demos-jp/image2.rb b/ext/tk/sample/demos-jp/image2.rb
deleted file mode 100644
index 07f9b17ebe..0000000000
--- a/ext/tk/sample/demos-jp/image2.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($image2_demo) && $image2_demo
-  $image2_demo.destroy 
-  $image2_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$image2_demo = TkToplevel.new {|w|
-  title('Image Demonstration #2')
-  iconname("Image2")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($image2_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υǥ�Ǥ�Tk�� photo image ����Ѥ��Ʋ����򸫤뤳�Ȥ��Ǥ��ޤ����ǽ�˥���ȥ���ˤ˥ǥ��쥯�ȥ�̾������Ʋ����������˲��Υꥹ�ȥܥå����ˤ��Υǥ��쥯�ȥ������ɤ��뤿�ᡢ�꥿����򲡤��Ƥ������������θ塢���������򤹤뤿��˥ꥹ�ȥܥå�������Υե�����̾����֥륯��å����Ʋ�������"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($image2_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $image2_demo
-      $image2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'image2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# �ѿ�����
-$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
-
-# image ����
-$image2a = TkPhotoImage.new
-
-# �ե�����̾������
-TkLabel.new($image2_demo, 'text'=>'�ǥ��쥯�ȥ�:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-image2_e = TkEntry.new($image2_demo) {
-  width 30
-  textvariable $dirName
-}.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkLabel.new($image2_demo, 'text'=>'�ե�����:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new($image2_demo){|w|
-  s = TkScrollbar.new(w)
-  l = TkListbox.new(w) {
-    width 20
-    height 10
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| l.yview(*args)})
-  l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  #l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
-  l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
-  l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
-
-  image2_e.bind 'Return', proc{loadDir l}
-
-}.pack('side'=>'top', 'anchor'=>'w')
-
-# image ����
-[ TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20),
-  TkLabel.new($image2_demo, 'text'=>'����:'),
-  TkLabel.new($image2_demo, 'image'=>$image2a)
-].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
-
-# �᥽�å����
-def loadDir(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-def loadImage(img,w,x,y)
-  img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
diff --git a/ext/tk/sample/demos-jp/image3.rb b/ext/tk/sample/demos-jp/image3.rb
deleted file mode 100644
index 84257a2b32..0000000000
--- a/ext/tk/sample/demos-jp/image3.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# image3.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image3_demo) && $image3_demo
-  $image3_demo.destroy 
-  $image3_demo = nil
-end
-
-# demo toplevel widget
-$image3_demo = TkToplevel.new {|w|
-  title('Image Demonstration #3')
-  iconname("Image3")
-  positionWindow(w)
-}
-
-# 
-def loadDir(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-# selectAndLoadDir --
-# This procedure pops up a dialog to ask for a directory to load into
-# the listobx and (if the user presses OK) reloads the directory
-# listbox from the directory named in the demo's entry.
-#
-# Arguments:
-# w -			Name of the toplevel window of the demo.
-def selectAndLoadDir(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName, :parent=>w, :mustexist=>true)
-  if dir.length > 0
-    $dirName.value = dir 
-    loadDir(lbox)
-  end
-end
-
-def loadImage(w,x,y)
-  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
-
-# label
-msg = TkLabel.new($image3_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υǥ�Ǥ�Tk�� photo image ����Ѥ��Ʋ����� ���뤳�Ȥ��Ǥ��ޤ����ǽ�˥���ȥ���ˤ˥ǥ��쥯�ȥ�̾������Ʋ����������˲��Υꥹ�ȥܥå����ˤ��Υǥ��쥯�ȥ������ɤ��뤿�ᡢ�꥿����򲡤��Ƥ������������θ塢���������򤹤뤿��˥ꥹ�ȥܥå�������Υե�����̾����֥륯��å����Ʋ�������"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new($image3_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $image3_demo
-      $image3_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'image3'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# variable
-$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
-
-# image
-begin
-  $image3a.delete
-rescue
-end
-$image3a = TkPhotoImage.new
-
-#
-image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-
-image3_df = TkLabelFrame.new($image3_demo, :text=>'�ǥ��쥯�ȥ�:')
-
-image3_ff = TkLabelFrame.new($image3_demo, :text=>'�ե�����:', 
-			     :padx=>'2m', :pady=>'2m')
-image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
-  pack(:side=>:left, :fill=>:y, :expand=>true)
-  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y, 
-					     :expand=>true))
-  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
-  bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
-}
-
-image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
-  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
-  bind('Return', proc{loadDir(image3_lbx)})
-}
-
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"�ǥ��쥯�ȥ�����", 
-	     :command=>proc{selectAndLoadDir(image3_ent, image3_lbx)}) {
-  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
-}
-
-image3_if = TkLabelFrame.new($image3_demo, :text=>'���᡼��:') {|f|
-  TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-}
-
-Tk.grid(image3_df,  '-',
-	:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if, 
-	:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-TkGrid.columnconfigure(image3_f, 1, :weight=>1)
-
diff --git a/ext/tk/sample/demos-jp/images/earth.gif b/ext/tk/sample/demos-jp/images/earth.gif
deleted file mode 100644
index 3ae4a9ce01..0000000000
--- a/ext/tk/sample/demos-jp/images/earth.gif
+++ /dev/null
diff --git a/ext/tk/sample/demos-jp/images/earthris.gif b/ext/tk/sample/demos-jp/images/earthris.gif
deleted file mode 100644
index 48f08c4421..0000000000
--- a/ext/tk/sample/demos-jp/images/earthris.gif
+++ /dev/null
diff --git a/ext/tk/sample/demos-jp/images/face.bmp b/ext/tk/sample/demos-jp/images/face.bmp
deleted file mode 100644
index 03d829f4d1..0000000000
--- a/ext/tk/sample/demos-jp/images/face.bmp
+++ /dev/null
@@ -1,173 +0,0 @@
-#define face_width 108
-#define face_height 144
-#define face_x_hot 48
-#define face_y_hot 80
-static char face_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09,
-   0x20, 0x80, 0x24, 0x05, 0x00, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x88,
-   0x24, 0x20, 0x80, 0x24, 0x00, 0x00, 0x00, 0x10, 0x80, 0x04, 0x00, 0x01,
-   0x00, 0x01, 0x40, 0x0a, 0x09, 0x00, 0x92, 0x04, 0x80, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x10, 0x40, 0x12, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x84,
-   0x24, 0x40, 0x22, 0xa8, 0x02, 0x14, 0x84, 0x92, 0x40, 0x42, 0x12, 0x04,
-   0x10, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x52, 0x11, 0x00, 0x12, 0x00,
-   0x40, 0x02, 0x00, 0x20, 0x00, 0x08, 0x00, 0xaa, 0x02, 0x54, 0x85, 0x24,
-   0x00, 0x10, 0x12, 0x00, 0x00, 0x81, 0x44, 0x00, 0x90, 0x5a, 0x00, 0xea,
-   0x1b, 0x00, 0x80, 0x40, 0x40, 0x02, 0x00, 0x08, 0x00, 0x20, 0xa2, 0x05,
-   0x8a, 0xb4, 0x6e, 0x45, 0x12, 0x04, 0x08, 0x00, 0x00, 0x00, 0x10, 0x02,
-   0xa8, 0x92, 0x00, 0xda, 0x5f, 0x10, 0x00, 0x10, 0xa1, 0x04, 0x20, 0x41,
-   0x02, 0x00, 0x5a, 0x25, 0xa0, 0xff, 0xfb, 0x05, 0x41, 0x02, 0x04, 0x00,
-   0x00, 0x08, 0x40, 0x80, 0xec, 0x9b, 0xec, 0xfe, 0x7f, 0x01, 0x04, 0x20,
-   0x90, 0x02, 0x04, 0x00, 0x08, 0x20, 0xfb, 0x2e, 0xf5, 0xff, 0xff, 0x57,
-   0x00, 0x04, 0x02, 0x00, 0x00, 0x20, 0x01, 0xc1, 0x6e, 0xab, 0xfa, 0xff,
-   0xff, 0x05, 0x90, 0x20, 0x48, 0x02, 0x00, 0x04, 0x20, 0xa8, 0xdf, 0xb5,
-   0xfe, 0xff, 0xff, 0x0b, 0x01, 0x00, 0x01, 0x00, 0x80, 0x80, 0x04, 0xe0,
-   0xbb, 0xef, 0xff, 0xff, 0x7f, 0x01, 0x00, 0x04, 0x48, 0x02, 0x00, 0x20,
-   0x80, 0xf4, 0x6f, 0xfb, 0xff, 0xff, 0xff, 0x20, 0x90, 0x40, 0x02, 0x00,
-   0x00, 0x04, 0x08, 0xb8, 0xf6, 0xff, 0xff, 0xdf, 0xbe, 0x12, 0x45, 0x10,
-   0x90, 0x04, 0x90, 0x00, 0x22, 0xfa, 0xff, 0xff, 0xff, 0xbb, 0xd7, 0xe9,
-   0x3a, 0x02, 0x02, 0x00, 0x04, 0x90, 0x80, 0xfe, 0xdf, 0xf6, 0xb7, 0xef,
-   0xbe, 0x56, 0x57, 0x40, 0x48, 0x09, 0x00, 0x04, 0x00, 0xfa, 0xf5, 0xdf,
-   0xed, 0x5a, 0xd5, 0xea, 0xbd, 0x09, 0x00, 0x00, 0x40, 0x00, 0x92, 0xfe,
-   0xbf, 0x7d, 0xb7, 0x6a, 0x55, 0xbf, 0xf7, 0x02, 0x11, 0x01, 0x00, 0x91,
-   0x00, 0xff, 0xff, 0xaf, 0x55, 0x55, 0x5b, 0xeb, 0xef, 0x22, 0x04, 0x04,
-   0x04, 0x00, 0xa4, 0xff, 0xf7, 0xad, 0xaa, 0xaa, 0xaa, 0xbe, 0xfe, 0x03,
-   0x20, 0x00, 0x10, 0x44, 0x80, 0xff, 0x7f, 0x55, 0x12, 0x91, 0x2a, 0xeb,
-   0xbf, 0x0b, 0x82, 0x02, 0x00, 0x00, 0xd1, 0x7f, 0xdf, 0xa2, 0xa4, 0x54,
-   0x55, 0xfd, 0xfd, 0x47, 0x08, 0x08, 0x00, 0x21, 0xe4, 0xff, 0x37, 0x11,
-   0x09, 0xa5, 0xaa, 0xb6, 0xff, 0x0d, 0x80, 0x00, 0x00, 0x04, 0xd0, 0xff,
-   0x4f, 0x44, 0x20, 0x48, 0x55, 0xfb, 0xff, 0x27, 0x11, 0x02, 0x40, 0x40,
-   0xe2, 0xfb, 0x15, 0x11, 0x4a, 0x55, 0x4a, 0x7d, 0xf7, 0x0f, 0x00, 0x00,
-   0x04, 0x08, 0xf8, 0xdf, 0x52, 0x44, 0x01, 0x52, 0xb5, 0xfa, 0xff, 0x0f,
-   0x49, 0x02, 0x00, 0x02, 0xe9, 0xf6, 0x0a, 0x11, 0xa4, 0x88, 0x4a, 0x6d,
-   0xff, 0x5f, 0x00, 0x00, 0x10, 0x20, 0xf0, 0x2f, 0x21, 0x44, 0x10, 0x52,
-   0xb5, 0xfa, 0xff, 0x0f, 0x44, 0x04, 0x80, 0x08, 0xf8, 0xab, 0x8a, 0x00,
-   0x81, 0xa4, 0xd4, 0xd6, 0xfe, 0x2f, 0x00, 0x00, 0x04, 0x40, 0xb5, 0x2d,
-   0x21, 0x08, 0x04, 0x90, 0xaa, 0xfa, 0xff, 0x1f, 0x11, 0x01, 0x00, 0x04,
-   0xf0, 0x57, 0x0a, 0x22, 0x40, 0x4a, 0xda, 0x5e, 0xfb, 0x1f, 0x40, 0x00,
-   0x40, 0x20, 0xba, 0x95, 0x90, 0x00, 0x01, 0xa0, 0xaa, 0xea, 0xff, 0x5f,
-   0x02, 0x02, 0x00, 0x01, 0xe8, 0x57, 0x05, 0x00, 0x00, 0x12, 0xd5, 0xfe,
-   0xfd, 0x1f, 0x48, 0x00, 0x04, 0x48, 0x7a, 0x95, 0x08, 0x02, 0x10, 0x40,
-   0xaa, 0x55, 0xf7, 0x1f, 0x00, 0x09, 0x20, 0x00, 0xf8, 0x57, 0x22, 0x10,
-   0x00, 0x28, 0xa9, 0xfa, 0xff, 0x5f, 0x02, 0x00, 0x00, 0x49, 0xdd, 0x29,
-   0x01, 0x00, 0x80, 0x80, 0xaa, 0xd7, 0xff, 0x0f, 0x10, 0x00, 0x08, 0x00,
-   0xf8, 0x96, 0x08, 0x00, 0x00, 0x20, 0x54, 0xfa, 0xee, 0x3f, 0x81, 0x04,
-   0x40, 0x24, 0xfe, 0x55, 0x82, 0x00, 0x00, 0x82, 0xd2, 0xad, 0xff, 0x0f,
-   0x08, 0x00, 0x04, 0x80, 0x6c, 0x97, 0x00, 0x00, 0x02, 0x20, 0xa9, 0xf6,
-   0xdf, 0x5f, 0x00, 0x02, 0x20, 0x09, 0xfa, 0x49, 0x12, 0x00, 0x20, 0x84,
-   0x54, 0xdb, 0xfe, 0x1f, 0x91, 0x00, 0x00, 0x00, 0xf8, 0x2b, 0x00, 0x20,
-   0x00, 0x40, 0xa4, 0xf6, 0xbb, 0x1f, 0x04, 0x00, 0x44, 0x92, 0x7e, 0x95,
-   0x02, 0x00, 0x00, 0x89, 0xaa, 0xdd, 0xff, 0x1f, 0x20, 0x09, 0x10, 0x00,
-   0xf4, 0x57, 0x20, 0x01, 0x08, 0x20, 0xa9, 0x76, 0xff, 0x5f, 0x02, 0x00,
-   0x00, 0x21, 0xfc, 0x4a, 0x05, 0x00, 0x01, 0x80, 0x54, 0xdb, 0xff, 0x1e,
-   0x08, 0x02, 0x04, 0x08, 0xf9, 0x2b, 0x00, 0x00, 0x40, 0x28, 0xd2, 0xf6,
-   0xff, 0xbf, 0x80, 0x00, 0x90, 0x00, 0xbc, 0x92, 0x08, 0x10, 0x00, 0x82,
-   0x54, 0xdb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x44, 0xf9, 0x55, 0x02, 0x01,
-   0x00, 0x20, 0xaa, 0xbd, 0xfd, 0x3f, 0x08, 0x04, 0x04, 0x10, 0xf4, 0x2a,
-   0x01, 0x00, 0x22, 0x80, 0xd4, 0xf6, 0xff, 0x5f, 0x82, 0x00, 0x40, 0x02,
-   0xf8, 0x55, 0x20, 0x00, 0x00, 0x50, 0x6a, 0xdf, 0xfe, 0x3f, 0x00, 0x00,
-   0x00, 0x48, 0xe9, 0x4a, 0x05, 0x08, 0x00, 0xa5, 0xd5, 0xf5, 0xff, 0x3f,
-   0x10, 0x01, 0x10, 0x01, 0xb0, 0xab, 0x92, 0x02, 0x40, 0xf8, 0xbf, 0xde,
-   0xfe, 0x5f, 0x02, 0x04, 0x04, 0x48, 0xfa, 0xd4, 0x6f, 0x20, 0x84, 0xef,
-   0xff, 0xfb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x00, 0xe0, 0xed, 0xbf, 0x0b,
-   0xa1, 0x7e, 0xff, 0xbf, 0xfd, 0x5f, 0x04, 0x01, 0x20, 0x49, 0xd2, 0xfb,
-   0xfe, 0x55, 0xd4, 0xff, 0xff, 0xf6, 0xff, 0x07, 0x00, 0x04, 0x00, 0x00,
-   0xc0, 0xaa, 0xfb, 0x2b, 0xa2, 0xfe, 0xff, 0xdf, 0xee, 0x1f, 0x91, 0x00,
-   0x82, 0xa4, 0xa4, 0xf5, 0xff, 0x57, 0xd5, 0xff, 0xbf, 0xfd, 0xff, 0x4d,
-   0x00, 0x00, 0x20, 0x00, 0x88, 0x5b, 0xff, 0x2f, 0x69, 0xff, 0xff, 0xdb,
-   0xfe, 0x1f, 0x24, 0x02, 0x00, 0x49, 0xa2, 0xd6, 0xff, 0x5f, 0xea, 0xff,
-   0x7f, 0x7f, 0x7f, 0x0d, 0x00, 0x00, 0x10, 0x00, 0x40, 0xab, 0xf7, 0xbb,
-   0xf0, 0xdf, 0xff, 0xd5, 0xff, 0xbf, 0x82, 0x04, 0x42, 0x24, 0x91, 0xd5,
-   0xaa, 0xae, 0xd4, 0xaa, 0x52, 0x7b, 0xff, 0x15, 0x08, 0x00, 0x00, 0x01,
-   0x04, 0x55, 0xd5, 0x55, 0x70, 0x5b, 0x75, 0xdd, 0xdf, 0x1f, 0x40, 0x00,
-   0x08, 0x48, 0xa0, 0x4a, 0xa9, 0x56, 0xea, 0x56, 0xad, 0x6a, 0x7d, 0x9b,
-   0x04, 0x01, 0x00, 0x02, 0x42, 0x2a, 0xd5, 0xaa, 0xa8, 0xaa, 0xaa, 0xfa,
-   0xdf, 0x2f, 0x10, 0x04, 0x22, 0x48, 0x08, 0x45, 0x2a, 0x15, 0x68, 0x55,
-   0x55, 0xd7, 0x76, 0x1b, 0x00, 0x00, 0x00, 0x01, 0x40, 0x2a, 0x80, 0xa0,
-   0xb2, 0x09, 0x48, 0xb9, 0xdf, 0x17, 0x22, 0x01, 0x00, 0x24, 0x45, 0x8a,
-   0x24, 0x4a, 0x54, 0x51, 0x91, 0xf6, 0x6e, 0x4b, 0x00, 0x04, 0x90, 0x00,
-   0x80, 0x52, 0x00, 0x20, 0x69, 0x05, 0xa4, 0xaa, 0xff, 0x1e, 0x48, 0x00,
-   0x02, 0x92, 0x08, 0x05, 0x81, 0x94, 0xd4, 0x92, 0x40, 0xfd, 0xb6, 0x8b,
-   0x00, 0x01, 0x40, 0x00, 0x82, 0x54, 0x00, 0x48, 0x68, 0x05, 0x90, 0xa4,
-   0xef, 0x06, 0x24, 0x00, 0x08, 0x12, 0x10, 0x05, 0x00, 0x10, 0xb5, 0x01,
-   0x42, 0xfb, 0xbf, 0x43, 0x00, 0x09, 0x00, 0x40, 0x81, 0xa8, 0x08, 0x4a,
-   0xaa, 0x96, 0x90, 0xac, 0x6d, 0x15, 0x22, 0x00, 0x20, 0x09, 0x04, 0x15,
-   0x80, 0x28, 0xdc, 0x01, 0x24, 0xfb, 0xbf, 0x01, 0x80, 0x04, 0x09, 0x00,
-   0x40, 0x48, 0x02, 0x45, 0xb2, 0x2e, 0x41, 0x6d, 0xef, 0x05, 0x11, 0x00,
-   0x40, 0x52, 0x02, 0x15, 0x29, 0x2a, 0xac, 0x42, 0x54, 0xfb, 0x3b, 0x51,
-   0x84, 0x00, 0x08, 0x00, 0x20, 0x54, 0x80, 0x05, 0xb5, 0x3d, 0xa2, 0xb6,
-   0xdf, 0x00, 0x20, 0x04, 0x20, 0x49, 0x89, 0xa8, 0x6a, 0x29, 0xac, 0xd6,
-   0x54, 0xff, 0x3f, 0x84, 0x00, 0x01, 0x04, 0x10, 0x00, 0x94, 0xa8, 0x56,
-   0xda, 0x5f, 0xab, 0xd5, 0x1e, 0x10, 0x48, 0x00, 0x90, 0x82, 0x48, 0xa8,
-   0xb2, 0xac, 0xfd, 0x55, 0xd5, 0xfe, 0x9f, 0x80, 0x00, 0x0a, 0x02, 0x08,
-   0x02, 0x55, 0x5a, 0x75, 0xff, 0xaf, 0xb6, 0xf7, 0x2d, 0x12, 0x92, 0x00,
-   0x10, 0x20, 0x10, 0xa8, 0x54, 0xd5, 0xbf, 0x5d, 0xad, 0xdd, 0x0f, 0x00,
-   0x00, 0x04, 0x40, 0x09, 0x84, 0xa8, 0xaa, 0x5a, 0xed, 0xeb, 0x6a, 0xff,
-   0x9f, 0xa4, 0x24, 0x01, 0x02, 0xa0, 0x20, 0x50, 0x55, 0xd5, 0xbe, 0xae,
-   0xad, 0xfd, 0x16, 0x00, 0x10, 0x04, 0x20, 0x0a, 0x08, 0xb4, 0xaa, 0x95,
-   0xaa, 0x7b, 0xb7, 0xdb, 0x5f, 0x92, 0x04, 0x01, 0x84, 0x20, 0x21, 0x51,
-   0xd5, 0x2a, 0xa9, 0xee, 0xd5, 0xfe, 0x0d, 0x00, 0x20, 0x04, 0x10, 0x00,
-   0x08, 0x50, 0xe9, 0xd7, 0xd4, 0xfb, 0xb5, 0xff, 0x9f, 0x24, 0x09, 0x01,
-   0x42, 0x4a, 0xa2, 0x64, 0xd5, 0x55, 0x7b, 0x7f, 0xda, 0x7d, 0x4f, 0x00,
-   0x20, 0x04, 0x00, 0x80, 0x00, 0xa0, 0x2a, 0x13, 0x84, 0x6a, 0x55, 0xff,
-   0x1d, 0x48, 0x8a, 0x00, 0x94, 0x24, 0x8a, 0xc8, 0xaa, 0x42, 0x20, 0x5d,
-   0xf5, 0xff, 0x5f, 0x01, 0x00, 0x02, 0x01, 0x00, 0x20, 0xa2, 0x4a, 0x1a,
-   0x82, 0x56, 0xda, 0xbd, 0x3f, 0x92, 0x92, 0x00, 0x90, 0x92, 0x00, 0x40,
-   0x95, 0x6a, 0xf4, 0x55, 0x6d, 0xff, 0xd6, 0x00, 0x00, 0x0a, 0x04, 0x20,
-   0x14, 0x49, 0x4b, 0xaa, 0xaa, 0x56, 0xf5, 0xff, 0xbf, 0xab, 0xa4, 0x00,
-   0x20, 0x89, 0x40, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xde, 0xbf, 0xeb, 0x03,
-   0x00, 0x02, 0x04, 0x02, 0x0a, 0x10, 0x2b, 0x2a, 0x55, 0x5b, 0xf5, 0xff,
-   0xd7, 0x2f, 0x92, 0x00, 0x10, 0x28, 0x21, 0x01, 0x56, 0x95, 0xa0, 0x56,
-   0xdf, 0xef, 0xea, 0x87, 0x40, 0x0a, 0x42, 0x41, 0x00, 0x90, 0xaa, 0x52,
-   0xb6, 0xad, 0xfa, 0xff, 0xd5, 0x2f, 0x14, 0x00, 0x00, 0x04, 0x95, 0x04,
-   0xaa, 0xac, 0x55, 0x6b, 0xff, 0xb7, 0xea, 0x9f, 0x40, 0x02, 0x28, 0x51,
-   0x00, 0x40, 0x58, 0xd5, 0xda, 0xd6, 0x6e, 0x7f, 0xf9, 0x3f, 0x12, 0x04,
-   0x02, 0x04, 0x49, 0x25, 0x55, 0xaa, 0x77, 0xab, 0xff, 0x2b, 0xfd, 0x3f,
-   0x48, 0x01, 0x20, 0x41, 0x00, 0x00, 0x58, 0xa9, 0xda, 0xea, 0xfd, 0xaf,
-   0xfa, 0xff, 0x02, 0x04, 0x08, 0x14, 0x29, 0x49, 0x52, 0x55, 0x55, 0x55,
-   0xff, 0x8d, 0xfe, 0x3f, 0xa8, 0x00, 0x02, 0x41, 0x00, 0x02, 0xa0, 0xa2,
-   0xaa, 0xea, 0xff, 0x53, 0xfd, 0xff, 0x02, 0x04, 0x50, 0x04, 0x25, 0xa8,
-   0x54, 0x49, 0x52, 0xb5, 0xbf, 0x8a, 0xfe, 0xff, 0xa9, 0x08, 0x04, 0x50,
-   0x80, 0x02, 0xa1, 0x2a, 0x95, 0xea, 0xff, 0xa1, 0xff, 0xff, 0x03, 0x02,
-   0x90, 0x02, 0x09, 0x08, 0x44, 0x49, 0x52, 0xbd, 0x7f, 0xca, 0xff, 0xff,
-   0x2b, 0x09, 0x04, 0x48, 0x40, 0x82, 0x90, 0x56, 0xa9, 0xf6, 0xbf, 0xd0,
-   0xff, 0xff, 0x47, 0x00, 0x50, 0x02, 0x15, 0x11, 0x40, 0x95, 0xaa, 0xfd,
-   0x2f, 0xe9, 0xff, 0xff, 0x8f, 0x0a, 0x84, 0x50, 0x40, 0x84, 0x14, 0xaa,
-   0x6a, 0xff, 0x5f, 0xf2, 0xff, 0xff, 0x7f, 0x00, 0x10, 0x02, 0x09, 0x10,
-   0x40, 0x7d, 0xf7, 0xff, 0x0b, 0xfc, 0xff, 0xff, 0xaf, 0x02, 0x84, 0x50,
-   0x42, 0x85, 0x12, 0xd0, 0xdd, 0xff, 0xa7, 0xf2, 0xff, 0xff, 0xff, 0x04,
-   0x00, 0x0a, 0x08, 0x10, 0x48, 0xf8, 0xff, 0xff, 0x0a, 0xfe, 0xff, 0xff,
-   0x7f, 0x03, 0xa4, 0x80, 0xa2, 0x8a, 0x02, 0x68, 0xff, 0xff, 0x52, 0xfd,
-   0xff, 0xff, 0xff, 0x07, 0x00, 0x2a, 0x08, 0x20, 0x28, 0xdc, 0xff, 0x5f,
-   0x05, 0xff, 0xff, 0xff, 0xff, 0x0d, 0x92, 0x40, 0x22, 0x09, 0x02, 0xea,
-   0xfb, 0xaf, 0x48, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x12, 0x81, 0xa0,
-   0x48, 0x9c, 0x6e, 0x93, 0xa2, 0xff, 0xff, 0xff, 0xff, 0x07, 0xa8, 0x40,
-   0x28, 0x0a, 0x02, 0x74, 0xb5, 0x45, 0x81, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x02, 0x0a, 0x81, 0x20, 0x08, 0xae, 0xaa, 0x90, 0xe8, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x90, 0x40, 0x28, 0x88, 0x12, 0x58, 0x15, 0x50, 0xd0, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x44, 0x0a, 0x41, 0x21, 0x08, 0xae, 0x04, 0x14,
-   0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40, 0x14, 0x88, 0x04, 0xba,
-   0x02, 0x28, 0xe8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x42, 0x15, 0x41, 0x21,
-   0x05, 0xad, 0x00, 0x05, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40,
-   0x24, 0x8a, 0x0e, 0x36, 0x00, 0x0a, 0xf4, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x42, 0x25, 0x90, 0xd0, 0x8b, 0xc2, 0x41, 0x05, 0xfc, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x10, 0x08, 0x05, 0xe8, 0x8e, 0x58, 0x80, 0x02, 0xfa, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x4a, 0x20, 0xa8, 0xba, 0x0b, 0x2b, 0x51, 0x01,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x8a, 0x02, 0xe8, 0xaf, 0x84,
-   0x90, 0x04, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x52, 0x21, 0x54, 0xbf,
-   0x1f, 0x15, 0xa5, 0x02, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x08,
-   0x01, 0xfa, 0xb6, 0xa4, 0x52, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x4a, 0xa2, 0x54, 0xef, 0x5f, 0x4b, 0xa4, 0x80, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x80, 0x10, 0x82, 0xfe, 0xbf, 0x92, 0x52, 0x42, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x12, 0x42, 0xa8, 0xbf, 0x1f, 0x24, 0x80, 0xa0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28, 0x8a, 0xf7, 0x37, 0x80,
-   0x52, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x82, 0xe0, 0xff,
-   0x1f, 0x00, 0x20, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28,
-   0xca, 0xff, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x10, 0x42, 0xf0, 0xfd, 0x1b, 0x00, 0x50, 0xf0, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0xa4, 0x10, 0xc5, 0xff, 0x1f, 0x00, 0x00, 0xe0, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x00, 0x22, 0xf8, 0xff, 0x0e, 0x00, 0x00, 0xf0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xaa, 0x88, 0xe2, 0xff, 0x0f, 0x10,
-   0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x25, 0xfa, 0xff,
-   0x0f, 0x01, 0x11, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xfb,
-   0xfb, 0xff, 0x7f, 0x5d, 0xd5, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f};
diff --git a/ext/tk/sample/demos-jp/images/flagdown.bmp b/ext/tk/sample/demos-jp/images/flagdown.bmp
deleted file mode 100644
index 55abc51825..0000000000
--- a/ext/tk/sample/demos-jp/images/flagdown.bmp
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagdown_width 48
-#define flagdown_height 48
-static char flagdown_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe1, 0x00, 0x00,
-   0x00, 0x00, 0x70, 0x80, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x03, 0x00,
-   0x00, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04,
-   0x00, 0x00, 0x03, 0x00, 0x06, 0x06, 0x00, 0x80, 0x01, 0x00, 0x06, 0x07,
-   0x00, 0xc0, 0x1f, 0x00, 0x87, 0x07, 0x00, 0xe0, 0x7f, 0x80, 0xc7, 0x07,
-   0x00, 0x70, 0xe0, 0xc0, 0xe5, 0x07, 0x00, 0x38, 0x80, 0xe1, 0x74, 0x07,
-   0x00, 0x18, 0x80, 0x71, 0x3c, 0x07, 0x00, 0x0c, 0x00, 0x3b, 0x1e, 0x03,
-   0x00, 0x0c, 0x00, 0x1f, 0x0f, 0x00, 0x00, 0x86, 0x1f, 0x8e, 0x07, 0x00,
-   0x00, 0x06, 0x06, 0xc6, 0x05, 0x00, 0x00, 0x06, 0x00, 0xc6, 0x05, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x7f, 0x06, 0x00, 0x06, 0xe4, 0xff, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x06, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x00, 0x00, 0x00, 0x06, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0x06, 0x00, 0x36, 0x00, 0x00, 0x00, 0x06, 0x00, 0x3e, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0x2f, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x27, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0xf7, 0xbf, 0x8e, 0xfc, 0xdf, 0xf8, 0x9d, 0xeb, 0x9b, 0x76, 0xd2, 0x7a,
-   0x46, 0x30, 0xe2, 0x0f, 0xe1, 0x47, 0x55, 0x84, 0x48, 0x11, 0x84, 0x19};
diff --git a/ext/tk/sample/demos-jp/images/flagup.bmp b/ext/tk/sample/demos-jp/images/flagup.bmp
deleted file mode 100644
index 6eb0d846a3..0000000000
--- a/ext/tk/sample/demos-jp/images/flagup.bmp
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagup_width 48
-#define flagup_height 48
-static char flagup_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xef, 0x6a, 0x00,
-   0x00, 0x00, 0xc0, 0x7b, 0x75, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x6a, 0x00,
-   0x00, 0x00, 0x30, 0x60, 0x75, 0x00, 0x00, 0x00, 0x18, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x0c, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x06, 0xe0, 0x04, 0x00,
-   0x00, 0x00, 0x03, 0xe0, 0x04, 0x00, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00,
-   0x00, 0xc0, 0x1f, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x7f, 0xe0, 0x07, 0x00,
-   0x00, 0x70, 0xe0, 0xe0, 0x05, 0x00, 0x00, 0x38, 0x80, 0xe1, 0x04, 0x00,
-   0x00, 0x18, 0x80, 0xf1, 0x04, 0x00, 0x00, 0x0c, 0x00, 0xfb, 0x04, 0x00,
-   0x00, 0x0c, 0x00, 0xff, 0x04, 0x00, 0x00, 0x86, 0x1f, 0xee, 0x04, 0x00,
-   0x00, 0x06, 0x06, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0xe6, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x66, 0x04, 0x00,
-   0x7f, 0x56, 0x52, 0x06, 0xe4, 0xff, 0x00, 0x76, 0x55, 0x06, 0x04, 0x00,
-   0x00, 0x56, 0x57, 0x06, 0x04, 0x00, 0x00, 0x56, 0x55, 0x06, 0x06, 0x00,
-   0x00, 0x56, 0xd5, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x54, 0x06, 0x00, 0xc6, 0x54, 0x55, 0xaa, 0x06, 0x00, 0x66, 0xaa, 0x2a,
-   0x54, 0x06, 0x00, 0x36, 0x55, 0x55, 0xaa, 0x06, 0x00, 0xbe, 0xaa, 0x2a,
-   0x54, 0xfe, 0xff, 0x6f, 0x55, 0x55, 0xaa, 0xfc, 0xff, 0xa7, 0xaa, 0x2a,
-   0x54, 0x01, 0x88, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x50, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa8, 0xaa, 0x2a,
-   0x54, 0x55, 0x95, 0x54, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
-   0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/demos-jp/images/gray25.bmp b/ext/tk/sample/demos-jp/images/gray25.bmp
deleted file mode 100644
index b234b3cb0b..0000000000
--- a/ext/tk/sample/demos-jp/images/gray25.bmp
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ext/tk/sample/demos-jp/images/grey.25 b/ext/tk/sample/demos-jp/images/grey.25
deleted file mode 100644
index b234b3cb0b..0000000000
--- a/ext/tk/sample/demos-jp/images/grey.25
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ext/tk/sample/demos-jp/images/grey.5 b/ext/tk/sample/demos-jp/images/grey.5
deleted file mode 100644
index 37688893f0..0000000000
--- a/ext/tk/sample/demos-jp/images/grey.5
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa};
diff --git a/ext/tk/sample/demos-jp/images/letters.bmp b/ext/tk/sample/demos-jp/images/letters.bmp
deleted file mode 100644
index 0f12568d1a..0000000000
--- a/ext/tk/sample/demos-jp/images/letters.bmp
+++ /dev/null
@@ -1,27 +0,0 @@
-#define letters_width 48
-#define letters_height 48
-static char letters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20,
-   0x00, 0xfa, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a,
-   0x00, 0x3a, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2e,
-   0xe0, 0xff, 0xff, 0xff, 0xff, 0x21, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21,
-   0xa0, 0x03, 0x00, 0x00, 0x70, 0x21, 0x20, 0x00, 0x00, 0x00, 0x50, 0x21,
-   0xa0, 0x1f, 0x00, 0x00, 0x50, 0x21, 0x20, 0x00, 0x00, 0x00, 0x70, 0x21,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0xfa, 0x01, 0x00, 0x80, 0x0b, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0a, 0x21,
-   0xba, 0x01, 0x00, 0x80, 0x0a, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0b, 0x21,
-   0x3a, 0x00, 0x00, 0x00, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0x02, 0xc0, 0xfb, 0x03, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x3f,
-   0x02, 0xc0, 0xbd, 0x0f, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0xc0, 0x7f, 0x7b, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/demos-jp/images/noletter.bmp b/ext/tk/sample/demos-jp/images/noletter.bmp
deleted file mode 100644
index 5774124efe..0000000000
--- a/ext/tk/sample/demos-jp/images/noletter.bmp
+++ /dev/null
@@ -1,27 +0,0 @@
-#define noletters_width 48
-#define noletters_height 48
-static char noletters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0xe0, 0x07,
-   0xe0, 0x01, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x00, 0x00, 0x00, 0x78, 0x0e,
-   0xf0, 0x00, 0x00, 0x00, 0x3c, 0x1e, 0x70, 0x00, 0x00, 0x00, 0x1e, 0x1c,
-   0x38, 0x00, 0x00, 0x00, 0x0f, 0x38, 0x38, 0x00, 0x00, 0x80, 0x07, 0x38,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x1c, 0x04, 0x00, 0xe0, 0x41, 0x70,
-   0x1c, 0x04, 0x00, 0xf0, 0x40, 0x70, 0x1c, 0x74, 0x00, 0x78, 0x4e, 0x70,
-   0x0e, 0x04, 0x00, 0x3c, 0x4a, 0xe0, 0x0e, 0x74, 0x03, 0x1e, 0x4a, 0xe0,
-   0x0e, 0x04, 0x00, 0x0f, 0x4e, 0xe0, 0x0e, 0x04, 0x80, 0x07, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x0f, 0x40, 0xe0, 0x0e, 0x04, 0xe0, 0x01, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x00, 0x40, 0xe0, 0x0e, 0x04, 0x78, 0x00, 0x40, 0xe0,
-   0x0e, 0x04, 0xfc, 0xf3, 0x40, 0xe0, 0x1c, 0x04, 0x1e, 0x00, 0x40, 0x70,
-   0x1c, 0x04, 0x0f, 0x00, 0x40, 0x70, 0x1c, 0x84, 0x07, 0x00, 0x40, 0x70,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x38, 0xe0, 0x01, 0x00, 0x00, 0x38,
-   0x38, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x70, 0x78, 0x00, 0x00, 0x00, 0x1c,
-   0xf0, 0x3c, 0x00, 0x00, 0x00, 0x1e, 0xe0, 0x1e, 0x00, 0x00, 0x00, 0x0e,
-   0xe0, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0x00, 0x00, 0x80, 0x07,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00};
diff --git a/ext/tk/sample/demos-jp/images/pattern.bmp b/ext/tk/sample/demos-jp/images/pattern.bmp
deleted file mode 100644
index df31baf789..0000000000
--- a/ext/tk/sample/demos-jp/images/pattern.bmp
+++ /dev/null
@@ -1,6 +0,0 @@
-#define foo_width 16
-#define foo_height 16
-static char foo_bits[] = {
-   0x60, 0x06, 0x90, 0x09, 0x90, 0x09, 0xb0, 0x0d, 0x4e, 0x72, 0x49, 0x92,
-   0x71, 0x8e, 0x8e, 0x71, 0x8e, 0x71, 0x71, 0x8e, 0x49, 0x92, 0x4e, 0x72,
-   0xb0, 0x0d, 0x90, 0x09, 0x90, 0x09, 0x60, 0x06};
diff --git a/ext/tk/sample/demos-jp/images/tcllogo.gif b/ext/tk/sample/demos-jp/images/tcllogo.gif
deleted file mode 100644
index 3fc7720b17..0000000000
--- a/ext/tk/sample/demos-jp/images/tcllogo.gif
+++ /dev/null
diff --git a/ext/tk/sample/demos-jp/images/teapot.ppm b/ext/tk/sample/demos-jp/images/teapot.ppm
deleted file mode 100644
index 78afefbf82..0000000000
--- a/ext/tk/sample/demos-jp/images/teapot.ppm
+++ /dev/null
@@ -1,56 +0,0 @@
-P6
-256 256
-255
-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�[7 eOLjQLmSMoTMnSMlRMhPL_9 \�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�nSMtVMzYN~[N~[N\N\O�\O�]O�]O�]O�]O�\O�\O}[NyYNtVM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-wXN}[N�]O�^O�_O�`O�`O�`O�`O�aO�aO�aO�aO�aO�aO�aO�aO�`O�_O�^O\N\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�aMLyYN�_O�aP�bP�cP�cP�dP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�cP�_OpUM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�wXN�_O�dP�fP�gQ�hQ�hQ�iQ�iQ�iQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�iQ�fP�`O\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJiQL�bP�hQ�kQ�mR�nR�oR�oR�oR�oR�oR�oR�oR�oR�pR�pS�qS�qS�rS�rS�rS�qS�oR�jQ�]O\KK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�fOLrUM�cP�lR�qS�tS�uT�wT�xT�xT�yT�yT�zT�zU�zU�zU�zU�zU�yT�xT�wT�tS�mR�aOhPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�a0	cNLqUM�\O�fQ�pS�wV�zV�|V�}V�V�VǀVɂW̅[Տe�w���ꪅĈg�qT�fQ{ZNYIK9\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�O1{G#�JkRMqUMtVN�iS�v\��d��b�zZ�vU�uT�sS�qS�nR�jQ�eP�^OrUM�Hh>!T4\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-V5wE"~I#�M%�U+�e7�l:�g2�b*�a(�`(�^(�])�^-�]1�S,qC$`9 R3G-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�@)J/i>!pA"tD"wF$yH&xH&tE$wE#yG%}M+�T4S5mE*Z7!K/B*;'\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��aO�oR�{UǀVυX<(F-a: e<!h>!j@#k@$h>"d<!c=$hD-fF2[<)K0@);'5$˂VǀV�|U_LKYIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��_O�xTɂW����֒k�|X�>�f-�^(�Z'�W&�T&�N>)F-J/b; g>#nD(jB&c<!b=%jH2_A/I0!<(8&5$�J�Y�S%8&;'?)E,<:HA=HE?IJAISFJYIKXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��nR�}Uܘqʊe�vU�e,�V&�V�C
-�@|>y<u:r9o7l6
-j5
-h4
-g3
-5$D,K/b; h>"wM1tK.e="a<#cA,U8&E-<(9&.!a0	b1	c1				
-
-+3#@)46G<:HMCIXHK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�U*�vT�~X�{Y�k+�W&�N$|>u:p8k5
-f3
-a0	_/	].	[-	�I�\*�_(�LkRMmSMmSMnSMnSMD,R3W5mA"|O0|P1j?"c<!a=%Y7"N1F,;'NCJNCJNDJODJODJODJh>!a: X/K%
-g3
-a0	Z-	\/T*Q(�H�m8kRMmSMnTMoTMpTMpUM15G15G05G04G04GpUMpTM5^9 d<!yF#�O+�N,rC#qB"pB#k?"a: Z7 6ODJPDJPEJQEJQEJREJREJREJRFJSFJSFJSFJSFJe<!X/
-^/	V+Q(L&I$r9�TlRMnSM46G47G47G46G46G46G46G46G36G36G25G25G15G04G/4F.3F
-�`O~[NqUM[-	�HUGJUGJVGJVGJVHJWHJWHJWHKWHKXHKXHKXHKXHKXHKXIKXIKXIKXIKXIKh>!Y0
-
-L&C!:4
-�X&pUMuWMwXNxXN<:H<:H<:H<:H<;H<;H<;H<;H=;H=;H=;H=;H>;H>;H?<H@<HA=HC>HG@ILBIREJ[JKcNLjQL�pR�uT�zU�~VȁW˂X֎c�sҎe�{V�vT�pS�kR�gQ�bP�_O�^O�]O�\O�\O�\O�\O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�\O�\O~\N}[N|ZNxXN�T%H$
-�W&rVMvWNyYNzYN|ZN}[N}[N><H?<H?<H?<H?<H?<H@<H@<H@<HA=HA=HB=HC>HE?IG@IIAIKBIODJSFJWHK�hQ�lR�pR�b(�i*�n+�|7�|6�r,�q+�p-�l+�g)�b(�sS�pS�lR�iQ�gQ�eP�cP�aP�aO�`O�`O�_O�_O�_O�_O�_O�_O�_O�_O�_O�_O�^O�^O�^O�^O�]O�]O�\O~[N{ZN�T%
-
-
-
-	
-@%<-$G?@�pfdNLuWM\NdNL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�TFJvWN�aP./01�E}[N�]O�_O�`O�aP�bP�bP�cP�cP�cP�dP�dP�dP�eP�eP�eP�eP�fP�fQ�fQ�gQ�gQ�gQ�hQ�hQ�hQ�iQ�iQ�jQ�jQ�kQ�kR�lR�lR�Y&�\'�^'�^�b�c�e�i �g�c�b�a�`�^�]�X�['�Z'�Y&�mR�mR�mR�lR�lR�lR�kR�kQ�kQ�jQ�jQ�jQ�iQ�iQ�iQ�iQ�hQ�hQ�hQ�hQ�gQ�gQ�gQ�gQ�gQ�fQ�fQ�fQ�fP�eP�eP�dP�cP�aP�O
- B\�\�\�\�\�\�\�\�\�\�%7!!C*F#P){dY�ze��p�\OgPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ`LKvWN�aPm6
-
-\�\�\�\�\�\�\�\�\� B B
-$5 �`(�e)�nR�jQ�^OJAI\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�XIK^KKdNLhPLuWM�]O�bP�fQ�eP
-m6
-�`O�cP�fQ�hQ�hQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�kQ�kQ�kQ�kR�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�g)�c(�c(�b(�V�c�e�i!�i!�d�b�`�`�_�_�^�Q�]'�_(�`(�f)�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�mR�mR�nR�mR�mR�mR�mR�kR�hQ�Ga0	�bP�mR�jQ�fQ�aP}[NrUMmSM�L$\�\�\�\�\�\�\�\� B B
-#C, 8&H.Z7 �pR�jQ{ZN\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�QEJ[JK`LKdNLhQLqUM{ZN�_O�cP�gQ�hQ
-�bP�eP�hQ�iQ�jQ�jQ�kQ�kQ�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�nR�j*�g)�e)�d)�d�X�g�h�e�c�b�b�b�U�`(�a(�a(�c(�i*�oR�oR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�nR�mR�jQ�Q%Z-	�jQ�nR�lR�hQ�dP�_OuWMpTMnSMkRLa: \�\�\�\�\�\�\� B B&D2
-@*S6#G@IPDJ�hQmSM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ]KKbMLeOLiQLlRMvWN\O�aO�eP�hQ�jQ�gQ
-\�\�\�\�\� B'D+E$(1J/jH1NCJUGJYIKUGJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�XHK]KKbNLfOLiQLkRMmSMoTMqUMxXN\N�_O�bP�fP�hQ�kQ�mR�oR�pS�pR�hQ�mR�oR�pS�qS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�rS�sS�sS�sS�sS�sS�sS�sS�sS�sS�sS�sS�sS�tS�tS�tS�uS�uS�uT�uT�uT�uT�uT�vT�wT�vT�vT�uT�tS�mR�tS�uT�uS�tS�rS�pR�mR�kQ�hQ�eP�aP�^O\N{ZNvXNqUMpTMnSMlRM�P%\�\�\�\� B#C*E$.E- .!G$Y:%d<"SFJYIKZIKNCJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�PDJZIK_LKdNLgPLjQLlRMnSMpTMqUMuWMyYN�\O�`O�cP�fP�hQ�jQ�mR�oR�qS�rS�rS�rS�mR
-!C+E'0F.4F7%8%U/lG.SFJZIK]KKZIKB=H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�REJZJK`LKdNLgPLjQLlRMnSMpTMqUMtWMxXN{ZN~[N�]O�^O�`O�aO�bP�dP�gQ�iQ�kQ�lR�nR�pS�rS�sS�tT�uT�vT�wT�xT�yT�yT�yT�yT�yT�xT�vT�rS�nR�hQ�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�}U�}U�}U�}U�}U�}U�}U�~U�~U�~V�~V�VŀWƁX�a(�lR�rS�vT�yT�zU�|U�~V�XƂ[Ɇ_΋dӑjԓmԓnБlʌhĆd��_�{[�vW�sU�pS�nR�kR�iQ�hQ�gQ�fQ�eP�dP�bP�aO�_O�^O�\O|ZNxXNsVMpTMnTMmSMjQL�C B)D&/F-3F47G6%>"Y7 kA$YIK]KK^KKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ\KKbMLeOLhPLkRLmSMnTMpTMrUMuWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�eP�fP�hQ�jQ�lR�nR�oS�qT�sT�uU�vU�wV�xV�yV�yU�zU�zU�{U�{U�{U�|U�|U�|U�|U�|U�{U�{U�{U�zU�zT�yT�yT�xT�wT�vT�vT�vT�vT�wT�wT�wT�xT�yT�zT�zU�{U�{U�|U�|U�}U�VŀWǂYɄ\͈_ьdٔl�u�|쩂ﬅ명榁ޟ{՗sˎld�^�yZ�uW�qU�oS�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWMpTMoTMmSMkRLgPL&D#.E,3F46G;'<(D"iB(VGJ]KK`LK[JKB>H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRMmSMoTMqUMsVMvXNzYN}[N�\O�^O�_O�`O�aP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�mS�oT�rU�tW�wY�zZ�}\�]��^��^��^^\��Z�Y�X�~W�~W�~V�~V�~V�~V�~U�~U�~U�~U�U�U�V�V�V�V�VƀVƀVǀWǁWȂXɃZ˅[͇^ЊaӍdؒiܗn�t�z�����������������驅�~֘vˏmÇf��`�z[�vX�rU�pT�oS�nS�lR�kR�kR�jQ�iQ�hQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzYNvWNpTMoTMnSMkRMhQLo7,2F36G99HC+@ ]8 nA"\JK`ML_LKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMpTMqUMtVMwXNzZN}[N�]O�^O�_O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�jR�lR�mS�oU�rW�vZ�{]��a��fŊjˏnГqӕsՖsՖrՖqՔoӒmяjύg͊cˈaɆ^Ȅ\ǂ[ƁYŀXŀW�W�W�V�V�WŀWƀWǁXȂYɃ[ʅ\͇_ϊaҍeՑhٕmݙq�v�z�}꧀멃몄騃奀ߠ|ٛwӕȑmƉh��c�~^�yZ�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�cP�bP�aO�_O�^O\N{ZNwXNsVMoTMnSMlRMiQL~I#26G99G?<HA*E$	i@$ZIKaMLbML[JK;:H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�WHJ]KKbMLeOLhPLjRLlSMnTMpTMrUMuWMxXN{ZN~\N�]O�^O�`O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�lS�mT�oU�rW�uZ�y]�~a��fl˒sԚzܡ�㧆諉뮋������묈訄�~ߞyڙt֕oҐjΌfˈbȅ_ƃ\ŁZĀY�X�W�~W�~W�~W�XÀXĀYŁZƃ\ǅ^Ɇ`ˈb̊d͋f΍gΎiΎjΎj͎jˌiǉgÆd��a�^�}]�|\�{[�yZ�xY�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�dP�bP�aO�_O�^O�\O|ZNxXNtVMpTMnSMmSMjQLgPL99G?<HG-E&b;!YIK`MLdOM`LKNCJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��lR�yT�~UʂXʃY�X�{W�tU�W'�[(�hQ�lR�cP�\OhQL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRLmSMoTMqUMrVMvWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�dP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pU�sW�vZ�z]�b��glɑsИy؞ޤ�㩊譍챐ﳑﳑ뭊穅⣀ݞzؘtғn΍iɉdƅ`Â]��[�~Y�}X�|W�|V�{V�{V�{V�{V�{V�|W�|W�}X�}Y�~Z�~Z�~Z�}[�}[�}[�~\�~\�~]�~]�~]�~]�}]�|\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWNpTMnTMmSMkRLhPL|H$D>IQ2P+XHK_LLfQOcNLXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��qS�yT�~VΈ`遲ޜv��]�qS�L�G|>g3
-S)?*%.�hQ�hQ�eP�`OuWM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMoTMqUMsVMwXNzYN}[N�\O�^O�_O�`O�aP�bP�dP�eP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pV�sX�vZ�z^�b��gËmʒsјz؟�ޤ�㩊譍ꯏ및ꯎ謋娇ं۞|֙wѓq̎lǉgÅb��_�\�}Z�{X�zW�yV�yU�xU�xU�xT�xT�xU�xU�xU�yV�yV�yW�zW�{X�{Y�|Z�}[�}[�}\�~\�~]�~]�}]�|\�{\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzZNvWNrUMoTMmSMlRMiQLeOLJAIJ(h>!]KKfQOgQN_LKD>I\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��iQ�tS�yT�{U�YΌeרּ���՗u�|\�Z'�L�D
-|>
-
-+,!.! "`E6�iY�lZ�o\�q]�s^�^J�va�wb�yc�zd�{e�}foTMqUMsVMuWNwXNyYN{ZN|ZN~[N\O�]O�]O�^O�_O�_O�`O�`O�aO�aP�bP�bP�cP�cP�cP�dP�dP�dP�dP�eP�eP�eP�eP�eP�eP�eP�eP�fP�fP�fP�fP�fP�fP�fP�eP�eP�eP�eP�eP�eP�eP�dP�dP�dP�dP�cP�cP�cP�bP�bP�aP�aO�`O�`O�_O�_O�^O�]O�]O\O~[N|[N{ZNyYNwXN��i��i��i��i��h�hR�fQ�dQ�bP�wfx]O�pdkbtd_m`]OEDG?A;:@.S�.S�.S�.S�.S�/S�/S�/S�/S�/S�/S�/S�/S�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�/S�Gl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl���܅�܅��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl���܅��������������������Ei���ր�ր�ր�ր�ր�ր�ր�ր�ր�ր�ր�ր�׀�׀�׀�׀�׀�׀��Bg�Bg�Bg�Bg�Bg�&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Af�Af�%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|%I|%I|%I|%I|
-+,YA5jPBpSD�l[�o]�q^�t`�_K�wb�yc�ze�{f�}g�h��i�lSrVMtWMvWNxXNyYN{ZN|[N~[N\O�]O�]O�^O�_O�_O�`O�`O�`O�aP�aP�bP�bP�bP�cP�cP�cP�cP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�dP�dP�dP�dP�dP�dP�cP�cP�cP�cP�bP�bP�bP�aP�aO�`O�`O�`O�_O�^O�^O�]O�]O\O~[N|[N{ZNyYNxXN��j��j��j��j��j��j�hS�gS�eR�cR|`Q�sf�oe}jcrd`k_]LCDC=@,,3(4F(4F.S�.S�/S�/S�/S�/S�/S�/S�/S�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�Ty�Ty����Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl����Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Ch�Ch��ր�ր�ր�ր��Ei�Ei�Ei���ր�ր�ր�ր�ր�ր�׀�׀�׀��Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Bg�Bg�&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�&J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|%I|%I|%I|#5H71O;3V?4iOBoSDsVF�o]{[I^K�`L�bN�dO�{f�}g�~h��j�kT�mU�oV�qW�rWwXNxXNzYN{ZN}[N~[N\O�]O�]O�^O�^O�_O�_O�`O�`O�`O�aO�aP�aP�bP�bP�bP�bP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�cP�bP�bP�bP�bP�aP�aP�aO�`O�`O�_O�_O�_O�^O�^O�]O�\O\N~[N|ZN{ZNyYN�oT�oT�oT�nT��l��l��l�jU�iT�hT�fT�cS�vi�rg�nfyidqdah^^HBD?<@)+3OZkMYk(5F(5F(5F/S�/S�/S�/S�/S�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�Ty�Ty�Ty�Uy���܆�܆�܆��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl���܆�܆�܆�܆��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Dh�Dh�Dh�Ch�&K}&K}&K}&K}&K}&K}Ch�Ch�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�&J|&J|&J|&J|&J|&J|Bg�Bg�Bg�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�&J|&J|&J|&J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%J|%I|%I|A99N?;L:2T>4gNBlRD�k\�n^z[J~^L�aN�cO�dP�fQ�gR�hT�jU�lV�nW�pX�rX�sY��q��q��r��r��r��s�z[�z[�z[�{[�{[�{ZœrŒqŒqŒpŒpőo�yV�xV�xU�wT�wT�aP�bP�bP�bP�bP�bP�bP�bP�bP�bP�bP�bP�bP�bP�aP�aP�aP�aP�aO�aO�`O�`O�`O�_O�_O�^O�^O�^O�]O�]O�\O~\N}[N|ZNzYN�pT�pU�pU�pU�oV�oV�nV�mV�lV�kV�jV�hV�fU~cU�uj�qh~mfugdkaad\^E@D98?$(2minffm^blV^lMYk(5F(5F/S�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�Ty�Ty�Uy�Uy���܆�܆�܆�܆�܆�܆�܆��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl���݆�݆�݆�݆�݆�݆�݆�݆�݆��Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�Hl�'K}'K}'K}'K}'K}'K}'K}'K}'K}&K}&K}Ch�Ch�Ch�Ch�Ch�Ch�Ch�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�&J|Cg�Cg�Cg�Cg�Cg�Bg�Bg�Bg�Bg�Bg�Bg�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�&J|&J|&J|&J|&J|&J|&J|%J|%J|%J|%J|%J|%J|%J|Ae�Ae�;GY<68I=:I82Q=4XA6~fZ�j\�m^�p`|]L�`N�cP�eQ�gS�j��l��m��n�oX�qY�rZ�t[��r��s��s��t��t��t�z]�{]�{]�{\�{\�{\�{[ēsērĒrĒqĒpđp�yWĐoÐnÏmÏllk��k�aO�aO�aO�aO�aO�aO�aO�`O�`O�`O�`O�`O�`O�_O�_O�_O�_O�^O�^O�]O�]O�]O\O~\N}[N|ZN��l��l��m�qV�qV�qV�pW�pW�oW��n��n��n��n��n�~n�eW�xl�tk�piykfodcf_`JDG@>C*,5$1MYk�tr~tstmolinadmX_lNZkMZkTx�Tx�Tx�Tx�Tx�Tx�Tx�Ty�Ty�Ty�Uy�Uy�Uy���݆�݆�݆�݆�݆�݆�݆�݆�݆��Hl�Hl�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm���݆�݆�݇�݇�݇�݇�݇�݇�݇�݇�݇�݇��Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�Hm�'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}'K}Dh�Dh�Dh�Dh�Ch�Ch�Ch�Ch�Ch�Ch�Ch�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�&J}&J}&J}Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Cg�Bg�Bg�Bg�Bg�Bg�Bg�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�Bf�&J|&J|&J|&J|&J|&J|&J|&J|&J|&J|Af�Af�Af�Af�;GY;GY;GY1'!D:9N?;N;3]I?zdY�h[�l^�oa�sc�ue�bQ�dR�fT�l��m��n��o��p��q��r��s�v]�w]��u��u��u��u��v�{^�{^�|^�|]�|]�{\�{\�{[�{[�zZ�zZ�yY�yX�xXonn��m��m�uT�uS�tS�tS�tR�sR�sQ�_O�_O�_O�^O�^O�^O�^O�^O�]O�]O�]O�rS�rS�rS��k��l��l��m��m��m��n��n�qW�qX�qX��o��o��p��p��p��p�p�}o{cXv`Vp]U}nishfhaba\_DAF::B$)4
-., 7(8'A1&F4(L8*oXIw]Jpdasfcvhexkg{mi~oj�qll\Xn^Yp`Zpa[qa\rb]rc^sc^sd_ue`wf`xgayhayhayhb�x�y�y�y�y�y�y�~ywgbvfateasd`qd`pc`nb_la_�ut|ssxqrunpZUXVRWROUMMSHIRIC@967-/3'+0(*-ACF?AD;=@#%(
-.+>1(B3)B2&F4'E4)gTGlXJs^OzcTzaPqfethgvjhbVTcWUdXVeYWfZXg[Yh\Zi]Zi][j^\�us�ususts~tt~tt}tt|st{stut~tt|sszrsyqrwpquoqsmpqloXTXTQWPOULLSSJEA<:=99757335./2113)+.'),)+.8:="(
-"6*#5*">2)>0&A2'C3(I8-^OFbRHfUJjXMq^RwcVzfYfRDfQCdN@zdTqijrjksklrklrklrklqjmpjmpjmojmojmnimmimkhliflscYm`Xg\VbYT^VRE>;A<:>98:77645:873220/0,-/)+.*,/#%( &
-
-&3#.$-% .% .& /&!,#,#@70A71XNHXNHWNHWNHZRLYQLYQLXQLWQLWPLUOLSNLQMKOLJMJJ0//.-.,,-&(+"(!'			
-
-%' %$#" ! !$
-
-
-						
-
-
-* 															
-	;?E7CU;HY=I[
diff --git a/ext/tk/sample/demos-jp/items.rb b/ext/tk/sample/demos-jp/items.rb
deleted file mode 100644
index e1007c5a8d..0000000000
--- a/ext/tk/sample/demos-jp/items.rb
+++ /dev/null
@@ -1,372 +0,0 @@
-#
-# canvas item types widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($items_demo) && $items_demo
-  $items_demo.destroy 
-  $items_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$items_demo = TkToplevel.new {|w|
-  title("Canvas Item Demonstration")
-  iconname("Items")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($items_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "���Υ�����ɥ��ˤϥ����Х� widget �����äƤ��ꡢ������ˤϥ����Х� widget �����ݡ��Ȥ����͡��ʥ����פΥ����ƥ���㤬���äƤ��ޤ������Τ褦�����Ǥ��ޤ���\n  �ܥ���-1 �ɥ�å�:\t�����ƥ��ư������\n  �ܥ���-2 �ɥ�å�:\t�����Ƥ�����ʬ�򤺤餹��\n  �ܥ���-3 �ɥ�å�:\t�ΰ��Ϥ���\n  ����ȥ�����-F:\t�ΰ�β��Υ����ƥ��ɽ�����롣"
-}.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($items_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $items_demo
-      $items_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'items'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-cvs = nil
-TkFrame.new($items_demo) {|cf|
-  # canvas ����
-  cvs = TkCanvas.new(cf) {|c|
-    focus
-    scrollregion '0c 0c 30c 24c'
-    width  '15c'
-    height '10c'
-    relief 'sunken'
-    borderwidth 2
-
-    hs = TkScrollbar.new(cf) {|s|
-      orient 'horizontal'
-      command proc{|*args| c.xview(*args)}
-      c.xscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    vs = TkScrollbar.new(cf) {|s|
-      command proc{|*args| c.yview(*args)}
-      c.yscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    if $tk_version =~ /^4\.[01]/
-      hs.pack('side'=>'bottom', 'fill'=>'x')
-      vs.pack('side'=>'right', 'fill'=>'y')
-      c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
-
-    else
-      c.grid('in'=>cf, 'row'=>0, 'column'=>0, 
-	     'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      vs.grid('row'=>0, 'column'=>1, 
-	      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      hs.grid('row'=>1, 'column'=>0, 
-	      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-      TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-
-    end
-
-  }
-}.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-# Display a 3x3 rectangular grid
-TkcRectangle.new(cvs, '0c', '0c', '30c', '24c', 'width'=>2)
-TkcLine.new(cvs, '0c', '8c', '30c', '8c', 'width'=>2)
-TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
-TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
-TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
-
-font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
-if TkWinfo.depth($root).to_i > 1
-  blue   = 'DeepSkyBlue3'
-  red    = 'red'
-  bisque = 'bisque3'
-  green  = 'SeaGreen3'
-else
-  blue   = 'black'
-  red    = 'black'
-  bisque = 'black'
-  green  = 'black'
-end
-
-# tag ���֥������Ȥ�����
-$tag_item = TkcGroup.new(cvs)
-
-# Set up demos within each of the areas of the grid.
-TkcText.new(cvs, '5c', '.2c', 'text'=>'�饤��', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c', 
-	    'width'=>2, 'fill'=>blue, 'capstyle'=>'butt', 
-	    'join'=>'miter', 'tags'=>$tag_item )
-TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
-TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
-TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
-	    '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
-	    '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
-	    'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c', 
-	    'stipple'=>'@'+[$demo_dir,
-	                    'images','gray25.bmp'].join(File::Separator), 
-	    'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
-	    'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round', 
-	    'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '.2c', 
-	    'text'=>'���� (��餫�ˤĤʤ���ľ��)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c', 
-	    'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c', 
-	    'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c', 
-	    '16.5c','4.5c','13.5c','7.5c','12c','6c',
-	    'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round', 
-	    'stipple'=>'@'+[$demo_dir, 
-	                    'images', 'gray25.bmp'].join(File::Separator), 
-	    'fill'=>red, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '.2c', 'text'=>'¿�ѷ�', 'anchor'=>'n')
-TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
-	       '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
-	       'fill'=>'green', 'outline'=>'black', 'width'=>4, 
-	       'tags'=>$tag_item )
-TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
-	       '28c','1c','29c','1c','29c','4c','29c','4c',
-	       'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
-TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
-	       '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
-	       '7.5c','22c','7.5c', 
-	       'stipple'=>'@' + [$demo_dir, 
-                                 'images', 'gray25.bmp'].join(File::Separator),
-	       'outline'=>'black', 'tags'=>$tag_item )
-
-TkcText.new(cvs, '5c', '8.2c', 'text'=>'���', 'anchor'=>'n')
-TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
-		 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c', 
-		 'fill'=>green, 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
-		 'stipple'=>'@'+[$demo_dir,
-	                         'images','gray25.bmp'].join(File::Separator),
-		 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '8.2c', 'text'=>'�ʱ�', 'anchor'=>'n')
-TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
-		 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c', 
-		 'fill'=>green, 'tags'=>$tag_item )
-TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
-		 'stipple'=>'@'+[$demo_dir,
-	                         'images','gray25.bmp'].join(File::Separator),
-		 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '8.2c', 'text'=>'�ƥ�����', 'anchor'=>'n')
-TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c', 
-	    'text'=>'û���ƥ����ȡ���ɥ�åס���·�������󥫡����� (��)��\
-���ϳƥƥ����ȤΥ��󥫡��ݥ���Ȥ򼨤���', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue, 
-	    'text'=>'�����Ĥ��ιԡ�\n���줾����Ω��\n��·����\n\
-���ƺ�ü�����󥫡�����Ƥ��롣', 'justify'=>'center', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
-if $tk_version =~ /^4\.[01]/
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
-	      'stipple'=>'@' + [$demo_dir, 
-                                'images', 'grey.5'].join(File::Separator),
-	      'text'=>'Stippled characters', 'tags'=>$tag_item )
-else
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
-	      'stipple'=>'gray50', 'text'=>'Stippled characters', 
-	      'tags'=>$tag_item )
-end
-
-TkcText.new(cvs, '5c', '16.2c', 'text'=>'��', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black', 
-	   'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
-#	   'outline'=>blue, 'start'=>135, 'extent'=>270, 
-#	   'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
-#	   'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
-	   'outline'=>blue, 'start'=>135, 'extent'=>270, 
-	   'outlinestipple'=>'@'+[$demo_dir, 
-                                  'images','gray25.bmp'].join(File::Separator),
-	   'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice', 
-	   'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90, 
-	   'tags'=>$tag_item)
-TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
-	   'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270, 
-	   'tags'=>$tag_item)
-
-TkcText.new(cvs, '15c', '16.2c', 'text'=>'�ӥåȥޥå�', 'anchor'=>'n')
-#TkcBitmap.new(cvs, '13c','20c',
-#	      'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
-#	      'tags'=>$tag_item)
-TkcBitmap.new(cvs, '13c','20c',
-	      'bitmap'=>'@' + [$demo_dir, 
-                               'images', 'face.bmp'].join(File::Separator),
-	      'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','18.5c',
-#	      'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
-#	      'tags'=>$tag_item)
-TkcBitmap.new(cvs, '17c','18.5c',
-	      'bitmap'=>'@' + [$demo_dir, 
-	                       'images', 'noletter.bmp'].join(File::Separator),
-	      'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','21.5c',
-#	      'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
-#	      'tags'=>$tag_item)
-# ���η����Ǥ��ǽ
-TkcBitmap.new(cvs, '17c','21.5c') {
-  bitmap '@' + [$demo_dir, 'images', 'letters.bmp'].join(File::Separator)
-  tags $tag_item
-}
-#TkcBitmap.new(cvs, '17c','21.5c') {
-#  bitmap '@' + ['images', 'letters'].join(File::Separator)
-#  tags $tag_item
-#}
-
-TkcText.new(cvs, '25c', '16.2c', 'text'=>'������ɥ�', 'anchor'=>'n')
-TkButton.new(cvs) {|b|
-  text '�����Ƥ�'
-  command proc{butPress cvs, red}
-  TkcWindow.new(cvs, '21c','18c', 
-		'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
-  insert 'end', '�Խ����Ƥ�'
-  TkcWindow.new(cvs, '21c','21c', 
-		'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c', 
-	    'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
-  TkcWindow.new(cvs, '28.5c','17.5c', 
-		'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
-}
-TkcText.new(cvs, '21c', '17.9c', 'text'=>'�ܥ���:', 'anchor'=>'sw')
-TkcText.new(cvs, '21c', '20.9c', 'text'=>'����ȥ�:', 'anchor'=>'sw')
-TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'��������:', 'anchor'=>'s')
-
-# Set up event bindings for canvas:
-cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
-cvs.itembind($tag_item, 'Any-Leave', proc{itemLeave cvs})
-cvs.bind('2', proc{|x,y| cvs.scan_mark x,y}, '%x %y')
-cvs.bind('B2-Motion', proc{|x,y| cvs.scan_dragto x,y}, '%x %y')
-cvs.bind('3', proc{|x,y| itemMark cvs,x,y}, '%x %y')
-cvs.bind('B3-Motion', proc{|x,y| itemStroke cvs,x,y}, '%x %y')
-cvs.bind('Control-f', proc{itemsUnderArea cvs})
-cvs.bind('1', proc{|x,y| itemStartDrag cvs,x,y}, '%x %y')
-cvs.bind('B1-Motion', proc{|x,y| itemDrag cvs,x,y}, '%x %y')
-# Utility methods for highlighting the item under the pointer
-
-$restoreCmd = nil
-def itemEnter (c)
-  if TkWinfo.depth(c).to_i == 1
-    $restoreCmd = nil
-    return
-  end
-  type = c.itemtype('current')
-  if type == TkcWindow
-    $restoreCmd = nil
-    return
-  end
-  if type == TkcBitmap
-    bg = (c.itemconfiginfo('current', 'background'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'background', bg}
-    c.itemconfigure 'current', 'background', 'SteelBlue2'
-    return
-  end
-  fill = (c.itemconfiginfo('current', 'fill'))[4]
-  if (type == TkcRectangle || type == TkcOval || type == TkcArc) && fill == []
-    outline = (c.itemconfiginfo('current', 'outline'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'outline', outline}
-    c.itemconfigure 'current', 'outline', 'SteelBlue2'
-  else
-    $restoreCmd = proc{c.itemconfigure 'current', 'fill', fill}
-    c.itemconfigure 'current', 'fill', 'SteelBlue2'
-  end
-end
-
-def itemLeave(c)
-  $restoreCmd.call if $restoreCmd
-end
-
-# Utility methods for stroking out a rectangle and printing what's 
-# underneath the rectangle's area.
-
-def itemMark(c,x,y)
-  $areaX1 = c.canvasx(x)
-  $areaY1 = c.canvasy(y)
-  c.delete 'area'
-end
-
-def itemStroke(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  if $areaX1 != x && $areaY1 != y
-    c.delete 'area'
-    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y, 
-					      '-outline', 'black')
-    $areaX2 = x
-    $areaY2 = y
-  end
-end
-
-def itemsUnderArea(c)
-  area = c.find_withtag('area')
-  items = []
-  c.find_enclosed($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items enclosed by area: #{items.inspect}\n"; STDOUT.flush
-  items.clear
-  c.find_overlapping($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items overlapping area: #{items.inspect}\n"; STDOUT.flush
-end
-
-$areaX1 = 0
-$areaY1 = 0
-$areaX2 = 0
-$areaY2 = 0
-
-# Utility methods to support dragging of items.
-
-def itemStartDrag(c,x,y)
-  $lastX = c.canvasx(x)
-  $lastY = c.canvasy(y)
-end
-
-def itemDrag(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  c.move 'current', x - $lastX, y - $lastY
-  $lastX = x
-  $lastY = y
-end
-
-# Method that's invoked when the button embedded in the canvas 
-# is invoked.
-
-def butPress(w,color)
-  i = TkcText.new(w, '25c', '18.1c', 
-		  'text'=>'���Ƥ�!!', 'fill'=>color, 'anchor'=>'n')
-  Tk.after(500, proc{w.delete i})
-end
diff --git a/ext/tk/sample/demos-jp/ixset b/ext/tk/sample/demos-jp/ixset
deleted file mode 100644
index 46c2378073..0000000000
--- a/ext/tk/sample/demos-jp/ixset
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/env ruby
-
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-  end
-
-  # apply is just "writesettings"
-
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length)
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left','expand'=>'y')
-      @entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken') {
-	pack('side'=>'left','expand'=>'y')
-      }
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    buttons = TkFrame.new(@root) {|f|
-      [ TkButton.new(f, 'command'=>proc{win.ok}, 'text'=>'Ok'),
-	TkButton.new(f, 'command'=>proc{win.writesettings}, 'text'=>'Apply'),
-	TkButton.new(f, 'command'=>proc{win.cancel}, 'text'=>'Cancel'),
-	TkButton.new(f, 'command'=>proc{win.quit}, 'text'=>'Quit') ].each{|b|
-	b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5)
-      }
-    }
-
-    #
-    # Bell settings
-    #
-    bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(bell, 'text'=>'Bell Settings')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200, 
-			     'tickinterval'=>20, 'orient'=>'horizontal', 
-			     'label'=>"Volume (%)") 
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6)
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    l.pack('side'=>'top', 'expand'=>'yes')
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    # 
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat', 
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200, 
-			 'tickinterval'=>20, 'orient'=>'horizontal', 
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
-    l.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(mouse, 'text'=>'Mouse Settings')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 3)
-    @w_mouseacc.pack('side'=>'left')
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3)
-    @w_mousethr.pack('side'=>'right')
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
-    f = TkFrame.new(screen)
-    ff1 = TkFrame.new(f)
-    [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank', 
-					 'relief'=>'flat', 
-					 'variable'=>@w_screenbla, 
-					 'value'=>'blank') {
-	def self.set(value)
-	  if value == 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      }, 
-      @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern', 
-				       'relief'=>'flat', 
-				       'variable'=>@w_screenbla, 
-				       'value'=>'noblank') {
-	def self.set(value)
-	  if value != 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      }
-    ].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
-
-    ff2 = TkFrame.new(f)
-    [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5), 
-      @w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
-      w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
-    }
-
-    ff1.pack('side'=>'left')
-    ff2.pack('side'=>'left')
-
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Main window
-    #
-    buttons.pack('side'=>'top', 'fill'=>'both')
-    bell.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    kbd.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    mouse.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    screen.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize
-    @root = TkRoot.new
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/ixset2 b/ext/tk/sample/demos-jp/ixset2
deleted file mode 100644
index 8947daa4b4..0000000000
--- a/ext/tk/sample/demos-jp/ixset2
+++ /dev/null
@@ -1,368 +0,0 @@
-#!/usr/bin/env ruby
-#
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  # apply is just "writesettings"
-  def apply
-    writesettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length, range=[])
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
-      if range.size > 0 
-	@entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken', 
-			       'from'=>range[0], 'to'=>range[1])
-      else
-	@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
-      end
-      @entry.pack('side'=>'right','expand'=>'y', 'fill'=>'x')
-    end
-    def epath
-      @frame
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    btn_frame = TkFrame.new(@root)
-    buttons = [ 
-      @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok}, 
-			     'default'=>'active', 'text'=>'λ��'),
-      @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings}, 
-				'default'=>'normal', 'text'=>'Ŭ��', 
-				'state'=>'disabled'),
-      @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel}, 
-				 'default'=>'normal', 'text'=>'���', 
-				'state'=>'disabled'),
-      @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit}, 
-			       'default'=>'normal', 'text'=>'���')
-    ]
-    buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
-
-    @root.bind('Return', proc{@btn_OK.flash; @btn_OK.invoke})
-    @root.bind('Escape', proc{@btn_QUIT.flash; @btn_QUIT.invoke})
-    @root.bind('1', proc{|w|
-		 unless buttons.index(w)
-		   @btn_APPLY.state(:normal)
-		   @btn_CANCEL.state(:normal)
-		 end
-	       }, '%W')
-    @root.bind('Key', proc{|w, k|
-		 unless buttons.index(w)
-		   case k
-		   when 'Return', 'Escape', 'Tab', /.*Shift.*/
-		     # do nothing
-		   else
-		     @btn_APPLY.state(:normal)
-		     @btn_CANCEL.state(:normal)
-		   end
-		 end
-	       }, '%W %K')
-
-    #
-    # Bell settings
-    #
-    bell = TkLabelframe.new(@root, 'text'=>'�٥�����', 
-			    'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200, 
-			     'tickinterval'=>20, 'orient'=>'horizontal', 
-			     'label'=>"���� (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "���� (Hz)", 6, [25, 20000])
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "��³���� (ms)", 6, [1, 10000])
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    # 
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkLabelframe.new(@root, 'text'=>'�����ܡ��ɥ�ԡ�������', 
-			   'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'����å�������', 
-				    'relief'=>'flat', 
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200, 
-			 'tickinterval'=>20, 'orient'=>'horizontal', 
-			 'label'=>'����å����� (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes', 
-		   'fill'=>'x', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkLabelframe.new(@root, 'text'=>'�ޥ�������', 
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, '��®��', 5)
-    @w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
-    @w_mousethr = LabelEntry.new(f, '���� (pixels)', 3, [1, 2000])
-    @w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkLabelframe.new(@root, 'text'=>'�����꡼�󥻡�������', 
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_screenblank = TkRadioButton.new(screen, 'text'=>'�֥��ɽ��', 
-				       'relief'=>'flat', 'anchor'=>'w', 
-				       'variable'=>@w_screenbla, 
-				       'value'=>'blank') {
-      def self.set(value)
-	if value == 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screenpat = TkRadioButton.new(screen, 'text'=>'�ѥ�����ɽ��', 
-				     'relief'=>'flat', 'anchor'=>'w', 
-				     'variable'=>@w_screenbla, 
-				     'value'=>'noblank') {
-      def self.set(value)
-	if value != 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screentim = LabelEntry.new(screen, '�����ॢ���� (s)', 5, [1, 100000])
-    @w_screencyc = LabelEntry.new(screen, '���� (s)', 5, [1, 100000])
-
-    Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
-    Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
-    TkGrid.configure(@w_screenblank, @w_screenpat, 'sticky'=>'ew')
-
-    #
-    # Main window
-    #
-    param = {
-      'side'=>'top', 'fill'=>'both', 'expand'=>'yes', 
-      'padx'=>'1m', 'pady'=>'1m'
-    }
-    btn_frame.pack('side'=>'top', 'fill'=>'both')
-    bell.pack(param)
-    kbd.pack(param)
-    mouse.pack(param)
-    screen.pack(param)
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize(title)
-    @root = TkRoot.new('title'=>title)
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new(File.basename($0,'.rb'))
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/label.rb b/ext/tk/sample/demos-jp/label.rb
deleted file mode 100644
index 80ab5f3d8f..0000000000
--- a/ext/tk/sample/demos-jp/label.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# label widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($label_demo) && $label_demo
-  $label_demo.destroy 
-  $label_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$label_demo = TkToplevel.new {|w|
-  title("Label Demonstration")
-  iconname("label")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($label_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ�5�ĤΥ�٥뤬ɽ������Ƥ��ޤ�����¦�ˤϥƥ����ȥ�٥뤬3�Ĥ��ꡢ��¦�ˤϥӥåȥޥåץ�٥�ȥƥ����ȥ�٥뤬����ޤ�����٥�Ȥ����ΤϤ��ޤ����򤤤�ΤǤϤ���ޤ��󡣤ʤ��ʤ�į���ʳ�����Ǥ��ʤ�����Ǥ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($label_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $label_demo
-      $label_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'label'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# label demo �ѥե졼������
-f_left = TkFrame.new($label_demo)
-f_right = TkFrame.new($label_demo)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes', 
-				  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
-
-# label ����
-[ TkLabel.new(f_left, 'text'=>'�ǽ�Υ�٥�'),
-  TkLabel.new(f_left, 'text'=>'2 ���ܡ�����ä��⤭�夬�餻�Ƥߤޤ���', 
-	      'relief'=>'raised'),
-  TkLabel.new(f_left, 'text'=>'3 ���ܡ�����Ǥ��ޤ� ', 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
-
-TkLabel.new(f_right) {
-  bitmap('@' + [$demo_dir,'images','face.bmp'].join(File::Separator))
-  borderwidth 2
-  relief 'sunken'
-}.pack('side'=>'top')
-
-TkLabel.new(f_right) { text 'Tcl/Tk ��ͭ��' }.pack('side'=>'top')
diff --git a/ext/tk/sample/demos-jp/labelframe.rb b/ext/tk/sample/demos-jp/labelframe.rb
deleted file mode 100644
index 044fcd23ae..0000000000
--- a/ext/tk/sample/demos-jp/labelframe.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# labelframe.rb
-#
-# This demonstration script creates a toplevel window containing
-# several labelframe widgets.
-#
-# based on "Id: labelframe.tcl,v 1.2 2001/10/30 11:21:50 dkf Exp"
-
-
-if defined?($labelframe_demo) && $labelframe_demo
-  $labelframe_demo.destroy 
-  $labelframe_demo = nil
-end
-
-$labelframe_demo = TkToplevel.new {|w|
-  title("Labelframe Demonstration")
-  iconname("labelframe")
-  positionWindow(w)
-}
-
-# Some information
-TkLabel.new($labelframe_demo, 
-	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-TkLabelFrame ���������åȤϴ�Ϣ���� widget 
-����ޤȤ�Ƽ�갷��������Ѥ����ޤ�����
-�٥���̾��ʸ����Ǥⲿ�餫�Υ��������å�
-�Ǥ⤫�ޤ��ޤ��󡣤⤷���ʤ����ȤäƤ��� 
-Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬ 
-labelframe ���������åȤ�������Ƥ��ʤ�
-��硢���Υǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ���
-���ξ��ˤ� labelframe ���������åȤ�����
-����Ƥ���褦�ʤ�꿷�����С������� Tk 
-���Ȥ߹�碌�ƻ�褦�ˤ��Ƥ���������
-EOL
-
-# The bottom buttons
-TkFrame.new($labelframe_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'λ��', :width=>15, :command=>proc{
-		 $labelframe_demo.destroy
-		 $labelframe_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-		 showCode 'labelframe'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-# Demo area
-w = TkFrame.new($labelframe_demo).pack(:side=>:bottom, :fill=>:both, 
-				       :expand=>true)
-
-# A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'������', 
-		 :padx=>2, :pady=>2) {|f|
-  grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
-
-  v = TkVariable.new
-  (1..4).each{|i|
-    TkRadiobutton.new(f, :text=>"This is value #{i}", 
-		      :variable=>v, :value=>i) {
-      pack(:side=>:top, :fill=>:x, :pady=>2)
-    }
-  }
-}
-
-
-# Using a label window to control a group of options.
-$lfdummy = TkVariable.new(0)
-
-def lfEnableButtons(w)
-  TkWinfo.children(w).each{|child|
-    next if child.path =~ /\.cb$/
-    if $lfdummy == 1
-      child.state(:normal)
-    else
-      child.state(:disabled)
-    end
-  }
-end
-
-TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
-  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy, 
-		    :text=>"���ץ��������", :padx=>0) {|cb|
-    command proc{lfEnableButtons(f)}
-    f.labelwidget(cb)
-  }
-  grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
-
-  %w(���ץ����1 ���ץ����2 ���ץ����3).each{|str|
-    TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
-  }
-
-  lfEnableButtons(f)
-}
-
-TkGrid.columnconfigure(w, [0,1], :weight=>1)
diff --git a/ext/tk/sample/demos-jp/menu.rb b/ext/tk/sample/demos-jp/menu.rb
deleted file mode 100644
index fb32623cc8..0000000000
--- a/ext/tk/sample/demos-jp/menu.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($menu_demo) && $menu_demo
-  $menu_demo.destroy 
-  $menu_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$menu_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu")
-  positionWindow(w)
-}
-
-# menu frame ����
-$menu_frame = TkFrame.new($menu_demo, 'relief'=>'raised', 'bd'=>2)
-$menu_frame.pack('side'=>'top', 'fill'=>'x')
-
-# label ����
-TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh'
-    text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Command-X �����Ϥ���ȡ�X�����ޥ�ɥ��������³����ɽ������Ƥ���ʸ���ʤ�С���������졼����Ȥä����ܵ�ư��Ԥ����Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
-  else
-    text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Alt-X �����Ϥ���ȡ�X����˥塼�˥�������饤���դ���ɽ������Ƥ���ʸ���ʤ�С������ܡ��ɤ���λ��꤬�Ǥ��ޤ�����������ǥ�˥塼�Υȥ�С������ǽ�Ǥ�����˥塼�����ꤵ�줿�ݤˤϡ����ڡ��������Ǽ¹Ԥ��뤳�Ȥ��Ǥ��ޤ������뤤�ϡ���������饤���դ���ʸ�������Ϥ��뤳�ȤǤ�¹ԤǤ��ޤ�����˥塼�Υ���ȥ꤬��������졼������äƤ�����ϡ����Υ�������졼�������Ϥ��뤳�Ȥǥ�˥塼����ꤹ�뤳�Ȥʤ��˼¹Ԥ��뤳�Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
-  end
-}.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($menu_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $menu_demo
-      $menu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu ����
-TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.configure('menu'=>file_menu)
-    add('command', 'label'=>'���� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"���� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'����', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"����"���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'��¸', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"��¸"���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'��¸(����) ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"��¸(����) ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('separator')
-    add('command', 'label'=>'�ץ������� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"�ץ������� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'�ץ��� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"�ץ��� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('separator')
-    add('command', 'label'=>'��λ', 'command'=>proc{$menu_demo.destroy})
-  }
-}
-
-if $tk_platform['platform'] == 'macintosh'
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.configure('menu'=>basic_menu)
-    add('command', 'label'=>'���⤷�ʤ�Ĺ������ȥ�')
-    ['A','B','C','D','E','F','G'].each{|c|
-      # add('command', 'label'=>"ʸ�� \"#{c}\" �����", 'underline'=>4, 
-      add('command', 'label'=>"Print letter \"#{c}\" (ʸ�� \"#{c}\" �����)", 
-	  'underline'=>14, 'accelerator'=>"Meta+#{c}", 
-	  'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.configure('menu'=>cascade_menu)
-    add('command', 'label'=>'Print hello(����ˤ���)', 
-	'command'=>proc{print "Hello(����ˤ���)\n"}, 
-	'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-h", proc{print "Hello(����ˤ���)\n"})
-    add('command', 'label'=>'Print goodbye(���褦�ʤ�)', 
-	'command'=>proc{print "Goodbye(���褦�ʤ�)\n"}, 
-	'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-g", proc{print "Goodbye(���褦�ʤ�)\n"})
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons(�����å��ܥ���)', 
-		       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'����������', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'�ȥ�󥹥ߥå��������', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'�֥졼������', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'�饤������', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��', 
-	  'command'=>proc{showVars($menu_demo, 
-				   ['����������', oil], 
-				   ['�ȥ�󥹥ߥå��������', trans], 
-				   ['�֥졼������', brakes], 
-				   ['�饤������', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons(�饸���ܥ���)', 
-		       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 �ݥ����', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 �ݥ����', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 �ݥ����', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 �ݥ����', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 �ݥ����', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'�����ޥ�', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'�ܡ����', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'������å�', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��', 
-	  'command'=>proc{showVars($menu_demo, 
-				   ['�ݥ���ȥ�����', pointSize], 
-				   ['��������', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.configure('menu'=>icon_menu)
-    add('command', 
-	'bitmap'=>'@'+[$demo_dir,'images','pattern.bmp'].join(File::Separator),
-	'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
-				     'text'=>'�����ʤ������򤷤���˥塼�ι��ܤϥƥ����ȤǤϤʤ��ӥåȥޥåפ�ɽ�����Ƥ��ޤ���������ʳ������Ǥ�¾�Υ�˥塼���ܤ��Ѥ��ޤ���',
-				     'bitmap'=>'', 'default'=>0, 
-				     'buttons'=>'λ��')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon, 
-	  'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.configure('menu'=>more_menu)
-    [ '����ȥ�','�̤Υ���ȥ�','���⤷�ʤ�','�ۤȤ�ɲ��⤷�ʤ�',
-      '������յ������Τ�' ].each{|i|
-      add('command', 'label'=>i, 
-	  'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m) {|colors_menu|
-    m.configure('menu'=>colors_menu)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c, 
-	  'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-}
diff --git a/ext/tk/sample/demos-jp/menu84.rb b/ext/tk/sample/demos-jp/menu84.rb
deleted file mode 100644
index ea5fdf6487..0000000000
--- a/ext/tk/sample/demos-jp/menu84.rb
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu84_demo) && $menu84_demo
-  $menu84_demo.destroy 
-  $menu84_demo = nil
-end
-
-# demo toplevel widget
-$menu84_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu84")
-  positionWindow(w)
-}
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label
-TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("���Υ�����ɥ��ˤϥ��������ɥ�˥塼����ĥ�˥塼�С����դ����Ƥ��ޤ���Command+x ('x'�ϥ��ޥ�ɥ�������ܥ��³����ɽ������Ƥ���ʸ���Ǥ�) �ȥ����פ��뤳�Ȥˤ�äƤ���ܤε�ǽ��ƤӽФ����Ȥ��Ǥ��ޤ����Ǹ�Υ�˥塼�ϡ��ޥ����ǥ�����ɥ��γ��˥ɥ�å����뤳�Ȥˤ�äơ���Ω�����ѥ�åȤȤʤ�褦���ڤ��������Ȥ���ǽ�Ǥ���")
-  else
-    text("���Υ�����ɥ��ˤϥ��������ɥ�˥塼����ĥ�˥塼�С����դ����Ƥ��ޤ���Alt+x ('x'�ϥ�˥塼��ǲ����������줿ʸ���Ǥ�) �ȥ����פ��뤳�Ȥˤ�äƤ��˥塼��ƤӽФ����Ȥ��Ǥ��ޤ������������Ȥäơ���˥塼�֤��ư���뤳�Ȥ��ǽ�Ǥ�����˥塼��ɽ������Ƥ�����ˤϡ����߰��֤ι��ܤ򥹥ڡ������������򤷤��ꡢ�����������줿ʸ�������Ϥ��뤳�ȤǤ��ι��ܤ����򤷤��ꤹ�뤳�Ȥ��Ǥ��ޤ����⤷���ܤ˥�������졼���λ��꤬�ʤ���Ƥ����ʤ�С����λ��ꤵ�줿�������Ϥ�Ԥ����Ȥǡ���˥塼��ɽ�������뤳�Ȥʤ�ľ�ܤ��ι��ܤε�ǽ��ƤӽФ��ޤ����Ǹ�Υ�˥塼�ϡ���˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥˤ�äơ���Ω�����ѥ�åȤȤʤ�褦���ڤ��������Ȥ���ǽ�Ǥ���")
-  end
-}.pack('side'=>'top')
-
-
-menustatus = TkVariable.new("    ")
-TkFrame.new($menu84_demo) {|frame|
-  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken', 
-	      'bd'=>1, 'font'=>['Helvetica', '10'], 
-	      'anchor'=>'w').pack('side'=>'left', 'padx'=>2, 
-				  'expand'=>true, 'fill'=>'both')
-  pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-}
-
-
-# frame
-TkFrame.new($menu84_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $menu84_demo
-      $menu84_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu84'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# create menu frame
-$menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
-
-# menu
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Open...', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"Open..." ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('command', 'label'=>'New', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"New" ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('command', 'label'=>'Save', 'command'=>proc{fail '�����ñ�ʤ�Ǥ�Ǥ����顢"Save" ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('command', 'label'=>'Save As...', 'command'=>proc{fail '�����ñ�ʤ�Ǥ�Ǥ����顢"Save As..." ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('separator')
-  add('command', 'label'=>'Print Setup...', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"Print Setup..." ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('command', 'label'=>'Print...', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"Print..." ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('separator')
-  add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem = "classic" || windowingsystem = "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Long entry that does nothing')
-  ['A','B','C','D','E','F','G'].each{|c|
-    add('command', 'label'=>"Print letter \"#{c}\"", 
-	'underline'=>14, 'accelerator'=>"Meta+#{c}", 
-	'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-    $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Print hello', 
-      'command'=>proc{print "Hello\n"}, 
-      'accelerator'=>"#{modifier}+H", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-  add('command', 'label'=>'Print goodbye', 
-      'command'=>proc{print "Goodbye\n"}, 
-      'accelerator'=>"#{modifier}+G", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    m.add('cascade', 'label'=>'Check button', 
-	  'menu'=>cascade_check, 'underline'=>0)
-    oil = TkVariable.new(0)
-    add('check', 'label'=>'�����븡��', 'variable'=>oil)
-    trans = TkVariable.new(0)
-    add('check', 'label'=>'�ȥ�󥹥ߥå���󸡺�', 'variable'=>trans)
-    brakes = TkVariable.new(0)
-    add('check', 'label'=>'�֥졼������', 'variable'=>brakes)
-    lights = TkVariable.new(0)
-    add('check', 'label'=>'�饤�ȸ���', 'variable'=>lights)
-    add('separator')
-    add('command', 'label'=>'Show current values', 
-	'command'=>proc{showVars($menu84_demo, 
-				 ['������', oil], 
-				 ['�ȥ�󥹥ߥå����', trans], 
-				 ['�֥졼��', brakes], 
-				 ['�饤��', lights])} )
-    invoke 1
-    invoke 3
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    m.add('cascade', 'label'=>'Radio buttons', 
-	  'menu'=>cascade_radio, 'underline'=>0)
-    pointSize = TkVariable.new
-    add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-    add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-    add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-    add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-    add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-    add('separator')
-    style = TkVariable.new
-    add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-    add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-    add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-    add('separator')
-    add('command', 'label'=>'�����ͤ�ɽ��', 
-	'command'=>proc{showVars($menu84_demo, 
-				 ['pointSize', pointSize], 
-				 ['style', style])} )
-    invoke 1
-    invoke 7
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
-  add('command', 'hidemargin'=>1, 
-      'bitmap'=>'@'+[$demo_dir,'images','pattern.bmp'].join(File::Separator),
-      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
-				   'text'=>'���ʤ������򤷤���˥塼���ܤϡ�ʸ���������˥ӥåȥޥåץ��᡼���ǹ��ܤ�ɽ��������ΤǤ�������ʳ������Ǥϡ��ۤ��Υ�˥塼���ܤȤδ֤��ä˰㤤������櫓�ǤϤ���ޤ���',
-				   'bitmap'=>'', 'default'=>0, 
-				   'buttons'=>'�Ĥ���')} )
-  ['info', 'questhead', 'error'].each{|icon|
-    add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
-	'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-  }
-
-  entryconfigure(2, :columnbreak=>true)
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
-  [ 'An entry','Another entry','Does nothing','Does almost nothing',
-    'Make life meaningful' ].each{|i|
-    add('command', 'label'=>i, 
-	'command'=>proc{print "You invoked \"#{i}\"\n"})
-  }
-
-  m.entryconfigure('Does almost nothing', 
-		   'bitmap'=>'questhead', 'compound'=>'left', 
-		   'command'=>proc{
-		     TkDialog.new('title'=>'Compound Menu Entry', 
-				  'message'=>'���ʤ������򤷤���˥塼���ܤϡ��ӥåȥޥåץ��᡼����ʸ����Ȥ�Ʊ���˰�Ĥι��ܤ�ɽ������褦�ˤ�����ΤǤ�������ʳ������Ǥϡ��ۤ��Υ�˥塼���ܤȤδ֤��ä˰㤤������櫓�ǤϤ���ޤ���',
-				  'buttons'=>['λ��'], 'bitmap'=>'')
-		   })
-}
-
-TkMenu.new($menu84_frame) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
-  ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-    add('command', 'label'=>c, 'background'=>c, 
-	'command'=>proc{print "You invoked \"#{c}\"\n"})
-  }
-}
-
-$menu84_demo.menu($menu84_frame)
-
-TkMenu.bind('<MenuSelect>', proc{|w|
-	      begin
-		label = w.entrycget('active', 'label')
-	      rescue
-		label = "    "
-	      end
-	      menustatus.value = label
-	      Tk.update(true)
-	    }, '%W')
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
deleted file mode 100644
index a6d3c5e09e..0000000000
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($menu8x_demo) && $menu8x_demo
-  $menu8x_demo.destroy 
-  $menu8x_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$menu8x_demo = TkToplevel.new {|w|
-  title("Menu Demonstration (Tk8.x)")
-  iconname("menu")
-  positionWindow(w)
-}
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label ����
-TkLabel.new($menu8x_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("�¹Ԥ��褦�Ȥ���������ץȤ� Tk8.0 �ʾ�����ѤǤ��뵡ǽ�����Ѥ��Ƥ��뤿�ᡢ���ʤ��� Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} �Ǥ�����˼¹ԤǤ��ޤ��󡣤�äƥǥ�μ¹Ԥ���ߤ��ޤ����������������Υ����ɻ��ȥܥ���򲡤����Ȥǡ��¹Ԥ���ߤ��줿������ץȤΥ������򻲾Ȥ��뤳�Ȥϲ�ǽ�Ǥ���")
-}.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($menu8x_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $menu8x_demo
-      $menu8x_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-# label ����
-TkLabel.new($menu8x_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh'
-    text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Command-X �����Ϥ���ȡ�X�����ޥ�ɥ��������³����ɽ������Ƥ���ʸ���ʤ�С���������졼����Ȥä����ܵ�ư��Ԥ����Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
-  else
-    text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Alt-X �����Ϥ���ȡ�X����˥塼�˥�������饤���դ���ɽ������Ƥ���ʸ���ʤ�С������ܡ��ɤ���λ��꤬�Ǥ��ޤ�����������ǥ�˥塼�Υȥ�С������ǽ�Ǥ�����˥塼�����ꤵ�줿�ݤˤϡ����ڡ��������Ǽ¹Ԥ��뤳�Ȥ��Ǥ��ޤ������뤤�ϡ���������饤���դ���ʸ�������Ϥ��뤳�ȤǤ�¹ԤǤ��ޤ�����˥塼�Υ���ȥ꤬��������졼������äƤ�����ϡ����Υ�������졼�������Ϥ��뤳�Ȥǥ�˥塼����ꤹ�뤳�Ȥʤ��˼¹Ԥ��뤳�Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
-  end
-}.pack('side'=>'top')
-
-# ����ɽ��������
-$menu8xstatus = TkVariable.new("    ")
-TkFrame.new($menu8x_demo) {|frame|
-  TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken', 
-	      'bd'=>1, 'font'=>['Helvetica', '10'], 'anchor'=>'w')\
-  .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-
-# frame ����
-TkFrame.new($menu8x_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $menu8x_demo
-      $menu8x_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu ����
-TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.add('cascade', 'label'=>'File', 'menu'=>file_menu, 'underline'=>0)
-    add('command', 'label'=>'���� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"���� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'����', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"����"���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'��¸', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"��¸"���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'��¸(����) ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"��¸(����) ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('separator')
-    add('command', 'label'=>'�ץ������� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"�ץ������� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'�ץ��� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"�ץ��� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('separator')
-    add('command', 'label'=>'��λ', 'command'=>proc{$menu8x_demo.destroy})
-  }
-
-  if $tk_platform['platform'] == 'macintosh'
-    modifier = 'Command'
-  elsif $tk_platform['platform'] == 'windows'
-    modifier = 'Control'
-  else
-    modifier = 'Meta'
-  end
-
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.add('cascade', 'label'=>'Basic', 'menu'=>basic_menu, 'underline'=>0)
-    add('command', 'label'=>'���⤷�ʤ�Ĺ������ȥ�')
-    ['A','B','C','D','E','F','G'].each{|c|
-      # add('command', 'label'=>"ʸ�� \"#{c}\" �����", 'underline'=>4, 
-      add('command', 'label'=>"Print letter \"#{c}\" (ʸ�� \"#{c}\" �����)", 
-	  'underline'=>14, 'accelerator'=>"Meta+#{c}", 
-	  'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu8x_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.add('cascade', 'label'=>'Cascades', 'menu'=>cascade_menu, 'underline'=>0)
-    add('command', 'label'=>'Print hello(����ˤ���)', 
-	'command'=>proc{print "Hello(����ˤ���)\n"}, 
-	'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu8x_demo.bind("#{modifier}-h", proc{print "Hello(����ˤ���)\n"})
-    add('command', 'label'=>'Print goodbye(���褦�ʤ�)', 
-	'command'=>proc{print "Goodbye(���褦�ʤ�)\n"}, 
-	'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu8x_demo.bind("#{modifier}-g", proc{print "Goodbye(���褦�ʤ�)\n"})
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons(�����å��ܥ���)', 
-		       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'����������', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'�ȥ�󥹥ߥå��������', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'�֥졼������', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'�饤������', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��', 
-	  'command'=>proc{showVars($menu8x_demo, 
-				   ['����������', oil], 
-				   ['�ȥ�󥹥ߥå��������', trans], 
-				   ['�֥졼������', brakes], 
-				   ['�饤������', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons(�饸���ܥ���)', 
-		       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 �ݥ����', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 �ݥ����', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 �ݥ����', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 �ݥ����', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 �ݥ����', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'�����ޥ�', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'�ܡ����', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'������å�', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��', 
-	  'command'=>proc{showVars($menu8x_demo, 
-				   ['�ݥ���ȥ�����', pointSize], 
-				   ['��������', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.add('cascade', 'label'=>'Icons', 'menu'=>icon_menu, 'underline'=>0)
-    add('command', 
-	'bitmap'=>'@'+[$demo_dir,'images','pattern.bmp'].join(File::Separator),
-	'hidemargin'=>1, 
-	'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
-				     'text'=>'�����ʤ������򤷤���˥塼�ι��ܤϥƥ����ȤǤϤʤ��ӥåȥޥåפ�ɽ�����Ƥ��ޤ���������ʳ������Ǥ�¾�Υ�˥塼���ܤ��Ѥ��ޤ���',
-				     'bitmap'=>'', 'default'=>0, 
-				     'buttons'=>'λ��')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
-	  'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-
-    entryconfigure(2, 'columnbreak'=>1)
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.add('cascade', 'label'=>'More', 'menu'=>more_menu, 'underline'=>0)
-    [ '����ȥ�','�̤Υ���ȥ�','���⤷�ʤ�','�ۤȤ�ɲ��⤷�ʤ�',
-      '������յ������Τ�' ].each{|i|
-      add('command', 'label'=>i, 
-	  'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-
-  TkMenu.new(m) {|colors_menu|
-    m.add('cascade', 'label'=>'Colors', 'menu'=>colors_menu, 'underline'=>1)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c, 
-	  'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-
-  $menu8x_demo.configure('menu'=>m)
-}
-
-TkMenu.bind('<MenuSelect>', 
-	    proc{|w| 
-	      begin
-		label = w.entrycget('active', 'label')
-	      rescue
-		label = '    '
-	      end
-	      $menu8xstatus.value = label
-	      Tk.update('idletasks')
-	    }, '%W')
-
-end ; # Tk 8.x
diff --git a/ext/tk/sample/demos-jp/menubu.rb b/ext/tk/sample/demos-jp/menubu.rb
deleted file mode 100644
index 8b4d7980d2..0000000000
--- a/ext/tk/sample/demos-jp/menubu.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-require "tkcanvas"
-
-def optionMenu(menubutton, varName, firstValue, *rest)
-  varName.value = firstValue
-  configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
-    'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
-    'anchor'=>'c','direction'=>'flush'}
-  configoptions.each {|key, value|
-    menubutton.configure(key, value)
-  }
-  menu = TkMenu.new(menubutton) {
-    tearoff 'off'
-    add 'radio', 'label'=>firstValue, 'variable'=>varName
-  }
-  menubutton.menu(menu)
-  for i in rest
-    menu.add 'radio', 'label'=>i, 'variable'=>varName
-  end
-  
-  return menu
-end
-
-if defined?($menubu_demo) && $menubu_demo
-  $menubu_demo.destroy
-  $menubu_demo = nil
-end
-
-$menubu_demo = TkToplevel.new {|w|
-  title("Menu Button Demonstration")
-  iconname("menubutton")
-}
-
-positionWindow($menubu_demo)
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label ����
-TkLabel.new($menubu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("�¹Ԥ��褦�Ȥ���������ץȤ� Tk8.0 �ʾ�����ѤǤ��뵡ǽ�����Ѥ��Ƥ��뤿�ᡢ���ʤ��� Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} �Ǥ�����˼¹ԤǤ��ޤ��󡣤�äƥǥ�μ¹Ԥ���ߤ��ޤ����������������Υ����ɻ��ȥܥ���򲡤����Ȥǡ��¹Ԥ���ߤ��줿������ץȤΥ������򻲾Ȥ��뤳�Ȥϲ�ǽ�Ǥ���")
-}.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($menubu_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-body = TkFrame.new($menubu_demo)
-body.pack('expand'=>'yes', 'fill'=>'both')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-right = TkMenubutton.new(body) {
-  text "Right"
-  underline 0
-  direction 'right'
-  relief 'raised'
-}
-rightMenu = TkMenu.new(right) {
-  tearoff 0
-  add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
-}
-right.menu(rightMenu)
-right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
-
-left = TkMenubutton.new(body) {
-  text "Left"
-  underline 0
-  direction 'left'
-  relief 'raised'
-}
-leftMenu = TkMenu.new(left) {
-  tearoff 0
-  add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
-}
-left.menu(leftMenu)
-left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-above = TkMenubutton.new(body) {
-  text "Above"
-  underline 0
-  direction 'above'
-  relief 'raised'
-}
-aboveMenu = TkMenu.new(above) {
-  tearoff 0
-  add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
-  add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
-}
-above.menu(aboveMenu)
-above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-TkFrame.new($menubu_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc {
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc { showCode 'menubu' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
-
-msg = TkLabel.new(center) {
-#  font $font
-  wraplength '4i'
-  justify 'left'
-  text "����ϥ�˥塼�ܥ���Υǥ�Ǥ���\"Below\"�Υܥ����\
-���˥�˥塼��Ф���\"Right\"�Υܥ���ϱ��˥�˥塼��Ф��ơ�\
-�ġĤȤʤ�ޤ�������ʸ�Ϥβ��ˤ�2�ĤΥ��ץ�����˥塼������ޤ���\
-1�Ĥ����̤Υ�˥塼�ǡ��⤦1�Ĥ�16���Υѥ�åȤǤ���"
-}
-msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
-
-TkFrame.new(center) {|f|
-  menubuttonoptions = TkVariable.new
-  mbutton = TkMenubutton.new(f)
-  options = optionMenu(mbutton, menubuttonoptions, 
-		       'one', 'two', 'three')
-  mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  paletteColor = TkVariable.new
-  colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
-    'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
-    'White','Brown','DarkSeaGreen','DarkViolet']
-  colorMenuButton = TkMenubutton.new(f)
-  m = optionMenu(colorMenuButton, paletteColor, *colors)
-  begin
-    windowingsystem = Tk.windowingsystem()
-  rescue
-    windowingsystem = ""
-  end
-  if windowingsystem == "classic" || windowingsystem == "aqua"
-    topBorderColor = 'Black'
-    bottomBorderColor = 'Black'
-  else
-    topBorderColor = 'gray50'
-    bottomBorderColor = 'gray75'
-  end
-  for i in 0..15
-    image = TkPhotoImage.new('height'=>16, 'width'=>16)
-    image.put(topBorderColor, 0, 0, 16, 1)
-    image.put(topBorderColor, 0, 1, 1, 16)
-    image.put(bottomBorderColor, 0, 15, 16, 16)
-    image.put(bottomBorderColor, 15, 1, 16, 16)
-    image.put(colors[i], 1, 1, 15, 15)
-
-    selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
-    selectimage.put('Black', 0, 0, 16, 2)
-    selectimage.put('Black', 0, 2, 2, 16)
-    selectimage.put('Black', 2, 14, 16, 16)
-    selectimage.put('Black', 14, 2, 16, 14)
-    selectimage.put(colors[i], 2, 2, 14, 14)
-
-    m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
-  end
-  m.configure('tearoff', 'on')
-  for c in ['Black', 'gray75', 'gray50', 'White']
-    m.entryconfigure(c, 'columnbreak'=>1)
-  end
-  colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  pack 'padx'=>25, 'pady'=>25
-}
-
-end ; # Tk8.x
diff --git a/ext/tk/sample/demos-jp/msgbox.rb b/ext/tk/sample/demos-jp/msgbox.rb
deleted file mode 100644
index cf53d70487..0000000000
--- a/ext/tk/sample/demos-jp/msgbox.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($msgbox_demo) && $msgbox_demo
-  $msgbox_demo.destroy 
-  $msgbox_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$msgbox_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($msgbox_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-	    'text'=>"ɽ�����륢������ȥ�å������ܥå����μ��������ǲ������������� \"��å������ܥå���\" �ܥ���򲡤��ȡ����ꤷ����å������ܥå�����ɽ������ޤ���").pack('side'=>'top')
-
-# frame ����
-TkFrame.new($msgbox_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $msgbox_demo
-      $msgbox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'msgbox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '��å������ܥå���'
-    command proc{showMessageBox $msgbox_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-$msgbox_leftframe  = TkFrame.new($msgbox_demo)
-$msgbox_rightframe = TkFrame.new($msgbox_demo)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
-			'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
-			'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'��������').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon, 
-		    'relief'=>'flat', 'value'=>icon, 'width'=>16, 
-		    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
-					'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'����').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel', 
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType, 
-		    'relief'=>'flat', 'value'=>type, 'width'=>16, 
-		    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
-					'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value, 
-			 'title'=>'Message', 'parent'=>w,
-			 'message'=>"����� \"#{$msgboxType.value}\" �Ȥ�������Υ�å������ܥå����ǡ�\"#{$msgboxIcon.value}\" �Υ�������ɽ������Ƥ��ޤ���")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
-		'message'=>"���ʤ��� \"#{button}\" �򲡤��ޤ����͡�")
-end
-
diff --git a/ext/tk/sample/demos-jp/paned1.rb b/ext/tk/sample/demos-jp/paned1.rb
deleted file mode 100644
index 99e6b6cddb..0000000000
--- a/ext/tk/sample/demos-jp/paned1.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# paned1.rb
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows horizontally.
-#
-# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned1_demo) && $paned1_demo
-  $paned1_demo.destroy 
-  $paned1_demo = nil
-end
-
-$paned1_demo = TkToplevel.new {|w|
-  title("Horizontal Paned Window Demonstration")
-  iconname("paned1")
-  positionWindow(w)
-}
-
-TkLabel.new($paned1_demo, 
-	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-���ο��դ����줿��ĤΥ�����ɥ��δ֤λ��ڤ��Ȥϡ���Ĥ��ΰ�򤽤줾��Υ�����ɥ��Τ����ʬ�䤹�뤿��Τ�ΤǤ������ܥ���ǻ��ڤ������ȡ�ʬ�䥵�����ѹ����������ǤϺ�ɽ���Ϥʤ��줺�����ꤵ�����Ȥ���ɽ������������ޤ����ޥ����ˤ����ڤ�������ɿ路�ƥ��������ѹ�����ɽ�����ʤ���褦�ˤ��������ϡ��ޥ���������ܥ����ȤäƤ���������
-�⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬ panedwindow ��������Ƥ��ʤ�
-��硢���Υǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ������ξ��ˤ� panedwindow ����������Ƥ���褦��
-��꿷�����С������� Tk ���Ȥ߹�碌�ƻ
-�褦�ˤ��Ƥ���������
-EOL
-
-# The bottom buttons
-TkFrame.new($paned1_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'λ��', :width=>15, :command=>proc{
-		 $paned1_demo.destroy
-		 $paned1_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-		 showCode 'paned1'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-TkPanedwindow.new($paned1_demo){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-
-  add(TkLabel.new(f, :text=>"This is the\nleft side", :bg=>'yellow'), 
-      TkLabel.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
-}
diff --git a/ext/tk/sample/demos-jp/paned2.rb b/ext/tk/sample/demos-jp/paned2.rb
deleted file mode 100644
index 9df88c4b97..0000000000
--- a/ext/tk/sample/demos-jp/paned2.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# paned2.rb --
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows vertically.
-#
-# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned2_demo) && $paned2_demo
-  $paned2_demo.destroy 
-  $paned2_demo = nil
-end
-
-$paned2_demo = TkToplevel.new {|w|
-  title("Vertical Paned Window Demonstration")
-  iconname("paned2")
-  positionWindow(w)
-}
-
-TkLabel.new($paned2_demo, 
-	    :font=>$font, :wraplength=>'4i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-���Υ���������С��դ��Υ��������åȤ��֤��줿��ĤΥ�����ɥ��δ֤λ��ڤ��Ȥϡ���Ĥ��ΰ�򤽤줾��Υ�����ɥ��Τ����ʬ�䤹�뤿��Τ�ΤǤ������ܥ���ǻ��ڤ������ȡ�ʬ�䥵�����ѹ����������ǤϺ�ɽ���Ϥʤ��줺�����ꤵ�����Ȥ���ɽ������������ޤ����ޥ����ˤ����ڤ�������ɿ路�ƥ��������ѹ�����ɽ�����ʤ���褦�ˤ��������ϡ��ޥ���������ܥ����ȤäƤ���������
-�⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬ panedwindow ��������Ƥ��ʤ�
-��硢���Υǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ������ξ��ˤ� panedwindow ����������Ƥ���褦��
-��꿷�����С������� Tk ���Ȥ߹�碌�ƻ
-�褦�ˤ��Ƥ���������
-EOL
-
-# The bottom buttons
-TkFrame.new($paned2_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'λ��', :width=>15, :command=>proc{
-		 $paned2_demo.destroy
-		 $paned2_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-		 showCode 'paned2'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-paneList = TkVariable.new  # define as normal variable (not array)
-paneList.value = [         # ruby's array --> tcl's list
-    'Ruby/Tk �Υ��������åȰ���',
-    'TkButton', 
-    'TkCanvas', 
-    'TkCheckbutton', 
-    'TkEntry', 
-    'TkFrame', 
-    'TkLabel', 
-    'TkLabelframe', 
-    'TkListbox', 
-    'TkMenu', 
-    'TkMenubutton', 
-    'TkMessage', 
-    'TkPanedwindow', 
-    'TkRadiobutton', 
-    'TkScale', 
-    'TkScrollbar', 
-    'TkSpinbox', 
-    'TkText', 
-    'TkToplevel'
-]
-
-# Create the pane itself
-TkPanedwindow.new($paned2_demo, :orient=>:vertical){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-
-  add(TkFrame.new(f){|paned2_top|
-	TkListbox.new(paned2_top, :listvariable=>paneList) {
-	  # Invert the first item to highlight it
-	  itemconfigure(0, :background=>self.cget(:foreground), 
-			   :foreground=>self.cget(:background) )
-	  yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right, 
-						      :fill=>:y))
-	  pack(:fill=>:both, :expand=>true)
-	}
-      }, 
-
-      TkFrame.new(f) {|paned2_bottom|
-	# The bottom window is a text widget with scrollbar
-	paned2_xscr = TkScrollbar.new(paned2_bottom)
-	paned2_yscr = TkScrollbar.new(paned2_bottom)
-	paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
-	  insert('1.0', '���������֤���Ƥ���Τϡ�' + 
-		        '�������̤Υƥ����ȥ��������åȤǤ���')
-	  xscrollbar(paned2_xscr)
-	  yscrollbar(paned2_yscr)
-	}
-	Tk.grid(paned2_text, paned2_yscr, :sticky=>'nsew')
-	Tk.grid(paned2_xscr, :sticky=>'nsew')
-	TkGrid.columnconfigure(paned2_bottom, 0, :weight=>1)
-	TkGrid.rowconfigure(paned2_bottom, 0, :weight=>1)
-      } )
-}
diff --git a/ext/tk/sample/demos-jp/plot.rb b/ext/tk/sample/demos-jp/plot.rb
deleted file mode 100644
index 464dd4441d..0000000000
--- a/ext/tk/sample/demos-jp/plot.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# 2-D plot widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($plot_demo) && $plot_demo
-  $plot_demo.destroy 
-  $plot_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$plot_demo = TkToplevel.new {|w|
-  title("Plot Demonstration")
-  iconname("Plot")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($plot_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left', 
-	    'text'=>"���Υ�����ɥ��ϴ�ñ��2�����Υץ��åȤ�ޤ�������Х� widget�Ǥ���ɽ�����줿����ޥ����ܥ���1�ǥɥ�å����ƥǡ����򤤤��뤳�Ȥ��Ǥ��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$plot_buttons = TkFrame.new($plot_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $plot_demo
-      $plot_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'plot'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# font ����
-plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-
-# canvas ����
-$plot_canvas = TkCanvas.new($plot_demo,'relief'=>'raised','width'=>450,'height'=>300)
-$plot_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# plot ����
-TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
-TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20, 
-	    'text'=>"��ñ�ʥץ��å�", 'font'=>plotFont, 'fill'=>'brown')
-
-(0..10).each {|i|
-  x = 100 + (i * 30)
-  TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
-  TkcText.new($plot_canvas, x, 254, 
-	      'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
-}
-(0..5).each {|i|
-  y = 250 - (i * 40)
-  TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
-  TkcText.new($plot_canvas, 96, y, 
-	      'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
-}
-
-for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-  x = 100 + (3*xx)
-  y = 250 - (4*yy)/5
-  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6, 
-		     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-  item.addtag 'point'
-end
-
-$plot_canvas.itembind('point', 'Any-Enter', 
-		      proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave', 
-		      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1', 
-		      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1', 
-		      proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion', 
-		  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
-
-$plot = {'lastX'=>0, 'lastY'=>0}
-
-# plotDown --
-# This method is invoked when the mouse is pressed over one of the 
-# data points.  It sets up state to allow the point to be dragged.
-#
-# Arguments:
-# w -		The canvas window.
-# x, y -	The coordinates of the mouse press.
-
-def plotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
-# plotMove --
-# This method is invoked during mouse motion events.  It drags the
-# current item.
-#
-# Arguments:
-# w -		The canvas window.
-# x, y -	The coordinates of the mouse.
-
-def plotMove (w, x, y)
-  w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
diff --git a/ext/tk/sample/demos-jp/puzzle.rb b/ext/tk/sample/demos-jp/puzzle.rb
deleted file mode 100644
index 24c48693a9..0000000000
--- a/ext/tk/sample/demos-jp/puzzle.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# widet demo 'puzzle' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($puzzle_demo) && $puzzle_demo
-  $puzzle_demo.destroy 
-  $puzzle_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$puzzle_demo = TkToplevel.new {|w|
-  title("15-Puzzle Demonstration")
-  iconname("15-Puzzle")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($puzzle_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "����15-�ѥ���ϥܥ���򽸤�ƤǤ��Ƥ��ޤ��������Ƥ������٤Υԡ����򥯥�å�����ȡ����Υԡ��������ζ����Ƥ�����˥��饤�ɤ��ޤ�����������³�����ԡ��������ο��ν�˾夫�鲼�������鱦���¤֤褦�ˤ��Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($puzzle_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $puzzle_demo
-      $puzzle_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'puzzle'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-#
-# Special trick: scrollbar widget ���������Ƥ��� trough color ���Ѥ��뤳�Ȥ�
-#                ������ʬ�Τ���ΰſ������򤷡����ꤹ�� 
-#
-begin
-  if Tk.windowingsystem() == 'aqua'
-    frameSize = 160
-  else
-    frameSize = 120
-  end
-rescue
-  frameSize = 120
-end
- 
-s = TkScrollbar.new($puzzle_demo)
-base = TkFrame.new($puzzle_demo) {
-  width  frameSize
-  height frameSize
-  borderwidth 2
-  relief 'sunken'
-  bg s['troughcolor']
-}
-s.destroy
-base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
-
-# proc �Υ������פ��Ĥ��뤿�ᡤproc �����᥽�åɤ��Ѱ�
-# �������Ƥ����ͤС��롼������ͤ��Ѳ����� num �αƶ��������
-# puzzleSwitch ���� 2 �������Ѳ����Ƥ��ޤ��������̤�ˤϤʤ�ʤ���
-def def_puzzleswitch_proc(w, num)
-  proc{puzzleSwitch w, num}
-end
-
-$xpos = {}
-$ypos = {}
-order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
-(0..14).each{|i|
-  num = order[i]
-  $xpos[num] = (i % 4) * 0.25
-  $ypos[num] = (i / 4) * 0.25
-  TkButton.new(base) {|w|
-    relief 'raised'
-    text num
-    highlightthickness 0
-    command def_puzzleswitch_proc(w, num)
-  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num], 
-	  'relwidth'=>0.25, 'relheight'=>0.25)
-}
-$xpos['space'] = 0.75
-$ypos['space'] = 0.75
-
-############
-def puzzleSwitch(w, num)
-  if ( ($ypos[num] >= ($ypos['space'] - 0.01))     \
-      && ($ypos[num] <= ($ypos['space'] + 0.01))   \
-      && ($xpos[num] >= ($xpos['space'] - 0.26))   \
-      && ($xpos[num] <= ($xpos['space'] + 0.26)))  \
-    || (($xpos[num] >= ($xpos['space'] - 0.01))    \
-	&& ($xpos[num] <= ($xpos['space'] + 0.01)) \
-	&& ($ypos[num] >= ($ypos['space'] - 0.26)) \
-	&& ($ypos[num] <= ($ypos['space'] + 0.26)))
-    tmp = $xpos['space']
-    $xpos['space'] = $xpos[num]
-    $xpos[num] = tmp
-    tmp = $ypos['space']
-    $ypos['space'] = $ypos[num]
-    $ypos[num] = tmp
-    w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/radio.rb b/ext/tk/sample/demos-jp/radio.rb
deleted file mode 100644
index 871503029e..0000000000
--- a/ext/tk/sample/demos-jp/radio.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($radio_demo) && $radio_demo
-  $radio_demo.destroy 
-  $radio_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$radio_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration")
-  iconname("radio")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($radio_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ�2�ĤΥ饸���ܥ��󥰥롼�פ�ɽ������Ƥ��ޤ����ܥ���򥯥�å�����ȡ����Υܥ�����������Υ��롼�פ�������򤵤�ޤ����ƥ��롼�פ��Ф��Ƥ��Υ��롼�פ���ΤɤΥܥ������򤵤�Ƥ��뤫�򼨤��ѿ���������Ƥ��Ƥ��ޤ������ߤ��ѿ����ͤ򸫤�ˤϡ��ѿ����ȡץܥ���򥯥�å����Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-# �ѿ�����
-size = TkVariable.new
-color = TkVariable.new
-
-# frame ����
-TkFrame.new($radio_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $radio_demo
-      $radio_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'radio'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�ѿ�����'
-    command proc{
-      showVars($radio_demo, ['size', size], ['color', color])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-f_left = TkFrame.new($radio_demo)
-f_right = TkFrame.new($radio_demo)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton ����
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "�ݥ���ȥ����� #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-['��', '��', '��', '��', '��', '��'].each {|col|
-  TkRadioButton.new(f_right) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
diff --git a/ext/tk/sample/demos-jp/radio2.rb b/ext/tk/sample/demos-jp/radio2.rb
deleted file mode 100644
index 62425af90d..0000000000
--- a/ext/tk/sample/demos-jp/radio2.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# radio.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio2_demo) && $radio2_demo
-  $radio2_demo.destroy 
-  $radio2_demo = nil
-end
-
-# demo toplevel widget
-$radio2_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration")
-  iconname("radio")
-  positionWindow(w)
-}
-
-# label 
-msg = TkLabel.new($radio2_demo) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "���ˤ�2�ĤΥ饸���ܥ��󥰥롼�פ�ɽ������Ƥ��ޤ����ܥ���򥯥�å�����ȡ����Υܥ�����������Υ��롼�פ�������򤵤�ޤ����ƥ��롼�פ��Ф��Ƥ��Υ��롼�פ���ΤɤΥܥ������򤵤�Ƥ��뤫�򼨤��ѿ���������Ƥ��Ƥ��ޤ������ߤ��ѿ����ͤ򸫤�ˤϡ��ѿ����ȡץܥ���򥯥�å����Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-# 
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame 
-TkFrame.new($radio2_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $radio2_demo
-      $radio2_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'radio'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�ѿ�����'
-    command proc{
-      showVars($radio2_demo, 
-	       ['size', size], ['color', color], ['compound', align])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 
-f_left  = TkLabelFrame.new($radio2_demo, 'text'=>'ʸ��������', 
-			   'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new($radio2_demo, 'text'=>'��', 
-			   'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new($radio2_demo, 'text'=>'�ӥåȥޥå�����', 
-			   'pady'=>2, 'padx'=>2)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton 
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "�ݥ���ȥ����� #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['��', '��', '��', '��', '��', '��'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-label = TkLabel.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead', 
-		    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  lower = a.downcase
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
-		    'value'=>lower, 'indicatoron'=>0, 'width'=>7, 
-		    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', abtn[0])
-Tk.grid(abtn[1], label, abtn[2])
-Tk.grid('x', abtn[3])
diff --git a/ext/tk/sample/demos-jp/rmt b/ext/tk/sample/demos-jp/rmt
deleted file mode 100644
index 73f631180a..0000000000
--- a/ext/tk/sample/demos-jp/rmt
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/env ruby
-
-# rmt -- 
-# This script implements a simple remote-control mechanism for 
-# Tk applications.  It allows you to select an application and 
-# then type commands to that application. 
-
-require 'tk'
-
-class Rmt
-  def initialize(parent=nil)
-    win = self
-
-    unless parent
-      parent = TkRoot.new
-    end
-    root = TkWinfo.toplevel(parent)
-    root.minsize(1,1)
-
-    # The instance variable below keeps track of the remote application 
-    # that we're sending to.  If it's an empty string then we execute 
-    # the commands locally. 
-    @app = 'local'
-    @mode = 'Ruby'
-
-    # The instance variable below keeps track of whether we're in the 
-    # middle of executing a command entered via the text. 
-    @executing = 0
-
-    # The instance variable below keeps track of the last command executed, 
-    # so it can be re-executed in response to !! commands. 
-    @lastCommand = ""
-
-    # Create menu bar.  Arrange to recreate all the information in the 
-    # applications sub-menu whenever it is cascaded to. 
-
-    TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
-      pack('side'=>'top', 'fill'=>'x')
-      TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
-	TkMenu.new(mb) {|mf|
-	  mb.menu(mf)
-	  TkMenu.new(mf) {|ma| 
-	    postcommand proc{win.fillAppsMenu ma}
-	    mf.add('cascade', 'label'=>'Select Application', 
-		   'menu'=>ma, 'underline'=>0)
-	  }
-	  add('command', 'label'=>'Quit', 
-	      'command'=>proc{root.destroy}, 'underline'=>0)
-	}
-	pack('side'=>'left')
-      }
-    }
-
-    # Create text window and scrollbar. 
-
-    @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
-      yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
-      pack('side'=>'left')
-    }
-
-    @promptEnd = TkTextMark.new(@txt, 'insert')
-
-    # Create a binding to forward commands to the target application, 
-    # plus modify many of the built-in bindings so that only information 
-    # in the current command can be deleted (can still set the cursor 
-    # earlier in the text and select and insert;  just can't delete).
-
-    @txt.bindtags([@txt, TkText, root, 'all'])
-    @txt.bind('Return', proc{
-		@txt.set_insert('end - 1c')
-		@txt.insert('insert', "\n")
-		win.invoke
-		Tk.callback_break
-	      })
-    @txt.bind('Delete', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('BackSpace', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('Control-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-k', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  @txt.set_insert(@promptEnd)
-		end
-	      })
-    @txt.bind('Control-t', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-BackSpace', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-h', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-
-    @txt.tag_configure('bold', 'font'=>['Courier', 12, 'bold'])
-
-    @app = Tk.appname('rmt')
-    if (@app =~ /^rmt(.*)$/)
-      root.title("Tk Remote Controller#{$1}")
-      root.iconname("Tk Remote#{$1}")
-    end
-    prompt
-    @txt.focus
-    #@app = TkWinfo.appname(TkRoot.new)
-  end
-
-  def tkTextInsert(w,s)
-    return if s == ""
-    begin
-      if w.compare('sel.first','<=','insert') \
-	&& w.compare('sel.last','>=','insert')
-	w.tag_remove('sel', 'sel.first', @promptEnd)
-	w.delete('sel.first', 'sel.last')
-      end
-    rescue
-    end
-    w.insert('insert', s)
-    w.see('insert')
-  end
-
-  # The method below is used to print out a prompt at the 
-  # insertion point (which should be at the beginning of a line 
-  # right now).
-
-  def prompt
-    @txt.insert('insert', "#{@app}: ")
-    @promptEnd.set('insert')
-    @promptEnd.gravity = 'left'
-    @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-  end
-
-  # The method below executes a command (it takes everything on the 
-  # current line after the prompt and either sends it to the remote 
-  # application or executes it locally, depending on "app".
-
-  def invoke
-    cmd = @txt.get(@promptEnd, 'insert')
-    @executing += 1
-    case (@mode)
-    when 'Tcl'
-      if Tk.info('complete', cmd)
-	if (cmd == "!!\n")
-	  cmd = @lastCommand
-	else
-	  @lastCommand = cmd
-	end
-	begin
-	  msg = Tk.appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-
-    when 'Ruby'
-      if (cmd == "!!\n")
-	cmd = @lastCommand
-      end
-      complete = true
-      begin
-	eval("proc{#{cmd}}")
-      rescue
-	complete = false
-      end
-      if complete
-	@lastCommand = cmd
-	begin
-#	  msg = Tk.appsend(@app, false, 
-#			   'ruby', 
-#			   '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
-	  msg = Tk.rb_appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-    end
-
-    @executing -= 1
-    @txt.yview_pickplace('insert')
-  end
-
-  # The following method is invoked to change the application that
-  # we're talking to.  It also updates the prompt for the current 
-  # command, unless we're in the middle of executing a command from 
-  # the text item (in which case a new prompt is about to be output 
-  # so there's no need to change the old one). 
-
-  def newApp(appName, mode)
-    @app = appName
-    @mode = mode
-    if @executing == 0
-      @promptEnd.gravity = 'right'
-      @txt.delete("#{@promptEnd.path} linestart", @promptEnd)
-      @txt.insert(@promptEnd, "#{appName}: ")
-      @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-      @promptEnd.gravity = 'left'
-    end
-  end
-
-  # The method below will fill in the applications sub-menu with a list
-  # of all the applications that currently exist. 
-
-  def fillAppsMenu(menu)
-    win = self
-    begin
-      menu.delete(0,'last')
-    rescue
-    end
-    TkWinfo.interps.sort.each{|ip|
-      begin
-	if Tk.appsend(ip, false, 'info commands ruby') == ""
-	  mode = 'Tcl'
-	else
-	  mode = 'Ruby'
-	end
-	menu.add('command', 'label'=>format("%s    (#{mode}/Tk)", ip), 
-		 'command'=>proc{win.newApp ip, mode})
-      rescue
-	menu.add('command', 'label'=>format("%s (unknown Tk)", ip), 
-		 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
-      end
-    }
-    menu.add('command', 'label'=>format("local    (Ruby/Tk)"), 
-	     'command'=>proc{win.newApp 'local', 'Ruby'})
-  end
-end
-
-Rmt.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/rolodex b/ext/tk/sample/demos-jp/rolodex
deleted file mode 100644
index 9f87ae2829..0000000000
--- a/ext/tk/sample/demos-jp/rolodex
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# This script is a part of Tom LaStrange's rolodex
-# 
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 12:45:21 nagai"
-#
-
-require "tk"
-
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( TkWinfo.exist?(w) )
-      topic = w
-    end
-  end
-  
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "Sorry, but no help is available for this topic"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"Information on #{topic}:\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0,"Takaaki Tateishi")
-  $root.frame.entry[2].insert(0,"Japan Advanced Institute of Science and Techonology")
-  $root.frame.entry[3].insert(0,"1-1 Asahidai, Tatsunokuchi")
-  $root.frame.entry[4].insert(0,"Ishikawa 923-1292, Japan")
-  $root.frame.entry[5].insert(0,"private")
-    $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"This is a dummy file selection dialog box.\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"Are you sure?",
-			"default_button"=>0,
-			"buttons"=>["Cancel"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","Name:","Address:","","","Home Phone:","Work Phone:","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-    
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,
-			  "text" => "Clear")
-    @add = TkButton.new(self,
-			"text" => "Add")
-    @search = TkButton.new(self,
-			   "text" => "Search")
-    @delete = TkButton.new(self,
-			   "text" => "Delete")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=>"File",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "Load ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "Exit",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=>"Help",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=>"On Context...",
-		   "command"=>proc{show_help("context")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Help...",
-		   "command"=>proc{show_help("help")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Window...",
-		   "command"=>proc{show_help("window")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Keys...",
-		   "command"=>proc{show_help("keys")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On version...",
-		   "command"=>proc{show_help("version")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=>"Clear   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=>"Add   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=>"Search   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=>"Delete...   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-This is the "file" menu. It can be used to invoke\
-some overall operations on the rolodex applications,\
-such as loading a file or exiting.
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-The "Load" entry in the "File" menu posts a dialog box\
-that you can use to select a rolodex file
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-The "Exit" entry in the "File" menu causes the rolodex\
-application to terminate
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's name
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-In this field of the rolodex entry you should\
-type the first line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-In this field of the rolodex entry you should\
-type the second line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-In this field of the rolodex entry you should\
-type the third line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's home phone number, or "private"\
-if the person doesn't want his or he number publicized
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's work phone number
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-In this field of the rolodex entry you should\
-type the phone number for the person's FAX machine
-EOF
-
-$helpTopics["context"] = <<EOF
-Unfortunately, this application doesn't support context-sensitive\
-help in the usual way, because when this demo was written Ruby/Tk\
-didn't have a grab mechanism and this is needed for context-sensitive\
-help. Instead, you can achive much the same effect by simply moving\
-the mouse over the window you're curious about and pressing the\
-Help or F1 keys. You can do this anytime.
-EOF
-
-$helpTopics["help"] = <<EOF
-This application provides only very crude help. Besides the\
-entries in this menu, you can get help on individual windows\
-by moving the mouse cursor over the window and pressing the\
-Help or F1 keys.
-EOF
-
-$helpTopics["window"] = <<EOF
-This window is a dummy rolodex application created as part of\
-Tom LaStrange's toolkit benchmark. It doesn't really do anything\
-useful except to demonstrate a few features of the Ruby/Tk.
-EOF
-
-$helpTopics["keys"] = <<EOF
-The following accelerator keys are defined for this application\
-(in addition to those already available for the entry windows):
-Ctrl+A:		Add
-Ctrl+C:		Clear
-Ctrl+D:		Delete
-Ctrl+F:		Enter file name
-Ctrl+Q:		Exit application (quit)
-Ctrl+S:		Search (dummy operation)
-EOF
-
-$helpTopics["version"] = <<EOF
-This is version 1.0.1.
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/rolodex-j b/ext/tk/sample/demos-jp/rolodex-j
deleted file mode 100644
index 1c482aafb2..0000000000
--- a/ext/tk/sample/demos-jp/rolodex-j
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# ���Υ�����ץȤ� Tom LaStrange �� rolodex �ΰ����Ǥ���
-# 
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 14:01:54 nagai"
-#
-
-require "tk"
-Tk.encoding = "euc-jp"
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( w.is_a?(TkWindow) )
-      if( TkWinfo.exist?(w) )
-	topic = w
-      end
-    end
-  end
-  
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "���Υȥԥå��ˤĤ��ƤΥإ�פϤޤ����ѤǤ��ޤ���"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"��#{topic}��\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0, "Ω�� ����")
-  $root.frame.entry[2].insert(0, "923-1292 ���")
-  $root.frame.entry[3].insert(0, "ä��Į ���� 1-1")
-  $root.frame.entry[4].insert(0, "��Φ��ü�ʳص�����ر����")
-  $root.frame.entry[5].insert(0,"private")
-  $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"����ϥե�������������������Υ��ߡ��Ǥ���\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"��������Ǥ�����",
-			"default_button"=>0,
-			"buttons"=>["����󥻥�"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","̾��:","����","","","����(����):","����(���):","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,"text" => "���ꥢ��")
-    @add = TkButton.new(self,  "text" => "�ɲ�")
-    @search = TkButton.new(self, "text" => "����")
-    @delete = TkButton.new(self,  "text" => "�õ�")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=> "�ե�����",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "�ɤ߹��� ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "��λ",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=> "�إ��",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=> "����ƥ����ȤˤĤ���",
-		   "command"=>proc{show_help("����ƥ�����")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�إ�פˤĤ���",
-		   "command"=>proc{show_help("�إ��")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "������ɥ��ˤĤ���",
-		   "command"=>proc{show_help("������ɥ�")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�������ˤĤ���",
-		   "command"=>proc{show_help("�������")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�С���������",
-		   "command"=>proc{show_help("�С���������")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=> "���ꥢ��   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=> "�ɲ�   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=> "����   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=> "�õ�   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-����ϡ֥ե�����ץ�˥塼�Ǥ������ɤ߹��ߡפ�ֽ�λ�פʤɤ�
-�Ԥʤ����Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-�ե�������ɤ߹��ߤ�Ԥʤ��Ȥ��˻Ȥ��ޤ���
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-���ץꥱ��������λ����Ȥ��˻Ȥ��ޤ���
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-̾���������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-����������ֹ�������륨��ȥ�Ǥ�������\
-�������ʤ��Ȥ��� private �ȵ������ޤ���
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-��Ҥ������ֹ�������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-FAX�ֹ�������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics["����ƥ�����"] = <<EOF
-Ruby/Tk�Ǥ�grab�ε������ʤ����ᤳ�Υ��ץꥱ�������Ǥ�\
-����ƥ����ȥإ�פϥ��ݡ��Ȥ���Ƥ��ޤ���
-������Ʊ���褦�ʸ��̤�bind�ȥޥ����ΰ��֤�Wedget���Τ�\
-���Ȥ����뤳�Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics["�إ��"] = <<EOF
-�ޥ����򥦥���ɥ��ˤ��碌��F1�����򲡤����Ȥˤ�ä�\
-���Υإ�פ򸫤뤳�Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics["������ɥ�"] = <<EOF
-���Υ�����ɥ��ϥ��ߡ��Ǥ���
-EOF
-
-$helpTopics["�������"] = <<EOF
-Ctrl+A:		�ɲ�
-Ctrl+C:		���ꥢ��
-Ctrl+D:		�õ�
-Ctrl+F:		�ե���������
-Ctrl+Q:		��λ
-Ctrl+S:		����
-EOF
-
-$helpTopics["�С���������"] = <<EOF
-�С������� 1.0.1j �Ǥ���
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/ruler.rb b/ext/tk/sample/demos-jp/ruler.rb
deleted file mode 100644
index d1a7818be4..0000000000
--- a/ext/tk/sample/demos-jp/ruler.rb
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# ruler widget demo (called by 'widget')
-#
-
-# rulerMkTab --
-# This method creates a new triangular polygon in a canvas to
-# represent a tab stop.
-#
-# Arguments:
-# c -		The canvas window.
-# x, y -	Coordinates at which to create the tab stop.
-
-def rulerMkTab(c,x,y)
-  v = $demo_rulerInfo
-  TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
-end
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($ruler_demo) && $ruler_demo
-  $ruler_demo.destroy 
-  $ruler_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$ruler_demo = TkToplevel.new {|w|
-  title("Ruler Demonstration")
-  iconname("ruler")
-  positionWindow(w)
-}
-
-# label ����
-TkLabel.new($ruler_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
-	    'text'=>"���Υ����Х�widget�ϥ롼�顼���Ϸ��Ǥ����롼�顼�α��ˤ���Τϥ��֥��ȥåפΰ�ͤǡ������������ĥ�äƤ��뤳�Ȥˤ�äƥ��֥��ȥåפ��뤳�Ȥ��Ǥ��ޤ����ޤ������Ǥˤ��륿�֥��ȥåפ�ư�������Ȥ�Ǥ��ޤ������֥��ȥåפ�����ޤ��ϲ����ˤ������ɽ�������ޤǥɥ�å�����ȡ��ޥ����ܥ����Υ�������ˤ��Υ��֥��ȥåפϾä��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$ruler_buttons = TkFrame.new($ruler_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $ruler_demo
-      $ruler_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'ruler'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas ����
-$ruler_canvas = TkCanvas.new($ruler_demo, 'width'=>'14.8c', 'height'=>'2.5c')
-$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# ������
-unless Struct.const_defined?("RulerInfo")
-  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y, 
-			       :top, :bottom, :size, :normalStyle, 
-			       :activeStyle, :deleteStyle).new
-end
-$demo_rulerInfo.grid = '.25c'
-$demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.right = TkWinfo.fpixels($ruler_canvas, '13c')
-$demo_rulerInfo.top = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.bottom = TkWinfo.fpixels($ruler_canvas, '1.5c')
-$demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
-$demo_rulerInfo.normalStyle = {'fill'=>'black'}
-if TkWinfo.depth($ruler_canvas) > 1
-  $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'red', 
-    'stipple'=>'@'+[$demo_dir, 'images', 'gray25.bmp'].join(File::Separator)}
-else
-  $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'black', 
-    'stipple'=>'@'+[$demo_dir, 'images', 'gray25.bmp'].join(File::Separator)}
-end
-
-TkcLine.new($ruler_canvas, 
-	    '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
-(0..11).each{|i|
-  x = i+1
-  TkcLine.new($ruler_canvas, "#{x}c", '1c', "#{x}c", '0.6c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.25c", '1c', "#{x}.25c", '0.8c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.5c", '1c', "#{x}.5c", '0.7c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.75c", '1c', "#{x}.75c", '0.8c', 'width'=>1)
-  TkcText.new($ruler_canvas, "#{x}.15c", '0.75c', 'text'=>i, 'anchor'=>'sw')
-}
-
-$rulerTag_well = TkcTag.new($ruler_canvas)
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-		TkcRectangle.new($ruler_canvas, 
-				 '13.2c', '1c', '13.8c', '0.5c', 
-				 'outline'=>'black', 
-				 'fill'=>($ruler_canvas\
-					  .configinfo('background'))[4]) )
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-		rulerMkTab($ruler_canvas, 
-			   TkWinfo.pixels($ruler_canvas, '13.5c'), 
-			   TkWinfo.pixels($ruler_canvas, '.65c') ) )
-
-$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1', 
-		       proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion', 
-		   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
-
-# rulerNewTab --
-# Does all the work of creating a tab stop, including creating the
-# triangle object and adding tags to it to give it tab behavior.
-#
-# Arguments:
-# c -		The canvas window.
-# x, y -	The coordinates of the tab stop.
-
-def rulerNewTab(c,x,y)
-  v = $demo_rulerInfo
-  c.addtag_withtag('active', rulerMkTab(c,x,y))
-  c.addtag_withtag('tab', 'active')
-  v.x = x
-  v.y = y
-  rulerMoveTab(c,x,y)
-end
-
-# rulerSelectTab --
-# This method is invoked when mouse button 1 is pressed over
-# a tab.  It remembers information about the tab so that it can
-# be dragged interactively.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse (identifies the point by
-#		which the tab was picked up for dragging).
-
-def rulerSelectTab(c,x,y)
-  v = $demo_rulerInfo
-  v.x = c.canvasx(x, v.grid)
-  v.y = v.top+2
-  c.addtag_withtag('active', 'current')
-  c.itemconfigure('active', v.activeStyle)
-  c.raise('active')
-end
-
-# rulerMoveTab --
-# This method is invoked during mouse motion events to drag a tab.
-# It adjusts the position of the tab, and changes its appearance if
-# it is about to be dragged out of the ruler.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse.
-
-def rulerMoveTab(c,x,y)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  cx = c.canvasx(x,v.grid)
-  cy = c.canvasy(y)
-  cx = v.left if cx < v.left
-  cx = v.right if cx > v.right
-  if (cy >= v.top && cy <= v.bottom)
-    cy = v.top+2
-    c.itemconfigure('active', v.activeStyle)
-  else
-    cy = cy-v.size-2
-    c.itemconfigure('active', v.deleteStyle)
-  end
-  c.move('active', cx-v.x, cy-v.y)
-  v.x = cx
-  v.y = cy
-end
-
-# rulerReleaseTab --
-# This method is invoked during button release events that end
-# a tab drag operation.  It deselects the tab and deletes the tab if
-# it was dragged out of the ruler.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse.
-
-def rulerReleaseTab(c)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  if v.y != v.top+2
-    c.delete('active')
-  else
-    c.itemconfigure('active', v.normalStyle)
-    c.dtag('active')
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/sayings.rb b/ext/tk/sample/demos-jp/sayings.rb
deleted file mode 100644
index f627396e0f..0000000000
--- a/ext/tk/sample/demos-jp/sayings.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# listbox widget demo 'sayings' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($sayings_demo) && $sayings_demo
-  $sayings_demo.destroy 
-  $sayings_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$sayings_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (well-known sayings)")
-  iconname("sayings")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($sayings_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υꥹ�ȥܥå����ˤϤ��������ʳʸ������äƤ��ޤ����ꥹ�Ȥ򥹥������뤵����Τϥ���������С��Ǥ�Ǥ��ޤ������ꥹ�ȥܥå�������ǥޥ����Υܥ���2(��ܥ���)�򲡤����ޤޥɥ�å����Ƥ�Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($sayings_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $sayings_demo
-      $sayings_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'sayings'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-sayings_lbox = nil
-TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
-  sv = TkScrollbar.new(w)
-  sh = TkScrollbar.new(w, 'orient'=>'horizontal')
-  sayings_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  20
-    height 10
-    yscrollcommand proc{|first,last| sv.set first,last}
-    xscrollcommand proc{|first,last| sh.set first,last}
-  }
-  sv.command(proc{|*args| sayings_lbox.yview(*args)})
-  sh.command(proc{|*args| sayings_lbox.xview(*args)})
-
-  if $tk_version =~ /^4\.[01]/
-    sv.pack('side'=>'right', 'fill'=>'y')
-    sh.pack('side'=>'bottom', 'fill'=>'x')
-    sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
-
-  else
-    sayings_lbox.grid('row'=>0, 'column'=>0, 
-		      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sv.grid('row'=>0, 'column'=>1, 
-	    'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sh.grid('row'=>1, 'column'=>0, 
-	    'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-  end
-
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-sayings_lbox.insert(0,
-"Waste not, want not",
-"Early to bed and early to rise makes a man healthy, wealthy, and wise",
-"Ask not what your country can do for you, ask what you can do for your country",
-"I shall return",
-"NOT",
-"A picture is worth a thousand words",
-"User interfaces are hard to build",
-"Thou shalt not steal",
-"A penny for your thoughts",
-"Fool me once, shame on you;  fool me twice, shame on me",
-"Every cloud has a silver lining",
-"Where there's smoke there's fire",
-"It takes one to know one",
-"Curiosity killed the cat",
-"Take this job and shove it",
-"Up a creek without a paddle",
-"I'm mad as hell and I'm not going to take it any more",
-"An apple a day keeps the doctor away",
-"Don't look a gift horse in the mouth"
-)
-
diff --git a/ext/tk/sample/demos-jp/search.rb b/ext/tk/sample/demos-jp/search.rb
deleted file mode 100644
index 538c607c01..0000000000
--- a/ext/tk/sample/demos-jp/search.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# Text Search widget demo (called by 'widget')
-#
-
-# textLoadFile --
-# This method below loads a file into a text widget, discarding
-# the previous contents of the widget. Tags for the old widget are
-# not affected, however.
-#
-# Arguments:
-# w -		The window into which to load the file.  Must be a
-#		text widget.
-# file -	The name of the file to load.  Must be readable.
-
-def textLoadFile(w,file)
-  w.delete('1.0', 'end')
-  f = open(file, 'r')
-  while(!f.eof?)
-    w.insert('end', f.read(1000))
-  end
-  f.close
-end
-
-# textSearch --
-# Search for all instances of a given string in a text widget and
-# apply a given tag to each instance found.
-#
-# Arguments:
-# w -		The window in which to search.  Must be a text widget.
-# string -	The string to search for.  The search is done using
-#		exact matching only;  no special characters.
-# tag -		Tag to apply to each instance of a matching string.
-
-def textSearch(w, string, tag)
-  tag.remove('0.0', 'end')
-  return if string == ""
-  cur = '1.0'
-  loop {
-    cur, len = w.search_with_length(string, cur, 'end')
-    break if cur == ""
-    tag.add(cur, "#{cur} + #{len} char")
-    cur = w.index("#{cur} + #{len} char")
-  }
-end
-
-# textToggle --
-# This method is invoked repeatedly to invoke two commands at
-# periodic intervals.  It normally reschedules itself after each
-# execution but if an error occurs (e.g. because the window was
-# deleted) then it doesn't reschedule itself.
-#
-# Arguments:
-# cmd1 -	Command to execute when method is called.
-# sleep1 -	Ms to sleep after executing cmd1 before executing cmd2.
-# cmd2 -	Command to execute in the *next* invocation of this method.
-# sleep2 -	Ms to sleep after executing cmd2 before executing cmd1 again.
-
-def textToggle(cmd1,sleep1,cmd2,sleep2)
-  sleep_list = [sleep2, sleep1]
-  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep}, 
-	      -1, cmd1, cmd2).start(sleep1)
-end
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($search_demo) && $search_demo
-  $search_demo.destroy 
-  $search_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$search_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Search and Highlight")
-  iconname("search")
-  positionWindow(w)
-}
-
-# frame ����
-$search_buttons = TkFrame.new($search_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $search_demo
-      $search_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'search'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-TkFrame.new($search_demo) {|f|
-  TkLabel.new(f, 'text'=>'�ե�����̾:', 
-	      'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_fileName = TkVariable.new
-  TkEntry.new(f, 'width'=>40, 
-	      'textvariable'=>$search_fileName) {
-    pack('side'=>'left')
-    bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
-	                $search_string_entry.focus})
-    focus
-  }
-  TkButton.new(f, 'text'=>'�ɤ߹���', 
-	       'command'=>proc{textLoadFile($search_text, 
-					    $search_fileName.value)})\
-  .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-}.pack('side'=>'top', 'fill'=>'x')
-
-TkFrame.new($search_demo) {|f|
-  TkLabel.new(f, 'text'=>'����ʸ����:', 
-	      'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_searchString = TkVariable.new
-  $search_string_entry = TkEntry.new(f, 'width'=>40, 
-				     'textvariable'=>$search_searchString) {
-    pack('side'=>'left')
-    bind('Return', proc{textSearch($search_text, $search_searchString.value, 
-				   $search_Tag)})
-  }
-  TkButton.new(f, 'text'=>'ȿž', 
-	       'command'=>proc{textSearch($search_text, 
-					  $search_searchString.value, 
-					  $search_Tag)}) {
-    pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-  }
-}.pack('side'=>'top', 'fill'=>'x')
-
-$search_text = TkText.new($search_demo, 'setgrid'=>true) {|t|
-  $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new($search_demo, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
-    t.yscrollcommand(proc{|first,last| sc.set first,last})
-    pack('side'=>'right', 'fill'=>'y')
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-}  
-
-# Set up display styles for text highlighting.
-
-if TkWinfo.depth($search_demo) > 1
-  textToggle(proc{
-	       begin
-		 $search_Tag.configure('background'=>'#ce5555', 
-				       'foreground'=>'white')
-	       rescue
-	       end
-	     },
-	     800, 
-	     proc{
-	       begin
-		 $search_Tag.configure('background'=>'', 'foreground'=>'')
-	       rescue
-	       end
-	     },
-	     200 )
-else
-  textToggle(proc{
-	       begin
-		 $search_Tag.configure('background'=>'black', 
-				       'foreground'=>'white')
-	       rescue
-	       end
-	     },
-	     800, 
-	     proc{
-	       begin
-		 $search_Tag.configure('background'=>'', 'foreground'=>'')
-	       rescue
-	       end
-	     },
-	     200 )
-end
-$search_text.insert('1.0', '\
-���Υ�����ɥ��ϸ���������¸�����Τ˥ƥ����� widget �Υ�����ǽ���ɤ�
-�褦�˻Ȥ���Τ���ǥ⤹���ΤǤ����ޤ���Υ���ȥ�˥ե�����̾����
-�졢<�꥿����> �򲡤����֥����ɡץܥ���򲡤��Ƥ������������ˤ��β���
-����ȥ��ʸ��������Ϥ���<�꥿����> �򲡤�����ȿž�ץܥ���򲡤��Ƥ�
-������������ȥե�������Ρ�����ʸ����Ȱ��פ�����ʬ������ "search_Tag"
-�Ȥ����������Ĥ���졢������ɽ��°���Ȥ��Ƥ���ʸ�������Ǥ���褦��
-���ꤵ��ޤ���')
-$search_text.set_insert '0.0'
-
-$search_fileName.value = ''
-$search_searchString.value = ''
-
diff --git a/ext/tk/sample/demos-jp/spin.rb b/ext/tk/sample/demos-jp/spin.rb
deleted file mode 100644
index 4f6edc13c0..0000000000
--- a/ext/tk/sample/demos-jp/spin.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# spin.rb --
-#
-# This demonstration script creates several spinbox widgets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($spin_demo) && $spin_demo
-  $spin_demo.destroy 
-  $spin_demo = nil
-end
-
-$spin_demo = TkToplevel.new {|w|
-  title("Spinbox Demonstration")
-  iconname("spin")
-  positionWindow(w)
-}
-
-TkLabel.new($spin_demo, 
-	    :font=>$font, :wraplength=>'5i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-���ˤϣ�����Υ��ԥ�ܥå�����ɽ������Ƥ��ޤ���\
-���줾�졢�ޥ��������򤷤�ʸ�������Ϥ��뤳�Ȥ��Ǥ��ޤ���
-�Խ����Ȥ��Ƥϡ�Emacs ������¿���˲ä��ơ�����Ū��
-Motif �����Υ��������ݡ��Ȥ���Ƥ��ޤ������Ȥ��С�
-Backspace �� Control-h �Ȥ����ϥ�������κ�¦��ʸ����
-�������Delete �� Control-d �Ȥϱ�¦��ʸ���������ޤ���
-�����Ȥ�Ĺ����ۤ���褦��Ĺ��ʸ��������Ϥ������ˤϡ�
-�ޥ����Υܥ��󣲤򲡤��ƥɥ�å����뤳�Ȥǡ�����ʸ����
-�򥹥���󤹤뤳�Ȥ���ǽ�Ǥ���
-�ʤ����ǽ�Υ��ԥ�ܥå����ϡ������ͤȤߤʤ����褦��
-ʸ���󤷤����Ϥ�������ʤ����Ȥ����դ��Ƥ����������ޤ���
-�����ܤΥ��ԥ�ܥå������������˸����Τϥ������ȥ�
-�ꥢ���Ի�̾�Υꥹ�ȤȤʤäƤ��ޤ���
-�⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤
-�֥�꤬ spinbox ���������åȤ�������Ƥ��ʤ���硢����
-�ǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ������ξ��ˤ� spinbox ����
-�����åȤ���������Ƥ���褦�ʤ�꿷�����С������� Tk 
-���Ȥ߹�碌�ƻ�褦�ˤ��Ƥ���������
-EOL
-
-TkFrame.new($spin_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'λ��', :width=>15, :command=>proc{
-		 $spin_demo.destroy
-		 $spin_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-		 showCode 'spin'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-australianCities = [
-    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 
-    'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
-]
-
-[
-  TkSpinbox.new($spin_demo, :from=>1, :to=>10, :width=>10, :validate=>:key, 
-		:validatecommand=>[
-		  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-		]), 
-  TkSpinbox.new($spin_demo, :from=>0, :to=>3, :increment=>0.5, 
-		:format=>'%05.2f', :width=>10), 
-  TkSpinbox.new($spin_demo, :values=>australianCities, :width=>10)
-].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-jp/square b/ext/tk/sample/demos-jp/square
deleted file mode 100644
index 00bfde59ff..0000000000
--- a/ext/tk/sample/demos-jp/square
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-
-# square --
-# This script generates a demo application containing only 
-# a "square" widget.  It's only usable if Tk has been compiled 
-# with tkSquare.c and with the -DSQUARE_DEMO compiler switch. 
-# This demo arranges the following bindings for the widget: 
-#
-# Button-1 press/drag:          moves square to mouse
-# "a":                          toggle size animation on/off
-#
-
-require 'tk'
-require 'tkafter'
-
-class TkSquare<TkWindow
-  def create_self
-    begin
-      tk_call 'square', path
-    rescue
-      STDERR.print "\nSorry. Your Tk interpreter does not contain " +
-	'a "square" demonstration widget.' + 
-	"\n ( See documents included the Tcl/Tk source archive. )\n\n"
-      exit
-    end
-  end
-  def size(amount=nil)
-    if amount
-      tk_send 'size', amount
-    else
-      number(tk_send('size'))
-    end
-  end
-  def position(x,y)
-    tk_send 'position', x, y
-  end
-end
-
-$s = TkSquare.new{
-  pack('expand'=>'yes', 'fill'=>'both')
-  bind('1', proc{|x,y| center(x,y)}, '%s %y')
-  bind('B1-Motion', proc{|x,y| center(x,y)}, '%s %y')
-  bind('a', proc{animate})
-  focus
-}
-TkRoot.new.minsize(1,1)
-
-# The procedure below centers the square on a given position.
-
-def center(x,y)
-  a = $s.size
-  $s.position(x-(a/2), y-(a/2))
-end
-
-# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger, 
-# and so on.
-
-$inc = 0
-
-def timer_proc
-  a = $s.size
-  return if $inc == 0
-  $inc = -3 if a >= 40
-  $inc =  3 if a <= 10
-  $s.size(a+$inc)
-end
-
-$timer = TkAfter.new(30, -1, proc{timer_proc})
-
-def animate
-  if $inc == 0
-    $inc = 3
-    $timer.start
-  else
-    $inc = 0
-    $timer.stop
-  end
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/states.rb b/ext/tk/sample/demos-jp/states.rb
deleted file mode 100644
index cf8a6768b6..0000000000
--- a/ext/tk/sample/demos-jp/states.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# listbox widget demo 'states' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($states_demo) && $states_demo
-  $states_demo.destroy 
-  $states_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$states_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (states)")
-  iconname("states")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($states_demo) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ���Τ���ƻ�ܸ�̾�����ä�����������С��դΥꥹ�ȥܥå����Ǥ����ꥹ�Ȥ򥹥������뤵����Τϥ���������С��Ǥ�Ǥ��ޤ������ꥹ�ȥܥå�������ǥޥ����Υܥ���2(��ܥ���)�򲡤����ޤޥɥ�å����Ƥ�Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new($states_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $states_demo
-      $states_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'states'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-states_lbox = nil
-TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
-  s = TkScrollbar.new(w)
-  states_lbox = TkListbox.new(w) {
-    setgrid 1
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| states_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  states_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-ins_data = [
-  '����','�Ŀ�','����','����','���','���','��ɲ',
-  '��ʬ','���','����','����','����','������','������',
-  '����','����','����','����','����','���','����',
-  '����','�Ų�','�纬','����','���','����','����',
-  'Ļ��','�ٻ�','Ĺ��','Ĺ��','����','����','ʼ��',
-  '����','ʡ��','ʡ��','ʡ��','�̳�ƻ','����','�ܾ�',
-  '�ܺ�','����','����','����','�²λ�'
-]
-
-states_lbox.insert(0, *ins_data)
-
diff --git a/ext/tk/sample/demos-jp/style.rb b/ext/tk/sample/demos-jp/style.rb
deleted file mode 100644
index d58c6115ae..0000000000
--- a/ext/tk/sample/demos-jp/style.rb
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-# text (display styles) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($style_demo) && $style_demo
-  $style_demo.destroy 
-  $style_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$style_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Display Styles")
-  iconname("style")
-  positionWindow(w)
-}
-
-# frame ����
-TkFrame.new($style_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $style_demo
-      $style_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'style'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text ����
-TkText.new($style_demo){|t|
-  # ����
-  setgrid 'true'
-  width  70
-  height 32
-  wrap 'word'
-  TkScrollbar.new($style_demo) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # �ƥ����ȥ������� (�ե���ȴ�Ϣ)
-  style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-  style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-    style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-###
-#  case($tk_version)
-#  when /^4.*/
-#    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-#  when /^8.*/
-#    unless $style_demo_do_first
-#      $style_demo_do_first = true
-#      Tk.tk_call('font', 'create', '@bigascii', 
-#		 '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-#      Tk.tk_call('font', 'create', '@smallascii', 
-#		 '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-#      Tk.tk_call('font', 'create', '@cBigFont', 
-#		 '-compound', '@bigascii @msg_knj')
-#      Tk.tk_call('font', 'create', '@cSmallFont', 
-#		 '-compound', '@smallascii @kanji')
-#    end
-#    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
-#  end
-
-  # �ƥ����ȥ������� (������꡼�մ�Ϣ)
-  if TkWinfo.depth($root).to_i > 1
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
-    style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
-    style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
-  else
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'black', 
-				     'foreground'=>'white')
-    style_tag_color2 = TkTextTag.new(t, 'background'=>'black', 
-				     'foreground'=>'white')
-    style_tag_raised = TkTextTag.new(t, 'background'=>'white', 
-				     'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'background'=>'white', 
-				     'relief'=>'sunken', 'borderwidth'=>1)
-  end
-
-  # �ƥ����ȥ������� (����¾)
-  if $tk_version =~ /^4\.[01]/
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-					'borderwidth'=>0, 
-					'bgstipple'=>'gray25')
-  else
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
-					'borderwidth'=>0, 
-					'bgstipple'=>'gray12')
-  end
-  style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
-  style_tag_underline = TkTextTag.new(t, 'underline'=>'on')
-  style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
-  style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
-  style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
-				    'rmargin'=>'10m')
-  style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
-				    'lmargin1'=>'12m', 'lmargin2'=>'6m',
-				    'rmargin'=>'10m')
-
-  # �ƥ���������
-  insert('end', '���Τ褦�˥ƥ����� widget �Ͼ�����͡��ʥ��������ɽ�����뤳��
-���Ǥ��ޤ���')
-  insert('end', '����', style_tag_big)
-  insert('end', '�Ȥ����ᥫ�˥���ǥ���ȥ����뤵��ޤ���
-�����Ȥϥƥ����� widget ��Τ���ʸ�� (���ϰ�)���Ф���Ŭ�ѤǤ���
-ñ�ʤ�̾���Τ��ȤǤ����������͡���ɽ���������������Ǥ��ޤ���
-���ꤹ��ȡ����Υ����ΤĤ���ʸ���ϻ��ꤷ�����������ɽ�������
-�褦�ˤʤ�ޤ������ѤǤ���ɽ����������ϼ����̤�Ǥ���
-')
-  insert('end', '
-1. �ե����', style_tag_big)
-  insert('end', '    �ɤ�� X �Υե���ȤǤ�Ȥ��ޤ���')
-  insert('end', 'large', style_tag_verybig)
-  insert('end', '
-�Ȥ�')
-#  insert('end', '������', style_tag_small)
-  insert('end', 'small', style_tag_small)
-  insert('end', '�Ȥ���
-')
-  insert('end', '
-2. ��', style_tag_big)
-  insert('end', '  ')
-  insert('end', '�طʿ�', style_tag_color1)
-  insert('end', '��')
-  insert('end', '���ʿ�', style_tag_color2)
-  insert('end', '��')
-  insert('end', 'ξ��', style_tag_color1, style_tag_color2)
-  insert('end', '�Ȥ��Ѥ��뤳�Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-3. �֤���', style_tag_big)
-  insert('end', '  ���Τ褦������κݤ�')
-  insert('end', '�طʤ�', style_tag_bgstipple)
-  insert('end', 'ʸ����', style_tag_fgstipple)
-  insert('end', 'ñ�ʤ��ɤ�Ĥ֤�
-�Ǥʤ����֤�����Ȥ����Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-4. ����', style_tag_big)
-  insert('end', '  ���Τ褦��')
-  insert('end', 'ʸ���˲��������', style_tag_underline)
-  insert('end', '���Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-5. �Ǥ��ä���', style_tag_big)
-  insert('end', '  ���Τ褦��')
-  insert('end', 'ʸ���˽Ťͤ��������', style_tag_overstrike)
-  insert('end', '���Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-6. 3D ����', style_tag_big)
-  insert('end', '  �طʤ��Ȥ�Ĥ��ơ�ʸ����')
-  insert('end', '���ӽФ�', style_tag_raised)
-  insert('end', '�褦�ˤ�����')
-  insert('end', '����', style_tag_sunken)
-  insert('end', '
-�褦�ˤǤ��ޤ���
-')
-  insert('end', '
-7. ��·��', style_tag_big)
-  insert('end', ' ���Τ褦�˹Ԥ�
-')
-  insert('end', '����·������
-')
-  insert('end', '����·������
-', style_tag_right)
-  insert('end', '�����·������Ǥ��ޤ���
-', style_tag_center)
-  insert('end', '
-8. ���դ�ʸ����ź��', style_tag_big)
-  insert('end', '  10')
-  insert('end', 'n', style_tag_super)
-  insert('end', ' �Τ褦�˸��դ�ʸ���θ��̤䡢')
-  insert('end', '
-X')
-  insert('end', 'i', style_tag_sub)
-  insert('end', '�Τ褦��ź���θ��̤�Ф����Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-9. �ޡ�����', style_tag_big)
-  insert('end', '�ƥ����Ȥκ�¦��;ʬ�ʶ�����֤����Ȥ��Ǥ��ޤ�:
-')
-  insert('end', '��������ϥޡ�����λ�����Ǥ��������꡼��', 
-	 style_tag_margins)
-  insert('end', '����ޤ��֤����ɽ������Ƥ���1�ԤΥƥ����ȤǤ���', 
-	 style_tag_margins)
-  insert('end', '��¦�ˤ�2����Υޡ����������ޤ���', style_tag_margins)
-  insert('end', '1���ܤ��Ф����Τȡ�', style_tag_margins)
-  insert('end', '2���ܰʹߤ�Ϣ³�����ޡ�����', style_tag_margins)
-  insert('end', '�Ǥ����ޤ���¦�ˤ�ޡ����󤬤���ޤ���', style_tag_margins)
-  insert('end', '�Ԥ��ޤ��֤����֤���뤿��˻��Ѥ��뤳�Ȥ��Ǥ��ޤ���
-', style_tag_margins)
-  insert('end', '
-10. ���ڡ�����', style_tag_big)
-  insert('end', '3�ĤΥѥ�᡼���ǹԤΥ��ڡ����󥰤�')
-  insert('end', '���椹
-�뤳�Ȥ��Ǥ��ޤ���Spacing1�ǡ��Ԥ�')
-  insert('end', '��ˤɤΤ��餤�ζ��֤��֤�����
-spacing3')
-  insert('end', '�ǹԤβ��ˤɤΤ��餤�ζ��֤��֤�����')
-  insert('end', '�Ԥ��ޤ��֤���Ƥ���ʤ�
-�С�spacing2�ǡ�')
-  insert('end', '�ƥ����ȹԤ��������Ƥ���Ԥδ֤ˤɤΤ��餤')
-  insert('end', '�ζ��֤���
-�����򼨤��ޤ���
-')
-  insert('end', '�����Υ���ǥ�Ȥ��줿����ϤɤΤ褦��', 
-	 style_tag_spacing)
-  insert('end', '���ڡ����󥰤����Ԥ���Τ��򼨤��ޤ���', 
-	 style_tag_spacing)
-  insert('end', '������ϼºݤϥƥ�����widget', style_tag_spacing)
-  insert('end', '��1�Ԥǡ�widget�ˤ�ä��ޤ���ޤ�Ƥ��ޤ���
-', style_tag_spacing)
-  insert('end', 'Spacing1�Ϥ��Υƥ����ȤǤ�10point��', style_tag_spacing)
-  insert('end', '���ꤵ��Ƥ��ޤ���', style_tag_spacing)
-  insert('end', '����ˤ�ꡢ����δ֤��礭�ʴֳ֤�', style_tag_spacing)
-  insert('end', '¸�ߤ��Ƥ��ޤ���', style_tag_spacing)
-  insert('end', 'Spacing2��2point�����ꤵ��Ƥ��ޤ���', style_tag_spacing)
-  insert('end', '������������ˤۤ�ξ����ֳ֤�¸�ߤ��Ƥ��ޤ���', 
-	 style_tag_spacing)
-  insert('end', 'Spacing3�Ϥ�����Ǥϻ��Ѥ���Ƥ��ޤ���
-', style_tag_spacing)
-  insert('end', '�ֳ֤��ɤ��ˤ��뤫�򸫤�����С������������', 
-	 style_tag_spacing)
-  insert('end', '�ʤ��ǥƥ����Ȥ����򤷤Ƥ��������������', style_tag_spacing)
-  insert('end', 'ȿž������ʬ�ˤ�;ʬ�ˤȤ�줿�ֳ֤�', style_tag_spacing)
-  insert('end', '�ޤޤ�Ƥ��ޤ���
-', style_tag_spacing)
-
-}
-
diff --git a/ext/tk/sample/demos-jp/tcolor b/ext/tk/sample/demos-jp/tcolor
deleted file mode 100644
index 391ce4c446..0000000000
--- a/ext/tk/sample/demos-jp/tcolor
+++ /dev/null
@@ -1,519 +0,0 @@
-#!/usr/bin/env ruby
-#
-# tcolor --
-# ���Υ�����ץȤ�RGB,HSB,CYM�����򥵥ݡ��Ȥ���
-# �ʰץ��顼���ǥ����Ǥ���
-#
-# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
-# last update: Thu Jun 18 06:32:35 JST 1998
-#
-
-# �ޤ���tk.rb���ɤ߹��ࡣ
-
-require "tk"
-
-
-# Tk�ˤ�ä��ѹ�������ѿ���TkVariable�Υ��󥹥��󥹤�Ȥ���
-
-$colorSpace = TkVariable.new(:rgb)
-$red = 65535
-$green = 0
-$blue = 0
-$color = "#ffff00000000"
-$updating = TkVariable.new(0)
-$autoUpdate = TkVariable.new(1)
-$name = TkVariable.new("")
-# $command = TkVariable.new("print(%%,\"\n\")")
-$command = TkVariable.new("")
-$label1 = TkVariable.new("label1")
-$label2 = TkVariable.new("label2")
-$label3 = TkVariable.new("label3")
-
-
-# �꥽�����ǡ����١���������
-if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
-  TkOptionDB.add('*Entry.background', 'white')
-end
-
-
-# �ƥ��٥���ѤΥ᥽�å�
-
-def rgbToHsv(red,green,blue)
-
-  if ( red > green )
-    max = red
-    min = green
-  else
-    max = green
-    min = red
-  end
-
-  if ( blue > max )
-    max = blue
-  else
-    if ( blue < min )
-      min = blue
-    end
-  end
-
-  range = max - min
-
-  if ( max == 0 )
-    sat = 0.0
-  else
-    sat = (max-min)/max
-  end
-
-  if ( sat == 0 )
-    hue = 0.0
-  else
-    rc = (max-red)/range
-    gc = (max-green)/range
-    bc = (max-blue)/range
-    if ( red == max )
-      hue = 0.166667 * (bc - gc)
-    else
-      if ( green == max )
-	hue = 0.166667 * (2.0 + rc - bc)
-      else
-	hue = 0.166667 * (4.0 + gc - rc)
-      end
-    end
-    if ( hue < 0.0 )
-      hue = hue + 1.0
-    end
-  end
-
-  [hue,sat,max/65535]
-end
-
-
-def hsbToRgb(hue,sat,value)
-  v = 65535.0 * value
-  if( sat == 0 )
-    ans = [v,v,v]
-  else
-    hue = hue*6.0
-    if ( hue >= 6 )
-      hue = 0.0
-    end
-    i = hue.to_i
-    f = hue - i
-    p = 65535.0 * value * (1.0 - sat)
-    q = 65535.0 * value * (1.0 - (sat * f))
-    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
-    case i
-    when 0
-      ans = [v,t,p]
-    when 1
-      ans = [q,v,p]
-    when 2
-      ans = [p,v,t]
-    when 3
-      ans = [p,q,v]
-    when 4
-      ans = [t,p,v]
-    when 5
-      ans = [v,p,q]
-    else
-      raise(eException,"i value #{i} is out of range")
-    end
-  end
-  return ans
-end
-
-
-def doUpdate 
-  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
-  eval(newCmd)
-end
-
-
-def tc_scaleChanged
-  if( $updating.to_i == 1 )
-    return 
-  end
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    $red = (scale1.get * 65.535).to_i
-    $green = (scale2.get * 65.535).to_i
-    $blue = (scale3.get * 65.535).to_i
-  when :cmy
-    $red = (65535 - scale1.get * 65.535).to_i
-    $green = (65535 - scale2.get * 65.535).to_i
-    $blue = (65535 - scale3.get * 65.535).to_i        
-  when :hsb
-    list = hsbToRgb(scale1.get / 1000.0,
-		    scale2.get / 1000.0,
-		    scale3.get / 1000.0)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
-  $root.middle.right.set_color($color)
-  if( $autoUpdate.to_i == 1 )
-    doUpdate
-  end
-  Tk.update(TRUE)
-end
-
-
-def tc_setScales
-  $updating.value = 1
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-  
-  case $colorSpace.value.intern
-  when :rgb
-    scale1.set($red / 65.535)
-    scale2.set($green / 65.535)
-    scale3.set($blue / 65.535)
-  when :cmy
-    scale1.set((65535 - $red) / 65.535)
-    scale2.set((65535 - $green) / 65.535)
-    scale3.set((65535 - $blue) / 65.535)
-  when :hsb
-    list = rgbToHsv($red,$green,$blue)
-    scale1.set( list[0] * 1000.0 )
-    scale2.set( list[1] * 1000.0 )
-    scale3.set( list[2] * 1000.0 )
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-
-  $updating.value = 0
-end
-
-
-def tc_loadNamedColor(name)
-  if name[0,1] != "#" 
-    list = TkWinfo.rgb($root.middle.right.swatch,name)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    case name.length
-    when 4
-      format = /#(.{1})(.{1})(.{1})/
-      shift = 12
-    when 7
-      format = /#(.{2})(.{2})(.{2})/
-      shift = 8
-    when 10
-      format = /#(.{3})(.{3})(.{3})/
-      shift = 4
-    when 13
-      format = /#(.{4})(.{4})(.{4})/
-      shift = 0
-    else
-      raise(eException,"syntax error in color name \"#{name}\"")
-    end
-    name.scan(format){|strlist|
-      if strlist.length != 3
-	raise(eException,"syntax error in color name \"#{name}\"")
-      end
-      $red = strlist[0].to_i
-      $green = strlist[1].to_i
-      $blue = strlist[2].to_i
-    }
-    $red = $red << shift
-    $green = $green << shift
-    $blue = $blue << shift
-  end
-  
-  tc_setScales
-  $color = format("#%04x%04x%04x",$red,$green,$blue)
-  $root.middle.right.set_color($color)
-  if $autoUpdate.to_i == 1
-    doUpdate
-  end
-end
-
-
-def changeColorSpace(space)
-  case space
-  when :rgb
-    $label1.value = "Red"
-    $label2.value = "Green"
-    $label3.value = "Blue"
-  when :cmy
-    $label1.value = "Cyan"
-    $label2.value = "Magenta"
-    $label3.value = "Yellow"
-  when :hsb
-    $label1.value = "Hue"
-    $label2.value = "Saturation"
-    $label3.value = "Brightness"
-  end
-  tc_setScales
-end
-
-
-
-
-
-# tcolor�ѤΥ�˥塼
-
-class TkColorMenuFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=>"raised",
-	  "borderwidth"=>"2")
-
-    # File��˥塼�ܥ��������
-    @file = TkMenubutton.new(self){|button|
-
-      # File��˥塼�κ���
-      @file_menu = TkMenu.new(button){
-	add "radio",
-	  "label" => "RGB color space",
-	  "variable" => $colorSpace,
-	  "value" => :rgb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:rgb)}
-	add "radio",
-	  "label" => "CMY color space",
-	  "variable" => $colorSpace,
-	  "value" => :cmy,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:cmy)}
-	add "radio",
-	  "label" => "HSB color space",
-	  "variable" => $colorSpace,
-	  "value" => :hsb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:hsb)}
-	add "separator"
-	add "radio",
-	  "label" => "Automatic updates",
-	  "variable" => $autoUpdate,
-	  "value" => "1",
-	  "underline" => "0"
-	add "radio",
-	  "label" => "Manual updates",
-	  "variable" => $autoUpdate,
-	  "value" => "0",
-	  "underline" => "0"
-	add "separator"
-	add "command",
-	  "label" => "Exit program",
-	  "underline" => "0",
-	  "command" => proc{exit}
-      }
-      
-      # File��˥塼��File�ܥ�����Ϣ�դ���
-      menu @file_menu
-
-      text "File"
-      underline "0"
-    }.pack("side"=>"left")
-
-    self
-  end
-end
-
-
-# �����Υե졼��Τ���Υ��饹
-class TkColorBotFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> 2)
-
-    @commandLabel = TkLabel.new(self,
-				"text"=> "Command:")
-    @command = TkEntry.new(self,
-			   "relief"=> "sunken",
-			   "borderwidth"=> "2",
-			   "textvariable"=> $command,
-			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @update = TkButton.new(self,
-			   "text"=> "Update",
-			   "command"=> proc{doUpdate})
-    @commandLabel.pack("side"=>"left")
-    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
-    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
-
-    self
-  end
-end    
-
-
-# ���ʺ��Υե졼��
-class TkColorMiddleLeftFrame<TkFrame
-  def initialize(parent)
-    super(parent)
-
-    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
-	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
-	"/usr/openwin/lib/X11/rgb.txt"]
-      if !File.readable?(i)
-	next
-      end
-      f = File.open(i)
-      @scroll = TkScrollbar.new(self,
-				"orient"=>"vertical",
-				"relief"=>"sunken",
-				"borderwidth"=>"2")
-      @scroll.pack("side"=>"right","fill"=>"y")
-      @names = TkListbox.new(self,
-			     "width"=>"20",
-			     "height"=>"12",
-			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
-			     "relief"=>"sunken",
-			     "borderwidth"=>"2",
-			     "exportselection"=>"false")
-      @scroll.command(proc{|*args| @names.yview(*args)})
-      @names.bind("Double-1",proc{
-		    tc_loadNamedColor(@names.get(@names.curselection))})
-      @names.pack("side"=>"left")
-      while (line = f.gets)
-	line.chop!
-	linelist = line.split(/[ \t]+/)
-	if linelist.length == 4
-	  @names.insert("end",linelist[3])
-	end
-      end
-      f.close
-      break
-    end
-
-    self
-  end
-end
-
-
-# ��������Υե졼��
-class TkColorMiddleMiddleFrame<TkFrame
-  # @scale1,@scale2,@scale3�������黲�ȤΤߵ��Ĥ��롣(�ѹ��Բ�)
-  attr_reader :scale1, :scale2, :scale3
-
-  def initialize(parent)
-    super(parent)
-
-    @f1 = TkFrame.new(self)
-    @f2 = TkFrame.new(self)
-    @f3 = TkFrame.new(self)
-    @f4 = TkFrame.new(self)
-
-    for f in [@f1,@f2,@f3]
-      f.pack("side"=>"top","expand"=>"yes")
-    end
-    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
-
-    @label1 = TkLabel.new(self,"textvariable"=>$label1)
-    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale1.pack("side"=>"top","anchor"=>"w")
-    @label1.pack("side"=>"top","anchor"=>"w")
-
-    @label2 = TkLabel.new(self,"textvariable"=>$label2)
-    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale2.pack("side"=>"top","anchor"=>"w")
-    @label2.pack("side"=>"top","anchor"=>"w")
-
-    @label3 = TkLabel.new(self,"textvariable"=>$label3)
-    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale3.pack("side"=>"top","anchor"=>"w")
-    @label3.pack("side"=>"top","anchor"=>"w")
-
-    @nameLabel = TkLabel.new(self,"text"=>"Name:")
-    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
-			"textvariable"=>$name,"width"=>"10",
-			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @nameLabel.pack("side"=>"left")
-    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
-    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
-
-    self
-  end
-end
-
-
-class TkColorMiddleRightFrame<TkFrame
-  attr_reader :swatch
-
-  def initialize(parent)
-    super(parent)
-    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
-			  "background"=>$color)
-    @value = TkLabel.new(self, 
-			 "text"=>$color,
-			 "width"=>"13",
-			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
-    @value.pack("side"=>"bottom","pady"=>".25c")
-
-    self
-  end
-
-  def set_color(color)
-    @swatch["background"] = color
-    @value["text"] = color
-  end
-end
-
-
-
-# ���ʤΥե졼��
-class TkColorMiddleFrame<TkFrame
-  attr_reader :left, :middle, :right
-
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> "2")
-
-    @left = TkColorMiddleLeftFrame.new(self)
-    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
-
-    @middle = TkColorMiddleMiddleFrame.new(self)
-    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
-
-    @right = TkColorMiddleRightFrame.new(self)
-    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
-
-    self
-  end
-end
-
-
-class TkColor<TkRoot
-  attr_reader :menu, :bottom, :middle
-
-  def initialize(*args)
-    super(*args)
-    @menu = TkColorMenuFrame.new(self)
-    @menu.pack("side"=>"top", "fill"=>"x")
-
-    @bottom = TkColorBotFrame.new(self)
-    @bottom.pack("side"=>"bottom","fill"=>"x")
-
-    @middle = TkColorMiddleFrame.new(self)
-    @middle.pack("side"=>"top","fill"=>"both")
-
-    self
-  end
-end
-
-
-$root = TkColor.new
-
-# ���٥�Ȥ��Ԥİ٤˥롼�פ����롣
-changeColorSpace :rgb
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/text.rb b/ext/tk/sample/demos-jp/text.rb
deleted file mode 100644
index 179589d820..0000000000
--- a/ext/tk/sample/demos-jp/text.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# text (basic facilities) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($text_demo) && $text_demo
-  $text_demo.destroy 
-  $text_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$text_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Basic Facilities")
-  iconname("text")
-  positionWindow(w)
-}
-
-# version check
-if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
-  undo_support = false
-else
-  undo_support = true
-end
-
-# frame ����
-TkFrame.new($text_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $text_demo
-      $text_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'text'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text ����
-TkText.new($text_demo){|t|
-  # ����
-  relief 'sunken'
-  bd 2
-  setgrid 1
-  height 30
-  TkScrollbar.new($text_demo) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # �ƥ���������
-  insert('0.0', <<EOT)
-���Υ�����ɥ��ϥƥ����� widget �Ǥ���1�Ԥޤ��Ϥ���ʾ�Υƥ����Ȥ�ɽ
-�����Խ����뤳�Ȥ��Ǥ��ޤ����ʲ��ϥƥ����� widget �ǤǤ������ˤĤ���
-�ޤȤ᤿��ΤǤ���
-
-1. ���������롣����������С��ǥƥ����Ȥ�ɽ����ʬ��ư�������Ȥ��Ǥ��ޤ���
-
-2. ������˥󥰡��ƥ����ȤΥ�����ɥ��ǥޥ����ܥ���2 (��ܥ����) ��
-���ƾ岼�˥ɥ�å����Ƥ�����������������ȥƥ����Ȥ���®�ǥɥ�å����졢
-���Ƥ򤶤ä�į��뤳�Ȥ��Ǥ��ޤ���
-
-3. �ƥ����Ȥ��������ޥ����ܥ���1 (���ܥ���) �򲡤���������������򥻥�
-�Ȥ��Ƥ���ƥ����Ȥ����Ϥ��Ƥ������������Ϥ�����Τ� widget ������ޤ���
-
-4. ���򡣤����ϰϤ�ʸ�������򤹤�ˤϥޥ����ܥ���1 �򲡤����ɥ�å���
-�Ƥ������������٥ܥ����Υ�����顢���եȥ����򲡤��ʤ���ܥ���1 �򲡤�
-���Ȥ������ϰϤ�Ĵ�����Ǥ��ޤ�������������ϰϤκǸ��ޥ������������
-�Ǥ�ᤤ���֤˥ꥻ�åȤ����ܥ����Υ�����˥ޥ�����ɥ�å����뤳�ȤǤ�
-��������ϰϤ�Ĵ���Ǥ��ޤ������֥륯��å��ǥ�ɤ򡢤ޤ��ȥ�ץ륯���
-���ǹ����Τ����򤹤뤳�Ȥ��Ǥ��ޤ���
-
-5. �õ���ִ����ƥ����Ȥ�õ��ˤϡ��õ����ʸ�������򤷤ƥХå�
-���ڡ������ǥ꡼�ȥ��������Ϥ��Ƥ������������뤤�ϡ��������ƥ����Ȥ�
-���Ϥ�������򤵤줿�ƥ����Ȥ��ִ�����ޤ���
-
-6. ������ʬ�Υ��ԡ���������ʬ�򤳤Υ�����ɥ�����Τɤ����˥��ԡ�����
-�ˤϡ��ޤ����ԡ��������������(�����ǡ����뤤���̤Υ��ץꥱ��������)
-�����ܥ��� 2 �򥯥�å����ơ�������������ΰ��֤˥��ԡ����Ƥ���������
-
-7. �Խ����ƥ����� widget �� Emacs �Υ����Х���ɤ˲ä���ɸ��Ū�ʤ� Motif
-���Խ���ǽ�򥵥ݡ��Ȥ��Ƥ��ޤ����Хå����ڡ����ȥ���ȥ�����-H ������
-��������κ�¦��ʸ���������ޤ����ǥ꡼�ȥ����ȥ���ȥ�����-D ������
-��������α�¦��ʸ���������ޤ���Meta-�Хå����ڡ������������������
-��¦��ñ���������Meta-D ��������������κ�¦��ñ��������ޤ���
-����ȥ�����-K �������������뤫������ޤǤ����������ΰ��֤˲���
-�����ʤ��ä����ϡ����Ԥ������ޤ���#{
-      if undo_support
-	undo_text = "Control-z �ϺǸ�˹Ԥä��ѹ��μ��ä�(undo)��Ԥ���"
-	case $tk_platform['platform']
-	when "unix", "macintosh"
-	  undo_text << "Control-Shift-z"
-	else # 'windows'
-	  undo_text << "Control-y"
-	end
-	undo_text << "��undo�����ѹ��κ�Ŭ��(redo)��Ԥ��ޤ���"
-      else
-	""
-      end
-}
-
-
-8. ������ɥ��Υꥵ���������� widget �� "setGrid" ���ץ����򥪥�ˤ�
-�Ƥ���ޤ��Τǡ�������ɥ���ꥵ����������ˤϹ⤵�����Ͼ��ʸ�����ʸ
-�����������ܤˤʤ�ޤ����ޤ���������ɥ��򶹤��������ˤ�Ĺ���Ԥ���ư
-Ū���ޤ��֤��졢������Ƥ����Ƥ�������褦�ˤʤäƤ��ޤ���
-EOT
-
-  set_insert('0.0')
-}
-
diff --git a/ext/tk/sample/demos-jp/timer b/ext/tk/sample/demos-jp/timer
deleted file mode 100644
index 58a41d00c0..0000000000
--- a/ext/tk/sample/demos-jp/timer
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-#
-# timer --
-# This script generates a counter with start,stop and reset buttons.
-#
-# Copyright (C) 1998 Takaaki Tateishi (ttate@jaist.ac.jp)
-# last update: Sat Jun 27 12:24:14 JST 1998
-#
-
-require "tk"
-require "thread"
-require "tkafter"
-
-$time = "0.00"
-$m = Mutex.new
-$loop = false
-
-def timer_stop
-  $loop = false
-  $m.lock
-end
-
-def timer_start
-  $loop = true
-  $m.unlock
-end
-
-def timer_reset
-  $time = "0.00"
-  $root.countframe.counter['text'] = $time
-end
-
-def timer_loop
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-  Tk.after(10,proc{timer_loop})
-end
-
-
-#
-# thread version
-#
-def timer_loop2
-  while true
-    $m.lock
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-    sleep(0.01)
-    $m.unlock
-  end
-end
-
-#
-# TkAfter
-#
-def timer_loop3
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-end
-
-
-class CountFrame < TkFrame
-  attr_reader :counter
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    @counter = TkLabel.new(self,
-			   'text'=>$time, 
-			   'relief'=>'raised')
-    @counter.pack('fill'=>'both')
-    self
-  end
-end
-
-
-class ButtonFrame < TkFrame
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-=begin
-    @stop = TkButton.new(self,
-			 'text'=>'Stop',
-			 'command'=>proc{timer_stop})
-    @start = TkButton.new(self,
-			  'text'=>'Start',
-			  'command'=>proc{timer_start})
-=end
-    @stop  = TkButton.new(self, :text=>'Stop',  :state=>:disabled)
-    @start = TkButton.new(self, :text=>'Start', :state=>:normal)
-
-    @stop.command proc{
-      timer_stop
-      @start.state(:normal)
-      @stop.state(:disabled)
-    }
-    @start.command proc{
-      timer_start
-      @stop.state(:normal)
-      @start.state(:disabled)
-    }
-
-    @reset = TkButton.new(self,
-			  'text'=>'Reset',
-			  'command'=>proc{timer_reset})
-    for b in [@stop,@start,@reset]
-      b.pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-    end
-  end
-end
-
-
-class Timer < TkRoot
-  attr_reader :countframe
-
-  def initialize(*args)
-    super(*args)
-    @countframe = CountFrame.new(self)
-    @buttonframe = ButtonFrame.new(self)
-    for f in [@buttonframe,@countframe]
-      f.pack('side'=>'top', 'fill'=>'both')
-    end
-    self
-  end
-end
-
-
-$root = Timer.new
-
-#$thread = Thread.start{timer_loop2}
-#timer_loop
-TkAfter.new(10,-1,proc{timer_loop3}).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/twind.rb b/ext/tk/sample/demos-jp/twind.rb
deleted file mode 100644
index d35acd24d0..0000000000
--- a/ext/tk/sample/demos-jp/twind.rb
+++ /dev/null
@@ -1,284 +0,0 @@
-#
-# text (embedded windows) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($twind_demo) && $twind_demo
-  $twind_demo.destroy 
-  $twind_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$twind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-# frame ����
-$twind_buttons = TkFrame.new($twind_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc{
-      tmppath = $twind_demo
-      $twind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'twind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-$twind_text = nil
-TkFrame.new($twind_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
-	    'relief'=>'sunken') {|f|
-  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font, 
-			  'width'=>'70', 'height'=>35, 'wrap'=>'word', 
-			  'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-# ��������
-$tag_center = TkTextTag.new($twind_text, 
-			    'justify' =>'center',
-			    'spacing1'=>'5m',
-			    'spacing3'=>'5m'  )
-$tag_buttons = TkTextTag.new($twind_text, 
-			     'lmargin1'=>'1c',
-			     'lmargin2'=>'1c',
-			     'rmargin' =>'1c',
-			     'spacing1'=>'3m',
-			     'spacing2'=>0,
-			     'spacing3'=>0 )
-
-# �ƥ����Ȥ�����
-$twind_text.insert('end', 
-		  '�ƥ�����widget���¾��widget���Ȥ߹��ळ�Ȥ��Ǥ��ޤ���')
-$twind_text.insert('end',
-		  '�Ȥ߹��ߥ�����ɥ��ȸƤФ졢Ǥ�դ�widget����ǽ�Ǥ���')
-$twind_text.insert('end',
-		  '�㤨�С�������2�ĤΥܥ���widget���Ȥ߹��ޤ�Ƥ��ޤ���')
-$twind_text.insert('end', '�ǽ�Υܥ���򥯥�å����ȿ�ʿ�����Υ����������')
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {
-		   #text 'ON'
-		   text '����'
-		   command proc{textWindOn $twind_text,$twind_buttons}
-		   cursor 'top_left_arrow'
-		 })
-$twind_text.insert('end', '�ˤ��ޤ����ޤ�2�Ĥ�Υܥ���򥯥�å������')
-$twind_text.insert('end', '��ʿ�����Υ����������')
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {
-		   #text 'OFF'
-		   text '����'
-		   command proc{textWindOff $twind_text}
-		   cursor 'top_left_arrow'
-		 })
-$twind_text.insert('end', '�ˤ��ޤ���')
-
-$twind_text.insert('end', '�⤦�ҤȤĤ���Ǥ���')
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {
-		   text '�����򥯥�å�'
-		   command proc{textWindPlot $twind_text}
-		   cursor 'top_left_arrow'
-		 })
-$twind_text.insert('end', '����ȡ�x-y�ץ��åȤ������˸���ޤ���')
-$mark_plot = TkTextMark.new($twind_text, 'insert')
-$mark_plot.gravity='left'
-$twind_text.insert('end', '�ޥ����ǥǡ��������褹�뤳�Ȥ��Ǥ��ޤ���')
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {
-		   text '�õ�'
-		   command proc{textWindDel $twind_text}
-		   cursor 'top_left_arrow'
-		 })
-$twind_text.insert('end', '�򥯥�å�����ȸ������ޤ���
-
-')
-
-$twind_text.insert('end', '�Ȥ߹��ߥ�����ɥ�������ƥ�����widget��ˡ��ºݤ�')
-$twind_text.insert('end', '�ƥ����ȤϤʤ����Ȥ߹��ळ�Ȥ������Ǥ���')
-$twind_text.insert('end', '���ξ��ϡ��ƥ�����widget�ϥ�����ɥ��ޥ͡������')
-$twind_text.insert('end', '�褦��ư��ޤ����㤨�С������ˤϥƥ�����widget��')
-$twind_text.insert('end', '��äƥܥ��󤬤��줤���¤٤��Ƥ��ޤ���')
-$twind_text.insert('end', '�����Υܥ�����طʿ����Ѥ��뤳�Ȥ��Ǥ��ޤ�')
-$twind_text.insert('end', '("Default"�Ǹ��ο����᤹���Ȥ��Ǥ��ޤ�)��')
-$twind_text.insert('end', '"Short"�Ȥ����ܥ���򥯥�å������ʸ�����Ĺ����')
-$twind_text.insert('end', '�Ѥ��ޤ�������ȼ�ưŪ�˥ƥ�����widget��')
-$twind_text.insert('end', '�쥤�����Ȥ������Ƥ���ޤ���')
-$twind_text.insert('end', '�⤦����Ʊ���ܥ���򲡤��ȸ������ޤ���
-
-')
-
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkButton.new($twind_text) {|b|
-		   text '�ǥե����'
-		   command proc{embDefBg $twind_text}
-		   cursor 'top_left_arrow'
-		   $tag_buttons.add('end')
-		 },
-		 'padx'=>3 )
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end', 
-		 'window'=>TkCheckButton.new($twind_text) {
-		   textvariable embToggle
-		   indicatoron 0
-		   variable embToggle
-		   onvalue 'A much longer string'
-		   offvalue 'Short'
-		   cursor 'top_left_arrow'
-		   pady 5
-		   padx 2
-		 },
-		 'padx'=>3, 
-		 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
-].each{|twind_color|
-  TkTextWindow.new($twind_text, 'end', 
-		   'window'=>TkButton.new($twind_text) {
-		     text twind_color
-		     cursor 'top_left_arrow'
-		     command proc{$twind_text.bg twind_color}
-		   },
-		   'padx'=>3, 
-		   'pady'=>2 )
-}
-
-# �᥽�å����
-def textWindOn (w,f)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff (w)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-  w.xscrollcommand ''
-  w.wrap 'word'
-end
-
-def textWindPlot (t)
-  if (defined? $twind_plot) && (TkWinfo.exist?($twind_plot))
-    return
-  end
-
-  $twind_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-
-  TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind_plot, 225, 20, 
-	      'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind_plot, x, 254, 
-		'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind_plot, 96, y, 
-		'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6, 
-		       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind_plot.itembind('point', 'Any-Enter', 
-			proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind_plot.itembind('point', 'Any-Leave', 
-			proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind_plot.itembind('point', '1', 
-			proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
-  $twind_plot.itembind('point', 'ButtonRelease-1', 
-			proc{$twind_plot.dtag 'selected'})
-  $twind_plot.bind('B1-Motion', 
-		    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
-  while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-    $twind_text.delete $mark_plot
-  end
-  $twind_text.insert $mark_plot,"\n"
-  TkTextWindow.new($twind_text, $mark_plot, 'window'=>$twind_plot)
-  $tag_center.add $mark_plot
-  $twind_text.insert $mark_plot,"\n"
-end
-
-$embPlot = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def embPlotMove (w, x, y)
-  w.move 'selected', x - $embPlot['lastX'], y - $embPlot['lastY']
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def textWindDel (w)
-  if (defined? $twind_text) && TkWinfo.exist?($twind_plot)
-    $twind_text.delete $twind_plot
-    $twind_plot = nil
-    while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-      $twind_text.delete $mark_plot
-    end
-    $twind_text.insert $mark_plot,"  "
-  end
-end
-
-def embDefBg (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-jp/unicodeout.rb b/ext/tk/sample/demos-jp/unicodeout.rb
deleted file mode 100644
index d408a36aae..0000000000
--- a/ext/tk/sample/demos-jp/unicodeout.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# unicodeout.rb --
-#
-# This demonstration script shows how you can produce output (in label
-# widgets) using many different alphabets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($unicodeout_demo) && $unicodeout_demo
-  $unicodeout_demo.destroy 
-  $unicodeout_demo = nil
-end
-
-$unicodeout_demo = TkToplevel.new {|w|
-  title("Unicode Label Demonstration")
-  iconname("unicodeout")
-  positionWindow(w)
-}
-
-TkLabel.new($unicodeout_demo, 
-	    :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
-	    :text=><<EOL).pack(:side=>:top)
-����ϡ�Tk�ˤ���������ʸ��������Ѥ��������Ф��륵�ݡ��ȤˤĤ��Ƥ�\
-����ץ�Ǥ���������������ɽ���ˤ����Ƥ��ʤ����ºݤˤɤΤ褦��ɽ����\
-�ܤˤ��뤫�ϡ����ʤ��δĶ��ˤɤΤ褦��ʸ�����礬���󥹥ȡ��뤵��Ƥ��뤫��\
-�礭����¸���ޤ����ޤ����оݤȤʤ�ʸ�����礬���󥹥ȡ��뤵��Ƥ��ʤ�����\
-�ɤΤ褦��ɽ�����ʤ���뤫�⤢�ʤ��δĶ�����Ǥ���\
-�֥����ɻ��ȡץܥ���򲡤��ƥ�������ɽ������\
-Unicodeout_SampleFrame���饹��@@font�������񤭴�����\
-(�ե���������Ƥ��ѹ�����ޤ���)\
-�ֺƼ¹ԡץܥ���Υ���å����ƤߤƤ���������
-������ץȤ�����������Ĥ褦�ˡ�ʸ�����\\uXXXX�Ȥ���\
-Tcl�Υ���������ɽ�����Ѥ���UNICODEʸ����ǽ񤫤�Ƥ��ޤ���\
-ʸ����ϡ�Tk::UTF8_String�᥽�åɤˤ�äơ�\
-��UTF8������ʸ����Ǥ���פȤ���\
-���󥳡��ɾ����դ���ʸ���󥪥֥�������\
-(Tcl�Υ���������ɽ�����Ѵ��Ѥ�)���Ѵ�����\
-��٥륦�������åȤ��Ϥ��Ƥ����������դ��Ƥ���������
-EOL
-#'
-
-TkFrame.new($unicodeout_demo){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'λ��', :width=>15, :command=>proc{
-		 $unicodeout_demo.destroy
-		 $unicodeout_demo = nil
-	       }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-		 showCode 'unicodeout'
-	       }).pack(:side=>:left, :expand=>true)
-}
-
-wait_msg = TkLabel.new($unicodeout_demo, 
-		       :text=>"�ե�����ɤ߹��ߤδ�λ�ޤ�" + 
-		              "���Ф餯���Ԥ�������������", 
-		       :font=>"Helvetica 12 italic").pack
-
-class Unicodeout_SampleFrame < TkFrame
-  @@font = $font
-  # @@font = 'Helvetica 14'
-  # @@font = 'Courier 12'
-  # @@font = 'clearlyu 16'
-  # @@font = 'fixed 12'
-  # @@font = 'Times 12'
-  # @@font = 'Newspaper 12'
-  # @@font = '{New century schoolbook} 12'
-
-  def initialize()
-    super($unicodeout_demo)
-    grid_columnconfig(1, :weight=>1)
-  end
-
-  def add_sample(lang, *args)
-    sample_txt = Tk::UTF8_String(args.join(''))
-    l = TkLabel.new(self, :font=>@@font, :text=>lang+':', 
-		    :anchor=>:nw, :pady=>0)
-    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt, 
-    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt, 
-		    :anchor=>:nw, :width=>30, :pady=>0)
-    Tk.grid(l, s, :sticky=>:ew, :pady=>0)
-    l.grid_config(:padx, '1m')
-  end
-end
-f = Unicodeout_SampleFrame.new
-f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
-
-# Processing when some characters are missing might take a while, so make
-# sure we're displaying something in the meantime...
-
-oldCursor = $unicodeout_demo.cursor
-$unicodeout_demo.cursor('watch')
-Tk.update
-
-f.add_sample('Arabic', 
-	     '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94', 
-	     '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
-f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
-f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek', 
-	     '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ', 
-	     '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew', 
-	     '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ', 
-	     '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese', 
-	     '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ', 
-	     '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
-f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian', 
-	     '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ', 
-	     '\u044F\u0437\u044B\u043A')
-
-wait_msg.destroy
-$unicodeout_demo.cursor(oldCursor)
diff --git a/ext/tk/sample/demos-jp/vscale.rb b/ext/tk/sample/demos-jp/vscale.rb
deleted file mode 100644
index 4cb8e0f6b7..0000000000
--- a/ext/tk/sample/demos-jp/vscale.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require "tkcanvas"
-
-if defined?($vscale_demo) && $vscale_demo
-  $vscale_demo.destroy
-  $vscale_demo = nil
-end
-
-$vscale_demo = TkToplevel.new {|w|
-  title("Vertical Scale Demonstration")
-  iconname("vscale")
-}
-positionWindow($vscale_demo)
-
-msg = TkLabel.new($vscale_demo) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-#  text "���ˤ������1�ĤȾ�ľ�ʥ������뤬ɽ������Ƥ��ޤ���\
-#���������ǥޥ����ܥ���1�򥯥�å����ޤ��ϥɥ�å������\
-#�����Ĺ�����Ѥ��뤳�Ȥ��Ǥ��ޤ���"
-  text "�ˤϥС��Ƚķ��Υ������뤬ɽ������Ƥ��ޤ�����������ǥޥ����Υܥ���1 �򥯥�å����뤫�ɥ�å����ƥС��ι⤵���Ѥ��뤳�Ȥ��Ǥ��ޤ������ä����λ��ץܥ���򲡤��Ƥ���������"
-}
-msg.pack('side'=>'top', 'padx'=>'.5c')
-
-TkFrame.new($vscale_demo) {|frame|
-  TkButton.new(frame) {
-    text 'λ��'
-    command proc {
-      tmppath = $vscale_demo
-      $vscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc { showCode 'vscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-TkFrame.new($vscale_demo) {|frame|
-  borderwidth 10
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, 0, 0, 1, 1, 2, 2) {
-      fill 'SeaGreen3'
-      tags 'poly'
-    }
-    TkcLine.new(c, 0, 0, 1, 1, 2, 2, 0, 0) {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'left',  'anchor'=>'nw', 'fill'=>'y')
-  scale = TkScale.new(frame) {
-    orient 'vertical'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setHeight(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'left', 'anchor'=>'ne')
-  scale.set 75
-}.pack
-
-
-def setHeight(w, height)
-  height = height + 21
-  y2 = height - 30
-  if y2 < 21
-    y2 = 21
-  end
-  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-end
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
deleted file mode 100644
index 696a9073cc..0000000000
--- a/ext/tk/sample/demos-jp/widget
+++ /dev/null
@@ -1,542 +0,0 @@
-#!/usr/bin/env ruby
-
-# tk �ط��饤�֥����ɤ߹���
-require 'tk'
-require 'tkafter'
-
-# widget demo directory ���֤γ���
-$demo_dir = File.dirname($0)
-
-# root ������
-$root = TkRoot.new{title "Widget Demonstration"}
-
-# tk �С������μ���
-$tk_version = Tk::TK_VERSION
-
-# tcl_platform ����ؤΥ����������֥�������
-$tk_platform = TkVarAccess.new('tcl_platform')
-
-# �ե��������
-$font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
-knjfont = '-*-r-*--16-*-jisx0208.1983-0'
-$kanji_font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
-			 knjfont)
-TkOption.add('*kanjiFont', knjfont, 'startupFile')
-$msg_kanji_font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
-			     '-*-r-*--24-*-jisx0208.1983-0')
-#######
-#case($tk_version)
-#when /^4.*/
-#  $font = '-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*'
-#  $kanji_font = '-*--16-*-jisx0208.1983-0'
-#  $msg_kanji_font = '-*--24-*-jisx0208.1983-0'
-#  $knjfont_opt = 'kanjifont'
-#  TkOption.add('*kanjiFont', $kanji_font, 'startupFile')
-#
-#when /^8.*/
-#  Tk.tk_call('font', 'create', '@ascii', 
-#	     '-copy', '-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*')
-#  Tk.tk_call('font', 'create', '@kanji', 
-#	     '-copy', '-*--16-*-jisx0208.1983-0')
-#  Tk.tk_call('font', 'create', '@msg_knj', 
-#	     '-copy', '-*--24-*-jisx0208.1983-0')
-#  Tk.tk_call('font', 'create', '@cFont', '-compound', '@ascii @kanji')
-#  Tk.tk_call('font', 'create', '@cMsgFont', '-compound', '@ascii @msg_knj')
-#  $font = '-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*'
-#  $kanji_font = '@cFont'
-#  $msg_kanji_font = '@cMsgFont'
-#  $knjfont_opt = 'font'
-#end
-#######
-
-# ��˥塼����
-TkMenubar.new($root, 
-	      [[['File', 0], 
-		  ['About ... ', proc{aboutBox}, 0, '<F1>'],
-		  '---', 
-		  ['Quit', proc{exit}, 0, 'Meta-Q']
-		]]).pack('side'=>'top', 'fill'=>'x')
-$root.bind('F1', proc{aboutBox})
-
-=begin
-TkFrame.new($root){|frame|
-  TkMenubutton.new(frame){|button|
-    m = TkMenu.new(button) {
-      add 'command', 'label'=>'Quit', 'command'=>proc{exit}, 'underline'=>0
-    }
-    menu m
-    text 'File'
-    underline 0
-  }.pack('side'=>'left')
-}.pack('side'=>'top', 'fill'=>'x')
-=end
-
-# �ƥ����ȥܥå���������
-if $tk_version =~ /^4\.[01]/
-  scr = TkScrollbar.new($root, 'orient'=>'vertical')
-  txt = TkText.new($root) {
-    #wrap 'word'
-    wrap 'char'
-    width 60
-    height 30
-    font $font
-    setgrid 'yes'
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-  scr.pack('side'=>'right', 'fill'=>'y')
-  txt.pack('expand'=>'yes', 'fill'=>'both')
-else
-  textFrame = TkFrame.new($root)
-  scr = TkScrollbar.new($root, 'orient'=>'vertical', 
-			'highlightthickness'=>0, 'takefocus'=>1) {
-    pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
-  }
-  txt = TkText.new($root) {
-    #wrap 'word'
-    wrap 'char'
-    width 60
-    height 30
-    font $font
-    setgrid 'yes'
-    highlightthickness 0
-    padx 4
-    pady 2
-    takefocus 0
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-#  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
-  textFrame.pack('expand'=>'yes', 'fill'=>'both')
-
-  statusBar = TkFrame.new($root) {|f|
-    $statusBarLabel = \
-    TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-		'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
-    .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-    TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-		'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
-    .pack('side'=>'left', 'padx'=>2)
-  }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-end
-
-# �ƥ����ȥ�������
-tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
-tag_kanji_title = TkTextTag.new(txt, 'kanjifont'=>$msg_kanji_font)
-tag_middle = TkTextTag.new(txt, 'kanjifont'=>$kanji_font)
-tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
-
-if TkWinfo.depth($root) == '1'
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-			   'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-			      'underline'=>1)
-  tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
-else
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-			   'foreground'=>'blue', 'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
-			      'foreground'=>'#303080', 'underline'=>1)
-#  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1, 
-#			  'background'=>'SeaGreen3')
-  tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
-end
-
-#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
-tag_demo.bind('ButtonRelease-1', 
-	      proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
-
-lastLine = TkVariable.new("")
-newLine  = TkVariable.new("")
-tag_demo.bind('Enter', proc{|x,y|
-		lastLine.value = txt.index("@#{x},#{y} linestart")
-		tag_hot.add(lastLine.value, "#{lastLine.value} lineend")
-		showStatus txt, txt.index("@#{x},#{y}")
-	      },
-	      '%x %y')
-tag_demo.bind('Leave', 
-	      proc{
-		tag_hot.remove('1.0','end')
-		txt.configure('cursor','xterm')
-		$statusBarLabel.configure('text'=>"")
-	      })
-tag_demo.bind('Motion', proc{|x, y|
-		newLine.value = txt.index("@#{x},#{y} linestart")
-		if newLine.value != lastLine.value
-		  tag_hot.remove('1.0','end')
-		  lastLine.value = newLine.value
-		  if ( txt.tag_names("@#{x},#{y}").find{|t| 
-			t.kind_of?(String) && t =~ /^demo-/
-		      } )
-		    tag_hot.add(lastLine.value, 
-				"#{lastLine.value} lineend -1 chars")
-		  end
-		end
-		showStatus txt, txt.index("@#{x},#{y}")
-	      },
-	      '%x %y')
-
-# �ƥ���������
-txt.insert('end', 'Ruby/Tk : Widget', tag_title)
-#txt.insert('end', "  �ǥ�󥹥ȥ졼�����\n", tag_middle)
-txt.insert('end', "  �ǥ�󥹥ȥ졼�����\n", tag_kanji_title)
-txt.insert('end', <<"EOT")
-
-���Υ��ץꥱ�������ϡ�Tk Widget ���Ѥ��ƤɤΤ褦�ʤ��Ȥ��Ǥ��뤫\
-�򼨤�����Ρ������Ĥ��ξ����ʥ�����ץȤ��Ф���ե���ȥ���ɤ���\
-�����Ƥ��ޤ����ʲ��˽��֤˵󤲤��Ƥ���ǥ�󥹥ȥ졼������¹�\
-����ˤϥޥ����ǥ���å����Ƥ����������ǥ�󥹥ȥ졼�����Υ�����\
-�ɥ��������ȡ��ǥ�󥹥ȥ졼�������������� Ruby/Tk �Υ����ɤ�\
-�뤿��ˡ�"�����ɻ���"�ܥ���򥯥�å����뤳�Ȥ��Ǥ��ޤ������ʤ���\
-˾��ʤ顢���Υ����ɤ������뤳�Ȥ��Ǥ��ޤ����������������ɤǥǥ�\
-�󥹥ȥ졼������Ƽ¹Ԥ��뤿��ˤϡ������ɤ��񤫤줿������ɥ���\
-����"�ǥ�Ƽ¹�" �ܥ���򥯥�å����Ƥ���������
-
-�����Υǥ�Ǥϡ����Ū�Ƕ�ΥС������� Tk �Ǥʤ���Х��ݡ��Ȥ���\
-���ʤ���ǽ��ȤäƼ������Ƥ��ޤ�(�㤨�� Tk8.4 �ʾ�ʤ�)�����Τ��ᡤ\
-����������ǽ������ʤ� Tk �饤�֥���ȤäƤ�����ˤϡ���������\
-�ǥ��������ư���ޤ��󡥤��Τ褦�ʵ�ǽ��ɬ�פǤ���С�����򥵥ݡ���\
-���Ƥ��� Tk �饤�֥���Ȥ��褦�ˡ�tcltklib �򥳥�ѥ��뤷�ʤ�����\
-����������
-
-
-EOT
-
-#txt.insert('end',"��٥�, �ܥ���, �����å��ܥ���, �饸���ܥ���\n",tag_middle)
-txt.insert('end', "��٥�, �ܥ���, �����å��ܥ���, �饸���ܥ���\n", 
-	   tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��٥� (�ƥ�����, �ӥåȥޥå�)\n", 
-	   tag_demo, "demo-label")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��٥��UNICODE�ƥ����� (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-unicodeout")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ܥ��� \n", tag_demo, "demo-button")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. �����å��ܥ��� (ʣ���������ǽ)\n", 
-	   tag_demo, "demo-check")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. �饸���ܥ��� (Ǥ�դΰ�Ĥ������ǽ)\n", 
-	   tag_demo, "demo-radio")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. �饸���ܥ��� (��ǽ���б������С�������Tk��ɬ��)\n", 
-	   tag_demo, "demo-radio2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. �ܥ���Ǻ��줿15-�ѥ��륲����\n", 
-	   tag_demo, "demo-puzzle")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. �ӥåȥޥåפ���Ѥ�����������ܥ���\n", 
-	   tag_demo, "demo-icon")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. ������ɽ��������ĤΥ�٥�\n", 
-	   tag_demo, "demo-image1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. �����򸫤뤿��δ�ñ�ʥ桼�����󥿡��ե�����\n", 
-	   tag_demo, "demo-image2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "11. �����򸫤뤿��δ�ñ�ʥ桼�����󥿡��ե����� (��ǽ���б������С�������Tk��ɬ��)\n", 
-	   tag_demo, "demo-image3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "12. ��٥��դ��ե졼�� (��ǽ���б������С�������Tk��ɬ��)\n", 
-	   tag_demo, "demo-labelframe")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "�ꥹ�ȥܥå���\n", tag_middle)
-txt.insert('end', "�ꥹ�ȥܥå���\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��ƻ�ܸ�.\n", tag_demo, "demo-states")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��: ���ץꥱ�������Τ�����ۿ����Ѥ���\n", 
-	   "#{tag_demo.id} demo-colors")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ʸ���\n", tag_demo, "demo-sayings")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "����ȥ�ȥ��ԥ�ܥå���\n", tag_middle)
-txt.insert('end', "����ȥ�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ����������С��ʤ�\n", tag_demo, "demo-entry1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ����������С�����\n", tag_demo, "demo-entry2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ǧ�ڽ����դ��Υ���ȥ�ܥå����ȥѥ���ɥե������ (��ǽ���б������С�������Tk��ɬ��)\n", 
-	   tag_demo, "demo-entry3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ���ԥ�ܥå��� (��ǽ���б������С�������Tk��ɬ��)\n", 
-	   tag_demo, "demo-spin")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ��ñ�ʥե�����\n", tag_demo, "demo-form")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "�ƥ�����\n", tag_middle)
-txt.insert('end', "�ƥ�����\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ����Ū�ʥƥ�����\n", tag_demo, "demo-text")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ɽ����������.\n", tag_demo, "demo-style")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ϥ��ѡ��ƥ�����(�����Х����).\n", 
-	   tag_demo, "demo-bind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ������ɥ�����������ƥ�����\n", 
-	   tag_demo, "demo-twind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ����\n", tag_demo, "demo-search")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "�����Х�\n", tag_middle)
-txt.insert('end', "�����Х�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. �����ƥ�η�\n", tag_demo, "demo-items")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 2 �����Υץ��å�\n", tag_demo, "demo-plot")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ƥ�����\n", tag_demo, "demo-ctext")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ����η�\n", tag_demo, "demo-arrow")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. �롼�顼\n", tag_demo, "demo-ruler")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. �ե����ץ��\n", tag_demo, "demo-floor")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. �����������ǽ�ʥ����Х�\n", 
-	   tag_demo, "demo-cscroll")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "��������\n", tag_middle)
-txt.insert('end', "��������\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��ľ\n", tag_demo.id, "demo-vscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��ʿ\n", tag_demo.id, "demo-hscale")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "�ڥ���ɥ�����ɥ�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��ʿ���� (��ǽ���б������С�������Tk��ɬ��)\n", 
-	   tag_demo.id, "demo-paned1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��ľ���� (��ǽ���б������С�������Tk��ɬ��)\n", 
-	   tag_demo.id, "demo-paned2")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "��˥塼\n", tag_middle)
-txt.insert('end', "��˥塼\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��˥塼�ȥ��������ɤ�ޤ��������ɥ�\n", 
-	   tag_demo, "demo-menu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��˥塼�ȥ��������ɤ�ޤ��������ɥ� (Tk8.x ����)\n", 
-	   tag_demo, "demo-menu8x")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3.                 ��                (��ǽ���б������С�������Tk��ɬ��)\n", 
-	   tag_demo, "demo-menu84")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ��˥塼�ܥ��� (Tk8.x ����)\n", 
-	   tag_demo, "demo-menubu")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "����������������ɥ�\n", tag_middle)
-txt.insert('end', "����������������ɥ�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��å������ܥå���\n", tag_demo, "demo-msgbox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. �ե������������������\n", tag_demo, "demo-filebox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ���������������\n", tag_demo, "demo-clrpick")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "����¾\n", tag_middle)
-txt.insert('end', "����¾\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. �Ȥ߹��ߤΥӥåȥޥå�\n", tag_demo, "demo-bitmap")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. �⡼�������������(�������륰���)\n", 
-	   tag_demo, "demo-dialog1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �⡼�������������(�������Х륰���)\n", 
-	   tag_demo, "demo-dialog2")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.state('disabled')
-scr.focus
-
-################################
-# method ���
-################################
-def positionWindow(w)
-  w.geometry('+300+300')
-end
-
-# �ƥ��������åȤȡ��ѿ�̾�� TkVariable �Ȥ���(����)���¤Ӥ��Ϥ�
-$showVarsWin = {}
-def showVars (parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy 
-    rescue
-    end
-  end
-  w = TkToplevel.new(parent) {|w|
-    title "Variable values"
-    TkLabel.new(w) {
-      text "�ѿ���:"
-      width 20
-      anchor 'center'
-      font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
-    }.pack('side'=>'top', 'fill'=>'x')
-    len = 1
-    args.each{|vnam,vbody|
-      len = vnam.to_s.length if vnam.to_s.length > len
-    }
-    args.each{|vnam,vbody|
-      TkFrame.new(w){|f|
-	#TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
-	TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
-	TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
-	           .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-      }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
-    }
-    TkButton.new(w) {
-      text "λ��"
-      command proc{w.destroy}
-    }.pack('side'=>'bottom', 'pady'=>2)
-  }
-  $showVarsWin[parent.path] = w
-end
-
-# �ƥ����Ⱦ�Ǥ� click ���Ф���ư��
-def invoke (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-  cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update
-#  eval `cat #{tag[5..-1]}.rb`
-  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
-  Tk.update
-#  txt.cursor('xterm')
-  txt.cursor(cursor)
-
-  $tag_visited.add("#{index} linestart +1 chars", "#{index} lineend +1 chars")
-end
-
-# ����ɽ��
-def showStatus (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  cursor = txt.cget('cursor')
-  unless tag
-    $statusBarLabel.configure('text', " ")
-    newcursor = 'xterm'
-  else
-    demoname = tag[5..-1]
-    $statusBarLabel.configure('text', 
-			     "����ץ�ץ������ \"#{demoname}\" �μ¹� ")
-    newcursor = 'hand2'
-  end
-  txt.configure('cursor'=>newcursor) if cursor != newcursor
-end
-
-# �����������ɤ�ɽ��
-def showCode (demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == '0'
-    $code_window = TkToplevel.new(nil)
-    f = TkFrame.new($code_window)
-    TkButton.new(f) {
-      text "λ��"
-      command proc{
-	$code_window.destroy
-	$code_window = nil
-      }
-    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
-    TkButton.new(f) {
-      text "�Ƽ¹�"
-      command proc{eval($code_text.get('1.0','end'))}
-    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
-#    f.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x')
-    f.pack('side'=>'bottom', 'fill'=>'x')
-
-    if $tk_version =~ /^4\.[01]/
-      s = TkScrollbar.new($code_window, 'orient'=>'vertical')
-      $code_text = TkText.new($code_window) {
-	height 40
-	setgrid 'yes'
-	yscrollcommand proc{|first,last| s.set first,last}
-      }
-      s.command(proc{|*args| $code_text.yview(*args)})
-      s.pack('side'=>'right', 'fill'=>'y')
-      $code_text.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    else
-      TkFrame.new($code_window) {|f|
-	pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-	hs = TkScrollbar.new($code_window, 'highlightthickness'=>0, 
-			     'orient'=>'horizontal')
-	vs = TkScrollbar.new($code_window, 'highlightthickness'=>0, 
-			     'orient'=>'vertical')
-	$code_text = TkText.new($code_window) {|t|
-	  height 40
-	  #wrap 'word'
-	  wrap 'char'
-	  xscrollcommand proc{|first,last| hs.set first,last}
-	  yscrollcommand proc{|first,last| vs.set first,last}
-	  setgrid 'yes'
-	  highlightthickness 0
-	  pady 2
-	  padx 3
-	  hs.command(proc{|*args| $code_text.xview(*args)})
-	  vs.command(proc{|*args| $code_text.yview(*args)})
-	}
-
-	$code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
-			'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-	vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
-		'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-#	xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
-#		'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-	TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-	TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-      }
-    end
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-#  fid = open(file, 'r')
-  fid = open([$demo_dir, file].join(File::Separator), 'r')
-  $code_text.delete('1.0', 'end')
-  #$code_text.insert('1.0', `cat #{file}`)
-  $code_text.insert('1.0', fid.read)
-  #$code_mark = TkTextMark.new($code_text, '1.0')
-  #$code_text.set_insert('1.0')
-  TkTextMarkInsert.new($code_text,'1.0')
-  fid.close
-end
-
-# aboutBox
-#
-#      Pops up a message box with an "about" message
-#
-def aboutBox
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-		'message'=>"Ruby/Tk ���������åȥǥ� Ver.1.3.2-jp\n\n( based on Tk ���������åȥǥ� :: Copyright (c) 1996-1997 Sun Microsystems, Inc. )\n\nRunning Version :: Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''}")
-end
-
-################################
-# ���٥���Ԥ�������
-Tk.mainloop
diff --git a/ext/tk/sample/resource.en b/ext/tk/sample/resource.en
deleted file mode 100644
index 39b4013971..0000000000
--- a/ext/tk/sample/resource.en
+++ /dev/null
@@ -1,13 +0,0 @@
-!
-!  see Tcl/Tk's "options" manual for "Database Name" and "Database Class"
-!
-*BtnFrame.borderWidth: 5
-*BtnFrame.relief: ridge
-*BtnFrame.Button.background: wheat
-*BtnFrame.Button.foreground: red
-*hello.text: HELLO
-*quit.text: QUIT
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE}) ";\
-                          print "Hello!! This is a sample of #{arg}.";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) Good-bye��(<<< $SAFE=#{$SAFE})\n"}
diff --git a/ext/tk/sample/resource.ja b/ext/tk/sample/resource.ja
deleted file mode 100644
index a61390f95d..0000000000
--- a/ext/tk/sample/resource.ja
+++ /dev/null
@@ -1,13 +0,0 @@
-!
-!  see Tcl/Tk's "options" manual for "Database Name" and "Database Class"
-!
-*BtnFrame.borderWidth: 5
-*BtnFrame.relief: ridge
-*BtnFrame.Button.background: wheat
-*BtnFrame.Button.foreground: red
-*hello.text: ����ˤ���
-*quit.text: ��λ
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE} >>>) ";\
-                          print "����ˤ��ϡ��� #{arg} �Υ���ץ�Ǥ���";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) ���褦�ʤ顥(<<< $SAFE=#{$SAFE})\n"}
diff --git a/ext/tk/sample/safe-tk.rb b/ext/tk/sample/safe-tk.rb
deleted file mode 100644
index 0a25c804f0..0000000000
--- a/ext/tk/sample/safe-tk.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-# This script is a sample of MultiTkIp class
-
-require "multi-tk"
-
-# create slave interpreters
-trusted_slave = MultiTkIp.new_slave
-safe_slave1   = MultiTkIp.new_safeTk
-safe_slave2   = MultiTkIp.new_safeTk('fill'=>:none, 'expand'=>false)
-#safe_slave2   = MultiTkIp.new_safeTk('fill'=>:none)
-#safe_slave2   = MultiTkIp.new_safeTk('expand'=>false)
-
-
-cmd = Proc.new{|txt|
-  #####################
-  ## from TkTimer2.rb
-
-  if TkCore::INTERP.safe?
-    # safeTk doesn't have permission to call 'wm' command
-  else
-    root = TkRoot.new(:title=>'timer sample')
-  end
-
-  label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
-                  .pack(:side=>:bottom, :fill=>:both)
-
-  tick = proc{|aobj|
-    cnt = aobj.return_value + 5
-    label.text format("%d.%02d", *(cnt.divmod(100)))
-    cnt
-  }
-
-  timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-
-=begin
-  TkButton.new(:text=>'Start') {
-    command proc{ timer.continue unless timer.running? }
-    pack(:side=>:left, :fill=>:both, :expand=>true)
-  }
-  TkButton.new(:text=>'Restart') {
-    command proc{ timer.restart(0, proc{ label.text('0.00'); 0 }) }
-    pack('side'=>'right','fill'=>'both','expand'=>'yes')
-  }
-  TkButton.new(:text=>'Stop') {
-    command proc{ timer.stop if timer.running? }
-    pack('side'=>'right','fill'=>'both','expand'=>'yes')
-  }
-=end
-  b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
-    pack(:side=>:left, :fill=>:both, :expand=>true)
-  }
-  b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
-    pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-  }
-
-  b_start.command {
-    timer.continue
-    b_stop.state(:normal)
-    b_start.state(:disabled)
-  }
-
-  b_stop.command {
-    timer.stop
-    b_start.state(:normal)
-    b_stop.state(:disabled)
-  }
-
-  TkButton.new(:text=>'Reset', :state=>:normal) {
-    command { timer.reset }
-    pack('side'=>'right', 'fill'=>'both', 'expand'=>'yes')
-  }
-
-  ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
-  Tk.root.bind(ev_quit, proc{Tk.exit}).focus
-}
-
-# call on the default master interpreter
-trusted_slave.eval_proc(cmd, 'trusted')  # label -> .w00012
-safe_slave1.eval_proc(cmd, 'safe1')      # label -> .w00016
-safe_slave2.eval_proc(cmd, 'safe2')      # label -> .w00020
-cmd.call('master')                       # label -> .w00024
-
-#second_master = MultiTkIp.new(&cmd)
-
-TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
-TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
-TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start
-
-TkTimer.new(7000, 1, 
-	    proc{
-	      safe_slave1.eval_proc{Tk.root.destroy}
-	      safe_slave1.delete
-	      print "*** The safe_slave1 is deleted by the timer.\n"
-	    }).start
-
-TkTimer.new(10000, 1, 
-	    proc{
-	      trusted_slave.eval_proc{Tk.root.destroy}
-	      trusted_slave.delete
-	      print "*** The trusted_slave is deleted by the timer.\n"
-	    }).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkbiff.rb b/ext/tk/sample/tkbiff.rb
index e89644bd9d..d2d7bf7beb 100644
--- a/ext/tk/sample/tkbiff.rb
+++ b/ext/tk/sample/tkbiff.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#! /usr/local/bin/ruby
 
 if ARGV[0] != '-d'
   unless $DEBUG
@@ -12,7 +12,7 @@ if ARGV.length == 0
   if ENV['MAIL']
     $spool = ENV['MAIL']
   else  
-    $spool = '/var/spool/mail/' + ENV['USER']
+    $spool = '/usr/spool/mail/' + ENV['USER']
   end
 else 
   $spool = ARGV[0]
@@ -38,11 +38,11 @@ class Mail
   def initialize(f)
     @header = {}
     @body = []
-    while line = f.gets()
-      line.chop!
-      next if /^From / =~ line	# skip From-line  
-      break if /^$/ =~ line	# end of header
-      if /^(\S+):\s*(.*)/ =~ line
+    while f.gets()
+      $_.chop!
+      next if /^From /	# skip From-line  
+      break if /^$/		# end of header
+      if /^(\S+):\s*(.*)/
 	@header[attr = $1.capitalize] = $2
       elsif attr
 	sub(/^\s*/, '')
@@ -50,10 +50,10 @@ class Mail
       end
     end
 
-    return unless $_
+    return if ! $_
 
-    while line = f.gets()
-      break if /^From / =~ line
+    while f.gets()
+      break if /^From /
       @body.push($_)
     end
   end
@@ -70,13 +70,7 @@ end
 
 require "tkscrollbox"
 
-my_appname = Tk.appname('tkbiff')
 $top = TkRoot.new
-if ((TkWinfo.interps($top) - [my_appname]).find{|ip| ip =~ /^tkbiff/})
-  STDERR.print("Probably other 'tkbiff's are running. Bye.\n")
-  exit
-end
-
 $top.withdraw
 $list = TkScrollbox.new($top) {
   relief 'raised'
@@ -142,12 +136,12 @@ def pop_up
     $list.see 'end'
   end
   $top.deiconify
-  Tk.after 2000, proc{$top.iconify}
+  Tk.after 2000, proc{$top.withdraw}
 end
 
 $list.insert 'end', "You have no mail."
 check
-Tk.after 2000, proc{$top.iconify}
+Tk.after 2000, proc{$top.withdraw}
 begin
   Tk.mainloop
 rescue
diff --git a/ext/tk/sample/tkbrowse.rb b/ext/tk/sample/tkbrowse.rb
index 7395688e97..882f0a489b 100644
--- a/ext/tk/sample/tkbrowse.rb
+++ b/ext/tk/sample/tkbrowse.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/local/bin/ruby
 #
 # This script generates a directory browser, which lists the working
 # directory and allows you to open files or subdirectories by
diff --git a/ext/tk/sample/tkdialog.rb b/ext/tk/sample/tkdialog.rb
index 00cc12ab11..e83e16d0a8 100644
--- a/ext/tk/sample/tkdialog.rb
+++ b/ext/tk/sample/tkdialog.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#! /usr/local/bin/ruby
 require "tk"
 
 root = TkFrame.new
@@ -54,6 +54,7 @@ bot.pack
 root.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
 
 def quit(button)
+  print "aaa\n"
   print "You pressed the \"#{button}\" button;  bye-bye!\n"
   exit
 end
diff --git a/ext/tk/sample/tkfrom.rb b/ext/tk/sample/tkfrom.rb
index 25f1d7c429..ba0e547799 100644
--- a/ext/tk/sample/tkfrom.rb
+++ b/ext/tk/sample/tkfrom.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#! /usr/local/bin/ruby
 
 require "parsedate"
 require "base64"
@@ -20,11 +20,11 @@ class Mail
   def initialize(f)
     @header = {}
     @body = []
-    while line = f.gets()
+    while f.gets()
       $_.chop!
-      next if /^From / =~ line	# skip From-line  
-      break if /^$/ =~ line	# end of header
-      if /^(\S+):\s*(.*)/ =~ line
+      next if /^From /		# skip From-line  
+      break if /^$/		# end of header
+      if /^(\S+):\s*(.*)/
 	@header[attr = $1.capitalize] = $2
       elsif attr
 	sub(/^\s*/, '')
@@ -32,10 +32,10 @@ class Mail
       end
     end
 
-    return unless $_
+    return if ! $_
 
-    while line = f.gets()
-      break if /^From / =~ line
+    while f.gets()
+      break if /^From /
       @body.push($_)
     end
   end
@@ -54,9 +54,9 @@ if ARGV.length == 0
   if ENV['MAIL']
     ARGV[0] = ENV['MAIL']
   elsif ENV['USER']
-    ARGV[0] = '/var/spool/mail/' + ENV['USER']
+    ARGV[0] = '/usr/spool/mail/' + ENV['USER']
   elsif ENV['LOGNAME']
-    ARGV[0] = '/var/spool/mail/' + ENV['LOGNAME']
+    ARGV[0] = '/usr/spool/mail/' + ENV['LOGNAME']
   end
 end
 
@@ -64,7 +64,7 @@ require "tk"
 list = scroll = nil
 TkFrame.new{|f|
   list = TkListbox.new(f) {
-    yscroll proc{|*idx|
+    yscroll proc{|idx|
 	scroll.set *idx
     }
     relief 'raised'
@@ -94,7 +94,7 @@ root.bind "space", proc{exit}
 
 $outcount = 0;
 for file in ARGV
-  next unless File.exist?(file)
+  next if File.exist?(file)
   atime = File.atime(file)
   mtime = File.mtime(file)
   f = open(file, "r")
diff --git a/ext/tk/sample/tkhello.rb b/ext/tk/sample/tkhello.rb
index ab236963e8..5188fe1c8c 100644
--- a/ext/tk/sample/tkhello.rb
+++ b/ext/tk/sample/tkhello.rb
@@ -5,6 +5,6 @@ TkButton.new(nil,
 	     'command' => proc{print "hello\n"}).pack('fill'=>'x')
 TkButton.new(nil,
 	     'text' => 'quit',
-	     'command' => proc{exit}).pack('fill'=>'x')
+	     'command' => 'exit').pack('fill'=>'x')
 
 Tk.mainloop
diff --git a/ext/tk/sample/tkmenubutton.rb b/ext/tk/sample/tkmenubutton.rb
deleted file mode 100644
index 1c7f51000b..0000000000
--- a/ext/tk/sample/tkmenubutton.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  menubutton sample : based on sample menubuttons on the Tcl/Tk demo script
-#
-require 'tk'
-
-TkLabel.new(:text=>'Sample of TkMenubutton').pack(:side=>:top)
-
-TkFrame.new{|f|
-  pack(:side=>:top) 
-
-
-  TkMenubutton.new(:parent=>f, :text=>'Right', :underline=>0, 
-		   :direction=>:right, :relief=>:raised){|mb|
-    menu TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Right menu: first item', 
-                    :command=>proc{print 'You have selected the first item' + 
-                                         " from the Right menu.\n"})
-      add(:command, :label=>'Right menu: second item', 
-                    :command=>proc{print 'You have selected the second item' + 
-                                         " from the Right menu.\n"})
-    }
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-
-  TkMenubutton.new(:parent=>f, :text=>'Below', :underline=>0, 
-		   :direction=>:below, :relief=>:raised){|mb|
-    menu(TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Below menu: first item', 
-                    :command=>proc{print 'You have selected the first item' + 
-                                         " from the Below menu.\n"})
-      add(:command, :label=>'Below menu: second item', 
-                    :command=>proc{print 'You have selected the second item' + 
-                                         " from the Below menu.\n"})
-    })
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-
-  TkMenubutton.new(:parent=>f, :text=>'Above', :underline=>0, 
-		   :direction=>:above, :relief=>:raised){|mb|
-    menu TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Above menu: first item', 
-                    :command=>proc{print 'You have selected the first item' + 
-                                         " from the Above menu.\n"})
-      add(:command, :label=>'Above menu: second item', 
-                    :command=>proc{print 'You have selected the second item' + 
-                                         " from the Above menu.\n"})
-    }
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-
-  TkMenubutton.new(:parent=>f, :text=>'Left', :underline=>0, 
-		   :direction=>:left, :relief=>:raised){|mb|
-    menu(TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Left menu: first item', 
-                    :command=>proc{print 'You have selected the first item' + 
-                                         " from the Left menu.\n"})
-      add(:command, :label=>'Left menu: second item', 
-                    :command=>proc{print 'You have selected the second item' + 
-                                         " from the Left menu.\n"})
-    })
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-}
-
-############################
-TkFrame.new(:borderwidth=>2, :relief=>:sunken, 
-	    :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
-############################
-
-TkLabel.new(:text=>'Sample of TkOptionMenu').pack(:side=>:top)
-
-colors = %w(Black red4 DarkGreen NavyBlue gray75 Red Green Blue gray50 
-            Yellow Cyan Magenta White Brown DarkSeaGreen DarkViolet)
-
-TkFrame.new{|f|
-  pack(:side=>:top) 
-
-  b1 = TkOptionMenubutton . 
-    new(:parent=>f, :values=>%w(one two three)) . 
-    pack(:side=>:left, :padx=>25, :pady=>25)
-
-  b2 = TkOptionMenubutton.new(:parent=>f, :values=>colors) {|optMB|
-    colors.each{|color|
-      no_sel = TkPhotoImage.new(:height=>16, :width=>16){
-	put 'gray50', *[ 0,  0, 16,  1]
-	put 'gray50', *[ 0,  1,  1, 16]
-	put 'gray75', *[ 0, 15, 16, 16]
-	put 'gray75', *[15,  1, 16, 16]
-	put color,    *[ 1,  1, 15, 15]
-      }
-      sel = TkPhotoImage.new(:height=>16, :width=>16){
-	put 'Black',  *[ 0,  0, 16,  2]
-	put 'Black',  *[ 0,  2,  2, 16]
-	put 'Black',  *[ 2, 14, 16, 16]
-	put 'Black',  *[14,  2, 16, 14]
-	put color,    *[ 2,  2, 14, 14]
-      }
-      optMB.entryconfigure(color, :hidemargin=>1, 
-			   :image=>no_sel, :selectimage=>sel)
-    }
-    optMB.menuconfigure(:tearoff, 1)
-    %w(Black gray75 gray50 White).each{|color|
-      optMB.entryconfigure(color, :columnbreak=>true)
-    }
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-
-  TkButton.new(:parent=>f){
-    text 'show values'
-    command proc{p [b1.value, b2.value]}
-    pack(:side=>:left, :padx=>25, :pady=>5, :anchor=>:s)
-  }
-}
-
-############################
-TkFrame.new(:borderwidth=>2, :relief=>:sunken, 
-	    :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
-############################
-
-root = TkRoot.new(:title=>'menubutton samples')
-
-TkButton.new(root, :text=>'exit', :command=>proc{exit}){
-  pack(:side=>:top, :padx=>25, :pady=>5, :anchor=>:e)
-}
-
-# VirtualEvent <<MenuSelect>> on Tcl/Tk ==> '<MenuSelect>' on Ruby/Tk
-# ( remove the most external <, > for Ruby/Tk notation )
-TkMenu.bind('<MenuSelect>', proc{|widget|
-	      p widget.entrycget('active', :label)
-	    }, '%W')
-
-############################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkoptdb-safeTk.rb b/ext/tk/sample/tkoptdb-safeTk.rb
deleted file mode 100644
index a5e394b230..0000000000
--- a/ext/tk/sample/tkoptdb-safeTk.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'multi-tk'
-
-TkMessage.new(:text => <<EOM).pack
-This is a sample of the safe-Tk slave interpreter. \
-On the slave interpreter, 'tkoptdb.rb' demo is running. 
-( Attention:: a safe-Tk interpreter can't read options \
-from a file. Options are given by the master interpreter \
-in this script. )
-The window shown this message is a root widget of \
-the default master interpreter. The other window \
-is a toplevel widget of the master interpreter, and it \
-has a container frame of the safe-Tk slave interpreter. \
-You can delete the slave by the button on the toplevel widget.
-EOM
-
-if ENV['LANG'] =~ /^ja/
-  # read Japanese resource
-  ent = TkOptionDB.read_entries(File.expand_path('resource.ja', 
-						 File.dirname(__FILE__)),
-				'euc-jp')
-else
-  # read English resource
-  ent = TkOptionDB.read_entries(File.expand_path('resource.en', 
-						File.dirname(__FILE__)))
-end
-file = File.expand_path('tkoptdb.rb', File.dirname(__FILE__))
-MultiTkIp.new_safeTk{
-  ent.each{|pat, val| TkOptionDB.add(pat, val)}
-  load file
-}
-# Tk.mainloop is ignored on the slave-IP
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkoptdb.rb b/ext/tk/sample/tkoptdb.rb
deleted file mode 100644
index ab8515ac16..0000000000
--- a/ext/tk/sample/tkoptdb.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  sample script of TkOptionDB
-#
-#  If 'LANG' environment variable's value is started by 'ja',  
-#  then read Japanese resource data and display Japanese button text. 
-#  In other case, read English resource data and display English text. 
-#
-require "tk"
-
-if __FILE__ == $0 || !TkCore::INTERP.safe?
-  if ENV['LANG'] =~ /^ja/
-    # read Japanese resource
-    TkOptionDB.read_with_encoding(File.expand_path('resource.ja', 
-						   File.dirname(__FILE__)), 
-				  'euc-jp')
-  else
-    # read English resource
-    TkOptionDB.readfile(File.expand_path('resource.en', 
-					 File.dirname(__FILE__)))
-  end
-end
-
-# 'show_msg' and 'bye_msg' procedures can be defined on BTN_CMD resource.
-# Those procedures are called under $SAFE==2
-cmd = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3) {
-  # If you want to check resource string (str), 
-  # please define __check_proc_string__(str) like this.
-  class << self
-    def __check_proc_string__(str)
-      print "($SAFE=#{$SAFE} >>>) check!! str.tainted?::#{str.tainted?}"
-      str.untaint
-      print "==>#{str.tainted?} (<<< $SAFE=#{$SAFE}): "
-      str
-    end
-  end
-}
-
-# following two frame widgets use same database entry
-TkFrame.new(:class=>'BtnFrame'){|f|
-  pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
-    command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
-      cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
-    } 
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-  TkButton.new(:command=>proc{
-		 print "($SAFE=#{$SAFE} >>>) : "
-		 cmd.bye_msg
-		 print "(<<< $SAFE=#{$SAFE} ) : "
-		 exit
-	       }, 
-	       :parent=>f, :widgetname=>'quit'){
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-}
-
-class BtnFrame < TkFrame; end
-BtnFrame.new{|f|
-  pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
-    command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
-      cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
-    } 
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-  TkButton.new(:command=>proc{
-		 print "($SAFE=#{$SAFE} >>>) : "
-		 cmd.bye_msg
-		 print "(<<< $SAFE=#{$SAFE})"
-		 exit
-	       }, 
-	       :parent=>f, :widgetname=>'quit'){
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-}
-
-# if unknown class, use default option values
-TkFrame.new(:class=>'BtnFrame2'){|f|
-  pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
-    command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
-      cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
-    } 
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-  TkButton.new(:command=>proc{
-		 print "($SAFE=#{$SAFE} >>>) : "
-		 cmd.bye_msg
-		 print "(<<< $SAFE=#{$SAFE})"
-		 exit
-	       }, 
-	       :parent=>f, :widgetname=>'quit'){
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/tktimer.rb b/ext/tk/sample/tktimer.rb
index b1adb5b506..34377e2f39 100644
--- a/ext/tk/sample/tktimer.rb
+++ b/ext/tk/sample/tktimer.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/local/bin/ruby
 # This script generates a counter with start and stop buttons.
 
 require "tk"
diff --git a/ext/tk/sample/tktimer2.rb b/ext/tk/sample/tktimer2.rb
deleted file mode 100644
index dd31bb098e..0000000000
--- a/ext/tk/sample/tktimer2.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class.
-
-require "tk"
-
-# new notation :
-#   * symbols are acceptable as keys or values of the option hash
-#   * the parent widget can be given by :parent key on the option hash 
-root = TkRoot.new(:title=>'timer sample')
-label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
-               .pack(:side=>:bottom, :fill=>:both)
-
-# define the procedure repeated by the TkTimer object
-tick = proc{|aobj| #<== TkTimer object
-  cnt = aobj.return_value + 5 # return_value keeps a result of the last proc
-  label.text format("%d.%02d", *(cnt.divmod(100)))
-  cnt #==> return value is kept by TkTimer object
-      #    (so, can be send to the next repeat-proc)
-}
-
-timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-        # ==> repeat-interval : (about) 50 ms,  
-        #     repeat : infinite (-1) times, 
-        #     repeat-procedure : tick (only one, in this case)
-        #
-        # ==> wait-before-call-init-proc : 0 ms, 
-        #     init_proc : proc{ label.text('0.00'); 0 }
-        #
-        # (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
-
-TkButton.new(:text=>'Start') {
-  command proc{ timer.continue unless timer.running? }
-  pack(:side=>:left, :fill=>:both, :expand=>true)
-}
-TkButton.new(:text=>'Restart') {
-  command proc{ timer.restart(0, proc{ label.text('0.00'); 0 }) }
-  pack(:side=>:left, :fill=>:both, :expand=>true)
-}
-TkButton.new(:text=>'Stop') {
-  command proc{ timer.stop if timer.running? }
-  pack('side'=>'right','fill'=>'both','expand'=>'yes')
-}
-
-ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
-Tk.root.bind(ev_quit, proc{Tk.exit}).focus
-
-Tk.mainloop
diff --git a/ext/tk/sample/tktimer3.rb b/ext/tk/sample/tktimer3.rb
deleted file mode 100644
index e3bb4c3e4a..0000000000
--- a/ext/tk/sample/tktimer3.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env ruby
-# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class.
-
-require "tk"
-
-# new notation :
-#   * symbols are acceptable as keys or values of the option hash
-#   * the parent widget can be given by :parent key on the option hash 
-root = TkRoot.new(:title=>'timer sample')
-label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
-               .pack(:side=>:bottom, :fill=>:both)
-
-# define the procedure repeated by the TkTimer object
-tick = proc{|aobj| #<== TkTimer object
-  cnt = aobj.return_value + 5 # return_value keeps a result of the last proc
-  label.text format("%d.%02d", *(cnt.divmod(100)))
-  cnt #==> return value is kept by TkTimer object
-      #    (so, can be send to the next repeat-proc)
-}
-
-timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-        # ==> repeat-interval : (about) 50 ms,  
-        #     repeat : infinite (-1) times, 
-        #     repeat-procedure : tick (only one, in this case)
-        #
-        # ==> wait-before-call-init-proc : 0 ms, 
-        #     init_proc : proc{ label.text('0.00'); 0 }
-        #
-        # (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
-
-b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
-  pack(:side=>:left, :fill=>:both, :expand=>true)
-}
-
-b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-b_start.command {
-  timer.continue
-  b_stop.state(:normal)
-  b_start.state(:disabled)
-}
-
-b_stop.command {
-  timer.stop
-  b_start.state(:normal)
-  b_stop.state(:disabled)
-}
-
-TkButton.new(:text=>'Reset', :state=>:normal) {
-  command { timer.reset }
-  pack(:side=>:right, :fill=>:both, :expand=>:yes)
-}
-
-ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
-Tk.root.bind(ev_quit, proc{Tk.exit}).focus
-
-Tk.mainloop
diff --git a/ext/tk/tkutil.c b/ext/tk/tkutil.c
index b42069e234..efa3fd735d 100644
--- a/ext/tk/tkutil.c
+++ b/ext/tk/tkutil.c
@@ -18,7 +18,7 @@ tk_eval_cmd(argc, argv)
     VALUE cmd, rest;
 
     rb_scan_args(argc, argv, "1*", &cmd, &rest);
-    return rb_eval_cmd(cmd, rest, 0);
+    return rb_eval_cmd(cmd, rest);
 }
 
 static VALUE
@@ -29,11 +29,10 @@ tk_s_new(argc, argv, klass)
 {
     VALUE obj = rb_class_new_instance(argc, argv, klass);
 
-    if (rb_block_given_p()) rb_obj_instance_eval(0, 0, obj);
+    if (rb_iterator_p()) rb_obj_instance_eval(0, 0, obj);
     return obj;
 }
 
-void
 Init_tkutil()
 {
     VALUE mTK = rb_define_module("TkUtil");
diff --git a/ext/win32ole/.cvsignore b/ext/win32ole/.cvsignore
deleted file mode 100644
index 44e7f262dc..0000000000
--- a/ext/win32ole/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.log
diff --git a/ext/win32ole/MANIFEST b/ext/win32ole/MANIFEST
deleted file mode 100644
index 8e9bd46211..0000000000
--- a/ext/win32ole/MANIFEST
+++ /dev/null
@@ -1,24 +0,0 @@
-MANIFEST
-depend
-doc/win32ole.rd
-extconf.rb
-lib/win32ole/property.rb
-sample/excel1.rb
-sample/excel2.rb
-sample/excel3.rb
-sample/ie.rb
-sample/ieconst.rb
-sample/ienavi.rb
-sample/oledirs.rb
-sample/olegen.rb
-sample/xml.rb
-tests/oleserver.rb
-tests/testOLEEVENT.rb
-tests/testOLEMETHOD.rb
-tests/testOLEPARAM.rb
-tests/testOLETYPE.rb
-tests/testOLEVARIABLE.rb
-tests/testVARIANT.rb
-tests/testWIN32OLE.rb
-tests/testall.rb
-win32ole.c
diff --git a/ext/win32ole/depend b/ext/win32ole/depend
deleted file mode 100644
index 4bf5ab5b94..0000000000
--- a/ext/win32ole/depend
+++ /dev/null
@@ -1 +0,0 @@
-win32ole.o : win32ole.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h 
diff --git a/ext/win32ole/doc/win32ole.rd b/ext/win32ole/doc/win32ole.rd
deleted file mode 100644
index c563ce5d5b..0000000000
--- a/ext/win32ole/doc/win32ole.rd
+++ /dev/null
@@ -1,294 +0,0 @@
-=begin
-= Win32OLE extension module
-
-== WIN32OLE 
-=== Constants
-: VERSION
-    The version number of WIN32OLE.
-
-: ARGV
-    The argument of the method invoked recently.
-    This constant is used to get value of argument 
-    when the argument is passed by reference.
-
-=== Class Method
-: connect(oleserver)
-   returns running OLE automation object or WIN32OLE object from moniker.
-
-: const_load(ole [,obj])
-   defines the constants of OLE automation
-   server as 'obj' class constants. If 'obj' omitted, the default
-   is WIN32OLE.
-
-: new(oleserver)
-   returns OLE Automation object.
-
-: ole_free(obj)
-   invokes Release method of Dispatch interface of WIN32OLE object.
-   This method should not be used because this method exists for debugging WIN32OLE.
-
-: ole_reference_count(obj)
-   returns reference counter of Dispatch interface.
-   This method should not be used because this method exists for debugging WIN32OLE.
-
-: ole_show_help(info [,helpcontext])
-   displays helpfile.
-   The first argument specifies WIN32OLE_TYPE object or WIN32OLE_METHOD object 
-   or helpfile.
-
-=== Method
-: self[property]
-   gets property of OLE object.
-
-: self[property]=
-   sets property of OLE object.
-
-: _invoke(dispid, args, types)
-   runs the early binding method.
-   The dispid specifies Dispatch ID, args specifies the array of arguments,
-   types specifies array of the type of arguments.
-
-: each {...}
-   Iterates over each item of OLE collection which has IEnumVARIANT
-   interface.
-
-: invoke(method, args,...)
-   runs OLE method.
-
-: ole_func_methods
-   returns array of WIN32OLE_METHOD object which corresponds with function.
-
-: ole_get_methods
-   returns array of WIN32OLE_METHOD object which corresponds with get properties.
-
-: ole_method(method)
-   returns WIN32OLE_METHOD object which coreesponds with method 
-   which specified by argument.
-
-: ole_method_help(method)
-   alias of ole_method.
-
-: ole_methods
-   returns WIN32OLE_METHOD object which coreesponds with method.
-
-: ole_obj_help
-   returns WIN32OLE_TYPE object.
-
-: ole_put_methods
-   returns array of WIN32OLE_METHOD object which corresponds with put properties.
-
-: setproperty(property, key, val)
-   set property of OLE object. 
-   This method is used when the property has argument.
-
-   For example, in VB
-     obj.item("key") = val
-   in Win32OLE
-     obj.setproperty("item", "key", val)
-
-
-== WIN32OLE_EVENT class
-
-=== Class Method
-
-: new(ole, interface)
-   The new class method creates OLE event sink object to connect ole.
-   The ole must be WIN32OLE object, and interface is the interface
-   name of event.
-
-: message_loop
-    The message_loop class method translates and dispatches Windows 
-    message.
-
-=== Method
-: on_event([event]){...}
-    defines the callback of event.
-    If event omitted, defines the callback of all events.
-
-: on_event_with_outargs([event]) {...}
-    defines the callback of event.
-    If you want modify argument in callback, 
-
-== WIN32OLE_METHOD
-
-=== Class Methods
-: new(win32ole_type, method)    
-   creates WIN32OLE_METHOD object.
-
-=== Methods
-: dispid
-   returns Dispatch ID.
-
-: event?
-   returns true if the method is event.
-
-: event_interface
-   returns interface name of event if the method is event.
-
-: helpcontext
-   returns help context.
-
-: helpfile
-   returns help file.
-
-: invkind
-   returns invkind.
-
-: invoke_kind
-   returns invoke kind string.
-
-: name
-   returns name of method.
-
-: offset_vtbl
-   returns the offset of Vtbl.
-
-: params
-   returns array of WIN32OLE_PARAM object.
-
-: return_type
-   returns string of return value type of method.
-
-: return_vtype
-   returns number of return value type of method.
-
-: return_type_detail
-   returns detail information of return value type of method.
-
-: size_params
-   returns the size of arguments.
-
-: size_opt_params
-   returns the size of optional arguments.
-
-: visible?
-   returns true if the method is public.
-
-== WIN32OLE_PARAM
-: default
-   returns default value.
-
-: input?
-   returns true if argument is input.
-
-: optional?
-   returns true if argument is optional.
-
-: output?
-   returns true if argument is output.
-
-: name
-   returns name.
-
-: ole_type
-   returns type of argument.
-
-: ole_type_detail
-   returns detail information of type of argument.
-
-: retval?
-   returns true if argument is return value.
-
-== WIN32OLE_TYPE
-=== Class Methods
-: new(typelibrary, class)
-    returns WIN32OLE_TYPE object.
-
-: ole_classes(typelibrary)
-    returns array of WIN32OLE_TYPE objects defined by Type Library.
-
-: progids
-    returns array of ProgID.
-
-: typelibs
-    returns array of type libraries.
-
-=== Methods
-: guid
-   returns GUID.
-
-: helpfile
-   returns helpfile.
-
-: helpcontext
-   returns helpcontext.
-
-: helpstring
-   returns help string.
-
-: major_version
-   returns major version.
-
-: minor_version
-   returns minor version.
-
-: name
-   returns name.
-
-: ole_methods
-   returns array of WIN32OLE_METHOD objects.
-
-: ole_type
-   returns type of class.
-
-: progid
-   returns ProgID if it exists. If not found, then returns nil.
-
-: src_type
-   returns source class when the OLE class is 'Alias'.
-
-: typekind
-   returns number which represents type.
-
-: variables
-   returns array of variables defined in OLE class.
-
-: visible?
-   returns true if the OLE class is public.
-
-== WIN32OLE_VARIABLE
-=== Methods
-: name
-   returns the name.
-
-: ole_type
-   returns type
-
-: ole_type_detail
-   returns detail information of type.
-
-: value
-   returns value.
-
-: variable_kind
-   returns variable kind string.
-
-: varkind
-   returns the number which represents variable kind.
-
-== WIN32OLE::VARIANT
-=== Constants
-  *VT_I4
-  *VT_R4
-  *VT_R8
-  *VT_CY
-  *VT_DATE
-  *VT_BSTR
-  *VT_USERDEFINED
-  *VT_PTR
-  *VT_DISPATCH
-  *VT_ERROR
-  *VT_BOOL
-  *VT_VARIANT
-  *VT_UNKNOWN
-  *VT_I1
-  *VT_UI1
-  *VT_UI2
-  *VT_UI4
-  *VT_INT
-  *VT_UINT
-  *VT_ARRAY
-  *VT_BYREF
-
-=end
-
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
deleted file mode 100644
index 4afe1117eb..0000000000
--- a/ext/win32ole/extconf.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#----------------------------------
-# extconf.rb
-# $Revision$
-# $Date$
-#----------------------------------
-require 'mkmf'
-
-def create_win32ole_makefile
-  if have_library("ole32") and
-     have_library("oleaut32") and
-     have_library("uuid") and 
-     have_library("user32") and
-     have_library("advapi32") and
-     have_header("windows.h")
-    create_makefile("win32ole")
-  end
-end
-
-case RUBY_PLATFORM
-when /mswin32/
-  $CFLAGS += ' /W3'
-when /cygwin/, /mingw/
-  $defs << '-DNONAMELESSUNION'
-end
-create_win32ole_makefile
diff --git a/ext/win32ole/lib/win32ole/property.rb b/ext/win32ole/lib/win32ole/property.rb
deleted file mode 100644
index a68bad9af8..0000000000
--- a/ext/win32ole/lib/win32ole/property.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# OLEProperty
-# helper class of Property with arguments.
-class OLEProperty
-  def initialize(obj, dispid, gettypes, settypes)
-    @obj = obj
-    @dispid = dispid
-    @gettypes = gettypes
-    @settypes = settypes
-  end
-  def [](*args)
-    @obj._getproperty(@dispid, args, @gettypes)
-  end
-  def []=(*args)
-    @obj._setproperty(@dispid, args, @settypes)
-  end
-end
diff --git a/ext/win32ole/sample/excel1.rb b/ext/win32ole/sample/excel1.rb
deleted file mode 100644
index e366a52839..0000000000
--- a/ext/win32ole/sample/excel1.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'win32ole'
-
-#application = WIN32OLE.new('Excel.Application.5')
-application = WIN32OLE.new('Excel.Application')
-
-application.visible = TRUE
-workbook = application.Workbooks.Add();
-worksheet = workbook.Worksheets(1);
-worksheet.Range("A1:D1").value = ["North","South","East","West"];
-worksheet.Range("A2:B2").value = [5.2, 10];
-worksheet.Range("C2").value = 8;
-worksheet.Range("D2").value = 20;
-
-range = worksheet.Range("A1:D2");
-range.Select
-chart = workbook.Charts.Add;
-
-workbook.saved = TRUE;
-
-application.ActiveWorkbook.Close(0);
-application.Quit();
-
diff --git a/ext/win32ole/sample/excel2.rb b/ext/win32ole/sample/excel2.rb
deleted file mode 100644
index 46f459b36b..0000000000
--- a/ext/win32ole/sample/excel2.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'win32ole'
-
-#   -4100 is the value for the Excel constant xl3DColumn.
-ChartTypeVal = -4100;
-
-#   Creates OLE object to Excel
-#excel = WIN32OLE.new("excel.application.5")
-excel = WIN32OLE.new("excel.application")
-
-# Create and rotate the chart
-
-excel['Visible'] = TRUE;
-excel.Workbooks.Add();
-excel.Range("a1")['Value'] = 3;
-excel.Range("a2")['Value'] = 2;
-excel.Range("a3")['Value'] = 1;
-excel.Range("a1:a3").Select();
-excelchart = excel.Charts.Add();
-excelchart['Type'] = ChartTypeVal;
-
-i = 30
-i.step(180, 10) do |rot|
-#    excelchart['Rotation'] = rot;
-    excelchart.rotation=rot;
-end
-# Done, bye
-
-excel.ActiveWorkbook.Close(0);
-excel.Quit();
-
diff --git a/ext/win32ole/sample/excel3.rb b/ext/win32ole/sample/excel3.rb
deleted file mode 100644
index 0f96717063..0000000000
--- a/ext/win32ole/sample/excel3.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'win32ole'
-
-#application = WIN32OLE.new('Excel.Application.5')
-application = WIN32OLE.new('Excel.Application')
-
-application.visible = TRUE
-workbook = application.Workbooks.Add();
-sheet = workbook.Worksheets(1);
-sheetS = workbook.Worksheets
-puts "The number of sheets is #{sheetS.count}"
-puts "Now add 2 sheets after of `#{sheet.name}`"
-sheetS.add({'count'=>2, 'after'=>sheet})
-puts "The number of sheets is #{sheetS.count}"
diff --git a/ext/win32ole/sample/ie.rb b/ext/win32ole/sample/ie.rb
deleted file mode 100644
index 11dc861e0b..0000000000
--- a/ext/win32ole/sample/ie.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'win32ole'
-url = 'http://www.ruby-lang.org/'
-ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = TRUE
-ie.gohome
-print "Now navigate Ruby home page... Please enter."
-gets
-ie.navigate(url)
-print "Now quit Internet Explorer... Please enter."
-gets
-ie.Quit()
diff --git a/ext/win32ole/sample/ieconst.rb b/ext/win32ole/sample/ieconst.rb
deleted file mode 100644
index 234272c7ed..0000000000
--- a/ext/win32ole/sample/ieconst.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'win32ole'
-
-ie = WIN32OLE.new('InternetExplorer.Application')
-=begin
-WIN32OLE.const_load(ie)
-WIN32OLE.constants.sort.each do |c|
-  puts "#{c} = #{WIN32OLE.const_get(c)}"
-end
-=end
-
-module IE_CONST
-end
-
-WIN32OLE.const_load(ie, IE_CONST)
-IE_CONST.constants.sort.each do |c|
-  puts "#{c} = #{IE_CONST.const_get(c)}"
-end
-
-#------------------------------------------------------------
-# Remark!!! CONSTANTS has not tested enoughly!!!
-# CONSTANTS is alpha release.
-# If there are constants which first letter is not [a-zA-Z],
-# like a '_Foo', then maybe you can access the value by 
-# using CONSTANTS['_Foo']
-#------------------------------------------------------------
-IE_CONST::CONSTANTS.each do |k, v|
-  puts "#{k} = #{v}"
-end
-
-puts WIN32OLE::VERSION
-ie.quit
-
diff --git a/ext/win32ole/sample/ienavi.rb b/ext/win32ole/sample/ienavi.rb
deleted file mode 100644
index c7fa3f5ec2..0000000000
--- a/ext/win32ole/sample/ienavi.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'win32ole'
-
-$urls = []
-
-def navigate(url)
-  $urls << url
-end
-
-def stop_msg_loop
-  puts "Now Stop IE..."
-  $LOOP = FALSE;
-end
-
-def default_handler(event, *args)
-  case event
-  when "BeforeNavigate"
-    puts "Now Navigate #{args[0]}..."
-  end
-end
-
-ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = TRUE
-ie.gohome
-
-ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
-
-ev.on_event {|*args| default_handler(*args)}
-ev.on_event("NavigateComplete") {|url| navigate(url)}
-ev.on_event("Quit") {|*args| stop_msg_loop} 
-
-$LOOP = TRUE
-while ($LOOP)
-  WIN32OLE_EVENT.message_loop
-end
-
-puts "You Navigated the URLs ..."
-$urls.each_with_index do |url, i|
-  puts "(#{i+1}) #{url}"
-end
-
diff --git a/ext/win32ole/sample/oledirs.rb b/ext/win32ole/sample/oledirs.rb
deleted file mode 100644
index 1c77e76f14..0000000000
--- a/ext/win32ole/sample/oledirs.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# You need WSH(Windows Scripting Host) to run this script.
-#
-
-require "win32ole"
-
-def listup(items)
-#  items.each do |i|
-  for i in items
-    puts i.name 
-  end
-end
-
-fs = WIN32OLE.new("Scripting.FileSystemObject")
-
-folder = fs.GetFolder(".")
-
-puts "--- folder of #{folder.path} ---"
-listup(folder.SubFolders)
-
-puts "--- files of #{folder.path} ---"
-listup(folder.Files)
-
diff --git a/ext/win32ole/sample/olegen.rb b/ext/win32ole/sample/olegen.rb
deleted file mode 100644
index 48d86893fe..0000000000
--- a/ext/win32ole/sample/olegen.rb
+++ /dev/null
@@ -1,348 +0,0 @@
-#-----------------------------
-# olegen.rb
-# $Date$
-# $Revision$
-#-----------------------------
-
-require 'win32ole'
-
-class WIN32COMGen
-  def initialize(typelib)
-    @typelib = typelib
-    @reciever = ""
-  end
-  attr_reader :typelib
-
-  def ole_classes(typelib)
-    begin
-      @ole = WIN32OLE.new(typelib)
-      [@ole.ole_obj_help]
-    rescue
-      WIN32OLE_TYPE.ole_classes(typelib)
-    end
-  end
-
-  def generate_args(method)
-    args = []
-    if method.size_opt_params >= 0
-      size_required_params = method.size_params - method.size_opt_params
-    else
-      size_required_params = method.size_params - 1
-    end
-    size_required_params.times do |i|
-      if method.params[i] && method.params[i].optional?
-        args.push "arg#{i}=nil"
-      else
-        args.push "arg#{i}"
-      end
-    end
-    if method.size_opt_params >= 0
-      method.size_opt_params.times do |i|
-        args.push "arg#{i + size_required_params}=nil"
-      end
-    else
-      args.push "*arg"
-    end
-    args.join(", ")
-  end
-
-  def generate_argtype(typedetails)
-    ts = ''
-    typedetails.each do |t|
-      case t
-      when 'CARRAY', 'VOID', 'UINT', 'RESULT', 'DECIMAL', 'I8', 'UI8' 
-#	  raise "Sorry type\"" + t + "\" not supported"
-      ts << "\"??? NOT SUPPORTED TYPE:`#{t}'\""
-      when 'USERDEFINED', 'Unknown Type 9'
-        ts << 'VT_DISPATCH'
-        break;
-      when 'SAFEARRAY'
-        ts << 'VT_ARRAY|'
-      when 'PTR'
-        ts << 'VT_BYREF|'
-      when 'INT'
-        ts << 'VT_I4'
-      else
-        if String === t
-          ts << 'VT_' + t
-        end
-      end
-    end
-    if ts.empty?
-      ts = 'VT_VARIANT'
-    elsif ts[-1] == ?|
-	ts += 'VT_VARIANT'
-    end
-    ts
-  end
-
-  def generate_argtypes(method, proptypes)
-    types = method.params.collect{|param|
-      generate_argtype(param.ole_type_detail)
-    }.join(", ")
-    if proptypes
-      types += ", " if types.size > 0 
-      types += generate_argtype(proptypes)
-    end
-    types
-  end
-
-  def generate_method_body(method, disptype, types=nil)
-    "    ret = #{@reciever}#{disptype}(#{method.dispid}, [" +
-    generate_args(method).gsub("=nil", "") +
-    "], [" +
-    generate_argtypes(method, types) +
-    "])\n" +
-    "    @lastargs = WIN32OLE::ARGV\n" +
-    "    ret"
-  end
-
-  def generate_method_help(method, type = nil)
-    str = "  # "  
-    if type 
-      str += type
-    else
-      str += method.return_type
-    end
-    str += " #{method.name}"
-    if method.event?
-      str += " EVENT"
-      str += " in #{method.event_interface}"
-    end
-    if method.helpstring && method.helpstring != ""
-      str += "\n  # "
-      str += method.helpstring
-    end
-    args_help = generate_method_args_help(method)
-    if args_help
-      str += "\n"
-      str += args_help
-    end
-    str
-  end
-
-  def generate_method_args_help(method)
-    args = []
-    method.params.each_with_index {|param, i|
-      h = "  #   #{param.ole_type} arg#{i} --- #{param.name}" 
-      inout = []
-      inout.push "IN" if param.input?
-      inout.push "OUT" if param.output?
-      h += " [#{inout.join('/')}]"
-      h += " ( = #{param.default})" if param.default
-      args.push h
-    }
-    if args.size > 0
-      args.join("\n")
-    else
-      nil
-    end
-  end
-
-  def generate_method(method, disptype, io = STDOUT, types = nil)
-    io.puts "\n"
-    io.puts  generate_method_help(method)
-    if method.invoke_kind == 'PROPERTYPUT'
-      io.print "  def #{method.name}=("
-    else
-      io.print "  def #{method.name}("
-    end
-    io.print generate_args(method)
-    io.puts ")"
-    io.puts generate_method_body(method, disptype, types)
-    io.puts "  end"
-  end
-
-  def generate_propputref_methods(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == 'PROPERTYPUTREF' && method.visible?
-    }.each do |method|
-      generate_method(method, io)
-    end
-  end
-
-  def generate_properties_with_args(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == 'PROPERTYGET' &&
-      method.visible? &&
-      method.size_params > 0
-    }.each do |method|
-      types = method.return_type_detail 
-      io.puts "\n"
-      io.puts  generate_method_help(method, types[0])
-      io.puts  "  def #{method.name}"
-      if klass.ole_type == "Class"
-        io.print "    OLEProperty.new(@dispatch, #{method.dispid}, [" 
-      else
-        io.print "    OLEProperty.new(self, #{method.dispid}, [" 
-      end
-      io.print generate_argtypes(method, nil)
-      io.print "], ["
-      io.print generate_argtypes(method, types)
-      io.puts "])"
-      io.puts  "  end"
-    end
-  end
-
-  def generate_propput_methods(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == 'PROPERTYPUT' && method.visible? &&
-      method.size_params == 1
-    }.each do |method|
-      ms = klass.ole_methods.select {|m|
-        m.invoke_kind == 'PROPERTYGET' &&
-        m.dispid == method.dispid
-      }
-      types = []
-      if ms.size == 1
-        types = ms[0].return_type_detail
-      end
-      generate_method(method, '_setproperty', io, types)
-    end
-  end
-
-  def generate_propget_methods(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == 'PROPERTYGET' && method.visible? &&
-      method.size_params == 0
-    }.each do |method|
-      generate_method(method, '_getproperty', io)
-    end
-  end
-
-  def generate_func_methods(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == "FUNC" && method.visible?
-    }.each do |method|
-      generate_method(method, '_invoke', io)
-    end
-  end
-
-  def generate_methods(klass, io = STDOUT)
-    generate_propget_methods(klass, io)
-    generate_propput_methods(klass, io)
-    generate_properties_with_args(klass, io)
-    generate_func_methods(klass, io)
-#   generate_propputref_methods(klass, io)
-  end
-
-  def generate_constants(klass, io = STDOUT)
-    klass.variables.select {|v|
-      v.visible? && v.variable_kind == 'CONSTANT'
-    }.each do |v|
-      io.print "  "
-      io.print v.name.sub(/^./){|c| c.upcase}
-      io.print " = "
-      io.puts  v.value
-    end
-  end
-
-  def class_name(klass)
-    klass_name = klass.name
-    if klass.ole_type == "Class" &&
-       klass.guid &&
-       klass.progid
-       klass_name = klass.progid.gsub(/\./, '_')
-    end
-    if /^[A-Z]/ !~ klass_name || Module.constants.include?(klass_name)
-      klass_name = 'OLE' + klass_name
-    end
-    klass_name
-  end
-
-  def define_initialize(klass)
-    <<STR
-
-  def initialize(obj = nil)
-    @clsid = "#{klass.guid}"
-    @progid = "#{klass.progid}"
-    if obj.nil?
-      @dispatch = WIN32OLE.new @progid
-    else
-      @dispatch = obj
-    end
-  end
-STR
-  end
-
-  def define_include
-    "  include WIN32OLE::VARIANT"
-  end
-
-  def define_instance_variables
-    "  attr_reader :lastargs"
-  end
-
-  def define_method_missing
-    <<STR
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-STR
-  end
-
-  def define_class(klass, io = STDOUT)
-    io.puts "class #{class_name(klass)} # #{klass.name}"
-    io.puts define_include
-    io.puts define_instance_variables
-    io.puts "  attr_reader :dispatch"
-    io.puts "  attr_reader :clsid"
-    io.puts "  attr_reader :progid"
-    io.puts define_initialize(klass)
-    io.puts define_method_missing
-  end
-
-  def define_module(klass, io = STDOUT)
-    io.puts "module #{class_name(klass)}"
-    io.puts define_include
-    io.puts define_instance_variables
-  end
-
-  def generate_class(klass, io = STDOUT)
-    io.puts "\n# #{klass.helpstring}"
-    if klass.ole_type == "Class" &&
-       klass.guid &&
-       klass.progid
-      @reciever = "@dispatch."
-      define_class(klass, io)
-    else
-      @reciever = ""
-      define_module(klass, io)
-    end
-    generate_constants(klass, io)
-    generate_methods(klass, io)
-    io.puts "end"
-  end
-
-  def generate(io = STDOUT)
-    io.puts "require 'win32ole'"
-    io.puts "require 'win32ole/property'"
-
-    ole_classes(typelib).select{|klass|
-      klass.visible? &&
-      (klass.ole_type == "Class" || 
-       klass.ole_type == "Interface" || 
-       klass.ole_type == "Dispatch" ||
-       klass.ole_type == "Enum")
-    }.each do |klass|
-      generate_class(klass, io)
-    end
-    begin
-      @ole.quit if @ole
-    rescue 
-    end
-  end
-end
-
-require 'win32ole'
-if __FILE__ == $0
-  if ARGV.size == 0
-    $stderr.puts "usage: #{$0} Type Library [...]"
-    exit 1
-  end
-  ARGV.each do |typelib|
-    comgen = WIN32COMGen.new(typelib)
-    comgen.generate
-  end
-end
diff --git a/ext/win32ole/sample/xml.rb b/ext/win32ole/sample/xml.rb
deleted file mode 100644
index b95d6d5275..0000000000
--- a/ext/win32ole/sample/xml.rb
+++ /dev/null
@@ -1,7306 +0,0 @@
-# 
-# This file created by olegen.rb as following.
-#    ruby olegen.rb 'Microsoft XML, version 2.0' > xml.rb
-# 
-require 'win32ole'
-require 'win32ole/property'
-
-# 
-module IXMLDOMImplementation
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BOOL hasFeature
-  #   BSTR arg0 --- feature [IN]
-  #   BSTR arg1 --- version [IN]
-  def hasFeature(arg0, arg1)
-    ret = _invoke(145, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# Core DOM node interface
-module IXMLDOMNode
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# Constants that define a node's type
-module OLEtagDOMNodeType
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  NODE_INVALID = 0
-  NODE_ELEMENT = 1
-  NODE_ATTRIBUTE = 2
-  NODE_TEXT = 3
-  NODE_CDATA_SECTION = 4
-  NODE_ENTITY_REFERENCE = 5
-  NODE_ENTITY = 6
-  NODE_PROCESSING_INSTRUCTION = 7
-  NODE_COMMENT = 8
-  NODE_DOCUMENT = 9
-  NODE_DOCUMENT_TYPE = 10
-  NODE_DOCUMENT_FRAGMENT = 11
-  NODE_NOTATION = 12
-end
-
-# 
-module IXMLDOMNodeList
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # I4 length
-  # number of nodes in the collection
-  def length()
-    ret = _getproperty(74, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # PTR item
-  # collection of nodes
-  #   I4 arg0 --- index [IN]
-  def item
-    OLEProperty.new(self, 0, [VT_I4], [VT_I4, VT_BYREF|VT_DISPATCH])
-  end
-
-  # IXMLDOMNode nextNode
-  # get next node from iterator
-  def nextNode()
-    ret = _invoke(76, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID reset
-  # reset the position of iterator
-  def reset()
-    ret = _invoke(77, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMNamedNodeMap
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # I4 length
-  # number of nodes in the collection
-  def length()
-    ret = _getproperty(74, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # PTR item
-  # collection of nodes
-  #   I4 arg0 --- index [IN]
-  def item
-    OLEProperty.new(self, 0, [VT_I4], [VT_I4, VT_BYREF|VT_DISPATCH])
-  end
-
-  # IXMLDOMNode getNamedItem
-  # lookup item by name
-  #   BSTR arg0 --- name [IN]
-  def getNamedItem(arg0)
-    ret = _invoke(83, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode setNamedItem
-  # set item by name
-  #   IXMLDOMNode arg0 --- newItem [IN]
-  def setNamedItem(arg0)
-    ret = _invoke(84, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeNamedItem
-  # remove item by name
-  #   BSTR arg0 --- name [IN]
-  def removeNamedItem(arg0)
-    ret = _invoke(85, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode getQualifiedItem
-  # lookup the item by name and namespace
-  #   BSTR arg0 --- baseName [IN]
-  #   BSTR arg1 --- namespaceURI [IN]
-  def getQualifiedItem(arg0, arg1)
-    ret = _invoke(87, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeQualifiedItem
-  # remove the item by name and namespace
-  #   BSTR arg0 --- baseName [IN]
-  #   BSTR arg1 --- namespaceURI [IN]
-  def removeQualifiedItem(arg0, arg1)
-    ret = _invoke(88, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextNode
-  # get next node from iterator
-  def nextNode()
-    ret = _invoke(89, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID reset
-  # reset the position of iterator
-  def reset()
-    ret = _invoke(90, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMDocument
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentType doctype
-  # node corresponding to the DOCTYPE
-  def doctype()
-    ret = _getproperty(38, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMImplementation implementation
-  # info on this DOM implementation
-  def implementation()
-    ret = _getproperty(39, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement documentElement
-  # the root of the tree
-  def documentElement()
-    ret = _getproperty(40, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # get the state of the XML document
-  def readyState()
-    ret = _getproperty(-525, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMParseError parseError
-  # get the last parser error
-  def parseError()
-    ret = _getproperty(59, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR url
-  # get the URL for the loaded XML document
-  def url()
-    ret = _getproperty(60, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL async
-  # flag for asynchronous download
-  def async()
-    ret = _getproperty(61, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse()
-    ret = _getproperty(65, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals()
-    ret = _getproperty(66, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace()
-    ret = _getproperty(67, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID async
-  # flag for asynchronous download
-  def async=(arg0)
-    ret = _setproperty(61, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse=(arg0)
-    ret = _setproperty(65, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals=(arg0)
-    ret = _setproperty(66, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace=(arg0)
-    ret = _setproperty(67, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # register a readystatechange event handler
-  def onreadystatechange=(arg0)
-    ret = _setproperty(68, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ondataavailable
-  # register an ondataavailable event handler
-  def ondataavailable=(arg0)
-    ret = _setproperty(69, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ontransformnode
-  # register an ontransformnode event handler
-  def ontransformnode=(arg0)
-    ret = _setproperty(70, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement createElement
-  # create an Element node
-  #   BSTR arg0 --- tagName [IN]
-  def createElement(arg0)
-    ret = _invoke(41, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentFragment createDocumentFragment
-  # create a DocumentFragment node
-  def createDocumentFragment()
-    ret = _invoke(42, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText createTextNode
-  # create a text node
-  #   BSTR arg0 --- data [IN]
-  def createTextNode(arg0)
-    ret = _invoke(43, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMComment createComment
-  # create a comment node
-  #   BSTR arg0 --- data [IN]
-  def createComment(arg0)
-    ret = _invoke(44, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMCDATASection createCDATASection
-  # create a CDATA section node
-  #   BSTR arg0 --- data [IN]
-  def createCDATASection(arg0)
-    ret = _invoke(45, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMProcessingInstruction createProcessingInstruction
-  # create a processing instruction node
-  #   BSTR arg0 --- target [IN]
-  #   BSTR arg1 --- data [IN]
-  def createProcessingInstruction(arg0, arg1)
-    ret = _invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute createAttribute
-  # create an attribute node
-  #   BSTR arg0 --- name [IN]
-  def createAttribute(arg0)
-    ret = _invoke(47, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMEntityReference createEntityReference
-  # create an entity reference node
-  #   BSTR arg0 --- name [IN]
-  def createEntityReference(arg0)
-    ret = _invoke(49, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList getElementsByTagName
-  # build a list of elements by name
-  #   BSTR arg0 --- tagName [IN]
-  def getElementsByTagName(arg0)
-    ret = _invoke(50, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode createNode
-  # create a node of the specified node type and name
-  #   VARIANT arg0 --- type [IN]
-  #   BSTR arg1 --- name [IN]
-  #   BSTR arg2 --- namespaceURI [IN]
-  def createNode(arg0, arg1, arg2)
-    ret = _invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nodeFromID
-  # retrieve node from it's ID
-  #   BSTR arg0 --- idString [IN]
-  def nodeFromID(arg0)
-    ret = _invoke(56, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL load
-  # load document from the specified XML source
-  #   VARIANT arg0 --- xmlSource [IN]
-  def load(arg0)
-    ret = _invoke(58, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # abort an asynchronous download
-  def abort()
-    ret = _invoke(62, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL loadXML
-  # load the document from a string
-  #   BSTR arg0 --- bstrXML [IN]
-  def loadXML(arg0)
-    ret = _invoke(63, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID save
-  # save the document to a specified desination
-  #   VARIANT arg0 --- desination [IN]
-  def save(arg0)
-    ret = _invoke(64, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMDocumentType
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR name
-  # name of the document type (root of the tree)
-  def name()
-    ret = _getproperty(131, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap entities
-  # a list of entities in the document
-  def entities()
-    ret = _getproperty(132, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap notations
-  # a list of notations in the document
-  def notations()
-    ret = _getproperty(133, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMElement
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR tagName
-  # get the tagName of the element
-  def tagName()
-    ret = _getproperty(97, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT getAttribute
-  # look up the string value of an attribute by name
-  #   BSTR arg0 --- name [IN]
-  def getAttribute(arg0)
-    ret = _invoke(99, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID setAttribute
-  # set the string value of an attribute by name
-  #   BSTR arg0 --- name [IN]
-  #   VARIANT arg1 --- value [IN]
-  def setAttribute(arg0, arg1)
-    ret = _invoke(100, [arg0, arg1], [VT_BSTR, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID removeAttribute
-  # remove an attribute by name
-  #   BSTR arg0 --- name [IN]
-  def removeAttribute(arg0)
-    ret = _invoke(101, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute getAttributeNode
-  # look up the attribute node by name
-  #   BSTR arg0 --- name [IN]
-  def getAttributeNode(arg0)
-    ret = _invoke(102, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute setAttributeNode
-  # set the specified attribute on the element
-  #   IXMLDOMAttribute arg0 --- DOMAttribute [IN]
-  def setAttributeNode(arg0)
-    ret = _invoke(103, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute removeAttributeNode
-  # remove the specified attribute
-  #   IXMLDOMAttribute arg0 --- DOMAttribute [IN]
-  def removeAttributeNode(arg0)
-    ret = _invoke(104, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList getElementsByTagName
-  # build a list of elements by name
-  #   BSTR arg0 --- tagName [IN]
-  def getElementsByTagName(arg0)
-    ret = _invoke(105, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID normalize
-  # collapse all adjacent text nodes in sub-tree
-  def normalize()
-    ret = _invoke(106, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMAttribute
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR name
-  # get name of the attribute
-  def name()
-    ret = _getproperty(118, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT value
-  # string value of the attribute
-  def value()
-    ret = _getproperty(120, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID value
-  # string value of the attribute
-  def value=(arg0)
-    ret = _setproperty(120, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMDocumentFragment
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMText
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # value of the node
-  def data()
-    ret = _getproperty(109, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 length
-  # number of characters in value
-  def length()
-    ret = _getproperty(110, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # value of the node
-  def data=(arg0)
-    ret = _setproperty(109, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR substringData
-  # retrieve substring of value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def substringData(arg0, arg1)
-    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID appendData
-  # append string to value
-  #   BSTR arg0 --- data [IN]
-  def appendData(arg0)
-    ret = _invoke(112, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID insertData
-  # insert string into value
-  #   I4 arg0 --- offset [IN]
-  #   BSTR arg1 --- data [IN]
-  def insertData(arg0, arg1)
-    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID deleteData
-  # delete string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def deleteData(arg0, arg1)
-    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID replaceData
-  # replace string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  #   BSTR arg2 --- data [IN]
-  def replaceData(arg0, arg1, arg2)
-    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText splitText
-  # split the text node into two text nodes at the position specified
-  #   I4 arg0 --- offset [IN]
-  def splitText(arg0)
-    ret = _invoke(123, [arg0], [VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMCharacterData
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # value of the node
-  def data()
-    ret = _getproperty(109, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 length
-  # number of characters in value
-  def length()
-    ret = _getproperty(110, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # value of the node
-  def data=(arg0)
-    ret = _setproperty(109, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR substringData
-  # retrieve substring of value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def substringData(arg0, arg1)
-    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID appendData
-  # append string to value
-  #   BSTR arg0 --- data [IN]
-  def appendData(arg0)
-    ret = _invoke(112, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID insertData
-  # insert string into value
-  #   I4 arg0 --- offset [IN]
-  #   BSTR arg1 --- data [IN]
-  def insertData(arg0, arg1)
-    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID deleteData
-  # delete string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def deleteData(arg0, arg1)
-    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID replaceData
-  # replace string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  #   BSTR arg2 --- data [IN]
-  def replaceData(arg0, arg1, arg2)
-    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMComment
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # value of the node
-  def data()
-    ret = _getproperty(109, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 length
-  # number of characters in value
-  def length()
-    ret = _getproperty(110, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # value of the node
-  def data=(arg0)
-    ret = _setproperty(109, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR substringData
-  # retrieve substring of value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def substringData(arg0, arg1)
-    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID appendData
-  # append string to value
-  #   BSTR arg0 --- data [IN]
-  def appendData(arg0)
-    ret = _invoke(112, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID insertData
-  # insert string into value
-  #   I4 arg0 --- offset [IN]
-  #   BSTR arg1 --- data [IN]
-  def insertData(arg0, arg1)
-    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID deleteData
-  # delete string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def deleteData(arg0, arg1)
-    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID replaceData
-  # replace string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  #   BSTR arg2 --- data [IN]
-  def replaceData(arg0, arg1, arg2)
-    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMCDATASection
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # value of the node
-  def data()
-    ret = _getproperty(109, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 length
-  # number of characters in value
-  def length()
-    ret = _getproperty(110, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # value of the node
-  def data=(arg0)
-    ret = _setproperty(109, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR substringData
-  # retrieve substring of value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def substringData(arg0, arg1)
-    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID appendData
-  # append string to value
-  #   BSTR arg0 --- data [IN]
-  def appendData(arg0)
-    ret = _invoke(112, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID insertData
-  # insert string into value
-  #   I4 arg0 --- offset [IN]
-  #   BSTR arg1 --- data [IN]
-  def insertData(arg0, arg1)
-    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID deleteData
-  # delete string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def deleteData(arg0, arg1)
-    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID replaceData
-  # replace string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  #   BSTR arg2 --- data [IN]
-  def replaceData(arg0, arg1, arg2)
-    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText splitText
-  # split the text node into two text nodes at the position specified
-  #   I4 arg0 --- offset [IN]
-  def splitText(arg0)
-    ret = _invoke(123, [arg0], [VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMProcessingInstruction
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR target
-  # the target
-  def target()
-    ret = _getproperty(127, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # the data
-  def data()
-    ret = _getproperty(128, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # the data
-  def data=(arg0)
-    ret = _setproperty(128, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMEntityReference
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# structure for reporting parser errors
-module IXMLDOMParseError
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # I4 errorCode
-  # the error code
-  def errorCode()
-    ret = _getproperty(0, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR url
-  # the URL of the XML document containing the error
-  def url()
-    ret = _getproperty(179, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR reason
-  # the cause of the error
-  def reason()
-    ret = _getproperty(180, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR srcText
-  # the data where the error occurred
-  def srcText()
-    ret = _getproperty(181, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 line
-  # the line number in the XML document where the error occurred
-  def line()
-    ret = _getproperty(182, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 linepos
-  # the character position in the line containing the error
-  def linepos()
-    ret = _getproperty(183, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 filepos
-  # the absolute file position in the XML document containing the error
-  def filepos()
-    ret = _getproperty(184, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMNotation
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT publicId
-  # the public ID
-  def publicId()
-    ret = _getproperty(136, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT systemId
-  # the system ID
-  def systemId()
-    ret = _getproperty(137, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# 
-module IXMLDOMEntity
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT publicId
-  # the public ID
-  def publicId()
-    ret = _getproperty(140, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT systemId
-  # the system ID
-  def systemId()
-    ret = _getproperty(141, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR notationName
-  # the name of the notation
-  def notationName()
-    ret = _getproperty(142, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# XTL runtime object
-module IXTLRuntime
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 uniqueID
-  #   IXMLDOMNode arg0 --- pNode [IN]
-  def uniqueID(arg0)
-    ret = _invoke(187, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 depth
-  #   IXMLDOMNode arg0 --- pNode [IN]
-  def depth(arg0)
-    ret = _invoke(188, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 childNumber
-  #   IXMLDOMNode arg0 --- pNode [IN]
-  def childNumber(arg0)
-    ret = _invoke(189, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 ancestorChildNumber
-  #   BSTR arg0 --- bstrNodeName [IN]
-  #   IXMLDOMNode arg1 --- pNode [IN]
-  def ancestorChildNumber(arg0, arg1)
-    ret = _invoke(190, [arg0, arg1], [VT_BSTR, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 absoluteChildNumber
-  #   IXMLDOMNode arg0 --- pNode [IN]
-  def absoluteChildNumber(arg0)
-    ret = _invoke(191, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR formatIndex
-  #   I4 arg0 --- lIndex [IN]
-  #   BSTR arg1 --- bstrFormat [IN]
-  def formatIndex(arg0, arg1)
-    ret = _invoke(192, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR formatNumber
-  #   R8 arg0 --- dblNumber [IN]
-  #   BSTR arg1 --- bstrFormat [IN]
-  def formatNumber(arg0, arg1)
-    ret = _invoke(193, [arg0, arg1], [VT_R8, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR formatDate
-  #   VARIANT arg0 --- varDate [IN]
-  #   BSTR arg1 --- bstrFormat [IN]
-  #   VARIANT arg2 --- varDestLocale [IN]
-  def formatDate(arg0, arg1, arg2=nil)
-    ret = _invoke(194, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR formatTime
-  #   VARIANT arg0 --- varTime [IN]
-  #   BSTR arg1 --- bstrFormat [IN]
-  #   VARIANT arg2 --- varDestLocale [IN]
-  def formatTime(arg0, arg1, arg2=nil)
-    ret = _invoke(195, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# W3C-DOM XML Document
-class Microsoft_XMLDOM_1_0 # DOMDocument
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{2933BF90-7B36-11D2-B20E-00C04F983E60}"
-    @progid = "Microsoft.XMLDOM.1.0"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = @dispatch._getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = @dispatch._getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = @dispatch._getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = @dispatch._getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = @dispatch._getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = @dispatch._getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = @dispatch._getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = @dispatch._getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = @dispatch._getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = @dispatch._getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = @dispatch._getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = @dispatch._getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = @dispatch._getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = @dispatch._getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = @dispatch._getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = @dispatch._getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = @dispatch._getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = @dispatch._getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = @dispatch._getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = @dispatch._getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = @dispatch._getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = @dispatch._getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentType doctype
-  # node corresponding to the DOCTYPE
-  def doctype()
-    ret = @dispatch._getproperty(38, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMImplementation implementation
-  # info on this DOM implementation
-  def implementation()
-    ret = @dispatch._getproperty(39, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement documentElement
-  # the root of the tree
-  def documentElement()
-    ret = @dispatch._getproperty(40, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # get the state of the XML document
-  def readyState()
-    ret = @dispatch._getproperty(-525, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMParseError parseError
-  # get the last parser error
-  def parseError()
-    ret = @dispatch._getproperty(59, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR url
-  # get the URL for the loaded XML document
-  def url()
-    ret = @dispatch._getproperty(60, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL async
-  # flag for asynchronous download
-  def async()
-    ret = @dispatch._getproperty(61, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse()
-    ret = @dispatch._getproperty(65, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals()
-    ret = @dispatch._getproperty(66, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace()
-    ret = @dispatch._getproperty(67, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = @dispatch._setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = @dispatch._setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = @dispatch._setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = @dispatch._setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID async
-  # flag for asynchronous download
-  def async=(arg0)
-    ret = @dispatch._setproperty(61, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse=(arg0)
-    ret = @dispatch._setproperty(65, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals=(arg0)
-    ret = @dispatch._setproperty(66, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace=(arg0)
-    ret = @dispatch._setproperty(67, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # register a readystatechange event handler
-  def onreadystatechange=(arg0)
-    ret = @dispatch._setproperty(68, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ondataavailable
-  # register an ondataavailable event handler
-  def ondataavailable=(arg0)
-    ret = @dispatch._setproperty(69, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ontransformnode
-  # register an ontransformnode event handler
-  def ontransformnode=(arg0)
-    ret = @dispatch._setproperty(70, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = @dispatch._invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = @dispatch._invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = @dispatch._invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = @dispatch._invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = @dispatch._invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = @dispatch._invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = @dispatch._invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = @dispatch._invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = @dispatch._invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = @dispatch._invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement createElement
-  # create an Element node
-  #   BSTR arg0 --- tagName [IN]
-  def createElement(arg0)
-    ret = @dispatch._invoke(41, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentFragment createDocumentFragment
-  # create a DocumentFragment node
-  def createDocumentFragment()
-    ret = @dispatch._invoke(42, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText createTextNode
-  # create a text node
-  #   BSTR arg0 --- data [IN]
-  def createTextNode(arg0)
-    ret = @dispatch._invoke(43, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMComment createComment
-  # create a comment node
-  #   BSTR arg0 --- data [IN]
-  def createComment(arg0)
-    ret = @dispatch._invoke(44, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMCDATASection createCDATASection
-  # create a CDATA section node
-  #   BSTR arg0 --- data [IN]
-  def createCDATASection(arg0)
-    ret = @dispatch._invoke(45, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMProcessingInstruction createProcessingInstruction
-  # create a processing instruction node
-  #   BSTR arg0 --- target [IN]
-  #   BSTR arg1 --- data [IN]
-  def createProcessingInstruction(arg0, arg1)
-    ret = @dispatch._invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute createAttribute
-  # create an attribute node
-  #   BSTR arg0 --- name [IN]
-  def createAttribute(arg0)
-    ret = @dispatch._invoke(47, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMEntityReference createEntityReference
-  # create an entity reference node
-  #   BSTR arg0 --- name [IN]
-  def createEntityReference(arg0)
-    ret = @dispatch._invoke(49, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList getElementsByTagName
-  # build a list of elements by name
-  #   BSTR arg0 --- tagName [IN]
-  def getElementsByTagName(arg0)
-    ret = @dispatch._invoke(50, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode createNode
-  # create a node of the specified node type and name
-  #   VARIANT arg0 --- type [IN]
-  #   BSTR arg1 --- name [IN]
-  #   BSTR arg2 --- namespaceURI [IN]
-  def createNode(arg0, arg1, arg2)
-    ret = @dispatch._invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nodeFromID
-  # retrieve node from it's ID
-  #   BSTR arg0 --- idString [IN]
-  def nodeFromID(arg0)
-    ret = @dispatch._invoke(56, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL load
-  # load document from the specified XML source
-  #   VARIANT arg0 --- xmlSource [IN]
-  def load(arg0)
-    ret = @dispatch._invoke(58, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # abort an asynchronous download
-  def abort()
-    ret = @dispatch._invoke(62, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL loadXML
-  # load the document from a string
-  #   BSTR arg0 --- bstrXML [IN]
-  def loadXML(arg0)
-    ret = @dispatch._invoke(63, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID save
-  # save the document to a specified desination
-  #   VARIANT arg0 --- desination [IN]
-  def save(arg0)
-    ret = @dispatch._invoke(64, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT ondataavailable EVENT in XMLDOMDocumentEvents
-  def ondataavailable()
-    ret = @dispatch._invoke(198, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT onreadystatechange EVENT in XMLDOMDocumentEvents
-  def onreadystatechange()
-    ret = @dispatch._invoke(-609, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# W3C-DOM XML Document (Apartment)
-class Microsoft_FreeThreadedXMLDOM_1_0 # DOMFreeThreadedDocument
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{2933BF91-7B36-11D2-B20E-00C04F983E60}"
-    @progid = "Microsoft.FreeThreadedXMLDOM.1.0"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = @dispatch._getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = @dispatch._getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = @dispatch._getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = @dispatch._getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = @dispatch._getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = @dispatch._getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = @dispatch._getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = @dispatch._getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = @dispatch._getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = @dispatch._getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = @dispatch._getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = @dispatch._getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = @dispatch._getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = @dispatch._getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = @dispatch._getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = @dispatch._getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = @dispatch._getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = @dispatch._getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = @dispatch._getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = @dispatch._getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = @dispatch._getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = @dispatch._getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentType doctype
-  # node corresponding to the DOCTYPE
-  def doctype()
-    ret = @dispatch._getproperty(38, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMImplementation implementation
-  # info on this DOM implementation
-  def implementation()
-    ret = @dispatch._getproperty(39, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement documentElement
-  # the root of the tree
-  def documentElement()
-    ret = @dispatch._getproperty(40, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # get the state of the XML document
-  def readyState()
-    ret = @dispatch._getproperty(-525, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMParseError parseError
-  # get the last parser error
-  def parseError()
-    ret = @dispatch._getproperty(59, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR url
-  # get the URL for the loaded XML document
-  def url()
-    ret = @dispatch._getproperty(60, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL async
-  # flag for asynchronous download
-  def async()
-    ret = @dispatch._getproperty(61, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse()
-    ret = @dispatch._getproperty(65, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals()
-    ret = @dispatch._getproperty(66, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace()
-    ret = @dispatch._getproperty(67, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = @dispatch._setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = @dispatch._setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = @dispatch._setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = @dispatch._setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID async
-  # flag for asynchronous download
-  def async=(arg0)
-    ret = @dispatch._setproperty(61, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse=(arg0)
-    ret = @dispatch._setproperty(65, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals=(arg0)
-    ret = @dispatch._setproperty(66, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace=(arg0)
-    ret = @dispatch._setproperty(67, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # register a readystatechange event handler
-  def onreadystatechange=(arg0)
-    ret = @dispatch._setproperty(68, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ondataavailable
-  # register an ondataavailable event handler
-  def ondataavailable=(arg0)
-    ret = @dispatch._setproperty(69, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ontransformnode
-  # register an ontransformnode event handler
-  def ontransformnode=(arg0)
-    ret = @dispatch._setproperty(70, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = @dispatch._invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = @dispatch._invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = @dispatch._invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = @dispatch._invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = @dispatch._invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = @dispatch._invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = @dispatch._invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = @dispatch._invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = @dispatch._invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = @dispatch._invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement createElement
-  # create an Element node
-  #   BSTR arg0 --- tagName [IN]
-  def createElement(arg0)
-    ret = @dispatch._invoke(41, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentFragment createDocumentFragment
-  # create a DocumentFragment node
-  def createDocumentFragment()
-    ret = @dispatch._invoke(42, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText createTextNode
-  # create a text node
-  #   BSTR arg0 --- data [IN]
-  def createTextNode(arg0)
-    ret = @dispatch._invoke(43, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMComment createComment
-  # create a comment node
-  #   BSTR arg0 --- data [IN]
-  def createComment(arg0)
-    ret = @dispatch._invoke(44, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMCDATASection createCDATASection
-  # create a CDATA section node
-  #   BSTR arg0 --- data [IN]
-  def createCDATASection(arg0)
-    ret = @dispatch._invoke(45, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMProcessingInstruction createProcessingInstruction
-  # create a processing instruction node
-  #   BSTR arg0 --- target [IN]
-  #   BSTR arg1 --- data [IN]
-  def createProcessingInstruction(arg0, arg1)
-    ret = @dispatch._invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute createAttribute
-  # create an attribute node
-  #   BSTR arg0 --- name [IN]
-  def createAttribute(arg0)
-    ret = @dispatch._invoke(47, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMEntityReference createEntityReference
-  # create an entity reference node
-  #   BSTR arg0 --- name [IN]
-  def createEntityReference(arg0)
-    ret = @dispatch._invoke(49, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList getElementsByTagName
-  # build a list of elements by name
-  #   BSTR arg0 --- tagName [IN]
-  def getElementsByTagName(arg0)
-    ret = @dispatch._invoke(50, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode createNode
-  # create a node of the specified node type and name
-  #   VARIANT arg0 --- type [IN]
-  #   BSTR arg1 --- name [IN]
-  #   BSTR arg2 --- namespaceURI [IN]
-  def createNode(arg0, arg1, arg2)
-    ret = @dispatch._invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nodeFromID
-  # retrieve node from it's ID
-  #   BSTR arg0 --- idString [IN]
-  def nodeFromID(arg0)
-    ret = @dispatch._invoke(56, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL load
-  # load document from the specified XML source
-  #   VARIANT arg0 --- xmlSource [IN]
-  def load(arg0)
-    ret = @dispatch._invoke(58, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # abort an asynchronous download
-  def abort()
-    ret = @dispatch._invoke(62, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL loadXML
-  # load the document from a string
-  #   BSTR arg0 --- bstrXML [IN]
-  def loadXML(arg0)
-    ret = @dispatch._invoke(63, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID save
-  # save the document to a specified desination
-  #   VARIANT arg0 --- desination [IN]
-  def save(arg0)
-    ret = @dispatch._invoke(64, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT ondataavailable EVENT in XMLDOMDocumentEvents
-  def ondataavailable()
-    ret = @dispatch._invoke(198, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT onreadystatechange EVENT in XMLDOMDocumentEvents
-  def onreadystatechange()
-    ret = @dispatch._invoke(-609, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# IXMLHttpRequest Interface
-module IXMLHttpRequest
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # I4 status
-  # Get HTTP status code
-  def status()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR statusText
-  # Get HTTP status text
-  def statusText()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DISPATCH responseXML
-  # Get response body
-  def responseXML()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR responseText
-  # Get response body
-  def responseText()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT responseBody
-  # Get response body
-  def responseBody()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT responseStream
-  # Get response body
-  def responseStream()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # Get ready state
-  def readyState()
-    ret = _getproperty(13, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # Register a complete event handler
-  def onreadystatechange=(arg0)
-    ret = _setproperty(14, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID open
-  # Open HTTP connection
-  #   BSTR arg0 --- bstrMethod [IN]
-  #   BSTR arg1 --- bstrUrl [IN]
-  #   VARIANT arg2 --- varAsync [IN]
-  #   VARIANT arg3 --- bstrUser [IN]
-  #   VARIANT arg4 --- bstrPassword [IN]
-  def open(arg0, arg1, arg2=nil, arg3=nil, arg4=nil)
-    ret = _invoke(1, [arg0, arg1, arg2, arg3, arg4], [VT_BSTR, VT_BSTR, VT_VARIANT, VT_VARIANT, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID setRequestHeader
-  # Add HTTP request header
-  #   BSTR arg0 --- bstrHeader [IN]
-  #   BSTR arg1 --- bstrValue [IN]
-  def setRequestHeader(arg0, arg1)
-    ret = _invoke(2, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR getResponseHeader
-  # Get HTTP response header
-  #   BSTR arg0 --- bstrHeader [IN]
-  def getResponseHeader(arg0)
-    ret = _invoke(3, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR getAllResponseHeaders
-  # Get all HTTP response headers
-  def getAllResponseHeaders()
-    ret = _invoke(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID send
-  # Send HTTP request
-  #   VARIANT arg0 --- varBody [IN]
-  def send(arg0=nil)
-    ret = _invoke(5, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # Abort HTTP request
-  def abort()
-    ret = _invoke(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# XML HTTP Request class.
-class Microsoft_XMLHTTP_1 # XMLHTTPRequest
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{ED8C108E-4349-11D2-91A4-00C04F7969E8}"
-    @progid = "Microsoft.XMLHTTP.1"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # I4 status
-  # Get HTTP status code
-  def status()
-    ret = @dispatch._getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR statusText
-  # Get HTTP status text
-  def statusText()
-    ret = @dispatch._getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DISPATCH responseXML
-  # Get response body
-  def responseXML()
-    ret = @dispatch._getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR responseText
-  # Get response body
-  def responseText()
-    ret = @dispatch._getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT responseBody
-  # Get response body
-  def responseBody()
-    ret = @dispatch._getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT responseStream
-  # Get response body
-  def responseStream()
-    ret = @dispatch._getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # Get ready state
-  def readyState()
-    ret = @dispatch._getproperty(13, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # Register a complete event handler
-  def onreadystatechange=(arg0)
-    ret = @dispatch._setproperty(14, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID open
-  # Open HTTP connection
-  #   BSTR arg0 --- bstrMethod [IN]
-  #   BSTR arg1 --- bstrUrl [IN]
-  #   VARIANT arg2 --- varAsync [IN]
-  #   VARIANT arg3 --- bstrUser [IN]
-  #   VARIANT arg4 --- bstrPassword [IN]
-  def open(arg0, arg1, arg2=nil, arg3=nil, arg4=nil)
-    ret = @dispatch._invoke(1, [arg0, arg1, arg2, arg3, arg4], [VT_BSTR, VT_BSTR, VT_VARIANT, VT_VARIANT, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID setRequestHeader
-  # Add HTTP request header
-  #   BSTR arg0 --- bstrHeader [IN]
-  #   BSTR arg1 --- bstrValue [IN]
-  def setRequestHeader(arg0, arg1)
-    ret = @dispatch._invoke(2, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR getResponseHeader
-  # Get HTTP response header
-  #   BSTR arg0 --- bstrHeader [IN]
-  def getResponseHeader(arg0)
-    ret = @dispatch._invoke(3, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR getAllResponseHeaders
-  # Get all HTTP response headers
-  def getAllResponseHeaders()
-    ret = @dispatch._invoke(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID send
-  # Send HTTP request
-  #   VARIANT arg0 --- varBody [IN]
-  def send(arg0=nil)
-    ret = @dispatch._invoke(5, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # Abort HTTP request
-  def abort()
-    ret = @dispatch._invoke(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# XML Data Source Object
-class Microsoft_XMLDSO_1_0 # XMLDSOControl
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{550DDA30-0541-11D2-9CA9-0060B0EC3D39}"
-    @progid = "Microsoft.XMLDSO.1.0"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # IXMLDOMDocument XMLDocument
-  def XMLDocument()
-    ret = @dispatch._getproperty(65537, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 JavaDSOCompatible
-  def JavaDSOCompatible()
-    ret = @dispatch._getproperty(65538, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  def readyState()
-    ret = @dispatch._getproperty(-525, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID XMLDocument
-  def XMLDocument=(arg0)
-    ret = @dispatch._setproperty(65537, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID JavaDSOCompatible
-  def JavaDSOCompatible=(arg0)
-    ret = @dispatch._setproperty(65538, [arg0], [VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# Constants that define types for IXMLElement.
-module OLEtagXMLEMEM_TYPE
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  XMLELEMTYPE_ELEMENT = 0
-  XMLELEMTYPE_TEXT = 1
-  XMLELEMTYPE_COMMENT = 2
-  XMLELEMTYPE_DOCUMENT = 3
-  XMLELEMTYPE_DTD = 4
-  XMLELEMTYPE_PI = 5
-  XMLELEMTYPE_OTHER = 6
-end
-
-# XMLDocument extends IXML Document.  It is obsolete.  You should use DOMDocument.  This object should not be confused with the XMLDocument property on the XML data island.
-class Msxml # XMLDocument
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{CFC399AF-D876-11D0-9C10-00C04FC99C8E}"
-    @progid = "Msxml"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # HRESULT url
-  # set URL to load an XML document from the URL.
-  #   BSTR arg0 --- p [IN]
-  def url=(arg0)
-    ret = @dispatch._setproperty(65641, [arg0], [VT_BSTR, VT_HRESULT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT charset
-  # get encoding.
-  #   BSTR arg0 --- p [IN]
-  def charset=(arg0)
-    ret = @dispatch._setproperty(65645, [arg0], [VT_BSTR, VT_HRESULT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT async
-  # get asynchronous loading flag.
-  #   BOOL arg0 --- pf [IN]
-  def async=(arg0)
-    ret = @dispatch._setproperty(65649, [arg0], [VT_BOOL, VT_HRESULT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT root
-  # get root IXMLElement of the XML document.
-  #   IXMLElement2,IXMLElement2 arg0 --- p [OUT]
-  def root
-    OLEProperty.new(@dispatch, 65637, [VT_BYREF|VT_BYREF|VT_DISPATCH], [VT_BYREF|VT_BYREF|VT_DISPATCH, VT_HRESULT])
-  end
-
-  # HRESULT url
-  # set URL to load an XML document from the URL.
-  #   BSTR arg0 --- p [OUT]
-  def url
-    OLEProperty.new(@dispatch, 65641, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
-  end
-
-  # HRESULT readyState
-  # get ready state.
-  #   I4 arg0 --- pl [OUT]
-  def readyState
-    OLEProperty.new(@dispatch, 65643, [VT_BYREF|VT_I4], [VT_BYREF|VT_I4, VT_HRESULT])
-  end
-
-  # HRESULT charset
-  # get encoding.
-  #   BSTR arg0 --- p [OUT]
-  def charset
-    OLEProperty.new(@dispatch, 65645, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
-  end
-
-  # HRESULT version
-  # get XML version number.
-  #   BSTR arg0 --- p [OUT]
-  def version
-    OLEProperty.new(@dispatch, 65646, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
-  end
-
-  # HRESULT doctype
-  # get document type.
-  #   BSTR arg0 --- p [OUT]
-  def doctype
-    OLEProperty.new(@dispatch, 65647, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
-  end
-
-  # HRESULT async
-  # get asynchronous loading flag.
-  #   BOOL arg0 --- pf [OUT]
-  def async
-    OLEProperty.new(@dispatch, 65649, [VT_BYREF|VT_BOOL], [VT_BYREF|VT_BOOL, VT_HRESULT])
-  end
-
-  # HRESULT createElement
-  # create different types of IXMLElements.
-  #   VARIANT arg0 --- vType [IN]
-  #   VARIANT arg1 --- var1 [IN]
-  #   IXMLElement2,IXMLElement2 arg2 --- ppElem [OUT]
-  def createElement(arg0, arg1=nil, arg2=nil)
-    ret = @dispatch._invoke(65644, [arg0, arg1, arg2], [VT_VARIANT, VT_VARIANT, VT_BYREF|VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
diff --git a/ext/win32ole/tests/oleserver.rb b/ext/win32ole/tests/oleserver.rb
deleted file mode 100644
index bf721373e5..0000000000
--- a/ext/win32ole/tests/oleserver.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'win32ole'
-def oletypelib_name(pat)
-  WIN32OLE_TYPE.typelibs.each do |lib|
-    return lib if pat =~ lib
-  end
-end
-module OLESERVER
-  MS_EXCEL_TYPELIB = oletypelib_name(/^Microsoft Excel .* Object Library$/)
-  MS_XML_TYPELIB = oletypelib_name(/^Microsoft XML/)
-end
diff --git a/ext/win32ole/tests/testOLEEVENT.rb b/ext/win32ole/tests/testOLEEVENT.rb
deleted file mode 100644
index 15b7ca8413..0000000000
--- a/ext/win32ole/tests/testOLEEVENT.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'rubyunit'
-require 'win32ole'
-
-class TestWIN32OLE_EVENT < RUNIT::TestCase
-  def setup
-    @excel = WIN32OLE.new("Excel.Application")
-    @excel.visible = true
-  end
-  def test_on_event
-    book = @excel.workbooks.Add
-    value = ""
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event('SheetChange'){|arg1, arg2| 
-        begin
-          value = arg1.value
-        rescue
-          value = $!.message
-        end
-      }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("OK", value)
-  end
-  def teardown
-    @excel.quit
-    @excel = nil
-    GC.start
-  end
-end
-
diff --git a/ext/win32ole/tests/testOLEMETHOD.rb b/ext/win32ole/tests/testOLEMETHOD.rb
deleted file mode 100644
index b52052e669..0000000000
--- a/ext/win32ole/tests/testOLEMETHOD.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-require 'oleserver'
-
-class TestOLEMETHOD < RUNIT::TestCase
-  include OLESERVER
-  def setup
-    @excel_app = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
-  end
-  def test_s_new
-    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
-    assert_instance_of(WIN32OLE_METHOD, m)
-    m =  WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
-    assert_instance_of(WIN32OLE_METHOD, m)
-    m =  WIN32OLE_METHOD.new(@excel_app, 'workbookopen')
-    assert_instance_of(WIN32OLE_METHOD, m)
-  end
-  def test_name
-    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
-    assert_equal('Quit', m.name)
-  end
-  def test_to_s
-    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
-    assert_equal('Quit', "#{m}")
-  end
-  def test_return_type
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_equal('Range', m.return_type)
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
-    assert_equal('BSTR', m.return_type)
-  end
-  def test_return_vtype
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_equal(WIN32OLE::VARIANT::VT_PTR, m.return_vtype)
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
-    assert_equal(WIN32OLE::VARIANT::VT_BSTR, m.return_vtype)
-  end
-  def test_return_type_detail
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_equal(['PTR', 'USERDEFINED', 'Range'], m.return_type_detail)
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
-    assert_equal(['BSTR'], m.return_type_detail)
-  end
-
-  def test_invoke_kind
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_equal('PROPERTYGET', m.invoke_kind)
-  end
-  def test_visible
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert(m.visible?)
-    m = WIN32OLE_METHOD.new(@excel_app, 'AddRef')
-    assert(!m.visible?)
-  end
-  def test_event
-    m =  WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
-    assert(m.event?)
-    m =  WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert(!m.event?)
-  end
-  def test_event_interface
-    m = WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
-    assert_equal('AppEvents', m.event_interface)
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_nil(m.event_interface)
-  end
-  def test_helpstring
-    domdoc = WIN32OLE_TYPE.new(MS_XML_TYPELIB, 'DOMDocument')
-    m =  WIN32OLE_METHOD.new(domdoc, 'abort')
-    assert_equal('abort an asynchronous download', m.helpstring)
-  end
-  def test_helpfile
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert_match(/VBAXL.*\.(HLP|CHM)$/i, m.helpfile)
-  end
-  def test_helpcontext
-    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
-    assert(m.helpcontext > 0)
-  end
-  def test_offset_vtbl
-    m = WIN32OLE_METHOD.new(@excel_app, 'QueryInterface')
-    assert_equal(0, m.offset_vtbl)
-  end
-end
diff --git a/ext/win32ole/tests/testOLEPARAM.rb b/ext/win32ole/tests/testOLEPARAM.rb
deleted file mode 100644
index 685b548aa5..0000000000
--- a/ext/win32ole/tests/testOLEPARAM.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-require 'oleserver'
-
-class TestOLEPARAM < RUNIT::TestCase
-  include OLESERVER
-  def test_name
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    sh = classes.find {|c| c.name == 'Worksheet'}
-    saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
-    param_names = saveas.params.collect{|p| p.name}
-    assert(param_names.size > 0)
-    assert(param_names.include?('Filename'))
-  end
-  def test_to_s
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    sh = classes.find {|c| c.name == 'Worksheet'}
-    saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
-    param_names = saveas.params.collect{|p| "#{p}"}
-    assert(param_names.include?('Filename'))
-  end
-  def test_ole_type
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal('BSTR', f.params[0].ole_type)
-    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal('XlSaveAsAccessMode', f.params[6].ole_type)
-  end
-  def test_ole_type_detail
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal(['BSTR'], f.params[0].ole_type_detail)
-    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal(['USERDEFINED', 'XlSaveAsAccessMode'], f.params[6].ole_type_detail)
-  end
-  def test_input
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert(f.params[0].input?)
-  end
-  
-  def test_output
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert(!f.params[0].output?)
-  end
-  def test_optional
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert(!f.params[0].optional?)
-    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert(f.params[0].optional?)
-  end
-  def test_ole_type_detail
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal(nil, f.params[0].default)
-    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
-    f = methods.find {|m| m.name == 'SaveAs'}
-    assert_equal(1, f.params[6].default)
-  end
-end
diff --git a/ext/win32ole/tests/testOLETYPE.rb b/ext/win32ole/tests/testOLETYPE.rb
deleted file mode 100644
index d4eb1146e1..0000000000
--- a/ext/win32ole/tests/testOLETYPE.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-require 'oleserver'
-
-class TestOLETYPE < RUNIT::TestCase
-  include OLESERVER
-  def test_s_new
-    type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
-    assert_instance_of(WIN32OLE_TYPE, type)
-  end
-  def test_s_ole_classes
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    assert(classes.size > 0)
-  end
-  def test_s_typelibs
-    libs = WIN32OLE_TYPE.typelibs
-    assert(libs.include?(MS_EXCEL_TYPELIB))
-    assert(libs.include?(MS_XML_TYPELIB))
-  end
-  def test_s_progids
-    progids = WIN32OLE_TYPE.progids
-    assert(progids.include?('Excel.Application'))
-  end
-  def test_name
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    class_names = classes.collect{|c|
-      c.name
-    }
-    assert(class_names.include?('Application'))
-  end
-
-  def test_class_to_s
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    class_names = classes.collect{|c|
-      "#{c}"
-    }
-    assert(class_names.include?('Application'))
-  end
-
-  def test_ole_type
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    app = classes.find {|c| c.name == 'Application'}
-    assert_equal('Class', app.ole_type)
-    app = classes.find {|c| c.name == '_Application'}
-    assert_equal('Dispatch', app.ole_type)
-  end
-  def test_typekind
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    app = classes.find {|c| c.name == 'Application'}
-    assert_equal(5, app.typekind)
-  end
-  def test_visible
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    app = classes.find {|c| c.name == 'Application'}
-    assert(app.visible?)
-    app = classes.find {|c| c.name == 'IAppEvents'}
-    assert(!app.visible?)
-  end
-  def test_src_type
-    classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
-    domnode = classes.find {|c| c.name == 'DOMNodeType'}
-    assert_equal('tagDOMNodeType', domnode.src_type)
-  end
-  def test_helpstring
-    classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
-    domdoc = classes.find {|c| c.name == 'DOMDocument'}
-    assert_equal('W3C-DOM XML Document', domdoc.helpstring)
-  end
-  def test_variables
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    xlchart = classes.find {|c| c.name == 'XlChartType'}
-    assert(xlchart.variables.size > 0)
-  end
-  def test_ole_methods
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    worksheet = classes.find {|c| c.name == 'Worksheet'}
-    assert(worksheet.ole_methods.size > 0)
-  end
-  def test_helpfile
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    worksheet = classes.find {|c| c.name == 'Worksheet'}
-    assert_match(/VBAXL.*\.(CHM|HLP)$/, worksheet.helpfile)
-  end
-  def test_helpcontext
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    worksheet = classes.find {|c| c.name == 'Worksheet'}
-    assert_equal(131088, worksheet.helpcontext)
-  end
-  def test_to_s
-    type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
-    assert_equal("Application", "#{type}");
-  end
-end
diff --git a/ext/win32ole/tests/testOLEVARIABLE.rb b/ext/win32ole/tests/testOLEVARIABLE.rb
deleted file mode 100644
index b4bb0b57d9..0000000000
--- a/ext/win32ole/tests/testOLEVARIABLE.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-require 'oleserver'
-
-class TestOLEVARIABLE < RUNIT::TestCase
-  include OLESERVER
-  def test_name
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var_names = chart.variables.collect {|m| m.name}
-    assert(var_names.size > 0)
-    assert(var_names.include?('xl3DColumn'))
-  end
-  def test_to_s
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var_names = chart.variables.collect {|m| "#{m}"}
-    assert(var_names.size > 0)
-    assert(var_names.include?('xl3DColumn'))
-  end
-  def test_ole_type
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
-    assert_equal('INT', var.ole_type)
-  end
-  def test_ole_type_detail
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
-    assert_equal(['INT'], var.ole_type_detail)
-  end
-
-  def test_value
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
-    assert_equal(-4100, var.value)
-  end
-  def test_visible
-    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
-    chart = classes.find {|c| c.name == 'XlChartType'}
-    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
-    assert(var.visible?)
-  end
-end
diff --git a/ext/win32ole/tests/testVARIANT.rb b/ext/win32ole/tests/testVARIANT.rb
deleted file mode 100644
index f274778f27..0000000000
--- a/ext/win32ole/tests/testVARIANT.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'rubyunit'
-
-require 'win32ole'
-
-class TestWin32OLE_VARIANT < RUNIT::TestCase
-  include WIN32OLE::VARIANT
-  def test_variant
-    assert_equal(2, VT_I2)
-    assert_equal(3, VT_I4)
-    assert_equal(4, VT_R4)
-    assert_equal(5, VT_R8)
-    assert_equal(6, VT_CY)
-    assert_equal(7, VT_DATE)
-    assert_equal(8, VT_BSTR)
-    assert_equal(9, VT_DISPATCH)
-    assert_equal(10, VT_ERROR)
-    assert_equal(11, VT_BOOL)
-    assert_equal(12, VT_VARIANT)
-    assert_equal(13, VT_UNKNOWN)
-    assert_equal(16, VT_I1)
-    assert_equal(17, VT_UI1)
-    assert_equal(18, VT_UI2)
-    assert_equal(19, VT_UI4)
-    assert_equal(22, VT_INT)
-    assert_equal(23, VT_UINT)
-    assert_equal(0x2000, VT_ARRAY)
-    assert_equal(0x4000, VT_BYREF)
-  end
-end
-
diff --git a/ext/win32ole/tests/testWIN32OLE.rb b/ext/win32ole/tests/testWIN32OLE.rb
deleted file mode 100644
index 7907fe36a9..0000000000
--- a/ext/win32ole/tests/testWIN32OLE.rb
+++ /dev/null
@@ -1,298 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script 
-
-require 'runit/testcase'
-require 'runit/cui/testrunner'
-
-require 'win32ole'
-require 'oleserver'
-
-module EXCEL_CONST
-end
-
-module CONST1
-end
-
-module CONST2
-end
-
-module CONST3
-end
-
-class TestWin32OLE < RUNIT::TestCase
-  include OLESERVER
-  def setup
-    @excel = WIN32OLE.new("Excel.Application")
-    @excel.visible = true
-  end
-  def test_s_new
-    assert_instance_of(WIN32OLE, @excel)
-  end
-  def test_s_new_DCOM
-    rexcel = WIN32OLE.new("Excel.Application", "localhost")
-    assert_instance_of(WIN32OLE, rexcel)
-    rexcel.visible = true
-    rexcel.quit
-  end
-  def test_s_new_from_clsid
-    excel = WIN32OLE.new("{00024500-0000-0000-C000-000000000046}")
-    assert_instance_of(WIN32OLE, excel)
-    excel.quit
-    exc = assert_exception(WIN32OLERuntimeError) {
-      WIN32OLE.new("{000}")
-    }
-    assert_match(/Unknown OLE server : `\{000\}'/, exc.message)
-  end
-  def test_s_connect
-    excel2 = WIN32OLE.connect('Excel.Application')
-    assert_instance_of(WIN32OLE, excel2)
-  end
-
-  def test_s_const_load
-    assert(!defined?(EXCEL_CONST::XlTop))
-    WIN32OLE.const_load(@excel, EXCEL_CONST)
-    assert_equal(-4160, EXCEL_CONST::XlTop)
-
-    assert(!defined?(CONST1::XlTop))
-    WIN32OLE.const_load(MS_EXCEL_TYPELIB, CONST1)
-    assert_equal(-4160, CONST1::XlTop)
-  end
-
-  def test_get_win32ole_object
-    workbooks = @excel.Workbooks;
-    assert_instance_of(WIN32OLE, workbooks)
-  end
-  def test_each
-    workbooks = @excel.Workbooks
-    assert_no_exception {
-      i = 0;
-      workbooks.each do |workbook|
-        print i += 1
-      end
-    }
-    workbooks.add
-    workbooks.add
-    i = 0
-    workbooks.each do |workbook|
-      i+=1
-    end
-    assert_equal(2, i)
-    workbooks.each do |workbook|
-      workbook.saved = true
-    end
-  end
-  def test_setproperty_bracket
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      sheet.range("A1")['Value'] = 10
-      assert_equal(10, sheet.range("A1").value)
-      sheet['Cells', 1, 2] = 10
-      assert_equal(10, sheet.range("B1").value)
-    ensure
-      book.saved = true
-    end
-  end
-  def test_convert_bignum
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      sheet.range("A1").value = 999999999
-      sheet.range("A2").value = 9999999999
-      sheet.range("A3").value = "=A1*10 + 9"
-      assert_equal(9999999999, sheet.range("A2").value)
-      assert_equal(9999999999, sheet.range("A3").value)
-     
-    ensure
-      book.saved = true
-    end
-  end
-
-  def test_ole_invoke_with_named_arg
-    book = @excel.workbooks.add
-    sheets = book.worksheets
-    sheet = book.worksheets(1)
-    num = sheets.count
-    begin
-      sheets.add({'count' => 2, 'after'=>sheet})
-      assert_equal(2, sheets.count - num);
-    ensure
-      book.saved = true
-    end
-  end
-
-  def test_ole_invoke_with_named_arg_last
-    book = @excel.workbooks.add
-    sheets = book.worksheets
-    sheet = book.worksheets(1)
-    num = sheets.count
-    begin
-      sheets.add(sheet, {'count' => 2})
-      assert_equal(2, sheets.count - num);
-    ensure
-      book.saved = true
-    end
-  end
-
-  def test_setproperty
-    @excel.setproperty('Visible', false)
-    assert_equal(false, @excel.Visible)
-    @excel.setproperty('Visible', true)
-    assert_equal(true, @excel.Visible)
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      sheet.setproperty('Cells', 1, 2, 10)
-      assert_equal(10, sheet.range("B1").value)
-    ensure
-      book.saved = true
-    end
-  end
-  def test_no_exist_property
-    isok = false
-    begin
-      @excel.unknown_prop = 1
-    rescue WIN32OLERuntimeError
-      isok = true
-    end
-    assert(isok)
-
-    isok = false
-    begin
-      @excel['unknown_prop'] = 2
-    rescue WIN32OLERuntimeError
-      isok = true
-    end
-    assert(isok)
-  end
-
-  def test_setproperty_with_equal
-    book = @excel.workbooks.add
-    sheet = book.worksheets(1)
-    begin
-      sheet.range("B1").value = 10
-      assert_equal(10, sheet.range("B1").value)
-      sheet.range("C1:D1").value = [11, 12]
-      assert_equal(11, sheet.range("C1").value)
-      assert_equal(12, sheet.range("D1").value)
-    ensure
-      book.saved = true
-    end
-  end
-  def test_invoke
-    workbooks = @excel.invoke( 'workbooks' )
-    assert_instance_of(WIN32OLE, workbooks)
-    book = workbooks.invoke( 'add' )
-    assert_instance_of(WIN32OLE, book)
-  end
-  def test_ole_methods
-    methods = @excel.ole_methods
-    method_names = methods.collect{|m| m.name}
-    assert(method_names.include?("Quit"))
-  end
-  def test_ole_method_help
-    quit_info = @excel.ole_method_help("Quit")
-    assert_equal(0, quit_info.size_params)
-    assert_equal(0, quit_info.size_opt_params)
-
-    workbooks = @excel.Workbooks
-    add_info = workbooks.ole_method_help("Add")
-    assert_equal(1, add_info.size_params)
-    assert_equal(1, add_info.size_opt_params)
-    assert(add_info.params[0].input?)
-    assert(add_info.params[0].optional?)
-    assert_equal('VARIANT', add_info.params[0].ole_type)
-  end
-#  def test_ole_put_methods
-#    methods_list = @excel.ole_put_methods
-#    puts methods_list
-#  end
-  def teardown
-    @excel.quit
-    @excel = nil
-    GC.start
-  end
-end
-
-class TestWin32OLE_WITH_MSI < RUNIT::TestCase
-  def setup
-    installer = WIN32OLE.new("WindowsInstaller.Installer")
-    @record = installer.CreateRecord(2)
-  end
-
-  # Sorry, this test fails. 
-  # Win32OLE does not support this style to set property.
-  # Use Win32OLE#setproperty or Win32OLE#[]= .
-  # def test_invoke
-  #   @record.invoke("StringData", 1, 'cccc')
-  #   assert_equal('cccc', @record.StringData(1))
-  # end
-
-  def test_setproperty
-    @record.setproperty( "StringData", 1, 'dddd')
-    assert_equal('dddd', @record.StringData(1))
-  end
-  def test_bracket_equal_with_arg
-    @record[ "StringData", 1 ] =  'ffff'
-    assert_equal('ffff', @record.StringData(1))
-  end
-end
-
-# ---------------------
-#
-# a subclass of Win32OLE
-# override new() and connect()
-class MyExcel<WIN32OLE
-    def MyExcel.new 
-        super "Excel.Application"
-    end
-    def MyExcel.connect
-        super "Excel.Application"
-    end
-end
-
-class TestMyExcel < TestWin32OLE
-#
-# because we overrided new() and connect()
-# we need to change the test.
-# also, because the class will be different
-# 
-  def setup
-    @excel = MyExcel.new
-    @excel.visible = true
-  end
-  def test_s_new
-    assert_instance_of(MyExcel, @excel)
-  end
-  def test_s_connect
-    excel2 = MyExcel.connect
-    assert_instance_of(MyExcel, excel2)
-  end
-#
-# const_load didn't like to be called twice,
-# and I don't know how to undefine something in Ruby yet 
-# so, hide the test.
-#
-  private :test_s_const_load
-end
-
-if $0 == __FILE__
-  puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
-  if ARGV.size == 0
-	suite = RUNIT::TestSuite.new
-	suite.add_test(TestWin32OLE.suite)
-	suite.add_test(TestMyExcel.suite)
-    begin
-      installer = WIN32OLE.new("WindowsInstaller.Installer")
-      suite.add_test(TestWin32OLE_WITH_MSI.suite)
-    rescue
-      puts "Skip some test with MSI"
-    end
-  else
-    suite = RUNIT::TestSuite.new
-    ARGV.each do |testmethod|
-      suite.add_test(TestWin32OLE.new(testmethod))
-    end
-  end
-  RUNIT::CUI::TestRunner.quiet_mode = true
-  RUNIT::CUI::TestRunner.run(suite)
-end
diff --git a/ext/win32ole/tests/testall.rb b/ext/win32ole/tests/testall.rb
deleted file mode 100644
index 17bae2c810..0000000000
--- a/ext/win32ole/tests/testall.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'rubyunit'
-require 'win32ole'
-puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
-# RUNIT::CUI::TestRunner.quiet_mode = true
-require "testWIN32OLE"
-require "testOLETYPE"
-require "testOLEPARAM"
-require "testOLEMETHOD"
-require "testOLEVARIABLE"
-require "testVARIANT"
-# require "testOLEEVENT"
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
deleted file mode 100644
index 3b143ebd07..0000000000
--- a/ext/win32ole/win32ole.c
+++ /dev/null
@@ -1,5418 +0,0 @@
-/*
- *  (c) 1995 Microsoft Corporation. All rights reserved.
- *  Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
- *
- *  Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
- *  <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
- *
- *  You may distribute under the terms of either the GNU General Public
- *  License or the Artistic License, as specified in the README file
- *  of the Perl distribution.
- *
- */
-
-/*
-  $Date$
-  modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
- */
-
-#include "ruby.h"
-#include "st.h"
-#include <windows.h>
-#include <ocidl.h>
-#include <ole2.h>
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
-
-#define DOUT fprintf(stderr,"[%d]\n",__LINE__)
-#define DOUTS(x) fprintf(stderr,"[%d]:" #x "=%s\n",__LINE__,x)
-#define DOUTMSG(x) fprintf(stderr, "[%d]:" #x "\n",__LINE__)
-#define DOUTI(x) fprintf(stderr, "[%ld]:" #x "=%d\n",__LINE__,x)
-#define DOUTD(x) fprintf(stderr, "[%d]:" #x "=%f\n",__LINE__,x)
-
-#if defined NONAMELESSUNION && __GNUC__
-#define V_UNION1(X, Y) ((X)->u.Y)
-#else
-#define V_UNION1(X, Y) ((X)->Y)
-#endif
-
-#if defined NONAMELESSUNION && __GNUC__
-#undef V_UNION
-#define V_UNION(X,Y) ((X)->n1.n2.n3.Y)
-
-#undef V_VT
-#define V_VT(X) ((X)->n1.n2.vt)
-
-#undef V_BOOL
-#define V_BOOL(X) V_UNION(X,boolVal)
-#endif
-
-#define OLE_RELEASE(X) (X) ? ((X)->lpVtbl->Release(X)) : 0
-
-#define OLE_ADDREF(X) (X) ? ((X)->lpVtbl->AddRef(X)) : 0
-
-#define OLE_GET_TYPEATTR(X, Y) ((X)->lpVtbl->GetTypeAttr((X), (Y)))
-#define OLE_RELEASE_TYPEATTR(X, Y) ((X)->lpVtbl->ReleaseTypeAttr((X), (Y)))
-
-#define OLE_FREE(x) {\
-    if(gOLEInitialized == Qtrue) {\
-        if(x) {\
-            OLE_RELEASE(x);\
-            (x) = 0;\
-        }\
-    }\
-    CoFreeUnusedLibraries();\
-}
-
-#define OLEData_Get_Struct(obj, pole) {\
-    Data_Get_Struct(obj, struct oledata, pole);\
-    if(!pole->pDispatch) {\
-        rb_raise(rb_eRuntimeError, "Fail to get Dispatch Interface");\
-    }\
-}
-
-#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
-
-#define WIN32OLE_VERSION "0.5.5"
-
-typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
-    (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
-
-typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
-				 UINT uCommand, DWORD dwData);
-typedef struct {
-    struct IEventSinkVtbl * lpVtbl;
-} IEventSink, *PEVENTSINK;
-
-typedef struct IEventSinkVtbl IEventSinkVtbl;
-
-struct IEventSinkVtbl {
-    STDMETHOD(QueryInterface)(
-        PEVENTSINK,
-        REFIID,
-        LPVOID *);
-    STDMETHOD_(ULONG, AddRef)(PEVENTSINK);
-    STDMETHOD_(ULONG, Release)(PEVENTSINK);
-
-    STDMETHOD(GetTypeInfoCount)(
-        PEVENTSINK,
-        UINT *);
-    STDMETHOD(GetTypeInfo)(
-        PEVENTSINK,
-        UINT,
-        LCID,
-        ITypeInfo **);
-    STDMETHOD(GetIDsOfNames)(
-        PEVENTSINK,
-        REFIID,
-        OLECHAR **,
-        UINT,
-        LCID,
-        DISPID *);
-    STDMETHOD(Invoke)(
-        PEVENTSINK,
-        DISPID,
-        REFIID,
-        LCID,
-        WORD,
-        DISPPARAMS *,
-        VARIANT *,
-        EXCEPINFO *,
-        UINT *);
-};
-
-typedef struct tagIEVENTSINKOBJ {
-    IEventSinkVtbl *lpVtbl;
-    DWORD m_cRef;
-    IID m_iid;
-    int m_event_id;
-    DWORD m_dwCookie;
-    IConnectionPoint *pConnectionPoint;
-    ITypeInfo *pTypeInfo;
-}IEVENTSINKOBJ, *PIEVENTSINKOBJ;
-
-VALUE cWIN32OLE;
-VALUE cWIN32OLE_TYPE;
-VALUE cWIN32OLE_VARIABLE;
-VALUE cWIN32OLE_METHOD;
-VALUE cWIN32OLE_PARAM;
-VALUE cWIN32OLE_EVENT;
-VALUE eWIN32OLE_RUNTIME_ERROR;
-VALUE mWIN32OLE_VARIANT;
-
-static VALUE ary_ole_event;
-static ID id_events;
-static BOOL gOLEInitialized = Qfalse;
-static HINSTANCE ghhctrl = NULL;
-static HINSTANCE gole32 = NULL;
-static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL;
-
-struct oledata {
-    IDispatch *pDispatch;
-};
-
-struct oletypedata {
-    ITypeInfo *pTypeInfo;
-};
-
-struct olemethoddata {
-    ITypeInfo *pOwnerTypeInfo;
-    ITypeInfo *pTypeInfo;
-    UINT index;
-};
-
-struct olevariabledata {
-    ITypeInfo *pTypeInfo;
-    UINT index;
-};
-
-struct oleparamdata {
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
-};
-
-struct oleeventdata {
-    IEVENTSINKOBJ *pEvent;
-};
-
-struct oleparam {
-    DISPPARAMS dp;
-    OLECHAR** pNamedArgs;
-};
-
-static VALUE folemethod_s_allocate _((VALUE));
-static VALUE olemethod_set_member _((VALUE, ITypeInfo *, ITypeInfo *, int, VALUE));
-static VALUE foletype_s_allocate _((VALUE));
-static VALUE oletype_set_member  _((VALUE, ITypeInfo *, VALUE));
-static VALUE olemethod_from_typeinfo _((VALUE, ITypeInfo *, VALUE));
-static HRESULT ole_docinfo_from_type _((ITypeInfo *, BSTR *, BSTR *, DWORD *, BSTR *));
-
-static void
-time2d(hh, mm, ss, pv)
-    int hh, mm, ss;
-    double *pv;
-{
-    *pv =  (hh * 60.0 * 60.0 + mm * 60.0 + ss) / 86400.0;
-}
-
-static void
-d2time(v, hh, mm, ss)
-    double v;
-    int *hh, *mm, *ss;
-{
-    double d_hh, d_mm, d_ss;
-    int    i_hh, i_mm, i_ss;
-
-    double d = v * 86400.0;
-
-    d_hh = d / 3600.0;
-    i_hh = (int)d_hh;
-
-    d = d - i_hh * 3600.0;
-
-    d_mm = d / 60.0;
-    i_mm = (int)d_mm;
-
-    d = d - i_mm * 60.0;
-
-    d_ss = d * 10.0 + 5;
-    
-    i_ss = (int)d_ss / 10;
-
-    if(i_ss == 60) {
-        i_mm += 1;
-        i_ss = 0;
-    }
-
-    if (i_mm == 60) {
-        i_hh += 1;
-        i_mm = 0;
-    }
-    if (i_hh == 24) {
-        i_hh = 0;
-    }
-    
-    *hh = i_hh;
-    *mm = i_mm;
-    *ss = i_ss;
-}
-
-static void
-civil2jd(y, m, d, jd)
-    int y, m, d;
-    long *jd;
-{
-    long a, b;
-    if (m <= 2) {
-        y -= 1;
-        m += 12;
-    }
-    a = (long)(y / 100.0);
-    b = 2 - a + (long)(a / 4.0);
-    *jd = (long)(365.25 * (double)(y + 4716))
-         + (long)(30.6001 * (m + 1))
-         + d + b - 1524;
-}
-
-static void
-jd2civil(day, yy, mm, dd)
-    long day;
-    int *yy, *mm, *dd;
-{
-    long x, a, b, c, d, e;
-    x = (long)(((double)day - 1867216.25) / 36524.25);
-    a = day + 1 + x - (long)(x / 4.0);
-    b = a + 1524;
-    c = (long)(((double)b -122.1) /365.25);
-    d = (long)(365.25 * c);
-    e = (long)((double)(b - d) / 30.6001);
-    *dd = b - d - (long)(30.6001 * e);
-    if (e <= 13) {
-        *mm = e - 1;
-        *yy = c - 4716;
-    }
-    else {
-        *mm = e - 13;
-        *yy = c - 4715;
-    }
-}
-
-static void
-double2time(v, y, m, d, hh, mm, ss)
-    double v;
-    int *y, *m, *d, *hh, *mm, *ss;
-{
-    long day;
-    double t;
-
-    day = (long)v;
-    t = v - day;
-    jd2civil(2415019 + day, y, m, d);
-
-    d2time(t, hh, mm, ss);
-}
-
-static double
-time_object2date(tmobj)
-    VALUE tmobj;
-{
-    long y, m, d, hh, mm, ss;
-    long day;
-    double t;
-    y = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
-    m = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
-    d = FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
-    hh = FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
-    mm = FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
-    ss = FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
-    civil2jd(y, m, d, &day);
-    time2d(hh, mm, ss, &t);
-    return t + day - 2415019;
-}
-
-static VALUE
-date2time_str(date)
-    double date;
-{
-    int y, m, d, hh, mm, ss;
-    char szTime[20];
-    double2time(date, &y, &m, &d, &hh, &mm, &ss);
-    sprintf(szTime,
-            "%4.4d/%02.2d/%02.2d %02.2d:%02.2d:%02.2d",
-            y, m, d, hh, mm, ss);
-    return rb_str_new2(szTime);
-}
-
-static void ole_val2variant();
-
-static char *
-ole_wc2mb(pw)
-    LPWSTR pw;
-{
-    int size;
-    LPSTR pm;
-    size = WideCharToMultiByte(CP_ACP, 0, pw, -1, NULL, 0, NULL, NULL);
-    if (size) {
-        pm = ALLOC_N(char, size);    
-        WideCharToMultiByte(CP_ACP, 0, pw, -1, pm, size, NULL, NULL);
-    }
-    else {
-        pm = ALLOC_N(char, 1);
-        *pm = '\0';
-    }
-    return pm;
-} 
-
-static VALUE
-ole_hresult2msg(hr)
-    HRESULT hr;
-{
-    VALUE msg = Qnil;
-    char *p_msg;
-    DWORD dwCount;
-
-    char strhr[100];
-    sprintf(strhr, "    HRESULT error code:0x%08x\n      ", hr);
-    msg = rb_str_new2(strhr);
-
-    dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                            FORMAT_MESSAGE_FROM_SYSTEM |
-                            FORMAT_MESSAGE_IGNORE_INSERTS,
-                            NULL, hr, LOCALE_SYSTEM_DEFAULT,
-                            (LPTSTR)&p_msg, 0, NULL);
-    if (dwCount > 0) {
-        /* remove dots and CRs/LFs */
-        while (dwCount > 0 &&
-               (p_msg[dwCount-1] < ' ' || p_msg[dwCount-1] == '.')) {
-            p_msg[--dwCount] = '\0';
-        }
-        if (p_msg[0] != '\0') {
-            rb_str_cat2(msg, p_msg);
-        }
-    }
-    return msg;
-}
-
-static VALUE
-ole_excepinfo2msg(pExInfo)
-    EXCEPINFO *pExInfo;
-{
-    char error_code[40];
-    char *pSource = NULL;
-    char *pDescription = NULL;
-    VALUE error_msg;
-    if(pExInfo->pfnDeferredFillIn != NULL) {
-        (*pExInfo->pfnDeferredFillIn)(pExInfo);
-    }
-    if (pExInfo->bstrSource != NULL) {
-        pSource = ole_wc2mb(pExInfo->bstrSource);
-    }
-    if (pExInfo->bstrDescription != NULL) {
-        pDescription = ole_wc2mb(pExInfo->bstrDescription);
-    }
-    if(pExInfo->wCode == 0) {
-        sprintf(error_code, "\n    OLE error code:%lX in ", pExInfo->scode);
-    }
-    else{
-        sprintf(error_code, "\n    OLE error code:%u in ", pExInfo->wCode);
-    }
-    error_msg = rb_str_new2(error_code);
-    if(pSource != NULL) {
-        rb_str_cat(error_msg, pSource, strlen(pSource));
-    }
-    else {
-        rb_str_cat(error_msg, "<Unknown>", 9);
-    }
-    rb_str_cat2(error_msg, "\n      ");
-    if(pDescription != NULL) {
-        rb_str_cat2(error_msg, pDescription);
-    }
-    else {
-        rb_str_cat2(error_msg, "<No Description>");
-    }
-    if(pSource) free(pSource);
-    if(pDescription) free(pDescription);
-    SysFreeString(pExInfo->bstrDescription);
-    SysFreeString(pExInfo->bstrSource);
-    SysFreeString(pExInfo->bstrHelpFile);
-    return error_msg;
-}
-
-static void
-#ifdef HAVE_STDARG_PROTOTYPES
-ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...)
-#else
-ole_raise(hr, exc, fmt, va_alist)
-    HRESULT hr;
-    VALUE exc;
-    const char *fmt;
-    va_dcl
-#endif
-{
-    va_list args;
-    char buf[BUFSIZ];
-    VALUE err_msg;
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
-    va_end(args);
-
-    err_msg = ole_hresult2msg(hr);
-    if(err_msg != Qnil) {
-        rb_raise(ecs, "%s\n%s", buf, StringValuePtr(err_msg));
-    }
-    else {
-        rb_raise(ecs, "%s", buf);
-    }
-}
-
-void
-ole_uninitialize()
-{
-    OleUninitialize();
-    gOLEInitialized = Qfalse;
-}
-
-static void
-ole_initialize() 
-{
-    HRESULT hr;
-    
-    if(gOLEInitialized == Qfalse) {
-        hr = OleInitialize(NULL);
-        if(FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "Fail : OLE initialize");
-        }
-        gOLEInitialized = Qtrue;
-	/*
-	 * In some situation, OleUninitialize does not work fine. ;-<
-	 */
-	/*
-        atexit((void (*)(void))ole_uninitialize);
-	*/
-    }
-}
-
-static void
-ole_msg_loop() {
-    MSG msg;
-    while(PeekMessage(&msg,NULL,0,0,PM_REMOVE)) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-}
-
-static void
-ole_free(pole)
-    struct oledata *pole;
-{
-    OLE_FREE(pole->pDispatch);
-}
-
-static void
-oletype_free(poletype)
-    struct oletypedata *poletype;
-{
-    OLE_FREE(poletype->pTypeInfo);
-}
-
-static void
-olemethod_free(polemethod)
-    struct olemethoddata *polemethod;
-{
-    OLE_FREE(polemethod->pTypeInfo);
-    OLE_FREE(polemethod->pOwnerTypeInfo);
-}
-
-static void
-olevariable_free(polevar)
-    struct olevariabledata *polevar;
-{
-    OLE_FREE(polevar->pTypeInfo);
-}
-
-static void
-oleparam_free(pole)
-    struct oleparamdata *pole;
-{
-    OLE_FREE(pole->pTypeInfo);
-}
-
-static LPWSTR
-ole_mb2wc(pm, len)
-    char *pm;
-    int  len;
-{
-    int size;
-    LPWSTR pw;
-    size = MultiByteToWideChar(CP_ACP, 0, pm, len, NULL, 0);
-    pw = SysAllocStringLen(NULL, size - 1);
-    MultiByteToWideChar(CP_ACP, 0, pm, len, pw, size);
-    return pw;
-}
-
-static VALUE
-ole_wc2vstr(pw, isfree)
-    LPWSTR pw;
-    BOOL isfree;
-{
-    char *p = ole_wc2mb(pw);
-    VALUE vstr = rb_str_new2(p);
-    if(isfree)
-        SysFreeString(pw);
-    free(p);
-    return vstr;
-}
-
-static VALUE
-ole_ary_m_entry(val, pid)
-    VALUE val;
-    long *pid;
-{
-    VALUE obj = Qnil;
-    int i = 0;
-    obj = val;
-    while(TYPE(obj) == T_ARRAY) {
-        obj = rb_ary_entry(obj, pid[i]);
-        i++;
-    }
-    return obj;
-}
-
-static void
-ole_set_safe_array(n, psa, pid, pub, val, dim)
-    long n;
-    SAFEARRAY *psa;
-    long *pid;
-    long *pub;
-    VALUE val;
-    long dim;
-{
-    VALUE val1;
-    VARIANT var;
-    VariantInit(&var);
-    if(n < 0) return;
-    if(n == dim) {
-        val1 = ole_ary_m_entry(val, pid);
-        ole_val2variant(val1, &var);
-        SafeArrayPutElement(psa, pid, &var);
-    }
-    pid[n] += 1;
-    if (pid[n] < pub[n]) {
-        ole_set_safe_array(dim, psa, pid, pub, val, dim);
-    }
-    else {
-        pid[n] = 0;
-        ole_set_safe_array(n-1, psa, pid, pub, val, dim);
-    }
-}
-
-static void
-ole_val2variant(val, var)
-    VALUE val;
-    VARIANT *var;
-{
-    struct oledata *pole;
-    if(rb_obj_is_kind_of(val, cWIN32OLE)) {
-        Data_Get_Struct(val, struct oledata, pole);
-	OLE_ADDREF(pole->pDispatch);
-        V_VT(var) = VT_DISPATCH;
-        V_DISPATCH(var) = pole->pDispatch;
-        return;
-    }
-    if (rb_obj_is_kind_of(val, rb_cTime)) {
-        V_VT(var) = VT_DATE;
-        V_DATE(var) = time_object2date(val);
-        return;
-    }
-    switch (TYPE(val)) {
-    case T_ARRAY:
-    {
-        VALUE val1;
-        long dim = 0;
-        int  i = 0;
-
-        HRESULT hr;
-        SAFEARRAYBOUND *psab;
-        SAFEARRAY *psa;
-        long      *pub, *pid;
-
-        val1 = val;
-        while(TYPE(val1) == T_ARRAY) {
-            val1 = rb_ary_entry(val1, 0);
-            dim += 1;
-        }
-        psab = ALLOC_N(SAFEARRAYBOUND, dim);
-        pub  = ALLOC_N(long, dim);
-        pid  = ALLOC_N(long, dim);
-
-        if(!psab || !pub || !pid) {
-            if(pub) free(pub);
-            if(psab) free(psab);
-            if(pid) free(pid);
-            rb_raise(rb_eRuntimeError, "memory allocate error");
-        }
-        val1 = val;
-        i = 0;
-        while(TYPE(val1) == T_ARRAY) {
-            psab[i].cElements = RARRAY(val1)->len;
-            psab[i].lLbound = 0;
-            pub[i] = psab[i].cElements;
-            pid[i] = 0;
-            i ++;
-            val1 = rb_ary_entry(val1, 0);
-        }
-        /* Create and fill VARIANT array */
-        psa = SafeArrayCreate(VT_VARIANT, dim, psab);
-        if (psa == NULL)
-            hr = E_OUTOFMEMORY;
-        else
-            hr = SafeArrayLock(psa);
-        if (SUCCEEDED(hr)) {
-            ole_set_safe_array(dim-1, psa, pid, pub, val, dim-1);
-            hr = SafeArrayUnlock(psa);
-        }
-        if(pub) free(pub);
-        if(psab) free(psab);
-        if(pid) free(pid);
-
-        if (SUCCEEDED(hr)) {
-            V_VT(var) = VT_VARIANT | VT_ARRAY;
-            V_ARRAY(var) = psa;
-        }
-        else if (psa != NULL)
-            SafeArrayDestroy(psa);
-        break;
-    }
-    case T_STRING:
-        V_VT(var) = VT_BSTR;
-        V_BSTR(var) = ole_mb2wc(StringValuePtr(val), -1);
-        break;
-    case T_FIXNUM:
-        V_VT(var) = VT_I4;
-        V_I4(var) = NUM2INT(val);
-        break;
-    case T_BIGNUM:
-	V_VT(var) = VT_R8;
-        V_R8(var) = rb_big2dbl(val);
-	break;
-    case T_FLOAT:
-        V_VT(var) = VT_R8;
-        V_R8(var) = NUM2DBL(val);
-        break;
-    case T_TRUE:
-        V_VT(var) = VT_BOOL;
-        V_BOOL(var) = VARIANT_TRUE;
-        break;
-    case T_FALSE:
-        V_VT(var) = VT_BOOL;
-        V_BOOL(var) = VARIANT_FALSE;
-        break;
-    case T_NIL:
-        V_VT(var) = VT_ERROR;
-        V_ERROR(var) = DISP_E_PARAMNOTFOUND;
-        break;
-    default:
-        rb_raise(rb_eTypeError, "not valid value");
-        break;
-    }
-}
-
-static VALUE
-ole_set_member(self, dispatch)
-    VALUE self;
-    IDispatch * dispatch;
-{
-    struct oledata *pole;
-    Data_Get_Struct(self, struct oledata, pole);
-    if (pole->pDispatch) {
-        OLE_RELEASE(pole->pDispatch);
-        pole->pDispatch = NULL;
-    }
-    pole->pDispatch = dispatch;
-    return self;
-}
-
-static VALUE fole_s_allocate _((VALUE));
-static VALUE
-fole_s_allocate(klass)
-    VALUE klass;
-{
-    struct oledata *pole;
-    VALUE obj;
-    ole_initialize();
-    obj = Data_Make_Struct(klass,struct oledata,0,ole_free,pole);
-    pole->pDispatch = NULL;
-    return obj;
-}
-
-static VALUE
-create_win32ole_object(klass, pDispatch, argc, argv)
-    VALUE klass;
-    IDispatch *pDispatch;
-    int argc;
-    VALUE *argv;
-{
-    VALUE obj = fole_s_allocate(klass);
-    ole_set_member(obj, pDispatch);
-    return obj;
-}
-
-static VALUE
-ole_variant2val(pvar)
-    VARIANT *pvar;
-{
-    VALUE obj = Qnil;
-    HRESULT hr;
-    while ( V_VT(pvar) == (VT_BYREF | VT_VARIANT) )
-        pvar = V_VARIANTREF(pvar);
-
-    if(V_ISARRAY(pvar)) {
-        SAFEARRAY *psa = V_ISBYREF(pvar) ? *V_ARRAYREF(pvar) : V_ARRAY(pvar);
-        long i;
-        long *pID, *pLB, *pUB;
-        VARIANT variant;
-        VALUE val;
-        VALUE val2;
-
-        int dim = SafeArrayGetDim(psa);
-        VariantInit(&variant);
-        V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF;
-
-        pID = ALLOC_N(long, dim);
-        pLB = ALLOC_N(long, dim);
-        pUB = ALLOC_N(long, dim);
-
-        if(!pID || !pLB || !pUB) {
-            if(pID) free(pID);
-            if(pLB) free(pLB);
-            if(pUB) free(pUB);
-            rb_raise(rb_eRuntimeError, "memory allocate error");
-        }
-
-        obj = Qnil;
-
-        for(i = 0; i < dim; ++i) {
-            SafeArrayGetLBound(psa, i+1, &pLB[i]);
-            SafeArrayGetLBound(psa, i+1, &pID[i]);
-            SafeArrayGetUBound(psa, i+1, &pUB[i]);
-        }
-
-        hr = SafeArrayLock(psa);
-        if (SUCCEEDED(hr)) {
-            val2 = rb_ary_new();
-            while (i >= 0) {
-                hr = SafeArrayPtrOfIndex(psa, pID, &V_BYREF(&variant));
-                if (FAILED(hr))
-                    break;
-
-                val = ole_variant2val(&variant);
-                rb_ary_push(val2, val);
-                for (i = dim-1 ; i >= 0 ; --i) {
-                    if (++pID[i] <= pUB[i])
-                        break;
-
-                    pID[i] = pLB[i];
-                    if (i > 0) {
-                        if (obj == Qnil)
-                            obj = rb_ary_new();
-                        rb_ary_push(obj, val2);
-                        val2 = rb_ary_new();
-                    }
-                }
-            }
-            SafeArrayUnlock(psa);
-        }
-        if(pID) free(pID);
-        if(pLB) free(pLB);
-        if(pUB) free(pUB);
-        return (obj == Qnil) ? val2 : obj;
-    }
-    switch(V_VT(pvar) & ~VT_BYREF){
-    case VT_EMPTY:
-        break;
-    case VT_NULL:
-        break;
-    case VT_UI1:
-        if(V_ISBYREF(pvar)) 
-            obj = INT2NUM((long)*V_UI1REF(pvar));
-        else 
-            obj = INT2NUM((long)V_UI1(pvar));
-        break;
-
-    case VT_I2:
-        if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_I2REF(pvar));
-        else 
-            obj = INT2NUM((long)V_I2(pvar));
-        break;
-
-    case VT_I4:
-        if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_I4REF(pvar));
-        else 
-            obj = INT2NUM((long)V_I4(pvar));
-        break;
-
-    case VT_R4:
-        if(V_ISBYREF(pvar))
-            obj = rb_float_new(*V_R4REF(pvar));
-        else
-            obj = rb_float_new(V_R4(pvar));
-        break;
-
-    case VT_R8:
-        if(V_ISBYREF(pvar))
-            obj = rb_float_new(*V_R8REF(pvar));
-        else
-            obj = rb_float_new(V_R8(pvar));
-        break;
-
-    case VT_BSTR:
-    {
-        char *p;
-        if(V_ISBYREF(pvar))
-            p = ole_wc2mb(*V_BSTRREF(pvar));
-        else
-            p = ole_wc2mb(V_BSTR(pvar));
-        obj = rb_str_new2(p);
-        if(p) free(p);
-        break;
-    }
-
-    case VT_ERROR:
-        if(V_ISBYREF(pvar))
-            obj = INT2NUM(*V_ERRORREF(pvar));
-        else
-            obj = INT2NUM(V_ERROR(pvar));
-        break;
-
-    case VT_BOOL:
-        if (V_ISBYREF(pvar))
-            obj = (*V_BOOLREF(pvar) ? Qtrue : Qfalse);
-        else
-            obj = (V_BOOL(pvar) ? Qtrue : Qfalse);
-        break;
-
-    case VT_DISPATCH:
-    {
-        IDispatch *pDispatch;
-
-        if (V_ISBYREF(pvar))
-            pDispatch = *V_DISPATCHREF(pvar);
-        else
-            pDispatch = V_DISPATCH(pvar);
-
-        if (pDispatch != NULL ) {
-	    OLE_ADDREF(pDispatch);
-            obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
-        }
-        break;
-    }
-
-    case VT_UNKNOWN:
-    {
-
-        /* get IDispatch interface from IUnknown interface */
-        IUnknown *punk;
-        IDispatch *pDispatch;
-        HRESULT hr;
-
-        if (V_ISBYREF(pvar))
-            punk = *V_UNKNOWNREF(pvar);
-        else
-            punk = V_UNKNOWN(pvar);
-
-        if(punk != NULL) {
-           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch,
-                                             (void **)&pDispatch);
-           if(SUCCEEDED(hr)) {
-               obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
-           }
-        }
-        break;
-    }
-
-    case VT_DATE:
-    {
-        DATE date;
-        if(V_ISBYREF(pvar))
-            date = *V_DATEREF(pvar);
-        else
-            date = V_DATE(pvar);
-
-        obj =  date2time_str(date);
-        break;
-    }
-    case VT_CY:
-    default:
-        {
-        HRESULT hr;
-        VARIANT variant;
-        VariantInit(&variant);
-        hr = VariantChangeTypeEx(&variant, pvar, 
-                                  LOCALE_SYSTEM_DEFAULT, 0, VT_BSTR);
-        if (SUCCEEDED(hr) && V_VT(&variant) == VT_BSTR) {
-            char *p = ole_wc2mb(V_BSTR(&variant));
-            obj = rb_str_new2(p);
-            if(p) free(p);
-        }
-        VariantClear(&variant);
-        break;
-        }
-    }
-    return obj;
-}
-
-static LONG reg_open_key(hkey, name, phkey)
-    HKEY hkey;
-    const char *name;
-    HKEY *phkey;
-{
-    return RegOpenKeyEx(hkey, name, 0, KEY_READ, phkey);
-}
-
-static LONG reg_open_vkey(hkey, key, phkey)
-    HKEY hkey;
-    VALUE key;
-    HKEY *phkey;
-{
-    return reg_open_key(hkey, StringValuePtr(key), phkey);
-}
-
-static VALUE
-reg_enum_key(hkey, i)
-    HKEY hkey;
-    DWORD i;
-{
-    char buf[BUFSIZ];
-    DWORD size_buf = sizeof(buf);
-    FILETIME ft;
-    LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf,
-                            NULL, NULL, NULL, &ft);
-    if(err == ERROR_SUCCESS) {
-        return rb_str_new2(buf);
-    }
-    return Qnil;
-}
-
-static VALUE
-reg_get_val(hkey, subkey)
-    HKEY hkey;
-    const char *subkey;
-{
-    char buf[BUFSIZ];
-    LONG size_buf = sizeof(buf);
-    LONG err = RegQueryValue(hkey, subkey, buf, &size_buf);
-    if (err == ERROR_SUCCESS) {
-        return rb_str_new2(buf);
-    }
-    return Qnil;
-}
-
-static VALUE
-typelib_file_from_clsid(ole)
-    VALUE ole;
-{
-    OLECHAR *pbuf;
-    CLSID clsid;
-    HRESULT hr;
-    HKEY hroot, hclsid;
-    LONG err;
-    VALUE typelib;
-    VALUE vclsid;
-    char *pclsid = NULL;
-
-    pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
-    hr = CLSIDFromProgID(pbuf, &clsid);
-    SysFreeString(pbuf);
-    if (FAILED(hr)) {
-	return Qnil;
-    }
-    StringFromCLSID(&clsid, &pbuf);
-    vclsid = WC2VSTR(pbuf);
-    err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hroot);
-    if (err != ERROR_SUCCESS) {
-        return Qnil;
-    }
-    err = reg_open_key(hroot, StringValuePtr(vclsid), &hclsid);
-    if (err != ERROR_SUCCESS) {
-        RegCloseKey(hroot);
-        return Qnil;
-    }
-    typelib = reg_get_val(hclsid, "InprocServer32");
-    RegCloseKey(hroot);
-    RegCloseKey(hclsid);
-    return typelib;
-}
-
-static VALUE
-typelib_file_from_typelib(ole)
-    VALUE ole;
-{
-    HKEY htypelib, hclsid, hversion, hlang;
-    double fver;
-    DWORD i, j, k;
-    LONG err;
-    BOOL found = FALSE;
-    VALUE typelib;
-    VALUE file = Qnil;
-    VALUE clsid;
-    VALUE ver;
-    VALUE lang;
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return Qnil;
-    }
-    for(i = 0; !found; i++) {
-        clsid = reg_enum_key(htypelib, i);
-        if (clsid == Qnil)
-            break;
-        err = reg_open_vkey(htypelib, clsid, &hclsid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        fver = 0;
-        for(j = 0; !found; j++) {
-            ver = reg_enum_key(hclsid, j);
-            if (ver == Qnil)
-                break;
-            err = reg_open_vkey(hclsid, ver, &hversion);
-            if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
-                continue;
-            fver = atof(StringValuePtr(ver));
-            typelib = reg_get_val(hversion, NULL);
-            if (typelib == Qnil)
-                continue;
-            if (rb_str_cmp(typelib, ole) == 0) {
-	        for(k = 0; !found; k++) {
-                    lang = reg_enum_key(hversion, k);
-                    if (lang == Qnil)
-                        break;
-                    err = reg_open_vkey(hversion, lang, &hlang);
-                    if (err == ERROR_SUCCESS) {
-                        if ((file = reg_get_val(hlang, "win32")) != Qnil) 
-                            found = TRUE;
-                        RegCloseKey(hlang);
-                    }
-                }
-            }
-            RegCloseKey(hversion);
-        }
-        RegCloseKey(hclsid);
-    }
-    RegCloseKey(htypelib);
-    return  file;
-}
-
-static VALUE
-typelib_file(ole)
-    VALUE ole;
-{
-    VALUE file = typelib_file_from_clsid(ole);
-    if (file != Qnil) {
-	return file;
-    }
-    return typelib_file_from_typelib(ole);
-}
-
-static void
-ole_const_load(pTypeLib, klass, self)
-    ITypeLib *pTypeLib;
-    VALUE klass;
-    VALUE self;
-{
-    unsigned int count;
-    unsigned int index;
-    int iVar;
-    ITypeInfo *pTypeInfo;
-    TYPEATTR  *pTypeAttr;
-    VARDESC   *pVarDesc;
-    HRESULT hr;
-    unsigned int len;
-    BSTR bstr;
-    char *pName = NULL;
-    VALUE val;
-    VALUE constant;
-    ID id;
-    constant = rb_hash_new();
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (index = 0; index < count; index++) {
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, index, &pTypeInfo);
-        if (FAILED(hr))
-            continue;
-        hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-        if(FAILED(hr)) {
-            OLE_RELEASE(pTypeInfo);
-            continue;
-        }
-        for(iVar = 0; iVar < pTypeAttr->cVars; iVar++) {
-            hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, iVar, &pVarDesc);
-            if(FAILED(hr))
-                continue;
-            if(pVarDesc->varkind == VAR_CONST &&
-               !(pVarDesc->wVarFlags & (VARFLAG_FHIDDEN |
-                                        VARFLAG_FRESTRICTED |
-                                        VARFLAG_FNONBROWSABLE))) {
-                hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pVarDesc->memid, &bstr,
-                                                 1, &len);
-                if(FAILED(hr) || len == 0 || !bstr)
-                    continue;
-                pName = ole_wc2mb(bstr);
-                val = ole_variant2val(V_UNION1(pVarDesc, lpvarValue));
-                *pName = toupper(*pName);
-                id = rb_intern(pName);
-                if (rb_is_const_id(id)) {
-                    rb_define_const(klass, pName, val);
-                }
-                else {
-                    rb_hash_aset(constant, rb_str_new2(pName), val);
-                }
-                SysFreeString(bstr);
-                if(pName) {
-                    free(pName);
-                    pName = NULL;
-                }
-            }
-            pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-        }
-        pTypeInfo->lpVtbl->ReleaseTypeAttr(pTypeInfo, pTypeAttr);
-        OLE_RELEASE(pTypeInfo);
-    }
-    rb_define_const(klass, "CONSTANTS", constant);
-}
-
-static HRESULT
-clsid_from_remote(host, com, pclsid)
-    VALUE host;
-    VALUE com;
-    CLSID *pclsid;
-{
-    HKEY hlm;
-    HKEY hpid;
-    VALUE subkey;
-    LONG err;
-    char clsid[100];
-    OLECHAR *pbuf;
-    DWORD len;
-    DWORD dwtype;
-    HRESULT hr = S_OK;
-    err = RegConnectRegistry(StringValuePtr(host), HKEY_LOCAL_MACHINE, &hlm);
-    if (err != ERROR_SUCCESS)
-        return HRESULT_FROM_WIN32(err);
-    subkey = rb_str_new2("SOFTWARE\\Classes\\");
-    rb_str_concat(subkey, com);
-    rb_str_cat2(subkey, "\\CLSID");
-    err = RegOpenKeyEx(hlm, StringValuePtr(subkey), 0, KEY_READ, &hpid);
-    if (err != ERROR_SUCCESS)
-        hr = HRESULT_FROM_WIN32(err);
-    else {
-        len = sizeof(clsid);
-        err = RegQueryValueEx(hpid, "", NULL, &dwtype, clsid, &len);
-        if (err == ERROR_SUCCESS && dwtype == REG_SZ) {
-            pbuf  = ole_mb2wc(clsid, -1);
-            hr = CLSIDFromString(pbuf, pclsid);
-            SysFreeString(pbuf);
-	}
-	else {
-            hr = HRESULT_FROM_WIN32(err);
-        }
-        RegCloseKey(hpid);
-    }
-    RegCloseKey(hlm);
-    return hr;
-}
-
-static VALUE
-ole_create_dcom(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE ole, host, others;
-    HRESULT hr;
-    CLSID   clsid;
-    OLECHAR *pbuf;
-
-    COSERVERINFO serverinfo;
-    MULTI_QI multi_qi;
-    DWORD clsctx = CLSCTX_REMOTE_SERVER;
-
-    if (!gole32)
-        gole32 = LoadLibrary("OLE32");
-    if (!gole32)
-        rb_raise(rb_eRuntimeError, "Fail to load OLE32.");
-    if (!gCoCreateInstanceEx)
-        gCoCreateInstanceEx = (FNCOCREATEINSTANCEEX*)
-            GetProcAddress(gole32, "CoCreateInstanceEx");
-    if (!gCoCreateInstanceEx)
-        rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment.");
-    rb_scan_args(argc, argv, "2*", &ole, &host, &others);
-
-    pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
-    hr = CLSIDFromProgID(pbuf, &clsid);
-    if (FAILED(hr))
-        hr = clsid_from_remote(host, ole, &clsid);
-    if (FAILED(hr))
-        hr = CLSIDFromString(pbuf, &clsid);
-    SysFreeString(pbuf);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Unknown OLE server : `%s'",
-                  StringValuePtr(ole));
-    memset(&serverinfo, 0, sizeof(COSERVERINFO));    
-    serverinfo.pwszName = ole_mb2wc(StringValuePtr(host), -1);
-    memset(&multi_qi, 0, sizeof(MULTI_QI));
-    multi_qi.pIID = &IID_IDispatch;
-    hr = gCoCreateInstanceEx(&clsid, NULL, clsctx, &serverinfo, 1, &multi_qi);
-    SysFreeString(serverinfo.pwszName);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Fail to create DCOM server : `%s' in `%s'",
-                  StringValuePtr(ole),
-                  StringValuePtr(host));
-
-    ole_set_member(self, (IDispatch*)multi_qi.pItf);
-    return self;
-}
-
-static VALUE
-ole_bind_obj(moniker, argc, argv, self)
-    VALUE moniker;
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    IBindCtx *pBindCtx;
-    IMoniker *pMoniker;
-    IDispatch *pDispatch;
-    HRESULT hr;
-    OLECHAR *pbuf;
-    ULONG eaten = 0;
-    
-    ole_initialize();
-
-    hr = CreateBindCtx(0, &pBindCtx);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Fail to create bind context");
-    }
-
-    pbuf  = ole_mb2wc(StringValuePtr(moniker), -1);
-    hr = MkParseDisplayName(pBindCtx, pbuf, &eaten, &pMoniker);
-    SysFreeString(pbuf);
-    if(FAILED(hr)) {
-        OLE_RELEASE(pBindCtx);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "Faile to parse display name of moniker:%s",
-                  StringValuePtr(moniker));
-    }
-    hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL, 
-                                        &IID_IDispatch,
-				        (void**)&pDispatch);
-    OLE_RELEASE(pMoniker);
-    OLE_RELEASE(pBindCtx);
-
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "Faile to bind moniker:%s",
-                  StringValuePtr(moniker));
-    }
-    return create_win32ole_object(self, pDispatch, argc, argv);
-}
-
-/*
- * WIN32OLE.connect( ole ) --> aWIN32OLE
- * ----
- * Returns running OLE Automation object or WIN32OLE object from moniker.
- * 1st argument should be OLE program id or class id or moniker.
- */
-static VALUE
-fole_s_connect(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE svr_name;
-    VALUE others;
-    HRESULT hr;
-    CLSID   clsid;
-    OLECHAR *pBuf;
-    IDispatch *pDispatch;
-    IUnknown *pUnknown;
-
-    rb_secure(4);
-    /* initialize to use OLE */
-    ole_initialize();
-
-    rb_scan_args(argc, argv, "1*", &svr_name, &others);
-    if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
-	rb_raise(rb_eSecurityError, "Insecure Object Connection - %s",
-		 StringValuePtr(svr_name));
-    }
-
-    /* get CLSID from OLE server name */
-    pBuf  = ole_mb2wc(StringValuePtr(svr_name), -1);
-    hr = CLSIDFromProgID(pBuf, &clsid);
-    if(FAILED(hr)) {
-        hr = CLSIDFromString(pBuf, &clsid);
-    }
-    SysFreeString(pBuf);
-    if(FAILED(hr)) {
-        return ole_bind_obj(svr_name, argc, argv, self);
-    }
-
-    hr = GetActiveObject(&clsid, 0, &pUnknown);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Not Running OLE server : `%s'", StringValuePtr(svr_name));
-    }
-    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch,
-                                             (void **)&pDispatch);
-    if(FAILED(hr)) {
-        OLE_RELEASE(pUnknown);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Fail to create WIN32OLE server : `%s'", 
-                  StringValuePtr(svr_name));
-    }
-
-    OLE_RELEASE(pUnknown);
-
-    return create_win32ole_object(self, pDispatch, argc, argv);
-}
-
-/* 
- * WIN32OLE.const_load( ole, mod = WIN32OLE)
- * ----
- * Defines the constants of OLE Automation server as mod's constants.
- * If 2nd argument is omitted, the default is WIN32OLE.
- */
-static VALUE
-fole_s_const_load(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE ole;
-    VALUE klass;
-    struct oledata *pole;
-    ITypeInfo *pTypeInfo;
-    ITypeLib *pTypeLib;
-    unsigned int index;
-    HRESULT hr;
-    OLECHAR *pBuf;
-    VALUE file;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
-    
-    rb_secure(4);
-    rb_scan_args(argc, argv, "11", &ole, &klass);
-    if (TYPE(klass) != T_CLASS &&
-        TYPE(klass) != T_MODULE &&
-        TYPE(klass) != T_NIL) {
-        rb_raise(rb_eTypeError, "2nd paramator must be Class or Module.");
-    }
-    if (rb_obj_is_kind_of(ole, cWIN32OLE)) {
-        OLEData_Get_Struct(ole, pole);
-        hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
-                                                  0, lcid, &pTypeInfo);
-        if(FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "fail to GetTypeInfo");
-        }
-        hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
-        if(FAILED(hr)) {
-            OLE_RELEASE(pTypeInfo);
-            ole_raise(hr, rb_eRuntimeError, "fail to GetContainingTypeLib");
-        }
-        OLE_RELEASE(pTypeInfo);
-        if(TYPE(klass) != T_NIL) {
-            ole_const_load(pTypeLib, klass, self);
-        }
-        else {
-            ole_const_load(pTypeLib, cWIN32OLE, self);
-        }
-        OLE_RELEASE(pTypeLib);
-    }
-    else if(TYPE(ole) == T_STRING) {
-        file = typelib_file(ole);
-        if (file == Qnil) {
-	    file = ole;
-        }
-        pBuf = ole_mb2wc(StringValuePtr(file), -1);
-        hr = LoadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib);
-        SysFreeString(pBuf);
-	if (FAILED(hr))
-          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to LoadTypeLibEx");
-        if(TYPE(klass) != T_NIL) {
-            ole_const_load(pTypeLib, klass, self);
-        }
-        else {
-            ole_const_load(pTypeLib, cWIN32OLE, self);
-        }
-        OLE_RELEASE(pTypeLib);
-    }
-    else {
-        rb_raise(rb_eTypeError, "1st paramator must be WIN32OLE instance");
-    }
-    return Qnil;
-}
-
-static VALUE
-ole_classes_from_typelib(pTypeLib, classes)
-    ITypeLib *pTypeLib;
-    VALUE classes;
-{
-    
-    long count;
-    int i;
-    HRESULT hr;
-    BSTR bstr;
-    ITypeInfo *pTypeInfo;
-    VALUE type;
-  
-    rb_secure(4);
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count; i++) {
-        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                                &bstr, NULL, NULL, NULL);
-        if (FAILED(hr)) 
-	    continue;
-
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
-        if (FAILED(hr))
-            continue;
-
-        type = foletype_s_allocate(cWIN32OLE_TYPE);
-	oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
-
-	rb_ary_push(classes, type);
-	OLE_RELEASE(pTypeInfo);
-    }
-    return classes;
-}
-
-static ULONG
-reference_count(pole)
-    struct oledata * pole;
-{
-    ULONG n = 0;
-    if(pole->pDispatch) {
-	OLE_ADDREF(pole->pDispatch);
-        n = OLE_RELEASE(pole->pDispatch);
-    }
-    return n;
-}
-
-/*
- * WIN32OLE.ole_reference_count(aWIN32OLE) --> number
- * ----
- * Returns reference counter of Dispatch interface of WIN32OLE object. 
- * You should not use this method because this method
- * exists only for debugging WIN32OLE.
- */
-static VALUE
-fole_s_reference_count(self, obj)
-    VALUE self;
-    VALUE obj;
-{
-    struct oledata * pole;
-    OLEData_Get_Struct(obj, pole);
-    return INT2NUM(reference_count(pole));
-}
-
-/*
- * WIN32OLE.ole_free(aWIN32OLE) --> number
- * ----
- * Invokes Release method of Dispatch interface of WIN32OLE object. 
- * You should not use this method because this method
- * exists only for debugging WIN32OLE.
- * The return value is reference counter of OLE object.
- */
-static VALUE
-fole_s_free(self, obj)
-    VALUE self;
-    VALUE obj;
-{
-    ULONG n = 0;
-    struct oledata * pole;
-    OLEData_Get_Struct(obj, pole);
-    if(pole->pDispatch) {
-        if (reference_count(pole) > 0) {
-            n = OLE_RELEASE(pole->pDispatch);
-        }
-    }
-    return INT2NUM(n);
-}
-
-static HWND
-ole_show_help(helpfile, helpcontext)
-    VALUE helpfile;
-    VALUE helpcontext;
-{
-    FNHTMLHELP *pfnHtmlHelp;
-    HWND hwnd = 0;
-
-    if(!ghhctrl)
-        ghhctrl = LoadLibrary("HHCTRL.OCX");
-    if (!ghhctrl)
-        return hwnd;
-    pfnHtmlHelp = (FNHTMLHELP*)GetProcAddress(ghhctrl, "HtmlHelpA");
-    if (!pfnHtmlHelp)
-        return hwnd;
-    hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile), 
-                    0x0f, NUM2INT(helpcontext));
-    if (hwnd == 0)
-	hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile), 
-                 0,  NUM2INT(helpcontext));
-    return hwnd;
-}
-
-/*
- * WIN32OLE.ole_show_help(obj [,helpcontext])
- * ----
- * Displays helpfile. The 1st argument specifies WIN32OLE_TYPE
- * object or WIN32OLE_METHOD object or helpfile.
- */
-static VALUE
-fole_s_show_help(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE target;
-    VALUE helpcontext;
-    VALUE helpfile;
-    VALUE name;
-    HWND  hwnd;
-    rb_scan_args(argc, argv, "11", &target, &helpcontext);
-    if (rb_obj_is_kind_of(target, cWIN32OLE_TYPE) ||
-        rb_obj_is_kind_of(target, cWIN32OLE_METHOD)) {
-        helpfile = rb_funcall(target, rb_intern("helpfile"), 0);
-        if(strlen(StringValuePtr(helpfile)) == 0) {
-            name = rb_ivar_get(target, rb_intern("name"));
-            rb_raise(rb_eRuntimeError, "no helpfile of `%s'",
-                     StringValuePtr(name));
-        }
-        helpcontext = rb_funcall(target, rb_intern("helpcontext"), 0);
-    } else {
-        helpfile = target;
-    }
-    if (TYPE(helpfile) != T_STRING) {
-        rb_raise(rb_eTypeError, "1st parametor must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD).");
-    }
-    hwnd = ole_show_help(helpfile, helpcontext);
-    if(hwnd == 0) {
-        rb_raise(rb_eRuntimeError, "fail to open help file:%s",
-                 StringValuePtr(helpfile));
-    }
-    return Qnil;
-}
-
-static VALUE
-fole_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE svr_name;
-    VALUE host;
-    VALUE others;
-    HRESULT hr;
-    CLSID   clsid;
-    OLECHAR *pBuf;
-    IDispatch *pDispatch;
-
-    rb_secure(4);
-    rb_call_super(0, 0);
-    rb_scan_args(argc, argv, "11*", &svr_name, &host, &others);
-
-    if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
-	rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
-		 StringValuePtr(svr_name));
-    }
-    if (!NIL_P(host)) {
-	if (ruby_safe_level > 0 && OBJ_TAINTED(host)) {
-	    rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
-		     StringValuePtr(svr_name));
-	}
-        return ole_create_dcom(argc, argv, self);
-    }
-
-    /* get CLSID from OLE server name */
-    pBuf  = ole_mb2wc(StringValuePtr(svr_name), -1);
-    hr = CLSIDFromProgID(pBuf, &clsid);
-    if(FAILED(hr)) {
-        hr = CLSIDFromString(pBuf, &clsid);
-    }
-    SysFreeString(pBuf);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Unknown OLE server : `%s'",
-                  StringValuePtr(svr_name));
-    }
-
-    /* get IDispatch interface */
-    hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
-                          &IID_IDispatch, (void**)&pDispatch);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "Fail to create WIN32OLE object from `%s'",
-                  StringValuePtr(svr_name));
-    }
-    
-    ole_set_member(self, pDispatch);
-    return self;
-}
-
-static VALUE
-hash2named_arg(pair, pOp)
-    VALUE pair;
-    struct oleparam* pOp;
-{
-    unsigned int index, i;
-    VALUE key, value;
-    index = pOp->dp.cNamedArgs;
-
-    /*-------------------------------------
-      the data-type of key must be String
-    ---------------------------------------*/
-    key = rb_ary_entry(pair, 0);
-    if(TYPE(key) != T_STRING) {
-        /* clear name of dispatch parameters */
-        for(i = 1; i < index + 1; i++) {
-            SysFreeString(pOp->pNamedArgs[i]);
-        }
-        /* clear dispatch parameters */
-        for(i = 0; i < index; i++ ) {
-            VariantClear(&(pOp->dp.rgvarg[i]));
-        }
-        /* raise an exception */
-        Check_Type(key, T_STRING);
-    }
-
-    /* pNamedArgs[0] is <method name>, so "index + 1" */
-    pOp->pNamedArgs[index + 1] = ole_mb2wc(StringValuePtr(key), -1);
-
-    value = rb_ary_entry(pair, 1);
-    VariantInit(&(pOp->dp.rgvarg[index]));
-    ole_val2variant(value, &(pOp->dp.rgvarg[index]));
-
-    pOp->dp.cNamedArgs += 1;
-    return Qnil;
-}
-
-static VALUE
-ole_invoke(argc, argv, self, wFlags)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-    USHORT wFlags;
-{
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
-    struct oledata *pole;
-    HRESULT hr;
-    VALUE cmd;
-    VALUE paramS;
-    VALUE param;
-    VALUE obj;
-    VALUE v;
-
-    BSTR wcmdname;
-
-    DISPID DispID;
-    DISPID* pDispID;
-    EXCEPINFO excepinfo;
-    VARIANT result;
-    VALUE args;
-    VARIANTARG* realargs = NULL;
-    unsigned int argErr = 0;
-    unsigned int i;
-    unsigned int cNamedArgs;
-    int n;
-    struct oleparam op;
-    memset(&excepinfo, 0, sizeof(EXCEPINFO));
-
-    VariantInit(&result);
-
-    op.dp.rgvarg = NULL;
-    op.dp.rgdispidNamedArgs = NULL;
-    op.dp.cNamedArgs = 0;
-    op.dp.cArgs = 0;
-
-    rb_scan_args(argc, argv, "1*", &cmd, &paramS);
-    OLEData_Get_Struct(self, pole);
-    if(!pole->pDispatch) {
-	rb_raise(rb_eRuntimeError, "Fail to get dispatch interface.");
-    }
-    wcmdname = ole_mb2wc(StringValuePtr(cmd), -1);
-    hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
-                                                 &wcmdname, 1, lcid, &DispID);
-    SysFreeString(wcmdname);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Unknown property or method : `%s'",
-                  StringValuePtr(cmd));
-    }
-
-    /* pick up last argument of method */
-    param = rb_ary_entry(paramS, argc-2);
-
-    op.dp.cNamedArgs = 0;
-
-    /* if last arg is hash object */
-    if(TYPE(param) == T_HASH) {
-        /*------------------------------------------ 
-          hash object ==> named dispatch parameters 
-        --------------------------------------------*/
-        cNamedArgs = NUM2INT(rb_funcall(param, rb_intern("length"), 0));
-        op.dp.cArgs = cNamedArgs + argc - 2;
-        op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
-        op.dp.rgvarg = ALLOCA_N(VARIANTARG, op.dp.cArgs);
-        rb_iterate(rb_each, param, hash2named_arg, (VALUE)&op);
-
-        pDispID = ALLOCA_N(DISPID, cNamedArgs + 1);
-        op.pNamedArgs[0] = ole_mb2wc(StringValuePtr(cmd), -1);
-        hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch,
-                                                    &IID_NULL,
-                                                    op.pNamedArgs,
-                                                    op.dp.cNamedArgs + 1,
-                                                    lcid, pDispID);
-        for(i = 0; i < op.dp.cNamedArgs + 1; i++) {
-            SysFreeString(op.pNamedArgs[i]);
-            op.pNamedArgs[i] = NULL;
-        }
-        if(FAILED(hr)) {
-            /* clear dispatch parameters */
-            for(i = 0; i < op.dp.cArgs; i++ ) {
-                VariantClear(&op.dp.rgvarg[i]);
-            }
-            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                      "FAIL to get named argument info : `%s'",
-                      StringValuePtr(cmd));
-        }
-        op.dp.rgdispidNamedArgs = &(pDispID[1]);
-    }
-    else {
-        cNamedArgs = 0;
-        op.dp.cArgs = argc - 1;
-        op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
-        if (op.dp.cArgs > 0) {
-            op.dp.rgvarg  = ALLOCA_N(VARIANTARG, op.dp.cArgs);
-        }
-    }
-    /*--------------------------------------
-      non hash args ==> dispatch parameters 
-     ----------------------------------------*/
-    if(op.dp.cArgs > cNamedArgs) {
-        realargs = ALLOCA_N(VARIANTARG, op.dp.cArgs-cNamedArgs+1);
-        for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-            n = op.dp.cArgs - i + cNamedArgs - 1;
-            VariantInit(&realargs[n]);
-            VariantInit(&op.dp.rgvarg[n]);
-            param = rb_ary_entry(paramS, i-cNamedArgs);
-            
- 	    ole_val2variant(param, &realargs[n]);
-            V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
- 	    V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
-
-        }
-    }
-    /* apparent you need to call propput, you need this */
-    if (wFlags & DISPATCH_PROPERTYPUT) {
-        if (op.dp.cArgs == 0)
-            return ResultFromScode(E_INVALIDARG);
-
-        op.dp.cNamedArgs = 1;
-        op.dp.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
-        op.dp.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
-    }
-    
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
-                                         &IID_NULL, lcid, wFlags, &op.dp, 
-                                         &result, &excepinfo, &argErr);
-    if (FAILED(hr)) {
-        /* retry to call args by value */
-        if(op.dp.cArgs > cNamedArgs) {
-            for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-                n = op.dp.cArgs - i + cNamedArgs - 1;
-                param = rb_ary_entry(paramS, i-cNamedArgs);
-                ole_val2variant(param, &op.dp.rgvarg[n]);
-            }
-            memset(&excepinfo, 0, sizeof(EXCEPINFO));
-            hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
-                                                 &IID_NULL, lcid, wFlags,
-                                                 &op.dp, NULL,
-                                                 &excepinfo, &argErr);
-            for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-                n = op.dp.cArgs - i + cNamedArgs - 1;
-                VariantClear(&op.dp.rgvarg[n]);
-            }
-        }
-        /* mega kludge. if a method in WORD is called and we ask
-         * for a result when one is not returned then
-         * hResult == DISP_E_EXCEPTION. this only happens on
-         * functions whose DISPID > 0x8000 */
-        if (hr == DISP_E_EXCEPTION && DispID > 0x8000) {
-            memset(&excepinfo, 0, sizeof(EXCEPINFO));
-            hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
-                                                 &IID_NULL, lcid, wFlags,
-                                                 &op.dp, NULL,
-                                                 &excepinfo, &argErr);
-
-        }
-    }
-    /* clear dispatch parameter */
-    if(op.dp.cArgs > cNamedArgs) {
-        args = rb_cvar_get(cWIN32OLE, rb_intern("ARGV"));
-        rb_funcall(args, rb_intern("clear"), 0);
-        for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-            n = op.dp.cArgs - i + cNamedArgs - 1;
-            rb_ary_push(args, ole_variant2val(&realargs[n]));
-            VariantClear(&realargs[n]);
-        }
-    }
-    else {
-        for(i = 0; i < op.dp.cArgs; i++) {
-            VariantClear(&op.dp.rgvarg[i]);
-        }
-    }
-
-    if (FAILED(hr)) {
-        v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "%s%s",
-                  StringValuePtr(cmd), StringValuePtr(v));
-    }
-    obj = ole_variant2val(&result);
-    VariantClear(&result);
-    return obj;
-}
-
-static VALUE
-fole_invoke(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
-}
-
-static VALUE
-ole_invoke2(self, dispid, args, types, dispkind)
-    VALUE self;
-    VALUE dispid;
-    VALUE args;
-    VALUE types;
-    USHORT dispkind;
-{
-    HRESULT hr;
-    struct oledata *pole;
-    unsigned int argErr = 0;
-    EXCEPINFO excepinfo;
-    VARIANT result;
-    DISPPARAMS dispParams;
-    VARIANTARG* realargs = NULL;
-    int i, j;
-    VALUE obj = Qnil;
-    VALUE tp, param;
-    VALUE v;
-    VARTYPE vt;
-
-    Check_Type(args, T_ARRAY);
-    Check_Type(types, T_ARRAY);
-    
-    memset(&excepinfo, 0, sizeof(EXCEPINFO));
-    memset(&dispParams, 0, sizeof(DISPPARAMS));
-    VariantInit(&result);
-    OLEData_Get_Struct(self, pole);
-
-    dispParams.cArgs = RARRAY(args)->len;
-    dispParams.rgvarg = ALLOCA_N(VARIANTARG, dispParams.cArgs);
-    realargs = ALLOCA_N(VARIANTARG, dispParams.cArgs);
-    for (i = 0, j = dispParams.cArgs - 1; i < (int)dispParams.cArgs; i++, j--)
-    {
-	VariantInit(&realargs[i]);
-	VariantInit(&dispParams.rgvarg[i]);
-	tp = rb_ary_entry(types, j);
-	vt = (VARTYPE)FIX2INT(tp);
-	V_VT(&dispParams.rgvarg[i]) = vt;
-	param = rb_ary_entry(args, j);
-	if (param == Qnil)
-	{
-
-	    V_VT(&dispParams.rgvarg[i]) = V_VT(&realargs[i]) = VT_ERROR;
-	    V_ERROR(&dispParams.rgvarg[i]) = V_ERROR(&realargs[i]) = DISP_E_PARAMNOTFOUND;
-	}
-	else
-	{
-	    if (vt & VT_ARRAY)
-	    {
-		int ent;
-		LPBYTE pb;
-		short* ps;
-		LPLONG pl;
-		VARIANT* pv;
-		CY *py;
-		VARTYPE v;
-		SAFEARRAYBOUND rgsabound[1];
-		Check_Type(param, T_ARRAY);
-		rgsabound[0].lLbound = 0;
-		rgsabound[0].cElements = RARRAY(param)->len;
-		v = vt & ~(VT_ARRAY | VT_BYREF);
-		V_ARRAY(&realargs[i]) = SafeArrayCreate(v, 1, rgsabound);
-		V_VT(&realargs[i]) = VT_ARRAY | v;
-		SafeArrayLock(V_ARRAY(&realargs[i]));
-		pb = V_ARRAY(&realargs[i])->pvData;
-		ps = V_ARRAY(&realargs[i])->pvData;
-		pl = V_ARRAY(&realargs[i])->pvData;
-		py = V_ARRAY(&realargs[i])->pvData;
-		pv = V_ARRAY(&realargs[i])->pvData;
-		for (ent = 0; ent < (int)rgsabound[0].cElements; ent++)
-		{
-		    VARIANT velem;
-		    VALUE elem = rb_ary_entry(param, ent);
-		    ole_val2variant(elem, &velem);
-		    if (v != VT_VARIANT)
-		    {
-			VariantChangeTypeEx(&velem, &velem,
-			    LOCALE_SYSTEM_DEFAULT, 0, v);
-		    }
-		    switch (v)
-		    {
-		    /* 128 bits */
-		    case VT_VARIANT:
-			*pv++ = velem;
-			break;
-		    /* 64 bits */
-		    case VT_R8:
-		    case VT_CY:
-		    case VT_DATE:
-			*py++ = V_CY(&velem);
-			break;
-		    /* 16 bits */
-		    case VT_BOOL:
-		    case VT_I2:
-		    case VT_UI2:
-			*ps++ = V_I2(&velem);
-			break;
-		    /* 8 bites */
-		    case VT_UI1:
-		    case VT_I1:
-			*pb++ = V_UI1(&velem);
-			break;
-		    /* 32 bits */
-		    default:
-			*pl++ = V_I4(&velem);
-			break;
-		    }
-		}
-		SafeArrayUnlock(V_ARRAY(&realargs[i]));
-	    }
-	    else
-	    {
-		ole_val2variant(param, &realargs[i]);
-		if ((vt & (~VT_BYREF)) != VT_VARIANT)
-		{
-		    hr = VariantChangeTypeEx(&realargs[i], &realargs[i],
-					     LOCALE_SYSTEM_DEFAULT, 0,
-					     (VARTYPE)(vt & (~VT_BYREF)));
-		    if (hr != S_OK)
-		    {
-			rb_raise(rb_eTypeError, "not valid value");
-		    }
-		}
-	    }
-	    if ((vt & VT_BYREF) || vt == VT_VARIANT)
-	    {
-		if (vt == VT_VARIANT)
-		    V_VT(&dispParams.rgvarg[i]) = VT_VARIANT | VT_BYREF;
-		switch (vt & (~VT_BYREF))
-		{
-		/* 128 bits */
-		case VT_VARIANT:
-		    V_VARIANTREF(&dispParams.rgvarg[i]) = &realargs[i];
-		    break;
-		/* 64 bits */
-		case VT_R8:
-		case VT_CY:
-		case VT_DATE:
-		    V_CYREF(&dispParams.rgvarg[i]) = &V_CY(&realargs[i]);
-		    break;
-		/* 16 bits */
-		case VT_BOOL:
-		case VT_I2:
-		case VT_UI2:
-		    V_I2REF(&dispParams.rgvarg[i]) = &V_I2(&realargs[i]);
-		    break;
-		/* 8 bites */
-		case VT_UI1:
-		case VT_I1:
-		    V_UI1REF(&dispParams.rgvarg[i]) = &V_UI1(&realargs[i]);
-		    break;
-		/* 32 bits */
-		default:
-		    V_I4REF(&dispParams.rgvarg[i]) = &V_I4(&realargs[i]);
-		    break;
-		}
-	    }
-	    else
-	    {
-		/* copy 64 bits of data */
-		V_CY(&dispParams.rgvarg[i]) = V_CY(&realargs[i]);
-	    }
-	}
-    }
-
-    if (dispkind & DISPATCH_PROPERTYPUT) {
-        dispParams.cNamedArgs = 1;
-        dispParams.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
-        dispParams.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
-    }
-
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, FIX2INT(dispid),
-                                         &IID_NULL, LOCALE_SYSTEM_DEFAULT,
-                                         dispkind,
-                                         &dispParams, &result,
-                                         &excepinfo, &argErr);
-
-    if (FAILED(hr)) {
-        v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "_invoke %s",
-                  StringValuePtr(v));
-    }
-
-    /* clear dispatch parameter */
-    if(dispParams.cArgs > 0) {
-        VALUE argv = rb_cvar_get(cWIN32OLE, rb_intern("ARGV"));
-        rb_funcall(argv, rb_intern("clear"), 0);
-        for(i = dispParams.cArgs - 1; i >= 0; i--) {
-            rb_ary_push(argv, ole_variant2val(&realargs[i]));
-            VariantClear(&realargs[i]);
-        }
-    }
-
-    obj = ole_variant2val(&result);
-    VariantClear(&result);
-    return obj;
-}
-
-/*
- * WIN32OLE#_invoke(dispid, args, types)
- * ----
- * Runs the early binding method.
- * The 1st argument specifies dispatch ID, 
- * the 2nd argument specifies the array of arguments,
- * the 3rd argument specifies the array of the type of arguments.
- */
-static VALUE
-fole_invoke2(self, dispid, args, types)
-    VALUE self;
-    VALUE dispid;
-    VALUE args;
-    VALUE types;
-{
-    return ole_invoke2(self, dispid, args, types, DISPATCH_METHOD);
-}
-
-/*
- * WIN32OLE#_getproperty(dispid, args, types)
- * ----
- * Runs the early binding method to get property.
- * The 1st argument specifies dispatch ID, 
- * the 2nd argument specifies the array of arguments,
- * the 3rd argument specifies the array of the type of arguments.
- */
-static VALUE
-fole_getproperty2(self, dispid, args, types)
-    VALUE self;
-    VALUE dispid;
-    VALUE args;
-    VALUE types;
-{
-    return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYGET);
-}
-
-/*
- * WIN32OLE#_setproperty(dispid, args, types)
- * ----
- * Runs the early binding method to set property.
- * The 1st argument specifies dispatch ID, 
- * the 2nd argument specifies the array of arguments,
- * the 3rd argument specifies the array of the type of arguments.
- */
-static VALUE
-fole_setproperty2(self, dispid, args, types)
-    VALUE self;
-    VALUE dispid;
-    VALUE args;
-    VALUE types;
-{
-    return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYPUT);
-}
-
-/*
- * WIN32OLE['property']=val 
- *
- * WIN32OLE.setproperty('property', [arg1, arg2,] val)
- * -----
- * Sets property of OLE object.
- * When you want to set property with argument, you can use setproperty method.
- */
-static VALUE
-fole_setproperty(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT);
-}
-
-/*
- * WIN32OLE['property'] 
- * -----
- * Returns property of OLE object.
- */
-static VALUE
-fole_getproperty(self, property)
-    VALUE self, property;
-{
-    return ole_invoke(1, &property, self, DISPATCH_PROPERTYGET);
-}
-
-static VALUE
-ole_propertyput(self, property, value)
-    VALUE self, property, value;
-{
-    struct oledata *pole;
-    unsigned argErr;
-    unsigned int index;
-    HRESULT hr;
-    EXCEPINFO excepinfo;
-    DISPID dispID = DISPID_VALUE;
-    DISPID dispIDParam = DISPID_PROPERTYPUT;
-    USHORT wFlags = DISPATCH_PROPERTYPUT;
-    DISPPARAMS dispParams;
-    VARIANTARG propertyValue[2];
-    OLECHAR* pBuf[1];
-    VALUE v;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
-    dispParams.rgdispidNamedArgs = &dispIDParam;
-    dispParams.rgvarg = propertyValue;
-    dispParams.cNamedArgs = 1;
-    dispParams.cArgs = 1;
-
-    VariantInit(&propertyValue[0]);
-    VariantInit(&propertyValue[1]);
-    memset(&excepinfo, 0, sizeof(excepinfo));
-
-    OLEData_Get_Struct(self, pole);
-
-    /* get ID from property name */
-    pBuf[0]  = ole_mb2wc(StringValuePtr(property), -1);
-    hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch, &IID_NULL,
-                                                pBuf, 1, lcid, &dispID);
-    SysFreeString(pBuf[0]);
-    pBuf[0] = NULL;
-
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Unknown property or method : `%s'",
-                  StringValuePtr(property));
-    }
-    /* set property value */
-    ole_val2variant(value, &propertyValue[0]);
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, dispID, &IID_NULL, 
-                                         lcid, wFlags, &dispParams,
-                                         NULL, &excepinfo, &argErr);
-
-    for(index = 0; index < dispParams.cArgs; ++index) {
-        VariantClear(&propertyValue[index]);
-    }
-    if (FAILED(hr)) {
-        v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, StringValuePtr(v));
-    }
-    return Qnil;
-}
-
-static VALUE
-fole_free(self)
-    VALUE self;
-{
-    struct oledata *pole;
-    rb_secure(4);
-    OLEData_Get_Struct(self, pole);
-    OLE_FREE(pole->pDispatch);
-    pole->pDispatch = NULL;
-    return Qnil;
-}
-
-static VALUE
-ole_each_sub(pEnumV)
-    VALUE pEnumV;
-{
-    VARIANT variant;
-    VALUE obj = Qnil;
-    IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
-    VariantInit(&variant);
-    while(pEnum->lpVtbl->Next(pEnum, 1, &variant, NULL) == S_OK) {
-        obj = ole_variant2val(&variant);
-        VariantClear(&variant);
-        VariantInit(&variant);
-	rb_yield(obj);
-    }
-    return Qnil;
-}
-
-static VALUE
-ole_ienum_free(pEnumV)
-    VALUE pEnumV;
-{
-    IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
-    OLE_RELEASE(pEnum);
-    return Qnil;
-}
-
-/*
- * WIN32OLE#each {|i|...}
- * -----
- * Iterates over each item of OLE collection which has IEnumVARIANT interface.
- */
-static VALUE
-fole_each(self)
-    VALUE self;
-{
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
-
-    struct oledata *pole;
-
-    unsigned int argErr;
-    EXCEPINFO excepinfo;
-    DISPPARAMS dispParams;
-    VARIANT result;
-    HRESULT hr;
-    IEnumVARIANT *pEnum = NULL;
-
-    VariantInit(&result);
-    dispParams.rgvarg = NULL;
-    dispParams.rgdispidNamedArgs = NULL;
-    dispParams.cNamedArgs = 0;
-    dispParams.cArgs = 0;
-    memset(&excepinfo, 0, sizeof(excepinfo));
-    
-    OLEData_Get_Struct(self, pole);
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DISPID_NEWENUM,
-                                         &IID_NULL, lcid,
-                                         DISPATCH_METHOD | DISPATCH_PROPERTYGET,
-                                         &dispParams, &result,
-                                         &excepinfo, &argErr);
-
-    if (FAILED(hr)) {
-        VariantClear(&result);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to get IEnum Interface");
-    }
-
-    if (V_VT(&result) == VT_UNKNOWN)
-        hr = V_UNKNOWN(&result)->lpVtbl->QueryInterface(V_UNKNOWN(&result),
-                                                        &IID_IEnumVARIANT,
-                                                        (void**)&pEnum);
-    else if (V_VT(&result) == VT_DISPATCH)
-        hr = V_DISPATCH(&result)->lpVtbl->QueryInterface(V_DISPATCH(&result),
-                                                         &IID_IEnumVARIANT,
-                                                         (void**)&pEnum);
-    if (FAILED(hr) || !pEnum) {
-        VariantClear(&result);
-        ole_raise(hr, rb_eRuntimeError, "Fail to get IEnum Interface");
-    }
-
-    VariantClear(&result);
-    rb_ensure(ole_each_sub, (VALUE)pEnum, ole_ienum_free, (VALUE)pEnum);
-    return Qnil;
-}
-
-/*
- * WIN32OLE#method_missing(id [,arg1, arg2, ...])
- * ----
- * Calls WIN32OLE#invoke method.
- */
-static VALUE
-fole_missing(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    ID id;
-    char* mname;
-    int n;
-    id = rb_to_id(argv[0]);
-    mname = rb_id2name(id);
-    if(!mname) {
-        rb_raise(rb_eRuntimeError, "Fail : Unknown method or property");
-    }
-    n = strlen(mname);
-    if(mname[n-1] == '=') {
-        argv[0] = rb_str_new(mname, n-1);
-
-        return ole_propertyput(self, argv[0], argv[1]);
-    }
-    else {
-        argv[0] = rb_str_new2(mname);
-        return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
-    }
-}
-
-static VALUE
-ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
-    VALUE self;
-    ITypeInfo *pOwnerTypeInfo;
-    ITypeInfo *pTypeInfo;
-    VALUE name;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    BSTR bstr;
-    FUNCDESC *pFuncDesc;
-    WORD i;
-    VALUE fname;
-    VALUE method = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
-    }
-    for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
-        hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
-	if (FAILED(hr))
-	     continue;
-
-        hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
-                                                 &bstr, NULL, NULL, NULL);
-        if (FAILED(hr)) {
-            pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-            continue;
-        }
-	fname = WC2VSTR(bstr);
-	if (strcasecmp(StringValuePtr(name), StringValuePtr(fname)) == 0) {
-	    olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, i, fname);
-            method = self;
-        }
-        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-	pFuncDesc=NULL;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return method;
-}
-
-static VALUE
-olemethod_from_typeinfo(self, pTypeInfo, name)
-    VALUE self;
-    ITypeInfo *pTypeInfo;
-    VALUE name;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    WORD i;
-    HREFTYPE href;
-    ITypeInfo *pRefTypeInfo;
-    VALUE method = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
-    }
-    method = ole_method_sub(self, 0, pTypeInfo, name);
-    if (method != Qnil) {
-       return method;
-    }
-    for(i=0; i < pTypeAttr->cImplTypes && method == Qnil; i++){
-       hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
-       if(FAILED(hr))
-           continue;
-       hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
-       if (FAILED(hr))
-           continue;
-       method = ole_method_sub(self, pTypeInfo, pRefTypeInfo, name);
-       OLE_RELEASE(pRefTypeInfo);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return method;
-}
-
-static VALUE
-ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
-    ITypeInfo *pOwnerTypeInfo;
-    ITypeInfo *pTypeInfo;
-    VALUE     methods;
-    int       mask;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    BSTR bstr;
-    char *pstr;
-    FUNCDESC *pFuncDesc;
-    VALUE method;
-    WORD i;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
-    }
-    for(i = 0; i < pTypeAttr->cFuncs; i++) {
-        pstr = NULL;
-        hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
-	if (FAILED(hr))
-	     continue;
-                 
-        hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
-                                                 &bstr, NULL, NULL, NULL);
-        if (FAILED(hr)) {
-            pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-            continue;
-        }
-	if(pFuncDesc->invkind & mask) {
-	    method = folemethod_s_allocate(cWIN32OLE_METHOD);
-	    olemethod_set_member(method, pTypeInfo, pOwnerTypeInfo, 
-	                         i, WC2VSTR(bstr));
-            rb_ary_push(methods, method);
-        }
-        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-	pFuncDesc=NULL;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-
-    return methods;
-}
-
-static VALUE
-ole_methods_from_typeinfo(pTypeInfo, mask)
-    ITypeInfo *pTypeInfo;
-    int mask;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    WORD i;
-    HREFTYPE href;
-    ITypeInfo *pRefTypeInfo;
-    VALUE methods = rb_ary_new();
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
-    }
-
-    ole_methods_sub(0, pTypeInfo, methods, mask);
-    for(i=0; i < pTypeAttr->cImplTypes; i++){
-       hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
-       if(FAILED(hr))
-           continue;
-       hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
-       if (FAILED(hr))
-           continue;
-       ole_methods_sub(pTypeInfo, pRefTypeInfo, methods, mask);
-       OLE_RELEASE(pRefTypeInfo);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return methods;
-}
-
-static HRESULT
-typeinfo_from_ole(pole, ppti)
-    struct oledata *pole;
-    ITypeInfo **ppti;
-{
-    ITypeInfo *pTypeInfo;
-    ITypeLib *pTypeLib;
-    BSTR bstr;
-    VALUE type;
-    UINT i;
-    UINT count;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
-    HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
-                                                      0, lcid, &pTypeInfo);
-    if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "fail to GetTypeInfo");
-    }
-    hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo,
-                                             -1,
-                                             &bstr,
-                                             NULL, NULL, NULL);
-    type = WC2VSTR(bstr);
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
-    OLE_RELEASE(pTypeInfo);
-    if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "fail to GetContainingTypeLib");
-    }
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count; i++) {
-        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                                &bstr, NULL, NULL, NULL);
-        if (SUCCEEDED(hr) && rb_str_cmp(WC2VSTR(bstr), type) == 0) {
-            hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
-            if (SUCCEEDED(hr)) {
-                *ppti = pTypeInfo;
-                break;
-            }
-        }
-    }
-    OLE_RELEASE(pTypeLib);
-    return hr;
-}
-
-static VALUE
-ole_methods(self,mask)
-    VALUE self;
-    int mask;
-{
-    ITypeInfo *pTypeInfo;
-    HRESULT hr;
-    VALUE methods;
-    struct oledata *pole;
-
-    OLEData_Get_Struct(self, pole);
-    methods = rb_ary_new();
-
-    hr = typeinfo_from_ole(pole, &pTypeInfo);
-    if(FAILED(hr))
-        return methods;
-    rb_ary_concat(methods, ole_methods_from_typeinfo(pTypeInfo, mask));
-    OLE_RELEASE(pTypeInfo);
-    return methods;
-}
-
-/*
- * WIN32OLE#ole_methods
- * ----
- * Returns OLE methods
- */
-static VALUE
-fole_methods( self )
-    VALUE self;
-{
-    return ole_methods( self, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT);
-}
-
-/*
- * WIN32OLE#ole_get_methods
- * ----
- * Returns get properties.
- */
-static VALUE
-fole_get_methods( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return ole_methods( self, INVOKE_PROPERTYGET);
-}
-
-/*
- * WIN32OLE#ole_put_methods
- * ----
- * Returns put properties.
- */
-static VALUE
-fole_put_methods( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return ole_methods( self, INVOKE_PROPERTYPUT);
-}
-
-/*
- * WIN32OLE#ole_func_methods
- * ---
- * Returns OLE func methods.
- */
-static VALUE
-fole_func_methods( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return ole_methods( self, INVOKE_FUNC);
-}
-
-/*
- * WIN32OLE#ole_obj_help
- * ----
- * Returns WIN32OLE_TYPE object.
- */
-static VALUE
-fole_obj_help( self )
-    VALUE self;
-{
-    unsigned int index;
-    ITypeInfo *pTypeInfo;
-    ITypeLib *pTypeLib;
-    HRESULT hr;
-    struct oledata *pole;
-    BSTR bstr;
-    LCID  lcid = LOCALE_SYSTEM_DEFAULT;
-    VALUE type = Qnil;
-
-    OLEData_Get_Struct(self, pole);
-
-    hr = pole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo );
-    if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "fail to GetTypeInfo");
-    }
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
-    if(FAILED(hr)) {
-        OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "fail to GetContainingTypeLib");
-    }
-    hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
-                                             &bstr, NULL, NULL, NULL);
-    if (SUCCEEDED(hr)) {
-        type = foletype_s_allocate(cWIN32OLE_TYPE);
-	oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
-    }
-    OLE_RELEASE(pTypeLib);
-    OLE_RELEASE(pTypeInfo);
-
-    return type;
-}
-
-static HRESULT
-ole_docinfo_from_type(pTypeInfo, name, helpstr, helpcontext, helpfile)
-    ITypeInfo *pTypeInfo;
-    BSTR *name;
-    BSTR *helpstr; 
-    DWORD *helpcontext;
-    BSTR *helpfile;
-{
-    HRESULT hr;
-    ITypeLib *pTypeLib;
-    UINT i;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
-    if (FAILED(hr)) {
-        return hr;
-    }
-    
-    hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                            name, helpstr, 
-                                            helpcontext, helpfile);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeLib);
-        return hr;
-    }
-    OLE_RELEASE(pTypeLib);
-    return hr;
-}
-
-static VALUE
-ole_usertype2val(pTypeInfo, pTypeDesc, typedetails)
-    ITypeInfo *pTypeInfo;
-    TYPEDESC *pTypeDesc;
-    VALUE typedetails;
-{
-    HRESULT hr;
-    BSTR bstr;
-    ITypeInfo *pRefTypeInfo;
-    VALUE type = Qnil;
-
-    hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, 
-                                           V_UNION1(pTypeDesc, hreftype),
-				           &pRefTypeInfo);
-    if(FAILED(hr))
-        return Qnil;
-    hr = ole_docinfo_from_type(pRefTypeInfo, &bstr, NULL, NULL, NULL);
-    if(FAILED(hr)) {
-        OLE_RELEASE(pRefTypeInfo);
-        return Qnil;
-    }
-    OLE_RELEASE(pRefTypeInfo);
-    type = WC2VSTR(bstr);
-    if(typedetails != Qnil)
-        rb_ary_push(typedetails, type);
-    return type;
-}
-
-static VALUE ole_typedesc2val();
-static VALUE
-ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails) 
-    ITypeInfo *pTypeInfo;
-    TYPEDESC *pTypeDesc;
-    VALUE typedetails;
-{    
-    TYPEDESC *p = pTypeDesc;
-    VALUE type = rb_str_new2("");
-    while(p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
-	p = V_UNION1(p, lptdesc);
-	if(strlen(StringValuePtr(type)) == 0) {
-	   type = ole_typedesc2val(pTypeInfo, p, typedetails);
-	} else {
-	   rb_str_cat(type, ",", 1);
-           rb_str_concat(type, ole_typedesc2val(pTypeInfo, p, typedetails));
-	}
-    }
-    return type;
-}
-
-static VALUE
-ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
-    ITypeInfo *pTypeInfo;
-    TYPEDESC *pTypeDesc;
-    VALUE typedetails;
-{
-    VALUE str;
-    switch(pTypeDesc->vt) {
-    case VT_I2:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("I2"));
-        return rb_str_new2("I2");
-    case VT_I4:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("I4"));
-        return rb_str_new2("I4");
-    case VT_R4:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("R4"));
-        return rb_str_new2("R4");
-    case VT_R8:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("R8"));
-        return rb_str_new2("R8");
-    case VT_CY:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("CY"));
-        return rb_str_new2("CY");
-    case VT_DATE:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("DATE"));
-        return rb_str_new2("DATE");
-    case VT_BSTR:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("BSTR"));
-        return rb_str_new2("BSTR");
-    case VT_BOOL:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("BOOL"));
-        return rb_str_new2("BOOL");
-    case VT_VARIANT:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("VARIANT"));
-        return rb_str_new2("VARIANT");
-    case VT_DECIMAL:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("DECIMAL"));
-        return rb_str_new2("DECIMAL");
-    case VT_I1:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("I1"));
-        return rb_str_new2("I1");
-    case VT_UI1:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UI1"));
-        return rb_str_new2("UI1");
-    case VT_UI2:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UI2"));
-        return rb_str_new2("UI2");
-    case VT_UI4:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UI4"));
-        return rb_str_new2("UI4");
-    case VT_I8:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("I8"));
-        return rb_str_new2("I8");
-    case VT_UI8:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UI8"));
-        return rb_str_new2("UI8");
-    case VT_INT:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("INT"));
-        return rb_str_new2("INT");
-    case VT_UINT:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("UINT"));
-        return rb_str_new2("UINT");
-    case VT_VOID:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("VOID"));
-        return rb_str_new2("VOID");
-    case VT_HRESULT:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("HRESULT"));
-        return rb_str_new2("HRESULT");
-    case VT_PTR:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("PTR"));
-        return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
-    case VT_SAFEARRAY:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("SAFEARRAY"));
-        return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
-    case VT_CARRAY:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("CARRAY"));
-        return rb_str_new2("CARRAY");
-    case VT_USERDEFINED:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("USERDEFINED"));
-        str = ole_usertype2val(pTypeInfo, pTypeDesc, typedetails);
-	if (str != Qnil) {
-	    return str;
-	}
-        return rb_str_new2("USERDEFINED");
-    case VT_UNKNOWN:
-	return rb_str_new2("UNKNOWN");
-    case VT_DISPATCH:
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, rb_str_new2("DISPATCH"));
-	return rb_str_new2("DISPATCH");
-    default:
-        str = rb_str_new2("Unknown Type ");
-        rb_str_concat(str, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
-        return str;
-    }
-}
-
-/*
- * WIN32OLE#ole_method_help(method)
- * -----
- * Returns WIN32OLE_METHOD object corresponding with method 
- * specified by 1st argument.
- */
-static VALUE
-fole_method_help( self, cmdname )
-    VALUE self;
-    VALUE cmdname;
-{
-    ITypeInfo *pTypeInfo;
-    HRESULT hr;
-    struct oledata *pole;
-    VALUE method, obj;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
-
-    Check_SafeStr(cmdname);
-    OLEData_Get_Struct(self, pole);
-    hr = typeinfo_from_ole(pole, &pTypeInfo);
-    if(FAILED(hr))
-        ole_raise(hr, rb_eRuntimeError, "fail to get ITypeInfo");
-    method = folemethod_s_allocate(cWIN32OLE_METHOD);
-    obj = olemethod_from_typeinfo(method, pTypeInfo, cmdname);
-    OLE_RELEASE(pTypeInfo);
-    if (obj == Qnil)
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s",
-	         StringValuePtr(cmdname));
-    return obj;
-}
-
-/*
- * WIN32OLE.ole_classes(typelibrary)
- * ----
- * Returns array of WIN32OLE_TYPE objects defined by type library.
- */
-static VALUE
-foletype_s_ole_classes(self, typelib)
-    VALUE self;
-    VALUE typelib;
-{
-    VALUE file, classes;
-    OLECHAR * pbuf;
-    ITypeLib *pTypeLib;
-    HRESULT hr;
-
-    rb_secure(4);
-    classes = rb_ary_new();
-    if(TYPE(typelib) == T_STRING) {
-        file = typelib_file(typelib);
-        if (file == Qnil) {
-	    file = typelib;
-        }
-        pbuf = ole_mb2wc(StringValuePtr(file), -1);
-        hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
-	if (FAILED(hr))
-          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to LoadTypeLibEx");
-        SysFreeString(pbuf);
-        ole_classes_from_typelib(pTypeLib, classes);
-	OLE_RELEASE(pTypeLib);
-    } else {
-	rb_raise(rb_eTypeError, "1st argument should be TypeLib string");
-    }
-    return classes;
-}
-
-/*
- * WIN32OLE_TYPE.typelibs
- * ----
- * Returns array of type libraries.
- */
-static VALUE
-foletype_s_typelibs(self)
-    VALUE self;
-{
-    HKEY htypelib, hclsid;
-    double fversion;
-    DWORD i, j;
-    LONG err;
-    VALUE clsid;
-    VALUE ver;
-    VALUE v = Qnil;
-    VALUE typelibs = rb_ary_new();
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return typelibs;
-    }
-    for(i = 0; ; i++) {
-        clsid = reg_enum_key(htypelib, i);
-        if (clsid == Qnil)
-            break;
-        err = reg_open_vkey(htypelib, clsid, &hclsid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        fversion = 0;
-        for(j = 0; ; j++) {
-            ver = reg_enum_key(hclsid, j);
-            if (ver == Qnil)
-                break;
-            if (fversion > atof(StringValuePtr(ver)))
-                continue;
-            fversion = atof(StringValuePtr(ver));
-            if ( (v = reg_get_val(hclsid, StringValuePtr(ver))) != Qnil ) {
-                rb_ary_push(typelibs, v);
-            }
-        }
-        RegCloseKey(hclsid);
-    }
-    RegCloseKey(htypelib);
-    return typelibs;
-}
-
-/*
- * WIN32OLE_TYPE.progids
- * ---
- * Returns array of ProgID.
- */
-static VALUE
-foletype_s_progids(self)
-    VALUE self;
-{
-    HKEY hclsids, hclsid;
-    DWORD i;
-    LONG err;
-    VALUE clsid;
-    VALUE v = rb_str_new2("");
-    VALUE progids = rb_ary_new();
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hclsids);
-    if(err != ERROR_SUCCESS) {
-        return progids;
-    }
-    for(i = 0; ; i++) {
-        clsid = reg_enum_key(hclsids, i);
-        if (clsid == Qnil)
-            break;
-        err = reg_open_vkey(hclsids, clsid, &hclsid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        if ((v = reg_get_val(hclsid, "ProgID")) != Qnil) 
-            rb_ary_push(progids, v);
-        if ((v = reg_get_val(hclsid, "VersionIndependentProgID")) != Qnil)
-            rb_ary_push(progids, v);
-        RegCloseKey(hclsid);
-    }
-    RegCloseKey(hclsids);
-    return progids;
-}
-
-static VALUE
-foletype_s_allocate(klass)
-    VALUE klass;
-{
-    struct oletypedata *poletype;
-    VALUE obj;
-    ole_initialize();
-    obj = Data_Make_Struct(klass,struct oletypedata,0,oletype_free,poletype);
-    poletype->pTypeInfo = NULL;
-    return obj;
-}
-
-static VALUE
-oletype_set_member(self, pTypeInfo, name)
-    VALUE self;
-    ITypeInfo *pTypeInfo;
-    VALUE name;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    rb_ivar_set(self, rb_intern("name"), name);
-    ptype->pTypeInfo = pTypeInfo;
-    if(pTypeInfo) OLE_ADDREF(pTypeInfo);
-    return self;
-}
-
-static VALUE
-oleclass_from_typelib(self, pTypeLib, oleclass)
-    VALUE self;
-    ITypeLib *pTypeLib;
-    VALUE oleclass;
-{
-    
-    long count;
-    int i;
-    HRESULT hr;
-    BSTR bstr;
-    VALUE typelib;
-    ITypeInfo *pTypeInfo;
-
-    VALUE found = Qfalse;
-  
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count && found == Qfalse; i++) {
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
-        if (FAILED(hr))
-            continue;
-        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                                &bstr, NULL, NULL, NULL);
-        if (FAILED(hr)) 
-	    continue;
-        typelib = WC2VSTR(bstr);
-	if (rb_str_cmp(oleclass, typelib) == 0) {
-            oletype_set_member(self, pTypeInfo, typelib);
-	    found = Qtrue;
-	}
-	OLE_RELEASE(pTypeInfo);
-    }
-    return found;
-}
-
-static VALUE
-foletype_initialize(self, typelib, oleclass)
-    VALUE self;
-    VALUE typelib;
-    VALUE oleclass;
-{
-    VALUE file;
-    OLECHAR * pbuf;
-    ITypeLib *pTypeLib;
-    HRESULT hr;
-
-    Check_SafeStr(oleclass);
-    Check_SafeStr(typelib);
-    file = typelib_file(typelib);
-    if (file == Qnil) {
-        file = typelib;
-    }
-    pbuf = ole_mb2wc(StringValuePtr(file), -1);
-    hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to LoadTypeLibEx");
-    SysFreeString(pbuf);
-    if (oleclass_from_typelib(self, pTypeLib, oleclass) == Qfalse) {
-        OLE_RELEASE(pTypeLib);
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found `%s` in `%s`",
-	         StringValuePtr(oleclass), StringValuePtr(typelib));
-    }
-    OLE_RELEASE(pTypeLib);
-    return self;
-}
-
-/*
- * WIN32OLE_TYPE#name
- * ---
- * Returns name.
- */
-static VALUE
-foletype_name(self)
-    VALUE self;
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-static VALUE
-ole_ole_type(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    VALUE type = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if(FAILED(hr)){
-        return type;
-    }
-    switch(pTypeAttr->typekind) {
-    case TKIND_ENUM:
-        type = rb_str_new2("Enum");
-        break;
-    case TKIND_RECORD:
-        type = rb_str_new2("Record");
-        break;
-    case TKIND_MODULE:
-        type = rb_str_new2("Module");
-        break;
-    case TKIND_INTERFACE:
-        type = rb_str_new2("Interface");
-        break;
-    case TKIND_DISPATCH:
-        type = rb_str_new2("Dispatch");
-        break;
-    case TKIND_COCLASS:
-        type = rb_str_new2("Class");
-        break;
-    case TKIND_ALIAS:
-        type = rb_str_new2("Alias");
-        break;
-    case TKIND_UNION:
-        type = rb_str_new2("Union");
-        break;
-    case TKIND_MAX:
-        type = rb_str_new2("Max");
-        break;
-    default:
-        type = Qnil;
-        break;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return type;
-}
-
-/*
- * WIN32OLE_TYPE#ole_type
- * ----
- * returns type of class.
- */
-static VALUE
-foletype_ole_type(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_ole_type(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_guid(pTypeInfo) 
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    int len;
-    OLECHAR bstr[80];
-    VALUE guid = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) 
-        return guid;
-    len = StringFromGUID2(&pTypeAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
-    if (len > 3) {
-        guid = ole_wc2vstr(bstr, FALSE);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return guid;
-}
-
-/*
- * WIN32OLE_TYPE#guid
- * ----
- * Returns GUID.
- */
-static VALUE
-foletype_guid(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_guid(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_progid(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    OLECHAR *pbuf;
-    VALUE progid = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) 
-        return progid;
-    hr = ProgIDFromCLSID(&pTypeAttr->guid, &pbuf);
-    if (SUCCEEDED(hr)) 
-        progid = WC2VSTR(pbuf);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return progid;
-}
-
-/*
- * WIN32OLE_TYPE#progid
- * ----
- * Returns ProgID if it exists. If not found, then returns nil.
- */
-static VALUE
-foletype_progid(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_progid(ptype->pTypeInfo);
-}
-
-
-static VALUE
-ole_type_visible(pTypeInfo) 
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    VALUE visible;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) 
-        return Qtrue;
-    if (pTypeAttr->wTypeFlags & (TYPEFLAG_FHIDDEN | TYPEFLAG_FRESTRICTED)) {
-        visible = Qfalse;
-    } else {
-        visible = Qtrue;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return visible;
-}
-
-/*
- * WIN32OLE_TYPE#visible
- * ----
- * returns true if the OLE class is public.
- */
-static VALUE
-foletype_visible(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_visible(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_major_version(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    VALUE ver;
-    TYPEATTR *pTypeAttr;
-    HRESULT hr;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
-    ver = INT2FIX(pTypeAttr->wMajorVerNum);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return ver;
-}
-
-/*
- * WIN32OLE_TYPE#major_version
- * ----
- * Returns major version.
- */
-static VALUE
-foletype_major_version(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_major_version(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_minor_version(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    VALUE ver;
-    TYPEATTR *pTypeAttr;
-    HRESULT hr;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
-    ver = INT2FIX(pTypeAttr->wMinorVerNum);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return ver;
-}
-
-/*
- * WIN32OLE_TYPE#minor_version
- * ----
- * Returns minor version.
- */
-static VALUE
-foletype_minor_version(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_minor_version(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_typekind(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    VALUE typekind;
-    TYPEATTR *pTypeAttr;
-    HRESULT hr;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
-    typekind = INT2FIX(pTypeAttr->typekind);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return typekind;
-}
-
-/*
- * WIN32OLE_TYPE#typekind
- * ----
- * Returns number which represents type.
- */
-static VALUE 
-foletype_typekind(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_typekind(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_helpstring(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    BSTR bhelpstr;
-    hr = ole_docinfo_from_type(pTypeInfo, NULL, &bhelpstr, NULL, NULL);
-    if(FAILED(hr)) {
-        return Qnil;
-    }
-    return WC2VSTR(bhelpstr);
-}
-
-/*
- * WIN32OLE_TYPE#helpstring
- * ---
- * Returns help string.
- */
-static VALUE 
-foletype_helpstring(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_helpstring(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_src_type(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    VALUE alias = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        return alias;
-    if(pTypeAttr->typekind != TKIND_ALIAS) {
-        OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-	return alias;
-    }
-    alias = ole_typedesc2val(pTypeInfo, &(pTypeAttr->tdescAlias), Qnil);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return alias;
-}
-
-/*
- * WIN32OLE_TYPE#src_type
- * ----
- * Returns source class when the OLE class is 'Alias'.
- */
-static VALUE
-foletype_src_type(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_src_type(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_helpfile(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    BSTR bhelpfile;
-    hr = ole_docinfo_from_type(pTypeInfo, NULL, NULL, NULL, &bhelpfile);
-    if(FAILED(hr)) {
-        return Qnil;
-    }
-    return WC2VSTR(bhelpfile);
-}
-
-/*
- * WIN32OLE_TYPE#helpfile
- * ----
- * Returns helpfile
- */
-static VALUE
-foletype_helpfile(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_helpfile(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_helpcontext(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    DWORD helpcontext;
-    hr = ole_docinfo_from_type(pTypeInfo, NULL, NULL, 
-                               &helpcontext, NULL);
-    if(FAILED(hr))
-        return Qnil;
-    return INT2FIX(helpcontext);
-}
-
-/*
- * WIN32OLE_TYPE#helpcontext
- * ---
- * Returns helpcontext.
- */
-static VALUE
-foletype_helpcontext(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_helpcontext(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_variables(pTypeInfo)
-    ITypeInfo *pTypeInfo;
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    WORD i;
-    UINT len;
-    BSTR bstr;
-    char *pstr;
-    VARDESC *pVarDesc;
-    struct olevariabledata *pvar;
-    VALUE var;
-    VALUE variables = rb_ary_new();
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
-    }
-    
-    for(i = 0; i < pTypeAttr->cVars; i++) {
-        hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, i, &pVarDesc);
-        if(FAILED(hr))
-            continue;
-        len = 0;
-	pstr = NULL;
-        hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pVarDesc->memid, &bstr,
-                                         1, &len);
-        if(FAILED(hr) || len == 0 || !bstr)
-            continue;
-
-        var = Data_Make_Struct(cWIN32OLE_VARIABLE, struct olevariabledata,
-	                       0,olevariable_free,pvar);
-        pvar->pTypeInfo = pTypeInfo;
-        OLE_ADDREF(pTypeInfo);
-        pvar->index = i;
-	rb_ivar_set(var, rb_intern("name"), WC2VSTR(bstr));
-        rb_ary_push(variables, var);
-
-        pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-	pVarDesc = NULL;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return variables;
-}
-
-/*
- * WIN32OLE_TYPE#variables
- * ----
- * Returns array of variables defined in OLE class.
- */
-static VALUE
-foletype_variables(self)
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_variables(ptype->pTypeInfo);
-}
-
-/*
- * WIN32OLE_TYPE#ole_methods
- * ----
- * Returns array of WIN32OLE_METHOD objects.
- */
-static VALUE
-foletype_methods(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_methods_from_typeinfo(ptype->pTypeInfo, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
-}
-
-/*
- * WIN32OLE_VARIABLE#name
- * ---
- * Returns the name.
- */
-static VALUE
-folevariable_name(self)
-    VALUE self;
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-static ole_variable_ole_type(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE type;
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetVarDesc");
-    type = ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil);
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return type;
-}
-
-/*
- * WIN32OLE_VARIABLE#ole_type
- * ----
- * Returns type.
- */
-static VALUE
-folevariable_ole_type(self)
-    VALUE self;
-{
-    struct olevariabledata *pvar;
-    Data_Get_Struct(self, struct olevariabledata, pvar);
-    return ole_variable_ole_type(pvar->pTypeInfo, pvar->index);
-}
-
-static ole_variable_ole_type_detail(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE type = rb_ary_new();
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetVarDesc");
-    ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type);
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return type;
-}
-
-/*
- * WIN32OLE_VARIABLE#ole_type_detail
- * ---
- * Returns detail information of type. The information is array of type.
- */
-static VALUE
-folevariable_ole_type_detail(self)
-    VALUE self;
-{
-    struct olevariabledata *pvar;
-    Data_Get_Struct(self, struct olevariabledata, pvar);
-    return ole_variable_ole_type_detail(pvar->pTypeInfo, pvar->index);
-}
-
-static ole_variable_value(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE val = Qnil;
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        return Qnil;
-    if(pVarDesc->varkind == VAR_CONST)
-        val = ole_variant2val(V_UNION1(pVarDesc, lpvarValue));
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return val;
-}
-
-/*
- * WIN32OLE_VARIABLE#value
- * ----
- * Returns value if value is exists. If the value does not exist, 
- * this method returns nil.
- */    
-static VALUE
-folevariable_value(self)
-    VALUE self;
-{
-    struct olevariabledata *pvar;
-    Data_Get_Struct(self, struct olevariabledata, pvar);
-    return ole_variable_value(pvar->pTypeInfo, pvar->index);
-}
-
-static ole_variable_visible(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE visible = Qfalse;
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        return visible;
-    if (!(pVarDesc->wVarFlags & (VARFLAG_FHIDDEN |
-                                 VARFLAG_FRESTRICTED |
-                                 VARFLAG_FNONBROWSABLE))) {
-        visible = Qtrue;
-    }
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return visible;
-}
-
-/*
- * WIN32OLE_VARIABLE#visible?
- * ----
- * Returns true if the variable is public.
- */
-static VALUE
-folevariable_visible(self)
-    VALUE self;
-{
-    struct olevariabledata *pvar;
-    Data_Get_Struct(self, struct olevariabledata, pvar);
-    return ole_variable_visible(pvar->pTypeInfo, pvar->index);
-}
-
-static VALUE
-ole_variable_kind(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE kind = rb_str_new2("UNKNOWN");
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        return kind;
-    switch(pVarDesc->varkind) {
-    case VAR_PERINSTANCE:
-        kind = rb_str_new2("PERINSTANCE");
-        break;
-    case VAR_STATIC:
-        kind = rb_str_new2("STATIC");
-        break;
-    case VAR_CONST:
-        kind = rb_str_new2("CONSTANT");
-        break;
-    case VAR_DISPATCH:
-        kind = rb_str_new2("DISPATCH");
-        break;
-    default:
-        break;
-    }
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return kind;
-}
-
-/*
- * WIN32OLE_VARIABLE#variable_kind
- * ----
- * Returns variable kind string.
- */
-static VALUE
-folevariable_variable_kind(self)
-    VALUE self;
-{
-    struct olevariabledata *pvar;
-    Data_Get_Struct(self, struct olevariabledata, pvar);
-    return ole_variable_kind(pvar->pTypeInfo, pvar->index);
-}
-
-static VALUE
-ole_variable_varkind(pTypeInfo, var_index)
-    ITypeInfo *pTypeInfo;
-    UINT var_index;
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE kind = Qnil;
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        return kind;
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    kind = INT2FIX(pVarDesc->varkind);    
-    return kind;
-}
-
-/*
- * WIN32OLE_VARIABLE#varkind
- * ----
- * Returns the number which represents variable kind.
- */
-static VALUE
-folevariable_varkind(self)
-    VALUE self;
-{
-    struct olevariabledata *pvar;
-    Data_Get_Struct(self, struct olevariabledata, pvar);
-    return ole_variable_varkind(pvar->pTypeInfo, pvar->index);
-}
-
-static VALUE
-olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, index, name)
-    VALUE self;
-    ITypeInfo *pTypeInfo;
-    ITypeInfo *pOwnerTypeInfo;
-    int index;
-    VALUE name;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    pmethod->pTypeInfo = pTypeInfo;
-    OLE_ADDREF(pTypeInfo);
-    pmethod->pOwnerTypeInfo = pOwnerTypeInfo;
-    if(pOwnerTypeInfo) OLE_ADDREF(pOwnerTypeInfo);
-    pmethod->index = index;
-    rb_ivar_set(self, rb_intern("name"), name);
-    return self;
-}
-
-static VALUE
-folemethod_s_allocate(klass)
-    VALUE klass;
-{
-    struct olemethoddata *pmethod;
-    VALUE obj;
-    obj = Data_Make_Struct(klass, 
-                           struct olemethoddata,
-                           0, olemethod_free, pmethod);
-    pmethod->pTypeInfo = NULL;
-    pmethod->pOwnerTypeInfo = NULL;
-    pmethod->index = 0;
-    return obj;
-}
-
-static VALUE
-folemethod_initialize(self, oletype, method)
-    VALUE self;
-    VALUE oletype;
-    VALUE method;
-{
-    struct oletypedata *ptype;
-    VALUE obj = Qnil;
-    if (rb_obj_is_kind_of(oletype, cWIN32OLE_TYPE)) {
-        Check_SafeStr(method);
-        Data_Get_Struct(oletype, struct oletypedata, ptype);
-	obj = olemethod_from_typeinfo(self, ptype->pTypeInfo, method);
-	if (obj == Qnil) {
-            rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s",
-	             StringValuePtr(method));
-        }
-    }
-    else {
-        rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object.");
-    }
-    return obj;
-}
-
-/*
- * WIN32OLE_METHOD#name
- * ----
- * Returns the name of the method.
- */
-static VALUE
-folemethod_name(self)
-    VALUE self;
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-static VALUE
-ole_method_return_type(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE type;
-
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetFuncDesc");
-    
-    type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return type;
-}
-
-/*
- * WIN32OLE_METHOD#return_type
- * ----
- * Returns string of return value type of method.
- */
-static VALUE
-folemethod_return_type(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_return_type(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_return_vtype(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE vt;
-
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetFuncDesc");
-    
-    vt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return vt;
-}
-
-/*
- * WIN32OLE_METHOD#return_vtype
- * ----
- * Returns number of return value type of method.
- */
-static VALUE
-folemethod_return_vtype(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_return_vtype(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_return_type_detail(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE type = rb_ary_new();
-
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr)) 
-        return type;
-    
-    ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), type);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return type;
-}
-
-/*
- * WIN32OLE_METHOD#return_type_detail
- * -----
- * Returns detail information of return value type of method.
- * The information is array.
- */
-static VALUE
-folemethod_return_type_detail(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_return_type_detail(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_invkind(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE invkind;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if(FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetFuncDesc");
-    invkind = INT2FIX(pFuncDesc->invkind);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return invkind;
-}
-
-static VALUE
-ole_method_invoke_kind(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    WORD method_index;
-{
-    VALUE type = rb_str_new2("UNKNOWN");
-    VALUE invkind = ole_method_invkind(pTypeInfo, method_index);
-    if((FIX2INT(invkind) & INVOKE_PROPERTYGET) &&
-       (FIX2INT(invkind) & INVOKE_PROPERTYPUT) ) {
-        type = rb_str_new2("PROPERTY");
-    } else if(FIX2INT(invkind) & INVOKE_PROPERTYGET) {
-        type =  rb_str_new2("PROPERTYGET");
-    } else if(FIX2INT(invkind) & INVOKE_PROPERTYPUT) {
-        type = rb_str_new2("PROPERTYPUT");
-    } else if(FIX2INT(invkind) & INVOKE_PROPERTYPUTREF) {
-        type = rb_str_new2("PROPERTYPUTREF");
-    } else if(FIX2INT(invkind) & INVOKE_FUNC) {
-        type = rb_str_new2("FUNC");
-    }
-    return type;
-}
-
-/*
- * WIN32OLE_MTHOD#invkind
- * ----
- * Returns invkind.
- */
-static VALUE
-folemethod_invkind(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_invkind(pmethod->pTypeInfo, pmethod->index);
-}
-
-/*
- * WIN32OLE_METHOD#invoke_kind
- * ----
- * Returns invoke kind string.
- */
-static VALUE
-folemethod_invoke_kind(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_invoke_kind(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_visible(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE visible;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if(FAILED(hr))
-        return Qfalse;
-    if (pFuncDesc->wFuncFlags & (FUNCFLAG_FRESTRICTED |
-                                 FUNCFLAG_FHIDDEN |
-				 FUNCFLAG_FNONBROWSABLE)) {
-        visible = Qfalse;
-    } else {
-        visible = Qtrue;
-    }
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return visible;
-}
-
-/*
- * WIN32OLE_METHOD#visible?
- * ----
- * Returns true if the method is public.
- */
-static VALUE
-folemethod_visible(self) 
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_visible(pmethod->pTypeInfo, pmethod->index);
-}
-
-static ole_method_event(pTypeInfo, method_index, method_name)
-    ITypeInfo *pTypeInfo;
-    WORD method_index;
-    VALUE method_name;
-{
-    TYPEATTR *pTypeAttr;
-    HRESULT hr;
-    WORD i;
-    int flags;
-    HREFTYPE href;
-    ITypeInfo *pRefTypeInfo;
-    FUNCDESC *pFuncDesc;
-    BSTR bstr;
-    VALUE name;
-    VALUE event = Qfalse;
-    
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) 
-        return event;
-    if(pTypeAttr->typekind != TKIND_COCLASS) {
-        pTypeInfo->lpVtbl->ReleaseTypeAttr(pTypeInfo, pTypeAttr);
-        return event;
-    }
-    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
-        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
-        if (FAILED(hr))
-            continue;
-
-        if (flags & IMPLTYPEFLAG_FSOURCE) {
-            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
-                                                         i, &href);
-            if (FAILED(hr))
-                continue;
-            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                                   href, &pRefTypeInfo);
-            if (FAILED(hr))
-	        continue;
-            hr = pRefTypeInfo->lpVtbl->GetFuncDesc(pRefTypeInfo, method_index, 
-	                                           &pFuncDesc);
-            if (FAILED(hr)) {
-	        OLE_RELEASE(pRefTypeInfo);
-		continue;
-            }
-
-            hr = pRefTypeInfo->lpVtbl->GetDocumentation(pRefTypeInfo, 
-	                                                pFuncDesc->memid,
-                                                        &bstr, NULL, NULL, NULL);
-            if (FAILED(hr)) {
-		pRefTypeInfo->lpVtbl->ReleaseFuncDesc(pRefTypeInfo, pFuncDesc);
-	        OLE_RELEASE(pRefTypeInfo);
-		continue;
-            }
-
-            name = WC2VSTR(bstr);
-	    pRefTypeInfo->lpVtbl->ReleaseFuncDesc(pRefTypeInfo, pFuncDesc);
-	    OLE_RELEASE(pRefTypeInfo);
-	    if (rb_str_cmp(method_name, name) == 0) {
-	        event = Qtrue;
-		break;
-            }
-        }
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return event;
-}
-
-/*
- * WIN32OLE_METHOD#event?
- * ----
- * Returns true if the method is event.
- */
-static VALUE
-folemethod_event(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    if (!pmethod->pOwnerTypeInfo)
-        return Qfalse;
-    return ole_method_event(pmethod->pOwnerTypeInfo, 
-                            pmethod->index,
-                            rb_ivar_get(self, rb_intern("name")));
-}
-
-static VALUE
-folemethod_event_interface(self)
-    VALUE self;
-{
-    BSTR name;
-    struct olemethoddata *pmethod;
-    HRESULT hr;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    if(folemethod_event(self) == Qtrue) {
-        hr = ole_docinfo_from_type(pmethod->pTypeInfo, &name, NULL, NULL, NULL);
-	if(SUCCEEDED(hr))
-	    return WC2VSTR(name);
-    }
-    return Qnil;
-}
-
-static VALUE
-ole_method_docinfo_from_type(pTypeInfo, method_index, name, helpstr,
-                             helpcontext, helpfile)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    BSTR *name;
-    BSTR *helpstr;
-    DWORD *helpcontext;
-    BSTR *helpfile;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return hr;
-    hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
-                                             name, helpstr,
-                                             helpcontext, helpfile);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return hr;
-}
-
-static VALUE
-ole_method_helpstring(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    HRESULT hr;
-    BSTR bhelpstring;
-    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, &bhelpstring,
-                                      NULL, NULL); 
-    if (FAILED(hr))
-        return Qnil;
-    return WC2VSTR(bhelpstring);
-}
-
-static VALUE
-folemethod_helpstring(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_helpstring(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_helpfile(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    HRESULT hr;
-    BSTR bhelpfile;
-    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, NULL,
-                                      NULL, &bhelpfile); 
-    if (FAILED(hr))
-        return Qnil;
-    return WC2VSTR(bhelpfile);
-}
-
-/*
- * WIN32OLE_METHOD#helpfile
- * ---
- * Returns help file.
- */
-static VALUE
-folemethod_helpfile(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-
-    return ole_method_helpfile(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_helpcontext(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    HRESULT hr;
-    DWORD helpcontext = 0;
-    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, NULL,
-                                      &helpcontext, NULL); 
-    if (FAILED(hr))
-        return Qnil;
-    return INT2FIX(helpcontext);
-}
-
-/* 
- * WIN32OLE_METHOD#helpcontext
- * -----
- * Returns help context.
- */
-static VALUE
-folemethod_helpcontext(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_helpcontext(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_dispid(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE dispid = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return dispid;
-    dispid = INT2FIX(pFuncDesc->memid); 
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return dispid;
-}
-
-/*
- * WIN32OLE_METHOD#dispid
- * ----
- * Returns dispatch ID.
- */
-static VALUE
-folemethod_dispid(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_dispid(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_offset_vtbl(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE offset_vtbl = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return offset_vtbl;
-    offset_vtbl = INT2FIX(pFuncDesc->oVft); 
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return offset_vtbl;
-}
-
-/*
- * WIN32OLE_METHOD#offset_vtbl
- * ----
- * Returns the offset ov VTBL.
- */
-static VALUE
-folemethod_offset_vtbl(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_offset_vtbl(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_size_params(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE size_params = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return size_params;
-    size_params = INT2FIX(pFuncDesc->cParams);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return size_params;
-}
-
-/*
- * WIN32OLE_METHOD#size_params
- * ----
- * Returns the size of arguments.
- */
-static VALUE
-folemethod_size_params(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_size_params(pmethod->pTypeInfo, pmethod->index);
-}
-
-/*
- * WIN32OLE_METHOD#size_opt_params
- * ----
- * Returns the size of optional parameters.
- */
-static VALUE
-ole_method_size_opt_params(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE size_opt_params = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return size_opt_params;
-    size_opt_params = INT2FIX(pFuncDesc->cParamsOpt);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return size_opt_params;
-}
-
-static VALUE
-folemethod_size_opt_params(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_size_opt_params(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_params(pTypeInfo, method_index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    BSTR *bstrs;
-    UINT len, i;
-    struct oleparamdata *pparam;
-    VALUE param;
-    VALUE params = rb_ary_new();
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr)) 
-        return params;
-
-    len = 0;
-    bstrs = ALLOCA_N(BSTR, pFuncDesc->cParams + 1);
-    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pFuncDesc->memid, 
-                                     bstrs, pFuncDesc->cParams + 1,
-                                     &len);
-    if (FAILED(hr)) {
-        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-        return params;
-    }
-    SysFreeString(bstrs[0]);
-    if (pFuncDesc->cParams > 0) {
-        for(i = 1; i < len; i++) {
-            param = Data_Make_Struct(cWIN32OLE_PARAM, struct oleparamdata, 0,
-                                     oleparam_free, pparam);
-            pparam->pTypeInfo = pTypeInfo;
-            OLE_ADDREF(pTypeInfo);
-            pparam->method_index = method_index;
-            pparam->index = i - 1;
-            rb_ivar_set(param, rb_intern("name"), WC2VSTR(bstrs[i]));
-            rb_ary_push(params, param);
-         }
-     }
-     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-     return params;
-}
-
-/*
- * WIN32OLE_METHOD#params
- * ----
- * returns array of WIN32OLE_PARAM object corresponding with method parameters.
- */
-static VALUE
-folemethod_params(self)
-    VALUE self;
-{
-    struct olemethoddata *pmethod;
-    Data_Get_Struct(self, struct olemethoddata, pmethod);
-    return ole_method_params(pmethod->pTypeInfo, pmethod->index);
-}
-
-/*
- * WIN32OLE_PARAM#name
- * ----
- * Returns name.
- */
-static VALUE
-foleparam_name(self)
-    VALUE self;
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-static VALUE
-ole_param_ole_type(pTypeInfo, method_index, index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE type = rb_str_new2("UNKNOWN");
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return type;
-    type = ole_typedesc2val(pTypeInfo, 
-                            &(pFuncDesc->lprgelemdescParam[index].tdesc), Qnil);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return type;
-}
-
-static VALUE 
-foleparam_ole_type(self)
-    VALUE self;
-{
-    struct oleparamdata *pparam;
-    Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_ole_type(pparam->pTypeInfo, pparam->method_index, 
-                              pparam->index);
-}
-
-static VALUE
-ole_param_ole_type_detail(pTypeInfo, method_index, index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE typedetail = rb_ary_new();
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return typedetail;
-    ole_typedesc2val(pTypeInfo, 
-                     &(pFuncDesc->lprgelemdescParam[index].tdesc), typedetail);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return typedetail;
-}
-
-static VALUE 
-foleparam_ole_type_detail(self)
-    VALUE self;
-{
-    struct oleparamdata *pparam;
-    Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_ole_type_detail(pparam->pTypeInfo, pparam->method_index, 
-                                     pparam->index);
-}
-
-static VALUE
-ole_param_flag_mask(pTypeInfo, method_index, index, mask)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
-    USHORT mask;
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE ret = Qfalse;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if(FAILED(hr)) 
-        return ret;
-    if (V_UNION1((&(pFuncDesc->lprgelemdescParam[index])), paramdesc).wParamFlags &mask) 
-        ret = Qtrue;
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return ret;
-}
-
-/*
- * WIN32OLE_PARAM#input?
- * ----
- * Returns true if the parameter is input.
- */
-static VALUE foleparam_input(self)
-    VALUE self;
-{
-    struct oleparamdata *pparam;
-    Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
-                               pparam->index, PARAMFLAG_FIN);
-}
-
-/*
- * WIN32OLE#output?
- * ----
- * Returns true if argument is output.
- */
-static VALUE foleparam_output(self)
-    VALUE self;
-{
-    struct oleparamdata *pparam;
-    Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
-                               pparam->index, PARAMFLAG_FOUT);
-}
-
-/*
- * WIN32OLE_PARAM#optional?
- * -----
- * Returns true if argument is output.
- */
-static VALUE foleparam_optional(self)
-    VALUE self;
-{
-    struct oleparamdata *pparam;
-    Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
-                               pparam->index, PARAMFLAG_FOPT);
-}
-
-static VALUE foleparam_retval(self)
-    VALUE self;
-{
-    struct oleparamdata *pparam;
-    Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
-                               pparam->index, PARAMFLAG_FRETVAL);
-}
-
-static VALUE
-ole_param_default(pTypeInfo, method_index, index)
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
-{
-    FUNCDESC *pFuncDesc;
-    ELEMDESC *pElemDesc;
-    PARAMDESCEX * pParamDescEx;
-    HRESULT hr;
-    USHORT wParamFlags;
-    USHORT mask = PARAMFLAG_FOPT|PARAMFLAG_FHASDEFAULT;
-    VALUE defval = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return defval;
-    pElemDesc = &pFuncDesc->lprgelemdescParam[index]; 
-    wParamFlags = V_UNION1(pElemDesc, paramdesc).wParamFlags;
-    if ((wParamFlags & mask) == mask) {
-         pParamDescEx = V_UNION1(pElemDesc, paramdesc).pparamdescex;
-         defval = ole_variant2val(&pParamDescEx->varDefaultValue);
-    }
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return defval;
-}
-
-/*
- * WIN32OLE_PARAM#default
- * ----
- * Returns default value. If the default value does not exist, 
- * this method returns nil.
- */
-static VALUE foleparam_default(self)
-    VALUE self;
-{
-    struct oleparamdata *pparam;
-    Data_Get_Struct(self, struct oleparamdata, pparam);
-    return ole_param_default(pparam->pTypeInfo, pparam->method_index,
-                             pparam->index);
-}
-
-static IEventSinkVtbl vtEventSink;
-static BOOL g_IsEventSinkVtblInitialized = FALSE;
-
-void EVENTSINK_Destructor(PIEVENTSINKOBJ);
-
-STDMETHODIMP
-EVENTSINK_QueryInterface(
-    PEVENTSINK pEV,
-    REFIID     iid,
-    LPVOID*    ppv
-    ) {
-    if (IsEqualIID(iid, &IID_IUnknown) ||
-        IsEqualIID(iid, &IID_IDispatch) ||
-        IsEqualIID(iid, &((PIEVENTSINKOBJ)pEV)->m_iid)) {
-        *ppv = pEV;
-    }
-    else {
-        *ppv = NULL;
-        return E_NOINTERFACE;
-    }
-    ((LPUNKNOWN)*ppv)->lpVtbl->AddRef((LPUNKNOWN)*ppv);
-    return NOERROR;
-}
-
-STDMETHODIMP_(ULONG)
-EVENTSINK_AddRef(
-    PEVENTSINK pEV
-    ){
-    PIEVENTSINKOBJ pEVObj = (PIEVENTSINKOBJ)pEV;
-    return ++pEVObj->m_cRef;
-}
-
-STDMETHODIMP_(ULONG) EVENTSINK_Release(
-    PEVENTSINK pEV
-    ) {
-    PIEVENTSINKOBJ pEVObj = (PIEVENTSINKOBJ)pEV;
-    --pEVObj->m_cRef;
-    if(pEVObj->m_cRef != 0)
-        return pEVObj->m_cRef;
-    EVENTSINK_Destructor(pEVObj);
-    return 0;
-}
-
-STDMETHODIMP EVENTSINK_GetTypeInfoCount(
-    PEVENTSINK pEV,
-    UINT *pct
-    ) {
-    *pct = 0;
-    return NOERROR;
-}
-
-STDMETHODIMP EVENTSINK_GetTypeInfo(
-    PEVENTSINK pEV,
-    UINT info,
-    LCID lcid,
-    ITypeInfo **pInfo
-    ) {
-    *pInfo = NULL;
-    return DISP_E_BADINDEX;
-}
-
-STDMETHODIMP EVENTSINK_GetIDsOfNames(
-    PEVENTSINK pEV,
-    REFIID riid,
-    OLECHAR **szNames,
-    UINT cNames,
-    LCID lcid,
-    DISPID *pDispID
-    ) {
-    return DISP_E_UNKNOWNNAME;
-}
-
-static VALUE
-ole_search_event(ary, ev, is_default)
-    VALUE ary;
-    VALUE ev;
-    BOOL  *is_default;
-{
-    VALUE event;
-    VALUE def_event;
-    VALUE event_name;
-    int i, len;
-    *is_default = FALSE;
-    def_event = Qnil;
-    len = RARRAY(ary)->len;
-    for(i = 0; i < len; i++) {
-        event = rb_ary_entry(ary, i);
-        event_name = rb_ary_entry(event, 1);
-        if(NIL_P(event_name)) {
-            *is_default = TRUE;
-            def_event = event;
-        }
-        else if (rb_str_cmp(ev, event_name) == 0) {
-            *is_default = FALSE;
-            return event;
-        }
-    }
-    return def_event;
-}
-
-static void
-val2ptr_variant(val, var)
-    VALUE val;
-    VARIANT *var;
-{
-    switch (TYPE(val)) {
-    case T_STRING:
-        if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
-            *V_BSTRREF(var) = ole_mb2wc(StringValuePtr(val), -1);
-        }
-        break;
-    case T_FIXNUM:
-        switch(V_VT(var)) {
-        case (VT_UI1 | VT_BYREF) :
-            *V_UI1REF(var) = NUM2CHR(val);
-            break;
-        case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)NUM2INT(val);
-            break;
-        case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = NUM2INT(val);
-            break;
-        case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)NUM2INT(val);
-            break;
-        case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = NUM2INT(val);
-            break;
-        default:
-            break;
-        }
-        break;
-    case T_FLOAT:
-        switch(V_VT(var)) {
-        case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)NUM2INT(val);
-            break;
-        case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = NUM2INT(val);
-            break;
-        case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)NUM2DBL(val);
-            break;
-        case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = NUM2DBL(val);
-            break;
-        default:
-            break;
-        }
-        break;
-    case T_BIGNUM:
-        if (V_VT(var) == (VT_R8 | VT_BYREF)) {
-            *V_R8REF(var) = rb_big2dbl(val);
-        }
-        break;
-    case T_TRUE:
-        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
-            *V_BOOLREF(var) = VARIANT_TRUE;
-        }
-        break;
-    case T_FALSE:
-        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
-            *V_BOOLREF(var) = VARIANT_FALSE;
-        }
-        break;
-    default:
-        break;
-    }
-}
-
-static void
-ary2ptr_dispparams(ary, pdispparams)
-    VALUE ary;
-    DISPPARAMS *pdispparams;
-{
-    int i;
-    VALUE v;
-    VARIANT *pvar;
-    for(i = 0; i < RARRAY(ary)->len && (unsigned int) i < pdispparams->cArgs; i++) {
-        v = rb_ary_entry(ary, i);
-        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
-        val2ptr_variant(v, pvar);
-    }
-}
-
-STDMETHODIMP EVENTSINK_Invoke(
-    PEVENTSINK pEventSink,
-    DISPID dispid,
-    REFIID riid,
-    LCID lcid,
-    WORD wFlags,
-    DISPPARAMS *pdispparams,
-    VARIANT *pvarResult,
-    EXCEPINFO *pexcepinfo,
-    UINT *puArgErr
-    ) {
-
-    HRESULT hr;
-    BSTR bstr;
-    unsigned int count;
-    unsigned int i;
-    ITypeInfo *pTypeInfo;
-    VARIANT *pvar;
-    VALUE ary, obj, event, handler, args, argv, ev, result;
-    BOOL is_default_handler = FALSE;
-
-    PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
-    pTypeInfo = pEV->pTypeInfo;
-
-    obj = rb_ary_entry(ary_ole_event, pEV->m_event_id);
-    if (!rb_obj_is_kind_of(obj, cWIN32OLE_EVENT)) {
-        return NOERROR;
-    }
-
-    ary = rb_ivar_get(obj, id_events);
-    if (NIL_P(ary) || TYPE(ary) != T_ARRAY) {
-        return NOERROR;
-    }
-    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, dispid,
-                                     &bstr, 1, &count);
-    if (FAILED(hr)) {
-        return NOERROR;
-    }
-    ev = WC2VSTR(bstr);
-    event = ole_search_event(ary, ev, &is_default_handler);
-    if (NIL_P(event)) {
-        return NOERROR;
-    }
-    args = rb_ary_new();
-    if (is_default_handler) {
-        rb_ary_push(args, ev);
-    }
-
-    /* make argument of event handler */
-    for (i = 0; i < pdispparams->cArgs; ++i) {
-        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
-        rb_ary_push(args, ole_variant2val(pvar));
-    }
-    handler = rb_ary_entry(event, 0);
-
-    if (rb_ary_entry(event, 3) == Qtrue) {
-        argv = rb_ary_new();
-	rb_ary_push(args, argv);
-        result = rb_apply(handler, rb_intern("call"), args);
-        ary2ptr_dispparams(argv, pdispparams);
-    }
-    else {
-        result = rb_apply(handler, rb_intern("call"), args);
-    }
-
-    if (pvarResult) {
-        ole_val2variant(result, pvarResult);
-    }
-    
-    return NOERROR;
-}
-
-PIEVENTSINKOBJ
-EVENTSINK_Constructor() {
-    PIEVENTSINKOBJ pEv;
-    if (!g_IsEventSinkVtblInitialized) {
-        vtEventSink.QueryInterface=EVENTSINK_QueryInterface;
-        vtEventSink.AddRef = EVENTSINK_AddRef;
-        vtEventSink.Release = EVENTSINK_Release;
-        vtEventSink.Invoke = EVENTSINK_Invoke;
-        vtEventSink.GetIDsOfNames = EVENTSINK_GetIDsOfNames;
-        vtEventSink.GetTypeInfoCount = EVENTSINK_GetTypeInfoCount;
-        vtEventSink.GetTypeInfo = EVENTSINK_GetTypeInfo;
-
-        g_IsEventSinkVtblInitialized = TRUE;
-    }
-    pEv = ALLOC_N(IEVENTSINKOBJ, 1);
-    if(pEv == NULL) return NULL;
-    pEv->lpVtbl = &vtEventSink;
-    pEv->m_cRef = 0;
-    pEv->m_event_id = 0;
-    pEv->m_dwCookie = 0;
-    pEv->pConnectionPoint = NULL;
-    pEv->pTypeInfo = NULL;
-    return pEv;
-}
-
-void EVENTSINK_Destructor(
-    PIEVENTSINKOBJ pEVObj
-    ) {
-    if(pEVObj != NULL) {
-        free(pEVObj);
-    }
-}
-
-static HRESULT
-find_iid(ole, pitf, piid, ppTypeInfo)
-    VALUE ole;
-    char *pitf;
-    IID *piid;
-    ITypeInfo **ppTypeInfo;
-{
-    HRESULT hr;
-    IDispatch *pDispatch;
-    ITypeInfo *pTypeInfo;
-    ITypeLib *pTypeLib;
-    TYPEATTR *pTypeAttr;
-    HREFTYPE RefType;
-    ITypeInfo *pImplTypeInfo;
-    TYPEATTR *pImplTypeAttr;
-
-    struct oledata *pole;
-    unsigned int index;
-    unsigned int count;
-    int type;
-    BSTR bstr;
-    char *pstr;
-
-    BOOL is_found = FALSE;
-    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
-
-    OLEData_Get_Struct(ole, pole);
-
-    pDispatch = pole->pDispatch;
-
-    hr = pDispatch->lpVtbl->GetTypeInfo(pDispatch, 0, lcid, &pTypeInfo);
-    if (FAILED(hr))
-        return hr;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo,
-                                                 &pTypeLib,
-                                                 &index);
-    OLE_RELEASE(pTypeInfo);
-    if (FAILED(hr))
-        return hr;
-
-    if (!pitf) {
-        hr = pTypeLib->lpVtbl->GetTypeInfoOfGuid(pTypeLib,
-                                                 piid,
-                                                 ppTypeInfo);
-        OLE_RELEASE(pTypeLib);
-        return hr;
-    }
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (index = 0; index < count; index++) {
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib,
-                                           index,
-                                           &pTypeInfo);
-        if (FAILED(hr))
-            break;
-        hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-
-        if(FAILED(hr)) {
-            OLE_RELEASE(pTypeInfo);
-            break;
-        }
-        if(pTypeAttr->typekind == TKIND_COCLASS) {
-            for (type = 0; type < pTypeAttr->cImplTypes; type++) {
-                hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
-                                                             type,
-                                                             &RefType);
-                if (FAILED(hr))
-                    break;
-                hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                                       RefType,
-                                                       &pImplTypeInfo);
-                if (FAILED(hr))
-                    break;
-
-                hr = pImplTypeInfo->lpVtbl->GetDocumentation(pImplTypeInfo,
-                                                             -1,
-                                                             &bstr,
-                                                             NULL, NULL, NULL);
-                if (FAILED(hr)) {
-                    OLE_RELEASE(pImplTypeInfo);
-                    break;
-                }
-                pstr = ole_wc2mb(bstr);
-                if (strcmp(pitf, pstr) == 0) {
-                    hr = pImplTypeInfo->lpVtbl->GetTypeAttr(pImplTypeInfo,
-                                                            &pImplTypeAttr);
-                    if (SUCCEEDED(hr)) {
-                        is_found = TRUE;
-                        *piid = pImplTypeAttr->guid;
-                        if (ppTypeInfo) {
-                            *ppTypeInfo = pImplTypeInfo;
-                            (*ppTypeInfo)->lpVtbl->AddRef((*ppTypeInfo));
-                        }
-                        pImplTypeInfo->lpVtbl->ReleaseTypeAttr(pImplTypeInfo,
-                                                               pImplTypeAttr);
-                    }
-                }
-                free(pstr);
-                OLE_RELEASE(pImplTypeInfo);
-                if (is_found || FAILED(hr))
-                    break;
-            }
-        }
-
-        OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-        OLE_RELEASE(pTypeInfo);
-        if (is_found || FAILED(hr))
-            break;
-    }
-    OLE_RELEASE(pTypeLib);
-    if(!is_found)
-        return E_NOINTERFACE;
-    return hr;
-}
-
-static HRESULT
-find_default_source(ole, piid, ppTypeInfo)
-    VALUE ole;
-    IID *piid;
-    ITypeInfo **ppTypeInfo;
-{
-    HRESULT hr;
-    IProvideClassInfo2 *pProvideClassInfo2;
-    IProvideClassInfo *pProvideClassInfo;
-
-    IDispatch *pDispatch;
-    ITypeInfo *pTypeInfo;
-    TYPEATTR *pTypeAttr;
-    int i;
-    int iFlags;
-    HREFTYPE hRefType;
-
-    struct oledata *pole;
-
-    OLEData_Get_Struct(ole, pole);
-    pDispatch = pole->pDispatch;
-    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
-                                           &IID_IProvideClassInfo2,
-                                           (void**)&pProvideClassInfo2);
-    if (SUCCEEDED(hr)) {
-        hr = pProvideClassInfo2->lpVtbl->GetGUID(pProvideClassInfo2,
-                                                 GUIDKIND_DEFAULT_SOURCE_DISP_IID,
-                                                 piid);
-        OLE_RELEASE(pProvideClassInfo2);
-        return find_iid(ole, NULL, piid, ppTypeInfo);
-    }
-    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
-                                           &IID_IProvideClassInfo,
-                                           (void**)&pProvideClassInfo);
-    if (FAILED(hr))
-        return hr;
-
-    hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
-                                                 &pTypeInfo);
-    OLE_RELEASE(pProvideClassInfo);
-    if (FAILED(hr))
-        return hr;
-
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeInfo);
-        return hr;
-    }
-    /* Enumerate all implemented types of the COCLASS */
-    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
-        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &iFlags);
-        if (FAILED(hr))
-            continue;
-
-        /*
-           looking for the [default] [source]
-           we just hope that it is a dispinterface :-)
-        */
-        if ((iFlags & IMPLTYPEFLAG_FDEFAULT) &&
-            (iFlags & IMPLTYPEFLAG_FSOURCE)) {
-
-            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
-                                                         i, &hRefType);
-            if (FAILED(hr))
-                continue;
-            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                                   hRefType, ppTypeInfo);
-            if (SUCCEEDED(hr))
-                break;
-        }
-    }
-
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    OLE_RELEASE(pTypeInfo);
-
-    /* Now that would be a bad surprise, if we didn't find it, wouldn't it? */
-    if (!*ppTypeInfo) {
-        if (SUCCEEDED(hr))
-            hr = E_UNEXPECTED;
-        return hr;
-    }
-
-    /* Determine IID of default source interface */
-    hr = (*ppTypeInfo)->lpVtbl->GetTypeAttr(*ppTypeInfo, &pTypeAttr);
-    if (SUCCEEDED(hr)) {
-        *piid = pTypeAttr->guid;
-        (*ppTypeInfo)->lpVtbl->ReleaseTypeAttr(*ppTypeInfo, pTypeAttr);
-    }
-    else
-        OLE_RELEASE(*ppTypeInfo);
-
-    return hr;
-
-}
-
-static void
-ole_event_free(poleev)
-    struct oleeventdata *poleev;
-{
-    ITypeInfo *pti = NULL;
-    IConnectionPoint *pcp = NULL;
-
-    if(poleev->pEvent) {
-        pti = poleev->pEvent->pTypeInfo;
-	if(pti) OLE_RELEASE(pti);
-	pcp = poleev->pEvent->pConnectionPoint;
-	if(pcp) {
-            pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie);
-            OLE_RELEASE(pcp);
-        }
-        CoFreeUnusedLibraries();
-    }
-}
-
-static VALUE fev_s_allocate _((VALUE));
-static VALUE
-fev_s_allocate(klass)
-    VALUE klass;
-{
-    VALUE obj;
-    struct oleeventdata *poleev;
-    obj = Data_Make_Struct(klass,struct oleeventdata,0,ole_event_free,poleev);
-    poleev->pEvent = NULL;
-    return obj;
-}
-
-static VALUE
-fev_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE ole, itf;
-    struct oledata *pole;
-    char *pitf;
-    HRESULT hr;
-    IID iid;
-    ITypeInfo *pTypeInfo;
-    IDispatch *pDispatch;
-    IConnectionPointContainer *pContainer;
-    IConnectionPoint *pConnectionPoint;
-    IEVENTSINKOBJ *pIEV;
-    DWORD dwCookie;
-    struct oleeventdata *poleev;
-
-    rb_secure(4);
-    rb_scan_args(argc, argv, "11", &ole, &itf);
-
-    if (!rb_obj_is_kind_of(ole, cWIN32OLE)) {
-        rb_raise(rb_eTypeError, "1st parametor must be WIN32OLE object.");
-    }
-
-    if(TYPE(itf) != T_NIL) {
-	if (ruby_safe_level > 0 && OBJ_TAINTED(itf)) {
-	    rb_raise(rb_eSecurityError, "Insecure Event Creation - %s",
-		     StringValuePtr(itf));
-	}
-        Check_SafeStr(itf);
-        pitf = StringValuePtr(itf);
-        hr = find_iid(ole, pitf, &iid, &pTypeInfo);
-    }
-    else {
-        hr = find_default_source(ole, &iid, &pTypeInfo);
-    }
-    if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "not found interface");
-    }
-
-    OLEData_Get_Struct(ole, pole);
-    pDispatch = pole->pDispatch;
-    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
-                                           &IID_IConnectionPointContainer,
-                                           (void**)&pContainer);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError,
-                  "fail to query IConnectionPointContainer");
-    }
-
-    hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
-                                                 &iid,
-                                                 &pConnectionPoint);
-    OLE_RELEASE(pContainer);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "fail to query IConnectionPoint");
-    }
-    pIEV = EVENTSINK_Constructor();
-    pIEV->m_iid = iid;
-    hr = pConnectionPoint->lpVtbl->Advise(pConnectionPoint,
-                                          (IUnknown*)pIEV,
-                                          &dwCookie);
-    if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "Advise Error");
-    }
-
-    Data_Get_Struct(self, struct oleeventdata, poleev);
-    poleev->pEvent = pIEV;
-    poleev->pEvent->m_event_id
-        = NUM2INT(rb_funcall(ary_ole_event, rb_intern("length"), 0));
-    poleev->pEvent->pConnectionPoint = pConnectionPoint;
-    poleev->pEvent->pTypeInfo = pTypeInfo;
-    poleev->pEvent->m_dwCookie = dwCookie;
-
-    rb_ary_push(ary_ole_event, self);
-    return self;
-}
-
-/*
- * WIN32OLE_EVENT.message_loop
- * ---
- * Translates and dispatches Windows message.
- */
-static VALUE
-fev_s_msg_loop(klass)
-    VALUE klass;
-{
-    ole_msg_loop();
-    return Qnil;
-}
-
-
-static void
-add_event_call_back(obj, data)
-    VALUE obj;
-    VALUE data;
-{
-    VALUE ary = rb_ivar_get(obj, id_events);
-    if (NIL_P(ary) || TYPE(ary) != T_ARRAY) {
-        ary = rb_ary_new();
-        rb_ivar_set(obj, id_events, ary);
-    }
-    rb_ary_push(ary, data);
-}
-
-static VALUE
-ev_on_event(argc, argv, self, is_ary_arg)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-    VALUE is_ary_arg;
-{
-    VALUE event, args, data;
-    rb_scan_args(argc, argv, "01*", &event, &args);
-    if(!NIL_P(event)) {
-        Check_SafeStr(event);
-    }
-    data = rb_ary_new3(4, rb_block_proc(), event, args, is_ary_arg);
-    add_event_call_back(self, data);
-    return Qnil;
-}
-
-/*
- * WIN32OLE_EVENT#on_event([event]){...}
- * ----
- * defines the callback event.
- * If argument is omitted, this method defines the callback of all events.
- */
-static VALUE
-fev_on_event(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return ev_on_event(argc, argv, self, Qfalse);
-}
-
-/*
- * WIN32OLE_EVENT#on_event_with_outargs([event]){...}
- * ----
- * defines the callback of event.
- * If you want modify argument in callback, 
- * you should use this method instead of WIN32OLE_EVENT#on_event.
- */
-static VALUE
-fev_on_event_with_outargs(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return ev_on_event(argc, argv, self, Qtrue);
-}
-
-
-void
-Init_win32ole()
-{
-    ary_ole_event = rb_ary_new();
-    rb_global_variable(&ary_ole_event);
-    id_events = rb_intern("events");
-
-    cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject);
-
-    rb_define_alloc_func(cWIN32OLE, fole_s_allocate);
-
-    rb_define_method(cWIN32OLE, "initialize", fole_initialize, -1);
-
-    rb_define_singleton_method(cWIN32OLE, "connect", fole_s_connect, -1);
-    rb_define_singleton_method(cWIN32OLE, "const_load", fole_s_const_load, -1);
-
-    rb_define_singleton_method(cWIN32OLE, "ole_free", fole_s_free, 1);
-    rb_define_singleton_method(cWIN32OLE, "ole_reference_count", fole_s_reference_count, 1);
-    rb_define_singleton_method(cWIN32OLE, "ole_show_help", fole_s_show_help, -1);
-
-
-    rb_define_method(cWIN32OLE, "invoke", fole_invoke, -1);
-    rb_define_method(cWIN32OLE, "[]", fole_getproperty, 1);
-    rb_define_method(cWIN32OLE, "_invoke", fole_invoke2, 3);
-    rb_define_method(cWIN32OLE, "_getproperty", fole_getproperty2, 3);
-    rb_define_method(cWIN32OLE, "_setproperty", fole_setproperty2, 3);
-
-    /* support propput method that takes an argument */
-    rb_define_method(cWIN32OLE, "[]=", fole_setproperty, -1); 
-
-    rb_define_method(cWIN32OLE, "ole_free", fole_free, 0);
-
-    rb_define_method(cWIN32OLE, "each", fole_each, 0);
-    rb_define_method(cWIN32OLE, "method_missing", fole_missing, -1);
-
-    /* support setproperty method much like Perl ;-) */
-    rb_define_method(cWIN32OLE, "setproperty", fole_setproperty, -1);
-
-    rb_define_method(cWIN32OLE, "ole_methods", fole_methods, 0);
-    rb_define_method(cWIN32OLE, "ole_get_methods", fole_get_methods, 0);
-    rb_define_method(cWIN32OLE, "ole_put_methods", fole_put_methods, 0);
-    rb_define_method(cWIN32OLE, "ole_func_methods", fole_func_methods, 0);
-
-    rb_define_method(cWIN32OLE, "ole_method", fole_method_help, 1);
-    rb_define_alias(cWIN32OLE, "ole_method_help", "ole_method");
-    rb_define_method(cWIN32OLE, "ole_obj_help", fole_obj_help, 0);
-
-    rb_define_const(cWIN32OLE, "VERSION", rb_str_new2(WIN32OLE_VERSION));
-    rb_define_const(cWIN32OLE, "ARGV", rb_ary_new());
-
-    mWIN32OLE_VARIANT = rb_define_module_under(cWIN32OLE, "VARIANT");
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I4", INT2FIX(VT_I4));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_R4", INT2FIX(VT_R4));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_R8", INT2FIX(VT_R8));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_CY", INT2FIX(VT_CY));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_DATE", INT2FIX(VT_DATE));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BSTR", INT2FIX(VT_BSTR));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_USERDEFINED", INT2FIX(VT_USERDEFINED));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_PTR", INT2FIX(VT_PTR));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_DISPATCH", INT2FIX(VT_DISPATCH));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_ERROR", INT2FIX(VT_ERROR));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BOOL", INT2FIX(VT_BOOL));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_VARIANT", INT2FIX(VT_VARIANT));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UNKNOWN", INT2FIX(VT_UNKNOWN));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I1", INT2FIX(VT_I1));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", INT2FIX(VT_UI1));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", INT2FIX(VT_UI2));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", INT2FIX(VT_UI4));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_INT", INT2FIX(VT_INT));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", INT2FIX(VT_UINT));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", INT2FIX(VT_ARRAY));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", INT2FIX(VT_BYREF));
-    
-    cWIN32OLE_TYPE = rb_define_class("WIN32OLE_TYPE", rb_cObject);
-    rb_define_singleton_method(cWIN32OLE_TYPE, "ole_classes", foletype_s_ole_classes, 1);
-    rb_define_singleton_method(cWIN32OLE_TYPE, "typelibs", foletype_s_typelibs, 0);
-    rb_define_singleton_method(cWIN32OLE_TYPE, "progids", foletype_s_progids, 0);
-    rb_define_alloc_func(cWIN32OLE_TYPE, foletype_s_allocate);
-    rb_define_method(cWIN32OLE_TYPE, "initialize", foletype_initialize, 2);
-    rb_define_method(cWIN32OLE_TYPE, "name", foletype_name, 0);
-    rb_define_method(cWIN32OLE_TYPE, "ole_type", foletype_ole_type, 0);
-    rb_define_method(cWIN32OLE_TYPE, "guid", foletype_guid, 0);
-    rb_define_method(cWIN32OLE_TYPE, "progid", foletype_progid, 0);
-    rb_define_method(cWIN32OLE_TYPE, "visible?", foletype_visible, 0);
-    rb_define_alias(cWIN32OLE_TYPE, "to_s", "name");
-
-    rb_define_method(cWIN32OLE_TYPE, "major_version", foletype_major_version, 0);
-    rb_define_method(cWIN32OLE_TYPE, "minor_version", foletype_minor_version, 0);
-    rb_define_method(cWIN32OLE_TYPE, "typekind", foletype_typekind, 0);
-    rb_define_method(cWIN32OLE_TYPE, "helpstring", foletype_helpstring, 0);
-    rb_define_method(cWIN32OLE_TYPE, "src_type", foletype_src_type, 0);
-    rb_define_method(cWIN32OLE_TYPE, "helpfile", foletype_helpfile, 0);
-    rb_define_method(cWIN32OLE_TYPE, "helpcontext", foletype_helpcontext, 0);
-    rb_define_method(cWIN32OLE_TYPE, "variables", foletype_variables, 0);
-    rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, -1);
-
-    cWIN32OLE_VARIABLE = rb_define_class("WIN32OLE_VARIABLE", rb_cObject);
-    rb_define_method(cWIN32OLE_VARIABLE, "name", folevariable_name, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "ole_type", folevariable_ole_type, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "ole_type_detail", folevariable_ole_type_detail, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "value", folevariable_value, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "visible?", folevariable_visible, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "variable_kind", folevariable_variable_kind, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "varkind", folevariable_varkind, 0);
-    rb_define_alias(cWIN32OLE_VARIABLE, "to_s", "name");
-
-    cWIN32OLE_METHOD = rb_define_class("WIN32OLE_METHOD", rb_cObject);
-    rb_define_alloc_func(cWIN32OLE_METHOD, folemethod_s_allocate);
-    rb_define_method(cWIN32OLE_METHOD, "initialize", folemethod_initialize, 2);
-
-    rb_define_method(cWIN32OLE_METHOD, "name", folemethod_name, 0);
-    rb_define_method(cWIN32OLE_METHOD, "return_type", folemethod_return_type, 0);
-    rb_define_method(cWIN32OLE_METHOD, "return_vtype", folemethod_return_vtype, 0);
-    rb_define_method(cWIN32OLE_METHOD, "return_type_detail", folemethod_return_type_detail, 0);
-    rb_define_method(cWIN32OLE_METHOD, "invoke_kind", folemethod_invoke_kind, 0);
-    rb_define_method(cWIN32OLE_METHOD, "invkind", folemethod_invkind, 0);
-    rb_define_method(cWIN32OLE_METHOD, "visible?", folemethod_visible, 0);
-    rb_define_method(cWIN32OLE_METHOD, "event?", folemethod_event, 0);
-    rb_define_method(cWIN32OLE_METHOD, "event_interface", folemethod_event_interface, 0);
-    rb_define_method(cWIN32OLE_METHOD, "helpstring", folemethod_helpstring, 0);
-    rb_define_method(cWIN32OLE_METHOD, "helpfile", folemethod_helpfile, 0);
-    rb_define_method(cWIN32OLE_METHOD, "helpcontext", folemethod_helpcontext, 0);
-    rb_define_method(cWIN32OLE_METHOD, "dispid", folemethod_dispid, 0);
-    rb_define_method(cWIN32OLE_METHOD, "offset_vtbl", folemethod_offset_vtbl, 0);
-    rb_define_method(cWIN32OLE_METHOD, "size_params", folemethod_size_params, 0);
-    rb_define_method(cWIN32OLE_METHOD, "size_opt_params", folemethod_size_opt_params, 0);
-    rb_define_method(cWIN32OLE_METHOD, "params", folemethod_params, 0);
-    rb_define_alias(cWIN32OLE_METHOD, "to_s", "name");
-
-    cWIN32OLE_PARAM = rb_define_class("WIN32OLE_PARAM", rb_cObject);
-    rb_define_method(cWIN32OLE_PARAM, "name", foleparam_name, 0);
-    rb_define_method(cWIN32OLE_PARAM, "ole_type", foleparam_ole_type, 0);
-    rb_define_method(cWIN32OLE_PARAM, "ole_type_detail", foleparam_ole_type_detail, 0);
-    rb_define_method(cWIN32OLE_PARAM, "input?", foleparam_input, 0);
-    rb_define_method(cWIN32OLE_PARAM, "output?", foleparam_output, 0);
-    rb_define_method(cWIN32OLE_PARAM, "optional?", foleparam_optional, 0);
-    rb_define_method(cWIN32OLE_PARAM, "retval?", foleparam_retval, 0);
-    rb_define_method(cWIN32OLE_PARAM, "default", foleparam_default, 0);
-    rb_define_alias(cWIN32OLE_PARAM, "to_s", "name");
- 
-    cWIN32OLE_EVENT = rb_define_class("WIN32OLE_EVENT", rb_cObject);
-
-    rb_define_alloc_func(cWIN32OLE_EVENT, fev_s_allocate);
-    rb_define_method(cWIN32OLE_EVENT, "initialize", fev_initialize, -1);
-    rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
-
-    rb_define_method(cWIN32OLE_EVENT, "on_event", fev_on_event, -1);
-    rb_define_method(cWIN32OLE_EVENT, "on_event_with_outargs", fev_on_event_with_outargs, -1);
-    eWIN32OLE_RUNTIME_ERROR = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
-}
diff --git a/ext/zlib/.cvsignore b/ext/zlib/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/zlib/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/zlib/MANIFEST b/ext/zlib/MANIFEST
deleted file mode 100644
index 746275d5c8..0000000000
--- a/ext/zlib/MANIFEST
+++ /dev/null
@@ -1,4 +0,0 @@
-MANIFEST
-extconf.rb
-zlib.c
-doc/zlib.rd
diff --git a/ext/zlib/doc/zlib.rd b/ext/zlib/doc/zlib.rd
deleted file mode 100644
index 6adff7f89c..0000000000
--- a/ext/zlib/doc/zlib.rd
+++ /dev/null
@@ -1,911 +0,0 @@
-=begin
-#
-# zlib.rd.src
-#
-#   Copyright (C) UENO Katsuhiro 2000-2003
-#
-# $Id$
-#
-
-= Ruby/zlib version 0.6.0
-
-Ruby/zlib is an extension library to use zlib from Ruby.
-Ruby/zlib also provides the features for accessing gzipped files.
-
-You can modify or redistribute Ruby/zlib in the same manner of
-Ruby interpreter. The latest version of Ruby/zlib would be found
-at ((<URL:http://www.blue.sky.or.jp/>)).
-
-Any comments and suggestions are always welcome. Please send
-them to ruby-list ML, ruby-ext ML, ruby-talk ML, or the author's
-mail address ((<URL:mailto:katsu@blue.sky.or.jp>)).
-
-This document is experimental and broken English version.
-If you find some mistakes or strange expressions (including
-kidding or unnatural ones) in this document, please let me know
-for my study.
-
-* ((<Zlib>))
-
-  * ((<Zlib::Error>))
-  * ((<Zlib::ZStream>))
-  * ((<Zlib::Deflate>))
-  * ((<Zlib::Inflate>))
-  * ((<Zlib::GzipFile>))
-  * ((<Zlib::GzipFile::Error>))
-  * ((<Zlib::GzipWriter>))
-  * ((<Zlib::GzipReader>))
-
-* ((<Changes from 0.5 to 0.6>))
-* ((<Changes from 0.4 to 0.5>))
-
-== Zlib
-
-Zlib is the module which provides the other features in zlib C
-library. See zlib.h for detail of each module function.
-
-=== Module Functions:
-
---- Zlib.zlib_version
-
-    Returns the string which represents the version of zlib
-    library.
-
---- Zlib.adler32([string[, adler]])
-
-    Calculates Alder-32 checksum for ((|string|)),
-    and returns updated value of ((|alder|)).
-    If ((|string|)) is omitted, it returns the Adler-32 initial
-    value. If ((|alder|)) is omitted, it assumes that the initial
-    value is given to ((|alder|)).
-
---- Zlib.crc32([string[, crc]])
-
-    Calculates CRC checksum for ((|string|)), and returns
-    updated value of ((|crc|)). If ((|string|)) is omitted,
-    it returns the CRC initial value. ((|crc|)) is omitted,
-    it assumes that the initial value is given to ((|crc|)).
-
---- Zlib.crc_table
-
-    Returns the table for calculating CRC checksum as an array.
-
-=== Constants:
-
---- Zlib::VERSION
-
-    The Ruby/zlib version string.
-
---- Zlib::ZLIB_VERSION
-
-    The string which represents the version of zlib.h.
-
---- Zlib::BINARY
---- Zlib::ASCII
---- Zlib::UNKNOWN
-
-    The integers representing data types which
-    ((<Zlib::ZStream#data_type>)) method returns.
-
---- Zlib::NO_COMPRESSION
---- Zlib::BEST_SPEED
---- Zlib::BEST_COMPRESSION
---- Zlib::DEFAULT_COMPRESSION
-
-    The integers representing compression levels which are
-    an argument for ((<Zlib::Deflate.new>)),
-    ((<Zlib::Deflate#deflate>)), and so on.
-
---- Zlib::FILTERED
---- Zlib::HUFFMAN_ONLY
---- Zlib::DEFAULT_STRATEGY
-
-    The integers representing compression methods which are
-    an argument for ((<Zlib::Deflate.new>)) and
-    ((<Zlib::Deflate#params>)).
-
---- Zlib::DEF_MEM_LEVEL
---- Zlib::MAX_MEM_LEVEL
-
-    The integers representing memory levels which are an
-    argument for ((<Zlib::Deflate.new>)),
-    ((<Zlib::Deflate#params>)), and so on.
-
---- Zlib::MAX_WBITS
-
-    The default value of ((|windowBits|)) which is an argument for
-    ((<Zlib::Deflate.new>)) and ((<Zlib::Inflate.new>)).
-
---- Zlib::NO_FLUSH
---- Zlib::SYNC_FLUSH
---- Zlib::FULL_FLUSH
---- Zlib::FINISH
-
-    The integers to control the output of the deflate stream,
-    which are an argument for ((<Zlib::Deflate#deflate>)) and so on.
-
---- Zlib::OS_CODE
---- Zlib::OS_MSDOS
---- Zlib::OS_AMIGA
---- Zlib::OS_VMS
---- Zlib::OS_UNIX
---- Zlib::OS_VMCMS
---- Zlib::OS_ATARI
---- Zlib::OS_OS2
---- Zlib::OS_MACOS
---- Zlib::OS_ZSYSTEM
---- Zlib::OS_CPM
---- Zlib::OS_TOPS20
---- Zlib::OS_WIN32
---- Zlib::OS_QDOS
---- Zlib::OS_RISCOS
---- Zlib::OS_UNKNOWN
-
-    The return values of ((<Zlib::GzipFile#os_code>)) method.
-
-
-== Zlib::Error
-
-The superclass for all exceptions raised by Ruby/zlib.
-
-The following exceptions are defined as subclasses of Zlib::Error.
-These exceptions are raised when zlib library functions return
-with an error status.
-
-  * Zlib::StreamEnd
-  * Zlib::NeedDict
-  * Zlib::DataError
-  * Zlib::StreamError
-  * Zlib::MemError
-  * Zlib::BufError
-  * Zlib::VersionError
-
-=== SuperClass:
-
-* StandardError
-
-
-== Zlib::ZStream
-
-The abstract class for the stream which handles the compressed
-data. The operations are defined in the subclasses,
-((<Zlib::Deflate>)) for compression, and ((<Zlib::Inflate>))
-for decompression.
-
-An instance of Zlib::ZStream has one stream (struct zstream) and
-two variable-length buffers which associated to the input
-(next_in) of the stream and the output (next_out) of the stream.
-In this document, "input buffer" means the buffer for input, and
-"output buffer" means the buffer for output.
-
-Data inputed into an instance of Zlib::ZStream are temporally
-stored into the end of input buffer, and then data in input buffer
-are processed from the beginning of the buffer until no more
-output from the stream is produced (i.e. until avail_out > 0
-after processing). During processing, output buffer is allocated
-and expanded automatically to hold all output data.
-
-Some particular instance methods consume the data in output buffer
-and return them as a String.
-
-Here is an ascii art for describing above:
-
-     +================ an instance of Zlib::ZStream ================+
-     ||                                                            ||
-     ||     +--------+          +-------+          +--------+      ||
-     ||  +--| output |<---------|zstream|<---------| input  |<--+  ||
-     ||  |  | buffer |  next_out+-------+next_in   | buffer |   |  ||
-     ||  |  +--------+                             +--------+   |  ||
-     ||  |                                                      |  ||
-     +===|======================================================|===+
-         |                                                      |
-         v                                                      |
-     "output data"                                         "input data"
-
-If an error is occurred during processing input buffer,
-an exception which is a subclass of ((<Zlib::Error>)) is raised.
-At that time, both input and output buffer keeps their conditions
-at the time when the error is occurred.
-
-=== SuperClass:
-
-* Object
-
-=== Class Methods:
-
---- Zlib::ZStream.new
-
-    See ((<Zlib::Deflate.new>)) and ((<Zlib::Inflate.new>)).
-
-=== Methods:
-
---- Zlib::ZStream#avail_in
-
-    Returns bytes of data in input buffer.
-    Normally, returns 0.
-
---- Zlib::ZStream#avail_out
-
-    Returns bytes of free spaces in output buffer.
-    Because the free spaces are allocated automatically,
-    this method returns 0 normally.
-
---- Zlib::ZStream#avail_out = size
-
-    Allocates free spaces of ((|size|)) bytes in output buffer.
-    If there are more than ((|size|)) bytes spaces in the buffer,
-    the buffer is truncated.
-    Because the free spaces are allocated automatically,
-    you usually need not to use this method.
-
---- Zlib::ZStream#flush_next_in
-
-    Flushes input buffer and returns all data in that buffer.
-
---- Zlib::ZStream#flush_next_out
-
-    Flushes output buffer and returns all data in that buffer.
-
---- Zlib::ZStream#total_in
-
-    Returns the total bytes of the input data to the stream.
-
---- Zlib::ZStream#total_out
-
-    Returns the total bytes of the output data from the stream.
-
---- Zlib::ZStream#data_type
-
-    Guesses the type of the data which have been inputed into
-    the stream. The returned value is either ((<Zlib::BINARY>)),
-    ((<Zlib::ASCII>)), or ((<Zlib::UNKNOWN>)).
-
---- Zlib::ZStream#adler
-
-    Returns the alder-32 checksum.
-
---- Zlib::ZStream#reset
-
-    Resets and initializes the stream. All data in both
-    input and output buffer are discarded.
-
---- Zlib::ZStream#finish
-
-    Finishes the stream and flushes output buffer.
-    See ((<Zlib::Deflate#finish>)) and ((<Zlib::Inflate#finish>))
-    for detail of the behavior.
-
---- Zlib::ZStream#finished?
---- Zlib::ZStream#stream_end?
-
-    Returns true if the stream is finished.
-
---- Zlib::ZStream#close
---- Zlib::ZStream#end
-
-    Closes the stream. All operations on the closed stream
-    will raise an exception.
-
---- Zlib::ZStream#closed?
---- Zlib::ZStream#ended?
-
-    Returns true if the stream closed.
-
-
-== Zlib::Deflate
-
-The class for compressing string data.
-
-=== SuperClass:
-
-* ((<Zlib::ZStream>))
-
-=== Class Methods:
-
---- Zlib::Deflate.deflate(string[, level])
-
-    Compresses ((|string|)). The avail values of ((|level|)) are
-    ((<Zlib::NO_COMPRESSION>)), ((<Zlib::BEST_SPEED>)),
-    ((<Zlib::BEST_COMPRESSION>)), ((<Zlib::DEFAULT_COMPRESSION>)),
-    and the integer from 0 to 9.
-
-    This method is almost equivalent to the following code:
-
-      def deflate(string, level)
-        z = Zlib::Deflate.new(level)
-        dst = z.deflate(string, Zlib::FINISH)
-        z.close
-        dst
-      end
-
---- Zlib::Deflate.new([level[, windowBits[, memlevel[, strategy]]]])
-
-    Creates a new deflate stream for compression.
-    See zlib.h for details of each argument.
-    If an argument is nil, the default value of that
-    argument is used.
-
-=== Methods:
-
---- Zlib::Deflate#clone
-
-    Duplicates the deflate stream.
-
---- Zlib::Deflate#deflate(string[, flush])
-
-    Inputs ((|string|)) into the deflate stream and returns
-    the output from the stream. Calling this method,
-    both input and output buffer of the stream are flushed.
-    If ((|string|)) is nil, this method finishes the stream,
-    just like ((<Zlib::ZStream#finish>)).
-    The value of ((|flush|)) should be either ((<Zlib::NO_FLUSH>)),
-    ((<Zlib::SYNC_FLUSH>)), ((<Zlib::FULL_FLUSH>)), or
-    ((<Zlib::FINISH>)).
-    See zlib.h for details.
-
---- Zlib::Deflate#<< string
-
-    Inputs ((|string|)) into the deflate stream just like
-    ((<Zlib::Deflate#deflate>)), but returns Zlib::Deflate object
-    itself. The output from the stream is preserved in output
-    buffer.
-
---- Zlib::Deflate#flush([flush])
-
-    This method is equivalent to (({deflate('', ((|flush|)))})).
-    If ((|flush|)) is omitted, ((<Zlib::SYNC_FLUSH>)) is used
-    as ((|flush|)). This method is just provided for
-    readability of your Ruby script.
-
---- Zlib::Deflate#finish
-
-    Finishes the stream. This method is equivalent to
-    (({deflate('', Zlib::FINISH)})).
-
---- Zlib::Deflate#params(level, strategy)
-
-    Changes the parameters of the deflate stream.
-    See zlib.h for details. The output from the stream
-    by changing the params is preserved in output buffer.
-
---- Zlib::Deflate#set_dictionary(string)
-
-    Sets the preset dictionary and returns ((|string|)).
-    This method is available just only after
-    ((<Zlib::Deflate.new>)) or ((<Zlib::ZStream#reset>)) method
-    was called. See zlib.h for details.
-
-
-== Zlib::Inflate
-
-The class for decompressing compressed data.
-Unlike ((<Zlib::Deflate>)), an instance of this class is not able
-to duplicate (clone, dup) itself.
-
-=== SuperClass:
-
-* ((<Zlib::ZStream>))
-
-=== Class Methods:
-
---- Zlib::Inflate.inflate(string)
-
-    Decompresses ((|string|)). Raises a ((<Zlib::NeedDict>))
-    exception if a preset dictionary is needed for decompression.
-
-    This method is almost equivalent to the following code:
-
-      def inflate(string)
-        zstream = Zlib::Inflate.new
-        buf = zstream.inflate(string)
-        zstream.finish
-        zstream.close
-        buf
-      end
-
---- Zlib::Inflate.new([windowBits])
-
-    Creates a new inflate stream for decompression.
-    See zlib.h for details of the argument.
-    If ((|windowBits|)) is nil, the default value is used.
-
-=== Methods:
-
---- Zlib::Inflate#inflate(string)
-
-    Inputs ((|string|)) into the inflate stream and returns
-    the output from the stream. Calling this method,
-    both input and output buffer of the stream are flushed.
-    If ((|string|)) is nil, this method finishes the stream,
-    just like ((<Zlib::ZStream#finish>)).
-
-    Raises a ((<Zlib::NeedDict>)) exception if a preset
-    dictionary is needed to decompress. Set the dictionary
-    by ((<Zlib::Inflate#set_dictionary>)) and then call
-    this method again with an empty string.
-
---- Zlib::Inflate#<< string
-
-    Inputs ((|string|)) into the inflate stream just like
-    ((<Zlib::Inflate#inflate>)), but returns Zlib::Inflate object
-    itself. The output from the stream is preserved in output
-    buffer.
-
---- Zlib::Inflate#finish
-
-    Finishes the inflate stream and returns the garbage
-    following the compressed data. Raises an exception
-    if the stream is not finished
-    (i.e. ((<Zlib::ZStream#finished?>)) doesn't returns true).
-
-    The inflate stream finishes itself as soon as it meets
-    the end code of the compressed data, you need not to call
-    this method explicitly. However, this method is useful
-    for checking whether the data is correctly ended or not.
-
---- Zlib::Inflate#set_dictionary(string)
-
-    Sets the preset dictionary and returns ((|string|))
-    This method is available just only after a ((<Zlib::NeedDict>))
-    exception was raised. See zlib.h for details.
-
---- Zlib::Inflate#sync(string)
-
-    Inputs ((|string|)) into the end of input buffer and
-    skips data until a full flush point can be found.
-    If the point is found in the buffer, this method flushes
-    the buffer and returns false. Otherwise it returns true
-    and the following data of full flush point is preserved
-    in the buffer.
-
---- Zlib::Inflate#sync_point?
-
-    What is this?
-
-
-== Zlib::GzipFile
-
-The abstruct class for handling a gzip formatted compressed file.
-The operations are defined in the subclasses,
-((<Zlib::GzipReader>)) for reading, and ((<Zlib::GzipWriter>))
-for writing.
-
-GzipReader should be used with associating an instance of IO class
-(or an object which has the same methods as IO has).
-
-=== SuperClass:
-
-* Object
-
-=== Class Methods:
-
---- Zlib::GzipFile.new(args...)
-
-    See ((<Zlib::GzipReader.new>)) and ((<Zlib::GzipWriter.new>)).
-
---- Zlib::GzipFile.wrap(args...) {|gz| ... }
-
-    See ((<Zlib::GzipReader.wrap>)) and ((<Zlib::GzipWriter.wrap>)).
-
---- Zlib::GzipFile.open(args...) {|gz| ... }
-
-    See ((<Zlib::GzipReader.open>)) and ((<Zlib::GzipWriter.open>)).
-
-=== Methods:
-
---- Zlib::GzipFile#closed?
---- Zlib::GzipFile#to_io
-
-    Same as IO.
-
---- Zlib::GzipFile#close
-
-    Closes the GzipFile object. This method calls close method
-    of the associated IO object. Returns the associated IO object.
-
---- Zlib::GzipFile#finish
-
-    Closes the GzipFile object. Unlike ((<Zlib::GzipFile#close>)),
-    this method ((*never*)) calls close method of the associated IO
-    object. Returns the associated IO object.
-
---- Zlib::GzipFile#crc
-
-    Returns CRC value of the uncompressed data.
-
---- Zlib::GzipFile#level
-
-    Returns compression level.
-
---- Zlib::GzipFile#mtime
-
-    Returns last modification time recorded in the gzip
-    file header.
-
---- Zlib::GzipFile#os_code
-
-    Returns OS code number recorded in the gzip file header.
-
---- Zlib::GzipFile#orig_name
-
-    Returns original filename recorded in the gzip file header,
-    or nil if original filename is not present.
-
---- Zlib::GzipFile#comment
-
-    Returns comments recorded in the gzip file header, or
-    nil if the comments is not present.
-
---- Zlib::GzipFile#sync
---- Zlib::GzipFile#sync= flag
-
-    Same as IO. If ((|flag|)) is true, the associated IO object
-    must respond to flush method. While `sync' mode is true,
-    the compression ratio decreases sharply.
-
-
-== Zlib::GzipFile::Error
-
-The superclass for all exceptions raised during processing a gzip
-file.
-
-The following exceptions are defined as subclasses of
-Zlib::GzipFile::Error.
-
-: Zlib::GzipFile::NoFooter
-
-    Raised when gzip file footer has not found.
-
-: Zlib::GzipFile::CRCError
-
-    Raised when the CRC checksum recorded in gzip file footer
-    is not equivalent to CRC checksum of the actually
-    uncompressed data.
-
-: Zlib::GzipFile::LengthError
-
-    Raised when the data length recorded in gzip file footer
-    is not equivalent to length of the actually uncompressed data.
-
-=== SuperClass:
-
-* ((<Zlib::Error>))
-
-
-== Zlib::GzipReader
-
-The class for reading a gzipped file. GzipReader should be used
-with associating an instance of IO class (or an object which has
-the same methods as IO has).
-
-    Zlib::GzipReader.open('hoge.gz') {|gz|
-      print gz.read
-    }
-
-    f = File.open('hoge.gz')
-    gz = Zlib::GzipReader.new(f)
-    print gz.read
-    gz.close
-
-=== SuperClass:
-
-* ((<Zlib::GzipFile>))
-
-=== Included Modules:
-
-* Enumerable
-
-=== Class Methods:
-
---- Zlib::GzipReader.new(io)
-
-    Creates a GzipReader object associated with ((|io|)).
-    The GzipReader object reads gzipped data from ((|io|)),
-    and parses/decompresses them. At least, ((|io|)) must have
-    read method that behaves same as read method in IO class.
-
-    If the gzip file header is incorrect, raises an
-    ((<Zlib::GzipFile::Error>)) exception.
-
---- Zlib::GzipReader.wrap(io) {|gz| ... }
-
-    Creates a GzipReader object associated with ((|io|)), and
-    executes the block with the newly created GzipReader object,
-    just like File::open. The GzipReader object will be closed
-    automatically after executing the block. If you want to keep
-    the associated IO object opening, you may call
-    ((<Zlib::GzipFile#finish>)) method in the block.
-
---- Zlib::GzipReader.open(filename)
---- Zlib::GzipReader.open(filename) {|gz| ... }
-
-    Opens a file specified by ((|filename|)) as a gzipped file,
-    and returns a GzipReader object associated with that file.
-    Further details of this method are same as
-    ((<Zlib::GzipReader.new>)) and ((<ZLib::GzipReader.wrap>)).
-
-=== �᥽�å�:
-
---- Zlib::GzipReader#eof
---- Zlib::GzipReader#eof?
-
-    Returns true if the object reaches the end of compressed data.
-    Note that eof? does ((*not*)) return true when reaches the
-    end of ((*file*)).
-
---- Zlib::GzipReader#pos
---- Zlib::GzipReader#tell
-
-    Returns the total bytes of data decompressed until now.
-    Not that it does ((*not*)) the position of file pointer.
-
---- Zlib::GzipReader#each([rs])
---- Zlib::GzipReader#each_line([rs])
---- Zlib::GzipReader#each_byte([rs])
---- Zlib::GzipReader#gets([rs])
---- Zlib::GzipReader#getc
---- Zlib::GzipReader#lineno
---- Zlib::GzipReader#lineno=
---- Zlib::GzipReader#read([length])
---- Zlib::GzipReader#readchar
---- Zlib::GzipReader#readline([rs])
---- Zlib::GzipReader#readlines([rs])
---- Zlib::GzipReader#ungetc(char)
-
-    Same as IO, but raises ((<Zlib::Error>)) or
-    ((<Zlib::GzipFile::Error>)) exception if an error was found
-    in the gzip file.
-
-    Be careful of the footer of gzip file. A gzip file has
-    the checksum of pre-compressed data in its footer.
-    GzipReader checks all uncompressed data against that checksum
-    at the following cases, and if failed, raises
-    ((<Zlib::GzipFile::NoFooter>)), ((<Zlib::GzipFile::CRCError>)),
-    or ((<Zlib::GzipFile::LengthError>)) exception.
-
-    * When an reading request is received beyond the end of file
-      (the end of compressed data).
-      That is, when ((<Zlib::GzipReader#read>)),
-      ((<Zlib::GzipReader#gets>)), or some other methods for reading
-      returns nil.
-
-    * When ((<Zlib::GzipFile#close>)) method is called after
-      the object reaches the end of file.
-
-    * When ((<Zlib::GzipReader#unused>)) method is called after
-      the object reaches the end of file.
-
---- Zlib::GzipReader#rewind
-
-    Resets the position of the file pointer to the point
-    created the GzipReader object.
-    The associated IO object need to respond to seek method.
-
---- Zlib::GzipReader#unused
-
-    Returns the rest of the data which had read for parsing gzip
-    format, or nil if the whole gzip file is not parsed yet.
-
-
-== Zlib::GzipWriter
-
-The class for writing a gzipped file. GzipWriter should be used
-with associate with an instance of IO class (or an object which
-has the same methods as IO has).
-
-    Zlib::GzipWriter.open('hoge.gz') {|gz|
-      gz.write 'jugemu jugemu gokou no surikire...'
-    }
-
-    f = File.open('hoge.gz', 'w')
-    gz = Zlib::GzipWriter.new(f)
-    gz.write 'jugemu jugemu gokou no surikire...'
-    gz.close
-
-NOTE: Due to the limitation in finalizer of Ruby, you must close
-explicitly GzipWriter object by ((<Zlib::GzipWriter#close>)) etc.
-Otherwise, GzipWriter should be not able to write gzip footer and
-generate broken gzip file.
-
-=== SuperClass:
-
-* ((<Zlib::GzipFile>))
-
-=== Class Methods:
-
---- Zlib::GzipWriter.new(io[, level[, strategy]])
-
-    Creates a GzipWriter object associated with ((|io|)).
-    ((|level|)) and ((|strategy|)) should be same as the
-    arguments of ((<Zlib::Deflate.new>)). The GzipWriter object
-    writes gzipped data to ((|io|)). At least, ((|io|)) must
-    respond to write method that behaves same as write method
-    in IO class.
-
---- Zlib::GzipWriter.wrap(io[, level[, strategy]]) {|gz| ... }
-
-    Creates a GzipWriter object associated with ((|io|)), and
-    executes the block with the newly created GzipWriter object,
-    just like File::open. The GzipWriter object will be closed
-    automatically after executing the block. If you want to keep
-    the associated IO object opening, you may call
-    ((<Zlib::GzipFile#finish>)) method in the block.
-
---- Zlib::GzipWriter.open(filename[, level[, strategy]])
---- Zlib::GzipWriter.open(filename[, level[, strategy]]) {|gz| ... }
-
-    Opens a file specified by ((|filename|)) for writing
-    gzip compressed data, and returns a GzipWriter object
-    associated with that file. Further details of this method
-    are same as ((<Zlib::GzipWriter.new>)) and
-    ((<Zlib::GzipWriter#wrap>)).
-
-
-=== Methods:
-
---- Zlib::GzipWriter#close
---- Zlib::GzipWriter#finish
-
-    Closes the GzipFile object. This method calls close method
-    of the associated IO object. Returns the associated IO object.
-    See ((<Zlib::GzipFile#close>)) and ((<Zlib::GzipFile#finish>))
-    for the difference between close and finish.
-
-    ((*NOTE: Due to the limitation in finalizer of Ruby, you must
-    close GzipWriter object explicitly. Otherwise, GzipWriter
-    should be not able to write gzip footer and generate broken
-    gzip file.*))
-
---- Zlib::GzipWriter#pos
---- Zlib::GzipWriter#tell
-
-    Returns the total bytes of data compressed until now.
-    Note that it does ((*not*)) the position of file pointer.
-
---- Zlib::GzipWriter#<< str
---- Zlib::GzipWriter#putc(ch)
---- Zlib::GzipWriter#puts(obj...)
---- Zlib::GzipWriter#print(arg...)
---- Zlib::GzipWriter#printf(format, arg...)
---- Zlib::GzipWriter#write(str)
-
-    Same as IO.
-
---- Zlib::GzipWriter#flush([flush])
-
-    Flushes all the internal buffers of the GzipWriter object.
-    The meaning of ((|flush|)) is same as one of the argument of
-    ((<Zlib::Deflate#deflate>)).
-    ((<Zlib::SYNC_FLUSH>)) is used if ((|flush|)) is omitted.
-    It is no use giving ((|flush|)) ((<Zlib::NO_FLUSH>)).
-
---- Zlib::GzipWriter#mtime= time
-
-    Sets last modification time to be stored in the gzip file
-    header. ((<Zlib::GzipFile::Error>)) exception will be raised
-    if this method is called after writing method (like
-    ((<Zlib::GzipWriter#write>))) was called.
-
---- Zlib::GzipWriter#orig_name= filename
-
-    Sets original filename to be stored in the gzip file header.
-    ((<Zlib::GzipFile::Error>)) exception will be raised
-    if this method is called after writing method (like
-    ((<Zlib::GzipWriter#write>))) was called.
-
---- Zlib::GzipWriter#comment= string
-
-    Sets comments to be stored in the gzip file header.
-    ((<Zlib::GzipFile::Error>)) exception will be raised
-    if this method is called after writing method (like
-    ((<Zlib::GzipWriter#write>))) was called.
-
-
-== Changes from 0.5 to 0.6
-
-* New methods:
-
-  * ((<Zlib::GzipFile.wrap>))
-  * ((<Zlib::GzipFile#finish>))
-
-* New constants:
-
-  * ((<Zlib::ZLIB_VERSION>))
-  * ((<Zlib::OS_VMCMS>))
-  * ((<Zlib::OS_ZSYSTEM>))
-  * ((<Zlib::OS_CPM>))
-  * ((<Zlib::OS_QDOS>))
-  * ((<Zlib::OS_RISCOS>))
-  * ((<Zlib::OS_UNKNOWN>))
-
-* Changed methods:
-
-  * ((<Zlib::GzipFile.new>)) now takes no block. Use
-    ((<Zlib::GzipFile.wrap>)) instead.
-
-  * ((<Zlib::GzipFile#close>)) now takes no argument. Use
-    ((<Zlib::GzipFile#finish>)) instead.
-
-* Renamed methods:
-
-  * Zlib.version is renamed to ((<Zlib.zlib_version>)).
-
-* Changed constants:
-
-  * ((<Zlib::VERSION>)) indicates the version of Ruby/zlib.
-    The zlib.h version is now in ((<Zlib::ZLIB_VERSION>)).
-
-* Backward compatibility:
-
-  * For backward compatibility for 0.5, the obsoleted methods and
-    arguments are still available.
-
-  * Obsoleted classes, methods, and constants for backward
-    compatibility for 0.4 or earlier are removed.
-
-== Changes from 0.4 to 0.5
-
-Almost all the code are rewritten.
-I hope all changes are enumerated below :-)
-
-* The names of almost classes and some methods are changed.
-  All classes and constants are now defined under module
-  ((<Zlib>)). The obsoleted names are also available for backward
-  compatibility.
-
-  * Classes
-
-    * Deflate -> ((<Zlib::Deflate>))
-    * Inflate -> ((<Zlib::Inflate>))
-    * Zlib::Gzip -> ((<Zlib::GzipFile>))
-    * GzipReader -> ((<Zlib::GzipReader>))
-    * GzipWriter -> ((<Zlib::GzipWriter>))
-    * Zlib::Gzip::Error -> ((<Zlib::GzipFile::Error>))
-    * Zlib::GzipReader::NoFooter -> ((<Zlib::GzipFile::NoFooter>))
-    * Zlib::GzipReader::CRCError -> ((<Zlib::GzipFile::CRCError>))
-    * Zlib::GzipReader::LengthError -> ((<Zlib::GzipFile::LengthError>))
-
-  * Constants
-
-    * Zlib::ZStream::BINARY -> ((<Zlib::BINARY>))
-    * Zlib::ZStream::ASCII -> ((<Zlib::ASCII>))
-    * Zlib::ZStream::UNKNOWN -> ((<Zlib::UNKNOWN>))
-    * Zlib::Deflate::NO_COMPRESSION -> ((<Zlib::NO_COMPRESSION>))
-    * Zlib::Deflate::BEST_SPEED -> ((<Zlib::BEST_SPEED>))
-    * Zlib::Deflate::BEST_COMPRESSION -> ((<Zlib::BEST_COMPRESSION>))
-    * Zlib::Deflate::DEFAULT_COMPRESSION -> ((<Zlib::DEFAULT_COMPRESSION>))
-    * Zlib::Deflate::FILTERED -> ((<Zlib::FILTERED>))
-    * Zlib::Deflate::HUFFMAN_ONLY -> ((<Zlib::HUFFMAN_ONLY>))
-    * Zlib::Deflate::DEFAULT_STRATEGY -> ((<Zlib::DEFAULT_STRATEGY>))
-    * Zlib::Deflate::MAX_WBITS -> ((<Zlib::MAX_WBITS>))
-    * Zlib::Deflate::DEF_MEM_LEVEL -> ((<Zlib::DEF_MEM_LEVEL>))
-    * Zlib::Deflate::MAX_MEM_LEVEL -> ((<Zlib::MAX_MEM_LEVEL>))
-    * Zlib::Deflate::NO_FLUSH -> ((<Zlib::NO_FLUSH>))
-    * Zlib::Deflate::SYNC_FLUSH -> ((<Zlib::SYNC_FLUSH>))
-    * Zlib::Deflate::FULL_FLUSH -> ((<Zlib::FULL_FLUSH>))
-    * Zlib::Inflate::MAX_WBITS -> ((<Zlib::MAX_WBITS>))
-    * Zlib::GzipReader::OS_* -> ((<Zlib::OS_*|Zlib::OS_CODE>))
-
-  * Methods
-
-    * Zlib::ZStream#flush_out -> ((<Zlib::ZStream#flush_next_out>))
-
-* Made buffer for input (next_in).
-
-* ((<Zlib::GzipReader#unused>)) returns nil after closing.
-
-* Now you are up to call ((<Zlib::GzipWriter#close>)) explicitly
-to avoid segv in finalizer.
-((<[ruby-dev:11915]|URL:http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-dev/11915>))
-
-* divided initialize from new.
-
-* remove sanity checks for arguments for deflateInit2 and
-  inflateInit2.
-
-* adapted the behavior of ((<Zlib::GzipWriter#puts>)) to Ruby-1.7.
-
-* Made all functions static.
-
-
-=end
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
deleted file mode 100644
index bf3349a65d..0000000000
--- a/ext/zlib/extconf.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# extconf.rb
-#
-# $Id$
-#
-
-require 'mkmf'
-require 'rbconfig'
-
-dir_config 'zlib'
-
-
-if %w'z libz zlib'.find {|z| have_library(z, 'deflateReset')} and
-    have_header('zlib.h') then
-
-  defines = []
-
-  message 'checking for kind of operating system... '
-  os_code = with_config('os-code') ||
-    case RUBY_PLATFORM.split('-',2)[1]
-    when 'amigaos' then
-      os_code = 'AMIGA'
-    when /\Aos2[\-_]emx\z/ then
-      os_code = 'OS2'
-    when 'mswin32', 'mingw32', 'bccwin32' then
-      # NOTE: cygwin should be regarded as Unix.
-      os_code = 'WIN32'
-    else
-      os_code = 'UNIX'
-    end
-  os_code = 'OS_' + os_code.upcase
-
-  OS_NAMES = {
-    'OS_MSDOS'   => 'MS-DOS',
-    'OS_AMIGA'   => 'Amiga',
-    'OS_VMS'     => 'VMS',
-    'OS_UNIX'    => 'Unix',
-    'OS_ATARI'   => 'Atari',
-    'OS_OS2'     => 'OS/2',
-    'OS_MACOS'   => 'MacOS',
-    'OS_TOPS20'  => 'TOPS20',
-    'OS_WIN32'   => 'Win32',
-    'OS_VMCMS'   => 'VM/CMS',
-    'OS_ZSYSTEM' => 'Z-System',
-    'OS_CPM'     => 'CP/M',
-    'OS_QDOS'    => 'QDOS',
-    'OS_RISCOS'  => 'RISCOS',
-    'OS_UNKNOWN' => 'Unknown',
-  }
-  unless OS_NAMES.key? os_code then
-    puts "invalid OS_CODE `#{os_code}'"
-    exit
-  end
-  message "#{OS_NAMES[os_code]}\n"
-  defines << "OS_CODE=#{os_code}"
-
-  defines = defines.collect{|d|' -D'+d}.join
-  if $CPPFLAGS then
-    $CPPFLAGS += defines
-  else
-    $CFLAGS += defines
-  end
-
-  create_makefile('zlib')
-
-end
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
deleted file mode 100644
index e1aebe446f..0000000000
--- a/ext/zlib/zlib.c
+++ /dev/null
@@ -1,2773 +0,0 @@
-/*
- * zlib.c - An interface for zlib.
- *
- *   Copyright (C) UENO Katsuhiro 2000-2003
- *
- * $Id$
- */
-
-#include <ruby.h>
-#include <zlib.h>
-#include <time.h>
-
-#define RUBY_ZLIB_VERSION  "0.6.0"
-
-
-#define OBJ_IS_FREED(val)  (RBASIC(val)->flags == 0)
-
-#ifndef GZIP_SUPPORT
-#define GZIP_SUPPORT  1
-#endif
-
-/* from zutil.h */
-#ifndef DEF_MEM_LEVEL
-#if MAX_MEM_LEVEL >= 8
-#define DEF_MEM_LEVEL  8
-#else
-#define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-#endif
-
-
-
-/*--------- Prototypes --------*/
-
-static NORETURN(void raise_zlib_error _((int, const char *)));
-static VALUE rb_zlib_version _((VALUE));
-static VALUE do_checksum _((int, VALUE*, uLong (*) _((uLong, const Bytef*, uInt))));
-static VALUE rb_zlib_adler32 _((int, VALUE*, VALUE));
-static VALUE rb_zlib_crc32 _((int, VALUE*, VALUE));
-static VALUE rb_zlib_crc_table _((VALUE));
-static voidpf zlib_mem_alloc _((voidpf, uInt, uInt));
-static void zlib_mem_free _((voidpf, voidpf));
-
-struct zstream;
-struct zstream_funcs;
-static void zstream_init _((struct zstream*, const struct zstream_funcs *));
-static void zstream_expand_buffer _((struct zstream*));
-static void zstream_expand_buffer_into _((struct zstream*, int));
-static void zstream_append_buffer _((struct zstream*, const char*, int));
-static VALUE zstream_detach_buffer _((struct zstream*));
-static VALUE zstream_shift_buffer _((struct zstream*, int));
-static void zstream_buffer_ungetc _((struct zstream*, int));
-static void zstream_append_input _((struct zstream*, const char*, unsigned int));
-static void zstream_discard_input _((struct zstream*, unsigned int));
-static void zstream_reset_input _((struct zstream*));
-static void zstream_passthrough_input _((struct zstream*));
-static VALUE zstream_detach_input _((struct zstream*));
-static void zstream_reset _((struct zstream*));
-static void zstream_end _((struct zstream*));
-static void zstream_run _((struct zstream*, Bytef*, uInt, int));
-static VALUE zstream_sync _((struct zstream*, Bytef*, uInt));
-static void zstream_mark _((struct zstream*));
-static void zstream_free _((struct zstream*));
-static VALUE zstream_new _((VALUE, const struct zstream_funcs*));
-static struct zstream *get_zstream _((VALUE));
-
-static VALUE rb_zstream_end _((VALUE));
-static VALUE rb_zstream_reset _((VALUE));
-static VALUE rb_zstream_finish _((VALUE));
-static VALUE rb_zstream_flush_next_in _((VALUE));
-static VALUE rb_zstream_flush_next_out _((VALUE));
-static VALUE rb_zstream_avail_out _((VALUE));
-static VALUE rb_zstream_set_avail_out _((VALUE, VALUE));
-static VALUE rb_zstream_avail_in _((VALUE));
-static VALUE rb_zstream_total_in _((VALUE));
-static VALUE rb_zstream_total_out _((VALUE));
-static VALUE rb_zstream_data_type _((VALUE));
-static VALUE rb_zstream_adler _((VALUE));
-static VALUE rb_zstream_finished_p _((VALUE));
-static VALUE rb_zstream_closed_p _((VALUE));
-
-static VALUE rb_deflate_s_allocate _((VALUE));
-static VALUE rb_deflate_initialize _((int, VALUE*, VALUE));
-static VALUE rb_deflate_clone _((VALUE));
-static VALUE rb_deflate_s_deflate _((int, VALUE*, VALUE));
-static void do_deflate _((struct zstream*, VALUE, int));
-static VALUE rb_deflate_deflate _((int, VALUE*, VALUE));
-static VALUE rb_deflate_addstr _((VALUE, VALUE));
-static VALUE rb_deflate_flush _((int, VALUE*, VALUE));
-static VALUE rb_deflate_params _((VALUE, VALUE, VALUE));
-static VALUE rb_deflate_set_dictionary _((VALUE, VALUE));
-
-static VALUE rb_inflate_s_allocate _((VALUE));
-static VALUE rb_inflate_initialize _((int, VALUE*, VALUE));
-static VALUE rb_inflate_s_inflate _((VALUE, VALUE));
-static void do_inflate _((struct zstream*, VALUE));
-static VALUE rb_inflate_inflate _((VALUE, VALUE));
-static VALUE rb_inflate_addstr _((VALUE, VALUE));
-static VALUE rb_inflate_sync _((VALUE, VALUE));
-static VALUE rb_inflate_sync_point_p _((VALUE));
-static VALUE rb_inflate_set_dictionary _((VALUE, VALUE));
-
-#if GZIP_SUPPORT
-struct gzfile;
-static void gzfile_mark _((struct gzfile*));
-static void gzfile_free _((struct gzfile*));
-static VALUE gzfile_new _((VALUE, const struct zstream_funcs*, void (*) _((struct gzfile*))));
-static void gzfile_reset _((struct gzfile*));
-static void gzfile_close _((struct gzfile*, int));
-static void gzfile_write_raw _((struct gzfile*));
-static VALUE gzfile_read_raw _((struct gzfile*));
-static int gzfile_read_raw_ensure _((struct gzfile*, int));
-static char *gzfile_read_raw_until_zero _((struct gzfile*, long));
-static unsigned int gzfile_get16 _((const unsigned char*));
-static unsigned long gzfile_get32 _((const unsigned char*));
-static void gzfile_set32 _((unsigned long n, unsigned char*));
-static void gzfile_make_header _((struct gzfile*));
-static void gzfile_make_footer _((struct gzfile*));
-static void gzfile_read_header _((struct gzfile*));
-static void gzfile_check_footer _((struct gzfile*));
-static void gzfile_write _((struct gzfile*, Bytef*, uInt));
-static long gzfile_read_more _((struct gzfile*));
-static VALUE gzfile_read _((struct gzfile*, int));
-static VALUE gzfile_read_all _((struct gzfile*));
-static void gzfile_ungetc _((struct gzfile*, int));
-static VALUE gzfile_finalize _((VALUE));
-static void gzfile_writer_end _((struct gzfile*));
-static void gzfile_reader_end _((struct gzfile*));
-static void gzfile_reader_rewind _((struct gzfile*));
-static VALUE gzfile_reader_get_unused _((struct gzfile*));
-static struct gzfile *get_gzfile _((VALUE));
-static VALUE gzfile_ensure_close _((VALUE));
-static VALUE rb_gzfile_s_wrap _((int, VALUE*, VALUE));
-static VALUE gzfile_s_open _((int, VALUE*, VALUE, const char*));
-
-static VALUE rb_gzfile_to_io _((VALUE));
-static VALUE rb_gzfile_crc _((VALUE));
-static VALUE rb_gzfile_mtime _((VALUE));
-static VALUE rb_gzfile_level _((VALUE));
-static VALUE rb_gzfile_os_code _((VALUE));
-static VALUE rb_gzfile_orig_name _((VALUE));
-static VALUE rb_gzfile_comment _((VALUE));
-static VALUE rb_gzfile_lineno _((VALUE));
-static VALUE rb_gzfile_set_lineno _((VALUE, VALUE));
-static VALUE rb_gzfile_set_mtime _((VALUE, VALUE));
-static VALUE rb_gzfile_set_orig_name _((VALUE, VALUE));
-static VALUE rb_gzfile_set_comment _((VALUE, VALUE));
-static VALUE rb_gzfile_close _((VALUE));
-static VALUE rb_gzfile_finish _((VALUE));
-static VALUE rb_gzfile_closed_p _((VALUE));
-static VALUE rb_gzfile_eof_p _((VALUE));
-static VALUE rb_gzfile_sync _((VALUE));
-static VALUE rb_gzfile_set_sync _((VALUE, VALUE));
-static VALUE rb_gzfile_total_in _((VALUE));
-static VALUE rb_gzfile_total_out _((VALUE));
-
-static VALUE rb_gzwriter_s_allocate _((VALUE));
-static VALUE rb_gzwriter_s_open _((int, VALUE*, VALUE));
-static VALUE rb_gzwriter_initialize _((int, VALUE*, VALUE));
-static VALUE rb_gzwriter_flush _((int, VALUE*, VALUE));
-static VALUE rb_gzwriter_write _((VALUE, VALUE));
-static VALUE rb_gzwriter_putc _((VALUE, VALUE));
-
-static VALUE rb_gzreader_s_allocate _((VALUE));
-static VALUE rb_gzreader_s_open _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_initialize _((VALUE, VALUE));
-static VALUE rb_gzreader_rewind _((VALUE));
-static VALUE rb_gzreader_unused _((VALUE));
-static VALUE rb_gzreader_read _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_getc _((VALUE));
-static VALUE rb_gzreader_readchar _((VALUE));
-static VALUE rb_gzreader_each_byte _((VALUE));
-static VALUE rb_gzreader_ungetc _((VALUE, VALUE));
-static void gzreader_skip_linebreaks _((struct gzfile*));
-static VALUE gzreader_gets _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_gets _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_readline _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_each _((int, VALUE*, VALUE));
-static VALUE rb_gzreader_readlines _((int, VALUE*, VALUE));
-#endif /* GZIP_SUPPORT */
-
-
-void Init_zlib _((void));
-
-
-
-/*--------- Exceptions --------*/
-
-static VALUE cZError, cStreamEnd, cNeedDict;
-static VALUE cStreamError, cDataError, cMemError, cBufError, cVersionError;
-
-static void
-raise_zlib_error(err, msg)
-    int err;
-    const char *msg;
-{
-    VALUE exc;
-
-    if (!msg) {
-	msg = zError(err);
-    }
-
-    switch(err) {
-      case Z_STREAM_END:
-	exc = rb_exc_new2(cStreamEnd, msg);
-	break;
-      case Z_NEED_DICT:
-	exc = rb_exc_new2(cNeedDict, msg);
-	break;
-      case Z_STREAM_ERROR:
-	exc = rb_exc_new2(cStreamError, msg);
-	break;
-      case Z_DATA_ERROR:
-	exc = rb_exc_new2(cDataError, msg);
-	break;
-      case Z_BUF_ERROR:
-	exc = rb_exc_new2(cBufError, msg);
-	break;
-      case Z_VERSION_ERROR:
-	exc = rb_exc_new2(cVersionError, msg);
-	break;
-      case Z_MEM_ERROR:
-	exc = rb_exc_new2(cMemError, msg);
-	break;
-      case Z_ERRNO:
-	rb_sys_fail(msg);
-	/* no return */
-      default:
-      {
-	  char buf[BUFSIZ];
-	  snprintf(buf, BUFSIZ, "unknown zlib error %d: %s", err, msg);
-	  exc = rb_exc_new2(cZError, buf);
-      }
-    }
-
-    rb_exc_raise(exc);
-}
-
-
-
-/*-------- module Zlib --------*/
-
-static VALUE
-rb_zlib_version(klass)
-    VALUE klass;
-{
-    VALUE str;
-
-    str = rb_str_new2(zlibVersion());
-    OBJ_TAINT(str);  /* for safe */
-    return str;
-}
-
-static VALUE
-do_checksum(argc, argv, func)
-    int argc;
-    VALUE *argv;
-    uLong (*func) _((uLong, const Bytef *, uInt));
-{
-    VALUE str, vsum;
-    unsigned long sum;
-
-    rb_scan_args(argc, argv, "02", &str, &vsum);
-
-    if (!NIL_P(vsum)) {
-	sum = NUM2ULONG(vsum);
-    }
-    else if (NIL_P(str)) {
-	sum = 0;
-    }
-    else {
-	sum = func(0, Z_NULL, 0);
-    }
-
-    if (NIL_P(str)) {
-	sum = func(sum, Z_NULL, 0);
-    }
-    else {
-	StringValue(str);
-	sum = func(sum, RSTRING(str)->ptr, RSTRING(str)->len);
-    }
-    return rb_uint2inum(sum);
-}
-
-static VALUE
-rb_zlib_adler32(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    return do_checksum(argc, argv, adler32);
-}
-
-static VALUE
-rb_zlib_crc32(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    return do_checksum(argc, argv, crc32);
-}
-
-static VALUE
-rb_zlib_crc_table(obj)
-    VALUE obj;
-{
-    const unsigned long *crctbl;
-    VALUE dst;
-    int i;
-
-    crctbl = get_crc_table();
-    dst = rb_ary_new2(256);
-
-    for (i = 0; i < 256; i++) {
-	rb_ary_push(dst, rb_uint2inum(crctbl[i]));
-    }
-    return dst;
-}
-
-
-
-/*-------- zstream - internal APIs --------*/
-
-struct zstream {
-    unsigned long flags;
-    VALUE buf;
-    long buf_filled;
-    VALUE input;
-    z_stream stream;
-    const struct zstream_funcs {
-	int (*reset) _((z_streamp));
-	int (*end) _((z_streamp));
-	int (*run) _((z_streamp, int));
-    } *func;
-};
-
-#define ZSTREAM_FLAG_READY      0x1
-#define ZSTREAM_FLAG_IN_STREAM  0x2
-#define ZSTREAM_FLAG_FINISHED   0x4
-#define ZSTREAM_FLAG_FINALIZE   0x8
-#define ZSTREAM_FLAG_UNUSED     0x10
-
-#define ZSTREAM_READY(z)       ((z)->flags |= ZSTREAM_FLAG_READY)
-#define ZSTREAM_IS_READY(z)    ((z)->flags & ZSTREAM_FLAG_READY)
-#define ZSTREAM_IS_FINISHED(z) ((z)->flags & ZSTREAM_FLAG_FINISHED)
-#define ZSTREAM_IS_FINALIZE(z) ((z)->flags & ZSTREAM_FLAG_FINALIZE)
-
-/* I think that more better value should be found,
-   but I gave up finding it. B) */
-#define ZSTREAM_INITIAL_BUFSIZE       1024
-#define ZSTREAM_AVAIL_OUT_STEP_MAX   16384
-#define ZSTREAM_AVAIL_OUT_STEP_MIN    2048
-
-static const struct zstream_funcs deflate_funcs = {
-    deflateReset, deflateEnd, deflate,
-};
-
-static const struct zstream_funcs inflate_funcs = {
-    inflateReset, inflateEnd, inflate,
-};
-
-
-static voidpf
-zlib_mem_alloc(opaque, items, size)
-    voidpf opaque;
-    uInt items, size;
-{
-    return xmalloc(items * size);
-}
-
-static void
-zlib_mem_free(opaque, address)
-    voidpf opaque, address;
-{
-    free(address);
-}
-
-static void
-zstream_init(z, func)
-    struct zstream *z;
-    const struct zstream_funcs *func;
-{
-    z->flags = 0;
-    z->buf = Qnil;
-    z->buf_filled = 0;
-    z->input = Qnil;
-    z->stream.zalloc = zlib_mem_alloc;
-    z->stream.zfree = zlib_mem_free;
-    z->stream.opaque = Z_NULL;
-    z->stream.msg = Z_NULL;
-    z->stream.next_in = Z_NULL;
-    z->stream.avail_in = 0;
-    z->stream.next_out = Z_NULL;
-    z->stream.avail_out = 0;
-    z->func = func;
-}
-
-#define zstream_init_deflate(z)   zstream_init((z), &deflate_funcs)
-#define zstream_init_inflate(z)   zstream_init((z), &inflate_funcs)
-
-static void
-zstream_expand_buffer(z)
-    struct zstream *z;
-{
-    long inc;
-
-    if (NIL_P(z->buf)) {
-	    /* I uses rb_str_new here not rb_str_buf_new because
-	       rb_str_buf_new makes a zero-length string. */
-	z->buf = rb_str_new(0, ZSTREAM_INITIAL_BUFSIZE);
-	z->buf_filled = 0;
-	z->stream.next_out = RSTRING(z->buf)->ptr;
-	z->stream.avail_out = ZSTREAM_INITIAL_BUFSIZE;
-	return;
-    }
-
-    if (RSTRING(z->buf)->len - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
-	/* to keep other threads from freezing */
-	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
-    }
-    else {
-	inc = z->buf_filled / 2;
-	if (inc < ZSTREAM_AVAIL_OUT_STEP_MIN) {
-	    inc = ZSTREAM_AVAIL_OUT_STEP_MIN;
-	}
-	rb_str_resize(z->buf, z->buf_filled + inc);
-	z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
-	    inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
-    }
-    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
-}
-
-static void
-zstream_expand_buffer_into(z, size)
-    struct zstream *z;
-    int size;
-{
-    if (NIL_P(z->buf)) {
-	/* I uses rb_str_new here not rb_str_buf_new because
-	   rb_str_buf_new makes a zero-length string. */
-	z->buf = rb_str_new(0, size);
-	z->buf_filled = 0;
-	z->stream.next_out = RSTRING(z->buf)->ptr;
-	z->stream.avail_out = size;
-    }
-    else if (z->stream.avail_out != size) {
-	rb_str_resize(z->buf, z->buf_filled + size);
-	z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
-	z->stream.avail_out = size;
-    }
-}
-
-static void
-zstream_append_buffer(z, src, len)
-    struct zstream *z;
-    const char *src;
-    int len;
-{
-    if (NIL_P(z->buf)) {
-	z->buf = rb_str_buf_new(len);
-	rb_str_buf_cat(z->buf, src, len);
-	z->buf_filled = len;
-	z->stream.next_out = RSTRING(z->buf)->ptr;
-	z->stream.avail_out = 0;
-	return;
-    }
-
-    if (RSTRING(z->buf)->len < z->buf_filled + len) {
-	rb_str_resize(z->buf, z->buf_filled + len);
-	z->stream.avail_out = 0;
-    }
-    else {
-	if (z->stream.avail_out >= len) {
-	    z->stream.avail_out -= len;
-	}
-	else {
-	    z->stream.avail_out = 0;
-	}
-    }
-    memcpy(RSTRING(z->buf)->ptr + z->buf_filled, src, len);
-    z->buf_filled += len;
-    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
-}
-
-#define zstream_append_buffer2(z,v) \
-    zstream_append_buffer((z),RSTRING(v)->ptr,RSTRING(v)->len)
-
-static VALUE
-zstream_detach_buffer(z)
-    struct zstream *z;
-{
-    VALUE dst;
-
-    if (NIL_P(z->buf)) {
-	dst = rb_str_new(0, 0);
-    }
-    else {
-	dst = z->buf;
-	rb_str_resize(dst, z->buf_filled);
-    }
-
-    z->buf = Qnil;
-    z->buf_filled = 0;
-    z->stream.next_out = 0;
-    z->stream.avail_out = 0;
-    return dst;
-}
-
-static VALUE
-zstream_shift_buffer(z, len)
-    struct zstream *z;
-    int len;
-{
-    VALUE dst;
-
-    if (z->buf_filled <= len) {
-	return zstream_detach_buffer(z);
-    }
-
-    dst = rb_str_substr(z->buf, 0, len);
-    z->buf_filled -= len;
-    memmove(RSTRING(z->buf)->ptr, RSTRING(z->buf)->ptr + len,
-	    z->buf_filled);
-    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
-    z->stream.avail_out = RSTRING(z->buf)->len - z->buf_filled;
-    if (z->stream.avail_out > ZSTREAM_AVAIL_OUT_STEP_MAX) {
-	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
-    }
-
-    return dst;
-}
-
-static void
-zstream_buffer_ungetc(z, c)
-    struct zstream *z;
-    int c;
-{
-    if (NIL_P(z->buf) || RSTRING(z->buf)->len - z->buf_filled == 0) {
-	zstream_expand_buffer(z);
-    }
-
-    memmove(RSTRING(z->buf)->ptr + 1, RSTRING(z->buf)->ptr, z->buf_filled);
-    RSTRING(z->buf)->ptr[0] = (char)c;
-    z->buf_filled++;
-    if (z->stream.avail_out > 0) {
-	z->stream.next_out++;
-	z->stream.avail_out--;
-    }
-}
-
-static void
-zstream_append_input(z, src, len)
-    struct zstream *z;
-    const char *src;
-    unsigned int len;
-{
-    if (len <= 0) return;
-
-    if (NIL_P(z->input)) {
-	z->input = rb_str_buf_new(len);
-	rb_str_buf_cat(z->input, src, len);
-    }
-    else {
-	rb_str_buf_cat(z->input, src, len);
-    }
-}
-
-#define zstream_append_input2(z,v)\
-    zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
-
-static void
-zstream_discard_input(z, len)
-    struct zstream *z;
-    unsigned int len;
-{
-    if (NIL_P(z->input) || RSTRING(z->input)->len <= len) {
-	z->input = Qnil;
-    }
-    else {
-	memmove(RSTRING(z->input)->ptr, RSTRING(z->input)->ptr + len,
-		RSTRING(z->input)->len - len);
-	rb_str_resize(z->input, RSTRING(z->input)->len - len);
-    }
-}
-
-static void
-zstream_reset_input(z)
-    struct zstream *z;
-{
-    z->input = Qnil;
-}
-
-static void
-zstream_passthrough_input(z)
-    struct zstream *z;
-{
-    if (!NIL_P(z->input)) {
-	zstream_append_buffer2(z, z->input);
-	z->input = Qnil;
-    }
-}
-
-static VALUE
-zstream_detach_input(z)
-    struct zstream *z;
-{
-    VALUE dst;
-
-    dst = NIL_P(z->input) ? rb_str_new(0, 0) : z->input;
-    z->input = Qnil;
-    return dst;
-}
-
-static void
-zstream_reset(z)
-    struct zstream *z;
-{
-    int err;
-
-    err = z->func->reset(&z->stream);
-    if (err != Z_OK && !ZSTREAM_IS_FINALIZE(z)) {
-	raise_zlib_error(err, z->stream.msg);
-    }
-    z->flags = ZSTREAM_FLAG_READY;
-    z->buf = Qnil;
-    z->buf_filled = 0;
-    z->stream.next_out = 0;
-    z->stream.avail_out = 0;
-    zstream_reset_input(z);
-}
-
-static void
-zstream_end(z)
-    struct zstream *z;
-{
-    int err;
-
-    if (!ZSTREAM_IS_READY(z) && !ZSTREAM_IS_FINALIZE(z)) {
-	if (RTEST(ruby_debug)) {
-	    rb_warning("attempt to close uninitialized zstream; ignored.");
-	}
-	return;
-    }
-    if (z->flags & ZSTREAM_FLAG_IN_STREAM) {
-	if (RTEST(ruby_debug)) {
-	    rb_warning("attempt to close unfinished zstream; reset forced.");
-	}
-	zstream_reset(z);
-    }
-
-    zstream_reset_input(z);
-    err = z->func->end(&z->stream);
-    if (err != Z_OK && !ZSTREAM_IS_FINALIZE(z)) {
-	raise_zlib_error(err, z->stream.msg);
-    }
-    z->flags = 0;
-}
-
-static void
-zstream_run(z, src, len, flush)
-    struct zstream *z;
-    Bytef *src;
-    uInt len;
-    int flush;
-{
-    uInt n;
-    int err;
-
-    if (NIL_P(z->input)) {
-	z->stream.next_in = src;
-	z->stream.avail_in = len;
-    }
-    else {
-	zstream_append_input(z, src, len);
-	z->stream.next_in = RSTRING(z->input)->ptr;
-	z->stream.avail_in = RSTRING(z->input)->len;
-    }
-
-    if (z->stream.avail_out == 0) {
-	zstream_expand_buffer(z);
-    }
-
-    for (;;) {
-	n = z->stream.avail_out;
-	err = z->func->run(&z->stream, flush);
-	z->buf_filled += n - z->stream.avail_out;
-	rb_thread_schedule();
-
-	if (err == Z_STREAM_END) {
-	    z->flags &= ~ZSTREAM_FLAG_IN_STREAM;
-	    z->flags |= ZSTREAM_FLAG_FINISHED;
-	    break;
-	}
-	if (err != Z_OK) {
-	    if (flush != Z_FINISH && err == Z_BUF_ERROR
-		&& z->stream.avail_out > 0) {
-		z->flags |= ZSTREAM_FLAG_IN_STREAM;
-		break;
-	    }
-	    zstream_reset_input(z);
-	    if (z->stream.avail_in > 0) {
-		zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
-	    }
-	    raise_zlib_error(err, z->stream.msg);
-	}
-	if (z->stream.avail_out > 0) {
-	    z->flags |= ZSTREAM_FLAG_IN_STREAM;
-	    break;
-	}
-	zstream_expand_buffer(z);
-    }
-
-    zstream_reset_input(z);
-    if (z->stream.avail_in > 0) {
-	zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
-    }
-}
-
-static VALUE
-zstream_sync(z, src, len)
-    struct zstream *z;
-    Bytef *src;
-    uInt len;
-{
-    VALUE rest;
-    int err;
-
-    if (!NIL_P(z->input)) {
-	z->stream.next_in = RSTRING(z->input)->ptr;
-	z->stream.avail_in = RSTRING(z->input)->len;
-	err = inflateSync(&z->stream);
-	if (err == Z_OK) {
-	    zstream_discard_input(z,
-				  RSTRING(z->input)->len - z->stream.avail_in);
-	    zstream_append_input(z, src, len);
-	    return Qtrue;
-	}
-	zstream_reset_input(z);
-	if (err != Z_DATA_ERROR) {
-	    rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
-	    raise_zlib_error(err, z->stream.msg);
-	}
-    }
-
-    if (len <= 0) return Qfalse;
-
-    z->stream.next_in = src;
-    z->stream.avail_in = len;
-    err = inflateSync(&z->stream);
-    if (err == Z_OK) {
-	zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
-	return Qtrue;
-    }
-    if (err != Z_DATA_ERROR) {
-	rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
-	raise_zlib_error(err, z->stream.msg);
-    }
-    return Qfalse;
-}
-
-static void
-zstream_mark(z)
-    struct zstream *z;
-{
-    rb_gc_mark(z->buf);
-    rb_gc_mark(z->input);
-}
-
-static void
-zstream_free(z)
-    struct zstream *z;
-{
-    z->flags |= ZSTREAM_FLAG_FINALIZE;
-    zstream_end(z);
-    free(z);
-}
-
-static VALUE
-zstream_new(klass, funcs)
-    VALUE klass;
-    const struct zstream_funcs *funcs;
-{
-    VALUE obj;
-    struct zstream *z;
-
-    obj = Data_Make_Struct(klass, struct zstream,
-			   zstream_mark, zstream_free, z);
-    zstream_init(z, funcs);
-    return obj;
-}
-
-#define zstream_deflate_new(klass)  zstream_new((klass), &deflate_funcs)
-#define zstream_inflate_new(klass)  zstream_new((klass), &inflate_funcs)
-
-static struct zstream *
-get_zstream(obj)
-    VALUE obj;
-{
-    struct zstream *z;
-
-    Data_Get_Struct(obj, struct zstream, z);
-    if (!ZSTREAM_IS_READY(z)) {
-	rb_raise(cZError, "stream is not ready");
-    }
-    return z;
-}
-
-
-
-/*-------- class Zlib::ZStream ---------*/
-
-static VALUE
-rb_zstream_end(obj)
-    VALUE obj;
-{
-    zstream_end(get_zstream(obj));
-    return Qnil;
-}
-
-static VALUE
-rb_zstream_reset(obj)
-    VALUE obj;
-{
-    zstream_reset(get_zstream(obj));
-    return Qnil;
-}
-
-static VALUE
-rb_zstream_finish(obj)
-    VALUE obj;
-{
-    struct zstream *z = get_zstream(obj);
-    VALUE dst;
-
-    zstream_run(z, "", 0, Z_FINISH);
-    dst = zstream_detach_buffer(z);
-
-    OBJ_INFECT(dst, obj);
-    return dst;
-}
-
-static VALUE
-rb_zstream_flush_next_in(obj)
-    VALUE obj;
-{
-    struct zstream *z;
-    VALUE dst;
-
-    Data_Get_Struct(obj, struct zstream, z);
-    dst = zstream_detach_input(z);
-    OBJ_INFECT(dst, obj);
-    return dst;
-}
-
-static VALUE
-rb_zstream_flush_next_out(obj)
-    VALUE obj;
-{
-    struct zstream *z;
-    VALUE dst;
-
-    Data_Get_Struct(obj, struct zstream, z);
-    dst = zstream_detach_buffer(z);
-    OBJ_INFECT(dst, obj);
-    return dst;
-}
-
-static VALUE
-rb_zstream_avail_out(obj)
-    VALUE obj;
-{
-    struct zstream *z;
-    Data_Get_Struct(obj, struct zstream, z);
-    return rb_uint2inum(z->stream.avail_out);
-}
-
-static VALUE
-rb_zstream_set_avail_out(obj, size)
-    VALUE obj, size;
-{
-    struct zstream *z = get_zstream(obj);
-
-    Check_Type(size, T_FIXNUM);
-    zstream_expand_buffer_into(z, FIX2INT(size));
-    return size;
-}
-
-static VALUE
-rb_zstream_avail_in(obj)
-    VALUE obj;
-{
-    struct zstream *z;
-    Data_Get_Struct(obj, struct zstream, z);
-    return INT2FIX(NIL_P(z->input) ? 0 : (int)(RSTRING(z->input)->len));
-}
-
-static VALUE
-rb_zstream_total_in(obj)
-    VALUE obj;
-{
-    return rb_uint2inum(get_zstream(obj)->stream.total_in);
-}
-
-static VALUE
-rb_zstream_total_out(obj)
-    VALUE obj;
-{
-    return rb_uint2inum(get_zstream(obj)->stream.total_out);
-}
-
-static VALUE
-rb_zstream_data_type(obj)
-    VALUE obj;
-{
-    return INT2FIX(get_zstream(obj)->stream.data_type);
-}
-
-static VALUE
-rb_zstream_adler(obj)
-    VALUE obj;
-{
-	return rb_uint2inum(get_zstream(obj)->stream.adler);
-}
-
-static VALUE
-rb_zstream_finished_p(obj)
-    VALUE obj;
-{
-    return ZSTREAM_IS_FINISHED(get_zstream(obj)) ? Qtrue : Qfalse;
-}
-
-static VALUE
-rb_zstream_closed_p(obj)
-    VALUE obj;
-{
-    struct zstream *z;
-    Data_Get_Struct(obj, struct zstream, z);
-    return ZSTREAM_IS_READY(z) ? Qfalse : Qtrue;
-}
-
-
-
-/*-------- class Zlib::Deflate --------*/
-
-#define FIXNUMARG(val, ifnil) \
-    (NIL_P((val)) ? (ifnil) \
-    : ((void)Check_Type((val), T_FIXNUM), FIX2INT((val))))
-
-#define ARG_LEVEL(val)     FIXNUMARG((val), Z_DEFAULT_COMPRESSION)
-#define ARG_WBITS(val)     FIXNUMARG((val), MAX_WBITS)
-#define ARG_MEMLEVEL(val)  FIXNUMARG((val), DEF_MEM_LEVEL)
-#define ARG_STRATEGY(val)  FIXNUMARG((val), Z_DEFAULT_STRATEGY)
-#define ARG_FLUSH(val)     FIXNUMARG((val), Z_NO_FLUSH)
-
-
-static VALUE
-rb_deflate_s_allocate(klass)
-    VALUE klass;
-{
-	return zstream_deflate_new(klass);
-}
-
-static VALUE
-rb_deflate_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct zstream *z;
-    VALUE level, wbits, memlevel, strategy;
-    int err;
-
-    rb_scan_args(argc, argv, "04", &level, &wbits, &memlevel, &strategy);
-    Data_Get_Struct(obj, struct zstream, z);
-
-    err = deflateInit2(&z->stream, ARG_LEVEL(level), Z_DEFLATED,
-		       ARG_WBITS(wbits), ARG_MEMLEVEL(memlevel),
-		       ARG_STRATEGY(strategy));
-    if (err != Z_OK) {
-	raise_zlib_error(err, z->stream.msg);
-    }
-    ZSTREAM_READY(z);
-
-    return obj;
-}
-
-static VALUE
-rb_deflate_clone(obj)
-    VALUE obj;
-{
-    struct zstream *z = get_zstream(obj);
-    struct zstream *z2;
-    VALUE clone;
-    int err;
-
-    clone = zstream_deflate_new(rb_class_of(obj));
-    Data_Get_Struct(clone, struct zstream, z2);
-
-    err = deflateCopy(&z2->stream, &z->stream);
-    if (err != Z_OK) {
-	raise_zlib_error(err, 0);
-    }
-
-    z2->flags = z->flags;
-    CLONESETUP(clone, obj);
-    OBJ_INFECT(clone, obj);
-    return clone;
-}
-
-static VALUE
-rb_deflate_s_deflate(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    struct zstream z;
-    VALUE src, level, dst;
-    int err;
-
-    rb_scan_args(argc, argv, "11", &src, &level);
-
-    zstream_init_deflate(&z);
-    err = deflateInit(&z.stream, ARG_LEVEL(level));
-    if (err != Z_OK) {
-	raise_zlib_error(err, z.stream.msg);
-    }
-    ZSTREAM_READY(&z);
-
-    StringValue(src);
-    zstream_run(&z, RSTRING(src)->ptr, RSTRING(src)->len, Z_FINISH);
-    dst = zstream_detach_buffer(&z);
-    zstream_end(&z);
-
-    OBJ_INFECT(dst, src);
-    return dst;
-}
-
-static void
-do_deflate(z, src, flush)
-    struct zstream *z;
-    VALUE src;
-    int flush;
-{
-    if (NIL_P(src)) {
-	zstream_run(z, "", 0, Z_FINISH);
-	return;
-    }
-    StringValue(src);
-    if (flush != Z_NO_FLUSH || RSTRING(src)->len > 0) { /* prevent BUF_ERROR */
-	zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, flush);
-    }
-}
-
-static VALUE
-rb_deflate_deflate(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct zstream *z = get_zstream(obj);
-    VALUE src, flush, dst;
-
-    rb_scan_args(argc, argv, "11", &src, &flush);
-    OBJ_INFECT(obj, src);
-    do_deflate(z, src, ARG_FLUSH(flush));
-    dst = zstream_detach_buffer(z);
-
-    OBJ_INFECT(dst, obj);
-    return dst;
-}
-
-static VALUE
-rb_deflate_addstr(obj, src)
-    VALUE obj, src;
-{
-    OBJ_INFECT(obj, src);
-    do_deflate(get_zstream(obj), src, Z_NO_FLUSH);
-    return obj;
-}
-
-static VALUE
-rb_deflate_flush(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct zstream *z = get_zstream(obj);
-    VALUE v_flush, dst;
-    int flush;
-
-    rb_scan_args(argc, argv, "01", &v_flush);
-    flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
-    if (flush != Z_NO_FLUSH) {  /* prevent Z_BUF_ERROR */
-	zstream_run(z, "", 0, flush);
-    }
-    dst = zstream_detach_buffer(z);
-
-    OBJ_INFECT(dst, obj);
-    return dst;
-}
-
-static VALUE
-rb_deflate_params(obj, v_level, v_strategy)
-    VALUE obj, v_level, v_strategy;
-{
-    struct zstream *z = get_zstream(obj);
-    int level, strategy;
-    int err;
-
-    level = ARG_LEVEL(v_level);
-    strategy = ARG_STRATEGY(v_strategy);
-
-    err = deflateParams(&z->stream, level, strategy);
-    while (err == Z_BUF_ERROR) {
-	if (RTEST(ruby_debug)) {
-	    rb_warning("deflateParams() returned Z_BUF_ERROR");
-	}
-	zstream_expand_buffer(z);
-	err = deflateParams(&z->stream, level, strategy);
-    }
-    if (err != Z_OK) {
-	raise_zlib_error(err, z->stream.msg);
-    }
-
-    return Qnil;
-}
-
-static VALUE
-rb_deflate_set_dictionary(obj, dic)
-    VALUE obj, dic;
-{
-    struct zstream *z = get_zstream(obj);
-    VALUE src = dic;
-    int err;
-
-    OBJ_INFECT(obj, dic);
-    StringValue(src);
-    err = deflateSetDictionary(&z->stream,
-			       RSTRING(src)->ptr, RSTRING(src)->len);
-    if (err != Z_OK) {
-	raise_zlib_error(err, z->stream.msg);
-    }
-
-    return dic;
-}
-
-
-
-/*-------- class Zlib::Inflate --------*/
-
-static VALUE
-rb_inflate_s_allocate(klass)
-    VALUE klass;
-{
-    return zstream_inflate_new(klass);
-}
-
-static VALUE
-rb_inflate_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct zstream *z;
-    VALUE wbits;
-    int err;
-
-    rb_scan_args(argc, argv, "01", &wbits);
-    Data_Get_Struct(obj, struct zstream, z);
-
-    err = inflateInit2(&z->stream, ARG_WBITS(wbits));
-    if (err != Z_OK) {
-	raise_zlib_error(err, z->stream.msg);
-    }
-    ZSTREAM_READY(z);
-
-    return obj;
-}
-
-static VALUE
-rb_inflate_s_inflate(obj, src)
-    VALUE obj, src;
-{
-    struct zstream z;
-    VALUE dst;
-    int err;
-
-    zstream_init_inflate(&z);
-    err = inflateInit(&z.stream);
-    if (err != Z_OK) {
-	raise_zlib_error(err, z.stream.msg);
-    }
-    ZSTREAM_READY(&z);
-
-    StringValue(src);
-    zstream_run(&z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
-    zstream_run(&z, "", 0, Z_FINISH);  /* for checking errors */
-    dst = zstream_detach_buffer(&z);
-    zstream_end(&z);
-
-    OBJ_INFECT(dst, src);
-    return dst;
-}
-
-static void
-do_inflate(z, src)
-    struct zstream *z;
-    VALUE src;
-{
-    if (NIL_P(src)) {
-	zstream_run(z, "", 0, Z_FINISH);
-	return;
-    }
-    StringValue(src);
-    if (RSTRING(src)->len > 0) { /* prevent Z_BUF_ERROR */
-	zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
-    }
-}
-
-static VALUE
-rb_inflate_inflate(obj, src)
-    VALUE obj, src;
-{
-    struct zstream *z = get_zstream(obj);
-    VALUE dst;
-
-    OBJ_INFECT(obj, src);
-
-    if (ZSTREAM_IS_FINISHED(z)) {
-	if (NIL_P(src)) {
-	    dst = zstream_detach_buffer(z);
-	}
-	else {
-	    StringValue(src);
-	    zstream_append_buffer2(z, src);
-	    dst = rb_str_new(0, 0);
-	}
-    }
-    else {
-	do_inflate(z, src);
-	dst = zstream_detach_buffer(z);
-	if (ZSTREAM_IS_FINISHED(z)) {
-	    zstream_passthrough_input(z);
-	}
-    }
-
-    OBJ_INFECT(dst, obj);
-    return dst;
-}
-
-static VALUE
-rb_inflate_addstr(obj, src)
-    VALUE obj, src;
-{
-    struct zstream *z = get_zstream(obj);
-
-    OBJ_INFECT(obj, src);
-
-    if (ZSTREAM_IS_FINISHED(z)) {
-	if (!NIL_P(src)) {
-	    StringValue(src);
-	    zstream_append_buffer2(z, src);
-	}
-    }
-    else {
-	do_inflate(z, src);
-	if (ZSTREAM_IS_FINISHED(z)) {
-	    zstream_passthrough_input(z);
-	}
-    }
-
-    return obj;
-}
-
-static VALUE
-rb_inflate_sync(obj, src)
-    VALUE obj, src;
-{
-    struct zstream *z = get_zstream(obj);
-
-    OBJ_INFECT(obj, src);
-    StringValue(src);
-    return zstream_sync(z, RSTRING(src)->ptr, RSTRING(src)->len);
-}
-
-static VALUE
-rb_inflate_sync_point_p(obj)
-    VALUE obj;
-{
-    struct zstream *z = get_zstream(obj);
-    int err;
-
-    err = inflateSyncPoint(&z->stream);
-    if (err == 1) {
-	return Qtrue;
-    }
-    if (err != Z_OK) {
-	raise_zlib_error(err, z->stream.msg);
-    }
-    return Qfalse;
-}
-
-static VALUE
-rb_inflate_set_dictionary(obj, dic)
-    VALUE obj, dic;
-{
-    struct zstream *z = get_zstream(obj);
-    VALUE src = dic;
-    int err;
-
-    OBJ_INFECT(obj, dic);
-    StringValue(src);
-    err = inflateSetDictionary(&z->stream,
-			       RSTRING(src)->ptr, RSTRING(src)->len);
-    if (err != Z_OK) {
-	raise_zlib_error(err, z->stream.msg);
-    }
-
-    return dic;
-}
-
-
-
-#if GZIP_SUPPORT
-
-/* NOTE: Features for gzip files of Ruby/zlib are written from scratch
- *       and using undocumented feature of zlib, negative wbits.
- *       I don't think gzFile APIs of zlib are good for Ruby.
- */
-
-/*------- .gz file header --------*/
-
-#define GZ_MAGIC1             0x1f
-#define GZ_MAGIC2             0x8b
-#define GZ_METHOD_DEFLATE     8
-#define GZ_FLAG_MULTIPART     0x2
-#define GZ_FLAG_EXTRA         0x4
-#define GZ_FLAG_ORIG_NAME     0x8
-#define GZ_FLAG_COMMENT       0x10
-#define GZ_FLAG_ENCRYPT       0x20
-#define GZ_FLAG_UNKNOWN_MASK  0xc0
-
-#define GZ_EXTRAFLAG_FAST     0x4
-#define GZ_EXTRAFLAG_SLOW     0x2
-
-/* from zutil.h */
-#define OS_MSDOS    0x00
-#define OS_AMIGA    0x01
-#define OS_VMS      0x02
-#define OS_UNIX     0x03
-#define OS_ATARI    0x05
-#define OS_OS2      0x06
-#define OS_MACOS    0x07
-#define OS_TOPS20   0x0a
-#define OS_WIN32    0x0b
-
-#define OS_VMCMS    0x04
-#define OS_ZSYSTEM  0x08
-#define OS_CPM      0x09
-#define OS_QDOS     0x0c
-#define OS_RISCOS   0x0d
-#define OS_UNKNOWN  0xff
-
-#ifndef OS_CODE
-#define OS_CODE  OS_UNIX
-#endif
-
-static ID id_write, id_read, id_flush, id_seek, id_close;
-static VALUE cGzError, cNoFooter, cCRCError, cLengthError;
-
-
-
-/*-------- gzfile internal APIs --------*/
-
-struct gzfile {
-    struct zstream z;
-    VALUE io;
-    int level;
-    time_t mtime;       /* for header */
-    int os_code;        /* for header */
-    VALUE orig_name;    /* for header; must be a String */
-    VALUE comment;      /* for header; must be a String */
-    unsigned long crc;
-    int lineno;
-    int ungetc;
-    void (*end)(struct gzfile *);
-};
-
-#define GZFILE_FLAG_SYNC             ZSTREAM_FLAG_UNUSED
-#define GZFILE_FLAG_HEADER_FINISHED  (ZSTREAM_FLAG_UNUSED << 1)
-#define GZFILE_FLAG_FOOTER_FINISHED  (ZSTREAM_FLAG_UNUSED << 2)
-
-#define GZFILE_IS_FINISHED(gz) \
-    (ZSTREAM_IS_FINISHED(&gz->z) && (gz)->z.buf_filled == 0)
-
-#define GZFILE_READ_SIZE  2048
-
-
-static void
-gzfile_mark(gz)
-    struct gzfile *gz;
-{
-    rb_gc_mark(gz->io);
-    rb_gc_mark(gz->orig_name);
-    rb_gc_mark(gz->comment);
-    zstream_mark(&gz->z);
-}
-
-static void
-gzfile_free(gz)
-    struct gzfile *gz;
-{
-    gz->z.flags |= ZSTREAM_FLAG_FINALIZE;
-    if (ZSTREAM_IS_READY(&gz->z)) {
-	gz->end(gz);
-    }
-    free(gz);
-}
-
-static VALUE
-gzfile_new(klass, funcs, endfunc)
-    VALUE klass;
-    const struct zstream_funcs *funcs;
-    void (*endfunc) _((struct gzfile *));
-{
-    VALUE obj;
-    struct gzfile *gz;
-
-    obj = Data_Make_Struct(klass, struct gzfile, gzfile_mark, gzfile_free, gz);
-    zstream_init(&gz->z, funcs);
-    gz->io = Qnil;
-    gz->level = 0;
-    gz->mtime = 0;
-    gz->os_code = OS_CODE;
-    gz->orig_name = Qnil;
-    gz->comment = Qnil;
-    gz->crc = crc32(0, Z_NULL, 0);
-    gz->lineno = 0;
-    gz->ungetc = 0;
-    gz->end = endfunc;
-
-    return obj;
-}
-
-#define gzfile_writer_new(gz) gzfile_new((gz),&deflate_funcs,gzfile_writer_end)
-#define gzfile_reader_new(gz) gzfile_new((gz),&inflate_funcs,gzfile_reader_end)
-
-static void
-gzfile_reset(gz)
-    struct gzfile *gz;
-{
-    zstream_reset(&gz->z);
-    gz->crc = crc32(0, Z_NULL, 0);
-    gz->lineno = 0;
-    gz->ungetc = 0;
-}
-
-static void
-gzfile_close(gz, closeflag)
-    struct gzfile *gz;
-    int closeflag;
-{
-    VALUE io = gz->io;
-    gz->end(gz);
-    gz->io = Qnil;
-    gz->orig_name = Qnil;
-    gz->comment = Qnil;
-    if (closeflag && rb_respond_to(io, id_close)) {
-	rb_funcall(io, id_close, 0);
-    }
-}
-
-static void
-gzfile_write_raw(gz)
-    struct gzfile *gz;
-{
-    VALUE str;
-
-    if (gz->z.buf_filled > 0) {
-	str = zstream_detach_buffer(&gz->z);
-	OBJ_TAINT(str);  /* for safe */
-	rb_funcall(gz->io, id_write, 1, str);
-	if ((gz->z.flags & GZFILE_FLAG_SYNC)
-	    && rb_respond_to(gz->io, id_flush))
-	    rb_funcall(gz->io, id_flush, 0);
-    }
-}
-
-static VALUE
-gzfile_read_raw(gz)
-    struct gzfile *gz;
-{
-    VALUE str;
-
-    str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
-    if (!NIL_P(str)) {
-	Check_Type(str, T_STRING);
-    }
-    return str;
-}
-
-static int
-gzfile_read_raw_ensure(gz, size)
-    struct gzfile *gz;
-    int size;
-{
-    VALUE str;
-
-    while (NIL_P(gz->z.input) || RSTRING(gz->z.input)->len < size) {
-	str = gzfile_read_raw(gz);
-	if (NIL_P(str)) return Qfalse;
-	zstream_append_input2(&gz->z, str);
-    }
-    return Qtrue;
-}
-
-static char *
-gzfile_read_raw_until_zero(gz, offset)
-    struct gzfile *gz;
-    long offset;
-{
-    VALUE str;
-    char *p;
-
-    for (;;) {
-	p = memchr(RSTRING(gz->z.input)->ptr + offset, '\0',
-		   RSTRING(gz->z.input)->len - offset);
-	if (p) break;
-	str = gzfile_read_raw(gz);
-	if (NIL_P(str)) {
-	    rb_raise(cGzError, "unexpected end of file");
-	}
-	offset = RSTRING(gz->z.input)->len;
-	zstream_append_input2(&gz->z, str);
-    }
-    return p;
-}
-
-static unsigned int
-gzfile_get16(src)
-    const unsigned char *src;
-{
-    unsigned int n;
-    n  = *(src++) & 0xff;
-    n |= (*(src++) & 0xff) << 8;
-    return n;
-}
-
-static unsigned long
-gzfile_get32(src)
-    const unsigned char *src;
-{
-    unsigned long n;
-    n  = *(src++) & 0xff;
-    n |= (*(src++) & 0xff) << 8;
-    n |= (*(src++) & 0xff) << 16;
-    n |= (*(src++) & 0xff) << 24;
-    return n;
-}
-
-static void
-gzfile_set32(n, dst)
-    unsigned long n;
-    unsigned char *dst;
-{
-    *(dst++) = n & 0xff;
-    *(dst++) = (n >> 8) & 0xff;
-    *(dst++) = (n >> 16) & 0xff;
-    *dst     = (n >> 24) & 0xff;
-}
-
-static void
-gzfile_make_header(gz)
-    struct gzfile *gz;
-{
-    unsigned char buf[10];  /* the size of gzip header */
-    unsigned char flags = 0, extraflags = 0;
-
-    if (!NIL_P(gz->orig_name)) {
-	flags |= GZ_FLAG_ORIG_NAME;
-    }
-    if (!NIL_P(gz->comment)) {
-	flags |= GZ_FLAG_COMMENT;
-    }
-    if (gz->mtime == 0) {
-	gz->mtime = time(0);
-    }
-
-    if (gz->level == Z_BEST_SPEED) {
-	extraflags |= GZ_EXTRAFLAG_FAST;
-    }
-    else if (gz->level == Z_BEST_COMPRESSION) {
-	extraflags |= GZ_EXTRAFLAG_SLOW;
-    }
-
-    buf[0] = GZ_MAGIC1;
-    buf[1] = GZ_MAGIC2;
-    buf[2] = GZ_METHOD_DEFLATE;
-    buf[3] = flags;
-    gzfile_set32(gz->mtime, &buf[4]);
-    buf[8] = extraflags;
-    buf[9] = gz->os_code;
-    zstream_append_buffer(&gz->z, buf, sizeof(buf));
-
-    if (!NIL_P(gz->orig_name)) {
-	zstream_append_buffer2(&gz->z, gz->orig_name);
-	zstream_append_buffer(&gz->z, "\0", 1);
-    }
-    if (!NIL_P(gz->comment)) {
-	zstream_append_buffer2(&gz->z, gz->comment);
-	zstream_append_buffer(&gz->z, "\0", 1);
-    }
-
-    gz->z.flags |= GZFILE_FLAG_HEADER_FINISHED;
-}
-
-static void
-gzfile_make_footer(gz)
-    struct gzfile *gz;
-{
-    unsigned char buf[8];  /* 8 is the size of gzip footer */
-
-    gzfile_set32(gz->crc, buf);
-    gzfile_set32(gz->z.stream.total_in, &buf[4]);
-    zstream_append_buffer(&gz->z, buf, sizeof(buf));
-    gz->z.flags |= GZFILE_FLAG_FOOTER_FINISHED;
-}
-
-static void
-gzfile_read_header(gz)
-    struct gzfile *gz;
-{
-    const unsigned char *head;
-    long len;
-    char flags, *p;
-
-    if (!gzfile_read_raw_ensure(gz, 10)) {  /* 10 is the size of gzip header */
-	rb_raise(cGzError, "not in gzip format");
-    }
-
-    head = RSTRING(gz->z.input)->ptr;
-
-    if (head[0] != GZ_MAGIC1 || head[1] != GZ_MAGIC2) {
-	rb_raise(cGzError, "not in gzip format");
-    }
-    if (head[2] != GZ_METHOD_DEFLATE) {
-	rb_raise(cGzError, "unsupported compression method %d", head[2]);
-    }
-
-    flags = head[3];
-    if (flags & GZ_FLAG_MULTIPART) {
-	rb_raise(cGzError, "multi-part gzip file is not supported");
-    }
-    else if (flags & GZ_FLAG_ENCRYPT) {
-	rb_raise(cGzError, "encrypted gzip file is not supported");
-    }
-    else if (flags & GZ_FLAG_UNKNOWN_MASK) {
-	rb_raise(cGzError, "unknown flags 0x%02x", flags);
-    }
-
-    if (head[8] & GZ_EXTRAFLAG_FAST) {
-	gz->level = Z_BEST_SPEED;
-    }
-    else if (head[8] & GZ_EXTRAFLAG_SLOW) {
-	gz->level = Z_BEST_COMPRESSION;
-    }
-    else {
-	gz->level = Z_DEFAULT_COMPRESSION;
-    }
-
-    gz->mtime = gzfile_get32(&head[4]);
-    gz->os_code = head[9];
-    zstream_discard_input(&gz->z, 10);
-
-    if (flags & GZ_FLAG_EXTRA) {
-	if (!gzfile_read_raw_ensure(gz, 2)) {
-	    rb_raise(cGzError, "unexpected end of file");
-	}
-	len = gzfile_get16(RSTRING(gz->z.input)->ptr);
-	if (!gzfile_read_raw_ensure(gz, 2 + len)) {
-	    rb_raise(cGzError, "unexpected end of file");
-	}
-	zstream_discard_input(&gz->z, 2 + len);
-    }
-    if (flags & GZ_FLAG_ORIG_NAME) {
-	p = gzfile_read_raw_until_zero(gz, 0);
-	len = p - RSTRING(gz->z.input)->ptr;
-	gz->orig_name = rb_str_new(RSTRING(gz->z.input)->ptr, len);
-	OBJ_TAINT(gz->orig_name);  /* for safe */
-	zstream_discard_input(&gz->z, len + 1);
-    }
-    if (flags & GZ_FLAG_COMMENT) {
-	p = gzfile_read_raw_until_zero(gz, 0);
-	len = p - RSTRING(gz->z.input)->ptr;
-	gz->comment = rb_str_new(RSTRING(gz->z.input)->ptr, len);
-	OBJ_TAINT(gz->comment);  /* for safe */
-	zstream_discard_input(&gz->z, len + 1);
-    }
-
-    if (gz->z.input != Qnil && RSTRING(gz->z.input)->len > 0) {
-	zstream_run(&gz->z, 0, 0, Z_SYNC_FLUSH);
-    }
-}
-
-static void
-gzfile_check_footer(gz)
-    struct gzfile *gz;
-{
-    unsigned long crc, length;
-
-    gz->z.flags |= GZFILE_FLAG_FOOTER_FINISHED;
-
-    if (!gzfile_read_raw_ensure(gz, 8)) { /* 8 is the size of gzip footer */
-	rb_raise(cNoFooter, "footer is not found");
-    }
-
-    crc = gzfile_get32(RSTRING(gz->z.input)->ptr);
-    length = gzfile_get32(RSTRING(gz->z.input)->ptr + 4);
-
-    gz->z.stream.total_in += 8;  /* to rewind correctly */
-    zstream_discard_input(&gz->z, 8);
-
-    if (gz->crc != crc) {
-	rb_raise(cCRCError, "invalid compressed data -- crc error");
-    }
-    if (gz->z.stream.total_out != length) {
-	rb_raise(cLengthError, "invalid compressed data -- length error");
-    }
-}
-
-static void
-gzfile_write(gz, str, len)
-    struct gzfile *gz;
-    Bytef *str;
-    uInt len;
-{
-    if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
-	gzfile_make_header(gz);
-    }
-
-    if (len > 0 || (gz->z.flags & GZFILE_FLAG_SYNC)) {
-	gz->crc = crc32(gz->crc, str, len);
-	zstream_run(&gz->z, str, len, (gz->z.flags & GZFILE_FLAG_SYNC)
-		    ? Z_SYNC_FLUSH : Z_NO_FLUSH);
-    }
-    gzfile_write_raw(gz);
-}
-
-static long
-gzfile_read_more(gz)
-    struct gzfile *gz;
-{
-    VALUE str;
-
-    while (!ZSTREAM_IS_FINISHED(&gz->z)) {
-	str = gzfile_read_raw(gz);
-	if (NIL_P(str)) {
-	    if (!ZSTREAM_IS_FINISHED(&gz->z)) {
-		rb_raise(cGzError, "unexpected end of file");
-	    }
-	    break;
-	}
-	if (RSTRING(str)->len > 0) { /* prevent Z_BUF_ERROR */
-	    zstream_run(&gz->z, RSTRING(str)->ptr, RSTRING(str)->len,
-			Z_SYNC_FLUSH);
-	}
-	if (gz->z.buf_filled > 0) break;
-    }
-    return gz->z.buf_filled;
-}
-
-static VALUE
-gzfile_read(gz, len)
-    struct gzfile *gz;
-    int len;
-{
-    VALUE dst;
-
-    if (len <= 0) return Qnil;
-    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
-	gzfile_read_more(gz);
-    }
-    if (GZFILE_IS_FINISHED(gz)) {
-	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz);
-	}
-	return Qnil;
-    }
-
-    dst = zstream_shift_buffer(&gz->z, len);
-    if (RSTRING(dst)->len <= gz->ungetc) {
-	gz->ungetc -= RSTRING(dst)->len;
-    }
-    else {
-	gz->crc = crc32(gz->crc, RSTRING(dst)->ptr + gz->ungetc,
-			RSTRING(dst)->len - gz->ungetc);
-    }
-
-    OBJ_TAINT(dst);  /* for safe */
-    return dst;
-}
-
-static VALUE
-gzfile_read_all(gz)
-    struct gzfile *gz;
-{
-    VALUE dst;
-
-    while (!ZSTREAM_IS_FINISHED(&gz->z)) {
-	gzfile_read_more(gz);
-    }
-    if (GZFILE_IS_FINISHED(gz)) {
-	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz);
-	}
-	return Qnil;
-    }
-
-    dst = zstream_detach_buffer(&gz->z);
-    if (RSTRING(dst)->len <= gz->ungetc) {
-	gz->ungetc -= RSTRING(dst)->len;
-    }
-    else {
-	gz->crc = crc32(gz->crc, RSTRING(dst)->ptr + gz->ungetc,
-			RSTRING(dst)->len - gz->ungetc);
-    }
-
-    OBJ_TAINT(dst);  /* for safe */
-    return dst;
-}
-
-static void
-gzfile_ungetc(gz, c)
-    struct gzfile *gz;
-    int c;
-{
-    zstream_buffer_ungetc(&gz->z, c);
-    gz->ungetc++;
-}
-
-static VALUE
-gzfile_finalize(obj)
-    VALUE obj;
-{
-    struct gzfile *gz = (struct gzfile *)obj;
-    gzfile_write_raw(gz);
-    return Qnil;
-}
-
-static void
-gzfile_writer_end(gz)
-    struct gzfile *gz;
-{
-    int aborted;
-
-    if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
-	gzfile_make_header(gz);
-    }
-
-    zstream_run(&gz->z, "", 0, Z_FINISH);
-    gzfile_make_footer(gz);
-
-    if (ZSTREAM_IS_FINALIZE(&gz->z)) {
-	rb_warn("Zlib::GzipWriter object must be closed explicitly.");
-	if (OBJ_IS_FREED(gz->io)) {
-	    aborted = 1;
-	}
-	else {
-	    rb_protect(gzfile_finalize, (VALUE)gz, &aborted);
-	}
-	if (aborted) {
-	    rb_warn("gzip footer is not written; broken gzip file");
-	}
-	zstream_end(&gz->z);
-	return;
-    }
-    gzfile_write_raw(gz);
-    zstream_end(&gz->z);
-}
-
-static void
-gzfile_reader_end(gz)
-    struct gzfile *gz;
-{
-    if (GZFILE_IS_FINISHED(gz)
-	&& !ZSTREAM_IS_FINALIZE(&gz->z)
-	&& !(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	gzfile_check_footer(gz);
-    }
-
-    zstream_end(&gz->z);
-}
-
-static void
-gzfile_reader_rewind(gz)
-    struct gzfile *gz;
-{
-    long n;
-
-    n = gz->z.stream.total_in;
-    if (!NIL_P(gz->z.input)) {
-	n += RSTRING(gz->z.input)->len;
-    }
-
-    rb_funcall(gz->io, id_seek, 2, rb_int2inum(-n), INT2FIX(1));
-    gzfile_reset(gz);
-}
-
-static VALUE
-gzfile_reader_get_unused(gz)
-    struct gzfile *gz;
-{
-    VALUE str;
-
-    if (!ZSTREAM_IS_READY(&gz->z)) return Qnil;
-    if (!GZFILE_IS_FINISHED(gz)) return Qnil;
-    if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	gzfile_check_footer(gz);
-    }
-    if (NIL_P(gz->z.input)) return Qnil;
-
-    str = rb_str_dup(gz->z.input);
-    OBJ_TAINT(str);  /* for safe */
-    return str;
-}
-
-static struct gzfile *
-get_gzfile(obj)
-    VALUE obj;
-{
-    struct gzfile *gz;
-
-    Data_Get_Struct(obj, struct gzfile, gz);
-    if (!ZSTREAM_IS_READY(&gz->z)) {
-	rb_raise(cGzError, "closed gzip stream");
-    }
-    return gz;
-}
-
-
-
-/*-------- class Zlib::GzipFile --------*/
-
-static VALUE
-gzfile_ensure_close(obj)
-    VALUE obj;
-{
-    struct gzfile *gz;
-
-    Data_Get_Struct(obj, struct gzfile, gz);
-    if (ZSTREAM_IS_READY(&gz->z)) {
-	gzfile_close(gz, 1);
-    }
-    return Qnil;
-}
-
-static VALUE
-rb_gzfile_s_wrap(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE obj = rb_class_new_instance(argc, argv, klass);
-
-    if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, obj, gzfile_ensure_close, obj);
-    }
-    else {
-	return obj;
-    }
-}
-
-static VALUE
-gzfile_s_open(argc, argv, klass, mode)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-    const char *mode;
-{
-    VALUE io, filename;
-
-    if (argc < 1) {
-	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
-    }
-    filename = argv[0];
-    SafeStringValue(filename);
-    io = rb_file_open(RSTRING(filename)->ptr, mode);
-
-    argv[0] = io;
-    return rb_gzfile_s_wrap(argc, argv, klass);
-}
-
-static VALUE
-rb_gzfile_to_io(obj)
-    VALUE obj;
-{
-    return get_gzfile(obj)->io;
-}
-
-static VALUE
-rb_gzfile_crc(obj)
-    VALUE obj;
-{
-    return rb_uint2inum(get_gzfile(obj)->crc);
-}
-
-static VALUE
-rb_gzfile_mtime(obj)
-    VALUE obj;
-{
-    return rb_time_new(get_gzfile(obj)->mtime, (time_t)0);
-}
-
-static VALUE
-rb_gzfile_level(obj)
-    VALUE obj;
-{
-    return INT2FIX(get_gzfile(obj)->level);
-}
-
-static VALUE
-rb_gzfile_os_code(obj)
-    VALUE obj;
-{
-    return INT2FIX(get_gzfile(obj)->os_code);
-}
-
-static VALUE
-rb_gzfile_orig_name(obj)
-    VALUE obj;
-{
-    VALUE str = get_gzfile(obj)->orig_name;
-    if (!NIL_P(str)) {
-	str = rb_str_dup(str);
-    }
-    OBJ_TAINT(str);  /* for safe */
-    return str;
-}
-
-static VALUE
-rb_gzfile_comment(obj)
-    VALUE obj;
-{
-    VALUE str = get_gzfile(obj)->comment;
-    if (!NIL_P(str)) {
-	str = rb_str_dup(str);
-    }
-    OBJ_TAINT(str);  /* for safe */
-    return str;
-}
-
-static VALUE
-rb_gzfile_lineno(obj)
-    VALUE obj;
-{
-    return INT2NUM(get_gzfile(obj)->lineno);
-}
-
-static VALUE
-rb_gzfile_set_lineno(obj, lineno)
-    VALUE obj, lineno;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    gz->lineno = NUM2INT(lineno);
-    return lineno;
-}
-
-static VALUE
-rb_gzfile_set_mtime(obj, mtime)
-    VALUE obj, mtime;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE val;
-
-    if (gz->z.flags & GZFILE_FLAG_HEADER_FINISHED) {
-	rb_raise(cGzError, "header is already written");
-    }
-
-    if (FIXNUM_P(time)) {
-	gz->mtime = FIX2INT(mtime);
-    }
-    else {
-	val = rb_Integer(mtime);
-	gz->mtime = FIXNUM_P(val) ? FIX2INT(val) : rb_big2ulong(val);
-    }
-    return mtime;
-}
-
-static VALUE
-rb_gzfile_set_orig_name(obj, str)
-    VALUE obj, str;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE s;
-    char *p;
-
-    if (gz->z.flags & GZFILE_FLAG_HEADER_FINISHED) {
-	rb_raise(cGzError, "header is already written");
-    }
-    s = rb_str_dup(rb_str_to_str(str));
-    p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
-    if (p) {
-	rb_str_resize(s, p - RSTRING(s)->ptr);
-    }
-    gz->orig_name = s;
-    return str;
-}
-
-static VALUE
-rb_gzfile_set_comment(obj, str)
-    VALUE obj, str;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE s;
-    char *p;
-
-    if (gz->z.flags & GZFILE_FLAG_HEADER_FINISHED) {
-	rb_raise(cGzError, "header is already written");
-    }
-    s = rb_str_dup(rb_str_to_str(str));
-    p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
-    if (p) {
-	rb_str_resize(s, p - RSTRING(s)->ptr);
-    }
-    gz->comment = s;
-    return str;
-}
-
-static VALUE
-rb_gzfile_close(obj)
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE io;
-
-    io = gz->io;
-    gzfile_close(gz, 1);
-    return io;
-}
-
-static VALUE
-rb_gzfile_finish(obj)
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE io;
-
-    io = gz->io;
-    gzfile_close(gz, 0);
-    return io;
-}
-
-static VALUE
-rb_gzfile_closed_p(obj)
-    VALUE obj;
-{
-    struct gzfile *gz;
-    Data_Get_Struct(obj, struct gzfile, gz);
-    return NIL_P(gz->io) ? Qtrue : Qfalse;
-}
-
-static VALUE
-rb_gzfile_eof_p(obj)
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    return GZFILE_IS_FINISHED(gz) ? Qtrue : Qfalse;
-}
-
-static VALUE
-rb_gzfile_sync(obj)
-    VALUE obj;
-{
-    return (get_gzfile(obj)->z.flags & GZFILE_FLAG_SYNC) ? Qtrue : Qfalse;
-}
-
-static VALUE
-rb_gzfile_set_sync(obj, mode)
-    VALUE obj, mode;
-{
-    struct gzfile *gz = get_gzfile(obj);
-
-    if (RTEST(mode)) {
-	gz->z.flags |= GZFILE_FLAG_SYNC;
-    }
-    else {
-	gz->z.flags &= ~GZFILE_FLAG_SYNC;
-    }
-    return mode;
-}
-
-static VALUE
-rb_gzfile_total_in(obj)
-    VALUE obj;
-{
-    return rb_uint2inum(get_gzfile(obj)->z.stream.total_in);
-}
-
-static VALUE
-rb_gzfile_total_out(obj)
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    return rb_uint2inum(gz->z.stream.total_out - gz->z.buf_filled);
-}
-
-
-
-/*-------- class Zlib::GzipWriter --------*/
-
-static VALUE
-rb_gzwriter_s_allocate(klass)
-    VALUE klass;
-{
-    return gzfile_writer_new(klass);
-}
-
-static VALUE
-rb_gzwriter_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    return gzfile_s_open(argc, argv, klass, "wb");
-}
-
-static VALUE
-rb_gzwriter_initialize(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct gzfile *gz;
-    VALUE io, level, strategy;
-    int err;
-
-    rb_scan_args(argc, argv, "12", &io, &level, &strategy);
-    Data_Get_Struct(obj, struct gzfile, gz);
-
-    /* this is undocumented feature of zlib */
-    gz->level = ARG_LEVEL(level);
-    err = deflateInit2(&gz->z.stream, gz->level, Z_DEFLATED,
-		       -MAX_WBITS, DEF_MEM_LEVEL, ARG_STRATEGY(strategy));
-    if (err != Z_OK) {
-	raise_zlib_error(err, gz->z.stream.msg);
-    }
-    gz->io = io;
-    ZSTREAM_READY(&gz->z);
-
-    return obj;
-}
-
-static VALUE
-rb_gzwriter_flush(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE v_flush;
-    int flush;
-
-    rb_scan_args(argc, argv, "01", &v_flush);
-
-    flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
-    if (flush != Z_NO_FLUSH) {  /* prevent Z_BUF_ERROR */
-	zstream_run(&gz->z, "", 0, flush);
-    }
-
-    gzfile_write_raw(gz);
-    if (rb_respond_to(gz->io, id_flush)) {
-	rb_funcall(gz->io, id_flush, 0);
-    }
-    return obj;
-}
-
-static VALUE
-rb_gzwriter_write(obj, str)
-    VALUE obj, str;
-{
-    struct gzfile *gz = get_gzfile(obj);
-
-    if (TYPE(str) != T_STRING) {
-	str = rb_obj_as_string(str);
-    }
-    gzfile_write(gz, RSTRING(str)->ptr, RSTRING(str)->len);
-    return INT2FIX(RSTRING(str)->len);
-}
-
-static VALUE
-rb_gzwriter_putc(obj, ch)
-    VALUE obj, ch;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    char c = NUM2CHR(ch);
-
-    gzfile_write(gz, &c, 1);
-    return ch;
-}
-
-#define rb_gzwriter_addstr  rb_io_addstr
-#define rb_gzwriter_printf  rb_io_printf
-#define rb_gzwriter_print  rb_io_print
-#define rb_gzwriter_puts  rb_io_puts
-
-
-/*-------- class Zlib::GzipReader --------*/
-
-static VALUE
-rb_gzreader_s_allocate(klass)
-    VALUE klass;
-{
-    return gzfile_reader_new(klass);
-}
-
-static VALUE
-rb_gzreader_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    return gzfile_s_open(argc, argv, klass, "rb");
-}
-
-static VALUE
-rb_gzreader_initialize(obj, io)
-    VALUE obj, io;
-{
-    struct gzfile *gz;
-    int err;
-
-    Data_Get_Struct(obj, struct gzfile, gz);
-
-    /* this is undocumented feature of zlib */
-    err = inflateInit2(&gz->z.stream, -MAX_WBITS);
-    if (err != Z_OK) {
-	raise_zlib_error(err, gz->z.stream.msg);
-    }
-    gz->io = io;
-    ZSTREAM_READY(&gz->z);
-    gzfile_read_header(gz);
-
-    return obj;
-}
-
-static VALUE
-rb_gzreader_rewind(obj)
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    gzfile_reader_rewind(gz);
-    return INT2FIX(0);
-}
-
-static VALUE
-rb_gzreader_unused(obj)
-    VALUE obj;
-{
-    struct gzfile *gz;
-    Data_Get_Struct(obj, struct gzfile, gz);
-    return gzfile_reader_get_unused(gz);
-}
-
-static VALUE
-rb_gzreader_read(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE vlen;
-    int len;
-
-    rb_scan_args(argc, argv, "01", &vlen);
-    if (NIL_P(vlen)) {
-	return gzfile_read_all(gz);
-    }
-
-    len = NUM2INT(vlen);
-    if (len < 0) {
-	rb_raise(rb_eArgError, "negative length %d given", len);
-    }
-    return gzfile_read(gz, len);
-}
-
-static VALUE
-rb_gzreader_getc(obj)
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE dst;
-
-    dst = gzfile_read(gz, 1);
-    if (!NIL_P(dst)) {
-	dst = INT2FIX((unsigned int)(RSTRING(dst)->ptr[0]) & 0xff);
-    }
-    return dst;
-}
-
-static VALUE
-rb_gzreader_readchar(obj)
-    VALUE obj;
-{
-    VALUE dst;
-    dst = rb_gzreader_getc(obj);
-    if (NIL_P(dst)) {
-	rb_raise(rb_eEOFError, "End of file reached");
-    }
-    return dst;
-}
-
-static VALUE
-rb_gzreader_each_byte(obj)
-    VALUE obj;
-{
-    VALUE c;
-    while (!NIL_P(c = rb_gzreader_getc(obj))) {
-	rb_yield(c);
-    }
-    return Qnil;
-}
-
-static VALUE
-rb_gzreader_ungetc(obj, ch)
-    VALUE obj, ch;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    gzfile_ungetc(gz, NUM2CHR(ch));
-    return Qnil;
-}
-
-static void
-gzreader_skip_linebreaks(gz)
-    struct gzfile *gz;
-{
-    VALUE str;
-    char *p;
-    int n;
-
-    while (gz->z.buf_filled == 0) {
-	if (GZFILE_IS_FINISHED(gz)) return;
-	gzfile_read_more(gz);
-    }
-    n = 0;
-    p = RSTRING(gz->z.buf)->ptr;
-
-    while (n++, *(p++) == '\n') {
-	if (n >= gz->z.buf_filled) {
-	    str = zstream_detach_buffer(&gz->z);
-	    gz->crc = crc32(gz->crc, RSTRING(str)->ptr,
-			    RSTRING(str)->len);
-	    while (gz->z.buf_filled == 0) {
-		if (GZFILE_IS_FINISHED(gz)) return;
-		gzfile_read_more(gz);
-	    }
-	    n = 0;
-	    p = RSTRING(gz->z.buf)->ptr;
-	}
-    }
-
-    str = zstream_shift_buffer(&gz->z, n - 1);
-    gz->crc = crc32(gz->crc, RSTRING(str)->ptr, RSTRING(str)->len);
-}
-
-static VALUE
-gzreader_gets(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE rs, dst;
-    char *rsptr, *p;
-    long rslen, n;
-    int rspara;
-
-    if (argc == 0) {
-	rs = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &rs);
-	if (!NIL_P(rs)) {
-	    Check_Type(rs, T_STRING);
-	}
-    }
-
-    if (NIL_P(rs)) {
-	dst = gzfile_read_all(gz);
-	if (!NIL_P(dst)) gz->lineno++;
-	return dst;
-    }
-
-    if (RSTRING(rs)->len == 0) {
-	rsptr = "\n\n";
-	rslen = 2;
-	rspara = 1;
-    } else {
-	rsptr = RSTRING(rs)->ptr;
-	rslen = RSTRING(rs)->len;
-	rspara = 0;
-    }
-
-    if (rspara) {
-	gzreader_skip_linebreaks(gz);
-    }
-
-    while (gz->z.buf_filled < rslen) {
-	if (ZSTREAM_IS_FINISHED(&gz->z)) {
-	    if (gz->z.buf_filled > 0) gz->lineno++;
-	    return gzfile_read(gz, rslen);
-	}
-	gzfile_read_more(gz);
-    }
-
-    n = rslen;
-    p = RSTRING(gz->z.buf)->ptr;
-    for (;;) {
-	if (n > gz->z.buf_filled) {
-	    if (ZSTREAM_IS_FINISHED(&gz->z)) break;
-	    gzfile_read_more(gz);
-	    p = RSTRING(gz->z.buf)->ptr + n - rslen;
-	}
-	if (memcmp(p, rsptr, rslen) == 0) break;
-	p++, n++;
-    }
-
-    gz->lineno++;
-    dst = gzfile_read(gz, n);
-    if (rspara) {
-	gzreader_skip_linebreaks(gz);
-    }
-
-    return dst;
-}
-
-static VALUE
-rb_gzreader_gets(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE dst;
-    dst = gzreader_gets(argc, argv, obj);
-    if (!NIL_P(dst)) {
-	rb_lastline_set(dst);
-    }
-    return dst;
-}
-
-static VALUE
-rb_gzreader_readline(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE dst;
-    dst = rb_gzreader_gets(argc, argv, obj);
-    if (NIL_P(dst)) {
-	rb_raise(rb_eEOFError, "End of file reached");
-    }
-    return dst;
-}
-
-static VALUE
-rb_gzreader_each(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE str;
-    while (!NIL_P(str = gzreader_gets(argc, argv, obj))) {
-	rb_yield(str);
-    }
-    return obj;
-}
-
-static VALUE
-rb_gzreader_readlines(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    VALUE str, dst;
-    dst = rb_ary_new();
-    while (!NIL_P(str = gzreader_gets(argc, argv, obj))) {
-	rb_ary_push(dst, str);
-    }
-    return dst;
-}
-
-#endif /* GZIP_SUPPORT */
-
-
-void Init_zlib()
-{
-    VALUE mZlib, cZStream, cDeflate, cInflate;
-#if GZIP_SUPPORT
-    VALUE cGzipFile, cGzipWriter, cGzipReader;
-#endif
-
-    mZlib = rb_define_module("Zlib");
-
-    cZError = rb_define_class_under(mZlib, "Error", rb_eStandardError);
-    cStreamEnd    = rb_define_class_under(mZlib, "StreamEnd", cZError);
-    cNeedDict     = rb_define_class_under(mZlib, "NeedDict", cZError);
-    cDataError    = rb_define_class_under(mZlib, "DataError", cZError);
-    cStreamError  = rb_define_class_under(mZlib, "StreamError", cZError);
-    cMemError     = rb_define_class_under(mZlib, "MemError", cZError);
-    cBufError     = rb_define_class_under(mZlib, "BufError", cZError);
-    cVersionError = rb_define_class_under(mZlib, "VersionError", cZError);
-
-    rb_define_module_function(mZlib, "zlib_version", rb_zlib_version, 0);
-    rb_define_module_function(mZlib, "adler32", rb_zlib_adler32, -1);
-    rb_define_module_function(mZlib, "crc32", rb_zlib_crc32, -1);
-    rb_define_module_function(mZlib, "crc_table", rb_zlib_crc_table, 0);
-
-    rb_define_const(mZlib, "VERSION", rb_str_new2(RUBY_ZLIB_VERSION));
-    rb_define_const(mZlib, "ZLIB_VERSION", rb_str_new2(ZLIB_VERSION));
-
-    cZStream = rb_define_class_under(mZlib, "ZStream", rb_cObject);
-    rb_undef_alloc_func(cZStream);
-    rb_define_method(cZStream, "avail_out", rb_zstream_avail_out, 0);
-    rb_define_method(cZStream, "avail_out=", rb_zstream_set_avail_out, 0);
-    rb_define_method(cZStream, "avail_in", rb_zstream_avail_in, 0);
-    rb_define_method(cZStream, "total_in", rb_zstream_total_in, 0);
-    rb_define_method(cZStream, "total_out", rb_zstream_total_out, 0);
-    rb_define_method(cZStream, "data_type", rb_zstream_data_type, 0);
-    rb_define_method(cZStream, "adler", rb_zstream_adler, 0);
-    rb_define_method(cZStream, "finished?", rb_zstream_finished_p, 0);
-    rb_define_method(cZStream, "stream_end?", rb_zstream_finished_p, 0);
-    rb_define_method(cZStream, "closed?", rb_zstream_closed_p, 0);
-    rb_define_method(cZStream, "ended?", rb_zstream_closed_p, 0);
-    rb_define_method(cZStream, "close", rb_zstream_end, 0);
-    rb_define_method(cZStream, "end", rb_zstream_end, 0);
-    rb_define_method(cZStream, "reset", rb_zstream_reset, 0);
-    rb_define_method(cZStream, "finish", rb_zstream_finish, 0);
-    rb_define_method(cZStream, "flush_next_in", rb_zstream_flush_next_in, 0);
-    rb_define_method(cZStream, "flush_next_out", rb_zstream_flush_next_out, 0);
-
-    rb_define_const(mZlib, "BINARY", INT2FIX(Z_BINARY));
-    rb_define_const(mZlib, "ASCII", INT2FIX(Z_ASCII));
-    rb_define_const(mZlib, "UNKNOWN", INT2FIX(Z_UNKNOWN));
-
-    cDeflate = rb_define_class_under(mZlib, "Deflate", cZStream);
-    rb_define_singleton_method(cDeflate, "deflate", rb_deflate_s_deflate, -1);
-    rb_define_alloc_func(cDeflate, rb_deflate_s_allocate);
-    rb_define_method(cDeflate, "initialize", rb_deflate_initialize, -1);
-    rb_define_method(cDeflate, "clone", rb_deflate_clone, 0);
-    rb_define_method(cDeflate, "deflate", rb_deflate_deflate, -1);
-    rb_define_method(cDeflate, "<<", rb_deflate_addstr, 1);
-    rb_define_method(cDeflate, "flush", rb_deflate_flush, -1);
-    rb_define_method(cDeflate, "params", rb_deflate_params, 2);
-    rb_define_method(cDeflate, "set_dictionary", rb_deflate_set_dictionary, 1);
-
-    cInflate = rb_define_class_under(mZlib, "Inflate", cZStream);
-    rb_define_singleton_method(cInflate, "inflate", rb_inflate_s_inflate, 1);
-    rb_define_alloc_func(cInflate, rb_inflate_s_allocate);
-    rb_define_method(cInflate, "initialize", rb_inflate_initialize, -1);
-    rb_define_method(cInflate, "inflate", rb_inflate_inflate, 1);
-    rb_define_method(cInflate, "<<", rb_inflate_addstr, 1);
-    rb_define_method(cInflate, "sync", rb_inflate_sync, 1);
-    rb_define_method(cInflate, "sync_point?", rb_inflate_sync_point_p, 0);
-    rb_define_method(cInflate, "set_dictionary", rb_inflate_set_dictionary, 1);
-
-    rb_define_const(mZlib, "NO_COMPRESSION", INT2FIX(Z_NO_COMPRESSION));
-    rb_define_const(mZlib, "BEST_SPEED", INT2FIX(Z_BEST_SPEED));
-    rb_define_const(mZlib, "BEST_COMPRESSION", INT2FIX(Z_BEST_COMPRESSION));
-    rb_define_const(mZlib, "DEFAULT_COMPRESSION",
-		    INT2FIX(Z_DEFAULT_COMPRESSION));
-
-    rb_define_const(mZlib, "FILTERED", INT2FIX(Z_FILTERED));
-    rb_define_const(mZlib, "HUFFMAN_ONLY", INT2FIX(Z_HUFFMAN_ONLY));
-    rb_define_const(mZlib, "DEFAULT_STRATEGY", INT2FIX(Z_DEFAULT_STRATEGY));
-
-    rb_define_const(mZlib, "MAX_WBITS", INT2FIX(MAX_WBITS));
-    rb_define_const(mZlib, "DEF_MEM_LEVEL", INT2FIX(DEF_MEM_LEVEL));
-    rb_define_const(mZlib, "MAX_MEM_LEVEL", INT2FIX(MAX_MEM_LEVEL));
-
-    rb_define_const(mZlib, "NO_FLUSH", INT2FIX(Z_NO_FLUSH));
-    rb_define_const(mZlib, "SYNC_FLUSH", INT2FIX(Z_SYNC_FLUSH));
-    rb_define_const(mZlib, "FULL_FLUSH", INT2FIX(Z_FULL_FLUSH));
-    rb_define_const(mZlib, "FINISH", INT2FIX(Z_FINISH));
-
-#if GZIP_SUPPORT
-    id_write = rb_intern("write");
-    id_read = rb_intern("read");
-    id_flush = rb_intern("flush");
-    id_seek = rb_intern("seek");
-    id_close = rb_intern("close");
-
-    cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
-    cGzError = rb_define_class_under(cGzipFile, "Error", cZError);
-
-    cNoFooter = rb_define_class_under(cGzipFile, "NoFooter", cGzError);
-    cCRCError = rb_define_class_under(cGzipFile, "CRCError", cGzError);
-    cLengthError = rb_define_class_under(cGzipFile,"LengthError",cGzError);
-
-    cGzipWriter = rb_define_class_under(mZlib, "GzipWriter", cGzipFile);
-    cGzipReader = rb_define_class_under(mZlib, "GzipReader", cGzipFile);
-    rb_include_module(cGzipReader, rb_mEnumerable);
-
-    rb_define_singleton_method(cGzipFile, "wrap", rb_gzfile_s_wrap, -1);
-    rb_undef_alloc_func(cGzipFile);
-    rb_define_method(cGzipFile, "to_io", rb_gzfile_to_io, 0);
-    rb_define_method(cGzipFile, "crc", rb_gzfile_crc, 0);
-    rb_define_method(cGzipFile, "mtime", rb_gzfile_mtime, 0);
-    rb_define_method(cGzipFile, "level", rb_gzfile_level, 0);
-    rb_define_method(cGzipFile, "os_code", rb_gzfile_os_code, 0);
-    rb_define_method(cGzipFile, "orig_name", rb_gzfile_orig_name, 0);
-    rb_define_method(cGzipFile, "comment", rb_gzfile_comment, 0);
-    rb_define_method(cGzipReader, "lineno", rb_gzfile_lineno, 0);
-    rb_define_method(cGzipReader, "lineno=", rb_gzfile_set_lineno, 1);
-    rb_define_method(cGzipWriter, "mtime=", rb_gzfile_set_mtime, 1);
-    rb_define_method(cGzipWriter, "orig_name=", rb_gzfile_set_orig_name,1);
-    rb_define_method(cGzipWriter, "comment=", rb_gzfile_set_comment, 1);
-    rb_define_method(cGzipFile, "close", rb_gzfile_close, 0);
-    rb_define_method(cGzipFile, "finish", rb_gzfile_finish, 0);
-    rb_define_method(cGzipFile, "closed?", rb_gzfile_closed_p, 0);
-    rb_define_method(cGzipReader, "eof", rb_gzfile_eof_p, 0);
-    rb_define_method(cGzipReader, "eof?", rb_gzfile_eof_p, 0);
-    rb_define_method(cGzipFile, "sync", rb_gzfile_sync, 0);
-    rb_define_method(cGzipFile, "sync=", rb_gzfile_set_sync, 1);
-    rb_define_method(cGzipReader, "pos", rb_gzfile_total_out, 0);
-    rb_define_method(cGzipWriter, "pos", rb_gzfile_total_in, 0);
-    rb_define_method(cGzipReader, "tell", rb_gzfile_total_out, 0);
-    rb_define_method(cGzipWriter, "tell", rb_gzfile_total_in, 0);
-
-    rb_define_singleton_method(cGzipWriter, "open", rb_gzwriter_s_open,-1);
-    rb_define_alloc_func(cGzipWriter, rb_gzwriter_s_allocate);
-    rb_define_method(cGzipWriter, "initialize", rb_gzwriter_initialize,-1);
-    rb_define_method(cGzipWriter, "flush", rb_gzwriter_flush, -1);
-    rb_define_method(cGzipWriter, "write", rb_gzwriter_write, 1);
-    rb_define_method(cGzipWriter, "putc", rb_gzwriter_putc, 1);
-    rb_define_method(cGzipWriter, "<<", rb_gzwriter_addstr, 1);
-    rb_define_method(cGzipWriter, "printf", rb_gzwriter_printf, -1);
-    rb_define_method(cGzipWriter, "print", rb_gzwriter_print, -1);
-    rb_define_method(cGzipWriter, "puts", rb_gzwriter_puts, -1);
-
-    rb_define_singleton_method(cGzipReader, "open", rb_gzreader_s_open,-1);
-    rb_define_alloc_func(cGzipReader, rb_gzreader_s_allocate);
-    rb_define_method(cGzipReader, "initialize", rb_gzreader_initialize, 1);
-    rb_define_method(cGzipReader, "rewind", rb_gzreader_rewind, 0);
-    rb_define_method(cGzipReader, "unused", rb_gzreader_unused, 0);
-    rb_define_method(cGzipReader, "read", rb_gzreader_read, -1);
-    rb_define_method(cGzipReader, "getc", rb_gzreader_getc, 0);
-    rb_define_method(cGzipReader, "readchar", rb_gzreader_readchar, 0);
-    rb_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0);
-    rb_define_method(cGzipReader, "ungetc", rb_gzreader_ungetc, 1);
-    rb_define_method(cGzipReader, "gets", rb_gzreader_gets, -1);
-    rb_define_method(cGzipReader, "readline", rb_gzreader_readline, -1);
-    rb_define_method(cGzipReader, "each", rb_gzreader_each, -1);
-    rb_define_method(cGzipReader, "readlines", rb_gzreader_readlines, -1);
-
-    rb_define_const(mZlib, "OS_CODE", INT2FIX(OS_CODE));
-    rb_define_const(mZlib, "OS_MSDOS", INT2FIX(OS_MSDOS));
-    rb_define_const(mZlib, "OS_AMIGA", INT2FIX(OS_AMIGA));
-    rb_define_const(mZlib, "OS_VMS", INT2FIX(OS_VMS));
-    rb_define_const(mZlib, "OS_UNIX", INT2FIX(OS_UNIX));
-    rb_define_const(mZlib, "OS_ATARI", INT2FIX(OS_ATARI));
-    rb_define_const(mZlib, "OS_OS2", INT2FIX(OS_OS2));
-    rb_define_const(mZlib, "OS_MACOS", INT2FIX(OS_MACOS));
-    rb_define_const(mZlib, "OS_TOPS20", INT2FIX(OS_TOPS20));
-    rb_define_const(mZlib, "OS_WIN32", INT2FIX(OS_WIN32));
-
-    rb_define_const(mZlib, "OS_VMCMS", INT2FIX(OS_VMCMS));
-    rb_define_const(mZlib, "OS_ZSYSTEM", INT2FIX(OS_ZSYSTEM));
-    rb_define_const(mZlib, "OS_CPM", INT2FIX(OS_CPM));
-    rb_define_const(mZlib, "OS_QDOS", INT2FIX(OS_QDOS));
-    rb_define_const(mZlib, "OS_RISCOS", INT2FIX(OS_RISCOS));
-    rb_define_const(mZlib, "OS_UNKNOWN", INT2FIX(OS_UNKNOWN));
-
-#endif /* GZIP_SUPPORT */
-}
diff --git a/file.c b/file.c
index 3fe8150065..d9107a1757 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   file.c -
 
@@ -6,47 +6,44 @@
   $Date$
   created at: Mon Nov 15 12:24:34 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
-#ifdef _WIN32
+#ifdef NT
 #include "missing/file.h"
 #endif
 
 #include "ruby.h"
 #include "rubyio.h"
 #include "rubysig.h"
-#include "util.h"
-#include "dln.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_SYS_FILE_H
-# include <sys/file.h>
-#else
-int flock _((int, int));
-#endif
-
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
-#endif
-#ifndef MAXPATHLEN
+#else
 # define MAXPATHLEN 1024
 #endif
 
 #include <time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#else
+#ifndef NT
+struct timeval {
+        long    tv_sec;         /* seconds */
+        long    tv_usec;        /* and microseconds */
+};
+#endif /* NT */
+#endif
 
 VALUE rb_time_new _((time_t, time_t));
 
 #ifdef HAVE_UTIME_H
 #include <utime.h>
-#elif defined HAVE_SYS_UTIME_H
-#include <sys/utime.h>
 #endif
 
 #ifdef HAVE_PWD_H
@@ -60,32 +57,39 @@ char *strrchr _((const char*,const char));
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef HAVE_SYS_MKDEV_H
-#include <sys/mkdev.h>
+#ifdef USE_CWGUSI
+ #include "macruby_missing.h"
+ extern int fileno(FILE *stream);
+ extern int utimes();
+ char* strdup(char*);
 #endif
 
-#ifndef HAVE_LSTAT
-#define lstat(path,st) stat(path,st)
+#ifdef __EMX__
+#define lstat stat
 #endif
-
+ 
 VALUE rb_cFile;
 VALUE rb_mFileTest;
-static VALUE rb_cStat;
+static VALUE sStat;
 
-static long
+static int
 apply2files(func, vargs, arg)
-    void (*func)();
+    int (*func)();
     VALUE vargs;
     void *arg;
 {
-    long i;
+    int i;
     VALUE path;
     struct RArray *args = RARRAY(vargs);
 
     for (i=0; i<args->len; i++) {
+	Check_SafeStr(args->ptr[i]);
+    }
+
+    for (i=0; i<args->len; i++) {
 	path = args->ptr[i];
-	SafeStringValue(path);
-	(*func)(StringValueCStr(path), arg);
+	if ((*func)(RSTRING(path)->ptr, arg) < 0)
+	    rb_sys_fail(RSTRING(path)->ptr);
     }
 
     return args->len;
@@ -97,252 +101,50 @@ rb_file_path(obj)
 {
     OpenFile *fptr;
 
-    fptr = RFILE(rb_io_taint_check(obj))->fptr;
-    if (!fptr->path) return Qnil;
+    GetOpenFile(obj, fptr);
+    if (fptr->path == NULL) return Qnil;
     return rb_str_new2(fptr->path);
 }
 
-static VALUE
-stat_new_0(klass, st)
-    VALUE klass;
-    struct stat *st;
-{
-    struct stat *nst = 0;
-
-    if (st) {
-	nst = ALLOC(struct stat);
-	*nst = *st;
-    }
-    return Data_Wrap_Struct(klass, NULL, free, nst);
-}
-
-static VALUE
-stat_new(st)
-    struct stat *st;
-{
-    return stat_new_0(rb_cStat, st);
-}
-
-static struct stat*
-get_stat(self)
-    VALUE self;
-{
-    struct stat* st;
-    Data_Get_Struct(self, struct stat, st);
-    if (!st) rb_raise(rb_eTypeError, "uninitialized File::Stat");
-    return st;
-}
-
-static VALUE
-rb_stat_cmp(self, other)
-    VALUE self, other;
-{
-    if (rb_obj_is_kind_of(other, rb_obj_class(self))) {
-	time_t t1 = get_stat(self)->st_mtime;
-	time_t t2 = get_stat(other)->st_mtime;
-	if (t1 == t2)
-	    return INT2FIX(0);
-	else if (t1 < t2)
-	    return INT2FIX(-1);
-	else
-	    return INT2FIX(1);
-    }
-    return Qnil;
-}
-
-static VALUE
-rb_stat_dev(self)
-    VALUE self;
-{
-    return INT2NUM(get_stat(self)->st_dev);
-}
-
-static VALUE
-rb_stat_ino(self)
-    VALUE self;
-{
-#ifdef HUGE_ST_INO
-    return ULL2NUM(get_stat(self)->st_ino);
-#else
-    return ULONG2NUM(get_stat(self)->st_ino);
-#endif
-}
-
-static VALUE
-rb_stat_mode(self)
-    VALUE self;
-{
-#ifdef __BORLANDC__
-    return UINT2NUM((unsigned short)(get_stat(self)->st_mode));
+#ifndef NT
+# ifndef USE_CWGUSI
+#  include <sys/file.h>
+# endif
 #else
-    return UINT2NUM(get_stat(self)->st_mode);
+#include "missing/file.h"
 #endif
-}
-
-static VALUE
-rb_stat_nlink(self)
-    VALUE self;
-{
-    return UINT2NUM(get_stat(self)->st_nlink);
-}
-
-static VALUE
-rb_stat_uid(self)
-    VALUE self;
-{
-    return UINT2NUM(get_stat(self)->st_uid);
-}
-
-static VALUE
-rb_stat_gid(self)
-    VALUE self;
-{
-    return UINT2NUM(get_stat(self)->st_gid);
-}
 
 static VALUE
-rb_stat_rdev(self)
-    VALUE self;
+stat_new(st)
+    struct stat *st;
 {
+    if (!st) rb_bug("stat_new() called with bad value");
+    return rb_struct_new(sStat,
+			 INT2FIX((int)st->st_dev),
+			 INT2FIX((int)st->st_ino),
+			 INT2FIX((int)st->st_mode),
+			 INT2FIX((int)st->st_nlink),
+			 INT2FIX((int)st->st_uid),
+			 INT2FIX((int)st->st_gid),
 #ifdef HAVE_ST_RDEV
-    return ULONG2NUM(get_stat(self)->st_rdev);
+			 INT2FIX((int)st->st_rdev),
 #else
-    return Qnil;
+			 INT2FIX(0),
 #endif
-}
-
-static VALUE
-rb_stat_rdev_major(self)
-    VALUE self;
-{
-#if defined(HAVE_ST_RDEV) && defined(major)
-    long rdev = get_stat(self)->st_rdev;
-    return ULONG2NUM(major(rdev));
-#else
-    return Qnil;
-#endif
-}
-
-static VALUE
-rb_stat_rdev_minor(self)
-    VALUE self;
-{
-#if defined(HAVE_ST_RDEV) && defined(minor)
-    long rdev = get_stat(self)->st_rdev;
-    return ULONG2NUM(minor(rdev));
-#else
-    return Qnil;
-#endif
-}
-
-static VALUE
-rb_stat_size(self)
-    VALUE self;
-{
-    return OFFT2NUM(get_stat(self)->st_size);
-}
-
-static VALUE
-rb_stat_blksize(self)
-    VALUE self;
-{
+			 INT2FIX((int)st->st_size),
 #ifdef HAVE_ST_BLKSIZE
-    return ULONG2NUM(get_stat(self)->st_blksize);
+			 INT2FIX((int)st->st_blksize),
 #else
-    return Qnil;
+			 INT2FIX(0),
 #endif
-}
-
-static VALUE
-rb_stat_blocks(self)
-    VALUE self;
-{
 #ifdef HAVE_ST_BLOCKS
-    return ULONG2NUM(get_stat(self)->st_blocks);
+			 INT2FIX((int)st->st_blocks),
 #else
-    return Qnil;
+			 INT2FIX(0),
 #endif
-}
-
-static VALUE
-rb_stat_atime(self)
-    VALUE self;
-{
-    return rb_time_new(get_stat(self)->st_atime, 0);
-}
-
-static VALUE
-rb_stat_mtime(self)
-    VALUE self;
-{
-    return rb_time_new(get_stat(self)->st_mtime, 0);
-}
-
-static VALUE
-rb_stat_ctime(self)
-    VALUE self;
-{
-    return rb_time_new(get_stat(self)->st_ctime, 0);
-}
-
-static VALUE
-rb_stat_inspect(self)
-    VALUE self;
-{
-    VALUE str;
-    int i;
-    static struct {
-        char *name;
-        VALUE (*func)();
-    } member[] = {
-        {"dev",     rb_stat_dev},
-        {"ino",     rb_stat_ino},
-        {"mode",    rb_stat_mode},
-        {"nlink",   rb_stat_nlink},
-        {"uid",     rb_stat_uid},
-        {"gid",     rb_stat_gid},
-        {"rdev",    rb_stat_rdev},
-        {"size",    rb_stat_size},
-        {"blksize", rb_stat_blksize},
-        {"blocks",  rb_stat_blocks},
-        {"atime",   rb_stat_atime},
-        {"mtime",   rb_stat_mtime},
-        {"ctime",   rb_stat_ctime},
-    };
-
-    str = rb_str_buf_new2("#<");
-    rb_str_buf_cat2(str, rb_obj_classname(self));
-    rb_str_buf_cat2(str, " ");
-
-    for (i = 0; i < sizeof(member)/sizeof(member[0]); i++) {
-	VALUE v;
-
-	if (i > 0) {
-	    rb_str_buf_cat2(str, ", ");
-	}
-	rb_str_buf_cat2(str, member[i].name);
-	rb_str_buf_cat2(str, "=");
-	v = (*member[i].func)(self);
-	if (i == 2) {		/* mode */
-	    char buf[32];
-
-	    sprintf(buf, "0%o", NUM2INT(v));
-	    rb_str_buf_cat2(str, buf);
-	}
-	else if (i == 0 || i == 6) { /* dev/rdev */
-	    char buf[32];
-
-	    sprintf(buf, "0x%lx", NUM2ULONG(v));
-	    rb_str_buf_cat2(str, buf);
-	}
-	else {
-	    rb_str_append(str, rb_inspect(v));
-	}
-    }
-    rb_str_buf_cat2(str, ">");
-    OBJ_INFECT(str, self);
-
-    return str;
+			 rb_time_new(st->st_atime, 0),
+			 rb_time_new(st->st_mtime, 0),
+			 rb_time_new(st->st_ctime, 0));
 }
 
 static int
@@ -350,29 +152,26 @@ rb_stat(file, st)
     VALUE file;
     struct stat *st;
 {
-    VALUE tmp;
-
-    tmp = rb_check_convert_type(file, T_FILE, "IO", "to_io");
-    if (!NIL_P(tmp)) {
+    if (TYPE(file) == T_FILE) {
 	OpenFile *fptr;
 
-	rb_secure(2);
-	GetOpenFile(tmp, fptr);
+	rb_secure(4);
+	GetOpenFile(file, fptr);
 	return fstat(fileno(fptr->f), st);
     }
-    SafeStringValue(file);
-    return stat(StringValueCStr(file), st);
+    Check_SafeStr(file);
+    return stat(RSTRING(file)->ptr, st);
 }
 
 static VALUE
-rb_file_s_stat(klass, fname)
-    VALUE klass, fname;
+rb_file_s_stat(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
-    SafeStringValue(fname);
-    if (rb_stat(fname, &st) < 0) {
-	rb_sys_fail(StringValueCStr(fname));
+    Check_SafeStr(fname);
+    if (stat(RSTRING(fname)->ptr, &st) == -1) {
+	rb_sys_fail(RSTRING(fname)->ptr);
     }
     return stat_new(&st);
 }
@@ -392,19 +191,20 @@ rb_io_stat(obj)
 }
 
 static VALUE
-rb_file_s_lstat(klass, fname)
-    VALUE klass, fname;
+rb_file_s_lstat(obj, fname)
+    VALUE obj, fname;
 {
-#ifdef HAVE_LSTAT
+#if !defined(MSDOS) && !defined(NT) && !defined(__EMX__)
     struct stat st;
 
-    SafeStringValue(fname);
-    if (lstat(StringValueCStr(fname), &st) == -1) {
+    Check_SafeStr(fname);
+    if (lstat(RSTRING(fname)->ptr, &st) == -1) {
 	rb_sys_fail(RSTRING(fname)->ptr);
     }
     return stat_new(&st);
 #else
-    return rb_file_s_stat(klass, fname);
+    rb_notimplement();
+    return Qnil;		/* not reached */
 #endif
 }
 
@@ -412,19 +212,19 @@ static VALUE
 rb_file_lstat(obj)
     VALUE obj;
 {
-#ifdef HAVE_LSTAT
+#if !defined(MSDOS) && !defined(NT)
     OpenFile *fptr;
     struct stat st;
 
-    rb_secure(2);
+    rb_secure(4);
     GetOpenFile(obj, fptr);
-    if (!fptr->path) return Qnil;
     if (lstat(fptr->path, &st) == -1) {
 	rb_sys_fail(fptr->path);
     }
     return stat_new(&st);
 #else
-    return rb_io_stat(obj);
+    rb_notimplement();
+    return Qnil;		/* not reached */
 #endif
 }
 
@@ -432,17 +232,13 @@ static int
 group_member(gid)
     GETGROUPS_T gid;
 {
-#ifndef _WIN32
-    if (getgid() ==  gid)
+#if !defined(NT) && !defined(USE_CWGUSI)
+    if (getgid() ==  gid || getegid() == gid)
 	return Qtrue;
 
 # ifdef HAVE_GETGROUPS
 #  ifndef NGROUPS
-#   ifdef NGROUPS_MAX
-#    define NGROUPS NGROUPS_MAX
-#   else
 #    define NGROUPS 32
-#   endif
 #  endif
     {
 	GETGROUPS_T gary[NGROUPS];
@@ -467,37 +263,37 @@ eaccess(path, mode)
      const char *path;
      int mode;
 {
-#if defined(S_IXGRP) && !defined(_WIN32) && !defined(__CYGWIN__)
-    struct stat st;
-    int euid;
-
-    if (stat(path, &st) < 0) return -1;
+#ifndef NT
+  struct stat st;
+  static int euid = -1;
 
-    euid = geteuid();
+  if (stat(path, &st) < 0) return (-1);
 
-    if (euid == 0) {
-	/* Root can read or write any file. */
-	if (!(mode & X_OK))
-	    return 0;
+  if (euid == -1)
+    euid = geteuid ();
 
-	/* Root can execute any file that has any one of the execute
-	   bits set. */
-	if (st.st_mode & S_IXUGO)
-	    return 0;
+  if (euid == 0)
+    {
+      /* Root can read or write any file. */
+      if (mode != X_OK)
+	return 0;
 
-	return -1;
+      /* Root can execute any file that has any one of the execute
+	 bits set. */
+      if (st.st_mode & S_IXUGO)
+	return 0;
     }
 
-    if (st.st_uid == euid)        /* owner */
-	mode <<= 6;
-    else if (getegid() == st.st_gid || group_member(st.st_gid))
-	mode <<= 3;
+  if (st.st_uid == euid)        /* owner */
+    mode <<= 6;
+  else if (group_member (st.st_gid))
+    mode <<= 3;
 
-    if ((st.st_mode & mode) == mode) return 0;
+  if (st.st_mode & mode) return 0;
 
-    return -1;
-#else
-    return access(path, mode);
+  return -1;
+#else  /* !NT*/
+	return 0;
 #endif
 }
 
@@ -541,14 +337,6 @@ test_l(obj, fname)
 #ifndef S_ISLNK
 #  ifdef _S_ISLNK
 #    define S_ISLNK(m) _S_ISLNK(m)
-#  elif defined __BORLANDC__
-#    ifdef _S_IFLNK
-#      define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == _S_IFLNK)
-#    else
-#      ifdef S_IFLNK
-#        define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == S_IFLNK)
-#      endif
-#    endif
 #  else
 #    ifdef _S_IFLNK
 #      define S_ISLNK(m) ((m & S_IFMT) == _S_IFLNK)
@@ -563,11 +351,11 @@ test_l(obj, fname)
 #ifdef S_ISLNK
     struct stat st;
 
-    SafeStringValue(fname);
-    if (lstat(StringValueCStr(fname), &st) < 0) return Qfalse;
+    Check_SafeStr(fname);
+    if (lstat(RSTRING(fname)->ptr, &st) < 0) return Qfalse;
     if (S_ISLNK(st.st_mode)) return Qtrue;
-#endif
 
+#endif
     return Qfalse;
 }
 
@@ -578,14 +366,6 @@ test_S(obj, fname)
 #ifndef S_ISSOCK
 #  ifdef _S_ISSOCK
 #    define S_ISSOCK(m) _S_ISSOCK(m)
-#  elif defined __BORLANDC__
-#    ifdef _S_IFSOCK
-#      define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == _S_IFSOCK)
-#    else
-#      ifdef S_IFSOCK
-#        define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == S_IFSOCK)
-#      endif
-#    endif
 #  else
 #    ifdef _S_IFSOCK
 #      define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
@@ -640,7 +420,7 @@ test_c(obj, fname)
     struct stat st;
 
     if (rb_stat(fname, &st) < 0) return Qfalse;
-    if (S_ISCHR(st.st_mode)) return Qtrue;
+    if (S_ISBLK(st.st_mode)) return Qtrue;
 
     return Qfalse;
 }
@@ -659,8 +439,8 @@ static VALUE
 test_r(obj, fname)
     VALUE obj, fname;
 {
-    SafeStringValue(fname);
-    if (eaccess(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+    Check_SafeStr(fname);
+    if (eaccess(RSTRING(fname)->ptr, R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -668,8 +448,8 @@ static VALUE
 test_R(obj, fname)
     VALUE obj, fname;
 {
-    SafeStringValue(fname);
-    if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+    Check_SafeStr(fname);
+    if (access(RSTRING(fname)->ptr, R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -677,8 +457,8 @@ static VALUE
 test_w(obj, fname)
     VALUE obj, fname;
 {
-    SafeStringValue(fname);
-    if (eaccess(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+    Check_SafeStr(fname);
+    if (eaccess(RSTRING(fname)->ptr, W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -686,8 +466,8 @@ static VALUE
 test_W(obj, fname)
     VALUE obj, fname;
 {
-    SafeStringValue(fname);
-    if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+    Check_SafeStr(fname);
+    if (access(RSTRING(fname)->ptr, W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -695,8 +475,8 @@ static VALUE
 test_x(obj, fname)
     VALUE obj, fname;
 {
-    SafeStringValue(fname);
-    if (eaccess(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+    Check_SafeStr(fname);
+    if (eaccess(RSTRING(fname)->ptr, X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -704,8 +484,8 @@ static VALUE
 test_X(obj, fname)
     VALUE obj, fname;
 {
-    SafeStringValue(fname);
-    if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+    Check_SafeStr(fname);
+    if (access(RSTRING(fname)->ptr, X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -743,7 +523,7 @@ test_s(obj, fname)
 
     if (rb_stat(fname, &st) < 0) return Qnil;
     if (st.st_size == 0) return Qnil;
-    return OFFT2NUM(st.st_size);
+    return rb_int2inum(st.st_size);
 }
 
 static VALUE
@@ -772,7 +552,7 @@ static VALUE
 test_grpowned(obj, fname)
     VALUE obj, fname;
 {
-#ifndef _WIN32
+#ifndef NT
     struct stat st;
 
     if (rb_stat(fname, &st) < 0) return Qfalse;
@@ -783,14 +563,13 @@ test_grpowned(obj, fname)
 
 #if defined(S_ISUID) || defined(S_ISGID) || defined(S_ISVTX)
 static VALUE
-check3rdbyte(fname, mode)
-    VALUE fname;
+check3rdbyte(file, mode)
+    const char *file;
     int mode;
 {
     struct stat st;
 
-    SafeStringValue(fname);
-    if (stat(StringValueCStr(fname), &st) < 0) return Qfalse;
+    if (stat(file, &st) < 0) return Qfalse;
     if (st.st_mode & mode) return Qtrue;
     return Qfalse;
 }
@@ -801,7 +580,8 @@ test_suid(obj, fname)
     VALUE obj, fname;
 {
 #ifdef S_ISUID
-    return check3rdbyte(fname, S_ISUID);
+    Check_SafeStr(fname);
+    return check3rdbyte(RSTRING(fname)->ptr, S_ISUID);
 #else
     return Qfalse;
 #endif
@@ -811,8 +591,9 @@ static VALUE
 test_sgid(obj, fname)
     VALUE obj, fname;
 {
-#ifdef S_ISGID
-    return check3rdbyte(fname, S_ISGID);
+#ifndef NT
+    Check_SafeStr(fname);
+    return check3rdbyte(RSTRING(fname)->ptr, S_ISGID);
 #else
     return Qfalse;
 #endif
@@ -823,55 +604,64 @@ test_sticky(obj, fname)
     VALUE obj, fname;
 {
 #ifdef S_ISVTX
-    return check3rdbyte(fname, S_ISVTX);
+    return check3rdbyte(STR2CSTR(fname), S_ISVTX);
 #else
     return Qnil;
 #endif
 }
 
 static VALUE
-rb_file_s_size(klass, fname)
-    VALUE klass, fname;
+rb_file_s_size(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
     if (rb_stat(fname, &st) < 0)
-	rb_sys_fail(StringValueCStr(fname));
-    return OFFT2NUM(st.st_size);
+	rb_sys_fail(RSTRING(fname)->ptr);
+    return rb_int2inum(st.st_size);
 }
 
 static VALUE
-rb_file_ftype(st)
-    struct stat *st;
+rb_file_s_ftype(obj, fname)
+    VALUE obj, fname;
 {
+    struct stat st;
     char *t;
 
-    if (S_ISREG(st->st_mode)) {
-	t = "file";
+#if defined(MSDOS) || defined(NT)
+    if (rb_stat(fname, &st) < 0)
+	rb_sys_fail(RSTRING(fname)->ptr);
+#else
+    Check_SafeStr(fname);
+    if (lstat(RSTRING(fname)->ptr, &st) == -1) {
+	rb_sys_fail(RSTRING(fname)->ptr);
     }
-    else if (S_ISDIR(st->st_mode)) {
+#endif
+
+    if (S_ISREG(st.st_mode)) {
+	t = "file";
+    } else if (S_ISDIR(st.st_mode)) {
 	t = "directory";
-    }
-    else if (S_ISCHR(st->st_mode)) {
+    } else if (S_ISCHR(st.st_mode)) {
 	t = "characterSpecial";
     }
 #ifdef S_ISBLK
-    else if (S_ISBLK(st->st_mode)) {
+    else if (S_ISBLK(st.st_mode)) {
 	t = "blockSpecial";
     }
 #endif
 #ifdef S_ISFIFO
-    else if (S_ISFIFO(st->st_mode)) {
+    else if (S_ISFIFO(st.st_mode)) {
 	t = "fifo";
     }
 #endif
 #ifdef S_ISLNK
-    else if (S_ISLNK(st->st_mode)) {
+    else if (S_ISLNK(st.st_mode)) {
 	t = "link";
     }
 #endif
 #ifdef S_ISSOCK
-    else if (S_ISSOCK(st->st_mode)) {
+    else if (S_ISSOCK(st.st_mode)) {
 	t = "socket";
     }
 #endif
@@ -883,27 +673,13 @@ rb_file_ftype(st)
 }
 
 static VALUE
-rb_file_s_ftype(klass, fname)
-    VALUE klass, fname;
-{
-    struct stat st;
-
-    SafeStringValue(fname);
-    if (lstat(StringValueCStr(fname), &st) == -1) {
-	rb_sys_fail(RSTRING(fname)->ptr);
-    }
-
-    return rb_file_ftype(&st);
-}
-
-static VALUE
-rb_file_s_atime(klass, fname)
-    VALUE klass, fname;
+rb_file_s_atime(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
     if (rb_stat(fname, &st) < 0)
-	rb_sys_fail(StringValueCStr(fname));
+	rb_sys_fail(RSTRING(fname)->ptr);
     return rb_time_new(st.st_atime, 0);
 }
 
@@ -922,8 +698,8 @@ rb_file_atime(obj)
 }
 
 static VALUE
-rb_file_s_mtime(klass, fname)
-    VALUE klass, fname;
+rb_file_s_mtime(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
@@ -947,8 +723,8 @@ rb_file_mtime(obj)
 }
 
 static VALUE
-rb_file_s_ctime(klass, fname)
-    VALUE klass, fname;
+rb_file_s_ctime(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
@@ -976,7 +752,7 @@ chmod_internal(path, mode)
     const char *path;
     int mode;
 {
-    if (chmod(path, mode) < 0)
+    if (chmod(path, mode) == -1)
 	rb_sys_fail(path);
 }
 
@@ -987,15 +763,13 @@ rb_file_s_chmod(argc, argv)
 {
     VALUE vmode;
     VALUE rest;
-    int mode;
-    long n;
+    int mode, n;
 
-    rb_secure(2);
     rb_scan_args(argc, argv, "1*", &vmode, &rest);
     mode = NUM2INT(vmode);
 
-    n = apply2files(chmod_internal, rest, (void *)(long)mode);
-    return LONG2FIX(n);
+    n = apply2files(chmod_internal, rest, mode);
+    return INT2FIX(n);
 }
 
 static VALUE
@@ -1005,60 +779,21 @@ rb_file_chmod(obj, vmode)
     OpenFile *fptr;
     int mode;
 
-    rb_secure(2);
+    rb_secure(4);
     mode = NUM2INT(vmode);
 
     GetOpenFile(obj, fptr);
-#ifdef HAVE_FCHMOD
-    if (fchmod(fileno(fptr->f), mode) == -1)
+#if defined(DJGPP) || defined(NT) || defined(USE_CWGUSI) || defined(__BEOS__) || defined(__EMX__)
+    if (chmod(fptr->path, mode) == -1)
 	rb_sys_fail(fptr->path);
 #else
-    if (!fptr->path) return Qnil;
-    if (chmod(fptr->path, mode) == -1)
+    if (fchmod(fileno(fptr->f), mode) == -1)
 	rb_sys_fail(fptr->path);
 #endif
 
     return INT2FIX(0);
 }
 
-#if defined(HAVE_LCHMOD)
-static void
-lchmod_internal(path, mode)
-    const char *path;
-    int mode;
-{
-    if (lchmod(path, mode) < 0)
-	rb_sys_fail(path);
-}
-
-static VALUE
-rb_file_s_lchmod(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE vmode;
-    VALUE rest;
-    int mode;
-    long n;
-
-    rb_secure(2);
-    rb_scan_args(argc, argv, "1*", &vmode, &rest);
-    mode = NUM2INT(vmode);
-
-    n = apply2files(lchmod_internal, rest, (void *)(long)mode);
-    return LONG2FIX(n);
-}
-#else
-static VALUE
-rb_file_s_lchmod(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    rb_notimplement();
-    return Qnil;		/* not reached */
-}
-#endif
-
 struct chown_args {
     int owner, group;
 };
@@ -1079,9 +814,8 @@ rb_file_s_chown(argc, argv)
 {
     VALUE o, g, rest;
     struct chown_args arg;
-    long n;
+    int n;
 
-    rb_secure(2);
     rb_scan_args(argc, argv, "2*", &o, &g, &rest);
     if (NIL_P(o)) {
 	arg.owner = -1;
@@ -1097,7 +831,7 @@ rb_file_s_chown(argc, argv)
     }
 
     n = apply2files(chown_internal, rest, &arg);
-    return LONG2FIX(n);
+    return INT2FIX(n);
 }
 
 static VALUE
@@ -1106,10 +840,9 @@ rb_file_chown(obj, owner, group)
 {
     OpenFile *fptr;
 
-    rb_secure(2);
+    rb_secure(4);
     GetOpenFile(obj, fptr);
-#if defined(DJGPP) || defined(__CYGWIN32__) || defined(_WIN32) || defined(__EMX__)
-    if (!fptr->path) return Qnil;
+#if defined(DJGPP) || defined(__CYGWIN32__) || defined(NT) || defined(USE_CWGUSI) || defined(__EMX__)
     if (chown(fptr->path, NUM2INT(owner), NUM2INT(group)) == -1)
 	rb_sys_fail(fptr->path);
 #else
@@ -1120,56 +853,9 @@ rb_file_chown(obj, owner, group)
     return INT2FIX(0);
 }
 
-#if defined(HAVE_LCHOWN) && !defined(__CHECKER__)
-static void
-lchown_internal(path, args)
-    const char *path;
-    struct chown_args *args;
-{
-    if (lchown(path, args->owner, args->group) < 0)
-	rb_sys_fail(path);
-}
-
-static VALUE
-rb_file_s_lchown(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE o, g, rest;
-    struct chown_args arg;
-    long n;
-
-    rb_secure(2);
-    rb_scan_args(argc, argv, "2*", &o, &g, &rest);
-    if (NIL_P(o)) {
-	arg.owner = -1;
-    }
-    else {
-	arg.owner = NUM2INT(o);
-    }
-    if (NIL_P(g)) {
-	arg.group = -1;
-    }
-    else {
-	arg.group = NUM2INT(g);
-    }
-
-    n = apply2files(lchown_internal, rest, &arg);
-    return LONG2FIX(n);
-}
-#else
-static VALUE
-rb_file_s_lchown(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    rb_notimplement();
-}
-#endif
-
 struct timeval rb_time_timeval();
 
-#if defined(HAVE_UTIMES) && !defined(__CHECKER__)
+#ifdef HAVE_UTIMES
 
 static void
 utime_internal(path, tvp)
@@ -1187,7 +873,7 @@ rb_file_s_utime(argc, argv)
 {
     VALUE atime, mtime, rest;
     struct timeval tvp[2];
-    long n;
+    int n;
 
     rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
 
@@ -1195,16 +881,27 @@ rb_file_s_utime(argc, argv)
     tvp[1] = rb_time_timeval(mtime);
 
     n = apply2files(utime_internal, rest, tvp);
-    return LONG2FIX(n);
+    return INT2FIX(n);
 }
 
 #else
 
-#if !defined HAVE_UTIME_H && !defined HAVE_SYS_UTIME_H
+#ifndef HAVE_UTIME_H
+# ifdef NT
+#   if defined(__BORLANDC__)
+#     include <utime.h>
+#   else
+#  include <sys/utime.h>
+#   endif
+#   if defined(_MSC_VER)
+#  define utimbuf _utimbuf
+#   endif
+# else
 struct utimbuf {
     long actime;
     long modtime;
 };
+# endif
 #endif
 
 static void
@@ -1222,7 +919,7 @@ rb_file_s_utime(argc, argv)
     VALUE *argv;
 {
     VALUE atime, mtime, rest;
-    long n;
+    int n;
     struct timeval tv;
     struct utimbuf utbuf;
 
@@ -1234,49 +931,37 @@ rb_file_s_utime(argc, argv)
     utbuf.modtime = tv.tv_sec;
 
     n = apply2files(utime_internal, rest, &utbuf);
-    return LONG2FIX(n);
+    return INT2FIX(n);
 }
 
 #endif
 
-NORETURN(static void sys_fail2 _((VALUE,VALUE)));
-static void
-sys_fail2(s1, s2)
-    VALUE s1, s2;
-{
-    char *buf;
-    int len;
-
-    len = RSTRING(s1)->len + RSTRING(s2)->len + 5;
-    buf = ALLOCA_N(char, len);
-    snprintf(buf, len, "%s or %s", RSTRING(s1)->ptr, RSTRING(s2)->ptr);
-    rb_sys_fail(buf);
-}
-
 static VALUE
-rb_file_s_link(klass, from, to)
-    VALUE klass, from, to;
+rb_file_s_link(obj, from, to)
+    VALUE obj, from, to;
 {
-    SafeStringValue(from);
-    SafeStringValue(to);
+#if defined(USE_CWGUSI)
+        rb_notimplement();
+#else
+    Check_SafeStr(from);
+    Check_SafeStr(to);
 
-    if (link(StringValueCStr(from), StringValueCStr(to)) < 0) {
-	sys_fail2(from, to);
-    }
+    if (link(RSTRING(from)->ptr, RSTRING(to)->ptr) < 0)
+	rb_sys_fail(RSTRING(from)->ptr);
     return INT2FIX(0);
+#endif /* USE_CWGUSI */
 }
 
 static VALUE
-rb_file_s_symlink(klass, from, to)
-    VALUE klass, from, to;
+rb_file_s_symlink(obj, from, to)
+    VALUE obj, from, to;
 {
-#ifdef HAVE_SYMLINK
-    SafeStringValue(from);
-    SafeStringValue(to);
+#if !defined(MSDOS) && !defined(NT) && !defined(__EMX__)
+    Check_SafeStr(from);
+    Check_SafeStr(to);
 
-    if (symlink(StringValueCStr(from), StringValueCStr(to)) < 0) {
-	sys_fail2(from, to);
-    }
+    if (symlink(RSTRING(from)->ptr, RSTRING(to)->ptr) < 0)
+	rb_sys_fail(RSTRING(from)->ptr);
     return INT2FIX(0);
 #else
     rb_notimplement();
@@ -1285,29 +970,19 @@ rb_file_s_symlink(klass, from, to)
 }
 
 static VALUE
-rb_file_s_readlink(klass, path)
-    VALUE klass, path;
-{
-#ifdef HAVE_READLINK
-    char *buf;
-    int size = 100;
-    int rv;
-    VALUE v;
-
-    SafeStringValue(path);
-    buf = xmalloc(size);
-    while ((rv = readlink(StringValueCStr(path), buf, size)) == size) {
-	size *= 2;
-	buf = xrealloc(buf, size);
-    }
-    if (rv < 0) {
-	free(buf);
+rb_file_s_readlink(obj, path)
+    VALUE obj, path;
+{
+#if !defined(MSDOS) && !defined(NT) && !defined(__EMX__)
+    char buf[MAXPATHLEN];
+    int cc;
+
+    Check_SafeStr(path);
+
+    if ((cc = readlink(RSTRING(path)->ptr, buf, MAXPATHLEN)) < 0)
 	rb_sys_fail(RSTRING(path)->ptr);
-    }
-    v = rb_tainted_str_new(buf, rv);
-    free(buf);
 
-    return v;
+    return rb_tainted_str_new(buf, cc);
 #else
     rb_notimplement();
     return Qnil;		/* not reached */
@@ -1323,44 +998,24 @@ unlink_internal(path)
 }
 
 static VALUE
-rb_file_s_unlink(klass, args)
-    VALUE klass, args;
+rb_file_s_unlink(obj, args)
+    VALUE obj, args;
 {
-    long n;
+    int n;
 
-    rb_secure(2);
     n = apply2files(unlink_internal, args, 0);
-    return LONG2FIX(n);
+    return INT2FIX(n);
 }
 
 static VALUE
-rb_file_s_rename(klass, from, to)
-    VALUE klass, from, to;
-{
-    const char *src, *dst;
-    SafeStringValue(from);
-    SafeStringValue(to);
-
-    src = StringValueCStr(from);
-    dst = StringValueCStr(to);
-    if (rename(src, dst) < 0) {
-#if defined __CYGWIN__
-	extern unsigned long __attribute__((stdcall)) GetLastError();
-	errno = GetLastError(); /* This is a Cygwin bug */
-#elif defined DOSISH && !defined _WIN32
-	if (errno == EEXIST
-#if defined (__EMX__)
-	    || errno == EACCES
-#endif
-	    ) {
-	    if (chmod(dst, 0666) == 0 &&
-		unlink(dst) == 0 &&
-		rename(src, dst) == 0)
-		return INT2FIX(0);
-	}
-#endif
-	sys_fail2(from, to);
-    }
+rb_file_s_rename(obj, from, to)
+    VALUE obj, from, to;
+{
+    Check_SafeStr(from);
+    Check_SafeStr(to);
+
+    if (rename(RSTRING(from)->ptr, RSTRING(to)->ptr) < 0)
+	rb_sys_fail(RSTRING(from)->ptr);
 
     return INT2FIX(0);
 }
@@ -1370,9 +1025,12 @@ rb_file_s_umask(argc, argv)
     int argc;
     VALUE *argv;
 {
+#ifdef USE_CWGUSI
+    rb_notimplement();
+#else
     int omask = 0;
 
-    rb_secure(2);
+    rb_secure(4);
     if (argc == 0) {
 	omask = umask(0);
 	umask(omask);
@@ -1381,217 +1039,54 @@ rb_file_s_umask(argc, argv)
 	omask = umask(NUM2INT(argv[0]));
     }
     else {
-	rb_raise(rb_eArgError, "wrong number of argument");
+	rb_raise(rb_eArgError, "wrong # of argument");
     }
     return INT2FIX(omask);
+#endif /* USE_CWGUSI */
 }
 
-#if defined DOSISH
-#define DOSISH_UNC
-#define isdirsep(x) ((x) == '/' || (x) == '\\')
-#else
-#define isdirsep(x) ((x) == '/')
-#endif
-#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
-# if defined(DJGPP)
-#   define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
-# else
-#   define CharNext(p) ((p) + 1)
-# endif
-#endif
-
-#ifdef __CYGWIN__
-#undef DOSISH
-#define DOSISH_UNC
-#define DOSISH_DRIVE_LETTER
-#endif
-
-#ifdef DOSISH_DRIVE_LETTER
-static inline int
-has_drive_letter(buf)
-    const char *buf;
-{
-    if (ISALPHA(buf[0]) && buf[1] == ':') {
-	return 1;
-    }
-    else {
-	return 0;
-    }
-}
-
-static void
-getcwdofdrv(drv, buf, len)
-    int drv;
-    char *buf;
-    int len;
-{
-    char drive[4];
-    char oldcwd[MAXPATHLEN+1];
-
-    drive[0] = drv;
-    drive[1] = ':';
-    drive[2] = '\0';
-
-    /* the only way that I know to get the current directory
-       of a particular drive is to change chdir() to that drive,
-       so save the old cwd before chdir()
-    */
-    getcwd(oldcwd, MAXPATHLEN);
-    if (chdir(drive) == 0) {
-	getcwd(buf, len);
-	chdir(oldcwd);
-    }
-    else {
-	/* perhaps the drive is not exist. we return only drive letter */
-	strncpy(buf, drive, len);
-    }
-}
-#endif
-
-static inline char *
-skiproot(path)
-    const char *path;
-{
-#ifdef DOSISH_DRIVE_LETTER
-    if (has_drive_letter(path)) path += 2;
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__)
+#define DOSISH 1
 #endif
-    while (isdirsep(*path)) path++;
-    return (char *)path;
-}
-
-static inline char *
-nextdirsep(s)
-    const char *s;
-{
-    while (*s && !isdirsep(*s)) {
-	s = CharNext(s);
-    }
-    return (char *)s;
-}
 
-#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER) 
-static inline char *
-skipprefix(path)
-    const char *path;
-{
-#ifdef DOSISH_UNC
-    if (isdirsep(path[0]) && isdirsep(path[1])) {
-	if (*(path = nextdirsep(path + 2)))
-	    path = nextdirsep(path + 1);
-	return (char *)path;
-    }
-#endif
-#ifdef DOSISH_DRIVE_LETTER
-    if (has_drive_letter(path))
-	return (char *)(path + 2);
-#endif
-    return (char *)path;
-}
+#if defined DOSISH
+#define ispathsep(x) ((x) == '/' || (x) == '\\')
 #else
-#define skipprefix(path) (path)
+#define ispathsep(x) ((x) == '/')
 #endif
 
-static char *
-strrdirsep(path)
-    const char *path;
-{
-    char *last = NULL;
-    while (*path) {
-	if (isdirsep(*path)) {
-	    const char *tmp = path++;
-	    while (isdirsep(*path)) path++;
-	    if (!*path) break;
-	    last = (char *)tmp;
-	}
-	else {
-	    path = CharNext(path);
-	}
-    }
-    return last;
-}
-
-static char *
-chompdirsep(path)
-    const char *path;
-{
-    while (*path) {
-	if (isdirsep(*path)) {
-	    const char *last = path++;
-	    while (isdirsep(*path)) path++;
-	    if (!*path) return (char *)last;
-	}
-	else {
-	    path = CharNext(path);
-	}
-    }
-    return (char *)path;
-}
-
-#define BUFCHECK(cond) do {\
-    long bdiff = p - buf;\
-    while (cond) {\
-	buflen *= 2;\
-    }\
-    rb_str_resize(result, buflen);\
-    buf = RSTRING(result)->ptr;\
-    p = buf + bdiff;\
-    pend = buf + buflen;\
-} while (0)
-
-#define BUFINIT() (\
-    p = buf = RSTRING(result)->ptr,\
-    buflen = RSTRING(result)->len,\
-    pend = p + buflen)
-
-#if !defined(TOLOWER)
-#define TOLOWER(c) (ISUPPER(c) ? tolower(c) : (c))
-#endif
-
-static int is_absolute_path _((const char*));
-
-static VALUE
-file_expand_path(fname, dname, result)
-    VALUE fname, dname, result;
+VALUE
+rb_file_s_expand_path(argc, argv)
+    int argc;
+    VALUE *argv;
 {
-    char *s, *buf, *b, *p, *pend, *root;
-    long buflen, dirlen;
-    int tainted;
+    VALUE fname, dname;
+    char *s, *p;
+    char buf[MAXPATHLEN+2];
 
-    s = StringValuePtr(fname);
-    BUFINIT();
-    tainted = OBJ_TAINTED(fname);
+    rb_scan_args(argc, argv, "11", &fname, &dname);
 
+    s = STR2CSTR(fname);
+    p = buf;
     if (s[0] == '~') {
-	if (isdirsep(s[1]) || s[1] == '\0') {
+	if (ispathsep(s[1]) || s[1] == '\0') {
 	    char *dir = getenv("HOME");
 
 	    if (!dir) {
 		rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `%s'", s);
 	    }
-	    dirlen = strlen(dir);
-	    BUFCHECK(dirlen > buflen);
 	    strcpy(buf, dir);
-#if defined DOSISH || defined __CYGWIN__
-	    for (p = buf; *p; p = CharNext(p)) {
-		if (*p == '\\') {
-		    *p = '/';
-		}
-	    }
-#else
-	    p = buf + strlen(dir);
-#endif
+	    p = &buf[strlen(buf)];
 	    s++;
-	    tainted = 1;
 	}
 	else {
 #ifdef HAVE_PWD_H
 	    struct passwd *pwPtr;
 	    s++;
 #endif
-	    s = nextdirsep(b = s);
-	    BUFCHECK(bdiff + (s-b) >= buflen);
-	    memcpy(p, b, s-b);
-	    p += s-b;
+	    while (*s && !ispathsep(*s)) {
+		*p++ = *s++;
+	    }
 	    *p = '\0';
 #ifdef HAVE_PWD_H
 	    pwPtr = getpwnam(buf);
@@ -1599,172 +1094,78 @@ file_expand_path(fname, dname, result)
 		endpwent();
 		rb_raise(rb_eArgError, "user %s doesn't exist", buf);
 	    }
-	    dirlen = strlen(pwPtr->pw_dir);
-	    BUFCHECK(dirlen > buflen);
 	    strcpy(buf, pwPtr->pw_dir);
-	    p = buf + strlen(pwPtr->pw_dir);
+	    p = &buf[strlen(buf)];
 	    endpwent();
 #endif
 	}
     }
-#ifdef DOSISH_DRIVE_LETTER
-    /* skip drive letter */
-    else if (has_drive_letter(s)) {
-	if (isdirsep(s[2])) {
-	    /* specified drive letter, and full path */
-	    /* skip drive letter */
-	    BUFCHECK(bdiff + 2 >= buflen);
-	    memcpy(p, s, 2);
-	    p += 2;
-	    s += 2;
-	}
-	else {
-	    /* specified drive, but not full path */
-	    int same = 0;
-	    if (!NIL_P(dname)) {
-		file_expand_path(dname, Qnil, result);
-		BUFINIT();
-		if (has_drive_letter(p) && TOLOWER(p[0]) == TOLOWER(s[0])) {
-		    /* ok, same drive */
-		    same = 1;
-		}
-	    }
-	    if (!same) {
-		BUFCHECK(buflen < MAXPATHLEN);
-		getcwdofdrv(*s, buf, MAXPATHLEN);
-		tainted = 1;
-	    }
-	    p = chompdirsep(skiproot(buf));
-	    s += 2;
+#if defined DOSISH
+    else if (isalpha(s[0]) && s[1] == ':' && ispathsep(s[2])) {
+	while (*s && !ispathsep(*s)) {
+	    *p++ = *s++;
 	}
     }
 #endif
-    else if (!is_absolute_path(s)) {
-	if (!NIL_P(dname)) {
-	    file_expand_path(dname, Qnil, result);
-	    BUFINIT();
+    else if (s[0] != '/') {
+	if (argc == 2) {
+	    dname = rb_file_s_expand_path(1, &dname);
+	    strcpy(buf, RSTRING(dname)->ptr);
 	}
 	else {
-	    char *dir = my_getcwd();
-
-	    tainted = 1;
-	    dirlen = strlen(dir);
-	    BUFCHECK(dirlen > buflen);
-	    strcpy(buf, dir);
-	    free(dir);
-	}
-#if defined DOSISH || defined __CYGWIN__
-	if (isdirsep(*s)) {
-	    /* specified full path, but not drive letter nor UNC */
-	    /* we need to get the drive letter or UNC share name */
-	    p = skipprefix(buf);
-	}
-	else
+#ifdef HAVE_GETCWD
+	    getcwd(buf, MAXPATHLEN);
+#else
+	    getwd(buf);
 #endif
-	    p = chompdirsep(skiproot(buf));
-    }
-    else {
-	b = s;
-	do s++; while (isdirsep(*s));
-	p = buf + (s - b);
-	BUFCHECK(bdiff >= buflen);
-	memset(buf, '/', p - buf);
+	}
+	p = &buf[strlen(buf)];
+	while (p > buf && *(p - 1) == '/') p--;
     }
-    if (p > buf && p[-1] == '/')
-	--p;
-    else
-	*p = '/';
-
-    p[1] = 0;
-    root = skipprefix(buf);
+    *p = '/';
 
-    b = s;
-    while (*s) {
+    for ( ; *s; s++) {
 	switch (*s) {
 	  case '.':
-	    if (b == s++) {	/* beginning of path element */
-		switch (*s) {
-		  case '\0':
-		    b = s;
-		    break;
+	    if (*(s+1)) {
+		switch (*++s) {
 		  case '.':
-		    if (*(s+1) == '\0' || isdirsep(*(s+1))) {
+		    if (*(s+1) == '\0' || ispathsep(*(s+1))) { 
 			/* We must go back to the parent */
-			*p = '\0';
-			if (!(b = strrdirsep(root))) {
-			    *p = '/';
-			}
-			else {
-			    p = b;
-			}
-			b = ++s;
+			if (ispathsep(*p) && p > buf) p--;
+			while (p > buf && !ispathsep(*p)) p--;
+		    }
+		    else {
+			*++p = '.';
+			*++p = '.';
 		    }
 		    break;
 		  case '/':
-#if defined DOSISH || defined __CYGWIN__
+#if defined DOSISH
 		  case '\\':
 #endif
-		    b = ++s;
+		    if (!ispathsep(*p)) *++p = '/'; 
 		    break;
 		  default:
-		    /* ordinary path element, beginning don't move */
-		    break;
+		    *++p = '.'; *++p = *s; break;
 		}
 	    }
 	    break;
 	  case '/':
-#if defined DOSISH || defined __CYGWIN__
+#if defined DOSISH
 	  case '\\':
 #endif
-	    if (s > b) {
-		long rootdiff = root - buf;
-		BUFCHECK(bdiff + (s-b+1) >= buflen);
-		root = buf + rootdiff;
-		memcpy(++p, b, s-b);
-		p += s-b;
-		*p = '/';
-	    }
-	    b = ++s;
-	    break;
+	    if (!ispathsep(*p)) *++p = '/'; break;
 	  default:
-	    s = CharNext(s);
-	    break;
+	    *++p = *s;
 	}
     }
-
-    if (s > b) {
-	BUFCHECK(bdiff + (s-b) >= buflen);
-	memcpy(++p, b, s-b);
-	p += s-b;
-    }
-    if (p == skiproot(buf) - 1) p++;
-
-    if (tainted) OBJ_TAINT(result);
-    RSTRING(result)->len = p - buf;
+  
+    /* Place a \0 at end. If path ends with a "/", delete it */
+    if (p == buf || !ispathsep(*p)) p++;
     *p = '\0';
-    return result;
-}
 
-VALUE
-rb_file_expand_path(fname, dname)
-    VALUE fname, dname;
-{
-    return file_expand_path(fname, dname, rb_str_new(0, MAXPATHLEN + 2));
-}
-
-VALUE
-rb_file_s_expand_path(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE fname, dname;
-
-    if (argc == 1) {
-	return rb_file_expand_path(argv[0], Qnil);
-    }
-    rb_scan_args(argc, argv, "11", &fname, &dname);
-
-    return rb_file_expand_path(fname, dname);
+    return rb_tainted_str_new2(buf);
 }
 
 static int
@@ -1773,9 +1174,9 @@ rmext(p, e)
 {
     int l1, l2;
 
+    l1 = strlen(p);
     if (!e) return 0;
 
-    l1 = chompdirsep(p) - p;
     l2 = strlen(e);
     if (l2 == 2 && e[1] == '*') {
 	e = strrchr(p, *e);
@@ -1784,7 +1185,7 @@ rmext(p, e)
     }
     if (l1 < l2) return l1;
 
-    if (strncmp(p+l1-l2, e, l2) == 0) {
+    if (strcmp(p+l1-l2, e) == 0) {
 	return l1-l2;
     }
     return 0;
@@ -1795,206 +1196,86 @@ rb_file_s_basename(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE fname, fext, basename;
-    char *name, *p, *ext = NULL;
+    VALUE fname, fext;
+    char *name, *p, *ext;
     int f;
 
     if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) {
-	ext = StringValueCStr(fext);
-    }
-    StringValue(fname);
-    if (RSTRING(fname)->len == 0 || !*(name = RSTRING(fname)->ptr))
-	return fname;
-    if (!*(name = skiproot(name))) {
-	p = name - 1;
-	f = 1;
-#ifdef DOSISH_DRIVE_LETTER
-	if (*p == ':') {
-	    p++;
-	    f = 0;
-	}
-#endif
+	ext = STR2CSTR(fext);
     }
-    else if (!(p = strrdirsep(name))) {
-	if (NIL_P(fext) || !(f = rmext(name, ext))) {
-	    f = chompdirsep(name) - name;
-	    if (f == RSTRING(fname)->len) return fname;
+    name = STR2CSTR(fname);
+    p = strrchr(name, '/');
+    if (!p) {
+	if (!NIL_P(fext)) {
+	    f = rmext(name, ext);
+	    if (f) return rb_str_new(name, f);
 	}
-	p = name;
+	return fname;
     }
-    else {
-	while (isdirsep(*p)) p++; /* skip last / */
-	if (NIL_P(fext) || !(f = rmext(p, ext))) {
-	    f = chompdirsep(p) - p;
-	}
+    p++;			/* skip last `/' */
+    if (!NIL_P(fext)) {
+	f = rmext(p, ext);
+	if (f) return rb_str_new(p, f);
     }
-    basename = rb_str_new(p, f);
-    OBJ_INFECT(basename, fname);
-    return basename;
+    return rb_tainted_str_new2(p);
 }
 
 static VALUE
-rb_file_s_dirname(klass, fname)
-    VALUE klass, fname;
+rb_file_s_dirname(obj, fname)
+    VALUE obj, fname;
 {
-    char *name, *root, *p;
-    VALUE dirname;
+    char *name, *p;
 
-    name = StringValueCStr(fname);
-    root = skiproot(name);
-#ifdef DOSISH_UNC
-    if (root > name + 2 && isdirsep(*name))
-	name = root - 2;
-#else
-    if (root > name + 1)
-	name = root - 1;
-#endif
-    p = strrdirsep(root);
+    name = STR2CSTR(fname);
+    p = strrchr(name, '/');
     if (!p) {
-	p = root;
+	return rb_str_new2(".");
     }
     if (p == name)
-	return rb_str_new2(".");
-    dirname = rb_str_new(name, p - name);
-#ifdef DOSISH_DRIVE_LETTER
-    if (root == name + 2 && name[1] == ':')
-	rb_str_cat(dirname, ".", 1);
-#endif
-    OBJ_INFECT(dirname, fname);
-    return dirname;
+	p++;
+    return rb_tainted_str_new(name, p - name);
 }
 
 static VALUE
-rb_file_s_extname(klass, fname)
-    VALUE klass, fname;
-{
-    char *name, *p, *e;
-    VALUE extname;
-
-    name = StringValueCStr(fname);
-    p = strrdirsep(name);	/* get the last path component */
-    if (!p)
- 	p = name;
-    else
- 	p++;
- 
-     e = strrchr(p, '.');	/* get the last dot of the last component */
-     if (!e || e == p)		/* no dot, or the only dot is first? */
-	 return rb_str_new2("");
-     extname = rb_str_new(e, chompdirsep(e) - e);	/* keep the dot, too! */
-     OBJ_INFECT(extname, fname);
-     return extname;
-}
-
-static VALUE
-rb_file_s_split(klass, path)
-    VALUE klass, path;
+rb_file_s_split(obj, path)
+    VALUE obj, path;
 {
-    StringValue(path);		/* get rid of converting twice */
     return rb_assoc_new(rb_file_s_dirname(Qnil, path), rb_file_s_basename(1,&path));
 }
 
 static VALUE separator;
 
-static VALUE rb_file_join _((VALUE ary, VALUE sep));
-
-static VALUE
-file_inspect_join(ary, arg)
-    VALUE ary;
-    VALUE *arg;
-{
-    return rb_file_join(arg[0], arg[1]);
-}
-
-static VALUE
-rb_file_join(ary, sep)
-    VALUE ary, sep;
-{
-    long len, i;
-    int taint = 0;
-    VALUE result, tmp;
-    char *name;
-
-    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-    if (OBJ_TAINTED(ary)) taint = 1;
-    if (OBJ_TAINTED(sep)) taint = 1;
-
-    len = 1;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	if (TYPE(RARRAY(ary)->ptr[i]) == T_STRING) {
-	    len += RSTRING(RARRAY(ary)->ptr[i])->len;
-	}
-	else {
-	    len += 10;
-	}
-    }
-    if (!NIL_P(sep) && TYPE(sep) == T_STRING) {
-	len += RSTRING(sep)->len * RARRAY(ary)->len - 1;
-    }
-    result = rb_str_buf_new(len);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	tmp = RARRAY(ary)->ptr[i];
-	switch (TYPE(tmp)) {
-	  case T_STRING:
-	    break;
-	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
-		tmp = rb_str_new2("[...]");
-	    }
-	    else {
-		VALUE args[2];
-
-		args[0] = tmp;
-		args[1] = sep;
-		tmp = rb_protect_inspect(file_inspect_join, ary, (VALUE)args);
-	    }
-	    break;
-	  default:
-	    tmp = rb_obj_as_string(tmp);
-	}
-	name = StringValueCStr(result);
-	if (i > 0 && !NIL_P(sep) && !*chompdirsep(name))
-	    rb_str_buf_append(result, sep);
-	rb_str_buf_append(result, tmp);
-	if (OBJ_TAINTED(tmp)) taint = 1;
-    }
-
-    if (taint) OBJ_TAINT(result);
-    return result;
-}
-
 static VALUE
-rb_file_s_join(klass, args)
-    VALUE klass, args;
+rb_file_s_join(obj, args)
+    VALUE obj, args;
 {
-    return rb_file_join(args, separator);
+    return rb_ary_join(args, separator);
 }
 
 static VALUE
-rb_file_s_truncate(klass, path, len)
-    VALUE klass, path, len;
+rb_file_s_truncate(obj, path, len)
+    VALUE obj, path, len;
 {
-    rb_secure(2);
-    SafeStringValue(path);
+    Check_SafeStr(path);
 
 #ifdef HAVE_TRUNCATE
-    if (truncate(StringValueCStr(path), NUM2OFFT(len)) < 0)
+    if (truncate(RSTRING(path)->ptr, NUM2INT(len)) < 0)
 	rb_sys_fail(RSTRING(path)->ptr);
 #else
 # ifdef HAVE_CHSIZE
     {
 	int tmpfd;
 
-#  ifdef _WIN32
-	if ((tmpfd = open(StringValueCStr(path), O_RDWR)) < 0) {
+#  if defined(NT)
+	if ((tmpfd = open(RSTRING(path)->ptr, O_RDWR)) < 0) {
 	    rb_sys_fail(RSTRING(path)->ptr);
 	}
 #  else
-	if ((tmpfd = open(StringValueCStr(path), 0)) < 0) {
+	if ((tmpfd = open(RSTRING(path)->ptr, 0)) < 0) {
 	    rb_sys_fail(RSTRING(path)->ptr);
 	}
 #  endif
-	if (chsize(tmpfd, NUM2OFFT(len)) < 0) {
+	if (chsize(tmpfd, NUM2INT(len)) < 0) {
 	    close(tmpfd);
 	    rb_sys_fail(RSTRING(path)->ptr);
 	}
@@ -2013,17 +1294,17 @@ rb_file_truncate(obj, len)
 {
     OpenFile *fptr;
 
-    rb_secure(2);
+    rb_secure(4);
     GetOpenFile(obj, fptr);
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
 #ifdef HAVE_TRUNCATE
-    if (ftruncate(fileno(fptr->f), NUM2OFFT(len)) < 0)
+    if (ftruncate(fileno(fptr->f), NUM2INT(len)) < 0)
 	rb_sys_fail(fptr->path);
 #else
 # ifdef HAVE_CHSIZE
-    if (chsize(fileno(fptr->f), NUM2OFFT(len)) < 0)
+    if (chsize(fileno(fptr->f), NUM2INT(len)) < 0)
 	rb_sys_fail(fptr->path);
 # else
     rb_notimplement();
@@ -2045,7 +1326,7 @@ rb_file_truncate(obj, len)
 #  define LOCK_UN 8
 # endif
 
-#if 0
+#if defined(EWOULDBLOCK)
 static int
 rb_thread_flock(fd, op, fptr)
     int fd, op;
@@ -2057,14 +1338,11 @@ rb_thread_flock(fd, op, fptr)
     op |= LOCK_NB;
     while (flock(fd, op) < 0) {
 	switch (errno) {
-          case EAGAIN:
-          case EACCES:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EINTR:		/* can be happen? */
 	  case EWOULDBLOCK:
-#endif
-	    rb_thread_polling();	/* busy wait */
+	    rb_thread_schedule();	/* busy wait */
 	    rb_io_check_closed(fptr);
-            continue;
+	    break;
 	  default:
 	    return -1;
 	}
@@ -2079,38 +1357,24 @@ rb_file_flock(obj, operation)
     VALUE obj;
     VALUE operation;
 {
-#ifndef __CHECKER__
+#ifdef USE_CWGUSI
+    rb_notimplement();
+#else
     OpenFile *fptr;
-    int ret;
 
-    rb_secure(2);
+    rb_secure(4);
     GetOpenFile(obj, fptr);
 
-    if (fptr->mode & FMODE_WRITABLE) {
-	fflush(GetWriteFile(fptr));
-    }
-  retry:
-    TRAP_BEG;
-    ret = flock(fileno(fptr->f), NUM2INT(operation));
-    TRAP_END;
-    if (ret < 0) {
-        switch (errno) {
-          case EAGAIN:
-          case EACCES:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-          case EWOULDBLOCK:
-#endif
-              return Qfalse;
-	  case EINTR:
-#if defined(ERESTART)
-	  case ERESTART:
+    if (flock(fileno(fptr->f), NUM2INT(operation)) < 0) {
+#ifdef EWOULDBLOCK
+	if (errno == EWOULDBLOCK) {
+	    return Qfalse;
+	}
 #endif
-	    goto retry;
-        }
 	rb_sys_fail(fptr->path);
     }
-#endif
     return INT2FIX(0);
+#endif /* USE_CWGUSI */
 }
 #undef flock
 
@@ -2122,15 +1386,17 @@ test_check(n, argc, argv)
     int i;
 
     n+=1;
-    if (n != argc) rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)", argc, n);
+    if (n < argc) rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)", argc, n);
     for (i=1; i<n; i++) {
 	switch (TYPE(argv[i])) {
 	  case T_STRING:
-	  default:
-	    SafeStringValue(argv[i]);
+	    Check_SafeStr(argv[i]);
 	    break;
 	  case T_FILE:
 	    break;
+	  default:
+	    Check_Type(argv[i], T_STRING);
+	    break;
 	}
     }
 }
@@ -2144,12 +1410,7 @@ rb_f_test(argc, argv)
 {
     int cmd;
 
-    if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments");
-#if 0 /* 1.7 behavior? */
-    if (argc == 1) {
-	return RTEST(argv[0]) ? Qtrue : Qfalse;
-    }
-#endif
+    if (argc == 0) rb_raise(rb_eArgError, "wrong # of arguments");
     cmd = NUM2CHR(argv[0]);
     if (cmd == 0) return Qfalse;
     if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {
@@ -2253,642 +1514,71 @@ rb_f_test(argc, argv)
 	  case '-':
 	    if (st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino)
 		return Qtrue;
-            return Qfalse;
+	    break;
 
 	  case '=':
 	    if (st1.st_mtime == st2.st_mtime) return Qtrue;
-	    return Qfalse;
+	    break;
 
 	  case '>':
 	    if (st1.st_mtime > st2.st_mtime) return Qtrue;
-	    return Qfalse;
+	    break;
 
 	  case '<':
 	    if (st1.st_mtime < st2.st_mtime) return Qtrue;
-	    return Qfalse;
-        }
+	    break;
+	}
     }
     /* unknown command */
     rb_raise(rb_eArgError, "unknown command ?%c", cmd);
     return Qnil;		/* not reached */
 }
 
-static VALUE rb_stat_s_alloc _((VALUE));
-static VALUE
-rb_stat_s_alloc(klass)
-    VALUE klass;
-{
-    return stat_new_0(klass, 0);
-}
-
-static VALUE
-rb_stat_init(obj, fname)
-    VALUE obj, fname;
-{
-    struct stat st, *nst;
-
-    SafeStringValue(fname);
-
-    if (stat(StringValueCStr(fname), &st) == -1) {
-	rb_sys_fail(RSTRING(fname)->ptr);
-    }
-    if (DATA_PTR(obj)) {
-	free(DATA_PTR(obj));
-	DATA_PTR(obj) = NULL;
-    }
-    nst = ALLOC(struct stat);
-    *nst = st;
-    DATA_PTR(obj) = nst;
-
-    return Qnil;
-}
-
-static VALUE
-rb_stat_init_copy(copy, orig)
-    VALUE copy, orig;
-{
-    struct stat *nst;
-
-    if (copy == orig) return orig;
-    rb_check_frozen(copy);
-    /* need better argument type check */
-    if (!rb_obj_is_instance_of(orig, rb_obj_class(copy))) {
-	rb_raise(rb_eTypeError, "wrong argument class");
-    }
-    if (DATA_PTR(copy)) {
-	free(DATA_PTR(copy));
-	DATA_PTR(copy) = 0;
-    }
-    if (DATA_PTR(orig)) {
-	nst = ALLOC(struct stat);
-	*nst = *(struct stat*)DATA_PTR(orig);
-	DATA_PTR(copy) = nst;
-    }
-
-    return copy;
-}
-
-static VALUE
-rb_stat_ftype(obj)
-    VALUE obj;
-{
-    return rb_file_ftype(get_stat(obj));
-}
-
-static VALUE
-rb_stat_d(obj)
-    VALUE obj;
-{
-    if (S_ISDIR(get_stat(obj)->st_mode)) return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_p(obj)
-    VALUE obj;
-{
-#ifdef S_IFIFO
-    if (S_ISFIFO(get_stat(obj)->st_mode)) return Qtrue;
-
-#endif
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_l(obj)
-    VALUE obj;
-{
-#ifdef S_ISLNK
-    if (S_ISLNK(get_stat(obj)->st_mode)) return Qtrue;
-#endif
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_S(obj)
-    VALUE obj;
-{
-#ifdef S_ISSOCK
-    if (S_ISSOCK(get_stat(obj)->st_mode)) return Qtrue;
-
-#endif
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_b(obj)
-    VALUE obj;
-{
-#ifdef S_ISBLK
-    if (S_ISBLK(get_stat(obj)->st_mode)) return Qtrue;
-
-#endif
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_c(obj)
-    VALUE obj;
-{
-    if (S_ISCHR(get_stat(obj)->st_mode)) return Qtrue;
-
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_owned(obj)
-    VALUE obj;
-{
-    if (get_stat(obj)->st_uid == geteuid()) return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_rowned(obj)
-    VALUE obj;
-{
-    if (get_stat(obj)->st_uid == getuid()) return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_grpowned(obj)
-    VALUE obj;
-{
-#ifndef _WIN32
-    if (get_stat(obj)->st_gid == getegid()) return Qtrue;
-#endif
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_r(obj)
-    VALUE obj;
-{
-    struct stat *st = get_stat(obj);
-
-#ifdef S_IRUSR
-    if (rb_stat_owned(obj))
-	return st->st_mode & S_IRUSR ? Qtrue : Qfalse;
-#endif
-#ifdef S_IRGRP
-    if (rb_stat_grpowned(obj))
-	return st->st_mode & S_IRGRP ? Qtrue : Qfalse;
-#endif
-#ifdef S_IROTH
-    if (!(st->st_mode & S_IROTH)) return Qfalse;
-#endif
-    return Qtrue;
-}
-
-static VALUE
-rb_stat_R(obj)
-    VALUE obj;
-{
-    struct stat *st = get_stat(obj);
-
-#ifdef S_IRUSR
-    if (rb_stat_rowned(obj))
-	return st->st_mode & S_IRUSR ? Qtrue : Qfalse;
-#endif
-#ifdef S_IRGRP
-    if (group_member(get_stat(obj)->st_gid))
-	return st->st_mode & S_IRGRP ? Qtrue : Qfalse;
-#endif
-#ifdef S_IROTH
-    if (!(st->st_mode & S_IROTH)) return Qfalse;
-#endif
-    return Qtrue;
-}
-
-static VALUE
-rb_stat_w(obj)
-    VALUE obj;
-{
-    struct stat *st = get_stat(obj);
-
-#ifdef S_IWUSR
-    if (rb_stat_owned(obj))
-	return st->st_mode & S_IWUSR ? Qtrue : Qfalse;
-#endif
-#ifdef S_IWGRP
-    if (rb_stat_grpowned(obj))
-	return st->st_mode & S_IWGRP ? Qtrue : Qfalse;
-#endif
-#ifdef S_IWOTH
-    if (!(st->st_mode & S_IWOTH)) return Qfalse;
-#endif
-    return Qtrue;
-}
-
-static VALUE
-rb_stat_W(obj)
-    VALUE obj;
-{
-    struct stat *st = get_stat(obj);
-
-#ifdef S_IWUSR
-    if (rb_stat_rowned(obj))
-	return st->st_mode & S_IWUSR ? Qtrue : Qfalse;
-#endif
-#ifdef S_IWGRP
-    if (group_member(get_stat(obj)->st_gid))
-	return st->st_mode & S_IWGRP ? Qtrue : Qfalse;
-#endif
-#ifdef S_IWOTH
-    if (!(st->st_mode & S_IWOTH)) return Qfalse;
-#endif
-    return Qtrue;
-}
-
-static VALUE
-rb_stat_x(obj)
-    VALUE obj;
-{
-    struct stat *st = get_stat(obj);
-
-#ifdef S_IXUSR
-    if (rb_stat_owned(obj))
-	return st->st_mode & S_IXUSR ? Qtrue : Qfalse;
-#endif
-#ifdef S_IXGRP
-    if (rb_stat_grpowned(obj))
-	return st->st_mode & S_IXGRP ? Qtrue : Qfalse;
-#endif
-#ifdef S_IXOTH
-    if (!(st->st_mode & S_IXOTH)) return Qfalse;
-#endif
-    return Qtrue;
-}
-
-static VALUE
-rb_stat_X(obj)
-    VALUE obj;
-{
-    struct stat *st = get_stat(obj);
-
-#ifdef S_IXUSR
-    if (rb_stat_rowned(obj))
-	return st->st_mode & S_IXUSR ? Qtrue : Qfalse;
-#endif
-#ifdef S_IXGRP
-    if (group_member(get_stat(obj)->st_gid))
-	return st->st_mode & S_IXGRP ? Qtrue : Qfalse;
-#endif
-#ifdef S_IXOTH
-    if (!(st->st_mode & S_IXOTH)) return Qfalse;
-#endif
-    return Qtrue;
-}
-
-static VALUE
-rb_stat_f(obj)
-    VALUE obj;
-{
-    if (S_ISREG(get_stat(obj)->st_mode)) return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_z(obj)
-    VALUE obj;
-{
-    if (get_stat(obj)->st_size == 0) return Qtrue;
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_s(obj)
-    VALUE obj;
-{
-    off_t size = get_stat(obj)->st_size;
-
-    if (size == 0) return Qnil;
-    return OFFT2NUM(size);
-}
-
-static VALUE
-rb_stat_suid(obj)
-    VALUE obj;
-{
-#ifdef S_ISUID
-    if (get_stat(obj)->st_mode & S_ISUID) return Qtrue;
-#endif
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_sgid(obj)
-    VALUE obj;
-{
-#ifdef S_ISGID
-    if (get_stat(obj)->st_mode & S_ISGID) return Qtrue;
-#endif
-    return Qfalse;
-}
-
-static VALUE
-rb_stat_sticky(obj)
-    VALUE obj;
-{
-#ifdef S_ISVTX
-    if (get_stat(obj)->st_mode & S_ISVTX) return Qtrue;
-#endif
-    return Qfalse;
-}
-
-static VALUE rb_mFConst;
+static VALUE rb_mConst;
 
 void
 rb_file_const(name, value)
     const char *name;
     VALUE value;
 {
-    rb_define_const(rb_mFConst, name, value);
-}
-
-static int
-is_absolute_path(path)
-    const char *path;
-{
-#ifdef DOSISH_DRIVE_LETTER
-    if (has_drive_letter(path) && isdirsep(path[2])) return 1;
-#endif
-#ifdef DOSISH_UNC
-    if (isdirsep(path[0]) && isdirsep(path[1])) return 1;
-#endif
-#ifndef DOSISH
-    if (path[0] == '/') return 1;
-#endif
-    return 0;
-}
-
-#ifndef DOSISH
-static int
-path_check_1(path)
-     VALUE path;
-{
-    struct stat st;
-    char *p0 = StringValueCStr(path);
-    char *p = 0, *s;
-
-    if (!is_absolute_path(p0)) {
-	char *buf = my_getcwd();
-	VALUE newpath;
-
-	newpath = rb_str_new2(buf);
-	free(buf);
-
-	rb_str_cat2(newpath, "/");
-	rb_str_cat2(newpath, p0);
-	return path_check_1(newpath);
-    }
-    for (;;) {
-#ifndef S_IWOTH
-# define S_IWOTH 002
-#endif
-	if (stat(p0, &st) == 0 && S_ISDIR(st.st_mode) && (st.st_mode & S_IWOTH)
-#ifdef S_ISVTX
-	    && (!p || !(st.st_mode & S_ISVTX))
-#endif
-	    ) {
-	    rb_warn("Insecure world writable dir %s, mode 0%o", p0, st.st_mode);
-	    if (p) *p = '/';
-	    return 0;
-	}
-	s = strrdirsep(p0);
-	if (p) *p = '/';
-	if (!s || s == p0) return 1;
-	p = s;
-	*p = '\0';
-    }
-}
-#endif
-
-int
-rb_path_check(path)
-    char *path;
-{
-#ifndef DOSISH
-    char *p0, *p, *pend;
-    const char sep = PATH_SEP_CHAR;
-
-    if (!path) return 1;
-
-    pend = path + strlen(path);
-    p0 = path;
-    p = strchr(path, sep);
-    if (!p) p = pend;
-
-    for (;;) {
-	if (!path_check_1(rb_str_new(p0, p - p0))) {
-	    return 0;		/* not safe */
-	}
-	p0 = p + 1;
-	if (p0 > pend) break;
-	p = strchr(p0, sep);
-	if (!p) p = pend;
-    }
-#endif
-    return 1;
-}
-
-#if defined(__MACOS__) || defined(riscos)
-static int
-is_macos_native_path(path)
-    const char *path;
-{
-    if (strchr(path, ':')) return 1;
-    return 0;
-}
-#endif
-
-static int
-file_load_ok(file)
-    char *file;
-{
-    FILE *f;
-
-    if (!file) return 0;
-    f = fopen(file, "r");
-    if (f == NULL) return 0;
-    fclose(f);
-    return 1;
-}
-
-extern VALUE rb_load_path;
-
-int
-rb_find_file_ext(filep, ext)
-    VALUE *filep;
-    const char * const *ext;
-{
-    char *path, *found;
-    char *f = RSTRING(*filep)->ptr;
-    VALUE fname;
-    long i, j;
-
-    if (f[0] == '~') {
-	fname = rb_file_expand_path(*filep, Qnil);
-	if (rb_safe_level() >= 2 && OBJ_TAINTED(fname)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
-	}
-	f = StringValueCStr(fname);
-	*filep = fname;
-    }
-
-    if (is_absolute_path(f)) {
-	for (i=0; ext[i]; i++) {
-	    fname = rb_str_dup(*filep);
-	    rb_str_cat2(fname, ext[i]);
-	    if (file_load_ok(StringValueCStr(fname))) {
-		*filep = fname;
-		return i+1;
-	    }
-	}
-	return 0;
-    }
-
-    if (!rb_load_path) return 0;
-
-    Check_Type(rb_load_path, T_ARRAY);
-    for (i=0;i<RARRAY(rb_load_path)->len;i++) {
-	VALUE str = RARRAY(rb_load_path)->ptr[i];
-
-	SafeStringValue(str);
-	if (RSTRING(str)->len == 0) continue;
-	path = RSTRING(str)->ptr;
-	for (j=0; ext[j]; j++) {
-	    fname = rb_str_dup(*filep);
-	    rb_str_cat2(fname, ext[j]);
-	    found = dln_find_file(StringValueCStr(fname), path);
-	    if (found && file_load_ok(found)) {
-		*filep = fname;
-		return j+1;
-	    }
-	}
-    }
-    return 0;
-}
-
-VALUE
-rb_find_file(path)
-    VALUE path;
-{
-    VALUE tmp;
-    char *f = StringValueCStr(path);
-    char *lpath;
-
-    if (f[0] == '~') {
-	path = rb_file_expand_path(path, Qnil);
-	if (rb_safe_level() >= 1 && OBJ_TAINTED(path)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
-	}
-	f = StringValueCStr(path);
-    }
-
-#if defined(__MACOS__) || defined(riscos)
-    if (is_macos_native_path(f)) {
-	if (rb_safe_level() >= 1 && !rb_path_check(f)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
-	}
-	if (file_load_ok(f)) return path;
-    }
-#endif
-
-    if (is_absolute_path(f)) {
-	if (rb_safe_level() >= 1 && !rb_path_check(f)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
-	}
-	if (file_load_ok(f)) return path;
-    }
-
-    if (rb_safe_level() >= 4) {
-	rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
-    }
-
-    if (rb_load_path) {
-	long i;
-
-	Check_Type(rb_load_path, T_ARRAY);
-	tmp = rb_ary_new();
-	for (i=0;i<RARRAY(rb_load_path)->len;i++) {
-	    VALUE str = RARRAY(rb_load_path)->ptr[i];
-	    SafeStringValue(str);
-	    if (RSTRING(str)->len > 0) {
-		rb_ary_push(tmp, str);
-	    }
-	}
-	tmp = rb_ary_join(tmp, rb_str_new2(PATH_SEP));
-	if (RSTRING(tmp)->len == 0) {
-	    lpath = 0;
-	}
-	else {
-	    lpath = RSTRING(tmp)->ptr;
-	    if (rb_safe_level() >= 1 && !rb_path_check(lpath)) {
-		rb_raise(rb_eSecurityError, "loading from unsafe path %s", lpath);
-	    }
-	}
-    }
-    else {
-	lpath = 0;
-    }
-
-    if (!lpath) {
-	return 0;		/* no path, no load */
-    }
-    f = dln_find_file(f, lpath);
-    if (rb_safe_level() >= 1 && !rb_path_check(f)) {
-	rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
-    }
-    if (file_load_ok(f)) {
-	return rb_str_new2(f);
-    }
-    return 0;
-}
-
-static void
-define_filetest_function(name, func, argc)
-    const char *name;
-    VALUE (*func)();
-    int argc;
-{
-    rb_define_module_function(rb_mFileTest, name, func, argc);
-    rb_define_singleton_method(rb_cFile, name, func, argc);
+    rb_define_const(rb_cFile, name, value);
+    rb_define_const(rb_mConst, name, value);
 }
 
 void
 Init_File()
 {
     rb_mFileTest = rb_define_module("FileTest");
-    rb_cFile = rb_define_class("File", rb_cIO);
 
-    define_filetest_function("directory?", test_d, 1);
-    define_filetest_function("exist?", test_e, 1);
-    define_filetest_function("exists?", test_e, 1); /* temporary */
-    define_filetest_function("readable?", test_r, 1);
-    define_filetest_function("readable_real?", test_R, 1);
-    define_filetest_function("writable?", test_w, 1);
-    define_filetest_function("writable_real?", test_W, 1);
-    define_filetest_function("executable?", test_x, 1);
-    define_filetest_function("executable_real?", test_X, 1);
-    define_filetest_function("file?", test_f, 1);
-    define_filetest_function("zero?", test_z, 1);
-    define_filetest_function("size?", test_s, 1);
-    define_filetest_function("size", rb_file_s_size, 1);
-    define_filetest_function("owned?", test_owned, 1);
-    define_filetest_function("grpowned?", test_grpowned, 1);
-
-    define_filetest_function("pipe?", test_p, 1);
-    define_filetest_function("symlink?", test_l, 1);
-    define_filetest_function("socket?", test_S, 1);
-
-    define_filetest_function("blockdev?", test_b, 1);
-    define_filetest_function("chardev?", test_c, 1);
-
-    define_filetest_function("setuid?", test_suid, 1);
-    define_filetest_function("setgid?", test_sgid, 1);
-    define_filetest_function("sticky?", test_sticky, 1);
+    rb_define_module_function(rb_mFileTest, "directory?",  test_d, 1);
+    rb_define_module_function(rb_mFileTest, "exist?",  test_e, 1);
+    rb_define_module_function(rb_mFileTest, "exists?",  test_e, 1); /* temporary */
+    rb_define_module_function(rb_mFileTest, "readable?",  test_r, 1);
+    rb_define_module_function(rb_mFileTest, "readable_real?",  test_R, 1);
+    rb_define_module_function(rb_mFileTest, "writable?",  test_w, 1);
+    rb_define_module_function(rb_mFileTest, "writable_real?",  test_W, 1);
+    rb_define_module_function(rb_mFileTest, "executable?",  test_x, 1);
+    rb_define_module_function(rb_mFileTest, "executable_real?",  test_X, 1);
+    rb_define_module_function(rb_mFileTest, "file?",  test_f, 1);
+    rb_define_module_function(rb_mFileTest, "zero?",  test_z, 1);
+    rb_define_module_function(rb_mFileTest, "size?",  test_s, 1);
+    rb_define_module_function(rb_mFileTest, "size",   test_s, 1);
+    rb_define_module_function(rb_mFileTest, "owned?",  test_owned, 1);
+    rb_define_module_function(rb_mFileTest, "grpowned?",  test_grpowned, 1);
+
+    rb_define_module_function(rb_mFileTest, "pipe?",  test_p, 1);
+    rb_define_module_function(rb_mFileTest, "symlink?",  test_l, 1);
+    rb_define_module_function(rb_mFileTest, "socket?",  test_S, 1);
+
+    rb_define_module_function(rb_mFileTest, "blockdev?",  test_b, 1);
+    rb_define_module_function(rb_mFileTest, "chardev?",  test_c, 1);
+
+    rb_define_module_function(rb_mFileTest, "setuid?",  test_suid, 1);
+    rb_define_module_function(rb_mFileTest, "setgid?",  test_sgid, 1);
+    rb_define_module_function(rb_mFileTest, "sticky?",  test_sticky, 1);
+
+    rb_cFile = rb_define_class("File", rb_cIO);
+    rb_extend_object(rb_cFile, CLASS_OF(rb_mFileTest));
 
     rb_define_singleton_method(rb_cFile, "stat",  rb_file_s_stat, 1);
     rb_define_singleton_method(rb_cFile, "lstat", rb_file_s_lstat, 1);
@@ -2897,12 +1587,11 @@ Init_File()
     rb_define_singleton_method(rb_cFile, "atime", rb_file_s_atime, 1);
     rb_define_singleton_method(rb_cFile, "mtime", rb_file_s_mtime, 1);
     rb_define_singleton_method(rb_cFile, "ctime", rb_file_s_ctime, 1);
+    rb_define_singleton_method(rb_cFile, "size",  rb_file_s_size, 1);
 
     rb_define_singleton_method(rb_cFile, "utime", rb_file_s_utime, -1);
     rb_define_singleton_method(rb_cFile, "chmod", rb_file_s_chmod, -1);
     rb_define_singleton_method(rb_cFile, "chown", rb_file_s_chown, -1);
-    rb_define_singleton_method(rb_cFile, "lchmod", rb_file_s_lchmod, -1);
-    rb_define_singleton_method(rb_cFile, "lchown", rb_file_s_lchown, -1);
 
     rb_define_singleton_method(rb_cFile, "link", rb_file_s_link, 2);
     rb_define_singleton_method(rb_cFile, "symlink", rb_file_s_symlink, 2);
@@ -2916,20 +1605,14 @@ Init_File()
     rb_define_singleton_method(rb_cFile, "expand_path", rb_file_s_expand_path, -1);
     rb_define_singleton_method(rb_cFile, "basename", rb_file_s_basename, -1);
     rb_define_singleton_method(rb_cFile, "dirname", rb_file_s_dirname, 1);
-    rb_define_singleton_method(rb_cFile, "extname", rb_file_s_extname, 1);
 
-    separator = rb_obj_freeze(rb_str_new2("/"));
+    separator = rb_str_new2("/");
     rb_define_const(rb_cFile, "Separator", separator);
     rb_define_const(rb_cFile, "SEPARATOR", separator);
     rb_define_singleton_method(rb_cFile, "split",  rb_file_s_split, 1);
     rb_define_singleton_method(rb_cFile, "join",   rb_file_s_join, -2);
 
-#ifdef DOSISH
-    rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_str_new2("\\")));
-#else
-    rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);
-#endif
-    rb_define_const(rb_cFile, "PATH_SEPARATOR", rb_obj_freeze(rb_str_new2(PATH_SEP)));
+    rb_define_const(rb_cFile, "PATH_SEPARATOR", rb_str_new2(RUBY_PATH_SEP));
 
     rb_define_method(rb_cIO, "stat",  rb_io_stat, 0); /* this is IO's method */
     rb_define_method(rb_cFile, "lstat",  rb_file_lstat, 0);
@@ -2944,66 +1627,18 @@ Init_File()
 
     rb_define_method(rb_cFile, "flock", rb_file_flock, 1);
 
-    rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
-    rb_include_module(rb_cIO, rb_mFConst);
+    rb_mConst = rb_define_module_under(rb_cFile, "Constants");
     rb_file_const("LOCK_SH", INT2FIX(LOCK_SH));
     rb_file_const("LOCK_EX", INT2FIX(LOCK_EX));
     rb_file_const("LOCK_UN", INT2FIX(LOCK_UN));
     rb_file_const("LOCK_NB", INT2FIX(LOCK_NB));
 
     rb_define_method(rb_cFile, "path",  rb_file_path, 0);
+
     rb_define_global_function("test", rb_f_test, -1);
 
-    rb_cStat = rb_define_class_under(rb_cFile, "Stat", rb_cObject);
-    rb_define_alloc_func(rb_cStat,  rb_stat_s_alloc);
-    rb_define_method(rb_cStat, "initialize", rb_stat_init, 1);
-    rb_define_method(rb_cStat, "initialize_copy", rb_stat_init_copy, 1);
-
-    rb_include_module(rb_cStat, rb_mComparable);
-
-    rb_define_method(rb_cStat, "<=>", rb_stat_cmp, 1);
-
-    rb_define_method(rb_cStat, "dev", rb_stat_dev, 0);
-    rb_define_method(rb_cStat, "ino", rb_stat_ino, 0);
-    rb_define_method(rb_cStat, "mode", rb_stat_mode, 0);
-    rb_define_method(rb_cStat, "nlink", rb_stat_nlink, 0);
-    rb_define_method(rb_cStat, "uid", rb_stat_uid, 0);
-    rb_define_method(rb_cStat, "gid", rb_stat_gid, 0);
-    rb_define_method(rb_cStat, "rdev", rb_stat_rdev, 0);
-    rb_define_method(rb_cStat, "rdev_major", rb_stat_rdev_major, 0);
-    rb_define_method(rb_cStat, "rdev_minor", rb_stat_rdev_minor, 0);
-    rb_define_method(rb_cStat, "size", rb_stat_size, 0);
-    rb_define_method(rb_cStat, "blksize", rb_stat_blksize, 0);
-    rb_define_method(rb_cStat, "blocks", rb_stat_blocks, 0);
-    rb_define_method(rb_cStat, "atime", rb_stat_atime, 0);
-    rb_define_method(rb_cStat, "mtime", rb_stat_mtime, 0);
-    rb_define_method(rb_cStat, "ctime", rb_stat_ctime, 0);
-
-    rb_define_method(rb_cStat, "inspect", rb_stat_inspect, 0);
-
-    rb_define_method(rb_cStat, "ftype", rb_stat_ftype, 0);
-
-    rb_define_method(rb_cStat, "directory?",  rb_stat_d, 0);
-    rb_define_method(rb_cStat, "readable?",  rb_stat_r, 0);
-    rb_define_method(rb_cStat, "readable_real?",  rb_stat_R, 0);
-    rb_define_method(rb_cStat, "writable?",  rb_stat_w, 0);
-    rb_define_method(rb_cStat, "writable_real?",  rb_stat_W, 0);
-    rb_define_method(rb_cStat, "executable?",  rb_stat_x, 0);
-    rb_define_method(rb_cStat, "executable_real?",  rb_stat_X, 0);
-    rb_define_method(rb_cStat, "file?",  rb_stat_f, 0);
-    rb_define_method(rb_cStat, "zero?",  rb_stat_z, 0);
-    rb_define_method(rb_cStat, "size?",  rb_stat_s, 0);
-    rb_define_method(rb_cStat, "owned?",  rb_stat_owned, 0);
-    rb_define_method(rb_cStat, "grpowned?",  rb_stat_grpowned, 0);
-
-    rb_define_method(rb_cStat, "pipe?",  rb_stat_p, 0);
-    rb_define_method(rb_cStat, "symlink?",  rb_stat_l, 0);
-    rb_define_method(rb_cStat, "socket?",  rb_stat_S, 0);
-
-    rb_define_method(rb_cStat, "blockdev?",  rb_stat_b, 0);
-    rb_define_method(rb_cStat, "chardev?",  rb_stat_c, 0);
-
-    rb_define_method(rb_cStat, "setuid?",  rb_stat_suid, 0);
-    rb_define_method(rb_cStat, "setgid?",  rb_stat_sgid, 0);
-    rb_define_method(rb_cStat, "sticky?",  rb_stat_sticky, 0);
+    sStat = rb_struct_define("Stat", "dev", "ino", "mode",
+			     "nlink", "uid", "gid", "rdev",
+			     "size", "blksize", "blocks", 
+			     "atime", "mtime", "ctime", 0);
 }
diff --git a/gc.c b/gc.c
index 4bbcf09a94..f5c03081f0 100644
--- a/gc.c
+++ b/gc.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   gc.c -
 
@@ -6,12 +6,11 @@
   $Date$
   created at: Tue Oct  5 09:44:46 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
+#define RUBY_NO_INLINE
 #include "ruby.h"
 #include "rubysig.h"
 #include "st.h"
@@ -20,106 +19,70 @@
 #include "re.h"
 #include <stdio.h>
 #include <setjmp.h>
-#include <sys/types.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-
-#ifdef __ia64__
-#include <ucontext.h>
-#pragma weak __libc_ia64_register_backing_store_base
-extern unsigned long __libc_ia64_register_backing_store_base;
-#endif
 
 void re_free_registers _((struct re_registers*));
 void rb_io_fptr_finalize _((struct OpenFile*));
 
-#if !defined(setjmp) && defined(HAVE__SETJMP)
+#ifndef setjmp
+#ifdef HAVE__SETJMP
 #define setjmp(env) _setjmp(env)
+#define longjmp(env,val) _longjmp(env,val)
+#endif
 #endif
 
-/* Make alloca work the best possible way.  */
-#ifdef __GNUC__
-# ifndef atarist
-#  ifndef alloca
-#   define alloca __builtin_alloca
-#  endif
-# endif /* atarist */
-#else
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca ();
-#   endif
-#  endif /* AIX */
-# endif /* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
+#ifdef C_ALLOCA
+#ifndef alloca
+void *alloca();
+#endif
+#endif
+
+static void run_final();
 
 #ifndef GC_MALLOC_LIMIT
 #if defined(MSDOS) || defined(__human68k__)
-#define GC_MALLOC_LIMIT 200000
+#define GC_MALLOC_LIMIT 100000
 #else
-#define GC_MALLOC_LIMIT 8000000
+#define GC_MALLOC_LIMIT 400000
 #endif
 #endif
+#define GC_NEWOBJ_LIMIT 10000
 
-static unsigned long malloc_increase = 0;
-static unsigned long malloc_limit = GC_MALLOC_LIMIT;
-static void run_final();
-static VALUE nomem_error;
-
-void
-rb_memerror()
-{
-    static int recurse = 0;
+static unsigned long malloc_memories = 0;
+static unsigned long alloc_objects = 0;
 
-    if (recurse > 0 && rb_safe_level() < 4) {
-	fprintf(stderr, "[FATAL] failed to allocate memory\n");
-	exit(1);
-    }
-    recurse++;
-    rb_exc_raise(nomem_error);
-}
+static int malloc_called = 0;
+static int free_called = 0;
 
+#ifndef xmalloc
 void *
-ruby_xmalloc(size)
-    long size;
+xmalloc(size)
+    size_t size;
 {
     void *mem;
 
     if (size < 0) {
-	rb_raise(rb_eNoMemError, "negative allocation size (or too big)");
+	rb_raise(rb_eArgError, "negative allocation size (or too big)");
     }
     if (size == 0) size = 1;
-    malloc_increase += size;
-
-    if (malloc_increase > malloc_limit) {
+    malloc_memories += size;
+    if (malloc_memories > GC_MALLOC_LIMIT && alloc_objects > GC_NEWOBJ_LIMIT) {
 	rb_gc();
     }
-    RUBY_CRITICAL(mem = malloc(size));
+    malloc_called++;
+    mem = malloc(size);
     if (!mem) {
 	rb_gc();
-	RUBY_CRITICAL(mem = malloc(size));
-	if (!mem) {
-	    rb_memerror();
-	}
+	mem = malloc(size);
+	if (!mem)
+	    rb_fatal("failed to allocate memory");
     }
 
     return mem;
 }
 
 void *
-ruby_xcalloc(n, size)
-    long n, size;
+xcalloc(n, size)
+    size_t n, size;
 {
     void *mem;
 
@@ -130,9 +93,9 @@ ruby_xcalloc(n, size)
 }
 
 void *
-ruby_xrealloc(ptr, size)
+xrealloc(ptr, size)
     void *ptr;
-    long size;
+    size_t size;
 {
     void *mem;
 
@@ -141,35 +104,64 @@ ruby_xrealloc(ptr, size)
     }
     if (!ptr) return xmalloc(size);
     if (size == 0) size = 1;
-    malloc_increase += size;
-    RUBY_CRITICAL(mem = realloc(ptr, size));
+    malloc_memories += size;
+    mem = realloc(ptr, size);
     if (!mem) {
 	rb_gc();
-	RUBY_CRITICAL(mem = realloc(ptr, size));
-	if (!mem) {
-	    rb_memerror();
-        }
+	mem = realloc(ptr, size);
+	if (!mem)
+	    rb_fatal("failed to allocate memory(realloc)");
     }
 
     return mem;
 }
 
-void
-ruby_xfree(x)
+static void
+xfree(x)
     void *x;
 {
-    if (x)
-	RUBY_CRITICAL(free(x));
+    free_called++;
+    free(x);
 }
+#endif
+
+/* The way of garbage collecting which allows use of the cstack is due to */
+/* Scheme In One Defun, but in C this time.
+
+ *			  COPYRIGHT (c) 1989 BY				    *
+ *	  PARADIGM ASSOCIATES INCORPORATED, CAMBRIDGE, MASSACHUSETTS.	    *
+ *			   ALL RIGHTS RESERVED				    *
+
+Permission to use, copy, modify, distribute and sell this software
+and its documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice appear
+in supporting documentation, and that the name of Paradigm Associates
+Inc not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.
+
+PARADIGM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+PARADIGM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+gjc@paradigm.com
+
+Paradigm Associates Inc		 Phone: 617-492-6079
+29 Putnam Ave, Suite 6
+Cambridge, MA 02138
+*/
 
 extern int ruby_in_compile;
 static int dont_gc;
 static int during_gc;
 static int need_call_final = 0;
-static st_table *finalizer_table = 0;
 
-VALUE
-rb_gc_enable()
+static VALUE
+gc_enable()
 {
     int old = dont_gc;
 
@@ -177,8 +169,8 @@ rb_gc_enable()
     return old;
 }
 
-VALUE
-rb_gc_disable()
+static VALUE
+gc_disable()
 {
     int old = dont_gc;
 
@@ -191,54 +183,24 @@ VALUE rb_mGC;
 static struct gc_list {
     VALUE *varptr;
     struct gc_list *next;
-} *global_List = 0;
+} *Global_List = 0;
 
 void
-rb_gc_register_address(addr)
-    VALUE *addr;
+rb_global_variable(var)
+    VALUE *var;
 {
     struct gc_list *tmp;
 
     tmp = ALLOC(struct gc_list);
-    tmp->next = global_List;
-    tmp->varptr = addr;
-    global_List = tmp;
-}
-
-void
-rb_gc_unregister_address(addr)
-    VALUE *addr;
-{
-    struct gc_list *tmp = global_List;
-
-    if (tmp->varptr == addr) {
-	global_List = tmp->next;
-	RUBY_CRITICAL(free(tmp));
-	return;
-    }
-    while (tmp->next) {
-	if (tmp->next->varptr == addr) {
-	    struct gc_list *t = tmp->next;
-
-	    tmp->next = tmp->next->next;
-	    RUBY_CRITICAL(free(t));
-	    break;
-	}
-	tmp = tmp->next;
-    }
-}
-
-void
-rb_global_variable(var)
-    VALUE *var;
-{
-    rb_gc_register_address(var);
+    tmp->next = Global_List;
+    tmp->varptr = var;
+    Global_List = tmp;
 }
 
 typedef struct RVALUE {
     union {
 	struct {
-	    unsigned long flags;	/* always 0 for freed obj */
+	    unsigned long flag;	/* always 0 for freed obj */
 	    struct RVALUE *next;
 	} free;
 	struct RBasic  basic;
@@ -261,20 +223,14 @@ typedef struct RVALUE {
 } RVALUE;
 
 static RVALUE *freelist = 0;
-static RVALUE *deferred_final_list = 0;
 
 #define HEAPS_INCREMENT 10
-static struct heaps_slot {
-    RVALUE *slot;
-    int limit;
-} *heaps;
+static RVALUE **heaps;
 static int heaps_length = 0;
 static int heaps_used   = 0;
 
-#define HEAP_MIN_SLOTS 10000
-static int heap_slots = HEAP_MIN_SLOTS;
-
-#define FREE_MIN  4096
+#define HEAP_SLOTS 10000
+#define FREE_MIN  512
 
 static RVALUE *himem, *lomem;
 
@@ -285,42 +241,21 @@ add_heap()
 
     if (heaps_used == heaps_length) {
 	/* Realloc heaps */
-	struct heaps_slot *p;
-	int length;
-
 	heaps_length += HEAPS_INCREMENT;
-	length = heaps_length*sizeof(struct heaps_slot);
-	RUBY_CRITICAL(
-	    if (heaps_used > 0) {
-		p = (struct heaps_slot *)realloc(heaps, length);
-		if (p) heaps = p;
-	    }
-	    else {
-		p = heaps = (struct heaps_slot *)malloc(length);
-	    });
-	if (p == 0) rb_memerror();
+	heaps = (heaps_used>0)?
+	    (RVALUE**)realloc(heaps, heaps_length*sizeof(RVALUE)):
+	    (RVALUE**)malloc(heaps_length*sizeof(RVALUE));
+	if (heaps == 0) rb_fatal("can't alloc memory");
     }
 
-    for (;;) {
-	RUBY_CRITICAL(p = heaps[heaps_used].slot = (RVALUE*)malloc(sizeof(RVALUE)*heap_slots));
-	heaps[heaps_used].limit = heap_slots;
-	if (p == 0) {
-	    if (heap_slots == HEAP_MIN_SLOTS) {
-		rb_memerror();
-	    }
-	    heap_slots = HEAP_MIN_SLOTS;
-	    continue;
-	}
-	break;
-    }
-    pend = p + heap_slots;
+    p = heaps[heaps_used++] = (RVALUE*)malloc(sizeof(RVALUE)*HEAP_SLOTS);
+    if (p == 0) rb_fatal("add_heap: can't alloc memory");
+    pend = p + HEAP_SLOTS;
     if (lomem == 0 || lomem > p) lomem = p;
     if (himem < pend) himem = pend;
-    heaps_used++;
-    heap_slots *= 1.8;
 
     while (p < pend) {
-	p->as.free.flags = 0;
+	p->as.free.flag = 0;
 	p->as.free.next = freelist;
 	freelist = p;
 	p++;
@@ -333,23 +268,27 @@ rb_newobj()
 {
     VALUE obj;
 
-    if (!freelist) rb_gc();
+    if (freelist) {
+      retry:
+	obj = (VALUE)freelist;
+	freelist = freelist->as.free.next;
+	alloc_objects++;
+	return obj;
+    }
+    if (dont_gc || during_gc || rb_prohibit_interrupt) add_heap();
+    else rb_gc();
 
-    obj = (VALUE)freelist;
-    freelist = freelist->as.free.next;
-    MEMZERO((void*)obj, RVALUE, 1);
-    return obj;
+    goto retry;
 }
 
 VALUE
 rb_data_object_alloc(klass, datap, dmark, dfree)
     VALUE klass;
     void *datap;
-    RUBY_DATA_FUNC dmark;
-    RUBY_DATA_FUNC dfree;
+    void (*dfree)();
+    void (*dmark)();
 {
     NEWOBJ(data, struct RData);
-    Check_Type(klass, T_CLASS);
     OBJSETUP(data, klass, T_DATA);
     data->data = datap;
     data->dfree = dfree;
@@ -361,180 +300,11 @@ rb_data_object_alloc(klass, datap, dmark, dfree)
 extern st_table *rb_class_tbl;
 VALUE *rb_gc_stack_start = 0;
 
-#if defined(DJGPP) || defined(_WIN32_WCE)
-static unsigned int STACK_LEVEL_MAX = 65535;
-#else
-#ifdef __human68k__
-extern unsigned int _stacksize;
-# define STACK_LEVEL_MAX (_stacksize - 4096)
-# undef HAVE_GETRLIMIT
-#else
-#ifdef HAVE_GETRLIMIT
-static unsigned int STACK_LEVEL_MAX = 655300;
-#else
-# define STACK_LEVEL_MAX 655300
-#endif
+#if defined(__GNUC__) && __GNUC__ >= 2
+__inline__
 #endif
-#endif
-
-#ifdef C_ALLOCA
-# define SET_STACK_END VALUE stack_end; alloca(0);
-# define STACK_END (&stack_end)
-#else
-# if defined(__GNUC__) && defined(USE_BUILTIN_FRAME_ADDRESS) && !defined(__ia64__)
-#  define  SET_STACK_END    VALUE *stack_end = __builtin_frame_address(0)
-# else
-#  define  SET_STACK_END    VALUE *stack_end = alloca(1)
-# endif
-# define STACK_END (stack_end)
-#endif
-#if defined(sparc) || defined(__sparc__)
-# define STACK_LENGTH  (rb_gc_stack_start - STACK_END + 0x80)
-#elif STACK_GROW_DIRECTION < 0
-# define STACK_LENGTH  (rb_gc_stack_start - STACK_END)
-#elif STACK_GROW_DIRECTION > 0
-# define STACK_LENGTH  (STACK_END - rb_gc_stack_start + 1)
-#else
-# define STACK_LENGTH  ((STACK_END < rb_gc_stack_start) ? rb_gc_stack_start - STACK_END\
-                                           : STACK_END - rb_gc_stack_start + 1)
-#endif
-#if STACK_GROW_DIRECTION > 0
-# define STACK_UPPER(x, a, b) a
-#elif STACK_GROW_DIRECTION < 0
-# define STACK_UPPER(x, a, b) b
-#else
-static int
-stack_growup_p(addr)
-    VALUE *addr;
-{
-    SET_STACK_END;
-
-    if (STACK_END > addr) return Qtrue;
-    return Qfalse;
-}
-# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
-#endif
-
-#define GC_WARTER_MARK 512
-
-#define CHECK_STACK(ret) do {\
-    SET_STACK_END;\
-    (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WARTER_MARK);\
-} while (0)
-
-int
-ruby_stack_length(p)
-    VALUE **p;
-{
-    SET_STACK_END;
-    if (p) *p = STACK_UPPER(STACK_END, rb_gc_stack_start, STACK_END);
-    return STACK_LENGTH;
-}
-
-int
-ruby_stack_check()
-{
-    int ret;
-
-    CHECK_STACK(ret);
-    return ret;
-}
-
-#define MARK_STACK_MAX 1024
-static VALUE mark_stack[MARK_STACK_MAX];
-static VALUE *mark_stack_ptr;
-static int mark_stack_overflow;
-
-static void
-init_mark_stack()
-{
-    mark_stack_overflow = 0;
-    mark_stack_ptr = mark_stack;
-}
-
-#define MARK_STACK_EMPTY (mark_stack_ptr == mark_stack)
-            
-static st_table *source_filenames;
-
-char *
-rb_source_filename(f)
-    const char *f;
-{
-    char *name;
-
-    if (!st_lookup(source_filenames, (st_data_t)f, (st_data_t *)&name)) {
-	long len = strlen(f) + 1;
-	char *ptr = name = ALLOC_N(char, len + 1);
-	*ptr++ = 0;
-	MEMCPY(ptr, f, char, len);
-	st_add_direct(source_filenames, (st_data_t)ptr, (st_data_t)name);
-	return ptr;
-    }
-    return name + 1;
-}
-
-static void
-mark_source_filename(f)
-    char *f;
-{
-    if (f) {
-	f[-1] = 1;
-    }
-}
-
 static int
-sweep_source_filename(key, value)
-    char *key, *value;
-{
-    if (*value) {
-	*value = 0;
-	return ST_CONTINUE;
-    }
-    else {
-	free(value);
-	return ST_DELETE;
-    }
-}
-
-static void rb_gc_mark_children _((VALUE ptr));
-
-static void
-gc_mark_all()
-{
-    RVALUE *p, *pend;
-    int i;
-
-    init_mark_stack();
-    for (i = 0; i < heaps_used; i++) {
-	p = heaps[i].slot; pend = p + heaps[i].limit;
-	while (p < pend) {
-	    if ((p->as.basic.flags & FL_MARK) &&
-		(p->as.basic.flags != FL_MARK)) {
-		rb_gc_mark_children((VALUE)p);
-	    }
-	    p++;
-	}
-    }
-}
-
-static void
-gc_mark_rest()
-{
-    VALUE tmp_arry[MARK_STACK_MAX];
-    VALUE *p;
-
-    p = (mark_stack_ptr - mark_stack) + tmp_arry;
-    MEMCPY(tmp_arry, mark_stack, VALUE, MARK_STACK_MAX);
-
-    init_mark_stack();
-    while(p != tmp_arry){
-	p--;
-	rb_gc_mark_children(*p);
-    }
-}
-
-static inline int
-is_pointer_to_heap(ptr)
+looks_pointerp(ptr)
     void *ptr;
 {
     register RVALUE *p = RANY(ptr);
@@ -545,9 +315,9 @@ is_pointer_to_heap(ptr)
 
     /* check if p looks like a pointer */
     for (i=0; i < heaps_used; i++) {
-	heap_org = heaps[i].slot;
-	if (heap_org <= p && p < heap_org + heaps[i].limit &&
-	    ((((char*)p)-((char*)heap_org))%sizeof(RVALUE)) == 0)
+	heap_org = heaps[i];
+	if (heap_org <= p && p < heap_org + HEAP_SLOTS
+	    && ((((char*)p)-((char*)heap_org))%sizeof(RVALUE)) == 0)
 	    return Qtrue;
     }
     return Qfalse;
@@ -559,7 +329,7 @@ mark_locations_array(x, n)
     register long n;
 {
     while (n--) {
-	if (is_pointer_to_heap((void *)*x)) {
+	if (looks_pointerp(*x)) {
 	    rb_gc_mark(*x);
 	}
 	x++;
@@ -573,7 +343,12 @@ rb_gc_mark_locations(start, end)
     VALUE *tmp;
     long n;
 
-    n = end - start;
+    if (start > end) {
+	tmp = start;
+	start = end;
+	end = tmp;
+    }
+    n = end - start + 1;
     mark_locations_array(start,n);
 }
 
@@ -595,8 +370,8 @@ rb_mark_tbl(tbl)
 }
 
 static int
-mark_keyvalue(key, value)
-    VALUE key;
+mark_hashentry(key, value)
+    ID key;
     VALUE value;
 {
     rb_gc_mark(key);
@@ -609,65 +384,34 @@ rb_mark_hash(tbl)
     st_table *tbl;
 {
     if (!tbl) return;
-    st_foreach(tbl, mark_keyvalue, 0);
+    st_foreach(tbl, mark_hashentry, 0);
 }
 
 void
 rb_gc_mark_maybe(obj)
-    VALUE obj;
+    void *obj;
 {
-    if (is_pointer_to_heap((void *)obj)) {
+    if (looks_pointerp(obj)) {
 	rb_gc_mark(obj);
     }
 }
 
 void
 rb_gc_mark(ptr)
-    VALUE ptr;
-{
-    int ret;
-    register RVALUE *obj;
-
-    obj = RANY(ptr);
-    if (rb_special_const_p(ptr)) return; /* special const not marked */
-    if (obj->as.basic.flags == 0) return;       /* free cell */
-    if (obj->as.basic.flags & FL_MARK) return;  /* already marked */ 
-    obj->as.basic.flags |= FL_MARK;
-
-    CHECK_STACK(ret);
-    if (ret) {
-	if (!mark_stack_overflow) {
-	    if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
-		*mark_stack_ptr = ptr;
-		mark_stack_ptr++;		
-	    }
-	    else {
-		mark_stack_overflow = 1;
-	    }
-	}
-	return;
-    }
-    rb_gc_mark_children(ptr);
-}
-
-static void
-rb_gc_mark_children(ptr)
-    VALUE ptr;
+    void *ptr;
 {
     register RVALUE *obj = RANY(ptr);
 
-    goto marking;		/* skip */
-
-  again:
-    obj = RANY(ptr);
-    if (rb_special_const_p(ptr)) return; /* special const not marked */
+  Top:
+    if (FIXNUM_P(obj)) return;	                /* fixnum not marked */
+    if (rb_special_const_p((VALUE)obj)) return; /* special const not marked */
     if (obj->as.basic.flags == 0) return;       /* free cell */
-    if (obj->as.basic.flags & FL_MARK) return;  /* already marked */ 
+    if (obj->as.basic.flags & FL_MARK) return;  /* already marked */
+
     obj->as.basic.flags |= FL_MARK;
 
-  marking:
     if (FL_TEST(obj, FL_EXIVAR)) {
-	rb_mark_generic_ivar(ptr);
+	rb_mark_generic_ivar((VALUE)obj);
     }
 
     switch (obj->as.basic.flags & T_MASK) {
@@ -677,7 +421,6 @@ rb_gc_mark_children(ptr)
 	break;
 
       case T_NODE:
-	mark_source_filename(obj->as.node.nd_file);
 	switch (nd_type(obj)) {
 	  case NODE_IF:		/* 1,2,3 */
 	  case NODE_FOR:
@@ -687,13 +430,13 @@ rb_gc_mark_children(ptr)
 	  case NODE_MASGN:
 	  case NODE_RESCUE:
 	  case NODE_RESBODY:
-	  case NODE_CLASS:
-	    rb_gc_mark((VALUE)obj->as.node.u2.node);
+	    rb_gc_mark(obj->as.node.u2.node);
 	    /* fall through */
 	  case NODE_BLOCK:	/* 1,3 */
 	  case NODE_ARRAY:
 	  case NODE_DSTR:
 	  case NODE_DXSTR:
+	  case NODE_EVSTR:
 	  case NODE_DREGX:
 	  case NODE_DREGX_ONCE:
 	  case NODE_FBODY:
@@ -701,14 +444,14 @@ rb_gc_mark_children(ptr)
 	  case NODE_CALL:
 	  case NODE_DEFS:
 	  case NODE_OP_ASGN1:
-	    rb_gc_mark((VALUE)obj->as.node.u1.node);
+	    rb_gc_mark(obj->as.node.u1.node);
 	    /* fall through */
 	  case NODE_SUPER:	/* 3 */
 	  case NODE_FCALL:
 	  case NODE_DEFN:
 	  case NODE_NEWLINE:
-	    ptr = (VALUE)obj->as.node.u3.node;
-	    goto again;
+	    obj = RANY(obj->as.node.u3.node);
+	    goto Top;
 
 	  case NODE_WHILE:	/* 1,2 */
 	  case NODE_UNTIL:
@@ -724,23 +467,21 @@ rb_gc_mark_children(ptr)
 	  case NODE_MATCH3:
 	  case NODE_OP_ASGN_OR:
 	  case NODE_OP_ASGN_AND:
-	  case NODE_MODULE:
-	    rb_gc_mark((VALUE)obj->as.node.u1.node);
+	    rb_gc_mark(obj->as.node.u1.node);
 	    /* fall through */
 	  case NODE_METHOD:	/* 2 */
 	  case NODE_NOT:
 	  case NODE_GASGN:
 	  case NODE_LASGN:
 	  case NODE_DASGN:
-	  case NODE_DASGN_CURR:
+	  case NODE_DASGN_PUSH:
 	  case NODE_IASGN:
-	  case NODE_CVDECL:
-	  case NODE_CVASGN:
+	  case NODE_CASGN:
+	  case NODE_MODULE:
 	  case NODE_COLON3:
 	  case NODE_OPT_N:
-	  case NODE_EVSTR:
-	    ptr = (VALUE)obj->as.node.u2.node;
-	    goto again;
+	    obj = RANY(obj->as.node.u2.node);
+	    goto Top;
 
 	  case NODE_HASH:	/* 1 */
 	  case NODE_LIT:
@@ -749,23 +490,18 @@ rb_gc_mark_children(ptr)
 	  case NODE_DEFINED:
 	  case NODE_MATCH:
 	  case NODE_RETURN:
-	  case NODE_BREAK:
-	  case NODE_NEXT:
 	  case NODE_YIELD:
 	  case NODE_COLON2:
 	  case NODE_ARGS:
-	  case NODE_SPLAT:
-	  case NODE_TO_ARY:
-	  case NODE_SVALUE:
-	    ptr = (VALUE)obj->as.node.u1.node;
-	    goto again;
+	    obj = RANY(obj->as.node.u1.node);
+	    goto Top;
 
 	  case NODE_SCOPE:	/* 2,3 */
+	  case NODE_CLASS:
 	  case NODE_BLOCK_PASS:
-	  case NODE_CDECL:
-	    rb_gc_mark((VALUE)obj->as.node.u3.node);
-	    ptr = (VALUE)obj->as.node.u2.node;
-	    goto again;
+	    rb_gc_mark(obj->as.node.u3.node);
+	    obj = RANY(obj->as.node.u2.node);
+	    goto Top;
 
 	  case NODE_ZARRAY:	/* - */
 	  case NODE_ZSUPER:
@@ -780,6 +516,8 @@ rb_gc_mark_children(ptr)
 	  case NODE_BACK_REF:
 	  case NODE_ALIAS:
 	  case NODE_VALIAS:
+	  case NODE_BREAK:
+	  case NODE_NEXT:
 	  case NODE_REDO:
 	  case NODE_RETRY:
 	  case NODE_UNDEF:
@@ -795,19 +533,20 @@ rb_gc_mark_children(ptr)
 	  case NODE_ALLOCA:
 	    mark_locations_array((VALUE*)obj->as.node.u1.value,
 				 obj->as.node.u3.cnt);
-	    ptr = (VALUE)obj->as.node.u2.node;
-	    goto again;
+	    obj = RANY(obj->as.node.u2.node);
+	    goto Top;
 #endif
 
-	  default:		/* unlisted NODE */
-	    if (is_pointer_to_heap(obj->as.node.u1.node)) {
-		rb_gc_mark((VALUE)obj->as.node.u1.node);
+	  default:
+	    if (looks_pointerp(obj->as.node.u1.node)) {
+		rb_gc_mark(obj->as.node.u1.node);
 	    }
-	    if (is_pointer_to_heap(obj->as.node.u2.node)) {
-		rb_gc_mark((VALUE)obj->as.node.u2.node);
+	    if (looks_pointerp(obj->as.node.u2.node)) {
+		rb_gc_mark(obj->as.node.u2.node);
 	    }
-	    if (is_pointer_to_heap(obj->as.node.u3.node)) {
-		rb_gc_mark((VALUE)obj->as.node.u3.node);
+	    if (looks_pointerp(obj->as.node.u3.node)) {
+		obj = RANY(obj->as.node.u3.node);
+		goto Top;
 	    }
 	}
 	return;			/* no need to mark class. */
@@ -818,36 +557,30 @@ rb_gc_mark_children(ptr)
       case T_ICLASS:
       case T_CLASS:
       case T_MODULE:
+	rb_gc_mark(obj->as.klass.super);
 	rb_mark_tbl(obj->as.klass.m_tbl);
 	rb_mark_tbl(obj->as.klass.iv_tbl);
-	ptr = obj->as.klass.super;
-	goto again;
+	break;
 
       case T_ARRAY:
-	if (FL_TEST(obj, ELTS_SHARED)) {
-	    ptr = obj->as.array.aux.shared;
-	    goto again;
-	}
-	else {
-	    long i, len = obj->as.array.len;
+	{
+	    int i, len = obj->as.array.len;
 	    VALUE *ptr = obj->as.array.ptr;
 
-	    for (i=0; i < len; i++) {
+	    for (i=0; i < len; i++)
 		rb_gc_mark(*ptr++);
-	    }
 	}
 	break;
 
       case T_HASH:
 	rb_mark_hash(obj->as.hash.tbl);
-	ptr = obj->as.hash.ifnone;
-	goto again;
+	rb_gc_mark(obj->as.hash.ifnone);
+	break;
 
       case T_STRING:
-#define STR_ASSOC FL_USER3   /* copied from string.c */
-	if (FL_TEST(obj, ELTS_SHARED|STR_ASSOC)) {
-	    ptr = obj->as.string.aux.shared;
-	    goto again;
+	if (obj->as.string.orig) {
+	    obj = RANY(obj->as.string.orig);
+	    goto Top;
 	}
 	break;
 
@@ -863,50 +596,53 @@ rb_gc_mark_children(ptr)
       case T_REGEXP:
       case T_FLOAT:
       case T_BIGNUM:
-      case T_BLKTAG:
 	break;
 
       case T_MATCH:
 	if (obj->as.match.str) {
-	    ptr = obj->as.match.str;
-	    goto again;
+	    obj = RANY(obj->as.match.str);
+	    goto Top;
 	}
 	break;
 
       case T_VARMAP:
 	rb_gc_mark(obj->as.varmap.val);
-	ptr = (VALUE)obj->as.varmap.next;
-	goto again;
+	obj = RANY(obj->as.varmap.next);
+	goto Top;
+	break;
 
       case T_SCOPE:
-	if (obj->as.scope.local_vars && (obj->as.scope.flags & SCOPE_MALLOC)) {
+	if (obj->as.scope.local_vars &&
+            obj->as.scope.flag != SCOPE_ALLOCA) {
 	    int n = obj->as.scope.local_tbl[0]+1;
 	    VALUE *vars = &obj->as.scope.local_vars[-1];
 
 	    while (n--) {
-		rb_gc_mark(*vars++);
+		rb_gc_mark(*vars);
+		vars++;
 	    }
 	}
 	break;
 
       case T_STRUCT:
 	{
-	    long len = obj->as.rstruct.len;
+	    int i, len = obj->as.rstruct.len;
 	    VALUE *ptr = obj->as.rstruct.ptr;
 
-	    while (len--) {
+	    for (i=0; i < len; i++)
 		rb_gc_mark(*ptr++);
-	    }
 	}
 	break;
 
       default:
-	rb_bug("rb_gc_mark(): unknown data type 0x%lx(0x%lx) %s",
+	rb_bug("rb_gc_mark(): unknown data type 0x%x(0x%x) %s",
 	       obj->as.basic.flags & T_MASK, obj,
-	       is_pointer_to_heap(obj) ? "corrupted object" : "non object");
+	       looks_pointerp(obj)?"corrupted object":"non object");
     }
 }
 
+#define MIN_FREE_OBJ 512
+
 static void obj_free _((VALUE));
 
 static void
@@ -914,46 +650,38 @@ gc_sweep()
 {
     RVALUE *p, *pend, *final_list;
     int freed = 0;
-    int i, j;
-    unsigned long live = 0;
-
-    if (ruby_in_compile && ruby_parser_stack_on_heap()) {
-	/* should not reclaim nodes during compilation
-           if yacc's semantic stack is not allocated on machine stack */
-	for (i = 0; i < heaps_used; i++) {
-	    p = heaps[i].slot; pend = p + heaps[i].limit;
+    int i, used = heaps_used;
+
+    if (ruby_in_compile) {
+	/* sould not reclaim nodes during compilation */
+	for (i = 0; i < used; i++) {
+	    p = heaps[i]; pend = p + HEAP_SLOTS;
 	    while (p < pend) {
 		if (!(p->as.basic.flags&FL_MARK) && BUILTIN_TYPE(p) == T_NODE)
-		    rb_gc_mark((VALUE)p);
+		    rb_gc_mark(p);
 		p++;
 	    }
 	}
     }
 
-    mark_source_filename(ruby_sourcefile);
-    st_foreach(source_filenames, sweep_source_filename, 0);
-
     freelist = 0;
-    final_list = deferred_final_list;
-    deferred_final_list = 0;
-    for (i = 0; i < heaps_used; i++) {
+    final_list = 0;
+    for (i = 0; i < used; i++) {
 	int n = 0;
-	RVALUE *free = freelist;
-	RVALUE *final = final_list;
 
-	p = heaps[i].slot; pend = p + heaps[i].limit;
+	p = heaps[i]; pend = p + HEAP_SLOTS;
 	while (p < pend) {
 	    if (!(p->as.basic.flags & FL_MARK)) {
 		if (p->as.basic.flags) {
 		    obj_free((VALUE)p);
 		}
-		if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
-		    p->as.free.flags = FL_MARK; /* remain marked */
+	if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
+		    p->as.free.flag = FL_MARK; /* remain marked */
 		    p->as.free.next = final_list;
 		    final_list = p;
 		}
 		else {
-		    p->as.free.flags = 0;
+		    p->as.free.flag = 0;
 		    p->as.free.next = freelist;
 		    freelist = p;
 		}
@@ -965,62 +693,26 @@ gc_sweep()
 	    }
 	    else {
 		RBASIC(p)->flags &= ~FL_MARK;
-		live++;
 	    }
 	    p++;
 	}
-	if (n == heaps[i].limit && freed > FREE_MIN) {
-	    RVALUE *pp;
-
-	    heaps[i].limit = 0;
-	    for (pp = final_list; pp != final; pp = pp->as.free.next) {
-		p->as.free.flags |= FL_SINGLETON; /* freeing page mark */
-	    }
-	    freelist = free;	/* cancel this page from freelist */
-	}
-	else {
-	    freed += n;
-	}
-    }
-    if (malloc_increase > malloc_limit) {
-	malloc_limit += (malloc_increase - malloc_limit) * (double)live / (live + freed);
-	if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT;
+	freed += n;
     }
-    malloc_increase = 0;
     if (freed < FREE_MIN) {
 	add_heap();
     }
     during_gc = 0;
 
     /* clear finalization list */
-    if (final_list) {
+    if (need_call_final) {
 	RVALUE *tmp;
 
-	if (rb_prohibit_interrupt || ruby_in_compile) {
-	    deferred_final_list = final_list;
-	    return;
-	}
-
 	for (p = final_list; p; p = tmp) {
 	    tmp = p->as.free.next;
 	    run_final((VALUE)p);
-	    if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
-		p->as.free.flags = 0;
-		p->as.free.next = freelist;
-		freelist = p;
-	    }
-	}
-    }
-    for (i = j = 1; j < heaps_used; i++) {
-	if (heaps[i].limit == 0) {
-	    free(heaps[i].slot);
-	    heaps_used--;
-	}
-	else {
-	    if (i != j) {
-		heaps[j] = heaps[i];
-	    }
-	    j++;
+	    p->as.free.flag = 0;
+	    p->as.free.next = freelist;
+	    freelist = p;
 	}
     }
 }
@@ -1029,7 +721,7 @@ void
 rb_gc_force_recycle(p)
     VALUE p;
 {
-    RANY(p)->as.free.flags = 0;
+    RANY(p)->as.free.flag = 0;
     RANY(p)->as.free.next = freelist;
     freelist = RANY(p);
 }
@@ -1059,39 +751,32 @@ obj_free(obj)
 	break;
       case T_MODULE:
       case T_CLASS:
-	rb_clear_cache_by_class((VALUE)obj);
+	rb_clear_cache();
 	st_free_table(RANY(obj)->as.klass.m_tbl);
 	if (RANY(obj)->as.object.iv_tbl) {
 	    st_free_table(RANY(obj)->as.object.iv_tbl);
 	}
 	break;
       case T_STRING:
-	if (RANY(obj)->as.string.ptr && !FL_TEST(obj, ELTS_SHARED)) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.string.ptr));
-	}
+#define STR_NO_ORIG FL_USER3	/* copied from string.c */
+	if (!RANY(obj)->as.string.orig || FL_TEST(obj, STR_NO_ORIG))
+	    free(RANY(obj)->as.string.ptr);
 	break;
       case T_ARRAY:
-	if (RANY(obj)->as.array.ptr && !FL_TEST(obj, ELTS_SHARED)) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.array.ptr));
-	}
+	if (RANY(obj)->as.array.ptr) free(RANY(obj)->as.array.ptr);
 	break;
       case T_HASH:
-	if (RANY(obj)->as.hash.tbl) {
+	if (RANY(obj)->as.hash.tbl)
 	    st_free_table(RANY(obj)->as.hash.tbl);
-	}
 	break;
       case T_REGEXP:
-	if (RANY(obj)->as.regexp.ptr) {
-	    re_free_pattern(RANY(obj)->as.regexp.ptr);
-	}
-	if (RANY(obj)->as.regexp.str) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.regexp.str));
-	}
+	if (RANY(obj)->as.regexp.ptr) re_free_pattern(RANY(obj)->as.regexp.ptr);
+	if (RANY(obj)->as.regexp.str) free(RANY(obj)->as.regexp.str);
 	break;
       case T_DATA:
 	if (DATA_PTR(obj)) {
 	    if ((long)RANY(obj)->as.data.dfree == -1) {
-		RUBY_CRITICAL(free(DATA_PTR(obj)));
+		free(DATA_PTR(obj));
 	    }
 	    else if (RANY(obj)->as.data.dfree) {
 		(*RANY(obj)->as.data.dfree)(DATA_PTR(obj));
@@ -1101,13 +786,13 @@ obj_free(obj)
       case T_MATCH:
 	if (RANY(obj)->as.match.regs) {
 	    re_free_registers(RANY(obj)->as.match.regs);
-	    RUBY_CRITICAL(free(RANY(obj)->as.match.regs));
+	    free(RANY(obj)->as.match.regs);
 	}
 	break;
       case T_FILE:
 	if (RANY(obj)->as.file.fptr) {
 	    rb_io_fptr_finalize(RANY(obj)->as.file.fptr);
-	    RUBY_CRITICAL(free(RANY(obj)->as.file.fptr));
+	    free(RANY(obj)->as.file.fptr);
 	}
 	break;
       case T_ICLASS:
@@ -1116,24 +801,21 @@ obj_free(obj)
 
       case T_FLOAT:
       case T_VARMAP:
-      case T_BLKTAG:
 	break;
 
       case T_BIGNUM:
-	if (RANY(obj)->as.bignum.digits) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.bignum.digits));
-	}
+	if (RANY(obj)->as.bignum.digits) free(RANY(obj)->as.bignum.digits);
 	break;
       case T_NODE:
 	switch (nd_type(obj)) {
 	  case NODE_SCOPE:
 	    if (RANY(obj)->as.node.u1.tbl) {
-		RUBY_CRITICAL(free(RANY(obj)->as.node.u1.tbl));
+		free(RANY(obj)->as.node.u1.tbl);
 	    }
 	    break;
 #ifdef C_ALLOCA
 	  case NODE_ALLOCA:
-	    RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node));
+	    free(RANY(obj)->as.node.u1.value);
 	    break;
 #endif
 	}
@@ -1141,23 +823,22 @@ obj_free(obj)
 
       case T_SCOPE:
 	if (RANY(obj)->as.scope.local_vars &&
-            RANY(obj)->as.scope.flags != SCOPE_ALLOCA) {
+            RANY(obj)->as.scope.flag != SCOPE_ALLOCA) {
 	    VALUE *vars = RANY(obj)->as.scope.local_vars-1;
 	    if (vars[0] == 0)
-		RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl));
-	    if (RANY(obj)->as.scope.flags & SCOPE_MALLOC)
-		RUBY_CRITICAL(free(vars));
+		free(RANY(obj)->as.scope.local_tbl);
+	    if (RANY(obj)->as.scope.flag&SCOPE_MALLOC)
+		free(vars);
 	}
 	break;
 
       case T_STRUCT:
-	if (RANY(obj)->as.rstruct.ptr) {
-	    RUBY_CRITICAL(free(RANY(obj)->as.rstruct.ptr));
-	}
+	if (RANY(obj)->as.rstruct.ptr)
+	    free(RANY(obj)->as.rstruct.ptr);
 	break;
 
       default:
-	rb_bug("gc_sweep(): unknown data type 0x%lx(%ld)", obj,
+	rb_bug("gc_sweep(): unknown data type %d",
 	       RANY(obj)->as.basic.flags & T_MASK);
     }
 }
@@ -1167,38 +848,35 @@ rb_gc_mark_frame(frame)
     struct FRAME *frame;
 {
     mark_locations_array(frame->argv, frame->argc);
-    rb_gc_mark((VALUE)frame->node);
+    rb_gc_mark(frame->cbase);
 }
 
 #ifdef __GNUC__
 #if defined(__human68k__) || defined(DJGPP)
 #if defined(__human68k__)
 typedef unsigned long rb_jmp_buf[8];
-__asm__ (".even\n\
-_rb_setjmp:\n\
-	move.l	4(sp),a0\n\
-	movem.l	d3-d7/a3-a5,(a0)\n\
-	moveq.l	#0,d0\n\
+__asm__ (".even
+_rb_setjmp:
+	move.l	4(sp),a0
+	movem.l	d3-d7/a3-a5,(a0)
+	moveq.l	#0,d0
 	rts");
-#ifdef setjmp
-#undef setjmp
-#endif
 #else
 #if defined(DJGPP)
 typedef unsigned long rb_jmp_buf[6];
-__asm__ (".align 4\n\
-_rb_setjmp:\n\
-	pushl	%ebp\n\
-	movl	%esp,%ebp\n\
-	movl	8(%ebp),%ebp\n\
-	movl	%eax,(%ebp)\n\
-	movl	%ebx,4(%ebp)\n\
-	movl	%ecx,8(%ebp)\n\
-	movl	%edx,12(%ebp)\n\
-	movl	%esi,16(%ebp)\n\
-	movl	%edi,20(%ebp)\n\
-	popl	%ebp\n\
-	xorl	%eax,%eax\n\
+__asm__ (".align 4
+_rb_setjmp:
+	pushl	%ebp
+	movl	%esp,%ebp
+	movl	8(%ebp),%ebp
+	movl	%eax,(%ebp)
+	movl	%ebx,4(%ebp)
+	movl	%ecx,8(%ebp)
+	movl	%edx,12(%ebp)
+	movl	%esi,16(%ebp)
+	movl	%edi,20(%ebp)
+	popl	%ebp
+	xorl	%eax,%eax
 	ret");
 #endif
 #endif
@@ -1212,81 +890,47 @@ void
 rb_gc()
 {
     struct gc_list *list;
-    struct FRAME * volatile frame; /* gcc 2.7.2.3 -O2 bug??  */
+    struct FRAME *frame;
     jmp_buf save_regs_gc_mark;
-    SET_STACK_END;
+    VALUE stack_end;
+
+    alloc_objects = 0;
+    malloc_memories = 0;
 
-    if (dont_gc || during_gc) {
-	if (!freelist) {
-	    add_heap();
-	}
-	return;
-    }
     if (during_gc) return;
     during_gc++;
 
-    init_mark_stack();
-    
+#ifdef C_ALLOCA
+    alloca(0);
+#endif
+
     /* mark frame stack */
     for (frame = ruby_frame; frame; frame = frame->prev) {
-	rb_gc_mark_frame(frame); 
-	if (frame->tmp) {
-	    struct FRAME *tmp = frame->tmp;
-	    while (tmp) {
-		rb_gc_mark_frame(tmp);
-		tmp = tmp->prev;
-	    }
-	}
-    }
-    rb_gc_mark((VALUE)ruby_scope);
-    rb_gc_mark((VALUE)ruby_dyna_vars);
-    if (finalizer_table) {
-	rb_mark_tbl(finalizer_table);
+	rb_gc_mark_frame(frame);
     }
+    rb_gc_mark(ruby_class);
+    rb_gc_mark(ruby_scope);
+    rb_gc_mark(ruby_dyna_vars);
 
     FLUSH_REGISTER_WINDOWS;
-    /* This assumes that all registers are saved into the jmp_buf (and stack) */
+    /* This assumes that all registers are saved into the jmp_buf */
     setjmp(save_regs_gc_mark);
-    mark_locations_array((VALUE*)save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *));
-#if STACK_GROW_DIRECTION < 0
-    rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
-#elif STACK_GROW_DIRECTION > 0
-    rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
-#else
-    if ((VALUE*)STACK_END < rb_gc_stack_start)
-	rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
-    else
-	rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
-#endif
-#ifdef __ia64__
-    /* mark backing store (flushed register window on the stack) */
-    /* the basic idea from guile GC code                         */
-    {
-	ucontext_t ctx;
-	VALUE *top, *bot;
-	getcontext(&ctx);
-	mark_locations_array((VALUE*)&ctx.uc_mcontext,
-			     ((size_t)(sizeof(VALUE)-1 + sizeof ctx.uc_mcontext)/sizeof(VALUE)));
-	bot = (VALUE*)__libc_ia64_register_backing_store_base;
-#if defined(__FreeBSD__)
-	top = (VALUE*)ctx.uc_mcontext.mc_special.bspstore;
-#else
-	top = (VALUE*)ctx.uc_mcontext.sc_ar_bsp;
-#endif
-	rb_gc_mark_locations(bot, top);
-    }
+    mark_locations_array((VALUE*)&save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *));
+    rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)&stack_end);
+#if defined(THINK_C) || defined(__human68k__)
+#ifndef __human68k__
+    mark_locations_array((VALUE*)((char*)save_regs_gc_mark+2),
+			 sizeof(save_regs_gc_mark) / sizeof(VALUE *));
 #endif
-#if defined(__human68k__) || defined(__mc68000__)
-    rb_gc_mark_locations((VALUE*)((char*)STACK_END + 2),
-			 (VALUE*)((char*)rb_gc_stack_start + 2));
+    rb_gc_mark_locations((VALUE*)((char*)rb_gc_stack_start + 2),
+		   (VALUE*)((char*)&stack_end + 2));
 #endif
     rb_gc_mark_threads();
 
     /* mark protected global variables */
-    for (list = global_List; list; list = list->next) {
-	rb_gc_mark_maybe(*list->varptr);
+    for (list = Global_List; list; list = list->next) {
+	rb_gc_mark(*list->varptr);
     }
-    rb_mark_end_proc();
     rb_gc_mark_global_tbl();
 
     rb_mark_tbl(rb_class_tbl);
@@ -1295,22 +939,11 @@ rb_gc()
     /* mark generic instance variables for special constants */
     rb_mark_generic_ivar_tbl();
 
-    rb_gc_mark_parser();
-    
-    /* gc_mark objects whose marking are not completed*/
-    while (!MARK_STACK_EMPTY){
-	if (mark_stack_overflow){
-	    gc_mark_all();
-	}
-	else {
-	    gc_mark_rest();
-	}
-    }
     gc_sweep();
 }
 
-VALUE
-rb_gc_start()
+static VALUE
+gc_start()
 {
     rb_gc();
     return Qnil;
@@ -1320,39 +953,14 @@ void
 Init_stack(addr)
     VALUE *addr;
 {
-#if defined(__human68k__)
+#ifdef __human68k__
     extern void *_SEND;
     rb_gc_stack_start = _SEND;
 #else
-    if (!addr) addr = (VALUE *)&addr;
-    if (rb_gc_stack_start) {
-	if (STACK_UPPER(&addr,
-			rb_gc_stack_start > addr,
-			rb_gc_stack_start < ++addr))
-	    rb_gc_stack_start = addr;
-	return;
-    }
-    rb_gc_stack_start = addr;
-#endif
-#ifdef HAVE_GETRLIMIT
-    {
-	struct rlimit rlim;
-
-	if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
-	    unsigned int space = rlim.rlim_cur/5;
+    VALUE start;
 
-	    if (space > 1024*1024) space = 1024*1024;
-	    STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
-	}
-    }
-#ifdef __ia64__
-    /* ruby crashes on IA64 if compiled with optimizer on */
-    /* when if STACK_LEVEL_MAX is greater than this magic number */
-    /* I know this is a kludge.  I suspect optimizer bug */
-#define IA64_MAGIC_STACK_LIMIT 49152
-    if (STACK_LEVEL_MAX > IA64_MAGIC_STACK_LIMIT)
-	STACK_LEVEL_MAX = IA64_MAGIC_STACK_LIMIT;
-#endif
+    if (!addr) addr = &start;
+    rb_gc_stack_start = addr;
 #endif
 }
 
@@ -1374,7 +982,7 @@ os_live_obj()
     for (i = 0; i < heaps_used; i++) {
 	RVALUE *p, *pend;
 
-	p = heaps[i].slot; pend = p + heaps[i].limit;
+	p = heaps[i]; pend = p + HEAP_SLOTS;
 	for (;p < pend; p++) {
 	    if (p->as.basic.flags) {
 		switch (TYPE(p)) {
@@ -1386,7 +994,6 @@ os_live_obj()
 		  case T_CLASS:
 		    if (FL_TEST(p, FL_SINGLETON)) continue;
 		  default:
-		    if (!p->as.basic.klass) continue;
 		    rb_yield((VALUE)p);
 		    n++;
 		}
@@ -1407,7 +1014,7 @@ os_obj_of(of)
     for (i = 0; i < heaps_used; i++) {
 	RVALUE *p, *pend;
 
-	p = heaps[i].slot; pend = p + heaps[i].limit;
+	p = heaps[i]; pend = p + HEAP_SLOTS;
 	for (;p < pend; p++) {
 	    if (p->as.basic.flags) {
 		switch (TYPE(p)) {
@@ -1419,7 +1026,6 @@ os_obj_of(of)
 		  case T_CLASS:
 		    if (FL_TEST(p, FL_SINGLETON)) continue;
 		  default:
-		    if (!p->as.basic.klass) continue;
 		    if (rb_obj_is_kind_of((VALUE)p, of)) {
 			rb_yield((VALUE)p);
 			n++;
@@ -1439,7 +1045,6 @@ os_each_obj(argc, argv)
 {
     VALUE of;
 
-    rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &of) == 0) {
 	return os_live_obj();
     }
@@ -1451,31 +1056,28 @@ os_each_obj(argc, argv)
 static VALUE finalizers;
 
 static VALUE
-add_final(os, block)
-    VALUE os, block;
+add_final(os, proc)
+    VALUE os, proc;
 {
-    rb_warn("ObjectSpace::add_finalizer is deprecated; use define_finalizer");
-    if (!rb_respond_to(block, rb_intern("call"))) {
-	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
-		 rb_obj_classname(block));
+    if (!rb_obj_is_kind_of(proc, rb_cProc)) {
+	rb_raise(rb_eArgError, "wrong type argument %s (Proc required)",
+		 rb_class2name(CLASS_OF(proc)));
     }
-    rb_ary_push(finalizers, block);
-    return block;
+    rb_ary_push(finalizers, proc);
+    return proc;
 }
 
 static VALUE
-rm_final(os, block)
-    VALUE os, block;
+rm_final(os, proc)
+    VALUE os, proc;
 {
-    rb_warn("ObjectSpace::remove_finalizer is deprecated; use undefine_finalizer");
-    rb_ary_delete(finalizers, block);
-    return block;
+    rb_ary_delete(finalizers, proc);
+    return proc;
 }
 
 static VALUE
 finals()
 {
-    rb_warn("ObjectSpace::finalizers is deprecated");
     return finalizers;
 }
 
@@ -1483,74 +1085,16 @@ static VALUE
 call_final(os, obj)
     VALUE os, obj;
 {
-    rb_warn("ObjectSpace::call_finalizer is deprecated; use define_finalizer");
     need_call_final = 1;
     FL_SET(obj, FL_FINALIZE);
     return obj;
 }
 
 static VALUE
-undefine_final(os, obj)
-    VALUE os, obj;
-{
-    if (finalizer_table) {
-	st_delete(finalizer_table, (st_data_t*)&obj, 0);
-    }
-    return obj;
-}
-
-static VALUE
-define_final(argc, argv, os)
-    int argc;
-    VALUE *argv;
-    VALUE os;
-{
-    VALUE obj, block, table;
-
-    rb_scan_args(argc, argv, "11", &obj, &block);
-    if (argc == 1) {
-	block = rb_block_proc();
-    }
-    else if (!rb_respond_to(block, rb_intern("call"))) {
-	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
-		 rb_obj_classname(block));
-    }
-    need_call_final = 1;
-    FL_SET(obj, FL_FINALIZE);
-
-    if (!finalizer_table) {
-	finalizer_table = st_init_numtable();
-    }
-    if (st_lookup(finalizer_table, obj, &table)) {
-	rb_ary_push(table, block);
-    }
-    else {
-	st_add_direct(finalizer_table, obj, rb_ary_new3(1, block));
-    }
-    return block;
-}
-
-void
-rb_gc_copy_finalizer(dest, obj)
-    VALUE dest, obj;
-{
-    VALUE table;
-
-    if (!finalizer_table) return;
-    if (!FL_TEST(obj, FL_FINALIZE)) return;
-    if (FL_TEST(dest, FL_FINALIZE)) {
-	rb_warn("copy_finalizer: descarding old finalizers");
-    }
-    if (st_lookup(finalizer_table, obj, &table)) {
-	st_insert(finalizer_table, dest, table);
-    }
-}
-
-static VALUE
 run_single_final(args)
     VALUE *args;
 {
-    rb_eval_cmd(args[0], args[1], 0);
+    rb_eval_cmd(args[0], args[1]);
     return Qnil;
 }
 
@@ -1558,23 +1102,15 @@ static void
 run_final(obj)
     VALUE obj;
 {
-    long i;
-    int status, critical_save = rb_thread_critical;
-    VALUE args[2], table;
+    int i, status;
+    VALUE args[2];
 
-    rb_thread_critical = Qtrue;
-    args[1] = rb_ary_new3(1, rb_obj_id(obj)); /* make obj into id */
+    obj = rb_obj_id(obj);	/* make obj into id */
+    args[1] = rb_ary_new3(1, obj);
     for (i=0; i<RARRAY(finalizers)->len; i++) {
 	args[0] = RARRAY(finalizers)->ptr[i];
-	rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
+	rb_protect(run_single_final, (VALUE)args, &status);
     }
-    if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
-	for (i=0; i<RARRAY(table)->len; i++) {
-	    args[0] = RARRAY(table)->ptr[i];
-	    rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
-	}
-    }
-    rb_thread_critical = critical_save;
 }
 
 void
@@ -1584,43 +1120,23 @@ rb_gc_call_finalizer_at_exit()
     int i;
 
     /* run finalizers */
-    if (need_call_final) {
-	if (deferred_final_list) {
-	    p = deferred_final_list;
-	    while (p) {
-		RVALUE *tmp = p;
-		p = p->as.free.next;
-		run_final((VALUE)tmp);
-	    }
-	}
-	for (i = 0; i < heaps_used; i++) {
-	    p = heaps[i].slot; pend = p + heaps[i].limit;
-	    while (p < pend) {
-		if (FL_TEST(p, FL_FINALIZE)) {
-		    FL_UNSET(p, FL_FINALIZE);
-		    p->as.basic.klass = 0;
-		    run_final((VALUE)p);
-		}
-		p++;
-	    }
+    for (i = 0; i < heaps_used; i++) {
+	p = heaps[i]; pend = p + HEAP_SLOTS;
+	while (p < pend) {
+	    if (FL_TEST(p, FL_FINALIZE))
+		run_final((VALUE)p);
+	    p++;
 	}
     }
-    /* run data object's finalizers */
+    /* run data object's finaliers */
     for (i = 0; i < heaps_used; i++) {
-	p = heaps[i].slot; pend = p + heaps[i].limit;
+	p = heaps[i]; pend = p + HEAP_SLOTS;
 	while (p < pend) {
 	    if (BUILTIN_TYPE(p) == T_DATA &&
 		DATA_PTR(p) && RANY(p)->as.data.dfree) {
-		p->as.free.flags = 0;
-		if ((long)RANY(p)->as.data.dfree == -1) {
-		    RUBY_CRITICAL(free(DATA_PTR(p)));
-		}
-		else if (RANY(p)->as.data.dfree) {
-		    (*RANY(p)->as.data.dfree)(DATA_PTR(p));
-		}
+		(*RANY(p)->as.data.dfree)(DATA_PTR(p));
 	    }
 	    else if (BUILTIN_TYPE(p) == T_FILE) {
-		p->as.free.flags = 0;
 		rb_io_fptr_finalize(RANY(p)->as.file.fptr);
 	    }
 	    p++;
@@ -1632,24 +1148,21 @@ static VALUE
 id2ref(obj, id)
     VALUE obj, id;
 {
-    unsigned long ptr, p0;
+    unsigned long ptr;
 
     rb_secure(4);
-    p0 = ptr = NUM2ULONG(id);
+    ptr = NUM2UINT(id);
+    if (FIXNUM_P(ptr)) return (VALUE)ptr;
     if (ptr == Qtrue) return Qtrue;
     if (ptr == Qfalse) return Qfalse;
     if (ptr == Qnil) return Qnil;
-    if (FIXNUM_P(ptr)) return (VALUE)ptr;
-    if (SYMBOL_P(ptr) && rb_id2name(SYM2ID((VALUE)ptr)) != 0) {
-	return (VALUE)ptr;
-    }
 
-    ptr = id ^ FIXNUM_FLAG;	/* unset FIXNUM_FLAG */
-    if (!is_pointer_to_heap((void *)ptr)|| BUILTIN_TYPE(ptr) >= T_BLKTAG) {
-	rb_raise(rb_eRangeError, "0x%lx is not id value", p0);
+    ptr = id ^ FIXNUM_FLAG;
+    if (!looks_pointerp(ptr)) {
+	rb_raise(rb_eIndexError, "0x%x is not id value", ptr);
     }
-    if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) {
-	rb_raise(rb_eRangeError, "0x%lx is recycled object", p0);
+    if (BUILTIN_TYPE(ptr) == 0) {
+	rb_raise(rb_eIndexError, "0x%x is recycled object", ptr);
     }
     return (VALUE)ptr;
 }
@@ -1660,31 +1173,20 @@ Init_GC()
     VALUE rb_mObSpace;
 
     rb_mGC = rb_define_module("GC");
-    rb_define_singleton_method(rb_mGC, "start", rb_gc_start, 0);
-    rb_define_singleton_method(rb_mGC, "enable", rb_gc_enable, 0);
-    rb_define_singleton_method(rb_mGC, "disable", rb_gc_disable, 0);
-    rb_define_method(rb_mGC, "garbage_collect", rb_gc_start, 0);
+    rb_define_singleton_method(rb_mGC, "start", gc_start, 0);
+    rb_define_singleton_method(rb_mGC, "enable", gc_enable, 0);
+    rb_define_singleton_method(rb_mGC, "disable", gc_disable, 0);
+    rb_define_method(rb_mGC, "garbage_collect", gc_start, 0);
 
     rb_mObSpace = rb_define_module("ObjectSpace");
     rb_define_module_function(rb_mObSpace, "each_object", os_each_obj, -1);
-    rb_define_module_function(rb_mObSpace, "garbage_collect", rb_gc_start, 0);
+    rb_define_module_function(rb_mObSpace, "garbage_collect", gc_start, 0);
     rb_define_module_function(rb_mObSpace, "add_finalizer", add_final, 1);
     rb_define_module_function(rb_mObSpace, "remove_finalizer", rm_final, 1);
     rb_define_module_function(rb_mObSpace, "finalizers", finals, 0);
     rb_define_module_function(rb_mObSpace, "call_finalizer", call_final, 1);
-
-    rb_define_module_function(rb_mObSpace, "define_finalizer", define_final, -1);
-    rb_define_module_function(rb_mObSpace, "undefine_finalizer", undefine_final, 1);
-
     rb_define_module_function(rb_mObSpace, "_id2ref", id2ref, 1);
 
-    rb_gc_register_address(&rb_mObSpace);
     rb_global_variable(&finalizers);
-    rb_gc_unregister_address(&rb_mObSpace);
     finalizers = rb_ary_new();
-
-    source_filenames = st_init_strtable();
-
-    nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
-    rb_global_variable(&nomem_error);
 }
diff --git a/hash.c b/hash.c
index 245f6fb4c6..68e90fe8dc 100644
--- a/hash.c
+++ b/hash.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   hash.c -
 
@@ -6,32 +6,36 @@
   $Date$
   created at: Mon Nov 22 18:51:18 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
 #include "st.h"
 #include "util.h"
 #include "rubysig.h"
-#include "version.h"
 
-#ifdef __APPLE__
-#include <crt_externs.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifndef HAVE_STRING_H
+char *strchr _((char*,char));
+#endif
+
+#ifdef USE_CWGUSI
+char* strdup(const char*);
 #endif
 
-#define HASH_DELETED  FL_USER1
-#define HASH_PROC_DEFAULT FL_USER2
+#define HASH_FREEZE   FL_USER1
+#define HASH_DELETED  FL_USER2
 
 static void
 rb_hash_modify(hash)
     VALUE hash;
 {
-    if (!RHASH(hash)->tbl) rb_raise(rb_eTypeError, "uninitialized Hash");
-    if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
-    if (!OBJ_TAINTED(hash) && rb_safe_level() >= 4)
+    if (FL_TEST(hash, HASH_FREEZE))
+	rb_raise(rb_eTypeError, "can't modify frozen hash");
+    if (!FL_TEST(hash, FL_TAINT) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
 }
 
@@ -39,75 +43,73 @@ VALUE
 rb_hash_freeze(hash)
     VALUE hash;
 {
-    return rb_obj_freeze(hash);
+    FL_SET(hash, HASH_FREEZE);
+    return hash;
+}
+
+static VALUE
+rb_hash_frozen_p(hash)
+    VALUE hash;
+{
+    if (FL_TEST(hash, HASH_FREEZE))
+	return Qtrue;
+    return Qfalse;
 }
 
 VALUE rb_cHash;
 
 static VALUE envtbl;
-static ID id_hash, id_call, id_default;
+static ID hash;
 
 VALUE
 rb_hash(obj)
     VALUE obj;
 {
-    return rb_funcall(obj, id_hash, 0);
-}
-
-static VALUE
-eql(args)
-    VALUE *args;
-{
-    return (VALUE)rb_eql(args[0], args[1]);
+    return rb_funcall(obj, hash, 0);
 }
 
 static int
 rb_any_cmp(a, b)
     VALUE a, b;
 {
-    VALUE args[2];
-
-    if (a == b) return 0;
-    if (FIXNUM_P(a) && FIXNUM_P(b)) {
-	return a != b;
-    }
-    if (TYPE(a) == T_STRING && RBASIC(a)->klass == rb_cString &&
-	TYPE(b) == T_STRING && RBASIC(b)->klass == rb_cString) {
-	return rb_str_cmp(a, b);
+    if (FIXNUM_P(a)) {
+	if (FIXNUM_P(b)) return a != b;
     }
-    if (a == Qundef || b == Qundef) return -1;
-    if (SYMBOL_P(a) && SYMBOL_P(b)) {
-	return a != b;
+    else if (TYPE(a) == T_STRING) {
+	if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
     }
 
-    args[0] = a;
-    args[1] = b;
-    return !rb_with_disable_interrupt(eql, (VALUE)args);
+    DEFER_INTS;
+    a = !rb_eql(a, b);
+    ENABLE_INTS;
+    return a;
 }
 
 static int
 rb_any_hash(a)
     VALUE a;
 {
-    VALUE hval;
+    unsigned int hval;
 
     switch (TYPE(a)) {
       case T_FIXNUM:
-      case T_SYMBOL:
-	return (int)a;
+	hval = a;
 	break;
 
       case T_STRING:
-	return rb_str_hash(a);
+	hval = rb_str_hash(a);
 	break;
 
       default:
-	hval = rb_funcall(a, id_hash, 0);
+	DEFER_INTS;
+	hval = rb_funcall(a, hash, 0);
 	if (!FIXNUM_P(hval)) {
-	    hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
+	    hval = rb_funcall(hval, '%', 1, INT2FIX(65439));
 	}
-	return (int)FIX2LONG(hval);
+	ENABLE_INTS;
+	hval = FIX2LONG(hval);
     }
+    return  hval;
 }
 
 static struct st_hash_type objhash = {
@@ -118,7 +120,7 @@ static struct st_hash_type objhash = {
 struct rb_hash_foreach_arg {
     VALUE hash;
     enum st_retval (*func)();
-    VALUE arg;
+    char *arg;
 };
 
 static int
@@ -130,7 +132,7 @@ rb_hash_foreach_iter(key, value, arg)
     st_table *tbl = RHASH(arg->hash)->tbl;
     struct st_table_entry **bins = tbl->bins;
 
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     status = (*arg->func)(key, value, arg->arg);
     if (RHASH(arg->hash)->tbl != tbl || RHASH(arg->hash)->tbl->bins != bins){
 	rb_raise(rb_eIndexError, "rehash occurred during iteration");
@@ -142,7 +144,7 @@ static VALUE
 rb_hash_foreach_call(arg)
     struct rb_hash_foreach_arg *arg;
 {
-    st_foreach(RHASH(arg->hash)->tbl, rb_hash_foreach_iter, (st_data_t)arg);
+    st_foreach(RHASH(arg->hash)->tbl, rb_hash_foreach_iter, arg);
     return Qnil;
 }
 
@@ -154,7 +156,7 @@ rb_hash_foreach_ensure(hash)
 
     if (RHASH(hash)->iter_lev == 0) {
 	if (FL_TEST(hash, HASH_DELETED)) {
-	    st_cleanup_safe(RHASH(hash)->tbl, Qundef);
+	    st_cleanup_safe(RHASH(hash)->tbl, Qnil);
 	    FL_UNSET(hash, HASH_DELETED);
 	}
     }
@@ -165,7 +167,7 @@ static int
 rb_hash_foreach(hash, func, farg)
     VALUE hash;
     enum st_retval (*func)();
-    VALUE farg;
+    char *farg;
 {
     struct rb_hash_foreach_arg arg;
 
@@ -176,48 +178,48 @@ rb_hash_foreach(hash, func, farg)
     return rb_ensure(rb_hash_foreach_call, (VALUE)&arg, rb_hash_foreach_ensure, hash);
 }
 
-static VALUE hash_alloc _((VALUE));
 static VALUE
-hash_alloc(klass)
+rb_hash_s_new(argc, argv, klass)
+    int argc;
+    VALUE *argv;
     VALUE klass;
 {
+    VALUE ifnone;
+
     NEWOBJ(hash, struct RHash);
     OBJSETUP(hash, klass, T_HASH);
 
+    hash->iter_lev = 0;
     hash->ifnone = Qnil;
+    hash->tbl = 0;		/* avoid GC crashing  */
+
+    rb_scan_args(argc, argv, "01", &ifnone);
+
+    hash->ifnone = ifnone;
     hash->tbl = st_init_table(&objhash);
 
     return (VALUE)hash;
 }
 
-VALUE
-rb_hash_new()
-{
-    return hash_alloc(rb_cHash);
-}
-
 static VALUE
-rb_hash_initialize(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
+rb_hash_new2(klass)
+    VALUE klass;
 {
-    VALUE ifnone;
+    NEWOBJ(hash, struct RHash);
+    OBJSETUP(hash, klass, T_HASH);
 
-    rb_hash_modify(hash);
-    if (rb_block_given_p()) {
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments");
-	}
-	RHASH(hash)->ifnone = rb_block_proc();
-	FL_SET(hash, HASH_PROC_DEFAULT);
-    }
-    else {
-	rb_scan_args(argc, argv, "01", &ifnone);
-	RHASH(hash)->ifnone = ifnone;
-    }
+    hash->iter_lev = 0;
+    hash->ifnone = Qnil;
+    hash->tbl = 0;		/* avoid GC crashing  */
+    hash->tbl = st_init_table(&objhash);
 
-    return hash;
+    return (VALUE)hash;
+}
+
+VALUE
+rb_hash_new()
+{
+    return rb_hash_new2(rb_cHash);
 }
 
 static VALUE
@@ -229,28 +231,67 @@ rb_hash_s_create(argc, argv, klass)
     VALUE hash;
     int i;
 
-    if (argc == 1 && TYPE(argv[0]) == T_HASH) {
-	hash = hash_alloc(klass);
+    if (argc == 1) {
+	if (TYPE(argv[0]) == T_HASH) {
+	    NEWOBJ(hash, struct RHash);
+	    OBJSETUP(hash, klass, T_HASH);
 	    
-	RHASH(hash)->ifnone = Qnil;
-	RHASH(hash)->tbl = st_copy(RHASH(argv[0])->tbl);
+	    hash->iter_lev = 0;
+	    hash->ifnone = Qnil;
+	    hash->tbl = 0;	/* avoid GC crashing  */
+	    hash->tbl = st_copy(RHASH(argv[0])->tbl);
 
-	return hash;
+	    return (VALUE)hash;
+	}
+	else {
+	    VALUE a = rb_Array(argv[0]);
+	    return rb_hash_s_create(RARRAY(a)->len, RARRAY(a)->ptr, klass);
+	}
     }
 
     if (argc % 2 != 0) {
 	rb_raise(rb_eArgError, "odd number args for Hash");
     }
+    hash = rb_hash_new2(klass);
 
-    hash = hash_alloc(klass);
     for (i=0; i<argc; i+=2) {
-        rb_hash_aset(hash, argv[i], argv[i + 1]);
+	st_insert(RHASH(hash)->tbl, argv[i], argv[i+1]);
     }
 
     return hash;
 }
 
 static VALUE
+rb_hash_clone(hash)
+    VALUE hash;
+{
+    NEWOBJ(hash2, struct RHash);
+    CLONESETUP(hash2, hash);
+
+    hash2->iter_lev = 0;
+    hash2->ifnone = RHASH(hash)->ifnone;
+    hash2->tbl = 0;		/* avoid GC crashing  */
+    hash2->tbl = (st_table*)st_copy(RHASH(hash)->tbl);
+
+    return (VALUE)hash2;
+}
+
+static VALUE
+rb_hash_dup(hash)
+    VALUE hash;
+{
+    NEWOBJ(hash2, struct RHash);
+    OBJSETUP(hash2, CLASS_OF(hash), T_HASH);
+
+    hash2->iter_lev = 0;
+    hash2->ifnone = RHASH(hash)->ifnone;
+    hash2->tbl = 0;		/* avoid GC crashing  */
+    hash2->tbl = (st_table*)st_copy(RHASH(hash)->tbl);
+
+    return (VALUE)hash2;
+}
+
+static VALUE
 to_hash(hash)
     VALUE hash;
 {
@@ -262,7 +303,9 @@ rb_hash_rehash_i(key, value, tbl)
     VALUE key, value;
     st_table *tbl;
 {
-    if (key != Qundef) st_insert(tbl, key, value);
+    if (key != Qnil) {
+	st_insert(tbl, key, value);
+    }
     return ST_CONTINUE;
 }
 
@@ -272,9 +315,8 @@ rb_hash_rehash(hash)
 {
     st_table *tbl;
 
-    rb_hash_modify(hash);
     tbl = st_init_table_with_size(&objhash, RHASH(hash)->tbl->num_entries);
-    st_foreach(RHASH(hash)->tbl, rb_hash_rehash_i, (st_data_t)tbl);
+    st_foreach(RHASH(hash)->tbl, rb_hash_rehash_i, tbl);
     st_free_table(RHASH(hash)->tbl);
     RHASH(hash)->tbl = tbl;
 
@@ -288,7 +330,7 @@ rb_hash_aref(hash, key)
     VALUE val;
 
     if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
-	return rb_funcall(hash, id_default, 1, key);
+	return RHASH(hash)->ifnone;
     }
     return val;
 }
@@ -305,14 +347,11 @@ rb_hash_fetch(argc, argv, hash)
     rb_scan_args(argc, argv, "11", &key, &if_none);
 
     if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
-	if (rb_block_given_p()) {
+	if (rb_iterator_p()) {
 	    if (argc > 1) {
-               rb_raise(rb_eArgError, "wrong number of arguments");
+		rb_raise(rb_eArgError, "wrong # of arguments", argc);
 	    }
-	    return rb_yield(key);
-	}
-	if (argc == 1) {
-	    rb_raise(rb_eIndexError, "key not found");
+	    return rb_yield(argv[0]);
 	}
 	return if_none;
     }
@@ -320,17 +359,9 @@ rb_hash_fetch(argc, argv, hash)
 }
 
 static VALUE
-rb_hash_default(argc, argv, hash)
-    int argc;
-    VALUE *argv;
+rb_hash_default(hash)
     VALUE hash;
 {
-    VALUE key;
-
-    rb_scan_args(argc, argv, "01", &key);
-    if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
-	return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, key);
-    }
     return RHASH(hash)->ifnone;
 }
 
@@ -338,20 +369,8 @@ static VALUE
 rb_hash_set_default(hash, ifnone)
     VALUE hash, ifnone;
 {
-    rb_hash_modify(hash);
     RHASH(hash)->ifnone = ifnone;
-    FL_UNSET(hash, HASH_PROC_DEFAULT);
-    return ifnone;
-}
-
-static VALUE
-rb_hash_default_proc(hash)
-    VALUE hash;
-{
-    if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
-	return RHASH(hash)->ifnone;
-    }
-    return Qnil;
+    return hash;
 }
 
 static int
@@ -375,7 +394,7 @@ rb_hash_index(hash, value)
     args[0] = value;
     args[1] = Qnil;
 
-    st_foreach(RHASH(hash)->tbl, index_i, (st_data_t)args);
+    st_foreach(RHASH(hash)->tbl, index_i, args);
 
     return args[1];
 }
@@ -389,32 +408,29 @@ rb_hash_indexes(argc, argv, hash)
     VALUE indexes;
     int i;
 
-    rb_warn("Hash#%s is deprecated; use Hash#values_at",
-	    rb_id2name(rb_frame_last_func()));
     indexes = rb_ary_new2(argc);
     for (i=0; i<argc; i++) {
 	RARRAY(indexes)->ptr[i] = rb_hash_aref(hash, argv[i]);
-	RARRAY(indexes)->len++;
     }
+    RARRAY(indexes)->len = i;
     return indexes;
 }
 
-VALUE
+static VALUE
 rb_hash_delete(hash, key)
     VALUE hash, key;
 {
     VALUE val;
 
     rb_hash_modify(hash);
-    if (RHASH(hash)->iter_lev > 0) {
-	if (st_delete_safe(RHASH(hash)->tbl, (st_data_t*)&key, &val, Qundef)) {
-	    FL_SET(hash, HASH_DELETED);
-	    return val;
-	}
+    if (RHASH(hash)->iter_lev > 0 &&
+	st_delete_safe(RHASH(hash)->tbl, &key, &val, Qnil)) {
+	FL_SET(hash, HASH_DELETED);
+	return val;
     }
-    else if (st_delete(RHASH(hash)->tbl, (st_data_t*)&key, &val))
+    else if (st_delete(RHASH(hash)->tbl, &key, &val))
 	return val;
-    if (rb_block_given_p()) {
+    if (rb_iterator_p()) {
 	return rb_yield(key);
     }
     return Qnil;
@@ -431,7 +447,7 @@ shift_i(key, value, var)
     VALUE key, value;
     struct shift_var *var;
 {
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     if (var->stop) return ST_STOP;
     var->stop = 1;
     var->key = key;
@@ -447,102 +463,32 @@ rb_hash_shift(hash)
 
     rb_hash_modify(hash);
     var.stop = 0;
-    st_foreach(RHASH(hash)->tbl, shift_i, (st_data_t)&var);
+    st_foreach(RHASH(hash)->tbl, shift_i, &var);
 
-    if (var.stop) {
-	return rb_assoc_new(var.key, var.val);
-    }
-    else if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
-	return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, Qnil);
-    }
-    else {
-	return RHASH(hash)->ifnone;
-    }
+    if (var.stop == 0) return Qnil;
+    return rb_assoc_new(var.key, var.val);
 }
 
-static enum st_retval
+static int
 delete_if_i(key, value)
     VALUE key, value;
 {
-    if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_yield_values(2, key, value)))
+    if (value == Qnil) return ST_CONTINUE;
+    if (RTEST(rb_yield(rb_assoc_new(key, value))))
 	return ST_DELETE;
     return ST_CONTINUE;
 }
 
-VALUE
+static VALUE
 rb_hash_delete_if(hash)
     VALUE hash;
 {
     rb_hash_modify(hash);
     rb_hash_foreach(hash, delete_if_i, 0);
-    return hash;
-}
 
-VALUE
-rb_hash_reject_bang(hash)
-    VALUE hash;
-{
-    int n = RHASH(hash)->tbl->num_entries;
-    rb_hash_delete_if(hash);
-    if (n == RHASH(hash)->tbl->num_entries) return Qnil;
     return hash;
 }
 
-static VALUE
-rb_hash_reject(hash)
-    VALUE hash;
-{
-    return rb_hash_delete_if(rb_obj_dup(hash));
-}
-
-static enum st_retval
-select_i(key, value, result)
-    VALUE key, value, result;
-{
-    if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_yield_values(2, key, value)))
-	rb_ary_push(result, rb_assoc_new(key, value));
-    return ST_CONTINUE;
-}
-
-VALUE
-rb_hash_values_at(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
-{
-    VALUE result = rb_ary_new();
-    long i;
-
-    for (i=0; i<argc; i++) {
-	rb_ary_push(result, rb_hash_aref(hash, argv[i]));
-    }
-    return result;
-}
-
-VALUE
-rb_hash_select(argc, argv, hash)
-    int argc;
-    VALUE *argv;
-    VALUE hash;
-{
-    VALUE result;
-
-    if (!rb_block_given_p()) {
-#if RUBY_VERSION_CODE < 181
-	rb_warn("Hash#select(key..) is deprecated; use Hash#values_at");
-#endif
-	return rb_hash_values_at(argc, argv, hash);
-    }
-    if (argc > 0) {
-	rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-    }
-    result = rb_ary_new();
-    rb_hash_foreach(hash, select_i, result);
-    return result;
-}
-
 static int
 clear_i(key, value, dummy)
     VALUE key, value, dummy;
@@ -565,6 +511,10 @@ rb_hash_aset(hash, key, val)
     VALUE hash, key, val;
 {
     rb_hash_modify(hash);
+    if (NIL_P(val)) {
+	rb_hash_delete(hash, key);
+	return Qnil;
+    }
     if (TYPE(key) != T_STRING || st_lookup(RHASH(hash)->tbl, key, 0)) {
 	st_insert(RHASH(hash)->tbl, key, val);
     }
@@ -578,10 +528,7 @@ static int
 replace_i(key, val, hash)
     VALUE key, val, hash;
 {
-    if (key != Qundef) {
-	rb_hash_aset(hash, key, val);
-    }
-
+    rb_hash_aset(hash, key, val);
     return ST_CONTINUE;
 }
 
@@ -590,22 +537,14 @@ rb_hash_replace(hash, hash2)
     VALUE hash, hash2;
 {
     hash2 = to_hash(hash2);
-    if (hash == hash2) return hash;
     rb_hash_clear(hash);
     st_foreach(RHASH(hash2)->tbl, replace_i, hash);
-    RHASH(hash)->ifnone = RHASH(hash2)->ifnone;
-    if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {
-	FL_SET(hash, HASH_PROC_DEFAULT);
-    }
-    else {
-	FL_UNSET(hash, HASH_PROC_DEFAULT);
-    }
 
     return hash;
 }
 
 static VALUE
-rb_hash_size(hash)
+rb_hash_length(hash)
     VALUE hash;
 {
     return INT2FIX(RHASH(hash)->tbl->num_entries);
@@ -620,11 +559,11 @@ rb_hash_empty_p(hash)
     return Qfalse;
 }
 
-static enum st_retval
+static int
 each_value_i(key, value)
     VALUE key, value;
 {
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     rb_yield(value);
     return ST_CONTINUE;
 }
@@ -637,11 +576,11 @@ rb_hash_each_value(hash)
     return hash;
 }
 
-static enum st_retval
+static int
 each_key_i(key, value)
     VALUE key, value;
 {
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     rb_yield(key);
     return ST_CONTINUE;
 }
@@ -654,12 +593,12 @@ rb_hash_each_key(hash)
     return hash;
 }
 
-static enum st_retval
+static int
 each_pair_i(key, value)
     VALUE key, value;
 {
-    if (key == Qundef) return ST_CONTINUE;
-    rb_yield_values(2, key, value);
+    if (value == Qnil) return ST_CONTINUE;
+    rb_yield(rb_assoc_new(key, value));
     return ST_CONTINUE;
 }
 
@@ -671,28 +610,11 @@ rb_hash_each_pair(hash)
     return hash;
 }
 
-static enum st_retval
-each_i(key, value)
-    VALUE key, value;
-{
-    if (key == Qundef) return ST_CONTINUE;
-    rb_yield(rb_assoc_new(key, value));
-    return ST_CONTINUE;
-}
-
-static VALUE
-rb_hash_each(hash)
-    VALUE hash;
-{
-    rb_hash_foreach(hash, each_i, 0);
-    return hash;
-}
-
 static int
 to_a_i(key, value, ary)
     VALUE key, value, ary;
 {
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     rb_ary_push(ary, rb_assoc_new(key, value));
     return ST_CONTINUE;
 }
@@ -705,7 +627,6 @@ rb_hash_to_a(hash)
 
     ary = rb_ary_new();
     st_foreach(RHASH(hash)->tbl, to_a_i, ary);
-    if (OBJ_TAINTED(hash)) OBJ_TAINT(ary);
 
     return ary;
 }
@@ -714,9 +635,7 @@ static VALUE
 rb_hash_sort(hash)
     VALUE hash;
 {
-    VALUE entries = rb_hash_to_a(hash);
-    rb_ary_sort_bang(entries);
-    return entries;
+    return rb_ary_sort_bang(rb_hash_to_a(hash));
 }
 
 static int
@@ -725,17 +644,15 @@ inspect_i(key, value, str)
 {
     VALUE str2;
 
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     if (RSTRING(str)->len > 1) {
-	rb_str_cat2(str, ", ");
+	rb_str_cat(str, ", ", 2);
     }
     str2 = rb_inspect(key);
-    rb_str_buf_append(str, str2);
-    OBJ_INFECT(str, str2);
-    rb_str_buf_cat2(str, "=>");
+    rb_str_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
+    rb_str_cat(str, "=>", 2);
     str2 = rb_inspect(value);
-    rb_str_buf_append(str, str2);
-    OBJ_INFECT(str, str2);
+    rb_str_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
 
     return ST_CONTINUE;
 }
@@ -746,10 +663,9 @@ inspect_hash(hash)
 {
     VALUE str;
 
-    str = rb_str_buf_new2("{");
+    str = rb_str_new2("{");
     st_foreach(RHASH(hash)->tbl, inspect_i, str);
-    rb_str_buf_cat2(str, "}");
-    OBJ_INFECT(str, hash);
+    rb_str_cat(str, "}", 1);
 
     return str;
 }
@@ -758,16 +674,16 @@ static VALUE
 rb_hash_inspect(hash)
     VALUE hash;
 {
-    if (RHASH(hash)->tbl == 0 || RHASH(hash)->tbl->num_entries == 0)
-	return rb_str_new2("{}");
+    if (RHASH(hash)->tbl->num_entries == 0) return rb_str_new2("{}");
     if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
     return rb_protect_inspect(inspect_hash, hash, 0);
 }
 
 static VALUE
-to_s_hash(hash)
+hash_to_s(hash)
     VALUE hash;
 {
+    if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
     return rb_ary_to_s(rb_hash_to_a(hash));
 }
 
@@ -776,7 +692,7 @@ rb_hash_to_s(hash)
     VALUE hash;
 {
     if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
-    return rb_protect_inspect(to_s_hash, hash, 0);
+    return rb_protect_inspect(hash_to_s, hash, 0);
 }
 
 static VALUE
@@ -790,7 +706,7 @@ static int
 keys_i(key, value, ary)
     VALUE key, value, ary;
 {
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     rb_ary_push(ary, key);
     return ST_CONTINUE;
 }
@@ -811,7 +727,7 @@ static int
 values_i(key, value, ary)
     VALUE key, value, ary;
 {
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     rb_ary_push(ary, value);
     return ST_CONTINUE;
 }
@@ -843,7 +759,7 @@ static int
 rb_hash_search_value(key, value, data)
     VALUE key, value, *data;
 {
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     if (rb_equal(value, data[1])) {
 	data[0] = Qtrue;
 	return ST_STOP;
@@ -860,7 +776,7 @@ rb_hash_has_value(hash, val)
 
     data[0] = Qfalse;
     data[1] = val;
-    st_foreach(RHASH(hash)->tbl, rb_hash_search_value, (st_data_t)data);
+    st_foreach(RHASH(hash)->tbl, rb_hash_search_value, data);
     return data[0];
 }
 
@@ -876,7 +792,7 @@ equal_i(key, val1, data)
 {
     VALUE val2;
 
-    if (key == Qundef) return ST_CONTINUE;
+    if (val1 == Qnil) return ST_CONTINUE;
     if (!st_lookup(data->tbl, key, &val2)) {
 	data->result = Qfalse;
 	return ST_STOP;
@@ -894,22 +810,13 @@ rb_hash_equal(hash1, hash2)
 {
     struct equal_data data;
 
-    if (hash1 == hash2) return Qtrue;
-    if (TYPE(hash2) != T_HASH) {
-	if (!rb_respond_to(hash2, rb_intern("to_hash"))) {
-	    return Qfalse;
-	}
-	return rb_equal(hash2, hash1);
-    }
+    if (TYPE(hash2) != T_HASH) return Qfalse;
     if (RHASH(hash1)->tbl->num_entries != RHASH(hash2)->tbl->num_entries)
 	return Qfalse;
-    if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
-	  FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
-	return Qfalse;
 
     data.tbl = RHASH(hash2)->tbl;
     data.result = Qtrue;
-    st_foreach(RHASH(hash1)->tbl, equal_i, (st_data_t)&data);
+    st_foreach(RHASH(hash1)->tbl, equal_i, &data);
 
     return data.result;
 }
@@ -919,7 +826,7 @@ rb_hash_invert_i(key, value, hash)
     VALUE key, value;
     VALUE hash;
 {
-    if (key == Qundef) return ST_CONTINUE;
+    if (value == Qnil) return ST_CONTINUE;
     rb_hash_aset(hash, value, key);
     return ST_CONTINUE;
 }
@@ -939,20 +846,7 @@ rb_hash_update_i(key, value, hash)
     VALUE key, value;
     VALUE hash;
 {
-    if (key == Qundef) return ST_CONTINUE;
-    rb_hash_aset(hash, key, value);
-    return ST_CONTINUE;
-}
-
-static int
-rb_hash_update_block_i(key, value, hash)
-    VALUE key, value;
-    VALUE hash;
-{
-    if (key == Qundef) return ST_CONTINUE;
-    if (rb_hash_has_key(hash, key)) {
-	value = rb_yield_values(3, key, rb_hash_aref(hash, key), value);
-    }
+    if (value == Qnil) return ST_CONTINUE;
     rb_hash_aset(hash, key, value);
     return ST_CONTINUE;
 }
@@ -962,99 +856,46 @@ rb_hash_update(hash1, hash2)
     VALUE hash1, hash2;
 {
     hash2 = to_hash(hash2);
-    if (rb_block_given_p()) {
-	st_foreach(RHASH(hash2)->tbl, rb_hash_update_block_i, hash1);
-    }
-    else {
-	st_foreach(RHASH(hash2)->tbl, rb_hash_update_i, hash1);
-    }
+    st_foreach(RHASH(hash2)->tbl, rb_hash_update_i, hash1);
     return hash1;
 }
 
-static VALUE
-rb_hash_merge(hash1, hash2)
-    VALUE hash1, hash2;
-{
-    return rb_hash_update(rb_obj_dup(hash1), hash2);
-}
-
 static int path_tainted = -1;
 
-static char **origenviron;
-#ifdef _WIN32
-#define GET_ENVIRON(e) (e = rb_w32_get_environ())
-#define FREE_ENVIRON(e) rb_w32_free_environ(e)
-static char **my_environ;
-#undef environ
-#define environ my_environ
-#elif defined(__APPLE__)
-#undef environ
-#define environ (*_NSGetEnviron())
-#define GET_ENVIRON(e) (e)
-#define FREE_ENVIRON(e)
-#else
+#ifndef NT
 extern char **environ;
-#define GET_ENVIRON(e) (e)
-#define FREE_ENVIRON(e)
 #endif
-
-static VALUE
-env_str_new(ptr, len)
-    const char *ptr;
-    long len;
-{
-    VALUE str = rb_tainted_str_new(ptr, len);
-
-    rb_obj_freeze(str);
-    return str;
-}
-
-static VALUE
-env_str_new2(ptr)
-    const char *ptr;
-{
-    if (!ptr) return Qnil;
-    return env_str_new(ptr, strlen(ptr));
-}
+static char **origenviron;
 
 static VALUE
 env_delete(obj, name)
     VALUE obj, name;
 {
+    int len;
     char *nam, *val;
 
     rb_secure(4);
-    SafeStringValue(name);
-    nam = RSTRING(name)->ptr;
-    if (strlen(nam) != RSTRING(name)->len) {
+    nam = str2cstr(name, &len);
+    if (strlen(nam) != len) {
 	rb_raise(rb_eArgError, "bad environment variable name");
     }
     val = getenv(nam);
     if (val) {
-	VALUE value = env_str_new2(val);
-
 	ruby_setenv(nam, 0);
-#ifdef ENV_IGNORECASE
-	if (strcasecmp(nam, PATH_ENV) == 0)
-#else
-	if (strcmp(nam, PATH_ENV) == 0)
-#endif
-	{
+	if (strcmp(nam, "PATH") == 0 && !OBJ_TAINTED(name)) {
 	    path_tainted = 0;
 	}
-	return value;
+	return rb_str_new2(val);
     }
     return Qnil;
 }
 
 static VALUE
-env_delete_m(obj, name)
+env_delete_method(obj, name)
     VALUE obj, name;
 {
-    VALUE val;
-
-    val = env_delete(obj, name);
-    if (NIL_P(val) && rb_block_given_p()) rb_yield(name);
+    VALUE val = env_delete(obj, name);
+    if (rb_iterator_p()) rb_yield(name);
     return val;
 }
 
@@ -1063,64 +904,67 @@ rb_f_getenv(obj, name)
     VALUE obj, name;
 {
     char *nam, *env;
+    int len;
 
-    StringValue(name);
-    nam = RSTRING(name)->ptr;
-    if (strlen(nam) != RSTRING(name)->len) {
+    nam = str2cstr(name, &len);
+    if (strlen(nam) != len) {
 	rb_raise(rb_eArgError, "bad environment variable name");
     }
     env = getenv(nam);
     if (env) {
-#ifdef ENV_IGNORECASE
-	if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
-#else
-	if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
-#endif
-	{
-	    VALUE str = rb_str_new2(env);
-
-	    rb_obj_freeze(str);
-	    return str;
-	}
-	return env_str_new2(env);
+	if (strcmp(nam, "PATH") == 0 && !rb_env_path_tainted())
+	    return rb_str_new2(env);
+	return rb_tainted_str_new2(env);
     }
     return Qnil;
 }
 
-static VALUE
-env_fetch(argc, argv)
-    int argc;
-    VALUE *argv;
+static int
+path_check_1(path)
+    char *path;
 {
-    VALUE key, if_none;
-    char *nam, *env;
+    struct stat st;
+    char *p = 0;
+    char *s;
 
-    rb_scan_args(argc, argv, "11", &key, &if_none);
-    StringValue(key);
-    nam = RSTRING(key)->ptr;
-    if (strlen(nam) != RSTRING(key)->len) {
-	rb_raise(rb_eArgError, "bad environment variable name");
-    }
-    env = getenv(nam);
-    if (!env) {
-	if (rb_block_given_p()) {
-	    if (argc > 1) {
-		rb_raise(rb_eArgError, "wrong number of arguments");
-	    }
-	    return rb_yield(key);
+    for (;;) {
+	if (stat(path, &st) == 0 && (st.st_mode & 002)) {
+	    return 0;
 	}
-	if (argc == 1) {
-	    rb_raise(rb_eIndexError, "key not found");
+	s = strrchr(path, '/');
+	if (p) *p = '/';
+	if (!s || s == path) return 1;
+	p = s;
+	*p = '\0';
+    }
+}
+
+int
+rb_path_check(path)
+    char *path;
+{
+    char *p, *pend;
+    const char sep = RUBY_PATH_SEP[0];
+
+    if (!path) return 1;
+
+    p = path;
+    pend = strchr(path, sep);
+    
+    for (;;) {
+	int safe;
+
+	if (pend) *pend = '\0';
+	safe = path_check_1(p);
+	if (!pend) break;
+	*pend = sep;
+	if (!safe) {
+	    return 0;
 	}
-	return if_none;
+	p = pend + 1;
+	pend = strchr(p, sep);
     }
-#ifdef ENV_IGNORECASE
-    if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
-#else
-    if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
-#endif
-	return rb_str_new2(env);
-    return env_str_new2(env);
+    return 1;
 }
 
 static void
@@ -1134,30 +978,27 @@ int
 rb_env_path_tainted()
 {
     if (path_tainted < 0) {
-	path_tainted_p(getenv(PATH_ENV));
+	path_tainted_p(getenv("PATH"));
     }
     return path_tainted;
 }
 
 static int
 envix(nam)
-    const char *nam;
+char *nam;
 {
     register int i, len = strlen(nam);
-    char **env;
 
-    env = GET_ENVIRON(environ);
-    for (i = 0; env[i]; i++) {
+    for (i = 0; environ[i]; i++) {
 	if (
-#ifdef ENV_IGNORECASE
-	    strncasecmp(env[i],nam,len) == 0
+#ifdef WIN32
+	    strnicmp(environ[i],nam,len) == 0
 #else
-	    memcmp(env[i],nam,len) == 0
+	    memcmp(environ[i],nam,len) == 0
 #endif
-	    && env[i][len] == '=')
+	    && environ[i][len] == '=')
 	    break;			/* memcmp must come first to avoid */
     }					/* potential SEGV's */
-    FREE_ENVIRON(environ);
     return i;
 }
 
@@ -1166,7 +1007,45 @@ ruby_setenv(name, value)
     const char *name;
     const char *value;
 {
-#if defined(_WIN32)
+#if defined(WIN32) && !defined(__CYGWIN32__)
+#ifdef USE_WIN32_RTL_ENV
+    register char *envstr;
+    STRLEN namlen = strlen(name);
+    STRLEN vallen;
+    char *oldstr = environ[envix(name)];
+
+    /* putenv() has totally broken semantics in both the Borland
+     * and Microsoft CRTLs.  They either store the passed pointer in
+     * the environment without making a copy, or make a copy and don't
+     * free it. And on top of that, they dont free() old entries that
+     * are being replaced/deleted.  This means the caller must
+     * free any old entries somehow, or we end up with a memory
+     * leak every time setenv() is called.  One might think
+     * one could directly manipulate environ[], like the UNIX code
+     * above, but direct changes to environ are not allowed when
+     * calling putenv(), since the RTLs maintain an internal
+     * *copy* of environ[]. Bad, bad, *bad* stink.
+     * GSAR 97-06-07
+     */
+
+    if (!value) {
+	if (!oldstr)
+	    return;
+	value = "";
+	vallen = 0;
+    }
+    else
+	vallen = strlen(val);
+    envstr = ALLOC_N(char, namelen + vallen + 3);
+    sprintf(envstr,"%s=%s",name,value);
+    putenv(envstr);
+    if (oldstr) free(oldstr);
+#ifdef _MSC_VER
+    free(envstr);		/* MSVCRT leaks without this */
+#endif
+
+#else /* !USE_WIN32_RTL_ENV */
+
     /* The sane way to deal with the environment.
      * Has these advantages over putenv() & co.:
      *  * enables us to store a truly empty value in the
@@ -1180,11 +1059,10 @@ ruby_setenv(name, value)
      *    not see changes made by extensions that call the Win32
      *    functions directly, either.
      * GSAR 97-06-07
-     *
-     * REMARK: USE_WIN32_RTL_ENV is already obsoleted since we don't use
-     *         RTL's environ global variable directly yet.
      */
     SetEnvironmentVariable(name,value);
+#endif
+
 #elif defined __CYGWIN__
 #undef setenv
 #undef unsetenv
@@ -1209,12 +1087,7 @@ ruby_setenv(name, value)
 	environ = tmpenv;		/* tell exec where it is now */
     }
     if (!value) {
-	if (environ != origenviron) {
-	    char **envp = origenviron;
-	    while (*envp && *envp != environ[i]) envp++;
-	    if (!*envp)
-		free(environ[i]);
-	}
+	free(environ[i]);
 	while (environ[i]) {
 	    environ[i] = environ[i+1];
 	    i++;
@@ -1226,8 +1099,7 @@ ruby_setenv(name, value)
 	environ[i+1] = 0;	/* make sure it's null terminated */
     }
     else {
-	if (environ[i] != origenviron[i])
-	    free(environ[i]);
+	free(environ[i]);
     }
     environ[i] = ALLOC_N(char, strlen(name) + strlen(value) + 2);
 #ifndef MSDOS
@@ -1253,10 +1125,11 @@ ruby_unsetenv(name)
 }
 
 static VALUE
-env_aset(obj, nm, val)
+rb_f_setenv(obj, nm, val)
     VALUE obj, nm, val;
 {
     char *name, *value;
+    int nlen, vlen;
 
     if (rb_safe_level() >= 4) {
 	rb_raise(rb_eSecurityError, "cannot change environment variable");
@@ -1267,31 +1140,25 @@ env_aset(obj, nm, val)
 	return Qnil;
     }
 
-    StringValue(nm);
-    StringValue(val);
-    name = RSTRING(nm)->ptr;
-    value = RSTRING(val)->ptr;
-    if (strlen(name) != RSTRING(nm)->len)
+    name = str2cstr(nm, &nlen);
+    value = str2cstr(val, &vlen);
+    if (strlen(name) != nlen)
 	rb_raise(rb_eArgError, "bad environment variable name");
-    if (strlen(value) != RSTRING(val)->len)
+    if (strlen(value) != vlen)
 	rb_raise(rb_eArgError, "bad environment variable value");
 
     ruby_setenv(name, value);
-#ifdef ENV_IGNORECASE
-    if (strcasecmp(name, PATH_ENV) == 0) {
-#else
-    if (strcmp(name, PATH_ENV) == 0) {
-#endif
+    if (strcmp(name, "PATH") == 0) {
 	if (OBJ_TAINTED(val)) {
 	    /* already tainted, no check */
 	    path_tainted = 1;
-	    return val;
+	    return Qtrue;
 	}
 	else {
 	    path_tainted_p(value);
 	}
     }
-    return val;
+    return Qtrue;
 }
 
 static VALUE
@@ -1300,29 +1167,32 @@ env_keys()
     char **env;
     VALUE ary = rb_ary_new();
 
-    env = GET_ENVIRON(environ);
+    env = environ;
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s) {
-	    rb_ary_push(ary, env_str_new(*env, s-*env));
+	    rb_ary_push(ary, rb_tainted_str_new(*env, s-*env));
 	}
 	env++;
     }
-    FREE_ENVIRON(environ);
     return ary;
 }
 
 static VALUE
-env_each_key(ehash)
-    VALUE ehash;
+env_each_key(hash)
+    VALUE hash;
 {
-    VALUE keys = env_keys();
-    long i;
+    char **env;
 
-    for (i=0; i<RARRAY(keys)->len; i++) {
-	rb_yield(RARRAY(keys)->ptr[i]);
+    env = environ;
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s) {
+	    rb_yield(rb_tainted_str_new(*env, s-*env));
+	}
+	env++;
     }
-    return ehash;
+    return Qnil;
 }
 
 static VALUE
@@ -1331,168 +1201,72 @@ env_values()
     char **env;
     VALUE ary = rb_ary_new();
 
-    env = GET_ENVIRON(environ);
+    env = environ;
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s) {
-	    rb_ary_push(ary, env_str_new2(s+1));
+	    rb_ary_push(ary, rb_tainted_str_new2(s+1));
 	}
 	env++;
     }
-    FREE_ENVIRON(environ);
     return ary;
 }
 
 static VALUE
-env_each_value(ehash)
-    VALUE ehash;
-{
-    VALUE values = env_values();
-    long i;
-
-    for (i=0; i<RARRAY(values)->len; i++) {
-	rb_yield(RARRAY(values)->ptr[i]);
-    }
-    return ehash;
-}
-
-static VALUE
-env_each_i(ehash, values)
-    VALUE ehash;
-    int values;
+env_each_value(hash)
+    VALUE hash;
 {
     char **env;
-    VALUE ary = rb_ary_new();
-    long i;
 
-    env = GET_ENVIRON(environ);
+    env = environ;
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s) {
-	    rb_ary_push(ary, env_str_new(*env, s-*env));
-	    rb_ary_push(ary, env_str_new2(s+1));
+	    rb_yield(rb_tainted_str_new2(s+1));
 	}
 	env++;
     }
-    FREE_ENVIRON(environ);
-
-    for (i=0; i<RARRAY(ary)->len; i+=2) {
-	if (values) {
-	    rb_yield_values(2, RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]);
-	}
-	else {
-	    rb_yield(rb_assoc_new(RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]));
-	}
-    }
-    return ehash;
-}
-
-static VALUE
-env_each(ehash)
-    VALUE ehash;
-{
-    return env_each_i(ehash, Qfalse);
-}
-
-static VALUE
-env_each_pair(ehash)
-    VALUE ehash;
-{
-    return env_each_i(ehash, Qtrue);
-}
-
-static VALUE
-env_reject_bang()
-{
-    volatile VALUE keys;
-    long i;
-    int del = 0;
-
-    rb_secure(4);
-    keys = env_keys();
-
-    for (i=0; i<RARRAY(keys)->len; i++) {
-	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
-	if (!NIL_P(val)) {
-	    if (RTEST(rb_yield_values(2, RARRAY(keys)->ptr[i], val))) {
-		FL_UNSET(RARRAY(keys)->ptr[i], FL_TAINT);
-		env_delete(Qnil, RARRAY(keys)->ptr[i]);
-		del++;
-	    }
-	}
-    }
-    if (del == 0) return Qnil;
-    return envtbl;
-}
-
-static VALUE
-env_delete_if()
-{
-    env_reject_bang();
-    return envtbl;
-}
-
-static VALUE
-env_values_at(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE result = rb_ary_new();
-    long i;
-
-    for (i=0; i<argc; i++) {
-	rb_ary_push(result, rb_f_getenv(Qnil, argv[i]));
-    }
-    return result;
+    return Qnil;
 }
 
 static VALUE
-env_select(argc, argv)
-    int argc;
-    VALUE *argv;
+env_each(hash)
+    VALUE hash;
 {
-    VALUE result;
     char **env;
 
-    if (!rb_block_given_p()) {
-	rb_warn("ENV.select(index..) is deprecated; use ENV.values_at");
-	return env_values_at(argc, argv);
-    }
-    if (argc > 0) {
-	rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-    }
-    result = rb_ary_new();
-    env = GET_ENVIRON(environ);
+    env = environ;
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s) {
-	    VALUE k = env_str_new(*env, s-*env);
-	    VALUE v = env_str_new2(s+1);
-	    if (RTEST(rb_yield_values(2, k, v))) {
-		rb_ary_push(result, rb_assoc_new(k, v));
-	    }
+	    rb_yield(rb_assoc_new(rb_tainted_str_new(*env, s-*env),
+				  rb_tainted_str_new2(s+1)));
 	}
 	env++;
     }
-    FREE_ENVIRON(environ);
-
-    return result;
+    return Qnil;
 }
 
 static VALUE
-env_clear()
+env_delete_if()
 {
     volatile VALUE keys;
-    long i;
-    
+    VALUE *ptr;
+    int len;
+
     rb_secure(4);
     keys = env_keys();
+    ptr = RARRAY(keys)->ptr;
+    len = RARRAY(keys)->len; 
 
-    for (i=0; i<RARRAY(keys)->len; i++) {
-	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
+    while (len--) {
+	VALUE val = rb_f_getenv(Qnil, *ptr);
 	if (!NIL_P(val)) {
-	    env_delete(Qnil, RARRAY(keys)->ptr[i]);
+	    if (RTEST(rb_yield(rb_assoc_new(*ptr, val)))) {
+		env_delete(Qnil, *ptr);
+	    }
 	}
+	ptr++;
     }
     return envtbl;
 }
@@ -1504,51 +1278,20 @@ env_to_s()
 }
 
 static VALUE
-env_inspect()
-{
-    char **env;
-    VALUE str = rb_str_buf_new2("{");
-    VALUE i;
-
-    env = GET_ENVIRON(environ);
-    while (*env) {
-	char *s = strchr(*env, '=');
-
-	if (env != environ) {
-	    rb_str_buf_cat2(str, ", ");
-	}
-	if (s) {
-	    rb_str_buf_cat2(str, "\"");
-	    rb_str_buf_cat(str, *env, s-*env);
-	    rb_str_buf_cat2(str, "\"=>");
-	    i = rb_inspect(rb_str_new2(s+1));
-	    rb_str_buf_append(str, i);
-	}
-	env++;
-    }
-    FREE_ENVIRON(environ);
-    rb_str_buf_cat2(str, "}");
-    OBJ_TAINT(str);
-
-    return str;
-}
-
-static VALUE
 env_to_a()
 {
     char **env;
     VALUE ary = rb_ary_new();
 
-    env = GET_ENVIRON(environ);
+    env = environ;
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s) {
-	    rb_ary_push(ary, rb_assoc_new(env_str_new(*env, s-*env),
-					  env_str_new2(s+1)));
+	    rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(*env, s-*env),
+					  rb_tainted_str_new2(s+1)));
 	}
 	env++;
     }
-    FREE_ENVIRON(environ);
     return ary;
 }
 
@@ -1562,26 +1305,16 @@ static VALUE
 env_size()
 {
     int i;
-    char **env;
 
-    env = GET_ENVIRON(environ);
-    for(i=0; env[i]; i++)
+    for(i=0; environ[i]; i++)
 	;
-    FREE_ENVIRON(environ);
     return INT2FIX(i);
 }
 
 static VALUE
 env_empty_p()
 {
-    char **env;
-
-    env = GET_ENVIRON(environ);
-    if (env[0] == 0) {
-	FREE_ENVIRON(environ);
-	return Qtrue;
-    }
-    FREE_ENVIRON(environ);
+    if (environ[0] == 0) return Qtrue;
     return Qfalse;
 }
 
@@ -1589,12 +1322,8 @@ static VALUE
 env_has_key(env, key)
     VALUE env, key;
 {
-    char *s;
-
-    s = StringValuePtr(key);
-    if (strlen(s) != RSTRING(key)->len)
-	rb_raise(rb_eArgError, "bad environment variable name");
-    if (getenv(s)) return Qtrue;
+    if (TYPE(key) != T_STRING) return Qfalse;
+    if (getenv(STR2CSTR(key))) return Qtrue;
     return Qfalse;
 }
 
@@ -1605,22 +1334,15 @@ env_has_value(dmy, value)
     char **env;
 
     if (TYPE(value) != T_STRING) return Qfalse;
-    env = GET_ENVIRON(environ);
+    env = environ;
     while (*env) {
-	char *s = strchr(*env, '=');
-	if (s++) {
-#ifdef ENV_IGNORECASE
-	    if (strncasecmp(s, RSTRING(value)->ptr, strlen(s)) == 0) {
-#else
-	    if (strncmp(s, RSTRING(value)->ptr, strlen(s)) == 0) {
-#endif
-		FREE_ENVIRON(environ);
+	char *s = strchr(*env, '=')+1;
+	if (s) {
+	    if (strncmp(s, RSTRING(value)->ptr, strlen(s)) == 0)
 		return Qtrue;
-	    }
 	}
 	env++;
     }
-    FREE_ENVIRON(environ);
     return Qfalse;
 }
 
@@ -1629,26 +1351,18 @@ env_index(dmy, value)
     VALUE dmy, value;
 {
     char **env;
-    VALUE str;
 
-    StringValue(value);
-    env = GET_ENVIRON(environ);
+    if (TYPE(value) != T_STRING) return Qnil;
+    env = environ;
     while (*env) {
-	char *s = strchr(*env, '=');
-	if (s++) {
-#ifdef ENV_IGNORECASE
-	    if (strncasecmp(s, RSTRING(value)->ptr, strlen(s)) == 0) {
-#else
+	char *s = strchr(*env, '=')+1;
+	if (s) {
 	    if (strncmp(s, RSTRING(value)->ptr, strlen(s)) == 0) {
-#endif
-		str = env_str_new(*env, s-*env-1);
-		FREE_ENVIRON(environ);
-		return str;
+		return rb_tainted_str_new(*env, s-*env);
 	    }
 	}
 	env++;
     }
-    FREE_ENVIRON(environ);
     return Qnil;
 }
 
@@ -1660,15 +1374,16 @@ env_indexes(argc, argv)
     int i;
     VALUE indexes = rb_ary_new2(argc);
 
-    rb_warn("ENV.%s is deprecated; use ENV.values_at",
-	    rb_id2name(rb_frame_last_func()));
     for (i=0;i<argc;i++) {
-	VALUE tmp = rb_check_string_type(argv[i]);
-	if (NIL_P(tmp)) {
-	    RARRAY(indexes)->ptr[i] = Qnil;
+	char *v = 0;
+	if (TYPE(argv[i]) == T_STRING) {
+	    v = getenv(RSTRING(argv[i])->ptr);
+	}
+	if (v) {
+	    RARRAY(indexes)->ptr[i] = rb_tainted_str_new2(v);
 	}
 	else {
-	    RARRAY(indexes)->ptr[i] = env_str_new2(getenv(RSTRING(tmp)->ptr));
+	    RARRAY(indexes)->ptr[i] = Qnil;
 	}
 	RARRAY(indexes)->len = i+1;
     }
@@ -1677,125 +1392,43 @@ env_indexes(argc, argv)
 }
 
 static VALUE
-env_to_hash()
+env_to_hash(obj)
+    VALUE obj;
 {
     char **env;
     VALUE hash = rb_hash_new();
 
-    env = GET_ENVIRON(environ);
+    env = environ;
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s) {
-	    rb_hash_aset(hash, env_str_new(*env, s-*env),
-			       env_str_new2(s+1));
+	    rb_hash_aset(hash, rb_tainted_str_new(*env, s-*env),
+			       rb_tainted_str_new2(s+1));
 	}
 	env++;
     }
-    FREE_ENVIRON(environ);
     return hash;
 }
 
-static VALUE
-env_reject()
-{
-    return rb_hash_delete_if(env_to_hash());
-}
-
-static VALUE
-env_shift()
-{
-    char **env;
-
-    env = GET_ENVIRON(environ);
-    if (*env) {
-	char *s = strchr(*env, '=');
-	if (s) {
-	    VALUE key = env_str_new(*env, s-*env);
-	    VALUE val = env_str_new2(getenv(RSTRING(key)->ptr));
-	    env_delete(Qnil, key);
-	    return rb_assoc_new(key, val);
-	}
-    }
-    FREE_ENVIRON(environ);
-    return Qnil;
-}
-
-static VALUE
-env_invert()
-{
-    return rb_hash_invert(env_to_hash());
-}
-
-static int
-env_replace_i(key, val, keys)
-    VALUE key, val, keys;
-{
-    if (key != Qundef) {
-	env_aset(Qnil, key, val);
-	if (rb_ary_includes(keys, key)) {
-	    rb_ary_delete(keys, key);
-	}
-    }
-    return ST_CONTINUE;
-}
-
-static VALUE
-env_replace(env, hash)
-    VALUE env, hash;
-{
-    volatile VALUE keys = env_keys();
-    long i;
-
-    if (env == hash) return env;
-    hash = to_hash(hash);
-    st_foreach(RHASH(hash)->tbl, env_replace_i, keys);
-
-    for (i=0; i<RARRAY(keys)->len; i++) {
-	env_delete(env, RARRAY(keys)->ptr[i]);
-    }
-    return env;
-}
-
-static int
-env_update_i(key, val)
-    VALUE key, val;
-{
-    if (key != Qundef) {
-	if (rb_block_given_p()) {
-	    val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
-	}
-	env_aset(Qnil, key, val);
-    }
-    return ST_CONTINUE;
-}
-
-static VALUE
-env_update(env, hash)
-    VALUE env, hash;
-{
-    if (env == hash) return env;
-    hash = to_hash(hash);
-    st_foreach(RHASH(hash)->tbl, env_update_i, 0);
-    return env;
-}
-
 void
 Init_Hash()
 {
-    id_hash = rb_intern("hash");
-    id_call = rb_intern("call");
-    id_default = rb_intern("default");
+    hash = rb_intern("hash");
 
     rb_cHash = rb_define_class("Hash", rb_cObject);
 
     rb_include_module(rb_cHash, rb_mEnumerable);
 
-    rb_define_alloc_func(rb_cHash, hash_alloc);
+    rb_define_singleton_method(rb_cHash, "new", rb_hash_s_new, -1);
     rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
-    rb_define_method(rb_cHash,"initialize", rb_hash_initialize, -1);
-    rb_define_method(rb_cHash,"initialize_copy", rb_hash_replace, 1);
+
+    rb_define_method(rb_cHash,"clone", rb_hash_clone, 0);
+    rb_define_method(rb_cHash,"dup", rb_hash_dup, 0);
     rb_define_method(rb_cHash,"rehash", rb_hash_rehash, 0);
 
+    rb_define_method(rb_cHash,"freeze", rb_hash_freeze, 0);
+    rb_define_method(rb_cHash,"frozen?",rb_hash_frozen_p, 0);
+
     rb_define_method(rb_cHash,"to_hash", rb_hash_to_hash, 0);
     rb_define_method(rb_cHash,"to_a", rb_hash_to_a, 0);
     rb_define_method(rb_cHash,"to_s", rb_hash_to_s, 0);
@@ -1806,17 +1439,16 @@ Init_Hash()
     rb_define_method(rb_cHash,"fetch", rb_hash_fetch, -1);
     rb_define_method(rb_cHash,"[]=", rb_hash_aset, 2);
     rb_define_method(rb_cHash,"store", rb_hash_aset, 2);
-    rb_define_method(rb_cHash,"default", rb_hash_default, -1);
+    rb_define_method(rb_cHash,"default", rb_hash_default, 0);
     rb_define_method(rb_cHash,"default=", rb_hash_set_default, 1);
-    rb_define_method(rb_cHash,"default_proc", rb_hash_default_proc, 0);
     rb_define_method(rb_cHash,"index", rb_hash_index, 1);
     rb_define_method(rb_cHash,"indexes", rb_hash_indexes, -1);
     rb_define_method(rb_cHash,"indices", rb_hash_indexes, -1);
-    rb_define_method(rb_cHash,"size", rb_hash_size, 0);
-    rb_define_method(rb_cHash,"length", rb_hash_size, 0);
+    rb_define_method(rb_cHash,"length", rb_hash_length, 0);
+    rb_define_alias(rb_cHash, "size", "length");
     rb_define_method(rb_cHash,"empty?", rb_hash_empty_p, 0);
 
-    rb_define_method(rb_cHash,"each", rb_hash_each, 0);
+    rb_define_method(rb_cHash,"each", rb_hash_each_pair, 0);
     rb_define_method(rb_cHash,"each_value", rb_hash_each_value, 0);
     rb_define_method(rb_cHash,"each_key", rb_hash_each_key, 0);
     rb_define_method(rb_cHash,"each_pair", rb_hash_each_pair, 0);
@@ -1824,20 +1456,15 @@ Init_Hash()
 
     rb_define_method(rb_cHash,"keys", rb_hash_keys, 0);
     rb_define_method(rb_cHash,"values", rb_hash_values, 0);
-    rb_define_method(rb_cHash,"values_at", rb_hash_values_at, -1);
 
     rb_define_method(rb_cHash,"shift", rb_hash_shift, 0);
     rb_define_method(rb_cHash,"delete", rb_hash_delete, 1);
     rb_define_method(rb_cHash,"delete_if", rb_hash_delete_if, 0);
-    rb_define_method(rb_cHash,"select", rb_hash_select, -1);
-    rb_define_method(rb_cHash,"reject", rb_hash_reject, 0);
-    rb_define_method(rb_cHash,"reject!", rb_hash_reject_bang, 0);
+    rb_define_method(rb_cHash,"reject!", rb_hash_delete_if, 0);
     rb_define_method(rb_cHash,"clear", rb_hash_clear, 0);
     rb_define_method(rb_cHash,"invert", rb_hash_invert, 0);
     rb_define_method(rb_cHash,"update", rb_hash_update, 1);
     rb_define_method(rb_cHash,"replace", rb_hash_replace, 1);
-    rb_define_method(rb_cHash,"merge!", rb_hash_update, 1);
-    rb_define_method(rb_cHash,"merge", rb_hash_merge, 1);
 
     rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
     rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);
@@ -1852,36 +1479,24 @@ Init_Hash()
     rb_extend_object(envtbl, rb_mEnumerable);
 
     rb_define_singleton_method(envtbl,"[]", rb_f_getenv, 1);
-    rb_define_singleton_method(envtbl,"fetch", env_fetch, -1);
-    rb_define_singleton_method(envtbl,"[]=", env_aset, 2);
-    rb_define_singleton_method(envtbl,"store", env_aset, 2);
+    rb_define_singleton_method(envtbl,"[]=", rb_f_setenv, 2);
     rb_define_singleton_method(envtbl,"each", env_each, 0);
-    rb_define_singleton_method(envtbl,"each_pair", env_each_pair, 0);
+    rb_define_singleton_method(envtbl,"each_pair", env_each, 0);
     rb_define_singleton_method(envtbl,"each_key", env_each_key, 0);
     rb_define_singleton_method(envtbl,"each_value", env_each_value, 0);
-    rb_define_singleton_method(envtbl,"delete", env_delete_m, 1);
+    rb_define_singleton_method(envtbl,"delete", env_delete_method, 1);
     rb_define_singleton_method(envtbl,"delete_if", env_delete_if, 0);
-    rb_define_singleton_method(envtbl,"clear", env_clear, 0);
-    rb_define_singleton_method(envtbl,"reject", env_reject, 0);
-    rb_define_singleton_method(envtbl,"reject!", env_reject_bang, 0);
-    rb_define_singleton_method(envtbl,"select", env_select, -1);
-    rb_define_singleton_method(envtbl,"shift", env_shift, 0);
-    rb_define_singleton_method(envtbl,"invert", env_invert, 0);
-    rb_define_singleton_method(envtbl,"replace", env_replace, 1);
-    rb_define_singleton_method(envtbl,"update", env_update, 1);
-    rb_define_singleton_method(envtbl,"inspect", env_inspect, 0);
+    rb_define_singleton_method(envtbl,"reject!", env_delete_if, 0);
+    rb_define_singleton_method(envtbl,"to_s", env_to_s, 0);
     rb_define_singleton_method(envtbl,"rehash", env_none, 0);
     rb_define_singleton_method(envtbl,"to_a", env_to_a, 0);
-    rb_define_singleton_method(envtbl,"to_s", env_to_s, 0);
     rb_define_singleton_method(envtbl,"index", env_index, 1);
     rb_define_singleton_method(envtbl,"indexes", env_indexes, -1);
     rb_define_singleton_method(envtbl,"indices", env_indexes, -1);
-    rb_define_singleton_method(envtbl,"size", env_size, 0);
     rb_define_singleton_method(envtbl,"length", env_size, 0);
     rb_define_singleton_method(envtbl,"empty?", env_empty_p, 0);
     rb_define_singleton_method(envtbl,"keys", env_keys, 0);
     rb_define_singleton_method(envtbl,"values", env_values, 0);
-    rb_define_singleton_method(envtbl,"values_at", env_values_at, -1);
     rb_define_singleton_method(envtbl,"include?", env_has_key, 1);
     rb_define_singleton_method(envtbl,"member?", env_has_key, 1);
     rb_define_singleton_method(envtbl,"has_key?", env_has_key, 1);
diff --git a/inits.c b/inits.c
index a6decb0b9d..fdc49f0f4b 100644
--- a/inits.c
+++ b/inits.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   inits.c -
 
@@ -6,9 +6,9 @@
   $Date$
   created at: Tue Dec 28 16:01:58 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
+************************************************/
 
 #include "ruby.h"
 
@@ -18,7 +18,6 @@ void Init_Comparable _((void));
 void Init_Dir _((void));
 void Init_Enumerable _((void));
 void Init_Exception _((void));
-void Init_syserr _((void));
 void Init_eval _((void));
 void Init_load _((void));
 void Init_Proc _((void));
@@ -60,7 +59,6 @@ rb_call_inits()
     Init_Thread();
     Init_Numeric();
     Init_Bignum();
-    Init_syserr();
     Init_Array();
     Init_Hash();
     Init_Struct();
diff --git a/install-sh b/install-sh
index e69de29bb2..89fc9b098b 100644
--- a/install-sh
+++ b/install-sh
@@ -0,0 +1,238 @@
+#! /bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+#
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+tranformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0
diff --git a/instruby.rb b/instruby.rb
index c5a906a7c5..52c7c2397f 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -1,207 +1,91 @@
-#!./miniruby
+#!./miniruby -I.
 
-load "./rbconfig.rb"
+require "rbconfig.rb"
 include Config
 
-$:.unshift File.join(CONFIG["srcdir"], "lib")
-require 'fileutils'
-require 'shellwords'
-require 'getopts'
-require 'tempfile'
+destdir = ARGV[0] || ''
 
-File.umask(0)
-
-def parse_args()
-  getopts('n', 'dest-dir:',
-	  'make:', 'make-flags:', 'mflags:',
-	  'mantype:doc')
-
-  $dryrun = $OPT['n']
-  $destdir = $OPT['dest-dir'] || ''
-  $make = $OPT['make'] || $make || 'make'
-  $mantype = $OPT['mantype']
-  mflags = ($OPT['make-flags'] || '').strip
-  mflags = ($OPT['mflags'] || '').strip if mflags.empty?
-
-  $mflags = Shellwords.shellwords(mflags)
-  if arg = $mflags.first
-    arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
-  end
-
-  $make, *rest = Shellwords.shellwords($make)
-  $mflags.unshift(*rest) unless rest.empty?
-
-  def $mflags.set?(flag)
-    grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
-    false
-  end
-
-  if $mflags.set?(?n)
-    $dryrun = true
-  else
-    $mflags << '-n' if $dryrun
-  end
-
-  $mflags << "DESTDIR=#{$destdir}"
-
-  $continue = $mflags.set?(?k)
-end
-
-parse_args()
-
-include FileUtils::Verbose
-include FileUtils::NoWrite if $dryrun
-@fileutils_output = STDOUT
-@fileutils_label = ''
-
-def install(src, dest, options = {})
-  options[:preserve] = true
-  super
-end
-
-$made_dirs = {}
-def makedirs(dirs)
-  dirs = fu_list(dirs)
-  dirs.reject! do |dir|
-    $made_dirs.fetch(dir) do
-      $made_dirs[dir] = true
-      File.directory?(dir)
-    end
-  end
-  super(dirs, :mode => 0755, :verbose => true) unless dirs.empty?
-end
+$:.unshift CONFIG["srcdir"]+"/lib"
+require "ftools"
+require "find"
 
 exeext = CONFIG["EXEEXT"]
-
+if ENV["prefix"]
+  prefix = ENV["prefix"]
+else
+  prefix = CONFIG["prefix"]
+end
 ruby_install_name = CONFIG["ruby_install_name"]
-rubyw_install_name = CONFIG["rubyw_install_name"]
-
-version = CONFIG["ruby_version"]
-bindir = $destdir+CONFIG["bindir"]
-libdir = $destdir+CONFIG["libdir"]
-rubylibdir = $destdir+CONFIG["rubylibdir"]
-archlibdir = $destdir+CONFIG["archdir"]
-sitelibdir = $destdir+CONFIG["sitelibdir"]
-sitearchlibdir = $destdir+CONFIG["sitearchdir"]
-mandir = File.join($destdir+CONFIG["mandir"], "man")
-configure_args = Shellwords.shellwords(CONFIG["configure_args"])
-enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-dll = CONFIG["LIBRUBY_SO"]
-lib = CONFIG["LIBRUBY"]
-arc = CONFIG["LIBRUBY_A"]
-
-makedirs [bindir, libdir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir]
-
-ruby_bin = File.join(bindir, ruby_install_name)
-
-install ruby_install_name+exeext, ruby_bin+exeext, :mode => 0755
-if rubyw_install_name and !rubyw_install_name.empty?
-  install rubyw_install_name+exeext, bindir, :mode => 0755
+bindir = destdir+CONFIG["bindir"]
+libdir = destdir+CONFIG["libdir"]
+#pkglibdir = libdir + "/" + ruby_install_name+"/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
+pkglibdir = libdir + "/ruby/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
+archdir = pkglibdir + "/" + CONFIG["arch"]
+mandir = destdir+CONFIG["mandir"] + "/man1"
+wdir = Dir.getwd
+
+File.makedirs bindir, true
+File.install ruby_install_name+exeext,
+  "#{bindir}/#{ruby_install_name}#{exeext}", 0755, true
+for dll in Dir['*.dll']
+  File.install dll, "#{bindir}/#{dll}", 0755, true
 end
-install dll, bindir, :mode => 0755 if enable_shared and dll != lib
-install lib, libdir, :mode => 0755 unless lib == arc
-install arc, libdir, :mode => 0644
-install "config.h", archlibdir, :mode => 0644
-install "rbconfig.rb", archlibdir, :mode => 0644
-if CONFIG["ARCHFILE"]
-  for file in CONFIG["ARCHFILE"].split
-    install file, archlibdir, :mode => 0644
+File.makedirs libdir, true
+for lib in ["libruby.so.LIB", CONFIG["LIBRUBY_SO"]]
+  if File.exist? lib
+    File.install lib, libdir, 0555, true
   end
 end
-
-if dll == lib and dll != arc
+Dir.chdir libdir
+if File.exist? CONFIG["LIBRUBY_SO"]
   for link in CONFIG["LIBRUBY_ALIASES"].split
-    ln_sf(dll, File.join(libdir, link))
-  end
-end
-
-Dir.chdir CONFIG["srcdir"]
-
-ruby_shebang = File.join(CONFIG["bindir"], ruby_install_name)
-for src in Dir["bin/*"]
-  next unless File.file?(src)
-  next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
-
-  name = ruby_install_name.sub(/ruby/, File.basename(src))
-  dest = File.join(bindir, name)
-
-  install src, dest, :mode => 0755
-
-  next if $dryrun
-
-  shebang = ''
-  body = ''
-  open(dest, "r+") { |f|
-    shebang = f.gets
-    body = f.read
-
-    if shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
-      f.rewind
-      f.print shebang, body
-      f.truncate(f.pos)
+    if File.exist? link
+       File.delete link
     end
-  }
-
-  if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
-    ruby_bin_dosish = ruby_bin.gsub(Regexp.compile(File::SEPARATOR), File::ALT_SEPARATOR)
-    batfile = dest + ".bat"
-    open(batfile, "w") { |b|
-      b.print <<EOH, shebang, body, <<EOF
-@echo off
-if "%OS%" == "Windows_NT" goto WinNT
-#{ruby_bin_dosish} -x "#{batfile}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto endofruby
-:WinNT
-#{ruby_bin_dosish} -x "#{batfile}" %*
-goto endofruby
-EOH
-__END__
-:endofruby
-EOF
-    }
+    File.symlink CONFIG["LIBRUBY_SO"], link
+    print "link #{CONFIG['LIBRUBY_SO']} -> #{link}\n"
   end
 end
-
-for f in Dir["lib/**/*{.rb,help-message}"]
-  dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir
-  makedirs dir
-  install f, dir, :mode => 0644
-end
-
-for f in Dir["*.h"]
-  install f, archlibdir, :mode => 0644
+Dir.chdir wdir
+File.makedirs pkglibdir, true
+File.makedirs archdir, true
+File.makedirs pkglibdir+"/site_ruby", true
+File.makedirs pkglibdir+"/site_ruby/"+CONFIG["arch"], true
+
+if RUBY_PLATFORM =~ /cygwin/ and File.exist? "import.h"
+  File.install "import.h", archdir, 0644, true
 end
 
-if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
-  makedirs File.join(archlibdir, "win32")
-  install "win32/win32.h", File.join(archlibdir, "win32"), :mode => 0644
+if RUBY_PLATFORM =~ /-aix/
+  File.install "ruby.imp", archdir, 0644, true
 end
 
-for mdoc in Dir["*.[1-9]"]
-  next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
-
-  section = mdoc[-1,1]
-
-  destdir = mandir + section
-  destfile = File.join(destdir, mdoc.sub(/ruby/, ruby_install_name))
-
-  makedirs destdir
-
-  if $mantype == "doc"
-    install mdoc, destfile, :mode => 0644
-  else
-    require 'mdoc2man.rb'
-
-    w = Tempfile.open(mdoc)
-
-    open(mdoc) { |r|
-      Mdoc2Man.mdoc2man(r, w)
-    }
+Dir.chdir "ext"
+system "../miniruby#{exeext} extmk.rb install #{destdir}"
+Dir.chdir CONFIG["srcdir"]
 
-    w.close
+Find.find("lib") do |f|
+  next unless /\.rb$/ =~ f
+  dir = pkglibdir+"/"+File.dirname(f[4..-1])
+  File.makedirs dir, true unless File.directory? dir
+  File.install f, dir, 0644, true
+end
 
-    install w.path, destfile, :mode => 0644
+for f in Dir["*.h"]
+  File.install f, archdir, 0644, true
+end
+if RUBY_PLATFORM =~ /mswin32/
+  File.makedirs archdir + "/win32", true
+  File.install "win32/win32.h", archdir + "/win32", 0644, true
+  if File.exist? wdir+'/rubymw.lib'
+    File.install wdir+'/rubymw.lib', archdir, 0644, true
   end
 end
+File.install wdir+'/'+CONFIG['LIBRUBY_A'], archdir, 0644, true
 
+File.makedirs mandir, true
+File.install "ruby.1", mandir, 0644, true
+Dir.chdir wdir
+File.install "config.h", archdir, 0644, true
+File.install "rbconfig.rb", archdir, 0644, true
 # vi:set sw=2:
diff --git a/intern.h b/intern.h
index 3aa96e5816..a5a3400366 100644
--- a/intern.h
+++ b/intern.h
@@ -1,37 +1,17 @@
-/**********************************************************************
-
-  intern.h -
-
-  $Author$
-  $Date$
-  created at: Thu Jun 10 14:22:17 JST 1993
-
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
-
-**********************************************************************/
-
-/* 
- * Functions and variables that are used by more than one source file of
- * the kernel.
+/* Functions and variables that are used by more than one source file of
+ * the kernel.  Not available to extensions and applications.
  */
 
-#define ID_ALLOCATOR 1
-
 /* array.c */
-void rb_mem_clear _((register VALUE*, register long));
+void rb_mem_clear _((register VALUE*, register size_t));
 VALUE rb_assoc_new _((VALUE, VALUE));
-VALUE rb_check_array_type _((VALUE));
 VALUE rb_ary_new _((void));
 VALUE rb_ary_new2 _((long));
 VALUE rb_ary_new3 __((long,...));
-VALUE rb_ary_new4 _((long, const VALUE *));
+VALUE rb_ary_new4 _((long, VALUE *));
 VALUE rb_ary_freeze _((VALUE));
 VALUE rb_ary_aref _((int, VALUE*, VALUE));
 void rb_ary_store _((VALUE, long, VALUE));
-VALUE rb_ary_dup _((VALUE));
-VALUE rb_ary_to_ary _((VALUE));
 VALUE rb_ary_to_s _((VALUE));
 VALUE rb_ary_push _((VALUE, VALUE));
 VALUE rb_ary_pop _((VALUE));
@@ -45,18 +25,14 @@ VALUE rb_ary_reverse _((VALUE));
 VALUE rb_ary_sort _((VALUE));
 VALUE rb_ary_sort_bang _((VALUE));
 VALUE rb_ary_delete _((VALUE, VALUE));
-VALUE rb_ary_delete_at _((VALUE, long));
-VALUE rb_ary_clear _((VALUE));
+VALUE rb_ary_delete_at _((VALUE, VALUE));
 VALUE rb_ary_plus _((VALUE, VALUE));
 VALUE rb_ary_concat _((VALUE, VALUE));
 VALUE rb_ary_assoc _((VALUE, VALUE));
 VALUE rb_ary_rassoc _((VALUE, VALUE));
 VALUE rb_ary_includes _((VALUE, VALUE));
-VALUE rb_ary_cmp _((VALUE, VALUE));
-VALUE rb_protect_inspect _((VALUE(*)(ANYARGS),VALUE,VALUE));
+VALUE rb_protect_inspect _((VALUE(*)(),VALUE,VALUE));
 VALUE rb_inspecting_p _((VALUE));
-VALUE rb_check_array_value _((VALUE));
-VALUE rb_values_at _((VALUE, long, int, VALUE*, VALUE(*) _((VALUE,long))));
 /* bignum.c */
 VALUE rb_big_clone _((VALUE));
 void rb_big_2comp _((VALUE));
@@ -65,131 +41,87 @@ VALUE rb_uint2big _((unsigned long));
 VALUE rb_int2big _((long));
 VALUE rb_uint2inum _((unsigned long));
 VALUE rb_int2inum _((long));
-VALUE rb_cstr_to_inum _((const char*, int, int));
-VALUE rb_str_to_inum _((VALUE, int, int));
-VALUE rb_cstr2inum _((const char*, int));
-VALUE rb_str2inum _((VALUE, int));
+VALUE rb_str2inum _((const char*, int));
 VALUE rb_big2str _((VALUE, int));
 long rb_big2long _((VALUE));
 #define rb_big2int(x) rb_big2long(x)
 unsigned long rb_big2ulong _((VALUE));
 #define rb_big2uint(x) rb_big2ulong(x)
-#if HAVE_LONG_LONG
-VALUE rb_ll2inum _((LONG_LONG));
-VALUE rb_ull2inum _((unsigned LONG_LONG));
-LONG_LONG rb_big2ll _((VALUE));
-unsigned LONG_LONG rb_big2ull _((VALUE));
-#endif  /* HAVE_LONG_LONG */
-void rb_quad_pack _((char*,VALUE));
-VALUE rb_quad_unpack _((const char*,int));
 VALUE rb_dbl2big _((double));
 double rb_big2dbl _((VALUE));
 VALUE rb_big_plus _((VALUE, VALUE));
 VALUE rb_big_minus _((VALUE, VALUE));
 VALUE rb_big_mul _((VALUE, VALUE));
-VALUE rb_big_divmod _((VALUE, VALUE));
 VALUE rb_big_pow _((VALUE, VALUE));
 VALUE rb_big_and _((VALUE, VALUE));
 VALUE rb_big_or _((VALUE, VALUE));
 VALUE rb_big_xor _((VALUE, VALUE));
 VALUE rb_big_lshift _((VALUE, VALUE));
-VALUE rb_big_rand _((VALUE, double*));
+VALUE rb_big_rand _((VALUE));
 /* class.c */
-VALUE rb_class_boot _((VALUE));
 VALUE rb_class_new _((VALUE));
-VALUE rb_mod_init_copy _((VALUE, VALUE));
-VALUE rb_class_init_copy _((VALUE, VALUE));
+VALUE rb_singleton_class_new _((VALUE));
 VALUE rb_singleton_class_clone _((VALUE));
 void rb_singleton_class_attached _((VALUE,VALUE));
-VALUE rb_make_metaclass _((VALUE, VALUE));
-VALUE rb_class_inherited _((VALUE, VALUE));
 VALUE rb_define_class_id _((ID, VALUE));
 VALUE rb_module_new _((void));
 VALUE rb_define_module_id _((ID));
 VALUE rb_mod_included_modules _((VALUE));
-VALUE rb_mod_include_p _((VALUE, VALUE));
 VALUE rb_mod_ancestors _((VALUE));
 VALUE rb_class_instance_methods _((int, VALUE*, VALUE));
-VALUE rb_class_public_instance_methods _((int, VALUE*, VALUE));
 VALUE rb_class_protected_instance_methods _((int, VALUE*, VALUE));
 VALUE rb_class_private_instance_methods _((int, VALUE*, VALUE));
-VALUE rb_obj_singleton_methods _((int, VALUE*, VALUE));
-void rb_define_method_id _((VALUE, ID, VALUE (*)(ANYARGS), int));
-void rb_frozen_class_p _((VALUE));
-void rb_undef _((VALUE, ID));
-void rb_define_protected_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
-void rb_define_private_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
-void rb_define_singleton_method _((VALUE, const char*, VALUE(*)(ANYARGS), int));
+VALUE rb_obj_singleton_methods _((VALUE));
+void rb_define_method_id _((VALUE, ID, VALUE (*)(), int));
+void rb_undef_method _((VALUE, const char*));
+void rb_define_protected_method _((VALUE, const char*, VALUE (*)(), int));
+void rb_define_private_method _((VALUE, const char*, VALUE (*)(), int));
+void rb_define_singleton_method _((VALUE,const char*,VALUE(*)(),int));
+void rb_define_private_method _((VALUE,const char*,VALUE(*)(),int));
 VALUE rb_singleton_class _((VALUE));
-/* compar.c */
-int rb_cmpint _((VALUE, VALUE, VALUE));
-NORETURN(void rb_cmperr _((VALUE, VALUE)));
 /* enum.c */
+VALUE rb_enum_length _((VALUE));
 /* error.c */
-RUBY_EXTERN int ruby_nerrs;
+extern int ruby_nerrs;
 VALUE rb_exc_new _((VALUE, const char*, long));
 VALUE rb_exc_new2 _((VALUE, const char*));
 VALUE rb_exc_new3 _((VALUE, VALUE));
-NORETURN(void rb_loaderror __((const char*, ...)));
-NORETURN(void rb_name_error __((ID, const char*, ...)));
-NORETURN(void rb_invalid_str _((const char*, const char*)));
+void rb_loaderror __((const char*, ...)) NORETURN;
 void rb_compile_error __((const char*, ...));
 void rb_compile_error_append __((const char*, ...));
-NORETURN(void rb_load_fail _((char*)));
-NORETURN(void rb_error_frozen _((char*)));
-void rb_check_frozen _((VALUE));
 /* eval.c */
-RUBY_EXTERN struct RNode *ruby_current_node;
-void ruby_set_current_source _((void));
-NORETURN(void rb_exc_raise _((VALUE)));
-NORETURN(void rb_exc_fatal _((VALUE)));
-VALUE rb_f_exit _((int,VALUE*));
-VALUE rb_f_abort _((int,VALUE*));
+void rb_exc_raise _((VALUE)) NORETURN;
+void rb_exc_fatal _((VALUE)) NORETURN;
 void rb_remove_method _((VALUE, const char*));
-#define rb_disable_super(klass, name) ((void)0)
-#define rb_enable_super(klass, name) ((void)0)
-#define HAVE_RB_DEFINE_ALLOC_FUNC 1
-void rb_define_alloc_func _((VALUE, VALUE (*)(VALUE)));
-void rb_undef_alloc_func _((VALUE));
+void rb_disable_super _((VALUE, const char*));
+void rb_enable_super _((VALUE, const char*));
 void rb_clear_cache _((void));
-void rb_clear_cache_by_class _((VALUE));
 void rb_alias _((VALUE, ID, ID));
 void rb_attr _((VALUE,ID,int,int,int));
 int rb_method_boundp _((VALUE, ID, int));
 VALUE rb_dvar_defined _((ID));
-VALUE rb_dvar_curr _((ID));
 VALUE rb_dvar_ref _((ID));
 void rb_dvar_asgn _((ID, VALUE));
 void rb_dvar_push _((ID, VALUE));
-VALUE *rb_svar _((int));
-VALUE rb_eval_cmd _((VALUE, VALUE, int));
+VALUE rb_eval_cmd _((VALUE, VALUE));
 int rb_respond_to _((VALUE, ID));
 void rb_interrupt _((void));
 VALUE rb_apply _((VALUE, ID, VALUE));
+VALUE rb_funcall2 _((VALUE, ID, int, VALUE*));
 void rb_backtrace _((void));
 ID rb_frame_last_func _((void));
 VALUE rb_obj_instance_eval _((int, VALUE*, VALUE));
-VALUE rb_mod_module_eval _((int, VALUE*, VALUE));
 void rb_load _((VALUE, int));
 void rb_load_protect _((VALUE, int, int*));
-NORETURN(void rb_jump_tag _((int)));
-int rb_provided _((const char*));
+void rb_jump_tag _((int)) NORETURN;
 void rb_provide _((const char*));
 VALUE rb_f_require _((VALUE, VALUE));
-VALUE rb_require_safe _((VALUE, int));
 void rb_obj_call_init _((VALUE, int, VALUE*));
 VALUE rb_class_new_instance _((int, VALUE*, VALUE));
-VALUE rb_block_proc _((void));
 VALUE rb_f_lambda _((void));
-VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE));
-VALUE rb_protect _((VALUE (*)(VALUE), VALUE, int*));
-void rb_set_end_proc _((void (*)(VALUE), VALUE));
-void rb_mark_end_proc _((void));
+VALUE rb_protect _((VALUE (*)(), VALUE, int*));
+void rb_set_end_proc _((void (*)(), VALUE));
 void rb_exec_end_proc _((void));
-void ruby_finalize _((void));
-NORETURN(void ruby_stop _((int)));
-int ruby_cleanup _((int));
-int ruby_exec _((void));
 void rb_gc_mark_threads _((void));
 void rb_thread_start_timer _((void));
 void rb_thread_stop_timer _((void));
@@ -198,64 +130,50 @@ void rb_thread_wait_fd _((int));
 int rb_thread_fd_writable _((int));
 void rb_thread_fd_close _((int));
 int rb_thread_alone _((void));
-void rb_thread_polling _((void));
 void rb_thread_sleep _((int));
 void rb_thread_sleep_forever _((void));
 VALUE rb_thread_stop _((void));
 VALUE rb_thread_wakeup _((VALUE));
 VALUE rb_thread_run _((VALUE));
-VALUE rb_thread_kill _((VALUE));
-VALUE rb_thread_create _((VALUE (*)(ANYARGS), void*));
+VALUE rb_thread_create _((VALUE (*)(), void*));
+int rb_thread_scope_shared_p _((void));
 void rb_thread_interrupt _((void));
 void rb_thread_trap_eval _((VALUE, int));
 void rb_thread_signal_raise _((char*));
-int rb_thread_select(ANYARGS);
-void rb_thread_wait_for(ANYARGS);
+int rb_thread_select();
+void rb_thread_wait_for();
 VALUE rb_thread_current _((void));
 VALUE rb_thread_main _((void));
 VALUE rb_thread_local_aref _((VALUE, ID));
 VALUE rb_thread_local_aset _((VALUE, ID, VALUE));
-void rb_thread_atfork _((void));
 /* file.c */
 int eaccess _((const char*, int));
 VALUE rb_file_s_expand_path _((int, VALUE *));
 void rb_file_const _((const char*, VALUE));
-int rb_find_file_ext _((VALUE*, const char* const*));
-VALUE rb_find_file _((VALUE));
 /* gc.c */
-NORETURN(void rb_memerror __((void)));
-int ruby_stack_check _((void));
-int ruby_stack_length _((VALUE**));
-char *rb_source_filename _((const char*));
+void rb_global_variable _((VALUE*));
 void rb_gc_mark_locations _((VALUE*, VALUE*));
 void rb_mark_tbl _((struct st_table*));
 void rb_mark_hash _((struct st_table*));
-void rb_gc_mark_maybe _((VALUE));
-void rb_gc_mark _((VALUE));
+void rb_gc_mark_maybe();
+void rb_gc_mark();
 void rb_gc_force_recycle _((VALUE));
 void rb_gc _((void));
-void rb_gc_copy_finalizer _((VALUE,VALUE));
 void rb_gc_call_finalizer_at_exit _((void));
-VALUE rb_gc_enable _((void));
-VALUE rb_gc_disable _((void));
-VALUE rb_gc_start _((void));
 /* hash.c */
 VALUE rb_hash _((VALUE));
 VALUE rb_hash_new _((void));
 VALUE rb_hash_freeze _((VALUE));
 VALUE rb_hash_aref _((VALUE, VALUE));
 VALUE rb_hash_aset _((VALUE, VALUE, VALUE));
-VALUE rb_hash_delete_if _((VALUE));
-VALUE rb_hash_delete _((VALUE,VALUE));
-int rb_path_check _((char*));
+int rb_path_check _((char *));
 int rb_env_path_tainted _((void));
 /* io.c */
-#define rb_defout rb_stdout
-RUBY_EXTERN VALUE rb_fs;
-RUBY_EXTERN VALUE rb_output_fs;
-RUBY_EXTERN VALUE rb_rs;
-RUBY_EXTERN VALUE rb_default_rs;
-RUBY_EXTERN VALUE rb_output_rs;
+extern VALUE rb_fs;
+extern VALUE rb_output_fs;
+extern VALUE rb_rs;
+extern VALUE rb_default_rs;
+extern VALUE rb_output_rs;
 VALUE rb_io_write _((VALUE, VALUE));
 VALUE rb_io_gets _((VALUE));
 VALUE rb_io_getc _((VALUE));
@@ -263,26 +181,16 @@ VALUE rb_io_ungetc _((VALUE, VALUE));
 VALUE rb_io_close _((VALUE));
 VALUE rb_io_eof _((VALUE));
 VALUE rb_io_binmode _((VALUE));
-VALUE rb_io_addstr _((VALUE, VALUE));
-VALUE rb_io_printf _((int, VALUE*, VALUE));
-VALUE rb_io_print _((int, VALUE*, VALUE));
-VALUE rb_io_puts _((int, VALUE*, VALUE));
 VALUE rb_file_open _((const char*, const char*));
 VALUE rb_gets _((void));
-void rb_write_error _((const char*));
-void rb_write_error2 _((const char*, long));
-/* marshal.c */
-VALUE rb_marshal_dump _((VALUE, VALUE));
-VALUE rb_marshal_load _((VALUE));
+void rb_str_setter _((VALUE, ID, VALUE*));
 /* numeric.c */
 void rb_num_zerodiv _((void));
 VALUE rb_num_coerce_bin _((VALUE, VALUE));
-VALUE rb_num_coerce_cmp _((VALUE, VALUE));
-VALUE rb_num_coerce_relop _((VALUE, VALUE));
 VALUE rb_float_new _((double));
 VALUE rb_num2fix _((VALUE));
 VALUE rb_fix2str _((VALUE, int));
-VALUE rb_dbl_cmp _((double, double));
+VALUE rb_fix_upto _((VALUE, VALUE));
 /* object.c */
 int rb_eql _((VALUE, VALUE));
 VALUE rb_any_to_s _((VALUE));
@@ -291,58 +199,35 @@ VALUE rb_obj_is_instance_of _((VALUE, VALUE));
 VALUE rb_obj_is_kind_of _((VALUE, VALUE));
 VALUE rb_obj_alloc _((VALUE));
 VALUE rb_obj_clone _((VALUE));
-VALUE rb_obj_dup _((VALUE));
-VALUE rb_obj_init_copy _((VALUE,VALUE));
 VALUE rb_obj_taint _((VALUE));
 VALUE rb_obj_tainted _((VALUE));
 VALUE rb_obj_untaint _((VALUE));
-VALUE rb_obj_freeze _((VALUE));
 VALUE rb_obj_id _((VALUE));
-VALUE rb_obj_class _((VALUE));
-VALUE rb_class_real _((VALUE));
 VALUE rb_convert_type _((VALUE,int,const char*,const char*));
-VALUE rb_check_convert_type _((VALUE,int,const char*,const char*));
-VALUE rb_to_int _((VALUE));
 VALUE rb_Integer _((VALUE));
 VALUE rb_Float _((VALUE));
 VALUE rb_String _((VALUE));
 VALUE rb_Array _((VALUE));
-double rb_cstr_to_dbl _((const char*, int));
-double rb_str_to_dbl _((VALUE, int));
 /* parse.y */
-RUBY_EXTERN int   ruby_sourceline;
-RUBY_EXTERN char *ruby_sourcefile;
-int ruby_yyparse _((void));
+extern int   ruby_sourceline;
+extern char *ruby_sourcefile;
+int yyparse _((void));
 ID rb_id_attrset _((ID));
 void rb_parser_append_print _((void));
 void rb_parser_while_loop _((int, int));
-int ruby_parser_stack_on_heap _((void));
-void rb_gc_mark_parser _((void));
 int rb_is_const_id _((ID));
 int rb_is_instance_id _((ID));
-int rb_is_class_id _((ID));
-int rb_is_local_id _((ID));
-int rb_is_junk_id _((ID));
 VALUE rb_backref_get _((void));
 void rb_backref_set _((VALUE));
 VALUE rb_lastline_get _((void));
 void rb_lastline_set _((VALUE));
-VALUE rb_sym_all_symbols _((void));
 /* process.c */
 int rb_proc_exec _((const char*));
-VALUE rb_f_exec _((int,VALUE*));
-int rb_waitpid _((int,int*,int));
 void rb_syswait _((int));
-VALUE rb_proc_times _((VALUE));
-VALUE rb_detach_process _((int));
 /* range.c */
 VALUE rb_range_new _((VALUE, VALUE, int));
 VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
-VALUE rb_length_by_each _((VALUE));
 /* re.c */
-int rb_memcmp _((char*,char*,long));
-int rb_memcicmp _((char*,char*,long));
-long rb_memsearch _((char*,long,char*,long));
 VALUE rb_reg_nth_defined _((int, VALUE));
 VALUE rb_reg_nth_match _((int, VALUE));
 VALUE rb_reg_last_match _((VALUE));
@@ -353,29 +238,28 @@ VALUE rb_reg_new _((const char*, long, int));
 VALUE rb_reg_match _((VALUE, VALUE));
 VALUE rb_reg_match2 _((VALUE));
 int rb_reg_options _((VALUE));
-void rb_set_kcode _((const char*));
 const char* rb_get_kcode _((void));
+void rb_set_kcode _((const char*));
+int rb_ignorecase_p _((void));
+void rb_match_busy _((VALUE, int));
 /* ruby.c */
-RUBY_EXTERN VALUE rb_argv;
-RUBY_EXTERN VALUE rb_argv0;
+extern VALUE rb_argv0;
 void rb_load_file _((char*));
 void ruby_script _((char*));
 void ruby_prog_init _((void));
 void ruby_set_argv _((int, char**));
 void ruby_process_options _((int, char**));
+void ruby_require_libraries _((void));
 void ruby_load_script _((void));
-void ruby_init_loadpath _((void));
-void ruby_incpush _((const char*));
 /* signal.c */
 VALUE rb_f_kill _((int, VALUE*));
 void rb_gc_mark_trap_list _((void));
 #ifdef POSIX_SIGNAL
 #define posix_signal ruby_posix_signal
-void posix_signal _((int, RETSIGTYPE (*)(int)));
+void posix_signal _((int, void (*)()));
 #endif
 void rb_trap_exit _((void));
 void rb_trap_exec _((void));
-const char *ruby_signal_name _((int));
 /* sprintf.c */
 VALUE rb_f_sprintf _((int, VALUE*));
 /* string.c */
@@ -383,18 +267,11 @@ VALUE rb_str_new _((const char*, long));
 VALUE rb_str_new2 _((const char*));
 VALUE rb_str_new3 _((VALUE));
 VALUE rb_str_new4 _((VALUE));
-VALUE rb_str_new5 _((VALUE, const char*, long));
 VALUE rb_tainted_str_new _((const char*, long));
 VALUE rb_tainted_str_new2 _((const char*));
-VALUE rb_str_buf_new _((long));
-VALUE rb_str_buf_new2 _((const char*));
-VALUE rb_str_buf_append _((VALUE, VALUE));
-VALUE rb_str_buf_cat _((VALUE, const char*, long));
-VALUE rb_str_buf_cat2 _((VALUE, const char*));
 VALUE rb_obj_as_string _((VALUE));
-VALUE rb_check_string_type _((VALUE));
+VALUE rb_str_to_str _((VALUE));
 VALUE rb_str_dup _((VALUE));
-VALUE rb_str_dup_frozen _((VALUE));
 VALUE rb_str_plus _((VALUE, VALUE));
 VALUE rb_str_times _((VALUE, VALUE));
 VALUE rb_str_substr _((VALUE, long, long));
@@ -402,20 +279,12 @@ void rb_str_modify _((VALUE));
 VALUE rb_str_freeze _((VALUE));
 VALUE rb_str_resize _((VALUE, long));
 VALUE rb_str_cat _((VALUE, const char*, long));
-VALUE rb_str_cat2 _((VALUE, const char*));
-VALUE rb_str_append _((VALUE, VALUE));
 VALUE rb_str_concat _((VALUE, VALUE));
 int rb_str_hash _((VALUE));
 int rb_str_cmp _((VALUE, VALUE));
 VALUE rb_str_upto _((VALUE, VALUE, int));
-void rb_str_update _((VALUE, long, long, VALUE));
 VALUE rb_str_inspect _((VALUE));
-VALUE rb_str_dump _((VALUE));
 VALUE rb_str_split _((VALUE, const char*));
-void rb_str_associate _((VALUE, VALUE));
-VALUE rb_str_associated _((VALUE));
-void rb_str_setter _((VALUE, ID, VALUE*));
-VALUE rb_str_intern _((VALUE));
 /* struct.c */
 VALUE rb_struct_new __((VALUE, ...));
 VALUE rb_struct_define __((const char*, ...));
@@ -423,59 +292,37 @@ VALUE rb_struct_alloc _((VALUE, VALUE));
 VALUE rb_struct_aref _((VALUE, VALUE));
 VALUE rb_struct_aset _((VALUE, VALUE, VALUE));
 VALUE rb_struct_getmember _((VALUE, ID));
-VALUE rb_struct_iv_get _((VALUE, char*));
 /* time.c */
-VALUE rb_time_new(ANYARGS);
+VALUE rb_time_new();
 /* variable.c */
 VALUE rb_mod_name _((VALUE));
 VALUE rb_class_path _((VALUE));
 void rb_set_class_path _((VALUE, VALUE, const char*));
 VALUE rb_path2class _((const char*));
 void rb_name_class _((VALUE, ID));
-void rb_autoload _((VALUE, ID, const char*));
-void rb_autoload_load _((VALUE, ID));
-VALUE rb_autoload_p _((VALUE, ID));
+void rb_autoload _((const char*, const char*));
+VALUE rb_f_autoload _((VALUE, VALUE, VALUE));
 void rb_gc_mark_global_tbl _((void));
 VALUE rb_f_trace_var _((int, VALUE*));
 VALUE rb_f_untrace_var _((int, VALUE*));
+VALUE rb_gvar_set2 _((const char*, VALUE));
 VALUE rb_f_global_variables _((void));
 void rb_alias_variable _((ID, ID));
-struct st_table* rb_generic_ivar_table _((VALUE));
-void rb_copy_generic_ivar _((VALUE,VALUE));
 void rb_mark_generic_ivar _((VALUE));
 void rb_mark_generic_ivar_tbl _((void));
 void rb_free_generic_ivar _((VALUE));
 VALUE rb_ivar_get _((VALUE, ID));
 VALUE rb_ivar_set _((VALUE, ID, VALUE));
 VALUE rb_ivar_defined _((VALUE, ID));
-VALUE rb_iv_set _((VALUE, const char*, VALUE));
-VALUE rb_iv_get _((VALUE, const char*));
-VALUE rb_attr_get _((VALUE, ID));
 VALUE rb_obj_instance_variables _((VALUE));
 VALUE rb_obj_remove_instance_variable _((VALUE, VALUE));
-void *rb_mod_const_at _((VALUE, void*));
-void *rb_mod_const_of _((VALUE, void*));
-VALUE rb_const_list _((void*));
+VALUE rb_mod_const_at _((VALUE, VALUE));
 VALUE rb_mod_constants _((VALUE));
+VALUE rb_mod_const_of _((VALUE, VALUE));
 VALUE rb_mod_remove_const _((VALUE, VALUE));
-int rb_const_defined _((VALUE, ID));
 int rb_const_defined_at _((VALUE, ID));
-int rb_const_defined_from _((VALUE, ID));
-VALUE rb_const_get _((VALUE, ID));
-VALUE rb_const_get_at _((VALUE, ID));
-VALUE rb_const_get_from _((VALUE, ID));
-void rb_const_set _((VALUE, ID, VALUE));
-VALUE rb_mod_constants _((VALUE));
-VALUE rb_mod_const_missing _((VALUE,VALUE));
-VALUE rb_cvar_defined _((VALUE, ID));
-#define RB_CVAR_SET_4ARGS 1
-void rb_cvar_set _((VALUE, ID, VALUE, int));
-VALUE rb_cvar_get _((VALUE, ID));
-void rb_cv_set _((VALUE, const char*, VALUE));
-VALUE rb_cv_get _((VALUE, const char*));
-void rb_define_class_variable _((VALUE, const char*, VALUE));
-VALUE rb_mod_class_variables _((VALUE));
-VALUE rb_mod_remove_cvar _((VALUE, VALUE));
+int rb_autoload_defined _((ID));
+int rb_const_defined _((VALUE, ID));
 /* version.c */
 void ruby_show_version _((void));
 void ruby_show_copyright _((void));
diff --git a/io.c b/io.c
index cac35eb7e6..5be3e40abd 100644
--- a/io.c
+++ b/io.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/************************************************
 
   io.c -
 
@@ -6,68 +6,46 @@
   $Date$
   created at: Fri Oct 15 18:08:59 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+  Copyright (C) 1993-1999 Yukihiro Matsumoto
 
-**********************************************************************/
-
-#if defined(__VMS)
-#define _XOPEN_SOURCE
-#define _POSIX_C_SOURCE 2
-#endif
+************************************************/
 
 #include "ruby.h"
 #include "rubyio.h"
 #include "rubysig.h"
-#include "env.h"
 #include <ctype.h>
 #include <errno.h>
 
-#if defined(MSDOS) || defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__) || defined(__BEOS__)
-# define NO_SAFE_RENAME
-#endif
-
-#if defined(MSDOS) || defined(__CYGWIN__) || defined(_WIN32)
-# define NO_LONG_FNAME
-#endif
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(sun) || defined(_nec_ews)
-# define USE_SETVBUF
-#endif
-
-#ifdef __QNXNTO__
-#include "unix.h"
-#endif
-
 #include <sys/types.h>
-#if !defined(DJGPP) && !defined(_WIN32) && !defined(__human68k__)
+#if !defined(DJGPP) && !defined(NT) && !defined(__human68k__)
 #include <sys/ioctl.h>
 #endif
-#if defined(HAVE_FCNTL_H) || defined(_WIN32)
+#if defined(HAVE_FCNTL_H) || defined(NT)
 #include <fcntl.h>
 #elif defined(HAVE_SYS_FCNTL_H)
 #include <sys/fcntl.h>
 #endif
 
-#if !HAVE_OFF_T && !defined(off_t)
-# define off_t  long
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#else
+#ifndef NT
+struct timeval {
+        long    tv_sec;         /* seconds */
+        long    tv_usec;        /* and microseconds */
+};
 #endif
-#if !HAVE_FSEEKO && !defined(fseeko)
-# define fseeko  fseek
 #endif
-#if !HAVE_FTELLO && !defined(ftello)
-# define ftello  ftell
+#ifdef HAVE_VFORK_H
+#include <vfork.h>
 #endif
 
 #include <sys/stat.h>
 
-/* EMX has sys/param.h, but.. */
-#if defined(HAVE_SYS_PARAM_H) && !(defined(__EMX__) || defined(__HIUX_MPP__))
+/* EMX has sys/parm.h, but.. */
+#if defined(HAVE_SYS_PARAM_H) && !defined(__EMX__)
 # include <sys/param.h>
-#endif
-
-#if !defined NOFILE
+#else
 # define NOFILE 64
 #endif
 
@@ -75,10 +53,20 @@
 #include <unistd.h>
 #endif
 
+#ifdef USE_CWGUSI
+ #include <sys/errno.h>
+ #include <unix.mac.h>
+ #include <compat.h>
+#endif
+
+#ifndef strdup
+char *strdup();
+#endif
+
 extern void Init_File _((void));
 
 #ifdef __BEOS__
-# ifndef NOFILE
+# ifdef _X86_
 #  define NOFILE (OPEN_MAX)
 # endif
 #include <net/socket.h>
@@ -86,18 +74,13 @@ extern void Init_File _((void));
 
 #include "util.h"
 
-#if SIZEOF_OFF_T > SIZEOF_LONG && !defined(HAVE_LONG_LONG)
-# error off_t is bigger than long, but you have no long long...
-#endif
-
 VALUE rb_cIO;
 VALUE rb_eEOFError;
 VALUE rb_eIOError;
 
-VALUE rb_stdin, rb_stdout, rb_stderr;
-VALUE rb_deferr;		/* rescue VIM plugin */
-static VALUE orig_stdout, orig_stderr;
+VALUE rb_stdin, rb_stdout, rb_stderr, rb_defout;
 
+VALUE rb_fs;
 VALUE rb_output_fs;
 VALUE rb_rs;
 VALUE rb_output_rs;
@@ -105,13 +88,13 @@ VALUE rb_default_rs;
 
 static VALUE argf;
 
-static ID id_write, id_read, id_getc;
+static ID id_write;
 
 extern char *ruby_inplace_mode;
 
 struct timeval rb_time_interval _((VALUE));
 
-static VALUE filename, current_file;
+static VALUE filename, file;
 static int gets_lineno;
 static int init_p = 0, next_p = 0;
 static VALUE lineno;
@@ -119,42 +102,19 @@ static VALUE lineno;
 #ifdef _STDIO_USES_IOSTREAM  /* GNU libc */
 #  ifdef _IO_fpos_t
 #    define READ_DATA_PENDING(fp) ((fp)->_IO_read_ptr != (fp)->_IO_read_end)
-#    define READ_DATA_PENDING_COUNT(fp) ((fp)->_IO_read_end - (fp)->_IO_read_ptr)
-#    define READ_DATA_PENDING_PTR(fp) ((fp)->_IO_read_ptr)
 #  else
 #    define READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr)
-#    define READ_DATA_PENDING_COUNT(fp) ((fp)->_egptr - (fp)->_gptr)
-#    define READ_DATA_PENDING_PTR(fp) ((fp)->_gptr)
 #  endif
 #elif defined(FILE_COUNT)
 #  define READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0)
-#  define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_COUNT)
-#elif defined(FILE_READEND)
-#  define READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
-#  define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_READEND - (fp)->FILE_READPTR)
 #elif defined(__BEOS__)
-#  define READ_DATA_PENDING(fp) (fp->_state._eof == 0)
-#elif defined(__VMS)
-#  define READ_DATA_PENDING(fp) (((unsigned int)((*(fp))->_flag) & _IOEOF) == 0)
+#  define ReadDataPending(fp) (fp->_state._eof == 0)
+#elif defined(USE_CWGUSI)
+#  define READ_DATA_PENDING(fp) (fp->state.eof == 0)
 #else
 /* requires systems own version of the ReadDataPending() */
 extern int ReadDataPending();
-#  define READ_DATA_PENDING(fp) (!feof(fp))
-#  define READ_DATA_BUFFERED(fp) 0
-#endif
-#ifndef READ_DATA_BUFFERED
-#  define READ_DATA_BUFFERED(fp) READ_DATA_PENDING(fp)
-#endif
-
-#ifndef READ_DATA_PENDING_PTR
-# ifdef FILE_READPTR
-#  define READ_DATA_PENDING_PTR(fp) ((char *)(fp)->FILE_READPTR)
-# endif
-#endif
-
-#if defined __DJGPP__
-# undef READ_DATA_PENDING_COUNT
-# undef READ_DATA_PENDING_PTR
+#  define READ_DATA_PENDING(fp) ReadDataPending(fp)
 #endif
 
 #define READ_CHECK(fp) do {\
@@ -170,16 +130,6 @@ rb_eof_error()
     rb_raise(rb_eEOFError, "End of file reached");
 }
 
-VALUE
-rb_io_taint_check(io)
-    VALUE io;
-{
-    if (!OBJ_TAINTED(io) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-    rb_check_frozen(io);
-    return io;
-}
-
 void
 rb_io_check_closed(fptr)
     OpenFile *fptr;
@@ -187,76 +137,26 @@ rb_io_check_closed(fptr)
     if (!fptr) {
 	rb_raise(rb_eIOError, "uninitialized stream");
     }
-    if (!fptr->f && !fptr->f2) {
+    if (fptr->f == NULL && fptr->f2 == NULL)
 	rb_raise(rb_eIOError, "closed stream");
-    }
 }
 
-static void io_fflush _((FILE *, OpenFile *));
-
-#if NEED_IO_FLUSH_BEFORE_SEEK
-static OpenFile *
-flush_before_seek(fptr)
-    OpenFile *fptr;
-{
-    if (fptr->mode & FMODE_WBUF) {
-	io_fflush(GetWriteFile(fptr), fptr);
-    }
-    return fptr;
-}
-#else
-#define flush_before_seek(fptr) fptr
-#endif
-
-#define io_seek(fptr, ofs, whence) fseeko(flush_before_seek(fptr)->f, ofs, whence)
-#define io_tell(fptr) ftello(flush_before_seek(fptr)->f)
-
-#ifndef SEEK_CUR
-# define SEEK_SET 0
-# define SEEK_CUR 1
-# define SEEK_END 2
-#endif
-
-#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE)
-
 void
 rb_io_check_readable(fptr)
     OpenFile *fptr;
 {
-    rb_io_check_closed(fptr);
     if (!(fptr->mode & FMODE_READABLE)) {
 	rb_raise(rb_eIOError, "not opened for reading");
     }
-#if NEED_IO_SEEK_BETWEEN_RW
-    if (((fptr->mode & FMODE_WBUF) ||
-	 (fptr->mode & (FMODE_SYNCWRITE|FMODE_RBUF)) == FMODE_SYNCWRITE) &&
-	!fptr->f2) {
-	io_seek(fptr, 0, SEEK_CUR);
-    }
-    fptr->mode |= FMODE_RBUF;
-#endif
 }
 
 void
 rb_io_check_writable(fptr)
     OpenFile *fptr;
 {
-    rb_io_check_closed(fptr);
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
-#if NEED_IO_SEEK_BETWEEN_RW
-    if ((fptr->mode & FMODE_RBUF) && !fptr->f2) {
-	io_seek(fptr, 0, SEEK_CUR);
-    }
-#endif
-}
-
-int
-rb_read_pending(fp)
-    FILE *fp;
-{
-    return READ_DATA_PENDING(fp);
 }
 
 void
@@ -268,178 +168,51 @@ rb_read_check(fp)
     }
 }
 
-static int
-ruby_dup(orig)
-    int orig;
-{
-    int fd;
-
-    fd = dup(orig);
-    if (fd < 0) {
-	if (errno == EMFILE || errno == ENFILE) {
-	    rb_gc();
-	    fd = dup(orig);
-	}
-	if (fd < 0) {
-	    rb_sys_fail(0);
-	}
-    }
-    return fd;
-}
-
-static VALUE io_alloc _((VALUE));
-static VALUE
-io_alloc(klass)
-    VALUE klass;
-{
-    NEWOBJ(io, struct RFile);
-    OBJSETUP(io, klass, T_FILE);
-
-    io->fptr = 0;
-
-    return (VALUE)io;
-}
-
-static void
-io_fflush(f, fptr)
-    FILE *f;
-    OpenFile *fptr;
-{
-    int n;
-
-    if (!rb_thread_fd_writable(fileno(f))) {
-        rb_io_check_closed(fptr);
-    }
-    for (;;) {
-	TRAP_BEG;
-	n = fflush(f);
-	TRAP_END;
-	if (n != EOF) break;
-	if (!rb_io_wait_writable(fileno(f)))
-	    rb_sys_fail(fptr->path);
-    }
-    fptr->mode &= ~FMODE_WBUF;
-}
-
-int
-rb_io_wait_readable(f)
-    int f;
-{
-    fd_set rfds;
-
-    switch (errno) {
-      case EINTR:
-#if defined(ERESTART)
-      case ERESTART:
-#endif
-	rb_thread_wait_fd(f);
-	return Qtrue;
-
-      case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-      case EWOULDBLOCK:
-#endif
-	FD_ZERO(&rfds);
-	FD_SET(f, &rfds);
-	rb_thread_select(f + 1, &rfds, NULL, NULL, NULL);
-	return Qtrue;
-
-      default:
-	return Qfalse;
-    }
-}
-
-int
-rb_io_wait_writable(f)
-    int f;
-{
-    fd_set wfds;
-
-    switch (errno) {
-      case EINTR:
-#if defined(ERESTART)
-      case ERESTART:
-#endif
-	rb_thread_fd_writable(f);
-	return Qtrue;
-
-      case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-      case EWOULDBLOCK:
-#endif
-	FD_ZERO(&wfds);
-	FD_SET(f, &wfds);
-	rb_thread_select(f + 1, NULL, &wfds, NULL, NULL);
-	return Qtrue;
-
-      default:
-	return Qfalse;
-    }
-}
-
 /* writing functions */
-long
-rb_io_fwrite(ptr, len, f)
-    const char *ptr;
-    long len;
-    FILE *f;
-{
-    long n, r;
-
-    if ((n = len) <= 0) return n;
-#ifdef __human68k__
-    do {
-	if (fputc(*ptr++, f) == EOF) {
-	    if (ferror(f)) return -1L;
-	    break;
-	}
-    } while (--n > 0);
-#else
-    while (ptr += (r = fwrite(ptr, 1, n, f)), (n -= r) > 0) {
-	if (ferror(f)) {
-	    if (rb_io_wait_writable(fileno(f))) {
-		clearerr(f);
-		continue;
-	    }
-	    return -1L;
-	}
-    }
-#endif
-    return len - n;
-}
-
 static VALUE
 io_write(io, str)
     VALUE io, str;
 {
     OpenFile *fptr;
     FILE *f;
-    long n;
+    int n;
 
     rb_secure(4);
     if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
+    if (RSTRING(str)->len == 0) return INT2FIX(0);
 
-    if (TYPE(io) != T_FILE) {
+    if (BUILTIN_TYPE(io) != T_FILE) {
 	/* port is not IO, call write method for it. */
 	return rb_funcall(io, id_write, 1, str);
     }
-    if (RSTRING(str)->len == 0) return INT2FIX(0);
 
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
     f = GetWriteFile(fptr);
 
-    n = rb_io_fwrite(RSTRING(str)->ptr, RSTRING(str)->len, f);
-    if (n == -1L) rb_sys_fail(fptr->path);
-    if (fptr->mode & FMODE_SYNC) {
-	io_fflush(f, fptr);
+#ifdef __human68k__
+    {
+	register char *ptr = RSTRING(str)->ptr;
+	n = (int)RSTRING(str)->len;
+	while (--n >= 0)
+	    if (fputc(*ptr++, f) == EOF)
+		rb_sys_fail(fptr->path);
+	n = ptr - RSTRING(str)->ptr;
     }
-    else {
-	fptr->mode |= FMODE_WBUF;
+    if (ferror(f))
+	rb_sys_fail(fptr->path);
+#else
+    n = fwrite(RSTRING(str)->ptr, 1, RSTRING(str)->len, f);
+    if (ferror(f)) {
+	rb_sys_fail(fptr->path);
+    }
+#endif
+    if (fptr->mode & FMODE_SYNC) {
+	fflush(f);
     }
 
-    return LONG2FIX(n);
+    return INT2FIX(n);
 }
 
 VALUE
@@ -449,7 +222,7 @@ rb_io_write(io, str)
     return rb_funcall(io, id_write, 1, str);
 }
 
-VALUE
+static VALUE
 rb_io_addstr(io, str)
     VALUE io, str;
 {
@@ -468,7 +241,7 @@ rb_io_flush(io)
     rb_io_check_writable(fptr);
     f = GetWriteFile(fptr);
 
-    io_fflush(f, fptr);
+    if (fflush(f) == EOF) rb_sys_fail(0);
 
     return io;
 }
@@ -478,74 +251,60 @@ rb_io_tell(io)
      VALUE io;
 {
     OpenFile *fptr;
-    off_t pos;
+    long pos;
 
     GetOpenFile(io, fptr);
-    pos = io_tell(fptr);
-    if (pos < 0) rb_sys_fail(fptr->path);
-    return OFFT2NUM(pos);
+    pos = ftell(fptr->f);
+    if (ferror(fptr->f)) rb_sys_fail(fptr->path);
+
+    return rb_int2inum(pos);
 }
 
 static VALUE
-rb_io_seek(io, offset, whence)
-    VALUE io, offset;
-    int whence;
+rb_io_seek(io, offset, ptrname)
+     VALUE io, offset, ptrname;
 {
     OpenFile *fptr;
-    off_t pos;
+    long pos;
 
     GetOpenFile(io, fptr);
-    pos = io_seek(fptr, NUM2OFFT(offset), whence);
-    if (pos < 0) rb_sys_fail(fptr->path);
+    pos = fseek(fptr->f, NUM2INT(offset), NUM2INT(ptrname));
+    if (pos != 0) rb_sys_fail(fptr->path);
     clearerr(fptr->f);
 
     return INT2FIX(0);
 }
 
-static VALUE
-rb_io_seek_m(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-    VALUE offset, ptrname;
-    int whence = SEEK_SET;
-
-    if (rb_scan_args(argc, argv, "11", &offset, &ptrname) == 2) {
-	whence = NUM2INT(ptrname);
-    }
-
-    return rb_io_seek(io, offset, whence);
-}
+#ifndef SEEK_CUR
+# define SEEK_SET 0
+# define SEEK_CUR 1
+# define SEEK_END 2
+#endif
 
 static VALUE
 rb_io_set_pos(io, offset)
      VALUE io, offset;
 {
     OpenFile *fptr;
-    off_t pos;
+    long pos;
 
     GetOpenFile(io, fptr);
-    pos = io_seek(fptr, NUM2OFFT(offset), SEEK_SET);
+    pos = fseek(fptr->f, NUM2INT(offset), SEEK_SET);
     if (pos != 0) rb_sys_fail(fptr->path);
     clearerr(fptr->f);
 
-    return OFFT2NUM(pos);
+    return INT2NUM(pos);
 }
 
 static VALUE
 rb_io_rewind(io)
-    VALUE io;
+     VALUE io;
 {
     OpenFile *fptr;
 
     GetOpenFile(io, fptr);
-    if (io_seek(fptr, 0L, 0) != 0) rb_sys_fail(fptr->path);
+    if (fseek(fptr->f, 0L, 0) != 0) rb_sys_fail(fptr->path);
     clearerr(fptr->f);
-    if (io == current_file) {
-	gets_lineno -= fptr->lineno;
-    }
-    fptr->lineno = 0;
 
     return INT2FIX(0);
 }
@@ -601,28 +360,6 @@ rb_io_set_sync(io, mode)
 }
 
 static VALUE
-rb_io_fsync(io)
-    VALUE io;
-{
-#ifdef HAVE_FSYNC
-    OpenFile *fptr;
-    FILE *f;
-
-    GetOpenFile(io, fptr);
-    rb_io_check_writable(fptr);
-    f = GetWriteFile(fptr);
-
-    io_fflush(f, fptr);
-    if (fsync(fileno(f)) < 0)
-	rb_sys_fail(fptr->path);
-    return INT2FIX(0);
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
-}
-
-static VALUE
 rb_io_fileno(io)
     VALUE io;
 {
@@ -635,33 +372,6 @@ rb_io_fileno(io)
 }
 
 static VALUE
-rb_io_pid(io)
-    VALUE io;
-{
-    OpenFile *fptr;
-
-    GetOpenFile(io, fptr);
-    if (!fptr->pid)
-	return Qnil;
-    return INT2FIX(fptr->pid);
-}
-
-static VALUE
-rb_io_inspect(obj)
-    VALUE obj;
-{
-    OpenFile *fptr;
-    char *buf, *cname;
-
-    fptr = RFILE(rb_io_taint_check(obj))->fptr;
-    if (!fptr || !(fptr->f || fptr->f2) || !fptr->path) return rb_any_to_s(obj);
-    cname = rb_obj_classname(obj);
-    buf = ALLOCA_N(char, strlen(cname) + strlen(fptr->path) + 5);
-    sprintf(buf, "#<%s:%s>", cname, fptr->path);
-    return rb_str_new2(buf);
-}
-
-static VALUE
 rb_io_to_io(io)
     VALUE io;
 {
@@ -669,70 +379,6 @@ rb_io_to_io(io)
 }
 
 /* reading functions */
-long
-rb_io_fread(ptr, len, f)
-    char *ptr;
-    long len;
-    FILE *f;
-{
-    long n = len;
-    int c;
-
-    while (n > 0) {
-#ifdef READ_DATA_PENDING_COUNT
-	long i = READ_DATA_PENDING_COUNT(f);
-	if (i <= 0) {
-	    rb_thread_wait_fd(fileno(f));
-	    i = READ_DATA_PENDING_COUNT(f);
-	}
-	if (i > 0) {
-	    if (i > n) i = n;
-	    TRAP_BEG;
-	    c = fread(ptr, 1, i, f);
-	    TRAP_END;
-	    if (c < 0) goto eof;
-	    ptr += c;
-	    n -= c;
-	    if (c < i) goto eof;
-	    continue;
-	}
-#else
-	if (!READ_DATA_PENDING(f)) {
-	    rb_thread_wait_fd(fileno(f));
-	}
-#endif
-	TRAP_BEG;
-	c = getc(f);
-	TRAP_END;
-	if (c == EOF) {
-	  eof:
-	    if (ferror(f)) {
-		switch (errno) {
-		  case EINTR:
-#if defined(ERESTART)
-		  case ERESTART:
-#endif
-		    clearerr(f);
-		    continue;
-		  case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-		  case EWOULDBLOCK:
-#endif
-		    if (len - n >= 0) {
-			clearerr(f);
-			return len - n;
-		    }
-		}
-		return 0;
-	    }
-	    *ptr = '\0';
-	    break;
-	}
-	*ptr++ = c;
-	n--;
-    }
-    return len - n;
-}
 
 #ifndef S_ISREG
 #   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
@@ -740,58 +386,46 @@ rb_io_fread(ptr, len, f)
 
 #define SMALLBUF 100
 
-static long
-remain_size(fptr)
-    OpenFile *fptr;
+static VALUE
+read_all(port)
+    VALUE port;
 {
+    OpenFile *fptr;
+    VALUE str = Qnil;
     struct stat st;
-    off_t siz = BUFSIZ;
-    off_t pos;
+    long siz = BUFSIZ;
+    long bytes = 0;
+    int n;
 
-    if (feof(fptr->f)) return 0;
+    GetOpenFile(port, fptr);
+    rb_io_check_readable(fptr);
+
+    if (feof(fptr->f)) return Qnil;
     if (fstat(fileno(fptr->f), &st) == 0  && S_ISREG(st.st_mode)
 #ifdef __BEOS__
 	&& (st.st_dev > 3)
 #endif
 	)
     {
-	pos = io_tell(fptr);
-	if (st.st_size > pos && pos >= 0) {
-	    siz = st.st_size - pos + 1;
-	    if (siz > LONG_MAX) {
-		rb_raise(rb_eIOError, "file too big for single read");
+	if (st.st_size == 0) {
+	    getc(fptr->f);	/* force EOF */
+	    return rb_str_new(0, 0);
+	}
+	else {
+	    long pos = ftell(fptr->f);
+	    if (st.st_size > pos && pos >= 0) {
+		siz = st.st_size - pos + 1;
 	    }
 	}
     }
-    return (long)siz;
-}
-
-static VALUE
-read_all(fptr, siz, str)
-    OpenFile *fptr;
-    long siz;
-    VALUE str;
-{
-    long bytes = 0;
-    long n;
-    off_t pos = 0;
-
-    if (feof(fptr->f)) return Qnil;
-    READ_CHECK(fptr->f);
-    if (!siz) siz = BUFSIZ;
-    if (NIL_P(str)) {
-	str = rb_tainted_str_new(0, siz);
-    }
-    else {
-	rb_str_resize(str, siz);
-    }
-    pos = io_tell(fptr);
+    str = rb_str_new(0, siz);
     for (;;) {
-	n = rb_io_fread(RSTRING(str)->ptr+bytes, siz-bytes, fptr->f);
-	if (pos > 0 && n == 0 && bytes == 0) {
-	    rb_str_resize(str,0);
+	READ_CHECK(fptr->f);
+	TRAP_BEG;
+	n = fread(RSTRING(str)->ptr+bytes, 1, siz-bytes, fptr->f);
+	TRAP_END;
+	if (n == 0) {
 	    if (feof(fptr->f)) return Qnil;
-	    if (!ferror(fptr->f)) return str;
 	    rb_sys_fail(fptr->path);
 	}
 	bytes += n;
@@ -801,6 +435,7 @@ read_all(fptr, siz, str)
     }
     if (bytes == 0) return rb_str_new(0,0);
     if (bytes != siz) rb_str_resize(str, bytes);
+    OBJ_TAINT(str);
 
     return str;
 }
@@ -812,39 +447,28 @@ io_read(argc, argv, io)
     VALUE io;
 {
     OpenFile *fptr;
-    long n, len;
+    int n, len;
     VALUE length, str;
 
-    rb_scan_args(argc, argv, "02", &length, &str);
-
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
+    rb_scan_args(argc, argv, "01", &length);
     if (NIL_P(length)) {
-	return read_all(fptr, remain_size(fptr), str);
+	return read_all(io);
     }
 
-    len = NUM2LONG(length);
-    if (len < 0) {
-	rb_raise(rb_eArgError, "negative length %ld given", len);
-    }
+    len = NUM2INT(length);
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
 
     if (feof(fptr->f)) return Qnil;
-    if (NIL_P(str)) {
-	str = rb_str_new(0, len);
-    }
-    else {
-	StringValue(str);
-	rb_str_modify(str);
-	rb_str_resize(str,len);
-    }
-    if (len == 0) return str;
+    str = rb_str_new(0, len);
 
     READ_CHECK(fptr->f);
-    n = rb_io_fread(RSTRING(str)->ptr, len, fptr->f);
+    TRAP_BEG;
+    n = fread(RSTRING(str)->ptr, 1, len, fptr->f);
+    TRAP_END;
     if (n == 0) {
-	rb_str_resize(str,0);
 	if (feof(fptr->f)) return Qnil;
-	if (len > 0) rb_sys_fail(fptr->path);
+	rb_sys_fail(fptr->path);
     }
     RSTRING(str)->len = n;
     RSTRING(str)->ptr[n] = '\0';
@@ -853,149 +477,135 @@ io_read(argc, argv, io)
     return str;
 }
 
-static int
-appendline(fptr, delim, strp)
-    OpenFile *fptr;
-    int delim;
-    VALUE *strp;
+static VALUE
+rb_io_gets_internal(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
-    FILE *f = fptr->f;
-    VALUE str = *strp;
-    int c = EOF;
-#ifndef READ_DATA_PENDING_PTR
-    char buf[8192];
-    char *bp = buf, *bpe = buf + sizeof buf - 3;
-    int cnt;
-#endif
+    OpenFile *fptr;
+    FILE *f;
+    VALUE str = Qnil;
+    int c, newline;
+    char *rsptr;
+    int rslen, rspara = 0;
+    VALUE rs;
 
-    do {
-#ifdef READ_DATA_PENDING_PTR
-	long pending = READ_DATA_PENDING_COUNT(f);
-	if (pending > 0) {
-	    const char *p = READ_DATA_PENDING_PTR(f);
-	    const char *e = memchr(p, delim, pending);
-	    long last = 0, len = (c != EOF);
-	    if (e) pending = e - p + 1;
-	    len += pending;
-	    if (!NIL_P(str)) {
-		last = RSTRING(str)->len;
-		rb_str_resize(str, last + len);
-	    }
-	    else {
-		*strp = str = rb_str_buf_new(len);
-		RSTRING(str)->len = len;
-		RSTRING(str)->ptr[len] = '\0';
-	    }
-	    if (c != EOF) {
-		RSTRING(str)->ptr[last++] = c;
-	    }
-	    fread(RSTRING(str)->ptr + last, 1, pending, f); /* must not fail */
-	    if (e) return delim;
+    if (argc == 0) {
+	rs = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &rs);
+	if (!NIL_P(rs)) Check_Type(rs, T_STRING);
+    }
+
+    if (NIL_P(rs)) {
+	rsptr = 0;
+	rslen = 0;
+    }
+    else {
+	rslen = RSTRING(rs)->len;
+	if (rslen == 0) {
+	    rsptr = "\n\n";
+	    rslen = 2;
+	    rspara = 1;
 	}
-	else if (c != EOF) {
-	    if (!NIL_P(str)) {
-		char ch = c;
-		rb_str_buf_cat(str, &ch, 1);
-	    }
-	    else {
-		*strp = str = rb_str_buf_new(1);
-		RSTRING(str)->ptr[RSTRING(str)->len++] = c;
-	    }
+	else if (rslen == 1 && RSTRING(rs)->ptr[0] == '\n') {
+	    return rb_io_gets(io);
 	}
-	rb_thread_wait_fd(fileno(f));
-	rb_io_check_closed(fptr);
-#else
-	READ_CHECK(f);
-#endif
-	TRAP_BEG;
-	c = getc(f);
-	TRAP_END;
-	if (c == EOF) {
-	    if (ferror(f)) {
-		clearerr(f);
-		if (!rb_io_wait_readable(fileno(f)))
-		    rb_sys_fail(fptr->path);
-		continue;
-	    }
-	    return c;
+	else {
+	    rsptr = RSTRING(rs)->ptr;
 	}
-#ifndef READ_DATA_PENDING_PTR
-	if ((*bp++ = c) == delim || bp == bpe) {
-	    cnt = bp - buf;
+    }
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    f = fptr->f;
 
-	    if (cnt > 0) {
-		if (!NIL_P(str))
-		    rb_str_cat(str, buf, cnt);
-		else
-		    *strp = str = rb_str_new(buf, cnt);
+    if (rspara) {
+	do {
+	    READ_CHECK(f);
+	    TRAP_BEG;
+	    c = getc(f);
+	    TRAP_END;
+	    if (c != '\n') {
+		ungetc(c,f);
+		break;
 	    }
-	    bp = buf;
-	}
-#endif
-    } while (c != delim);
+	} while (c != EOF);
+    }
 
-#ifdef READ_DATA_PENDING_PTR
+    newline = rslen ? rsptr[rslen - 1] : 0777;
     {
-	char ch = c;
-	if (!NIL_P(str)) {
-	    rb_str_cat(str, &ch, 1);
+	char buf[8192];
+	char *bp, *bpe = buf + sizeof buf - 3;
+	int cnt;
+	int append = 0;
+
+      again:
+	bp = buf;
+
+	if (rslen) {
+	    for (;;) {
+		READ_CHECK(f);
+		TRAP_BEG;
+		c = getc(f);
+		TRAP_END;
+		if (c == EOF) {
+		    if (ferror(f) && errno == EINTR) continue;
+		    break;
+		}
+		if ((*bp++ = c) == newline) break;
+		if (bp == bpe) break;
+	    }
+	    cnt = bp - buf;
 	}
 	else {
-	    *strp = str = rb_str_new(&ch, 1);
+	    READ_CHECK(f);
+	    TRAP_BEG;
+	    cnt = fread(buf, 1, sizeof(buf), f);
+	    TRAP_END;
+	    if (cnt == 0) {
+		if (ferror(f)) rb_sys_fail(fptr->path);
+		c = EOF;
+	    }
+	    else {
+		c = 0;
+	    }
 	}
-    }
-#endif
 
-    return c;
-}
+	if (c == EOF && !append && cnt == 0) {
+	    str = Qnil;
+	    goto return_gets;
+	}
 
-static inline int
-swallow(fptr, term)
-    OpenFile *fptr;
-    int term;
-{
-    FILE *f = fptr->f;
-    int c;
+	if (append)
+	    rb_str_cat(str, buf, cnt);
+	else
+	    str = rb_str_new(buf, cnt);
 
-    do {
-#ifdef READ_DATA_PENDING_PTR
-	long cnt;
-	while ((cnt = READ_DATA_PENDING_COUNT(f)) > 0) {
-	    char buf[1024];
-	    const char *p = READ_DATA_PENDING_PTR(f);
-	    int i;
-	    if (cnt > sizeof buf) cnt = sizeof buf;
-	    if (*p != term) return Qtrue;
-	    i = cnt;
-	    while (--i && *++p == term);
-	    if (!fread(buf, 1, cnt - i, f)) /* must not fail */
-		rb_sys_fail(fptr->path);
-	}
-	rb_thread_wait_fd(fileno(f));
-	rb_io_check_closed(fptr);
-#else
-	READ_CHECK(f);
-#endif
-	TRAP_BEG;
-	c = getc(f);
-	TRAP_END;
-	if (c != term) {
-	    ungetc(c, f);
-	    return Qtrue;
+	if (c != EOF &&
+	    (!rslen ||
+	     RSTRING(str)->len < rslen ||
+	     memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen))) {
+	    append = 1;
+	    goto again;
 	}
-    } while (c != EOF);
-    return Qfalse;
-}
-
-static VALUE
-rb_io_getline_fast(fptr, delim)
-    OpenFile *fptr;
-    int delim;
-{
-    VALUE str = Qnil;
-    int c;
+    }
 
-    while ((c = appendline(fptr, delim, &str)) != EOF && c != delim);
+  return_gets:
+    if (rspara) {
+	while (c != EOF) {
+	    READ_CHECK(f);
+	    TRAP_BEG;
+	    c = getc(f);
+	    TRAP_END;
+	    if (c != '\n') {
+		ungetc(c, f);
+		break;
+	    }
+	}
+    }
 
     if (!NIL_P(str)) {
 	fptr->lineno++;
@@ -1006,53 +616,55 @@ rb_io_getline_fast(fptr, delim)
     return str;
 }
 
-static VALUE
-rb_io_getline(rs, fptr)
-    VALUE rs;
-    OpenFile *fptr;
+VALUE
+rb_io_gets(io)
+    VALUE io;
 {
+    OpenFile *fptr;
+    FILE *f;
     VALUE str = Qnil;
+    int c;
+    char buf[8192];
+    char *bp, *bpe = buf + sizeof buf - 3;
+    int cnt;
+    int append = 0;
 
+    GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    if (NIL_P(rs)) {
-	str = read_all(fptr, 0, Qnil);
-    }
-    else if (rs == rb_default_rs) {
-	return rb_io_getline_fast(fptr, '\n');
-    }
-    else {
-	int c, newline;
-	char *rsptr;
-	long rslen;
-	int rspara = 0;
+    f = fptr->f;
 
-	StringValue(rs);
-	rslen = RSTRING(rs)->len;
-	if (rslen == 0) {
-	    rsptr = "\n\n";
-	    rslen = 2;
-	    rspara = 1;
-	    swallow(fptr, '\n');
-	}
-	else if (rslen == 1) {
-	    return rb_io_getline_fast(fptr, RSTRING(rs)->ptr[0]);
-	}
-	else {
-	    rsptr = RSTRING(rs)->ptr;
+  again:
+    bp = buf;
+    for (;;) {
+	READ_CHECK(f);
+	TRAP_BEG;
+	c = getc(f);
+	TRAP_END;
+	if (c == EOF) {
+	    if (ferror(f) && errno == EINTR) continue;
+	    break;
 	}
-	newline = rsptr[rslen - 1];
+	if ((*bp++ = c) == '\n') break;
+	if (bp == bpe) break;
+    }
+    cnt = bp - buf;
 
-	while ((c = appendline(fptr, newline, &str)) != EOF &&
-	       (c != newline || RSTRING(str)->len < rslen ||
-		memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen)));
+    if (c == EOF && !append && cnt == 0) {
+	str = Qnil;
+	goto return_gets;
+    }
 
-	if (rspara) {
-	    if (c != EOF) {
-		swallow(fptr, '\n');
-	    }
-	}
+    if (append)
+	rb_str_cat(str, buf, cnt);
+    else
+	str = rb_str_new(buf, cnt);
+
+    if (c != EOF && RSTRING(str)->ptr[RSTRING(str)->len-1] != '\n') {
+	append = 1;
+	goto again;
     }
 
+  return_gets:
     if (!NIL_P(str)) {
 	fptr->lineno++;
 	lineno = INT2FIX(fptr->lineno);
@@ -1062,34 +674,13 @@ rb_io_getline(rs, fptr)
     return str;
 }
 
-VALUE
-rb_io_gets(io)
-    VALUE io;
-{
-    OpenFile *fptr;
-
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    return rb_io_getline_fast(fptr, '\n');
-}
-
 static VALUE
-rb_io_gets_m(argc, argv, io)
+rb_io_gets_method(argc, argv, io)
     int argc;
     VALUE *argv;
     VALUE io;
 {
-    VALUE rs, str;
-    OpenFile *fptr;
-
-    if (argc == 0) {
-	rs = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &rs);
-    }
-    GetOpenFile(io, fptr);
-    str = rb_io_getline(rs, fptr);
+    VALUE str = rb_io_gets_internal(argc, argv, io);
 
     if (!NIL_P(str)) {
 	rb_lastline_set(str);
@@ -1116,8 +707,7 @@ rb_io_set_lineno(io, lineno)
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    fptr->lineno = NUM2INT(lineno);
-    return lineno;
+    return fptr->lineno = NUM2INT(lineno);
 }
 
 static void
@@ -1151,7 +741,7 @@ rb_io_readline(argc, argv, io)
     VALUE *argv;
     VALUE io;
 {
-    VALUE line = rb_io_gets_m(argc, argv, io);
+    VALUE line = rb_io_gets_method(argc, argv, io);
 
     if (NIL_P(line)) {
 	rb_eof_error();
@@ -1166,18 +756,9 @@ rb_io_readlines(argc, argv, io)
     VALUE io;
 {
     VALUE line, ary;
-    VALUE rs;
-    OpenFile *fptr;
 
-    if (argc == 0) {
-	rs = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &rs);
-    }
-    GetOpenFile(io, fptr);
     ary = rb_ary_new();
-    while (!NIL_P(line = rb_io_getline(rs, fptr))) {
+    while (!NIL_P(line = rb_io_gets_internal(argc, argv, io))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -1190,17 +771,8 @@ rb_io_each_line(argc, argv, io)
     VALUE io;
 {
     VALUE str;
-    OpenFile *fptr;
-    VALUE rs;
 
-    if (argc == 0) {
-	rs = rb_rs;
-    }
-    else {
-	rb_scan_args(argc, argv, "1", &rs);
-    }
-    GetOpenFile(io, fptr);
-    while (!NIL_P(str = rb_io_getline(rs, fptr))) {
+    while (!NIL_P(str = rb_io_gets_internal(argc, argv, io))) {
 	rb_yield(str);
     }
     return io;
@@ -1215,27 +787,19 @@ rb_io_each_byte(io)
     int c;
 
     GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    f = fptr->f;
 
     for (;;) {
-	rb_io_check_readable(fptr);
-	f = fptr->f;
 	READ_CHECK(f);
 	TRAP_BEG;
 	c = getc(f);
 	TRAP_END;
-	if (c == EOF) {
-	    if (ferror(f)) {
-		clearerr(f);
-		if (!rb_io_wait_readable(fileno(f)))
-		    rb_sys_fail(fptr->path);
-		continue;
-	    }
-	    break;
-	}
+	if (c == EOF) break;
 	rb_yield(INT2FIX(c & 0xff));
     }
     if (ferror(f)) rb_sys_fail(fptr->path);
-    return io;
+    return Qnil;
 }
 
 VALUE
@@ -1250,19 +814,13 @@ rb_io_getc(io)
     rb_io_check_readable(fptr);
     f = fptr->f;
 
-  retry:
     READ_CHECK(f);
     TRAP_BEG;
     c = getc(f);
     TRAP_END;
 
     if (c == EOF) {
-	if (ferror(f)) {
-	    clearerr(f);
-	    if (!rb_io_wait_readable(fileno(f)))
-		rb_sys_fail(fptr->path);
-	    goto retry;
-	}
+	if (ferror(f)) rb_sys_fail(fptr->path);
 	return Qnil;
     }
     return INT2FIX(c & 0xff);
@@ -1301,12 +859,12 @@ rb_io_ungetc(io, c)
     VALUE io, c;
 {
     OpenFile *fptr;
-    int cc = NUM2INT(c);
 
+    Check_Type(c, T_FIXNUM);
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
 
-    if (ungetc(cc, fptr->f) == EOF && cc != EOF)
+    if (ungetc(FIX2INT(c), fptr->f) == EOF)
 	rb_sys_fail(fptr->path);
     return Qnil;
 }
@@ -1324,66 +882,49 @@ rb_io_isatty(io)
 }
 
 static void
-fptr_finalize(fptr, noraise)
+fptr_finalize(fptr)
     OpenFile *fptr;
-    int noraise;
 {
-    int n1 = 0, n2 = 0, e = 0, f1, f2 = -1;
-
-    if (fptr->f2) {
-	f2 = fileno(fptr->f2);
-	while ((n2 = fclose(fptr->f2)) < 0) {
-	    if (!rb_io_wait_writable(f2)) {
-		e = errno;
-		break;
-	    }
-	    if (!fptr->f2) break;
-	}
-	fptr->f2 = 0;
-    }
-    if (fptr->f) {
-	f1 = fileno(fptr->f);
-	while ((n1 = fclose(fptr->f)) < 0) {
-	    if (f2 != -1 || !(fptr->mode & FMODE_WBUF)) break;
-	    if (!rb_io_wait_writable(f1)) break;
-	    if (!fptr->f) break;
-	}
-	fptr->f = 0;
-	if (n1 < 0 && errno == EBADF && f1 == f2) {
-	    n1 = 0;
-	}
+    if (fptr->f != NULL) {
+	fclose(fptr->f);
     }
-    if (!noraise && (n1 < 0 || n2 < 0)) {
-	if (n1 == 0) errno = e;
-	rb_sys_fail(fptr->path);
+    if (fptr->f2 != NULL) {
+	fclose(fptr->f2);
     }
 }
 
 static void
-rb_io_fptr_cleanup(fptr, noraise)
+rb_io_fptr_close(fptr)
     OpenFile *fptr;
-    int noraise;
 {
+    int fd;
+
+    if (fptr->f == NULL && fptr->f2 == NULL) return;
+
+    fd = fileno(fptr->f);
     if (fptr->finalize) {
-	(*fptr->finalize)(fptr, noraise);
+	(*fptr->finalize)(fptr);
     }
     else {
-	fptr_finalize(fptr, noraise);
+	fptr_finalize(fptr);
+	if (fptr->pid) {
+	    rb_syswait(fptr->pid);
+	    fptr->pid = 0;
+	}
     }
+    fptr->f = fptr->f2 = NULL;
+    rb_thread_fd_close(fd);
 }
 
 void
 rb_io_fptr_finalize(fptr)
     OpenFile *fptr;
 {
-    if (!fptr) return;
+    rb_io_fptr_close(fptr);
     if (fptr->path) {
 	free(fptr->path);
+	fptr->path = NULL;
     }
-    if (!fptr->f && !fptr->f2) return;
-    if (fileno(fptr->f) < 3) return;
-
-    rb_io_fptr_cleanup(fptr, Qtrue);
 }
 
 VALUE
@@ -1391,51 +932,23 @@ rb_io_close(io)
     VALUE io;
 {
     OpenFile *fptr;
-    int fd, fd2;
 
-    fptr = RFILE(io)->fptr;
-    if (!fptr) return Qnil;
-    if (fptr->f2) {
-	fd2 = fileno(fptr->f2);
-    }
-    else {
-	if (!fptr->f) return Qnil;
-	fd2 = -1;
-    }
-
-    fd = fileno(fptr->f);
-    rb_io_fptr_cleanup(fptr, Qfalse);
-    rb_thread_fd_close(fd);
-    if (fd2 >= 0) rb_thread_fd_close(fd2);
-
-    if (fptr->pid) {
-	rb_syswait(fptr->pid);
-	fptr->pid = 0;
-    }
+    GetOpenFile(io, fptr);
+    rb_io_fptr_close(fptr);
 
     return Qnil;
 }
 
 static VALUE
-rb_io_close_m(io)
+rb_io_close_method(io)
     VALUE io;
 {
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close");
-    }
-    rb_io_check_closed(RFILE(io)->fptr);
+    rb_secure(4);
     rb_io_close(io);
     return Qnil;
 }
 
 static VALUE
-io_close(io)
-    VALUE io;
-{
-    return rb_funcall(io, rb_intern("close"), 0, 0);
-}
-
-static VALUE
 rb_io_closed(io)
     VALUE io;
 {
@@ -1445,16 +958,14 @@ rb_io_closed(io)
     return (fptr->f || fptr->f2)?Qfalse:Qtrue;
 }
 
-static VALUE
+VALUE
 rb_io_close_read(io)
     VALUE io;
 {
     OpenFile *fptr;
     int n;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close");
-    }
+    rb_secure(4);
     GetOpenFile(io, fptr);
     if (fptr->f2 == 0 && (fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
@@ -1478,9 +989,7 @@ rb_io_close_write(io)
     OpenFile *fptr;
     int n;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close");
-    }
+    rb_secure(4);
     GetOpenFile(io, fptr);
     if (fptr->f2 == 0 && (fptr->mode & FMODE_READABLE)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
@@ -1497,41 +1006,12 @@ rb_io_close_write(io)
 }
 
 static VALUE
-rb_io_sysseek(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-    VALUE offset, ptrname;
-    int whence = SEEK_SET;
-    OpenFile *fptr;
-    off_t pos;
-
-    if (rb_scan_args(argc, argv, "11", &offset, &ptrname) == 2) {
-	whence = NUM2INT(ptrname);
-    }
-
-    GetOpenFile(io, fptr);
-    if ((fptr->mode & FMODE_READABLE) && READ_DATA_BUFFERED(fptr->f)) {
-	rb_raise(rb_eIOError, "sysseek for buffered IO");
-    }
-    if ((fptr->mode & FMODE_WRITABLE) && (fptr->mode & FMODE_WBUF)) {
-	rb_warn("sysseek for buffered IO");
-    }
-    pos = lseek(fileno(fptr->f), NUM2OFFT(offset), whence);
-    if (pos == -1) rb_sys_fail(fptr->path);
-    clearerr(fptr->f);
-
-    return OFFT2NUM(pos);
-}
-
-static VALUE
 rb_io_syswrite(io, str)
     VALUE io, str;
 {
     OpenFile *fptr;
     FILE *f;
-    long n;
+    int n;
 
     rb_secure(4);
     if (TYPE(str) != T_STRING)
@@ -1541,9 +1021,6 @@ rb_io_syswrite(io, str)
     rb_io_check_writable(fptr);
     f = GetWriteFile(fptr);
 
-    if (fptr->mode & FMODE_WBUF) {
-	rb_warn("syswrite for buffered IO");
-    }
     if (!rb_thread_fd_writable(fileno(f))) {
         rb_io_check_closed(fptr);
     }
@@ -1551,49 +1028,30 @@ rb_io_syswrite(io, str)
 
     if (n == -1) rb_sys_fail(fptr->path);
 
-    return LONG2FIX(n);
+    return INT2FIX(n);
 }
 
 static VALUE
-rb_io_sysread(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
+rb_io_sysread(io, len)
+    VALUE io, len;
 {
-    VALUE len, str;
     OpenFile *fptr;
-    long n, ilen;
+    int n, ilen;
+    VALUE str;
 
-    rb_scan_args(argc, argv, "11", &len, &str);
-    ilen = NUM2LONG(len);
+    ilen = NUM2INT(len);
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
 
-    if (READ_DATA_BUFFERED(fptr->f)) {
-	rb_raise(rb_eIOError, "sysread for buffered IO");
-    }
-    if (NIL_P(str)) {
-	str = rb_str_new(0, ilen);
-    }
-    else {
-	StringValue(str);
-	rb_str_modify(str);
-	rb_str_resize(str, ilen);
-    }
-    if (ilen == 0) return str;
+    str = rb_str_new(0, ilen);
 
-    n = fileno(fptr->f);
     rb_thread_wait_fd(fileno(fptr->f));
     TRAP_BEG;
     n = read(fileno(fptr->f), RSTRING(str)->ptr, RSTRING(str)->len);
     TRAP_END;
 
-    if (n == -1) {
-	rb_str_resize(str, 0);
-	rb_sys_fail(fptr->path);
-    }
+    if (n == -1) rb_sys_fail(fptr->path);
     if (n == 0 && ilen > 0) {
-	rb_str_resize(str, 0);
 	rb_eof_error();
     }
 
@@ -1608,7 +1066,8 @@ VALUE
 rb_io_binmode(io)
     VALUE io;
 {
-#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
+#if defined(NT) || defined(DJGPP) || defined(__CYGWIN32__)\
+    || defined(__human68k__) || defined(USE_CWGUSI) || defined(__EMX__)
     OpenFile *fptr;
 
     GetOpenFile(io, fptr);
@@ -1618,10 +1077,17 @@ rb_io_binmode(io)
     if (fptr->f2)
 	fmode(fptr->f2, _IOBIN);
 #else
+# ifndef USE_CWGUSI
     if (fptr->f && setmode(fileno(fptr->f), O_BINARY) == -1)
 	rb_sys_fail(fptr->path);
     if (fptr->f2 && setmode(fileno(fptr->f2), O_BINARY) == -1)
 	rb_sys_fail(fptr->path);
+# else  /* USE_CWGUSI */
+	if (fptr->f)
+		fptr->f->mode.binary_io = 1;
+	if (fptr->f2)
+		fptr->f2->mode.binary_io = 1;
+# endif /* USE_CWGUSI */
 #endif
 
     fptr->mode |= FMODE_BINMODE;
@@ -1629,47 +1095,13 @@ rb_io_binmode(io)
     return io;
 }
 
-char*
-rb_io_flags_mode(flags, mode)
-    int flags;
-    char *mode;
-{
-    char *p = mode;
-
-    switch (flags & FMODE_READWRITE) {
-      case FMODE_READABLE:
-	*p++ = 'r';
-	break;
-      case FMODE_WRITABLE:
-	*p++ = 'w';
-	break;
-      case FMODE_READWRITE:
-	*p++ = 'r';
-	*p++ = '+';
-	break;
-    }
-    *p++ = '\0';
-#ifdef O_BINARY
-    if (flags & FMODE_BINMODE) {
-	if (mode[1] == '+') {
-	    mode[1] = 'b'; mode[2] = '+'; mode[3] = '\0';
-	}
-	else {
-	    mode[1] = 'b'; mode[2] = '\0';
-	}
-    }
-#endif
-    return mode;
-}
-
 int
 rb_io_mode_flags(mode)
     const char *mode;
 {
     int flags = 0;
-    const char *m = mode;
 
-    switch (*m++) {
+    switch (mode[0]) {
       case 'r':
 	flags |= FMODE_READABLE;
 	break;
@@ -1684,30 +1116,28 @@ rb_io_mode_flags(mode)
 	rb_raise(rb_eArgError, "illegal access mode %s", mode);
     }
 
-    while (*m) {
-        switch (*m++) {
-        case 'b':
-            flags |= FMODE_BINMODE;
-            break;
-        case '+':
-            flags |= FMODE_READWRITE;
-            break;
-        default:
-            goto error;
-        }
+    if (mode[1] == 'b') {
+	flags |= FMODE_BINMODE;
+	mode++;
+    }
+
+    if (mode[1] == '+') {
+	flags |= FMODE_READWRITE;
+	if (mode[2] != 0) goto error;
     }
+    else if (mode[1] != 0) goto error;
 
     return flags;
 }
 
 static int
-rb_io_modenum_flags(mode)
+rb_io_mode_flags2(mode)
     int mode;
 {
-    int flags = 0;
+    int flags;
 
     switch (mode & (O_RDONLY|O_WRONLY|O_RDWR)) {
-      case O_RDONLY:
+      case O_RDONLY:	
 	flags = FMODE_READABLE;
 	break;
       case O_WRONLY:
@@ -1727,62 +1157,22 @@ rb_io_modenum_flags(mode)
     return flags;
 }
 
-static int
-rb_io_mode_modenum(mode)
-    const char *mode;
-{
-    int flags = 0;
-    const char *m = mode;
-
-    switch (*m++) {
-      case 'r':
-	flags |= O_RDONLY;
-	break;
-      case 'w':
-	flags |= O_WRONLY | O_CREAT | O_TRUNC;
-	break;
-      case 'a':
-	flags |= O_WRONLY | O_CREAT | O_APPEND;
-	break;
-      default:
-      error:
-	rb_raise(rb_eArgError, "illegal access mode %s", mode);
-    }
-
-    while (*m) {
-        switch (*m++) {
-        case 'b':
-#ifdef O_BINARY
-            flags |= O_BINARY;
-#endif
-            break;
-        case '+':
-            flags |= O_RDWR;
-            break;
-        default:
-            goto error;
-        }
-    }
-
-    return flags;
-}
-
 static char*
-rb_io_modenum_mode(flags, mode)
+rb_io_flags_mode(flags)
     int flags;
-    char *mode;
 {
+    static char mode[4];
     char *p = mode;
 
     switch (flags & (O_RDONLY|O_WRONLY|O_RDWR)) {
-      case O_RDONLY:
+      case O_RDONLY:	
 	*p++ = 'r';
 	break;
       case O_WRONLY:
 	*p++ = 'w';
 	break;
       case O_RDWR:
-	*p++ = 'r';
+	*p++ = 'w';
 	*p++ = '+';
 	break;
     }
@@ -1801,18 +1191,18 @@ rb_io_modenum_mode(flags, mode)
 }
 
 static int
-rb_sysopen(fname, flags, mode)
+rb_open(fname, flag, mode)
     char *fname;
-    int flags;
+    int flag;
     unsigned int mode;
 {
     int fd;
 
-    fd = open(fname, flags, mode);
+    fd = open(fname, flag, mode);
     if (fd < 0) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
-	    fd = open(fname, flags, mode);
+	    fd = open(fname, flag, mode);
 	}
 	if (fd < 0) {
 	    rb_sys_fail(fname);
@@ -1829,22 +1219,15 @@ rb_fopen(fname, mode)
     FILE *file;
 
     file = fopen(fname, mode);
-    if (!file) {
+    if (file == NULL) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
 	    file = fopen(fname, mode);
 	}
-	if (!file) {
+	if (file == NULL) {
 	    rb_sys_fail(fname);
 	}
     }
-#ifdef USE_SETVBUF
-    if (setvbuf(file, NULL, _IOFBF, 0) != 0)
-	rb_warn("setvbuf() can't be honered for %s", fname);
-#endif
-#ifdef __human68k__
-    fmode(file, _IOTEXT);
-#endif
     return file;
 }
 
@@ -1856,69 +1239,69 @@ rb_fdopen(fd, mode)
     FILE *file;
 
     file = fdopen(fd, mode);
-    if (!file) {
+    if (file == NULL) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
 	    file = fdopen(fd, mode);
 	}
-	if (!file) {
-#ifdef _WIN32
-	    if (errno == 0) errno = EINVAL;
-#endif
+	if (file == NULL) {
 	    rb_sys_fail(0);
 	}
     }
-
-#ifdef USE_SETVBUF
-    if (setvbuf(file, NULL, _IOFBF, 0) != 0)
-	rb_warn("setvbuf() can't be honered (fd=%d)", fd);
-#endif
     return file;
 }
 
 static VALUE
-rb_file_open_internal(io, fname, mode)
-    VALUE io;
+rb_file_open_internal(klass, fname, mode)
+    VALUE klass;
     const char *fname, *mode;
 {
     OpenFile *fptr;
-
-    MakeOpenFile(io, fptr);
+    NEWOBJ(port, struct RFile);
+    OBJSETUP(port, klass, T_FILE);
+    MakeOpenFile(port, fptr);
 
     fptr->mode = rb_io_mode_flags(mode);
     fptr->f = rb_fopen(fname, mode);
     fptr->path = strdup(fname);
 
-    return io;
+    return (VALUE)port;
 }
 
 VALUE
 rb_file_open(fname, mode)
     const char *fname, *mode;
 {
-    return rb_file_open_internal(io_alloc(rb_cFile), fname, mode);
+    return rb_file_open_internal(rb_cFile, fname, mode);
 }
 
-static VALUE
-rb_file_sysopen_internal(io, fname, flags, mode)
-    VALUE io;
+VALUE
+rb_file_sysopen_internal(klass, fname, flags, mode)
+    VALUE klass;
     char *fname;
     int flags, mode;
 {
+#ifdef USE_CWGUSI
+    if (mode != 0666) {
+	rb_warn("can't specify file mode on this platform");
+    }
+    return rb_file_open_internal(klass, fname, rb_io_flags_mode(flags));
+#else
     OpenFile *fptr;
     int fd;
     char *m;
-    char mbuf[4];
+    NEWOBJ(port, struct RFile);
+    OBJSETUP(port, klass, T_FILE);
+    MakeOpenFile(port, fptr);
 
-    MakeOpenFile(io, fptr);
-
-    fd = rb_sysopen(fname, flags, mode);
-    m = rb_io_modenum_mode(flags, mbuf);
-    fptr->mode = rb_io_modenum_flags(flags);
+    fd = rb_open(fname, flags, mode);
+    m = rb_io_flags_mode(flags);
+    fptr->mode = rb_io_mode_flags2(flags);
     fptr->f = rb_fdopen(fd, m);
     fptr->path = strdup(fname);
 
-    return io;
+    return (VALUE)port;
+#endif
 }
 
 VALUE
@@ -1926,10 +1309,10 @@ rb_file_sysopen(fname, flags, mode)
     const char *fname;
     int flags, mode;
 {
-    return rb_file_sysopen_internal(io_alloc(rb_cFile), fname, flags, mode);
+    return rb_file_sysopen_internal(rb_cFile, fname, flags, mode);
 }
 
-#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__VMS)
+#if defined (NT) || defined(DJGPP) || defined(__CYGWIN32__) || defined(__human68k__)
 static struct pipe_list {
     OpenFile *fptr;
     struct pipe_list *next;
@@ -1972,7 +1355,7 @@ pipe_del_fptr(fptr)
 }
 
 static void
-pipe_atexit _((void))
+pipe_atexit()
 {
     struct pipe_list *list = pipe_list;
     struct pipe_list *tmp;
@@ -1984,62 +1367,50 @@ pipe_atexit _((void))
     }
 }
 
-static void pipe_finalize _((OpenFile *fptr,int));
-
 static void
-pipe_finalize(fptr, noraise)
+pipe_finalize(fptr)
     OpenFile *fptr;
-    int noraise;
 {
-#if !defined (__CYGWIN__) && !defined(_WIN32)
-    extern VALUE rb_last_status;
-    int status;
-    if (fptr->f) {
-	status = pclose(fptr->f);
+#if !defined (__CYGWIN32__)
+    if (fptr->f != NULL) {
+	pclose(fptr->f);
     }
-    if (fptr->f2) {
-	status = pclose(fptr->f2);
+    if (fptr->f2 != NULL) {
+	pclose(fptr->f2);
     }
-    fptr->f = fptr->f2 = 0;
-#if defined DJGPP
-    status <<= 8;
-#endif
-    rb_last_status = INT2FIX(status);
+    fptr->f = fptr->f2 = NULL;
 #else
-    fptr_finalize(fptr, noraise);
+    fptr_finalize(fptr);
 #endif
     pipe_del_fptr(fptr);
 }
 #endif
 
 void
-rb_io_synchronized(fptr)
-    OpenFile *fptr;
-{
-    fptr->mode |= FMODE_SYNC;
-}
-
-void
 rb_io_unbuffered(fptr)
     OpenFile *fptr;
 {
-    rb_io_synchronized(fptr);
+    if (fptr->f2 == 0) rb_raise(rb_eTypeError, "non-writable fptr");
+    if (fptr->f != 0) setbuf(fptr->f, NULL);
+    setbuf(fptr->f2, NULL);
+    fptr->mode |= FMODE_SYNC;
 }
 
 static VALUE
 pipe_open(pname, mode)
     char *pname, *mode;
 {
+#ifndef USE_CWGUSI
     int modef = rb_io_mode_flags(mode);
     OpenFile *fptr;
 
-#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
+#if defined(NT) || defined(DJGPP) || defined(__human68k__)
     FILE *f = popen(pname, mode);
 
-    if (!f) rb_sys_fail(pname);
+    if (f == NULL) rb_sys_fail(pname);
     else {
-	VALUE port = io_alloc(rb_cIO);
-
+	NEWOBJ(port, struct RFile);
+	OBJSETUP(port, rb_cIO, T_FILE);
 	MakeOpenFile(port, fptr);
 	fptr->finalize = pipe_finalize;
 	fptr->mode = modef;
@@ -2047,43 +1418,9 @@ pipe_open(pname, mode)
 	pipe_add_fptr(fptr);
 	if (modef & FMODE_READABLE) fptr->f  = f;
 	if (modef & FMODE_WRITABLE) {
-	    if (fptr->f) fptr->f2 = f;
-	    else fptr->f = f;
-	    rb_io_synchronized(fptr);
-	}
-	return (VALUE)port;
-    }
-#else
-#ifdef _WIN32
-    int pid;
-    FILE *fpr, *fpw;
-
-retry:
-    pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw);
-    if (pid == -1) {		/* exec failed */
-	if (errno == EAGAIN) {
-	    rb_thread_sleep(1);
-	    goto retry;
-	}
-	rb_sys_fail(pname);
-    }
-    else {
-        VALUE port = io_alloc(rb_cIO);
-
-	MakeOpenFile(port, fptr);
-	fptr->mode = modef;
-	fptr->mode |= FMODE_SYNC;
-	fptr->pid = pid;
-
-	if (modef & FMODE_READABLE) {
-	    fptr->f = fpr;
-	}
-	if (modef & FMODE_WRITABLE) {
-	    if (fptr->f) fptr->f2 = fpw;
-	    else fptr->f = fpw;
+	    fptr->f2 = f;
+	    rb_io_unbuffered(fptr);
 	}
-	fptr->finalize = pipe_finalize;
-	pipe_add_fptr(fptr);
 	return (VALUE)port;
     }
 #else
@@ -2102,7 +1439,7 @@ retry:
     }
 
   retry:
-    switch ((pid = fork())) {
+    switch (pid = (doexec?vfork():fork())) {
       case 0:			/* child */
 	if (modef & FMODE_READABLE) {
 	    close(pr[0]);
@@ -2129,8 +1466,6 @@ retry:
 		    ruby_sourcefile, ruby_sourceline, pname);
 	    _exit(127);
 	}
-	rb_io_synchronized(RFILE(orig_stdout)->fptr);
-	rb_io_synchronized(RFILE(orig_stderr)->fptr);
 	return Qnil;
 
       case -1:			/* fork failed */
@@ -2145,8 +1480,8 @@ retry:
       default:			/* parent */
 	if (pid < 0) rb_sys_fail(pname);
 	else {
-	    VALUE port = io_alloc(rb_cIO);
-
+	    NEWOBJ(port, struct RFile);
+	    OBJSETUP(port, rb_cIO, T_FILE);
 	    MakeOpenFile(port, fptr);
 	    fptr->mode = modef;
 	    fptr->mode |= FMODE_SYNC;
@@ -2163,155 +1498,119 @@ retry:
 		if (fptr->f) fptr->f2 = f;
 		else fptr->f = f;
 	    }
-#if defined (__CYGWIN__)
+#if defined (__CYGWIN32__)
 	    fptr->finalize = pipe_finalize;
 	    pipe_add_fptr(fptr);
 #endif
-	    return port;
+	    return (VALUE)port;
 	}
     }
 #endif
+#else /* USE_CWGUSI */
+    rb_notimplement();  
+    return Qnil;		/* not reached */
 #endif
 }
 
 static VALUE
-rb_io_popen(str, argc, argv, klass)
-    char *str;
+rb_io_s_popen(argc, argv, self)
     int argc;
     VALUE *argv;
-    VALUE klass;
+    VALUE self;
 {
     char *mode;
     VALUE pname, pmode, port;
-    char mbuf[4];
 
     if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) {
 	mode = "r";
     }
-    else if (FIXNUM_P(pmode)) {
-	mode = rb_io_modenum_mode(FIX2INT(pmode), mbuf);
-    }
     else {
-	mode = StringValuePtr(pmode);
-    }
-    SafeStringValue(pname);
-    port = pipe_open(str, mode);
-    if (NIL_P(port)) {
-	/* child */
-	if (rb_block_given_p()) {
-	    rb_yield(Qnil);
-	    fflush(stdout);
-	    fflush(stderr);
-	    _exit(0);
-	}
-	return Qnil;
-    }
-    RBASIC(port)->klass = klass;
-    if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, port, io_close, port);
+	int len;
+
+	mode = STR2CSTR(pmode);
+	len = strlen(mode);
+	if (len == 0 || len > 3)
+	    rb_raise(rb_eArgError, "illegal access mode");
     }
+    Check_SafeStr(pname);
+    port = pipe_open(RSTRING(pname)->ptr, mode);
+    if (NIL_P(port)) return Qnil;
     return port;
 }
 
 static VALUE
-rb_io_s_popen(argc, argv, klass)
+rb_file_s_open(argc, argv, klass)
     int argc;
     VALUE *argv;
     VALUE klass;
 {
-    char *str = 0;
-
-    if (argc >= 1) {
-	str = StringValuePtr(argv[0]);
-    }
-    return rb_io_popen(str, argc, argv, klass);
-}
-
-static VALUE
-rb_open_file(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-    VALUE fname, vmode, perm;
+    VALUE fname, vmode, file, perm;
     char *path, *mode;
-    int flags, fmode;
 
     rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
-    SafeStringValue(fname);
+    Check_SafeStr(fname);
     path = RSTRING(fname)->ptr;
 
-    if (FIXNUM_P(vmode) || !NIL_P(perm)) {
-	if (FIXNUM_P(vmode)) {
-	    flags = NUM2INT(vmode);
-	}
-	else {
-	    SafeStringValue(vmode);
-	    flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
-	}
-	fmode = NIL_P(perm) ? 0666 :  NUM2INT(perm);
+    if (FIXNUM_P(vmode)) {
+	int flags = FIX2INT(vmode);
+	int fmode = NIL_P(perm) ? 0666 : FIX2INT(perm);
 
-	rb_file_sysopen_internal(io, path, flags, fmode);
+	file = rb_file_sysopen_internal(klass, path, flags, fmode);
     }
     else {
-	mode = NIL_P(vmode) ? "r" : StringValuePtr(vmode);
-	rb_file_open_internal(io, RSTRING(fname)->ptr, mode);
+	if (!NIL_P(vmode)) {
+	    mode = STR2CSTR(vmode);
+	}
+	else {
+	    mode = "r";
+	}
+	file = rb_file_open_internal(klass, RSTRING(fname)->ptr, mode);
     }
-    return io;
-}
 
-static VALUE
-rb_io_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE io = rb_class_new_instance(argc, argv, klass);
-
-    if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, io, io_close, io);
+    if (rb_iterator_p()) {
+	return rb_ensure(rb_yield, file, rb_io_close, file);
     }
 
-    return io;
+    return file;
 }
 
 static VALUE
-rb_io_s_sysopen(argc, argv)
+rb_f_open(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE fname, vmode, perm;
-    int flags, fmode, fd;
+    char *mode;
+    VALUE pname, pmode, perm;
+    VALUE port;
 
-    rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
-    SafeStringValue(fname);
+    rb_scan_args(argc, argv, "12", &pname, &pmode, &perm);
+    Check_SafeStr(pname);
+    if (RSTRING(pname)->ptr[0] != '|') /* open file */
+	return rb_file_s_open(argc, argv, rb_cFile);
 
-    if (NIL_P(vmode)) flags = O_RDONLY;
-    else if (FIXNUM_P(vmode)) flags = NUM2INT(vmode);
-    else {
-	SafeStringValue(vmode);
-	flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
+    /* open pipe */
+    if (NIL_P(pmode)) {
+	mode = "r";
     }
-    if (NIL_P(perm)) fmode = 0666;
-    else             fmode = NUM2INT(perm);
-
-    fd = rb_sysopen(RSTRING(fname)->ptr, flags, fmode);
-    return INT2NUM(fd);
-}
+    else if (FIXNUM_P(pmode)) {
+	mode = rb_io_flags_mode(FIX2INT(pmode));
+    }
+    else {
+	int len;
 
-static VALUE
-rb_f_open(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    if (argc >= 1) {
-	char *str = StringValuePtr(argv[0]);
+	mode = STR2CSTR(pmode);
+	len = strlen(mode);
+	if (len == 0 || len > 3)
+	    rb_raise(rb_eArgError, "illegal access mode %s", mode);
+    }
 
-	if (str[0] == '|') {
-	    return rb_io_popen(str+1, argc, argv, rb_cIO);
-	}
+    port = pipe_open(RSTRING(pname)->ptr+1, mode);
+    if (NIL_P(port)) return Qnil;
+    if (rb_iterator_p()) {
+	return rb_ensure(rb_yield, port, rb_io_close, port);
     }
-    return rb_io_s_open(argc, argv, rb_cFile);
+
+    return port;
 }
 
 static VALUE
@@ -2349,34 +1648,26 @@ rb_io_mode_string(fptr)
 }
 
 static VALUE
-io_reopen(io, nfile)
+rb_io_reopen(io, nfile)
     VALUE io, nfile;
 {
     OpenFile *fptr, *orig;
     char *mode;
-    int fd, fd2;
-    off_t pos = 0;
+    int fd;
 
-    nfile = rb_io_get_io(nfile);
-    if (rb_safe_level() >= 4 && (!OBJ_TAINTED(io) || !OBJ_TAINTED(nfile))) {
-	rb_raise(rb_eSecurityError, "Insecure: can't reopen");
-    }
+    rb_secure(4);
     GetOpenFile(io, fptr);
+    nfile = rb_io_get_io(nfile);
     GetOpenFile(nfile, orig);
 
     if (fptr == orig) return io;
-    if (orig->mode & FMODE_READABLE) {
-	pos = io_tell(orig);
-    }
     if (orig->f2) {
-	io_fflush(orig->f2, orig);
+	fflush(orig->f2);
     }
     else if (orig->mode & FMODE_WRITABLE) {
-	io_fflush(orig->f, orig);
-    }
-    if (fptr->mode & FMODE_WRITABLE) {
-	io_fflush(GetWriteFile(fptr), fptr);
+	fflush(orig->f);
     }
+    rb_thread_fd_close(fileno(fptr->f));
 
     /* copy OpenFile structure */
     fptr->mode = orig->mode;
@@ -2389,41 +1680,29 @@ io_reopen(io, nfile)
 
     mode = rb_io_mode_string(fptr);
     fd = fileno(fptr->f);
-    fd2 = fileno(orig->f);
-    if (fd != fd2) {
-	if (fptr->f == stdin || fptr->f == stdout || fptr->f == stderr) {
-	    clearerr(fptr->f);
-	    /* need to keep stdio objects */
-	    if (dup2(fd2, fd) < 0)
-		rb_sys_fail(orig->path);
-	}
-	else {
-	    fclose(fptr->f);
-	    if (dup2(fd2, fd) < 0)
-		rb_sys_fail(orig->path);
-	    fptr->f = rb_fdopen(fd, mode);
-	}
-	rb_thread_fd_close(fd);
-	if ((orig->mode & FMODE_READABLE) && pos >= 0) {
-	    io_seek(fptr, pos, SEEK_SET);
-	    io_seek(orig, pos, SEEK_SET);
-	}
+    if (fd < 3) {
+	/* need to keep stdio */
+	if (dup2(fileno(orig->f), fd) < 0)
+	    rb_sys_fail(orig->path);
+    }
+    else {
+	fclose(fptr->f);
+	if (dup2(fileno(orig->f), fd) < 0)
+	    rb_sys_fail(orig->path);
+	fptr->f = rb_fdopen(fd, mode);
     }
 
-    if (fptr->f2 && fd != fileno(fptr->f2)) {
+    if (fptr->f2) {
 	fd = fileno(fptr->f2);
-	if (!orig->f2) {
-	    fclose(fptr->f2);
-	    rb_thread_fd_close(fd);
-	    fptr->f2 = 0;
-	}
-	else if (fd != (fd2 = fileno(orig->f2))) {
-	    fclose(fptr->f2);
-	    rb_thread_fd_close(fd);
-	    if (dup2(fd2, fd) < 0)
+	fclose(fptr->f2);
+	if (orig->f2) {
+	    if (dup2(fileno(orig->f2), fd) < 0)
 		rb_sys_fail(orig->path);
 	    fptr->f2 = rb_fdopen(fd, "w");
 	}
+	else {
+	    fptr->f2 = 0;
+	}
     }
 
     if (fptr->mode & FMODE_BINMODE) {
@@ -2435,7 +1714,7 @@ io_reopen(io, nfile)
 }
 
 static VALUE
-rb_io_reopen(argc, argv, file)
+rb_file_reopen(argc, argv, file)
     int argc;
     VALUE *argv;
     VALUE file;
@@ -2446,54 +1725,37 @@ rb_io_reopen(argc, argv, file)
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "11", &fname, &nmode) == 1) {
-	if (TYPE(fname) != T_STRING) { /* fname must be IO */
-	    return io_reopen(file, fname);
+	if (TYPE(fname) == T_FILE) { /* fname must be IO */
+	    return rb_io_reopen(file, fname);
 	}
     }
 
-    SafeStringValue(fname);
-
-    rb_io_taint_check(file);
-    fptr = RFILE(file)->fptr;
-    if (!fptr) {
-	fptr = RFILE(file)->fptr = ALLOC(OpenFile);
-    }
-
+    Check_SafeStr(fname);
     if (!NIL_P(nmode)) {
-	mode = StringValuePtr(nmode);
+	mode = STR2CSTR(nmode);
     }
     else {
-	mode = ALLOCA_N(char, 4);
-	rb_io_flags_mode(fptr->mode, mode);
-    }
-
-    if (fptr->path) {
-	free(fptr->path);
-	fptr->path = 0;
+	mode = "r";
     }
 
+    GetOpenFile(file, fptr);
+    if (fptr->path) free(fptr->path);
     fptr->path = strdup(RSTRING(fname)->ptr);
     fptr->mode = rb_io_mode_flags(mode);
     if (!fptr->f) {
 	fptr->f = rb_fopen(RSTRING(fname)->ptr, mode);
 	if (fptr->f2) {
 	    fclose(fptr->f2);
-	    fptr->f2 = 0;
+	    fptr->f2 = NULL;
 	}
-
 	return file;
     }
 
-    if (freopen(RSTRING(fname)->ptr, mode, fptr->f) == 0) {
+    if (freopen(RSTRING(fname)->ptr, mode, fptr->f) == NULL) {
 	rb_sys_fail(fptr->path);
     }
-#ifdef USE_SETVBUF
-    if (setvbuf(fptr->f, NULL, _IOFBF, 0) != 0)
-	rb_warn("setvbuf() can't be honered for %s", RSTRING(fname)->ptr);
-#endif
-
     if (fptr->f2) {
-	if (freopen(RSTRING(fname)->ptr, "w", fptr->f2) == 0) {
+	if (freopen(RSTRING(fname)->ptr, "w", fptr->f2) == NULL) {
 	    rb_sys_fail(fptr->path);
 	}
     }
@@ -2502,27 +1764,24 @@ rb_io_reopen(argc, argv, file)
 }
 
 static VALUE
-rb_io_init_copy(dest, io)
-    VALUE dest, io;
+rb_io_clone(io)
+    VALUE io;
 {
     OpenFile *fptr, *orig;
     int fd;
     char *mode;
 
-    io = rb_io_get_io(io);
-    if (dest == io) return dest;
+    NEWOBJ(obj, struct RFile);
+    OBJSETUP(obj, CLASS_OF(io), T_FILE);
+
     GetOpenFile(io, orig);
-    MakeOpenFile(dest, fptr);
+    MakeOpenFile(obj, fptr);
 
     if (orig->f2) {
-	io_fflush(orig->f2, orig);
-	fseeko(orig->f, 0L, SEEK_CUR);
+	fflush(orig->f2);
     }
     else if (orig->mode & FMODE_WRITABLE) {
-	io_fflush(orig->f, orig);
-    }
-    else {
-	fseeko(orig->f, 0L, SEEK_CUR);
+	fflush(orig->f);
     }
 
     /* copy OpenFile structure */
@@ -2543,33 +1802,32 @@ rb_io_init_copy(dest, io)
 	else          mode = "r+";
 	break;
     }
-    fd = ruby_dup(fileno(orig->f));
+    fd = dup(fileno(orig->f));
     fptr->f = rb_fdopen(fd, mode);
-    if (orig->f2) {
-	if (fileno(orig->f) != fileno(orig->f2)) {
-	    fd = ruby_dup(fileno(orig->f2));
-	}
-	fptr->f2 = rb_fdopen(fd, "w");
+    if (fptr->f2) {
+	fd = dup(fileno(orig->f2));
+	fptr->f = rb_fdopen(fd, "w");
     }
     if (fptr->mode & FMODE_BINMODE) {
-	rb_io_binmode(dest);
+	rb_io_binmode((VALUE)obj);
     }
 
-    return dest;
+    return (VALUE)obj;
 }
 
-VALUE
+static VALUE
 rb_io_printf(argc, argv, out)
     int argc;
     VALUE argv[];
     VALUE out;
 {
-    rb_io_write(out, rb_f_sprintf(argc, argv));
+    rb_funcall(out, id_write, 1, rb_f_sprintf(argc, argv));
+
     return Qnil;
 }
 
 static VALUE
-rb_f_printf(argc, argv)
+rb_rb_f_printf(argc, argv)
     int argc;
     VALUE argv[];
 {
@@ -2577,19 +1835,22 @@ rb_f_printf(argc, argv)
 
     if (argc == 0) return Qnil;
     if (TYPE(argv[0]) == T_STRING) {
-	out = rb_stdout;
+	out = rb_defout;
     }
-    else {
+    else if (rb_respond_to(argv[0], id_write)) {
 	out = argv[0];
 	argv++;
 	argc--;
     }
-    rb_io_write(out, rb_f_sprintf(argc, argv));
+    else {
+	rb_raise(rb_eNameError, "output must responds to `write'");
+    }
+    rb_funcall(out, id_write, 1, rb_f_sprintf(argc, argv));
 
     return Qnil;
 }
 
-VALUE
+static VALUE
 rb_io_print(argc, argv, out)
     int argc;
     VALUE *argv;
@@ -2629,7 +1890,7 @@ rb_f_print(argc, argv)
     int argc;
     VALUE *argv;
 {
-    rb_io_print(argc, argv, rb_stdout);
+    rb_io_print(argc, argv, rb_defout);
     return Qnil;
 }
 
@@ -2637,9 +1898,20 @@ static VALUE
 rb_io_putc(io, ch)
     VALUE io, ch;
 {
-    char c = NUM2CHR(ch);
+    OpenFile *fptr;
+    FILE *f;
+    int c = NUM2CHR(ch);
+
+    rb_secure(4);
+    GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
+    f = GetWriteFile(fptr);
+
+    if (fputc(c, f) == EOF)
+	rb_sys_fail(fptr->path);
+    if (fptr->mode & FMODE_SYNC)
+	fflush(f);
 
-    rb_io_write(io, rb_str_new(&c, 1));
     return ch;
 }
 
@@ -2647,15 +1919,17 @@ static VALUE
 rb_f_putc(recv, ch)
     VALUE recv, ch;
 {
-    return rb_io_putc(rb_stdout, ch);
+    return rb_io_putc(rb_defout, ch);
 }
 
+static VALUE rb_io_puts _((int, VALUE*, VALUE));
+
 static VALUE
 io_puts_ary(ary, out)
     VALUE ary, out;
 {
     VALUE tmp;
-    long i;
+    int i;
 
     for (i=0; i<RARRAY(ary)->len; i++) {
 	tmp = RARRAY(ary)->ptr[i];
@@ -2667,7 +1941,7 @@ io_puts_ary(ary, out)
     return Qnil;
 }
 
-VALUE
+static VALUE
 rb_io_puts(argc, argv, out)
     int argc;
     VALUE *argv;
@@ -2682,20 +1956,20 @@ rb_io_puts(argc, argv, out)
 	return Qnil;
     }
     for (i=0; i<argc; i++) {
-	if (NIL_P(argv[i])) {
+	switch (TYPE(argv[i])) {
+	  case T_NIL:
 	    line = rb_str_new2("nil");
+	    break;
+	  case T_ARRAY:
+	    rb_protect_inspect(io_puts_ary, argv[i], out);
+	    continue;
+	  default:
+	    line = argv[i];
+	    break;
 	}
-	else {
-	    line = rb_check_array_type(argv[i]);
-	    if (!NIL_P(line)) {
-		rb_protect_inspect(io_puts_ary, line, out);
-		continue;
-	    }
-	    line = rb_obj_as_string(argv[i]);
-	}
+	line = rb_obj_as_string(line);
 	rb_io_write(out, line);
-	if (RSTRING(line)->len == 0 ||
-            RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
+	if (RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
 	    rb_io_write(out, rb_default_rs);
 	}
     }
@@ -2708,7 +1982,7 @@ rb_f_puts(argc, argv)
     int argc;
     VALUE *argv;
 {
-    rb_io_puts(argc, argv, rb_stdout);
+    rb_io_puts(argc, argv, rb_defout);
     return Qnil;
 }
 
@@ -2716,8 +1990,10 @@ void
 rb_p(obj)			/* for debug print within C code */
     VALUE obj;
 {
-    rb_io_write(rb_stdout, rb_obj_as_string(rb_inspect(obj)));
-    rb_io_write(rb_stdout, rb_default_rs);
+    obj = rb_obj_as_string(rb_inspect(obj));
+    fwrite(RSTRING(obj)->ptr, 1, RSTRING(obj)->len, stdout);
+    obj = rb_default_rs;
+    fwrite(RSTRING(obj)->ptr, 1, RSTRING(obj)->len, stdout);
 }
 
 static VALUE
@@ -2730,9 +2006,6 @@ rb_f_p(argc, argv)
     for (i=0; i<argc; i++) {
 	rb_p(argv[i]);
     }
-    if (TYPE(rb_stdout) == T_FILE) {
-	rb_io_flush(rb_stdout);
-    }
     return Qnil;
 }
 
@@ -2745,7 +2018,7 @@ rb_obj_display(argc, argv, self)
     VALUE out;
 
     if (rb_scan_args(argc, argv, "01", &out) == 0) {
-	out = rb_stdout;
+	out = rb_defout;
     }
 
     rb_io_write(out, self);
@@ -2753,62 +2026,133 @@ rb_obj_display(argc, argv, self)
     return Qnil;
 }
 
-void
-rb_write_error2(mesg, len)
-    const char *mesg;
-    long len;
+static void
+rb_io_defset(val, id)
+    VALUE val;
+    ID id;
 {
-    rb_io_write(rb_stderr, rb_str_new(mesg, len));
+    if (TYPE(val) == T_STRING) {
+	val = rb_io_open(RSTRING(val)->ptr, "w");
+    }
+    if (!rb_respond_to(val, id_write)) {
+	rb_raise(rb_eTypeError, "$> must have write method, %s given",
+		 rb_class2name(CLASS_OF(val)));
+    }
+    rb_defout = val;
 }
 
-void
-rb_write_error(mesg)
-    const char *mesg;
+static int
+rb_dup(orig)
+    int orig;
 {
-    rb_write_error2(mesg, strlen(mesg));
+    int fd;
+
+    fd = dup(orig);
+    if (fd < 0) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    fd = dup(orig);
+	}
+	if (fd < 0) {
+	    rb_sys_fail(0);
+	}
+    }
+    return fd;
 }
 
 static void
-must_respond_to(mid, val, id)
-    ID mid;
+set_stdin(val, id, var)
     VALUE val;
     ID id;
+    VALUE *var;
 {
-    if (!rb_respond_to(val, mid)) {
-	rb_raise(rb_eTypeError, "%s must have %s method, %s given",
-		 rb_id2name(id), rb_id2name(mid),
-		 rb_obj_classname(val));
+    OpenFile *fptr;
+    int fd;
+    char *mode;
+
+    if (val == *var) return;
+    if (TYPE(val) != T_FILE) {
+	rb_raise(rb_eTypeError, "%s must be IO object", rb_id2name(id));
+    }
+
+    GetOpenFile(val, fptr);
+    rb_io_check_readable(fptr);
+
+    GetOpenFile(*var, fptr);
+    mode = rb_io_mode_string(fptr);
+    fd = rb_dup(fileno(fptr->f));
+    if (fileno(fptr->f) > 2) {
+	fclose(fptr->f);
     }
+    fptr->f = rb_fdopen(fd, mode);
+
+    GetOpenFile(val, fptr);
+    dup2(fileno(fptr->f), 0);
+    fclose(fptr->f);
+    fptr->f = stdin;
+
+    *var = val;
 }
 
 static void
-stdout_setter(val, id, variable)
+set_outfile(val, id, var, stdf)
     VALUE val;
     ID id;
-    VALUE *variable;
+    VALUE *var;
+    FILE *stdf;
 {
-    must_respond_to(id_write, val, id);
-    *variable = val;
+    OpenFile *fptr;
+    FILE *f;
+    int fd;
+    char *mode;
+
+    if (val == *var) return;
+    rb_io_flush(*var);
+
+    if (TYPE(val) != T_FILE) {
+	rb_raise(rb_eTypeError, "%s must be IO object", rb_id2name(id));
+    }
+
+    GetOpenFile(val, fptr);
+    rb_io_check_writable(fptr);
+
+    GetOpenFile(*var, fptr);
+    mode = rb_io_mode_string(fptr);
+    f = GetWriteFile(fptr);
+    fd = rb_dup(fileno(f));
+    if (fileno(f) > 2) {
+	fclose(fptr->f);
+    }
+    f = rb_fdopen(fd, mode);
+    if (fptr->f2) fptr->f2 = f;
+    else          fptr->f = f;
+
+    GetOpenFile(val, fptr);
+    f = GetWriteFile(fptr);
+    dup2(fileno(f), fileno(stdf));
+    fclose(f);
+    if (fptr->f2) fptr->f2 = stdf;
+    else          fptr->f = stdf;
+
+    *var = val;
 }
 
 static void
-defout_setter(val, id, variable)
+set_stdout(val, id, var)
     VALUE val;
     ID id;
-    VALUE *variable;
+    VALUE *var;
 {
-    stdout_setter(val, id, variable);
-    rb_warn("$defout is obslete; use $stdout instead");
+    set_outfile(val, id, var, stdout);
 }
 
 static void
-deferr_setter(val, id, variable)
+set_stderr(val, id, var)
     VALUE val;
     ID id;
-    VALUE *variable;
+    VALUE *var;
 {
-    stdout_setter(val, id, variable);
-    rb_warn("$deferr is obslete; use $stderr instead");
+    set_outfile(val, id, var, stderr);
 }
 
 static VALUE
@@ -2818,92 +2162,14 @@ prep_stdio(f, mode, klass)
     VALUE klass;
 {
     OpenFile *fp;
-    VALUE io = io_alloc(klass);
+    NEWOBJ(io, struct RFile);
+    OBJSETUP(io, klass, T_FILE);
 
     MakeOpenFile(io, fp);
-#ifdef __CYGWIN__
-    if (!isatty(fileno(f))) {
-	mode |= O_BINARY;
-	setmode(fileno(f), O_BINARY);
-    }
-#endif
     fp->f = f;
     fp->mode = mode;
 
-    return io;
-}
-
-static void
-prep_path(io, path)
-    VALUE io;
-    char *path;
-{
-    OpenFile *fptr;
-
-    GetOpenFile(io, fptr);
-    if (fptr->path) rb_bug("illegal prep_path() call");
-    fptr->path = strdup(path);
-}
-
-static VALUE
-rb_io_initialize(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-    VALUE fnum, mode;
-    OpenFile *fp;
-    int fd, flags;
-    char mbuf[4];
-
-    rb_secure(4);
-    rb_scan_args(argc, argv, "11", &fnum, &mode);
-    fd = NUM2INT(fnum);
-    if (argc == 2) {
-	if (FIXNUM_P(mode)) {
-	    flags = FIX2LONG(mode);
-	}
-	else {
-	    SafeStringValue(mode);
-	    flags = rb_io_mode_modenum(RSTRING(mode)->ptr);
-	}
-    }
-    else {
-#if defined(HAVE_FCNTL) && defined(F_GETFL)
-	flags = fcntl(fd, F_GETFL);
-#else
-	flags = O_RDONLY;
-#endif
-    }
-    MakeOpenFile(io, fp);
-    fp->mode = rb_io_modenum_flags(flags);
-    fp->f = rb_fdopen(fd, rb_io_modenum_mode(flags, mbuf));
-
-    return io;
-}
-
-static VALUE
-rb_file_initialize(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-    if (RFILE(io)->fptr) {
-	rb_io_close_m(io);
-	free(RFILE(io)->fptr);
-	RFILE(io)->fptr = 0;
-    }
-    if (0 < argc && argc < 3) {
-	VALUE fd = rb_check_convert_type(argv[0], T_FIXNUM, "Fixnum", "to_int");
-
-	if (!NIL_P(fd)) {
-	    argv[0] = fd;
-	    return rb_io_initialize(argc, argv, io);
-	}
-    }
-    rb_open_file(argc, argv, io);
-
-    return io;
+    return (VALUE)io;
 }
 
 static VALUE
@@ -2912,49 +2178,24 @@ rb_io_s_new(argc, argv, klass)
     VALUE *argv;
     VALUE klass;
 {
-    if (rb_block_given_p()) {
-	char *cname = rb_class2name(klass);
+    VALUE fnum, mode;
+    char *m = "r";
 
-	rb_warn("%s::new() does not take block; use %s::open() instead",
-		cname, cname);
+    if (rb_scan_args(argc, argv, "11", &fnum, &mode) == 2) {
+	Check_SafeStr(mode);
+	m = RSTRING(mode)->ptr;
     }
-    return rb_class_new_instance(argc, argv, klass);
-}
-
-static VALUE
-rb_io_s_for_fd(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE io = rb_obj_alloc(klass);
-    rb_io_initialize(argc, argv, io);
-    return io;
+    return prep_stdio(rb_fdopen(NUM2INT(fnum), m), rb_io_mode_flags(m), klass);
 }
 
 static int binmode = 0;
 
 static VALUE
-argf_forward()
-{
-    return rb_funcall3(current_file, ruby_frame->last_func,
-		       ruby_frame->argc, ruby_frame->argv);
-}
-
-#define ARGF_FORWARD() do { if (TYPE(current_file) != T_FILE) return argf_forward(); } while (0)
-#define NEXT_ARGF_FORWARD() do {\
-     if (!next_argv()) return Qnil;\
-      ARGF_FORWARD();\
-} while (0)
-
-static void
-argf_close(file)
-    VALUE file;
+argf_binmode()
 {
-    if (TYPE(file) == T_FILE)
-	rb_io_close(file);
-    else
-	rb_funcall3(file, rb_intern("close"), 0, 0);
+    rb_io_binmode(file);
+    binmode = 1;
+    return argf;
 }
 
 static int
@@ -2962,14 +2203,6 @@ next_argv()
 {
     extern VALUE rb_argv;
     char *fn;
-    OpenFile *fptr;
-    int stdout_binmode = 0;
-
-    if (TYPE(rb_stdout) == T_FILE) {
-        GetOpenFile(rb_stdout, fptr);
-        if (fptr->mode & FMODE_BINMODE)
-            stdout_binmode = 1;
-    }
 
     if (init_p == 0) {
 	if (RARRAY(rb_argv)->len > 0) {
@@ -2977,8 +2210,7 @@ next_argv()
 	}
 	else {
 	    next_p = -1;
-	    current_file = rb_stdin;
-	    filename = rb_str_new2("-");
+	    file = rb_stdin;
 	}
 	init_p = 1;
 	gets_lineno = 0;
@@ -2989,11 +2221,11 @@ next_argv()
 	next_p = 0;
 	if (RARRAY(rb_argv)->len > 0) {
 	    filename = rb_ary_shift(rb_argv);
-	    fn = StringValuePtr(filename);
+	    fn = STR2CSTR(filename);
 	    if (strlen(fn) == 1 && fn[0] == '-') {
-		current_file = rb_stdin;
+		file = rb_stdin;
 		if (ruby_inplace_mode) {
-		    rb_warn("Can't do inplace edit for stdio");
+		    rb_defout = rb_stdout;
 		}
 	    }
 	    else {
@@ -3004,18 +2236,19 @@ next_argv()
 		    VALUE str;
 		    FILE *fw;
 
-		    if (TYPE(rb_stdout) == T_FILE && rb_stdout != orig_stdout) {
-			rb_io_close(rb_stdout);
+		    if (TYPE(rb_defout) == T_FILE && rb_defout != rb_stdout) {
+			rb_io_close(rb_defout);
 		    }
 		    fstat(fileno(fr), &st);
 		    if (*ruby_inplace_mode) {
 			str = rb_str_new2(fn);
-#ifdef NO_LONG_FNAME
+#if defined(MSDOS) || defined(__CYGWIN32__) || defined(NT)
                         ruby_add_suffix(str, ruby_inplace_mode);
 #else
-			rb_str_cat2(str, ruby_inplace_mode);
+			rb_str_cat(str, ruby_inplace_mode,
+				   strlen(ruby_inplace_mode));
 #endif
-#ifdef NO_SAFE_RENAME
+#if defined(MSDOS) || defined(__BOW__) || defined(__CYGWIN32__) || defined(NT) || defined(__human68k__) || defined(__EMX__)
 			(void)fclose(fr);
 			(void)unlink(RSTRING(str)->ptr);
 			(void)rename(fn, RSTRING(str)->ptr);
@@ -3030,43 +2263,33 @@ next_argv()
 #endif
 		    }
 		    else {
-#ifdef NO_SAFE_RENAME
-			rb_fatal("Can't do inplace edit without backup");
-#else
+#if !defined(MSDOS) && !defined(__BOW__) && !defined(__CYGWIN32__) && !defined(NT) && !defined(__human68k__)
 			if (unlink(fn) < 0) {
 			    rb_warn("Can't remove %s: %s, skipping file",
 				    fn, strerror(errno));
 			    fclose(fr);
 			    goto retry;
 			}
+#else
+			rb_fatal("Can't do inplace edit without backup");
 #endif
 		    }
 		    fw = rb_fopen(fn, "w");
-#ifndef NO_SAFE_RENAME
+#if !defined(MSDOS) && !defined(__CYGWIN32__) && !(NT) && !defined(__human68k__) && !defined(USE_CWGUSI) && !defined(__BEOS__) && !defined(__EMX__)
 		    fstat(fileno(fw), &st2);
-#ifdef HAVE_FCHMOD
 		    fchmod(fileno(fw), st.st_mode);
-#else
-		    chmod(fn, st.st_mode);
-#endif
 		    if (st.st_uid!=st2.st_uid || st.st_gid!=st2.st_gid) {
 			fchown(fileno(fw), st.st_uid, st.st_gid);
 		    }
 #endif
-		    rb_stdout = prep_stdio(fw, FMODE_WRITABLE, rb_cFile);
-		    prep_path(rb_stdout, fn);
-		    if (stdout_binmode) rb_io_binmode(rb_stdout);
+		    rb_defout = prep_stdio(fw, FMODE_WRITABLE, rb_cFile);
 		}
-		current_file = prep_stdio(fr, FMODE_READABLE, rb_cFile);
-		prep_path(current_file, fn);
+		file = prep_stdio(fr, FMODE_READABLE, rb_cFile);
 	    }
-	    if (binmode) rb_io_binmode(current_file);
+	    if (binmode) rb_io_binmode(file);
 	}
 	else {
 	    init_p = 0;
-	    if (ruby_inplace_mode) {
-		rb_stdout = orig_stdout;
-	    }
 	    return Qfalse;
 	}
     }
@@ -3074,7 +2297,7 @@ next_argv()
 }
 
 static VALUE
-argf_getline(argc, argv)
+rb_f_gets_internal(argc, argv)
     int argc;
     VALUE *argv;
 {
@@ -3083,30 +2306,19 @@ argf_getline(argc, argv)
   retry:
     if (!next_argv()) return Qnil;
     if (argc == 0 && rb_rs == rb_default_rs) {
-	line = rb_io_gets(current_file);
+	line = rb_io_gets(file);
     }
     else {
-	VALUE rs;
-	OpenFile *fptr;
-
-	if (argc == 0) {
-	    rs = rb_rs;
-	}
-	else {
-	    rb_scan_args(argc, argv, "1", &rs);
-	}
-	GetOpenFile(current_file, fptr);
-	line = rb_io_getline(rs, fptr);
+	line = rb_io_gets_internal(argc, argv, file);
     }
     if (NIL_P(line) && next_p != -1) {
-	argf_close(current_file);
+	rb_io_close(file);
 	next_p = 1;
 	goto retry;
     }
-    if (!NIL_P(line)) {
-	gets_lineno++;
-	lineno = INT2FIX(gets_lineno);
-    }
+    gets_lineno++;
+    lineno = INT2FIX(gets_lineno);
+
     return line;
 }
 
@@ -3115,15 +2327,8 @@ rb_f_gets(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE line;
+    VALUE line = rb_f_gets_internal(argc, argv);
 
-    if (!next_argv()) return Qnil;
-    if (TYPE(current_file) != T_FILE) {
-	line = rb_funcall3(current_file, rb_intern("gets"), argc, argv);
-    }
-    else {
-	line = argf_getline(argc, argv);
-    }
     rb_lastline_set(line);
     return line;
 }
@@ -3139,9 +2344,9 @@ rb_gets()
 
   retry:
     if (!next_argv()) return Qnil;
-    line = rb_io_gets(current_file);
+    line = rb_io_gets(file);
     if (NIL_P(line) && next_p != -1) {
-	argf_close(current_file);
+	rb_io_close(file);
 	next_p = 1;
 	goto retry;
     }
@@ -3159,10 +2364,8 @@ rb_f_readline(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE line;
+    VALUE line = rb_f_gets(argc, argv);
 
-    NEXT_ARGF_FORWARD();
-    line = rb_f_gets(argc, argv);
     if (NIL_P(line)) {
 	rb_eof_error();
     }
@@ -3174,9 +2377,6 @@ static VALUE
 rb_f_getc()
 {
     rb_warn("getc is obsolete; use STDIN.getc instead");
-    if (TYPE(rb_stdin) != T_FILE) {
-	return rb_funcall3(rb_stdin, rb_intern("getc"), 0, 0);
-    }
     return rb_io_getc(rb_stdin);
 }
 
@@ -3187,28 +2387,36 @@ rb_f_readlines(argc, argv)
 {
     VALUE line, ary;
 
-    NEXT_ARGF_FORWARD();
     ary = rb_ary_new();
-    while (!NIL_P(line = argf_getline(argc, argv))) {
+    while (!NIL_P(line = rb_f_gets_internal(argc, argv))) {
 	rb_ary_push(ary, line);
     }
 
     return ary;
 }
 
+void
+rb_str_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    if (!NIL_P(val) && TYPE(val) != T_STRING) {
+	rb_raise(rb_eTypeError, "value of %s must be String", rb_id2name(id));
+    }
+    *var = val;
+}
+
 static VALUE
 rb_f_backquote(obj, str)
     VALUE obj, str;
 {
     VALUE port, result;
-    OpenFile *fptr;
 
-    SafeStringValue(str);
+    Check_SafeStr(str);
     port = pipe_open(RSTRING(str)->ptr, "r");
     if (NIL_P(port)) return rb_str_new(0,0);
-
-    GetOpenFile(port, fptr);
-    result = read_all(fptr, remain_size(fptr), Qnil);
+    result = read_all(port);
 
     rb_io_close(port);
 
@@ -3231,14 +2439,13 @@ rb_f_select(argc, argv, obj)
     fd_set *rp, *wp, *ep;
     struct timeval *tp, timerec;
     OpenFile *fptr;
-    long i;
-    int max = 0, n;
+    int i, max = 0, n;
     int interrupt_flag = 0;
     int pending = 0;
 
     rb_scan_args(argc, argv, "13", &read, &write, &except, &timeout);
     if (NIL_P(timeout)) {
-	tp = 0;
+	tp = NULL;
     }
     else {
 	timerec = rb_time_interval(timeout);
@@ -3265,7 +2472,7 @@ rb_f_select(argc, argv, obj)
 	}
     }
     else
-	rp = 0;
+	rp = NULL;
 
     if (!NIL_P(write)) {
 	Check_Type(write, T_ARRAY);
@@ -3282,7 +2489,7 @@ rb_f_select(argc, argv, obj)
 	}
     }
     else
-	wp = 0;
+	wp = NULL;
 
     if (!NIL_P(except)) {
 	Check_Type(except, T_ARRAY);
@@ -3298,9 +2505,8 @@ rb_f_select(argc, argv, obj)
 	    }
 	}
     }
-    else {
-	ep = 0;
-    }
+    else
+	ep = NULL;
 
     max++;
 
@@ -3357,43 +2563,16 @@ rb_f_select(argc, argv, obj)
     return res;			/* returns an empty array on interrupt */
 }
 
-#if !defined(MSDOS) && !defined(__human68k__)
-static int
-io_cntl(fd, cmd, narg, io_p)
-    int fd, cmd, io_p;
-    long narg;
-{
-    int retval;
-
-#ifdef HAVE_FCNTL
-    TRAP_BEG;
-# if defined(__CYGWIN__)
-    retval = io_p?ioctl(fd, cmd, (void*)narg):fcntl(fd, cmd, narg);
-# else
-    retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, cmd, narg);
-# endif
-    TRAP_END;
-#else
-    if (!io_p) {
-	rb_notimplement();
-    }
-    TRAP_BEG;
-    retval = ioctl(fd, cmd, narg);
-    TRAP_END;
-#endif
-    return retval;
-}
-#endif
-
 static VALUE
 rb_io_ctl(io, req, arg, io_p)
     VALUE io, req, arg;
     int io_p;
 {
 #if !defined(MSDOS) && !defined(__human68k__)
-    int cmd = NUM2ULONG(req);
+    int cmd = NUM2INT(req);
     OpenFile *fptr;
-    long len = 0;
+    int len = 0;
+    int fd;
     long narg = 0;
     int retval;
 
@@ -3404,52 +2583,56 @@ rb_io_ctl(io, req, arg, io_p)
 	narg = 0;
     }
     else if (FIXNUM_P(arg)) {
-	narg = FIX2LONG(arg);
+	narg = FIX2INT(arg);
     }
     else if (arg == Qtrue) {
 	narg = 1;
     }
     else {
-	VALUE tmp = rb_check_string_type(arg);
+	Check_Type(arg, T_STRING);
 
-	if (NIL_P(tmp)) {
-	    narg = NUM2LONG(arg);
-	}
-	else {
-	    arg = tmp;
 #ifdef IOCPARM_MASK
 #ifndef IOCPARM_LEN
 #define IOCPARM_LEN(x)  (((x) >> 16) & IOCPARM_MASK)
 #endif
 #endif
 #ifdef IOCPARM_LEN
-	    len = IOCPARM_LEN(cmd);	/* on BSDish systems we're safe */
+	len = IOCPARM_LEN(cmd);	/* on BSDish systems we're safe */
 #else
-	    len = 256;		/* otherwise guess at what's safe */
+	len = 256;		/* otherwise guess at what's safe */
 #endif
-	    rb_str_modify(arg);
+	rb_str_modify(arg);
 
-	    if (len <= RSTRING(arg)->len) {
-		len = RSTRING(arg)->len;
-	    }
-	    if (RSTRING(arg)->len < len) {
-		rb_str_resize(arg, len+1);
-	    }
-	    RSTRING(arg)->ptr[len] = 17;	/* a little sanity check here */
-	    narg = (long)RSTRING(arg)->ptr;
+	if (len <= RSTRING(arg)->len) {
+	    len = RSTRING(arg)->len;
+	}
+	if (RSTRING(arg)->len < len) {
+	    rb_str_resize(arg, len+1);
 	}
+	RSTRING(arg)->ptr[len] = 17;	/* a little sanity check here */
+	narg = (long)RSTRING(arg)->ptr;
+    }
+    fd = fileno(fptr->f);
+#ifdef HAVE_FCNTL
+    TRAP_BEG;
+# ifdef USE_CWGUSI
+    retval = io_p?ioctl(fd, cmd, (void*) narg):fcntl(fd, cmd, narg);
+# else
+    retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, cmd, narg);
+# endif
+    TRAP_END;
+#else
+    if (!io_p) {
+	rb_notimplement();
     }
-    retval = io_cntl(fileno(fptr->f), cmd, narg, io_p);
+    TRAP_BEG;
+    retval = ioctl(fd, cmd, narg);
+    TRAP_END;
+#endif
     if (retval < 0) rb_sys_fail(fptr->path);
     if (TYPE(arg) == T_STRING && RSTRING(arg)->ptr[len] != 17) {
 	rb_raise(rb_eArgError, "return value overflowed string");
     }
-
-    if (fptr->f2 && fileno(fptr->f) != fileno(fptr->f2)) {
-	/* call on f2 too; ignore result */
-	io_cntl(fileno(fptr->f2), cmd, narg, io_p);
-    }
-
     return INT2NUM(retval);
 #else
     rb_notimplement();
@@ -3491,7 +2674,7 @@ rb_f_syscall(argc, argv)
     int argc;
     VALUE *argv;
 {
-#if defined(HAVE_SYSCALL) && !defined(__CHECKER__)
+#ifdef HAVE_SYSCALL
 #ifdef atarist
     unsigned long arg[14]; /* yes, we really need that many ! */
 #else
@@ -3509,19 +2692,16 @@ rb_f_syscall(argc, argv)
     rb_secure(2);
     if (argc == 0)
 	rb_raise(rb_eArgError, "too few arguments for syscall");
-    arg[0] = NUM2LONG(argv[0]); argv++;
+    arg[0] = NUM2INT(argv[0]); argv++;
     while (items--) {
-	VALUE v = rb_check_string_type(*argv);
-
-	if (!NIL_P(v)) {
-	    StringValue(v);
-	    rb_str_modify(v);
-	    arg[i] = (unsigned long)RSTRING(v)->ptr;
+	if (FIXNUM_P(*argv)) {
+	    arg[i] = (unsigned long)NUM2INT(*argv); argv++;
 	}
 	else {
-	    arg[i] = (unsigned long)NUM2LONG(*argv);
+	    Check_Type(*argv, T_STRING);
+	    rb_str_modify(*argv);
+	    arg[i] = (unsigned long)RSTRING(*argv)->ptr; argv++;
 	}
-	argv++;
 	i++;
     }
     TRAP_BEG;
@@ -3587,106 +2767,61 @@ rb_f_syscall(argc, argv)
 #endif
 }
 
-static VALUE io_new_instance _((VALUE));
-static VALUE
-io_new_instance(args)
-    VALUE args;
-{
-    return rb_class_new_instance(2, (VALUE*)args+1, *(VALUE*)args);
-}
-
 static VALUE
-rb_io_s_pipe(klass)
-    VALUE klass;
+rb_io_s_pipe()
 {
 #ifndef __human68k__
-    int pipes[2], state;
-    VALUE r, w, args[3];
+    int pipes[2];
+    VALUE r, w, ary;
 
-#ifdef _WIN32
+#ifdef NT
     if (_pipe(pipes, 1024, O_BINARY) == -1)
 #else
     if (pipe(pipes) == -1)
 #endif
 	rb_sys_fail(0);
 
-    args[0] = klass;
-    args[1] = INT2NUM(pipes[0]);
-    args[2] = INT2FIX(O_RDONLY);
-    r = rb_protect(io_new_instance, (VALUE)args, &state);
-    if (state) {
-	close(pipes[0]);
-	close(pipes[1]);
-	rb_jump_tag(state);
-    }
-    args[1] = INT2NUM(pipes[1]);
-    args[2] = INT2FIX(O_WRONLY);
-    w = rb_protect(io_new_instance, (VALUE)args, &state);
-    if (state) {
-	close(pipes[1]);
-	if (!NIL_P(r)) rb_io_close(r);
-	rb_jump_tag(state);
-    }
-    rb_io_synchronized(RFILE(w)->fptr);
-
-    return rb_assoc_new(r, w);
+    r = prep_stdio(rb_fdopen(pipes[0], "r"), FMODE_READABLE, rb_cIO);
+    w = prep_stdio(rb_fdopen(pipes[1], "w"), FMODE_WRITABLE, rb_cIO);
+
+    ary = rb_ary_new2(2);
+    rb_ary_push(ary, r);
+    rb_ary_push(ary, w);
+
+    return ary;
 #else
     rb_notimplement();
     return Qnil;		/* not reached */
 #endif
 }
 
+static VALUE
+rb_f_pipe()
+{
+    rb_warn("pipe is obsolete; use IO::pipe instead");
+    return rb_io_s_pipe();
+}
+
 struct foreach_arg {
     int argc;
     VALUE sep;
     VALUE io;
-    OpenFile *fptr;
 };
 
 static VALUE
-io_s_foreach(arg)
+rb_io_foreach_line(arg)
     struct foreach_arg *arg;
 {
     VALUE str;
 
-    while (!NIL_P(str = rb_io_getline(arg->sep, arg->fptr))) {
+    while (!NIL_P(str = rb_io_gets_internal(arg->argc, &arg->sep, arg->io))) {
 	rb_yield(str);
     }
     return Qnil;
 }
 
 static VALUE
-rb_io_s_foreach(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    VALUE fname, io;
-    OpenFile *fptr;
-    struct foreach_arg arg;
-
-    rb_scan_args(argc, argv, "11", &fname, &arg.sep);
-    SafeStringValue(fname);
-
-    if (argc == 1) {
-	arg.sep = rb_default_rs;
-    }
-    io = rb_io_open(RSTRING(fname)->ptr, "r");
-    if (NIL_P(io)) return Qnil;
-    GetOpenFile(io, fptr);
-    arg.fptr = fptr;
-
-    return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, io);
-}
-
-static VALUE
-io_s_readlines(arg)
-    struct foreach_arg *arg;
-{
-    return rb_io_readlines(arg->argc, &arg->sep, arg->io);
-}
-
-static VALUE
-rb_io_s_readlines(argc, argv, io)
+rb_io_s_foreach(argc, argv, io)
     int argc;
     VALUE *argv;
     VALUE io;
@@ -3695,63 +2830,61 @@ rb_io_s_readlines(argc, argv, io)
     struct foreach_arg arg;
 
     rb_scan_args(argc, argv, "11", &fname, &arg.sep);
-    SafeStringValue(fname);
+    Check_SafeStr(fname);
 
     arg.argc = argc - 1;
     arg.io = rb_io_open(RSTRING(fname)->ptr, "r");
     if (NIL_P(arg.io)) return Qnil;
-    return rb_ensure(io_s_readlines, (VALUE)&arg, rb_io_close, arg.io);
+    return rb_ensure(rb_io_foreach_line, (VALUE)&arg, rb_io_close, arg.io);
 }
 
 static VALUE
-io_s_read(arg)
+rb_io_readline_line(arg)
     struct foreach_arg *arg;
 {
-    return io_read(arg->argc, &arg->sep, arg->io);
+    VALUE line, ary;
+
+    ary = rb_ary_new();
+    while (!NIL_P(line = rb_io_gets_internal(arg->argc, &arg->sep, arg->io))) {
+	rb_ary_push(ary, line);
+    }
+
+    return ary;
 }
 
 static VALUE
-rb_io_s_read(argc, argv, io)
+rb_io_s_readlines(argc, argv, io)
     int argc;
     VALUE *argv;
     VALUE io;
 {
-    VALUE fname, offset;
+    VALUE fname;
     struct foreach_arg arg;
 
-    rb_scan_args(argc, argv, "12", &fname, &arg.sep, &offset);
-    SafeStringValue(fname);
+    rb_scan_args(argc, argv, "11", &fname, &arg.sep);
+    Check_SafeStr(fname);
 
-    arg.argc = argc ? 1 : 0;
+    arg.argc = argc - 1;
     arg.io = rb_io_open(RSTRING(fname)->ptr, "r");
     if (NIL_P(arg.io)) return Qnil;
-    if (!NIL_P(offset)) {
-	rb_io_seek(arg.io, offset, SEEK_SET);
-    }
-    return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);
+    return rb_ensure(rb_io_readline_line, (VALUE)&arg, rb_io_close, arg.io);
 }
 
 static VALUE
 argf_tell()
 {
-    if (!next_argv()) {
-	rb_raise(rb_eArgError, "no stream to tell");
-    }
-    ARGF_FORWARD();
-    return rb_io_tell(current_file);
+    return rb_io_tell(file);
 }
 
 static VALUE
-argf_seek_m(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+argf_seek(self, offset, ptrname)
+     VALUE self, offset, ptrname;
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to seek");
     }
-    ARGF_FORWARD();
-    return rb_io_seek_m(argc, argv, current_file);
+
+    return rb_io_seek(file, offset, ptrname);
 }
 
 static VALUE
@@ -3759,38 +2892,28 @@ argf_set_pos(self, offset)
      VALUE self, offset;
 {
     if (!next_argv()) {
-	rb_raise(rb_eArgError, "no stream to set position");
+	rb_raise(rb_eArgError, "no stream to pos");
     }
-    ARGF_FORWARD();
-    return rb_io_set_pos(current_file, offset);
+
+    return rb_io_set_pos(file, offset);
 }
 
 static VALUE
 argf_rewind()
 {
-    if (!next_argv()) {
-	rb_raise(rb_eArgError, "no stream to rewind");
-    }
-    ARGF_FORWARD();
-    return rb_io_rewind(current_file);
+    return rb_io_rewind(file);
 }
 
 static VALUE
 argf_fileno()
 {
-    if (!next_argv()) {
-	rb_raise(rb_eArgError, "no stream");
-    }
-    ARGF_FORWARD();
-    return rb_io_fileno(current_file);
+    return rb_io_fileno(file);
 }
 
 static VALUE
 argf_to_io()
 {
-    next_argv();
-    ARGF_FORWARD();
-    return current_file;
+    return file;
 }
 
 static VALUE
@@ -3799,28 +2922,30 @@ argf_read(argc, argv)
     VALUE *argv;
 {
     VALUE tmp, str;
-    long len = 0;
+    int len;
 
-    if (argc == 1) len = NUM2LONG(argv[0]);
+    if (argc == 1) len = NUM2INT(argv[0]);
     str = Qnil;
 
   retry:
     if (!next_argv()) return str;
-    if (TYPE(current_file) != T_FILE) {
-	tmp = argf_forward();
-    }
-    else {
-	tmp = io_read(argc, argv, current_file);
-    }
+    tmp = io_read(argc, argv, file);
     if (NIL_P(tmp) && next_p != -1) {
-	argf_close(current_file);
+	rb_io_close(file);
 	next_p = 1;
-	if (argc == 0) goto retry;
+	goto retry;
     }
     if (NIL_P(tmp) || RSTRING(tmp)->len == 0) return str;
     else if (NIL_P(str)) str = tmp;
-    else rb_str_append(str, tmp);
-    if (argc == 0) goto retry;
+    else rb_str_cat(str, RSTRING(tmp)->ptr, RSTRING(tmp)->len);
+    if (argc == 0) {
+	goto retry;
+    }
+    if (RSTRING(tmp)->len < len) {
+	len -= RSTRING(tmp)->len;
+	argv[0] = INT2FIX(len);
+	goto retry;
+    }
 
     return str;
 }
@@ -3832,14 +2957,9 @@ argf_getc()
 
   retry:
     if (!next_argv()) return Qnil;
-    if (TYPE(current_file) != T_FILE) {
-	byte = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
-    }
-    else {
-	byte = rb_io_getc(current_file);
-    }
+    byte = rb_io_getc(file);
     if (NIL_P(byte) && next_p != -1) {
-	argf_close(current_file);
+	rb_io_close(file);
 	next_p = 1;
 	goto retry;
     }
@@ -3850,10 +2970,8 @@ argf_getc()
 static VALUE
 argf_readchar()
 {
-    VALUE c;
+    VALUE c = rb_io_getc(file);
 
-    NEXT_ARGF_FORWARD();
-    c = argf_getc();
     if (NIL_P(c)) {
 	rb_eof_error();
     }
@@ -3863,33 +2981,30 @@ argf_readchar()
 static VALUE
 argf_eof()
 {
-    if (current_file) {
-	if (init_p == 0) return Qtrue;
-	ARGF_FORWARD();
-	if (rb_io_eof(current_file)) {
-	    next_p = 1;
-	    return Qtrue;
-	}
+    if (init_p == 0 && !next_argv())
+	return Qtrue;
+    if (rb_io_eof(file)) {
+	next_p = 1;
+	return Qtrue;
     }
     return Qfalse;
 }
 
 static VALUE
+rb_f_eof()
+{
+    rb_warn("eof? is obsolete; use ARGF.eof? instead");
+    return argf_eof();
+}
+
+static VALUE
 argf_each_line(argc, argv)
     int argc;
     VALUE *argv;
 {
     VALUE str;
 
-    if (!next_argv()) return Qnil;
-    if (TYPE(current_file) != T_FILE) {
-	for (;;) {
-	    if (!next_argv()) return argf;
-	    rb_iterate(rb_each, current_file, rb_yield, 0);
-	    next_p = 1;
-	}
-    }
-    while (!NIL_P(str = argf_getline(argc, argv))) {
+    while (RTEST(str = rb_f_gets_internal(argc, argv))) {
 	rb_yield(str);
     }
     return argf;
@@ -3909,42 +3024,29 @@ argf_each_byte()
 static VALUE
 argf_filename()
 {
-    next_argv();
     return filename;
 }
 
 static VALUE
 argf_file()
 {
-    next_argv();
-    return current_file;
-}
-
-static VALUE
-argf_binmode()
-{
-    binmode = 1;
-    next_argv();
-    ARGF_FORWARD();
-    rb_io_binmode(current_file);
-    return argf;
+    return file;
 }
 
 static VALUE
 argf_skip()
 {
     if (next_p != -1) {
-	argf_close(current_file);
+	rb_io_close(file);
 	next_p = 1;
     }
     return argf;
 }
 
 static VALUE
-argf_close_m()
+argf_close()
 {
-    next_argv();
-    argf_close(current_file);
+    rb_io_close(file);
     if (next_p != -1) {
 	next_p = 1;
     }
@@ -3955,15 +3057,7 @@ argf_close_m()
 static VALUE
 argf_closed()
 {
-    next_argv();
-    ARGF_FORWARD();
-    return rb_io_closed(current_file);
-}
-
-static VALUE
-argf_to_s()
-{
-    return rb_str_new2("ARGF");
+    return rb_io_closed(file);
 }
 
 static VALUE
@@ -3978,54 +3072,38 @@ opt_i_set(val)
     VALUE val;
 {
     if (!RTEST(val)) {
-	if (ruby_inplace_mode) free(ruby_inplace_mode);
 	ruby_inplace_mode = 0;
 	return;
     }
-    StringValue(val);
-    if (ruby_inplace_mode) free(ruby_inplace_mode);
-    ruby_inplace_mode = 0;
-    ruby_inplace_mode = strdup(RSTRING(val)->ptr);
+    ruby_inplace_mode = STR2CSTR(val);
 }
 
 void
 Init_IO()
 {
-#ifdef __CYGWIN__ 
-#include <sys/cygwin.h>
-    static struct __cygwin_perfile pf[] =
-    {
-	{"", O_RDONLY | O_BINARY},
-	{"", O_WRONLY | O_BINARY},
-	{"", O_RDWR | O_BINARY},
-	{"", O_APPEND | O_BINARY},
-	{NULL, 0}
-    };
-    cygwin_internal(CW_PERFILE, pf);
-#endif
-
     rb_eIOError = rb_define_class("IOError", rb_eStandardError);
     rb_eEOFError = rb_define_class("EOFError", rb_eIOError);
 
     id_write = rb_intern("write");
-    id_read = rb_intern("read");
-    id_getc = rb_intern("getc");
 
     rb_define_global_function("syscall", rb_f_syscall, -1);
 
     rb_define_global_function("open", rb_f_open, -1);
-    rb_define_global_function("printf", rb_f_printf, -1);
+    rb_define_global_function("printf", rb_rb_f_printf, -1);
     rb_define_global_function("print", rb_f_print, -1);
     rb_define_global_function("putc", rb_f_putc, 1);
     rb_define_global_function("puts", rb_f_puts, -1);
     rb_define_global_function("gets", rb_f_gets, -1);
     rb_define_global_function("readline", rb_f_readline, -1);
+    rb_define_global_function("eof", rb_f_eof, 0);
+    rb_define_global_function("eof?", rb_f_eof, 0);
     rb_define_global_function("getc", rb_f_getc, 0);
     rb_define_global_function("select", rb_f_select, -1);
 
     rb_define_global_function("readlines", rb_f_readlines, -1);
 
     rb_define_global_function("`", rb_f_backquote, 1);
+    rb_define_global_function("pipe", rb_f_pipe, 0);
 
     rb_define_global_function("p", rb_f_p, -1);
     rb_define_method(rb_mKernel, "display", rb_obj_display, -1);
@@ -4033,27 +3111,21 @@ Init_IO()
     rb_cIO = rb_define_class("IO", rb_cObject);
     rb_include_module(rb_cIO, rb_mEnumerable);
 
-    rb_define_alloc_func(rb_cIO, io_alloc);
     rb_define_singleton_method(rb_cIO, "new", rb_io_s_new, -1);
-    rb_define_singleton_method(rb_cIO, "open",  rb_io_s_open, -1);
-    rb_define_singleton_method(rb_cIO, "sysopen",  rb_io_s_sysopen, -1);
-    rb_define_singleton_method(rb_cIO, "for_fd", rb_io_s_for_fd, -1);
     rb_define_singleton_method(rb_cIO, "popen", rb_io_s_popen, -1);
     rb_define_singleton_method(rb_cIO, "foreach", rb_io_s_foreach, -1);
     rb_define_singleton_method(rb_cIO, "readlines", rb_io_s_readlines, -1);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
     rb_define_singleton_method(rb_cIO, "select", rb_f_select, -1);
     rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, 0);
 
-    rb_define_method(rb_cIO, "initialize", rb_io_initialize, -1);
-
-    rb_output_fs = Qnil;
+    rb_fs = rb_output_fs = Qnil;
+    rb_define_hooked_variable("$;", &rb_fs, 0, rb_str_setter);
+    rb_define_hooked_variable("$-F", &rb_fs, 0, rb_str_setter);
     rb_define_hooked_variable("$,", &rb_output_fs, 0, rb_str_setter);
 
-    rb_rs = rb_default_rs = rb_str_new2("\n");
-    rb_output_rs = Qnil;
+    rb_rs = rb_default_rs = rb_str_new2("\n"); rb_output_rs = Qnil;
     rb_global_variable(&rb_default_rs);
-    OBJ_FREEZE(rb_default_rs);	/* avoid modifying RS_default */
+    rb_str_freeze(rb_default_rs);	/* avoid modifying RS_default */
     rb_define_hooked_variable("$/", &rb_rs, 0, rb_str_setter);
     rb_define_hooked_variable("$-0", &rb_rs, 0, rb_str_setter);
     rb_define_hooked_variable("$\\", &rb_output_rs, 0, rb_str_setter);
@@ -4061,8 +3133,8 @@ Init_IO()
     rb_define_hooked_variable("$.", &lineno, 0, lineno_setter);
     rb_define_virtual_variable("$_", rb_lastline_get, rb_lastline_set);
 
-    rb_define_method(rb_cIO, "initialize_copy", rb_io_init_copy, 1);
-    rb_define_method(rb_cIO, "reopen", rb_io_reopen, -1);
+    rb_define_method(rb_cIO, "clone", rb_io_clone, 0);
+    rb_define_method(rb_cIO, "reopen", rb_io_reopen, 1);
 
     rb_define_method(rb_cIO, "print", rb_io_print, -1);
     rb_define_method(rb_cIO, "putc", rb_io_putc, 1);
@@ -4074,13 +3146,12 @@ Init_IO()
     rb_define_method(rb_cIO, "each_byte",  rb_io_each_byte, 0);
 
     rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1);
-    rb_define_method(rb_cIO, "sysread",  rb_io_sysread, -1);
+    rb_define_method(rb_cIO, "sysread",  rb_io_sysread, 1);
 
     rb_define_method(rb_cIO, "fileno", rb_io_fileno, 0);
     rb_define_alias(rb_cIO, "to_i", "fileno");
     rb_define_method(rb_cIO, "to_io", rb_io_to_io, 0);
 
-    rb_define_method(rb_cIO, "fsync",   rb_io_fsync, 0);
     rb_define_method(rb_cIO, "sync",   rb_io_sync, 0);
     rb_define_method(rb_cIO, "sync=",  rb_io_set_sync, 1);
 
@@ -4091,7 +3162,7 @@ Init_IO()
 
     rb_define_method(rb_cIO, "read",  io_read, -1);
     rb_define_method(rb_cIO, "write", io_write, 1);
-    rb_define_method(rb_cIO, "gets",  rb_io_gets_m, -1);
+    rb_define_method(rb_cIO, "gets",  rb_io_gets_method, -1);
     rb_define_method(rb_cIO, "readline",  rb_io_readline, -1);
     rb_define_method(rb_cIO, "getc",  rb_io_getc, 0);
     rb_define_method(rb_cIO, "readchar",  rb_io_readchar, 0);
@@ -4099,17 +3170,17 @@ Init_IO()
     rb_define_method(rb_cIO, "<<",    rb_io_addstr, 1);
     rb_define_method(rb_cIO, "flush", rb_io_flush, 0);
     rb_define_method(rb_cIO, "tell", rb_io_tell, 0);
-    rb_define_method(rb_cIO, "seek", rb_io_seek_m, -1);
-    rb_define_const(rb_cIO, "SEEK_SET", INT2FIX(SEEK_SET));
-    rb_define_const(rb_cIO, "SEEK_CUR", INT2FIX(SEEK_CUR));
-    rb_define_const(rb_cIO, "SEEK_END", INT2FIX(SEEK_END));
+    rb_define_method(rb_cIO, "seek", rb_io_seek, 2);
+    rb_define_const(rb_cIO, "SEEK_SET", SEEK_SET);
+    rb_define_const(rb_cIO, "SEEK_CUR", SEEK_CUR);
+    rb_define_const(rb_cIO, "SEEK_END", SEEK_END);
     rb_define_method(rb_cIO, "rewind", rb_io_rewind, 0);
     rb_define_method(rb_cIO, "pos", rb_io_tell, 0);
     rb_define_method(rb_cIO, "pos=", rb_io_set_pos, 1);
     rb_define_method(rb_cIO, "eof", rb_io_eof, 0);
     rb_define_method(rb_cIO, "eof?", rb_io_eof, 0);
 
-    rb_define_method(rb_cIO, "close", rb_io_close_m, 0);
+    rb_define_method(rb_cIO, "close", rb_io_close_method, 0);
     rb_define_method(rb_cIO, "closed?", rb_io_closed, 0);
     rb_define_method(rb_cIO, "close_read", rb_io_close_read, 0);
     rb_define_method(rb_cIO, "close_write", rb_io_close_write, 0);
@@ -4117,28 +3188,19 @@ Init_IO()
     rb_define_method(rb_cIO, "isatty", rb_io_isatty, 0);
     rb_define_method(rb_cIO, "tty?", rb_io_isatty, 0);
     rb_define_method(rb_cIO, "binmode",  rb_io_binmode, 0);
-    rb_define_method(rb_cIO, "sysseek", rb_io_sysseek, -1);
 
     rb_define_method(rb_cIO, "ioctl", rb_io_ioctl, -1);
     rb_define_method(rb_cIO, "fcntl", rb_io_fcntl, -1);
-    rb_define_method(rb_cIO, "pid", rb_io_pid, 0);
-    rb_define_method(rb_cIO, "inspect",  rb_io_inspect, 0);
 
     rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO);
-    rb_define_variable("$stdin", &rb_stdin);
+    rb_define_hooked_variable("$stdin", &rb_stdin, 0, set_stdin);
     rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO);
-    rb_define_hooked_variable("$stdout", &rb_stdout, 0, stdout_setter);
+    rb_define_hooked_variable("$stdout", &rb_stdout, 0, set_stdout);
     rb_stderr = prep_stdio(stderr, FMODE_WRITABLE, rb_cIO);
-    rb_define_hooked_variable("$stderr", &rb_stderr, 0, stdout_setter);
-    rb_define_hooked_variable("$>", &rb_stdout, 0, stdout_setter);
-    orig_stdout = rb_stdout;
-    rb_deferr = orig_stderr = rb_stderr;
+    rb_define_hooked_variable("$stderr", &rb_stderr, 0, set_stderr);
+    rb_defout = rb_stdout;
+    rb_define_hooked_variable("$>", &rb_defout, 0, rb_io_defset);
 
-    /* variables to be removed in 1.8.1 */
-    rb_define_hooked_variable("$defout", &rb_stdout, 0, defout_setter);
-    rb_define_hooked_variable("$deferr", &rb_stderr, 0, deferr_setter);
-
-    /* constants to hold original stdin/stdout/stderr */
     rb_define_global_const("STDIN", rb_stdin);
     rb_define_global_const("STDOUT", rb_stdout);
     rb_define_global_const("STDERR", rb_stderr);
@@ -4149,8 +3211,6 @@ Init_IO()
     rb_define_readonly_variable("$<", &argf);
     rb_define_global_const("ARGF", argf);
 
-    rb_define_singleton_method(argf, "to_s", argf_to_s, 0);
-
     rb_define_singleton_method(argf, "fileno", argf_fileno, 0);
     rb_define_singleton_method(argf, "to_i", argf_fileno, 0);
     rb_define_singleton_method(argf, "to_io", argf_to_io, 0);
@@ -4166,7 +3226,7 @@ Init_IO()
     rb_define_singleton_method(argf, "getc", argf_getc, 0);
     rb_define_singleton_method(argf, "readchar", argf_readchar, 0);
     rb_define_singleton_method(argf, "tell", argf_tell, 0);
-    rb_define_singleton_method(argf, "seek", argf_seek_m, -1);
+    rb_define_singleton_method(argf, "seek", argf_seek, 2);
     rb_define_singleton_method(argf, "rewind", argf_rewind, 0);
     rb_define_singleton_method(argf, "pos", argf_tell, 0);
     rb_define_singleton_method(argf, "pos=", argf_set_pos, 1);
@@ -4174,29 +3234,33 @@ Init_IO()
     rb_define_singleton_method(argf, "eof?", argf_eof, 0);
     rb_define_singleton_method(argf, "binmode", argf_binmode, 0);
 
+    rb_define_singleton_method(argf, "to_s", argf_filename, 0);
     rb_define_singleton_method(argf, "filename", argf_filename, 0);
-    rb_define_singleton_method(argf, "path", argf_filename, 0);
     rb_define_singleton_method(argf, "file", argf_file, 0);
     rb_define_singleton_method(argf, "skip", argf_skip, 0);
-    rb_define_singleton_method(argf, "close", argf_close_m, 0);
+    rb_define_singleton_method(argf, "close", argf_close, 0);
     rb_define_singleton_method(argf, "closed?", argf_closed, 0);
 
     rb_define_singleton_method(argf, "lineno",   argf_lineno, 0);
     rb_define_singleton_method(argf, "lineno=",  argf_set_lineno, 1);
 
-    rb_global_variable(&current_file);
+    file = rb_stdin;
+    rb_global_variable(&file);
     filename = rb_str_new2("-");
     rb_define_readonly_variable("$FILENAME", &filename);
 
     rb_define_virtual_variable("$-i", opt_i_get, opt_i_set);
 
-#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__)
+#if defined (NT) || defined(DJGPP) || defined(__CYGWIN32__) || defined(__human68k__)
     atexit(pipe_atexit);
 #endif
 
     Init_File();
 
-    rb_define_method(rb_cFile, "initialize",  rb_file_initialize, -1);
+    rb_define_method(rb_cFile, "reopen",  rb_file_reopen, -1);
+
+    rb_define_singleton_method(rb_cFile, "new",  rb_file_s_open, -1);
+    rb_define_singleton_method(rb_cFile, "open",  rb_file_s_open, -1);
 
     rb_file_const("RDONLY", INT2FIX(O_RDONLY));
     rb_file_const("WRONLY", INT2FIX(O_WRONLY));
@@ -4218,7 +3282,4 @@ Init_IO()
 #ifdef O_BINARY
     rb_file_const("BINARY", INT2FIX(O_BINARY));
 #endif
-#ifdef O_SYNC
-    rb_file_const("SYNC", INT2FIX(O_SYNC));
-#endif
 }
diff --git a/keywords b/keywords
index 04be992857..1772de42b0 100644
--- a/keywords
+++ b/keywords
@@ -1,42 +1,42 @@
 struct kwtable {char *name; int id[2]; enum lex_state state;};
 %%
-__LINE__, {k__LINE__, k__LINE__}, EXPR_END
-__FILE__, {k__FILE__, k__FILE__}, EXPR_END
-BEGIN, {klBEGIN, klBEGIN}, EXPR_END
-END, {klEND, klEND}, EXPR_END
-alias, {kALIAS, kALIAS}, EXPR_FNAME
-and, {kAND, kAND}, EXPR_BEG
-begin, {kBEGIN, kBEGIN}, EXPR_BEG
-break, {kBREAK, kBREAK}, EXPR_MID
-case, {kCASE, kCASE}, EXPR_BEG
-class, {kCLASS, kCLASS}, EXPR_CLASS
-def, {kDEF, kDEF}, EXPR_FNAME
-defined?, {kDEFINED, kDEFINED}, EXPR_ARG
-do, {kDO, kDO}, EXPR_BEG
-else, {kELSE, kELSE}, EXPR_BEG
-elsif, {kELSIF, kELSIF}, EXPR_BEG
-end, {kEND, kEND}, EXPR_END
-ensure, {kENSURE, kENSURE}, EXPR_BEG
-false, {kFALSE, kFALSE}, EXPR_END
-for, {kFOR, kFOR}, EXPR_BEG
-if, {kIF, kIF_MOD}, EXPR_BEG
-in, {kIN, kIN}, EXPR_BEG
-module, {kMODULE, kMODULE}, EXPR_BEG
-next, {kNEXT, kNEXT}, EXPR_MID
-nil, {kNIL, kNIL}, EXPR_END
-not, {kNOT, kNOT}, EXPR_BEG
-or, {kOR, kOR}, EXPR_BEG
-redo, {kREDO, kREDO}, EXPR_END
-rescue, {kRESCUE, kRESCUE_MOD}, EXPR_MID
-retry, {kRETRY, kRETRY}, EXPR_END
-return, {kRETURN, kRETURN}, EXPR_MID
-self, {kSELF, kSELF}, EXPR_END
-super, {kSUPER, kSUPER}, EXPR_ARG
-then, {kTHEN, kTHEN}, EXPR_BEG
-true, {kTRUE, kTRUE}, EXPR_END
-undef, {kUNDEF, kUNDEF}, EXPR_FNAME
-unless, {kUNLESS, kUNLESS_MOD}, EXPR_BEG
-until, {kUNTIL, kUNTIL_MOD}, EXPR_BEG
-when, {kWHEN, kWHEN}, EXPR_BEG
-while, {kWHILE, kWHILE_MOD}, EXPR_BEG
-yield, {kYIELD, kYIELD}, EXPR_ARG
+__LINE__, k__LINE__, k__LINE__, EXPR_END
+__FILE__, k__FILE__, k__FILE__, EXPR_END
+BEGIN, klBEGIN, klBEGIN, EXPR_END
+END, klEND, klEND, EXPR_END
+alias, kALIAS, kALIAS, EXPR_FNAME
+and, kAND, kAND, EXPR_BEG
+begin, kBEGIN, kBEGIN, EXPR_BEG
+break, kBREAK, kBREAK, EXPR_END
+case, kCASE, kCASE, EXPR_BEG
+class, kCLASS, kCLASS, EXPR_CLASS
+def, kDEF, kDEF, EXPR_FNAME
+defined?, kDEFINED, kDEFINED, EXPR_END
+do, kDO, kDO, EXPR_BEG
+else, kELSE, kELSE, EXPR_BEG
+elsif, kELSIF, kELSIF, EXPR_BEG
+end, kEND, kEND, EXPR_END
+ensure, kENSURE, kENSURE, EXPR_BEG
+false, kFALSE, kFALSE, EXPR_END
+for, kFOR, kFOR, EXPR_BEG
+if, kIF, kIF_MOD, EXPR_BEG
+in, kIN, kIN, EXPR_BEG
+module, kMODULE, kMODULE, EXPR_BEG
+next, kNEXT, kNEXT, EXPR_END
+nil, kNIL, kNIL, EXPR_END
+not, kNOT, kNOT, EXPR_BEG
+or, kOR, kOR, EXPR_BEG
+redo, kREDO, kREDO, EXPR_END
+rescue, kRESCUE, kRESCUE, EXPR_MID
+retry, kRETRY, kRETRY, EXPR_END
+return, kRETURN, kRETURN, EXPR_MID
+self, kSELF, kSELF, EXPR_END
+super, kSUPER, kSUPER, EXPR_END
+then, kTHEN, kTHEN, EXPR_BEG
+true, kTRUE, kTRUE, EXPR_END
+undef, kUNDEF, kUNDEF, EXPR_FNAME
+unless, kUNLESS, kUNLESS_MOD, EXPR_BEG
+until, kUNTIL, kUNTIL_MOD, EXPR_BEG
+when, kWHEN, kWHEN, EXPR_BEG
+while, kWHILE, kWHILE_MOD, EXPR_BEG
+yield, kYIELD, kYIELD, EXPR_END
diff --git a/lex.c b/lex.c
index 79d9448dae..62e1ef6f61 100644
--- a/lex.c
+++ b/lex.c
@@ -1,5 +1,5 @@
-/* C code produced by gperf version 2.7.2 */
-/* Command-line: gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' ./keywords  */
+/* C code produced by gperf version 2.7.1 (19981006 egcs) */
+/* Command-line: gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$ ./keywords  */
 struct kwtable {char *name; int id[2]; enum lex_state state;};
 
 #define TOTAL_KEYWORDS 40
@@ -11,10 +11,6 @@ struct kwtable {char *name; int id[2]; enum lex_state state;};
 
 #ifdef __GNUC__
 __inline
-#else
-#ifdef __cplusplus
-inline
-#endif
 #endif
 static unsigned int
 hash (str, len)
@@ -76,48 +72,48 @@ rb_reserved_word (str, len)
   static struct kwtable wordlist[] =
     {
       {""}, {""}, {""}, {""}, {""}, {""},
-      {"end", {kEND, kEND}, EXPR_END},
-      {"else", {kELSE, kELSE}, EXPR_BEG},
-      {"case", {kCASE, kCASE}, EXPR_BEG},
-      {"ensure", {kENSURE, kENSURE}, EXPR_BEG},
-      {"module", {kMODULE, kMODULE}, EXPR_BEG},
-      {"elsif", {kELSIF, kELSIF}, EXPR_BEG},
-      {"def", {kDEF, kDEF}, EXPR_FNAME},
-      {"rescue", {kRESCUE, kRESCUE_MOD}, EXPR_MID},
-      {"not", {kNOT, kNOT}, EXPR_BEG},
-      {"then", {kTHEN, kTHEN}, EXPR_BEG},
-      {"yield", {kYIELD, kYIELD}, EXPR_ARG},
-      {"for", {kFOR, kFOR}, EXPR_BEG},
-      {"self", {kSELF, kSELF}, EXPR_END},
-      {"false", {kFALSE, kFALSE}, EXPR_END},
-      {"retry", {kRETRY, kRETRY}, EXPR_END},
-      {"return", {kRETURN, kRETURN}, EXPR_MID},
-      {"true", {kTRUE, kTRUE}, EXPR_END},
-      {"if", {kIF, kIF_MOD}, EXPR_BEG},
-      {"defined?", {kDEFINED, kDEFINED}, EXPR_ARG},
-      {"super", {kSUPER, kSUPER}, EXPR_ARG},
-      {"undef", {kUNDEF, kUNDEF}, EXPR_FNAME},
-      {"break", {kBREAK, kBREAK}, EXPR_MID},
-      {"in", {kIN, kIN}, EXPR_BEG},
-      {"do", {kDO, kDO}, EXPR_BEG},
-      {"nil", {kNIL, kNIL}, EXPR_END},
-      {"until", {kUNTIL, kUNTIL_MOD}, EXPR_BEG},
-      {"unless", {kUNLESS, kUNLESS_MOD}, EXPR_BEG},
-      {"or", {kOR, kOR}, EXPR_BEG},
-      {"next", {kNEXT, kNEXT}, EXPR_MID},
-      {"when", {kWHEN, kWHEN}, EXPR_BEG},
-      {"redo", {kREDO, kREDO}, EXPR_END},
-      {"and", {kAND, kAND}, EXPR_BEG},
-      {"begin", {kBEGIN, kBEGIN}, EXPR_BEG},
-      {"__LINE__", {k__LINE__, k__LINE__}, EXPR_END},
-      {"class", {kCLASS, kCLASS}, EXPR_CLASS},
-      {"__FILE__", {k__FILE__, k__FILE__}, EXPR_END},
-      {"END", {klEND, klEND}, EXPR_END},
-      {"BEGIN", {klBEGIN, klBEGIN}, EXPR_END},
-      {"while", {kWHILE, kWHILE_MOD}, EXPR_BEG},
+      {"end", kEND, kEND, EXPR_END},
+      {"else", kELSE, kELSE, EXPR_BEG},
+      {"case", kCASE, kCASE, EXPR_BEG},
+      {"ensure", kENSURE, kENSURE, EXPR_BEG},
+      {"module", kMODULE, kMODULE, EXPR_BEG},
+      {"elsif", kELSIF, kELSIF, EXPR_BEG},
+      {"def", kDEF, kDEF, EXPR_FNAME},
+      {"rescue", kRESCUE, kRESCUE, EXPR_MID},
+      {"not", kNOT, kNOT, EXPR_BEG},
+      {"then", kTHEN, kTHEN, EXPR_BEG},
+      {"yield", kYIELD, kYIELD, EXPR_END},
+      {"for", kFOR, kFOR, EXPR_BEG},
+      {"self", kSELF, kSELF, EXPR_END},
+      {"false", kFALSE, kFALSE, EXPR_END},
+      {"retry", kRETRY, kRETRY, EXPR_END},
+      {"return", kRETURN, kRETURN, EXPR_MID},
+      {"true", kTRUE, kTRUE, EXPR_END},
+      {"if", kIF, kIF_MOD, EXPR_BEG},
+      {"defined?", kDEFINED, kDEFINED, EXPR_END},
+      {"super", kSUPER, kSUPER, EXPR_END},
+      {"undef", kUNDEF, kUNDEF, EXPR_FNAME},
+      {"break", kBREAK, kBREAK, EXPR_END},
+      {"in", kIN, kIN, EXPR_BEG},
+      {"do", kDO, kDO, EXPR_BEG},
+      {"nil", kNIL, kNIL, EXPR_END},
+      {"until", kUNTIL, kUNTIL_MOD, EXPR_BEG},
+      {"unless", kUNLESS, kUNLESS_MOD, EXPR_BEG},
+      {"or", kOR, kOR, EXPR_BEG},
+      {"next", kNEXT, kNEXT, EXPR_END},
+      {"when", kWHEN, kWHEN, EXPR_BEG},
+      {"redo", kREDO, kREDO, EXPR_END},
+      {"and", kAND, kAND, EXPR_BEG},
+      {"begin", kBEGIN, kBEGIN, EXPR_BEG},
+      {"__LINE__", k__LINE__, k__LINE__, EXPR_END},
+      {"class", kCLASS, kCLASS, EXPR_CLASS},
+      {"__FILE__", k__FILE__, k__FILE__, EXPR_END},
+      {"END", klEND, klEND, EXPR_END},
+      {"BEGIN", klBEGIN, klBEGIN, EXPR_END},
+      {"while", kWHILE, kWHILE_MOD, EXPR_BEG},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""},
-      {"alias", {kALIAS, kALIAS}, EXPR_FNAME}
+      {"alias", kALIAS, kALIAS, EXPR_FNAME}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/lib/English.rb b/lib/English.rb
index 625b035270..c7e13bebe6 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -1,3 +1,4 @@
+
 alias $ERROR_INFO              $!
 alias $ERROR_POSITION          $@
 alias $LOADED_FEATURES         $"
@@ -8,7 +9,7 @@ alias $OUTPUT_FIELD_SEPARATOR  $,
 alias $RS                      $/
 alias $INPUT_RECORD_SEPARATOR  $/
 alias $ORS                     $\
-alias $OUTPUT_RECORD_SEPARATOR $\
+alias $OUPUT_RECORD_SEPARATOR  $\
 alias $INPUT_LINE_NUMBER       $.
 alias $NR                      $.
 alias $LAST_READ_LINE          $_
diff --git a/lib/Env.rb b/lib/Env.rb
index 452a28659e..b3ee3bae8a 100644
--- a/lib/Env.rb
+++ b/lib/Env.rb
@@ -1,4 +1,5 @@
-# Env.rb -- imports environment variables as global variables, Perlish ;(
+# Env.rb -- imports environment variables as global variables
+#
 # Usage:
 #
 #  require 'Env'
@@ -6,7 +7,19 @@
 #  $USER = "matz"
 #  p ENV["USER"]
 
-require 'importenv'
+for k,v in ENV
+  next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k
+  eval <<EOS
+  $#{k} = %q!#{v}!
+  trace_var "$#{k}", proc{|v|
+    ENV[%q!#{k}!] = v; 
+    $#{k} = %q!#{v}!
+    if v == nil
+      untrace_var "$#{k}"
+    end
+  }
+EOS
+end
 
 if __FILE__ == $0
   p $TERM
diff --git a/lib/README b/lib/README
index 2a3e3083ca..765c380f7d 100644
--- a/lib/README
+++ b/lib/README
@@ -1,95 +1,48 @@
-English.rb	lets Perl'ish global variables have English names
-Env.rb		loads importenv.rb
+English.rb	access global variables by english names
+Env.rb		access environment variables as globals
 README		this file
-base64.rb	encodes/decodes base64 (obsolete)
-benchmark.rb	a benchmark utility
-cgi-lib.rb	simple CGI support library (old style)
-cgi.rb		CGI support library
-cgi/session.rb	CGI session class
+base64.rb	encode/decode base64 (obsolete)
+cgi-lib.rb	decode CGI data
 complex.rb	complex number suppor
-csv.rb		CSV parser/generator
-date.rb		date object
-date/format.rb	date parsing and formatting
-date2.rb	date object (obsolete; use date)
+date.rb		date object (compatible)
+date2.rb	yet another (better) date object
 debug.rb	ruby debugger
-delegate.rb	delegates messages to other object
-drb.rb		distributed Ruby
+delegate.rb	delegate messages to other object
 e2mmap.rb	exception utilities
-erb.rb		tiny eRuby library
 eregex.rb	extended regular expression (just a proof of concept)
-fileutils.rb	file utilities
-finalize.rb	adds finalizer to the object
-find.rb		traverses directory tree
-forwardable.rb	explicit delegation library
+final.rb	add finalizer to the object (simple)
+finalize.rb	add finalizer to the object
+find.rb		traverse directory tree
 ftools.rb	file tools
+ftplib.rb	ftp access library
 getoptlong.rb	GNU getoptlong compatible
-getopts.rb	parses command line options (use getoptlong)
-gserver.rb	general TCP server
-importenv.rb	imports environment variables as global variables
-ipaddr.rb	defines the IPAddr class
-irb.rb		interactive ruby
-jcode.rb	Japanese text handling (replace String methods)
-logger.rb	simple logging utility
-mailread.rb	reads mail headers
+getopts.rb	parse command line options
+importenv.rb	access environment variables as globals
+jcode.rb	japanese text handling (replace String methods)
+mailread.rb	read mail headers
 mathn.rb	extended math operation
 matrix.rb	matrix calculation library
 mkmf.rb		Makefile maker
 monitor.rb	exclusive region monitor for thread
 mutex_m.rb	mutex mixin
-net/ftp.rb	ftp access
-net/http.rb	HTTP access
-net/imap.rb	IMAP4 access
-net/pop.rb	POP3 access
-net/protocol.rb	abstract class for net library (DO NOT USE)
-net/smtp.rb	SMTP access
-net/telnet.rb	telnet library
 observer.rb	observer desing pattern library (provides Observable)
-open-uri.rb	easy-to-use network interface using URI and Net
-open3.rb	opens subprocess connection stdin/stdout/stderr
-optparse.rb	command line option analysis
+open3.rb	open subprocess connection stdin/stdout/stderr
 ostruct.rb	python style object
 parsearg.rb	argument parser using getopts
-parsedate.rb	parses date string
-pathname.rb	Object-Oriented Pathname Class
-ping.rb		checks whether host is up, using TCP echo.
-pp.rb		pretty print objects
-prettyprint.rb	pretty printing algorithm
-profile.rb	runs ruby profiler
-profiler.rb	ruby profiler module
+parsedate.rb	parse date string
+ping.rb		check whether host is up, using TCP echo.
+profile.rb	ruby profiler
 pstore.rb	persistent object strage using marshal
-racc/parser.rb	racc (Ruby yACC) runtime
 rational.rb	rational number support
 readbytes.rb	define IO#readbytes
-resolv-replace.rb	replace Socket DNS by resolve.rb
-resolv.rb	DNS resolver in Ruby
-rexml		an XML parser for Ruby, in Ruby
-rubyunit.rb	original Ruby Unit testing framework
-scanf.rb	scanf for Ruby
-set.rb		defines the Set class
-shell.rb	runs commands and does pipeline operations like shell
+shell.rb	shell like operation under Ruby (imcomplete)
 shellwords.rb	split into words like shell
 singleton.rb	singleton design pattern library
-soap		SOAP 1.1 implementation
 sync.rb		2 phase lock
-tempfile.rb	temporary file with automatic removal
-test/unit	Ruby Unit Testing Framework
+telnet.rb	telnet library
+tempfile.rb	temporary file that automatically removed
 thread.rb	thread support
 thwait.rb	thread syncronization class
-time.rb		RFC2822, RFC2616, ISO8601 style time formatting/parsing
-timeout.rb	provides timeout
-tmpdir.rb	retrieve temporary directory path
+timeout.rb	provids timeout
 tracer.rb	execution tracer
-tsort.rb	topological sorting
-un.rb		Utilities to replace common UNIX commands in Makefiles etc
-uri.rb		URI support
-uri/ftp.rb	ftp scheme support
-uri/http.rb	http scheme support
-uri/https.rb	https scheme support
-uri/ldap.rb	ldap scheme support
-uri/mailto.rb	mailto scheme support
 weakref.rb	weak reference class
-webrick.rb	WEB server toolkit
-wsdl		WSDL 1.1 implementation
-xmlrpc		XML-RPC implementation
-xsd		XML Schema Datatypes implementation
-yaml.rb		YAML implementation
diff --git a/lib/abbrev.rb b/lib/abbrev.rb
deleted file mode 100644
index 9cd3a71e40..0000000000
--- a/lib/abbrev.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
-#
-# All rights reserved.  You can redistribute and/or modify it under
-# the same terms as Ruby.
-#
-# $Idaemons: /home/cvs/rb/abbrev.rb,v 1.2 2001/05/30 09:37:45 knu Exp $
-# $RoughId: abbrev.rb,v 1.4 2003/10/14 19:45:42 knu Exp $
-# $Id$
-
-module Abbrev
-  def abbrev(words, pattern = nil)
-    table = {}
-    seen = Hash.new(0)
-
-    if pattern.is_a?(String)
-      pattern = /^#{Regexp.quote(pattern)}/	# regard as a prefix
-    end
-
-    words.each do |word|
-      next if (abbrev = word).empty?
-      while (len = abbrev.rindex(/[\w\W]\z/)) > 0
-	abbrev = word[0,len]
-
-	next if pattern && pattern !~ abbrev
-
-	case seen[abbrev] += 1
-	when 1
-	  table[abbrev] = word
-	when 2
-	  table.delete(abbrev)
-	else
-	  break
-	end
-      end
-    end
-
-    words.each do |word|
-      next if pattern && pattern !~ word
-
-      table[word] = word
-    end
-
-    table
-  end
-
-  module_function :abbrev
-end
-
-class Array
-  def abbrev(pattern = nil)
-    Abbrev::abbrev(self, pattern)
-  end
-end
-
-if $0 == __FILE__
-  while line = gets
-    hash = line.split.abbrev
-
-    hash.sort.each do |k, v|
-      puts "#{k} => #{v}"
-    end
-  end
-end
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
deleted file mode 100644
index c5d1cecc4d..0000000000
--- a/lib/benchmark.rb
+++ /dev/null
@@ -1,604 +0,0 @@
-#
-# benchmark.rb - a performance benchmarking library 
-# 
-# $Id$
-# 
-# Created by Gotoken (gotoken@notwork.org). 
-#
-# Documentation by Gotoken (original RD), Lyle Johnson (RDoc conversion), and
-# Gavin Sinclair (editing). 
-#
-# == Overview
-#
-# The Benchmark module provides methods for benchmarking Ruby code, giving
-# detailed reports on the time taken for each task.
-#
-
-
-#
-# The Benchmark module provides methods to measure and report the time
-# used to execute Ruby code.  Read on for illustrative examples.
-# 
-# == Examples
-# 
-#
-# === Example 1
-#
-# To measure the time to construct the string given by the expression
-# <tt>"a"*1_000_000</tt>:
-#
-#       require 'benchmark'
-#
-#       puts Benchmark.measure { "a"*1_000_000 }
-# 
-# On my machine (FreeBSD 3.2 on P5100MHz) this reported as follows:
-# 
-#       1.166667   0.050000   1.216667 (  0.571355)
-# 
-# This report shows the user CPU time, system CPU time, the sum of the user and
-# system CPU times, and the elapsed real time. The unit of time is seconds.
-# 
-#
-# === Example 2
-#
-# To do some experiments sequentially, the #bm method is useful:
-#
-#       require 'benchmark'
-#
-#       n = 50000
-#       Benchmark.bm do |x|
-#         x.report { for i in 1..n; a = "1"; end }
-#         x.report { n.times do   ; a = "1"; end }
-#         x.report { 1.upto(n) do ; a = "1"; end }
-#       end
-# 
-# The result:
-#
-#              user     system      total        real
-#          1.033333   0.016667   1.016667 (  0.492106)
-#          1.483333   0.000000   1.483333 (  0.694605)
-#          1.516667   0.000000   1.516667 (  0.711077)
-#
-#
-# === Example 3
-#
-# Continuing the previous example, to put a label in each report:
-#
-#       require 'benchmark'
-#
-#       n = 50000
-#       Benchmark.bm(7) do |x|
-#         x.report("for:")   { for i in 1..n; a = "1"; end }
-#         x.report("times:") { n.times do   ; a = "1"; end }
-#         x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
-#       end
-# 
-# The argument to #bm (7) specifies the offset of each report according to the
-# longest label.
-# 
-# The result:
-# 
-#                     user     system      total        real
-#        for:     1.050000   0.000000   1.050000 (  0.503462)
-#        times:   1.533333   0.016667   1.550000 (  0.735473)
-#        upto:    1.500000   0.016667   1.516667 (  0.711239)
-# 
-#
-# === Example 4
-# 
-# The times for some benchmarks depend on the order in which items are run.
-# These differences are due to the cost of memory allocation and garbage
-# collection.
-#
-# To avoid these discrepancies, the #bmbm method is provided.  For example, to
-# compare ways for sort an array of floats:
-#
-#       require 'benchmark'
-#       
-#       array = (1..1000000).map { rand }
-#       
-#       Benchmark.bmbm do |x|
-#         x.report("sort!") { array.dup.sort! }
-#         x.report("sort")  { array.dup.sort  }
-#       end
-# 
-# The result:
-# 
-#        Rehearsal -----------------------------------------
-#        sort!  11.928000   0.010000  11.938000 ( 12.756000)
-#        sort   13.048000   0.020000  13.068000 ( 13.857000)
-#        ------------------------------- total: 25.006000sec
-#        
-#                    user     system      total        real
-#        sort!  12.959000   0.010000  12.969000 ( 13.793000)
-#        sort   12.007000   0.000000  12.007000 ( 12.791000)
-#
-#
-# === Example 5
-#
-# To report statistics of sequential experiments with unique labels,
-# #benchmark is available:
-#
-#       require 'benchmark'
-#
-#       n = 50000
-#       Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
-#         tf = x.report("for:")   { for i in 1..n; a = "1"; end }
-#         tt = x.report("times:") { n.times do   ; a = "1"; end }
-#         tu = x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
-#         [tf+tt+tu, (tf+tt+tu)/3]
-#       end
-# 
-# The result:
-# 
-#                     user     system      total        real
-#        for:     1.016667   0.016667   1.033333 (  0.485749)
-#        times:   1.450000   0.016667   1.466667 (  0.681367)
-#        upto:    1.533333   0.000000   1.533333 (  0.722166)
-#        >total:  4.000000   0.033333   4.033333 (  1.889282)
-#        >avg:    1.333333   0.011111   1.344444 (  0.629761)
-# 
-module Benchmark
-
-  # BENCHMARK_VERSION is version string containing the last modification
-  # date (YYYY-MM-DD). 
-  BENCHMARK_VERSION = "2002-04-25"
-
-  def Benchmark::times() # :nodoc:
-      Process::times()
-  end
-
-
-  #
-  # Reports the time required to execute one or more blocks of code.
-  #
-  # _Note_: Other methods provide a simpler interface to this one, and are
-  # suitable for nearly all benchmarking requirements.  See the examples in
-  # Benchmark, and the #bm and #bmbm methods.
-  #
-  # Example: 
-  #
-  #     require 'benchmark'
-  #     include Benchmark          # we need the CAPTION and FMTSTR constants 
-  #
-  #     n = 50000
-  #     Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
-  #       tf = x.report("for:")   { for i in 1..n; a = "1"; end }
-  #       tt = x.report("times:") { n.times do   ; a = "1"; end }
-  #       tu = x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
-  #       [tf+tt+tu, (tf+tt+tu)/3]
-  #     end
-  # 
-  # The result:
-  # 
-  #                     user     system      total        real
-  #        for:     1.016667   0.016667   1.033333 (  0.485749)
-  #        times:   1.450000   0.016667   1.466667 (  0.681367)
-  #        upto:    1.533333   0.000000   1.533333 (  0.722166)
-  #        >total:  4.000000   0.033333   4.033333 (  1.889282)
-  #        >avg:    1.333333   0.011111   1.344444 (  0.629761)
-  # 
-  # The parameters accepted are as follows:
-  # 
-  # _caption_::
-  #   A string printed once before execution of the given block. 
-  # 
-  # _label_width_::
-  #   An integer used as an offset in each report. 
-  # 
-  # _fmtstr_::
-  #   A string used to format each measurement. See Benchmark::Tms#format.
-  # 
-  # _labels_::
-  #   The remaining parameters are used as prefix of the format to the
-  #   value of block; see the example above.
-  #
-  # This method yields a Benchmark::Report object. 
-  # 
-  def benchmark(caption = "", label_width = nil, fmtstr = nil, *labels) # :yield: report
-    sync = STDOUT.sync
-    STDOUT.sync = true
-    label_width ||= 0
-    fmtstr ||= FMTSTR
-    raise ArgumentError, "no block" unless iterator?
-    print caption
-    results = yield(Report.new(label_width, fmtstr))
-    Array === results and results.grep(Tms).each {|t|
-      print((labels.shift || t.label || "").ljust(label_width), 
-            t.format(fmtstr))
-    }
-    STDOUT.sync = sync
-  end
-
-
-  # 
-  # A simple interface to #benchmark, #bm is suitable for sequential reports
-  # with labels.  For example:
-  # 
-  #     require 'benchmark'
-  #
-  #     n = 50000
-  #     Benchmark.bm(7) do |x|
-  #       x.report("for:")   { for i in 1..n; a = "1"; end }
-  #       x.report("times:") { n.times do   ; a = "1"; end }
-  #       x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
-  #     end
-  # 
-  # The argument to #bm (7) specifies the offset of each report according to the
-  # longest label.
-  # 
-  # This reports as follows:
-  # 
-  #                     user     system      total        real
-  #        for:     1.050000   0.000000   1.050000 (  0.503462)
-  #        times:   1.533333   0.016667   1.550000 (  0.735473)
-  #        upto:    1.500000   0.016667   1.516667 (  0.711239)
-  #
-  # The labels are optional. 
-  # 
-  def bm(label_width = 0, *labels, &blk) # :yield: report
-    benchmark(" "*label_width + CAPTION, label_width, FMTSTR, *labels, &blk)
-  end
-
-
-  # 
-  # Similar to #bm, but designed to prevent memory allocation and garbage
-  # collection from influencing the result.  It works like this:
-  # 
-  # 1. The _rehearsal_ step runs all items in the job list to allocate
-  #    enough memory.
-  # 2. Before each measurement, invokes GC.start to prevent the influence of
-  #    previous job. 
-  #
-  # If the specified _label_width_ is less than the width of the widest label
-  # passed as an argument to #item, the latter is used.  (Because #bmbm is a
-  # 2-pass procedure, this is possible.)  Therefore you do not really need to
-  # specify a label width.
-  #
-  # For example:
-  #
-  #       require 'benchmark'
-  #       
-  #       array = (1..1000000).map { rand }
-  #       
-  #       Benchmark.bmbm do |x|
-  #         x.report("sort!") { array.dup.sort! }
-  #         x.report("sort")  { array.dup.sort  }
-  #       end
-  # 
-  # The result:
-  # 
-  #        Rehearsal -----------------------------------------
-  #        sort!  11.928000   0.010000  11.938000 ( 12.756000)
-  #        sort   13.048000   0.020000  13.068000 ( 13.857000)
-  #        ------------------------------- total: 25.006000sec
-  #        
-  #                    user     system      total        real
-  #        sort!  12.959000   0.010000  12.969000 ( 13.793000)
-  #        sort   12.007000   0.000000  12.007000 ( 12.791000)
-  #
-  # #bmbm yields a Benchmark::Job object and returns an array of one
-  # Benchmark::Tms objects.
-  #
-  def bmbm(width = 0, &blk) # :yield: job
-    job = Job.new(width)
-    yield(job)
-    width = job.width
-    sync = STDOUT.sync
-    STDOUT.sync = true
-
-    # rehearsal
-    print "Rehearsal "
-    puts '-'*(width+CAPTION.length - "Rehearsal ".length)
-    list = []
-    job.list.each{|label,item|
-      print(label.ljust(width))
-      res = Benchmark::measure(&item)
-      print res.format()
-      list.push res
-    }
-    sum = Tms.new; list.each{|i| sum += i}
-    ets = sum.format("total: %tsec")
-    printf("%s %s\n\n",
-           "-"*(width+CAPTION.length-ets.length-1), ets)
-    
-    # take
-    print ' '*width, CAPTION
-    list = []
-    ary = []
-    job.list.each{|label,item|
-      GC::start
-      print label.ljust(width)
-      res = Benchmark::measure(&item)
-      print res.format()
-      ary.push res
-      list.push [label, res]
-    }
-
-    STDOUT.sync = sync
-    ary
-  end
-
-  # 
-  # Returns the time used to execute the given block as a
-  # Benchmark::Tms object.
-  #
-  def measure(label = "") # :yield:
-    t0, r0 = Benchmark.times, Time.now
-    yield
-    t1, r1 = Benchmark.times, Time.now
-    Benchmark::Tms.new(t1.utime  - t0.utime, 
-                       t1.stime  - t0.stime, 
-                       t1.cutime - t0.cutime, 
-                       t1.cstime - t0.cstime, 
-                       r1.to_f - r0.to_f,
-                       label)
-  end
-
-  #
-  # Returns the elapsed real time used to execute the given block.
-  #
-  def realtime(&blk) # :yield:
-    Benchmark::measure(&blk).real
-  end
-
-
-
-  #
-  # A Job is a sequence of labelled blocks to be processed by the
-  # Benchmark.bmbm method.  It is of little direct interest to the user.
-  #
-  class Job
-    #
-    # Returns an initialized Job instance.
-    # Usually, one doesn't call this method directly, as new
-    # Job objects are created by the #bmbm method.
-    # _width_ is a initial value for the label offset used in formatting;
-    # the #bmbm method passes its _width_ argument to this constructor. 
-    # 
-    def initialize(width)
-      @width = width
-      @list = []
-    end
-
-    #
-    # Registers the given label and block pair in the job list.
-    #
-    def item(label = "", &blk) # :yield:
-      raise ArgmentError, "no block" unless block_given?
-      label.concat ' '
-      w = label.length
-      @width = w if @width < w
-      @list.push [label, blk]
-      self
-    end
-
-    alias report item
-    
-    # An array of 2-element arrays, consisting of label and block pairs.
-    attr_reader :list
-    
-    # Length of the widest label in the #list, plus one.  
-    attr_reader :width
-  end
-
-  module_function :benchmark, :measure, :realtime, :bm, :bmbm
-
-
-
-  #
-  # This class is used by the Benchmark.benchmark and Benchmark.bm methods.
-  # It is of little direct interest to the user.
-  #
-  class Report
-    #
-    # Returns an initialized Report instance.
-    # Usually, one doesn't call this method directly, as new
-    # Report objects are created by the #benchmark and #bm methods. 
-    # _width_ and _fmtstr_ are the label offset and 
-    # format string used by Tms#format. 
-    # 
-    def initialize(width = 0, fmtstr = nil)
-      @width, @fmtstr = width, fmtstr
-    end
-
-    #
-    # Prints the _label_ and measured time for the block,
-    # formatted by _fmt_. See Tms#format for the
-    # formatting rules.
-    #
-    def item(label = "", *fmt, &blk) # :yield:
-      print label.ljust(@width)
-      res = Benchmark::measure(&blk)
-      print res.format(@fmtstr, *fmt)
-      res
-    end
-
-    alias report item
-  end
-
-
-
-  #
-  # A data object, representing the times associated with a benchmark
-  # measurement.
-  #
-  class Tms
-    CAPTION = "      user     system      total        real\n"
-    FMTSTR = "%10.6u %10.6y %10.6t %10.6r\n"
-
-    # User CPU time
-    attr_reader :utime
-    
-    # System CPU time
-    attr_reader :stime
-   
-    # User CPU time of children
-    attr_reader :cutime
-    
-    # System CPU time of children
-    attr_reader :cstime
-    
-    # Elapsed real time
-    attr_reader :real
-    
-    # Total time, that is _utime_ + _stime_ + _cutime_ + _cstime_ 
-    attr_reader :total
-    
-    # Label
-    attr_reader :label
-
-    #
-    # Returns a initialized Tms object which has
-    # _u_ as the user CPU time, _s_ as the system CPU time, 
-    # _cu_ as the childrens' user CPU time, _cs_ as the childrens'
-    # system CPU time, _real_ as the elapsed real time and _l_
-    # as the label. 
-    # 
-    def initialize(u = 0.0, s = 0.0, cu = 0.0, cs = 0.0, real = 0.0, l = nil)
-      @utime, @stime, @cutime, @cstime, @real, @label = u, s, cu, cs, real, l
-      @total = @utime + @stime + @cutime + @cstime
-    end
-
-    # 
-    # Returns a new Tms object whose times are the sum of the times for this
-    # Tms object, plus the time required to execute the code block (_blk_).
-    # 
-    def add(&blk) # :yield:
-      self + Benchmark::measure(&blk) 
-    end
-
-    # 
-    # An in-place version of #add.
-    # 
-    def add!
-      t = Benchmark::measure(&blk) 
-      @utime  = utime + t.utime
-      @stime  = stime + t.stime
-      @cutime = cutime + t.cutime
-      @cstime = cstime + t.cstime
-      @real   = real + t.real
-      self
-    end
-
-    # 
-    # Returns a new Tms object obtained by memberwise summation
-    # of the individual times for this Tms object with those of the other
-    # Tms object.
-    # This method and #/() are useful for taking statistics. 
-    # 
-    def +(other); memberwise(:+, other) end
-    
-    #
-    # Returns a new Tms object obtained by memberwise subtraction
-    # of the individual times for the other Tms object from those of this
-    # Tms object.
-    #
-    def -(other); memberwise(:-, other) end
-    
-    #
-    # Returns a new Tms object obtained by memberwise multiplication
-    # of the individual times for this Tms object by _x_.
-    #
-    def *(x); memberwise(:*, x) end
-
-    # 
-    # Returns a new Tms object obtained by memberwise division
-    # of the individual times for this Tms object by _x_.
-    # This method and #+() are useful for taking statistics. 
-    # 
-    def /(x); memberwise(:/, x) end
-
-    #
-    # Returns the contents of this Tms object as
-    # a formatted string, according to a format string
-    # like that passed to Kernel.format. In addition, #format
-    # accepts the following extensions:
-    #
-    # <tt>%u</tt>::     Replaced by the user CPU time, as reported by Tms#utime.
-    # <tt>%y</tt>::     Replaced by the system CPU time, as reported by #stime (Mnemonic: y of "s*y*stem")
-    # <tt>%U</tt>::     Replaced by the childrens' user CPU time, as reported by Tms#cutime 
-    # <tt>%Y</tt>::     Replaced by the childrens' system CPU time, as reported by Tms#cstime
-    # <tt>%t</tt>::     Replaced by the total CPU time, as reported by Tms#total
-    # <tt>%r</tt>::     Replaced by the elapsed real time, as reported by Tms#real
-    # <tt>%n</tt>::     Replaced by the label string, as reported by Tms#label (Mnemonic: n of "*n*ame")
-    # 
-    # If _fmtstr_ is not given, FMTSTR is used as default value, detailing the
-    # user, system and real elapsed time.
-    # 
-    def format(arg0 = nil, *args)
-      fmtstr = (arg0 || FMTSTR).dup
-      fmtstr.gsub!(/(%[-+\.\d]*)n/){"#{$1}s" % label}
-      fmtstr.gsub!(/(%[-+\.\d]*)u/){"#{$1}f" % utime}
-      fmtstr.gsub!(/(%[-+\.\d]*)y/){"#{$1}f" % stime}
-      fmtstr.gsub!(/(%[-+\.\d]*)U/){"#{$1}f" % cutime}
-      fmtstr.gsub!(/(%[-+\.\d]*)Y/){"#{$1}f" % cstime}
-      fmtstr.gsub!(/(%[-+\.\d]*)t/){"#{$1}f" % total}
-      fmtstr.gsub!(/(%[-+\.\d]*)r/){"(#{$1}f)" % real}
-      arg0 ? Kernel::format(fmtstr, *args) : fmtstr
-    end
-
-    # 
-    # Same as #format.
-    # 
-    def to_s
-      format
-    end
-
-    # 
-    # Returns a new 6-element array, consisting of the
-    # label, user CPU time, system CPU time, childrens'
-    # user CPU time, childrens' system CPU time and elapsed
-    # real time.
-    # 
-    def to_a
-      [@label, @utime, @stime, @cutime, @cstime, @real]
-    end
-
-    protected
-    def memberwise(op, x)
-      case x
-      when Benchmark::Tms
-        Benchmark::Tms.new(utime.__send__(op, x.utime),
-                           stime.__send__(op, x.stime),
-                           cutime.__send__(op, x.cutime),
-                           cstime.__send__(op, x.cstime),
-                           real.__send__(op, x.real)
-                           )
-      else
-        Benchmark::Tms.new(utime.__send__(op, x),
-                           stime.__send__(op, x),
-                           cutime.__send__(op, x),
-                           cstime.__send__(op, x),
-                           real.__send__(op, x)
-                           )
-      end
-    end
-  end
-
-  # The default caption string (heading above the output times).
-  CAPTION = Benchmark::Tms::CAPTION
-
-  # The default format string used to display times.  See also Benchmark::Tms#format. 
-  FMTSTR = Benchmark::Tms::FMTSTR
-end
-
-if __FILE__ == $0
-  include Benchmark
-
-  n = ARGV[0].to_i.nonzero? || 50000
-  puts %Q([#{n} times iterations of `a = "1"'])
-  benchmark("       " + CAPTION, 7, FMTSTR) do |x|
-    x.report("for:")   {for i in 1..n; a = "1"; end} # Benchmark::measure
-    x.report("times:") {n.times do   ; a = "1"; end}
-    x.report("upto:")  {1.upto(n) do ; a = "1"; end}
-  end
-
-  benchmark do
-    [
-      measure{for i in 1..n; a = "1"; end},  # Benchmark::measure
-      measure{n.times do   ; a = "1"; end},
-      measure{1.upto(n) do ; a = "1"; end}
-    ]
-  end
-end
diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb
index bc780ffc4e..f599f772ce 100644
--- a/lib/cgi-lib.rb
+++ b/lib/cgi-lib.rb
@@ -117,32 +117,23 @@ class CGI < SimpleDelegator
   LF  = "\012"
   EOL = CR + LF
 
-  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
-  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
-
-  # make rfc1123 date string
-  def CGI::rfc1123_date(time)
-    t = time.clone.gmtime
-    return format("%s, %.2d %s %d %.2d:%.2d:%.2d GMT",
-                RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
-                t.hour, t.min, t.sec)
-  end
-
   # escape url encode
-  def CGI::escape(str)
+  def escape(str)
     str.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
   end
 
   # unescape url encoded
-  def CGI::unescape(str)
+  def unescape(str)
     str.gsub(/\+/, ' ').gsub(/%([0-9a-fA-F]{2})/){ [$1.hex].pack("c") }
   end
 
   # escape HTML
-  def CGI::escapeHTML(str)
+  def escapeHTML(str)
     str.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
   end
 
+  module_function :escape, :unescape, :escapeHTML
+
   # offline mode. read name=value pairs on standard input.
   def read_from_cmdline
     require "shellwords.rb"
@@ -169,8 +160,8 @@ class CGI < SimpleDelegator
       input.read(Integer(ENV['CONTENT_LENGTH'])) or ""
     else
       read_from_cmdline
-    end.split(/[&;]/).each do |x|
-      key, val = x.split(/=/,2).collect{|x|CGI::unescape(x)}
+    end.split(/&/).each do |x|
+      key, val = x.split(/=/,2).collect{|x|unescape(x)}
       if @inputs.include?(key)
         @inputs[key] += "\0" + (val or "")
       else
@@ -181,10 +172,10 @@ class CGI < SimpleDelegator
     super(@inputs)
 
     if ENV.has_key?('HTTP_COOKIE') or ENV.has_key?('COOKIE')
-      (ENV['HTTP_COOKIE'] or ENV['COOKIE']).split(/; /).each do |x|
+      (ENV['HTTP_COOKIE'] or ENV['COOKIE']).split("; ").each do |x|
         key, val = x.split(/=/,2)
-        key = CGI::unescape(key)
-        val = val.split(/&/).collect{|x|CGI::unescape(x)}.join("\0")
+        key = unescape(key)
+        val = val.split(/&/).collect{|x|unescape(x)}.join("\0")
         if @cookie.include?(key)
           @cookie[key] += "\0" + val
         else
@@ -210,16 +201,16 @@ class CGI < SimpleDelegator
     "Set-Cookie: " + options['name'] + '=' + escape(options['value']) +
     (options['domain']  ? '; domain='  + options['domain'] : '') +
     (options['path']    ? '; path='    + options['path']   : '') +
-    (options['expires'] ? '; expires=' + rfc1123_date(options['expires']) : '') +
+    (options['expires'] ? '; expires=' + options['expires'].strftime("%a, %d %b %Y %X %Z") : '') +
     (options['secure']  ? '; secure' : '')
   end
 
   # make HTTP header string
   def CGI::header(*options)
-    if defined?(MOD_RUBY)
+    if ENV['MOD_RUBY']
       options.each{|option|
         option.sub(/(.*?): (.*)/){
-          Apache::request.headers_out[$1] = $2
+          Apache::request[$1] = $2
         }
       }
       Apache::request.send_http_header
@@ -227,7 +218,7 @@ class CGI < SimpleDelegator
     else
       if options.delete("nph") or (ENV['SERVER_SOFTWARE'] =~ /IIS/)
         [(ENV['SERVER_PROTOCOL'] or "HTTP/1.0") + " 200 OK",
-         "Date: " + rfc1123_date(Time.now),
+         "Date: " + Time.now.gmtime.strftime("%a, %d %b %Y %X %Z"),
          "Server: " + (ENV['SERVER_SOFTWARE'] or ""),
          "Connection: close"] +
         (options.empty? ? ["Content-Type: text/html"] : options)
diff --git a/lib/cgi.rb b/lib/cgi.rb
deleted file mode 100644
index 43a5aa89f0..0000000000
--- a/lib/cgi.rb
+++ /dev/null
@@ -1,2336 +0,0 @@
-# 
-# cgi.rb - cgi support library
-# 
-# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-# 
-# Copyright (C) 2000  Information-technology Promotion Agency, Japan
-#
-# Author: Wakou Aoyama <wakou@ruby-lang.org>
-#
-# Documentation: Wakou Aoyama (RDoc'd and embellished by William Webber) 
-# 
-# == Overview
-#
-# The Common Gateway Interface (CGI) is a simple protocol
-# for passing an HTTP request from a web server to a
-# standalone program, and returning the output to the web
-# browser.  Basically, a CGI program is called with the
-# parameters of the request passed in either in the
-# environment (GET) or via $stdin (POST), and everything
-# it prints to $stdout is returned to the client.
-# 
-# This file holds the +CGI+ class.  This class provides
-# functionality for retrieving HTTP request parameters,
-# managing cookies, and generating HTML output.  See the
-# class documentation for more details and examples of use.
-#
-# The file cgi/session.rb provides session management
-# functionality; see that file for more details.
-#
-# See http://www.w3.org/CGI/ for more information on the CGI
-# protocol.
-
-raise "Please, use ruby1.5.4 or later." if RUBY_VERSION < "1.5.4"
-
-require 'English'
-
-# CGI class.  See documentation for the file cgi.rb for an overview
-# of the CGI protocol.
-#
-# == Introduction
-#
-# CGI is a large class, providing several categories of methods, many of which
-# are mixed in from other modules.  Some of the documentation is in this class,
-# some in the modules CGI::QueryExtension and CGI::HtmlExtension.  See
-# CGI::Cookie for specific information on handling cookies, and cgi/session.rb
-# (CGI::Session) for information on sessions.
-#
-# For queries, CGI provides methods to get at environmental variables,
-# parameters, cookies, and multipart request data.  For responses, CGI provides
-# methods for writing output and generating HTML.
-#
-# Read on for more details.  Examples are provided at the bottom.
-#
-# == Queries
-#
-# The CGI class dynamically mixes in parameter and cookie-parsing
-# functionality,  environmental variable access, and support for
-# parsing multipart requests (including uploaded files) from the
-# CGI::QueryExtension module.
-#
-# === Environmental Variables
-#
-# The standard CGI environmental variables are available as read-only
-# attributes of a CGI object.  The following is a list of these variables:
-#
-#
-#   AUTH_TYPE               HTTP_HOST          REMOTE_IDENT
-#   CONTENT_LENGTH          HTTP_NEGOTIATE     REMOTE_USER
-#   CONTENT_TYPE            HTTP_PRAGMA        REQUEST_METHOD
-#   GATEWAY_INTERFACE       HTTP_REFERER       SCRIPT_NAME
-#   HTTP_ACCEPT             HTTP_USER_AGENT    SERVER_NAME
-#   HTTP_ACCEPT_CHARSET     PATH_INFO          SERVER_PORT
-#   HTTP_ACCEPT_ENCODING    PATH_TRANSLATED    SERVER_PROTOCOL
-#   HTTP_ACCEPT_LANGUAGE    QUERY_STRING       SERVER_SOFTWARE
-#   HTTP_CACHE_CONTROL      REMOTE_ADDR
-#   HTTP_FROM               REMOTE_HOST
-#
-#
-# For each of these variables, there is a corresponding attribute with the
-# same name, except all lower case and without a preceding HTTP_.  
-# +content_length+ and +server_port+ are integers; the rest are strings.
-#
-# === Parameters
-#
-# The method #params() returns a hash of all parameters in the request as
-# name/value-list pairs, where the value-list is an Array of one or more
-# values.  The CGI object itself also behaves as a hash of parameter names 
-# to values, but only returns a single value (as a String) for each 
-# parameter name.
-#
-# For instance, suppose the request contains the parameter 
-# "favourite_colours" with the multiple values "blue" and "green".  The
-# following behaviour would occur:
-#
-#   cgi.params["favourite_colours"]  # => ["blue", "green"]
-#   cgi["favourite_colours"]         # => "blue"
-#
-# If a parameter does not exist, the former method will return an empty
-# array, the latter an empty string.  The simplest way to test for existence
-# of a parameter is by the #has_key? method.
-#
-# === Cookies
-#
-# HTTP Cookies are automatically parsed from the request.  They are available
-# from the #cookies() accessor, which returns a hash from cookie name to
-# CGI::Cookie object.
-#
-# === Multipart requests
-#
-# If a request's method is POST and its content type is multipart/form-data, 
-# then it may contain uploaded files.  These are stored by the QueryExtension
-# module in the parameters of the request.  The parameter name is the name
-# attribute of the file input field, as usual.  However, the value is not
-# a string, but an IO object, either an IOString for small files, or a
-# Tempfile for larger ones.  This object also has the additional singleton
-# methods:
-#
-# #local_path():: the path of the uploaded file on the local filesystem
-# #original_filename():: the name of the file on the client computer
-# #content_type():: the content type of the file
-#
-# == Responses
-#
-# The CGI class provides methods for sending header and content output to
-# the HTTP client, and mixes in methods for programmatic HTML generation
-# from CGI::HtmlExtension and CGI::TagMaker modules.  The precise version of HTML
-# to use for HTML generation is specified at object creation time.
-#
-# === Writing output
-#
-# The simplest way send output to the HTTP client is using the #out() method.
-# This takes the HTTP headers as a hash parameter, and the body content
-# via a block.  The headers can be generated as a string using the #header()
-# method.  The output stream can be written directly to using the #print()
-# method.
-#
-# === Generating HTML
-#
-# Each HTML element has a corresponding method for generating that
-# element as a String.  The name of this method is the same as that
-# of the element, all lowercase.  The attributes of the element are 
-# passed in as a hash, and the body as a no-argument block that evaluates
-# to a String.  The HTML generation module knows which elements are
-# always empty, and silently drops any passed-in body.  It also knows
-# which elements require matching closing tags and which don't.  However,
-# it does not know what attributes are legal for which elements.
-#
-# There are also some additional HTML generation methods mixed in from
-# the CGI::HtmlExtension module.  These include individual methods for the
-# different types of form inputs, and methods for elements that commonly
-# take particular attributes where the attributes can be directly specified
-# as arguments, rather than via a hash.
-#
-# == Examples of use
-# 
-# === Get form values
-# 
-#   require "cgi"
-#   cgi = CGI.new
-#   value = cgi['field_name']   # <== value string for 'field_name'
-#     # if not 'field_name' included, then return "".
-#   fields = cgi.keys            # <== array of field names
-# 
-#   # returns true if form has 'field_name'
-#   cgi.has_key?('field_name')
-#   cgi.has_key?('field_name')
-#   cgi.include?('field_name')
-# 
-# CAUTION! cgi['field_name'] returned an Array with the old 
-# cgi.rb(included in ruby 1.6)
-# 
-# === Get form values as hash
-# 
-#   require "cgi"
-#   cgi = CGI.new
-#   params = cgi.params
-# 
-# cgi.params is a hash.
-# 
-#   cgi.params['new_field_name'] = ["value"]  # add new param
-#   cgi.params['field_name'] = ["new_value"]  # change value
-#   cgi.params.delete('field_name')           # delete param
-#   cgi.params.clear                          # delete all params
-# 
-# 
-# === Save form values to file
-# 
-#   require "pstore"
-#   db = PStore.new("query.db")
-#   db.transaction do
-#     db["params"] = cgi.params
-#   end
-# 
-# 
-# === Restore form values from file
-# 
-#   require "pstore"
-#   db = PStore.new("query.db")
-#   db.transaction do
-#     cgi.params = db["params"]
-#   end
-# 
-# 
-# === Get multipart form values
-# 
-#   require "cgi"
-#   cgi = CGI.new
-#   value = cgi['field_name']   # <== value string for 'field_name'
-#   value.read                  # <== body of value
-#   value.local_path            # <== path to local file of value
-#   value.original_filename     # <== original filename of value
-#   value.content_type          # <== content_type of value
-# 
-# and value has StringIO or Tempfile class methods.
-# 
-# === Get cookie values
-# 
-#   require "cgi"
-#   cgi = CGI.new
-#   values = cgi.cookies['name']  # <== array of 'name'
-#     # if not 'name' included, then return [].
-#   names = cgi.cookies.keys      # <== array of cookie names
-# 
-# and cgi.cookies is a hash.
-# 
-# === Get cookie objects
-# 
-#   require "cgi"
-#   cgi = CGI.new
-#   for name, cookie in cgi.cookies
-#     cookie.expires = Time.now + 30
-#   end
-#   cgi.out("cookie" => cgi.cookies) {"string"}
-# 
-#   cgi.cookies # { "name1" => cookie1, "name2" => cookie2, ... }
-# 
-#   require "cgi"
-#   cgi = CGI.new
-#   cgi.cookies['name'].expires = Time.now + 30
-#   cgi.out("cookie" => cgi.cookies['name']) {"string"}
-# 
-# === Print http header and html string to $DEFAULT_OUTPUT ($>)
-# 
-#   require "cgi"
-#   cgi = CGI.new("html3")  # add HTML generation methods
-#   cgi.out() do
-#     cgi.html() do
-#       cgi.head{ cgi.title{"TITLE"} } +
-#       cgi.body() do
-#         cgi.form() do
-#           cgi.textarea("get_text") +
-#           cgi.br +
-#           cgi.submit
-#         end +
-#         cgi.pre() do
-#           CGI::escapeHTML(
-#             "params: " + cgi.params.inspect + "\n" +
-#             "cookies: " + cgi.cookies.inspect + "\n" +
-#             ENV.collect() do |key, value|
-#               key + " --> " + value + "\n"
-#             end.join("")
-#           )
-#         end
-#       end
-#     end
-#   end
-# 
-#   # add HTML generation methods
-#   CGI.new("html3")    # html3.2
-#   CGI.new("html4")    # html4.01 (Strict)
-#   CGI.new("html4Tr")  # html4.01 Transitional
-#   CGI.new("html4Fr")  # html4.01 Frameset
-#
-class CGI
-
-  # :stopdoc:
-
-  # String for carriage return
-  CR  = "\015"
-
-  # String for linefeed
-  LF  = "\012"
-
-  # Standard internet newline sequence
-  EOL = CR + LF
-
-  REVISION = '$Id$' #:nodoc:
-
-  NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM) 
-
-  # Path separators in different environments.
-  PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}
-
-  # HTTP status codes.
-  HTTP_STATUS = {
-    "OK"                  => "200 OK",
-    "PARTIAL_CONTENT"     => "206 Partial Content",
-    "MULTIPLE_CHOICES"    => "300 Multiple Choices",
-    "MOVED"               => "301 Moved Permanently",
-    "REDIRECT"            => "302 Found",
-    "NOT_MODIFIED"        => "304 Not Modified",
-    "BAD_REQUEST"         => "400 Bad Request",
-    "AUTH_REQUIRED"       => "401 Authorization Required",
-    "FORBIDDEN"           => "403 Forbidden",
-    "NOT_FOUND"           => "404 Not Found",
-    "METHOD_NOT_ALLOWED"  => "405 Method Not Allowed",
-    "NOT_ACCEPTABLE"      => "406 Not Acceptable",
-    "LENGTH_REQUIRED"     => "411 Length Required",
-    "PRECONDITION_FAILED" => "412 Rrecondition Failed",
-    "SERVER_ERROR"        => "500 Internal Server Error",
-    "NOT_IMPLEMENTED"     => "501 Method Not Implemented",
-    "BAD_GATEWAY"         => "502 Bad Gateway",
-    "VARIANT_ALSO_VARIES" => "506 Variant Also Negotiates"
-  }
-
-  # Abbreviated day-of-week names specified by RFC 822
-  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
-
-  # Abbreviated month names specified by RFC 822
-  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
-
-  # :startdoc:
-
-  def env_table 
-    ENV
-  end
-
-  def stdinput
-    $stdin
-  end
-
-  def stdoutput
-    $DEFAULT_OUTPUT
-  end
-
-  private :env_table, :stdinput, :stdoutput
-
-  # URL-encode a string.
-  #   url_encoded_string = CGI::escape("'Stop!' said Fred")
-  #      # => "%27Stop%21%27+said+Fred"
-  def CGI::escape(string)
-    string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
-      '%' + $1.unpack('H2' * $1.size).join('%').upcase
-    end.tr(' ', '+')
-  end
-
-
-  # URL-decode a string.
-  #   string = CGI::unescape("%27Stop%21%27+said+Fred")
-  #      # => "'Stop!' said Fred"
-  def CGI::unescape(string)
-    string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
-      [$1.delete('%')].pack('H*')
-    end
-  end
-
-
-  # Escape special characters in HTML, namely &\"<>
-  #   CGI::escapeHTML('Usage: foo "bar" <baz>')
-  #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
-  def CGI::escapeHTML(string)
-    string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
-  end
-
-
-  # Unescape a string that has been HTML-escaped
-  #   CGI::unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
-  #      # => "Usage: foo \"bar\" <baz>"
-  def CGI::unescapeHTML(string)
-    string.gsub(/&(.*?);/n) do
-      match = $1.dup
-      case match
-      when /\Aamp\z/ni           then '&'
-      when /\Aquot\z/ni          then '"'
-      when /\Agt\z/ni            then '>'
-      when /\Alt\z/ni            then '<'
-      when /\A#0*(\d+)\z/n       then
-        if Integer($1) < 256
-          Integer($1).chr
-        else
-          if Integer($1) < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
-            [Integer($1)].pack("U")
-          else
-            "&##{$1};"
-          end
-        end
-      when /\A#x([0-9a-f]+)\z/ni then
-        if $1.hex < 256
-          $1.hex.chr
-        else
-          if $1.hex < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
-            [$1.hex].pack("U")
-          else
-            "&#x#{$1};"
-          end
-        end
-      else
-        "&#{match};"
-      end
-    end
-  end
-
-
-  # Escape only the tags of certain HTML elements in +string+.
-  #
-  # Takes an element or elements or array of elements.  Each element
-  # is specified by the name of the element, without angle brackets.
-  # This matches both the start and the end tag of that element.
-  # The attribute list of the open tag will also be escaped (for
-  # instance, the double-quotes surrounding attribute values).
-  #
-  #   print CGI::escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
-  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
-  #
-  #   print CGI::escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
-  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
-  def CGI::escapeElement(string, *elements)
-    elements = elements[0] if elements[0].kind_of?(Array)
-    unless elements.empty?
-      string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/ni) do
-        CGI::escapeHTML($&)
-      end
-    else
-      string
-    end
-  end
-
-
-  # Undo escaping such as that done by CGI::escapeElement()
-  #
-  #   print CGI::unescapeElement(
-  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
-  #     # "&lt;BR&gt;<A HREF="url"></A>"
-  # 
-  #   print CGI::unescapeElement(
-  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
-  #     # "&lt;BR&gt;<A HREF="url"></A>"
-  def CGI::unescapeElement(string, *elements)
-    elements = elements[0] if elements[0].kind_of?(Array)
-    unless elements.empty?
-      string.gsub(/&lt;\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?&gt;/ni) do
-        CGI::unescapeHTML($&)
-      end
-    else
-      string
-    end
-  end
-
-
-  # Format a +Time+ object as a String using the format specified by RFC 1123.
-  #
-  #   CGI::rfc1123_date(Time.now)
-  #     # Sat, 01 Jan 2000 00:00:00 GMT
-  def CGI::rfc1123_date(time)
-    t = time.clone.gmtime
-    return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
-                RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
-                t.hour, t.min, t.sec)
-  end
-
-
-  # Create an HTTP header block as a string.
-  #
-  # Includes the empty line that ends the header block.
-  #
-  # +options+ can be a string specifying the Content-Type (defaults
-  # to text/html), or a hash of header key/value pairs.  The following
-  # header keys are recognized:
-  #
-  # type:: the Content-Type header.  Defaults to "text/html"
-  # charset:: the charset of the body, appended to the Content-Type header.
-  # nph:: a boolean value.  If true, prepend protocol string and status code, and
-  #       date; and sets default values for "server" and "connection" if not
-  #       explicitly set.
-  # status:: the HTTP status code, returned as the Status header.  See the
-  #          list of available status codes below.
-  # server:: the server software, returned as the Server header.
-  # connection:: the connection type, returned as the Connection header (for 
-  #              instance, "close".
-  # length:: the length of the content that will be sent, returned as the
-  #          Content-Length header.
-  # language:: the language of the content, returned as the Content-Language
-  #            header.
-  # expires:: the time on which the current content expires, as a +Time+
-  #           object, returned as the Expires header.
-  # cookie:: a cookie or cookies, returned as one or more Set-Cookie headers.
-  #          The value can be the literal string of the cookie; a CGI::Cookie
-  #          object; an Array of literal cookie strings or Cookie objects; or a 
-  #          hash all of whose values are literal cookie strings or Cookie objects.
-  #          These cookies are in addition to the cookies held in the
-  #          @output_cookies field.
-  #
-  # Other header lines can also be set; they are appended as key: value.
-  # 
-  #   header
-  #     # Content-Type: text/html
-  # 
-  #   header("text/plain")
-  #     # Content-Type: text/plain
-  # 
-  #   header("nph"        => true,
-  #          "status"     => "OK",  # == "200 OK"
-  #            # "status"     => "200 GOOD",
-  #          "server"     => ENV['SERVER_SOFTWARE'],
-  #          "connection" => "close",
-  #          "type"       => "text/html",
-  #          "charset"    => "iso-2022-jp",
-  #            # Content-Type: text/html; charset=iso-2022-jp
-  #          "length"     => 103,
-  #          "language"   => "ja",
-  #          "expires"    => Time.now + 30,
-  #          "cookie"     => [cookie1, cookie2],
-  #          "my_header1" => "my_value"
-  #          "my_header2" => "my_value")
-  # 
-  # The status codes are:
-  # 
-  #   "OK"                  --> "200 OK"
-  #   "PARTIAL_CONTENT"     --> "206 Partial Content"
-  #   "MULTIPLE_CHOICES"    --> "300 Multiple Choices"
-  #   "MOVED"               --> "301 Moved Permanently"
-  #   "REDIRECT"            --> "302 Found"
-  #   "NOT_MODIFIED"        --> "304 Not Modified"
-  #   "BAD_REQUEST"         --> "400 Bad Request"
-  #   "AUTH_REQUIRED"       --> "401 Authorization Required"
-  #   "FORBIDDEN"           --> "403 Forbidden"
-  #   "NOT_FOUND"           --> "404 Not Found"
-  #   "METHOD_NOT_ALLOWED"  --> "405 Method Not Allowed"
-  #   "NOT_ACCEPTABLE"      --> "406 Not Acceptable"
-  #   "LENGTH_REQUIRED"     --> "411 Length Required"
-  #   "PRECONDITION_FAILED" --> "412 Rrecondition Failed"
-  #   "SERVER_ERROR"        --> "500 Internal Server Error"
-  #   "NOT_IMPLEMENTED"     --> "501 Method Not Implemented"
-  #   "BAD_GATEWAY"         --> "502 Bad Gateway"
-  #   "VARIANT_ALSO_VARIES" --> "506 Variant Also Negotiates"
-  # 
-  # This method does not perform charset conversion. 
-  #
-  def header(options = "text/html")
-
-    buf = ""
-
-    case options
-    when String
-      options = { "type" => options }
-    when Hash
-      options = options.dup
-    end
-
-    unless options.has_key?("type")
-      options["type"] = "text/html"
-    end
-
-    if options.has_key?("charset")
-      options["type"] += "; charset=" + options.delete("charset")
-    end
-
-    options.delete("nph") if defined?(MOD_RUBY)
-    if options.delete("nph") or /IIS/n.match(env_table['SERVER_SOFTWARE'])
-      buf += (env_table["SERVER_PROTOCOL"] or "HTTP/1.0")  + " " +
-             (HTTP_STATUS[options["status"]] or options["status"] or "200 OK") +
-             EOL +
-             "Date: " + CGI::rfc1123_date(Time.now) + EOL
-
-      unless options.has_key?("server")
-        options["server"] = (env_table['SERVER_SOFTWARE'] or "")
-      end
-
-      unless options.has_key?("connection")
-        options["connection"] = "close"
-      end
-
-      options.delete("status")
-    end
-
-    if options.has_key?("status")
-      buf += "Status: " +
-             (HTTP_STATUS[options["status"]] or options["status"]) + EOL
-      options.delete("status")
-    end
-
-    if options.has_key?("server")
-      buf += "Server: " + options.delete("server") + EOL
-    end
-
-    if options.has_key?("connection")
-      buf += "Connection: " + options.delete("connection") + EOL
-    end
-
-    buf += "Content-Type: " + options.delete("type") + EOL
-
-    if options.has_key?("length")
-      buf += "Content-Length: " + options.delete("length").to_s + EOL
-    end
-
-    if options.has_key?("language")
-      buf += "Content-Language: " + options.delete("language") + EOL
-    end
-
-    if options.has_key?("expires")
-      buf += "Expires: " + CGI::rfc1123_date( options.delete("expires") ) + EOL
-    end
-
-    if options.has_key?("cookie")
-      if options["cookie"].kind_of?(String) or
-           options["cookie"].kind_of?(Cookie)
-        buf += "Set-Cookie: " + options.delete("cookie").to_s + EOL
-      elsif options["cookie"].kind_of?(Array)
-        options.delete("cookie").each{|cookie|
-          buf += "Set-Cookie: " + cookie.to_s + EOL
-        }
-      elsif options["cookie"].kind_of?(Hash)
-        options.delete("cookie").each_value{|cookie|
-          buf += "Set-Cookie: " + cookie.to_s + EOL
-        }
-      end
-    end
-    if @output_cookies
-      for cookie in @output_cookies
-        buf += "Set-Cookie: " + cookie.to_s + EOL
-      end
-    end
-
-    options.each{|key, value|
-      buf += key + ": " + value.to_s + EOL
-    }
-
-    if defined?(MOD_RUBY)
-      table = Apache::request.headers_out
-      buf.scan(/([^:]+): (.+)#{EOL}/n){ |name, value|
-        warn sprintf("name:%s value:%s\n", name, value) if $DEBUG
-        case name
-        when 'Set-Cookie'
-          table.add(name, value)
-        when /^status$/ni
-          Apache::request.status_line = value
-          Apache::request.status = value.to_i
-        when /^content-type$/ni
-          Apache::request.content_type = value
-        when /^content-encoding$/ni
-          Apache::request.content_encoding = value
-        when /^location$/ni
-	  if Apache::request.status == 200
-	    Apache::request.status = 302
-	  end
-          Apache::request.headers_out[name] = value
-        else
-          Apache::request.headers_out[name] = value
-        end
-      }
-      Apache::request.send_http_header
-      ''
-    else
-      buf + EOL
-    end
-
-  end # header()
-
-
-  # Print an HTTP header and body to $DEFAULT_OUTPUT ($>)
-  #
-  # The header is provided by +options+, as for #header().
-  # The body of the document is that returned by the passed-
-  # in block.  This block takes no arguments.  It is required.
-  #
-  #   cgi = CGI.new
-  #   cgi.out{ "string" }
-  #     # Content-Type: text/html
-  #     # Content-Length: 6
-  #     #
-  #     # string
-  # 
-  #   cgi.out("text/plain") { "string" }
-  #     # Content-Type: text/plain
-  #     # Content-Length: 6
-  #     #
-  #     # string
-  # 
-  #   cgi.out("nph"        => true,
-  #           "status"     => "OK",  # == "200 OK"
-  #           "server"     => ENV['SERVER_SOFTWARE'],
-  #           "connection" => "close",
-  #           "type"       => "text/html",
-  #           "charset"    => "iso-2022-jp",
-  #             # Content-Type: text/html; charset=iso-2022-jp
-  #           "language"   => "ja",
-  #           "expires"    => Time.now + (3600 * 24 * 30),
-  #           "cookie"     => [cookie1, cookie2],
-  #           "my_header1" => "my_value",
-  #           "my_header2" => "my_value") { "string" }
-  # 
-  # Content-Length is automatically calculated from the size of
-  # the String returned by the content block.
-  #
-  # If ENV['REQUEST_METHOD'] == "HEAD", then only the header
-  # is outputted (the content block is still required, but it
-  # is ignored).
-  # 
-  # If the charset is "iso-2022-jp" or "euc-jp" or "shift_jis" then
-  # the content is converted to this charset, and the language is set 
-  # to "ja".
-  def out(options = "text/html") # :yield:
-
-    options = { "type" => options } if options.kind_of?(String)
-    content = yield
-
-    if options.has_key?("charset")
-      require "nkf"
-      case options["charset"]
-      when /iso-2022-jp/ni
-        content = NKF::nkf('-j', content)
-        options["language"] = "ja" unless options.has_key?("language")
-      when /euc-jp/ni
-        content = NKF::nkf('-e', content)
-        options["language"] = "ja" unless options.has_key?("language")
-      when /shift_jis/ni
-        content = NKF::nkf('-s', content)
-        options["language"] = "ja" unless options.has_key?("language")
-      end
-    end
-
-    options["length"] = content.length.to_s
-    output = stdoutput
-    output.binmode if defined? output.binmode
-    output.print header(options)
-    output.print content unless "HEAD" == env_table['REQUEST_METHOD']
-  end
-
-
-  # Print an argument or list of arguments to the default output stream
-  #
-  #   cgi = CGI.new
-  #   cgi.print    # default:  cgi.print == $DEFAULT_OUTPUT.print
-  def print(*options)
-    stdoutput.print(*options)
-  end
-
-  require "delegate"
-
-  # Class representing an HTTP cookie.
-  #
-  # In addition to its specific fields and methods, a Cookie instance
-  # is a delegator to the array of its values.
-  #
-  # See RFC 2965.
-  #
-  # == Examples of use
-  #   cookie1 = CGI::Cookie::new("name", "value1", "value2", ...)
-  #   cookie1 = CGI::Cookie::new("name" => "name", "value" => "value")
-  #   cookie1 = CGI::Cookie::new('name'    => 'name',
-  #                              'value'   => ['value1', 'value2', ...],
-  #                              'path'    => 'path',   # optional
-  #                              'domain'  => 'domain', # optional
-  #                              'expires' => Time.now, # optional
-  #                              'secure'  => true      # optional
-  #                             )
-  # 
-  #   cgi.out("cookie" => [cookie1, cookie2]) { "string" }
-  # 
-  #   name    = cookie1.name
-  #   values  = cookie1.value
-  #   path    = cookie1.path
-  #   domain  = cookie1.domain
-  #   expires = cookie1.expires
-  #   secure  = cookie1.secure
-  # 
-  #   cookie1.name    = 'name'
-  #   cookie1.value   = ['value1', 'value2', ...]
-  #   cookie1.path    = 'path'
-  #   cookie1.domain  = 'domain'
-  #   cookie1.expires = Time.now + 30
-  #   cookie1.secure  = true
-  class Cookie < SimpleDelegator
-
-    # Create a new CGI::Cookie object.
-    #
-    # The contents of the cookie can be specified as a +name+ and one
-    # or more +value+ arguments.  Alternatively, the contents can
-    # be specified as a single hash argument.  The possible keywords of
-    # this hash are as follows:
-    #
-    # name:: the name of the cookie.  Required.
-    # value:: the cookie's value or list of values.
-    # path:: the path for which this cookie applies.  Defaults to the
-    #        base directory of the CGI script.
-    # domain:: the for which this cookie applies.
-    # expires:: the time at which this cookie expires, as a +Time+ object.
-    # secure:: whether this cookie is a secure cookie or not (default to
-    #          false).  Secure cookies are only transmitted to HTTPS 
-    #          servers.
-    #
-    # These keywords correspond to attributes of the cookie object.
-    def initialize(name = "", *value)
-      options = if name.kind_of?(String)
-                  { "name" => name, "value" => value }
-                else
-                  name
-                end
-      unless options.has_key?("name")
-        raise ArgumentError, "`name' required"
-      end
-
-      @name = options["name"]
-      @value = Array(options["value"])
-      # simple support for IE
-      if options["path"]
-        @path = options["path"]
-      else
-        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
-        @path = ($1 or "")
-      end
-      @domain = options["domain"]
-      @expires = options["expires"]
-      @secure = options["secure"] == true ? true : false
-
-      super(@value)
-    end
-
-    attr_accessor("name", "value", "path", "domain", "expires")
-    attr_reader("secure")
-
-    # Set whether the Cookie is a secure cookie or not.
-    #
-    # +val+ must be a boolean.
-    def secure=(val)
-      @secure = val if val == true or val == false
-      @secure
-    end
-
-    # Convert the Cookie to its string representation.
-    def to_s
-      buf = ""
-      buf += @name + '='
-
-      if @value.kind_of?(String)
-        buf += CGI::escape(@value)
-      else
-        buf += @value.collect{|v| CGI::escape(v) }.join("&")
-      end
-
-      if @domain
-        buf += '; domain=' + @domain
-      end
-
-      if @path
-        buf += '; path=' + @path
-      end
-
-      if @expires
-        buf += '; expires=' + CGI::rfc1123_date(@expires)
-      end
-
-      if @secure == true
-        buf += '; secure'
-      end
-
-      buf
-    end
-
-  end # class Cookie
-
-
-  # Parse a raw cookie string into a hash of cookie-name=>Cookie
-  # pairs.
-  #
-  #   cookies = CGI::Cookie::parse("raw_cookie_string")
-  #     # { "name1" => cookie1, "name2" => cookie2, ... }
-  #
-  def Cookie::parse(raw_cookie)
-    cookies = Hash.new([])
-    return cookies unless raw_cookie
-
-    raw_cookie.split(/; /).each do |pairs|
-      name, values = pairs.split('=',2)
-      next unless name and values
-      name = CGI::unescape(name)
-      values ||= ""
-      values = values.split('&').collect{|v| CGI::unescape(v) }
-      unless cookies.has_key?(name)
-        cookies[name] = Cookie::new({ "name" => name, "value" => values })
-      end
-    end
-
-    cookies
-  end
-
-  # Parse an HTTP query string into a hash of key=>value pairs.
-  #
-  #   params = CGI::parse("query_string")
-  #     # {"name1" => ["value1", "value2", ...],
-  #     #  "name2" => ["value1", "value2", ...], ... }
-  #
-  def CGI::parse(query)
-    params = Hash.new([].freeze)
-
-    query.split(/[&;]/n).each do |pairs|
-      key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
-      if params.has_key?(key)
-        params[key].push(value)
-      else
-        params[key] = [value]
-      end
-    end
-
-    params
-  end
-
-  # Mixin module. It provides the follow functionality groups:
-  #
-  # 1. Access to CGI environment variables as methods.  See 
-  #    documentation to the CGI class for a list of these variables.
-  #
-  # 2. Access to cookies, including the cookies attribute.
-  #
-  # 3. Access to parameters, including the params attribute, and overloading
-  #    [] to perform parameter value lookup by key.
-  #
-  # 4. The initialize_query method, for initialising the above
-  #    mechanisms, handling multipart forms, and allowing the
-  #    class to be used in "offline" mode.
-  #
-  module QueryExtension
-
-    for env in %w[ CONTENT_LENGTH SERVER_PORT ]
-      eval( <<-END )
-        def #{env.sub(/^HTTP_/n, '').downcase}
-          env_table["#{env}"] && Integer(env_table["#{env}"])
-        end
-      END
-    end
-
-    for env in %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
-        PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
-        REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
-        SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
-
-        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
-        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
-        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ]
-      eval( <<-END )
-        def #{env.sub(/^HTTP_/n, '').downcase}
-          env_table["#{env}"]
-        end
-      END
-    end
-
-    # Get the raw cookies as a string.
-    def raw_cookie
-      env_table["HTTP_COOKIE"]
-    end
-
-    # Get the raw RFC2965 cookies as a string.
-    def raw_cookie2
-      env_table["HTTP_COOKIE2"]
-    end
-
-    # Get the cookies as a hash of cookie-name=>Cookie pairs.
-    attr_accessor("cookies")
-
-    # Get the parameters as a hash of name=>values pairs, where
-    # values is an Array.
-    attr("params")
-
-    # Set all the parameters.
-    def params=(hash)
-      @params.clear
-      @params.update(hash)
-    end
-
-    def read_multipart(boundary, content_length)
-      params = Hash.new([])
-      boundary = "--" + boundary
-      buf = ""
-      bufsize = 10 * 1024
-
-      # start multipart/form-data
-      stdinput.binmode if defined? stdinput.binmode
-      boundary_size = boundary.size + EOL.size
-      content_length -= boundary_size
-      status = stdinput.read(boundary_size)
-      if nil == status
-        raise EOFError, "no content body"
-      elsif boundary + EOL != status
-        raise EOFError, "bad content body"
-      end
-
-      until -1 == content_length
-        head = nil
-        if 10240 < content_length
-          require "tempfile"
-          body = Tempfile.new("CGI")
-        else
-          begin
-            require "stringio"
-            body = StringIO.new
-          rescue LoadError
-            require "tempfile"
-            body = Tempfile.new("CGI")
-          end
-        end
-        body.binmode if defined? body.binmode
-
-        until head and /#{boundary}(?:#{EOL}|--)/n.match(buf)
-
-          if (not head) and /#{EOL}#{EOL}/n.match(buf)
-            buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
-              head = $1.dup
-              ""
-            end
-            next
-          end
-
-          if head and ( (EOL + boundary + EOL).size < buf.size )
-            body.print buf[0 ... (buf.size - (EOL + boundary + EOL).size)]
-            buf[0 ... (buf.size - (EOL + boundary + EOL).size)] = ""
-          end
-
-          c = if bufsize < content_length
-                stdinput.read(bufsize) or ''
-              else
-                stdinput.read(content_length) or ''
-              end
-          buf += c
-          content_length -= c.size
-
-        end
-
-        buf = buf.sub(/\A((?:.|\n)*?)(?:#{EOL})?#{boundary}(#{EOL}|--)/n) do
-          body.print $1
-          if "--" == $2 or EOL == $2
-            content_length = -1
-          end
-          ""
-        end
-
-        body.rewind
-
-        eval <<-END
-          def body.local_path
-            #{body.path.dump}
-          end
-        END
-
-        /Content-Disposition:.* filename="?([^\";]*)"?/ni.match(head)
-        eval <<-END
-          def body.original_filename
-            #{
-              filename = ($1 or "").dup
-              if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
-                 /Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and
-                 (not /MSIE/ni.match(env_table['HTTP_USER_AGENT']))
-                CGI::unescape(filename)
-              else
-                filename
-              end.dump.untaint
-            }.taint
-          end
-        END
-
-        /Content-Type: (.*)/ni.match(head)
-        eval <<-END
-          def body.content_type
-            #{($1 or "").dump.untaint}.taint
-          end
-        END
-
-        /Content-Disposition:.* name="?([^\";]*)"?/ni.match(head)
-        name = $1.dup
-
-        if params.has_key?(name)
-          params[name].push(body)
-        else
-          params[name] = [body]
-        end
-
-      end
-
-      params
-    end # read_multipart
-    private :read_multipart
-
-    # offline mode. read name=value pairs on standard input.
-    def read_from_cmdline
-      require "shellwords"
-
-      string = unless ARGV.empty?
-        ARGV.join(' ')
-      else
-        if STDIN.tty?
-          STDERR.print(
-            %|(offline mode: enter name=value pairs on standard input)\n|
-          )
-        end
-        readlines.join(' ').gsub(/\n/n, '')
-      end.gsub(/\\=/n, '%3D').gsub(/\\&/n, '%26')
-
-      words = Shellwords.shellwords(string)
-
-      if words.find{|x| /=/n.match(x) }
-        words.join('&')
-      else
-        words.join('+')
-      end
-    end
-    private :read_from_cmdline
-
-    # Initialize the data from the query.
-    #
-    # Handles multipart forms (in particular, forms that involve file uploads).
-    # Reads query parameters in the @params field, and cookies into @cookies.
-    def initialize_query()
-      if ("POST" == env_table['REQUEST_METHOD']) and
-         %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n.match(env_table['CONTENT_TYPE'])
-        boundary = $1.dup
-        @multipart = true
-        @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
-      else
-        @params = CGI::parse(
-                    case env_table['REQUEST_METHOD']
-                    when "GET", "HEAD"
-                      if defined?(MOD_RUBY)
-                        Apache::request.args or ""
-                      else
-                        env_table['QUERY_STRING'] or ""
-                      end
-                    when "POST"
-                      stdinput.binmode if defined? stdinput.binmode
-                      stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
-                    else
-                      read_from_cmdline
-                    end
-                  )
-      end
-
-      @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
-
-    end
-    private :initialize_query
-
-    class Value < String    # :nodoc:
-      def initialize(str, params)
-        @params = params
-        super(str)
-      end
-      def [](idx)
-        warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
-        self
-      end
-      def first
-        warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
-        self
-      end
-      alias last first
-      def to_a
-        @params || [self]
-      end
-      alias to_ary to_a   	# to be rhs of multiple assignment
-    end
-
-    # Get the value for the parameter with a given key.
-    #
-    # If the parameter has multiple values, only the first will be 
-    # retrieved; use #params() to get the array of values.
-    def [](key)
-      params = @params[key]
-      value = params[0]
-      if @multipart
-        if value
-          return value
-        elsif defined? StringIO
-          StringIO.new("")
-        else
-          Tempfile.new("CGI")
-        end
-      else
-        Value.new(value || "", params)
-      end
-    end
-
-    # Return all parameter keys as an array.
-    def keys(*args)
-      @params.keys(*args)
-    end
-
-    # Returns true if a given parameter key exists in the query.
-    def has_key?(*args)
-      @params.has_key?(*args)
-    end
-    alias key? has_key?
-    alias include? has_key?
-
-  end # QueryExtension
-
-
-  # Prettify (indent) an HTML string.
-  #
-  # +string+ is the HTML string to indent.  +shift+ is the indentation
-  # unit to use; it defaults to two spaces.
-  #
-  #   print CGI::pretty("<HTML><BODY></BODY></HTML>")
-  #     # <HTML>
-  #     #   <BODY>
-  #     #   </BODY>
-  #     # </HTML>
-  # 
-  #   print CGI::pretty("<HTML><BODY></BODY></HTML>", "\t")
-  #     # <HTML>
-  #     #         <BODY>
-  #     #         </BODY>
-  #     # </HTML>
-  #
-  def CGI::pretty(string, shift = "  ")
-    lines = string.gsub(/(?!\A)<(?:.|\n)*?>/n, "\n\\0").gsub(/<(?:.|\n)*?>(?!\n)/n, "\\0\n")
-    end_pos = 0
-    while end_pos = lines.index(/^<\/(\w+)/n, end_pos)
-      element = $1.dup
-      start_pos = lines.rindex(/^\s*<#{element}/ni, end_pos)
-      lines[start_pos ... end_pos] = "__" + lines[start_pos ... end_pos].gsub(/\n(?!\z)/n, "\n" + shift) + "__"
-    end
-    lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/n, '\1')
-  end
-
-
-  # Base module for HTML-generation mixins.
-  #
-  # Provides methods for code generation for tags following
-  # the various DTD element types.
-  module TagMaker # :nodoc:
-
-    # Generate code for an element with required start and end tags.
-    #
-    #   - -
-    def nn_element_def(element)
-      <<-END.gsub(/element\.downcase/n, element.downcase).gsub(/element\.upcase/n, element.upcase)
-          "<element.upcase" + attributes.collect{|name, value|
-            next unless value
-            " " + CGI::escapeHTML(name) +
-            if true == value
-              ""
-            else
-              '="' + CGI::escapeHTML(value) + '"'
-            end
-          }.to_s + ">" +
-          if block_given?
-            yield.to_s
-          else
-            ""
-          end +
-          "</element.upcase>"
-      END
-    end
-
-    # Generate code for an empty element.
-    #
-    #   - O EMPTY
-    def nOE_element_def(element)
-      <<-END.gsub(/element\.downcase/n, element.downcase).gsub(/element\.upcase/n, element.upcase)
-          "<element.upcase" + attributes.collect{|name, value|
-            next unless value
-            " " + CGI::escapeHTML(name) +
-            if true == value
-              ""
-            else
-              '="' + CGI::escapeHTML(value) + '"'
-            end
-          }.to_s + ">"
-      END
-    end
-
-    # Generate code for an element for which the end (and possibly the
-    # start) tag is optional.
-    #
-    #   O O or - O
-    def nO_element_def(element)
-      <<-END.gsub(/element\.downcase/n, element.downcase).gsub(/element\.upcase/n, element.upcase)
-          "<element.upcase" + attributes.collect{|name, value|
-            next unless value
-            " " + CGI::escapeHTML(name) +
-            if true == value
-              ""
-            else
-              '="' + CGI::escapeHTML(value) + '"'
-            end
-          }.to_s + ">" +
-          if block_given?
-            yield.to_s + "</element.upcase>"
-          else
-            ""
-          end
-      END
-    end
-
-  end # TagMaker
-
-
-  #
-  # Mixin module providing HTML generation methods.
-  #
-  # For example,
-  #   cgi.a("http://www.example.com") { "Example" }
-  #     # => "<A HREF=\"http://www.example.com\">Example</A>"
-  #
-  # Modules Http3, Http4, etc., contain more basic HTML-generation methods
-  # (:title, :center, etc.).
-  #
-  # See class CGI for a detailed example. 
-  #
-  module HtmlExtension
-
-
-    # Generate an Anchor element as a string.
-    #
-    # +href+ can either be a string, giving the URL
-    # for the HREF attribute, or it can be a hash of
-    # the elements's attributes.
-    #
-    # The body of the element is the string returned by the no-argument
-    # block passed in.
-    #
-    #   a("http://www.example.com") { "Example" }
-    #     # => "<A HREF=\"http://www.example.com\">Example</A>"
-    #
-    #   a("HREF" => "http://www.example.com", "TARGET" => "_top") { "Example" }
-    #     # => "<A HREF=\"http://www.example.com\" TARGET=\"_top\">Example</A>"
-    #
-    def a(href = "") # :yield:
-      attributes = if href.kind_of?(String)
-                     { "HREF" => href }
-                   else
-                     href
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-    # Generate a Document Base URI element as a String. 
-    #
-    # +href+ can either by a string, giving the base URL for the HREF
-    # attribute, or it can be a has of the element's attributes.
-    #
-    # The passed-in no-argument block is ignored.
-    #
-    #   base("http://www.example.com/cgi")
-    #     # => "<BASE HREF=\"http://www.example.com/cgi\">"
-    def base(href = "") # :yield:
-      attributes = if href.kind_of?(String)
-                     { "HREF" => href }
-                   else
-                     href
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-    # Generate a BlockQuote element as a string.
-    #
-    # +cite+ can either be a string, give the URI for the source of
-    # the quoted text, or a hash, giving all attributes of the element,
-    # or it can be omitted, in which case the element has no attributes.
-    #
-    # The body is provided by the passed-in no-argument block
-    #
-    #   blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
-    #     #=> "<BLOCKQUOTE CITE=\"http://www.example.com/quotes/foo.html\">Foo!</BLOCKQUOTE>
-    def blockquote(cite = nil)  # :yield:
-      attributes = if cite.kind_of?(String)
-                     { "CITE" => cite }
-                   else
-                     cite or ""
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-
-    # Generate a Table Caption element as a string.
-    #
-    # +align+ can be a string, giving the alignment of the caption
-    # (one of top, bottom, left, or right).  It can be a hash of
-    # all the attributes of the element.  Or it can be omitted.
-    #
-    # The body of the element is provided by the passed-in no-argument block.
-    #
-    #   caption("left") { "Capital Cities" }
-    #     # => <CAPTION ALIGN=\"left\">Capital Cities</CAPTION>
-    def caption(align = nil) # :yield:
-      attributes = if align.kind_of?(String)
-                     { "ALIGN" => align }
-                   else
-                     align or ""
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-
-    # Generate a Checkbox Input element as a string.
-    #
-    # The attributes of the element can be specified as three arguments,
-    # +name+, +value+, and +checked+.  +checked+ is a boolean value;
-    # if true, the CHECKED attribute will be included in the element.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   checkbox("name")
-    #     # = checkbox("NAME" => "name")
-    # 
-    #   checkbox("name", "value")
-    #     # = checkbox("NAME" => "name", "VALUE" => "value")
-    # 
-    #   checkbox("name", "value", true)
-    #     # = checkbox("NAME" => "name", "VALUE" => "value", "CHECKED" => true)
-    def checkbox(name = "", value = nil, checked = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "checkbox", "NAME" => name,
-                       "VALUE" => value, "CHECKED" => checked }
-                   else
-                     name["TYPE"] = "checkbox"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a sequence of checkbox elements, as a String.
-    #
-    # The checkboxes will all have the same +name+ attribute.
-    # Each checkbox is followed by a label.
-    # There will be one checkbox for each value.  Each value
-    # can be specified as a String, which will be used both
-    # as the value of the VALUE attribute and as the label
-    # for that checkbox.  A single-element array has the
-    # same effect.
-    #
-    # Each value can also be specified as a three-element array.
-    # The first element is the VALUE attribute; the second is the
-    # label; and the third is a boolean specifying whether this
-    # checkbox is CHECKED.
-    #
-    # Each value can also be specified as a two-element
-    # array, by omitting either the value element (defaults
-    # to the same as the label), or the boolean checked element
-    # (defaults to false).
-    #
-    #   checkbox_group("name", "foo", "bar", "baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
-    # 
-    #   checkbox_group("name", ["foo"], ["bar", true], "baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
-    # 
-    #   checkbox_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="1">Foo
-    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="2">Bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="Baz">Baz
-    # 
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => ["foo", "bar", "baz"])
-    # 
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => [["foo"], ["bar", true], "baz"])
-    # 
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    def checkbox_group(name = "", *values)
-      if name.kind_of?(Hash)
-        values = name["VALUES"]
-        name = name["NAME"]
-      end
-      values.collect{|value|
-        if value.kind_of?(String)
-          checkbox(name, value) + value
-        else
-          if value[value.size - 1] == true
-            checkbox(name, value[0], true) +
-            value[value.size - 2]
-          else
-            checkbox(name, value[0]) +
-            value[value.size - 1]
-          end
-        end
-      }.to_s
-    end
-
-
-    # Generate an File Upload Input element as a string.
-    #
-    # The attributes of the element can be specified as three arguments,
-    # +name+, +size+, and +maxlength+.  +maxlength+ is the maximum length
-    # of the file's _name_, not of the file's _contents_.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # See #multipart_form() for forms that include file uploads.
-    #
-    #   file_field("name")
-    #     # <INPUT TYPE="file" NAME="name" SIZE="20">
-    # 
-    #   file_field("name", 40)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
-    # 
-    #   file_field("name", 40, 100)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40" MAXLENGTH="100">
-    # 
-    #   file_field("NAME" => "name", "SIZE" => 40)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
-    def file_field(name = "", size = 20, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "file", "NAME" => name,
-                       "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "file"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-
-    # Generate a Form element as a string.
-    #
-    # +method+ should be either "get" or "post", and defaults to the latter.
-    # +action+ defaults to the current CGI script name.  +enctype+
-    # defaults to "application/x-www-form-urlencoded".  
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # See also #multipart_form() for forms that include file uploads.
-    #
-    #   form{ "string" }
-    #     # <FORM METHOD="post" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    # 
-    #   form("get") { "string" }
-    #     # <FORM METHOD="get" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    # 
-    #   form("get", "url") { "string" }
-    #     # <FORM METHOD="get" ACTION="url" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    # 
-    #   form("METHOD" => "post", "ENCTYPE" => "enctype") { "string" }
-    #     # <FORM METHOD="post" ENCTYPE="enctype">string</FORM>
-    def form(method = "post", action = script_name, enctype = "application/x-www-form-urlencoded")
-      attributes = if method.kind_of?(String)
-                     { "METHOD" => method, "ACTION" => action,
-                       "ENCTYPE" => enctype } 
-                   else
-                     unless method.has_key?("METHOD")
-                       method["METHOD"] = "post"
-                     end
-                     unless method.has_key?("ENCTYPE")
-                       method["ENCTYPE"] = enctype
-                     end
-                     method
-                   end
-      if block_given?
-        body = yield
-      else
-        body = ""
-      end
-      if @output_hidden
-        hidden = @output_hidden.collect{|k,v|
-          "<INPUT TYPE=HIDDEN NAME=\"#{k}\" VALUE=\"#{v}\">"
-        }.to_s
-        if defined? fieldset
-          body += fieldset{ hidden }
-        else
-          body += hidden
-        end
-      end
-      super(attributes){body}
-    end
-
-    # Generate a Hidden Input element as a string.
-    #
-    # The attributes of the element can be specified as two arguments,
-    # +name+ and +value+.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   hidden("name")
-    #     # <INPUT TYPE="hidden" NAME="name">
-    # 
-    #   hidden("name", "value")
-    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value">
-    # 
-    #   hidden("NAME" => "name", "VALUE" => "reset", "ID" => "foo")
-    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value" ID="foo">
-    def hidden(name = "", value = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "hidden", "NAME" => name, "VALUE" => value }
-                   else
-                     name["TYPE"] = "hidden"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a top-level HTML element as a string.
-    #
-    # The attributes of the element are specified as a hash.  The
-    # psuedo-attribute "PRETTY" can be used to specify that the generated
-    # HTML string should be indented.  "PRETTY" can also be specified as
-    # a string as the sole argument to this method.  The psuedo-attribute
-    # "DOCTYPE", if given, is used as the leading DOCTYPE SGML tag; it
-    # should include the entire text of this tag, including angle brackets.
-    #
-    # The body of the html element is supplied as a block.
-    # 
-    #   html{ "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>string</HTML>
-    # 
-    #   html("LANG" => "ja") { "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML LANG="ja">string</HTML>
-    # 
-    #   html("DOCTYPE" => false) { "string" }
-    #     # <HTML>string</HTML>
-    # 
-    #   html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">') { "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML>string</HTML>
-    # 
-    #   html("PRETTY" => "  ") { "<BODY></BODY>" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-    #     # <HTML>
-    #     #   <BODY>
-    #     #   </BODY>
-    #     # </HTML>
-    # 
-    #   html("PRETTY" => "\t") { "<BODY></BODY>" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-    #     # <HTML>
-    #     #         <BODY>
-    #     #         </BODY>
-    #     # </HTML>
-    # 
-    #   html("PRETTY") { "<BODY></BODY>" }
-    #     # = html("PRETTY" => "  ") { "<BODY></BODY>" }
-    # 
-    #   html(if $VERBOSE then "PRETTY" end) { "HTML string" }
-    #
-    def html(attributes = {}) # :yield:
-      if nil == attributes
-        attributes = {}
-      elsif "PRETTY" == attributes
-        attributes = { "PRETTY" => true }
-      end
-      pretty = attributes.delete("PRETTY")
-      pretty = "  " if true == pretty
-      buf = ""
-
-      if attributes.has_key?("DOCTYPE")
-        if attributes["DOCTYPE"]
-          buf += attributes.delete("DOCTYPE")
-        else
-          attributes.delete("DOCTYPE")
-        end
-      else
-        buf += doctype
-      end
-
-      if block_given?
-        buf += super(attributes){ yield }
-      else
-        buf += super(attributes)
-      end
-
-      if pretty
-        CGI::pretty(buf, pretty)
-      else
-        buf
-      end
-
-    end
-
-    # Generate an Image Button Input element as a string.
-    #
-    # +src+ is the URL of the image to use for the button.  +name+ 
-    # is the input name.  +alt+ is the alternative text for the image.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    # 
-    #   image_button("url")
-    #     # <INPUT TYPE="image" SRC="url">
-    # 
-    #   image_button("url", "name", "string")
-    #     # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string">
-    # 
-    #   image_button("SRC" => "url", "ATL" => "strng")
-    #     # <INPUT TYPE="image" SRC="url" ALT="string">
-    def image_button(src = "", name = nil, alt = nil)
-      attributes = if src.kind_of?(String)
-                     { "TYPE" => "image", "SRC" => src, "NAME" => name,
-                       "ALT" => alt }
-                   else
-                     src["TYPE"] = "image"
-                     src["SRC"] ||= ""
-                     src
-                   end
-      input(attributes)
-    end
-
-
-    # Generate an Image element as a string.
-    #
-    # +src+ is the URL of the image.  +alt+ is the alternative text for
-    # the image.  +width+ is the width of the image, and +height+ is
-    # its height.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   img("src", "alt", 100, 50)
-    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
-    # 
-    #   img("SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50)
-    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
-    def img(src = "", alt = "", width = nil, height = nil)
-      attributes = if src.kind_of?(String)
-                     { "SRC" => src, "ALT" => alt }
-                   else
-                     src
-                   end
-      attributes["WIDTH"] = width.to_s if width
-      attributes["HEIGHT"] = height.to_s if height
-      super(attributes)
-    end
-
-
-    # Generate a Form element with multipart encoding as a String.
-    #
-    # Multipart encoding is used for forms that include file uploads.
-    #
-    # +action+ is the action to perform.  +enctype+ is the encoding
-    # type, which defaults to "multipart/form-data".
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   multipart_form{ "string" }
-    #     # <FORM METHOD="post" ENCTYPE="multipart/form-data">string</FORM>
-    # 
-    #   multipart_form("url") { "string" }
-    #     # <FORM METHOD="post" ACTION="url" ENCTYPE="multipart/form-data">string</FORM>
-    def multipart_form(action = nil, enctype = "multipart/form-data")
-      attributes = if action == nil
-                     { "METHOD" => "post", "ENCTYPE" => enctype } 
-                   elsif action.kind_of?(String)
-                     { "METHOD" => "post", "ACTION" => action,
-                       "ENCTYPE" => enctype } 
-                   else
-                     unless action.has_key?("METHOD")
-                       action["METHOD"] = "post"
-                     end
-                     unless action.has_key?("ENCTYPE")
-                       action["ENCTYPE"] = enctype
-                     end
-                     action
-                   end
-      if block_given?
-        form(attributes){ yield }
-      else
-        form(attributes)
-      end
-    end
-
-
-    # Generate a Password Input element as a string.
-    #
-    # +name+ is the name of the input field.  +value+ is its default
-    # value.  +size+ is the size of the input field display.  +maxlength+
-    # is the maximum length of the inputted password.
-    #
-    # Alternatively, attributes can be specified as a hash.
-    #
-    #   password_field("name")
-    #     # <INPUT TYPE="password" NAME="name" SIZE="40">
-    # 
-    #   password_field("name", "value")
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="40">
-    # 
-    #   password_field("password", "value", 80, 200)
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
-    # 
-    #   password_field("NAME" => "name", "VALUE" => "value")
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value">
-    def password_field(name = "", value = nil, size = 40, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "password", "NAME" => name,
-                       "VALUE" => value, "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "password"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-    # Generate a Select element as a string.
-    #
-    # +name+ is the name of the element.  The +values+ are the options that
-    # can be selected from the Select menu.  Each value can be a String or
-    # a one, two, or three-element Array.  If a String or a one-element
-    # Array, this is both the value of that option and the text displayed for
-    # it.  If a three-element Array, the elements are the option value, displayed
-    # text, and a boolean value specifying whether this option starts as selected.
-    # The two-element version omits either the option value (defaults to the same
-    # as the display text) or the boolean selected specifier (defaults to false).
-    #
-    # The attributes and options can also be specified as a hash.  In this
-    # case, options are specified as an array of values as described above,
-    # with the hash key of "VALUES".
-    #
-    #   popup_menu("name", "foo", "bar", "baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="foo">foo</OPTION>
-    #     #   <OPTION VALUE="bar">bar</OPTION>
-    #     #   <OPTION VALUE="baz">baz</OPTION>
-    #     # </SELECT>
-    # 
-    #   popup_menu("name", ["foo"], ["bar", true], "baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="foo">foo</OPTION>
-    #     #   <OPTION VALUE="bar" SELECTED>bar</OPTION>
-    #     #   <OPTION VALUE="baz">baz</OPTION>
-    #     # </SELECT>
-    # 
-    #   popup_menu("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="1">Foo</OPTION>
-    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
-    #     #   <OPTION VALUE="Baz">Baz</OPTION>
-    #     # </SELECT>
-    # 
-    #   popup_menu("NAME" => "name", "SIZE" => 2, "MULTIPLE" => true,
-    #               "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    #     # <SELECT NAME="name" MULTIPLE SIZE="2">
-    #     #   <OPTION VALUE="1">Foo</OPTION>
-    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
-    #     #   <OPTION VALUE="Baz">Baz</OPTION>
-    #     # </SELECT>
-    def popup_menu(name = "", *values)
-
-      if name.kind_of?(Hash)
-        values   = name["VALUES"]
-        size     = name["SIZE"].to_s if name["SIZE"]
-        multiple = name["MULTIPLE"]
-        name     = name["NAME"]
-      else
-        size = nil
-        multiple = nil
-      end
-
-      select({ "NAME" => name, "SIZE" => size,
-               "MULTIPLE" => multiple }){
-        values.collect{|value|
-          if value.kind_of?(String)
-            option({ "VALUE" => value }){ value }
-          else
-            if value[value.size - 1] == true
-              option({ "VALUE" => value[0], "SELECTED" => true }){
-                value[value.size - 2]
-              }
-            else
-              option({ "VALUE" => value[0] }){
-                value[value.size - 1]
-              }
-            end
-          end
-        }.to_s
-      }
-
-    end
-
-    # Generates a radio-button Input element.
-    #
-    # +name+ is the name of the input field.  +value+ is the value of
-    # the field if checked.  +checked+ specifies whether the field
-    # starts off checked.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   radio_button("name", "value")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value">
-    # 
-    #   radio_button("name", "value", true)
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" CHECKED>
-    # 
-    #   radio_button("NAME" => "name", "VALUE" => "value", "ID" => "foo")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" ID="foo">
-    def radio_button(name = "", value = nil, checked = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "radio", "NAME" => name,
-                       "VALUE" => value, "CHECKED" => checked }
-                   else
-                     name["TYPE"] = "radio"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a sequence of radio button Input elements, as a String.
-    #
-    # This works the same as #checkbox_group().  However, it is not valid
-    # to have more than one radiobutton in a group checked.
-    # 
-    #   radio_group("name", "foo", "bar", "baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
-    # 
-    #   radio_group("name", ["foo"], ["bar", true], "baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
-    # 
-    #   radio_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="1">Foo
-    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="2">Bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="Baz">Baz
-    # 
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => ["foo", "bar", "baz"])
-    # 
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => [["foo"], ["bar", true], "baz"])
-    # 
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    def radio_group(name = "", *values)
-      if name.kind_of?(Hash)
-        values = name["VALUES"]
-        name = name["NAME"]
-      end
-      values.collect{|value|
-        if value.kind_of?(String)
-          radio_button(name, value) + value
-        else
-          if value[value.size - 1] == true
-            radio_button(name, value[0], true) +
-            value[value.size - 2]
-          else
-            radio_button(name, value[0]) +
-            value[value.size - 1]
-          end
-        end
-      }.to_s
-    end
-
-    # Generate a reset button Input element, as a String.
-    #
-    # This resets the values on a form to their initial values.  +value+
-    # is the text displayed on the button. +name+ is the name of this button.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   reset
-    #     # <INPUT TYPE="reset">
-    # 
-    #   reset("reset")
-    #     # <INPUT TYPE="reset" VALUE="reset">
-    # 
-    #   reset("VALUE" => "reset", "ID" => "foo")
-    #     # <INPUT TYPE="reset" VALUE="reset" ID="foo">
-    def reset(value = nil, name = nil)
-      attributes = if (not value) or value.kind_of?(String)
-                     { "TYPE" => "reset", "VALUE" => value, "NAME" => name }
-                   else
-                     value["TYPE"] = "reset"
-                     value
-                   end
-      input(attributes)
-    end
-
-    alias scrolling_list popup_menu
-
-    # Generate a submit button Input element, as a String.
-    #
-    # +value+ is the text to display on the button.  +name+ is the name
-    # of the input.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   submit
-    #     # <INPUT TYPE="submit">
-    # 
-    #   submit("ok")
-    #     # <INPUT TYPE="submit" VALUE="ok">
-    # 
-    #   submit("ok", "button1")
-    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1">
-    # 
-    #   submit("VALUE" => "ok", "NAME" => "button1", "ID" => "foo")
-    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1" ID="foo">
-    def submit(value = nil, name = nil)
-      attributes = if (not value) or value.kind_of?(String)
-                     { "TYPE" => "submit", "VALUE" => value, "NAME" => name }
-                   else
-                     value["TYPE"] = "submit"
-                     value
-                   end
-      input(attributes)
-    end
-
-    # Generate a text field Input element, as a String.
-    #
-    # +name+ is the name of the input field.  +value+ is its initial
-    # value.  +size+ is the size of the input area.  +maxlength+
-    # is the maximum length of input accepted.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   text_field("name")
-    #     # <INPUT TYPE="text" NAME="name" SIZE="40">
-    # 
-    #   text_field("name", "value")
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="40">
-    # 
-    #   text_field("name", "value", 80)
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80">
-    # 
-    #   text_field("name", "value", 80, 200)
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
-    # 
-    #   text_field("NAME" => "name", "VALUE" => "value")
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value">
-    def text_field(name = "", value = nil, size = 40, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "text", "NAME" => name, "VALUE" => value,
-                       "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "text"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-    # Generate a TextArea element, as a String.
-    #
-    # +name+ is the name of the textarea.  +cols+ is the number of
-    # columns and +rows+ is the number of rows in the display.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # The body is provided by the passed-in no-argument block
-    #
-    #   textarea("name")
-    #      # = textarea("NAME" => "name", "COLS" => 70, "ROWS" => 10)
-    #
-    #   textarea("name", 40, 5)
-    #      # = textarea("NAME" => "name", "COLS" => 40, "ROWS" => 5)
-    def textarea(name = "", cols = 70, rows = 10)  # :yield:
-      attributes = if name.kind_of?(String)
-                     { "NAME" => name, "COLS" => cols.to_s,
-                       "ROWS" => rows.to_s }
-                   else
-                     name
-                   end
-      if block_given?
-        super(attributes){ yield }
-      else
-        super(attributes)
-      end
-    end
-
-  end # HtmlExtension
-
-
-  # Mixin module for HTML version 3 generation methods.
-  module Html3 # :nodoc:
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    def element_init
-      extend TagMaker
-      methods = ""
-      # - -
-      for element in %w[ A TT I B U STRIKE BIG SMALL SUB SUP EM STRONG
-          DFN CODE SAMP KBD VAR CITE FONT ADDRESS DIV center MAP
-          APPLET PRE XMP LISTING DL OL UL DIR MENU SELECT table TITLE
-          STYLE SCRIPT H1 H2 H3 H4 H5 H6 TEXTAREA FORM BLOCKQUOTE
-          CAPTION ]
-        methods += <<-BEGIN + nn_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # - O EMPTY
-      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
-          ISINDEX META ]
-        methods += <<-BEGIN + nOE_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # O O or - O
-      for element in %w[ HTML HEAD BODY P PLAINTEXT DT DD LI OPTION tr
-          th td ]
-        methods += <<-BEGIN + nO_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-      eval(methods)
-    end
-
-  end # Html3
-
-
-  # Mixin module for HTML version 4 generation methods.
-  module Html4 # :nodoc:
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    def element_init
-      extend TagMaker
-      methods = ""
-      # - -
-      for element in %w[ TT I B BIG SMALL EM STRONG DFN CODE SAMP KBD
-        VAR CITE ABBR ACRONYM SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
-        H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT OPTGROUP
-        FIELDSET LEGEND BUTTON TABLE TITLE STYLE SCRIPT NOSCRIPT
-        TEXTAREA FORM A BLOCKQUOTE CAPTION ]
-        methods += <<-BEGIN + nn_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # - O EMPTY
-      for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META ]
-        methods += <<-BEGIN + nOE_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # O O or - O
-      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
-          COLGROUP TR TH TD HEAD]
-        methods += <<-BEGIN + nO_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-      eval(methods)
-    end
-
-  end # Html4
-
-
-  # Mixin module for HTML version 4 transitional generation methods.
-  module Html4Tr # :nodoc:
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    def element_init
-      extend TagMaker
-      methods = ""
-      # - -
-      for element in %w[ TT I B U S STRIKE BIG SMALL EM STRONG DFN
-          CODE SAMP KBD VAR CITE ABBR ACRONYM FONT SUB SUP SPAN BDO
-          ADDRESS DIV CENTER MAP OBJECT APPLET H1 H2 H3 H4 H5 H6 PRE Q
-          INS DEL DL OL UL DIR MENU LABEL SELECT OPTGROUP FIELDSET
-          LEGEND BUTTON TABLE IFRAME NOFRAMES TITLE STYLE SCRIPT
-          NOSCRIPT TEXTAREA FORM A BLOCKQUOTE CAPTION ]
-        methods += <<-BEGIN + nn_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # - O EMPTY
-      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
-          COL ISINDEX META ]
-        methods += <<-BEGIN + nOE_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # O O or - O
-      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
-          COLGROUP TR TH TD HEAD ]
-        methods += <<-BEGIN + nO_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-      eval(methods)
-    end
-
-  end # Html4Tr
-
-
-  # Mixin module for generating HTML version 4 with framesets.
-  module Html4Fr # :nodoc:
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    def element_init
-      methods = ""
-      # - -
-      for element in %w[ FRAMESET ]
-        methods += <<-BEGIN + nn_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-
-      # - O EMPTY
-      for element in %w[ FRAME ]
-        methods += <<-BEGIN + nOE_element_def(element) + <<-END
-          def #{element.downcase}(attributes = {})
-        BEGIN
-          end
-        END
-      end
-      eval(methods)
-    end
-
-  end # Html4Fr
-
-
-  # Creates a new CGI instance.
-  #
-  # +type+ specifies which version of HTML to load the HTML generation
-  # methods for.  The following versions of HTML are supported:
-  #
-  # html3:: HTML 3.x
-  # html4:: HTML 4.0
-  # html4Tr:: HTML 4.0 Transitional
-  # html4Fr:: HTML 4.0 with Framesets
-  #
-  # If not specified, no HTML generation methods will be loaded.
-  #
-  # If the CGI object is not created in a standard CGI call environment
-  # (that is, it can't locate REQUEST_METHOD in its environment), then
-  # it will run in "offline" mode.  In this mode, it reads its parameters
-  # from the command line or (failing that) from standard input.  Otherwise,
-  # cookies and other parameters are parsed automatically from the standard
-  # CGI locations, which varies according to the REQUEST_METHOD.
-  def initialize(type = "query")
-    if defined?(MOD_RUBY) && !ENV.key?("GATEWAY_INTERFACE")
-      Apache.request.setup_cgi_env
-    end
-
-    extend QueryExtension
-    @multipart = false
-    if "POST" != env_table['REQUEST_METHOD']
-      initialize_query()  # set @params, @cookies
-    else
-      if defined?(CGI_PARAMS)
-        @params  = CGI_PARAMS.nil?  ? nil : CGI_PARAMS.dup
-        @cookies = CGI_COOKIES.nil? ? nil : CGI_COOKIES.dup
-      else
-        initialize_query()  # set @params, @cookies
-        eval "CGI_PARAMS  = @params.nil?  ? nil : @params.dup"
-        eval "CGI_COOKIES = @cookies.nil? ? nil : @cookies.dup"
-        if defined?(MOD_RUBY) and (RUBY_VERSION < "1.4.3")
-          raise "Please, use ruby1.4.3 or later."
-        else
-          at_exit() do
-            if defined?(CGI_PARAMS)
-              CGI.class_eval("remove_const(:CGI_PARAMS)")
-              CGI.class_eval("remove_const(:CGI_COOKIES)")
-            end
-          end
-        end
-      end
-    end
-    @output_cookies = nil
-    @output_hidden = nil
-
-    case type
-    when "html3"
-      extend Html3
-      element_init()
-      extend HtmlExtension
-    when "html4"
-      extend Html4
-      element_init()
-      extend HtmlExtension
-    when "html4Tr"
-      extend Html4Tr
-      element_init()
-      extend HtmlExtension
-    when "html4Fr"
-      extend Html4Tr
-      element_init()
-      extend Html4Fr
-      element_init()
-      extend HtmlExtension
-    end
-  end
-
-end   # class CGI
-
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
deleted file mode 100644
index 4ad6bf2a67..0000000000
--- a/lib/cgi/session.rb
+++ /dev/null
@@ -1,466 +0,0 @@
-#
-# cgi/session.rb - session support for cgi scripts
-#
-# Copyright (C) 2001  Yukihiro "Matz" Matsumoto
-# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-# Copyright (C) 2000  Information-technology Promotion Agency, Japan
-#
-# Author: Yukihiro "Matz" Matsumoto
-#
-# Documentation: William Webber (william@williamwebber.com)
-#
-# == Overview
-#
-# This file provides the +CGI::Session+ class, which provides session
-# support for CGI scripts.  A session is a sequence of HTTP requests
-# and responses linked together and associated with a single client.  
-# Information associated with the session is stored
-# on the server between requests.  A session id is passed between client
-# and server with every request and response, transparently
-# to the user.  This adds state information to the otherwise stateless
-# HTTP request/response protocol.
-#
-# See the documentation to the +CGI::Session+ class for more details
-# and examples of usage.  See cgi.rb for the +CGI+ class itself.
-
-require 'cgi'
-require 'tmpdir'
-
-class CGI
-
-  # Class representing an HTTP session.  See documentation for the file 
-  # cgi/session.rb for an introduction to HTTP sessions.
-  #
-  # == Lifecycle
-  #
-  # A CGI::Session instance is created from a CGI object.  By default,
-  # this CGI::Session instance will start a new session if none currently
-  # exists, or continue the current session for this client if one does
-  # exist.  The +new_session+ option can be used to either always or
-  # never create a new session.  See #new() for more details.
-  #
-  # #delete() deletes a session from session storage.  It
-  # does not however remove the session id from the client.  If the client
-  # makes another request with the same id, the effect will be to start
-  # a new session with the old session's id.
-  #
-  # == Setting and retrieving session data.
-  #
-  # The Session class associates data with a session as key-value pairs.
-  # This data can be set and retrieved by indexing the Session instance 
-  # using '[]', much the same as hashes (although other hash methods
-  # are not supported).
-  #
-  # When session processing has been completed for a request, the
-  # session should be closed using the close() method.  This will
-  # store the session's state to persistent storage.  If you want
-  # to store the session's state to persistent storage without
-  # finishing session processing for this request, call the update()
-  # method.
-  #
-  # == Storing session state
-  #
-  # The caller can specify what form of storage to use for the session's 
-  # data with the +database_manager+ option to CGI::Session::new.  The
-  # following storage classes are provided as part of the standard library:
-  #
-  # CGI::Session::FileStore:: stores data as plain text in a flat file.  Only 
-  #                           works with String data.  This is the default 
-  #                           storage type.
-  # CGI::Session::MemoryStore:: stores data in an in-memory hash.  The data 
-  #                             only persists for as long as the current ruby 
-  #                             interpreter instance does.
-  # CGI::Session::PStore:: stores data in Marshalled format.  Provided by
-  #                        cgi/session/pstore.rb.  Supports data of any type, 
-  #                        and provides file-locking and transaction support.
-  #
-  # Custom storage types can also be created by defining a class with 
-  # the following methods:
-  #
-  #    new(session, options)
-  #    restore  # returns hash of session data.
-  #    update
-  #    close
-  #    delete
-  #
-  # Changing storage type mid-session does not work.  Note in particular
-  # that by default the FileStore and PStore session data files have the
-  # same name.  If your application switches from one to the other without
-  # making sure that filenames will be different
-  # and clients still have old sessions lying around in cookies, then
-  # things will break nastily!
-  #
-  # == Maintaining the session id.
-  #
-  # Most session state is maintained on the server.  However, a session
-  # id must be passed backwards and forwards between client and server
-  # to maintain a reference to this session state.
-  #
-  # The simplest way to do this is via cookies.  The CGI::Session class
-  # provides transparent support for session id communication via cookies
-  # if the client has cookies enabled.
-  # 
-  # If the client has cookies disabled, the session id must be included
-  # as a parameter of all requests sent by the client to the server.  The
-  # CGI::Session class in conjunction with the CGI class will transparently
-  # add the session id as a hidden input field to all forms generated
-  # using the CGI#form() HTML generation method.  No built-in support is
-  # provided for other mechanisms, such as URL re-writing.  The caller is
-  # responsible for extracting the session id from the session_id 
-  # attribute and manually encoding it in URLs and adding it as a hidden
-  # input to HTML forms created by other mechanisms.  Also, session expiry
-  # is not automatically handled.
-  #
-  # == Examples of use
-  #
-  # === Setting the user's name
-  #
-  #   require 'cgi'
-  #   require 'cgi/session'
-  #   require 'cgi/session/pstore'     # provides CGI::Session::PStore
-  #
-  #   cgi = CGI.new("html4")
-  #
-  #   session = CGI::Session.new(cgi,
-  #       'database_manager' => CGI::Session::PStore,  # use PStore
-  #       'session_key' => '_rb_sess_id',              # custom session key
-  #       'session_expires' => Time.now + 30 * 60,     # 30 minute timeout 
-  #       'prefix' => 'pstore_sid_')                   # PStore option
-  #   if cgi.has_key?('user_name') and cgi['user_name'] != ''
-  #       # coerce to String: cgi[] returns the 
-  #       # string-like CGI::QueryExtension::Value
-  #       session['user_name'] = cgi['user_name'].to_s
-  #   elsif !session['user_name']
-  #       session['user_name'] = "guest"
-  #   end
-  #   session.close
-  #
-  # === Creating a new session safely
-  #
-  #   require 'cgi'
-  #   require 'cgi/session'
-  #
-  #   cgi = CGI.new("html4")
-  #
-  #   # We make sure to delete an old session if one exists,
-  #   # not just to free resources, but to prevent the session 
-  #   # from being maliciously hijacked later on.
-  #   begin
-  #       session = CGI::Session.new(cgi, 'new_session' => false)      
-  #       session.delete                 
-  #   rescue ArgumentError  # if no old session
-  #   end
-  #   session = CGI::Session.new(cgi, 'new_session' => true)
-  #   session.close
-  #
-  class Session
-
-    # The id of this session.
-    attr_reader :session_id
-
-    def Session::callback(dbman)  #:nodoc:
-      lambda{
-	dbman[0].close unless dbman.empty?
-      }
-    end
-
-    # Create a new session id.
-    #
-    # The session id is an MD5 hash based upon the time,
-    # a random number, and a constant string.  This routine
-    # is used internally for automatically generated
-    # session ids. 
-    def Session::create_new_id
-      require 'digest/md5'
-      md5 = Digest::MD5::new
-      md5.update(String(Time::now))
-      md5.update(String(rand(0)))
-      md5.update(String($$))
-      md5.update('foobar')
-      md5.hexdigest[0,16]
-    end
-
-    # Create a new CGI::Session object for +request+.
-    #
-    # +request+ is an instance of the +CGI+ class (see cgi.rb).
-    # +option+ is a hash of options for initialising this
-    # CGI::Session instance.  The following options are
-    # recognised:
-    #
-    # session_key:: the parameter name used for the session id.
-    #               Defaults to '_session_id'.
-    # session_id:: the session id to use.  If not provided, then
-    #              it is retrieved from the +session_key+ parameter
-    #              of the request, or automatically generated for
-    #              a new session.
-    # new_session:: if true, force creation of a new session.  If not set, 
-    #               a new session is only created if none currently
-    #               exists.  If false, a new session is never created,
-    #               and if none currently exists and the +session_id+
-    #               option is not set, an ArgumentError is raised.
-    # database_manager:: the name of the class providing storage facilities
-    #                    for session state persistence.  Built-in support
-    #                    is provided for +FileStore+ (the default),
-    #                    +MemoryStore+, and +PStore+ (from
-    #                    cgi/session/pstore.rb).  See the documentation for
-    #                    these classes for more details.
-    #
-    # The following options are also recognised, but only apply if the
-    # session id is stored in a cookie.
-    #
-    # session_expires:: the time the current session expires, as a 
-    #                   +Time+ object.  If not set, the session will continue
-    #                   indefinitely.
-    # session_domain:: the hostname domain for which this session is valid.
-    #                  If not set, defaults to the hostname of the server.
-    # session_secure:: if +true+, this session will only work over HTTPS.
-    # session_path:: the path for which this session applies.  Defaults
-    #                to the directory of the CGI script.
-    #
-    # +option+ is also passed on to the session storage class initialiser; see
-    # the documentation for each session storage class for the options
-    # they support.
-    #                  
-    # The retrieved or created session is automatically added to +request+
-    # as a cookie, and also to its +output_hidden+ table, which is used
-    # to add hidden input elements to forms.  
-    #
-    # *WARNING* the +output_hidden+
-    # fields are surrounded by a <fieldset> tag in HTML 4 generation, which
-    # is _not_ invisible on many browsers; you may wish to disable the
-    # use of fieldsets with code similar to the following
-    # (see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/37805)
-    #
-    #   cgi = CGI.new("html4")
-    #   class << cgi
-    #       undef_method :fieldset
-    #   end
-    #
-    def initialize(request, option={})
-      session_key = option['session_key'] || '_session_id'
-      id = option['session_id']
-      unless id
-	if option['new_session']
-	  id = Session::create_new_id
-	end
-      end
-      unless id
-	if request.key?(session_key)
-	  id = request[session_key] 
-	  id = id.read if id.respond_to?(:read)
-	end
-	unless id
-	  id, = request.cookies[session_key]
-	end
-	unless id
-	  if option.key?('new_session') and not option['new_session']
-	    raise ArgumentError, "session_key `%s' should be supplied"%session_key
-	  end
-	  id = Session::create_new_id
-	end
-      end
-      @session_id = id
-      dbman = option['database_manager'] || FileStore
-      @dbman = dbman::new(self, option)
-      request.instance_eval do
-	@output_hidden = {session_key => id}
-	@output_cookies =  [
-          Cookie::new("name" => session_key,
-		      "value" => id,
-		      "expires" => option['session_expires'],
-		      "domain" => option['session_domain'],
-		      "secure" => option['session_secure'],
-		      "path" => if option['session_path'] then
-				  option['session_path']
-		                elsif ENV["SCRIPT_NAME"] then
-				  File::dirname(ENV["SCRIPT_NAME"])
-				else
-				  ""
-				end)
-        ]
-      end
-      @dbprot = [@dbman]
-      ObjectSpace::define_finalizer(self, Session::callback(@dbprot))
-    end
-
-    # Retrieve the session data for key +key+.
-    def [](key)
-      unless @data
-	@data = @dbman.restore
-      end
-      @data[key]
-    end
-
-    # Set the session date for key +key+.
-    def []=(key, val)
-      unless @write_lock
-	@write_lock = true
-      end
-      unless @data
-	@data = @dbman.restore
-      end
-      @data[key] = val
-    end
-
-    # Store session data on the server.  For some session storage types,
-    # this is a no-op.
-    def update  
-      @dbman.update
-    end
-
-    # Store session data on the server and close the session storage.  
-    # For some session storage types, this is a no-op.
-    def close
-      @dbman.close
-      @dbprot.clear
-    end
-
-    # Delete the session from storage.  Also closes the storage.
-    #
-    # Note that the session's data is _not_ automatically deleted
-    # upon the session expiring.
-    def delete
-      @dbman.delete
-      @dbprot.clear
-    end
-
-    # File-based session storage class.
-    #
-    # Implements session storage as a flat file of 'key=value' values.
-    # This storage type only works directly with String values; the
-    # user is responsible for converting other types to Strings when
-    # storing and from Strings when retrieving.
-    class FileStore
-      def check_id(id) #:nodoc:
-	/[^0-9a-zA-Z]/ =~ id.to_s ? false : true
-      end
-
-      # Create a new FileStore instance.
-      #
-      # This constructor is used internally by CGI::Session.  The
-      # user does not generally need to call it directly.
-      #
-      # +session+ is the session for which this instance is being
-      # created.  The session id must only contain alphanumeric
-      # characters; automatically generated session ids observe
-      # this requirement.
-      # 
-      # +option+ is a hash of options for the initialiser.  The
-      # following options are recognised:
-      #
-      # tmpdir:: the directory to use for storing the FileStore
-      #          file.  Defaults to Dir::tmpdir (generally "/tmp"
-      #          on Unix systems).
-      # prefix:: the prefix to add to the session id when generating
-      #          the filename for this session's FileStore file.
-      #          Defaults to the empty string.
-      #
-      # This session's FileStore file will be created if it does
-      # not exist, or opened if it does.
-      def initialize(session, option={})
-	dir = option['tmpdir'] || Dir::tmpdir
-	prefix = option['prefix'] || ''
-	id = session.session_id
-	unless check_id(id)
-	  raise ArgumentError, "session_id `%s' is invalid" % id
-	end
-	path = dir+"/"+prefix+id
-	path.untaint
-	unless File::exist? path
-	  @hash = {}
-	end
-	begin
-	  @f = open(path, "r+")
-	rescue Errno::ENOENT
-	  @f = open(path, "w+")
-	end
-      end
-
-      # Restore session state from the session's FileStore file.
-      #
-      # Returns the session state as a hash.
-      def restore
-	unless @hash
-	  @hash = {}
-	  @f.flock File::LOCK_EX
-	  @f.rewind
-	  for line in @f
-	    line.chomp!
-	    k, v = line.split('=',2)
-	    @hash[CGI::unescape(k)] = CGI::unescape(v)
-	  end
-	end
-	@hash
-      end
-
-      # Save session state to the session's FileStore file.
-      def update
-	return unless @hash
-	@f.rewind
-	for k,v in @hash
-	  @f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(v))
-	end
-	@f.truncate @f.tell
-      end
-
-      # Update and close the session's FileStore file.
-      def close
-	return if @f.closed?
-	update
-	@f.close
-      end
-
-      # Close and delete the session's FileStore file.
-      def delete
-	path = @f.path
-	@f.close
-	File::unlink path
-      end
-    end
-
-    # In-memory session storage class.
-    #
-    # Implements session storage as a global in-memory hash.  Session
-    # data will only persist for as long as the ruby interpreter 
-    # instance does.
-    class MemoryStore
-      GLOBAL_HASH_TABLE = {} #:nodoc:
-
-      # Create a new MemoryStore instance.
-      #
-      # +session+ is the session this instance is associated with.
-      # +option+ is a list of initialisation options.  None are
-      # currently recognised.
-      def initialize(session, option=nil)
-	@session_id = session.session_id
-	GLOBAL_HASH_TABLE[@session_id] ||= {}
-      end
-
-      # Restore session state.
-      #
-      # Returns session data as a hash.
-      def restore
-	GLOBAL_HASH_TABLE[@session_id]
-      end
-
-      # Update session state.
-      #
-      # A no-op.
-      def update
-	# don't need to update; hash is shared
-      end
-
-      # Close session storage.
-      #
-      # A no-op.
-      def close
-	# don't need to close
-      end
-
-      # Delete the session state.
-      def delete
-	GLOBAL_HASH_TABLE.delete(@session_id)
-      end
-    end
-  end
-end
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb
deleted file mode 100644
index 8f4beb978a..0000000000
--- a/lib/cgi/session/pstore.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# cgi/session/pstore.rb - persistent storage of marshalled session data
-#
-# Documentation: William Webber (william@williamwebber.com)
-# 
-# == Overview
-#
-# This file provides the CGI::Session::PStore class, which builds
-# persistent of session data on top of the pstore library.  See
-# cgi/session.rb for more details on session storage managers.
-
-require 'cgi/session'
-require 'pstore'
-
-class CGI
-  class Session
-    def []=(key, val)
-      unless @write_lock
-	@write_lock = true
-      end
-      unless @data
-	@data = @dbman.restore
-      end
-      #@data[key] = String(val)
-      @data[key] = val
-    end
-
-    # PStore-based session storage class.
-    #
-    # This builds upon the top-level PStore class provided by the
-    # library file pstore.rb.  Session data is marshalled and stored
-    # in a file.  File locking and transaction services are provided.
-    class PStore
-      def check_id(id) #:nodoc:
-	/[^0-9a-zA-Z]/ =~ id.to_s ? false : true
-      end
-
-      # Create a new CGI::Session::PStore instance
-      #
-      # This constructor is used internally by CGI::Session.  The
-      # user does not generally need to call it directly.
-      #
-      # +session+ is the session for which this instance is being
-      # created.  The session id must only contain alphanumeric
-      # characters; automatically generated session ids observe
-      # this requirement.
-      # 
-      # +option+ is a hash of options for the initialiser.  The
-      # following options are recognised:
-      #
-      # tmpdir:: the directory to use for storing the PStore
-      #          file.  Defaults to Dir::tmpdir (generally "/tmp"
-      #          on Unix systems).
-      # prefix:: the prefix to add to the session id when generating
-      #          the filename for this session's PStore file.
-      #          Defaults to the empty string.
-      #
-      # This session's PStore file will be created if it does
-      # not exist, or opened if it does.
-      def initialize session, option={}
-	dir = option['tmpdir'] || ENV['TMP'] || '/tmp'
-	prefix = option['prefix'] || ''
-	id = session.session_id
-	unless check_id(id)
-	  raise ArgumentError, "session_id `%s' is invalid" % id
-	end
-	path = dir+"/"+prefix+id
-	path.untaint
-	unless File::exist? path
-	  @hash = {}
-	end
-	@p = ::PStore.new(path)
-      end
-
-      # Restore session state from the session's PStore file.
-      #
-      # Returns the session state as a hash.
-      def restore
-	unless @hash
-	  @p.transaction do
-	    begin
-	      @hash = @p['hash']
-	    rescue
-	      @hash = {}
-	    end
-	  end
-	end
-	@hash
-      end
-
-      # Save session state to the session's PStore file.
-      def update 
-	@p.transaction do
-	    @p['hash'] = @hash
-	end
-      end
-
-      # Update and close the session's PStore file.
-      def close
-	update
-      end
-
-      # Close and delete the session's PStore file.
-      def delete
-	path = @p.path
-	File::unlink path
-      end
-
-    end
-  end
-end
-
-if $0 == __FILE__
-  # :enddoc:
-  STDIN.reopen("/dev/null")
-  cgi = CGI.new
-  session = CGI::Session.new(cgi, 'database_manager' => CGI::Session::PStore)
-  session['key'] = {'k' => 'v'}
-  puts session['key'].class
-  fail unless Hash === session['key']
-  puts session['key'].inspect
-  fail unless session['key'].inspect == '{"k"=>"v"}'
-end
diff --git a/lib/complex.rb b/lib/complex.rb
index 9300f391e8..0af8c20b89 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -5,136 +5,79 @@
 #   	$Date: 1998/07/08 10:05:28 $
 #   	by Keiju ISHITSUKA(SHL Japan Inc.)
 #
-# ----
+# --
+#   Usage:
+#      class Complex < Numeric
 #
-# complex.rb implements the Complex class for complex numbers.  Additionally,
-# some methods in other Numeric classes are redefined or added to allow greater
-# interoperability with Complex numbers.
+#   Complex(x, y) --> x + yi
+#   y.im          --> 0 + yi
 #
-# Complex numbers can be created in the following manner:
-# - <tt>Complex(a, b)</tt>
-# - <tt>Complex.polar(radius, theta)</tt>
-#   
-# Additionally, note the following:
-# - <tt>Complex::I</tt> (the mathematical constant <i>i</i>)
-# - <tt>Numeric#im</tt> (e.g. <tt>5.im -> 0+5i</tt>)
+#   Complex::polar
 #
-# The following +Math+ module methods are redefined to handle Complex arguments.
-# They will work as normal with non-Complex arguments.
-#    sqrt exp cos sin tan log log10
-#    cosh sinh tanh acos asin atan atan2 acosh asinh atanh
+#   Complex::+
+#   Complex::-
+#   Complex::*
+#   Complex::/
+#   Complex::**
+#   Complex::%
+#   Complex::divmod
+#   Complex::abs
+#   Complex::abs2
+#   Complex::arg
+#   Complex::polar
+#   Complex::conjugate
+#   Complex::<=>
+#   Complex::==
+#   Complex::to_i
+#   Complex::to_f
+#   Complex::to_r
+#   Complex::to_s
 #
-
-
+#   Complex::I
 #
-# Numeric is a built-in class on which Fixnum, Bignum, etc., are based.  Here
-# some methods are added so that all number types can be treated to some extent
-# as Complex numbers.
+#   Numeric::im
 #
-class Numeric
-  #
-  # Returns a Complex number <tt>(0,<i>self</i>)</tt>.
-  #
-  def im
-    Complex(0, self)
-  end
-  
-  #
-  # The real part of a complex number, i.e. <i>self</i>.
-  #
-  def real
-    self
-  end
-  
-  #
-  # The imaginary part of a complex number, i.e. 0.
-  #
-  def image
-    0
-  end
-  alias imag image
-  
-  #
-  # See Complex#arg.
-  #
-  def arg
-    if self >= 0
-      return 0
-    else
-      return Math::PI
-    end
-  end
-  alias angle arg
-  
-  #
-  # See Complex#polar.
-  #
-  def polar
-    return abs, arg
-  end
-  
-  #
-  # See Complex#conjugate (short answer: returns <i>self</i>).
-  #
-  def conjugate
-    self
-  end
-  alias conj conjugate
-end
-
-
+#   Math.sqrt
+#   Math.exp
+#   Math.cos
+#   Math.sin
+#   Math.tan
+#   Math.log
+#   Math.log10
+#   Math.atan2
 #
-# Creates a Complex number.  +a+ and +b+ should be Numeric.  The result will be
-# <tt>a+bi</tt>.
 #
+
 def Complex(a, b = 0)
-  if b == 0 and (a.kind_of?(Complex) or defined? Complex::Unify)
+  if a.kind_of?(Complex) and b == 0
+    a
+  elsif b == 0 and defined? Complex::Unify
     a
   else
-    Complex.new( a.real-b.imag, a.imag+b.real )
+    Complex.new(a, b)
   end
 end
 
-#
-# The complex number class.  See complex.rb for an overview.
-#
 class Complex < Numeric
   @RCS_ID='-$Id: complex.rb,v 1.3 1998/07/08 10:05:28 keiju Exp keiju $-'
-
-  undef step
-
-  def Complex.generic?(other) # :nodoc:
+  
+  def Complex.generic?(other)
     other.kind_of?(Integer) or
     other.kind_of?(Float) or
     (defined?(Rational) and other.kind_of?(Rational))
   end
 
-  #
-  # Creates a +Complex+ number in terms of +r+ (radius) and +theta+ (angle).
-  #
   def Complex.polar(r, theta)
     Complex(r*Math.cos(theta), r*Math.sin(theta))
   end
-
-  #
-  # Creates a +Complex+ number <tt>a</tt>+<tt>b</tt><i>i</i>.
-  #
-  def Complex.new!(a, b=0)
-    new(a,b)
-  end
-
-  def initialize(a, b)
-    raise TypeError, "non numeric 1st arg `#{a.inspect}'" if !a.kind_of? Numeric
-    raise TypeError, "`#{a.inspect}' for 1st arg" if a.kind_of? Complex
-    raise TypeError, "non numeric 2nd arg `#{b.inspect}'" if !b.kind_of? Numeric
-    raise TypeError, "`#{b.inspect}' for 2nd arg" if b.kind_of? Complex
+  
+  def initialize(a, b = 0)
+    raise "non numeric 1st arg `#{a.inspect}'" if !a.kind_of? Numeric
+    raise "non numeric 2nd arg `#{b.inspect}'" if !b.kind_of? Numeric
     @real = a
     @image = b
   end
-
-  #
-  # Addition with real or complex number.
-  #
+  
   def + (other)
     if other.kind_of?(Complex)
       re = @real + other.real
@@ -148,9 +91,6 @@ class Complex < Numeric
     end
   end
   
-  #
-  # Subtraction with real or complex number.
-  #
   def - (other)
     if other.kind_of?(Complex)
       re = @real - other.real
@@ -164,9 +104,6 @@ class Complex < Numeric
     end
   end
   
-  #
-  # Multiplication with real or complex number.
-  #
   def * (other)
     if other.kind_of?(Complex)
       re = @real*other.real - @image*other.image
@@ -180,23 +117,17 @@ class Complex < Numeric
     end
   end
   
-  #
-  # Division by real or complex number.
-  #
   def / (other)
     if other.kind_of?(Complex)
-      self*other.conjugate/other.abs2
+      self * other.conjugate / other.abs2
     elsif Complex.generic?(other)
-      Complex(@real/other, @image/other)
+      Complex(@real / other, @image / other)
     else
-      x, y = other.coerce(self)
-      x/y
+      x , y = other.coerce(self)
+      x / y
     end
   end
   
-  #
-  # Raise this complex number to the given (real or complex) power.
-  #
   def ** (other)
     if other == 0
       return Complex(1)
@@ -232,16 +163,13 @@ class Complex < Numeric
       end
     elsif Complex.generic?(other)
       r, theta = polar
-      Complex.polar(r**other, theta*other)
+      Complex.polar(r.power!(other), theta * other)
     else
-      x, y = other.coerce(self)
-      x**y
+      x , y = other.coerce(self)
+      x / y
     end
   end
   
-  #
-  # Remainder after division by a real or complex number.
-  #
   def % (other)
     if other.kind_of?(Complex)
       Complex(@real % other.real, @image % other.image)
@@ -253,109 +181,84 @@ class Complex < Numeric
     end
   end
   
-#--
-#    def divmod(other)
-#      if other.kind_of?(Complex)
-#        rdiv, rmod = @real.divmod(other.real)
-#        idiv, imod = @image.divmod(other.image)
-#        return Complex(rdiv, idiv), Complex(rmod, rmod)
-#      elsif Complex.generic?(other)
-#        Complex(@real.divmod(other), @image.divmod(other))
-#      else
-#        x , y = other.coerce(self)
-#        x.divmod(y)
-#      end
-#    end
-#++
-  
-  #
-  # Absolute value (aka modulus): distance from the zero point on the complex
-  # plane.
-  #
+  def divmod(other)
+    if other.kind_of?(Complex)
+      rdiv, rmod = @real.divmod(other.real)
+      idiv, imod = @image.divmod(other.image)
+      return Complex(rdiv, idiv), Complex(rmod, rdiv)
+    elsif Complex.generic?(other)
+      Complex(@real.divmod(other), @image.divmod(other))
+    else
+      x , y = other.coerce(self)
+      x.divmod(y)
+    end
+  end
+  
   def abs
-    Math.hypot(@real, @image)
+    Math.sqrt!((@real*@real + @image*@image).to_f)
   end
   
-  #
-  # Square of the absolute value.
-  #
   def abs2
     @real*@real + @image*@image
   end
   
-  #
-  # Argument (angle from (1,0) on the complex plane).
-  #
   def arg
-    Math.atan2!(@image, @real)
+    Math.atan2(@image.to_f, @real.to_f)
   end
-  alias angle arg
   
-  #
-  # Returns the absolute value _and_ the argument.
-  #
   def polar
     return abs, arg
   end
   
-  #
-  # Complex conjugate (<tt>z + z.conjugate = 2 * z.real</tt>).
-  #
   def conjugate
     Complex(@real, -@image)
   end
-  alias conj conjugate
   
-  #
-  # Compares the absolute values of the two numbers.
-  #
   def <=> (other)
     self.abs <=> other.abs
   end
   
-  #
-  # Test for numerical equality (<tt>a == a + 0<i>i</i></tt>).
-  #
   def == (other)
     if other.kind_of?(Complex)
       @real == other.real and @image == other.image
     elsif Complex.generic?(other)
       @real == other and @image == 0
     else
-      other == self
+      x , y = other.coerce(self)
+      x == y
     end
   end
 
-  #
-  # Attempts to coerce +other+ to a Complex number.
-  #
   def coerce(other)
     if Complex.generic?(other)
-      return Complex.new!(other), self
+      return Complex.new(other), self
     else
       super
     end
   end
 
-  #
-  # FIXME
-  #
+  def to_i
+    Complex(@real.to_i, @image.to_i)
+  end
+  
+  def to_f
+    Complex(@real.to_f, @image.to_f)
+  end
+  
+  def to_r
+    Complex(@real.to_r, @image.to_r)
+  end
+  
   def denominator
     @real.denominator.lcm(@image.denominator)
   end
   
-  #
-  # FIXME
-  #
   def numerator
     cd = denominator
     Complex(@real.numerator*(cd/@real.denominator),
 	    @image.numerator*(cd/@image.denominator))
   end
   
-  #
-  # Standard string representation of the complex number.
-  #
   def to_s
     if @real != 0
       if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
@@ -380,58 +283,94 @@ class Complex < Numeric
     end
   end
   
-  #
-  # Returns a hash code for the complex number.
-  #
   def hash
-    @real.hash ^ @image.hash
+    @real ^ @image
   end
   
-  #
-  # Returns "<tt>Complex(<i>real</i>, <i>image</i>)</tt>".
-  #
   def inspect
     sprintf("Complex(%s, %s)", @real.inspect, @image.inspect)
   end
 
   
-  #
-  # +I+ is the imaginary number.  It exists at point (0,1) on the complex plane.
-  #
   I = Complex(0,1)
   
-  # The real part of a complex number.
   attr :real
-
-  # The imaginary part of a complex number.
   attr :image
-  alias imag image
   
 end
 
+class Numeric
+  def im
+    Complex(0, self)
+  end
+  
+  def real
+    self
+  end
+  
+  def image
+    0
+  end
+  
+  def arg
+    if self >= 0
+      return 0
+    else
+      return Math.atan2(1,1)*4
+    end
+  end
+  
+  def polar
+    return abs, arg
+  end
+  
+  def conjugate
+    self
+  end
+end
+
+class Fixnum
+  if not defined? Rational
+    alias power! **
+  end
+  
+  def ** (other)
+    if self < 0
+      Complex.new(self) ** other
+    else
+      if defined? Rational
+	if other >= 0
+	  self.power!(other)
+	else
+	  Rational.new!(self,1)**other
+	end
+      else
+	self.power!(other)
+      end
+    end
+  end
+end
 
+class Bignum
+  if not defined? Rational
+    alias power! **
+  end
+end
 
+class Float
+  alias power! **
+end
 
 module Math
   alias sqrt! sqrt
   alias exp! exp
-  alias log! log
-  alias log10! log10
   alias cos! cos
   alias sin! sin
   alias tan! tan
-  alias cosh! cosh
-  alias sinh! sinh
-  alias tanh! tanh
-  alias acos! acos
-  alias asin! asin
-  alias atan! atan
+  alias log! log
+  alias log10! log10
   alias atan2! atan2
-  alias acosh! acosh
-  alias asinh! asinh
-  alias atanh! atanh  
-
-  # Redefined to handle a Complex argument.
+  
   def sqrt(z)
     if Complex.generic?(z)
       if z >= 0
@@ -440,17 +379,10 @@ module Math
 	Complex(0,sqrt!(-z))
       end
     else
-      if z.image < 0
-	sqrt(z.conjugate).conjugate
-      else
-	r = z.abs
-	x = z.real
-	Complex( sqrt!((r+x)/2), sqrt!((r-x)/2) )
-      end
+      z**Rational(1,2)
     end
   end
   
-  # Redefined to handle a Complex argument.
   def exp(z)
     if Complex.generic?(z)
       exp!(z)
@@ -459,7 +391,14 @@ module Math
     end
   end
   
-  # Redefined to handle a Complex argument.
+  def cosh!(x)
+    (exp!(x) + exp!(-x))/2.0
+  end
+  
+  def sinh!(x)
+    (exp!(x) - exp!(-x))/2.0
+  end
+  
   def cos(z)
     if Complex.generic?(z)
       cos!(z)
@@ -469,7 +408,6 @@ module Math
     end
   end
     
-  # Redefined to handle a Complex argument.
   def sin(z)
     if Complex.generic?(z)
       sin!(z)
@@ -479,7 +417,6 @@ module Math
     end
   end
   
-  # Redefined to handle a Complex argument.
   def tan(z)
     if Complex.generic?(z)
       tan!(z)
@@ -487,32 +424,7 @@ module Math
       sin(z)/cos(z)
     end
   end
-
-  def sinh(z)
-    if Complex.generic?(z)
-      sinh!(z)
-    else
-      Complex( sinh!(z.real)*cos!(z.image), cosh!(z.real)*sin!(z.image) )
-    end
-  end
-
-  def cosh(z)
-    if Complex.generic?(z)
-      cosh!(z)
-    else
-      Complex( cosh!(z.real)*cos!(z.image), sinh!(z.real)*sin!(z.image) )
-    end
-  end
-
-  def tanh(z)
-    if Complex.generic?(z)
-      tanh!(z)
-    else
-      sinh(z)/cosh(z)
-    end
-  end
   
-  # Redefined to handle a Complex argument.
   def log(z)
     if Complex.generic?(z) and z >= 0
       log!(z)
@@ -522,7 +434,6 @@ module Math
     end
   end
   
-  # Redefined to handle a Complex argument.
   def log10(z)
     if Complex.generic?(z)
       log10!(z)
@@ -530,102 +441,58 @@ module Math
       log(z)/log!(10)
     end
   end
-
-  def acos(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      acos!(z)
+  
+  def atan2(x, y)
+    if Complex.generic?(x) and Complex.generic?(y)
+      atan2!(x, y)
     else
-      -1.0.im * log( z + 1.0.im * sqrt(1.0-z*z) )
+      fail "Not yet implemented."
     end
   end
-
-  def asin(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      asin!(z)
-    else
-      -1.0.im * log( 1.0.im * z + sqrt(1.0-z*z) )
-    end
+  
+  def atanh!(x)
+    log((1.0 + x.to_f) / ( 1.0 - x.to_f)) / 2.0
   end
-
+  
   def atan(z)
     if Complex.generic?(z)
-      atan!(z)
-    else
-      1.0.im * log( (1.0.im+z) / (1.0.im-z) ) / 2.0
-    end
-  end
-
-  def atan2(y,x)
-    if Complex.generic?(y) and Complex.generic?(x)
-      atan2!(y,x)
-    else
-      -1.0.im * log( (x+1.0.im*y) / sqrt(x*x+y*y) )
-    end
-  end
-
-  def acosh(z)
-    if Complex.generic?(z) and z >= 1
-      acosh!(z)
-    else
-      log( z + sqrt(z*z-1.0) )
-    end
-  end
-
-  def asinh(z)
-    if Complex.generic?(z)
-      asinh!(z)
+      atan2!(z, 1)
+    elsif z.image == 0
+      atan2(z.real,1)
     else
-      log( z + sqrt(1.0+z*z) )
+      a = z.real
+      b = z.image
+      
+      c = (a*a + b*b - 1.0)
+      d = (a*a + b*b + 1.0)
+
+      Complex(atan2!((c + sqrt(c*c + 4.0*a*a)), 2.0*a),
+	      atanh!((-d + sqrt(d*d - 4.0*b*b))/(2.0*b)))
     end
   end
-
-  def atanh(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      atanh!(z)
-    else
-      log( (1.0+z) / (1.0-z) ) / 2.0
-    end
-  end
-
-  module_function :sqrt!
+  
   module_function :sqrt
+  module_function :sqrt!
   module_function :exp!
   module_function :exp
-  module_function :log!
-  module_function :log
-  module_function :log10!
-  module_function :log10
   module_function :cosh!
-  module_function :cosh
   module_function :cos!
   module_function :cos
   module_function :sinh!
-  module_function :sinh
   module_function :sin!
   module_function :sin
   module_function :tan!
   module_function :tan
-  module_function :tanh!
-  module_function :tanh
-  module_function :acos!
-  module_function :acos
-  module_function :asin!
-  module_function :asin
-  module_function :atan!
-  module_function :atan
+  module_function :log!
+  module_function :log
+  module_function :log10!
+  module_function :log
   module_function :atan2!
   module_function :atan2
-  module_function :acosh!
-  module_function :acosh
-  module_function :asinh!
-  module_function :asinh
+#  module_function :atan!
+  module_function :atan
   module_function :atanh!
-  module_function :atanh
   
 end
 
-# Documentation comments:
-#  - source: original (researched from pickaxe)
-#  - a couple of fixme's
-#  - RDoc output for Bignum etc. is a bit short, with nothing but an
-#    (undocumented) alias.  No big deal.
+
diff --git a/lib/csv.rb b/lib/csv.rb
deleted file mode 100644
index 10c86f6417..0000000000
--- a/lib/csv.rb
+++ /dev/null
@@ -1,1338 +0,0 @@
-# CSV -- module for generating/parsing CSV data.
-  
-# $Id$
-  
-# This module is copyrighted free software by NAKAMURA, Hiroshi.
-# You can redistribute it and/or modify it under the same term as Ruby.
-  
-  
-class CSV
-public
-
-  # DESCRIPTION
-  #   CSV::Cell -- Describes 1 cell of CSV.
-  #   
-  class Cell
-  public
-  
-    # Datum as string.
-    attr_accessor :data
-    
-    # Is this datum null?
-    attr_accessor :is_null
-
-    # SYNOPSIS
-    #   cell = CSV::Cell.new(data = '', is_null = true)
-    #
-    # ARGS
-    #   data: datum as String
-    #   is_null: is this datum null?
-    #
-    # RETURNS
-    #   cell: Created instance.
-    #
-    # DESCRIPTION
-    #   Create instance.  If is_null is true, datum is stored in the instance
-    #   created but it should be treated as 'NULL'.
-    #   
-    def initialize(data = '', is_null = true)
-      @data = data
-      @is_null = is_null
-    end
-
-    # SYNOPSIS
-    #   CSV::Cell#match(rhs)
-    #
-    # ARGS
-    #   rhs: an instance of CSV::Cell to be compared.
-    #
-    # RETURNS
-    #   true/false.  See the souce if you want to know matching algorithm.
-    #
-    # DESCRIPTION
-    #   Compare another cell with me.  Bare in mind Null matches with Null
-    #   using this method.  Use CSV::Cell#== if you want Null never matches
-    #   with other data including Null.
-    #
-    def match(rhs)
-      if @is_null and rhs.is_null
-        true
-      elsif @is_null or rhs.is_null
-        false
-      else
-        @data == rhs.data
-      end
-    end
-
-    # SYNOPSIS
-    #   CSV::Cell#==(rhs)
-    #
-    # ARGS
-    #   rhs: an instance of CSV::Cell to be compared.
-    #
-    # RETURNS
-    #   true/false.  See the souce if you want to know matching algorithm.
-    #
-    # DESCRIPTION
-    #   Compare another cell with me.  Bare in mind Null is not match with
-    #   Null using this method.  Null never matches with other data including
-    #   Null.  Use CSV::Cell#match if you want Null matches with Null.
-    #
-    def ==(rhs)
-      if @is_null or rhs.is_null
-        false
-      else
-        @data == rhs.data
-      end
-    end
-  end
-  
-
-  # DESCRIPTION
-  #   CSV::Row -- Describes a row of CSV.  Each element must be a CSV::Cell.
-  #   
-  class Row < Array
-  public
-
-    # SYNOPSIS
-    #   CSV::Row#to_a
-    #
-    # RETURNS
-    #   An Array of String.
-    #
-    # DESCRIPTION
-    #   Convert CSV::Cell to String.  Null is converted to nil.
-    #
-    def to_a
-      self.collect { |cell| cell.is_null ? nil : cell.data }
-    end
-
-    # SYNOPSIS
-    #   CSV::Row#match(rhs)
-    #
-    # ARGS
-    #   rhs: an Array of cells.  Each cell is a instance of CSV::Cell.
-    #
-    # RETURNS
-    #   true/false.  See the souce if you want to know matching algorithm.
-    #
-    # DESCRIPTION
-    #   Compare another row with me.
-    #
-    def match(rhs)
-      if self.size != rhs.size
-        return false
-      end
-      for idx in 0...(self.size)
-        unless self[idx].match(rhs[idx])
-          return false
-        end
-      end
-      true
-    end
-  end
-
-
-  # SYNOPSIS
-  #   1. reader = CSV.open(filename, 'r')
-  #
-  #   2. CSV.open(filename, 'r') do |row|
-  #        ...
-  #      end
-  #
-  #   3. writer = CSV.open(filename, 'w')
-  #
-  #   4. CSV.open(filename, 'w') do |writer|
-  #        ...
-  #      end
-  #
-  # ARGS
-  #   filename: filename to open.
-  #   mode: 'r' for read (parse)
-  #         'w' for write (generate)
-  #   row: an Array of cells which is a parsed line.
-  #   writer: Created writer instance.  See CSV::Writer#<< and
-  #     CSV::Writer#add_row to know how to generate CSV string.
-  #
-  # RETURNS
-  #   reader: Create reader instance.  To get parse result, see
-  #     CSV::Reader#each.
-  #   writer: Created writer instance.  See CSV::Writer#<< and
-  #     CSV::Writer#add_row to know how to generate CSV string.
-  #
-  # DESCRIPTION
-  #   Open a CSV formatted file to read or write.
-  #
-  # EXAMPLE 1
-  #   reader = CSV.open('csvfile.csv', 'r')
-  #   row1 = reader.shift
-  #   row2 = reader.shift
-  #   if row2.empty?
-  #     p 'row2 not find.'
-  #   end
-  #   reader.close
-  #   
-  # EXAMPLE 2
-  #   CSV.open('csvfile.csv', 'r') do |row|
-  #     p row
-  #   end
-  #      
-  # EXAMPLE 3
-  #   writer = CSV.open('csvfile.csv', 'w')
-  #   writer << ['r1c1', 'r1c2'] << ['r2c1', 'r2c2'] << [nil, nil]
-  #   writer.close
-  #   
-  # EXAMPLE 4
-  #   CSV.open('csvfile.csv', 'w') do |writer|
-  #     writer << ['r1c1', 'r1c2']
-  #     writer << ['r2c1', 'r2c2']
-  #     writer << [nil, nil]
-  #   end
-  #
-  def CSV.open(filename, mode, col_sep = ?,, row_sep = nil, &block)
-    if mode == 'r' or mode == 'rb'
-      open_reader(filename, col_sep, row_sep, &block)
-    elsif mode == 'w' or mode == 'wb'
-      open_writer(filename, col_sep, row_sep, &block)
-    else
-      raise ArgumentError.new("'mode' must be 'r', 'rb', 'w', or 'wb'")
-    end
-  end
-
-  def CSV.parse(filename, col_sep = ?,, row_sep = nil, &block)
-    open_reader(filename, col_sep, row_sep, &block)
-  end
-
-  def CSV.generate(filename, col_sep = ?,, row_sep = nil, &block)
-    open_writer(filename, col_sep, row_sep, &block)
-  end
-
-  # Private class methods.
-  class << self
-  private
-    def open_reader(filename, col_sep, row_sep, &block)
-      file = File.open(filename, 'rb')
-      if block
-        begin
-          CSV::Reader.parse(file, col_sep, row_sep) do |row|
-            yield(row)
-          end
-        ensure
-          file.close
-        end
-        nil
-      else
-        reader = CSV::Reader.create(file, col_sep, row_sep)
-        reader.close_on_terminate
-        reader
-      end
-    end
-
-    def open_writer(filename, col_sep, row_sep, &block)
-      file = File.open(filename, 'wb')
-      if block
-        begin
-          CSV::Writer.generate(file, col_sep, row_sep) do |writer|
-            yield(writer)
-          end
-        ensure
-          file.close
-        end
-        nil
-      else
-        writer = CSV::Writer.create(file, col_sep, row_sep) 
-        writer.close_on_terminate
-        writer
-      end
-    end
-  end
-
-
-  # DESCRIPTION
-  #   CSV::Reader -- CSV formatted string/stream reader.
-  #   
-  # EXAMPLE
-  #   Read CSV lines untill the first column is 'stop'.
-  #
-  #   CSV::Reader.parse(File.open('bigdata', 'rb')) do |row|
-  #     p row
-  #     break if !row[0].is_null && row[0].data == 'stop'
-  #   end
-  #
-  class Reader
-    include Enumerable
-  public
-
-    # SYNOPSIS
-    #   reader = CSV::Reader.create(str_or_readable)
-    #
-    # ARGS
-    #   str_or_readable: a CSV data to be parsed.  A String or an IO.
-    #
-    # RETURNS
-    #   reader: Created instance.
-    #
-    # DESCRIPTION
-    #   Create instance.  To get parse result, see CSV::Reader#each.
-    #   
-    def Reader.create(str_or_readable, col_sep = ?,, row_sep = nil)
-      case str_or_readable
-      when IO
-        IOReader.new(str_or_readable, col_sep, row_sep)
-      when String
-        StringReader.new(str_or_readable, col_sep, row_sep)
-      else
-        IOReader.new(str_or_readable, col_sep, row_sep)
-      end
-    end
-
-    # SYNOPSIS
-    #   CSV::Reader.parse(str_or_readable) do |row|
-    #     ...
-    #   end
-    #
-    # ARGS
-    #   str_or_readable: a CSV data to be parsed.  A String or an IO.
-    #   row: a CSV::Row; an Array of a CSV::Cell in a line.
-    #
-    # RETURNS
-    #   nil
-    #
-    # DESCRIPTION
-    #   Parse CSV data and get lines.  Caller block is called for each line
-    #   with an argument which is a chunk of cells in a row.
-    #
-    #   Block value is always nil.  Rows are not cached for performance
-    #   reason.
-    #
-    def Reader.parse(str_or_readable, col_sep = ?,, row_sep = nil)
-      reader = create(str_or_readable, col_sep, row_sep)
-      reader.each do |row|
-        yield(row)
-      end
-      reader.close
-      nil
-    end
-
-    # SYNOPSIS
-    #   CSV::Reader#each do |row|
-    #     ...
-    #   end
-    #
-    # ARGS
-    #   row: a CSV::Row; an Array of a CSV::Cell in a line.
-    #
-    # RETURNS
-    #   nil
-    #
-    # DESCRIPTION
-    #   Caller block is called for each line with an argument which is a chunk
-    #   of cells in a row.
-    #
-    #   Block value is always nil.  Rows are not cached for performance
-    #   reason.
-    #   
-    def each
-      while true
-        row = Row.new
-        parsed_cells = get_row(row)
-        if parsed_cells == 0
-          break
-        end
-        yield(row)
-      end
-      nil
-    end
-
-    # SYNOPSIS
-    #   cell = CSV::Reader#shift
-    #
-    # RETURNS
-    #   cell: a CSV::Row; an Array of a CSV::Cell.
-    #
-    # DESCRIPTION
-    #   Extract cells of next line.
-    #   
-    def shift
-      row = Row.new
-      parsed_cells = get_row(row)
-      row
-    end
-
-    # SYNOPSIS
-    #   CSV::Reader#close
-    #
-    # RETURNS
-    #   nil
-    #
-    # DESCRIPTION
-    #   Close this reader.
-    #   
-    def close
-      terminate
-    end
-
-  private
-    def initialize(dev)
-      raise RuntimeError.new('Do not instanciate this class directly.')
-    end
-
-    def get_row(row)
-      raise NotImplementedError.new('Method get_row must be defined in a derived class.')
-    end
-
-    def terminate
-      # Define if needed.
-    end
-  end
-  
-
-  # DESCRIPTION
-  #   CSV::StringReader -- CSV formatted stream reader.
-  #   
-  # EXAMPLE
-  #   Read CSV lines untill the first column is 'stop'.
-  #
-  #   CSV::Reader.parse(File.open('bigdata', 'rb')) do |row|
-  #     p row
-  #     break if !row[0].is_null && row[0].data == 'stop'
-  #   end
-  #
-  class StringReader < Reader
-  public
-
-    # SYNOPSIS
-    #   reader = CSV::StringReader.new(string)
-    #
-    # ARGS
-    #   string: a CSV String to be parsed.
-    #
-    # RETURNS
-    #   reader: Created instance.
-    #
-    # DESCRIPTION
-    #   Create instance.  To get parse result, see CSV::Reader#each.
-    #   
-    def initialize(string, col_sep = ?,, row_sep = nil)
-      @col_sep = col_sep
-      @row_sep = row_sep
-      @dev = string
-      @idx = 0
-      if @dev[0, 3] == "\xef\xbb\xbf"
-        @idx += 3
-      end
-    end
-
-  private
-    def get_row(row)
-      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @col_sep, @row_sep)
-      if parsed_cells == 0 && next_idx == 0 && @idx != @dev.size
-        raise IllegalFormatError.new
-      end
-      @idx = next_idx
-      parsed_cells
-    end
-  end
-
-
-  # DESCRIPTION
-  #   CSV::IOReader -- CSV formatted stream reader.
-  #   
-  # EXAMPLE
-  #   Read CSV lines untill the first column is 'stop'.
-  #
-  #   CSV::Reader.parse(File.open('bigdata', 'rb')) do |row|
-  #     p row
-  #     break if !row[0].is_null && row[0].data == 'stop'
-  #   end
-  #
-  class IOReader < Reader
-  public
-
-    # SYNOPSIS
-    #   reader = CSV::IOReader.new(io)
-    #
-    # ARGS
-    #   io: a CSV data to be parsed.  Must be an IO. (io#read is called.)
-    #
-    # RETURNS
-    #   reader: Created instance.
-    #
-    # DESCRIPTION
-    #   Create instance.  To get parse result, see CSV::Reader#each.
-    #   
-    def initialize(io, col_sep = ?,, row_sep = nil)
-      @io = io
-      @io.binmode if @io.respond_to?(:binmode)
-      @col_sep = col_sep
-      @row_sep = row_sep
-      @dev = CSV::IOBuf.new(@io)
-      @idx = 0
-      if @dev[0] == 0xef and @dev[1] == 0xbb and @dev[2] == 0xbf
-        @idx += 3
-      end
-      @close_on_terminate = false
-    end
-
-    # SYNOPSIS
-    #   CSV::IOReader#close_on_terminate
-    #
-    # RETURNS
-    #   true
-    #
-    # DESCRIPTION
-    #   Tell this reader to close the IO when terminated (Triggered by invoking
-    #   CSV::IOReader#close).
-    #   
-    def close_on_terminate
-      @close_on_terminate = true
-    end
-
-  private
-    def get_row(row)
-      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @col_sep, @row_sep)
-      if parsed_cells == 0 && next_idx == 0 && !@dev.is_eos?
-        raise IllegalFormatError.new
-      end
-      dropped = @dev.drop(next_idx)
-      @idx = next_idx - dropped
-      parsed_cells
-    end
-
-    def terminate
-      if @close_on_terminate
-        @io.close
-      end
-
-      if @dev
-        @dev.close
-      end
-    end
-  end
-
-
-  # DESCRIPTION
-  #   CSV::Writer -- CSV formatted string/stream writer.
-  #   
-  # EXAMPLE
-  #   Write rows to 'csvout' file.
-  #
-  #   outfile = File.open('csvout', 'wb')
-  #   CSV::Writer.generate(outfile) do |csv|
-  #     csv << ['c1', nil, '', '"', "\r\n", 'c2']
-  #     # or
-  #     csv.add_row [
-  #       CSV::Cell.new('c1', false),
-  #       CSV::Cell.new('dummy', true),
-  #       CSV::Cell.new('', false),
-  #       CSV::Cell.new('"', false),
-  #       CSV::Cell.new("\r\n", false)
-  #       CSV::Cell.new('c2', false)
-  #     ]
-  #     ...
-  #     ...
-  #   end
-  #
-  #   outfile.close
-  #
-  class Writer
-  public
-
-    # SYNOPSIS
-    #   writer = CSV::Writer.create(str_or_readable)
-    #
-    # ARGS
-    #   str_or_writable: device for generated CSV string.  Must respond to
-    #     '<<(string)'.
-    #
-    # RETURNS
-    #   writer: Created instance.
-    #
-    # DESCRIPTION
-    #   Create instance.  To add CSV data to generate CSV string, see
-    #   CSV::Writer#<< or CSV::Writer#add_row.
-    #   
-    def Writer.create(str_or_writable, col_sep = ?,, row_sep = nil)
-      BasicWriter.new(str_or_writable, col_sep, row_sep)
-    end
-
-    # SYNOPSIS
-    #   CSV::Writer.generate(str_or_writable) do |writer|
-    #     ...
-    #   end
-    #
-    # ARGS
-    #   str_or_writable: device for generated CSV string.  Must respond to
-    #     '<<(string)'.
-    #   writer: Created writer instance.  See CSV::Writer#<< and
-    #     CSV::Writer#add_row to know how to generate CSV string.
-    #
-    # RETURNS
-    #   nil
-    #
-    # DESCRIPTION
-    #   Create writer instance.  Caller block is called with the new instance.
-    #   To add CSV data to generate CSV string, see CSV::Writer#<< or
-    #   CSV::Writer#add_row.
-    #   
-    def Writer.generate(str_or_writable, col_sep = ?,, row_sep = nil)
-      writer = Writer.create(str_or_writable, col_sep, row_sep)
-      yield(writer)
-      writer.close
-      nil
-    end
-
-    # SYNOPSIS
-    #   CSV::Writer#<<(row)
-    #
-    # ARGS
-    #   row: an Array of a String.
-    #
-    # RETURNS
-    #   self
-    #
-    # DESCRIPTION
-    #   Dump CSV stream to the device.  Argument is an array of a String like
-    #   ['c1', 'c2', 'c3'].
-    #   
-    def <<(ary)
-      row = ary.collect { |item|
-        if item.is_a?(Cell)
-          item
-        elsif (item.nil?)
-          Cell.new('', true)
-        else
-          Cell.new(item.to_s, false)
-        end
-      }
-      CSV.generate_row(row, row.size, @dev, @col_sep, @row_sep)
-      self
-    end
-
-    # SYNOPSIS
-    #   CSV::Writer#<<(row)
-    #
-    # ARGS
-    #   row: an Array of a CSV::Cell.
-    #
-    # RETURNS
-    #   self
-    #
-    # DESCRIPTION
-    #   Dump CSV stream to the device.  Argument is an array of a CSV::Cell
-    #   like [CSV::Cell.new('c1', false), CSV::Cell.new('dummy', true)].
-    #   (Formar is 'c1' and latter is Null.)
-    #   
-    def add_row(row)
-      CSV.generate_row(row, row.size, @dev, @col_sep, @row_sep)
-      self
-    end
-
-    # SYNOPSIS
-    #   CSV::Writer#close
-    #
-    # RETURNS
-    #   nil
-    #
-    # DESCRIPTION
-    #   Close this writer.
-    #   
-    def close
-      terminate
-    end
-
-  private
-    def initialize(dev)
-      raise RuntimeError.new('Do not instanciate this class directly.')
-    end
-
-    def terminate
-      # Define if needed.
-    end
-  end
-
-
-  # DESCRIPTION
-  #   CSV::BasicWriter -- CSV formatted string/stream writer using <<.
-  #   
-  class BasicWriter < Writer
-  public
-
-    # SYNOPSIS
-    #   writer = CSV::BasicWriter.new(str_or_writable)
-    #
-    # ARGS
-    #   str_or_writable: device for generated CSV string.  Must respond to
-    #     '<<(string)'.
-    #
-    # RETURNS
-    #   writer: Created instance.
-    #
-    # DESCRIPTION
-    #   Create instance.  To add CSV data to generate CSV string, see
-    #   CSV::Writer#<< or CSV::Writer#add_row.
-    #   
-    def initialize(str_or_writable, col_sep = ?,, row_sep = nil)
-      @col_sep = col_sep
-      @row_sep = row_sep
-      @dev = str_or_writable
-      @dev.binmode if @dev.respond_to?(:binmode)
-      @close_on_terminate = false
-    end
-
-    # SYNOPSIS
-    #   CSV::BasicWriter#close_on_terminate
-    #
-    # RETURNS
-    #   true
-    #
-    # DESCRIPTION
-    #   Tell this writer to close the IO when terminated (Triggered by invoking
-    #   CSV::BasicWriter#close).
-    #   
-    def close_on_terminate
-      @close_on_terminate = true
-    end
-
-  private
-    def terminate
-      if @close_on_terminate
-        @dev.close
-      end
-    end
-  end
-
-  # SYNOPSIS
-  #   cells = CSV.parse_line(src, col_sep = ?,, row_sep = nil)
-  #
-  # ARGS
-  #   src: a CSV String.
-  #   col_sep: Column separator.  ?, by default.  If you want to separate
-  #     fields with semicolon, give ?; here.
-  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
-  #     want to separate records with \r, give ?\r here.
-  #
-  # RETURNS
-  #   cells: an Array of parsed cells in first line.  Each cell is a String.
-  #
-  # DESCRIPTION
-  #   Parse one line from given string.  Bare in mind it parses ONE LINE.  Rest
-  #   of the string is ignored for example "a,b\r\nc,d" => ['a', 'b'] and the
-  #   second line 'c,d' is ignored.
-  #
-  #   If you don't know whether a target string to parse is exactly 1 line or
-  #   not, use CSV.parse_row instead of this method.
-  #   
-  def CSV.parse_line(src, col_sep = ?,, row_sep = nil)
-    idx = 0
-    res_type = :DT_COLSEP
-    cells = Row.new
-    begin
-      while (res_type.equal?(:DT_COLSEP))
-        cell = Cell.new
-        res_type, idx = parse_body(src, idx, cell, col_sep, row_sep)
-        cells.push(cell.is_null ? nil : cell.data)
-      end
-    rescue IllegalFormatError
-      return Row.new
-    end
-    cells
-  end
-  
-
-  # SYNOPSIS
-  #   str = CSV.generate_line(cells, col_sep = ?,, row_sep = nil)
-  #
-  # ARGS
-  #   cells: an Array of cell to be converted to CSV string.  Each cell must 
-  #     respond to 'to_s'.
-  #   col_sep: Column separator.  ?, by default.  If you want to separate
-  #     fields with semicolon, give ?; here.
-  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
-  #     want to separate records with \r, give ?\r here.
-  #
-  # RETURNS
-  #   str: a String of generated CSV string.
-  #
-  # DESCRIPTION
-  #   Create a line from cells.  Each cell is stringified by to_s.
-  #   
-  def CSV.generate_line(cells, col_sep = ?,, row_sep = nil)
-    if (cells.size == 0)
-      return ''
-    end
-    res_type = :DT_COLSEP
-    result_str = ''
-    idx = 0
-    while true
-      cell = if (cells[idx].nil?)
-          Cell.new('', true)
-        else
-          Cell.new(cells[idx].to_s, false)
-        end
-      generate_body(cell, result_str, col_sep, row_sep)
-      idx += 1
-      if (idx == cells.size)
-        break
-      end
-      generate_separator(:DT_COLSEP, result_str, col_sep, row_sep)
-    end
-    result_str
-  end
-  
-  # SYNOPSIS
-  #   parsed_cells, idx = CSV.parse_row(src, idx, out_dev, col_sep = ?,, row_sep = nil)
-  #
-  # ARGS
-  #   src: a CSV data to be parsed.  Must respond '[](idx)'.
-  #     src[](idx) must return a char. (Not a string such as 'a', but 97).
-  #     src[](idx_out_of_bounds) must return nil.  A String satisfies this
-  #     requirement.
-  #   idx: index of parsing location of 'src'.  0 origin.
-  #   out_dev: buffer for parsed cells.  Must respond '<<(CSV::Cell)'.
-  #   col_sep: Column separator.  ?, by default.  If you want to separate
-  #     fields with semicolon, give ?; here.
-  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
-  #     want to separate records with \r, give ?\r here.
-  #
-  # RETURNS
-  #   parsed_cells: num of parsed cells.
-  #   idx: index of next parsing location of 'src'.
-  #
-  # DESCRIPTION
-  #   Parse a line from string.  To parse lines in CSV string, see EXAMPLE
-  #   below.
-  #
-  # EXAMPLE
-  #   src = "a,b\r\nc,d\r\ne,f"
-  #   idx = 0
-  #   begin
-  #     parsed = []
-  #     parsed_cells, idx = CSV.parse_row(src, idx, parsed)
-  #     puts "Parsed #{ parsed_cells } cells."
-  #     p parsed
-  #   end while parsed_cells > 0
-  #   
-  def CSV.parse_row(src, idx, out_dev, col_sep = ?,, row_sep = nil)
-    idx_backup = idx
-    parsed_cells = 0
-    res_type = :DT_COLSEP
-    begin
-      while (!res_type.equal?(:DT_ROWSEP))
-        cell = Cell.new
-        res_type, idx = parse_body(src, idx, cell, col_sep, row_sep)
-        if res_type.equal?(:DT_EOS)
-          if idx == idx_backup #((parsed_cells == 0) && (cell.is_null))
-            return 0, 0
-          end
-          res_type = :DT_ROWSEP
-        end
-        parsed_cells += 1
-        out_dev << cell
-      end
-    rescue IllegalFormatError
-      return 0, 0
-    end
-    return parsed_cells, idx
-  end
-  
-  # SYNOPSIS
-  #   parsed_cells = CSV.generate_row(src, cells, out_dev, col_sep = ?,, row_sep = nil)
-  #
-  # ARGS
-  #   src: an Array of CSV::Cell to be converted to CSV string.  Must respond to
-  #     'size' and '[](idx)'.  src[idx] must return CSV::Cell.
-  #   cells: num of cells in a line.
-  #   out_dev: buffer for generated CSV string.  Must respond to '<<(string)'.
-  #   col_sep: Column separator.  ?, by default.  If you want to separate
-  #     fields with semicolon, give ?; here.
-  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
-  #     want to separate records with \r, give ?\r here.
-  #
-  # RETURNS
-  #   parsed_cells: num of converted cells.
-  #
-  # DESCRIPTION
-  #   Convert a line from cells data to string.  To generate multi-row CSV
-  #   string,  See EXAMPLE below.
-  #
-  # EXAMPLE
-  #   def d(str)
-  #     CSV::Cell.new(str, false)
-  #   end
-  #
-  #   row1 = [d('a'), d('b')]
-  #   row2 = [d('c'), d('d')]
-  #   row3 = [d('e'), d('f')]
-  #   src = [row1, row2, row3]
-  #   buf = ''
-  #   src.each do |row|
-  #     parsed_cells = CSV.generate_row(row, 2, buf)
-  #     puts "Created #{ parsed_cells } cells."
-  #   end
-  #   p buf
-  #   
-  def CSV.generate_row(src, cells, out_dev, col_sep = ?,, row_sep = nil)
-    src_size = src.size
-    if (src_size == 0)
-      if cells == 0
-        generate_separator(:DT_ROWSEP, out_dev, col_sep, row_sep)
-      end
-      return 0
-    end
-    res_type = :DT_COLSEP
-    parsed_cells = 0
-    generate_body(src[parsed_cells], out_dev, col_sep, row_sep)
-    parsed_cells += 1
-    while ((parsed_cells < cells) && (parsed_cells != src_size))
-      generate_separator(:DT_COLSEP, out_dev, col_sep, row_sep)
-      generate_body(src[parsed_cells], out_dev, col_sep, row_sep)
-      parsed_cells += 1
-    end
-    if (parsed_cells == cells)
-      generate_separator(:DT_ROWSEP, out_dev, col_sep, row_sep)
-    else
-      generate_separator(:DT_COLSEP, out_dev, col_sep, row_sep)
-    end
-    parsed_cells
-  end
-  
-private
-  class IllegalFormatError < RuntimeError; end
-
-  # Private class methods.
-  class << self
-  private
-
-    def parse_body(src, idx, cell, col_sep, row_sep)
-      row_sep_end = row_sep || ?\n
-      cell.is_null = false
-      state = :ST_START
-      quoted = false
-      cr = false
-      c = nil
-      while (c = src[idx])
-        idx += 1
-        result_state = :DT_UNKNOWN
-        if (c == col_sep)
-          if state.equal?(:ST_DATA)
-            if cr
-              raise IllegalFormatError.new
-            end
-            if (!quoted)
-              state = :ST_END
-              result_state = :DT_COLSEP
-            else
-              cell.data << c.chr
-            end
-          elsif state.equal?(:ST_QUOTE)
-            if cr
-              raise IllegalFormatError.new
-            end
-            state = :ST_END
-            result_state = :DT_COLSEP
-          else  # :ST_START
-            cell.is_null = true
-            state = :ST_END
-            result_state = :DT_COLSEP
-          end
-        elsif (c == ?")         # " for vim syntax hilighting.
-          if state.equal?(:ST_DATA)
-            if cr
-              raise IllegalFormatError.new
-            end
-            if quoted
-              quoted = false
-              state = :ST_QUOTE
-            else
-              raise IllegalFormatError.new
-            end
-          elsif state.equal?(:ST_QUOTE)
-            cell.data << c.chr
-            quoted = true
-            state = :ST_DATA
-          else  # :ST_START
-            quoted = true
-            state = :ST_DATA
-          end
-        elsif row_sep.nil? and c == ?\r
-          if cr
-            raise IllegalFormatError.new
-          end
-          if quoted
-            cell.data << c.chr
-            state = :ST_DATA
-          else
-            cr = true
-          end
-        elsif c == row_sep_end
-          if state.equal?(:ST_DATA)
-            if cr
-              state = :ST_END
-              result_state = :DT_ROWSEP
-              cr = false
-            else
-              if quoted
-                cell.data << c.chr
-                state = :ST_DATA
-              else
-                state = :ST_END
-                result_state = :DT_ROWSEP
-              end
-            end
-          elsif state.equal?(:ST_QUOTE)
-            state = :ST_END
-            result_state = :DT_ROWSEP
-            if cr
-              cr = false
-            end
-          else  # :ST_START
-            cell.is_null = true
-            state = :ST_END
-            result_state = :DT_ROWSEP
-          end
-        else
-          if state.equal?(:ST_DATA) || state.equal?(:ST_START)
-            if cr
-              raise IllegalFormatError.new
-            end
-            cell.data << c.chr
-            state = :ST_DATA
-          else  # :ST_QUOTE
-            raise IllegalFormatError.new
-          end
-        end
-        if state.equal?(:ST_END)
-          return result_state, idx;
-        end
-      end
-      if state.equal?(:ST_START)
-        cell.is_null = true
-      elsif state.equal?(:ST_QUOTE)
-        true    # dummy for coverate; only a data
-      elsif quoted
-        raise IllegalFormatError.new
-      elsif cr
-        raise IllegalFormatError.new
-      end
-      return :DT_EOS, idx
-    end
-  
-    def generate_body(cells, out_dev, col_sep, row_sep)
-      row_data = cells.data.dup
-      if (!cells.is_null)
-        if (row_data.gsub!('"', '""') ||
-            row_data.include?(col_sep) ||
-	    (row_sep && row_data.index(row_sep)) ||
-	    (/[\r\n]/ =~ row_data) ||
-	    (cells.data.empty?))
-          out_dev << '"' << row_data << '"'
-        else
-          out_dev << row_data
-        end
-      end
-    end
-    
-    def generate_separator(type, out_dev, col_sep, row_sep)
-      case type
-      when :DT_COLSEP
-        out_dev << col_sep.chr
-      when :DT_ROWSEP
-        out_dev << (row_sep ? row_sep.chr : "\r\n")
-      end
-    end
-  end
-
-
-  # DESCRIPTION
-  #   CSV::StreamBuf -- a class for a bufferd stream.
-  #
-  # EXAMPLE 1 -- an IO.
-  #   class MyBuf < StreamBuf
-  #     # Do initialize myself before a super class.  Super class might call my
-  #     # method 'read'. (Could be awful for C++ user. :-)
-  #     def initialize(s)
-  #       @s = s
-  #       super()
-  #     end
-  #
-  #     # define my own 'read' method.
-  #     # CAUTION: Returning nil means EnfOfStream.
-  #     def read(size)
-  #       @s.read(size)
-  #     end
-  #
-  #     # release buffers. in Ruby which has GC, you do not have to call this...
-  #     def terminate
-  #       @s = nil
-  #       super()
-  #     end
-  #   end
-  #
-  #   buf = MyBuf.new(STDIN)
-  #   my_str = ''
-  #   p buf[0, 0]               # => '' (null string)
-  #   p buf[0]                  # => 97 (char code of 'a')
-  #   p buf[0, 1]               # => 'a'
-  #   my_str = buf[0, 5]
-  #   p my_str                  # => 'abcde' (5 chars)
-  #   p buf[0, 6]               # => "abcde\n" (6 chars)
-  #   p buf[0, 7]               # => "abcde\n" (6 chars)
-  #   p buf.drop(3)             # => 3 (dropped chars)
-  #   p buf.get(0, 2)           # => 'de' (2 chars)
-  #   p buf.is_eos?             # => false (is not EOS here)
-  #   p buf.drop(5)             # => 3 (dropped chars)
-  #   p buf.is_eos?             # => true (is EOS here)
-  #   p buf[0]                  # => nil (is EOS here)
-  #
-  # EXAMPLE 2 -- String.
-  #   This is a conceptual example.  No pros with this.
-  # 
-  #   class StrBuf < StreamBuf
-  #     def initialize(s)
-  #       @str = s
-  #       @idx = 0
-  #       super()
-  #     end
-  #   
-  #     def read(size)
-  #       str = @str[@idx, size]
-  #       @idx += str.size
-  #       str
-  #     end
-  #   end
-  #
-  class StreamBuf       # pure virtual. (do not instanciate it directly)
-  public
-  
-    # SYNOPSIS
-    #   char/str = CSV::StreamBuf#get(idx, n = nil)
-    #   char/str = CSV::StreamBuf#[idx, n = nil]
-    #
-    # ARGS
-    #   idx: index of a string to specify a start point of a string to get.
-    #     Unlike String instance, idx < 0 returns nil.
-    #   n: size of a string to get.
-    #
-    # RETURNS
-    #   char: if n == nil.  A char at idx.
-    #   str: if n != nil.  A partial string, from idx to (idx + size).  At
-    #     EOF, the string size could not equal to arg n.
-    #
-    # DESCRIPTION
-    #   Get a char or a partial string from the stream.
-    #
-    def [](idx, n = nil) 
-      if idx < 0
-        return nil
-      end
-      if (idx_is_eos?(idx))
-        if n and (@offset + idx == buf_size(@cur_buf))
-          # Like a String, 'abc'[4, 1] returns nil and
-          # 'abc'[3, 1] returns '' not nil.
-          return ''
-        else
-          return nil
-        end
-      end
-      my_buf = @cur_buf
-      my_offset = @offset
-      next_idx = idx
-      while (my_offset + next_idx >= buf_size(my_buf))
-        if (my_buf == @buf_tail_idx)
-          unless add_buf
-            break
-          end
-        end
-        next_idx = my_offset + next_idx - buf_size(my_buf)
-        my_buf += 1
-        my_offset = 0
-      end
-      loc = my_offset + next_idx
-      if !n
-        return @buf_list[my_buf][loc]		# Fixnum of char code.
-      elsif (loc + n - 1 < buf_size(my_buf))
-        return @buf_list[my_buf][loc, n]	# String.
-      else # should do loop insted of (tail) recursive call...
-	res = @buf_list[my_buf][loc, BufSize]
-        size_added = buf_size(my_buf) - loc
-        if size_added > 0
-          idx += size_added
-          n -= size_added
-          ret = self[idx, n]
-          if ret
-            res << ret
-          end
-        end
-        return res
-      end
-    end
-    alias get []
-  
-    # SYNOPSIS
-    #   size_dropped = CSV::StreamBuf#drop(n)
-    #
-    # ARGS
-    #   n: drop size
-    #
-    # RETURNS
-    #   size_dropped: droped size.  At EOF, dropped size might not equals to arg n.
-    #     0 if n <= 0.
-    #
-    # DESCRIPTION
-    #   Drop a string from the stream.  Once you drop the head of the stream,
-    #   access to the dropped part via [] or get returns nil.
-    #
-    def drop(n)
-      if is_eos?
-        return 0
-      end
-      size_dropped = 0
-      while (n > 0)
-        if (!@is_eos || (@cur_buf != @buf_tail_idx))
-          if (@offset + n < buf_size(@cur_buf))
-            size_dropped += n
-            @offset += n
-            n = 0
-          else
-            size = buf_size(@cur_buf) - @offset
-            size_dropped += size
-            n -= size
-            @offset = 0
-            unless rel_buf
-              unless add_buf
-                break
-              end
-              @cur_buf = @buf_tail_idx
-            end
-          end
-        end
-      end
-      size_dropped
-    end
-  
-    # SYNOPSIS
-    #   is_eos = CSV::StreamBuf#is_eos?
-    #
-    # RETURNS
-    #   is_eos: true if end of the stream or false.
-    #
-    # DESCRIPTION
-    #   Check EOF or not.
-    #
-    def is_eos?
-      return idx_is_eos?(0)
-    end
-  
-    # SYNOPSIS
-    #   N/A
-    #
-    # DESCRIPTION
-    #   Do not instanciate this class directly.  Define your own class which
-    #   derives this class and define 'read' instance method.
-    #
-    def initialize
-      @buf_list = []
-      @cur_buf = @buf_tail_idx = -1
-      @offset = 0
-      @is_eos = false
-      add_buf
-      @cur_buf = @buf_tail_idx
-    end
-  
-  protected
-    def terminate
-      while (rel_buf); end
-    end
-  
-    # protected method 'read' must be defined in derived classes.
-    # CAUTION: Returning a string which size is not equal to 'size' means
-    #   EnfOfStream.  When it is not at EOS, you must block the callee, try to
-    #   read and return the sized string.
-    def read(size) # raise EOFError
-      raise NotImplementedError.new('Method read must be defined in a derived class.')
-    end
-  
-  private
-  
-    def buf_size(idx)
-      @buf_list[idx].size
-    end
-
-    def add_buf
-      if @is_eos
-        return false
-      end
-      begin
-        str_read = read(BufSize)
-      rescue EOFError
-        str_read = nil
-      rescue
-        terminate
-        raise
-      end
-      if str_read.nil?
-        @is_eos = true
-        @buf_list.push('')
-        @buf_tail_idx += 1
-        false
-      else
-        @buf_list.push(str_read)
-        @buf_tail_idx += 1
-        true
-      end
-    end
-  
-    def rel_buf
-      if (@cur_buf < 0)
-        return false
-      end
-      @buf_list[@cur_buf] = nil
-      if (@cur_buf == @buf_tail_idx)
-        @cur_buf = -1
-        return false
-      else
-        @cur_buf += 1
-        return true
-      end
-    end
-  
-    def idx_is_eos?(idx)
-      (@is_eos && ((@cur_buf < 0) || (@cur_buf == @buf_tail_idx)))
-    end
-  
-    BufSize = 1024 * 8
-  end
-
-  # DESCRIPTION
-  #   CSV::IOBuf -- a class for a bufferd IO.
-  #
-  # EXAMPLE
-  #   # File 'bigdata' could be a giga-byte size one!
-  #   buf = CSV::IOBuf.new(File.open('bigdata', 'rb'))
-  #   CSV::Reader.new(buf).each do |row|
-  #     p row
-  #     break if row[0].data == 'admin'
-  #   end
-  #
-  class IOBuf < StreamBuf
-  public
-    def initialize(s)
-      @s = s
-      super()
-    end
-  
-    def close
-      terminate
-    end
-
-  private
-    def read(size)
-      @s.read(size)
-    end
- 
-    def terminate
-      super()
-    end
-  end
-end
diff --git a/lib/date.rb b/lib/date.rb
index 21e35a6660..9de49bcbc7 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -1,1328 +1,258 @@
-# 
-# date.rb - date and time library
 #
-# Author: Tadayoshi Funaba 1998-2002
+#               Date.rb - 
+#                       $Release Version: $
+#                       $Revision: 1.1.1.1.4.5 $
+#                       $Date: 1998/03/03 02:39:34 $
+#                       by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
 #
-# Documentation: William Webber <william@williamwebber.com>
+# --
 #
-#--
-# $Id: date.rb,v 2.8 2002-06-08 00:39:51+09 tadf Exp $
-#++
-#
-# == Overview
-#
-# This file provides two classes for working with
-# dates and times.
-# 
-# The first class, Date, represents dates.  
-# It works with years, months, weeks, and days.
-# See the Date class documentation for more details.
-#
-# The second, DateTime, extends Date to include hours,
-# minutes, seconds, and fractions of a second.  It
-# provides basic support for time zones.  See the
-# DateTime class documentation for more details.
-#
-# === Ways of calculating the date.
-#
-# In common usage, the date is reckoned in years since or
-# before the Common Era (CE/BCE, also known as AD/BC), then
-# as a month and day-of-the-month within the current year.
-# This is known as the *Civil* *Date*, and abbrevated 
-# as +civil+ in the Date class.
-#
-# Instead of year, month-of-the-year,  and day-of-the-month, 
-# the date can also be reckoned in terms of year and 
-# day-of-the-year.  This is known as the *Ordinal* *Date*,
-# and is abbreviated as +ordinal+ in the Date class.  (Note
-# that referring to this as the Julian date is incorrect.)
-#
-# The date can also be reckoned in terms of year, week-of-the-year,
-# and day-of-the-week.  This is known as the *Commercial*
-# *Date*, and is abbreviated as +commercial+ in the
-# Date class.  The commercial week runs Monday (day-of-the-week
-# 1) to Sunday (day-of-the-week 7), in contrast to the civil
-# week which runs Sunday (day-of-the-week 0) to Saturday
-# (day-of-the-week 6).  The first week of the commercial year
-# starts on the Monday on or before January 1, and the commercial
-# year itself starts on this Monday, not January 1.
-#
-# For scientific purposes, it is convenient to refer to a date
-# simply as a day count, counting from an arbitrary initial
-# day.  The date first chosen for this was January 1, 4713 BCE.
-# A count of days from this date is the *Julian* *Day* *Number*
-# or *Julian* *Date*, which is abbreviated as +jd+ in the
-# Date class.  This is in local time, and counts from midnight
-# on the initial day.  The stricter usage is in UTC, and counts
-# from midday on the initial day.  This is referred to in the
-# Date class as the *Astronomical* *Julian* *Day* *Number*, and
-# abbreviated as +ajd+.  In the Date class, the Astronomical
-# Julian Day Number includes fractional days.
-# 
-# Another absolute day count is the *Modified* *Julian* *Day*
-# *Number*, which takes November 17, 1858 as its initial day.
-# This is abbreviated as +mjd+ in the Date class.  There
-# is also an *Astronomical* *Modified* *Julian* *Day* *Number*,
-# which is in UTC and includes fractional days.  This is
-# abbreviated as +amjd+ in the Date class.  Like the Modified
-# Julian Day Number (and unlike the Astronomical Julian
-# Day Number), it counts from midnight.
-#
-# Alternative calendars such as the Chinese Lunar Calendar,
-# the Islamic Calendar, or the French Revolutionary Calendar
-# are not supported by the Date class; nor are calendars that
-# are based on an Era different from the Common Era, such as
-# the Japanese Imperial Calendar or the Republic of China
-# Calendar.
-#
-# === Calendar Reform
-#
-# The standard civil year is 365 days long.  However, the
-# solar year is fractionally longer than this.  To account
-# for this, a *leap* *year* is occasionally inserted.  This
-# is a year with 366 days, the extra day falling on February 29.  
-# In the early days of the civil calendar, every fourth
-# year without exception was a leap year.  This way of
-# reckoning leap years is the *Julian* *Calendar*.
-#
-# However, the solar year is marginally shorter than 365 1/4
-# days, and so the *Julian* *Calendar* gradually ran slow
-# over the centuries.  To correct this, every 100th year
-# (but not every 400th year) was excluded as a leap year.
-# This way of reckoning leap years, which we use today, is
-# the *Gregorian* *Calendar*.
-#
-# The Gregorian Calendar was introduced at different times
-# in different regions.  The day on which it was introduced
-# for a particular region is the *Day* *of* *Calendar* 
-# *Reform* for that region.  This is abbreviated as +sg+
-# (for Start of Gregorian calendar) in the Date class.
-#
-# Two such days are of particular
-# significance.  The first is October 15, 1582, which was
-# the Day of Calendar Reform for Italy and most Catholic
-# countries.  The second is September 14, 1752, which was
-# the Day of Calendar Reform for England and its colonies
-# (including what is now the United States).  These two 
-# dates are available as the constants Date::ITALY and
-# Date::ENGLAND, respectively.  (By comparison, Germany and
-# Holland, less Catholic than Italy but less stubborn than
-# England, changed over in 1698; Sweden in 1753; Russia not
-# till 1918, after the Revolution; and Greece in 1923.  Many
-# Orthodox churches still use the Julian Calendar.  A complete
-# list of Days of Calendar Reform can be found at 
-# http://www.polysyllabic.com/GregConv.html.)
-#
-# Switching from the Julian to the Gregorian calendar
-# involved skipping a number of days to make up for the
-# accumulated lag, and the later the switch was (or is)
-# done, the more days need to be skipped.  So in 1582 in Italy,
-# 4th October was followed by 15th October, skipping 10 days; in 1752 
-# in England, 2nd September was followed by 14th September, skipping
-# 11 days; and if I decided to switch from Julian to Gregorian 
-# Calendar this midnight, I would go from 27th July 2003 (Julian) 
-# today to 10th August 2003 (Gregorian) tomorrow, skipping
-# 13 days.  The Date class is aware of this gap, and a supposed
-# date that would fall in the middle of it is regarded as invalid.
-#
-# The Day of Calendar Reform is relevant to all date representations
-# involving years.  It is not relevant to the Julian Day Numbers,
-# except for converting between them and year-based representations.
-#
-# In the Date and DateTime classes, the Day of Calendar Reform or
-# +sg+ can be specified a number of ways.  First, it can be as
-# the Julian Day Number of the Day of Calendar Reform.  Second,
-# it can be using the constants Date::ITALY or Date::ENGLAND; these
-# are in fact the Julian Day Numbers of the Day of Calendar Reform
-# of the respective regions.  Third, it can be as the constant
-# Date::JULIAN, which means to always use the Julian Calendar.
-# Finally, it can be as the constant Date::GREGORIAN, which means
-# to always use the Gregorian Calendar.
-#
-# Note: in the Julian Calendar, New Years Day was March 25.  The
-# Date class does not follow this convention.
-#
-# === Time Zones
-#
-# DateTime objects support a simple representation
-# of time zones.  Time zones are represented as an offset
-# from UTC, as a fraction of a day.  This offset is the
-# how much local time is later (or earlier) than UTC.
-# UTC offset 0 is centred on England (also known as GMT).  
-# As you travel east, the offset increases until you
-# reach the dateline in the middle of the Pacific Ocean;
-# as you travel west, the offset decreases.  This offset
-# is abbreviated as +of+ in the Date class.
-#
-# This simple representation of time zones does not take 
-# into account the common practice of Daylight Savings
-# Time or Summer Time.
-#
-# Most DateTime methods return the date and the
-# time in local time.  The two exceptions are
-# #ajd() and #amjd(), which return the date and time
-# in UTC time, including fractional days.
-#
-# The Date class does not support time zone offsets, in that
-# there is no way to create a Date object with a time zone.
-# However, methods of the Date class when used by a
-# DateTime instance will use the time zone offset of this
-# instance.
-#
-# == Examples of use
-#
-# === Print out the date of every Sunday between two dates.
-#
-#     def print_sundays(d1, d2)
-#         d1 +=1 while (d1.wday != 0)
-#         d1.step(d2, 7) do |date|
-#             puts "#{Date::MONTHNAMES[date.mon]} #{date.day}"
-#         end
-#     end
-#
-#     print_sundays(Date::civil(2003, 4, 8), Date::civil(2003, 5, 23))
-#
-# === Calculate how many seconds to go till midnight on New Year's Day.
-#
-#     def secs_to_new_year(now = DateTime::now())
-#         new_year = DateTime.new(now.year + 1, 1, 1)
-#         dif = new_year - now
-#         hours, mins, secs, ignore_fractions = Date::day_fraction_to_time(dif)
-#         return hours * 60 * 60 + mins * 60 + secs
-#     end
-#
-#     puts secs_to_new_year()
+#    September 1752
+#  S  M Tu  W Th  F  S
+#        1  2 14 15 16
+# 17 18 19 20 21 22 23
+# 24 25 26 27 28 29 30
+#       
 
-require 'rational'
-require 'date/format'
-
-# Class representing a date.
-#
-# See the documentation to the file date.rb for an overview.
-#
-# Internally, the date is represented as an Astronomical
-# Julian Day Number, +ajd+.  The Day of Calendar Reform, +sg+, is 
-# also stored, for conversions to other date formats.  (There
-# is also an +of+ field for a time zone offset, but this
-# is only for the use of the DateTime subclass.)
-#
-# A new Date object is created using one of the object creation
-# class methods named after the corresponding date format, and the
-# arguments appropriate to that date format; for instance,
-# Date::civil() (aliased to Date::new()) with year, month,
-# and day-of-month, or Date::ordinal() with year and day-of-year.
-# All of these object creation class methods also take the
-# Day of Calendar Reform as an optional argument.
-#
-# Date objects are immutable once created.
-#
-# Once a Date has been created, date values
-# can be retrieved for the different date formats supported 
-# using instance methods.  For instance, #mon() gives the
-# Civil month, #cwday() gives the Commercial day of the week,
-# and #yday() gives the Ordinal day of the year.  Date values
-# can be retrieved in any format, regardless of what format
-# was used to create the Date instance.
-#
-# The Date class includes the Comparable module, allowing
-# date objects to be compared and sorted, ranges of dates
-# to be created, and so forth.
 class Date
-
   include Comparable
-
-  # Full month names, in English.  Months count from 1 to 12; a
-  # month's numerical representation indexed into this array
-  # gives the name of that month (hence the first element is nil).
-  MONTHNAMES = [nil] + %w(January February March April May June July
-			  August September October November December)
-
-  # Full names of days of the week, in English.  Days of the week 
-  # count from 0 to 6 (except in the commercial week); a day's numerical
-  # represenation indexed into this array gives the name of that day.
-  DAYNAMES = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
-
-  # Abbreviated month names, in English.
-  ABBR_MONTHNAMES = [nil] + %w(Jan Feb Mar Apr May Jun
-			       Jul Aug Sep Oct Nov Dec)
-
-  # Abbreviated day names, in English.
-  ABBR_DAYNAMES = %w(Sun Mon Tue Wed Thu Fri Sat)
-
-  # The Julian Day Number of the Day of Calendar Reform for Italy
-  # and the Catholic countries.
-  ITALY     = 2299161 # 1582-10-15
-
-  # The Julian Day Number of the Day of Calendar Reform for England
-  # and her Colonies.
-  ENGLAND   = 2361222 # 1752-09-14
-
-  # A constant used to indicate that a Date should always use the
-  # Julian calendar.
-  JULIAN    = false
-
-  # A constant used to indicate that a Date should always use the
-  # Gregorian calendar.
-  GREGORIAN = true
-
-  # Does a given Julian Day Number fall inside the old-style (Julian)
-  # calendar?
-  #
-  # +jd+ is the Julian Day Number in question. +sg+ may be Date::GREGORIAN,
-  # in which case the answer is false; it may be Date::JULIAN, in which case
-  # the answer is true; or it may a number representing the Day of
-  # Calendar Reform. Date::ENGLAND and Date::ITALY are two possible such
-  # days.
-  def self.os? (jd, sg)
-    case sg
-    when Numeric; jd < sg
-    else;         not sg
-    end
-  end
-
-  # Does a given Julian Day Number fall inside the new-style (Gregorian)
-  # calendar?
-  #
-  # The reverse of self.os?  See the documentation for that method for
-  # more details.
-  def self.ns? (jd, sg) not os?(jd, sg) end
-
-  # Convert a Civil Date to a Julian Day Number.
-  # +y+, +m+, and +d+ are the year, month, and day of the
-  # month.  +sg+ specifies the Day of Calendar Reform.
-  #
-  # Returns the corresponding Julian Day Number.
-  def self.civil_to_jd(y, m, d, sg=GREGORIAN)
-    if m <= 2
-      y -= 1
-      m += 12
-    end
-    a = (y / 100.0).floor
-    b = 2 - a + (a / 4.0).floor
-    jd = (365.25 * (y + 4716)).floor +
-      (30.6001 * (m + 1)).floor +
-      d + b - 1524
-    if os?(jd, sg)
-      jd -= b
-    end
-    jd
-  end
-
-  # Convert a Julian Day Number to a Civil Date.  +jd+ is
-  # the Julian Day Number. +sg+ specifies the Day of
-  # Calendar Reform.
-  #
-  # Returns the corresponding [year, month, day_of_month] 
-  # as a three-element array.
-  def self.jd_to_civil(jd, sg=GREGORIAN)
-    if os?(jd, sg)
-      a = jd
-    else
-      x = ((jd - 1867216.25) / 36524.25).floor
-      a = jd + 1 + x - (x / 4.0).floor
-    end
-    b = a + 1524
-    c = ((b - 122.1) / 365.25).floor
-    d = (365.25 * c).floor
-    e = ((b - d) / 30.6001).floor
-    dom = b - d - (30.6001 * e).floor
-    if e <= 13
-      m = e - 1
-      y = c - 4716
+  
+  Weektag = [
+    "Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"
+  ]
+
+  Monthtag = [
+    "January","February","March","April", "May", "June","July",
+    "August", "September", "October", "November", "December"
+  ]
+
+  Monthtab = {
+    "jan"=>1, "feb"=>2, "mar"=>3, "apr"=>4, "may"=>5, "jun"=>6,
+    "jul"=>7, "aug"=>8, "sep"=>9, "oct"=>10, "nov"=>11, "dec"=>12
+  }
+
+  def initialize(y = 1, m = 1, d = 1)
+    if y.kind_of?(String)
+      case y
+      when /(\d\d\d\d)-?(?:(\d\d)-?(\d\d)?)?/
+	@year = $1.to_i
+	@month = if $2 then $2.to_i else 1 end
+	@day = if $3 then $3.to_i else 1 end
+      else
+	require 'parsedate'
+	@year, @month, @day = ParseDate.parsedate(y)
+      end
     else
-      m = e - 13
-      y = c - 4715
+      if m.kind_of?(String)
+        m = Monthtab[m.downcase]
+        if m.nil?
+          raise ArgumentError, "Wrong argument. (month)"
+        end
+      end
+      @year = y.to_i
+      @month = m.to_i
+      @day = d.to_i
     end
-    return y, m, dom
+    _check_date
+    return self
   end
-
-  # Convert an Ordinal Date to a Julian Day Number.
-  #
-  # +y+ and +d+ are the year and day-of-year to convert.
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # Returns the corresponding Julian Day Number.
-  def self.ordinal_to_jd(y, d, sg=GREGORIAN)
-    civil_to_jd(y, 1, d, sg)
+  
+  def year
+    return @year
   end
-
-  # Convert a Julian Day Number to an Ordinal Date.
-  #
-  # +jd+ is the Julian Day Number to convert.
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # Returns the corresponding Ordinal Date as 
-  # [year, day_of_year]
-  def self.jd_to_ordinal(jd, sg=GREGORIAN)
-    y = jd_to_civil(jd, sg)[0]
-    doy = jd - civil_to_jd(y - 1, 12, 31, ns?(jd, sg))
-    return y, doy
+  
+  def month
+    return @month
   end
-
-  # Convert a Julian Day Number to a Commercial Date
-  #
-  # +jd+ is the Julian Day Number to convert.
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # Returns the corresponding Commercial Date as
-  # [commercial_year, week_of_year, day_of_week]
-  def self.jd_to_commercial(jd, sg=GREGORIAN)
-    ns = ns?(jd, sg)
-    a = jd_to_civil(jd - 3, ns)[0]
-    y = if jd >= commercial_to_jd(a + 1, 1, 1, ns) then a + 1 else a end
-    w = 1 + (jd - commercial_to_jd(y, 1, 1, ns)) / 7
-    d = (jd + 1) % 7
-    if d.zero? then d = 7 end
-    return y, w, d
+  
+  def day
+    return @day
   end
-
-  # Convert a Commercial Date to a Julian Day Number.
-  #
-  # +y+, +w+, and +d+ are the (commercial) year, week of the year, 
-  # and day of the week of the Commercial Date to convert.
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.commercial_to_jd(y, w, d, ns=GREGORIAN)
-    jd = civil_to_jd(y, 1, 4, ns)
-    (jd - (((jd - 1) + 1) % 7)) +
-      7 * (w - 1) +
-      (d - 1)
+  
+  def period
+    return Date.period!(@year, @month, @day)
   end
 
-  %w(self.clfloor clfloor).each do |name|
-    module_eval <<-"end;"
-      def #{name}(x, y=1)
-	q, r = x.divmod(y)
-	q = q.to_i
-	return q, r
-      end
-    end;
+  def jd
+    return period + 1721423
   end
 
-  private_class_method :clfloor
-  private              :clfloor
-
-
-  # Convert an Astronomical Julian Day Number to a (civil) Julian
-  # Day Number.
-  #
-  # +ajd+ is the Astronomical Julian Day Number to convert.  
-  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-  #
-  # Returns the (civil) Julian Day Number as [day_number,
-  # fraction] where +fraction+ is always 1/2.
-  def self.ajd_to_jd(ajd, of=0) clfloor(ajd + of + 1.to_r/2) end
-
-  # Convert a (civil) Julian Day Number to an Astronomical Julian
-  # Day Number.
-  #
-  # +jd+ is the Julian Day Number to convert, and +fr+ is a
-  # fractional day.  
-  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-  #
-  # Returns the Astronomical Julian Day Number as a single 
-  # numeric value.
-  def self.jd_to_ajd(jd, fr, of=0) jd + fr - of - 1.to_r/2 end
-
-  # Convert a fractional day +fr+ to [hours, minutes, seconds,
-  # fraction_of_a_second]
-  def self.day_fraction_to_time(fr)
-    h,   fr = clfloor(fr, 1.to_r/24)
-    min, fr = clfloor(fr, 1.to_r/1440)
-    s,   fr = clfloor(fr, 1.to_r/86400)
-    return h, min, s, fr
+  def mjd
+    return jd - 2400000.5
   end
 
-  # Convert an +h+ hour, +min+ minutes, +s+ seconds period
-  # to a fractional day.
-  def self.time_to_day_fraction(h, min, s)
-    h.to_r/24 + min.to_r/1440 + s.to_r/86400
+  def to_s
+    format("%.3s, %.3s %2d %4d", name_of_week, name_of_month, @day, @year)
   end
 
-  # Convert an Astronomical Modified Julian Day Number to an 
-  # Astronomical Julian Day Number.
-  def self.amjd_to_ajd(amjd) amjd + 4800001.to_r/2 end
-
-  # Convert an Astronimcal Julian Day Number to an
-  # Astronomical Modified Julian Day Number.
-  def self.ajd_to_amjd(ajd) ajd - 4800001.to_r/2 end
-
-  # Convert a Modified Julian Day Number to a Julian
-  # Day Number.
-  def self.mjd_to_jd(mjd) mjd + 2400001 end
-
-  # Convert a Julian Day Number to a Modified Julian Day 
-  # Number.
-  def self.jd_to_mjd(jd) jd - 2400001 end
-
-  # Convert a count of the number of days since the adoption
-  # of the Gregorian Calendar (in Italy) to a Julian Day Number.
-  def self.ld_to_jd(ld) ld + 2299160 end
-
-  # Convert a Julian Day Number to the number of days since
-  # the adoption of the Gregorian Calendar (in Italy).
-  def self.jd_to_ld(jd) jd - 2299160 end
-
-  # Convert a Julian Day Number to the day of the week.
-  #
-  # Sunday is day-of-week 0; Saturday is day-of-week 6.
-  def self.jd_to_wday(jd) (jd + 1) % 7 end
-
-  # Is a year a leap year in the Julian calendar?
-  #
-  # All years divisible by 4 are leap years in the Julian calendar.
-  def self.julian_leap? (y) y % 4 == 0 end
-
-  # Is a year a leap year in the Gregorian calendar?
-  #
-  # All years divisible by 4 are leap years in the Gregorian calendar,
-  # except for years divisible by 100 and not by 400.
-  def self.gregorian_leap? (y) y % 4 == 0 and y % 100 != 0 or y % 400 == 0 end
-
-  class << self; alias_method :leap?, :gregorian_leap? end
-  class << self; alias_method :new0, :new end
-
-  # Is +jd+ a valid Julian Day Number?
-  #
-  # If it is, returns it.  In fact, any value is treated as a valid
-  # Julian Day Number.
-  def self.valid_jd? (jd, sg=ITALY) jd end
-
-  # Create a new Date object from a Julian Day Number.
-  #
-  # +jd+ is the Julian Day Number; if not specified, it defaults to
-  # 0.  
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.jd(jd=0, sg=ITALY)
-    jd = valid_jd?(jd, sg)
-    new0(jd_to_ajd(jd, 0, 0), 0, sg)
+  def inspect
+    to_s
   end
 
-  # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date?
-  # Returns the corresponding Julian Day Number if they do, or
-  # nil if they don't.
-  #
-  # +d+ can be a negative number, in which case it counts backwards
-  # from the end of the year (-1 being the last day of the year).
-  # No year wraparound is performed, however, so valid values of
-  # +d+ are -365 .. -1, 1 .. 365 on a non-leap-year, 
-  # -366 .. -1, 1 .. 366 on a leap year.  
-  # A date falling in the period skipped in the Day of Calendar Reform
-  # adjustment is not valid.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.valid_ordinal? (y, d, sg=ITALY)
-    if d < 0
-      ny, = clfloor(y + 1, 1)
-      jd = ordinal_to_jd(ny, d + 1, sg)
-      ns = ns?(jd, sg)
-      return unless [y] == jd_to_ordinal(jd, sg)[0..0]
-      return unless [ny, 1] == jd_to_ordinal(jd - d, ns)
-    else
-      jd = ordinal_to_jd(y, d, sg)
-      return unless [y, d] == jd_to_ordinal(jd, sg)
-    end
-    jd
+  def day_of_week
+    return (period + 5) % 7
   end
-
-  # Create a new Date object from an Ordinal Date, specified
-  # by year +y+ and day-of-year +d+. +d+ can be negative,
-  # in which it counts backwards from the end of the year.
-  # No year wraparound is performed, however.  An invalid
-  # value for +d+ results in an ArgumentError being raised.
-  #
-  # +y+ defaults to -4712, and +d+ to 1; this is Julian Day
-  # Number day 0.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.ordinal(y=-4712, d=1, sg=ITALY)
-    unless jd = valid_ordinal?(y, d, sg)
-      raise ArgumentError, 'invalid date'
-    end
-    new0(jd_to_ajd(jd, 0, 0), 0, sg)
+  
+  def name_of_week
+    return Weektag[self.day_of_week]
   end
-
-  # Do year +y+, month +m+, and day-of-month +d+ make a 
-  # valid Civil Date?  Returns the corresponding Julian 
-  # Day Number if they do, nil if they don't.
-  #
-  # +m+ and +d+ can be negative, in which case they count
-  # backwards from the end of the year and the end of the
-  # month respectively.  No wraparound is performed, however,
-  # and invalid values cause an ArgumentError to be raised.
-  # A date falling in the period skipped in the Day of Calendar 
-  # Reform adjustment is not valid.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.valid_civil? (y, m, d, sg=ITALY)
-    if m < 0
-      m += 13
-    end
-    if d < 0
-      ny, nm = clfloor(y * 12 + m, 12)
-      nm,    = clfloor(nm + 1, 1)
-      jd = civil_to_jd(ny, nm, d + 1, sg)
-      ns = ns?(jd, sg)
-      return unless [y, m] == jd_to_civil(jd, sg)[0..1]
-      return unless [ny, nm, 1] == jd_to_civil(jd - d, ns)
-    else
-      jd = civil_to_jd(y, m, d, sg)
-      return unless [y, m, d] == jd_to_civil(jd, sg)
-    end
-    jd
+  
+  def name_of_month
+    return Monthtag[@month-1]
   end
-
-  class << self; alias_method :valid_date?, :valid_civil? end
-
-  # Create a new Date object for the Civil Date specified by
-  # year +y+, month +m+, and day-of-month +d+.
-  #
-  # +m+ and +d+ can be negative, in which case they count
-  # backwards from the end of the year and the end of the
-  # month respectively.  No wraparound is performed, however,
-  # and invalid values cause an ArgumentError to be raised.
-  # can be negative 
-  #
-  # +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is
-  # Julian Day Number day 0.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.civil(y=-4712, m=1, d=1, sg=ITALY)
-    unless jd = valid_civil?(y, m, d, sg)
-      raise ArgumentError, 'invalid date'
+  
+  def +(o)
+    if o.kind_of?(Numeric)
+      d = Integer(self.period + o)
+    elsif o.kind_of?(Date)
+      d = self.period + o.period
+    else
+      raise TypeError, "Illegal type. (Integer or Date)"
     end
-    new0(jd_to_ajd(jd, 0, 0), 0, sg)
-  end
-
-  class << self; alias_method :new, :civil end
-
-  # Do year +y+, week-of-year +w+, and day-of-week +d+ make a
-  # valid Commercial Date?  Returns the corresponding Julian
-  # Day Number if they do, nil if they don't.
-  #
-  # Monday is day-of-week 1; Sunday is day-of-week 7.
-  #
-  # +w+ and +d+ can be negative, in which case they count
-  # backwards from the end of the year and the end of the
-  # week respectively.  No wraparound is performed, however,
-  # and invalid values cause an ArgumentError to be raised.
-  # A date falling in the period skipped in the Day of Calendar 
-  # Reform adjustment is not valid.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.valid_commercial? (y, w, d, sg=ITALY)
-    if d < 0
-      d += 8
+    if d <= 0
+      raise ArgumentError, "argument out of range. (self > other)"
     end
-    if w < 0
-      w = jd_to_commercial(commercial_to_jd(y + 1, 1, 1) + w * 7)[1]
+    return Date.at(d)
+  end
+  
+  def -(o)
+    if o.kind_of?(Numeric)
+      d = Integer(self.period - o)
+    elsif o.kind_of?(Date)
+      return Integer(self.period - o.period)
+    else
+      raise TypeError, "Illegal type. (Integer or Date)"
     end
-    jd = commercial_to_jd(y, w, d)
-    return unless ns?(jd, sg)
-    return unless [y, w, d] == jd_to_commercial(jd)
-    jd
-  end
-
-  # Create a new Date object for the Commercial Date specifed by
-  # year +y+, week-of-year +w+, and day-of-week +d+.
-  #
-  # Monday is day-of-week 1; Sunday is day-of-week 7.
-  #
-  # +w+ and +d+ can be negative, in which case they count
-  # backwards from the end of the year and the end of the
-  # week respectively.  No wraparound is performed, however,
-  # and invalid values cause an ArgumentError to be raised.
-  #
-  # +y+ defaults to 1582, +w+ to 41, and +d+ to 5, the Day of
-  # Calendar Reform for Italy and the Catholic countries.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.commercial(y=1582, w=41, d=5, sg=ITALY)
-    unless jd = valid_commercial?(y, w, d, sg)
-      raise ArgumentError, 'invalid date'
+    if d <= 0
+      raise ArgumentError, "argument out of range. (self > other)"
     end
-    new0(jd_to_ajd(jd, 0, 0), 0, sg)
-  end
-
-  def self.new_with_hash(elem, sg)
-    elem ||= {}
-    y, m, d = elem.values_at(:year, :mon, :mday)
-    if [y, m, d].include? nil
-      raise ArgumentError, 'invalid date'
+    return Date.at(d)
+  end
+  
+  def <=>(o)
+    if o.kind_of?(Integer)
+      d = o
+    elsif o.kind_of?(Date)
+      d = o.period
     else
-      civil(y, m, d, sg)
+      raise TypeError, "Illegal type. (Integer or Date)"
     end
+    return self.period <=> d
   end
 
-  private_class_method :new_with_hash
-
-  # Create a new Date object by parsing from a String
-  # according to a specified format.
-  #
-  # +str+ is a String holding a date representation.
-  # +fmt+ is the format that the date is in.  See 
-  # date/format.rb for details on supported formats.
-  #
-  # The default +str+ is '-4712-01-01', and the default
-  # +fmt+ is '%F', which means Year-Month-Day_of_Month.
-  # This gives Julian Day Number day 0.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # An ArgumentError will be raised if +str+ cannot be
-  # parsed.
-  def self.strptime(str='-4712-01-01', fmt='%F', sg=ITALY)
-    elem = _strptime(str, fmt)
-    new_with_hash(elem, sg)
+  def eql?(o)
+    self == o
   end
-
-  # Create a new Date object by parsing from a String,
-  # without specifying the format.
-  #
-  # +str+ is a String holding a date representation.  
-  # +comp+ specifies whether to interpret 2-digit years
-  # as 19XX (>= 69) or 20XX (< 69); the default is not to.
-  # The method will attempt to parse a date from the String
-  # using various heuristics; see #_parse in date/format.rb
-  # for more details.  If parsing fails, an ArgumentError
-  # will be raised.
-  #
-  # The default +str+ is '-4712-01-01'; this is Julian
-  # Day Number day 0.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.parse(str='-4712-01-01', comp=false, sg=ITALY)
-    elem = _parse(str, comp)
-    new_with_hash(elem, sg)
+  
+  def hash
+    return @year ^ @month ^ @day
   end
-
-  # Create a new Date object representing today.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.today(sg=ITALY)
-    jd = civil_to_jd(*(Time.now.to_a[3..5].reverse << sg))
-    new0(jd_to_ajd(jd, 0, 0), 0, sg)
+  
+  def leapyear?
+    Date.leapyear(@year) != 1
   end
 
-  class << self
-
-    def once(*ids) # :nodoc:
-      for id in ids
-	module_eval <<-"end;"
-	  alias_method :__#{id.to_i}__, :#{id.to_s}
-	  private :__#{id.to_i}__
-	  def #{id.to_s}(*args, &block)
-	    (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0]
-	  end
-	end;
-      end
+  def _check_date
+    if @year == nil or @month == nil or @day == nil
+      raise ArgumentError, "argument contains nil"
     end
-
-    private :once
-
-  end
-
-  # *NOTE* this is the documentation for the method new0().  If
-  # you are reading this as the documentation for new(), that is
-  # because rdoc doesn't fully support the aliasing of the 
-  # initialize() method.
-  # new() is in
-  # fact an alias for #civil(): read the documentation for that
-  # method instead.
-  #
-  # Create a new Date object.
-  #
-  # +ajd+ is the Astronomical Julian Day Number. 
-  # +of+ is the offset from UTC as a fraction of a day.
-  # Both default to 0. 
-  #
-  # +sg+ specifies the Day of Calendar Reform to use for this
-  # Date object.
-  #
-  # Using one of the factory methods such as Date::civil is
-  # generally easier and safer.
-  def initialize(ajd=0, of=0, sg=ITALY) @ajd, @of, @sg = ajd, of, sg end
-
-  # Get the date as an Astronomical Julian Day Number.
-  def ajd() @ajd end
-
-  # Get the date as an Astronomical Modified Julian Day Number.
-  def amjd() self.class.ajd_to_amjd(@ajd) end
-
-  once :amjd
-
-  # Get the date as a Julian Day Number.
-  def jd() self.class.ajd_to_jd(@ajd, @of)[0] end
-
-  # Get any fractional day part of the date.
-  def day_fraction() self.class.ajd_to_jd(@ajd, @of)[1] end
-
-  # Get the date as a Modified Julian Day Number.
-  def mjd() self.class.jd_to_mjd(jd) end
-
-  # Get the date as the number of days since the Day of Calendar
-  # Reform (in Italy and the Catholic countries).
-  def ld() self.class.jd_to_ld(jd) end
-
-  once :jd, :day_fraction, :mjd, :ld
-
-  # Get the date as a Civil Date, [year, month, day_of_month]
-  def civil() self.class.jd_to_civil(jd, @sg) end
-
-  # Get the date as an Ordinal Date, [year, day_of_year]
-  def ordinal() self.class.jd_to_ordinal(jd, @sg) end
-
-  # Get the date as a Commercial Date, [year, week_of_year, day_of_week]
-  def commercial() self.class.jd_to_commercial(jd, @sg) end
-
-  once :civil, :ordinal, :commercial
-  private :civil, :ordinal, :commercial
-
-  # Get the year of this date.
-  def year() civil[0] end
-
-  # Get the day-of-the-year of this date.
-  #
-  # January 1 is day-of-the-year 1
-  def yday() ordinal[1] end
-
-  # Get the month of this date.
-  #
-  # January is month 1.
-  def mon() civil[1] end
-
-  # Get the day-of-the-month of this date.
-  def mday() civil[2] end
-
-  alias_method :month, :mon
-  alias_method :day, :mday
-
-  # Get the time of this date as [hours, minutes, seconds,
-  # fraction_of_a_second]
-  def time() self.class.day_fraction_to_time(day_fraction) end
-
-  once :time
-  private :time
-
-  # Get the hour of this date.
-  def hour() time[0] end
-
-  # Get the minute of this date.
-  def min() time[1] end
-
-  # Get the second of this date.
-  def sec() time[2] end
-
-  # Get the fraction-of-a-second of this date.
-  def sec_fraction() time[3] end
-
-  private :hour, :min, :sec, :sec_fraction
-
-  def zone
-    ['Z',
-      format('%+.2d%02d',
-	     (@of     / (1.to_r/24)).to_i,
-	     (@of.abs % (1.to_r/24) / (1.to_r/1440)).to_i)
-    ][@of<=>0]
-  end
-
-  private :zone
-
-  # Get the commercial year of this date.  See *Commercial* *Date*
-  # in the introduction for how this differs from the normal year.
-  def cwyear() commercial[0] end
-
-  # Get the commercial week of the year of this date.
-  def cweek() commercial[1] end
-
-  # Get the commercial day of the week of this date.  Monday is
-  # commercial day-of-week 1; Sunday is commercial day-of-week 7.
-  def cwday() commercial[2] end
-
-  # Get the week day of this date.  Sunday is day-of-week 0;
-  # Saturday is day-of-week 6.
-  def wday() self.class.jd_to_wday(jd) end
-
-  once :wday
-
-  # Is the current date old-style (Julian Calendar)?
-  def os? () self.class.os?(jd, @sg) end
-
-  # Is the current date new-style (Gregorian Calendar)?
-  def ns? () self.class.ns?(jd, @sg) end
-
-  once :os?, :ns?
-
-  # Is this a leap year?
-  def leap?
-    self.class.jd_to_civil(self.class.civil_to_jd(year, 3, 1, ns?) - 1,
-		     ns?)[-1] == 29
-  end
-
-  once :leap?
-
-  # When is the Day of Calendar Reform for this Date object?
-  def start() @sg end
-
-  # Create a copy of this Date object using a new Day of Calendar Reform.
-  def new_start(sg=self.class::ITALY) self.class.new0(@ajd, @of, sg) end
-
-  # Create a copy of this Date object that uses the Italian/Catholic
-  # Day of Calendar Reform.
-  def italy() new_start(self.class::ITALY) end
-
-  # Create a copy of this Date object that uses the English/Colonial
-  # Day of Calendar Reform.
-  def england() new_start(self.class::ENGLAND) end
-
-  # Create a copy of this Date object that always uses the Julian
-  # Calendar.
-  def julian() new_start(self.class::JULIAN) end
-
-  # Create a copy of this Date object that always uses the Gregorian
-  # Calendar.
-  def gregorian() new_start(self.class::GREGORIAN) end
-
-  def offset() @of end
-  def new_offset(of=0) self.class.new0(@ajd, of, @sg) end
-
-  private :offset, :new_offset
-
-  # Return a new Date object that is +n+ days later than the
-  # current one.
-  #
-  # +n+ may be a negative value, in which case the new Date
-  # is earlier than the current one; however, #-() might be
-  # more intuitive.
-  #
-  # If +n+ is not a Numeric, a TypeError will be thrown.  In
-  # particular, two Dates cannot be added to each other.
-  def + (n)
-    case n
-    when Numeric; return self.class.new0(@ajd + n, @of, @sg)
-    end
-    raise TypeError, 'expected numeric'
-  end
-
-  # If +x+ is a Numeric value, create a new Date object that is
-  # +x+ days earlier than the current one.
-  #
-  # If +x+ is a Date, return the number of days between the
-  # two dates; or, more precisely, how many days later the current
-  # date is than +x+.
-  #
-  # If +x+ is neither Numeric nor a Date, a TypeError is raised.
-  def - (x)
-    case x
-    when Numeric; return self.class.new0(@ajd - x, @of, @sg)
-    when Date;    return @ajd - x.ajd
-    end
-    raise TypeError, 'expected numeric or date'
-  end
-
-  # Compare this date with another date.
-  #
-  # +other+ can also be a Numeric value, in which case it is 
-  # interpreted as an Astronomical Julian Day Number.
-  #
-  # Comparison is by Astronomical Julian Day Number, including
-  # fractional days.  This means that both the time and the
-  # timezone offset are taken into account when comparing
-  # two DateTime instances.  When comparing a DateTime instance
-  # with a Date instance, the time of the latter will be
-  # considered as falling on midnight UTC.
-  def <=> (other)
-    case other
-    when Numeric; return @ajd <=> other
-    when Date;    return @ajd <=> other.ajd
-    end
-    nil
-  end
-
-  # The relationship operator for Date.
-  #
-  # Compares dates by Julian Day Number.  When comparing
-  # two DateTime instances, or a DateTime with a Date,
-  # the instances will be regarded as equivalent if they
-  # fall on the same date in local time.
-  def === (other)
-    case other
-    when Numeric; return jd == other
-    when Date;    return jd == other.jd
-    end
-    false
-  end
-
-  # Return a new Date object that is +n+ months later than
-  # the current one.
-  #
-  # If the day-of-the-month of the current Date is greater
-  # than the last day of the target month, the day-of-the-month
-  # of the returned Date will be the last day of the target month.
-  def >> (n)
-    y, m = clfloor(year * 12 + (mon - 1) + n, 12)
-    m,   = clfloor(m + 1, 1)
-    d = mday
-    d -= 1 until jd2 = self.class.valid_civil?(y, m, d, ns?)
-    self + (jd2 - jd)
-  end
-
-  # Return a new Date object that is +n+ months earlier than
-  # the current one.
-  #
-  # If the day-of-the-month of the current Date is greater
-  # than the last day of the target month, the day-of-the-month
-  # of the returned Date will be the last day of the target month.
-  def << (n) self >> -n end
-
-  # Step the current date forward +step+ days at a
-  # time (or backward, if +step+ is negative) until 
-  # we reach +limit+ (inclusive), yielding the resultant
-  # date at each step.
-  def step(limit, step)  # :yield: date
-    da = self
-    op = [:-,:<=,:>=][step<=>0]
-    while da.__send__(op, limit)
-      yield da
-      da += step
+    m = Date.daylist(@year)
+    if @month < 1 || @month > 12
+      raise ArgumentError, "argument(month) out of range."
+      return nil
     end
-    self
-  end
-
-  # Step forward one day at a time until we reach +max+
-  # (inclusive), yielding each date as we go.
-  def upto(max, &block)  # :yield: date
-      step(max, +1, &block) 
-  end 
-
-  # Step backward one day at a time until we reach +min+
-  # (inclusive), yielding each date as we go.
-  def downto(min, &block) # :yield: date
-      step(min, -1, &block) 
-  end
-
-  # Return a new Date one day after this one.
-  def succ() self + 1 end
-
-  alias_method :next, :succ
-
-  # Is this Date equal to +other+?
-  #
-  # +other+ must both be a Date object, and represent the same date.
-  def eql? (other) Date === other and self == other end
-
-  # Calculate a hash value for this date.
-  def hash() @ajd.hash end
-
-  # Return internal object state as a programmer-readable string.
-  def inspect() format('#<%s: %s,%s,%s>', self.class, @ajd, @of, @sg) end
-
-  # Return the date as a human-readable string.
-  #
-  # The format used is YYYY-MM-DD.
-  def to_s() strftime end
-
-  # Dump to Marshal format.
-  def _dump(limit) Marshal.dump([@ajd, @of, @sg], -1) end
-
-# def self._load(str) new0(*Marshal.load(str)) end
-
-  # Load from Marshall format.
-  def self._load(str)
-    a = Marshal.load(str)
-    if a.size == 2
-      ajd,     sg = a
-           of = 0
-      ajd -= 1.to_r/2
+    if @year == 1752 && @month == 9
+      if @day >= 3 && @day <= 13
+        raise ArgumentError, "argument(1752/09/3-13) out of range."
+        return nil
+      end
+      d = 30
     else
-      ajd, of, sg = a
+      d = m[@month]
     end
-    new0(ajd, of, sg)
-  end
-
-end
-
-# Class representing a date and time.
-#
-# See the documentation to the file date.rb for an overview.
-#
-# DateTime objects are immutable once created.
-#
-# == Other methods.
-#
-# The following methods are defined in Date, but declared private
-# there.  They are made public in DateTime.  They are documented
-# here.
-#
-# === hour()
-#
-# Get the hour-of-the-day of the time.  This is given
-# using the 24-hour clock, counting from midnight.  The first
-# hour after midnight is hour 0; the last hour of the day is 
-# hour 23.
-#
-# === min()
-#
-# Get the minute-of-the-hour of the time.
-#
-# === sec()
-#
-# Get the second-of-the-minute of the time.
-#
-# === sec_fraction()
-#
-# Get the fraction of a second of the time.  This is returned as
-# a +Rational+.
-#
-# === zone()
-#
-# Get the time zone as a String.  This is representation of the
-# time offset such as "+1000", not the true time-zone name.
-#
-# === offset()
-#
-# Get the time zone offset as a fraction of a day.  This is returned
-# as a +Rational+.
-#
-# === new_offset(of=0)
-#
-# Create a new DateTime object, identical to the current one, except
-# with a new time zone offset of +of+.  +of+ is the new offset from
-# UTC as a fraction of a day.
-#
-class DateTime < Date
-
-  # Do hour +h+, minute +min+, and second +s+ constitute a valid time?
-  #
-  # If they do, returns their value as a fraction of a day.  If not,
-  # returns nil.
-  #
-  # The 24-hour clock is used.  Negative values of +h+, +min+, and
-  # +sec+ are treating as counting backwards from the end of the
-  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
-  # wraparound is performed.
-  def self.valid_time? (h, min, s)
-    h   += 24 if h   < 0
-    min += 60 if min < 0
-    s   += 60 if s   < 0
-    return unless (0..24) === h and
-		  (0..59) === min and
-		  (0..59) === s
-    time_to_day_fraction(h, min, s)
-  end
-
-  # Create a new DateTime object corresponding to the specified
-  # Julian Day Number +jd+ and hour +h+, minute +min+, second +s+.
-  #
-  # The 24-hour clock is used.  Negative values of +h+, +min+, and
-  # +sec+ are treating as counting backwards from the end of the
-  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
-  # wraparound is performed.  If an invalid time portion is specified,
-  # an ArgumentError is raised.
-  #
-  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # All day/time values default to 0.
-  def self.jd(jd=0, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = valid_jd?(jd, sg)) and
-	   (fr = valid_time?(h, min, s))
-      raise ArgumentError, 'invalid date'
+    if @day < 1 || @day > d
+      raise ArgumentError, "argument(day) out of range."
+      return nil
     end
-    new0(jd_to_ajd(jd, fr, of), of, sg)
-  end
-
-  # Create a new DateTime object corresponding to the specified
-  # Ordinal Date and hour +h+, minute +min+, second +s+.
-  #
-  # The 24-hour clock is used.  Negative values of +h+, +min+, and
-  # +sec+ are treating as counting backwards from the end of the
-  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
-  # wraparound is performed.  If an invalid time portion is specified,
-  # an ArgumentError is raised.
-  #
-  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # +y+ defaults to -4712, and +d+ to 1; this is Julian Day Number
-  # day 0.  The time values default to 0.
-  def self.ordinal(y=-4712, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = valid_ordinal?(y, d, sg)) and
-	   (fr = valid_time?(h, min, s))
-      raise ArgumentError, 'invalid date'
-    end
-    new0(jd_to_ajd(jd, fr, of), of, sg)
-  end
-
-  # Create a new DateTime object corresponding to the specified
-  # Civil Date and hour +h+, minute +min+, second +s+.
-  #
-  # The 24-hour clock is used.  Negative values of +h+, +min+, and
-  # +sec+ are treating as counting backwards from the end of the
-  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
-  # wraparound is performed.  If an invalid time portion is specified,
-  # an ArgumentError is raised.
-  #
-  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is Julian Day 
-  # Number day 0.  The time values default to 0.
-  def self.civil(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = valid_civil?(y, m, d, sg)) and
-	   (fr = valid_time?(h, min, s))
-      raise ArgumentError, 'invalid date'
-    end
-    new0(jd_to_ajd(jd, fr, of), of, sg)
-  end
-
-  class << self; alias_method :new, :civil end
-
-  # Create a new DateTime object corresponding to the specified
-  # Commercial Date and hour +h+, minute +min+, second +s+.
-  #
-  # The 24-hour clock is used.  Negative values of +h+, +min+, and
-  # +sec+ are treating as counting backwards from the end of the
-  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
-  # wraparound is performed.  If an invalid time portion is specified,
-  # an ArgumentError is raised.
-  #
-  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # +y+ defaults to 1582, +w+ to 41, and +d+ to 5; this is the Day of
-  # Calendar Reform for Italy and the Catholic countries.
-  # The time values default to 0.
-  def self.commercial(y=1582, w=41, d=5, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = valid_commercial?(y, w, d, sg)) and
-	   (fr = valid_time?(h, min, s))
-      raise ArgumentError, 'invalid date'
-    end
-    new0(jd_to_ajd(jd, fr, of), of, sg)
+    return self
   end
+  
+  private :_check_date
+end
 
-  def self.new_with_hash(elem, sg)
-    elem ||= {}
-    y, m, d, h, min, s, of =
-      elem.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)
-    h   ||= 0
-    min ||= 0
-    s   ||= 0
-    of  ||= 0
-    if [y, m, d].include? nil
-      raise ArgumentError, 'invalid date'
+def Date.at(d)
+  if d.kind_of? Time
+    return Date.new(d.year, d.mon, d.mday)
+  end
+  if d.kind_of? Date
+    return Date.at(d.period)
+  end
+  mm = 1
+  yy = (d / 366.0).to_i
+  if yy != 0
+    dd = d - (Date.period!(yy, 1, 1) - 1)
+  else
+    dd = d
+    yy = 1
+  end
+  dl = Date.daylist(yy)
+  while dd > dl[mm]
+    if dd > dl[0]
+      dd -= dl[0]
+      yy += 1
+      dl = Date.daylist(yy)
     else
-      civil(y, m, d, h, min, s, of.to_r/86400, sg)
+      dd -= dl[mm]
+      mm += 1
     end
   end
-
-  private_class_method :new_with_hash
-
-  # Create a new DateTime object by parsing from a String
-  # according to a specified format.
-  #
-  # +str+ is a String holding a date-time representation.
-  # +fmt+ is the format that the date-time is in.  See 
-  # date/format.rb for details on supported formats.
-  #
-  # The default +str+ is '-4712-01-01T00:00:00Z', and the default
-  # +fmt+ is '%FT%T%Z'.  This gives midnight on Julian Day Number day 0.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  #
-  # An ArgumentError will be raised if +str+ cannot be
-  # parsed.
-  def self.strptime(str='-4712-01-01T00:00:00Z', fmt='%FT%T%Z', sg=ITALY)
-    elem = _strptime(str, fmt)
-    new_with_hash(elem, sg)
+  if yy == 1752 && mm == 9 && dd >= 3 && dd <= 19
+    dd += (14 - 3)              # 1752/09/03-19 -> 1752/09/14-30
   end
+  
+  return Date.new(yy, mm, dd)
+end
 
-  # Create a new DateTime object by parsing from a String,
-  # without specifying the format.
-  #
-  # +str+ is a String holding a date-time representation.  
-  # +comp+ specifies whether to interpret 2-digit years
-  # as 19XX (>= 69) or 20XX (< 69); the default is not to.
-  # The method will attempt to parse a date-time from the String
-  # using various heuristics; see #_parse in date/format.rb
-  # for more details.  If parsing fails, an ArgumentError
-  # will be raised.
-  #
-  # The default +str+ is '-4712-01-01T00:00:00Z'; this is Julian
-  # Day Number day 0.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.parse(str='-4712-01-01T00:00:00Z', comp=false, sg=ITALY)
-    elem = _parse(str, comp)
-    new_with_hash(elem, sg)
-  end
+def Date.period!(y, m, d)
+  p = d
+  dl = Date.daylist(y)
+  for mm in 1..(m - 1)
+    p += dl[mm]
+  end
+  p += (y - 1) * 365 + ((y - 1) / 4.0).to_i
+  if y > 1752
+    p -= ((y - 1) / 100.0).to_i
+    p += ((y - 1) / 400.0).to_i
+    p += 2
+  elsif y == 1752 && m == 9 && d >= 14 && d <= 30
+    p -= (14 - 3)
+  end
+  return p
+end
 
-  class << self; undef_method :today end
+def Date.leapyear(yy)
+  return ((Date.jan1!(yy + 1) + 7 - Date.jan1!(yy)) % 7)
+end
 
-  # Create a new DateTime object representing the current time.
-  #
-  # +sg+ specifies the Day of Calendar Reform.
-  def self.now(sg=ITALY)
-    i = Time.now
-    a = i.to_a[0..5].reverse
-    jd = civil_to_jd(*(a[0,3] << sg))
-    fr = time_to_day_fraction(*(a[3,3])) + i.usec.to_r/86400000000
-    d = Time.gm(*i.to_a).to_i - i.to_i
-    d += d / d.abs if d.nonzero?
-    of = (d / 60).to_r/1440
-    new0(jd_to_ajd(jd, fr, of), of, sg)
+def Date.daylist(yy)
+  case (Date.leapyear(yy))
+  when 1 # non-leapyear
+    return [365, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+  when 2 # leapyear
+    return [366, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+  else   # 1752
+    return [355, 31, 29, 31, 30, 31, 30, 31, 31, 19, 31, 30, 31]
   end
-
-  public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset
-
 end
 
-class Date
-
-  [ %w(exist1?	valid_jd?),
-    %w(exist2?	valid_ordinal?),
-    %w(exist3?	valid_date?),
-    %w(exist?	valid_date?),
-    %w(existw?	valid_commercial?),
-    %w(new1	jd),
-    %w(new2	ordinal),
-    %w(new3	new),
-    %w(neww	commercial)
-  ].each do |old, new|
-    module_eval <<-"end;"
-      def self.#{old}(*args, &block)
-	if $VERBOSE
-	  warn("\#{caller.shift.sub(/:in .*/, '')}: " \
-	       "warning: \#{self}::#{old} is deprecated; " \
-	       "use \#{self}::#{new}")
-	end
-	#{new}(*args, &block)
-      end
-    end;
+def Date.jan1!(y)
+  d = 4 + y + (y + 3) / 4
+  if y > 1800
+    d -= (y - 1701) / 100
+    d += (y - 1601) / 400
   end
-
-  [ %w(sg	start),
-    %w(newsg	new_start),
-    %w(of	offset),
-    %w(newof	new_offset)
-  ].each do |old, new|
-    module_eval <<-"end;"
-      def #{old}(*args, &block)
-	if $VERBOSE
-	  warn("\#{caller.shift.sub(/:in .*/, '')}: " \
-	       "warning: \#{self.class}\##{old} is deprecated; " \
-	       "use \#{self.class}\##{new}")
-	end
-	#{new}(*args, &block)
-      end
-    end;
+  if y > 1752
+    d += 3
   end
-
-  private :of, :newof
-
-end
-
-class DateTime < Date
-
-  public :of, :newof
-
+  return (d % 7)
 end
diff --git a/lib/date/format.rb b/lib/date/format.rb
deleted file mode 100644
index f00f60ab47..0000000000
--- a/lib/date/format.rb
+++ /dev/null
@@ -1,535 +0,0 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2003
-# $Id: format.rb,v 2.9 2003-04-19 19:19:35+09 tadf Exp $
-
-class Date
-
-  MONTHS = {
-    'january'  => 1, 'february' => 2, 'march'    => 3, 'april'    => 4,
-    'may'      => 5, 'june'     => 6, 'july'     => 7, 'august'   => 8,
-    'september'=> 9, 'october'  =>10, 'november' =>11, 'december' =>12
-  }
-
-  DAYS = {
-    'sunday'   => 0, 'monday'   => 1, 'tuesday'  => 2, 'wednesday'=> 3,
-    'thursday' => 4, 'friday'   => 5, 'saturday' => 6
-  }
-
-  ABBR_MONTHS = {
-    'jan'      => 1, 'feb'      => 2, 'mar'      => 3, 'apr'      => 4,
-    'may'      => 5, 'jun'      => 6, 'jul'      => 7, 'aug'      => 8,
-    'sep'      => 9, 'oct'      =>10, 'nov'      =>11, 'dec'      =>12
-  }
-
-  ABBR_DAYS = {
-    'sun'      => 0, 'mon'      => 1, 'tue'      => 2, 'wed'      => 3,
-    'thu'      => 4, 'fri'      => 5, 'sat'      => 6
-  }
-
-  ZONES = {
-    'ut'  =>  0*3600, 'gmt' =>  0*3600, 'est' => -5*3600, 'edt' => -4*3600,
-    'cst' => -6*3600, 'cdt' => -5*3600, 'mst' => -7*3600, 'mdt' => -6*3600,
-    'pst' => -8*3600, 'pdt' => -7*3600,
-    'a'   =>  1*3600, 'b'   =>  2*3600, 'c'   =>  3*3600, 'd'   =>  4*3600,
-    'e'   =>  5*3600, 'f'   =>  6*3600, 'g'   =>  7*3600, 'h'   =>  8*3600,
-    'i'   =>  9*3600, 'k'   => 10*3600, 'l'   => 11*3600, 'm'   => 12*3600,
-    'n'   => -1*3600, 'o'   => -2*3600, 'p'   => -3*3600, 'q'   => -4*3600,
-    'r'   => -5*3600, 's'   => -6*3600, 't'   => -7*3600, 'u'   => -8*3600,
-    'v'   => -9*3600, 'w'   =>-10*3600, 'x'   =>-11*3600, 'y'   =>-12*3600,
-    'z'   =>  0*3600,
-    'utc' =>  0*3600, 'wet' =>  0*3600, 'bst' =>  1*3600, 'wat' => -1*3600,
-    'at'  => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600,
-    'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600,
-    'ahst'=>-10*3600, 'nt'  =>-11*3600, 'idlw'=>-12*3600, 'cet' =>  1*3600,
-    'met' =>  1*3600, 'mewt'=>  1*3600, 'mest'=>  2*3600, 'mesz'=>  2*3600,
-    'swt' =>  1*3600, 'sst' =>  2*3600, 'fwt' =>  1*3600, 'fst' =>  2*3600,
-    'eet' =>  2*3600, 'bt'  =>  3*3600, 'zp4' =>  4*3600, 'zp5' =>  5*3600,
-    'zp6' =>  6*3600, 'wast'=>  7*3600, 'wadt'=>  8*3600, 'cct' =>  8*3600,
-    'jst' =>  9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600,
-    'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*3600
-  }
-
-  def self.__strptime(str, fmt, elem)
-    fmt.scan(/%[EO]?.|./o) do |c|
-      cc = c.sub(/\A%[EO]?(.)\Z/o, '%\\1')
-      case cc
-      when /\A\s/o
-	str.sub!(/\A[\s\v]+/o, '')
-      when '%A', '%a'
-	return unless str.sub!(/\A([a-z]+)\b/io, '')
-	val = DAYS[$1.downcase] || ABBR_DAYS[$1.downcase]
-	return unless val
-	elem[:wday] = val
-      when '%B', '%b', '%h'
-	return unless str.sub!(/\A([a-z]+)\b/io, '')
-	val = MONTHS[$1.downcase] || ABBR_MONTHS[$1.downcase]
-	return unless val
-	elem[:mon] = val
-      when '%C'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	elem[:cent] = val
-      when '%c'
-	return unless __strptime(str, '%a %b %e %H:%M:%S %Y', elem)
-      when '%D'
-	return unless __strptime(str, '%m/%d/%y', elem)
-      when '%d', '%e'
-	return unless str.sub!(/\A ?(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..31) === val
-	elem[:mday] = val
-      when '%F'
-	return unless __strptime(str, '%Y-%m-%d', elem)
-      when '%G'
-	return unless str.sub!(/\A([-+]?\d+)/o, '')
-	val = $1.to_i
-	elem[:cwyear] = val
-      when '%g'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..99) === val
-	elem[:cwyear] = val
-	elem[:cent] ||= if val >= 69 then 19 else 20 end
-      when '%H', '%k'
-	return unless str.sub!(/\A ?(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..24) === val
-	elem[:hour] = val
-      when '%I', '%l'
-	return unless str.sub!(/\A ?(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..12) === val
-	elem[:hour] = val
-      when '%j'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..366) === val
-	elem[:yday] = val
-      when '%M'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..59) === val
-	elem[:min] = val
-      when '%m'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..12) === val
-	elem[:mon] = val
-      when '%n'
-	return unless __strptime(str, ' ', elem)
-      when '%p', '%P'
-	return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/io, '')
-	elem[:merid] = if $1.downcase == 'a' then 0 else 12 end
-      when '%R'
-	return unless __strptime(str, '%H:%M', elem)
-      when '%r'
-	return unless __strptime(str, '%I:%M:%S %p', elem)
-      when '%S'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..60) === val
-	elem[:sec] = val
-      when '%s'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	elem[:seconds] = val
-      when '%T'
-	return unless __strptime(str, '%H:%M:%S', elem)
-      when '%t'
-	return unless __strptime(str, ' ', elem)
-      when '%U', '%W'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..53) === val
-	elem[if c == '%U' then :wnum0 else :wnum1 end] = val
-      when '%u'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..7) === val
-	elem[:cwday] = val
-      when '%V'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..53) === val
-	elem[:cweek] = val
-      when '%v'
-	return unless __strptime(str, '%e-%b-%Y', elem)
-      when '%w'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..6) === val
-	elem[:wday] = val
-      when '%X'
-	return unless __strptime(str, '%H:%M:%S', elem)
-      when '%x'
-	return unless __strptime(str, '%m/%d/%y', elem)
-      when '%Y'
-	return unless str.sub!(/\A([-+]?\d+)/o, '')
-	val = $1.to_i
-	elem[:year] = val
-      when '%y'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..99) === val
-	elem[:year] = val
-	elem[:cent] ||= if val >= 69 then 19 else 20 end
-      when '%Z', '%z'
-	return unless str.sub!(/\A([-+:a-z0-9]+(?:\s+dst\b)?)/io, '')
-	val = $1
-	elem[:zone] = val
-	offset = zone_to_diff(val)
-	elem[:offset] = offset
-      when '%%'
-	return unless str.sub!(/\A%/o, '')
-      when '%+'
-	return unless __strptime(str, '%a %b %e %H:%M:%S %Z %Y', elem)
-      when '%1'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	elem[:jd] = val
-      when '%2'
-	return unless __strptime(str, '%Y-%j', elem)
-      when '%3'
-	return unless __strptime(str, '%F', elem)
-      else
-	return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '')
-      end
-    end
-
-    if cent = elem.delete(:cent)
-      if elem[:cwyear]
-	elem[:cwyear] += cent * 100
-      end
-      if elem[:year]
-	elem[:year] += cent * 100
-      end
-    end
-
-    if merid = elem.delete(:merid)
-      if elem[:hour]
-	elem[:hour] %= 12
-	elem[:hour] += merid
-      end
-    end
-
-    str
-  end
-
-  private_class_method :__strptime
-
-  def self._strptime(str, fmt='%F')
-    elem = {}
-    elem if __strptime(str.dup, fmt, elem)
-  end
-
-  PARSE_MONTHPAT = ABBR_MONTHS.keys.join('|')
-  PARSE_DAYPAT   = ABBR_DAYS.  keys.join('|')
-
-  def self._parse(str, comp=false)
-    str = str.dup
-
-    str.gsub!(/[^-+.\/:0-9a-z]+/ino, ' ')
-
-    # day
-    if str.sub!(/(#{PARSE_DAYPAT})\S*/ino, ' ')
-      wday = ABBR_DAYS[$1.downcase]
-    end
-
-    # time
-    if str.sub!(
-		/(\d+):(\d+)(?::(\d+))?
-		 (?:
-		   \s*
-		   ([ap])(?:m\b|\.m\.)
-		 )?
-		 (?:
-		   \s*
-		   (
-		     [a-z]+(?:\s+dst)?\b
-		   |
-		     [-+]\d+(?::?\d+)
-		   )
-		 )?
-		/inox,
-		' ')
-      hour = $1.to_i
-      min = $2.to_i
-      sec = $3.to_i if $3
-
-      if $4
-	hour %= 12
-	if $4.downcase == 'p'
-	  hour += 12
-	end
-      end
-
-      zone = $5
-    end
-
-    # eu
-    if str.sub!(
-		/(\d+)\S*
-		 \s+
-		 (#{PARSE_MONTHPAT})\S*
-		 (?:
-		   \s+
-		   (-?\d+)
-		 )?
-		/inox,
-		' ')
-      mday = $1.to_i
-      mon = ABBR_MONTHS[$2.downcase]
-
-      if $3
-	year = $3.to_i
-	if $3.size > 2
-	  comp = false
-	end
-      end
-
-    # us
-    elsif str.sub!(
-		   /(#{PARSE_MONTHPAT})\S*
-		    \s+
-		    (\d+)\S*
-		    (?:
-		      \s+
-		      (-?\d+)
-		    )?
-		   /inox,
-		   ' ')
-      mon = ABBR_MONTHS[$1.downcase]
-      mday = $2.to_i
-
-      if $3
-	year = $3.to_i
-	if $3.size > 2
-	  comp = false
-	end
-      end
-
-    # iso
-    elsif str.sub!(/([-+]?\d+)-(\d+)-(-?\d+)/no, ' ')
-      year = $1.to_i
-      mon = $2.to_i
-      mday = $3.to_i
-
-      if $1.size > 2
-	comp = false
-      elsif $3.size > 2
-	comp = false
-	mday, mon, year = year, mon, mday
-      end
-
-    # jis
-    elsif str.sub!(/([MTSH])(\d+)\.(\d+)\.(\d+)/ino, ' ')
-      e = { 'm'=>1867,
-	    't'=>1911,
-	    's'=>1925,
-	    'h'=>1988
-	  }[$1.downcase]
-      year = $2.to_i + e
-      mon = $3.to_i
-      mday = $4.to_i
-
-    # vms
-    elsif str.sub!(/(-?\d+)-(#{PARSE_MONTHPAT})[^-]*-(-?\d+)/ino, ' ')
-      mday = $1.to_i
-      mon = ABBR_MONTHS[$2.downcase]
-      year = $3.to_i
-
-      if $1.size > 2
-	comp = false
-	year, mon, mday = mday, mon, year
-      elsif $3.size > 2
-	comp = false
-      end
-
-    # sla
-    elsif str.sub!(%r|(-?\d+)/(\d+)(?:/(-?\d+))?|no, ' ')
-      mon = $1.to_i
-      mday = $2.to_i
-
-      if $3
-	year = $3.to_i
-	if $3.size > 2
-	  comp = false
-	end
-      end
-
-      if $3 && $1.size > 2
-	comp = false
-	year, mon, mday = mon, mday, year
-      end
-
-    # ddd
-    elsif str.sub!(
-		   /([-+]?)(\d{4,14})
-		    (?:
-		      \s*
-		      T?
-		      \s*
-		      (\d{2,6})
-		    )?
-		    (?:
-		      \s*
-		      (
-			Z
-		      |
-			[-+]\d{2,4}
-		      )
-		      \b
-		    )?
-		   /inox,
-		   ' ')
-      case $2.size
-      when 4
-	mon  = $2[ 0, 2].to_i
-	mday = $2[ 2, 2].to_i
-      when 6
-	year = ($1 + $2[ 0, 2]).to_i
-	mon  = $2[ 2, 2].to_i
-	mday = $2[ 4, 2].to_i
-      when 8, 10, 12, 14
-	year = ($1 + $2[ 0, 4]).to_i
-	mon  = $2[ 4, 2].to_i
-	mday = $2[ 6, 2].to_i
-	hour = $2[ 8, 2].to_i if $2.size >= 10
-	min  = $2[10, 2].to_i if $2.size >= 12
-	sec  = $2[12, 2].to_i if $2.size >= 14
-	comp = false
-      end
-      if $3
-	case $3.size
-	when 2, 4, 6
-	  hour = $3[ 0, 2].to_i
-	  min  = $3[ 2, 2].to_i if $3.size >= 4
-	  sec  = $3[ 4, 2].to_i if $3.size >= 6
-	end
-      end
-      zone = $4
-    end
-
-    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/ino, ' ')
-      if year
-	year = -year + 1
-      end
-    end
-
-    if comp and year
-      if year >= 0 and year <= 99
-	if year >= 69
-	  year += 1900
-	else
-	  year += 2000
-	end
-      end
-    end
-
-    elem = {}
-    elem[:year] = year if year
-    elem[:mon] = mon if mon
-    elem[:mday] = mday if mday
-    elem[:hour] = hour if hour
-    elem[:min] = min if min
-    elem[:sec] = sec if sec
-    elem[:zone] = zone if zone
-    offset = zone_to_diff(zone) if zone
-    elem[:offset] = offset if offset
-    elem[:wday] = wday if wday
-    elem
-  end
-
-  def self.zone_to_diff(str)
-    abb, dst = str.downcase.split(/\s+/o, 2)
-    if ZONES.include?(abb)
-      offset  = ZONES[abb]
-      offset += 3600 if dst
-    elsif /\A([-+])(\d{2}):?(\d{2})?\Z/no =~ str
-      offset = $2.to_i * 3600 + $3.to_i * 60
-      offset *= -1 if $1 == '-'
-    end
-    offset
-  end
-
-  def strftime(fmt='%F')
-    o = ''
-    fmt.scan(/%[EO]?.|./o) do |c|
-      cc = c.sub(/^%[EO]?(.)$/o, '%\\1')
-      case cc
-      when '%A'; o << DAYNAMES[wday]
-      when '%a'; o << ABBR_DAYNAMES[wday]
-      when '%B'; o << MONTHNAMES[mon]
-      when '%b'; o << ABBR_MONTHNAMES[mon]
-      when '%C'; o << '%02d' % (year / 100.0).floor		# P2,ID
-      when '%c'; o << strftime('%a %b %e %H:%M:%S %Y')
-      when '%D'; o << strftime('%m/%d/%y')			# P2,ID
-      when '%d'; o << '%02d' % mday
-      when '%e'; o <<  '%2d' % mday
-      when '%F'; o << strftime('%Y-%m-%d')			# ID
-      when '%G'; o << '%.4d' %  cwyear				# ID
-      when '%g'; o << '%02d' % (cwyear % 100)			# ID
-      when '%H'; o << '%02d' %   hour
-      when '%h'; o << strftime('%b')				# P2,ID
-      when '%I'; o << '%02d' % ((hour % 12).nonzero? or 12)
-      when '%j'; o << '%03d' % yday
-      when '%k'; o <<  '%2d' %   hour				# AR,TZ,GL
-      when '%l'; o <<  '%2d' % ((hour % 12).nonzero? or 12)	# AR,TZ,GL
-      when '%M'; o << '%02d' % min
-      when '%m'; o << '%02d' % mon
-      when '%n'; o << "\n"					# P2,ID
-      when '%P'; o << if hour < 12 then 'am' else 'pm' end	# GL
-      when '%p'; o << if hour < 12 then 'AM' else 'PM' end
-      when '%R'; o << strftime('%H:%M')				# ID
-      when '%r'; o << strftime('%I:%M:%S %p')			# P2,ID
-      when '%S'; o << '%02d' % sec
-      when '%s'							# TZ,GL
-	d = ajd - self.class.jd_to_ajd(self.class.civil_to_jd(1970,1,1), 0)
-	s = (d * 86400).to_i
-	o << '%d' % s
-      when '%T'; o << strftime('%H:%M:%S')			# P2,ID
-      when '%t'; o << "\t"					# P2,ID
-      when '%U', '%W'
-	a = self.class.civil_to_jd(year, 1, 1, ns?) + 6
-	k = if c == '%U' then 0 else 1 end
-	w = (jd - (a - ((a - k) + 1) % 7) + 7) / 7
-	o << '%02d' % w
-      when '%u'; o <<   '%d' % cwday				# P2,ID
-      when '%V'; o << '%02d' % cweek				# P2,ID
-      when '%v'; o << strftime('%e-%b-%Y')			# AR,TZ
-      when '%w'; o <<   '%d' % wday
-      when '%X'; o << strftime('%H:%M:%S')
-      when '%x'; o << strftime('%m/%d/%y')
-      when '%Y'; o << '%.4d' %  year
-      when '%y'; o << '%02d' % (year % 100)
-      when '%Z'; o << zone
-      when '%z'; o << zone					# ID
-      when '%%'; o << '%'
-      when '%+'; o << strftime('%a %b %e %H:%M:%S %Z %Y')	# TZ
-      when '%1'; o <<   '%d' % jd
-      when '%2'; o << strftime('%Y-%j')
-      when '%3'; o << strftime('%Y-%m-%d')
-      else;      o << c
-      end
-    end
-    o
-  end
-
-# alias_method :format, :strftime
-
-  def asctime() strftime('%c') end
-
-  alias_method :ctime, :asctime
-
-end
-
-class DateTime < Date
-
-  def self._strptime(str, fmt='%FT%T%Z')
-    super(str, fmt)
-  end
-
-  def strftime(fmt='%FT%T%Z')
-    super(fmt)
-  end
-
-end
diff --git a/lib/date2.rb b/lib/date2.rb
index f7da78f650..a1045a982e 100644
--- a/lib/date2.rb
+++ b/lib/date2.rb
@@ -1,5 +1,255 @@
-# date2 was overridden by date.
-# To be precise, date was overridden by date2,
-# and date2 was renamed to date.
+# date.rb: Written by Tadayoshi Funaba 1998, 1999
+# $Id: date.rb,v 1.7 1999/03/06 02:05:59 tadf Exp $
 
-require 'date'
+class Date
+
+  include Comparable
+
+  MONTHNAMES = [ nil, 'January', 'February', 'March',
+    'April', 'May', 'June', 'July', 'August',
+    'September', 'October', 'November', 'December' ]
+
+  DAYNAMES = [ 'Sunday', 'Monday', 'Tuesday',
+    'Wednesday', 'Thursday', 'Friday', 'Saturday' ]
+
+  ITALY   = 2299161 # Oct 15, 1582
+  ENGLAND = 2361222 # Sept 14, 1752
+
+  class << self
+
+    def civil_to_jd(y, m, d, gs=true)
+      if m <= 2
+	y -= 1
+	m += 12
+      end
+      a = (y / 100).to_i
+      b = 2 - a + (a / 4).to_i
+      jd = (365.25 * (y + 4716)).to_i +
+	(30.6001 * (m + 1)).to_i +
+	d + b - 1524
+      unless
+	(if gs.kind_of? Numeric then jd >= gs else gs end)
+	jd -= b
+      end
+      jd
+    end
+
+    def jd_to_civil(jd, gs=true)
+      unless
+	(if gs.kind_of? Numeric then jd >= gs else gs end)
+	a = jd
+      else
+	x = ((jd - 1867216.25) / 36524.25).to_i
+	a = jd + 1 + x - (x / 4).to_i
+      end
+      b = a + 1524
+      c = ((b - 122.1) / 365.25).to_i
+      d = (365.25 * c).to_i
+      e = ((b - d) / 30.6001).to_i
+      dom = b - d - (30.6001 * e).to_i
+      if e <= 13
+	m = e - 1
+	y = c - 4716
+      else
+	m = e - 13
+	y = c - 4715
+      end
+      return y, m, dom
+    end
+
+    def ordinal_to_jd(y, d, gs=true)
+      civil_to_jd(y, 1, d, gs)
+    end
+
+    def jd_to_ordinal(jd, gs=true)
+      y, *_ = jd_to_civil(jd, gs)
+      ns = if gs.kind_of? Numeric then jd >= gs else gs end
+      pl = civil_to_jd(y - 1, 12, 31, ns)
+      doy = jd - pl
+      return y, doy
+    end
+
+    def mjd_to_jd(mjd)
+      mjd + 2400000.5
+    end
+
+    def jd_to_mjd(jd)
+      jd - 2400000.5
+    end
+
+    def tjd_to_jd(tjd)
+      tjd + 2440000.5
+    end
+
+    def jd_to_tjd(jd)
+      jd - 2440000.5
+    end
+
+    def julian_leap? (y)
+      y % 4 == 0
+    end
+
+    def gregorian_leap? (y)
+      y % 4 == 0 and y % 100 != 0 or y % 400 == 0
+    end
+
+    alias_method :leap?, :gregorian_leap?
+
+    def exist3? (y, m, d, gs=true)
+      jd = civil_to_jd(y, m, d, gs)
+      if [y, m, d] == jd_to_civil(jd, gs)
+	jd
+      end
+    end
+
+    alias_method :exist?, :exist3?
+
+    def new3(y=-4712, m=1, d=1, gs=ITALY)
+      unless jd = exist3?(y, m, d, gs)
+	fail ArgumentError, 'invalid date'
+      end
+      new(jd, gs)
+    end
+
+    def exist2? (y, d, gs=true)
+      jd = ordinal_to_jd(y, d, gs)
+      if [y, d] == jd_to_ordinal(jd, gs)
+	jd
+      end
+    end
+
+    def new2(y=-4712, d=1, gs=ITALY)
+      unless jd = exist2?(y, d, gs)
+	fail ArgumentError, 'invalid date'
+      end
+      new(jd, gs)
+    end
+
+    def today(gs=ITALY)
+      new(civil_to_jd(*(Time.now.to_a[3..5].reverse << gs)), gs)
+    end
+
+  end
+
+  def initialize(jd=0, gs=ITALY)
+    @jd, @gs = jd, gs
+  end
+
+  def jd
+    @jd
+  end
+
+  def mjd
+    def self.mjd() @mjd end
+    @mjd = Date.jd_to_mjd(@jd)
+  end
+
+  def tjd
+    def self.tjd() @tjd end
+    @tjd = Date.jd_to_tjd(@jd)
+  end
+
+  def civil
+    def self.year() @year end
+    def self.mon() @mon end
+    def self.mday() @mday end
+    @year, @mon, @mday = Date.jd_to_civil(@jd, @gs)
+  end
+
+  private :civil
+
+  def year
+    civil
+    @year
+  end
+
+  def yday
+    def self.yday() @yday end
+    _, @yday = Date.jd_to_ordinal(@jd, @gs)
+    @yday
+  end
+
+  def mon
+    civil
+    @mon
+  end
+
+  def mday
+    civil
+    @mday
+  end
+
+  def wday
+    def self.wday() @wday end
+    @wday = (@jd + 1) % 7
+  end
+
+  def leap?
+    def self.leap?() @leap_p end
+    ns = if @gs.kind_of? Numeric then @jd >= @gs else @gs end
+    jd = Date.civil_to_jd(year, 2, 28, ns)
+    @leap_p = Date.jd_to_civil(jd + 1, ns)[1] == 2
+  end
+
+  def + (other)
+    case other
+    when Numeric; return Date.new(@jd + other, @gs)
+    end
+    fail TypeError, 'expected numeric'
+  end
+
+  def - (other)
+    case other
+    when Numeric; return Date.new(@jd - other, @gs)
+    when Date;    return @jd - other.jd
+    end
+    fail TypeError, 'expected numeric or date'
+  end
+
+  def <=> (other)
+    case other
+    when Numeric; return @jd <=> other
+    when Date;    return @jd <=> other.jd
+    end
+    fail TypeError, 'expected numeric or date'
+  end
+
+  def downto(min)
+    @jd.downto(min.jd) do |jd|
+      yield Date.new(jd, @gs)
+    end
+  end
+
+  def upto(max)
+    @jd.upto(max.jd) do |jd|
+      yield Date.new(jd, @gs)
+    end
+  end
+
+  def step(max, step)
+    @jd.step(max.jd, step) do |jd|
+      yield Date.new(jd, @gs)
+    end
+  end
+
+  def eql? (other)
+    self == other
+  end
+
+  def hash
+    @jd
+  end
+
+  def to_s
+    format('%04d-%02d-%02d', year, mon, mday)
+  end
+
+  def _dump(limit)
+    Marshal.dump([@jd, @gs], -1)
+  end
+
+  def Date._load(str)
+    Date.new(*Marshal.load(str))
+  end
+
+end
diff --git a/lib/debug.rb b/lib/debug.rb
index b15f4d4b59..45ec05ff01 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -1,940 +1,332 @@
-# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-# Copyright (C) 2000  Information-technology Promotion Agency, Japan
-# Copyright (C) 2000-2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-if $SAFE > 0
-  STDERR.print "-r debug.rb is not available in safe mode\n"
-  exit 1
-end
-
-require 'tracer'
-require 'pp'
-
-class Tracer
-  def Tracer.trace_func(*vars)
-    Single.trace_func(*vars)
-  end
-end
-
-SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
-
 class DEBUGGER__
-class Mutex
-  def initialize
-    @locker = nil
-    @waiting = []
-    @locked = false;
-  end
-
-  def locked?
-    @locked
-  end
-
-  def lock
-    return if Thread.critical
-    return if @locker == Thread.current
-    while (Thread.critical = true; @locked)
-      @waiting.push Thread.current
-      Thread.stop
-    end
-    @locked = true
-    @locker = Thread.current
-    Thread.critical = false
-    self
-  end
-
-  def unlock
-    return if Thread.critical
-    return unless @locked
-    unless @locker == Thread.current
-      raise RuntimeError, "unlocked by other"
-    end
-    Thread.critical = true
-    t = @waiting.shift
-    @locked = false
-    @locker = nil
-    Thread.critical = false
-    t.run if t
-    self
-  end
-end
-MUTEX = Mutex.new
-
-class Context
-  DEBUG_LAST_CMD = []
-
-  begin
-    require 'readline'
-    def readline(prompt, hist)
-      Readline::readline(prompt, hist)
-    end
-  rescue LoadError
-    def readline(prompt, hist)
-      STDOUT.print prompt
-      STDOUT.flush
-      line = STDIN.gets
-      exit unless line
-      line.chomp!
-      line
-    end
-    USE_READLINE = false
-  end
-
+  trap("INT") {  DEBUGGER__::CONTEXT.interrupt }
+  $DEBUG = true
   def initialize
-    if Thread.current == Thread.main
-      @stop_next = 1
-    else
-      @stop_next = 0
-    end
+    @break_points = []
+    @stop_next = 1
+    @frames = [nil]
     @last_file = nil
-    @file = nil
-    @line = nil
-    @no_step = nil
-    @frames = []
-    @finish_pos = 0
-    @trace = false
-    @catch = "StandardError"
-    @suspend_next = false
-  end
-
-  def stop_next(n=1)
-    @stop_next = n
-  end
-
-  def set_suspend
-    @suspend_next = true
+    @last = [nil, nil]
+    @scripts = {}
   end
 
-  def clear_suspend
-    @suspend_next = false
-  end
-
-  def suspend_all
-    DEBUGGER__.suspend
-  end
-
-  def resume_all
-    DEBUGGER__.resume
-  end
-
-  def check_suspend
-    return if Thread.critical
-    while (Thread.critical = true; @suspend_next)
-      DEBUGGER__.waiting.push Thread.current
-      @suspend_next = false
-      Thread.stop
-    end
-    Thread.critical = false
-  end
-
-  def trace?
-    @trace
-  end
-
-  def set_trace(arg)
-    @trace = arg
-  end
-
-  def stdout
-    DEBUGGER__.stdout
-  end
-
-  def break_points
-    DEBUGGER__.break_points
-  end
-
-  def display
-    DEBUGGER__.display
-  end
-
-  def context(th)
-    DEBUGGER__.context(th)
-  end
-
-  def set_trace_all(arg)
-    DEBUGGER__.set_trace(arg)
-  end
+  DEBUG_LAST_CMD = []
 
-  def set_last_thread(th)
-    DEBUGGER__.set_last_thread(th)
+  def interrupt
+    @stop_next = 1
   end
 
   def debug_eval(str, binding)
     begin
       val = eval(str, binding)
-    rescue StandardError, ScriptError => e
-      at = eval("caller(1)", binding)
-      stdout.printf "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
+      val
+    rescue
+      at = caller(0)
+      STDOUT.printf "%s:%s\n", at.shift, $!
       for i in at
-	stdout.printf "\tfrom %s\n", i
-      end
-      throw :debug_error
-    end
-  end
-
-  def debug_silent_eval(str, binding)
-    begin
-      eval(str, binding)
-    rescue StandardError, ScriptError
-      nil
-    end
-  end
-
-  def var_list(ary, binding)
-    ary.sort!
-    for v in ary
-      stdout.printf "  %s => %s\n", v, eval(v, binding).inspect
-    end
-  end
-
-  def debug_variable_info(input, binding)
-    case input
-    when /^\s*g(?:lobal)?$/
-      var_list(global_variables, binding)
-
-    when /^\s*l(?:ocal)?$/
-      var_list(eval("local_variables", binding), binding)
-
-    when /^\s*i(?:nstance)?\s+/
-      obj = debug_eval($', binding)
-      var_list(obj.instance_variables, obj.instance_eval{binding()})
-
-    when /^\s*c(?:onst(?:ant)?)?\s+/
-      obj = debug_eval($', binding)
-      unless obj.kind_of? Module
-	stdout.print "Should be Class/Module: ", $', "\n"
-      else
-	var_list(obj.constants, obj.module_eval{binding()})
-      end
-    end
-  end
-
-  def debug_method_info(input, binding)
-    case input
-    when /^i(:?nstance)?\s+/
-      obj = debug_eval($', binding)
-
-      len = 0
-      for v in obj.methods.sort
-	len += v.size + 1
-	if len > 70
-	  len = v.size + 1
-	  stdout.print "\n"
-	end
-	stdout.print v, " "
-      end
-      stdout.print "\n"
-
-    else
-      obj = debug_eval(input, binding)
-      unless obj.kind_of? Module
-	stdout.print "Should be Class/Module: ", input, "\n"
-      else
-	len = 0
-	for v in obj.instance_methods(false).sort
-	  len += v.size + 1
-	  if len > 70
-	    len = v.size + 1
-	    stdout.print "\n"
-	  end
-	  stdout.print v, " "
-	end
-	stdout.print "\n"
+	break if i =~ /`debug_(eval|command)'$/ #`
+	STDOUT.printf "\tfrom %s\n", i
       end
     end
   end
 
-  def thnum
-    num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
-    unless num
-      DEBUGGER__.make_thread_list
-      num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
-    end
-    num
-  end
-
   def debug_command(file, line, id, binding)
-    MUTEX.lock
-    set_last_thread(Thread.current)
     frame_pos = 0
     binding_file = file
     binding_line = line
-    previous_line = nil
-    if ENV['EMACS']
-      stdout.printf "\032\032%s:%d:\n", binding_file, binding_line
+    previus_line = nil
+    if (ENV['EMACS'] == 't')
+      STDOUT.printf "\032\032%s:%d:\n", binding_file, binding_line
     else
-      stdout.printf "%s:%d:%s", binding_file, binding_line,
+      STDOUT.printf "%s:%d:%s", binding_file, binding_line,
 	line_at(binding_file, binding_line)
     end
-    @frames[0] = [binding, file, line, id]
-    display_expressions(binding)
-    prompt = true
-    while prompt and input = readline("(rdb:%d) "%thnum(), true)
-      catch(:debug_error) do
-	if input == ""
-	  input = DEBUG_LAST_CMD[0]
-	  stdout.print input, "\n"
+    @frames[0] = binding
+    STDOUT.print "(rdb:-) "
+    STDOUT.flush
+    while input = STDIN.gets
+      input.chop!
+      if input == ""
+	input = DEBUG_LAST_CMD[0]
+      else
+	DEBUG_LAST_CMD[0] = input
+      end
+
+      case input
+      when /^b(?:reak)?\s+((?:[^:\n]+:)?.+)/
+	pos = $1
+	if pos.index ":"
+	  file, pos = pos.split(":")
+	end
+	file = File.basename(file)
+	if pos =~ /^\d+$/
+	  pname = pos
+	  pos = Integer(pos)
 	else
-	  DEBUG_LAST_CMD[0] = input
+	  pname = pos = pos.intern.id2name
+	end
+	STDOUT.printf "Set breakpoint %d at %s:%s\n", @break_points.size, file,
+	  pname
+	@break_points.push [file, pos]
+
+      when /^b(?:reak)?$/, /^i(?:nfo) b(?:reak)?$/
+	n = 0
+	for f, p in @break_points
+	  STDOUT.printf "%d %s:%s\n", n, f, p
+	  n += 1
 	end
 
-	case input
-	when /^\s*tr(?:ace)?(?:\s+(on|off))?(?:\s+(all))?$/
-          if defined?( $2 )
-            if $1 == 'on'
-              set_trace_all true
-            else
-              set_trace_all false
-            end
-          elsif defined?( $1 )
-            if $1 == 'on'
-              set_trace true
-            else
-              set_trace false
-            end
-          end
-          if trace?
-            stdout.print "Trace on.\n"
-          else
-            stdout.print "Trace off.\n"
-          end
-
-	when /^\s*b(?:reak)?\s+(?:(.+):)?([^.:]+)$/
-	  pos = $2
-          if $1
-            klass = debug_silent_eval($1, binding)
-            file = $1
-          end
-	  if pos =~ /^\d+$/
-	    pname = pos
-	    pos = pos.to_i
-	  else
-	    pname = pos = pos.intern.id2name
-	  end
-	  break_points.push [true, 0, klass || file, pos]
-	  stdout.printf "Set breakpoint %d at %s:%s\n", break_points.size, klass || file, pname
-
-	when /^\s*b(?:reak)?\s+(.+)[#.]([^.:]+)$/
-	  pos = $2.intern.id2name
-	  klass = debug_eval($1, binding)
-	  break_points.push [true, 0, klass, pos]
-	  stdout.printf "Set breakpoint %d at %s.%s\n", break_points.size, klass, pos
-
-	when /^\s*wat(?:ch)?\s+(.+)$/
-	  exp = $1
-	  break_points.push [true, 1, exp]
-	  stdout.printf "Set watchpoint %d\n", break_points.size, exp
-
-	when /^\s*b(?:reak)?$/
-	  if break_points.find{|b| b[1] == 0}
-	    n = 1
-	    stdout.print "Breakpoints:\n"
-	    for b in break_points
-	      if b[0] and b[1] == 0
-		stdout.printf "  %d %s:%s\n", n, b[2], b[3] 
-	      end
-	      n += 1
-	    end
-	  end
-	  if break_points.find{|b| b[1] == 1}
-	    n = 1
-	    stdout.print "\n"
-	    stdout.print "Watchpoints:\n"
-	    for b in break_points
-	      if b[0] and b[1] == 1
-		stdout.printf "  %d %s\n", n, b[2]
-	      end
-	      n += 1
-	    end
-	  end
-	  if break_points.size == 0
-	    stdout.print "No breakpoints\n"
-	  else
-	    stdout.print "\n"
-	  end
-
-	when /^\s*del(?:ete)?(?:\s+(\d+))?$/
-	  pos = $1
-	  unless pos
-	    input = readline("Clear all breakpoints? (y/n) ", false)
-	    if input == "y"
-	      for b in break_points
-		b[0] = false
-	      end
-	    end
-	  else
-	    pos = pos.to_i
-	    if break_points[pos-1]
-	      break_points[pos-1][0] = false
-	    else
-	      stdout.printf "Breakpoint %d is not defined\n", pos
-	    end
-	  end
-
-	when /^\s*disp(?:lay)?\s+(.+)$/
-	  exp = $1
-	  display.push [true, exp]
-	  stdout.printf "%d: ", display.size
-	  display_expression(exp, binding)
-
-	when /^\s*disp(?:lay)?$/
-	  display_expressions(binding)
-
-	when /^\s*undisp(?:lay)?(?:\s+(\d+))?$/
-	  pos = $1
-	  unless pos
-	    input = readline("Clear all expressions? (y/n) ", false)
-	    if input == "y"
-	      for d in display
-		d[0] = false
-	      end
-	    end
-	  else
-	    pos = pos.to_i
-	    if display[pos-1]
-	      display[pos-1][0] = false
-	    else
-	      stdout.printf "Display expression %d is not defined\n", pos
-	    end
-	  end
-
-	when /^\s*c(?:ont)?$/
-	  prompt = false
-
-	when /^\s*s(?:tep)?(?:\s+(\d+))?$/
-	  if $1
-	    lev = $1.to_i
-	  else
-	    lev = 1
-	  end
-	  @stop_next = lev
-	  prompt = false
-
-	when /^\s*n(?:ext)?(?:\s+(\d+))?$/
-	  if $1
-	    lev = $1.to_i
-	  else
-	    lev = 1
-	  end
-	  @stop_next = lev
-	  @no_step = @frames.size - frame_pos
-	  prompt = false
-
-	when /^\s*w(?:here)?$/, /^\s*f(?:rame)?$/
-	  display_frames(frame_pos)
-
-	when /^\s*l(?:ist)?(?:\s+(.+))?$/
-	  if not $1
-	    b = previous_line ? previous_line + 10 : binding_line - 5
-	    e = b + 9
-	  elsif $1 == '-'
-	    b = previous_line ? previous_line - 10 : binding_line - 5
-	    e = b + 9
-	  else
-	    b, e = $1.split(/[-,]/)
-	    if e
-	      b = b.to_i
-	      e = e.to_i
-	    else
-	      b = b.to_i - 5
-	      e = b + 9
+      when /^del(?:ete)?(?:\s+(\d+))?$/
+	pos = $1
+	unless pos
+	  STDOUT.print "clear all breakpoints? (y/n) "
+	  STDOUT.flush
+	  input = STDIN.gets.chop!
+	  if input == "y"
+	    for n in @break_points.indexes
+	      @break_points[n] = nil
 	    end
 	  end
-	  previous_line = b
-	  display_list(b, e, binding_file, binding_line)
-
-	when /^\s*up(?:\s+(\d+))?$/
-	  previous_line = nil
-	  if $1
-	    lev = $1.to_i
+	else
+	  pos = Integer(pos)
+	  if @break_points[pos]
+	    bp = @break_points[pos]
+	    STDOUT.printf "Clear breakpoint %d at %s:%s\n", pos, bp[0], bp[1]
+	    @break_points[pos] = nil
 	  else
-	    lev = 1
+	    STDOUT.printf "Breakpoint %d is not defined\n", pos
 	  end
-	  frame_pos += lev
-	  if frame_pos >= @frames.size
-	    frame_pos = @frames.size - 1
-	    stdout.print "At toplevel\n"
-	  end
-	  binding, binding_file, binding_line = @frames[frame_pos]
-	  stdout.print format_frame(frame_pos)
+	end
 
-	when /^\s*down(?:\s+(\d+))?$/
-	  previous_line = nil
-	  if $1
-	    lev = $1.to_i
-	  else
-	    lev = 1
-	  end
-	  frame_pos -= lev
-	  if frame_pos < 0
-	    frame_pos = 0
-	    stdout.print "At stack bottom\n"
-	  end
-	  binding, binding_file, binding_line = @frames[frame_pos]
-	  stdout.print format_frame(frame_pos)
+      when /^c(?:ont)?$/
+	return
 
-	when /^\s*fin(?:ish)?$/
-	  if frame_pos == @frames.size
-	    stdout.print "\"finish\" not meaningful in the outermost frame.\n"
-	  else
-	    @finish_pos = @frames.size - frame_pos
-	    frame_pos = 0
-	    prompt = false
-	  end
+      when /^s(?:tep)?\s*(\d+)?$/
+	if $1
+	  lev = Integer($1)
+	else
+	  lev = 1
+	end
+	@stop_next = lev
+	return
 
-	when /^\s*cat(?:ch)?(?:\s+(.+))?$/
-	  if $1
-	    excn = $1
-	    if excn == 'off'
-	      @catch = nil
-	      stdout.print "Clear catchpoint.\n"
-	    else
-	      @catch = excn
-	      stdout.printf "Set catchpoint %s.\n", @catch
-	    end
+      when /^n(?:ext)?\s*(\d+)?$/
+	if $1
+	  lev = Integer($1)
+	else
+	  lev = 1
+	end
+	@stop_next = lev
+	@no_step = @frames.size - frame_pos
+	return
+
+      when /^w(?:here)?$/, /^f(?:rame)?$/
+	at = caller(0)
+	0.upto( @frames.size - 1 ) do |n|
+	  if ( frame_pos == n )
+	    STDOUT.printf "--> #%d  %s\n", n, at[-(@frames.size - n)]
 	  else
-	    if @catch
-	      stdout.printf "Catchpoint %s.\n", @catch
-	    else
-	      stdout.print "No catchpoint.\n"
-	    end
+	    STDOUT.printf "    #%d  %s\n", n, at[-(@frames.size - n)]
 	  end
-
-	when /^\s*q(?:uit)?$/
-	  input = readline("Really quit? (y/n) ", false)
-	  if input == "y"
-	    exit!	# exit -> exit!: No graceful way to stop threads...
-	  end
-
-	when /^\s*v(?:ar)?\s+$/
-	  debug_variable_info($', binding)
-
-	when /^\s*m(?:ethod)?\s+$/
-	  debug_method_info($', binding)
-
-	when /^\s*th(?:read)?\s+$/
-	  if DEBUGGER__.debug_thread_info($', binding) == :cont
-	    prompt = false
-	  end
-
-	when /^\s*pp\s+$/
-	  PP.pp(debug_eval($', binding), stdout)
-
-	when /^\s*p\s+$/
-	  stdout.printf "%s\n", debug_eval($', binding).inspect
-
-	when /^\s*h(?:elp)?$/
-	  debug_print_help()
-
-	else
-	  v = debug_eval(input, binding)
-	  stdout.printf "%s\n", v.inspect
 	end
-      end
-    end
-    MUTEX.unlock
-    resume_all
-  end
 
-  def debug_print_help
-    stdout.print <<EOHELP
-Debugger help v.-0.002b
-Commands
-  b[reak] [file|class:]<line|method>
-  b[reak] [class.]<line|method>
-                             set breakpoint to some position
-  wat[ch] <expression>       set watchpoint to some expression
-  cat[ch] <an Exception>     set catchpoint to an exception
-  b[reak]                    list breakpoints
-  cat[ch]                    show catchpoint
-  del[ete][ nnn]             delete some or all breakpoints
-  disp[lay] <expression>     add expression into display expression list
-  undisp[lay][ nnn]          delete one particular or all display expressions
-  c[ont]                     run until program ends or hit breakpoint
-  s[tep][ nnn]               step (into methods) one line or till line nnn
-  n[ext][ nnn]               go over one line or till line nnn
-  w[here]                    display frames
-  f[rame]                    alias for where
-  l[ist][ (-|nn-mm)]         list program, - lists backwards
-                             nn-mm lists given lines
-  up[ nn]                    move to higher frame
-  down[ nn]                  move to lower frame
-  fin[ish]                   return to outer frame
-  tr[ace] (on|off)           set trace mode of current thread
-  tr[ace] (on|off) all       set trace mode of all threads
-  q[uit]                     exit from debugger
-  v[ar] g[lobal]             show global variables
-  v[ar] l[ocal]              show local variables
-  v[ar] i[nstance] <object>  show instance variables of object
-  v[ar] c[onst] <object>     show constants of object
-  m[ethod] i[nstance] <obj>  show methods of object
-  m[ethod] <class|module>    show instance methods of class or module
-  th[read] l[ist]            list all threads
-  th[read] c[ur[rent]]       show current thread
-  th[read] [sw[itch]] <nnn>  switch thread context to nnn
-  th[read] stop <nnn>        stop thread nnn
-  th[read] resume <nnn>      resume thread nnn
-  p expression               evaluate expression and print its value
-  h[elp]                     print this help
-  <everything else>          evaluate
-EOHELP
-  end
+      when /^l(?:ist)?(?:\s+(.+))?$/
+        if !$1
+          b = previus_line ? previus_line + 10 : binding_line - 5
+          e = b + 9
+        elsif $1 == '-'
+          b = previus_line ? previus_line - 10 : binding_line - 5
+          e = b + 9
+        else
+          b, e = $1.split(/[-,]/)
+          if e
+            b = Integer(b)
+            e = Integer(e)
+          else
+            b = Integer(b) - 5
+            e = b + 9
+          end
+        end
+        previus_line = b
+        STDOUT.printf "[%d, %d] in %s\n", b, e, binding_file
+        line_at(binding_file, binding_line)
+        if lines = @scripts[binding_file] and lines != true
+          n = 0
+          b.upto(e) do |n|
+            if n > 0 && lines[n-1]
+	      if ( n == binding_line )
+              	STDOUT.printf "=> %d  %s\n", n, lines[n-1].chomp
+	      else
+              	STDOUT.printf "   %d  %s\n", n, lines[n-1].chomp
+	      end
+            end
+          end
+        else
+          STDOUT.printf "no sourcefile available for %s\n", binding_file
+        end
+
+      when /^up\s*(\d+)?$/
+	previus_line = nil
+        if $1
+          lev = Integer($1)
+        else
+          lev = 1
+        end
+        frame_pos += lev
+        if frame_pos >= @frames.size
+	  frame_pos = @frames.size - 1
+          STDOUT.print "at toplevel\n"
+	end
+        binding = @frames[frame_pos]
+        info, binding_file, binding_line = frame_info(frame_pos)
+        STDOUT.printf "#%d %s\n", frame_pos, info
+
+      when /^down\s*(\d+)?$/
+	previus_line = nil
+        if $1
+          lev = Integer($1)
+        else
+          lev = 1
+        end
+        frame_pos -= lev
+        if frame_pos < 0
+          frame_pos = 0
+          STDOUT.print "at stack bottom\n"
+	end
+        binding = @frames[frame_pos]
+        info, binding_file, binding_line = frame_info(frame_pos)
+        STDOUT.printf "#%d %s\n", frame_pos, info
 
-  def display_expressions(binding)
-    n = 1
-    for d in display
-      if d[0]
-	stdout.printf "%d: ", n
-	display_expression(d[1], binding)
-      end
-      n += 1
-    end
-  end
+      when /^fi(?:nish)?$/
+	@finish_pos = @frames.size - frame_pos
+	frame_pos = 0
+	return
 
-  def display_expression(exp, binding)
-    stdout.printf "%s = %s\n", exp, debug_silent_eval(exp, binding).to_s
-  end
+      when /^q(?:uit)?$/
+	STDOUT.print "really quit? (y/n) "
+	STDOUT.flush
+	input = STDIN.gets.chop!
+	exit if input == "y"
 
-  def frame_set_pos(file, line)
-    if @frames[0]
-      @frames[0][1] = file
-      @frames[0][2] = line
-    end
-  end
+      when /^p\s+/
+	p debug_eval($', binding)
 
-  def display_frames(pos)
-    0.upto(@frames.size - 1) do |n|
-      if n == pos
-	stdout.print "--> "
       else
-	stdout.print "    "
+	v = debug_eval(input, binding)
+	p v unless v == nil
       end
-      stdout.print format_frame(n)
+      STDOUT.print "(rdb:-) "
+      STDOUT.flush
     end
   end
-
-  def format_frame(pos)
-    bind, file, line, id = @frames[pos]
-    sprintf "#%d %s:%s%s\n", pos + 1, file, line,
-      (id ? ":in `#{id.id2name}'" : "")
-  end
-
-  def display_list(b, e, file, line)
-    stdout.printf "[%d, %d] in %s\n", b, e, file
-    if lines = SCRIPT_LINES__[file] and lines != true
-      n = 0
-      b.upto(e) do |n|
-	if n > 0 && lines[n-1]
-	  if n == line
-	    stdout.printf "=> %d  %s\n", n, lines[n-1].chomp
-	  else
-	    stdout.printf "   %d  %s\n", n, lines[n-1].chomp
-	  end
-	end
-      end
-    else
-      stdout.printf "No sourcefile available for %s\n", file
-    end
+  
+  def frame_info(pos = 0)
+    info = caller(0)[-(@frames.size - pos)]
+    info.sub( /:in `.*'$/, '' ) =~ /^(.*):(\d+)$/ #`
+    [info, $1, $2.to_i]
   end
 
   def line_at(file, line)
-    lines = SCRIPT_LINES__[file]
+    lines = @scripts[file]
     if lines
       return "\n" if lines == true
       line = lines[line-1]
       return "\n" unless line
       return line
     end
-    return "\n"
+    save = $DEBUG
+    begin
+      $DEBUG = false
+      f = open(file)
+      lines = @scripts[file] = f.readlines
+    rescue
+      $DEBUG = save
+      @scripts[file] = true
+      return "\n"
+    end
+    line = lines[line-1]
+    return "\n" unless line
+    return line
   end
 
   def debug_funcname(id)
-    if id.nil?
+    if id == 0
       "toplevel"
     else
       id.id2name
     end
   end
 
-  def check_break_points(file, klass, pos, binding, id)
-    return false if break_points.empty?
-    n = 1
-    for b in break_points
-      if b[0]		# valid
-	if b[1] == 0	# breakpoint
-	  if (b[2] == file and b[3] == pos) or
-	      (klass and b[2] == klass and b[3] == pos)
-	    stdout.printf "Breakpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
-	    return true
-	  end
-	elsif b[1] == 1	# watchpoint
-	  if debug_silent_eval(b[2], binding)
-	    stdout.printf "Watchpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
-	    return true
-	  end
-	end
-      end
-      n += 1
+  def check_break_points(file, pos, binding, id)
+    file = File.basename(file)
+    if @break_points.include? [file, pos]
+      index = @break_points.index([file, pos])
+      STDOUT.printf "Breakpoint %d, %s at %s:%s\n",
+	index, debug_funcname(id), file, pos
+      return true
     end
     return false
   end
 
   def excn_handle(file, line, id, binding)
-    if $!.class <= SystemExit
-      set_trace_func nil
-      exit
-    end
+    fs = @frames.size
+    tb = caller(0)[-fs..-1]
 
-    if @catch and ($!.class.ancestors.find { |e| e.to_s == @catch })
-      stdout.printf "%s:%d: `%s' (%s)\n", file, line, $!, $!.class
-      fs = @frames.size
-      tb = caller(0)[-fs..-1]
-      if tb
-	for i in tb
-	  stdout.printf "\tfrom %s\n", i
-	end
-      end
-      suspend_all
-      debug_command(file, line, id, binding)
+    STDOUT.printf "%s\n", $!
+    for i in tb
+      STDOUT.printf "\tfrom %s\n", i
     end
+    debug_command(file, line, id, binding)
   end
 
-  def trace_func(event, file, line, id, binding, klass)
-    Tracer.trace_func(event, file, line, id, binding, klass) if trace?
-    context(Thread.current).check_suspend
-    @file = file
-    @line = line
+  def trace_func(event, file, line, id, binding)
     case event
     when 'line'
-      frame_set_pos(file, line)
       if !@no_step or @frames.size == @no_step
 	@stop_next -= 1
-	@stop_next = -1 if @stop_next < 0
       elsif @frames.size < @no_step
 	@stop_next = 0		# break here before leaving...
       else
 	# nothing to do. skipped.
       end
-      if @stop_next == 0 or check_break_points(file, nil, line, binding, id)
-	@no_step = nil
-	suspend_all
+      if @stop_next == 0
+	if [file, line] == @last
+	  @stop_next = 1
+	else
+	  @no_step = nil
+	  debug_command(file, line, id, binding)
+	  @last = [file, line]
+	end
+      end
+      if check_break_points(file, line, binding, id)
 	debug_command(file, line, id, binding)
       end
 
     when 'call'
-      @frames.unshift [binding, file, line, id]
-      if check_break_points(file, klass, id.id2name, binding, id)
-	suspend_all
+      @frames.unshift binding
+      if check_break_points(file, id.id2name, binding, id)
 	debug_command(file, line, id, binding)
       end
 
-    when 'c-call'
-      frame_set_pos(file, line)
-
     when 'class'
-      @frames.unshift [binding, file, line, id]
-
+      @frames.unshift binding
+    
     when 'return', 'end'
       if @frames.size == @finish_pos
 	@stop_next = 1
-	@finish_pos = 0
       end
       @frames.shift
-
-    when 'end'
-      @frames.shift
-
+    
     when 'raise' 
       excn_handle(file, line, id, binding)
 
     end
     @last_file = file
   end
-end
-
-trap("INT") { DEBUGGER__.interrupt }
-@last_thread = Thread::main
-@max_thread = 1
-@thread_list = {Thread::main => 1}
-@break_points = []
-@display = []
-@waiting = []
-@stdout = STDOUT
-
-class << DEBUGGER__
-  def stdout
-    @stdout
-  end
-
-  def stdout=(s)
-    @stdout = s
-  end
-
-  def display
-    @display
-  end
-
-  def break_points
-    @break_points
-  end
-
-  def waiting
-    @waiting
-  end
-
-  def set_trace( arg )
-    saved_crit = Thread.critical
-    Thread.critical = true
-    make_thread_list
-    for th, in @thread_list
-      context(th).set_trace arg
-    end
-    Thread.critical = saved_crit
-    arg
-  end
-
-  def set_last_thread(th)
-    @last_thread = th
-  end
-
-  def suspend
-    saved_crit = Thread.critical
-    Thread.critical = true
-    make_thread_list
-    for th, in @thread_list
-      next if th == Thread.current
-      context(th).set_suspend
-    end
-    Thread.critical = saved_crit
-    # Schedule other threads to suspend as soon as possible.
-    Thread.pass unless Thread.critical
-  end
-
-  def resume
-    saved_crit = Thread.critical
-    Thread.critical = true
-    make_thread_list
-    for th, in @thread_list
-      next if th == Thread.current
-      context(th).clear_suspend
-    end
-    waiting.each do |th|
-      th.run
-    end
-    waiting.clear
-    Thread.critical = saved_crit
-    # Schedule other threads to restart as soon as possible.
-    Thread.pass
-  end
-
-  def context(thread=Thread.current)
-    c = thread[:__debugger_data__]
-    unless c
-      thread[:__debugger_data__] = c = Context.new
-    end
-    c
-  end
 
-  def interrupt
-    context(@last_thread).stop_next
-  end
-
-  def get_thread(num)
-    th = @thread_list.index(num)
-    unless th
-      @stdout.print "No thread ##{num}\n"
-      throw :debug_error
-    end
-    th
-  end
-
-  def thread_list(num)
-    th = get_thread(num)
-    if th == Thread.current
-      @stdout.print "+"
-    else
-      @stdout.print " "
-    end
-    @stdout.printf "%d ", num
-    @stdout.print th.inspect, "\t"
-    file = context(th).instance_eval{@file}
-    if file
-      @stdout.print file,":",context(th).instance_eval{@line}
-    end
-    @stdout.print "\n"
-  end
-
-  def thread_list_all
-    for th in @thread_list.values.sort
-      thread_list(th)
-    end
-  end
-
-  def make_thread_list
-    hash = {}
-    for th in Thread::list
-      if @thread_list.key? th
-	hash[th] = @thread_list[th]
-      else
-	@max_thread += 1
-	hash[th] = @max_thread
-      end
-    end
-    @thread_list = hash
-  end
-
-  def debug_thread_info(input, binding)
-    case input
-    when /^l(?:ist)?/
-      make_thread_list
-      thread_list_all
-
-    when /^c(?:ur(?:rent)?)?$/
-      make_thread_list
-      thread_list(@thread_list[Thread.current])
-
-    when /^(?:sw(?:itch)?\s+)?(\d+)/
-      make_thread_list
-      th = get_thread($1.to_i)
-      if th == Thread.current
-	@stdout.print "It's the current thread.\n"
-      else
-	thread_list(@thread_list[th])
-	context(th).stop_next
-	th.run
-	return :cont
-      end
-
-    when /^stop\s+(\d+)/
-      make_thread_list
-      th = get_thread($1.to_i)
-      if th == Thread.current
-	@stdout.print "It's the current thread.\n"
-      elsif th.stop?
-	@stdout.print "Already stopped.\n"
-      else
-	thread_list(@thread_list[th])
-	context(th).suspend 
-      end
-
-    when /^resume\s+(\d+)/
-      make_thread_list
-      th = get_thread($1.to_i)
-      if th == Thread.current
-	@stdout.print "It's the current thread.\n"
-      elsif !th.stop?
-	@stdout.print "Already running."
-      else
-	thread_list(@thread_list[th])
-	th.run
-      end
-    end
-  end
+  CONTEXT = new
 end
 
-stdout.printf "Debug.rb\n"
-stdout.printf "Emacs support available.\n\n"
-set_trace_func proc { |event, file, line, id, binding, klass, *rest|
-  DEBUGGER__.context.trace_func event, file, line, id, binding, klass
+set_trace_func proc{|event, file, line, id, binding,*rest|
+  DEBUGGER__::CONTEXT.trace_func event, file, line, id, binding
 }
-end
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 578859fdc6..29f2a5ded2 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -8,7 +8,7 @@
 # Usage:
 #   foo = Object.new
 #   foo2 = SimpleDelegator.new(foo)
-#   foo.hash == foo2.hash # => false
+#   foo.hash == foo2.hash # => true
 #
 #   Foo = DelegateClass(Array)
 #
@@ -19,44 +19,34 @@
 class Delegator
 
   def initialize(obj)
-    preserved = ::Kernel.public_instance_methods(false)
+    preserved = ::Kernel.instance_methods
     preserved -= ["to_s","to_a","inspect","==","=~","==="]
-    for t in self.class.ancestors
-      preserved |= t.public_instance_methods(false)
-      preserved |= t.private_instance_methods(false)
-      preserved |= t.protected_instance_methods(false)
+    for t in self.type.ancestors
+      preserved |= t.instance_methods
+      preserved |= t.private_instance_methods
+      preserved |= t.protected_instance_methods
       break if t == Delegator
     end
     for method in obj.methods
       next if preserved.include? method
-      begin
-	eval <<-EOS
-	  def self.#{method}(*args, &block)
-	    begin
-	      __getobj__.__send__(:#{method}, *args, &block)
-	    rescue Exception
-	      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
-	      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
-	      raise
-	    end
+      eval <<-EOS
+	def self.#{method}(*args, &block)
+	  begin
+	    __getobj__.__send__(:#{method}, *args, &block)
+	  rescue Exception
+	    $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
+	    $@.delete_if{|s| /^\\(eval\\):/ =~ s}
+	    raise
 	  end
+	end
 	EOS
-      rescue SyntaxError
-        raise NameError, "invalid identifier %s" % method, caller(4)
-      end
     end
   end
 
   def __getobj__
-    raise NotImplementedError, "need to define `__getobj__'"
+    raise NotImplementError, "need to define `__getobj__'"
   end
 
-  def marshal_dump
-    __getobj__
-  end
-  def marshal_load(obj)
-    initialize(obj)
-  end
 end
 
 class SimpleDelegator<Delegator
@@ -82,8 +72,8 @@ SimpleDelegater = SimpleDelegator
 #
 def DelegateClass(superclass)
   klass = Class.new
-  methods = superclass.public_instance_methods(true)
-  methods -= ::Kernel.public_instance_methods(false)
+  methods = superclass.instance_methods
+  methods -= ::Kernel.instance_methods
   methods |= ["to_s","to_a","inspect","==","=~","==="]
   klass.module_eval <<-EOS
   def initialize(obj)
@@ -91,9 +81,8 @@ def DelegateClass(superclass)
   end
   EOS
   for method in methods
-    begin
-      klass.module_eval <<-EOS
-        def #{method}(*args, &block)
+    klass.module_eval <<-EOS
+	def #{method}(*args, &block)
 	  begin
 	    @obj.__send__(:#{method}, *args, &block)
 	  rescue
@@ -101,13 +90,10 @@ def DelegateClass(superclass)
 	    raise
 	  end
 	end
-      EOS
-    rescue SyntaxError
-      raise NameError, "invalid identifier %s" % method, caller(3)
-    end
+	EOS
+      end
+    return klass;
   end
-  return klass;
-end
 
 if __FILE__ == $0
   class ExtArray<DelegateClass(Array)
@@ -117,7 +103,7 @@ if __FILE__ == $0
   end
 
   ary = ExtArray.new
-  p ary.class
+  p ary.type
   ary.push 25
   p ary
 
diff --git a/lib/drb.rb b/lib/drb.rb
deleted file mode 100644
index 93cc811e14..0000000000
--- a/lib/drb.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'drb/drb'
-
diff --git a/lib/drb/acl.rb b/lib/drb/acl.rb
deleted file mode 100644
index aa86dbe70f..0000000000
--- a/lib/drb/acl.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-# acl-2.0 - simple Access Control List
-#
-# Copyright (c) 2000,2002,2003 Masatoshi SEKI
-#
-# acl.rb is copyrighted free software by Masatoshi SEKI.
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-require 'ipaddr'
-
-class ACL
-  VERSION=["2.0.0"]
-  class ACLEntry
-    def initialize(str)
-      if str == '*' or str == 'all'
-	@pat = [:all]
-      else
-	begin
-	  @pat = [:ip, IPAddr.new(str)]
-	rescue ArgumentError
-	  @pat = [:name, dot_pat(str)]
-	end
-      end
-    end
-
-    private
-    def dot_pat_str(str)
-      list = str.split('.').collect { |s|
-	(s == '*') ? '.+' : s
-      }
-      list.join("\\.")
-    end
-
-    private
-    def dot_pat(str)
-      exp = "^" + dot_pat_str(str) + "$"
-      Regexp.new(exp)
-    end
-
-    public
-    def match(addr)
-      case @pat[0]
-      when :all
-	true
-      when :ip
-	begin
-	  ipaddr = IPAddr.new(addr[3])
-	  ipaddr = ipaddr.ipv4_mapped if @pat[1].ipv6? && ipaddr.ipv4?
-	rescue ArgumentError
-	  return false
-	end
-	(@pat[1].include?(ipaddr)) ? true : false
-      when :name
-	(@pat[1] =~ addr[2]) ? true : false
-      else
-	false
-      end
-    end
-  end
-
-  class ACLList
-    def initialize
-      @list = []
-    end
-
-    public
-    def match(addr)
-      @list.each do |e|
-	return true if e.match(addr)
-      end
-      false
-    end
-
-    public
-    def add(str)
-      @list.push(ACLEntry.new(str))
-    end
-  end
-
-  DENY_ALLOW = 0
-  ALLOW_DENY = 1
-
-  def initialize(list=nil, order = DENY_ALLOW)
-    @order = order
-    @deny = ACLList.new
-    @allow = ACLList.new
-    install_list(list) if list
-  end
-
-  public
-  def allow_socket?(soc)
-    allow_addr?(soc.peeraddr)
-  end
-
-  public
-  def allow_addr?(addr)
-    case @order
-    when DENY_ALLOW
-      return true if @allow.match(addr)
-      return false if @deny.match(addr)
-      return true
-    when ALLOW_DENY
-      return false if @deny.match(addr)
-      return true if @allow.match(addr)
-      return false
-    else
-      false
-    end
-  end
-
-  public
-  def install_list(list)
-    i = 0
-    while i < list.size
-      permission, domain = list.slice(i,2)
-      case permission.downcase
-      when 'allow'
-	@allow.add(domain)
-      when 'deny'
-	@deny.add(domain)
-      else
-	raise "Invalid ACL entry #{list.to_s}"
-      end
-      i += 2
-    end
-  end
-end
-
-if __FILE__ == $0
-  # example
-  list = %w(deny all
-	    allow 192.168.1.1
-            allow ::ffff:192.168.1.2
-            allow 192.168.1.3
-            )
-
-  addr = ["AF_INET", 10, "lc630", "192.168.1.3"]
-
-  acl = ACL.new
-  p acl.allow_addr?(addr)
-
-  acl = ACL.new(list, ACL::DENY_ALLOW)
-  p acl.allow_addr?(addr)
-end
-
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
deleted file mode 100644
index fda18401dd..0000000000
--- a/lib/drb/drb.rb
+++ /dev/null
@@ -1,1596 +0,0 @@
-#
-# drb/drb.rb -- distributed Ruby --- dRuby 2.0.4
-#
-#--
-# 	Copyright (c) 1999-2003 Masatoshi SEKI You can redistribute it and/or
-# 	modify it under the same terms as Ruby.
-#++
-#
-# Author: Masatoshi SEKI
-#
-# Documentation: William Webber (william@williamwebber.com)
-#
-# == Overview
-#
-# dRuby is a distributed object system for Ruby.  It allows an object in one
-# Ruby process to invoke methods on an object in another Ruby process on the
-# same or a different machine.
-#
-# The Ruby standard library contains the core classes of the dRuby package.
-# However, the full package also includes access control lists and the
-# Rinda tuple-space distributed task management system, as well as a 
-# large number of samples.  The full dRuby package can be downloaded from
-# the dRuby home page (see *References*).
-#
-# For an introduction and examples of usage see the documentation to the
-# DRb module.
-#
-# == References
-#
-# [http://www2a.biglobe.ne.jp/~seki/ruby/druby.html]
-#    The dRuby home page, in Japanese.  Contains the full dRuby package
-#    and links to other Japanese-language sources.
-#
-# [http://www2a.biglobe.ne.jp/~seki/ruby/druby.en.html]
-#    The English version of the dRuby home page.
-#
-# [http://www.chadfowler.com/ruby/drb.html]
-#    A quick tutorial introduction to using dRuby by Chad Fowler.
-#
-# [http://www.linux-mag.com/2002-09/ruby_05.html]
-#   A tutorial introduction to dRuby in Linux Magazine by Dave Thomas.
-#   Includes a discussion of Rinda.
-#
-# [http://www.eng.cse.dmu.ac.uk/~hgs/ruby/dRuby/]
-#   Links to English-language Ruby material collected by Hugh Sasse.
-#
-# [http://www.rubycentral.com/book/ospace.html]
-#   The chapter from *Programming* *Ruby* by Dave Thomas and Andy Hunt
-#   which discusses dRuby.
-#
-# [http://www.clio.ne.jp/home/web-i31s/Flotuard/Ruby/PRC2K_seki/dRuby.en.html]
-#   Translation of presentation on Ruby by Masatoshi Seki.
-
-require 'socket'
-require 'thread'
-require 'fcntl'
-
-#
-# == Overview
-#
-# dRuby is a distributed object system for Ruby.  It is written in
-# pure Ruby and uses its own protocol.  No add-in services are needed
-# beyond those provided by the Ruby runtime, such as TCP sockets.  It
-# does not rely on or interoperate with other distributed object
-# systems such as CORBA, RMI, or .NET.
-#
-# dRuby allows methods to be called in one Ruby process upon a Ruby
-# object located in another Ruby process, even on another machine.
-# References to objects can be passed between processes.  Method
-# arguments and return values are dumped and loaded in marshalled
-# format.  All of this is done transparently to both the caller of the
-# remote method and the object that it is called upon.
-#
-# An object in a remote process is locally represented by a
-# DRb::DRbObject instance.  This acts as a sort of proxy for the
-# remote object.  Methods called upon this DRbObject instance are
-# forwarded to its remote object.  This is arranged dynamically at run
-# time.  There are no statically declared interfaces for remote
-# objects, such as CORBA's IDL.
-#
-# dRuby calls made into a process are handled by a DRb::DRbServer
-# instance within that process.  This reconstitutes the method call,
-# invokes it upon the specified local object, and returns the value to
-# the remote caller.  Any object can receive calls over dRuby.  There
-# is no need to implement a special interface, or mixin special
-# functionality.  Nor, in the general case, does an object need to
-# explicitly register itself with a DRbServer in order to receive
-# dRuby calls.
-#
-# One process wishing to make dRuby calls upon another process must
-# somehow obtain an initial reference to an object in the remote
-# process by some means other than as the return value of a remote
-# method call, as there is initially no remote object reference it can
-# invoke a method upon.  This is done by attaching to the server by
-# URI.  Each DRbServer binds itself to a URI such as
-# 'druby://example.com:8787'.  A DRbServer can have an object attached
-# to it that acts as the server's *front* *object*.  A DRbObject can
-# be explicitly created from the server's URI.  This DRbObject's
-# remote object will be the server's front object.  This front object
-# can then return references to other Ruby objects in the DRbServer's
-# process.
-#
-# Method calls made over dRuby behave largely the same as normal Ruby
-# method calls made within a process.  Method calls with blocks are
-# supported, as are raising exceptions.  In addition to a method's
-# standard errors, a dRuby call may also raise one of the
-# dRuby-specific errors, all of which are subclasses of DRb::DRbError.
-#
-# Any type of object can be passed as an argument to a dRuby call or
-# returned as its return value.  By default, such objects are dumped
-# or marshalled at the local end, then loaded or unmarshalled at the
-# remote end.  The remote end therefore receives a copy of the local
-# object, not a distributed reference to it; methods invoked upon this
-# copy are executed entirely in the remote process, not passed on to
-# the local original.  This has semantics similar to pass-by-value.
-#
-# However, if an object cannot be marshalled, a dRuby reference to it
-# is passed or returned instead.  This will turn up at the remote end
-# as a DRbObject instance.  All methods invoked upon this remote proxy
-# are forwarded to the local object, as described in the discussion of
-# DRbObjects.  This has semantics similar to the normal Ruby
-# pass-by-reference.
-# 
-# The easiest way to signal that we want an otherwise marshallable
-# object to be passed or returned as a DRbObject reference, rather
-# than marshalled and sent as a copy, is to include the
-# DRb::DRbUndumped mixin module.
-#
-# dRuby supports calling remote methods with blocks.  As blocks (or
-# rather the Proc objects that represent them) are not marshallable,
-# the block executes in the local, not the remote, context.  Each
-# value yielded to the block is passed from the remote object to the
-# local block, then the value returned by each block invocation is
-# passed back to the remote execution context to be collected, before
-# the collected values are finally returned to the local context as
-# the return value of the method invocation.
-# 
-# == Examples of usage.
-#
-# For more dRuby samples, see the +samples+ directory in the full
-# dRuby distribution.
-#
-# === dRuby in client/server mode.
-#
-# This illustrates setting up a simple client-server drb
-# system.  Run the server and client code in different terminals,
-# starting the server code first.
-#
-# ==== Server code
-#    
-#   require 'drb/drb'
-#     
-#   # The URI for the server to connect to
-#   URI="druby://localhost:8787" 
-#     
-#   class TimeServer
-#     
-#     def get_current_time
-#       return Time.now
-#     end
-#     
-#   end
-#     
-#   # The object that handles requests on the server
-#   FRONT_OBJECT=TimeServer.new
-#
-#   $SAFE = 1   # disable eval() and friends
-#   
-#   DRb.start_service(URI, FRONT_OBJECT)
-#   # Wait for the drb server thread to finish before exiting.
-#   DRb.thread.join
-#
-# ==== Client code
-#     
-#   require 'drb/drb'
-#   
-#   # The URI to connect to
-#   SERVER_URI="druby://localhost:8787"
-#
-#   # Start a local DRbServer to handle callbacks.
-#   #
-#   # Not necessary for this small example, but will be required
-#   # as soon as we pass a non-marshallable object as an argument
-#   # to a dRuby call.
-#   DRb.start_service
-#   
-#   timeserver = DRbObject.new_with_uri(SERVER_URI)
-#   puts timeserver.get_current_time 
-#
-# === Remote objects under dRuby
-#
-# This example illustrates returning a reference to an object
-# from a dRuby call.  The Logger instances live in the server
-# process.  References to them are returned to the client process,
-# where methods can be invoked upon them.  These methods are 
-# executed in the server process.
-#
-# ==== Server code
-#   
-#   require 'drb/drb'
-#   
-#   URI="druby://localhost:8787"
-#   
-#   class Logger
-#
-#       # Make dRuby send Logger instances as dRuby references,
-#       # not copies.
-#       include DRb::DRbUndumped
-#   
-#       def initialize(n, fname)
-#           @name = n
-#           @filename = fname
-#       end
-#   
-#       def log(message)
-#           File.open(@filename, "a") do |f|
-#               f.puts("#{Time.now}: #{@name}: #{message}")
-#           end
-#       end
-#   
-#   end
-#   
-#   # We have a central object for creating and retrieving loggers.
-#   # This retains a local reference to all loggers created.  This
-#   # is so an existing logger can be looked up by name, but also
-#   # to prevent loggers from being garbage collected.  A dRuby
-#   # reference to an object is not sufficient to prevent it being
-#   # garbage collected!
-#   class LoggerFactory
-#   
-#       def initialize(bdir)
-#           @basedir = bdir
-#           @loggers = {}
-#       end
-#   
-#       def get_logger(name)
-#           if !@loggers.has_key? name
-#               # make the filename safe, then declare it to be so
-#               fname = name.gsub(/[.\/]/, "_").untaint
-#               @loggers[name] = Logger.new(name, @basedir + "/" + fname)
-#           end
-#           return @loggers[name]
-#       end
-#   
-#   end
-#   
-#   FRONT_OBJECT=LoggerFactory.new("/tmp/dlog")
-#
-#   $SAFE = 1   # disable eval() and friends
-#   
-#   DRb.start_service(URI, FRONT_OBJECT)
-#   DRb.thread.join
-#
-# ==== Client code
-#
-#   require 'drb/drb'
-#   
-#   SERVER_URI="druby://localhost:8787"
-#
-#   DRb.start_service
-#   
-#   log_service=DRbObject.new_with_uri(SERVER_URI)
-#   
-#   ["loga", "logb", "logc"].each do |logname|
-#   
-#       logger=log_service.get_logger(logname)
-#   
-#       logger.log("Hello, world!")
-#       logger.log("Goodbye, world!")
-#       logger.log("=== EOT ===")
-#   
-#   end
-#
-# == Security
-#
-# As with all network services, security needs to be considered when
-# using dRuby.  By allowing external access to a Ruby object, you are
-# not only allowing outside clients to call the methods you have
-# defined for that object, but by default to execute arbitrary Ruby
-# code on your server.  Consider the following:
-#
-#    # !!! UNSAFE CODE !!!
-#    ro = DRbObject::new_with_uri("druby://your.server.com:8989")
-#    class << ro
-#      undef :instance_eval  # force call to be passed to remote object
-#    end
-#    ro.instance_eval("`rm -rf *`")
-#
-# The dangers posed by instance_eval and friends are such that a
-# DRbServer should generally be run with $SAFE set to at least 
-# level 1.  This will disable eval() and related calls on strings 
-# passed across the wire.  The sample usage code given above follows 
-# this practice.
-#
-# A DRbServer can be configured with an access control list to
-# selectively allow or deny access from specified IP addresses.  The
-# main druby distribution provides the ACL class for this purpose.  In
-# general, this mechanism should only be used alongside, rather than
-# as a replacement for, a good firewall.
-#
-# == dRuby internals
-#
-# dRuby is implemented using three main components: a remote method
-# call marshaller/unmarshaller; a transport protocol; and an
-# ID-to-object mapper.  The latter two can be directly, and the first
-# indirectly, replaced, in order to provide different behaviour and
-# capabilities.
-#
-# Marshalling and unmarshalling of remote method calls is performed by
-# a DRb::DRbMessage instance.  This uses the Marshal module to dump
-# the method call before sending it over the transport layer, then
-# reconstitute it at the other end.  There is normally no need to
-# replace this component, and no direct way is provided to do so.
-# However, it is possible to implement an alternative marshalling
-# scheme as part of an implementation of the transport layer.
-#
-# The transport layer is responsible for opening client and server
-# network connections and forwarding dRuby request across them.
-# Normally, it uses DRb::DRbMessage internally to manage marshalling
-# and unmarshalling.  The transport layer is managed by
-# DRb::DRbProtocol.  Multiple protocols can be installed in
-# DRbProtocol at the one time; selection between them is determined by
-# the scheme of a dRuby URI.  The default transport protocol is
-# selected by the scheme 'druby:', and implemented by
-# DRb::DRbTCPSocket.  This uses plain TCP/IP sockets for
-# communication.  An alternative protocol, using UNIX domain sockets,
-# is implemented by DRb::DRbUNIXSocket in the file drb/unix.rb, and
-# selected by the scheme 'drbunix:'.  A sample implementation over
-# HTTP can be found in the samples accompanying the main dRuby
-# distribution.
-#
-# The ID-to-object mapping component maps dRuby object ids to the
-# objects they refer to, and vice versa.  The implementation to use
-# can be specified as part of a DRb::DRbServer's configuration.  The
-# default implementation is provided by DRb::DRbIdConv.  It uses an
-# object's ObjectSpace id as its dRuby id.  This means that the dRuby
-# reference to that object only remains meaningful for the lifetime of
-# the object's process and the lifetime of the object within that
-# process.  A modified implementation is provided by DRb::TimerIdConv
-# in the file drb/timeridconv.rb.  This implementation retains a local
-# reference to all objects exported over dRuby for a configurable
-# period of time (defaulting to ten minutes), to prevent them being
-# garbage-collected within this time.  Another sample implementation
-# is provided in sample/name.rb in the main dRuby distribution.  This
-# allows objects to specify their own id or "name".  A dRuby reference
-# can be made persistent across processes by having each process
-# register an object using the same dRuby name.
-#
-module DRb
-
-  # Superclass of all errors raised in the DRb module.
-  class DRbError < RuntimeError; end
-
-  # Error raised when an error occurs on the underlying communication
-  # protocol.
-  class DRbConnError < DRbError; end
-
-  # Class responsible for converting between an object and its id.
-  #
-  # This, the default implementation, uses an object's local ObjectSpace
-  # __id__ as its id.  This means that an object's identification over
-  # drb remains valid only while that object instance remains alive 
-  # within the server runtime.
-  #
-  # For alternative mechanisms, see DRb::TimerIdConv in rdb/timeridconv.rb
-  # and DRbNameIdConv in sample/name.rb in the full drb distribution.
-  class DRbIdConv
-
-    # Convert an object reference id to an object.
-    #
-    # This implementation looks up the reference id in the local object
-    # space and returns the object it refers to.
-    def to_obj(ref)
-      ObjectSpace._id2ref(ref)
-    end
-    
-    # Convert an object into a reference id.
-    #
-    # This implementation returns the object's __id__ in the local
-    # object space.
-    def to_id(obj)
-      obj.nil? ? nil : obj.__id__
-    end
-  end
-
-  # Mixin module making an object undumpable or unmarshallable.
-  #
-  # If an object which includes this module is returned by method
-  # called over drb, then the object remains in the server space
-  # and a reference to the object is returned, rather than the
-  # object being marshalled and moved into the client space.
-  module DRbUndumped 
-    def _dump(dummy)  # :nodoc:
-      raise TypeError, 'can\'t dump'
-    end
-  end
-
-  # Error raised by the DRb module when an attempt is made to refer to
-  # the context's current drb server but the context does not have one.
-  # See #current_server.
-  class DRbServerNotFound < DRbError; end
-
-  # Error raised by the DRbProtocol module when it cannot find any
-  # protocol implementation support the scheme specified in a URI.
-  class DRbBadURI < DRbError; end
-
-  # Error raised by a dRuby protocol when it doesn't support the
-  # scheme specified in a URI.  See DRb::DRbProtocol.
-  class DRbBadScheme < DRbError; end
-
-  # An exception wrapping a DRb::DRbUnknown object
-  class DRbUnknownError < DRbError
-
-    # Create a new DRbUnknownError for the DRb::DRbUnknown object +unknown+
-    def initialize(unknown)
-      @unknown = unknown
-      super(unknown.name)
-    end
-
-    # Get the wrapped DRb::DRbUnknown object.
-    attr_reader :unknown
-
-    def self._load(s)  # :nodoc:
-      Marshal::load(s)
-    end
-    
-    def _dump(lv) # :nodoc:
-      Marshal::dump(@unknown)
-    end
-  end
-
-  # Class wrapping a marshalled object whose type is unknown locally.
-  #
-  # If an object is returned by a method invoked over drb, but the
-  # class of the object is unknown in the client namespace, or
-  # the object is a constant unknown in the client namespace, then
-  # the still-marshalled object is returned wrapped in a DRbUnknown instance.
-  #
-  # If this object is passed as an argument to a method invoked over
-  # drb, then the wrapped object is passed instead.
-  #
-  # The class or constant name of the object can be read from the
-  # +name+ attribute.  The marshalled object is held in the +buf+
-  # attribute.
-  class DRbUnknown
-    
-    # Create a new DRbUnknown object.
-    #
-    # +buf+ is a string containing a marshalled object that could not
-    # be unmarshalled.  +err+ is the error message that was raised 
-    # when the unmarshalling failed.  It is used to determine the
-    # name of the unmarshalled object.
-    def initialize(err, buf)
-      case err
-      when /uninitialized constant (\S+)/
-	@name = $1
-      when /undefined class\/module (\S+)/
-	@name = $1
-      else
-	@name = nil
-      end
-      @buf = buf
-    end
-
-    # The name of the unknown thing.
-    #
-    # Class name for unknown objects; variable name for unknown
-    # constants.
-    attr_reader :name
-
-    # Buffer contained the marshalled, unknown object.
-    attr_reader :buf
-
-    def self._load(s) # :nodoc:
-      begin
-	Marshal::load(s)
-      rescue NameError, ArgumentError
-	DRbUnknown.new($!, s)
-      end
-    end
-
-    def _dump(lv) # :nodoc:
-      @buf
-    end
-
-    # Attempt to load the wrapped marshalled object again.
-    #
-    # If the class of the object is now known locally, the object
-    # will be unmarshalled and returned.  Otherwise, a new 
-    # but identical DRbUnknown object will be returned.
-    def reload
-      self.class._load(@buf)
-    end
-
-    # Create a DRbUnknownError exception containing this object.
-    def exception
-      DRbUnknownError.new(self)
-    end
-  end
-
-  class DRbArray
-    def initialize(ary)
-      @ary = ary.collect { |obj| 
-	if obj.kind_of? DRbUndumped
-	  DRbObject.new(obj)
-	else
-	  begin
-	    Marshal.dump(obj)
-	    obj
-	  rescue
-	    DRbObject.new(obj)
-	  end
-	end
-      }
-    end
-
-    def self._load(s)
-      Marshal::load(s)
-    end
-
-    def _dump(lv)
-      Marshal.dump(@ary)
-    end
-  end
-
-  # Handler for sending and receiving drb messages.
-  #
-  # This takes care of the low-level marshalling and unmarshalling
-  # of drb requests and responses sent over the wire between server
-  # and client.  This relieves the implementor of a new drb
-  # protocol layer with having to deal with these details.
-  #
-  # The user does not have to directly deal with this object in
-  # normal use.
-  class DRbMessage
-    def initialize(config) # :nodoc:
-      @load_limit = config[:load_limit]
-      @argc_limit = config[:argc_limit]
-    end
-
-    def dump(obj)  # :nodoc:
-      obj = DRbObject.new(obj) if obj.kind_of? DRbUndumped
-      begin
-	str = Marshal::dump(obj)
-      rescue
-	str = Marshal::dump(DRbObject.new(obj))
-      end
-      [str.size].pack('N') + str
-    end
-
-    def load(soc)  # :nodoc:
-      sz = soc.read(4)	# sizeof (N)
-      raise(DRbConnError, 'connection closed') if sz.nil?
-      raise(DRbConnError, 'premature header') if sz.size < 4
-      sz = sz.unpack('N')[0]
-      raise(DRbConnError, "too large packet #{sz}") if @load_limit < sz
-      str = soc.read(sz)
-      raise(DRbConnError, 'connection closed') if sz.nil?
-      raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz
-      begin
-	Marshal::load(str)
-      rescue NameError, ArgumentError
-	DRbUnknown.new($!, str)
-      end
-    end
-
-    def send_request(stream, ref, msg_id, arg, b) # :nodoc:
-      ary = []
-      ary.push(dump(ref.__drbref))
-      ary.push(dump(msg_id.id2name))
-      ary.push(dump(arg.length))
-      arg.each do |e|
-	ary.push(dump(e))
-      end
-      ary.push(dump(b))
-      stream.write(ary.join(''))
-    end
-    
-    def recv_request(stream) # :nodoc:
-      ref = load(stream)
-      ro = DRb.to_obj(ref)
-      msg = load(stream)
-      argc = load(stream)
-      raise ArgumentError, 'too many arguments' if @argc_limit < argc
-      argv = Array.new(argc, nil)
-      argc.times do |n|
-	argv[n] = load(stream)
-      end
-      block = load(stream)
-      return ro, msg, argv, block
-    end
-
-    def send_reply(stream, succ, result)  # :nodoc:
-      stream.write(dump(succ) + dump(result))
-    end
-
-    def recv_reply(stream)  # :nodoc:
-      succ = load(stream)
-      result = load(stream)
-      [succ, result]
-    end
-  end
-
-  # Module managing the underlying network protocol(s) used by drb.
-  #
-  # By default, drb uses the DRbTCPSocket protocol.  Other protocols
-  # can be defined.  A protocol must define the following class methods:
-  #
-  #   [open(uri, config)] Open a client connection to the server at +uri+,
-  #                       using configuration +config+.  Return a protocol
-  #                       instance for this connection.
-  #   [open_server(uri, config)] Open a server listening at +uri+,
-  #                              using configuration +config+.  Return a
-  #                              protocol instance for this listener.
-  #   [uri_option(uri, config)] Take a URI, possibly containing an option
-  #                             component (e.g. a trailing '?param=val'), 
-  #                             and return a [uri, option] tuple.
-  #
-  # All of these methods should raise a DRbBadScheme error if the URI 
-  # does not identify the protocol they support (e.g. "druby:" for
-  # the standard Ruby protocol).  This is how the DRbProtocol module,
-  # given a URI, determines which protocol implementation serves that
-  # protocol.
-  #
-  # The protocol instance returned by #open_server must have the
-  # following methods:
-  #
-  # [accept] Accept a new connection to the server.  Returns a protocol
-  #          instance capable of communicating with the client.
-  # [close] Close the server connection.
-  # [uri] Get the URI for this server.
-  #
-  # The protocol instance returned by #open must have the following methods:
-  #
-  # [send_request (ref, msg_id, arg, b)] 
-  #      Send a request to +ref+ with the given message id and arguments.
-  #      This is most easily implemented by calling DRbMessage.send_request,
-  #      providing a stream that sits on top of the current protocol.
-  # [recv_reply]
-  #      Receive a reply from the server and return it as a [success-boolean,
-  #      reply-value] pair.  This is most easily implemented by calling
-  #      DRb.recv_reply, providing a stream that sits on top of the 
-  #      current protocol.
-  # [alive?]
-  #      Is this connection still alive?
-  # [close]
-  #      Close this connection.
-  #
-  # The protocol instance returned by #open_server().accept() must have
-  # the following methods:
-  #
-  # [recv_request]
-  #     Receive a request from the client and return a [object, message,
-  #     args, block] tuple.  This is most easily implemented by calling
-  #     DRbMessage.recv_request, providing a stream that sits on top of
-  #     the current protocol.
-  # [send_reply(succ, result)]
-  #     Send a reply to the client.  This is most easily implemented
-  #     by calling DRbMessage.send_reply, providing a stream that sits
-  #     on top of the current protocol.
-  # [close]
-  #     Close this connection.
-  #
-  # A new protocol is registered with the DRbProtocol module using
-  # the add_protocol method.
-  #
-  # For examples of other protocols, see DRbUNIXSocket in drb/unix.rb,
-  # and HTTP0 in sample/http0.rb and sample/http0serv.rb in the full
-  # drb distribution.
-  module DRbProtocol
-
-    # Add a new protocol to the DRbProtocol module.
-    def add_protocol(prot)
-      @protocol.push(prot)
-    end
-    module_function :add_protocol
-
-    # Open a client connection to +uri+ with the configuration +config+.
-    #
-    # The DRbProtocol module asks each registered protocol in turn to
-    # try to open the URI.  Each protocol signals that it does not handle that
-    # URIby raising a DRbBadScheme error.  If no protocol recognises the
-    # URI, then a DRbBadURI error is raised.  If a protocol accepts the
-    # URI, but an error occurs in opening it, a DRbConnError is raised.
-    def open(uri, config, first=true) 
-      @protocol.each do |prot|
-	begin
-	  return prot.open(uri, config)
-	rescue DRbBadScheme
-	rescue DRbConnError
-	  raise($!)
-	rescue
-	  raise(DRbConnError, "#{uri} - #{$!.inspect}")
-	end
-      end
-      if first && (config[:auto_load] != false)
-	auto_load(uri, config)
-	return open(uri, config, false)
-      end
-      raise DRbBadURI, 'can\'t parse uri:' + uri
-    end
-    module_function :open
-
-    # Open a server listening for connections at +uri+ with 
-    # configuration +config+.
-    #
-    # The DRbProtocol module asks each registered protocol in turn to
-    # try to open a server at the URI.  Each protocol signals that it does 
-    # not handle that URI by raising a DRbBadScheme error.  If no protocol 
-    # recognises the URI, then a DRbBadURI error is raised.  If a protocol 
-    # accepts the URI, but an error occurs in opening it, the underlying 
-    # error is passed on to the caller.
-    def open_server(uri, config, first=true)
-      @protocol.each do |prot|
-	begin
-	  return prot.open_server(uri, config)
-	rescue DRbBadScheme
-	end
-      end
-      if first && (config[:auto_load] != false)
-	auto_load(uri, config)
-	return open_server(uri, config, false)
-      end
-      raise DRbBadURI, 'can\'t parse uri:' + uri
-    end
-    module_function :open_server
-
-    # Parse +uri+ into a [uri, option] pair.
-    #
-    # The DRbProtocol module asks each registered protocol in turn to
-    # try to parse the URI.  Each protocol signals that it does not handle that
-    # URI by raising a DRbBadScheme error.  If no protocol recognises the
-    # URI, then a DRbBadURI error is raised.  
-    def uri_option(uri, config, first=true)
-      @protocol.each do |prot|
-	begin
-	  uri, opt = prot.uri_option(uri, config)
-	  # opt = nil if opt == ''
-	  return uri, opt
-	rescue DRbBadScheme
-	end
-      end
-      if first && (config[:auto_load] != false)
-	auto_load(uri, config)
-        return uri_option(uri, config, false)
-      end
-      raise DRbBadURI, 'can\'t parse uri:' + uri
-    end
-    module_function :uri_option
-
-    def auto_load(uri, config)  # :nodoc:
-      if uri =~ /^drb([a-z0-9]+):/
-	require("drb/#{$1}") rescue nil
-      end
-    end
-    module_function :auto_load
-  end
-
-  # The default drb protocol.
-  #
-  # Communicates over a TCP socket.
-  class DRbTCPSocket
-    private
-    def self.parse_uri(uri)
-      if uri =~ /^druby:\/\/(.*?):(\d+)(\?(.*))?$/
-	host = $1
-	port = $2.to_i
-	option = $4
-	[host, port, option]
-      else
-	raise(DRbBadScheme, uri) unless uri =~ /^druby:/
-	raise(DRbBadURI, 'can\'t parse uri:' + uri)
-      end
-    end
-
-    public
-
-    # Open a client connection to +uri+ using configuration +config+.
-    def self.open(uri, config)
-      host, port, option = parse_uri(uri)
-      host.untaint
-      port.untaint
-      soc = TCPSocket.open(host, port)
-      self.new(uri, soc, config)
-    end
-
-    # Open a server listening for connections at +uri+ using 
-    # configuration +config+.
-    def self.open_server(uri, config)
-      uri = 'druby://:0' unless uri
-      host, port, opt = parse_uri(uri)
-      if host.size == 0
-	soc = TCPServer.open(port)
-	host = Socket.gethostname
-      else
-	soc = TCPServer.open(host, port)
-      end
-      port = soc.addr[1] if port == 0
-      uri = "druby://#{host}:#{port}"
-      self.new(uri, soc, config)
-    end
-
-    # Parse +uri+ into a [uri, option] pair.
-    def self.uri_option(uri, config)
-      host, port, option = parse_uri(uri)
-      return "druby://#{host}:#{port}", option
-    end
-
-    # Create a new DRbTCPSocket instance.
-    #
-    # +uri+ is the URI we are connected to.
-    # +soc+ is the tcp socket we are bound to.  +config+ is our
-    # configuration.
-    def initialize(uri, soc, config={})
-      @uri = uri
-      @socket = soc
-      @config = config
-      @acl = config[:tcp_acl]
-      @msg = DRbMessage.new(config)
-      set_sockopt(@socket)
-    end
-
-    # Get the URI that we are connected to.
-    attr_reader :uri
-
-    # Get the address of our TCP peer (the other end of the socket
-    # we are bound to.
-    def peeraddr
-      @socket.peeraddr
-    end
-    
-    # Get the socket.
-    def stream; @socket; end
-
-    # On the client side, send a request to the server.
-    def send_request(ref, msg_id, arg, b)
-      @msg.send_request(stream, ref, msg_id, arg, b)
-    end
-    
-    # On the server side, receive a request from the client.
-    def recv_request
-      @msg.recv_request(stream)
-    end
-
-    # On the server side, send a reply to the client.
-    def send_reply(succ, result)
-      @msg.send_reply(stream, succ, result)
-    end
-
-    # On the client side, receive a reply from the server.
-    def recv_reply
-      @msg.recv_reply(stream)
-    end
-
-    public
-
-    # Close the connection.
-    #
-    # If this is an instance returned by #open_server, then this stops
-    # listening for new connections altogether.  If this is an instance
-    # returned by #open or by #accept, then it closes this particular
-    # client-server session.
-    def close
-      if @socket
-	@socket.close
-	@socket = nil
-      end
-    end
-    
-    # On the server side, for an instance returned by #open_server, 
-    # accept a client connection and return a new instance to handle
-    # the server's side of this client-server session.
-    def accept
-      while true
-	s = @socket.accept
-	break if (@acl ? @acl.allow_socket?(s) : true) 
-	s.close
-      end
-      self.class.new(nil, s, @config)
-    end
-
-    # Check to see if this connection is alive.
-    def alive?
-      return false unless @socket
-      if IO.select([@socket], nil, nil, 0)
-	close
-	return false
-      end
-      true
-    end
-
-    def set_sockopt(soc) # :nodoc:
-      soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-      soc.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK) if defined? Fcntl::O_NONBLOCK
-      soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
-    end
-  end
-
-  module DRbProtocol
-    @protocol = [DRbTCPSocket] # default
-  end
-
-  class DRbURIOption  # :nodoc:  I don't understand the purpose of this class...
-    def initialize(option)
-      @option = option.to_s
-    end
-    attr :option
-    def to_s; @option; end
-    
-    def ==(other)
-      return false unless DRbURIOption === other
-      @option == other.option
-    end
-    
-    def hash
-      @option.hash
-    end
-    
-    alias eql? ==
-  end
-
-  # Object wrapping a reference to a remote drb object.
-  #
-  # Method calls on this object are relayed to the remote
-  # object that this object is a stub for.
-  class DRbObject
-
-    # Unmarshall a marshalled DRbObject.
-    #
-    # If the referenced object is located within the local server, then
-    # the object itself is returned.  Otherwise, a new DRbObject is
-    # created to act as a stub for the remote referenced object.
-    def self._load(s)
-      uri, ref = Marshal.load(s)
-      if DRb.here?(uri)
-	return DRb.to_obj(ref)
-      end
-
-      it = self.new(nil)
-      it.reinit(uri, ref)
-      it
-    end
-
-    # Create a new DRbObject from a URI alone.
-    def self.new_with_uri(uri)
-      self.new(nil, uri)
-    end
-
-    # Marshall this object.
-    #
-    # The URI and ref of the object are marshalled.
-    def _dump(lv)
-      Marshal.dump([@uri, @ref])
-    end
-
-    # Create a new remote object stub.
-    #
-    # +obj+ is the (local) object we want to create a stub for.  Normally
-    # this is +nil+.  +uri+ is the URI of the remote object that this
-    # will be a stub for.
-    def initialize(obj, uri=nil)
-      @uri = nil
-      @ref = nil
-      if obj.nil?
-	return if uri.nil?
-	@uri, option = DRbProtocol.uri_option(uri, DRb.config)
-	@ref = DRbURIOption.new(option) unless option.nil?
-      else
-	@uri = uri ? uri : (DRb.uri rescue nil)
-	@ref = obj ? DRb.to_id(obj) : nil
-      end
-    end
-
-    # Reinitialise this object with the given +uri+ and +ref+
-    def reinit(uri, ref)
-      @uri = uri
-      @ref = ref
-    end
-
-    # Get the URI of the remote object.
-    def __drburi 
-      @uri
-    end
-
-    # Get the reference of the object, if local.
-    def __drbref
-      @ref
-    end
-
-    undef :to_s
-    undef :to_a
-    undef :respond_to?
-
-    # Routes method calls to the referenced object.
-    def method_missing(msg_id, *a, &b)
-      if DRb.here?(@uri)
-	obj = DRb.to_obj(@ref)
-	DRb.current_server.check_insecure_method(obj, msg_id)
-	return obj.__send__(msg_id, *a, &b) 
-      end
-
-      succ, result = DRbConn.open(@uri) do |conn|
-	conn.send_message(self, msg_id, a, b)
-      end
-      return result if succ
-      unless DRbUnknown === result
-	prefix = "(#{@uri}) "
-	bt = []
-	result.backtrace.each do |x|
-	  break if /`__send__'$/ =~ x 
-	  if /^\(druby:\/\// =~ x
-	    bt.push(x)
-	  else
-	    bt.push(prefix + x)
-	  end
-	end
-	raise result, result.message, bt + caller
-      else
-	raise result
-      end
-    end
-  end
-
-  # Class handling the connection between a DRbObject and the
-  # server the real object lives on.
-  #
-  # This class maintains a pool of connections, to reduce the
-  # overhead of starting and closing down connections for each
-  # method call.
-  #
-  # This class is used internally by DRbObject.  The user does
-  # not normally need to deal with it directly.
-  class DRbConn
-    POOL_SIZE = 16  # :nodoc:
-    @mutex = Mutex.new
-    @pool = []
-
-    def self.open(remote_uri)  # :nodoc:
-      begin
-	conn = nil
-
-	@mutex.synchronize do
-	  #FIXME
-	  new_pool = []
-	  @pool.each do |c|
-	    if conn.nil? and c.uri == remote_uri
-	      conn = c if c.alive?
-	    else
-	      new_pool.push c
-	    end
-	  end
-	  @pool = new_pool
-	end
-
-	conn = self.new(remote_uri) unless conn
-	succ, result = yield(conn)
-	return succ, result
-
-      ensure
-	@mutex.synchronize do
-	  if @pool.size > POOL_SIZE or ! succ
-	    conn.close if conn
-	  else
-	    @pool.unshift(conn)
-	  end
-	end
-      end
-    end
-
-    def initialize(remote_uri)  # :nodoc:
-      @uri = remote_uri
-      @protocol = DRbProtocol.open(remote_uri, DRb.config)
-    end
-    attr_reader :uri  # :nodoc:
-
-    def send_message(ref, msg_id, arg, block)  # :nodoc:
-      @protocol.send_request(ref, msg_id, arg, block)
-      @protocol.recv_reply
-    end
-
-    def close  # :nodoc:
-      @protocol.close
-      @protocol = nil
-    end
-
-    def alive?  # :nodoc:
-      @protocol.alive?
-    end
-  end
-
-  # Class representing a drb server instance.
-  #
-  # A DRbServer must be running in the local process before any incoming
-  # dRuby calls can be accepted, or any local objects can be passed as
-  # dRuby references to remote processes, even if those local objects are
-  # never actually called remotely. You do not need to start a DRbServer
-  # in the local process if you are only making outgoing dRuby calls
-  # passing marshalled parameters.
-  #
-  # Unless multiple servers are being used, the local DRbServer is normally
-  # started by calling DRb.start_service.
-  class DRbServer
-    @@acl = nil
-    @@idconv = DRbIdConv.new
-    @@secondary_server = nil
-    @@argc_limit = 256
-    @@load_limit = 256 * 102400
-    @@verbose = false
-
-    # Set the default value for the :argc_limit option.
-    #
-    # See #new().  The initial default value is 256.
-    def self.default_argc_limit(argc)
-      @@argc_limit = argc
-    end
-
-    # Set the default value for the :load_limit option.
-    #
-    # See #new().  The initial default value is 25 MB.
-    def self.default_load_limit(sz)
-      @@load_limit = sz
-    end
-
-    # Set the default value for the :acl option.
-    #
-    # See #new().  The initial default value is nil.
-    def self.default_acl(acl)
-      @@acl = acl
-    end
-
-    # Set the default value for the :id_conv option.
-    #
-    # See #new().  The initial default value is a DRbIdConv instance.
-    def self.default_id_conv(idconv)
-      @@idconv = idconv
-    end
-
-    # Set the default value of the :verbose option.
-    #
-    # See #new().  The initial default value is false.
-    def self.verbose=(on)
-      @@verbose = on
-    end
-    
-    # Get the default value of the :verbose option.
-    def self.verbose
-      @@verbose
-    end
-
-    def self.make_config(hash={})  # :nodoc:
-      default_config = { 
-	:idconv => @@idconv,
-	:verbose => @@verbose,
-	:tcp_acl => @@acl,
-	:load_limit => @@load_limit,
-	:argc_limit => @@argc_limit
-      }
-      default_config.update(hash)
-    end
-
-    # Create a new DRbServer instance.
-    #
-    # +uri+ is the URI to bind to.  This is normally of the form
-    # 'druby://<hostname>:<port>' where <hostname> is a hostname of
-    # the local machine.  If nil, then the system's default hostname
-    # will be bound to, on a port selected by the system; these value
-    # can be retrieved from the +uri+ attribute.  'druby:' specifies
-    # the default dRuby transport protocol: another protocol, such
-    # as 'drbunix:', can be specified instead.
-    #
-    # +front+ is the front object for the server, that is, the object
-    # to which remote method calls on the server will be passed.  If
-    # nil, then the server will not accept remote method calls.
-    #
-    # If +config_or_acl+ is a hash, it is the configuration to
-    # use for this server.  The following options are recognised:
-    #
-    # :idconv :: an id-to-object conversion object.  This defaults
-    #            to an instance of the class DRb::DRbIdConv.
-    # :verbose :: if true, all unsucessful remote calls on objects
-    #             in the server will be logged to $stdout. false
-    #             by default.
-    # :tcp_acl :: the access control list for this server.  See
-    #             the ACL class from the main dRuby distribution.
-    # :load_limit :: the maximum message size in bytes accepted by
-    #                the server.  Defaults to 25 MB (26214400).
-    # :argc_limit :: the maximum number of arguments to a remote
-    #                method accepted by the server.  Defaults to
-    #                256.
-    #
-    # The default values of these options can be modified on
-    # a class-wide basis by the class methods #default_argc_limit,
-    # #default_load_limit, #default_acl, #default_id_conv,
-    # and #verbose=
-    #
-    # If +config_or_acl+ is not a hash, but is not nil, it is
-    # assumed to be the access control list for this server.
-    # See the :tcp_acl option for more details.
-    #
-    # If no other server is currently set as the primary server,
-    # this will become the primary server.
-    #
-    # The server will immediately start running in its own thread.
-    def initialize(uri=nil, front=nil, config_or_acl=nil)
-      if Hash === config_or_acl
-	config = config_or_acl.dup
-      else
-	acl = config_or_acl || @@acl
-	config = {
-	  :tcp_acl => acl
-	}
-      end
-
-      @config = self.class.make_config(config)
-
-      @protocol = DRbProtocol.open_server(uri, @config)
-      @uri = @protocol.uri
-
-      @front = front
-      @idconv = @config[:idconv]
-
-      @grp = ThreadGroup.new
-      @thread = run
-
-      Thread.exclusive do
-	DRb.primary_server = self unless DRb.primary_server
-      end
-    end
-
-    # The URI of this DRbServer.
-    attr_reader :uri
-
-    # The main thread of this DRbServer.
-    #
-    # This is the thread that listens for and accepts connections
-    # from clients, not that handles each client's request-response
-    # session.
-    attr_reader :thread
-
-    # The front object of the DRbServer.
-    # 
-    # This object receives remote method calls made on the server's
-    # URI alone, with an object id.
-    attr_reader :front
-
-    # The configuration of this DRbServer
-    attr_reader :config
-
-    # Set whether to operate in verbose mode.
-    #
-    # In verbose mode, failed calls are logged to stdout.
-    def verbose=(v); @config[:verbose]=v; end
-
-    # Get whether the server is in verbose mode.
-    #
-    # In verbose mode, failed calls are logged to stdout.
-    def verbose; @config[:verbose]; end
-
-    # Is this server alive?
-    def alive?
-      @thread.alive?
-    end
-
-    # Stop this server.
-    def stop_service
-      @thread.kill
-    end
-
-    # Convert a dRuby reference to the local object it refers to.
-    def to_obj(ref)
-      return front if ref.nil?
-      return front[ref.to_s] if DRbURIOption === ref
-      @idconv.to_obj(ref)
-    end
-
-    # Convert a local object to a dRuby reference.
-    def to_id(obj)
-      return nil if obj.__id__ == front.__id__
-      @idconv.to_id(obj)
-    end
-
-    private
-    def kill_sub_thread
-      Thread.new do
-	grp = ThreadGroup.new
-	grp.add(Thread.current)
-	list = @grp.list
-	while list.size > 0
-	  list.each do |th|
-	    th.kill if th.alive?
-	  end
-	  list = @grp.list
-	end
-      end
-    end
-
-    def run
-      Thread.start do
-	begin
-	  while true
-	    main_loop
-	  end
-	ensure
-	  @protocol.close if @protocol
-	  kill_sub_thread
-	end
-      end
-    end
-
-    # List of insecure methods.
-    #
-    # These methods are not callable via dRuby.
-    INSECURE_METHOD = [
-      :__send__
-    ]
-
-    # Has a method been included in the list of insecure methods?
-    def insecure_method?(msg_id)
-      INSECURE_METHOD.include?(msg_id)
-    end
-
-    # Coerce an object to a string, providing our own representation if
-    # to_s is not defined for the object.
-    def any_to_s(obj)
-      obj.to_s rescue sprintf("#<%s:0x%lx>", obj.class, obj.__id__)      
-    end
-
-    # Check that a method is callable via dRuby.
-    #
-    # +obj+ is the object we want to invoke the method on. +msg_id+ is the
-    # method name, as a Symbol.
-    #
-    # If the method is an insecure method (see #insecure_method?) a 
-    # SecurityError is thrown.  If the method is private or undefined,
-    # a NameError is thrown.
-    def check_insecure_method(obj, msg_id)
-      return true if Proc === obj && msg_id == :__drb_yield
-      raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
-      raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
-      unless obj.respond_to?(msg_id)
-	desc = any_to_s(obj)
-	if desc.nil? || desc[0] == '#'
-	  desc << ":#{obj.class}"
-	end
-	
-	if obj.private_methods.include?(msg_id.to_s)
-	  raise NameError, "private method `#{msg_id}' called for #{desc}"
-	else
-	  raise NameError, "undefined method `#{msg_id}' called for #{desc}"
-	end
-      end
-      true
-    end
-    public :check_insecure_method
-
-    class InvokeMethod  # :nodoc:
-      def initialize(drb_server, client)
-	@drb_server = drb_server
-	@client = client
-      end
-
-      def perform
-	@result = nil
-	@succ = false
-	setup_message
-        if @block
-          @result = perform_with_block
-        else
-          @result = perform_without_block
-        end
-	@succ = true
-	if @msg_id == :to_ary && @result.class == Array
-	  @result = DRbArray.new(@result) 
-	end
-	return @succ, @result
-      rescue StandardError, ScriptError, Interrupt
-	@result = $!
-	return @succ, @result
-      end
-
-      private
-      def init_with_client
-	obj, msg, argv, block = @client.recv_request
-        @obj = obj
-        @msg_id = msg.intern
-        @argv = argv
-        @block = block
-      end
-      
-      def check_insecure_method
-        @drb_server.check_insecure_method(@obj, @msg_id)
-      end
-
-      def setup_message
-	init_with_client
-	check_insecure_method
-      end
-      
-      def perform_without_block
-	if Proc === @obj && @msg_id == :__drb_yield
-          if @argv.size == 1
-	    ary = @argv
-	  else
-	    ary = [@argv]
-	  end
-	  ary.collect(&@obj)[0]
-	else
-	  @obj.__send__(@msg_id, *@argv)
-	end
-      end
-
-    end
-
-    if RUBY_VERSION >= '1.8'
-      require 'drb/invokemethod'
-      class InvokeMethod
-        include InvokeMethod18Mixin
-      end
-    else
-      require 'drb/invokemethod16'
-      class InvokeMethod
-        include InvokeMethod16Mixin
-      end
-    end
-
-    # The main loop performed by a DRbServer's internal thread.
-    #
-    # Accepts a connection from a client, and starts up its own
-    # thread to handle it.  This thread loops, receiving requests
-    # from the client, invoking them on a local object, and
-    # returning responses, until the client closes the connection
-    # or a local method call fails.
-    def main_loop
-      Thread.start(@protocol.accept) do |client|
-	@grp.add Thread.current
-	Thread.current['DRb'] = { 'client' => client ,
-	                          'server' => self }
-	loop do
-	  begin
-	    succ = false
-	    invoke_method = InvokeMethod.new(self, client)
-	    succ, result = invoke_method.perform
-	    if !succ && verbose
-	      p result
-	      result.backtrace.each do |x|
-		puts x
-	      end
-	    end
-	    client.send_reply(succ, result) rescue nil
-	  ensure
-	    unless succ
-	      client.close
-	      break
-	    end
-	  end
-	end
-      end
-    end
-  end
-
-  @primary_server = nil
-
-  # Start a dRuby server locally.
-  #
-  # The new dRuby server will become the primary server, even
-  # if another server is currently the primary server.
-  #
-  # +uri+ is the URI for the server to bind to.  If nil,
-  # the server will bind to random port on the default local host
-  # name and use the default dRuby protocol.
-  #
-  # +front+ is the server's front object.  This may be nil.
-  #
-  # +config+ is the configuration for the new server.  This may
-  # be nil.
-  #
-  # See DRbServer::new.
-  def start_service(uri=nil, front=nil, config=nil)
-    @primary_server = DRbServer.new(uri, front, config)
-  end
-  module_function :start_service
-
-  # The primary local dRuby server.
-  #
-  # This is the server created by the #start_service call.  
-  attr_accessor :primary_server
-  module_function :primary_server=, :primary_server
-
-  # Get the 'current' server.
-  #
-  # In the context of execution taking place within the main
-  # thread of a dRuby server (typically, as a result of a remote
-  # call on the server or one of its objects), the current
-  # server is that server.  Otherwise, the current server is
-  # the primary server.
-  #
-  # If the above rule fails to find a server, a DRbServerNotFound
-  # error is raised.
-  def current_server
-    drb = Thread.current['DRb'] 
-    server = (drb && drb['server']) ? drb['server'] : @primary_server 
-    raise DRbServerNotFound unless server
-    return server
-  end
-  module_function :current_server
-
-  # Stop the local dRuby server.
-  #
-  # This operates on the primary server.  If there is no primary
-  # server currently running, it is a noop.
-  def stop_service
-    @primary_server.stop_service if @primary_server
-    @primary_server = nil
-  end
-  module_function :stop_service
-
-  # Get the URI defining the local dRuby space.
-  #
-  # This is the URI of the current server.  See #current_server.
-  def uri
-    current_server.uri
-  end
-  module_function :uri
-
-  # Is +uri+ the URI for the current local server?
-  def here?(uri)
-    (current_server.uri rescue nil) == uri
-  end
-  module_function :here?
-
-  # Get the configuration of the current server.
-  #
-  # If there is no current server, this returns the default configuration.
-  # See #current_server and DRbServer::make_config.
-  def config
-    current_server.config
-  rescue
-    DRbServer.make_config
-  end
-  module_function :config
-  
-  # Get the front object of the current server.
-  #
-  # This raises a DRbServerNotFound error if there is no current server.
-  # See #current_server.
-  def front
-    current_server.front
-  end
-  module_function :front
-
-  # Convert a reference into an object using the current server.
-  #
-  # This raises a DRbServerNotFound error if there is no current server.
-  # See #current_server.
-  def to_obj(ref)
-    current_server.to_obj(ref)
-  end
-
-  # Get a reference id for an object using the current server.
-  #
-  # This raises a DRbServerNotFound error if there is no current server.
-  # See #current_server.
-  def to_id(obj)
-    current_server.to_id(obj)
-  end
-  module_function :to_id
-  module_function :to_obj
-
-  # Get the thread of the primary server.
-  #
-  # This returns nil if there is no primary server.  See #primary_server.
-  def thread
-    @primary_server ? @primary_server.thread : nil
-  end
-  module_function :thread
-
-  # Set the default id conv object.
-  #
-  # See DRbServer#default_id_conv.
-  def install_id_conv(idconv)
-    DRbServer.default_id_conv(idconv)
-  end
-  module_function :install_id_conv
-
-  # Set the default acl.
-  #
-  # See DRb::DRbServer.default_acl.
-  def install_acl(acl)
-    DRbServer.default_acl(acl)
-  end
-  module_function :install_acl
-end
-
-DRbObject = DRb::DRbObject
-DRbUndumped = DRb::DRbUndumped
-DRbIdConv = DRb::DRbIdConv
diff --git a/lib/drb/eq.rb b/lib/drb/eq.rb
deleted file mode 100644
index e24512d6a7..0000000000
--- a/lib/drb/eq.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'drb/drb'
-
-module DRb
-  class DRbObject
-    def ==(other)
-      return false unless DRbObject === other
-     (@ref == other.__drbref) && (@uri == other.__drburi)
-    end
-
-    def hash
-      [@uri, @ref].hash
-    end
-
-    alias eql? ==
-  end
-end
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
deleted file mode 100644
index f05bae5264..0000000000
--- a/lib/drb/extserv.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-=begin
- external service
- 	Copyright (c) 2000,2002 Masatoshi SEKI 
-=end
-
-require 'drb/drb'
-
-module DRb
-  class ExtServ
-    include DRbUndumped
-
-    def initialize(there, name, server=nil)
-      @server = server || DRb::primary_server
-      @name = name
-      ro = DRbObject.new(nil, there)
-      @invoker = ro.regist(name, DRbObject.new(self, @server.uri))
-    end
-    attr_reader :server
-
-    def front
-      DRbObject.new(nil, @server.uri)
-    end
-
-    def stop_service
-      @invoker.unregist(@name)
-      server = @server
-      @server = nil
-      Thread.new do
-	sleep 1
-	server.stop_service
-      end
-      true
-    end
-
-    def alive?
-      @server ? @server.alive? : false
-    end
-  end
-end
-
-if __FILE__ == $0
-  class Foo
-    include DRbUndumped
-
-    def initialize(str)
-      @str = str
-    end
-
-    def hello(it)
-      "#{it}: #{self}"
-    end
-
-    def to_s
-      @str
-    end
-  end
-
-  cmd = ARGV.shift
-  case cmd
-  when 'itest1', 'itest2'
-    front = Foo.new(cmd)
-    manager = DRb::DRbServer.new(nil, front)
-    es = DRb::ExtService.new(ARGV.shift, ARGV.shift, manager)
-    es.server.thread.join
-  end
-end
-
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
deleted file mode 100644
index 50009dbae2..0000000000
--- a/lib/drb/extservm.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-=begin
- external service manager
- 	Copyright (c) 2000 Masatoshi SEKI 
-=end
-
-require 'drb/drb'
-require 'thread'
-
-module DRb
-  class ExtServManager
-    include DRbUndumped
-
-    @@command = {}
-
-    def self.command
-      @@command
-    end
-
-    def self.command=(cmd)
-      @@command = cmd
-    end
-      
-    def initialize
-      @servers = {}
-      @waiting = []
-      @queue = Queue.new
-      @thread = invoke_thread
-    end
-    attr_reader :server
-
-    def service(name)
-      while true
-	server = nil
-	Thread.exclusive do
-	  server = @servers[name] if @servers[name]
-	end
-	return server if server && server.alive?
-	invoke_service(name)
-      end
-    end
-
-    def regist(name, ro)
-      ary = nil
-      Thread.exclusive do
-	@servers[name] = ro
-	ary = @waiting
-	@waiting = []
-      end
-      ary.each do |th|
-	begin
-	  th.run
-	rescue ThreadError
-	end
-      end
-      self
-    end
-    
-    def unregist(name)
-      Thread.exclusive do
-	@servers.delete(name)
-      end
-    end
-
-    private
-    def invoke_thread
-      Thread.new do
-	while true
-	  name = @queue.pop
-	  invoke_service_command(name, @@command[name])
-	end
-      end
-    end
-
-    def invoke_service(name)
-      Thread.critical = true
-      @waiting.push Thread.current
-      @queue.push name
-      Thread.stop
-    end
-
-    def invoke_service_command(name, command)
-      raise "invalid command. name: #{name}" unless command
-      Thread.exclusive do
-	return if @servers.include?(name)
-	@servers[name] = false
-      end
-      if RUBY_PLATFORM =~ /mswin32/
-	system("cmd /c start /b #{command} #{DRb.uri} #{name}")
-      else
-	system("#{command} #{DRb.uri} #{name} &")
-      end
-    end
-  end
-end
diff --git a/lib/drb/gw.rb b/lib/drb/gw.rb
deleted file mode 100644
index 012a2b0a11..0000000000
--- a/lib/drb/gw.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require 'drb/drb'
-require 'monitor'
-
-module DRb
-  class GWIdConv < DRbIdConv
-    def to_obj(ref)
-      if Array === ref && ref[0] == :DRbObject
-        it = DRbObject.new(nil)
-        it.reinit(ref[1], ref[2])
-        return it
-      end
-      super(ref)
-    end
-  end
-
-  class GW
-    include MonitorMixin
-    def initialize
-      super()
-      @hash = {}
-    end
-
-    def [](key)
-      synchronize do
-        @hash[key]
-      end
-    end
-
-    def []=(key, v)
-      synchronize do
-        @hash[key] = v
-      end
-    end
-  end
-
-  class DRbObject
-    def self._load(s)
-      uri, ref = Marshal.load(s)
-      if DRb.uri == uri
-        return ref ? DRb.to_obj(ref) : DRb.front
-      end
-
-      it = self.new(nil)
-      it.reinit(DRb.uri, [:DRbObject, uri, ref])
-      it
-    end
-
-    def _dump(lv)
-      if DRb.uri == @uri
-        if Array === @ref && @ref[0] == :DRbObject
-          Marshal.dump([@ref[1], @ref[2]])
-        else
-          Marshal.dump([@uri, @ref]) # ??
-        end
-      else
-        Marshal.dump([DRb.uri, [:DRbObject, @uri, @ref]])
-      end
-    end
-  end
-end
diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb
deleted file mode 100644
index 412b2ab9b5..0000000000
--- a/lib/drb/invokemethod.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# for ruby-1.8.0
-
-module DRb
-  class DRbServer
-    module InvokeMethod18Mixin
-      def block_yield(x)
-	if x.size == 1 && x[0].class == Array
-	  x[0] = DRbArray.new(x[0])
-	end
-        block_value = @block.call(*x)
-      end
-      
-      def perform_with_block
-        @obj.__send__(@msg_id, *@argv) do |*x|
-          jump_error = nil
-          begin
-            block_value = block_yield(x)
-          rescue LocalJumpError
-            jump_error = $!
-          end
-          if jump_error
-            case jump_error.reason
-            when :retry
-              retry
-            when :break
-              break(jump_error.exit_value)
-            else
-              raise jump_error
-            end
-          end
-          block_value
-        end
-      end
-    end
-  end
-end
diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb
deleted file mode 100644
index e7f1668c52..0000000000
--- a/lib/drb/observer.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'observer'
-
-module DRb
-  module DRbObservable
-    include Observable
-
-    def notify_observers(*arg)
-      if defined? @observer_state and @observer_state
-	if defined? @observer_peers
-	  for i in @observer_peers.dup
-	    begin
-	      i.update(*arg)
-	    rescue
-	      delete_observer(i)
-	    end
-	  end
-	end
-	@observer_state = false
-      end
-    end
-  end
-end
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
deleted file mode 100644
index 1a454a59cc..0000000000
--- a/lib/drb/ssl.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-require 'socket'
-require 'openssl'
-require 'drb/drb'
-require 'singleton'
-
-module DRb
-
-  class DRbSSLSocket < DRbTCPSocket
-
-    class SSLConfig
-
-      DEFAULT = {
-	:SSLCertificate       => nil,
-	:SSLPrivateKey        => nil,
-	:SSLClientCA          => nil,
-	:SSLCACertificatePath => nil,
-	:SSLCACertificateFile => nil,
-	:SSLVerifyMode        => ::OpenSSL::SSL::VERIFY_NONE, 
-	:SSLVerifyDepth       => nil,
-	:SSLVerifyCallback    => nil,   # custom verification
-        :SSLCertificateStore  => nil,
-	# Must specify if you use auto generated certificate.
-	:SSLCertName          => nil,   # e.g. [["CN","fqdn.example.com"]]
-	:SSLCertComment       => "Generated by Ruby/OpenSSL"
-      }
-
-      def initialize(config)
-	@config  = config
-        @cert    = config[:SSLCertificate]
-        @pkey    = config[:SSLPrivateKey]
-        @ssl_ctx = nil
-      end
-
-      def [](key); 
-	@config[key] || DEFAULT[key]
-      end
-
-      def connect(tcp)
-	ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
-	ssl.sync = true
-	ssl.connect
-	ssl
-      end
-      
-      def accept(tcp)
-	ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
-	ssl.sync = true
-	ssl.accept
-	ssl
-      end
-      
-      def setup_certificate
-        if @cert && @pkey
-          return
-        end
-
-	rsa = OpenSSL::PKey::RSA.new(512){|p, n|
-	  next unless self[:verbose]
-	  case p
-	  when 0; $stderr.putc "."  # BN_generate_prime
-	  when 1; $stderr.putc "+"  # BN_generate_prime
-	  when 2; $stderr.putc "*"  # searching good prime,
-	                            # n = #of try,
-                          	    # but also data from BN_generate_prime
-	  when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
-                         	    # but also data from BN_generate_prime
-	  else;   $stderr.putc "*"  # BN_generate_prime
-	  end
-	}
-
-	cert = OpenSSL::X509::Certificate.new
-	cert.version = 3
-	cert.serial = 0
-	name = OpenSSL::X509::Name.new(self[:SSLCertName])
-	cert.subject = name
-	cert.issuer = name
-	cert.not_before = Time.now
-	cert.not_after = Time.now + (365*24*60*60)
-	cert.public_key = rsa.public_key
-	
-	ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
-	cert.extensions = [
-	  ef.create_extension("basicConstraints","CA:FALSE"),
-	  ef.create_extension("subjectKeyIdentifier", "hash") ]
-	ef.issuer_certificate = cert
-	cert.add_extension(ef.create_extension("authorityKeyIdentifier",
-					       "keyid:always,issuer:always"))
-	if comment = self[:SSLCertComment]
-	  cert.add_extension(ef.create_extension("nsComment", comment))
-	end
-	cert.sign(rsa, OpenSSL::Digest::SHA1.new)
-	
-	@cert = cert
-        @pkey = rsa
-      end
-
-      def setup_ssl_context
-        ctx = ::OpenSSL::SSL::SSLContext.new
-        ctx.cert            = @cert
-        ctx.key             = @pkey
-	ctx.client_ca       = self[:SSLClientCA]
-	ctx.ca_path         = self[:SSLCACertificatePath]
-	ctx.ca_file         = self[:SSLCACertificateFile]
-	ctx.verify_mode     = self[:SSLVerifyMode]
-	ctx.verify_depth    = self[:SSLVerifyDepth]
-	ctx.verify_callback = self[:SSLVerifyCallback]
-        ctx.cert_store      = self[:SSLCertificateStore]
-        @ssl_ctx = ctx
-      end
-    end
-
-    def self.parse_uri(uri)
-      if uri =~ /^drbssl:\/\/(.*?):(\d+)(\?(.*))?$/
-	host = $1
-	port = $2.to_i
-	option = $4
-	[host, port, option]
-      else
-	raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
-	raise(DRbBadURI, 'can\'t parse uri:' + uri)
-      end
-    end
-
-    def self.open(uri, config)
-      host, port, option = parse_uri(uri)
-      host.untaint
-      port.untaint
-      soc = TCPSocket.open(host, port)
-      ssl_conf = SSLConfig::new(config)
-      ssl_conf.setup_ssl_context
-      ssl = ssl_conf.connect(soc)
-      self.new(uri, ssl, ssl_conf, true)
-    end
-
-    def self.open_server(uri, config)
-      uri = 'drbssl://:0' unless uri
-      host, port, opt = parse_uri(uri)
-      if host.size == 0
-	soc = TCPServer.open(port)
-	host = Socket.gethostname
-      else
-	soc = TCPServer.open(host, port)
-      end
-      port = soc.addr[1] if port == 0
-      @uri = "drbssl://#{host}:#{port}"
-      
-      ssl_conf = SSLConfig.new(config)
-      ssl_conf.setup_certificate
-      ssl_conf.setup_ssl_context
-      self.new(@uri, soc, ssl_conf, false)
-    end
-
-    def self.uri_option(uri, config)
-      host, port, option = parse_uri(uri)
-      return "drbssl://#{host}:#{port}", option
-    end
-
-    def initialize(uri, soc, config, is_established)
-      @ssl = is_established ? soc : nil
-      super(uri, soc.to_io, config)
-    end
-    
-    def stream; @ssl; end
-
-    def close
-      if @ssl
-	@ssl.close
-	@ssl = nil
-      end
-      super
-    end
-      
-    def accept
-      while true
-	soc = @socket.accept
-	break if (@acl ? @acl.allow_socket?(soc) : true) 
-	soc.close
-      end
-      ssl = @config.accept(soc)
-      self.class.new(uri, ssl, @config, true)
-    end
-  end
-  
-  DRbProtocol.add_protocol(DRbSSLSocket)
-end
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
deleted file mode 100644
index bb2c48d528..0000000000
--- a/lib/drb/timeridconv.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require 'drb/drb'
-require 'monitor'
-
-module DRb
-  class TimerIdConv < DRbIdConv
-    class TimerHolder2
-      include MonitorMixin
-
-      class InvalidIndexError < RuntimeError; end
-
-      def initialize(timeout=600)
-	super()
-	@sentinel = Object.new
-	@gc = {}
-	@curr = {}
-	@renew = {}
-	@timeout = timeout
-	@keeper = keeper
-      end
-
-      def add(obj)
-	synchronize do 
-	  key = obj.__id__
-	  @curr[key] = obj
-	  return key
-	end
-      end
-
-      def fetch(key, dv=@sentinel)
-	synchronize do 
-	  obj = peek(key)
-	  if obj == @sentinel
-	    return dv unless dv == @sentinel
-	    raise InvalidIndexError
-	  end
-	  @renew[key] = obj # KeepIt
-	  return obj
-	end
-      end
-
-      def include?(key)
-	synchronize do 
-	  obj = peek(key)
-	  return false if obj == @sentinel
-	  true
-	end
-      end
-
-      def peek(key)
-	synchronize do 
-	  return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
-	end
-      end
-
-      private
-      def alternate
-	synchronize do
-	  @gc = @curr       # GCed
-	  @curr = @renew
-	  @renew = {}
-	end
-      end
-
-      def keeper
-	Thread.new do
-	  loop do
-	    size = alternate
-	    sleep(@timeout)
-	  end
-	end
-      end
-    end
-
-    def initialize(timeout=600)
-      @holder = TimerHolder2.new(timeout)
-    end
-
-    def to_obj(ref)
-      return super if ref.nil?
-      @holder.fetch(ref)
-    rescue TimerHolder2::InvalidIndexError
-      raise "invalid reference"
-    end
-
-    def to_id(obj)
-      return @holder.add(obj)
-    end
-  end
-end
-
-# DRb.install_id_conv(TimerIdConv.new)
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
deleted file mode 100644
index f51e390808..0000000000
--- a/lib/drb/unix.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-require 'socket'
-require 'drb/drb'
-require 'tmpdir'
-
-raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer)
-
-module DRb
-
-  class DRbUNIXSocket < DRbTCPSocket
-    def self.parse_uri(uri)
-      if /^drbunix:(.*?)(\?(.*))?$/ =~ uri 
-	filename = $1
-	option = $3
-	[filename, option]
-      else
-	raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
-	raise(DRbBadURI, 'can\'t parse uri:' + uri)
-      end
-    end
-
-    def self.open(uri, config)
-      filename, option = parse_uri(uri)
-      filename.untaint
-      soc = UNIXSocket.open(filename)
-      self.new(uri, soc, config)
-    end
-
-    def self.open_server(uri, config)
-      filename, option = parse_uri(uri)
-      if filename.size == 0
-	soc = temp_server
-	uri = 'drbunix:' + soc.path
-      else
-	soc = UNIXServer.open(filename)
-      end
-      owner = config[:UNIXFileOwner]
-      group = config[:UNIXFileGroup]
-      if owner || group
-        require 'etc'
-        owner = Etc.getpwnam( owner ).uid  if owner
-        group = Etc.getgrnam( group ).gid  if group
-        File.chown owner, group, filename
-      end
-      mode = config[:UNIXFileMode]
-      File.chmod(mode, filename) if mode
-
-      self.new(uri, soc, config, true)
-    end
-
-    def self.uri_option(uri, config)
-      filename, option = parse_uri(uri)
-      return "drbunix:#{filename}", option
-    end
-
-    def initialize(uri, soc, config={}, server_mode = false)
-      super(uri, soc, config)
-      set_sockopt(@socket)
-      @server_mode = server_mode
-      @acl = nil
-    end
-    
-    # import from tempfile.rb
-    Max_try = 10
-    private
-    def self.temp_server
-      tmpdir = Dir::tmpdir
-      n = 0
-      while true
-	begin
-	  tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
-	  lock = tmpname + '.lock'
-	  unless File.exist?(tmpname) or File.exist?(lock)
-	    Dir.mkdir(lock)
-	    break
-	  end
-	rescue
-	  raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
-	  #sleep(1)
-	end
-	n += 1
-      end
-      soc = UNIXServer.new(tmpname)
-      Dir.rmdir(lock)
-      soc
-    end
-
-    public
-    def close
-      return unless @socket
-      path = @socket.path
-      @socket.close
-      File.unlink(path) if @server_mode
-      @socket = nil
-    end
-
-    def accept
-      s = @socket.accept
-      self.class.new(nil, s, @config)
-    end
-
-    def set_sockopt(soc)
-      soc.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK) if defined? Fcntl::O_NONBLOCK
-      soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
-    end
-  end
-
-  DRbProtocol.add_protocol(DRbUNIXSocket)
-end
diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index 3e2604af5d..e04ed4a5b4 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -10,7 +10,7 @@
 #
 # U1)
 #   class Foo
-#     extend Exception2MessageMapper
+#     extend Exception2MassageMapper
 #     def_e2message ExistingExceptionClass, "message..."
 #     def_exception :NewExceptionClass, "message..."[, superclass]
 #     ...
@@ -18,13 +18,13 @@
 #
 # U2)
 #   module Error
-#     extend Exception2MessageMapper
+#     extend Exception2MassageMapper
 #     def_e2meggage ExistingExceptionClass, "message..."
 #     def_exception :NewExceptionClass, "message..."[, superclass]
 #     ...
 #   end
 #   class Foo
-#     include Error
+#     include Exp
 #     ...
 #   end
 #
@@ -33,7 +33,7 @@
 #
 # U3)
 #   module Error
-#     extend Exception2MessageMapper
+#     extend Exception2MassageMapper
 #     def_e2message ExistingExceptionClass, "message..."
 #     def_exception :NewExceptionClass, "message..."[, superclass]
 #     ...
@@ -60,7 +60,7 @@ module Exception2MessageMapper
     cl.bind(self) unless cl == E2MM
   end
   
-  # backward compatibility
+  # �����Ȥθߴ����Τ���˻Ĥ��Ƥ���.
   def E2MM.extend_to(b)
     c = eval("self", b)
     c.extend(self)
@@ -69,26 +69,27 @@ module Exception2MessageMapper
   def bind(cl)
     self.module_eval %[
       def Raise(err = nil, *rest)
-	Exception2MessageMapper.Raise(self.class, err, *rest)
+	Exception2MessageMapper.Raise(self.type, err, *rest)
       end
       alias Fail Raise
 
-      def self.included(mod)
+      def self.append_features(mod)
+	super
 	mod.extend Exception2MessageMapper
       end
     ]
   end
 
   # Fail(err, *rest)
-  #	err:	exception
-  #	rest:	message arguments
+  #	err:	�㳰
+  #	rest:	��å��������Ϥ��ѥ�᡼��
   #
   def Raise(err = nil, *rest)
     E2MM.Raise(self, err, *rest)
   end
   alias Fail Raise
 
-  # backward compatibility
+  # ���θߴ����Τ���
   alias fail! fail
   def fail(err = nil, *rest)
     begin 
@@ -105,17 +106,17 @@ module Exception2MessageMapper
   # def_e2message(c, m)
   #	    c:  exception
   #	    m:  message_form
-  #	define exception c with message m.
+  #	�㳰c�Υ�å�������m�Ȥ���.
   #
   def def_e2message(c, m)
     E2MM.def_e2message(self, c, m)
   end
   
-  # def_exception(n, m, s)
+  # def_exception(c, m)
   #	    n:  exception_name
   #	    m:  message_form
-  #	    s:	superclass(default: StandardError)
-  #	define exception named ``c'' with message m.
+  #	    s:	�㳰�����ѡ����饹(�ǥե����: StandardError)
+  #	�㳰̾``c''�����㳰�������, ���Υ�å�������m�Ȥ���.
   #
   def def_exception(n, m, s = StandardError)
     E2MM.def_exception(self, n, m, s)
@@ -128,22 +129,22 @@ module Exception2MessageMapper
   @MessageMap = {}
 
   # E2MM.def_exception(k, e, m)
-  #	    k:  class to define exception under.
+  #	    k:  �㳰��������륯�饹
   #	    e:  exception
   #	    m:  message_form
-  #	define exception c with message m.
+  #	�㳰c�Υ�å�������m�Ȥ���.
   #
   def E2MM.def_e2message(k, c, m)
     E2MM.instance_eval{@MessageMap[[k, c]] = m}
     c
   end
   
-  # E2MM.def_exception(k, n, m, s)
-  #	    k:  class to define exception under.
+  # E2MM.def_exception(k, c, m)
+  #	    k:  �㳰��������륯�饹
   #	    n:  exception_name
   #	    m:  message_form
-  #	    s:	superclass(default: StandardError)
-  #	define exception named ``c'' with message m.
+  #	    s:	�㳰�����ѡ����饹(�ǥե����: StandardError)
+  #	�㳰̾``c''�����㳰�������, ���Υ�å�������m�Ȥ���.
   #
   def E2MM.def_exception(k, n, m, s = StandardError)
     n = n.id2name if n.kind_of?(Fixnum)
@@ -153,9 +154,9 @@ module Exception2MessageMapper
   end
 
   # Fail(klass, err, *rest)
-  #	klass:  class to define exception under.
-  #	err:	exception
-  #	rest:	message arguments
+  #     klass:  �㳰���������Ƥ��륯�饹
+  #	err:	�㳰
+  #	rest:	��å��������Ϥ��ѥ�᡼��
   #
   def E2MM.Raise(klass = E2MM, err = nil, *rest)
     if form = e2mm_message(klass, err)
@@ -176,7 +177,7 @@ module Exception2MessageMapper
   def E2MM.e2mm_message(klass, exp)
     for c in klass.ancestors
       if mes = @MessageMap[[c,exp]]
-	#p mes
+	p mes
 	m = klass.instance_eval('"' + mes + '"')
 	return m
       end
diff --git a/lib/erb.rb b/lib/erb.rb
deleted file mode 100644
index 1b712c92c2..0000000000
--- a/lib/erb.rb
+++ /dev/null
@@ -1,471 +0,0 @@
-# Tiny eRuby --- ERB2
-# Copyright (c) 1999-2000,2002,2003 Masatoshi SEKI 
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-class ERB
-  Revision = '$Date$' 	#'
-
-  def self.version
-    "erb.rb [2.0.4 #{ERB::Revision.split[1]}]"
-  end
-end
-
-# ERB::Compiler
-class ERB
-  class Compiler
-    class PercentLine
-      def initialize(str)
-        @value = str
-      end
-      attr_reader :value
-      alias :to_s :value
-    end
-
-    class Scanner
-      SplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
-
-      @scanner_map = {}
-      def self.regist_scanner(klass, trim_mode, percent)
-	@scanner_map[[trim_mode, percent]] = klass
-      end
-
-      def self.default_scanner=(klass)
-	@default_scanner = klass
-      end
-
-      def self.make_scanner(src, trim_mode, percent)
-	klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
-	klass.new(src, trim_mode, percent)
-      end
-
-      def initialize(src, trim_mode, percent)
-	@src = src
-	@stag = nil
-      end
-      attr_accessor :stag
-
-      def scan; end
-    end
-
-    class TrimScanner < Scanner
-      TrimSplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>\n)|(%>)|(\n)/
-
-      def initialize(src, trim_mode, percent)
-	super
-	@trim_mode = trim_mode
-	@percent = percent
-	if @trim_mode == '>'
-	  @scan_line = self.method(:trim_line1)
-	elsif @trim_mode == '<>'
-	  @scan_line = self.method(:trim_line2)
-	elsif @trim_mode == '-'
-	  @scan_line = self.method(:explicit_trim_line)
-	else
-	  @scan_line = self.method(:scan_line)
-	end
-      end
-      attr_accessor :stag
-      
-      def scan(&block)
-	@stag = nil
-	if @percent
-	  @src.each do |line|
-	    percent_line(line, &block)
-	  end
-	else
-	  @src.each do |line|
-	    @scan_line.call(line, &block)
-	  end
-	end
-	nil
-      end
-
-      def percent_line(line, &block)
-	if @stag || line[0] != ?%
-	  return @scan_line.call(line, &block)
-	end
-
-	line[0] = ''
-	if line[0] == ?%
-	  @scan_line.call(line, &block)
-	else
-          yield(PercentLine.new(line.chomp))
-	end
-      end
-
-      def scan_line(line)
-	line.split(SplitRegexp).each do |token|
-	  next if token.empty?
-	  yield(token)
-	end
-      end
-
-      def trim_line1(line)
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  if token == "%>\n"
-	    yield('%>')
-	    yield(:cr)
-	    break
-	  end
-	  yield(token)
-	end
-      end
-
-      def trim_line2(line)
-	head = nil
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  head = token unless head
-	  if token == "%>\n"
-	    yield('%>')
-	    if  is_erb_stag?(head)
-	      yield(:cr)
-	    else
-	      yield("\n")
-	    end
-	    break
-	  end
-	  yield(token)
-	end
-      end
-
-      ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?\z)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
-      def explicit_trim_line(line)
-	line.split(ExplicitTrimRegexp).each do |token|
-	  next if token.empty?
-	  if @stag.nil? && /[ \t]*<%-/ =~ token
-	    yield('<%')
-	  elsif @stag && /-%>\n/ =~ token
-	    yield('%>')
-	    yield(:cr)
-	  elsif @stag && token == '-%>'
-	    yield('%>')
-	  else
-	    yield(token)
-	  end
-	end
-      end
-
-      ERB_STAG = %w(<%= <%# <%)
-      def is_erb_stag?(s)
-	ERB_STAG.member?(s)
-      end
-    end
-
-    Scanner.default_scanner = TrimScanner
-
-    class SimpleScanner < Scanner
-      def scan
-	@src.each do |line|
-	  line.split(SplitRegexp).each do |token|
-	    next if token.empty?
-	    yield(token)
-	  end
-	end
-      end
-    end
-    
-    Scanner.regist_scanner(SimpleScanner, nil, false)
-
-    begin
-      require 'strscan'
-      class SimpleScanner2 < Scanner
-        def scan
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-            scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-          end
-        end
-      end
-      Scanner.regist_scanner(SimpleScanner2, nil, false)
-
-      class PercentScanner < Scanner
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    if new_line && @stag.nil?
-	      if scanner.scan(/%%/)
-		yield('%')
-		new_line = false
-		next
-	      elsif scanner.scan(/%/)
-		yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
-		next
-	      end
-	    end
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-	    new_line = (elem == "\n")
-          end
-        end
-      end
-      Scanner.regist_scanner(PercentScanner, nil, true)
-
-      class ExplicitScanner < Scanner
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|-%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    if new_line && @stag.nil? && scanner.scan(/[ \t]*<%-/)
-	      yield('<%')
-	      new_line = false
-	      next
-	    end
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-	    new_line = (elem == "\n")
-            yield(text) unless text.empty?
-	    if elem == '-%>'
-	      yield('%>')
-	      if scanner.scan(/(\n|\z)/)
-		yield(:cr)
-		new_line = true
-	      end
-	    elsif elem == '<%-'
-	      yield('<%')
-	    else
-	      yield(elem) unless elem.empty?
-	    end
-          end
-        end
-      end
-      Scanner.regist_scanner(ExplicitScanner, '-', false)
-
-    rescue LoadError
-    end
-
-    class Buffer
-      def initialize(compiler)
-	@compiler = compiler
-	@line = []
-	@script = ""
-	@compiler.pre_cmd.each do |x|
-	  push(x)
-	end
-      end
-      attr_reader :script
-
-      def push(cmd)
-	@line << cmd
-      end
-      
-      def cr
-	@script << (@line.join('; '))
-	@line = []
-	@script << "\n"
-      end
-      
-      def close
-	return unless @line
-	@compiler.post_cmd.each do |x|
-	  push(x)
-	end
-	@script << (@line.join('; '))
-	@line = nil
-      end
-    end
-
-    def compile(s)
-      out = Buffer.new(self)
-
-      content = ''
-      scanner = make_scanner(s)
-      scanner.scan do |token|
-	if scanner.stag.nil?
-	  case token
-          when PercentLine
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-	    content = ''
-            out.push(token.to_s)
-            out.cr
-	  when :cr
-	    out.cr
-	  when '<%', '<%=', '<%#'
-	    scanner.stag = token
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-	    content = ''
-	  when "\n"
-	    content << "\n"
-	    out.push("#{@put_cmd} #{content.dump}")
-	    out.cr
-	    content = ''
-	  when '<%%'
-	    content << '<%'
-	  else
-	    content << token
-	  end
-	else
-	  case token
-	  when '%>'
-	    case scanner.stag
-	    when '<%'
-	      if content[-1] == ?\n
-		content.chop!
-		out.push(content)
-		out.cr
-	      else
-		out.push(content)
-	      end
-	    when '<%='
-	      out.push("#{@put_cmd}((#{content}).to_s)")
-	    when '<%#'
-	      # out.push("# #{content.dump}")
-	    end
-	    scanner.stag = nil
-	    content = ''
-	  when '%%>'
-	    content << '%>'
-	  else
-	    content << token
-	  end
-	end
-      end
-      out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-      out.close
-      out.script
-    end
-
-    def prepare_trim_mode(mode)
-      case mode
-      when 1
-	return [false, '>']
-      when 2
-	return [false, '<>']
-      when 0
-	return [false, nil]
-      when String
-	perc = mode.include?('%')
-	if mode.include?('-')
-	  return [perc, '-']
-	elsif mode.include?('<>')
-	  return [perc, '<>']
-	elsif mode.include?('>')
-	  return [perc, '>']
-	else
-	  [perc, nil]
-	end
-      else
-	return [false, nil]
-      end
-    end
-
-    def make_scanner(src)
-      Scanner.make_scanner(src, @trim_mode, @percent)
-    end
-
-    def initialize(trim_mode)
-      @percent, @trim_mode = prepare_trim_mode(trim_mode)
-      @put_cmd = 'print'
-      @pre_cmd = []
-      @post_cmd = []
-    end
-    attr_reader :percent, :trim_mode
-    attr_accessor :put_cmd, :pre_cmd, :post_cmd
-  end
-end
-
-# ERB
-class ERB
-  def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
-    @safe_level = safe_level
-    compiler = ERB::Compiler.new(trim_mode)
-    set_eoutvar(compiler, eoutvar)
-    @src = compiler.compile(str)
-  end
-  attr :src
-
-  def set_eoutvar(compiler, eoutvar = '_erbout')
-    compiler.put_cmd = "#{eoutvar}.concat"
-
-    cmd = []
-    cmd.push "#{eoutvar} = ''"
-    
-    compiler.pre_cmd = cmd
-
-    cmd = []
-    cmd.push(eoutvar)
-
-    compiler.post_cmd = cmd
-  end
-
-  def run(b=TOPLEVEL_BINDING)
-    print self.result(b)
-  end
-
-  def result(b=TOPLEVEL_BINDING)
-    if @safe_level
-      th = Thread.start { 
-	$SAFE = @safe_level
-	eval(@src, b)
-      }
-      return th.value
-    else
-      return eval(@src, b)
-    end
-  end
-
-  def def_method(mod, methodname, fname='(ERB)')
-    mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
-  end
-
-  def def_module(methodname='erb')
-    mod = Module.new
-    def_method(mod, methodname)
-    mod
-  end
-
-  def def_class(superklass=Object, methodname='result')
-    cls = Class.new(superklass)
-    def_method(cls, methodname)
-    cls
-  end
-end
-
-# ERB::Util
-class ERB
-  module Util
-    public
-    def html_escape(s)
-      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
-    end
-    alias h html_escape
-    
-    def url_encode(s)
-      s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
-    end
-    alias u url_encode
-  end
-end
-
-# ERB::DefMethod
-class ERB
-  module DefMethod
-    public
-    def def_erb_method(methodname, erb)
-      if erb.kind_of? String
-	fname = erb
-	File.open(fname) {|f| erb = ERB.new(f.read) }
-	erb.def_method(self, methodname, fname)
-      else
-	erb.def_method(self, methodname)
-      end
-    end
-    module_function :def_erb_method
-  end
-end
diff --git a/lib/eregex.rb b/lib/eregex.rb
index cc7a7f6f46..384d531e0f 100644
--- a/lib/eregex.rb
+++ b/lib/eregex.rb
@@ -1,4 +1,3 @@
-# this is just a proof of concept toy.
 
 class RegOr
   def initialize(re1, re2)
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
deleted file mode 100644
index e65033f9bd..0000000000
--- a/lib/fileutils.rb
+++ /dev/null
@@ -1,860 +0,0 @@
-# 
-# = fileutils.rb
-# 
-# Copyright (c) 2000-2003 Minero Aoki <aamine@loveruby.net>
-# 
-# This program is free software.
-# You can distribute/modify this program under the same terms of ruby.
-# 
-# == module FileUtils
-# 
-# Namespace for several file utility methods for copying, moving, removing, etc.
-# 
-# === Module Functions
-# 
-#   cd( dir, options )
-#   cd( dir, options ) {|dir| .... }
-#   pwd()
-#   mkdir( dir, options )
-#   mkdir_p( dir, options )
-#   rmdir( dir, options )
-#   ln( old, new, options )
-#   ln( list, destdir, options )
-#   ln_s( old, new, options )
-#   ln_s( list, destdir, options )
-#   ln_sf( src, dest, options )
-#   cp( src, dest, options )
-#   cp( list, dir, options )
-#   cp_r( src, dest, options )
-#   cp_r( list, dir, options )
-#   mv( src, dest, options )
-#   mv( list, dir, options )
-#   rm( list, options )
-#   rm_r( list, options )
-#   rm_rf( list, options )
-#   install( src, dest, mode = <src's>, options )
-#   chmod( mode, list, options )
-#   touch( list, options )
-#
-# The <tt>options</tt> parameter is a hash of options, taken from the list
-# +:force+, +:noop+, +:preserve+, and +:verbose+.  +:noop+ means that no changes
-# are made.  The other two are obvious.  Each method documents the options that
-# it honours.
-#
-# All methods that have the concept of a "source" file or directory can take
-# either one file or a list of files in that argument.  See the method
-# documentation for examples.
-#
-# There are some `low level' methods, which does not accept any option:
-#
-#   uptodate?( file, cmp_list )
-#   copy_file( srcfilename, destfilename )
-#   copy_stream( srcstream, deststream )
-#   compare_file( file_a, file_b )
-#   compare_stream( stream_a, stream_b )
-#
-# == module FileUtils::Verbose
-# 
-# This module has all methods of FileUtils module, but it outputs messages
-# before acting.  This equates to passing the +:verbose+ flag to methods in
-# FileUtils.
-# 
-# == module FileUtils::NoWrite
-# 
-# This module has all methods of FileUtils module, but never changes
-# files/directories.  This equates to passing the +:noop+ flag to methods in
-# FileUtils.
-# 
-
-
-module FileUtils
-
-  # All methods are module_function.
-
-  #
-  # Options: (none)
-  #
-  # Returns the name of the current directory.
-  #
-  def pwd
-    Dir.pwd
-  end
-
-  alias getwd pwd
-
-  #
-  # Options: noop verbose
-  # 
-  # Changes the current directory to the directory +dir+.
-  # 
-  # If this method is called with block, resumes to the old
-  # working directory after the block execution finished.
-  # 
-  #   FileUtils.cd('/', :verbose => true)   # chdir and report it
-  # 
-  def cd( dir, options = {}, &block ) # :yield: dir
-    fu_check_options options, :noop, :verbose
-    fu_output_message "cd #{dir}" if options[:verbose]
-    Dir.chdir(dir, &block) unless options[:noop]
-    fu_output_message 'cd -' if options[:verbose] and block
-  end
-
-  alias chdir cd
-
-
-  #
-  # Options: (none)
-  # 
-  # Returns true if +newer+ is newer than all +old_list+.
-  # Non-existent files are older than any file.
-  # 
-  #   FileUtils.uptodate?('hello.o', %w(hello.c hello.h)) or \
-  #       system 'make hello.o'
-  # 
-  def uptodate?( new, old_list, options = nil )
-    raise ArgumentError, 'uptodate? does not accept any option' if options
-
-    return false unless FileTest.exist?(new)
-    new_time = File.mtime(new)
-    old_list.each do |old|
-      if FileTest.exist?(old)
-        return false unless new_time > File.mtime(old)
-      end
-    end
-    true
-  end
-
-
-  #
-  # Options: mode noop verbose
-  # 
-  # Creates one or more directories.
-  # 
-  #   FileUtils.mkdir 'test'
-  #   FileUtils.mkdir %w( tmp data )
-  #   FileUtils.mkdir 'notexist', :noop => true  # Does not really create.
-  #   FileUtils.mkdir 'tmp', :mode => 0700
-  # 
-  def mkdir( list, options = {} )
-    fu_check_options options, :mode, :noop, :verbose
-    list = fu_list(list)
-    fu_output_message "mkdir #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    mode = options[:mode] || (0777 & ~File.umask)
-    list.each do |dir|
-      Dir.mkdir dir, mode
-    end
-  end
-
-  #
-  # Options: mode noop verbose
-  # 
-  # Creates a directory and all its parent directories.
-  # For example,
-  # 
-  #   FileUtils.mkdir_p '/usr/local/lib/ruby'
-  # 
-  # causes to make following directories, if it does not exist.
-  #     * /usr
-  #     * /usr/local
-  #     * /usr/local/lib
-  #     * /usr/local/lib/ruby
-  #
-  # You can pass several directories at a time in a list.
-  # 
-  def mkdir_p( list, options = {} )
-    fu_check_options options, :mode, :noop, :verbose
-    list = fu_list(list)
-    fu_output_message "mkdir -p #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}" if options[:verbose]
-    return *list if options[:noop]
-
-    mode = options[:mode] || (0777 & ~File.umask)
-    list.map {|n| File.expand_path(n) }.each do |dir|
-      stack = []
-      until FileTest.directory?(dir)
-        stack.push dir
-        dir = File.dirname(dir)
-      end
-      stack.reverse_each do |n|
-        Dir.mkdir n, mode
-      end
-    end
-
-    return *list
-  end
-
-  alias mkpath    mkdir_p
-  alias makedirs  mkdir_p
-
-
-  #
-  # Options: noop, verbose
-  # 
-  # Removes one or more directories.
-  # 
-  #   FileUtils.rmdir 'somedir'
-  #   FileUtils.rmdir %w(somedir anydir otherdir)
-  #   # Does not really remove directory; outputs message.
-  #   FileUtils.rmdir 'somedir', :verbose => true, :noop => true
-  # 
-  def rmdir( list, options = {} )
-    fu_check_options options, :noop, :verbose
-    list = fu_list(list)
-    fu_output_message "rmdir #{list.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    list.each do |dir|
-      Dir.rmdir dir
-    end
-  end
-
-
-  #
-  # Options: force noop verbose
-  #
-  # <b><tt>ln( old, new, options = {} )</tt></b>
-  #
-  # Creates a hard link +new+ which points to +old+.
-  # If +new+ already exists and it is a directory, creates a symbolic link +new/old+.
-  # If +new+ already exists and it is not a directory, raises Errno::EEXIST.
-  # But if :force option is set, overwrite +new+.
-  # 
-  #   FileUtils.ln 'gcc', 'cc', :verbose => true
-  #   FileUtils.ln '/usr/bin/emacs21', '/usr/bin/emacs'
-  # 
-  # <b><tt>ln( list, destdir, options = {} )</tt></b>
-  # 
-  # Creates several hard links in a directory, with each one pointing to the
-  # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
-  # 
-  #   include FileUtils
-  #   cd '/bin'
-  #   ln %w(cp mv mkdir), '/usr/bin'   # Now /usr/bin/cp and /bin/cp are linked.
-  # 
-  def ln( src, dest, options = {} )
-    fu_check_options options, :force, :noop, :verbose
-    fu_output_message "ln#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    fu_each_src_dest(src, dest) do |s,d|
-      remove_file d, true if options[:force]
-      File.link s, d
-    end
-  end
-
-  alias link ln
-
-  #
-  # Options: force noop verbose
-  #
-  # <b><tt>ln_s( old, new, options = {} )</tt></b>
-  # 
-  # Creates a symbolic link +new+ which points to +old+.  If +new+ already
-  # exists and it is a directory, creates a symbolic link +new/old+.  If +new+
-  # already exists and it is not a directory, raises Errno::EEXIST.  But if
-  # :force option is set, overwrite +new+.
-  # 
-  #   FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
-  #   FileUtils.ln_s 'verylongsourcefilename.c', 'c', :force => true
-  # 
-  # <b><tt>ln_s( list, destdir, options = {} )</tt></b>
-  # 
-  # Creates several symbolic links in a directory, with each one pointing to the
-  # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
-  #
-  # If +destdir+ is not a directory, raises Errno::ENOTDIR.
-  # 
-  #   FileUtils.ln_s Dir.glob('bin/*.rb'), '/home/aamine/bin'
-  # 
-  def ln_s( src, dest, options = {} )
-    fu_check_options options, :force, :noop, :verbose
-    fu_output_message "ln -s#{options[:force] ? 'f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    fu_each_src_dest(src, dest) do |s,d|
-      remove_file d, true if options[:force]
-      File.symlink s, d
-    end
-  end
-
-  alias symlink ln_s
-
-  #
-  # Options: noop verbose
-  # 
-  # Same as
-  #   #ln_s(src, dest, :force)
-  # 
-  def ln_sf( src, dest, options = {} )
-    fu_check_options options, :noop, :verbose
-    options = options.dup
-    options[:force] = true
-    ln_s src, dest, options
-  end
-
-
-  #
-  # Options: preserve noop verbose
-  #
-  # Copies a file +src+ to +dest+. If +dest+ is a directory, copies
-  # +src+ to +dest/src+.
-  #
-  # If +src+ is a list of files, then +dest+ must be a directory.
-  #
-  #   FileUtils.cp 'eval.c', 'eval.c.org'
-  #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6'
-  #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6', :verbose => true
-  # 
-  def cp( src, dest, options = {} )
-    fu_check_options options, :preserve, :noop, :verbose
-    fu_output_message "cp#{options[:preserve] ? ' -p' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    fu_each_src_dest(src, dest) do |s,d|
-      fu_preserve_attr(options[:preserve], s, d) {
-          copy_file s, d
-      }
-    end
-  end
-
-  alias copy cp
-
-  #
-  # Options: preserve noop verbose
-  # 
-  # Copies +src+ to +dest+. If +src+ is a directory, this method copies
-  # all its contents recursively. If +dest+ is a directory, copies
-  # +src+ to +dest/src+.
-  #
-  # +src+ can be a list of files.
-  # 
-  #   # Installing ruby library "mylib" under the site_ruby
-  #   FileUtils.rm_r site_ruby + '/mylib', :force
-  #   FileUtils.cp_r 'lib/', site_ruby + '/mylib'
-  # 
-  #   # Examples of copying several files to target directory.
-  #   FileUtils.cp_r %w(mail.rb field.rb debug/), site_ruby + '/tmail'
-  #   FileUtils.cp_r Dir.glob('*.rb'), '/home/aamine/lib/ruby', :noop, :verbose
-  # 
-  def cp_r( src, dest, options = {} )
-    fu_check_options options, :preserve, :noop, :verbose
-    fu_output_message "cp -r#{options[:preserve] ? 'p' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    fu_each_src_dest(src, dest) do |s,d|
-      if FileTest.directory?(s)
-        fu_copy_dir s, d, '.', options[:preserve]
-      else
-        fu_p_copy s, d, options[:preserve]
-      end
-    end
-  end
-
-  def fu_copy_dir( src, dest, rel, preserve ) #:nodoc:
-    fu_preserve_attr(preserve, "#{src}/#{rel}", "#{dest}/#{rel}") {|s,d|
-        dir = File.expand_path(d)   # to remove '/./'
-        Dir.mkdir dir unless FileTest.directory? dir
-    }
-    Dir.entries("#{src}/#{rel}").each do |fname|
-      if FileTest.directory? File.join(src,rel,fname)
-        next if /\A\.\.?\z/ === fname
-        fu_copy_dir src, dest, "#{rel}/#{fname}", preserve
-      else
-        fu_p_copy File.join(src,rel,fname), File.join(dest,rel,fname), preserve
-      end
-    end
-  end
-  private :fu_copy_dir
-
-  def fu_p_copy( src, dest, really ) #:nodoc:
-    fu_preserve_attr(really, src, dest) {
-        copy_file src, dest
-    }
-  end
-  private :fu_p_copy
-
-  def fu_preserve_attr( really, src, dest ) #:nodoc:
-    unless really
-      yield src, dest
-      return
-    end
-
-    st = File.stat(src)
-    yield src, dest
-    File.utime st.atime, st.mtime, dest
-    begin
-      File.chown st.uid, st.gid, dest
-    rescue Errno::EPERM
-      File.chmod st.mode & 01777, dest   # clear setuid/setgid
-    else
-      File.chmod st.mode, dest
-    end
-  end
-  private :fu_preserve_attr
-
-  #
-  # Copies file +src+ to +dest+.
-  # Both of +src+ and +dest+ must be a filename.
-  #
-  def copy_file( src, dest )
-    File.open(src,  'rb') {|r|
-      File.open(dest, 'wb') {|w|
-        copy_stream r, w
-      }
-    }
-  end
-
-  #
-  # Copies stream +src+ to +dest+.
-  # Both of +src+ and +dest+ must be a IO.
-  #
-  def copy_stream( src, dest )
-    bsize = fu_stream_blksize(src, dest)
-    begin
-      while true
-        dest.syswrite src.sysread(bsize)
-      end
-    rescue EOFError
-    end
-  end
-
-  #
-  # Options: noop verbose
-  # 
-  # Moves file(s) +src+ to +dest+.  If +file+ and +dest+ exist on the different
-  # disk partition, the file is copied instead.
-  # 
-  #   FileUtils.mv 'badname.rb', 'goodname.rb'
-  #   FileUtils.mv 'stuff.rb', 'lib/ruby', :force => true
-  # 
-  #   FileUtils.mv %w(junk.txt dust.txt), '/home/aamine/.trash/'
-  #   FileUtils.mv Dir.glob('test*.rb'), 'test', :noop, :verbose => true
-  # 
-  def mv( src, dest, options = {} )
-    fu_check_options options, :noop, :verbose
-    fu_output_message "mv #{[src,dest].flatten.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    fu_each_src_dest(src, dest) do |s,d|
-      if cannot_overwrite_file? and FileTest.file?(d)
-        File.unlink d
-      end
-
-      begin
-        File.rename s, d
-      rescue
-        if FileTest.symlink?(s)
-          File.symlink File.readlink(s), dest
-          File.unlink s
-        else
-          st = File.stat(s)
-          copy_file s, d
-          File.unlink s
-          File.utime st.atime, st.mtime, d
-          begin
-            File.chown st.uid, st.gid, d
-          rescue
-            # ignore
-          end
-        end
-      end
-    end
-  end
-
-  alias move mv
-
-  def cannot_overwrite_file? #:nodoc:
-    /djgpp|cygwin|mswin32/ === RUBY_PLATFORM
-  end
-  private :cannot_overwrite_file?
-
-
-  #
-  # Options: force noop verbose
-  # 
-  # Remove file(s) specified in +list+.  This method cannot remove directories.
-  # All errors are ignored when the :force option is set.
-  # 
-  #   FileUtils.rm %w( junk.txt dust.txt )
-  #   FileUtils.rm Dir.glob('*.so')
-  #   FileUtils.rm 'NotExistFile', :force => true   # never raises exception
-  # 
-  def rm( list, options = {} )
-    fu_check_options options, :force, :noop, :verbose
-    list = fu_list(list)
-    fu_output_message "rm#{options[:force] ? ' -f' : ''} #{list.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    list.each do |fname|
-      remove_file fname, options[:force]
-    end
-  end
-
-  alias remove rm
-
-  #
-  # Options: noop verbose
-  # 
-  # Same as
-  #   #rm(list, :force)
-  #
-  def rm_f( list, options = {} )
-    fu_check_options options, :noop, :verbose
-    options = options.dup
-    options[:force] = true
-    rm list, options
-  end
-
-  alias safe_unlink rm_f
-
-  #
-  # Options: force noop verbose
-  # 
-  # remove files +list+[0] +list+[1]... If +list+[n] is a directory,
-  # removes its all contents recursively. This method ignores
-  # StandardError when :force option is set.
-  # 
-  #   FileUtils.rm_r Dir.glob('/tmp/*')
-  #   FileUtils.rm_r '/', :force => true          #  :-)
-  # 
-  def rm_r( list, options = {} )
-    fu_check_options options, :force, :noop, :verbose
-    list = fu_list(list)
-    fu_output_message "rm -r#{options[:force] ? 'f' : ''} #{list.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    list.each do |fname|
-      begin
-        st = File.lstat(fname)
-      rescue
-        next if options[:force]
-        raise
-      end
-      if    st.symlink?   then remove_file fname, options[:force]
-      elsif st.directory? then remove_dir fname, options[:force]
-      else                     remove_file fname, options[:force]
-      end
-    end
-  end
-
-  #
-  # Options: noop verbose
-  # 
-  # Same as 
-  #   #rm_r(list, :force => true)
-  # 
-  def rm_rf( list, options = {} )
-    fu_check_options options, :noop, :verbose
-    options = options.dup
-    options[:force] = true
-    rm_r list, options
-  end
-
-  alias rmtree rm_rf
-
-  def remove_file( fname, force = false ) #:nodoc:
-    first_time_p = true
-    begin
-      File.unlink fname
-    rescue Errno::ENOENT
-      raise unless force
-    rescue
-      if first_time_p
-        # try once more for Windows
-        first_time_p = false
-        File.chmod 0777, fname
-        retry
-      end
-      raise
-    end
-  end
-
-  def remove_dir( dir, force = false ) #:nodoc:
-    Dir.foreach(dir) do |file|
-      next if /\A\.\.?\z/ === file
-      path = "#{dir}/#{file}"
-      if FileTest.directory? path
-        remove_dir path, force
-      else
-        remove_file path, force
-      end
-    end
-    begin
-      Dir.rmdir dir
-    rescue Errno::ENOENT
-      raise unless force
-    end
-  end
-
-
-  #
-  # Returns true if the contents of a file A and a file B are identical.
-  # 
-  #   FileUtils.compare_file('somefile', 'somefile')  #=> true
-  #   FileUtils.compare_file('/bin/cp', '/bin/mv')    #=> maybe false
-  #
-  def compare_file( a, b )
-    return false unless File.size(a) == File.size(b)
-    File.open(a, 'rb') {|fa|
-    File.open(b, 'rb') {|fb|
-        return compare_stream(fa, fb)
-    } }
-  end
-
-  alias identical? compare_file
-  alias cmp compare_file
-
-  #
-  # Returns true if the contents of a stream +a+ and +b+ are identical.
-  #
-  def compare_stream( a, b )
-    bsize = fu_stream_blksize(a, b)
-    sa = sb = nil
-    while sa == sb
-      sa = a.read(bsize)
-      sb = b.read(bsize)
-      unless sa and sb
-        if sa.nil? and sb.nil?
-          return true
-        end
-      end
-    end
-    false
-  end
-
-
-  #
-  # Options: mode noop verbose
-  # 
-  # If +src+ is not same as +dest+, copies it and changes the permission
-  # mode to +mode+.  If +dest+ is a directory, destination is +dest+/+src+.
-  # 
-  #   FileUtils.install 'ruby', '/usr/local/bin/ruby', :mode => 0755, :verbose => true
-  #   FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', :verbose => true
-  # 
-  def install( src, dest, options = {} )
-    fu_check_options options, :mode, :preserve, :noop, :verbose
-    fu_output_message "install -c#{options[:preserve] && ' -p'}#{options[:mode] ? (' -m 0%o' % options[:mode]) : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    fu_each_src_dest(src, dest) do |s,d|
-      unless FileTest.exist?(d) and compare_file(s,d)
-	remove_file d, true
-	st = File.stat(s) if options[:preserve]
-	copy_file s, d
-	File.utime st.atime, st.mtime, d if options[:preserve]
-	File.chmod options[:mode], d if options[:mode]
-      end
-    end
-  end
-
-
-  #
-  # Options: noop verbose
-  # 
-  # Changes permission bits on the named files (in +list+) to the bit pattern
-  # represented by +mode+.
-  # 
-  #   FileUtils.chmod 0755, 'somecommand'
-  #   FileUtils.chmod 0644, %w(my.rb your.rb his.rb her.rb)
-  #   FileUtils.chmod 0755, '/usr/bin/ruby', :verbose => true
-  # 
-  def chmod( mode, list, options = {} )
-    fu_check_options options, :noop, :verbose
-    list = fu_list(list)
-    fu_output_message sprintf('chmod %o %s', mode, list.join(' ')) if options[:verbose]
-    return if options[:noop]
-    File.chmod mode, *list
-  end
-
-
-  #
-  # Options: noop verbose
-  # 
-  # Updates modification time (mtime) and access time (atime) of file(s) in
-  # +list+.  Files are created if they don't exist.
-  # 
-  #   FileUtils.touch 'timestamp'
-  #   FileUtils.touch Dir.glob('*.c');  system 'make'
-  # 
-  def touch( list, options = {} )
-    fu_check_options options, :noop, :verbose
-    list = fu_list(list)
-    fu_output_message "touch #{list.join ' '}" if options[:verbose]
-    return if options[:noop]
-
-    t = Time.now
-    list.each do |fname|
-      begin
-        File.utime(t, t, fname)
-      rescue Errno::ENOENT
-        File.open(fname, 'a') {
-            ;
-        }
-      end
-    end
-  end
-
-  private
-
-  def fu_check_options( options, *optdecl )
-    h = options.dup
-    optdecl.each do |name|
-      h.delete name
-    end
-    raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
-  end
-
-  def fu_list( arg )
-    Array === arg ? arg : [arg]
-  end
-
-  def fu_each_src_dest( src, dest )
-    unless Array === src
-      yield src, fu_dest_filename(src, dest)
-    else
-      dir = dest
-      # FileTest.directory? dir or raise ArgumentError, "must be dir: #{dir}"
-      dir += (dir[-1,1] == '/') ? '' : '/'
-      src.each do |fname|
-        yield fname, dir + File.basename(fname)
-      end
-    end
-  end
-
-  def fu_dest_filename( src, dest )
-    if FileTest.directory? dest
-      (dest[-1,1] == '/' ? dest : dest + '/') + File.basename(src)
-    else
-      dest
-    end
-  end
-
-  def fu_stream_blksize( *streams )
-    streams.each do |s|
-      next unless s.respond_to?(:stat)
-      size = s.stat.blksize
-      return size unless size.nil? or size.zero?
-    end
-    1024
-  end
-
-  @fileutils_output = $stderr
-  @fileutils_label  = ''
-
-  def fu_output_message( msg )
-    @fileutils_output ||= $stderr
-    @fileutils_label  ||= ''
-    @fileutils_output.puts @fileutils_label + msg
-  end
-
-  def fu_update_option( args, new )
-    if Hash === args.last
-      args.last.update new
-    else
-      args.push new
-    end
-    args
-  end
-
-
-  extend self
-
-
-  OPT_TABLE = {
-    'pwd'          => %w(),
-    'cd'           => %w( noop verbose ),
-    'chdir'        => %w( noop verbose ),
-    'chmod'        => %w( noop verbose ),
-    'copy'         => %w( preserve noop verbose ),
-    'cp'           => %w( preserve noop verbose ),
-    'cp_r'         => %w( preserve noop verbose ),
-    'install'      => %w( preserve mode noop verbose ),
-    'link'         => %w( force noop verbose ),
-    'ln'           => %w( force noop verbose ),
-    'ln_s'         => %w( force noop verbose ),
-    'ln_sf'        => %w( noop verbose ),
-    'makedirs'     => %w( noop verbose ),
-    'mkdir'        => %w( mode noop verbose ),
-    'mkdir_p'      => %w( mode noop verbose ),
-    'mkpath'       => %w( noop verbose ),
-    'move'         => %w( noop verbose ),
-    'mv'           => %w( noop verbose ),
-    'remove'       => %w( force noop verbose ),
-    'rm'           => %w( force noop verbose ),
-    'rm_f'         => %w( noop verbose ),
-    'rm_r'         => %w( force noop verbose ),
-    'rm_rf'        => %w( noop verbose ),
-    'rmtree'       => %w( noop verbose ),
-    'rmdir'        => %w( noop verbose ),
-    'safe_unlink'  => %w( noop verbose ),
-    'symlink'      => %w( force noop verbose ),
-    'touch'        => %w( noop verbose )
-  }
-
-
-  # 
-  # This module has all methods of FileUtils module, but it outputs messages
-  # before acting.  This equates to passing the +:verbose+ flag to methods in
-  # FileUtils.
-  # 
-  module Verbose
-
-    include FileUtils
-
-    @fileutils_output  = $stderr
-    @fileutils_label   = ''
-    @fileutils_verbose = true
-
-    FileUtils::OPT_TABLE.each do |name, opts|
-      next unless opts.include?('verbose')
-      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        def #{name}( *args )
-          @fileutils_verbose = true unless defined?(@fileutils_verbose)
-          super(*fu_update_option(args, :verbose => @fileutils_verbose))
-        end
-      EOS
-    end
-
-    extend self
-
-  end
-
-
-  # 
-  # This module has all methods of FileUtils module, but never changes
-  # files/directories.  This equates to passing the +:noop+ flag to methods in
-  # FileUtils.
-  # 
-  module NoWrite
-
-    include FileUtils
-
-    @fileutils_output  = $stderr
-    @fileutils_label   = ''
-    @fileutils_nowrite = true
-
-    FileUtils::OPT_TABLE.each do |name, opts|
-      next unless opts.include? 'noop'
-      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        def #{name}( *args )
-          unless defined?(@fileutils_nowrite)
-            @fileutils_nowrite ||= true
-          end
-          super(*fu_update_option(args, :noop => true))
-        end
-      EOS
-    end
-
-    extend self
-  
-  end
-
-end
-
-
-# Documentation comments:
-#  - Some RDoc markup used here doesn't work (namely, +file1+, +:noop+,
-#    +dir/file+).  I consider this a bug and expect that these will be valid in
-#    the near future.
diff --git a/lib/final.rb b/lib/final.rb
new file mode 100644
index 0000000000..cdffd941e7
--- /dev/null
+++ b/lib/final.rb
@@ -0,0 +1,41 @@
+#
+# $Id$
+# Copyright (C) 1998 Yukihiro Matsumoto. All rights reserved. 
+
+# The ObjectSpace extension:
+#
+#  ObjectSpace.define_finalizer(obj, proc=lambda())
+#
+#    Defines the finalizer for the specified object.
+#
+#  ObjectSpace.undefine_finalizer(obj)
+#
+#    Removes the finalizers for the object.  If multiple finalizers are
+#    defined for the object,  all finalizers will be removed.
+#
+
+module ObjectSpace
+  Finalizers = {}
+  def define_finalizer(obj, proc=lambda())
+    ObjectSpace.call_finalizer(obj)
+    if assoc = Finalizers[obj.id]
+      assoc.push(proc)
+    else
+      Finalizers[obj.id] = [proc]
+    end
+  end
+  def undefine_finalizer(obj)
+    Finalizers.delete(obj.id)
+  end
+  module_function :define_finalizer, :undefine_finalizer
+
+  Generic_Finalizer = proc {|id|
+    if Finalizers.key? id
+      for proc in Finalizers[id]
+	proc.call(id)
+      end
+      Finalizers.delete(id)
+    end
+  }
+  add_finalizer Generic_Finalizer
+end
diff --git a/lib/finalize.rb b/lib/finalize.rb
index ed1ccc830f..3cf79ff92f 100644
--- a/lib/finalize.rb
+++ b/lib/finalize.rb
@@ -32,7 +32,7 @@
 #	finalize all dependants connected by dependency R_*(obj, dependtant).
 #   finalize_by_dependant(dependant, method = :finalize)
 #	finalize the dependant connected by dependency R_method(*, dependtant).
-#   finalize_all_by_dependant(dependant)
+#   fainalize_all_by_dependant(dependant)
 #	finalize all dependants connected by dependency R_*(*, dependant).
 #   finalize_all
 #	finalize all dependency registered to the Finalizer.
@@ -43,144 +43,159 @@
 
 module Finalizer
   RCS_ID='-$Id: finalize.rb,v 1.4 1998/02/27 05:34:33 keiju Exp keiju $-'
-
-  class <<self
-    # @dependency: {id => [[dependant, method, *opt], ...], ...}
-
-    # add dependency R_method(obj, dependant)
-    def add_dependency(obj, dependant, method = :finalize, *opt)
-      ObjectSpace.call_finalizer(obj)
-      method = method.intern unless method.kind_of?(Integer)
-      assoc = [dependant, method].concat(opt)
-      if dep = @dependency[obj.object_id]
-	dep.push assoc
-      else
-	@dependency[obj.object_id] = [assoc]
-      end
+  
+  # @dependency: {id => [[dependant, method, *opt], ...], ...}
+  
+  # add dependency R_method(obj, dependant)
+  def add_dependency(obj, dependant, method = :finalize, *opt)
+    ObjectSpace.call_finalizer(obj)
+    method = method.intern unless method.kind_of?(Integer)
+    assoc = [dependant, method].concat(opt)
+    if dep = @dependency[obj.id]
+      dep.push assoc
+    else
+      @dependency[obj.id] = [assoc]
     end
-    alias add add_dependency
-
-    # delete dependency R_method(obj, dependant)
-    def delete_dependency(id, dependant, method = :finalize)
-      id = id.object_id unless id.kind_of?(Integer)
-      method = method.intern unless method.kind_of?(Integer)
-      for assoc in @dependency[id]
-	assoc.delete_if do
-	  |d, m, *o|
-	  d == dependant && m == method
-	end
-	@dependency.delete(id) if assoc.empty?
-      end
-    end
-    alias delete delete_dependency
-
-    # delete dependency R_*(obj, dependant)
-    def delete_all_dependency(id, dependant)
-      id = id.object_id unless id.kind_of?(Integer)
-      method = method.intern unless method.kind_of?(Integer)
-      for assoc in @dependency[id]
-	assoc.delete_if do
-	  |d, m, *o|
-	  d == dependant
-	end
-	@dependency.delete(id) if assoc.empty?
+  end
+  alias add add_dependency
+  
+  # delete dependency R_method(obj, dependant)
+  def delete_dependency(id, dependant, method = :finalize)
+    id = id.id unless id.kind_of?(Integer)
+    method = method.intern unless method.kind_of?(Integer)
+    for assoc in @dependency[id]
+      assoc.delete_if do
+	|d, m, *o|
+	d == dependant && m == method
       end
+      @dependency.delete(id) if assoc.empty?
     end
-
-    # delete dependency R_method(*, dependant)
-    def delete_by_dependant(dependant, method = :finalize)
-      method = method.intern unless method.kind_of?(Integer)
-      for id in @dependency.keys
-	delete(id, dependant, method)
+  end
+  alias delete delete_dependency
+  
+  # delete dependency R_*(obj, dependant)
+  def delete_all_dependency(id, dependant)
+    id = id.id unless id.kind_of?(Integer)
+    method = method.intern unless method.kind_of?(Integer)
+    for assoc in @dependency[id]
+      assoc.delete_if do
+	|d, m, *o|
+	d == dependant
       end
+      @dependency.delete(id) if assoc.empty?
     end
-
-    # delete dependency R_*(*, dependant)
-    def delete_all_by_dependant(dependant)
-      for id in @dependency.keys
-	delete_all_dependency(id, dependant)
-      end
+  end
+  
+  # delete dependency R_method(*, dependant)
+  def delete_by_dependant(dependant, method = :finalize)
+    method = method.intern unless method.kind_of?(Integer)
+    for id in @dependency.keys
+      delete(id, dependant, method)
     end
-
-    # finalize the depandant connected by dependency R_method(obj, dependtant)
-    def finalize_dependency(id, dependant, method = :finalize)
-      id = id.object_id unless id.kind_of?(Integer)
-      method = method.intern unless method.kind_of?(Integer)
-      for assocs in @dependency[id]
-	assocs.delete_if do
-	  |d, m, *o|
-	  d.send(m, id, *o) if ret = d == dependant && m == method
-	  ret
-	end
-	@dependency.delete(id) if assoc.empty?
-      end
+  end
+  
+  # delete dependency R_*(*, dependant)
+  def delete_all_by_dependant(dependant)
+    for id in @dependency.keys
+      delete_all_dependency(id, dependant)
     end
-    alias finalize finalize_dependency
-
-    # finalize all dependants connected by dependency R_*(obj, dependtant)
-    def finalize_all_dependency(id, dependant)
-      id = id.object_id unless id.kind_of?(Integer)
-      method = method.intern unless method.kind_of?(Integer)
-      for assoc in @dependency[id]
-	assoc.delete_if do
-	  |d, m, *o|
-	  d.send(m, id, *o) if ret = d == dependant
-	end
-	@dependency.delete(id) if assoc.empty?
+  end
+  
+  # finalize the depandant connected by dependency R_method(obj, dependtant)
+  def finalize_dependency(id, dependant, method = :finalize)
+    id = id.id unless id.kind_of?(Integer)
+    method = method.intern unless method.kind_of?(Integer)
+    for assocs in @dependency[id]
+      assocs.delete_if do
+	|d, m, *o|
+	d.send(m, id, *o) if ret = d == dependant && m == method
+	ret
       end
+      @dependency.delete(id) if assoc.empty?
     end
-
-    # finalize the dependant connected by dependency R_method(*, dependtant)
-    def finalize_by_dependant(dependant, method = :finalize)
-      method = method.intern unless method.kind_of?(Integer)
-      for id in @dependency.keys
-	finalize(id, dependant, method)
+  end
+  alias finalize finalize_dependency
+  
+  # finalize all dependants connected by dependency R_*(obj, dependtant)
+  def finalize_all_dependency(id, dependant)
+    id = id.id unless id.kind_of?(Integer)
+    method = method.intern unless method.kind_of?(Integer)
+    for assoc in @dependency[id]
+      assoc.delete_if do
+	|d, m, *o|
+	d.send(m, id, *o) if ret = d == dependant
       end
+      @dependency.delete(id) if assoc.empty?
     end
-
-    # finalize all dependants connected by dependency R_*(*, dependtant)
-    def finalize_all_by_dependant(dependant)
-      for id in @dependency.keys
-	finalize_all_dependency(id, dependant)
-      end
+  end
+  
+  # finalize the dependant connected by dependency R_method(*, dependtant)
+  def finalize_by_dependant(dependant, method = :finalize)
+    method = method.intern unless method.kind_of?(Integer)
+    for id in @dependency.keys
+      finalize(id, dependant, method)
     end
-
-    # finalize all dependants registered to the Finalizer.
-    def finalize_all
-      for id, assocs in @dependency
-	for dependant, method, *opt in assocs
-	  dependant.send(method, id, *opt)
-	end
-	assocs.clear
-      end
+  end
+  
+  # finalize all dependants connected by dependency R_*(*, dependtant)
+  def fainalize_all_by_dependant(dependant)
+    for id in @dependency.keys
+      finalize_all_dependency(id, dependant)
     end
-
-    # method to call finalize_* safely.
-    def safe
-      old_status = Thread.critical
-      Thread.critical = true
-      ObjectSpace.remove_finalizer(@proc)
-      begin
-	yield
-      ensure
-	ObjectSpace.add_finalizer(@proc)
-	Thread.critical = old_status
+  end
+  
+  # finalize all dependants registered to the Finalizer.
+  def finalize_all
+    for id, assocs in @dependency
+      for dependant, method, *opt in assocs
+	dependant.send(method, id, *opt)
       end
+      assocs.clear
     end
-
-    private
-
-    # registering function to ObjectSpace#add_finalizer
-    def final_of(id)
-      if assocs = @dependency.delete(id)
-	for dependant, method, *opt in assocs
-	  dependant.send(method, id, *opt)
-	end
+  end
+  
+  # method to call finalize_* safely.
+  def safe
+    old_status = Thread.critical
+    Thread.critical = true
+    ObjectSpace.remove_finalizer(@proc)
+    yield
+    ObjectSpace.add_finalizer(@proc)
+    Thread.critical = old_status
+  end
+  
+  # registering function to ObjectSpace#add_finalizer
+  def final_of(id)
+    if assocs = @dependency.delete(id)
+      for dependant, method, *opt in assocs
+	dependant.send(method, id, *opt)
       end
     end
-
   end
+  
   @dependency = Hash.new
   @proc = proc{|id| final_of(id)}
   ObjectSpace.add_finalizer(@proc)
+
+  module_function :add
+  module_function :add_dependency
+  
+  module_function :delete
+  module_function :delete_dependency
+  module_function :delete_all_dependency
+  module_function :delete_by_dependant
+  module_function :delete_all_by_dependant
+  
+  module_function :finalize
+  module_function :finalize_dependency
+  module_function :finalize_all_dependency
+  module_function :finalize_by_dependant
+  module_function :fainalize_all_by_dependant
+  module_function :finalize_all
+
+  module_function :safe
+  
+  module_function :final_of
+  private_class_method :final_of
+  
 end
diff --git a/lib/find.rb b/lib/find.rb
index 9ca39cabcb..3f1b82d2b3 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -1,78 +1,39 @@
+# Usage:
+#	require "find"
 #
-# find.rb: the Find module for processing all files under a given directory.
+#	Find.find('/foo','/bar') {|f| ...}
+#  or
+#	include Find
+#	find('/foo','/bar') {|f| ...}
 #
 
-#
-# The +Find+ module supports the top-down traversal of a set of file paths.
-#
-# For example, to total the size of all files under your home directory,
-# ignoring anything in a "dot" directory (e.g. $HOME/.ssh):
-#
-#   require 'find'
-#
-#   total_size = 0
-#
-#   Find.find(ENV["HOME"]) do |path|
-#     if FileTest.directory?(path)
-#       if File.basename(path)[0] == ?.
-#         Find.prune       # Don't look any further into this directory.
-#       else
-#         next
-#       end
-#     else
-#       total_size += FileTest.size(path)
-#     end
-#   end
-#
 module Find
-
-  #
-  # Calls the associated block with the name of every file and directory listed
-  # as arguments, then recursively on their subdirectories, and so on.
-  #
-  # See the +Find+ module documentation for an example.
-  #
-  def find(*paths) # :yield: path
-    paths.collect!{|d| d.dup}
-    while file = paths.shift
-      catch(:prune) do
+  def find(*path)
+    while file = path.shift
+      catch(:prune) {
 	yield file
-	begin
-	  if File.lstat(file).directory? then
-	    d = Dir.open(file)
-	    begin
-	      for f in d
-		next if f == "." or f == ".."
-		if File::ALT_SEPARATOR and file =~ /^(?:[\/\\]|[A-Za-z]:[\/\\]?)$/ then
-		  f = file + f
-		elsif file == "/" then
-		  f = "/" + f
-		else
-		  f = File.join(file, f)
-		end
-		paths.unshift f
+	if File.directory? file then
+	  d = Dir.open(file)
+	  begin
+	    for f in d
+	      next if f =~ /^\.\.?$/
+	      if file == "/" then
+		f = "/" + f
+	      else
+		f = file + "/" + f
 	      end
-	    ensure
-	      d.close
+	      path.unshift f
 	    end
+	  ensure
+	    d.close
 	  end
-       rescue Errno::ENOENT, Errno::EACCES
 	end
-      end
+      }
     end
   end
 
-  #
-  # Skips the current file or directory, restarting the loop with the next
-  # entry. If the current file is a directory, that directory will not be
-  # recursively entered. Meaningful only within the block associated with
-  # Find::find.
-  #
-  # See the +Find+ module documentation for an example.
-  #
   def prune
     throw :prune
   end
-
   module_function :find, :prune
 end
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
deleted file mode 100644
index b845f76ec4..0000000000
--- a/lib/forwardable.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-#   forwardable.rb - 
-#   	$Release Version: 1.1$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#	original definition by delegator.rb
-# --
-# Usage:
-#
-#   class Foo
-#     extend Forwardable
-#
-#     def_delegators("@out", "printf", "print")
-#     def_delegators(:@in, :gets)
-#     def_delegator(:@contents, :[], "content_at")
-#   end
-#   f = Foo.new
-#   f.printf ...
-#   f.gets
-#   f.content_at(1)
-#
-#   g = Goo.new
-#   g.extend SingleForwardable
-#   g.def_delegator("@out", :puts)
-#   g.puts ...
-#
-#
-
-module Forwardable
-
-  @debug = nil
-  class<<self
-    attr_accessor :debug
-  end
-
-  def def_instance_delegators(accessor, *methods)
-    for method in methods
-      def_instance_delegator(accessor, method)
-    end
-  end
-
-  def def_instance_delegator(accessor, method, ali = method)
-    accessor = accessor.id2name if accessor.kind_of?(Integer)
-    method = method.id2name if method.kind_of?(Integer)
-    ali = ali.id2name if ali.kind_of?(Integer)
-
-    module_eval(<<-EOS, "(__FORWARDABLE__)", 1)
-      def #{ali}(*args, &block)
-	begin
-	  #{accessor}.__send__(:#{method}, *args, &block)
-	rescue Exception
-	  $@.delete_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
-	  Kernel::raise
-	end
-      end
-    EOS
-  end
-
-  alias def_delegators def_instance_delegators
-  alias def_delegator def_instance_delegator
-end
-
-module SingleForwardable
-  def def_singleton_delegators(accessor, *methods)
-    for method in methods
-      def_singleton_delegator(accessor, method)
-    end
-  end
-
-  def def_singleton_delegator(accessor, method, ali = method)
-    accessor = accessor.id2name if accessor.kind_of?(Integer)
-    method = method.id2name if method.kind_of?(Integer)
-    ali = ali.id2name if ali.kind_of?(Integer)
-
-    instance_eval(<<-EOS, "(__FORWARDABLE__)", 1)
-       def #{ali}(*args, &block)
-	 begin
-	   #{accessor}.__send__(:#{method}, *args,&block)
-	 rescue Exception
-	   $@.delete_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
-	   Kernel::raise
-	 end
-       end
-    EOS
-  end
-
-  alias def_delegators def_singleton_delegators
-  alias def_delegator def_singleton_delegator
-end
-
-
-
-
diff --git a/lib/ftools.rb b/lib/ftools.rb
index c605bc085e..39d6ca9462 100644
--- a/lib/ftools.rb
+++ b/lib/ftools.rb
@@ -1,10 +1,15 @@
 class << File
 
-  BUFSIZE = 8 * 1024
+  TOO_BIG = 1024 * 1024 * 2 # 2MB
 
   def catname from, to
     if FileTest.directory? to
-      File.join to.sub(%r([/\\]$), ''), basename(from)
+      to +
+	if to =~ /\\/
+	  if to[-1,1] != '\\' then '\\' end + basename(from)
+	else
+	  if to[-1,1] != '/' then '/' end + basename(from)
+	end
     else
       to
     end
@@ -15,16 +20,27 @@ class << File
   def syscopy from, to
     to = catname(from, to)
 
+    fsize = size(from)
+    fsize = 1024 if fsize < 512
+    fsize = TOO_BIG if fsize > TOO_BIG
+
     fmode = stat(from).mode
     tpath = to
-    not_exist = !exist?(tpath)
 
-    from = open(from, "rb")
-    to = open(to, "wb")
+    from = open(from, "r")
+    from.binmode
+    to = open(to, "w")
+    to.binmode
 
     begin
       while true
-	to.syswrite from.sysread(BUFSIZE)
+	r = from.sysread(fsize)
+	rsize = r.size
+        w = 0
+	while w < rsize
+	  t = to.syswrite(r[w, rsize - w])
+	  w += t
+	end
       end
     rescue EOFError
       ret = true
@@ -34,12 +50,12 @@ class << File
       to.close
       from.close
     end
-    chmod(fmode, tpath) if not_exist
+    chmod(fmode, tpath)
     ret
   end
 
   def copy from, to, verbose = false
-    $deferr.print from, " -> ", catname(from, to), "\n" if verbose
+    $stderr.print from, " -> ", catname(from, to), "\n" if verbose
     syscopy from, to
   end
 
@@ -49,9 +65,9 @@ class << File
 
   def move from, to, verbose = false
     to = catname(from, to)
-    $deferr.print from, " -> ", to, "\n" if verbose
+    $stderr.print from, " -> ", to, "\n" if verbose
 
-    if RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ and FileTest.file? to
+    if RUBY_PLATFORM =~ /djgpp|cygwin|mswin32/ and FileTest.file? to
       unlink to
     end
     fstat = stat(from)
@@ -65,7 +81,7 @@ class << File
 	syscopy from, to and unlink from
 	utime(from_stat.atime, from_stat.mtime, to)
 	begin
-	  chown(fstat.uid, fstat.gid, to)
+	  chown(fstat.uid, fstat.gid, tpath)
 	rescue
 	end
       end
@@ -79,23 +95,25 @@ class << File
 #   false: not identical
 
   def compare from, to, verbose = false
-    $deferr.print from, " <=> ", to, "\n" if verbose
-
-    return false if stat(from).size != stat(to).size
+    $stderr.print from, " <=> ", to, "\n" if verbose
+    fsize = size(from)
+    fsize = 1024 if fsize < 512
+    fsize = TOO_BIG if fsize > TOO_BIG
 
-    from = open(from, "rb")
-    to = open(to, "rb")
+    from = open(from, "r")
+    from.binmode
+    to = open(to, "r")
+    to.binmode
 
     ret = false
     fr = tr = ''
 
     begin
       while fr == tr
-	fr = from.read(BUFSIZE)
-	if fr
+	if fr = from.read(fsize)
 	  tr = to.read(fr.size)
 	else
-	  ret = to.read(BUFSIZE)
+	  ret = to.read(fsize)
 	  ret = !ret || ret.length == 0
 	  break
 	end
@@ -116,11 +134,11 @@ class << File
   def safe_unlink(*files)
     verbose = if files[-1].is_a? String then false else files.pop end
     begin
-      $deferr.print files.join(" "), "\n" if verbose
+      $stderr.print files.join(" "), "\n" if verbose
       chmod 0777, *files
-      unlink(*files)
+      unlink *files
     rescue
-#      $deferr.print "warning: Couldn't unlink #{files.join ' '}\n"
+#      STDERR.print "warning: Couldn't unlink #{files.join ' '}\n"
     end
   end
 
@@ -131,10 +149,10 @@ class << File
 #    mode = if dirs[-1].is_a? Fixnum then dirs.pop else 0755 end
     mode = 0755
     for dir in dirs
+      next if FileTest.directory? dir
       parent = dirname(dir)
-      next if parent == dir or FileTest.directory? dir
       makedirs parent unless FileTest.directory? parent
-      $deferr.print "mkdir ", dir, "\n" if verbose
+      $stderr.print "mkdir ", dir, "\n" if verbose
       if basename(dir) != ""
 	Dir.mkdir dir, mode
       end
@@ -145,13 +163,11 @@ class << File
 
   alias o_chmod chmod
 
-  vsave, $VERBOSE = $VERBOSE, false
   def chmod(mode, *files)
     verbose = if files[-1].is_a? String then false else files.pop end
-    $deferr.printf "chmod %04o %s\n", mode, files.join(" ") if verbose
+    $stderr.printf "chmod %04o %s\n", mode, files.join(" ") if verbose
     o_chmod mode, *files
   end
-  $VERBOSE = vsave
 
   def install(from, to, mode = nil, verbose = false)
     to = catname(from, to)
diff --git a/lib/ftplib.rb b/lib/ftplib.rb
new file mode 100644
index 0000000000..9336e0a8c2
--- /dev/null
+++ b/lib/ftplib.rb
@@ -0,0 +1,639 @@
+## ftplib.rb
+
+# Author: Shugo Maeda <shugo@po.aianet.ne.jp>
+# Version: $Revision: 1.7 $
+
+## Code:
+
+require "socket"
+require "monitor"
+
+class FTPError < StandardError; end
+class FTPReplyError < FTPError; end
+class FTPTempError < FTPError; end
+class FTPPermError < FTPError; end
+class FTPProtoError < FTPError; end
+
+class FTP
+  
+  RCS_ID = %q$Id: ftplib.rb,v 1.7 1998/04/13 12:34:24 shugo Exp shugo $ 
+  
+  include MonitorMixin
+  
+  FTP_PORT = 21
+  CRLF = "\r\n"
+  
+  attr_accessor :passive, :return_code, :debug_mode
+  attr_reader :welcome, :lastresp
+  
+  def FTP.open(host, user = nil, passwd = nil, acct = nil)
+    new(host, user, passwd, acct)
+  end
+    
+  def initialize(host = nil, user = nil, passwd = nil, acct = nil)
+    super
+    @passive = false
+    @return_code = "\n"
+    @debug_mode = false
+    if host
+      connect(host)
+      if user
+	login(user, passwd, acct)
+      end
+    end
+  end
+  
+  def open_socket(host, port)
+    if defined? SOCKSsocket and ENV["SOCKS_SERVER"]
+      @passive = true
+      return SOCKSsocket.open(host, port)
+    else
+      return TCPsocket.open(host, port)
+    end
+  end
+  private :open_socket
+   
+  def connect(host, port = FTP_PORT)
+    if @debug_mode
+      print "connect: ", host, ", ", port, "\n"
+    end
+    synchronize do
+      @sock = open_socket(host, port)
+      voidresp
+    end
+  end
+  
+  def sanitize(s)
+    if s =~ /^PASS /i
+      return s[0, 5] + "*" * (s.length - 5)
+    else
+      return s
+    end
+  end
+  private :sanitize
+  
+  def putline(line)
+    if @debug_mode
+      print "put: ", sanitize(line), "\n"
+    end
+    line = line + CRLF
+    @sock.write(line)
+  end
+  private :putline
+   
+  def getline
+    line = @sock.readline # if get EOF, raise EOFError
+    if line[-2, 2] == CRLF
+      line = line[0 .. -3]
+    elsif line[-1] == ?\r or
+	line[-1] == ?\n
+      line = line[0 .. -2]
+    end
+    if @debug_mode
+      print "get: ", sanitize(line), "\n"
+    end
+    return line
+  end
+  private :getline
+  
+  def getmultiline
+    line = getline
+    buff = line
+    if line[3] == ?-
+      code = line[0, 3]
+      begin
+	line = getline
+	buff << "\n" << line
+      end until line[0, 3] == code and line[3] != ?-
+    end
+    return buff << "\n"
+  end
+  private :getmultiline
+  
+  def getresp
+    resp = getmultiline
+    @lastresp = resp[0, 3]
+    c = resp[0]
+    case c
+    when ?1, ?2, ?3
+      return resp
+    when ?4
+      raise FTPTempError, resp
+    when ?5
+      raise FTPPermError, resp
+    else
+      raise FTPProtoError, resp
+    end
+  end
+  private :getresp
+  
+  def voidresp
+    resp = getresp
+    if resp[0] != ?2
+      raise FTPReplyError, resp
+    end
+  end
+  private :voidresp
+  
+  def sendcmd(cmd)
+    synchronize do
+      putline(cmd)
+      return getresp
+    end
+  end
+   
+  def voidcmd(cmd)
+    synchronize do
+      putline(cmd)
+      voidresp
+    end
+  end
+   
+  def sendport(host, port)
+    af = (@sock.peeraddr)[0]
+    if af == "AF_INET"
+      hbytes = host.split(".")
+      pbytes = [port / 256, port % 256]
+      bytes = hbytes + pbytes
+      cmd = "PORT " + bytes.join(",")
+    elsif af == "AF_INET6"
+      cmd = "EPRT |2|" + host + "|" + sprintf("%d", port) + "|"
+    else
+      raise FTPProtoError, host
+    end
+    voidcmd(cmd)
+  end
+  private :sendport
+   
+  def makeport
+    sock = TCPserver.open(@sock.addr[3], 0)
+    port = sock.addr[1]
+    host = TCPsocket.getaddress(@sock.addr[2])
+    resp = sendport(host, port)
+    return sock
+  end
+  private :makeport
+   
+  def makepasv
+    if @sock.peeraddr[0] == "AF_INET"
+      host, port = parse227(sendcmd("PASV"))
+    else
+      host, port = parse229(sendcmd("EPSV"))
+#     host, port = parse228(sendcmd("LPSV"))
+    end
+    return host, port
+  end
+  private :makepasv
+   
+  def transfercmd(cmd)
+    if @passive
+      host, port = makepasv
+      conn = open_socket(host, port)
+      resp = sendcmd(cmd)
+      if resp[0] != ?1
+	raise FTPReplyError, resp
+      end
+    else
+      sock = makeport
+      resp = sendcmd(cmd)
+      if resp[0] != ?1
+	raise FTPReplyError, resp
+      end
+      conn = sock.accept
+    end
+    return conn
+  end
+  private :transfercmd
+   
+  def getaddress
+    thishost = Socket.gethostname
+    if not thishost.index(".")
+      thishost = Socket.gethostbyname(thishost)[0]
+    end
+    if ENV.has_key?("LOGNAME")
+      realuser = ENV["LOGNAME"]
+    elsif ENV.has_key?("USER")
+      realuser = ENV["USER"]
+    else
+      realuser = "anonymous"
+    end
+    return realuser + "@" + thishost
+  end
+  private :getaddress
+   
+  def login(user = "anonymous", passwd = nil, acct = nil)
+    if user == "anonymous" and passwd == nil
+      passwd = getaddress
+    end
+    
+    resp = ""
+    synchronize do
+      resp = sendcmd('USER ' + user)
+      if resp[0] == ?3
+	resp = sendcmd('PASS ' + passwd)
+      end
+      if resp[0] == ?3
+	resp = sendcmd('ACCT ' + acct)
+      end
+    end
+    if resp[0] != ?2
+      raise FTPReplyError, resp
+    end
+    @welcome = resp
+  end
+  
+  def retrbinary(cmd, blocksize, callback = Proc.new)
+    synchronize do
+      voidcmd("TYPE I")
+      conn = transfercmd(cmd)
+      loop do
+	data = conn.read(blocksize)
+	break if data == nil
+	callback.call(data)
+      end
+      conn.close
+      voidresp
+    end
+  end
+   
+  def retrlines(cmd, callback = nil)
+    if iterator?
+      callback = Proc.new
+    elsif not callback.is_a?(Proc)
+      callback = Proc.new {|line| print line, "\n"}
+    end
+    synchronize do
+      voidcmd("TYPE A")
+      conn = transfercmd(cmd)
+      loop do
+	line = conn.gets
+	break if line == nil
+	if line[-2, 2] == CRLF
+	  line = line[0 .. -3]
+	elsif line[-1] == ?\n
+	  line = line[0 .. -2]
+	end
+	callback.call(line)
+      end
+      conn.close
+      voidresp
+    end
+  end
+  
+  def storbinary(cmd, file, blocksize, callback = nil)
+    if iterator?
+      callback = Proc.new
+    end
+    use_callback = callback.is_a?(Proc)
+    synchronize do
+      voidcmd("TYPE I")
+      conn = transfercmd(cmd)
+      loop do
+	buf = file.read(blocksize)
+	break if buf == nil
+	conn.write(buf)
+	callback.call(buf) if use_callback
+      end
+      conn.close
+      voidresp
+    end
+  end
+   
+  def storlines(cmd, file, callback = nil)
+    if iterator?
+      callback = Proc.new
+    end
+    use_callback = callback.is_a?(Proc)
+    synchronize do
+      voidcmd("TYPE A")
+      conn = transfercmd(cmd)
+      loop do
+	buf = file.gets
+	break if buf == nil
+	if buf[-2, 2] != CRLF
+	  buf = buf.chop + CRLF
+	end
+	conn.write(buf)
+	callback.call(buf) if use_callback
+      end
+      conn.close
+      voidresp
+    end
+  end
+  
+  def getbinaryfile(remotefile, localfile, blocksize, callback = nil)
+    if iterator?
+      callback = Proc.new
+    end
+    use_callback = callback.is_a?(Proc)
+    f = open(localfile, "w")
+    begin
+      f.binmode
+      retrbinary("RETR " + remotefile, blocksize) do |data|
+	f.write(data)
+	callback.call(data) if use_callback
+      end
+    ensure
+      f.close
+    end
+  end
+   
+  def gettextfile(remotefile, localfile, callback = nil)
+    if iterator?
+      callback = Proc.new
+    end
+    use_callback = callback.is_a?(Proc)
+    f = open(localfile, "w")
+    begin
+      retrlines("RETR " + remotefile) do |line|
+	line = line + @return_code
+	f.write(line)
+	callback.call(line) if use_callback
+      end
+    ensure
+      f.close
+    end
+  end
+   
+  def putbinaryfile(localfile, remotefile, blocksize, callback = nil)
+    if iterator?
+      callback = Proc.new
+    end
+    use_callback = callback.is_a?(Proc)
+    f = open(localfile)
+    begin
+      f.binmode
+      storbinary("STOR " + remotefile, f, blocksize) do |data|
+	callback.call(data) if use_callback
+      end
+    ensure
+      f.close
+    end
+  end
+  
+  def puttextfile(localfile, remotefile, callback = nil)
+    if iterator?
+      callback = Proc.new
+    end
+    use_callback = callback.is_a?(Proc)
+    f = open(localfile)
+    begin
+      storlines("STOR " + remotefile, f) do |line|
+	callback.call(line) if use_callback
+      end
+    ensure
+      f.close
+    end
+  end
+   
+  def acct(account)
+    cmd = "ACCT " + account
+    voidcmd(cmd)
+  end
+  
+  def nlst(dir = nil)
+    cmd = "NLST"
+    if dir
+      cmd = cmd + " " + dir
+    end
+    files = []
+    retrlines(cmd) do |line|
+      files.push(line)
+    end
+    return files
+  end
+  
+  def list(*args, &block)
+    cmd = "LIST"
+    args.each do |arg|
+      cmd = cmd + " " + arg
+    end
+    if block
+      retrlines(cmd, &block)
+    else
+      lines = []
+      retrlines(cmd) do |line|
+	lines << line
+      end
+      return lines
+    end
+  end
+  alias ls list
+  alias dir list
+  
+  def rename(fromname, toname)
+    resp = sendcmd("RNFR " + fromname)
+    if resp[0] != ?3
+      raise FTPReplyError, resp
+    end
+    voidcmd("RNTO " + toname)
+  end
+  
+  def delete(filename)
+    resp = sendcmd("DELE " + filename)
+    if resp[0, 3] == "250"
+      return
+    elsif resp[0] == ?5
+      raise FTPPermError, resp
+    else
+      raise FTPReplyError, resp
+    end
+  end
+  
+  def chdir(dirname)
+    if dirname == ".."
+      begin
+	voidcmd("CDUP")
+	return
+      rescue FTPPermError
+	if $![0, 3] != "500"
+	  raise FTPPermError, $!
+	end
+      end
+    end
+    cmd = "CWD " + dirname
+    voidcmd(cmd)
+  end
+   
+  def size(filename)
+    voidcmd("TYPE I")
+    resp = sendcmd("SIZE " + filename)
+    if resp[0, 3] != "213" 
+      raise FTPReplyError, resp
+    end
+    return resp[3..-1].strip 
+  end
+
+  MDTM_REGEXP = /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/
+
+  def mtime(filename, local = false)
+    str = mdtm(filename)
+    ary = str.scan(MDTM_REGEXP)[0].collect {|i| i.to_i}
+    return local ? Time.local(*ary) : Time.gm(*ary)
+  end
+
+  def mkdir(dirname)
+    resp = sendcmd("MKD " + dirname)
+    return parse257(resp)
+  end
+  
+  def rmdir(dirname)
+    voidcmd("RMD " + dirname)
+  end
+  
+  def pwd
+    resp = sendcmd("PWD")
+      return parse257(resp)
+  end
+  alias getdir pwd
+  
+  def system
+    resp = sendcmd("SYST")
+    if resp[0, 3] != "215"
+      raise FTPReplyError, resp
+    end
+    return resp[4 .. -1]
+  end
+  
+  def abort
+    line = "ABOR" + CRLF
+    print "put: ABOR\n" if @debug_mode
+    @sock.send(line, Socket::MSG_OOB)
+    resp = getmultiline
+    unless ["426", "226", "225"].include?(resp[0, 3])
+      raise FTPProtoError, resp
+    end
+    return resp
+  end
+   
+  def status
+    line = "STAT" + CRLF
+    print "put: STAT\n" if @debug_mode
+    @sock.send(line, Socket::MSG_OOB)
+    return getresp
+  end
+  
+  def mdtm(filename)
+    resp = sendcmd("MDTM " + filename)
+    if resp[0, 3] == "213"
+      return resp[3 .. -1].strip
+    end
+  end
+  
+  def help(arg = nil)
+    cmd = "HELP"
+    if arg
+      cmd = cmd + " " + arg
+    end
+    sendcmd(cmd)
+  end
+  
+  def quit
+    voidcmd("QUIT")
+  end
+  
+  def close
+    @sock.close if @sock and not @sock.closed?
+  end
+  
+  def closed?
+    @sock == nil or @sock.closed?
+  end
+  
+  def parse227(resp)
+    if resp[0, 3] != "227"
+      raise FTPReplyError, resp
+    end
+    left = resp.index("(")
+    right = resp.index(")")
+    if left == nil or right == nil
+      raise FTPProtoError, resp
+    end
+    numbers = resp[left + 1 .. right - 1].split(",")
+    if numbers.length != 6
+      raise FTPProtoError, resp
+    end
+    host = numbers[0, 4].join(".")
+    port = (numbers[4].to_i << 8) + numbers[5].to_i
+    return host, port
+  end
+  private :parse227
+  
+  def parse228(resp)
+    if resp[0, 3] != "228"
+      raise FTPReplyError, resp
+    end
+    left = resp.index("(")
+    right = resp.index(")")
+    if left == nil or right == nil
+      raise FTPProtoError, resp
+    end
+    numbers = resp[left + 1 .. right - 1].split(",")
+    if numbers[0] == "4"
+      if numbers.length != 9 || numbers[1] != "4" || numbers[2 + 4] != "2"
+	raise FTPProtoError, resp
+      end
+      host = numbers[2, 4].join(".")
+      port = (numbers[7].to_i << 8) + numbers[8].to_i
+    elsif numbers[0] == "6"
+      if numbers.length != 21 || numbers[1] != "16" || numbers[2 + 16] != "2"
+	raise FTPProtoError, resp
+      end
+      v6 = ["", "", "", "", "", "", "", ""]
+      for i in 0 .. 7
+	v6[i] = sprintf("%02x%02x", numbers[(i * 2) + 2].to_i,
+			numbers[(i * 2) + 3].to_i)
+      end
+      host = v6[0, 8].join(":")
+      port = (numbers[19].to_i << 8) + numbers[20].to_i
+    end 
+    return host, port
+  end
+  private :parse228
+  
+  def parse229(resp)
+    if resp[0, 3] != "229"
+      raise FTPReplyError, resp
+    end
+    left = resp.index("(")
+    right = resp.index(")")
+    if left == nil or right == nil
+      raise FTPProtoError, resp
+    end
+    numbers = resp[left + 1 .. right - 1].split(resp[left + 1, 1])
+    if numbers.length != 4
+      raise FTPProtoError, resp
+    end
+    port = numbers[3].to_i
+    host = (@sock.peeraddr())[3]
+    return host, port
+  end
+  private :parse228
+  
+  def parse257(resp)
+    if resp[0, 3] != "257"
+      raise FTPReplyError, resp
+    end
+    if resp[3, 2] != ' "'
+      return ""
+    end
+    dirname = ""
+    i = 5
+    n = resp.length
+    while i < n
+      c = resp[i, 1]
+      i = i + 1
+      if c == '"'
+	if i > n or resp[i, 1] != '"'
+	  break
+	end
+	i = i + 1
+      end
+      dirname = dirname + c
+    end
+    return dirname
+  end
+  private :parse257
+end
+
+## ftplib.rb ends here
diff --git a/lib/generator.rb b/lib/generator.rb
deleted file mode 100644
index 196fc8f483..0000000000
--- a/lib/generator.rb
+++ /dev/null
@@ -1,378 +0,0 @@
-#!/usr/bin/env ruby
-#
-# generator.rb - converts an internal iterator to an external iterator
-#++
-# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
-#
-# All rights reserved.  You can redistribute and/or modify it under
-# the same terms as Ruby.
-#
-# $Idaemons: /home/cvs/rb/generator.rb,v 1.8 2001/10/03 08:54:32 knu Exp $
-# $RoughId: generator.rb,v 1.10 2003/10/14 19:36:58 knu Exp $
-# $Id$
-#
-# == Overview
-#
-# This library provides the Generator class, which converts an
-# internal iterator (i.e. an Enumerable object) to an external
-# iterator.  In that form, you can roll many iterators independently.
-#
-# The SyncEnumerator class, which is implemented using Generator,
-# makes it easy to roll many Enumerable objects synchronously.
-#
-# See the respective classes for examples of usage.
-
-#
-# Generator converts an internal iterator (i.e. an Enumerable object)
-# to an external iterator.
-#
-# Note that it is not very fast since it is implemented using
-# continuation, which currently is slow.
-#
-# == Example
-#
-#   require 'generator'
-#
-#   # Generator from an Enumerable object
-#   g = Generator.new(['A', 'B', 'C', 'Z'])
-#
-#   while g.next?
-#     puts g.next
-#   end
-#
-#   # Generator from a block
-#   g = Generator.new { |g|
-#     for i in 'A'..'C'
-#       g.yield i
-#     end
-#
-#     g.yield 'Z'
-#   }
-#
-#   # The same result as above
-#   while g.next?
-#     puts g.next
-#   end
-#   
-class Generator
-  include Enumerable
-
-  # Creates a new generator either from an Enumerable object or from a
-  # block.
-  #
-  # In the former, block is ignored even if given.
-  #
-  # In the latter, the given block is called with the generator
-  # itself, and expected to call the +yield+ method for each element.
-  def initialize(enum = nil, &block)
-    if enum
-      @block = proc { |g|
-	enum.each { |x| g.yield x }
-      }
-    else
-      @block = block
-    end
-
-    @index = 0
-    @queue = []
-    @cont_next = @cont_yield = @cont_endp = nil
-
-    if @cont_next = callcc { |c| c }
-      @block.call(self)
-
-      @cont_endp.call(nil) if @cont_endp
-    end
-
-    self
-  end
-
-  # Yields an element to the generator.
-  def yield(value)
-    if @cont_yield = callcc { |c| c }
-      @queue << value
-      @cont_next.call(nil)
-    end
-
-    self
-  end
-
-  # Returns true if the generator has reached the end.
-  def end?()
-    if @cont_endp = callcc { |c| c }
-      @cont_yield.nil? && @queue.empty?
-    else
-      @queue.empty?
-    end
-  end
-
-  # Returns true if the generator has not reached the end yet.
-  def next?()
-    !end?
-  end
-
-  # Returns the current index (position) counting from zero.
-  def index()
-    @index
-  end
-
-  # Returns the current index (position) counting from zero.
-  def pos()
-    @index
-  end
-
-  # Returns the element at the current position and moves forward.
-  def next()
-    if end?
-      raise EOFError, "no more element is supplied"
-    end
-
-    if @cont_next = callcc { |c| c }
-      @cont_yield.call(nil) if @cont_yield
-    end
-
-    @index += 1
-
-    @queue.shift
-  end
-
-  # Returns the element at the current position.
-  def current()
-    if @queue.empty?
-      raise EOFError, "no more element is supplied"
-    end
-
-    @queue.first
-  end
-
-  # Rewinds the generator.
-  def rewind()
-    initialize(nil, &@block) if @index.nonzero?
-
-    self
-  end
-
-  # Rewinds the generator and enumerates the elements.
-  def each
-    rewind
-
-    until end?
-      yield self.next
-    end
-
-    self
-  end
-end
-
-#
-# SyncEnumerator creates an Enumerable object from multiple Enumerable
-# objects and enumerates them synchronously.
-#
-# == Example
-#
-#   require 'generator'
-#
-#   s = SyncEnumerator.new([1,2,3], ['a', 'b', 'c'])
-#
-#   # Yields [1, 'a'], [2, 'b'], and [3,'c']
-#   s.each { |row| puts row.join(', ') }
-#
-class SyncEnumerator
-  include Enumerable
-
-  # Creates a new SyncEnumerator which enumerates rows of given
-  # Enumerable objects.
-  def initialize(*enums)
-    @gens = enums.map { |e| Generator.new(e) }
-  end
-
-  # Returns the number of enumerated Enumerable objects, i.e. the size
-  # of each row.
-  def size
-    @gens.size
-  end
-
-  # Returns the number of enumerated Enumerable objects, i.e. the size
-  # of each row.
-  def length
-    @gens.length
-  end
-
-  # Returns true if the given nth Enumerable object has reached the
-  # end.  If no argument is given, returns true if any of the
-  # Enumerable objects has reached the end.
-  def end?(i = nil)
-    if i.nil?
-      @gens.detect { |g| g.end? } ? true : false
-    else
-      @gens[i].end?
-    end
-  end
-
-  # Enumerates rows of the Enumerable objects.
-  def each
-    @gens.each { |g| g.rewind }
-
-    loop do
-      count = 0
-
-      ret = @gens.map { |g|
-	if g.end?
-	  count += 1
-	  nil
-	else
-	  g.next
-	end
-      }
-
-      if count == @gens.size
-	break
-      end
-
-      yield ret
-    end
-
-    self
-  end
-end
-
-if $0 == __FILE__
-  eval DATA.read, nil, $0, __LINE__+4
-end
-
-__END__
-
-require 'test/unit'
-
-class TC_Generator < Test::Unit::TestCase
-  def test_block1
-    g = Generator.new { |g|
-      # no yield's
-    }
-
-    assert_equal(0, g.pos)
-    assert_raises(EOFError) { g.current }
-  end
-
-  def test_block2
-    g = Generator.new { |g|
-      for i in 'A'..'C'
-        g.yield i
-      end
-
-      g.yield 'Z'
-    }
-
-    assert_equal(0, g.pos)
-    assert_equal('A', g.current)
-
-    assert_equal(true, g.next?)
-    assert_equal(0, g.pos)
-    assert_equal('A', g.current)
-    assert_equal(0, g.pos)
-    assert_equal('A', g.next)
-
-    assert_equal(1, g.pos)
-    assert_equal(true, g.next?)
-    assert_equal(1, g.pos)
-    assert_equal('B', g.current)
-    assert_equal(1, g.pos)
-    assert_equal('B', g.next)
-
-    assert_equal(g, g.rewind)
-
-    assert_equal(0, g.pos)
-    assert_equal('A', g.current)
-
-    assert_equal(true, g.next?)
-    assert_equal(0, g.pos)
-    assert_equal('A', g.current)
-    assert_equal(0, g.pos)
-    assert_equal('A', g.next)
-
-    assert_equal(1, g.pos)
-    assert_equal(true, g.next?)
-    assert_equal(1, g.pos)
-    assert_equal('B', g.current)
-    assert_equal(1, g.pos)
-    assert_equal('B', g.next)
-
-    assert_equal(2, g.pos)
-    assert_equal(true, g.next?)
-    assert_equal(2, g.pos)
-    assert_equal('C', g.current)
-    assert_equal(2, g.pos)
-    assert_equal('C', g.next)
-
-    assert_equal(3, g.pos)
-    assert_equal(true, g.next?)
-    assert_equal(3, g.pos)
-    assert_equal('Z', g.current)
-    assert_equal(3, g.pos)
-    assert_equal('Z', g.next)
-
-    assert_equal(4, g.pos)
-    assert_equal(false, g.next?)
-    assert_raises(EOFError) { g.next }
-  end
-
-  def test_each
-    a = [5, 6, 7, 8, 9]
-
-    g = Generator.new(a)
-
-    i = 0
-
-    g.each { |x|
-      assert_equal(a[i], x)
-
-      i += 1
-
-      break if i == 3
-    }
-
-    assert_equal(3, i)
-
-    i = 0
-
-    g.each { |x|
-      assert_equal(a[i], x)
-
-      i += 1
-    }
-
-    assert_equal(5, i)
-  end
-end
-
-class TC_SyncEnumerator < Test::Unit::TestCase
-  def test_each
-    r = ['a'..'f', 1..10, 10..20]
-    ra = r.map { |x| x.to_a }
-
-    a = (0...(ra.map {|x| x.size}.max)).map { |i| ra.map { |x| x[i] } }
-
-    s = SyncEnumerator.new(*r)
-
-    i = 0
-
-    s.each { |x|
-      assert_equal(a[i], x)
-
-      i += 1
-
-      break if i == 3
-    }
-
-    assert_equal(3, i)
-
-    i = 0
-
-    s.each { |x|
-      assert_equal(a[i], x)
-
-      i += 1
-    }
-
-    assert_equal(a.size, i)
-  end
-end
diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
index 7bb9baef2d..a37714cafd 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -1,8 +1,15 @@
 #                                                         -*- Ruby -*-
-# Copyright (C) 1998, 1999, 2000  Motoyuki Kasahara
+# Copyright (C) 1998  Motoyuki Kasahara
 #
-# You may redistribute it and/or modify it under the same license
-# terms as Ruby.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 
 #
@@ -28,16 +35,15 @@ class GetoptLong
   #
   # Status codes.
   #
-  STATUS_YET, STATUS_STARTED, STATUS_TERMINATED = 0, 1, 2
+  STATUS_YET, STATUS_STARTED, STATUS_TERMINATED = 0..2
 
   #
   # Error types.
   #
-  class Error  < StandardError; end
-  class AmbigousOption   < Error; end
-  class NeedlessArgument < Error; end
-  class MissingArgument  < Error; end
-  class InvalidOption    < Error; end
+  class AmbigousOption   < StandardError; end
+  class NeedlessArgument < StandardError; end
+  class MissingArgument  < StandardError; end
+  class InvalidOption    < StandardError; end
 
   #
   # Initializer.
@@ -67,7 +73,7 @@ class GetoptLong
     @argument_flags = Hash.new
 
     #
-    # Whether error messages are output to $deferr.
+    # Whether error messages are output to stderr.
     #
     @quiet = FALSE
 
@@ -226,7 +232,7 @@ class GetoptLong
   # Termintate option processing.
   #
   def terminate
-    return nil if @status == STATUS_TERMINATED
+    return if @status == STATUS_TERMINATED
     raise RuntimeError, "an error has occured" if @error != nil
 
     @status = STATUS_TERMINATED
@@ -253,7 +259,7 @@ class GetoptLong
   # Set an error (protected).
   #
   def set_error(type, message)
-    $deferr.print("#{$0}: #{message}\n") if !@quiet
+    $stderr.print("#{$0}: #{message}\n") if !@quiet
 
     @error = type
     @error_message = message
@@ -287,24 +293,24 @@ class GetoptLong
   # Get next option name and its argument as an array.
   #
   def get
-    option_name, option_argument = nil, ''
+    name, argument = nil, ''
 
     #
     # Check status.
     #
-    return nil if @error != nil
+    return if @error != nil
     case @status
     when STATUS_YET
       @status = STATUS_STARTED
     when STATUS_TERMINATED
-      return nil
+      return
     end
 
     #
     # Get next option argument.
     #
     if 0 < @rest_singles.length
-      argument = '-' + @rest_singles
+      $_ = '-' + @rest_singles
     elsif (ARGV.length == 0)
       terminate
       return nil
@@ -314,24 +320,24 @@ class GetoptLong
       end
       if ARGV.length == 0
 	terminate
-	return nil
+	return
       end
-      argument = ARGV.shift
+      $_ = ARGV.shift
     elsif @ordering == REQUIRE_ORDER 
       if (ARGV[0] !~ /^-./)
 	terminate
 	return nil
       end
-      argument = ARGV.shift
+      $_ = ARGV.shift
     else
-      argument = ARGV.shift
+      $_ = ARGV.shift
     end
 
     #
     # Check the special argument `--'.
     # `--' indicates the end of the option list.
     #
-    if argument == '--' && @rest_singles.length == 0
+    if $_ == '--' && @rest_singles.length == 0
       terminate
       return nil
     end
@@ -339,88 +345,87 @@ class GetoptLong
     #
     # Check for long and short options.
     #
-    if argument =~ /^(--[^=]+)/ && @rest_singles.length == 0
+    if /^(--[^=]+)/ && @rest_singles.length == 0
       #
       # This is a long style option, which start with `--'.
       #
       pattern = $1
       if @canonical_names.include?(pattern)
-	option_name = pattern
+	name = pattern
       else
 	#
-	# The option `option_name' is not registered in `@canonical_names'.
+	# The option `name' is not registered in `@canonical_names'.
 	# It may be an abbreviated.
 	#
 	match_count = 0
 	@canonical_names.each_key do |key|
 	  if key.index(pattern) == 0
-	    option_name = key
+	    name = key
 	    match_count += 1
 	  end
 	end
 	if 2 <= match_count
-	  set_error(AmbigousOption, "option `#{argument}' is ambiguous")
+	  set_error(AmbigousOption, "option `#{$_}' is ambiguous")
 	elsif match_count == 0
-	  set_error(InvalidOption, "unrecognized option `#{argument}'")
+	  set_error(InvalidOption, "unrecognized option `#{$_}'")
 	end
       end
 
       #
       # Check an argument to the option.
       #
-      if @argument_flags[option_name] == REQUIRED_ARGUMENT
-	if argument =~ /=(.*)$/
-	  option_argument = $1
+      if @argument_flags[name] == REQUIRED_ARGUMENT
+	if /=(.*)$/
+	  argument = $1
 	elsif 0 < ARGV.length
-	  option_argument = ARGV.shift
+	  argument = ARGV.shift
 	else
-	  set_error(MissingArgument,
-	            "option `#{argument}' requires an argument")
+	  set_error(MissingArgument, "option `#{$_}' requires an argument")
 	end
-      elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
-	if argument =~ /=(.*)$/
-	  option_argument = $1
+      elsif @argument_flags[name] == OPTIONAL_ARGUMENT
+	if /=(.*)$/
+	  argument = $1
 	elsif 0 < ARGV.length && ARGV[0] !~ /^-./
-	  option_argument = ARGV.shift
+	  argument = ARGV.shift
 	else
-	  option_argument = ''
+	  argument = ''
 	end
-      elsif argument =~ /=(.*)$/
+      elsif /=(.*)$/
 	set_error(NeedlessArgument,
-		  "option `#{option_name}' doesn't allow an argument")
+		  "option `#{name}' doesn't allow an argument")
       end
 
-    elsif argument =~ /^(-(.))(.*)/
+    elsif /^(-(.))(.*)/
       #
       # This is a short style option, which start with `-' (not `--').
       # Short options may be catinated (e.g. `-l -g' is equivalent to
       # `-lg').
       #
-      option_name, ch, @rest_singles = $1, $2, $3
+      name, ch, @rest_singles = $1, $2, $3
 
-      if @canonical_names.include?(option_name)
+      if @canonical_names.include?(name)
 	#
-	# The option `option_name' is found in `@canonical_names'.
+	# The option `name' is found in `@canonical_names'.
 	# Check its argument.
 	#
-	if @argument_flags[option_name] == REQUIRED_ARGUMENT
+	if @argument_flags[name] == REQUIRED_ARGUMENT
 	  if 0 < @rest_singles.length
-	    option_argument = @rest_singles
+	    argument = @rest_singles
 	    @rest_singles = ''
 	  elsif 0 < ARGV.length
-	    option_argument = ARGV.shift
+	    argument = ARGV.shift
 	  else
 	    # 1003.2 specifies the format of this message.
 	    set_error(MissingArgument, "option requires an argument -- #{ch}")
 	  end
-	elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
+	elsif @argument_flags[name] == OPTIONAL_ARGUMENT
 	  if 0 < @rest_singles.length
-	    option_argument = @rest_singles
+	    argument = @rest_singles
 	    @rest_singles = ''
 	  elsif 0 < ARGV.length && ARGV[0] !~ /^-./
-	    option_argument = ARGV.shift
+	    argument = ARGV.shift
 	  else
-	    option_argument = ''
+	    argument = ''
 	  end
 	end
       else
@@ -439,10 +444,10 @@ class GetoptLong
       # This is a non-option argument.
       # Only RETURN_IN_ORDER falled into here.
       #
-      return '', argument
+      return '', $_
     end
 
-    return @canonical_names[option_name], option_argument
+    return @canonical_names[name], argument
   end
 
   #
@@ -455,9 +460,9 @@ class GetoptLong
   #
   def each
     loop do
-      option_name, option_argument = get_option
-      break if option_name == nil
-      yield option_name, option_argument
+      name, argument = get_option
+      break if name == nil
+      yield name, argument
     end
   end
 
diff --git a/lib/getopts.rb b/lib/getopts.rb
index 34fb0d6442..5b9562d5b2 100644
--- a/lib/getopts.rb
+++ b/lib/getopts.rb
@@ -1,124 +1,141 @@
 #
-#               getopts.rb - 
-#                       $Release Version: $
-#                       $Revision$
-#                       $Date$
-#                       by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
+#		getopts.rb - 
+#			$Release Version: $
+#			$Revision$
+#			$Date$
+#			by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
 #
 # --
-# this is obsolete; use getoptlong
 #
-# 2000-03-21
-# modified by Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-#
-# 2002-03-05
-# rewritten by Akinori MUSHA <knu@ruby-lang.org>
+#	
 #
 
 $RCS_ID=%q$Header$
 
-
-def getopts(single_options, *options)
-  boolopts = {}
-  valopts = {}
-
-  #
-  # set defaults
-  #
-  single_options.scan(/.:?/) do |opt|
-    if opt.size == 1
-      boolopts[opt] = false
-    else
-      valopts[opt[0, 1]] = nil
+def isSingle(lopt)
+  if lopt.index(":")
+    if lopt.split(":")[0].length == 1
+      return true
     end
-  end if single_options
+  end
+  return nil
+end
 
-  options.each do |arg|
-    opt, val = arg.split(':', 2)
+def getOptionName(lopt)
+  return lopt.split(":")[0]
+end
 
-    if val
-      valopts[opt] = val.empty? ? nil : val
-    else
-      boolopts[opt] = false
-    end
+def getDefaultOption(lopt)
+  od = lopt.split(":")[1]
+  if od
+    return od
   end
+  return nil
+end
 
-  #
-  # scan
-  #
-  c = 0
-  argv = ARGV
+def setOption(name, value)
+  eval("$OPT_" + name + " = " + 'value')
+end
 
-  while arg = argv.shift
-    case arg
-    when /\A--(.*)/
-      if $1.empty?			# xinit -- -bpp 24
-	break
-      end
+def setDefaultOption(lopt)
+  d = getDefaultOption(lopt)
+  if d
+    setOption(getOptionName(lopt), d)
+  end
+end
+
+def setNewArgv(newargv)
+  ARGV.clear
+  for na in newargv
+    ARGV << na
+  end
+end
 
-      opt, val = $1.split('=', 2)
 
-      if opt.size == 1
-	argv.unshift arg
-	return nil
-      elsif valopts.key? opt		# imclean --src +trash
-	valopts[opt] = val || argv.shift or return nil
-      elsif boolopts.key? opt		# ruby --verbose
-	boolopts[opt] = true
+def getopts(single_opts, *options)
+  if options
+    single_colon = ""
+    long_opts = []
+    sc = 0
+    for o in options
+      setDefaultOption(o)
+      if isSingle(o)
+	single_colon[sc, 0] = getOptionName(o)
+	sc += 1
       else
-	argv.unshift arg
+	long_opts.push(o)
+      end
+    end
+  end
+  
+  opts = {}
+  count = 0
+  newargv = []
+  while ARGV.length != 0
+    compare = nil
+    case ARGV[0]
+    when /^--?$/
+      ARGV.shift
+      newargv += ARGV
+      break
+    when /^--.*/
+      compare = ARGV[0][2, (ARGV[0].length - 2)]
+      if long_opts != ""
+	for lo in long_opts
+	  if lo.index(":") && getOptionName(lo) == compare
+	    if ARGV.length <= 1
+	      return nil
+	    end
+	    setOption(compare, ARGV[1])
+	    opts[compare] = true
+	    ARGV.shift
+	    count += 1
+	    break
+	  elsif lo == compare
+	    setOption(compare, true)
+	    opts[compare] = true
+	    count += 1
+	    break
+	  end
+	end
+      end
+      if compare.length <= 1
 	return nil
       end
-
-      c += 1
-    when /\A-(.+)/
-      opts = $1
-
-      until opts.empty?
-	opt = opts.slice!(0, 1)
-
-	if valopts.key? opt
-	  val = opts
-
-	  if val.empty?			# ruby -e 'p $:'
-	    valopts[opt] = argv.shift or return nil
-	  else				# cc -ohello ...
-	    valopts[opt] = val
+    when /^-.*/
+      for idx in 1..(ARGV[0].length - 1)
+	compare = ARGV[0][idx, 1]
+	if single_opts && compare =~ "[" + single_opts + "]"
+	  setOption(compare, true)
+	  opts[compare] = true
+	  count += 1
+	elsif single_colon != "" && compare =~ "[" + single_colon + "]"
+	  if ARGV[0][idx..-1].length > 1
+	    setOption(compare, ARGV[0][(idx + 1)..-1])
+	    opts[compare] = true
+	    count += 1
+	  elsif ARGV.length <= 1
+	    return nil
+	  else
+	    setOption(compare, ARGV[1])
+	    opts[compare] = true
+	    ARGV.shift
+	    count += 1
 	  end
-
-	  c += 1
 	  break
-	elsif boolopts.key? opt
-	  boolopts[opt] = true		# ruby -h
-	  c += 1
-	else
-	  argv.unshift arg
-	  return nil
 	end
       end
     else
-      argv.unshift arg
-      break
+      compare = ARGV[0]
+      opts[compare] = true
+      newargv << ARGV[0]
+    end
+    
+    ARGV.shift
+    if !opts.has_key?(compare)
+      return nil
     end
   end
-
-  #
-  # set
-  #
-  $OPT = {}
-
-  boolopts.each do |opt, val|
-    $OPT[opt] = val
-
-    sopt = opt.gsub(/[^A-Za-z0-9_]/, '_')
-    eval "$OPT_#{sopt} = val"
-  end
-  valopts.each do |opt, val|
-    $OPT[opt] = val
-
-    sopt = opt.gsub(/[^A-Za-z0-9_]/, '_')
-    eval "$OPT_#{sopt} = val"
-  end
-
-  c
+  setNewArgv(newargv)
+  return count
 end
diff --git a/lib/gserver.rb b/lib/gserver.rb
deleted file mode 100644
index 14f765a90c..0000000000
--- a/lib/gserver.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright (C) 2001 John W. Small All Rights Reserved
-# mailto:jsmall@laser.net  subject:ruby-generic-server
-# Freeware
-
-require "socket"
-require "thread"
-
-class GServer
-
-  DEFAULT_HOST = "127.0.0.1"
-
-  def serve(io)
-  end
-
-  @@services = {}   # Hash of opened ports, i.e. services
-  @@servicesMutex = Mutex.new
-
-  def GServer.stop(port, host = DEFAULT_HOST)
-    @@servicesMutex.synchronize {
-      @@services[host][port].stop
-    }
-  end
-
-  def GServer.in_service?(port, host = DEFAULT_HOST)
-    @@services.has_key?(host) and
-      @@services[host].has_key?(port)
-  end
-
-  def stop
-    @connectionsMutex.synchronize  {
-      if @tcpServerThread
-        @tcpServerThread.raise "stop"
-      end
-    }
-  end
-
-  def stopped?
-    @tcpServerThread == nil
-  end
-
-  def shutdown
-    @shutdown = true
-  end
-
-  def connections
-    @connections.size
-  end
-
-  def join
-    @tcpServerThread.join if @tcpServerThread
-  end
-
-  attr_reader :port, :host, :maxConnections
-  attr_accessor :stdlog, :audit, :debug
-
-  def connecting(client)
-    addr = client.peeraddr
-    log("#{self.class.to_s} #{@host}:#{@port} client:#{addr[1]} " +
-        "#{addr[2]}<#{addr[3]}> connect")
-    true
-  end
-
-  def disconnecting(clientPort)
-    log("#{self.class.to_s} #{@host}:#{@port} " +
-      "client:#{clientPort} disconnect")
-  end
-
-  protected :connecting, :disconnecting
-
-  def starting()
-    log("#{self.class.to_s} #{@host}:#{@port} start")
-  end
-
-  def stopping()
-    log("#{self.class.to_s} #{@host}:#{@port} stop")
-  end
-
-  protected :starting, :stopping
-
-  def error(detail)
-    log(detail.backtrace.join("\n"))
-  end
-
-  def log(msg)
-    if @stdlog
-      @stdlog.puts("[#{Time.new.ctime}] %s" % msg)
-      @stdlog.flush
-    end
-  end
-
-  protected :error, :log
-
-  def initialize(port, host = DEFAULT_HOST, maxConnections = 4,
-    stdlog = $stderr, audit = false, debug = false)
-    @tcpServerThread = nil
-    @port = port
-    @host = host
-    @maxConnections = maxConnections
-    @connections = []
-    @connectionsMutex = Mutex.new
-    @connectionsCV = ConditionVariable.new
-    @stdlog = stdlog
-    @audit = audit
-    @debug = debug
-  end
-
-  def start(maxConnections = -1)
-    raise "running" if !stopped?
-    @shutdown = false
-    @maxConnections = maxConnections if maxConnections > 0
-    @@servicesMutex.synchronize  {
-      if GServer.in_service?(@port,@host)
-        raise "Port already in use: #{host}:#{@port}!"
-      end
-      @tcpServer = TCPServer.new(@host,@port)
-      @port = @tcpServer.addr[1]
-      @@services[@host] = {} unless @@services.has_key?(@host)
-      @@services[@host][@port] = self;
-    }
-    @tcpServerThread = Thread.new {
-      begin
-        starting if @audit
-        while !@shutdown
-          @connectionsMutex.synchronize  {
-             while @connections.size >= @maxConnections
-               @connectionsCV.wait(@connectionsMutex)
-             end
-          }
-          client = @tcpServer.accept
-          @connections << Thread.new(client)  { |myClient|
-            begin
-              myPort = myClient.peeraddr[1]
-              serve(myClient) if !@audit or connecting(myClient)
-            rescue => detail
-              error(detail) if @debug
-            ensure
-              begin
-                myClient.close
-              rescue
-              end
-              @connectionsMutex.synchronize {
-                @connections.delete(Thread.current)
-                @connectionsCV.signal
-              }
-              disconnecting(myPort) if @audit
-            end
-          }
-        end
-      rescue => detail
-        error(detail) if @debug
-      ensure
-        begin
-          @tcpServer.close
-        rescue
-        end
-        if @shutdown
-          @connectionsMutex.synchronize  {
-             while @connections.size > 0
-               @connectionsCV.wait(@connectionsMutex)
-             end
-          }
-        else
-          @connections.each { |c| c.raise "stop" }
-        end
-        @tcpServerThread = nil
-        @@servicesMutex.synchronize  {
-          @@services[@host].delete(@port)
-        }
-        stopping if @audit
-      end
-    }
-    self
-  end
-
-end
diff --git a/lib/importenv.rb b/lib/importenv.rb
index 435d6f972a..10b289199c 100644
--- a/lib/importenv.rb
+++ b/lib/importenv.rb
@@ -1,4 +1,4 @@
-# importenv.rb -- imports environment variables as global variables, Perlish ;(
+# importenv.rb -- imports environment variables as global variables
 #
 # Usage:
 #
@@ -10,10 +10,10 @@
 for k,v in ENV
   next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k
   eval <<EOS
-  $#{k} = v
+  $#{k} = %q!#{v}!
   trace_var "$#{k}", proc{|v|
-    ENV[%q!#{k}!] = v
-    $#{k} = v
+    ENV[%q!#{k}!] = v; 
+    $#{k} = %q!#{v}!
     if v == nil
       untrace_var "$#{k}"
     end
@@ -29,3 +29,4 @@ if __FILE__ == $0
   $TERM = "foo"
   p ENV["TERM"]
 end
+
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
deleted file mode 100644
index b8befe8499..0000000000
--- a/lib/ipaddr.rb
+++ /dev/null
@@ -1,700 +0,0 @@
-#
-# ipaddr.rb - A class to manipulate an IP address
-#
-# Copyright (c) 2002 Hajimu UMEMOTO <ume@mahoroba.org>.
-# All rights reserved.
-#
-# You can redistribute and/or modify it under the same terms as Ruby.
-#
-# $Id$
-#--
-# TODO:
-#   - scope_id support
-#++
-#
-#== Example
-#
-#  require 'ipaddr'
-#
-#  ipaddr1 = IPAddr.new "3ffe:505:2::1"
-#
-#  p ipaddr1			#=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0001/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff>
-#
-#  p ipaddr1.to_s		#=> "3ffe:505:2::1"
-#
-#  ipaddr2 = ipaddr1.mask(48)	#=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>
-#
-#  p ipaddr2.to_s		#=> "3ffe:505:2::"
-#
-#  ipaddr3 = IPAddr.new "192.168.2.0/24"
-#
-#  p ipaddr3			#=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
-
-require 'socket'
-
-# IPAddr provides a set of methods to manipulate an IP address.  Both
-# IPv4 and IPv6 are supported.
-class IPAddr
-
-  IN4MASK = 0xffffffff
-  IN6MASK = 0xffffffffffffffffffffffffffffffff
-  IN6FORMAT = (["%.4x"] * 8).join(':')
-
-  # Returns the address family of this IP address.
-  attr :family
-
-  # Creates a new ipaddr containing the given network byte ordered
-  # string form of an IP address.
-  def IPAddr::new_ntoh(addr)
-    return IPAddr.new(IPAddr::ntop(addr))
-  end
-
-  # Convert a network byte ordered string form of an IP address into
-  # human readable form.
-  def IPAddr::ntop(addr)
-    case addr.size
-    when 4
-      s = addr.unpack('C4').join('.')
-    when 16
-      s = IN6FORMAT % addr.unpack('n8')
-    else
-      raise ArgumentError, "unsupported address family"
-    end
-    return s
-  end
-
-  # Returns a new ipaddr built by bitwise AND.
-  def &(other)
-    return self.clone.set(@addr & other.to_i)
-  end
-
-  # Returns a new ipaddr built by bitwise OR.
-  def |(other)
-    return self.clone.set(@addr | other.to_i)
-  end
-
-  # Returns a new ipaddr built by bitwise right-shift.
-  def >>(num)
-    return self.clone.set(@addr >> num)
-  end
-
-  # Returns a new ipaddr built by bitwise left shift.
-  def <<(num)
-    return self.clone.set(addr_mask(@addr << num))
-  end
-
-  # Returns a new ipaddr built by bitwise negation.
-  def ~
-    return self.clone.set(addr_mask(~@addr))
-  end
-
-  # Returns true if two ipaddr are equal.
-  def ==(other)
-    if other.kind_of?(IPAddr) && @family != other.family
-      return false
-    end
-    return (@addr == other.to_i)
-  end
-
-  # Returns a new ipaddr built by masking IP address with the given
-  # prefixlen/netmask. (e.g. 8, 64, "255.255.255.0", etc.)
-  def mask(prefixlen)
-    return self.clone.mask!(prefixlen)
-  end
-
-  # Returns true if the given ipaddr is in the range.
-  #
-  # e.g.:
-  #   require 'ipaddr'
-  #   net1 = IPAddr.new("192.168.2.0/24")
-  #   p net1.include?(IPAddr.new("192.168.2.0"))	#=> true
-  #   p net1.include?(IPAddr.new("192.168.2.255"))	#=> true
-  #   p net1.include?(IPAddr.new("192.168.3.0"))	#=> false
-  def include?(other)
-    if ipv4_mapped?
-      if (@mask_addr >> 32) != 0xffffffffffffffffffffffff
-	return false
-      end
-      mask_addr = (@mask_addr & IN4MASK)
-      addr = (@addr & IN4MASK)
-      family = Socket::AF_INET
-    else
-      mask_addr = @mask_addr
-      addr = @addr
-      family = @family
-    end
-    if other.kind_of?(IPAddr)
-      if other.ipv4_mapped?
-	other_addr = (other.to_i & IN4MASK)
-	other_family = Socket::AF_INET
-      else
-	other_addr = other.to_i
-	other_family = other.family
-      end
-    else # Not IPAddr - assume integer in same family as us
-      other_addr   = other.to_i
-      other_family = family
-    end
-
-    if family != other_family
-      return false
-    end
-    return ((addr & mask_addr) == (other_addr & mask_addr))
-  end
-  alias === include?
-
-  # Returns the integer representation of the ipaddr.
-  def to_i
-    return @addr
-  end
-
-  # Returns a string containing the IP address representation.
-  def to_s
-    return IPSocket.getaddress(to_string)
-  end
-
-  # Returns a string containing the IP address representation in
-  # canonical form.
-  def to_string
-    return _to_string(@addr)
-  end
-
-  # Returns a network byte ordered string form of the IP address.
-  def hton
-    case @family
-    when Socket::AF_INET
-      return [@addr].pack('N')
-    when Socket::AF_INET6
-      return (0..7).map { |i|
-	(@addr >> (112 - 16 * i)) & 0xffff
-      }.pack('n8')
-    else
-      raise "unsupported address family"
-    end
-  end
-
-  # Returns true if the ipaddr is an IPv4 address.
-  def ipv4?
-    return @family == Socket::AF_INET
-  end
-
-  # Returns true if the ipaddr is an IPv6 address.
-  def ipv6?
-    return @family == Socket::AF_INET6
-  end
-
-  # Returns true if the ipaddr is an IPv4-mapped IPv6 address.
-  def ipv4_mapped?
-    return ipv6? && (@addr >> 32) == 0xffff
-  end
-
-  # Returns true if the ipaddr is an IPv4-compatible IPv6 address.
-  def ipv4_compat?
-    if !ipv6? || (@addr >> 32) != 0
-      return false
-    end
-    a = (@addr & IN4MASK)
-    return a != 0 && a != 1
-  end
-
-  # Returns a new ipaddr built by converting the native IPv4 address
-  # into an IPv4-mapped IPv6 address.
-  def ipv4_mapped
-    if !ipv4?
-      raise ArgumentError, "not an IPv4 address"
-    end
-    return self.clone.set(@addr | 0xffff00000000, Socket::AF_INET6)
-  end
-
-  # Returns a new ipaddr built by converting the native IPv4 address
-  # into an IPv4-compatible IPv6 address.
-  def ipv4_compat
-    if !ipv4?
-      raise ArgumentError, "not an IPv4 address"
-    end
-    return self.clone.set(@addr, Socket::AF_INET6)
-  end
-
-  # Returns a new ipaddr built by converting the IPv6 address into a
-  # native IPv4 address.  If the IP address is not an IPv4-mapped or
-  # IPv4-compatible IPv6 address, returns self.
-  def native
-    if !ipv4_mapped? && !ipv4_compat?
-      return self
-    end
-    return self.clone.set(@addr & IN4MASK, Socket::AF_INET)
-  end
-
-  # Returns a string for DNS reverse lookup.  It returns a string in
-  # RFC3172 form for an IPv6 address.
-  def reverse
-    case @family
-    when Socket::AF_INET
-      return _reverse + ".in-addr.arpa"
-    when Socket::AF_INET6
-      return ip6_arpa
-    else
-      raise "unsupported address family"
-    end
-  end
-
-  # Returns a string for DNS reverse lookup compatible with RFC3172.
-  def ip6_arpa
-    if !ipv6?
-      raise ArgumentError, "not an IPv6 address"
-    end
-    return _reverse + ".ip6.arpa"
-  end
-
-  # Returns a string for DNS reverse lookup compatible with RFC1886.
-  def ip6_int
-    if !ipv6?
-      raise ArgumentError, "not an IPv6 address"
-    end
-    return _reverse + ".ip6.int"
-  end
-
-  # Returns a string containing a human-readable representation of the
-  # ipaddr. ("#<IPAddr: family:address/mask>")
-  def inspect
-    case @family
-    when Socket::AF_INET
-      af = "IPv4"
-    when Socket::AF_INET6
-      af = "IPv6"
-    else
-      raise "unsupported address family"
-    end
-    return sprintf("#<%s: %s:%s/%s>", self.class.name,
-		   af, _to_string(@addr), _to_string(@mask_addr))
-  end
-
-  protected
-
-  def set(addr, *family)
-    case family[0] ? family[0] : @family
-    when Socket::AF_INET
-      if addr < 0 || addr > IN4MASK
-	raise ArgumentError, "invalid address"
-      end
-    when Socket::AF_INET6
-      if addr < 0 || addr > IN6MASK
-	raise ArgumentError, "invalid address"
-      end
-    else
-      raise ArgumentError, "unsupported address family"
-    end
-    @addr = addr
-    if family[0]
-      @family = family[0]
-    end
-    return self
-  end
-
-  def mask!(mask)
-    if mask.kind_of?(String)
-      if mask =~ /^\d+$/
-	prefixlen = mask.to_i
-      else
-	m = IPAddr.new(mask)
-	if m.family != @family
-	  raise ArgumentError, "address family is not same"
-	end
-	@mask_addr = m.to_i
-	@addr &= @mask_addr
-	return self
-      end
-    else
-      prefixlen = mask
-    end
-    case @family
-    when Socket::AF_INET
-      if prefixlen < 0 || prefixlen > 32
-	raise ArgumentError, "invalid length"
-      end
-      masklen = 32 - prefixlen
-      @mask_addr = ((IN4MASK >> masklen) << masklen)
-    when Socket::AF_INET6
-      if prefixlen < 0 || prefixlen > 128
-	raise ArgumentError, "invalid length"
-      end
-      masklen = 128 - prefixlen
-      @mask_addr = ((IN6MASK >> masklen) << masklen)
-    else
-      raise "unsupported address family"
-    end
-    @addr = ((@addr >> masklen) << masklen)
-    return self
-  end
-
-  private
-
-  # Creates a new ipaddr containing the given human readable form of
-  # an IP address.  It also accepts `address/prefixlen' and
-  # `address/mask'.  When prefixlen or mask is specified, it returns a
-  # masked ipaddr.  IPv6 address may beenclosed with `[' and `]'.
-  #
-  # Although an address family is determined automatically from a
-  # specified address, you can specify an address family explicitly by
-  # the optional second argument.
-  def initialize(addr = '::', family = Socket::AF_UNSPEC)
-    if !addr.kind_of?(String)
-      if family != Socket::AF_INET6 && family != Socket::AF_INET
-	raise ArgumentError, "unsupported address family"
-      end
-      set(addr, family)
-      @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
-      return
-    end
-    prefix, prefixlen = addr.split('/')
-    if prefix =~ /^\[(.*)\]$/i
-      prefix = $1
-      family = Socket::AF_INET6
-    end
-    # It seems AI_NUMERICHOST doesn't do the job.
-    #Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil,
-    #		       Socket::AI_NUMERICHOST)
-    begin
-      IPSocket.getaddress(prefix)		# test if address is vaild
-    rescue
-      raise ArgumentError, "invalid address"
-    end
-    @addr = @family = nil
-    if family == Socket::AF_UNSPEC || family == Socket::AF_INET
-      @addr = in_addr(prefix)
-      if @addr
-	@family = Socket::AF_INET
-      end
-    end
-    if !@addr && (family == Socket::AF_UNSPEC || family == Socket::AF_INET6)
-      @addr = in6_addr(prefix)
-      @family = Socket::AF_INET6
-    end
-    if family != Socket::AF_UNSPEC && @family != family
-      raise ArgumentError, "address family unmatch"
-    end
-    if prefixlen
-      mask!(prefixlen)
-    else
-      @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
-    end
-  end
-
-  def in_addr(addr)
-    if addr =~ /^\d+\.\d+\.\d+\.\d+$/
-      n = 0
-      addr.split('.').each { |i|
-	n <<= 8
-	n += i.to_i
-      }
-      return n
-    end
-    return nil
-  end
-
-  def in6_addr(left)
-    case left
-    when /^::ffff:(\d+\.\d+\.\d+\.\d+)$/i
-      return in_addr($1) + 0xffff00000000
-    when /^::(\d+\.\d+\.\d+\.\d+)$/i
-      return in_addr($1)
-    when /[^0-9a-f:]/i
-      raise ArgumentError, "invalid address"
-    when /^(.*)::(.*)$/
-      left, right = $1, $2
-    else
-      right = ''
-    end
-    l = left.split(':')
-    r = right.split(':')
-    rest = 8 - l.size - r.size
-    if rest < 0
-      return nil
-    end
-    a = [l, Array.new(rest, '0'), r].flatten!
-    n = 0
-    a.each { |i|
-      n <<= 16
-      n += i.hex
-    }
-    return n
-  end
-
-  def addr_mask(addr)
-    case @family
-    when Socket::AF_INET
-      addr &= IN4MASK
-    when Socket::AF_INET6
-      addr &= IN6MASK
-    else
-      raise "unsupported address family"
-    end
-    return addr
-  end
-
-  def _reverse
-    case @family
-    when Socket::AF_INET
-      return (0..3).map { |i|
-	(@addr >> (8 * i)) & 0xff
-      }.join('.')
-    when Socket::AF_INET6
-      return ("%.32x" % @addr).reverse!.gsub!(/.(?!$)/, '\&.')
-    else
-      raise "unsupported address family"
-    end
-  end
-
-  def _to_string(addr)
-    case @family
-    when Socket::AF_INET
-      return (0..3).map { |i|
-	(addr >> (24 - 8 * i)) & 0xff
-      }.join('.')
-    when Socket::AF_INET6
-      return (("%.32x" % addr).gsub!(/.{4}(?!$)/, '\&:'))
-    else
-      raise "unsupported address family"
-    end
-  end
-
-end
-
-if $0 == __FILE__
-  eval DATA.read, nil, $0, __LINE__+4
-end
-
-__END__
-
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-
-class TC_IPAddr < Test::Unit::TestCase
-  def test_s_new
-    assert_nothing_raised {
-      IPAddr.new("3FFE:505:ffff::/48")
-      IPAddr.new("0:0:0:1::")
-      IPAddr.new("2001:200:300::/48")
-    }
-
-    a = IPAddr.new
-    assert_equal("::", a.to_s)
-    assert_equal("0000:0000:0000:0000:0000:0000:0000:0000", a.to_string)
-    assert_equal(Socket::AF_INET6, a.family)
-
-    a = IPAddr.new("0123:4567:89ab:cdef:0ABC:DEF0:1234:5678")
-    assert_equal("123:4567:89ab:cdef:abc:def0:1234:5678", a.to_s)
-    assert_equal("0123:4567:89ab:cdef:0abc:def0:1234:5678", a.to_string)
-    assert_equal(Socket::AF_INET6, a.family)
-
-    a = IPAddr.new("3ffe:505:2::/48")
-    assert_equal("3ffe:505:2::", a.to_s)
-    assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0000", a.to_string)
-    assert_equal(Socket::AF_INET6, a.family)
-    assert_equal(false, a.ipv4?)
-    assert_equal(true, a.ipv6?)
-    assert_equal("#<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>", a.inspect)
-
-    a = IPAddr.new("3ffe:505:2::/ffff:ffff:ffff::")
-    assert_equal("3ffe:505:2::", a.to_s)
-    assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0000", a.to_string)
-    assert_equal(Socket::AF_INET6, a.family)
-
-    a = IPAddr.new("0.0.0.0")
-    assert_equal("0.0.0.0", a.to_s)
-    assert_equal("0.0.0.0", a.to_string)
-    assert_equal(Socket::AF_INET, a.family)
-
-    a = IPAddr.new("192.168.1.2")
-    assert_equal("192.168.1.2", a.to_s)
-    assert_equal("192.168.1.2", a.to_string)
-    assert_equal(Socket::AF_INET, a.family)
-    assert_equal(true, a.ipv4?)
-    assert_equal(false, a.ipv6?)
-
-    a = IPAddr.new("192.168.1.2/24")
-    assert_equal("192.168.1.0", a.to_s)
-    assert_equal("192.168.1.0", a.to_string)
-    assert_equal(Socket::AF_INET, a.family)
-    assert_equal("#<IPAddr: IPv4:192.168.1.0/255.255.255.0>", a.inspect)
-
-    a = IPAddr.new("192.168.1.2/255.255.255.0")
-    assert_equal("192.168.1.0", a.to_s)
-    assert_equal("192.168.1.0", a.to_string)
-    assert_equal(Socket::AF_INET, a.family)
-
-    assert_equal("0:0:0:1::", IPAddr.new("0:0:0:1::").to_s)
-    assert_equal("2001:200:300::", IPAddr.new("2001:200:300::/48").to_s)
-
-    assert_equal("2001:200:300::", IPAddr.new("[2001:200:300::]/48").to_s)
-
-    [
-      ["fe80::1%fxp0"],
-      ["::1/255.255.255.0"],
-      ["::1:192.168.1.2/120"],
-      [IPAddr.new("::1").to_i],
-      ["::ffff:192.168.1.2/120", Socket::AF_INET],
-      ["[192.168.1.2]/120"],
-    ].each { |args|
-      assert_raises(ArgumentError) {
-	IPAddr.new(*args)
-      }
-    }
-  end
-
-  def test_s_new_ntoh
-    addr = ''
-    IPAddr.new("1234:5678:9abc:def0:1234:5678:9abc:def0").hton.each_byte { |c|
-      addr += sprintf("%02x", c)
-    }
-    assert_equal("123456789abcdef0123456789abcdef0", addr)
-    addr = ''
-    IPAddr.new("123.45.67.89").hton.each_byte { |c|
-      addr += sprintf("%02x", c)
-    }
-    assert_equal(sprintf("%02x%02x%02x%02x", 123, 45, 67, 89), addr)
-    a = IPAddr.new("3ffe:505:2::")
-    assert_equal("3ffe:505:2::", IPAddr.new_ntoh(a.hton).to_s)
-    a = IPAddr.new("192.168.2.1")
-    assert_equal("192.168.2.1", IPAddr.new_ntoh(a.hton).to_s)
-  end
-
-  def test_ipv4_compat
-    a = IPAddr.new("::192.168.1.2")
-    assert_equal("::192.168.1.2", a.to_s)
-    assert_equal("0000:0000:0000:0000:0000:0000:c0a8:0102", a.to_string)
-    assert_equal(Socket::AF_INET6, a.family)
-    assert_equal(true, a.ipv4_compat?)
-    b = a.native
-    assert_equal("192.168.1.2", b.to_s)
-    assert_equal(Socket::AF_INET, b.family)
-    assert_equal(false, b.ipv4_compat?)
-
-    a = IPAddr.new("192.168.1.2")
-    b = a.ipv4_compat
-    assert_equal("::192.168.1.2", b.to_s)
-    assert_equal(Socket::AF_INET6, b.family)
-  end
-
-  def test_ipv4_mapped
-    a = IPAddr.new("::ffff:192.168.1.2")
-    assert_equal("::ffff:192.168.1.2", a.to_s)
-    assert_equal("0000:0000:0000:0000:0000:ffff:c0a8:0102", a.to_string)
-    assert_equal(Socket::AF_INET6, a.family)
-    assert_equal(true, a.ipv4_mapped?)
-    b = a.native
-    assert_equal("192.168.1.2", b.to_s)
-    assert_equal(Socket::AF_INET, b.family)
-    assert_equal(false, b.ipv4_mapped?)
-
-    a = IPAddr.new("192.168.1.2")
-    b = a.ipv4_mapped
-    assert_equal("::ffff:192.168.1.2", b.to_s)
-    assert_equal(Socket::AF_INET6, b.family)
-  end
-
-  def test_reverse
-    assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.arpa", IPAddr.new("3ffe:505:2::f").reverse)
-    assert_equal("1.2.168.192.in-addr.arpa", IPAddr.new("192.168.2.1").reverse)
-  end
-
-  def test_ip6_arpa
-    assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.arpa", IPAddr.new("3ffe:505:2::f").ip6_arpa)
-    assert_raises(ArgumentError) {
-      IPAddr.new("192.168.2.1").ip6_arpa
-    }
-  end
-
-  def test_ip6_int
-    assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.int", IPAddr.new("3ffe:505:2::f").ip6_int)
-    assert_raises(ArgumentError) {
-      IPAddr.new("192.168.2.1").ip6_int
-    }
-  end
-
-end
-
-class TC_Operator < Test::Unit::TestCase
-
-  IN6MASK32  = "ffff:ffff::"
-  IN6MASK128 = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"
-
-  def setup
-    @in6_addr_any = IPAddr.new()
-    @a = IPAddr.new("3ffe:505:2::/48")
-    @b = IPAddr.new("0:0:0:1::")
-    @c = IPAddr.new(IN6MASK32)
-  end
-  alias set_up setup
-
-  def test_or
-    assert_equal("3ffe:505:2:1::", (@a | @b).to_s)
-    a = @a
-    a |= @b
-    assert_equal("3ffe:505:2:1::", a.to_s)
-    assert_equal("3ffe:505:2::", @a.to_s)
-    assert_equal("3ffe:505:2:1::",
-		 (@a | 0x00000000000000010000000000000000).to_s)
-  end
-
-  def test_and
-    assert_equal("3ffe:505::", (@a & @c).to_s)
-    a = @a
-    a &= @c
-    assert_equal("3ffe:505::", a.to_s)
-    assert_equal("3ffe:505:2::", @a.to_s)
-    assert_equal("3ffe:505::", (@a & 0xffffffff000000000000000000000000).to_s)
-  end
-
-  def test_shift_right
-    assert_equal("0:3ffe:505:2::", (@a >> 16).to_s)
-    a = @a
-    a >>= 16
-    assert_equal("0:3ffe:505:2::", a.to_s)
-    assert_equal("3ffe:505:2::", @a.to_s)
-  end
-
-  def test_shift_left
-    assert_equal("505:2::", (@a << 16).to_s)
-    a = @a
-    a <<= 16
-    assert_equal("505:2::", a.to_s)
-    assert_equal("3ffe:505:2::", @a.to_s)
-  end
-
-  def test_carrot
-    a = ~@in6_addr_any
-    assert_equal(IN6MASK128, a.to_s)
-    assert_equal("::", @in6_addr_any.to_s)
-  end
-
-  def test_equal
-    assert_equal(true, @a == IPAddr.new("3ffe:505:2::"))
-    assert_equal(false, @a == IPAddr.new("3ffe:505:3::"))
-    assert_equal(true, @a != IPAddr.new("3ffe:505:3::"))
-    assert_equal(false, @a != IPAddr.new("3ffe:505:2::"))
-  end
-
-  def test_mask
-    a = @a.mask(32)
-    assert_equal("3ffe:505::", a.to_s)
-    assert_equal("3ffe:505:2::", @a.to_s)
-  end
-
-  def test_include?
-    assert_equal(true, @a.include?(IPAddr.new("3ffe:505:2::")))
-    assert_equal(true, @a.include?(IPAddr.new("3ffe:505:2::1")))
-    assert_equal(false, @a.include?(IPAddr.new("3ffe:505:3::")))
-    net1 = IPAddr.new("192.168.2.0/24")
-    assert_equal(true, net1.include?(IPAddr.new("192.168.2.0")))
-    assert_equal(true, net1.include?(IPAddr.new("192.168.2.255")))
-    assert_equal(false, net1.include?(IPAddr.new("192.168.3.0")))
-    # test with integer parameter
-    int = (192 << 24) + (168 << 16) + (2 << 8) + 13
-
-    assert_equal(true, net1.include?(int))
-    assert_equal(false, net1.include?(int+255))
-
-  end
-
-end
diff --git a/lib/irb.rb b/lib/irb.rb
deleted file mode 100644
index 1e59d6f669..0000000000
--- a/lib/irb.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-#
-#   irb.rb - irb main module
-#   	$Release Version: 0.9 $
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#
-#
-require "e2mmap"
-
-require "irb/init"
-require "irb/context"
-require "irb/extend-command"
-#require "irb/workspace"
-
-require "irb/ruby-lex"
-require "irb/input-method"
-require "irb/locale"
-
-STDOUT.sync = true
-
-module IRB
-  @RCS_ID='-$Id$-'
-
-  class Abort < Exception;end
-
-  #
-  @CONF = {}
-
-  def IRB.conf
-    @CONF
-  end
-
-  # IRB version method
-  def IRB.version
-    if v = @CONF[:VERSION] then return v end
-
-    require "irb/version"
-    rv = @RELEASE_VERSION.sub(/\.0/, "")
-    @CONF[:VERSION] = format("irb %s(%s)", rv, @LAST_UPDATE_DATE)
-  end
-
-  def IRB.CurrentContext
-    IRB.conf[:MAIN_CONTEXT]
-  end
-
-  # initialize IRB and start TOP_LEVEL irb
-  def IRB.start(ap_path = nil)
-    $0 = File::basename(ap_path, ".rb") if ap_path
-
-    IRB.setup(ap_path)
-
-    if @CONF[:SCRIPT]
-      irb = Irb.new(nil, @CONF[:SCRIPT])
-    else
-      irb = Irb.new
-    end
-
-    @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
-    @CONF[:MAIN_CONTEXT] = irb.context
-
-    trap("SIGINT") do
-      irb.signal_handle
-    end
-    
-    catch(:IRB_EXIT) do
-      irb.eval_input
-    end
-#    print "\n"
-  end
-
-  def IRB.irb_exit(irb, ret)
-    throw :IRB_EXIT, ret
-  end
-
-  def IRB.irb_abort(irb, exception = Abort)
-    if defined? Thread
-      irb.context.thread.raise exception, "abort then interrupt!!"
-    else
-      raise exception, "abort then interrupt!!"
-    end
-  end
-
-  #
-  # irb interpriter main routine 
-  #
-  class Irb
-    def initialize(workspace = nil, input_method = nil)
-      @context = Context.new(self, workspace, input_method)
-      @context.main.extend ExtendCommandBundle
-      @signal_status = :IN_IRB
-
-      @scanner = RubyLex.new
-      @scanner.exception_on_syntax_error = false
-    end
-    attr_reader :context
-    attr_accessor :scanner
-
-    def eval_input
-      @scanner.set_prompt do
-	|ltype, indent, continue, line_no|
-	if ltype
-	  f = @context.prompt_s
-	elsif continue
-	  f = @context.prompt_c
-	else @context.prompt_i
-	  f = @context.prompt_i
-	end
-	f = "" unless f
-	if @context.prompting?
-	  @context.io.prompt = p = prompt(f, ltype, indent, line_no)
-	else
-	  @context.io.prompt = p = ""
-	end
-	if @context.auto_indent_mode
-	  unless ltype
-	    ind = prompt(@context.prompt_i, ltype, indent, line_no).size + 
-	      indent * 2 - p.size
-	    ind += 2 if continue
-	    @context.io.prompt = p + " " * ind if ind > 0
-	  end
-	end
-      end
-       
-      @scanner.set_input(@context.io) do
-	signal_status(:IN_INPUT) do
-	  if l = @context.io.gets
-	    print l if @context.verbose?
-	  else
-	    if @context.ignore_eof? and @context.io.readable_atfer_eof?
-	      l = "\n"
-	      if @context.verbose?
-		printf "Use \"exit\" to leave %s\n", @context.ap_name
-	      end
-	    end
-	  end
-	  l
-	end
-      end
-
-      @scanner.each_top_level_statement do |line, line_no|
-	signal_status(:IN_EVAL) do
-	  begin
-            line.untaint
-	    @context.evaluate(line, line_no)
-	    output_value if @context.echo?
-	  rescue StandardError, ScriptError, Abort
-	    $! = RuntimeError.new("unknown exception raised") unless $!
-	    print $!.class, ": ", $!, "\n"
-	    if  $@[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && $!.class.to_s !~ /^IRB/
-	      irb_bug = true 
-	    else
-	      irb_bug = false
-	    end
-	    
-	    messages = []
-	    lasts = []
-	    levels = 0
-	    for m in $@
-	      m = @context.workspace.filter_backtrace(m) unless irb_bug
-	      if m
-		if messages.size < @context.back_trace_limit
-		  messages.push "\tfrom "+m
-		else
-		  lasts.push "\tfrom "+m
-		  if lasts.size > @context.back_trace_limit
-		    lasts.shift 
-		    levels += 1
-		  end
-		end
-	      end
-	    end
-	    print messages.join("\n"), "\n"
-	    unless lasts.empty?
-	      printf "... %d levels...\n", levels if levels > 0
-	      print lasts.join("\n")
-	    end
-	    print "Maybe IRB bug!!\n" if irb_bug
-	  end
-          if $SAFE > 2
-            warn "Error: irb does not work for $SAFE level higher than 2"
-            exit 1
-          end
-	end
-      end
-    end
-
-    def suspend_name(path = nil, name = nil)
-      @context.irb_path, back_path = path, @context.irb_path if path
-      @context.irb_name, back_name = name, @context.irb_name if name
-      begin
-	yield back_path, back_name
-      ensure
-	@context.irb_path = back_path if path
-	@context.irb_name = back_name if name
-      end
-    end
-
-    def suspend_workspace(workspace)
-      @context.workspace, back_workspace = workspace, @context.workspace
-      begin
-	yield back_workspace
-      ensure
-	@context.workspace = back_workspace
-      end
-    end
-
-    def suspend_input_method(input_method)
-      back_io = @context.io
-      @context.instance_eval{@io = input_method}
-      begin
-	yield back_io
-      ensure
-	@context.instance_eval{@io = back_io}
-      end
-    end
-
-    def suspend_context(context)
-      @context, back_context = context, @context
-      begin
-	yield back_context
-      ensure
-	@context = back_context
-      end
-    end
-
-    def signal_handle
-      unless @context.ignore_sigint?
-	print "\nabort!!\n" if @context.verbose?
-	exit
-      end
-
-      case @signal_status
-      when :IN_INPUT
-	print "^C\n"
-	raise RubyLex::TerminateLineInput
-      when :IN_EVAL
-	IRB.irb_abort(self)
-      when :IN_LOAD
-	IRB.irb_abort(self, LoadAbort)
-      when :IN_IRB
-	# ignore
-      else
-	# ignore other cases as well
-      end
-    end
-
-    def signal_status(status)
-      return yield if @signal_status == :IN_LOAD
-
-      signal_status_back = @signal_status
-      @signal_status = status
-      begin
-	yield
-      ensure
-	@signal_status = signal_status_back
-      end
-    end
-
-    def prompt(prompt, ltype, indent, line_no)
-      p = prompt.dup
-      p.gsub!(/%([0-9]+)?([a-zA-Z])/) do
-	case $2
-	when "N"
-	  @context.irb_name
-	when "m"
-	  @context.main.to_s
-	when "M"
-	  @context.main.inspect
-	when "l"
-	  ltype
-	when "i"
-	  if $1 
-	    format("%" + $1 + "d", indent)
-	  else
-	    indent.to_s
-	  end
-	when "n"
-	  if $1 
-	    format("%" + $1 + "d", line_no)
-	  else
-	    line_no.to_s
-	  end
-	when "%"
-	  "%"
-	end
-      end
-      p
-    end
-
-    def output_value
-      if @context.inspect?
-        printf @context.return_format, @context.last_value.inspect
-      else
-        printf @context.return_format, @context.last_value
-      end
-    end
-
-    def inspect
-      ary = []
-      for iv in instance_variables
-	case iv
-	when "@signal_status"
-	  ary.push format("%s=:%s", iv, @signal_status.id2name)
-	when "@context"
-	  ary.push format("%s=%s", iv, eval(iv).__to_s__)
-	else
-	  ary.push format("%s=%s", iv, eval(iv))
-	end
-      end
-      format("#<%s: %s>", self.class, ary.join(", "))
-    end
-  end
-
-  # Singleton method
-  def @CONF.inspect
-    IRB.version unless self[:VERSION]
-
-    array = []
-    for k, v in sort{|a1, a2| a1[0].id2name <=> a2[0].id2name}
-      case k
-      when :MAIN_CONTEXT, :__TMP__EHV__
-	array.push format("CONF[:%s]=...myself...", k.id2name)
-      when :PROMPT
-	s = v.collect{
-	  |kk, vv|
-	  ss = vv.collect{|kkk, vvv| ":#{kkk.id2name}=>#{vvv.inspect}"}
-	  format(":%s=>{%s}", kk.id2name, ss.join(", "))
-	}
-	array.push format("CONF[:%s]={%s}", k.id2name, s.join(", "))
-      else
-	array.push format("CONF[:%s]=%s", k.id2name, v.inspect)
-      end
-    end
-    array.join("\n")
-  end
-end
diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
deleted file mode 100644
index 84f06014ba..0000000000
--- a/lib/irb/cmd/chws.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#   change-ws.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "irb/cmd/nop.rb"
-require "irb/ext/change-ws.rb"
-
-module IRB
-  module ExtendCommand
-
-    class CurrentWorkingWorkspace<Nop
-      def execute(*obj)
-	irb_context.main
-      end
-    end
-
-    class ChangeWorkspace<Nop
-      def execute(*obj)
-	irb_context.change_workspace(*obj)
-	irb_context.main
-      end
-    end
-  end
-end
-
diff --git a/lib/irb/cmd/fork.rb b/lib/irb/cmd/fork.rb
deleted file mode 100644
index 30024dc5e0..0000000000
--- a/lib/irb/cmd/fork.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-module IRB
-  module ExtendCommand
-    class Fork<Nop
-      def execute(&block)
-	pid = send(ExtendCommand.irb_original_method_name("fork"))
-	unless pid 
-	  class<<self
-	    alias_method :exit, ExtendCommand.irb_original_method_name('exit')
-	  end
-	  if iterator?
-	    begin
-	      yield
-	    ensure
-	      exit
-	    end
-	  end
-	end
-	pid
-      end
-    end
-  end
-end
-
-
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
deleted file mode 100644
index 99d20f500c..0000000000
--- a/lib/irb/cmd/load.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#   load.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "irb/cmd/nop.rb"
-require "irb/ext/loader"
-
-module IRB
-  module ExtendCommand
-    class Load<Nop
-      include IrbLoader
-
-      def execute(file_name, priv = nil)
-#	return ruby_load(file_name) unless IRB.conf[:USE_LOADER]
-	return irb_load(file_name, priv)
-      end
-    end
-
-    class Require<Nop
-      include IrbLoader
-      
-      def execute(file_name)
-#	return ruby_require(file_name) unless IRB.conf[:USE_LOADER]
-
-	rex = Regexp.new("#{Regexp.quote(file_name)}(\.o|\.rb)?")
-	return false if $".find{|f| f =~ rex}
-
-	case file_name
-	when /\.rb$/
-	  begin
-	    if irb_load(file_name)
-	      $".push file_name
-	      return true
-	    end
-	  rescue LoadError
-	  end
-	when /\.(so|o|sl)$/
-	  return ruby_require(file_name)
-	end
-	
-	begin
-	  irb_load(f = file_name + ".rb")
-	  $".push f
-	  return true
-	rescue LoadError
-	  return ruby_require(file_name)
-	end
-      end
-    end
-
-    class Source<Nop
-      include IrbLoader
-      def execute(file_name)
-	source_file(file_name)
-      end
-    end
-  end
-
-end
diff --git a/lib/irb/cmd/nop.rb b/lib/irb/cmd/nop.rb
deleted file mode 100644
index 73c52b1aa3..0000000000
--- a/lib/irb/cmd/nop.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#   nop.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-module IRB
-  module ExtendCommand
-    class Nop
-      
-      @RCS_ID='-$Id$-'
-
-      def self.execute(conf, *opts)
-	command = new(conf)
-	command.execute(*opts)
-      end
-
-      def initialize(conf)
-	@irb_context = conf
-      end
-
-      attr_reader :irb_context
-
-      def irb
-	@irb_context.irb
-      end
-
-      def execute(*opts)
-	#nop
-      end
-    end
-  end
-end
-
diff --git a/lib/irb/cmd/pushws.rb b/lib/irb/cmd/pushws.rb
deleted file mode 100644
index 0d8130d5c6..0000000000
--- a/lib/irb/cmd/pushws.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#   change-ws.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "irb/cmd/nop.rb"
-require "irb/ext/workspaces.rb"
-
-module IRB
-  module ExtendCommand
-    class Workspaces<Nop
-      def execute(*obj)
-	irb_context.workspaces.collect{|ws| ws.main}
-      end
-    end
-
-    class PushWorkspace<Workspaces
-      def execute(*obj)
-	irb_context.push_workspace(*obj)
-	super
-      end
-    end
-
-    class PopWorkspace<Workspaces
-      def execute(*obj)
-	irb_context.pop_workspace(*obj)
-	super
-      end
-    end
-  end
-end
-
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
deleted file mode 100644
index 7899f1bb43..0000000000
--- a/lib/irb/cmd/subirb.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/local/bin/ruby
-#
-#   multi.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "irb/cmd/nop.rb"
-require "irb/ext/multi-irb"
-
-module IRB
-  module ExtendCommand
-    class IrbCommand<Nop
-      def execute(*obj)
-	IRB.irb(nil, *obj)
-      end
-    end
-
-    class Jobs<Nop
-      def execute
-	IRB.JobManager
-      end
-    end
-
-    class Foreground<Nop
-      def execute(key)
-	IRB.JobManager.switch(key)
-      end
-    end
-
-    class Kill<Nop
-      def execute(*keys)
-	IRB.JobManager.kill(*keys)
-      end
-    end
-  end
-end
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
deleted file mode 100644
index 46e6f24f30..0000000000
--- a/lib/irb/completion.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-#   irb/completor.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#       From Original Idea of shugo@ruby-lang.org
-#
-
-require "readline"
-
-module IRB
-  module InputCompletor
-
-    @RCS_ID='-$Id$-'
-
-    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",
-    ]
-      
-    CompletionProc = proc { |input|
-      bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
-      
-#      puts "input: #{input}"
-
-      case input
-      when /^(\/[^\/]*\/)\.([^.]*)$/
-	# Regexp
-	receiver = $1
-	message = Regexp.quote($2)
-
-	candidates = Regexp.instance_methods(true)
-	select_message(receiver, message, candidates)
-
-      when /^([^\]]*\])\.([^.]*)$/
-	# Array
-	receiver = $1
-	message = Regexp.quote($2)
-
-	candidates = Array.instance_methods(true)
-	select_message(receiver, message, candidates)
-
-      when /^([^\}]*\})\.([^.]*)$/
-	# Proc or Hash
-	receiver = $1
-	message = Regexp.quote($2)
-
-	candidates = Proc.instance_methods(true) | Hash.instance_methods(true)
-	select_message(receiver, message, candidates)
-	
-      when /^(:[^:.]*)$/
- 	# Symbol
-	if Symbol.respond_to?(:all_symbols)
-	  sym = $1
-	  candidates = Symbol.all_symbols.collect{|s| ":" + s.id2name}
-	  candidates.grep(/^#{sym}/)
-	else
-	  []
-	end
-
-      when /^::([A-Z][^:\.\(]*)$/
-	# Absolute Constant or class methods
-	receiver = $1
-	candidates = Object.constants
-	candidates.grep(/^#{receiver}/).collect{|e| "::" + e}
-
-      when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/
-	# Constant or class methods
-	receiver = $1
-	message = Regexp.quote($4)
-	begin
-	  candidates = eval("#{receiver}.constants | #{receiver}.methods", bind)
-	rescue Exception
-	  candidates = []
-	end
-	candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
-
-      when /^(:[^:.]+)\.([^.]*)$/
-	# Symbol
-	receiver = $1
-	message = Regexp.quote($2)
-
-	candidates = Symbol.instance_methods(true)
-	select_message(receiver, message, candidates)
-
-      when /^([0-9_]+(\.[0-9_]+)?(e[0-9]+)?)\.([^.]*)$/
-	# Numeric
-	receiver = $1
-	message = Regexp.quote($4)
-
-	begin
-	  candidates = eval(receiver, bind).methods
-	rescue Exception
-	  candidates
-	end
-	select_message(receiver, message, candidates)
-
-      when /^(\$[^.]*)$/
-	candidates = global_variables.grep(Regexp.new(Regexp.quote($1)))
-
-#      when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
-      when /^((\.?[^.]+)+)\.([^.]*)$/
-	# variable
-	receiver = $1
-	message = Regexp.quote($3)
-
-	gv = eval("global_variables", bind)
-	lv = eval("local_variables", bind)
-	cv = eval("self.class.constants", bind)
-	
-	if (gv | lv | cv).include?(receiver)
-	  # foo.func and foo is local var.
-	  candidates = eval("#{receiver}.methods", bind)
-	elsif /^[A-Z]/ =~ receiver and /\./ !~ receiver
-	  # Foo::Bar.func
-	  begin
-	    candidates = eval("#{receiver}.methods", bind)
-	  rescue Exception
-	    candidates = []
-	  end
-	else
-	  # func1.func2
-	  candidates = []
-	  ObjectSpace.each_object(Module){|m|
-	    next if m.name != "IRB::Context" and 
-	      /^(IRB|SLex|RubyLex|RubyToken)/ =~ m.name
-	    candidates.concat m.instance_methods(false)
-	  }
-	  candidates.sort!
-	  candidates.uniq!
-	end
-	select_message(receiver, message, candidates)
-
-      when /^\.([^.]*)$/
-	# unknown(maybe String)
-
-	receiver = ""
-	message = Regexp.quote($1)
-
-	candidates = String.instance_methods(true)
-	select_message(receiver, message, candidates)
-
-      else
-	candidates = eval("methods | private_methods | local_variables | self.class.constants", bind)
-			  
-	(candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
-      end
-    }
-
-    Operators = ["%", "&", "*", "**", "+",  "-",  "/",
-      "<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
-      "[]", "[]=", "^",]
-
-    def self.select_message(receiver, message, candidates)
-      candidates.grep(/^#{message}/).collect do |e|
-	case e
-	when /^[a-zA-Z_]/
-	  receiver + "." + e
-	when /^[0-9]/
-	when *Operators
-	  #receiver + " " + e
-	end
-      end
-    end
-  end
-end
-
-if Readline.respond_to?("basic_word_break_characters=")
-  Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
-end
-Readline.completion_append_character = nil
-Readline.completion_proc = IRB::InputCompletor::CompletionProc
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
deleted file mode 100644
index 9421608f85..0000000000
--- a/lib/irb/context.rb
+++ /dev/null
@@ -1,234 +0,0 @@
-#
-#   irb/context.rb - irb context
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-require "irb/workspace"
-
-module IRB
-  class Context
-    #
-    # Arguments:
-    #   input_method: nil -- stdin or readline
-    #		      String -- File
-    #		      other -- using this as InputMethod
-    #
-    def initialize(irb, workspace = nil, input_method = nil)
-      @irb = irb
-      if workspace
-	@workspace = workspace
-      else
-	@workspace = WorkSpace.new
-      end
-      @thread = Thread.current if defined? Thread
-#      @irb_level = 0
-
-      # copy of default configuration
-      @ap_name = IRB.conf[:AP_NAME]
-      @rc = IRB.conf[:RC]
-      @load_modules = IRB.conf[:LOAD_MODULES]
-
-      @use_readline = IRB.conf[:USE_READLINE]
-      @inspect_mode = IRB.conf[:INSPECT_MODE]
-
-      self.math_mode = IRB.conf[:MATH_MODE] if IRB.conf[:MATH_MODE]
-      self.use_tracer = IRB.conf[:USE_TRACER] if IRB.conf[:USE_TRASER]
-      self.use_loader = IRB.conf[:USE_LOADER] if IRB.conf[:USE_LOADER]
-      self.eval_history = IRB.conf[:EVAL_HISTORY] if IRB.conf[:EVAL_HISTORY]
-
-      @ignore_sigint = IRB.conf[:IGNORE_SIGINT]
-      @ignore_eof = IRB.conf[:IGNORE_EOF]
-
-      @back_trace_limit = IRB.conf[:BACK_TRACE_LIMIT]
-      
-      self.prompt_mode = IRB.conf[:PROMPT_MODE]
-
-      if IRB.conf[:SINGLE_IRB] or !defined?(JobManager)
-	@irb_name = IRB.conf[:IRB_NAME]
-      else
-	@irb_name = "irb#"+IRB.JobManager.n_jobs.to_s
-      end
-      @irb_path = "(" + @irb_name + ")"
-
-      case input_method
-      when nil
-	if (defined?(ReadlineInputMethod) &&
-            (use_readline? || IRB.conf[:PROMPT_MODE] != :INF_RUBY && STDIN.tty?))
-	  @io = ReadlineInputMethod.new
-	else
-	  @io = StdioInputMethod.new
-	end
-      when String
-	@io = FileInputMethod.new(input_method)
-	@irb_name = File.basename(input_method)
-	@irb_path = input_method
-      else
-	@io = input_method
-      end
-
-      @verbose = IRB.conf[:VERBOSE] 
-      @echo = IRB.conf[:ECHO]
-      if @echo.nil?
-	@echo = true
-      end
-      @debug_level = IRB.conf[:DEBUG_LEVEL]
-    end
-
-    def main
-      @workspace.main
-    end
-
-    attr_reader :workspace_home
-    attr_accessor :workspace
-    attr_reader :thread
-    attr_accessor :io
-    
-    attr_accessor :irb
-    attr_accessor :ap_name
-    attr_accessor :rc
-    attr_accessor :load_modules
-    attr_accessor :irb_name
-    attr_accessor :irb_path
-
-    attr_accessor :use_readline
-    attr_reader :inspect_mode
-
-    attr_reader :prompt_mode
-    attr_accessor :prompt_i
-    attr_accessor :prompt_s
-    attr_accessor :prompt_c
-    attr_accessor :auto_indent_mode
-    attr_accessor :return_format
-
-    attr_accessor :ignore_sigint
-    attr_accessor :ignore_eof
-    attr_accessor :echo
-    attr_accessor :verbose
-    attr_reader :debug_level
-
-    attr_accessor :back_trace_limit
-
-    alias use_readline? use_readline
-    alias rc? rc
-    alias ignore_sigint? ignore_sigint
-    alias ignore_eof? ignore_eof
-    alias echo? echo
-
-    def verbose?
-      if @verbose.nil?
-	if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod) 
-	  false
-	elsif !STDIN.tty? or @io.kind_of?(FileInputMethod)
-	  true
-	else
-	  false
-	end
-      end
-    end
-
-    def prompting?
-      verbose? || (STDIN.tty? && @io.kind_of?(StdioInputMethod) ||
-		(defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)))
-    end
-
-    attr_reader :last_value
-
-    def set_last_value(value)
-      @last_value = value
-    end
-
-    attr_reader :irb_name
-
-    def prompt_mode=(mode)
-      @prompt_mode = mode
-      pconf = IRB.conf[:PROMPT][mode]
-      @prompt_i = pconf[:PROMPT_I]
-      @prompt_s = pconf[:PROMPT_S]
-      @prompt_c = pconf[:PROMPT_C]
-      @return_format = pconf[:RETURN]
-      if ai = pconf.include?(:AUTO_INDENT)
-	@auto_indent_mode = ai
-      else
-	@auto_indent_mode = IRB.conf[:AUTO_INDENT]
-      end
-    end
-    
-    def inspect?
-      @inspect_mode.nil? or @inspect_mode
-    end
-
-    def file_input?
-      @io.class == FileInputMethod
-    end
-
-    def inspect_mode=(opt)
-      if opt
-	@inspect_mode = opt
-      else
-	@inspect_mode = !@inspect_mode
-      end
-      print "Switch to#{unless @inspect_mode; ' non';end} inspect mode.\n" if verbose?
-      @inspect_mode
-    end
-
-    undef use_readline=
-    def use_readline=(opt)
-      @use_readline = opt
-      print "use readline module\n" if @use_readline
-    end
-
-    def debug_level=(value)
-      @debug_level = value
-      RubyLex.debug_level = value
-      SLex.debug_level = value
-    end
-
-    def debug?
-      @debug_level > 0
-    end
-
-    def evaluate(line, line_no)
-      @line_no = line_no
-      set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
-#      @workspace.evaluate("_ = IRB.conf[:MAIN_CONTEXT]._")
-#      @_ = @workspace.evaluate(line, irb_path, line_no)
-    end
-
-    alias __exit__ exit
-    def exit(ret = 0)
-      IRB.irb_exit(@irb, ret)
-    end
-
-    NOPRINTING_IVARS = ["@last_value"]
-    NO_INSPECTING_IVARS = ["@irb", "@io"]
-    IDNAME_IVARS = ["@prompt_mode"]
-
-    alias __inspect__ inspect
-    def inspect
-      array = []
-      for ivar in instance_variables.sort{|e1, e2| e1 <=> e2}
-	name = ivar.sub(/^@(.*)$/){$1}
-	val = instance_eval(ivar)
-	case ivar
-	when *NOPRINTING_IVARS
-	  array.push format("conf.%s=%s", name, "...")
-	when *NO_INSPECTING_IVARS
-	  array.push format("conf.%s=%s", name, val.to_s)
-	when *IDNAME_IVARS
-	  array.push format("conf.%s=:%s", name, val.id2name)
-	else
-	  array.push format("conf.%s=%s", name, val.inspect)
-	end
-      end
-      array.join("\n")
-    end
-    alias __to_s__ to_s
-    alias to_s inspect
-  end
-end
diff --git a/lib/irb/ext/change-ws.rb b/lib/irb/ext/change-ws.rb
deleted file mode 100644
index f15391e202..0000000000
--- a/lib/irb/ext/change-ws.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#   irb/ext/cb.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-module IRB
-  class Context
-
-    def home_workspace
-      if defined? @home_workspace
-	@home_workspace
-      else
-	@home_workspace = @workspace
-      end
-    end
-
-    def change_workspace(*_main)
-      if _main.empty?
-	@workspace = home_workspace 
-	return main
-      end
-      
-      @workspace = WorkSpace.new(_main[0])
-      
-      if !(class<<main;ancestors;end).include?(ExtendCommandBundle)
-	main.extend ExtendCommandBundle
-      end
-    end
-
-#     def change_binding(*_main)
-#       back = @workspace
-#       @workspace = WorkSpace.new(*_main)
-#       unless _main.empty?
-# 	begin
-# 	  main.extend ExtendCommandBundle
-# 	rescue
-# 	  print "can't change binding to: ", main.inspect, "\n"
-# 	  @workspace = back
-# 	  return nil
-# 	end
-#       end
-#       @irb_level += 1
-#       begin
-# 	catch(:SU_EXIT) do
-# 	  @irb.eval_input
-# 	end
-#       ensure
-# 	@irb_level -= 1
-#  	@workspace = back
-#       end
-#     end
-#     alias change_workspace change_binding
-   end
-end
-
diff --git a/lib/irb/ext/history.rb b/lib/irb/ext/history.rb
deleted file mode 100644
index d40a62e959..0000000000
--- a/lib/irb/ext/history.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-#   history.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-module IRB
-
-  class Context
-
-    NOPRINTING_IVARS.push "@eval_history_values"
-
-    alias _set_last_value set_last_value
-
-    def set_last_value(value)
-      _set_last_value(value)
-
-      @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
-      if @eval_history #and !@eval_history_values.equal?(llv)
- 	@eval_history_values.push @line_no, @last_value
- 	@workspace.evaluate self, "__ = IRB.CurrentContext.instance_eval{@eval_history_values}"
-      end
-
-      @last_value
-    end
-
-    attr_reader :eval_history
-    def eval_history=(no)
-      if no
-	if @eval_history 
-	  @eval_history_values.size(no)
-	else
-	  @eval_history_values = History.new(no)
-	  IRB.conf[:__TMP__EHV__] = @eval_history_values
-	  @workspace.evaluate(self, "__ = IRB.conf[:__TMP__EHV__]")
-	  IRB.conf.delete(:__TMP_EHV__)
-	end
-      else
-	@eval_history_values = nil
-      end
-      @eval_history = no
-    end
-  end
-
-  class History
-    @RCS_ID='-$Id$-'
-
-    def initialize(size = 16)
-      @size = size
-      @contents = []
-    end
-
-    def size(size)
-      if size != 0 && size < @size 
-	@contents = @contents[@size - size .. @size]
-      end
-      @size = size
-    end
-
-    def [](idx)
-      begin
-	if idx >= 0
-	  @contents.find{|no, val| no == idx}[1]
-	else
-	  @contents[idx][1]
-	end
-      rescue NameError
-	nil
-      end
-    end
-
-    def push(no, val)
-      @contents.push [no, val]
-      @contents.shift if @size != 0 && @contents.size > @size
-    end
-    
-    alias real_inspect inspect
-
-    def inspect
-      if @contents.empty?
-	return real_inspect
-      end
-
-      unless (last = @contents.pop)[1].equal?(self)
-	@contents.push last
-	last = nil
-      end
-      str = @contents.collect{|no, val|
-	if val.equal?(self)
-	  "#{no} ...self-history..."
-	else
-	  "#{no} #{val.inspect}"
-	end
-      }.join("\n")
-      if str == ""
-	str = "Empty."
-      end
-      @contents.push last if last
-      str
-    end
-  end
-end
-
-
diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb
deleted file mode 100644
index 26e36e1209..0000000000
--- a/lib/irb/ext/loader.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-module IRB
-  class LoadAbort < Exception;end
-
-  module IrbLoader
-    @RCS_ID='-$Id$-'
-    alias ruby_load load
-    alias ruby_require require
-
-    def irb_load(fn, priv = nil)
-      path = search_file_from_ruby_path(fn)
-      raise LoadError, "No such file to load -- #{fn}" unless path
-
-      load_file(path, priv)
-    end
-
-    def search_file_from_ruby_path(fn)
-      if /^#{Regexp.quote(File::Separator)}/ =~ fn
-	return fn if File.exist?(fn)
-	return nil
-      end
-
-      for path in $:
-	if File.exist?(f = File.join(path, fn))
-	  return f
-	end
-      end
-      return nil
-    end
-
-    def source_file(path)
-      irb.suspend_name(path, File.basename(path)) do
-	irb.suspend_input_method(FileInputMethod.new(path)) do
-	  |back_io|
-	  irb.signal_status(:IN_LOAD) do 
-	    if back_io.kind_of?(FileInputMethod)
-	      irb.eval_input
-	    else
-	      begin
-		irb.eval_input
-	      rescue LoadAbort
-		print "load abort!!\n"
-	      end
-	    end
-	  end
-	end
-      end
-    end
-
-    def load_file(path, priv = nil)
-      irb.suspend_name(path, File.basename(path)) do
-	
-	if priv
-	  ws = WorkSpace.new(Module.new)
-	else
-	  ws = WorkSpace.new
-	end
-	irb.suspend_workspace(ws) do
-	  irb.suspend_input_method(FileInputMethod.new(path)) do
-	    |back_io|
-	    irb.signal_status(:IN_LOAD) do 
-#	      p irb.conf
-	      if back_io.kind_of?(FileInputMethod)
-		irb.eval_input
-	      else
-		begin
-		  irb.eval_input
-		rescue LoadAbort
-		  print "load abort!!\n"
-		end
-	      end
-	    end
-	  end
-	end
-      end
-    end
-
-    def old
-      back_io = @io
-      back_path = @irb_path
-      back_name = @irb_name
-      back_scanner = @irb.scanner
-      begin
- 	@io = FileInputMethod.new(path)
- 	@irb_name = File.basename(path)
-	@irb_path = path
-	@irb.signal_status(:IN_LOAD) do
-	  if back_io.kind_of?(FileInputMethod)
-	    @irb.eval_input
-	  else
-	    begin
-	      @irb.eval_input
-	    rescue LoadAbort
-	      print "load abort!!\n"
-	    end
-	  end
-	end
-      ensure
- 	@io = back_io
- 	@irb_name = back_name
- 	@irb_path = back_path
-	@irb.scanner = back_scanner
-      end
-    end
-  end
-end
-
diff --git a/lib/irb/ext/math-mode.rb b/lib/irb/ext/math-mode.rb
deleted file mode 100644
index 5e268bb3e5..0000000000
--- a/lib/irb/ext/math-mode.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#   math-mode.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-require "mathn"
-
-module IRB
-  class Context
-    attr_reader :math_mode
-    alias math? math_mode
-
-    def math_mode=(opt)
-      if @math_mode == true && opt == false
-	IRB.fail CantReturnToNormalMode
-	return
-      end
-
-      @math_mode = opt
-      if math_mode
-	main.extend Math
-	print "start math mode\n" if verbose?
-      end
-    end
-
-    def inspect?
-      @inspect_mode.nil? && !@math_mode or @inspect_mode
-    end
-  end
-end
-
diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
deleted file mode 100644
index e815889383..0000000000
--- a/lib/irb/ext/multi-irb.rb
+++ /dev/null
@@ -1,241 +0,0 @@
-#
-#   irb/multi-irb.rb - multiple irb module
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-IRB.fail CantShiftToMultiIrbMode unless defined?(Thread)
-require "thread"
-
-module IRB
-  # job management class
-  class JobManager
-    @RCS_ID='-$Id$-'
-
-    def initialize
-      # @jobs = [[thread, irb],...]
-      @jobs = []
-      @current_job = nil
-    end
-
-    attr_accessor :current_job
-
-    def n_jobs
-      @jobs.size
-    end
-
-    def thread(key)
-      th, irb = search(key)
-      th
-    end
-
-    def irb(key)
-      th, irb = search(key)
-      irb
-    end
-
-    def main_thread
-      @jobs[0][0]
-    end
-
-    def main_irb
-      @jobs[0][1]
-    end
-
-    def insert(irb)
-      @jobs.push [Thread.current, irb]
-    end
-
-    def switch(key)
-      th, irb = search(key)
-      IRB.fail IrbAlreadyDead unless th.alive?
-      IRB.fail IrbSwitchedToCurrentThread if th == Thread.current
-      @current_job = irb
-      th.run
-      Thread.stop
-      @current_job = irb(Thread.current)
-    end
-
-    def kill(*keys)
-      for key in keys
-	th, irb = search(key)
-	IRB.fail IrbAlreadyDead unless th.alive?
-	th.exit
-      end
-    end    
-
-    def search(key)
-      case key
-      when Integer
-	@jobs[key]
-      when Irb
-	@jobs.find{|k, v| v.equal?(key)}
-      when Thread
-	@jobs.assoc(key)
-      else
-	assoc = @jobs.find{|k, v| v.context.main.equal?(key)}
-	IRB.fail NoSuchJob, key if assoc.nil?
-	assoc
-      end
-    end
-
-    def delete(key)
-      case key
-      when Integer
-	IRB.fail NoSuchJob, key unless @jobs[key]
-	@jobs[key] = nil
-      else
-	catch(:EXISTS) do
-	  @jobs.each_index do
-	    |i|
-	    if @jobs[i] and (@jobs[i][0] == key ||
-			     @jobs[i][1] == key ||
-			     @jobs[i][1].context.main.equal?(key))
-	      @jobs[i] = nil
-	      throw :EXISTS
-	    end
-	  end
-	  IRB.fail NoSuchJob, key
-	end
-      end
-      until assoc = @jobs.pop; end unless @jobs.empty?
-      @jobs.push assoc
-    end
-
-    def inspect
-      ary = []
-      @jobs.each_index do
-	|i|
-	th, irb = @jobs[i]
-	next if th.nil?
-
-	if th.alive?
-	  if th.stop?
-	    t_status = "stop"
-	  else
-	    t_status = "running"
-	  end
-	else
-	  t_status = "exited"
-	end
-	ary.push format("#%d->%s on %s (%s: %s)",
-			i, 
-			irb.context.irb_name, 
-			irb.context.main,
-			th,
-			t_status)
-      end
-      ary.join("\n")
-    end
-  end
-
-  @JobManager = JobManager.new
-
-  def IRB.JobManager
-    @JobManager
-  end
-
-  def IRB.CurrentContext
-    IRB.JobManager.irb(Thread.current).context
-  end
-
-  # invoke multi-irb 
-  def IRB.irb(file = nil, *main)
-    workspace = WorkSpace.new(*main)
-    parent_thread = Thread.current
-    Thread.start do
-      begin
-	irb = Irb.new(workspace, file)
-      rescue 
-	print "Subirb can't start with context(self): ", workspace.main.inspect, "\n"
-	print "return to main irb\n"
-	Thread.pass
-	Thread.main.wakeup
-	Thread.exit
-      end
-      @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
-      @JobManager.insert(irb)
-      @JobManager.current_job = irb
-      begin
-	system_exit = false
-	catch(:IRB_EXIT) do
-	  irb.eval_input
-	end
-      rescue SystemExit
-	system_exit = true
-	raise
-	#fail
-      ensure
-	unless system_exit
-	  @JobManager.delete(irb)
-	  if parent_thread.alive?
-	    @JobManager.current_job = @JobManager.irb(parent_thread)
-	    parent_thread.run
-	  else
-	    @JobManager.current_job = @JobManager.main_irb
-	    @JobManager.main_thread.run
-	  end
-	end
-      end
-    end
-    Thread.stop
-    @JobManager.current_job = @JobManager.irb(Thread.current)
-  end
-
-#   class Context
-#     def set_last_value(value)
-#       @last_value = value
-#       @workspace.evaluate "_ = IRB.JobManager.irb(Thread.current).context.last_value"
-#       if @eval_history #and !@__.equal?(@last_value)
-# 	@eval_history_values.push @line_no, @last_value
-# 	@workspace.evaluate "__ = IRB.JobManager.irb(Thread.current).context.instance_eval{@eval_history_values}"
-#       end
-#       @last_value
-#     end
-#   end
-
-#  module ExtendCommand
-#     def irb_context
-#       IRB.JobManager.irb(Thread.current).context
-#     end
-# #    alias conf irb_context
-#   end
-
-  @CONF[:SINGLE_IRB_MODE] = false
-  @JobManager.insert(@CONF[:MAIN_CONTEXT].irb)
-  @JobManager.current_job = @CONF[:MAIN_CONTEXT].irb
-
-  class Irb
-    def signal_handle
-      unless @context.ignore_sigint?
-	print "\nabort!!\n" if @context.verbose?
-	exit
-      end
-
-      case @signal_status
-      when :IN_INPUT
-	print "^C\n"
-	IRB.JobManager.thread(self).raise RubyLex::TerminateLineInput
-      when :IN_EVAL
-	IRB.irb_abort(self)
-      when :IN_LOAD
-	IRB.irb_abort(self, LoadAbort)
-      when :IN_IRB
-	# ignore
-      else
-	# ignore other cases as well
-      end
-    end
-  end
-
-  trap("SIGINT") do
-    @JobManager.current_job.signal_handle
-    Thread.stop
-  end
-
-end
diff --git a/lib/irb/ext/tracer.rb b/lib/irb/ext/tracer.rb
deleted file mode 100644
index b2528f74b2..0000000000
--- a/lib/irb/ext/tracer.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#   irb/lib/tracer.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-require "tracer"
-
-module IRB
-
-  # initialize tracing function
-  def IRB.initialize_tracer
-    Tracer.verbose = false
-    Tracer.add_filter {
-      |event, file, line, id, binding, *rests|
-      /^#{Regexp.quote(@CONF[:IRB_LIB_PATH])}/ !~ file and
-	File::basename(file) != "irb.rb"
-    }
-  end
-
-  class Context
-    attr_reader :use_tracer
-    alias use_tracer? use_tracer
-
-    def use_tracer=(opt)
-      if opt
-	Tracer.set_get_line_procs(@irb_path) {
-	  |line_no, *rests|
-	  @io.line(line_no)
-	}
-      elsif !opt && @use_tracer
-	Tracer.off
-      end
-      @use_tracer=opt
-    end
-  end
-
-  class WorkSpace
-    alias __evaluate__ evaluate
-    def evaluate(context, statements, file = nil, line = nil)
-      if context.use_tracer? && file != nil && line != nil
-	Tracer.on 
-	begin
-	  __evaluate__(context, statements, file, line)
-	ensure
-	  Tracer.off
-	end
-      else
-	__evaluate__(context, statements, file || __FILE__, line || __LINE__)
-      end
-    end
-  end
-
-  IRB.initialize_tracer
-end
-	
diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb
deleted file mode 100644
index a81b3aca7b..0000000000
--- a/lib/irb/ext/use-loader.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#   use-loader.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "irb/cmd/load"
-require "irb/ext/loader"
-
-class Object
-  alias __original__load__IRB_use_loader__ load
-  alias __original__require__IRB_use_loader__ require
-end
-
-module IRB
-  module ExtendCommandBundle
-    def irb_load(*opts, &b)
-      ExtendCommand::Load.execute(irb_context, *opts, &b)
-    end
-    def irb_require(*opts, &b)
-      ExtendCommand::Require.execute(irb_context, *opts, &b)
-    end
-  end
-
-  class Context
-
-    IRB.conf[:USE_LOADER] = false
-    
-    def use_loader
-      IRB.conf[:USE_LOADER]
-    end
-
-    alias use_loader? use_loader
-
-    def use_loader=(opt)
-
-      if IRB.conf[:USE_LOADER] != opt
-	IRB.conf[:USE_LOADER] = opt
-	if opt
-	  if !$".include?("irb/cmd/load")
-	  end
-	  (class<<@workspace.main;self;end).instance_eval {
-	    alias_method :load, :irb_load
-	    alias_method :require, :irb_require
-	  }
-	else
-	  (class<<@workspace.main;self;end).instance_eval {
-	    alias_method :load, :__original__load__IRB_use_loader__
-	    alias_method :require, :__original__require__IRB_use_loader__
-	  }
-	end
-      end
-      print "Switch to load/require#{unless use_loader; ' non';end} trace mode.\n" if verbose?
-      opt
-    end
-  end
-end
-
-
diff --git a/lib/irb/ext/workspaces.rb b/lib/irb/ext/workspaces.rb
deleted file mode 100644
index 2fe8f8a87b..0000000000
--- a/lib/irb/ext/workspaces.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#   push-ws.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-module IRB
-  class Context
-
-    def irb_level
-      workspace_stack.size
-    end
-
-    def workspaces
-      if defined? @workspaces
-	@workspaces
-      else
-	@workspaces = []
-      end
-    end
-
-    def push_workspace(*_main)
-      if _main.empty?
-	if workspaces.empty?
-	  print "No other workspace\n"
-	  return nil
-	end
-	ws = workspaces.pop
-	workspaces.push @workspace
-	@workspace = ws
-	return workspaces
-      end
-
-      workspaces.push @workspace
-      @workspace = WorkSpace.new(@workspace.binding, _main[0])
-      if !(class<<main;ancestors;end).include?(ExtendCommandBundle)
-	main.extend ExtendCommandBundle
-      end
-    end
-
-    def pop_workspace
-      if workspaces.empty?
-	print "workspace stack empty\n"
-	return
-      end
-      @workspace = workspaces.pop
-    end
-  end
-end
-
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
deleted file mode 100644
index cfb2c7c4be..0000000000
--- a/lib/irb/extend-command.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-#
-#   irb/extend-command.rb - irb command extend
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-module IRB
-  #
-  # IRB extended command
-  #
-  module ExtendCommandBundle
-    EXCB = ExtendCommandBundle
-
-    NO_OVERRIDE = 0
-    OVERRIDE_PRIVATE_ONLY = 0x01
-    OVERRIDE_ALL = 0x02
-
-    def irb_exit(ret = 0)
-      irb_context.exit(ret)
-    end
-
-    def irb_context
-      IRB.CurrentContext
-    end
-
-    @ALIASES = [
-      [:context, :irb_context, NO_OVERRIDE],
-      [:conf, :irb_context, NO_OVERRIDE],
-      [:irb_quit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
-      [:exit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
-      [:quit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
-    ]
-
-    @EXTEND_COMMANDS = [
-      [:irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
-	[:irb_print_working_workspace, OVERRIDE_ALL],
-	[:irb_cwws, OVERRIDE_ALL],
-	[:irb_pwws, OVERRIDE_ALL],
-#	[:irb_cww, OVERRIDE_ALL],
-#	[:irb_pww, OVERRIDE_ALL],
-	[:cwws, NO_OVERRIDE],
-	[:pwws, NO_OVERRIDE],
-#	[:cww, NO_OVERRIDE],
-#	[:pww, NO_OVERRIDE],
-	[:irb_current_working_binding, OVERRIDE_ALL],
-	[:irb_print_working_binding, OVERRIDE_ALL],
-	[:irb_cwb, OVERRIDE_ALL],
-	[:irb_pwb, OVERRIDE_ALL],
-#	[:cwb, NO_OVERRIDE],
-#	[:pwb, NO_OVERRIDE]
-      ],
-      [:irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
-	[:irb_chws, OVERRIDE_ALL],
-#	[:irb_chw, OVERRIDE_ALL],
-	[:irb_cws, OVERRIDE_ALL],
-#	[:irb_cw, OVERRIDE_ALL],
-	[:chws, NO_OVERRIDE],
-#	[:chw, NO_OVERRIDE],
-	[:cws, NO_OVERRIDE],
-#	[:cw, NO_OVERRIDE],
-	[:irb_change_binding, OVERRIDE_ALL],
-	[:irb_cb, OVERRIDE_ALL],
-	[:cb, NO_OVERRIDE]],
-
-      [:irb_workspaces, :Workspaces, "irb/cmd/pushws",
-	[:workspaces, NO_OVERRIDE],
-	[:irb_bindings, OVERRIDE_ALL],
-	[:bindings, NO_OVERRIDE]],
-      [:irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
-	[:irb_pushws, OVERRIDE_ALL],
-#	[:irb_pushw, OVERRIDE_ALL],
-	[:pushws, NO_OVERRIDE],
-#	[:pushw, NO_OVERRIDE],
-	[:irb_push_binding, OVERRIDE_ALL],
-	[:irb_pushb, OVERRIDE_ALL],
-	[:pushb, NO_OVERRIDE]],
-      [:irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
-	[:irb_popws, OVERRIDE_ALL],
-#	[:irb_popw, OVERRIDE_ALL],
-	[:popws, NO_OVERRIDE],
-#	[:popw, NO_OVERRIDE],
-	[:irb_pop_binding, OVERRIDE_ALL],
-	[:irb_popb, OVERRIDE_ALL],
-	[:popb, NO_OVERRIDE]],
-
-      [:irb_load, :Load, "irb/cmd/load"],
-      [:irb_require, :Require, "irb/cmd/load"],
-      [:irb_source, :Source, "irb/cmd/load", 
-	[:source, NO_OVERRIDE]],
-
-      [:irb, :IrbCommand, "irb/cmd/subirb"],
-      [:irb_jobs, :Jobs, "irb/cmd/subirb", 
-	[:jobs, NO_OVERRIDE]],
-      [:irb_fg, :Foreground, "irb/cmd/subirb", 
-	[:fg, NO_OVERRIDE]],
-      [:irb_kill, :Kill, "irb/cmd/subirb", 
-	[:kill, OVERRIDE_PRIVATE_ONLY]],
-    ]
-
-    def EXCB.install_extend_commands
-      for args in @EXTEND_COMMANDS
-	def_extend_command(*args)
-      end
-    end
-
-    # aliases = [commans_alias, flag], ...
-    def EXCB.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
-      case cmd_class
-      when Symbol
-	cmd_class = cmd_class.id2name
-      when String
-      when Class
-	cmd_class = cmd_class.name
-      end
-
-      if load_file
-	eval %[
-	  def #{cmd_name}(*opts, &b)
-	    require "#{load_file}"
-	    eval %[
-	      def #{cmd_name}(*opts, &b)
-		ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
-	      end
-	    ]
-	    send :#{cmd_name}, *opts, &b
-	  end
-	]
-      else
-	eval %[
-	  def #{cmd_name}(*opts, &b)
-	    ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
-	  end
-	]
-      end
-
-      for ali, flag in aliases
-	@ALIASES.push [ali, cmd_name, flag]
-      end
-    end
-
-    # override = {NO_OVERRIDE, OVERRIDE_PRIVATE_ONLY, OVERRIDE_ALL}
-    def install_alias_method(to, from, override = NO_OVERRIDE)
-      to = to.id2name unless to.kind_of?(String)
-      from = from.id2name unless from.kind_of?(String)
-
-      if override == OVERRIDE_ALL or
-	  (override == OVERRIDE_PRIVATE_ONLY) && !respond_to?(to) or
-	  (override == NO_OVERRIDE) &&  !respond_to?(to, true)
-	target = self
-	(class<<self;self;end).instance_eval{
-	  if target.respond_to?(to, true) && 
-	      !target.respond_to?(EXCB.irb_original_method_name(to), true)
-	    alias_method(EXCB.irb_original_method_name(to), to) 
-	  end
-	  alias_method to, from
-	}
-      else
-	print "irb: warn: can't alias #{to} from #{from}.\n"
-      end
-    end
-
-    def self.irb_original_method_name(method_name)
-      "irb_" + method_name + "_org"
-    end
-
-    def EXCB.extend_object(obj)
-      unless (class<<obj;ancestors;end).include?(EXCB)
-	super
-	for ali, com, flg in @ALIASES
-	  obj.install_alias_method(ali, com, flg)
-	end
-      end
-    end
-
-    install_extend_commands
-  end
-
-  # extension support for Context
-  module ContextExtender
-    CE = ContextExtender
-
-    @EXTEND_COMMANDS = [
-      [:eval_history=, "irb/ext/history.rb"],
-      [:use_tracer=, "irb/ext/tracer.rb"],
-      [:math_mode=, "irb/ext/math-mode.rb"],
-      [:use_loader=, "irb/ext/use-loader.rb"],
-    ]
-
-    def CE.install_extend_commands
-      for args in @EXTEND_COMMANDS
-	def_extend_command(*args)
-      end
-    end
-
-    def CE.def_extend_command(cmd_name, load_file, *aliases)
-      Context.module_eval %[
-        def #{cmd_name}(*opts, &b)
-	  require "#{load_file}"
-	  send :#{cmd_name}, *opts, &b
-	end
-	for ali in aliases
-	  alias_method ali, cmd_name
-	end
-      ]
-    end
-
-    CE.install_extend_commands
-  end
-end
-
diff --git a/lib/irb/frame.rb b/lib/irb/frame.rb
deleted file mode 100644
index f0b0a9abf3..0000000000
--- a/lib/irb/frame.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#   frame.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "e2mmap"
-
-module IRB
-  class Frame
-    extend Exception2MessageMapper
-    def_exception :FrameOverflow, "frame overflow"
-    def_exception :FrameUnderflow, "frame underflow"
-
-    INIT_STACK_TIMES = 3
-    CALL_STACK_OFFSET = 3
-
-    def initialize
-      @frames = [TOPLEVEL_BINDING] * INIT_STACK_TIMES
-    end
-
-    def trace_func(event, file, line, id, binding)
-      case event
-      when 'call', 'class'
-	@frames.push binding
-      when 'return', 'end'
-	@frames.pop
-      end
-    end
-
-    def top(n = 0)
-      bind = @frames[-(n + CALL_STACK_OFFSET)]
-      Fail FrameUnderflow unless bind
-      bind
-    end
-
-    def bottom(n = 0)
-      bind = @frames[n]
-      Fail FrameOverflow unless bind
-      bind
-    end
-
-    # singleton functions
-    def Frame.bottom(n = 0)
-      @backtrace.bottom(n)
-    end
-
-    def Frame.top(n = 0)
-      @backtrace.top(n)
-    end
-
-    def Frame.sender
-      eval "self", @backtrace.top
-    end
-
-    @backtrace = Frame.new
-    set_trace_func proc{|event, file, line, id, binding, klass|
-      @backtrace.trace_func(event, file, line, id, binding)
-    }
-  end
-end
diff --git a/lib/irb/help.rb b/lib/irb/help.rb
deleted file mode 100644
index eb876a6dbe..0000000000
--- a/lib/irb/help.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#   irb/help.rb - print usase module
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-
-module IRB
-  def IRB.print_usage
-    lc = IRB.conf[:LC_MESSAGES]
-    path = lc.find("irb/help-message")
-    space_line = false
-    File.foreach(path) do
-      |l|
-      if /^\s*$/ =~ l
-	lc.puts l unless space_line
-	space_line = true
-	next
-      end
-      space_line = false
-      
-      l.sub!(/#.*$/, "")
-      next if /^\s*$/ =~ l
-      lc.puts l
-    end
-  end
-end
-
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
deleted file mode 100644
index 9fd86e94a2..0000000000
--- a/lib/irb/init.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-#
-#   irb/init.rb - irb initialize module
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-
-module IRB
-
-  # initialize config
-  def IRB.setup(ap_path)
-    IRB.init_config(ap_path)
-    IRB.init_error
-    IRB.parse_opts
-    IRB.run_config
-    IRB.load_modules
-
-    unless @CONF[:PROMPT][@CONF[:PROMPT_MODE]]
-      IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE]) 
-    end
-  end
-
-  # @CONF default setting
-  def IRB.init_config(ap_path)
-    # class instance variables
-    @TRACER_INITIALIZED = false
-
-    # default configurations
-    unless ap_path and @CONF[:AP_NAME]
-      ap_path = File.join(File.dirname(File.dirname(__FILE__)), "irb.rb")
-    end
-    @CONF[:AP_NAME] = File::basename(ap_path, ".rb")
-
-    @CONF[:IRB_NAME] = "irb"
-    @CONF[:IRB_LIB_PATH] = File.dirname(__FILE__)
-
-    @CONF[:RC] = true
-    @CONF[:LOAD_MODULES] = []
-    @CONF[:IRB_RC] = nil
-
-    @CONF[:MATH_MODE] = false
-    @CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
-    @CONF[:INSPECT_MODE] = nil
-    @CONF[:USE_TRACER] = false
-    @CONF[:USE_LOADER] = false
-    @CONF[:IGNORE_SIGINT] = true
-    @CONF[:IGNORE_EOF] = false
-    @CONF[:ECHO] = nil
-    @CONF[:VERBOSE] = nil
-
-    @CONF[:EVAL_HISTORY] = nil
-
-    @CONF[:BACK_TRACE_LIMIT] = 16
-
-    @CONF[:PROMPT] = {
-      :NULL => {
-	:PROMPT_I => nil,
-	:PROMPT_S => nil,
-	:PROMPT_C => nil,
-	:RETURN => "%s\n"
-      },
-      :DEFAULT => {
-	:PROMPT_I => "%N(%m):%03n:%i> ",
-	:PROMPT_S => "%N(%m):%03n:%i%l ",
-	:PROMPT_C => "%N(%m):%03n:%i* ",
-	:RETURN => "=> %s\n"
-      },
-      :CLASSIC => {
-	:PROMPT_I => "%N(%m):%03n:%i> ",
-	:PROMPT_S => "%N(%m):%03n:%i%l ",
-	:PROMPT_C => "%N(%m):%03n:%i* ",
-	:RETURN => "%s\n"
-      },
-      :SIMPLE => {
-	:PROMPT_I => ">> ",
-	:PROMPT_S => nil,
-	:PROMPT_C => "?> ",
-	:RETURN => "=> %s\n"
-      },
-      :INF_RUBY => {
-	:PROMPT_I => "%N(%m):%03n:%i> ",
-	:PROMPT_S => nil,
-	:PROMPT_C => nil,
-	:RETURN => "%s\n",
-	:AUTO_INDENT => true
-      },
-      :XMP => {
-	:PROMPT_I => nil,
-	:PROMPT_S => nil,
-	:PROMPT_C => nil,
-	:RETURN => "    ==>%s\n"
-      }
-    }
-
-    @CONF[:PROMPT_MODE] = :DEFAULT
-    @CONF[:AUTO_INDENT] = false
-
-    @CONF[:CONTEXT_MODE] = 3 # use binding in function on TOPLEVEL_BINDING
-    @CONF[:SINGLE_IRB] = false
-
-#    @CONF[:LC_MESSAGES] = "en"
-    @CONF[:LC_MESSAGES] = Locale.new
-    
-    @CONF[:DEBUG_LEVEL] = 1
-  end
-
-  def IRB.init_error
-    @CONF[:LC_MESSAGES].load("irb/error.rb")
-  end
-
-  # option analyzing
-  def IRB.parse_opts
-    while opt = ARGV.shift
-      case opt
-      when "-f"
-	@CONF[:RC] = false
-      when "-m"
-	@CONF[:MATH_MODE] = true
-      when "-d"
-	$DEBUG = true
-      when "-r"
-	opt = ARGV.shift
-	@CONF[:LOAD_MODULES].push opt if opt
-      when /^-K(.)/
-	$KCODE = $1
-      when "--inspect"
-	@CONF[:INSPECT_MODE] = true
-      when "--noinspect"
-	@CONF[:INSPECT_MODE] = false
-      when "--readline"
-	@CONF[:USE_READLINE] = true
-      when "--noreadline"
-	@CONF[:USE_READLINE] = false
-      when "--echo"
-	@CONF[:ECHO] = true
-      when "--noecho"
-	@CONF[:ECHO] = false
-      when "--verbose"
-	@CONF[:VERBOSE] = true
-      when "--noverbose"
-	@CONF[:VERBOSE] = false
-      when "--prompt-mode", "--prompt"
-	prompt_mode = ARGV.shift.upcase.tr("-", "_").intern
-	@CONF[:PROMPT_MODE] = prompt_mode
-      when "--noprompt"
-	@CONF[:PROMPT_MODE] = :NULL
-      when "--inf-ruby-mode"
-	@CONF[:PROMPT_MODE] = :INF_RUBY
-      when "--sample-book-mode", "--simple-prompt"
-	@CONF[:PROMPT_MODE] = :SIMPLE
-      when "--tracer"
-	@CONF[:USE_TRACER] = true
-      when "--back-trace-limit"
-	@CONF[:BACK_TRACE_LIMIT] = ARGV.shift.to_i
-      when "--context-mode"
-	@CONF[:CONTEXT_MODE] = ARGV.shift.to_i
-      when "--single-irb"
-	@CONF[:SINGLE_IRB] = true
-      when "--irb_debug"
-	@CONF[:DEBUG_LEVEL] = ARGV.shift.to_i
-      when "-v", "--version"
-	print IRB.version, "\n"
-	exit 0
-      when "-h", "--help"
-	require "irb/help"
-	IRB.print_usage
-	exit 0
-      when /^-/
-	IRB.fail UnrecognizedSwitch, opt
-      else
-	@CONF[:SCRIPT] = opt
-	$0 = opt
-	break
-      end
-    end
-  end
-
-  # running config
-  def IRB.run_config
-    if @CONF[:RC]
-      rcs = []
-      rcs.push File.expand_path("~/.irbrc") if ENV.key?("HOME")
-      rcs.push ".irbrc"
-      rcs.push "irb.rc"
-      rcs.push "_irbrc"
-      rcs.push "$irbrc"
-      catch(:EXIT) do
-	for rc in rcs
-	  begin
-	    load rc
-	    throw :EXIT
-	  rescue LoadError, Errno::ENOENT
-	  rescue
-	    print "load error: #{rc}\n"
-	    print $!.class, ": ", $!, "\n"
-	    for err in $@[0, $@.size - 2]
-	      print "\t", err, "\n"
-	    end
-	    throw :EXIT
-	  end
-	end
-      end
-    end
-  end
-
-  # loading modules
-  def IRB.load_modules
-    for m in @CONF[:LOAD_MODULES]
-      begin
-	require m
-      rescue
-	print $@[0], ":", $!.class, ": ", $!, "\n"
-      end
-    end
-  end
-
-end
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
deleted file mode 100644
index ec834b17bc..0000000000
--- a/lib/irb/input-method.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-#   irb/input-method.rb - input methods using irb
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-module IRB
-  # 
-  # InputMethod
-  #	StdioInputMethod
-  #	FileInputMethod
-  #	(ReadlineInputMethod)
-  #
-  STDIN_FILE_NAME = "(line)"
-  class InputMethod
-    @RCS_ID='-$Id$-'
-
-    def initialize(file = STDIN_FILE_NAME)
-      @file_name = file
-    end
-    attr_reader :file_name
-
-    attr_accessor :prompt
-    
-    def gets
-      IRB.fail NotImplementedError, "gets"
-    end
-    public :gets
-
-    def readable_atfer_eof?
-      false
-    end
-  end
-  
-  class StdioInputMethod < InputMethod
-    def initialize
-      super
-      @line_no = 0
-      @line = []
-    end
-
-    def gets
-      print @prompt
-      @line[@line_no += 1] = $stdin.gets
-    end
-
-    def eof?
-      $stdin.eof?
-    end
-
-    def readable_atfer_eof?
-      true
-    end
-
-    def line(line_no)
-      @line[line_no]
-    end
-  end
-  
-  class FileInputMethod < InputMethod
-    def initialize(file)
-      super
-      @io = open(file)
-    end
-    attr_reader :file_name
-
-    def eof?
-      @io.eof?
-    end
-
-    def gets
-      print @prompt
-      l = @io.gets
-#      print @prompt, l
-      l
-    end
-  end
-
-  begin
-    require "readline"
-    class ReadlineInputMethod < InputMethod
-      include Readline 
-      def initialize
-	super
-
-	@line_no = 0
-	@line = []
-	@eof = false
-      end
-
-      def gets
-	if l = readline(@prompt, true)
-	  HISTORY.pop if l.empty?
-	  @line[@line_no += 1] = l + "\n"
-	else
-	  @eof = true
-	  l
-	end
-      end
-
-      def eof?
-	@eof
-      end
-
-      def readable_atfer_eof?
-	true
-      end
-
-      def line(line_no)
-	@line[line_no]
-      end
-    end
-  rescue LoadError
-  end
-end
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
deleted file mode 100644
index 68a488a48a..0000000000
--- a/lib/irb/lc/error.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#   irb/lc/error.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-require "e2mmap"
-
-module IRB
-
-  # exceptions
-  extend Exception2MessageMapper
-  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 :IrbAlreadyDead, "Irb is already dead."
-  def_exception :IrbSwitchedToCurrentThread, "Switched to current thread."
-  def_exception :NoSuchJob, "No such job(%s)."
-  def_exception :CantShiftToMultiIrbMode, "Can't shift to multi irb mode."
-  def_exception :CantChangeBinding, "Can't change binding to (%s)."
-  def_exception :UndefinedPromptMode, "Undefined prompt mode(%s)."
-
-end
-
diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
deleted file mode 100644
index 42e861a343..0000000000
--- a/lib/irb/lc/help-message
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#   irb/lc/help-message.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-Usage:  irb.rb [options] [programfile] [arguments]
-  -f		    Suppress read of ~/.irbrc 
-  -m		    Bc mode (load mathn, fraction or matrix are available)
-  -d                Set $DEBUG to true (same as `ruby -d')
-  -r load-module    Same as `ruby -r'
-  --inspect	    Use `inspect' for output (default except for bc mode)
-  --noinspect	    Don't use inspect for output
-  --readline	    Use Readline extension module
-  --noreadline	    Don't use Readline extension module
-  --prompt prompt-mode
-  --prompt-mode prompt-mode
-		    Switch prompt mode. Pre-defined prompt modes are
-		    `default', `simple', `xmp' and `inf-ruby'
-  --inf-ruby-mode   Use prompt appropriate for inf-ruby-mode on emacs. 
-		    Suppresses --readline. 
-  --simple-prompt   Simple prompt mode
-  --noprompt	    No prompt mode
-  --tracer	    Display trace for each execution of commands.
-  --back-trace-limit n
-		    Display backtrace top n and tail n. The default
-		    value is 16. 
-  --irb_debug n	    Set internal debug level to n (not for popular use)
-  -v, --version	    Print the version of irb
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
deleted file mode 100644
index e1afaf5d71..0000000000
--- a/lib/irb/lc/ja/error.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#   irb/lc/ja/error.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-require "e2mmap"
-
-module IRB
-  # exceptions
-  extend Exception2MessageMapper
-  def_exception :UnrecognizedSwitch, '$B%9%$%C%A(B(%s)$B$,J,$j$^$;$s(B'
-  def_exception :NotImplementedError, '`%s\'$B$NDj5A$,I,MW$G$9(B'
-  def_exception :CantReturnToNormalMode, 'Normal$B%b!<%I$KLa$l$^$;$s(B.'
-  def_exception :IllegalParameter, '$B%Q%i%a!<%?(B(%s)$B$,4V0c$C$F$$$^$9(B.'
-  def_exception :IrbAlreadyDead, 'Irb$B$O4{$K;`$s$G$$$^$9(B.'
-  def_exception :IrbSwitchedToCurrentThread, '$B%+%l%s%H%9%l%C%I$K@Z$jBX$o$j$^$7$?(B.'
-  def_exception :NoSuchJob, '$B$=$N$h$&$J%8%g%V(B(%s)$B$O$"$j$^$;$s(B.'
-  def_exception :CantShiftToMultiIrbMode, 'multi-irb mode$B$K0\$l$^$;$s(B.'
-  def_exception :CantChangeBinding, '$B%P%$%s%G%#%s%0(B(%s)$B$KJQ99$G$-$^$;$s(B.'
-  def_exception :UndefinedPromptMode, '$B%W%m%s%W%H%b!<%I(B(%s)$B$ODj5A$5$l$F$$$^$;$s(B.'
-end
-
-
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
deleted file mode 100644
index 1cf980f6ba..0000000000
--- a/lib/irb/lc/ja/help-message
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#   irb/lc/ja/help-message.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-Usage:  irb.rb [options] [programfile] [arguments]
-  -f		    ~/.irbrc $B$rFI$_9~$^$J$$(B.
-  -m		    bc$B%b!<%I(B($BJ,?t(B, $B9TNs$N7W;;$,$G$-$k(B)
-  -d                $DEBUG $B$r(Btrue$B$K$9$k(B(ruby -d $B$HF1$8(B)
-  -r load-module    ruby -r $B$HF1$8(B.
-  --inspect	    $B7k2L=PNO$K(Binspect$B$rMQ$$$k(B(bc$B%b!<%I0J30$O%G%U%)%k%H(B). 
-  --noinspect	    $B7k2L=PNO$K(Binspect$B$rMQ$$$J$$(B.
-  --readline	    readline$B%i%$%V%i%j$rMxMQ$9$k(B.
-  --noreadline	    readline$B%i%$%V%i%j$rMxMQ$7$J$$(B. 
-  --prompt prompt-mode/--prompt-mode prompt-mode
-		    $B%W%m%s%W%H%b!<%I$r@ZBX$($^$9(B. $B8=:_Dj5A$5$l$F$$$k%W(B
-		    $B%m%s%W%H%b!<%I$O(B, default, simple, xmp, inf-ruby$B$,(B
-		    $BMQ0U$5$l$F$$$^$9(B. 
-  --inf-ruby-mode   emacs$B$N(Binf-ruby-mode$BMQ$N%W%m%s%W%HI=<($r9T$J$&(B. $BFC(B
-		    $B$K;XDj$,$J$$8B$j(B, readline$B%i%$%V%i%j$O;H$o$J$/$J$k(B.
-  --simple-prompt   $BHs>o$K%7%s%W%k$J%W%m%s%W%H$rMQ$$$k%b!<%I$G$9(B.
-  --noprompt	    $B%W%m%s%W%HI=<($r9T$J$o$J$$(B.
-  --tracer	    $B%3%^%s%I<B9T;~$K%H%l!<%9$r9T$J$&(B.
-  --back-trace-limit n
-		    $B%P%C%/%H%l!<%9I=<($r%P%C%/%H%l!<%9$NF,$+$i(B n, $B8e$m(B
-		    $B$+$i(Bn$B$@$19T$J$&(B. $B%G%U%)%k%H$O(B16 
-  --irb_debug n	    irb$B$N%G%P%C%0%G%P%C%0%l%Y%k$r(Bn$B$K@_Dj$9$k(B($BMxMQ$7$J(B
-		    $B$$J}$,L5Fq$G$7$g$&(B).
-  -v, --version	    irb$B$N%P!<%8%g%s$rI=<($9$k(B
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
deleted file mode 100644
index b2c90e38e2..0000000000
--- a/lib/irb/locale.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-#
-#   irb/locale.rb - internationalization module
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-
-autoload :Tempfile, "tempfile"
-autoload :Kconv, "kconv"
-
-module IRB
-  class Locale
-    @RCS_ID='-$Id$-'
-
-    JPDefaultLocale = "ja"
-    LOCALE_DIR = "/lc/"
-
-    def initialize(locale = nil)
-      @lang = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C" 
-    end
-
-    attr_reader :lang
-
-    def lc2kconv(lang)
-      case lang
-      when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP"
-        Kconv::EUC
-      when "ja_JP.sjis", "ja_JP.SJIS"
-        Kconv::SJIS
-      end
-    end
-    private :lc2kconv
-
-    def String(mes)
-      mes = super(mes)
-      case @lang
-      when /^ja/
-	mes = Kconv::kconv(mes, lc2kconv(@lang))
-      else
-	mes
-      end
-      mes
-    end
-
-    def format(*opts)
-      String(super(*opts))
-    end
-
-    def gets(*rs)
-      String(super(*rs))
-    end
-
-    def readline(*rs)
-      String(super(*rs))
-    end
-
-    def print(*opts)
-      ary = opts.collect{|opt| String(opt)}
-      super(*ary)
-    end
-
-    def printf(*opts)
-      s = format(*opts)
-      print s
-    end
-
-    def puts(*opts)
-      ary = opts.collect{|opt| String(opts)}
-      super(*ary)
-    end
-
-    def require(file, priv = nil)
-      rex = Regexp.new("lc/#{Regexp.quote(file)}\.(so|o|sl|rb)?")
-      return false if $".find{|f| f =~ rex}
-
-      case file
-      when /\.rb$/
-	begin
-	  load(file, priv)
-	  $".push file
-	  return true
-	rescue LoadError
-	end
-      when /\.(so|o|sl)$/
-	return super
-      end
-
-      begin
-	load(f = file + ".rb")
-	$".push f  #"
-	return true
-      rescue LoadError
-	return ruby_require(file)
-      end
-    end
-
-    alias toplevel_load load
-    
-    def load(file, priv=nil)
-      dir = File.dirname(file)
-      dir = "" if dir == "."
-      base = File.basename(file)
-
-      if /^ja(_JP)?$/ =~ @lang
- 	back, @lang = @lang, "C"
-      end
-      begin
-	if dir[0] == ?/ #/
-	  lc_path = search_file(dir, base)
-	  return real_load(lc_path, priv) if lc_path
-	end
-	
-	for path in $:
-	  lc_path = search_file(path + "/" + dir, base)
-	  return real_load(lc_path, priv) if lc_path
-	end
-      ensure
-	@lang = back if back
-      end
-      raise LoadError, "No such file to load -- #{file}"
-    end 
-
-    def real_load(path, priv)
-      tmp_base = path.tr("./:", "___")
-      lc_file = Tempfile.new(tmp_base)
-      File.foreach(path) do |line|
-	line = self.String(line)
-	lc_file.print(line)
-      end
-      lc_file.close
-      toplevel_load lc_file.path, priv
-      lc_file.close(true)
-    end
-    private :real_load
-
-    def find(file , paths = $:)
-      dir = File.dirname(file)
-      dir = "" if dir == "."
-      base = File.basename(file)
-      if dir[0] == ?/ #/
-	  return lc_path = search_file(dir, base)
-      else
-	for path in $:
-	  if lc_path = search_file(path + "/" + dir, base)
-	    return lc_path
-	  end
-	end
-      end
-      nil
-    end
-
-    def search_file(path, file)
-      if File.exists?(p1 = path + lc_path(file, "C"))
-	if File.exists?(p2 = path + lc_path(file))
-	  return p2
-	else
-	end
-	return p1
-      else
-      end
-      nil
-    end
-    private :search_file
-
-    def lc_path(file = "", lc = @lang)
-      case lc
-      when "C"
-	LOCALE_DIR + file
-      when /^ja/
-	LOCALE_DIR + "ja/" + file
-      else
-	LOCALE_DIR + @lang + "/" + file
-      end
-    end
-    private :lc_path
-  end
-end
-
-
-
-
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
deleted file mode 100644
index 6b445a32b9..0000000000
--- a/lib/irb/ruby-lex.rb
+++ /dev/null
@@ -1,1070 +0,0 @@
-#
-#   irb/ruby-lex.rb - ruby lexcal analizer
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-
-require "e2mmap"
-require "irb/slex"
-require "irb/ruby-token"
-
-class RubyLex
-  @RCS_ID='-$Id$-'
-
-  extend Exception2MessageMapper
-  def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
-  def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
-  def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
-  def_exception(:TkReading2TokenDuplicateError, 
-		"key duplicate(token_n='%s', key='%s')")
-  def_exception(:SyntaxError, "%s")
-
-  def_exception(:TerminateLineInput, "Terminate Line Input")
-  
-  include RubyToken
-
-  class << self
-    attr_accessor :debug_level
-    def debug?
-      @debug_level > 0
-    end
-  end
-  @debug_level = 0
-
-  def initialize
-    lex_init
-    set_input(STDIN)
-
-    @seek = 0
-    @exp_line_no = @line_no = 1
-    @base_char_no = 0
-    @char_no = 0
-    @rests = []
-    @readed = []
-    @here_readed = []
-
-    @indent = 0
-    @indent_stack = []
-
-    @skip_space = false
-    @readed_auto_clean_up = false
-    @exception_on_syntax_error = true
-  end
-
-  attr_accessor :skip_space
-  attr_accessor :readed_auto_clean_up
-  attr_accessor :exception_on_syntax_error
-
-  attr_reader :seek
-  attr_reader :char_no
-  attr_reader :line_no
-  attr_reader :indent
-
-  # io functions
-  def set_input(io, p = nil, &block)
-    @io = io
-    if p.respond_to?(:call)
-      @input = p
-    elsif block_given?
-      @input = block
-    else
-      @input = Proc.new{@io.gets}
-    end
-  end
-
-  def get_readed
-    if idx = @readed.reverse.index("\n")
-      @base_char_no = idx
-    else
-      @base_char_no += @readed.size
-    end
-    
-    readed = @readed.join("")
-    @readed = []
-    readed
-  end
-
-  def getc
-    while @rests.empty?
-      return nil unless buf_input
-    end
-    c = @rests.shift
-    if @here_header
-      @here_readed.push c
-    else
-      @readed.push c
-    end
-    @seek += 1
-    if c == "\n"
-      @line_no += 1 
-      @char_no = 0
-    else
-      @char_no += 1
-    end
-    c
-  end
-
-  def gets
-    l = ""
-    while c = getc
-      l.concat c
-      break if c == "\n"
-    end
-    l
-  end
-
-  def eof?
-    @io.eof?
-  end
-
-  def getc_of_rests
-    if @rests.empty?
-      nil
-    else
-      getc
-    end
-  end
-
-  def ungetc(c = nil)
-    if @here_readed.empty?
-      c2 = @readed.pop
-    else
-      c2 = @here_readed.pop
-    end
-    c = c2 unless c
-    @rests.unshift c #c = 
-      @seek -= 1
-    if c == "\n"
-      @line_no -= 1 
-      if idx = @readed.reverse.index("\n")
-	@char_no = @readed.size - idx
-      else
-	@char_no = @base_char_no + @readed.size
-      end
-    else
-      @char_no -= 1
-    end
-  end
-
-  def peek_equal?(str)
-    chrs = str.split(//)
-    until @rests.size >= chrs.size
-      return false unless buf_input
-    end
-    @rests[0, chrs.size] == chrs
-  end
-
-  def peek_match?(regexp)
-    while @rests.empty?
-      return false unless buf_input
-    end
-    regexp =~ @rests.join("")
-  end
-
-  def peek(i = 0)
-    while @rests.size <= i
-      return nil unless buf_input
-    end
-    @rests[i]
-  end
-
-  def buf_input
-    prompt
-    line = @input.call
-    return nil unless line
-    @rests.concat line.split(//)
-    true
-  end
-  private :buf_input
-
-  def set_prompt(p=nil, &block)
-    p = block if block_given?
-    if p.respond_to?(:call)
-      @prompt = p
-    else
-      @prompt = Proc.new{print p}
-    end
-  end
-
-  def prompt
-    if @prompt
-      @prompt.call(@ltype, @indent, @continue, @line_no)
-    end
-  end
-
-  def initialize_input
-    @ltype = nil
-    @quoted = nil
-    @indent = 0
-    @indent_stack = []
-    @lex_state = EXPR_BEG
-    @space_seen = false
-    @here_header = false
-    
-    @continue = false
-    prompt
-
-    @line = ""
-    @exp_line_no = @line_no
-  end
-  
-  def each_top_level_statement
-    initialize_input
-    catch(:TERM_INPUT) do
-      loop do
-	begin
-	  @continue = false
-	  prompt
-	  unless l = lex
-	    throw :TERM_INPUT if @line == ''
-	  else
-	    #p l
-	    @line.concat l
-	    if @ltype or @continue or @indent > 0
-	      next
-	    end
-	  end
-	  if @line != "\n"
-	    yield @line, @exp_line_no
-	  end
-	  break unless l
-	  @line = ''
-	  @exp_line_no = @line_no
-
-	  @indent = 0
-	  @indent_stack = []
-	  prompt
-	rescue TerminateLineInput
-	  initialize_input
-	  prompt
-	  get_readed
-	end
-      end
-    end
-  end
-
-  def lex
-    until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
-	     !@continue or
-	     tk.nil?)
-      #p tk
-      #p @lex_state
-      #p self
-    end
-    line = get_readed
-    #      print self.inspect
-    if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
-      nil
-    else
-      line
-    end
-  end
-
-  def token
-    #      require "tracer"
-    #      Tracer.on
-    @prev_seek = @seek
-    @prev_line_no = @line_no
-    @prev_char_no = @char_no
-    begin
-      begin
-	tk = @OP.match(self)
-	@space_seen = tk.kind_of?(TkSPACE)
-      rescue SyntaxError
-	abort if @exception_on_syntax_error
-	tk = TkError.new(@seek, @line_no, @char_no)
-      end
-    end while @skip_space and tk.kind_of?(TkSPACE)
-    if @readed_auto_clean_up
-      get_readed
-    end
-    #      Tracer.off
-    tk
-  end
-  
-  ENINDENT_CLAUSE = [
-    "case", "class", "def", "do", "for", "if",
-    "module", "unless", "until", "while", "begin" #, "when"
-  ]
-  DEINDENT_CLAUSE = ["end" #, "when"
-  ]
-
-  PERCENT_LTYPE = {
-    "q" => "\'",
-    "Q" => "\"",
-    "x" => "\`",
-    "r" => "\/",
-    "w" => "]",
-    "W" => "]",
-    "s" => ":"
-  }
-  
-  PERCENT_PAREN = {
-    "{" => "}",
-    "[" => "]",
-    "<" => ">",
-    "(" => ")"
-  }
-
-  Ltype2Token = {
-    "\'" => TkSTRING,
-    "\"" => TkSTRING,
-    "\`" => TkXSTRING,
-    "\/" => TkREGEXP,
-    "]" => TkDSTRING,
-    ":" => TkSYMBOL
-  }
-  DLtype2Token = {
-    "\"" => TkDSTRING,
-    "\`" => TkDXSTRING,
-    "\/" => TkDREGEXP,
-  }
-
-  def lex_init()
-    @OP = SLex.new
-    @OP.def_rules("\0", "\004", "\032") do
-      Token(TkEND_OF_SCRIPT)
-    end
-
-    @OP.def_rules(" ", "\t", "\f", "\r", "\13") do
-      @space_seen = true
-      while getc =~ /[ \t\f\r\13]/; end
-      ungetc
-      Token(TkSPACE)
-    end
-
-    @OP.def_rule("#") do
-      |op, io|
-      identify_comment
-    end
-
-    @OP.def_rule("=begin", proc{@prev_char_no == 0 && peek(0) =~ /\s/}) do
-      |op, io|
-      @ltype = "="
-      until getc == "\n"; end
-      until peek_equal?("=end") && peek(4) =~ /\s/
-	until getc == "\n"; end
-      end
-      gets
-      @ltype = nil
-      Token(TkRD_COMMENT)
-    end
-
-    @OP.def_rule("\n") do
-      print "\\n\n" if RubyLex.debug?
-      case @lex_state
-      when EXPR_BEG, EXPR_FNAME, EXPR_DOT
-	@continue = true
-      else
-	@continue = false
-	@lex_state = EXPR_BEG
-	until (@indent_stack.empty? || 
-	       [TkLPAREN, TkLBRACK, TkLBRACE, 
-		 TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
-	  @indent_stack.pop
-	end
-      end
-      @here_header = false
-      @here_readed = []
-      Token(TkNL)
-    end
-
-    @OP.def_rules("*", "**",	
-		  "=", "==", "===", 
-		  "=~", "<=>",	
-		  "<", "<=",
-		  ">", ">=", ">>") do
-      |op, io|
-      case @lex_state
-      when EXPR_FNAME, EXPR_DOT
-	@lex_state = EXPR_ARG
-      else
-	@lex_state = EXPR_BEG
-      end
-      Token(op)
-    end
-
-    @OP.def_rules("!", "!=", "!~") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op)
-    end
-
-    @OP.def_rules("<<") do
-      |op, io|
-      tk = nil
-      if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
-	  (@lex_state != EXPR_ARG || @space_seen)
-	c = peek(0)
-	if /\S/ =~ c && (/["'`]/ =~ c || /[\w_]/ =~ c || c == "-")
-	  tk = identify_here_document
-	end
-      end
-      unless tk
-	tk = Token(op)
-	case @lex_state
-	when EXPR_FNAME, EXPR_DOT
-	  @lex_state = EXPR_ARG
-	else
-	  @lex_state = EXPR_BEG
-	end
-      end
-      tk
-    end
-
-    @OP.def_rules("'", '"') do
-      |op, io|
-      identify_string(op)
-    end
-
-    @OP.def_rules("`") do
-      |op, io|
-      if @lex_state == EXPR_FNAME
-	Token(op)
-      else
-	identify_string(op)
-      end
-    end
-
-    @OP.def_rules('?') do
-      |op, io|
-      if @lex_state == EXPR_END
-	@lex_state = EXPR_BEG
-	Token(TkQUESTION)
-      else
-	ch = getc
-	if @lex_state == EXPR_ARG && ch =~ /\s/
-	  ungetc
-	  @lex_state = EXPR_BEG;
-	  Token(TkQUESTION)
-	else
-	  if (ch == '\\') 
-	    read_escape
-	  end
-	  @lex_state = EXPR_END
-	  Token(TkINTEGER)
-	end
-      end
-    end
-
-    @OP.def_rules("&", "&&", "|", "||") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op)
-    end
-    
-    @OP.def_rules("+=", "-=", "*=", "**=", 
-		  "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      op =~ /^(.*)=$/
-      Token(TkOPASGN, $1)
-    end
-
-    @OP.def_rule("+@", proc{@lex_state == EXPR_FNAME}) do
-      |op, io|
-      Token(op)
-    end
-
-    @OP.def_rule("-@", proc{@lex_state == EXPR_FNAME}) do
-      |op, io|
-      Token(op)
-    end
-
-    @OP.def_rules("+", "-") do
-      |op, io|
-      catch(:RET) do
-	if @lex_state == EXPR_ARG
-	  if @space_seen and peek(0) =~ /[0-9]/
-	    throw :RET, identify_number
-	  else
-	    @lex_state = EXPR_BEG
-	  end
-	elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
-	  throw :RET, identify_number
-	else
-	  @lex_state = EXPR_BEG
-	end
-	Token(op)
-      end
-    end
-
-    @OP.def_rule(".") do
-      @lex_state = EXPR_BEG
-      if peek(0) =~ /[0-9]/
-	ungetc
-	identify_number
-      else
-	# for "obj.if" etc.
-	@lex_state = EXPR_DOT
-	Token(TkDOT)
-      end
-    end
-
-    @OP.def_rules("..", "...") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op)
-    end
-
-    lex_int2
-  end
-  
-  def lex_int2
-    @OP.def_rules("]", "}", ")") do
-      |op, io|
-      @lex_state = EXPR_END
-      @indent -= 1
-      @indent_stack.pop
-      Token(op)
-    end
-
-    @OP.def_rule(":") do
-      if @lex_state == EXPR_END || peek(0) =~ /\s/
-	@lex_state = EXPR_BEG
-	Token(TkCOLON)
-      else
-	@lex_state = EXPR_FNAME;
-	Token(TkSYMBEG)
-      end
-    end
-
-    @OP.def_rule("::") do
-#      p @lex_state.id2name, @space_seen
-      if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
-	@lex_state = EXPR_BEG
-	Token(TkCOLON3)
-      else
-	@lex_state = EXPR_DOT
-	Token(TkCOLON2)
-      end
-    end
-
-    @OP.def_rule("/") do
-      |op, io|
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-	identify_string(op)
-      elsif peek(0) == '='
-	getc
-	@lex_state = EXPR_BEG
-	Token(TkOPASGN, "/") #/)
-      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
-	identify_string(op)
-      else 
-	@lex_state = EXPR_BEG
-	Token("/") #/)
-      end
-    end
-
-    @OP.def_rules("^") do
-      @lex_state = EXPR_BEG
-      Token("^")
-    end
-
-    #       @OP.def_rules("^=") do
-    # 	@lex_state = EXPR_BEG
-    # 	Token(OP_ASGN, :^)
-    #       end
-    
-    @OP.def_rules(",") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op)
-    end
-
-    @OP.def_rules(";") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      until (@indent_stack.empty? || 
-	     [TkLPAREN, TkLBRACK, TkLBRACE, 
-	       TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
-	@indent_stack.pop
-      end
-      Token(op)
-    end
-
-    @OP.def_rule("~") do
-      @lex_state = EXPR_BEG
-      Token("~")
-    end
-
-    @OP.def_rule("~@", proc{@lex_state == EXPR_FNAME}) do
-      @lex_state = EXPR_BEG
-      Token("~")
-    end
-    
-    @OP.def_rule("(") do
-      @indent += 1
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-	@lex_state = EXPR_BEG
-	tk_c = TkfLPAREN
-      else
-	@lex_state = EXPR_BEG
-	tk_c = TkLPAREN
-      end
-      @indent_stack.push tk_c
-      tk = Token(tk_c)
-    end
-
-    @OP.def_rule("[]", proc{@lex_state == EXPR_FNAME}) do
-      Token("[]")
-    end
-
-    @OP.def_rule("[]=", proc{@lex_state == EXPR_FNAME}) do
-      Token("[]=")
-    end
-
-    @OP.def_rule("[") do
-      @indent += 1
-      if @lex_state == EXPR_FNAME
-	tk_c = TkfLBRACK
-      else
-	if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-	  tk_c = TkLBRACK
-	elsif @lex_state == EXPR_ARG && @space_seen
-	  tk_c = TkLBRACK
-	else
-	  tk_c = TkfLBRACK
-	end
-	@lex_state = EXPR_BEG
-      end
-      @indent_stack.push tk_c
-      Token(tk_c)
-    end
-
-    @OP.def_rule("{") do
-      @indent += 1
-      if @lex_state != EXPR_END && @lex_state != EXPR_ARG
-	tk_c = TkLBRACE
-      else
-	tk_c = TkfLBRACE
-      end
-      @lex_state = EXPR_BEG
-      @indent_stack.push tk_c
-      Token(tk_c)
-    end
-
-    @OP.def_rule('\\') do
-      if getc == "\n"
-	@space_seen = true
-	@continue = true
-	Token(TkSPACE)
-      else
-	ungetc
-	Token("\\")
-      end
-    end
-
-    @OP.def_rule('%') do
-      |op, io|
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-	identify_quotation
-      elsif peek(0) == '='
-	getc
-	Token(TkOPASGN, :%)
-      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
-	identify_quotation
-      else
-	@lex_state = EXPR_BEG
-	Token("%") #))
-      end
-    end
-
-    @OP.def_rule('$') do
-      identify_gvar
-    end
-
-    @OP.def_rule('@') do
-      if peek(0) =~ /[\w_@]/
-	ungetc
-	identify_identifier
-      else
-	Token("@")
-      end
-    end
-
-    #       @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do 
-    # 	|op, io|
-    # 	@indent += 1
-    # 	@lex_state = EXPR_FNAME
-    # #	@lex_state = EXPR_END
-    # #	until @rests[0] == "\n" or @rests[0] == ";"
-    # #	  rests.shift
-    # #	end
-    #       end
-
-    @OP.def_rule("") do
-      |op, io|
-      printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
-      if peek(0) =~ /[0-9]/
-	t = identify_number
-      elsif peek(0) =~ /[\w_]/
-	t = identify_identifier
-      end
-      printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
-      t
-    end
-    
-    p @OP if RubyLex.debug?
-  end
-  
-  def identify_gvar
-    @lex_state = EXPR_END
-    
-    case ch = getc
-    when /[~_*$?!@\/\\;,=:<>".]/   #"
-      Token(TkGVAR, "$" + ch)
-    when "-"
-      Token(TkGVAR, "$-" + getc)
-    when "&", "`", "'", "+"
-      Token(TkBACK_REF, "$"+ch)
-    when /[1-9]/
-      while getc =~ /[0-9]/; end
-      ungetc
-      Token(TkNTH_REF)
-    when /\w/
-      ungetc
-      ungetc
-      identify_identifier
-    else 
-      ungetc
-      Token("$")
-    end
-  end
-  
-  def identify_identifier
-    token = ""
-    if peek(0) =~ /[$@]/
-      token.concat(c = getc)
-      if c == "@" and peek(0) == "@"
-	token.concat getc
-      end
-    end
-
-    while (ch = getc) =~ /\w|_/
-      print ":", ch, ":" if RubyLex.debug?
-      token.concat ch
-    end
-    ungetc
-    
-    if (ch == "!" || ch == "?") && token[0,1] =~ /\w/ && peek(0) != "="
-      token.concat getc
-    end
-
-    # almost fix token
-
-    case token
-    when /^\$/
-      return Token(TkGVAR, token)
-    when /^\@\@/
-      @lex_state = EXPR_END
-      # p Token(TkCVAR, token)
-      return Token(TkCVAR, token)
-    when /^\@/
-      @lex_state = EXPR_END
-      return Token(TkIVAR, token)
-    end
-    
-    if @lex_state != EXPR_DOT
-      print token, "\n" if RubyLex.debug?
-
-      token_c, *trans = TkReading2Token[token]
-      if token_c
-	# reserved word?
-
-	if (@lex_state != EXPR_BEG &&
-	    @lex_state != EXPR_FNAME &&
-	    trans[1])
-	  # modifiers
-	  token_c = TkSymbol2Token[trans[1]]
-	  @lex_state = trans[0]
-	else
-	  if @lex_state != EXPR_FNAME
-	    if ENINDENT_CLAUSE.include?(token)
-	      # check for ``class = val''.
-	      valid = true
-	      case token
-	      when "class"
-		valid = false unless peek_match?(/^\s*(<<|\w|::)/)
-	      when "def"
-		valid = false if peek_match?(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
-#		valid = false if peek_match?(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)?=|\&\&|\|\|)/)
-	      when "do"
-		valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&)/)
-	      when *ENINDENT_CLAUSE
-		valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&|\|)/)
-	      else
-		# no nothing
-	      end
-	      if valid
-		if token == "do"
-		  if ![TkFOR, TkWHILE, TkUNTIL].include?(@indent_stack.last)
-		    @indent += 1
-		    @indent_stack.push token_c
-		  end
-		else
-		  @indent += 1
-		  @indent_stack.push token_c
-		end
-#		p @indent_stack
-	      end
-
-	    elsif DEINDENT_CLAUSE.include?(token)
-	      @indent -= 1
-	      @indent_stack.pop
-	    end
-	    @lex_state = trans[0]
-	  else
-	    @lex_state = EXPR_END
-	  end
-	end
-	return Token(token_c, token)
-      end
-    end
-
-    if @lex_state == EXPR_FNAME
-      @lex_state = EXPR_END
-      if peek(0) == '='
-	token.concat getc
-      end
-    elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
-      @lex_state = EXPR_ARG
-    else
-      @lex_state = EXPR_END
-    end
-
-    if token[0, 1] =~ /[A-Z]/
-      return Token(TkCONSTANT, token)
-    elsif token[token.size - 1, 1] =~ /[!?]/
-      return Token(TkFID, token)
-    else
-      return Token(TkIDENTIFIER, token)
-    end
-  end
-
-  def identify_here_document
-    ch = getc
-#    if lt = PERCENT_LTYPE[ch]
-    if ch == "-"
-      ch = getc
-      indent = true
-    end
-    if /['"`]/ =~ ch
-      lt = ch
-      quoted = ""
-      while (c = getc) && c != lt
-	quoted.concat c
-      end
-    else
-      lt = '"'
-      quoted = ch.dup
-      while (c = getc) && c =~ /\w/
-	quoted.concat c
-      end
-      ungetc
-    end
-
-    ltback, @ltype = @ltype, lt
-    reserve = []
-    while ch = getc
-      reserve.push ch
-      if ch == "\\"
-	reserve.push ch = getc
-      elsif ch == "\n"
-	break
-      end
-    end
-
-    @here_header = false
-    while (l = gets.chomp) && (indent ? l.strip : l) != quoted
-    end
-
-    @here_header = true
-    @here_readed.concat reserve
-    while ch = reserve.pop
-      ungetc ch
-    end
-
-    @ltype = ltback
-    @lex_state = EXPR_END
-    Token(Ltype2Token[lt])
-  end
-  
-  def identify_quotation
-    ch = getc
-    if lt = PERCENT_LTYPE[ch]
-      ch = getc
-    elsif ch =~ /\W/
-      lt = "\""
-    else
-      RubyLex.fail SyntaxError, "unknown type of %string"
-    end
-#     if ch !~ /\W/
-#       ungetc
-#       next
-#     end
-    #@ltype = lt
-    @quoted = ch unless @quoted = PERCENT_PAREN[ch]
-    identify_string(lt, @quoted)
-  end
-
-  def identify_number
-    @lex_state = EXPR_END
-
-    if ch = getc
-      if /[xX]/ =~ peek(0)
-	ch = getc
-	match = /[0-9a-fA-F_]/
-      elsif /[bB]/ =~ peek(0)
-	ch = getc
-	match = /[01_]/
-      else
-	match = /[0-7_]/
-      end
-      while ch = getc
-	if ch !~ match
-	  ungetc
-	  break
-	end
-      end
-      return Token(TkINTEGER)
-    end
-    
-    type = TkINTEGER
-    allow_point = true
-    allow_e = true
-    while ch = getc
-      case ch
-      when /[0-9_]/
-      when allow_point && "."
-	type = TkFLOAT
-	if peek(0) !~ /[0-9]/
-	  ungetc
-	  break
-	end
-	allow_point = false
-      when allow_e && "e", allow_e && "E"
-	type = TkFLOAT
-	if peek(0) =~ /[+-]/
-	  getc
-	end
-	allow_e = false
-	allow_point = false
-      else
-	ungetc
-	break
-      end
-    end
-    Token(type)
-  end
-  
-  def identify_string(ltype, quoted = ltype)
-    @ltype = ltype
-    @quoted = quoted
-    subtype = nil
-    begin
-      nest = 0
-      while ch = getc
-	if @quoted == ch and nest == 0
-	  break
-	elsif @ltype != "'" && @ltype != "]" and ch == "#"
-	  subtype = true
-	elsif ch == '\\' #'
-	  read_escape
-	end
-	if PERCENT_PAREN.values.include?(@quoted) 
-	  if PERCENT_PAREN[ch] == @quoted
-	    nest += 1
-	  elsif ch == @quoted
-	    nest -= 1
-	  end
-	end
-      end
-      if @ltype == "/"
-	if peek(0) =~ /i|m|x|o|e|s|u|n/
-	  getc
-	end
-      end
-      if subtype
-	Token(DLtype2Token[ltype])
-      else
-	Token(Ltype2Token[ltype])
-      end
-    ensure
-      @ltype = nil
-      @quoted = nil
-      @lex_state = EXPR_END
-    end
-  end
-  
-  def identify_comment
-    @ltype = "#"
-
-    while ch = getc
-#      if ch == "\\" #"
-#	read_escape
-#      end
-      if ch == "\n"
-	@ltype = nil
-	ungetc
-	break
-      end
-    end
-    return Token(TkCOMMENT)
-  end
-  
-  def read_escape
-    case ch = getc
-    when "\n", "\r", "\f"
-    when "\\", "n", "t", "r", "f", "v", "a", "e", "b" #"
-    when /[0-7]/
-      ungetc ch
-      3.times do
-	case ch = getc
-	when /[0-7]/
-	when nil
-	  break
-	else
-	  ungetc
-	  break
-	end
-      end
-      
-    when "x"
-      2.times do
-	case ch = getc
-	when /[0-9a-fA-F]/
-	when nil
-	  break
-	else
-	  ungetc
-	  break
-	end
-      end
-
-    when "M"
-      if (ch = getc) != '-'
-	ungetc
-      else
-	if (ch = getc) == "\\" #"
-	  read_escape
-	end
-      end
-
-    when "C", "c", "^"
-      if ch == "C" and (ch = getc) != "-"
-	ungetc
-      elsif (ch = getc) == "\\" #"
-	read_escape
-      end
-    else
-      # other characters 
-    end
-  end
-end
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
deleted file mode 100644
index 49b97e9c54..0000000000
--- a/lib/irb/ruby-token.rb
+++ /dev/null
@@ -1,273 +0,0 @@
-#
-#   irb/ruby-token.rb - ruby tokens 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-module RubyToken
-  EXPR_BEG = :EXPR_BEG
-  EXPR_MID = :EXPR_MID
-  EXPR_END = :EXPR_END
-  EXPR_ARG = :EXPR_ARG
-  EXPR_FNAME = :EXPR_FNAME
-  EXPR_DOT = :EXPR_DOT
-  EXPR_CLASS = :EXPR_CLASS
-
-  # for ruby 1.4X
-  if !defined?(Symbol)
-    Symbol = Integer
-  end
-  
-  class Token
-    def initialize(seek, line_no, char_no)
-      @seek = seek
-      @line_no = line_no
-      @char_no = char_no
-    end
-    attr :seek
-    attr :line_no
-    attr :char_no
-  end
-
-  class TkNode < Token
-    def initialize(seek, line_no, char_no)
-      super
-    end
-    attr :node
-  end
-
-  class TkId < Token
-    def initialize(seek, line_no, char_no, name)
-      super(seek, line_no, char_no)
-      @name = name
-    end
-    attr :name
-  end
-
-  class TkVal < Token
-    def initialize(seek, line_no, char_no, value = nil)
-      super(seek, line_no, char_no)
-      @value = value
-    end
-    attr :value
-  end
-
-  class TkOp < Token
-    attr :name, true
-  end
-
-  class TkOPASGN < TkOp
-    def initialize(seek, line_no, char_no, op)
-      super(seek, line_no, char_no)
-      op = TkReading2Token[op] unless op.kind_of?(Symbol)
-      @op = op
-    end
-    attr :op
-  end
-
-  class TkUnknownChar < Token
-    def initialize(seek, line_no, char_no, id)
-      super(seek, line_no, char_no)
-      @name = name
-    end
-    attr :name
-  end
-
-  class TkError < Token
-  end
-
-  def Token(token, value = nil)
-    case token
-    when String
-      if (tk = TkReading2Token[token]).nil?
-	IRB.fail TkReading2TokenNoKey, token
-      end
-      tk = Token(tk[0], value) 
-      if tk.kind_of?(TkOp)
-	tk.name = token
-      end
-      return tk
-    when Symbol
-      if (tk = TkSymbol2Token[token]).nil?
-	IRB.fail TkSymbol2TokenNoKey, token
-      end
-      return Token(tk[0], value) 
-    else 
-      if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
-	token.new(@prev_seek, @prev_line_no, @prev_char_no)
-      else
-	token.new(@prev_seek, @prev_line_no, @prev_char_no, value)
-      end
-    end
-  end
-
-  TokenDefinitions = [
-    [:TkCLASS,      TkId,  "class",  EXPR_CLASS],
-    [:TkMODULE,     TkId,  "module", EXPR_BEG],
-    [:TkDEF,	    TkId,  "def",    EXPR_FNAME],
-    [:TkUNDEF,      TkId,  "undef",  EXPR_FNAME],
-    [:TkBEGIN,      TkId,  "begin",  EXPR_BEG],
-    [:TkRESCUE,     TkId,  "rescue", EXPR_MID],
-    [:TkENSURE,     TkId,  "ensure", EXPR_BEG],
-    [:TkEND,	    TkId,  "end",    EXPR_END],
-    [:TkIF,         TkId,  "if",     EXPR_BEG, :TkIF_MOD],
-    [:TkUNLESS,     TkId,  "unless", EXPR_BEG, :TkUNLESS_MOD],
-    [:TkTHEN,	    TkId,  "then",   EXPR_BEG],
-    [:TkELSIF,      TkId,  "elsif",  EXPR_BEG],
-    [:TkELSE,	    TkId,  "else",   EXPR_BEG],
-    [:TkCASE,	    TkId,  "case",   EXPR_BEG],
-    [:TkWHEN,	    TkId,  "when",   EXPR_BEG],
-    [:TkWHILE,      TkId,  "while",  EXPR_BEG, :TkWHILE_MOD],
-    [:TkUNTIL,      TkId,  "until",  EXPR_BEG, :TkUNTIL_MOD],
-    [:TkFOR,	    TkId,  "for",    EXPR_BEG],
-    [:TkBREAK,      TkId,  "break",  EXPR_END],
-    [:TkNEXT,	    TkId,  "next",   EXPR_END],
-    [:TkREDO,	    TkId,  "redo",   EXPR_END],
-    [:TkRETRY,      TkId,  "retry",  EXPR_END],
-    [:TkIN,	    TkId,  "in",     EXPR_BEG],
-    [:TkDO,	    TkId,  "do",     EXPR_BEG],
-    [:TkRETURN,     TkId,  "return", EXPR_MID],
-    [:TkYIELD,      TkId,  "yield",  EXPR_END],
-    [:TkSUPER,      TkId,  "super",  EXPR_END],
-    [:TkSELF,	    TkId,  "self",   EXPR_END],
-    [:TkNIL, 	    TkId,  "nil",    EXPR_END],
-    [:TkTRUE,	    TkId,  "true",   EXPR_END],
-    [:TkFALSE,      TkId,  "false",  EXPR_END],
-    [:TkAND,	    TkId,  "and",    EXPR_BEG],
-    [:TkOR, 	    TkId,  "or",     EXPR_BEG],
-    [:TkNOT,	    TkId,  "not",    EXPR_BEG],
-    [:TkIF_MOD,     TkId],
-    [:TkUNLESS_MOD, TkId],
-    [:TkWHILE_MOD,  TkId],
-    [:TkUNTIL_MOD,  TkId],
-    [:TkALIAS,      TkId,  "alias",    EXPR_FNAME],
-    [:TkDEFINED,    TkId,  "defined?", EXPR_END],
-    [:TklBEGIN,     TkId,  "BEGIN",    EXPR_END],
-    [:TklEND,	    TkId,  "END",      EXPR_END],
-    [:Tk__LINE__,   TkId,  "__LINE__", EXPR_END],
-    [:Tk__FILE__,   TkId,  "__FILE__", EXPR_END],
-
-    [:TkIDENTIFIER, TkId],
-    [:TkFID,	    TkId],
-    [:TkGVAR,	    TkId],
-    [:TkCVAR,	    TkId],
-    [:TkIVAR,	    TkId],
-    [:TkCONSTANT,   TkId],
-
-    [:TkINTEGER,    TkVal],
-    [:TkFLOAT,      TkVal],
-    [:TkSTRING,     TkVal],
-    [:TkXSTRING,    TkVal],
-    [:TkREGEXP,     TkVal],
-    [:TkSYMBOL,     TkVal],
-
-    [:TkDSTRING,    TkNode],
-    [:TkDXSTRING,   TkNode],
-    [:TkDREGEXP,    TkNode],
-    [:TkNTH_REF,    TkNode],
-    [:TkBACK_REF,   TkNode],
-
-    [:TkUPLUS,      TkOp,   "+@"],
-    [:TkUMINUS,     TkOp,   "-@"],
-    [:TkPOW,	    TkOp,   "**"],
-    [:TkCMP,	    TkOp,   "<=>"],
-    [:TkEQ,	    TkOp,   "=="],
-    [:TkEQQ,	    TkOp,   "==="],
-    [:TkNEQ,	    TkOp,   "!="],
-    [:TkGEQ,	    TkOp,   ">="],
-    [:TkLEQ,	    TkOp,   "<="],
-    [:TkANDOP,      TkOp,   "&&"],
-    [:TkOROP,	    TkOp,   "||"],
-    [:TkMATCH,      TkOp,   "=~"],
-    [:TkNMATCH,     TkOp,   "!~"],
-    [:TkDOT2,	    TkOp,   ".."],
-    [:TkDOT3,	    TkOp,   "..."],
-    [:TkAREF,	    TkOp,   "[]"],
-    [:TkASET,	    TkOp,   "[]="],
-    [:TkLSHFT,      TkOp,   "<<"],
-    [:TkRSHFT,      TkOp,   ">>"],
-    [:TkCOLON2,     TkOp],
-    [:TkCOLON3,     TkOp],
-#   [:OPASGN,	    TkOp],               # +=, -=  etc. #
-    [:TkASSOC,      TkOp,   "=>"],
-    [:TkQUESTION,   TkOp,   "?"],	 #?
-    [:TkCOLON,      TkOp,   ":"],        #:
-    
-    [:TkfLPAREN],         # func( #
-    [:TkfLBRACK],         # func[ #
-    [:TkfLBRACE],         # func{ #
-    [:TkSTAR],            # *arg
-    [:TkAMPER],           # &arg #
-    [:TkSYMBEG],          # :SYMBOL
-
-    [:TkGT,	    TkOp,   ">"],
-    [:TkLT,	    TkOp,   "<"],
-    [:TkPLUS,	    TkOp,   "+"],
-    [:TkMINUS,      TkOp,   "-"],
-    [:TkMULT,	    TkOp,   "*"],
-    [:TkDIV,	    TkOp,   "/"],
-    [:TkMOD,	    TkOp,   "%"],
-    [:TkBITOR,      TkOp,   "|"],
-    [:TkBITXOR,     TkOp,   "^"],
-    [:TkBITAND,     TkOp,   "&"],
-    [:TkBITNOT,     TkOp,   "~"],
-    [:TkNOTOP,      TkOp,   "!"],
-
-    [:TkBACKQUOTE,  TkOp,   "`"],
-
-    [:TkASSIGN,     Token,  "="],
-    [:TkDOT,	    Token,  "."],
-    [:TkLPAREN,     Token,  "("],  #(exp)
-    [:TkLBRACK,     Token,  "["],  #[arry]
-    [:TkLBRACE,     Token,  "{"],  #{hash}
-    [:TkRPAREN,     Token,  ")"],
-    [:TkRBRACK,     Token,  "]"],
-    [:TkRBRACE,     Token,  "}"],
-    [:TkCOMMA,      Token,  ","],
-    [:TkSEMICOLON,  Token,  ";"],
-
-    [:TkCOMMENT],
-    [:TkRD_COMMENT],
-    [:TkSPACE],
-    [:TkNL],
-    [:TkEND_OF_SCRIPT],
-
-    [:TkBACKSLASH,  TkUnknownChar,  "\\"],
-    [:TkAT,	    TkUnknownChar,  "@"],
-    [:TkDOLLAR,     TkUnknownChar,  "$"],
-  ]
-
-  # {reading => token_class}
-  # {reading => [token_class, *opt]}
-  TkReading2Token = {}
-  TkSymbol2Token = {}
-
-  def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
-    token_n = token_n.id2name if token_n.kind_of?(Symbol)
-    if RubyToken.const_defined?(token_n)
-      IRB.fail AlreadyDefinedToken, token_n
-    end
-    token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
-    
-    if reading
-      if TkReading2Token[reading]
-	IRB.fail TkReading2TokenDuplicateError, token_n, reading
-      end
-      if opts.empty?
-	TkReading2Token[reading] = [token_c]
-      else
-	TkReading2Token[reading] = [token_c].concat(opts)
-      end
-    end
-    TkSymbol2Token[token_n.intern] = token_c
-  end
-
-  for defs in TokenDefinitions
-    def_token(*defs)
-  end
-end
diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb
deleted file mode 100644
index ceee90b3d9..0000000000
--- a/lib/irb/slex.rb
+++ /dev/null
@@ -1,278 +0,0 @@
-#
-#   irb/slex.rb - symple lex analizer
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishituska.com)
-#
-# --
-#
-#   
-#
-
-require "e2mmap"
-
-class SLex
-  @RCS_ID='-$Id$-'
-
-  extend Exception2MessageMapper
-  def_exception :ErrNodeNothing, "node nothing"
-  def_exception :ErrNodeAlreadyExists, "node already exists"
-
-  class << self
-    attr_accessor :debug_level
-    def debug?
-      debug_level > 0
-    end
-  end
-  @debug_level = 0
-
-  def initialize
-    @head = Node.new("")
-  end
-  
-  def def_rule(token, preproc = nil, postproc = nil, &block)
-    #      print node.inspect, "\n" if SLex.debug?
-    postproc = block if block_given?
-    node = create(token, preproc, postproc)
-  end
-  
-  def def_rules(*tokens, &block)
-    if block_given?
-      p = block
-    end
-    for token in tokens
-      def_rule(token, nil, p)
-    end
-  end
-  
-  def preproc(token, proc)
-    node = search(token)
-    node.preproc=proc
-  end
-  
-  def postproc(token)
-    node = search(token, proc)
-    node.postproc=proc
-  end
-  
-  def search(token)
-    @head.search(token.split(//))
-  end
-
-  def create(token, preproc = nil, postproc = nil)
-    @head.create_subnode(token.split(//), preproc, postproc)
-  end
-  
-  def match(token)
-    case token
-    when Array
-    when String
-      return match(token.split(//))
-    else
-      return @head.match_io(token)
-    end
-    ret = @head.match(token)
-    printf "match end: %s:%s", ret, token.inspect if SLex.debug?
-    ret
-  end
-  
-  def inspect
-    format("<SLex: @head = %s>", @head.inspect)
-  end
-
-  #----------------------------------------------------------------------
-  #
-  #   class Node - 
-  #
-  #----------------------------------------------------------------------
-  class Node
-    # if postproc is nil, this node is an abstract node.
-    # if postproc is non-nil, this node is a real node.
-    def initialize(preproc = nil, postproc = nil)
-      @Tree = {}
-      @preproc = preproc
-      @postproc = postproc
-    end
-
-    attr_accessor :preproc
-    attr_accessor :postproc
-    
-    def search(chrs, opt = nil)
-      return self if chrs.empty?
-      ch = chrs.shift
-      if node = @Tree[ch]
-	node.search(chrs, opt)
-      else
-	if opt
-	  chrs.unshift ch
-	  self.create_subnode(chrs)
-	else
-	  SLex.fail ErrNodeNothing
-	end
-      end
-    end
-    
-    def create_subnode(chrs, preproc = nil, postproc = nil)
-      if chrs.empty?
-	if @postproc
-	  p node
-	  SLex.fail ErrNodeAlreadyExists
-	else
-	  print "Warn: change abstruct node to real node\n" if SLex.debug?
-	  @preproc = preproc
-	  @postproc = postproc
-	end
-	return self
-      end
-      
-      ch = chrs.shift
-      if node = @Tree[ch]
-	if chrs.empty?
-	  if node.postproc
-	    p node
-	    p self
-	    p ch
-	    p chrs
-	    SLex.fail ErrNodeAlreadyExists
-	  else
-	    print "Warn: change abstruct node to real node\n" if SLex.debug?
-	    node.preproc = preproc
-	    node.postproc = postproc
-	  end
-	else
-	  node.create_subnode(chrs, preproc, postproc)
-	end
-      else
-	if chrs.empty?
-	  node = Node.new(preproc, postproc)
-	else
-	  node = Node.new
-	  node.create_subnode(chrs, preproc, postproc)
-	end
-	@Tree[ch] = node
-      end
-      node
-    end
-
-    #
-    # chrs: String
-    #       character array
-    #       io must have getc()/ungetc(); and ungetc() must be
-    #       able to be called arbitrary number of times. 
-    #
-    def match(chrs, op = "")
-      print "match>: ", chrs, "op:", op, "\n" if SLex.debug?
-      if chrs.empty?
-	if @preproc.nil? || @preproc.call(op, chrs)
-	  printf "op1: %s\n", op if SLex.debug?
-	  @postproc.call(op, chrs)
-	else
-	  nil
-	end
-      else
-	ch = chrs.shift
-	if node = @Tree[ch]
-	  if ret = node.match(chrs, op+ch)
-	    return ret
-	  else
-	    chrs.unshift ch
-	    if @postproc and @preproc.nil? || @preproc.call(op, chrs)
-	      printf "op2: %s\n", op.inspect if SLex.debug?
-	      ret = @postproc.call(op, chrs)
-	      return ret
-	    else
-	      return nil
-	    end
-	  end
-	else
-	  chrs.unshift ch
-	  if @postproc and @preproc.nil? || @preproc.call(op, chrs)
-	    printf "op3: %s\n", op if SLex.debug?
-	    @postproc.call(op, chrs)
-	    return ""
-	  else
-	    return nil
-	  end
-	end
-      end
-    end
-
-    def match_io(io, op = "")
-      if op == ""
-	ch = io.getc
-	if ch == nil
-	  return nil
-	end
-      else
-	ch = io.getc_of_rests
-      end
-      if ch.nil?
-	if @preproc.nil? || @preproc.call(op, io)
-	  printf "op1: %s\n", op if SLex.debug?
-	  @postproc.call(op, io)
-	else
-	  nil
-	end
-      else
-	if node = @Tree[ch]
-	  if ret = node.match_io(io, op+ch)
-	    ret
-	  else
-	    io.ungetc ch
-	    if @postproc and @preproc.nil? || @preproc.call(op, io)
-	      printf "op2: %s\n", op.inspect if SLex.debug?
-	      @postproc.call(op, io)
-	    else
-	      nil
-	    end
-	  end
-	else
-	  io.ungetc ch
-	  if @postproc and @preproc.nil? || @preproc.call(op, io)
-	    printf "op3: %s\n", op if SLex.debug?
-	    @postproc.call(op, io)
-	  else
-	    nil
-	  end
-	end
-      end
-    end
-  end
-end
-
-if $0 == __FILE__
-  #    Tracer.on
-  case $1
-  when "1"
-    tr = SLex.new
-    print "0: ", tr.inspect, "\n"
-    tr.def_rule("=") {print "=\n"}
-    print "1: ", tr.inspect, "\n"
-    tr.def_rule("==") {print "==\n"}
-    print "2: ", tr.inspect, "\n"
-    
-    print "case 1:\n"
-    print tr.match("="), "\n"
-    print "case 2:\n"
-    print tr.match("=="), "\n"
-    print "case 3:\n"
-    print tr.match("=>"), "\n"
-    
-  when "2"
-    tr = SLex.new
-    print "0: ", tr.inspect, "\n"
-    tr.def_rule("=") {print "=\n"}
-    print "1: ", tr.inspect, "\n"
-    tr.def_rule("==", proc{false}) {print "==\n"}
-    print "2: ", tr.inspect, "\n"
-    
-    print "case 1:\n"
-    print tr.match("="), "\n"
-    print "case 2:\n"
-    print tr.match("=="), "\n"
-    print "case 3:\n"
-    print tr.match("=>"), "\n"
-  end
-  exit
-end
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
deleted file mode 100644
index a9e37f7e7b..0000000000
--- a/lib/irb/version.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#   irb/version.rb - irb version definition file
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-
-module IRB
-  @RELEASE_VERSION = "0.9"
-  @LAST_UPDATE_DATE = "02/07/03"
-end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
deleted file mode 100644
index 531995fc44..0000000000
--- a/lib/irb/workspace.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-#   irb/workspace-binding.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-module IRB
-  class WorkSpace
-    # create new workspace. set self to main if specified, otherwise
-    # inherit main from TOPLEVEL_BINDING.
-    def initialize(*main)
-      if main[0].kind_of?(Binding)
-	@binding = main.shift
-      elsif IRB.conf[:SINGLE_IRB]
-	@binding = TOPLEVEL_BINDING
-      else
-	case IRB.conf[:CONTEXT_MODE]
-	when 0	# binding in proc on TOPLEVEL_BINDING
-	  @binding = eval("proc{binding}.call",
-		      TOPLEVEL_BINDING, 
-		      __FILE__,
-		      __LINE__)
-	when 1	# binding in loaded file
-	  require "tempfile"
-	  f = Tempfile.open("irb-binding")
-	  f.print <<EOF
-	  $binding = binding
-EOF
-	  f.close
-	  load f.path
-	  @binding = $binding
-
-	when 2	# binding in loaded file(thread use)
-	  unless defined? BINDING_QUEUE
-	    require "thread"
-	    
-	    IRB.const_set("BINDING_QUEUE", SizedQueue.new(1))
-	    Thread.abort_on_exception = true
-	    Thread.start do
-	      eval "require \"irb/ws-for-case-2\"", TOPLEVEL_BINDING, __FILE__, __LINE__
-	    end
-	    Thread.pass
-	  end
-	  @binding = BINDING_QUEUE.pop
-
-	when 3	# binging in function on TOPLEVEL_BINDING(default)
-	  @binding = eval("def irb_binding; binding; end; irb_binding",
-		      TOPLEVEL_BINDING, 
-		      __FILE__,
-		      __LINE__ - 3)
-	end
-      end
-      if main.empty?
-	@main = eval("self", @binding)
-      else
-	@main = main[0]
-	IRB.conf[:__MAIN__] = @main
-	case @main
-	when Module
-	  @binding = eval("IRB.conf[:__MAIN__].module_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
-	else
-	  begin 
-	    @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
-	  rescue TypeError
-	    IRB.fail CantChangeBinding, @main.inspect
-	  end
-	end
-      end
-      eval("_=nil", @binding)
-    end
-
-    attr_reader :binding
-    attr_reader :main
-
-    def evaluate(context, statements, file = __FILE__, line = __LINE__)
-      eval(statements, @binding, file, line)
-    end
-  
-    # error message manupilator
-    def filter_backtrace(bt)
-      case IRB.conf[:CONTEXT_MODE]
-      when 0
-	return nil if bt =~ /\(irb_local_binding\)/
-      when 1
-	if(bt =~ %r!/tmp/irb-binding! or
-	   bt =~ %r!irb/.*\.rb! or
-	   bt =~ /irb\.rb/)
-	  return nil
-	end
-      when 2
-	return nil if bt =~ /irb\/.*\.rb/
-      when 3
-	return nil if bt =~ /irb\/.*\.rb/
-	bt.sub!(/:\s*in `irb_binding'/){""} 
-      end
-      bt
-    end
-
-    def IRB.delete_caller
-    end
-  end
-end
diff --git a/lib/irb/ws-for-case-2.rb b/lib/irb/ws-for-case-2.rb
deleted file mode 100644
index 1c58fb7dda..0000000000
--- a/lib/irb/ws-for-case-2.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#   irb/ws-for-case-2.rb - 
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-# --
-#
-#   
-#
-
-while true
-  IRB::BINDING_QUEUE.push b = binding
-end
diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb
deleted file mode 100644
index 4bcc2ca22f..0000000000
--- a/lib/irb/xmp.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-#   xmp.rb - irb version of gotoken xmp
-#   	$Release Version: 0.9$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nippon Rational Inc.)
-#
-# --
-#
-#   
-#
-
-require "irb"
-require "irb/frame"
-
-class XMP
-  @RCS_ID='-$Id$-'
-
-  def initialize(bind = nil)
-    IRB.init_config(nil)
-    #IRB.parse_opts
-    #IRB.load_modules
-
-    IRB.conf[:PROMPT_MODE] = :XMP
-
-    bind = IRB::Frame.top(1) unless bind
-    ws = IRB::WorkSpace.new(bind)
-    @io = StringInputMethod.new
-    @irb = IRB::Irb.new(ws, @io)
-    @irb.context.ignore_sigint = false
-
-#    IRB.conf[:IRB_RC].call(@irb.context) if IRB.conf[:IRB_RC]
-    IRB.conf[:MAIN_CONTEXT] = @irb.context
-  end
-
-  def puts(exps)
-    @io.puts exps
-
-    if @irb.context.ignore_sigint
-      begin
-	trap_proc_b = trap("SIGINT"){@irb.signal_handle}
-	catch(:IRB_EXIT) do
-	  @irb.eval_input
-	end
-      ensure
-	trap("SIGINT", trap_proc_b)
-      end
-    else
-      catch(:IRB_EXIT) do
-	@irb.eval_input
-      end
-    end
-  end
-
-  class StringInputMethod < IRB::InputMethod
-    def initialize
-      super
-      @exps = []
-    end
-
-    def eof?
-      @exps.empty?
-    end
-
-    def gets
-      while l = @exps.shift
-	next if /^\s+$/ =~ l
-	l.concat "\n"
-	print @prompt, l
-	break
-      end
-      l
-    end
-
-    def puts(exps)
-      @exps.concat exps.split(/\n/)
-    end
-  end
-end
-
-def xmp(exps, bind = nil)
-  bind = IRB::Frame.top(1) unless bind
-  xmp = XMP.new(bind)
-  xmp.puts exps
-  xmp
-end
diff --git a/lib/jcode.rb b/lib/jcode.rb
index 8cd770be26..0bd63cf6f2 100644
--- a/lib/jcode.rb
+++ b/lib/jcode.rb
@@ -1,144 +1,112 @@
 # jcode.rb - ruby code to handle japanese (EUC/SJIS) string
 
-if $VERBOSE && $KCODE == "NONE"
-  warn "Warning: $KCODE is NONE."
-end
-
-$vsave, $VERBOSE = $VERBOSE, false
+$vsave, $VERBOSE = $VERBOSE, FALSE
 class String
-  warn "feel free for some warnings:\n" if $VERBOSE
+  printf STDERR, "feel free for some warnings:\n" if $VERBOSE
 
-  def _regex_quote(str)
-    str.gsub(/(\\[\[\]\-\\])|\\(.)|([\[\]\\])/) do
-      $1 || $2 || '\\' + $3
-    end
+  def jlength
+    self.split(//).length
   end
-  private :_regex_quote
-
-  PATTERN_SJIS = '[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc]'
-  PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]'
-  PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]'
 
-  RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n')
-  RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n')
-  RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n')
-
-  SUCC = {}
-  SUCC['s'] = Hash.new(1)
-  for i in 0 .. 0x3f
-    SUCC['s'][i.chr] = 0x40 - i
-  end
-  SUCC['s']["\x7e"] = 0x80 - 0x7e
-  SUCC['s']["\xfd"] = 0x100 - 0xfd
-  SUCC['s']["\xfe"] = 0x100 - 0xfe
-  SUCC['s']["\xff"] = 0x100 - 0xff
-  SUCC['e'] = Hash.new(1)
-  for i in 0 .. 0xa0
-    SUCC['e'][i.chr] = 0xa1 - i
-  end
-  SUCC['e']["\xfe"] = 2
-  SUCC['u'] = Hash.new(1)
-  for i in 0 .. 0x7f
-    SUCC['u'][i.chr] = 0x80 - i
-  end
-  SUCC['u']["\xbf"] = 0x100 - 0xbf
+  alias original_succ succ
+  private :original_succ
 
   def mbchar?
     case $KCODE[0]
     when ?s, ?S
-      self =~ RE_SJIS
+      self =~ /[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc]/n
     when ?e, ?E
-      self =~ RE_EUC
-    when ?u, ?U
-      self =~ RE_UTF8
+      self =~ /[\xa1-\xfe][\xa1-\xfe]/n
     else
-      nil
+      false
     end
   end
 
-  def end_regexp
-    case $KCODE[0]
-    when ?s, ?S
-      /#{PATTERN_SJIS}$/on
-    when ?e, ?E
-      /#{PATTERN_EUC}$/on
-    when ?u, ?U
-      /#{PATTERN_UTF8}$/on
+  def succ
+    if self[-2] and self[-2, 2].mbchar?
+      s = self.dup
+      s[-1] += 1
+      s[-1] += 1 unless s[-2, 2].mbchar?
+      return s
     else
-      /.$/on
+      original_succ
     end
   end
 
-  alias original_succ! succ!
-  private :original_succ!
+  def upto(to)
+    return if self > to
 
-  alias original_succ succ
-  private :original_succ
-
-  def succ!
-    reg = end_regexp
-    if self =~ reg
-      succ_table = SUCC[$KCODE[0,1].downcase]
-      begin
-	self[-1] += succ_table[self[-1]]
-	self[-2] += 1 if self[-1] == 0
-      end while self !~ reg
-      self
+    curr = self
+    tail = self[-2..-1]
+    if tail.length == 2 and tail  =~ /^.$/ then
+      if self[0..-2] == to[0..-2]
+	first = self[-2].chr
+	for c in self[-1] .. to[-1]
+	  if (first+c.chr).mbchar?
+	    yield self[0..-2]+c.chr
+	  end
+	end
+      end
     else
-      original_succ!
+      loop do
+	yield curr
+	return if curr == to
+	curr = curr.succ
+	return if curr.length > to.length
+      end
     end
-  end
-
-  def succ
-    (str = self.dup).succ! or str
+    return nil
   end
 
   private
 
   def _expand_ch str
     a = []
-    str.scan(/(?:\\(.)|([^\\]))-(?:\\(.)|([^\\]))|(?:\\(.)|(.))/m) do
-      from = $1 || $2
-      to = $3 || $4
-      one = $5 || $6
-      if one
-	a.push one
-      elsif from.length != to.length
-	next
-      elsif from.length == 1
-	from[0].upto(to[0]) { |c| a.push c.chr }
+    str.scan(/(.|\n)-(.|\n)|(.|\n)/) do |r|
+      if $3
+	a.push $3
+      elsif $1.length != $2.length
+ 	next
+      elsif $1.length == 1
+ 	$1[0].upto($2[0]) { |c| a.push c.chr }
       else
-	from.upto(to) { |c| a.push c }
+ 	$1.upto($2) { |c| a.push c }
       end
     end
     a
   end
 
-  def expand_ch_hash from, to
-    h = {}
+  HashCache = {}
+
+  def expand_ch_hash from, to = ""
+    key = from.intern.to_s + ":" + to.intern.to_s
+    return HashCache[key] if HashCache.key? key
     afrom = _expand_ch(from)
-    ato = _expand_ch(to)
-    afrom.each_with_index do |x,i| h[x] = ato[i] || ato[-1] end
-    h
+    h = {}
+    if to.length != 0
+      ato = _expand_ch(to)
+      afrom.each_with_index do |x,i| h[x] = ato[i] || ato[-1] end
+    else
+      afrom.each do |x| h[x] = true end
+    end
+    HashCache[key] = h
   end
 
-  HashCache = {}
-  TrPatternCache = {}
-  DeletePatternCache = {}
-  SqueezePatternCache = {}
+  def bsquote(str)
+    str.gsub(/\\/, '\\\\\\\\')
+  end
 
   public
 
   def tr!(from, to)
-    return nil if from == ""
-    return self.delete!(from) if to == ""
+    return self.delete!(from) if to.length == 0
 
-    pattern = TrPatternCache[from] ||= /[#{_regex_quote(from)}]/
+    pattern = /[#{bsquote(from)}]/
     if from[0] == ?^
       last = /.$/.match(to)[0]
       self.gsub!(pattern, last)
     else
-      h = HashCache[from + "1-0" + to] ||= expand_ch_hash(from, to)
+      h = expand_ch_hash(from, to)
       self.gsub!(pattern) do |c| h[c] end
     end
   end
@@ -148,8 +116,8 @@ class String
   end
 
   def delete!(del)
-    return nil if del == ""
-    self.gsub!(DeletePatternCache[del] ||= /[#{_regex_quote(del)}]+/, '')
+    pattern = /[#{bsquote(del)}]+/
+    self.gsub!(pattern, '')
   end
 
   def delete(del)
@@ -157,10 +125,9 @@ class String
   end
 
   def squeeze!(del=nil)
-    return nil if del == ""
     pattern =
       if del
-	SqueezePatternCache[del] ||= /([#{_regex_quote(del)}])\1+/
+        /([#{bsquote(del)}])\1+/
       else
 	/(.|\n)\1+/
       end
@@ -174,12 +141,12 @@ class String
   def tr_s!(from, to)
     return self.delete!(from) if to.length == 0
 
-    pattern = SqueezePatternCache[from] ||= /([#{_regex_quote(from)}])\1+/
+    pattern = /([#{bsquote(from)}])\1+/
     if from[0] == ?^
       last = /.$/.match(to)[0]
       self.gsub!(pattern, last)
     else
-      h = HashCache[from + "1-0" + to] ||= expand_ch_hash(from, to)
+      h = expand_ch_hash(from, to)
       self.gsub!(pattern) do h[$1] end
     end
   end
@@ -189,31 +156,16 @@ class String
   end
 
   def chop!
-    self.gsub!(/(?:.|\r?\n)\z/, '')
+    self.gsub!(/(?:.|\n)\z/, '')
   end
 
   def chop
     (str = self.dup).chop! or str
   end
 
-  def jlength
-    self.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
-  end
-  alias jsize jlength
-
   def jcount(str)
     self.delete("^#{str}").jlength
   end
 
-  def each_char
-    if block_given?
-      scan(/./m) do |x|
-        yield x
-      end
-    else
-      scan(/./m)
-    end
-  end
-
 end
 $VERBOSE = $vsave
diff --git a/lib/logger.rb b/lib/logger.rb
deleted file mode 100644
index e8e163ca93..0000000000
--- a/lib/logger.rb
+++ /dev/null
@@ -1,595 +0,0 @@
-# Logger -- Logging utility.
-#
-# $Id$
-#
-# This module is copyrighted free software by NAKAMURA, Hiroshi.
-# You can redistribute it and/or modify it under the same term as Ruby.
-#
-# See Logger at first.
-
-
-# DESCRIPTION
-#   Logger -- Logging utility.
-#
-# How to create a logger.
-#   1. Create logger which logs messages to STDERR/STDOUT.
-#     logger = Logger.new(STDERR)
-#     logger = Logger.new(STDOUT)
-#
-#   2. Create logger for the file which has the specified name.
-#     logger = Logger.new('logfile.log')
-#
-#   3. Create logger for the specified file.
-#     file = open('foo.log', File::WRONLY | File::APPEND)
-#     # To create new (and to remove old) logfile, add File::CREAT like;
-#     #   file = open('foo.log', File::WRONLY | File::APPEND | File::CREAT)
-#     logger = Logger.new(file)
-#
-#   4. Create logger which ages logfile automatically.  Leave 10 ages and each
-#      file is about 102400 bytes.
-#     logger = Logger.new('foo.log', 10, 102400)
-#
-#   5. Create logger which ages logfile daily/weekly/monthly automatically.
-#     logger = Logger.new('foo.log', 'daily')
-#     logger = Logger.new('foo.log', 'weekly')
-#     logger = Logger.new('foo.log', 'monthly')
-#
-# How to log a message.
-#
-#   1. Message in block.
-#     logger.fatal { "Argument 'foo' not given." }
-#
-#   2. Message as a string.
-#     logger.error "Argument #{ @foo } mismatch."
-#
-#   3. With progname.
-#     logger.info('initialize') { "Initializing..." }
-#
-#   4. With severity.
-#     logger.add(Logger::FATAL) { 'Fatal error!' }
-#
-# How to close a logger.
-#
-#   logger.close
-#
-# Setting severity threshold.
-#
-#   1. Original interface.
-#     logger.level = Logger::WARN
-#
-#   2. Log4r (somewhat) compatible interface.
-#     logger.level = Logger::INFO
-#
-#   DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
-#
-# Format.
-#
-#   Log format:
-#     SeverityID, [Date Time mSec #pid] SeverityLabel -- ProgName: message
-#
-#   Log sample:
-#     I, [Wed Mar 03 02:34:24 JST 1999 895701 #19074]  INFO -- Main: info.
-#
-class Logger
-  /: (\S+),v (\S+)/ =~ %q$Id$
-  ProgName = "#{$1}/#{$2}"
-
-  class Error < RuntimeError; end
-  class ShiftingError < Error; end
-
-  # Logging severity.
-  module Severity
-    DEBUG = 0
-    INFO = 1
-    WARN = 2
-    ERROR = 3
-    FATAL = 4
-    UNKNOWN = 5
-  end
-  include Severity
-
-  # Logging severity threshold.
-  attr_accessor :level
-
-  # Logging program name.
-  attr_accessor :progname
-
-  # Logging date-time format (string passed to strftime)
-  attr_accessor :datetime_format
-
-  alias sev_threshold level
-  alias sev_threshold= level=
-
-  def debug?; @level <= DEBUG; end
-  def info?; @level <= INFO; end
-  def warn?; @level <= WARN; end
-  def error?; @level <= ERROR; end
-  def fatal?; @level <= FATAL; end
-
-  # SYNOPSIS
-  #   Logger.new(name, shift_age = 7, shift_size = 1048576)
-  #
-  # ARGS
-  #   log	String as filename of logging.
-  #		or
-  #		IO as logging device(i.e. STDERR).
-  #   shift_age	An Integer	Num of files you want to keep aged logs.
-  #		'daily'		Daily shifting.
-  #		'weekly'	Weekly shifting (Every monday.)
-  #		'monthly'	Monthly shifting (Every 1th day.)
-  #   shift_size	Shift size threshold when shift_age is an integer.
-  #		Otherwise (like 'daily'), shift_size will be ignored.
-  #
-  # DESCRIPTION
-  #   Create an instance.
-  #
-  def initialize(logdev, shift_age = 0, shift_size = 1048576)
-    @logdev = nil
-    @progname = nil
-    @level = DEBUG
-    @datetime_format = nil
-    @logdev = nil
-    if logdev
-      @logdev = LogDevice.new(logdev, :shift_age => shift_age, :shift_size => shift_size)
-    end
-  end
-
-  # SYNOPSIS
-  #   Logger#add(severity, msg = nil, progname = nil) { ... } = nil
-  #
-  # ARGS
-  #   severity	Severity.  Constants are defined in Logger namespace.
-  #		DEBUG, INFO, WARN, ERROR, FATAL, or UNKNOWN.
-  #   msg	Message.  A string, exception, or something. Can be omitted.
-  #   progname	Program name string.  Can be omitted.
-  #   		Logged as a msg if no msg and block are given.
-  #   block     Can be omitted.
-  #             Called to get a message string if msg is nil.
-  #
-  # RETURN
-  #   true if succeed, false if failed.
-  #   When the given severity is not enough severe,
-  #   Log no message, and returns true.
-  #
-  # DESCRIPTION
-  #   Log a log if the given severity is enough severe.
-  #
-  # BUGS
-  #   Logfile is not locked.
-  #   Append open does not need to lock file.
-  #   But on the OS which supports multi I/O, records possibly be mixed.
-  #
-  def add(severity, msg = nil, progname = nil, &block)
-    severity ||= UNKNOWN
-    if @logdev.nil? or severity < @level
-      return true
-    end
-    progname ||= @progname
-    if msg.nil?
-      if block_given?
-	msg = yield
-      else
-	msg = progname
-	progname = @progname
-      end
-    end
-    @logdev.write(
-      format_message(
-	format_severity(severity),
-	format_datetime(Time.now),
-	msg2str(msg),
-	progname
-      )
-    )
-    true
-  end
-  alias log add
-
-  # SYNOPSIS
-  #   Logger#<<(msg)
-  #
-  # ARGS
-  #   msg	Message.
-  #
-  # RETURN
-  #   Same as IO#<<.  If logdev is not given, returns nil.
-  #
-  # DESCRIPTION
-  #   Dump given message to log device without any formatting.
-  #
-  def <<(msg)
-    unless @logdev.nil?
-      @logdev.write(msg)
-    end
-  end
-
-  # SYNOPSIS
-  #   Logger#debug(progname = nil) { ... } = nil
-  #   Logger#info(progname = nil) { ... } = nil
-  #   Logger#warn(progname = nil) { ... } = nil
-  #   Logger#error(progname = nil) { ... } = nil
-  #   Logger#fatal(progname = nil) { ... } = nil
-  #   Logger#unknown(progname = nil) { ... } = nil
-  #
-  # ARGS
-  #   progname	Program name string.  Can be omitted.
-  #   		Logged as a msg if no block are given.
-  #   block     Can be omitted.
-  #             Called to get a message string if msg is nil.
-  #
-  # RETURN
-  #   See Logger#add .
-  #
-  # DESCRIPTION
-  #   Log a log.
-  #
-  def debug(progname = nil, &block)
-    add(DEBUG, nil, progname, &block)
-  end
-
-  def info(progname = nil, &block)
-    add(INFO, nil, progname, &block)
-  end
-
-  def warn(progname = nil, &block)
-    add(WARN, nil, progname, &block)
-  end
-
-  def error(progname = nil, &block)
-    add(ERROR, nil, progname, &block)
-  end
-
-  def fatal(progname = nil, &block)
-    add(FATAL, nil, progname, &block)
-  end
-
-  def unknown(progname = nil, &block)
-    add(UNKNOWN, nil, progname, &block)
-  end
-
-  # SYNOPSIS
-  #   Logger#close
-  #
-  # DESCRIPTION
-  #   Close the logging device.
-  #
-  def close
-    @logdev.close if @logdev
-  end
-
-private
-
-  # Severity label for logging. (max 5 char)
-  SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY);
-
-  def format_severity(severity)
-    SEV_LABEL[severity] || 'ANY'
-  end
-
-  def format_datetime(datetime)
-    if @datetime_format.nil?
-      datetime.strftime("%Y-%m-%dT%H:%M:%S.") << "%6d " % datetime.usec
-    else
-      datetime.strftime(@datetime_format)
-    end
-  end
-
-  Format = "%s, [%s#%d] %5s -- %s: %s\n"
-  def format_message(severity, timestamp, msg, progname)
-    Format % [severity[0..0], timestamp, $$, severity, progname, msg]
-  end
-
-  def msg2str(msg)
-    if msg.is_a?(::String)
-      msg
-    elsif msg.is_a?(::Exception)
-      "#{ msg.message } (#{ msg.class })\n" << (msg.backtrace || []).join("\n")
-    elsif msg.respond_to?(:to_str)
-      msg.to_str
-    else
-      msg.inspect
-    end
-  end
-
-
-  # LogDevice -- Logging device.
-  class LogDevice
-    attr_reader :dev
-    attr_reader :filename
-
-    # SYNOPSIS
-    #   Logger::LogDev.new(name, opt = {})
-    #
-    # ARGS
-    #   log	String as filename of logging.
-    #		  or
-    #		IO as logging device(i.e. STDERR).
-    #	opt	Hash of options.
-    #
-    # DESCRIPTION
-    #   Log device class.  Output and shifting of log.
-    #	When a String was given, LogDevice opens the file and set sync = true.
-    #
-    # OPTIONS
-    #   :shift_age
-    #     An Integer	Num of files you want to keep aged logs.
-    #	  'daily'	Daily shifting.
-    #	  'weekly'	Weekly shifting (Shift every monday.)
-    #	  'monthly'	Monthly shifting (Shift every 1th day.)
-    #
-    #   :shift_size	Shift size threshold when :shift_age is an integer.
-    #			Otherwise (like 'daily'), it is ignored.
-    #
-    def initialize(log = nil, opt = {})
-      @dev = @filename = @shift_age = @shift_size = nil
-      if log.respond_to?(:write) and log.respond_to?(:close)
-	@dev = log
-      elsif log.is_a?(String)
-	@dev = open_logfile(log)
-	@dev.sync = true
-	@filename = log
-	@shift_age = opt[:shift_age] || 7
-	@shift_size = opt[:shift_size] || 1048576
-      else
-	raise ArgumentError.new("Wrong argument: #{ log } for log.")
-      end
-    end
-
-    # SYNOPSIS
-    #   Logger::LogDev#write(message)
-    #
-    # ARGS
-    #   message		Message to be logged.
-    #
-    # DESCRIPTION
-    #   Log a message.  If needed, the log device is aged and the new device
-    #  	is prepared.  Log device is not locked.  Append open does not need to
-    #  	lock file but on the OS which supports multi I/O, records possibly be
-    #  	mixed.
-    #
-    def write(message)
-      if shift_log?
-       	begin
-  	  shift_log
-   	rescue
-  	  raise Logger::ShiftingError.new("Shifting failed. #{$!}")
-   	end
-      end
-
-      @dev.write(message) 
-    end
-
-    # SYNOPSIS
-    #   Logger::LogDev#close
-    #
-    # DESCRIPTION
-    #   Close the logging device.
-    #
-    def close
-      @dev.close
-    end
-
-  private
-
-    def open_logfile(filename)
-      if (FileTest.exist?(filename))
-     	open(filename, (File::WRONLY | File::APPEND))
-      else
-       	create_logfile(filename)
-      end
-    end
-
-    def create_logfile(filename)
-      logdev = open(filename, (File::WRONLY | File::APPEND | File::CREAT))
-      add_log_header(logdev)
-      logdev
-    end
-
-    def add_log_header(file)
-      file.write(
-     	"# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName]
-    )
-    end
-
-    SiD = 24 * 60 * 60
-
-    def shift_log?
-      if !@shift_age or !@dev.respond_to?(:stat)
-     	return false
-      end
-      if (@shift_age.is_a?(Integer))
-	# Note: always returns false if '0'.
-	return (@filename && (@shift_age > 0) && (@dev.stat.size > @shift_size))
-      else
-	now = Time.now
-	limit_time = case @shift_age
-	  when /^daily$/
-	    eod(now - 1 * SiD)
-	  when /^weekly$/
-	    eod(now - ((now.wday + 1) * SiD))
-	  when /^monthly$/
-	    eod(now - now.mday * SiD)
-	  else
-	    now
-	  end
-	return (@dev.stat.mtime <= limit_time)
-      end
-    end
-
-    def shift_log
-      # At first, close the device if opened.
-      if @dev
-      	@dev.close
-       	@dev = nil
-      end
-      if (@shift_age.is_a?(Integer))
-	(@shift_age-3).downto(0) do |i|
-	  if (FileTest.exist?("#{@filename}.#{i}"))
-	    File.rename("#{@filename}.#{i}", "#{@filename}.#{i+1}")
-	  end
-	end
-	File.rename("#{@filename}", "#{@filename}.0")
-      else
-	now = Time.now
-	postfix_time = case @shift_age
-	  when /^daily$/
-	    eod(now - 1 * SiD)
-	  when /^weekly$/
-	    eod(now - ((now.wday + 1) * SiD))
-	  when /^monthly$/
-	    eod(now - now.mday * SiD)
-	  else
-	    now
-	  end
-	postfix = postfix_time.strftime("%Y%m%d")	# YYYYMMDD
-	age_file = "#{@filename}.#{postfix}"
-	if (FileTest.exist?(age_file))
-	  raise RuntimeError.new("'#{ age_file }' already exists.")
-	end
-	File.rename("#{@filename}", age_file)
-      end
-
-      @dev = create_logfile(@filename)
-      return true
-    end
-
-    def eod(t)
-      Time.mktime(t.year, t.month, t.mday, 23, 59, 59)
-    end
-  end
-
-
-  # DESCRIPTION
-  #   Application -- Add logging support to your application.
-  #
-  # USAGE
-  #   1. Define your application class as a sub-class of this class.
-  #   2. Override 'run' method in your class to do many things.
-  #   3. Instanciate it and invoke 'start'.
-  #
-  # EXAMPLE
-  #   class FooApp < Application
-  #     def initialize(foo_app, application_specific, arguments)
-  #       super('FooApp') # Name of the application.
-  #     end
-  #
-  #     def run
-  #       ...
-  #       log(WARN, 'warning', 'my_method1')
-  #       ...
-  #       @log.error('my_method2') { 'Error!' }
-  #       ...
-  #     end
-  #   end
-  #
-  #   status = FooApp.new(....).start
-  #
-  class Application
-    include Logger::Severity
-
-    attr_reader :appname
-    attr_reader :logdev
-
-    # SYNOPSIS
-    #   Application.new(appname = '')
-    #
-    # ARGS
-    #   appname	Name String of the application.
-    #
-    # DESCRIPTION
-    #   Create an instance.  Log device is STDERR by default.
-    #
-    def initialize(appname = nil)
-      @appname = appname
-      @log = Logger.new(STDERR)
-      @log.progname = @appname
-      @level = @log.level
-    end
-
-    # SYNOPSIS
-    #   Application#start
-    #
-    # DESCRIPTION
-    #   Start the application.
-    #
-    # RETURN
-    #   Status code.
-    #
-    def start
-      status = -1
-      begin
-	log(INFO, "Start of #{ @appname }.")
-	status = run
-      rescue
-	log(FATAL, "Detected an exception. Stopping ... #{$!} (#{$!.class})\n" << $@.join("\n"))
-      ensure
-	log(INFO, "End of #{ @appname }. (status: #{ status.to_s })")
-      end
-      status
-    end
-
-    # SYNOPSIS
-    #   Application#set_log(log, shift_age, shift_size)
-    #
-    # ARGS
-    #   (Args are explained in the class Logger)
-    #
-    # DESCRIPTION
-    #   Set the log device for this application.
-    #
-    def set_log(logdev, shift_age = 0, shift_size = 102400)
-      @log = Logger.new(logdev, shift_age, shift_size)
-      @log.progname = @appname
-      @log.level = @level
-    end
-
-    def log=(logdev)
-      set_log(logdev)
-    end
-
-
-    # SYNOPSIS
-    #   Application#level=(severity)
-    #
-    # ARGS
-    #   level	Severity threshold.
-    #
-    # DESCRIPTION
-    #   Set severity threshold.
-    #
-    def level=(level)
-      @level = level
-      @log.level = @level
-    end
-
-  protected
-
-    # SYNOPSIS
-    #   Application#log(severity, comment = nil) { ... }
-    #
-    # ARGS
-    #   severity	Severity. See above to give this.
-    #   comment		Message String.
-    #   block     	Can be omitted.  Called to get a message String if
-    #			comment is nil or omitted.
-    #
-    # DESCRIPTION
-    #   Log a log if the given severity is enough severe.
-    #   For more detail, see Log.add.
-    #
-    # RETURN
-    #   true if succeed, false if failed.
-    #   When the given severity is not enough severe,
-    #   Log no message, and returns true.
-    #
-    def log(severity, message = nil, &block)
-      @log.add(severity, message, @appname, &block) if @log
-    end
-
-  private
-
-    def run
-      raise RuntimeError.new('Method run must be defined in the derived class.')
-    end
-  end
-end
diff --git a/lib/mailread.rb b/lib/mailread.rb
index 7573d03ed4..2edcca002a 100644
--- a/lib/mailread.rb
+++ b/lib/mailread.rb
@@ -9,25 +9,25 @@ class Mail
     @header = {}
     @body = []
     begin
-      while line = f.gets()
-	line.chop!
-	next if /^From /=~line	# skip From-line
-	break if /^$/=~line	# end of header
+      while f.gets()
+	$_.chop!
+	next if /^From /	# skip From-line
+	break if /^$/		# end of header
 
-	if /^(\S+?):\s*(.*)/=~line
+	if /^(\S+):\s*(.*)/
 	  (attr = $1).capitalize!
 	  @header[attr] = $2
 	elsif attr
-	  line.sub!(/^\s*/, '')
-	  @header[attr] += "\n" + line
+	  sub!(/^\s*/, '')
+	  @header[attr] += "\n" + $_
 	end
       end
   
-      return unless line
+      return unless $_
 
-      while line = f.gets()
-	break if /^From /=~line
-	@body.push(line)
+      while f.gets()
+	break if /^From /
+	@body.push($_)
       end
     ensure
       f.close if opened
diff --git a/lib/mathn.rb b/lib/mathn.rb
index 26dd0b4a27..8d92272159 100644
--- a/lib/mathn.rb
+++ b/lib/mathn.rb
@@ -10,8 +10,8 @@
 #   
 #
 
-require "complex.rb"
 require "rational.rb"
+require "complex.rb"
 require "matrix.rb"
 
 class Integer
@@ -106,20 +106,23 @@ class Prime
 end
 
 class Fixnum
-  alias / quo
+  alias divmod! divmod
+  alias / rdiv
+  def divmod(other)
+    a = self.div(other)
+    b = self % other
+    return a,b
+  end
 end
 
 class Bignum
-  alias / quo
+  alias divmod! divmod
+  alias / rdiv
 end
 
 class Rational
   Unify = true
-
-  def inspect
-    format "%s/%s", numerator.inspect, denominator.inspect
-  end
-
+  
   alias power! **
 
   def ** (other)
@@ -134,8 +137,8 @@ class Rational
 	return Rational(1,1)
       end
       
-      npd = numerator.prime_division
-      dpd = denominator.prime_division
+      npd = @numerator.prime_division
+      dpd = @denominator.prime_division
       if other < 0
 	other = -other
 	npd, dpd = dpd, npd
@@ -164,11 +167,11 @@ class Rational
       
     elsif other.kind_of?(Integer)
       if other > 0
-	num = numerator ** other
-	den = denominator ** other
+	num = @numerator ** other
+	den = @denominator ** other
       elsif other < 0
-	num = denominator ** -other
-	den = numerator ** -other
+	num = @denominator ** -other
+	den = @numerator ** -other
       elsif other == 0
 	num = 1
 	den = 1
@@ -208,11 +211,11 @@ class Rational
       
     elsif other.kind_of?(Integer)
       if other > 0
-	num = numerator ** other
-	den = denominator ** other
+	num = @numerator ** other
+	den = @denominator ** other
       elsif other < 0
-	num = denominator ** -other
-	den = numerator ** -other
+	num = @denominator ** -other
+	den = @numerator ** -other
       elsif other == 0
 	num = 1
 	den = 1
diff --git a/lib/matrix.rb b/lib/matrix.rb
index 8e56fcbd97..f5c8491146 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -2,8 +2,8 @@
 #
 #   matrix.rb - 
 #   	$Release Version: 1.0$
-#   	$Revision: 1.11 $
-#   	$Date: 1999/10/06 11:01:53 $
+#   	$Revision: 1.8 $
+#   	$Date: 1999/02/17 12:34:19 $
 #       Original Version from Smalltalk-80 version
 #	   on July 23, 1985 at 8:37:17 am
 #   	by Keiju ISHITSUKA
@@ -18,6 +18,8 @@
 #	    :
 #          rown]
 #
+#   column: ��
+#   row:    ��
 #
 # module ExceptionForMatrix::
 #   Exceptions:
@@ -126,7 +128,13 @@
 #	column_vectors
 #	    array of column vectors
 #	to_a
-#	    converts to Array of Arrays
+#	    converts each element to Array
+#	to_f
+#	    converts each element to Float
+#	to_i
+#	    converts each element to Integer
+#	to_r
+#	    converts each element to Rational
 #   PRINTING:
 #	to_s
 #	    returns string representation
@@ -157,6 +165,9 @@
 #   CONVERTING:
 #	covector
 #	to_a
+#	to_f
+#	to_i
+#	to_r
 #	coerce(other)
 #   PRINTING:
 #	to_s
@@ -174,21 +185,8 @@ module ExceptionForMatrix
   def_exception("ErrOperationNotDefined", "This operation(%s) can\\'t defined")
 end
 
-#
-# Represents a mathematical matrix, and provides methods for creating
-# special-case matrices (zero, identity, diagonal, singular, vector), operating
-# on them arithmetically and algebraically, and determining their mathematical
-# properties (trace, rank, inverse, determinant).
-#
-# The capabilities of the class indicated in the above paragraph are probably
-# not exhaustive.  Browse the methods and their documentation for more
-# information.
-#
-# Note that although matrices should theoretically be rectangular, this is not
-# enforced by the class.
-#
 class Matrix
-  @RCS_ID='-$Id: matrix.rb,v 1.11 1999/10/06 11:01:53 keiju Exp keiju $-'
+  @RCS_ID='-$Id: matrix.rb,v 1.8 1999/02/17 12:34:19 keiju Exp keiju $-'
   
 #  extend Exception2MessageMapper
   include ExceptionForMatrix
@@ -196,34 +194,14 @@ class Matrix
   # instance creations
   private_class_method :new
   
-  #
-  # Creates a matrix where each argument is a row.
-  #   Matrix[ [25, 93], [-1, 66] ]
-  #      =>  25 93
-  #          -1 66
-  #
   def Matrix.[](*rows)
     new(:init_rows, rows, false)
   end
   
-  #
-  # Creates a matrix where +rows+ is an array of arrays, each of which is a row
-  # to the matrix.  If the optional argument +copy+ is false, use the given
-  # arrays as the internal structure of the matrix without copying.
-  #   Matrix.rows([[25, 93], [-1, 66]])
-  #      =>  25 93
-  #          -1 66
   def Matrix.rows(rows, copy = true)
     new(:init_rows, rows, copy)
   end
   
-  #
-  # Creates a matrix using +columns+ as an array of column vectors.
-  #   Matrix.columns([[25, 93], [-1, 66]])
-  #      =>  25 -1
-  #          93 66
-  #
-  #
   def Matrix.columns(columns)
     rows = (0 .. columns[0].size - 1).collect {
       |i|
@@ -235,13 +213,6 @@ class Matrix
     Matrix.rows(rows, false)
   end
   
-  #
-  # Creates a matrix where the diagonal elements are composed of +values+.
-  #   Matrix.diagonal(9, 5, -3)
-  #     =>  9  0  0
-  #         0  5  0
-  #         0  0 -3
-  #
   def Matrix.diagonal(*values)
     size = values.size
     rows = (0 .. size  - 1).collect {
@@ -253,23 +224,10 @@ class Matrix
     rows(rows, false)
   end
   
-  #
-  # Creates an +n+ by +n+ diagonal matrix where each diagonal element is
-  # +value+.
-  #   Matrix.scalar(2, 5)
-  #     => 5 0
-  #        0 5
-  #
   def Matrix.scalar(n, value)
     Matrix.diagonal(*Array.new(n).fill(value, 0, n))
   end
 
-  #
-  # Creates an +n+ by +n+ identity matrix.
-  #   Matrix.identity(2)
-  #     => 1 0
-  #        0 1
-  #
   def Matrix.identity(n)
     Matrix.scalar(n, 1)
   end
@@ -278,22 +236,10 @@ class Matrix
     alias I identity
   end
   
-  #
-  # Creates an +n+ by +n+ zero matrix.
-  #   Matrix.zero(2)
-  #     => 0 0
-  #        0 0
-  #
   def Matrix.zero(n)
     Matrix.scalar(n, 0)
   end
   
-  #
-  # Creates a single-row matrix where the values of that row are as given in
-  # +row+.
-  #   Matrix.row_vector([4,5,6])
-  #     => 4 5 6
-  #
   def Matrix.row_vector(row)
     case row
     when Vector
@@ -301,18 +247,10 @@ class Matrix
     when Array
       Matrix.rows([row.dup], false)
     else
-      Matrix.rows([[row]], false)
+      Matrix.row([[row]], false)
     end
   end
   
-  #
-  # Creates a single-column matrix where the values of that column are as given
-  # in +column+.
-  #   Matrix.column_vector([4,5,6])
-  #     => 4
-  #        5
-  #        6
-  #
   def Matrix.column_vector(column)
     case column
     when Vector
@@ -324,10 +262,7 @@ class Matrix
     end
   end
 
-  #
-  # This method is used by the other methods that create matrices, and is of no
-  # use to general users.
-  #
+  # initializing
   def initialize(init_method, *argv)
     self.send(init_method, *argv)
   end
@@ -342,51 +277,32 @@ class Matrix
   end
   private :init_rows
   
-  #
-  # Returns element (+i+,+j+) of the matrix.  That is: row +i+, column +j+.
-  #
+  #accessing
   def [](i, j)
     @rows[i][j]
   end
 
-  #
-  # Returns the number of rows.
-  #
   def row_size
     @rows.size
   end
   
-  #
-  # Returns the number of columns.  Note that it is possible to construct a
-  # matrix with uneven columns (e.g. Matrix[ [1,2,3], [4,5] ]), but this is
-  # mathematically unsound.  This method uses the first row to determine the
-  # result.
-  #
   def column_size
     @rows[0].size
   end
 
-  #
-  # Returns row vector number +i+ of the matrix as a Vector (starting at 0 like
-  # an array).  When a block is given, the elements of that vector are iterated.
-  #
-  def row(i) # :yield: e
-    if block_given?
+  def row(i)
+    if iterator?
       for e in @rows[i]
 	yield e
+
       end
     else
       Vector.elements(@rows[i])
     end
   end
 
-  #
-  # Returns column vector number +j+ of the matrix as a Vector (starting at 0
-  # like an array).  When a block is given, the elements of that vector are
-  # iterated.
-  #
-  def column(j) # :yield: e
-    if block_given?
+  def column(j)
+    if iterator?
       0.upto(row_size - 1) do
 	|i|
 	yield @rows[i][j]
@@ -400,37 +316,23 @@ class Matrix
     end
   end
   
-  #
-  # Returns a matrix that is the result of iteration of the given block over all
-  # elements of the matrix.
-  #   Matrix[ [1,2], [3,4] ].collect { |i| i**2 }
-  #     => 1  4
-  #        9 16
-  #
-  def collect # :yield: e
+  def collect
     rows = @rows.collect{|row| row.collect{|e| yield e}}
     Matrix.rows(rows, false)
   end
   alias map collect
   
   #
-  # Returns a section of the matrix.  The parameters are either:
-  # *  start_row, nrows, start_col, ncols; OR
-  # *  col_range, row_range
-  #
-  #   Matrix.diagonal(9, 5, -3).minor(0..1, 0..2)
-  #     => 9 0 0
-  #        0 5 0
+  # param:  (from_row, row_size, from_col, size_col)
+  #	    (from_row..to_row, from_col..to_col)
   #
   def minor(*param)
     case param.size
     when 2
       from_row = param[0].first
-      size_row = param[0].end - from_row
-      size_row += 1 unless param[0].exclude_end?
+      size_row = param[0].size
       from_col = param[1].first
-      size_col = param[1].end - from_col
-      size_col += 1 unless param[1].exclude_end?
+      size_col = param[1].size
     when 4
       from_row = param[0]
       size_row = param[1]
@@ -446,40 +348,21 @@ class Matrix
     }
     Matrix.rows(rows, false)
   end
- 
-  #--
-  # TESTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
-
-  #
-  # Returns +true+ if this is a regular matrix.
-  #
+  
+  # TESTING
   def regular?
     square? and rank == column_size
   end
   
-  #
-  # Returns +true+ is this is a singular (i.e. non-regular) matrix.
-  #
   def singular?
     not regular?
   end
 
-  #
-  # Returns +true+ is this is a square matrix.  See note in column_size about this
-  # being unreliable, though.
-  #
   def square?
     column_size == row_size
   end
   
-  #--
-  # OBJECT METHODS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
-
-  #
-  # Returns +true+ if and only if the two matrices contain equal elements.
-  #
+  # COMPARING
   def ==(other)
     return false unless Matrix === other
     
@@ -487,9 +370,6 @@ class Matrix
   end
   alias eql? ==
   
-  #
-  # Not really intended for general consumption.
-  #
   def compare_by_row_vectors(rows)
     return false unless @rows.size == rows.size
     
@@ -500,17 +380,10 @@ class Matrix
     true
   end
   
-  #
-  # Returns a clone of the matrix, so that the contents of each do not reference
-  # identical objects.
-  #
   def clone
     Matrix.rows(@rows)
   end
   
-  #
-  # Returns a hash-code for the matrix.
-  #
   def hash
     value = 0
     for row in @rows
@@ -521,17 +394,9 @@ class Matrix
     return value
   end
   
-  #--
-  # ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
+  # ARITHMETIC
   
-  #
-  # Matrix multiplication.
-  #   Matrix[[2,4], [6,8]] * Matrix.identity(2)
-  #     => 2 4
-  #        6 8
-  #
-  def *(m) # m is matrix or vector or number
+  def *(m) #is matrix or vector or number"
     case(m)
     when Numeric
       rows = @rows.collect {
@@ -568,12 +433,6 @@ class Matrix
     end
   end
   
-  #
-  # Matrix addition.
-  #   Matrix.scalar(2,5) + Matrix[[1,0], [-4,7]]
-  #     =>  6  0
-  #        -4 12
-  #
   def +(m)
     case m
     when Numeric
@@ -598,12 +457,6 @@ class Matrix
     Matrix.rows(rows, false)
   end
 
-  #
-  # Matrix subtraction.
-  #   Matrix[[1,5], [4,2]] - Matrix[[9,3], [-4,1]]
-  #     => -8  2
-  #         8  1
-  #
   def -(m)
     case m
     when Numeric
@@ -628,12 +481,6 @@ class Matrix
     Matrix.rows(rows, false)
   end
   
-  #
-  # Matrix division (multiplication by the inverse).
-  #   Matrix[[7,6], [3,9]] / Matrix[[2,9], [3,1]]
-  #     => -7  1
-  #        -3 -6
-  #
   def /(other)
     case other
     when Numeric
@@ -653,21 +500,12 @@ class Matrix
     end
   end
 
-  #
-  # Returns the inverse of the matrix.
-  #   Matrix[[1, 2], [2, 1]].inverse
-  #     => -1  1
-  #         0 -1
-  #
   def inverse
     Matrix.Raise ErrDimensionMismatch unless square?
     Matrix.I(row_size).inverse_from(self)
   end
   alias inv inverse
-
-  #
-  # Not for public consumption?
-  #
+  
   def inverse_from(src)
     size = row_size - 1
     a = src.to_a
@@ -711,13 +549,6 @@ class Matrix
   end
   #alias reciprocal inverse
   
-  #
-  # Matrix exponentiation.  Defined for integer powers only.  Equivalent to
-  # multiplying the matrix by itself N times.
-  #   Matrix[[7,6], [3,9]] ** 2
-  #     => 67 96
-  #        48 99
-  #
   def ** (other)
     if other.kind_of?(Integer)
       x = self
@@ -745,16 +576,8 @@ class Matrix
     end
   end
   
-  #--
-  # MATRIX FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
+  # Matrix functions
   
-  #
-  # Returns the determinant of the matrix.  If the matrix is not square, the
-  # result is 0.
-  #   Matrix[[7,6], [3,9]].determinant
-  #     => 63
-  #
   def determinant
     return 0 unless square?
     
@@ -771,7 +594,6 @@ class Matrix
 	end while a[i][k] == 0
 	a[i], a[k] = a[k], a[i]
 	akk = a[k][k]
-	det *= -1
       end
       (k + 1).upto(size) do
 	|i|
@@ -787,76 +609,41 @@ class Matrix
   end
   alias det determinant
 	
-  #
-  # Returns the rank of the matrix.  Beware that using Float values, with their
-  # usual lack of precision, can affect the value returned by this method.  Use
-  # Rational values instead if this is important to you.
-  #   Matrix[[7,6], [3,9]].rank
-  #     => 2
-  #
   def rank
     if column_size > row_size
       a = transpose.to_a
-      a_column_size = row_size
-      a_row_size = column_size
     else
       a = to_a
-      a_column_size = column_size
-      a_row_size = row_size
     end
     rank = 0
     k = 0
     begin
       if (akk = a[k][k]) == 0
-	i = k
-	exists = true
+	i = -1
+	nothing = false
 	begin
-	  if (i += 1) > a_column_size - 1
-	    exists = false
+	  if (i += 1) > column_size - 1
+	    nothing = true
 	    break
 	  end
 	end while a[i][k] == 0
-	if exists
-	  a[i], a[k] = a[k], a[i]
-	  akk = a[k][k]
-	else
-	  i = k
-	  exists = true
-	  begin
-	    if (i += 1) > a_row_size - 1
-	      exists = false
-	      break
-	    end
-	  end while a[k][i] == 0
-	  if exists
-	    k.upto(a_column_size - 1) do
-	      |j|
-	      a[j][k], a[j][i] = a[j][i], a[j][k]
-	    end
-	    akk = a[k][k]
-	  else
-	    next
-	  end
-	end
+	next if nothing
+	a[i], a[k] = a[k], a[i]
+	akk = a[k][k]
       end
-      (k + 1).upto(a_row_size - 1) do
+      (k + 1).upto(row_size - 1) do
 	|i|
 	q = a[i][k] / akk
-	(k + 1).upto(a_column_size - 1) do
+	(k + 1).upto(column_size - 1) do
 	  |j|
 	  a[i][j] -= a[k][j] * q
 	end
       end
       rank += 1
-    end while (k += 1) <= a_column_size - 1
+    end while (k += 1) <= column_size - 1
     return rank
   end
 
-  #
-  # Returns the trace (sum of diagonal elements) of the matrix.
-  #   Matrix[[7,6], [3,9]].trace
-  #     => 16
-  #
   def trace
     tr = 0
     0.upto(column_size - 1) do
@@ -867,73 +654,55 @@ class Matrix
   end
   alias tr trace
   
-  #
-  # Returns the transpose of the matrix.
-  #   Matrix[[1,2], [3,4], [5,6]]
-  #     => 1 2
-  #        3 4
-  #        5 6
-  #   Matrix[[1,2], [3,4], [5,6]].transpose
-  #     => 1 3 5
-  #        2 4 6
-  #
   def transpose
     Matrix.columns(@rows)
   end
   alias t transpose
   
-  #--
-  # CONVERTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
+  # CONVERTING
   
-  #
-  # FIXME: describe #coerce.
-  #
   def coerce(other)
     case other
     when Numeric
       return Scalar.new(other), self
     else
-      raise TypeError, "#{self.class} can't be coerced into #{other.class}"
+      raise TypeError, "#{type} can't be coerced into #{other.type}"
     end
   end
 
-  #
-  # Returns an array of the row vectors of the matrix.  See Vector.
-  #
   def row_vectors
-    rows = (0 .. row_size - 1).collect {
+    rows = (0 .. column_size - 1).collect {
       |i|
       row(i)
     }
     rows
   end
   
-  #
-  # Returns an array of the column vectors of the matrix.  See Vector.
-  #
   def column_vectors
-    columns = (0 .. column_size - 1).collect {
+    columns = (0 .. row_size - 1).collect {
       |i|
       column(i)
     }
     columns
   end
   
-  #
-  # Returns an array of arrays that describe the rows of the matrix.
-  #
   def to_a
     @rows.collect{|row| row.collect{|e| e}}
   end
   
-  #--
-  # PRINTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
+  def to_f
+    collect{|e| e.to_f}
+  end
   
-  #
-  # Overrides Object#to_s
-  #
+  def to_i
+    collect{|e| e.to_i}
+  end
+  
+  def to_r
+    collect{|e| e.to_r}
+  end
+  
+  # PRINTING
   def to_s
     "Matrix[" + @rows.collect{
       |row|
@@ -941,16 +710,13 @@ class Matrix
     }.join(", ")+"]"
   end
   
-  #
-  # Overrides Object#inspect
-  #
   def inspect
     "Matrix"+@rows.inspect
   end
   
   # Private CLASS
   
-  class Scalar < Numeric # :nodoc:
+  class Scalar < Numeric
     include ExceptionForMatrix
     
     def initialize(value)
@@ -963,7 +729,7 @@ class Matrix
       when Numeric
 	Scalar.new(@value + other)
       when Vector, Matrix
-	Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
+	Scalar.Raise WrongArgType, other.type, "Numeric or Scalar"
       when Scalar
 	Scalar.new(@value + other.value)
       else
@@ -977,7 +743,7 @@ class Matrix
       when Numeric
 	Scalar.new(@value - other)
       when Vector, Matrix
-	Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
+	Scalar.Raise WrongArgType, other.type, "Numeric or Scalar"
       when Scalar
 	Scalar.new(@value - other.value)
       else
@@ -1003,7 +769,7 @@ class Matrix
       when Numeric
 	Scalar.new(@value / other)
       when Vector
-	Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
+	Scalar.Raise WrongArgType, other.type, "Numeric or Scalar or Matrix"
       when Matrix
 	self * _M.inverse
       else
@@ -1017,7 +783,7 @@ class Matrix
       when Numeric
 	Scalar.new(@value ** other)
       when Vector
-	Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
+	Scalar.Raise WrongArgType, other.type, "Numeric or Scalar or Matrix"
       when Matrix
 	other.powered_by(self)
       else
@@ -1039,33 +805,18 @@ class Vector
   #INSTANCE CREATION
   
   private_class_method :new
-
-  #
-  # Creates a Vector from a list of elements.
-  #   Vector[7, 4, ...]
-  #
   def Vector.[](*array)
     new(:init_elements, array, copy = false)
   end
   
-  #
-  # Creates a vector from an Array.  The optional second argument specifies
-  # whether the array itself or a copy is used internally.
-  #
   def Vector.elements(array, copy = true)
     new(:init_elements, array, copy)
   end
   
-  #
-  # For internal use.
-  #
   def initialize(method, array, copy)
     self.send(method, array, copy)
   end
   
-  #
-  # For internal use.
-  #
   def init_elements(array, copy)
     if copy
       @elements = array.dup
@@ -1076,28 +827,16 @@ class Vector
   
   # ACCSESSING
 	 
-  #
-  # Returns element number +i+ (starting at zero) of the vector.
-  #
   def [](i)
     @elements[i]
   end
   
-  #
-  # Returns the number of elements in the vector.
-  #
   def size
     @elements.size
   end
   
-  #--
-  # ENUMRATIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
-
-  #
-  # Iterate over the elements of this vector and +v+ in conjunction.
-  #
-  def each2(v) # :yield: e1, e2
+  # ENUMRATIONS
+  def each2(v)
     Vector.Raise ErrDimensionMismatch if size != v.size
     0.upto(size - 1) do
       |i|
@@ -1105,11 +844,7 @@ class Vector
     end
   end
   
-  #
-  # Collects (as in Enumerable#collect) over the elements of this vector and +v+
-  # in conjunction.
-  #
-  def collect2(v) # :yield: e1, e2
+  def collect2(v)
     Vector.Raise ErrDimensionMismatch if size != v.size
     (0 .. size - 1).collect do
       |i|
@@ -1117,13 +852,7 @@ class Vector
     end
   end
 
-  #--
-  # COMPARING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
-
-  #
-  # Returns +true+ iff the two vectors have the same elements in the same order.
-  #
+  # COMPARING
   def ==(other)
     return false unless Vector === other
     
@@ -1131,50 +860,33 @@ class Vector
   end
   alias eqn? ==
   
-  #
-  # For internal use.
-  #
   def compare_by(elements)
     @elements == elements
   end
   
-  #
-  # Return a copy of the vector.
-  #
   def clone
     Vector.elements(@elements)
   end
   
-  #
-  # Return a hash-code for the vector.
-  #
   def hash
     @elements.hash
   end
   
-  #--
-  # ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
+  # ARITHMETIC
   
-  #
-  # Multiplies the vector by +x+, where +x+ is a number or another vector.
-  #
-  def *(x)
+  def *(x) # is matrix or number
     case x
     when Numeric
       els = @elements.collect{|e| e * x}
       Vector.elements(els, false)
     when Matrix
-      Matrix.column_vector(self) * x
+      self.covector * x
     else
-      s, x = x.coerce(self)
+      s, x = X.coerce(self)
       s * x
     end
   end
 
-  #
-  # Vector addition.
-  #
   def +(v)
     case v
     when Vector
@@ -1192,9 +904,6 @@ class Vector
     end
   end
 
-  #
-  # Vector subtraction.
-  #
   def -(v)
     case v
     when Vector
@@ -1212,14 +921,8 @@ class Vector
     end
   end
   
-  #--
-  # VECTOR FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
+  # VECTOR FUNCTIONS
   
-  #
-  # Returns the inner product of this vector with the other.
-  #   Vector[4,7].inner_product Vector[10,1]  => 47
-  #
   def inner_product(v)
     Vector.Raise ErrDimensionMismatch if size != v.size
     
@@ -1231,10 +934,7 @@ class Vector
     p
   end
   
-  #
-  # Like Array#collect.
-  #
-  def collect # :yield: e
+  def collect
     els = @elements.collect {
       |v|
       yield v
@@ -1243,10 +943,7 @@ class Vector
   end
   alias map collect
   
-  #
-  # Like Vector#collect2, but returns a Vector instead of an Array.
-  #
-  def map2(v) # :yield: e1, e2
+  def map2(v)
     els = collect2(v) {
       |v1, v2|
       yield v1, v2
@@ -1254,10 +951,6 @@ class Vector
     Vector.elements(els, false)
   end
   
-  #
-  # Returns the modulus (Pythagorean distance) of the vector.
-  #   Vector[5,8,2].r => 9.643650761
-  #
   def r
     v = 0
     for e in @elements
@@ -1266,57 +959,44 @@ class Vector
     return Math.sqrt(v)
   end
   
-  #--
   # CONVERTING
-  #++
-
-  #
-  # Creates a single-row matrix from this vector.
-  #
   def covector
     Matrix.row_vector(self)
   end
   
-  #
-  # Returns the elements of the vector in an array.
-  #
   def to_a
     @elements.dup
   end
   
-  #
-  # FIXME: describe Vector#coerce.
-  #
+  def to_f
+    collect{|e| e.to_f}
+  end
+  
+  def to_i
+    collect{|e| e.to_i}
+  end
+  
+  def to_r
+    collect{|e| e.to_r}
+  end
+  
   def coerce(other)
     case other
     when Numeric
       return Scalar.new(other), self
     else
-      raise TypeError, "#{self.class} can't be coerced into #{other.class}"
+      raise TypeError, "#{type} can't be coerced into #{other.type}"
     end
   end
   
-  #--
-  # PRINTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  #++
+  # PRINTING
   
-  #
-  # Overrides Object#to_s
-  #
   def to_s
     "Vector[" + @elements.join(", ") + "]"
   end
   
-  #
-  # Overrides Object#inspect
-  #
   def inspect
     str = "Vector"+@elements.inspect
   end
 end
 
-
-# Documentation comments:
-#  - Matrix#coerce and Vector#coerce need to be documented
-#  - Matrix class methods (aliases) unit and I don't appear in RDoc output
-#    becuase of "class << Matrix".  This is an RDoc issue.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index b0a719e86e..a3f2a8e6fe 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2,588 +2,330 @@
 # invoke like: ruby -r mkmf extconf.rb
 
 require 'rbconfig'
-require 'fileutils'
-require 'shellwords'
+require 'find'
 
-CONFIG = Config::MAKEFILE_CONFIG
-ORIG_LIBPATH = ENV['LIB']
+include Config
 
 SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"]
-$static = $config_h = nil
 
-unless defined? $configure_args
-  $configure_args = {}
-  args = CONFIG["configure_args"]
-  if ENV["CONFIGURE_ARGS"]
-    args << " " << ENV["CONFIGURE_ARGS"]
-  end
-  for arg in Shellwords::shellwords(args)
-    arg, val = arg.split('=', 2)
-    next unless arg
-    if arg.sub!(/^(?!--)/, '--')
-      val or next
-      arg.downcase!
-    end
-    next if /^--(?:top|topsrc|src|cur)dir$/ =~ arg
-    $configure_args[arg] = val || true
-  end
-  for arg in ARGV
-    arg, val = arg.split('=', 2)
-    next unless arg
-    if arg.sub!(/^(?!--)/, '--')
-      val or next
-      arg.downcase!
+$cache_mod = false
+$lib_cache = {}
+$lib_found = {}
+$func_cache = {}
+$func_found = {}
+$hdr_cache = {}
+$hdr_found = {}
+
+$config_cache = CONFIG["compile_dir"]+"/ext/config.cache"
+if File.exist?($config_cache) then
+  f = open($config_cache, "r")
+  while f.gets
+    case $_
+    when /^lib: (.+) (yes|no)/
+      $lib_cache[$1] = $2
+    when /^func: ([\w_]+) (yes|no)/
+      $func_cache[$1] = $2
+    when /^hdr: (.+) (yes|no)/
+      $hdr_cache[$1] = $2
     end
-    $configure_args[arg] = val || true
   end
+  f.close
 end
 
 $srcdir = CONFIG["srcdir"]
-$libdir = CONFIG["libdir"]
-$rubylibdir = CONFIG["rubylibdir"]
-$archdir = CONFIG["archdir"]
-$sitedir = CONFIG["sitedir"]
-$sitelibdir = CONFIG["sitelibdir"]
-$sitearchdir = CONFIG["sitearchdir"]
+$libdir = CONFIG["libdir"]+"/ruby/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
+$archdir = $libdir+"/"+CONFIG["arch"]
 
-$extmk = /extmk\.rb/ =~ $0
-$mswin = /mswin/ =~ RUBY_PLATFORM
-$bccwin = /bccwin/ =~ RUBY_PLATFORM
-$mingw = /mingw/ =~ RUBY_PLATFORM
-$cygwin = /cygwin/ =~ RUBY_PLATFORM
-$human = /human/ =~ RUBY_PLATFORM
-$netbsd = /netbsd/ =~ RUBY_PLATFORM
-$os2 = /os2/ =~ RUBY_PLATFORM
-
-def config_string(key, config = CONFIG)
-  s = config[key] and !s.empty? and block_given? ? yield(s) : s
-end
-
-def dir_re(dir)
-  Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$\(target_prefix\)|\{target_prefix\})?')
-end
-
-INSTALL_DIRS = [
-  [dir_re('commondir'), "$(RUBYCOMMONDIR)"],
-  [dir_re("sitedir"), "$(RUBYCOMMONDIR)"],
-  [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
-  [dir_re('archdir'), "$(RUBYARCHDIR)"],
-  [dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
-  [dir_re('sitearchdir'), "$(RUBYARCHDIR)"]
-]
-
-def map_dir(dir, map = nil)
-  map ||= INSTALL_DIRS
-  map.inject(dir) {|dir, (orig, new)| dir.gsub(orig, new)}
-end
-
-if not $extmk and File.exist? Config::CONFIG["archdir"] + "/ruby.h"
+if File.exist? $archdir + "/ruby.h"
   $hdrdir = $archdir
 elsif File.exist? $srcdir + "/ruby.h"
   $hdrdir = $srcdir
 else
-  warn "can't find header files for ruby."
+  STDERR.print "can't find header files for ruby.\n"
   exit 1
 end
 $topdir = $hdrdir
+$hdrdir.gsub!('/', '\\') if RUBY_PLATFORM =~ /mswin32/
 
-OUTFLAG = CONFIG['OUTFLAG']
-CPPOUTFILE = CONFIG['CPPOUTFILE']
-
-CONFTEST_C = "conftest.c"
-
-class String
-  def quote
-    /\s/ =~ self ? "\"#{self}\"" : self
-  end
+CFLAGS = CONFIG["CFLAGS"]
+if RUBY_PLATFORM == "m68k-human"
+  CFLAGS.gsub!(/-c..-stack=[0-9]+ */, '')
+elsif RUBY_PLATFORM =~ /-nextstep|-rhapsody/
+  CFLAGS.gsub!( /-arch\s\w*/, '' )
 end
-class Array
-  def quote
-    map {|s| s.quote}
-  end
+if /win32|djgpp|mingw32|m68k-human|i386-os2_emx/i =~ RUBY_PLATFORM
+  $null = open("nul", "w")
+else
+  $null = open("/dev/null", "w")
 end
+LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} -I#{CONFIG['includedir']} #{CFLAGS} %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
+CPP = "#{CONFIG['CPP']} -E -I#{$hdrdir} -I#{CONFIG['includedir']} #{CFLAGS} %s %s conftest.c"
 
-def rm_f(*files)
-  FileUtils.rm_f(Dir[files.join("\0")])
+$orgerr = $stderr.dup
+$orgout = $stdout.dup
+def xsystem command
+  if $DEBUG
+    print command, "\n"
+    return system(command)
+  end
+  $stderr.reopen($null) 
+  $stdout.reopen($null) 
+  r = system(command)
+  $stderr.reopen($orgerr)
+  $stdout.reopen($orgout)
+  return r
 end
 
-def modified?(target, times)
-  (t = File.mtime(target)) rescue return nil
-  Array === times or times = [times]
-  t if times.all? {|n| n <= t}
+def try_link0(src, opt="")
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  xsystem(format(LINK, $CFLAGS, $LDFLAGS, opt, $LOCAL_LIBS))
 end
 
-module Logging
-  @log = nil
-  @logfile = 'mkmf.log'
-  @orgerr = $stderr.dup
-  @orgout = $stdout.dup
-
-  def self::open
-    @log ||= File::open(@logfile, 'w')
-    @log.sync = true
-    $stderr.reopen(@log)
-    $stdout.reopen(@log)
-    yield
+def try_link(src, opt="")
+  begin
+    try_link0(src, opt)
   ensure
-    $stderr.reopen(@orgerr)
-    $stdout.reopen(@orgout)
-  end
-
-  def self::message(*s)
-    @log ||= File::open(@logfile, 'w')
-    @log.sync = true
-    @log.printf(*s)
+    system "rm -f conftest*"
   end
+end
 
-  def self::logfile file
-    @logfile = file
-    if @log and not @log.closed?
-      @log.flush
-      @log.close
-      @log = nil
-    end
-  end
-  
-  def self::postpone
-    tmplog = "mkmftmp.log"
-    open do
-      log, *save = @log, @logfile, @orgout, @orgerr
-      @log, @logfile, @orgout, @orgerr = nil, tmplog, log, log
-      begin
-        log.print(open {yield})
-        @log.close
-        File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
-      ensure
-        @log, @logfile, @orgout, @orgerr = log, *save
-        rm_f tmplog
-      end
-    end
+def try_cpp(src, opt="")
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  begin
+    xsystem(format(CPP, $CFLAGS, opt))
+  ensure
+    system "rm -f conftest*"
   end
 end
 
-def xsystem command
-  Config.expand(command)
-  Logging::open do
-    puts command.quote
-    system(command)
+def egrep_cpp(pat, src, opt="")
+  cfile = open("conftest.c", "w")
+  cfile.print src
+  cfile.close
+  begin
+    xsystem(format(CPP+"|egrep #{pat}", $CFLAGS, opt))
+  ensure
+    system "rm -f conftest*"
   end
 end
 
-def xpopen command, *mode, &block
-  Config.expand(command)
-  Logging::open do
-    case mode[0]
-    when nil, /^r/
-      puts "#{command} |"
+def try_run(src, opt="")
+  begin
+    if try_link0(src, opt)
+      if xsystem("./conftest")
+	true
+      else
+	false
+      end
     else
-      puts "| #{command}"
+      nil
     end
-    IO.popen(command, *mode, &block)
+  ensure
+    system "rm -f conftest*"
   end
 end
 
-def log_src(src)
-  Logging::message <<"EOM", src
-checked program was:
-/* begin */
-%s/* end */
-
-EOM
-end
-
-def create_tmpsrc(src)
-  src = yield(src) if block_given?
-  src = src.sub(/[^\n]\z/, "\\&\n")
-  open(CONFTEST_C, "w") do |cfile|
-    cfile.print src
+def install_rb(mfile, srcdir = nil)
+  libdir = "lib"
+  libdir = srcdir + "/" + libdir if srcdir
+  path = []
+  dir = []
+  Find.find(libdir) do |f|
+    next unless /\.rb$/ =~ f
+    f = f[libdir.length+1..-1]
+    path.push f
+    dir |= File.dirname(f)
+  end
+  for f in dir
+    next if f == "."
+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(libdir)/%s\n", f
+  end
+  for f in path
+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' lib/%s $(libdir)/%s\n", f, f
   end
-  src
-end
-
-def try_do(src, command, &b)
-  src = create_tmpsrc(src, &b)
-  xsystem(command)
-ensure
-  log_src(src)
-end
-
-def link_command(ldflags, opt="", libpath=$LIBPATH)
-  Config::expand(TRY_LINK.dup,
-		 'hdrdir' => $hdrdir,
-		 'src' => CONFTEST_C,
-		 'INCFLAGS' => $INCFLAGS,
-		 'CPPFLAGS' => $CPPFLAGS,
-		 'CFLAGS' => "#$CFLAGS",
-		 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
-		 'LIBPATH' => libpathflag(libpath),
-		 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
-		 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
-end
-
-def cc_command(opt="")
-  "$(CC) -c #$INCFLAGS -I#{$hdrdir} " \
-  "#$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C}"
-end
-
-def cpp_command(outfile, opt="")
-  "$(CPP) #$INCFLAGS -I#{$hdrdir} " \
-  "#$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}"
-end
-
-def libpathflag(libpath=$LIBPATH)
-  libpath.map{|x| LIBPATHFLAG % %["#{x}"]}.join
-end
-
-def try_link0(src, opt="", &b)
-  try_do(src, link_command("", opt), &b)
-end
-
-def try_link(src, opt="", &b)
-  try_link0(src, opt, &b)
-ensure
-  rm_f "conftest*", "c0x32*"
-end
-
-def try_compile(src, opt="", &b)
-  try_do(src, cc_command(opt), &b)
-ensure
-  rm_f "conftest*"
-end
-
-def try_cpp(src, opt="", &b)
-  try_do(src, cpp_command(CPPOUTFILE, opt), &b)
-ensure
-  rm_f "conftest*"
 end
 
-def cpp_include(header)
-  if header
-    header = [header] unless header.kind_of? Array
-    header.map {|h| "#include <#{h}>\n"}.join
+def append_library(libs, lib)
+  if /mswin32/ =~ RUBY_PLATFORM
+    lib + ".lib " + libs
   else
-    ""
+    "-l" + lib + " " + libs
   end
 end
 
-def try_static_assert(expr, headers = nil, opt = "", &b)
-  headers = cpp_include(headers)
-  try_compile(<<SRC, opt, &b)
-#{COMMON_HEADERS}
-#{headers}
-/*top*/
-int tmp[(#{expr}) ? 1 : -1];
-SRC
-end
-
-def try_constant(const, headers = nil, opt = "", &b)
-  headers = cpp_include(headers)
-  if CROSS_COMPILING
-    unless try_compile(<<"SRC", opt, &b)
-#{COMMON_HEADERS}
-#{headers}
-/*top*/
-int tmp = #{const};
-SRC
-      return nil
-    end
-    if try_static_assert("#{const} < 0", headers, opt)
-      neg = true
-      const = "-(#{const})"
-    elsif try_static_assert("#{const} == 0", headers, opt)
-      return 0
-    end
-    upper = 1
-    until try_static_assert("#{const} < #{upper}", headers, opt)
-      lower = upper
-      upper <<= 1
-    end
-    return nil unless lower
-    until try_static_assert("#{const} == #{upper}", headers, opt)
-      if try_static_assert("#{const} > #{(upper+lower)/2}", headers, opt)
-        lower = (upper+lower)/2
-      else
-        upper = (upper+lower)/2
-      end
-    end
-    upper = -upper if neg
-    return upper
-  else
-    src = %{#{COMMON_HEADERS}
-#{headers}
-#include <stdio.h>
-/*top*/
-int main() {printf("%d\\n", (int)(#{const})); return 0;}
-}
-    if try_link0(src, opt, &b)
-      xpopen("./conftest") do |f|
-        return Integer(f.gets)
-      end
+def have_library(lib, func="main")
+  printf "checking for %s() in -l%s... ", func, lib
+  STDOUT.flush
+  if $lib_cache[lib]
+    if $lib_cache[lib] == "yes"
+      $libs = append_library($libs, lib)
+      print "(cached) yes\n"
+      return true
+    else
+      print "(cached) no\n"
+      return false
     end
   end
-  nil
-end
 
-def try_func(func, libs, headers = nil, &b)
-  headers = cpp_include(headers)
-  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
-#{headers}
-/*top*/
+  if func && func != ""
+    libs = append_library($libs, lib)
+    if /mswin32/ =~ RUBY_PLATFORM
+      r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
 int main() { return 0; }
 int t() { #{func}(); return 0; }
 SRC
-#{COMMON_HEADERS}
-#{headers}
-/*top*/
+      unless r
+        r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
 int main() { return 0; }
-int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
+int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
-end
-
-def egrep_cpp(pat, src, opt = "", &b)
-  src = create_tmpsrc(src, &b)
-  xpopen(cpp_command('', opt)) do |f|
-    if Regexp === pat
-      puts("    ruby -ne 'print if #{pat.inspect}'")
-      f.grep(pat) {|l|
-	puts "#{f.lineno}: #{l}"
-	return true
-      }
-      false
-    else
-      puts("    egrep '#{pat}'")
-      begin
-	stdin = $stdin.dup
-	$stdin.reopen(f)
-	system("egrep", pat)
-      ensure
-	$stdin.reopen(stdin)
       end
-    end
-  end
-ensure
-  rm_f "conftest*"
-  log_src(src)
-end
-
-def macro_defined?(macro, src, opt = "", &b)
-  src = src.sub(/[^\n]\z/, "\\&\n")
-  try_cpp(src + <<"SRC", opt, &b)
-/*top*/
-#ifndef #{macro}
-# error
-#endif
-SRC
-end
-
-def try_run(src, opt = "", &b)
-  if try_link0(src, opt, &b)
-    xsystem("./conftest")
-  else
-    nil
-  end
-ensure
-  rm_f "conftest*"
-end
-
-def install_files(mfile, ifiles, map = nil, srcprefix = nil)
-  ifiles or return
-  srcprefix ||= '$(srcdir)'
-  Config::expand(srcdir = srcprefix.dup)
-  dirs = []
-  path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
-  ifiles.each do |files, dir, prefix|
-    dir = map_dir(dir, map)
-    prefix = %r|\A#{Regexp.quote(prefix)}/?| if prefix
-    if( files[0,2] == "./" )
-      # install files which are in current working directory.
-      files = files[2..-1]
-      len = nil
     else
-      # install files which are under the $(srcdir).
-      files = File.join(srcdir, files)
-      len = srcdir.size
-    end
-    f = nil
-    Dir.glob(files) do |f|
-      f[0..len] = "" if len
-      d = File.dirname(f)
-      d.sub!(prefix, "") if prefix
-      d = (d.empty? || d == ".") ? dir : File.join(dir, d)
-      f = File.join(srcprefix, f) if len
-      path[d] << f
+      r = try_link(<<"SRC", libs)
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
     end
-    unless len or f
-      d = File.dirname(files)
-      d.sub!(prefix, "") if prefix
-      d = (d.empty? || d == ".") ? dir : File.join(dir, d)
-      path[d] << files
+    unless r
+      $lib_cache[lib] = 'no'
+      $cache_mod = true
+      print "no\n"
+      return false
     end
+  else
+    libs = append_library($libs, lib)
   end
-  dirs
-end
-
-def install_rb(mfile, dest, srcdir = nil)
-  install_files(mfile, [["lib/**/*.rb", dest, "lib"]], nil, srcdir)
-end
-
-def append_library(libs, lib)
-  format(LIBARG, lib) + " " + libs
-end
-
-def message(*s)
-  unless $extmk and not $VERBOSE
-    printf(*s)
-    $stdout.flush
-  end
-end
 
-def checking_for(m)
-  f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim
-  m = "checking for #{m}... "
-  message "%s", m
-  a = r = nil
-  Logging::postpone do
-    r = yield
-    a = r ? "yes\n" : "no\n"
-    "#{f}#{m}-------------------- #{a}\n"
-  end
-  message(a)
-  Logging::message "--------------------\n\n"
-  r
+  $libs = libs
+  $lib_cache[lib] = 'yes'
+  $cache_mod = true
+  print "yes\n"
+  return true
 end
 
-def have_library(lib, func = nil, &b)
-  func = "main" if !func or func.empty?
-  lib = with_config(lib+'lib', lib)
-  checking_for "#{func}() in #{LIBARG%lib}" do
-    if COMMON_LIBS.include?(lib)
-      true
-    else
-      libs = append_library($libs, lib)
-      if try_func(func, libs, &b)
-        $libs = libs
-        true
-      else
-        false
-      end
-    end
-  end
-end
+def find_library(lib, func, *paths)
+  printf "checking for %s() in -l%s... ", func, lib
+  STDOUT.flush
 
-def find_library(lib, func, *paths, &b)
-  func = "main" if !func or func.empty?
-  lib = with_config(lib+'lib', lib)
-  checking_for "#{func}() in #{LIBARG%lib}" do
-    libpath = $LIBPATH
-    libs = append_library($libs, lib)
-    begin
-      until r = try_func(func, libs, &b) or paths.empty?
-	$LIBPATH = libpath | [paths.shift]
-      end
-      if r
-	$libs = libs
-	libpath = nil
-      end
-    ensure
-      $LIBPATH = libpath if libpath
+  ldflags = $LDFLAGS
+  libs = "-l" + lib + " " + $libs 
+  until try_link(<<"SRC", libs)
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+    if paths.size == 0
+      $LDFLAGS = ldflags
+      print "no\n"
+      return false
     end
-    r
+    $LDFLAGS = ldflags + " -L"+paths.shift
   end
+  $libs = libs
+  print "yes\n"
+  return true
 end
 
-def have_func(func, headers = nil, &b)
-  checking_for "#{func}()" do
-    if try_func(func, $libs, headers, &b)
+def have_func(func)
+  printf "checking for %s()... ", func
+  STDOUT.flush
+  if $func_cache[func]
+    if $func_cache[func] == "yes"
       $defs.push(format("-DHAVE_%s", func.upcase))
-      true
+      print "(cached) yes\n"
+      return true
     else
-      false
+      print "(cached) no\n"
+      return false
     end
   end
-end
 
-def have_header(header, &b)
-  checking_for header do
-    if try_cpp(cpp_include(header), &b)
-      $defs.push(format("-DHAVE_%s", header.tr("a-z./\055", "A-Z___")))
-      true
-    else
-      false
-    end
-  end
-end
+  libs = $libs
 
-def have_struct_member(type, member, header = nil, &b)
-  checking_for "#{type}.#{member}" do
-    if try_compile(<<"SRC", &b)
-#{COMMON_HEADERS}
-#{cpp_include(header)}
-/*top*/
+  if /mswin32/ =~ RUBY_PLATFORM
+    r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
 int main() { return 0; }
-int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
+int t() { #{func}(); return 0; }
 SRC
-      $defs.push(format("-DHAVE_ST_%s", member.upcase))
-      true
-    else
-      false
-    end
-  end
-end
-
-def have_type(type, header = nil, opt = "", &b)
-  checking_for type do
-    header = cpp_include(header)
-    if try_compile(<<"SRC", opt, &b) or try_compile(<<"SRC", opt, &b)
-#{COMMON_HEADERS}
-#{header}
-/*top*/
-static #{type} t;
+    unless r
+      r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
-#{COMMON_HEADERS}
-#{header}
-/*top*/
-static #{type} *t;
+    end
+  else
+    r = try_link(<<"SRC", libs)
+int main() { return 0; }
+int t() { #{func}(); return 0; }
 SRC
-      $defs.push(format("-DHAVE_TYPE_%s", type.upcase))
-      true
+  end
+  unless r
+    $func_found[func] = 'no'
+    $cache_mod = true
+    print "no\n"
+    return false
+  end
+  $defs.push(format("-DHAVE_%s", func.upcase))
+  $func_found[func] = 'yes'
+  $cache_mod = true
+  print "yes\n"
+  return true
+end
+
+def have_header(header)
+  printf "checking for %s... ", header
+  STDOUT.flush
+  if $hdr_cache[header]
+    if $hdr_cache[header] == "yes"
+      header.tr!("a-z./\055", "A-Z___")
+      $defs.push(format("-DHAVE_%s", header))
+      print "(cached) yes\n"
+      return true
     else
-      false
+      print "(cached) no\n"
+      return false
     end
   end
-end
-
-def check_sizeof(type, header = nil, &b)
-  expr = "sizeof(#{type})"
-  m = "checking size of #{type}... "
-  message "%s", m
-  Logging::message "check_sizeof: %s--------------------\n", m
-  if size = try_constant(expr, header, &b)
-    $defs.push(format("-DSIZEOF_%s", type.upcase))
-  end
-  message(a = size ? "#{size}\n" : "failed\n")
-  Logging::message "-------------------- %s\n", a
-  r
-end
-
-def find_executable0(bin, path = nil)
-  path = (path || ENV['PATH']).split(File::PATH_SEPARATOR)
-  ext = config_string('EXEEXT')
-  file = nil
-  path.each do |dir|
-    return file if File.executable?(file = File.join(dir, bin))
-    return file if ext and File.executable?(file << ext)
-  end
-  nil
-end
 
-def find_executable(bin, path = nil)
-  checking_for bin do
-    find_executable0(bin, path)
+  unless try_cpp(<<"SRC")
+#include <#{header}>
+SRC
+    $hdr_found[header] = 'no'
+    $cache_mod = true
+    print "no\n"
+    return false
   end
+  $hdr_found[header] = 'yes'
+  header.tr!("a-z./\055", "A-Z___")
+  $defs.push(format("-DHAVE_%s", header))
+  $cache_mod = true
+  print "yes\n"
+  return true
 end
 
 def arg_config(config, default=nil)
+  unless defined? $configure_args
+    $configure_args = {}
+    for arg in CONFIG["configure_args"].split + ARGV
+      next unless /^--/ =~ arg
+      if /=/ =~ arg
+	$configure_args[$`] = $'
+      else
+	$configure_args[arg] = true
+      end
+    end
+  end
   $configure_args.fetch(config, default)
 end
 
@@ -595,440 +337,229 @@ def with_config(config, default=nil)
 end
 
 def enable_config(config, default=nil)
-  if arg_config("--enable-"+config)
+  if arg_config("--enable-"+config, default)
     true
-  elsif arg_config("--disable-"+config)
+  elsif arg_config("--disable-"+config, false)
     false
   else
     default
   end
 end
 
-def create_header(header = "extconf.h")
-  message "creating %s\n", header
+def create_header()
+  print "creating extconf.h\n"
+  STDOUT.flush
   if $defs.length > 0
-    sym = header.tr("a-z./\055", "A-Z___")
-    open(header, "w") do |hfile|
-      hfile.print "#ifndef #{sym}\n#define #{sym}\n"
-      for line in $defs
-	case line
-	when /^-D(.*)(?:=(.*))?/
-	  hfile.print "#define #$1 #{$2 || 1}\n"
-	when /^-U(.*)/
-	  hfile.print "#undef #$1\n"
-	end
-      end
-      hfile.print "#endif\n"
+    hfile = open("extconf.h", "w")
+    for line in $defs
+      line =~ /^-D(.*)/
+      hfile.printf "#define %s 1\n", $1
     end
+    hfile.close
   end
 end
 
-def dir_config(target, idefault=nil, ldefault=nil)
-  if dir = with_config(target + "-dir", (idefault unless ldefault))
-    defaults = dir.split(File::PATH_SEPARATOR)
-    idefault = ldefault = nil
+def dir_config(target)
+  dir = with_config("%s-dir"%target)
+  if dir
+    idir = " -I"+dir+"/include"
+    ldir = " -L"+dir+"/lib"
   end
-
-  idir = with_config(target + "-include", idefault)
-  ldir = with_config(target + "-lib", ldefault)
-
-#  idirs = idir ? idir.split(File::PATH_SEPARATOR) : []
-  idirs = idir.split(File::PATH_SEPARATOR) rescue []
-  if defaults
-    idirs.concat(defaults.collect {|dir| dir + "/include"})
-    idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
-  end
-  unless idirs.empty?
-    idirs.collect! {|dir| "-I" + dir}
-    idirs -= Shellwords.shellwords($CPPFLAGS)
-    unless idirs.empty?
-      $CPPFLAGS = (idirs << $CPPFLAGS).join(" ")
-    end
+  unless idir
+    dir = with_config("%s-include"%target)
+    idir = " -I"+dir if dir
   end
-
-  ldirs = ldir ? ldir.split(File::PATH_SEPARATOR) : []
-  if defaults
-    ldirs.concat(defaults.collect {|dir| dir + "/lib"})
-    ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
+  unless ldir
+    dir = with_config("%s-lib"%target)
+    ldir = " -L"+dir if dir
   end
-  $LIBPATH |= ldirs
 
-  [idir, ldir]
+  $CFLAGS += idir if idir
+  $LDFLAGS += ldir if ldir
 end
 
-def pkg_config(pkg)
-  unless defined?($PKGCONFIG)
-    if pkgconfig = with_config("pkg-config", !CROSS_COMPILING && "pkg-config")
-      find_executable0(pkgconfig) or pkgconfig = nil
+def create_makefile(target)
+  print "creating Makefile\n"
+  system "rm -f conftest*"
+  STDOUT.flush
+  if CONFIG["DLEXT"] == $OBJEXT
+    libs = $libs.split
+    for lib in libs
+      lib.sub!(/-l(.*)/, '"lib\1.a"')
     end
-    $PKGCONFIG = pkgconfig
+    $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
   end
-  if $PKGCONFIG and system("#{$PKGCONFIG} --exists #{pkg}")
-    cflags = `#{$PKGCONFIG} --cflags #{pkg}`.chomp
-    ldflags = `#{$PKGCONFIG} --libs #{pkg}`.chomp
-    libs = `#{$PKGCONFIG} --libs-only-l #{pkg}`.chomp
-    ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
-    $CFLAGS += " " << cflags
-    $LDFLAGS += " " << ldflags
-    $libs += " " << libs
-    Logging::message "package configuration for %s\n", pkg
-    Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
-                     cflags, ldflags, libs
-    [cflags, ldflags, libs]
+  $DLDFLAGS = CONFIG["DLDFLAGS"]
+
+  if RUBY_PLATFORM =~ /beos/
+    $libs = $libs + " -lruby"
+    $DLDFLAGS = $DLDFLAGS + " -L" + CONFIG["prefix"] + "/lib"
   end
-end
 
-def with_destdir(dir)
-  /^\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
-end
+  defflag = ''
+  if RUBY_PLATFORM =~ /cygwin/
+    if File.exist? target + ".def"
+      defflag = "--def=" + target + ".def"
+    end
+    $libs = $libs + " " + CONFIG["LIBRUBYARG"]
+    $DLDFLAGS = $DLDFLAGS + " -L$(topdir)"
+  end
 
-def winsep(s)
-  s.tr('/', '\\')
-end
+  unless $objs then
+    $objs = []
+    for f in Dir["*.{#{SRC_EXT.join(%q{,})}}"]
+      f = File.basename(f)
+      f.sub!(/(#{SRC_EXT.join(%q{|})})$/, $OBJEXT)
+      $objs.push f
+    end
+  end
+  $objs = $objs.join(" ")
 
-def configuration(srcdir)
-  mk = []
-  mk << %{
+  mfile = open("Makefile", "w")
+  mfile.print  <<EOMF
 SHELL = /bin/sh
 
 #### Start of system configuration section. ####
 
-srcdir = #{srcdir}
+srcdir = #{$srcdir}
 topdir = #{$topdir}
 hdrdir = #{$hdrdir}
-VPATH = #{$mingw && CONFIG['build_os'] == 'cygwin' ? '$(shell cygpath -u $(srcdir))' : '$(srcdir)'}
-}
-  drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/
-  if destdir = CONFIG["prefix"].scan(drive)[0] and !destdir.empty?
-    mk << "\nDESTDIR = #{destdir}\n"
-  end
-  CONFIG.each do |key, var|
-    next unless /prefix$/ =~ key
-    mk << "#{key} = #{with_destdir(var.sub(drive, ''))}\n"
-  end
-  CONFIG.each do |key, var|
-    next if /^abs_/ =~ key
-    next unless /^(?:src|top|(.*))dir$/ =~ key and $1
-    mk << "#{key} = #{with_destdir(var.sub(drive, ''))}\n"
-  end
-  mk << %{
-CC = #{CONFIG['CC']}
-LIBRUBY = #{CONFIG['LIBRUBY']}
-LIBRUBY_A = #{CONFIG['LIBRUBY_A']}
-LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED
-LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
 
-CFLAGS   = #{CONFIG['CCDLFLAGS'] unless $static} #$CFLAGS
-CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{$CPPFLAGS}
-CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
-DLDFLAGS = #$LDFLAGS #{CONFIG['DLDFLAGS']} #$DLDFLAGS
-LDSHARED = #{CONFIG['LDSHARED']}
-AR = #{CONFIG['AR']}
-EXEEXT = #{CONFIG['EXEEXT']}
+CC = #{CONFIG["CC"]}
 
-RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']}
-RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
-arch = #{CONFIG['arch']}
-sitearch = #{CONFIG['sitearch']}
-ruby_version = #{Config::CONFIG['ruby_version']}
-RUBY = #{$ruby}
-RM = $(RUBY) -run -e rm -- -f
-MAKEDIRS = $(RUBY) -run -e mkdir -- -p
-INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755
-INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644
-
-#### End of system configuration section. ####
+CFLAGS   = #{CONFIG["CCDLFLAGS"]} -I$(hdrdir) -I#{CONFIG["includedir"]} #{CFLAGS} #{$CFLAGS} #{$defs.join(" ")}
+CXXFLAGS = $(CFLAGS)
+DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS}
+LDSHARED = #{CONFIG["LDSHARED"]} #{defflag}
 
-}
-  if $nmake == ?b
-    mk.each do |x|
-      x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do
-        "!ifndef " + $1 + "\n" +
-        $& +
-	"!endif\n"
-      end
-    end
-  end
-  mk
-end
+prefix = #{CONFIG["prefix"]}
+exec_prefix = #{CONFIG["exec_prefix"]}
+libdir = #{$libdir}
+archdir = #{$archdir}
 
-def dummy_makefile(srcdir)
-  configuration(srcdir) << "all install: Makefile\n" << CLEANINGS
-end
+#### End of system configuration section. ####
 
-def create_makefile(target, srcprefix = nil)
-  $target = target
-  libpath = $LIBPATH
-  message "creating Makefile\n"
-  rm_f "conftest*"
-  if CONFIG["DLEXT"] == $OBJEXT
-    for lib in libs = $libs.split
-      lib.sub!(/-l(.*)/, %%"lib\\1.#{$LIBEXT}"%)
-    end
-    $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
-  end
+LOCAL_LIBS = #{$LOCAL_LIBS} #{$local_flags}
+LIBS = #{$libs}
+OBJS = #{$objs}
 
-  if target.include?('/')
-    target_prefix, target = File.split(target)
-    target_prefix[0,0] = '/'
-  else
-    target_prefix = ""
-  end
+TARGET = #{target}
+DLLIB = $(TARGET).#{CONFIG["DLEXT"]}
 
-  srcprefix ||= '$(srcdir)'
-  Config::expand(srcdir = srcprefix.dup)
+RUBY = #{CONFIG["ruby_install_name"]}
 
-  unless $objs then
-    $objs = []
-    for f in Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
-      $objs.push(File.basename(f, ".*") << "." << $OBJEXT)
-    end
-  else
-    for i in $objs
-      i.sub!(/\.o\z/, ".#{$OBJEXT}")
-    end
-  end
-  $objs = $objs.join(" ")
+EXEEXT = #{CONFIG["EXEEXT"]}
 
-  target = nil if $objs == ""
+all:		$(DLLIB)
 
-  if target and EXPORT_PREFIX
-    origdef = target + '.def'
-    deffile = EXPORT_PREFIX + origdef
-    unless File.exist? deffile
-      if File.exist? File.join(srcdir, deffile)
-	deffile = File.join(srcdir, deffile)
-      elsif !EXPORT_PREFIX.empty? and File.exist?(origdef = File.join(srcdir, origdef))
-	open(origdef) do |d|
-	  open(deffile, 'wb') do |f|
-	    d.each do |l|
-	      f.print l
-	      break if /^EXPORTS$/i =~ l
-	    end
-	    d.each do |l|
-	      f.print l.sub(/\S/, EXPORT_PREFIX+'\&')
-	    end
-	  end
-	end
-      else
-	open(deffile, 'wb') do |f|
-	  f.print "EXPORTS\n", EXPORT_PREFIX, "Init_", target, "\n"
-	end
-      end
-    end
-    $distcleanfiles << deffile unless deffile == origdef
-  end
+clean:;		@rm -f *.#{$OBJEXT} *.so *.sl *.a $(DLLIB)
+		@rm -f $(TARGET).lib $(TARGET).exp
+		@rm -f Makefile extconf.h conftest.*
+		@rm -f core ruby$(EXEEXT) *~
 
-  libpath = libpathflag(libpath)
+realclean:	clean
 
-  dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : ""
-  staticlib = target ? "$(TARGET).#$LIBEXT" : ""
-  mfile = open("Makefile", "wb")
-  mfile.print configuration(srcdir)
-  mfile.print %{
-LIBPATH = #{libpath}
-DEFFILE = #{deffile}
+install:	$(archdir)/$(DLLIB)
 
-CLEANFILES = #{$cleanfiles.join(' ')}
-DISTCLEANFILES = #{$distcleanfiles.join(' ')}
+$(archdir)/$(DLLIB): $(DLLIB)
+	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(libdir) $(archdir)
+	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(archdir)/$(DLLIB)
+EOMF
+  install_rb(mfile)
+  mfile.printf "\n"
 
-target_prefix = #{target_prefix}
-LOCAL_LIBS = #{$LOCAL_LIBS}
-LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
-OBJS = #{$objs}
-TARGET = #{target}
-DLLIB = #{dllib}
-STATIC_LIB = #{staticlib}
-}
-  if $extmk
-    mfile.print %{
-RUBYCOMMONDIR = $(rubylibdir)
-RUBYLIBDIR    = $(rubylibdir)$(target_prefix)
-RUBYARCHDIR   = $(archdir)$(target_prefix)
-}
-  else
-    mfile.print %{
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-}
+  if CONFIG["DLEXT"] != $OBJEXT
+    mfile.printf <<EOMF
+$(DLLIB): $(OBJS)
+	$(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)
+EOMF
+  elsif not File.exist?(target + ".c") and not File.exist?(target + ".cc")
+    mfile.print "$(DLLIB): $(OBJS)\n"
+    case RUBY_PLATFORM
+    when "m68k-human"
+      mfile.printf "ar cru $(DLLIB) $(OBJS)\n"
+    else
+      mfile.printf "ld $(DLDFLAGS) -r -o $(DLLIB) $(OBJS)\n"
+    end
   end
-  mfile.print %{
-CLEANLIBS     = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB)
-CLEANOBJS     = "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}"
 
-all:		#{target ? "$(DLLIB)" : "Makefile"}
-static:		$(STATIC_LIB)
-}
-  mfile.print CLEANINGS
-  dirs = []
-  if not $static and target
-    dirs << (dir = "$(RUBYARCHDIR)")
-    mfile.print("install: #{dir}\n")
-    f = "$(DLLIB)"
-    dest = "#{dir}/#{f}"
-    mfile.print "install: #{dest}\n"
-    mfile.print "#{dest}: #{f} #{dir}\n\t@$(INSTALL_PROG) #{f} #{dir}\n"
-  end
-  for i in [[["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]], $INSTALLFILES]
-    files = install_files(mfile, i, nil, srcprefix) or next
-    for dir, *files in files
-      unless dirs.include?(dir)
-	dirs << dir
-	mfile.print("install: #{dir}\n")
-      end
-      files.each do |f|
-	dest = "#{dir}/#{File.basename(f)}"
-	mfile.print("install: #{dest}\n")
-	mfile.print("#{dest}: #{f} #{dir}\n\t@$(INSTALL_DATA) #{f} #{dir}\n")
-      end
+  if File.exist?("depend")
+    dfile = open("depend", "r")
+    mfile.printf "###\n"
+    while line = dfile.gets()
+      mfile.printf "%s", line.gsub(/\.o/, ".#{$OBJEXT}")
     end
+    dfile.close
   end
-  if dirs.empty?
-    mfile.print("install:\n")
-  else
-    dirs.each {|dir| mfile.print "#{dir}:\n\t@$(MAKEDIRS) #{dir}\n"}
-  end
-
-  mfile.print "\nsite-install: install\n\n"
-
-  return unless target
-
-  mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
-  mfile.print "\n"
+  mfile.close
 
-  %w[cc cpp cxx C].each do |ext|
-    COMPILE_RULES.each do |rule|
-      mfile.printf(rule, ext, $OBJEXT)
-      mfile.printf("\n\t%s\n\n", COMPILE_CXX)
+  if $cache_mod
+    begin
+      f = open($config_cache, "w")
+      for k,v in $lib_cache
+	f.printf "lib: %s %s\n", k, v.downcase
+      end
+      for k,v in $lib_found
+	f.printf "lib: %s %s\n", k, v.downcase
+      end
+      for k,v in $func_cache
+	f.printf "func: %s %s\n", k, v.downcase
+      end
+      for k,v in $func_found
+	f.printf "func: %s %s\n", k, v.downcase
+      end
+      for k,v in $hdr_cache
+	f.printf "hdr: %s %s\n", k, v.downcase
+      end
+      for k,v in $hdr_found
+	f.printf "hdr: %s %s\n", k, v.downcase
+      end
+      f.close
+    rescue
     end
   end
-  %w[c].each do |ext|
-    COMPILE_RULES.each do |rule|
-      mfile.printf(rule, ext, $OBJEXT)
-      mfile.printf("\n\t%s\n\n", COMPILE_C)
+  
+  if RUBY_PLATFORM =~ /beos/
+    if RUBY_PLATFORM =~ /^powerpc/ then
+      deffilename = "ruby.exp"
+    else
+      deffilename = "ruby.def"
     end
-  end
-
-  mfile.print "$(DLLIB): $(OBJS)\n\t"
-  mfile.print "@-$(RM) $@\n\t"
-  mfile.print "@-$(RM) $(TARGET).lib\n\t" if $mswin
-  mfile.print LINK_SO, "\n\n"
-  mfile.print "$(STATIC_LIB): $(OBJS)\n\t"
-  mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
-  if ranlib = config_string('RANLIB')
-    mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true"
-  end
-  mfile.print "\n\n"
-
-  depend = File.join(srcdir, "depend")
-  if File.exist?(depend)
-    open(depend, "r") do |dfile|
-      mfile.printf "###\n"
-      while line = dfile.gets()
-	line.gsub!(/\.o\b/, ".#{$OBJEXT}")
-	line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if $nmake
-	line.gsub!(/\$\(hdrdir\)\/config.h/, $config_h) if $config_h
-	mfile.print line
-      end
+    print "creating #{deffilename}\n"
+    open(deffilename, "w") do |file|
+      file.print("EXPORTS\n") if RUBY_PLATFORM =~ /^i/
+      file.print("Init_#{target}\n")
     end
   end
-ensure
-  mfile.close if mfile
 end
 
-def init_mkmf(config = CONFIG)
-  $enable_shared = config['ENABLE_SHARED'] == 'yes'
-  $defs = []
-  $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
-  $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
-  $LDFLAGS = (with_config("ldflags") || "").dup
-  $INCFLAGS = "-I#{$topdir}"
-  $DLDFLAGS = (arg_config("DLDFLAGS") || "").dup
-  $LIBEXT = config['LIBEXT'].dup
-  $OBJEXT = config["OBJEXT"].dup
-  $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
-  $LIBRUBYARG = ""
-  $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
-  $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
-  $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
-  $LIBPATH.unshift("$(topdir)") if $extmk
-  $INSTALLFILES = nil
-
-  $objs = nil
+$OBJEXT = CONFIG["OBJEXT"]
+$objs = nil
+$libs = "-lc"
+$local_flags = ""
+case RUBY_PLATFORM
+when /cygwin|beos|openstep|nextstep|rhapsody/
   $libs = ""
-  if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
-    $LIBRUBYARG = config['LIBRUBYARG']
-  end
-
-  $LOCAL_LIBS = ""
-  
-  $cleanfiles = []
-  $distcleanfiles = []
-  
-  dir_config("opt")
+when /mswin32/
+  $libs = ""
+  $local_flags = "rubymw.lib -link /LIBPATH:$(topdir) /EXPORT:Init_$(TARGET)"
 end
+$LOCAL_LIBS = ""
+$defs = []
 
-init_mkmf
-
-$make = with_config("make-prog", ENV["MAKE"] || "make")
-make, = Shellwords.shellwords($make)
-$nmake = nil
-case
-when $mswin
-  $nmake = ?m if /nmake/i =~ make
-when $bccwin
-  $nmake = ?b if /Borland/i =~ `#{make} -h`
+dir = with_config("opt-dir")
+if dir
+  idir = "-I"+dir+"/include"
+  ldir = "-L"+dir+"/lib"
 end
-
-Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
-  $srcdir = arg_config("--srcdir", File.dirname($0))
-$configure_args["--topsrcdir"] ||= $srcdir
-Config::CONFIG["topdir"] = CONFIG["topdir"] =
-  $curdir = arg_config("--curdir", Dir.pwd)
-$configure_args["--topdir"] ||= $curdir
-$ruby = arg_config("--ruby", CONFIG["ruby_install_name"])
-
-split = Shellwords.method(:shellwords).to_proc
-
-EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
-
-hdr = []
-config_string('COMMON_MACROS') do |s|
-  Shellwords.shellwords(s).each do |s|
-    /(.*?)(?:=(.*))/ =~ s
-    hdr << "#define #$1 #$2"
-  end
+unless idir
+  dir = with_config("opt-include")
+  idir = "-I"+dir if dir
 end
-config_string('COMMON_HEADERS') do |s|
-  Shellwords.shellwords(s).each {|s| hdr << "#include <#{s}>"}
+unless ldir
+  dir = with_config("opt-lib")
+  ldir = "-L"+dir if dir
 end
-COMMON_HEADERS = (hdr.join("\n") unless hdr.empty?)
-COMMON_LIBS = config_string('COMMON_LIBS', &split) || []
-
-COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
-COMPILE_C = config_string('COMPILE_C') || '$(CC) $(CFLAGS) $(CPPFLAGS) -c $<'
-COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<'
-TRY_LINK = config_string('TRY_LINK') ||
-  "$(CC) #{OUTFLAG}conftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) " \
-  "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(LOCAL_LIBS) $(LIBS)"
-LINK_SO = config_string('LINK_SO') ||
-  if CONFIG["DLEXT"] == $OBJEXT
-    "ld $(DLDFLAGS) -r -o $(DLLIB) $(OBJS)\n"
-  else
-    "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$(DLLIB) " \
-    "$(OBJS) $(LOCAL_LIBS) $(LIBS)"
-  end
-LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s'
-LIBARG = config_string('LIBARG') || '-l%s'
-
-CLEANINGS = "
-clean:
-		@$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@$(RM) Makefile extconf.h conftest.* mkmf.log
-		@$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
 
-realclean:	distclean
-"
+$CFLAGS = idir || ""
+$LDFLAGS = ldir || ""
diff --git a/lib/monitor.rb b/lib/monitor.rb
index c7f610cef6..75d9c35821 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -1,81 +1,30 @@
 =begin
 
-= monitor.rb
+monitor.rb
+Author: Shugo Maeda <shugo@netlab.co.jp>
+Version: 1.2.1
 
-Copyright (C) 2001  Shugo Maeda <shugo@ruby-lang.org>
+USAGE:
 
-This library is distributed under the terms of the Ruby license.
-You can freely distribute/modify this library.
+  foo = Foo.new
+  foo.extend(MonitorMixin)
+  cond = foo.new_cond
 
-== example
+  thread1:
+  foo.synchronize {
+    ...
+    cond.wait_until { foo.done? }
+    ...
+  }
 
-This is a simple example.
-
-  require 'monitor.rb'
-  
-  buf = []
-  buf.extend(MonitorMixin)
-  empty_cond = buf.new_cond
-  
-  # consumer
-  Thread.start do
-    loop do
-      buf.synchronize do
-        empty_cond.wait_while { buf.empty? }
-        print buf.shift
-      end
-    end
-  end
-  
-  # producer
-  while line = ARGF.gets
-    buf.synchronize do
-      buf.push(line)
-      empty_cond.signal
-    end
-  end
-
-The consumer thread waits for the producer thread to push a line
-to buf while buf.empty?, and the producer thread (main thread)
-reads a line from ARGF and push it to buf, then call
-empty_cond.signal.
+  thread2:
+  foo.synchronize {
+    foo.do_something
+    cond.signal
+  }
 
 =end
   
-
-#
-# Adds monitor functionality to an arbitrary object by mixing the module with
-# +include+.  For example:
-#
-#    require 'monitor.rb'
-#    
-#    buf = []
-#    buf.extend(MonitorMixin)
-#    empty_cond = buf.new_cond
-#    
-#    # consumer
-#    Thread.start do
-#      loop do
-#        buf.synchronize do
-#          empty_cond.wait_while { buf.empty? }
-#          print buf.shift
-#        end
-#      end
-#    end
-#    
-#    # producer
-#    while line = ARGF.gets
-#      buf.synchronize do
-#        buf.push(line)
-#        empty_cond.signal
-#      end
-#    end
-# 
-# The consumer thread waits for the producer thread to push a line
-# to buf while buf.empty?, and the producer thread (main thread)
-# reads a line from ARGF and push it to buf, then call
-# empty_cond.signal.
-#
 module MonitorMixin
   module Accessible
   protected
@@ -93,12 +42,6 @@ module MonitorMixin
     end
   end
   
-  #
-  # FIXME: This isn't documented in Nutshell.
-  #
-  # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
-  # above calls while_wait and signal, this class should be documented.
-  #
   class ConditionVariable
     class Timeout < Exception; end
     
@@ -109,15 +52,6 @@ module MonitorMixin
 	raise ThreadError, "current thread not owner"
       end
       
-      if timeout
-	ct = Thread.current
-	timeout_thread = Thread.start {
-	  Thread.pass
-	  sleep(timeout)
-	  ct.raise(Timeout.new)
-	}
-      end
-
       Thread.critical = true
       count = @monitor.mon_count
       @monitor.mon_count = 0
@@ -129,34 +63,34 @@ module MonitorMixin
       end
       t.wakeup if t
       @waiters.push(Thread.current)
-
-      preserved_exceptions = []
-      while true
-        begin
-          Thread.stop
-        rescue Timeout
-        rescue Exception => exception
-          preserved_exceptions << exception
-        end
-	Thread.critical = true
+      
+      if timeout
+	t = Thread.current
+	timeout_thread = Thread.start {
+	  sleep(timeout)
+	  t.raise(Timeout.new)
+	}
+      end
+      begin
+	Thread.stop
+      rescue Timeout
+	@waiters.delete(Thread.current)
+      ensure
 	if timeout && timeout_thread.alive?
 	  Thread.kill(timeout_thread)
 	end
-	if @waiters.include?(Thread.current)  # interrupted?
-	  @waiters.delete(Thread.current)
-	end
-
-        break if @monitor.mon_owner.nil? or @monitor.mon_owner == Thread.current
-        @monitor.mon_waiting_queue.delete(Thread.current)
-        @monitor.mon_waiting_queue.push(Thread.current)
+      end
+      
+      Thread.critical = true
+      while @monitor.mon_owner &&
+	  @monitor.mon_owner != Thread.current
+	@monitor.mon_waiting_queue.push(Thread.current)
+	Thread.stop
+	Thread.critical = true
       end
       @monitor.mon_owner = Thread.current
       @monitor.mon_count = count
       Thread.critical = false
-
-      unless preserved_exceptions.empty?
-        raise preserved_exceptions.first
-      end
     end
     
     def wait_while
@@ -215,9 +149,6 @@ module MonitorMixin
     obj.mon_initialize
   end
   
-  #
-  # Attempts to enter exclusive section.  Returns +false+ if lock fails.
-  #
   def try_mon_enter
     result = false
     Thread.critical = true
@@ -232,13 +163,9 @@ module MonitorMixin
     return result
   end
 
-  #
-  # Enters exlusive section.
-  #
   def mon_enter
     Thread.critical = true
     while mon_owner != nil && mon_owner != Thread.current
-      mon_entering_queue.delete(Thread.current)
       mon_entering_queue.push(Thread.current)
       Thread.stop
       Thread.critical = true
@@ -248,9 +175,6 @@ module MonitorMixin
     Thread.critical = false
   end
   
-  #
-  # Leaves exclusive section.
-  #
   def mon_exit
     if mon_owner != Thread.current
       raise ThreadError, "current thread not owner"
@@ -270,11 +194,6 @@ module MonitorMixin
     Thread.pass
   end
 
-  #
-  # Enters exclusive section and executes the block.  Leaves the exclusive
-  # section automatically when the block exits.  See example under
-  # +MonitorMixin+.
-  #
   def mon_synchronize
     mon_enter
     begin
@@ -285,9 +204,6 @@ module MonitorMixin
   end
   alias synchronize mon_synchronize
   
-  #
-  # FIXME: This isn't documented in Nutshell.
-  #
   def new_cond
     return ConditionVariable.new(self)
   end
@@ -307,25 +223,6 @@ class Monitor
   alias owner mon_owner
 end
 
-
-# Documentation comments:
-#  - All documentation comes from Nutshell.
-#  - MonitorMixin.new_cond appears in the example, but is not documented in
-#    Nutshell.
-#  - All the internals (internal modules Accessible and Initializable, class
-#    ConditionVariable) appear in RDoc.  It might be good to hide them, by
-#    making them private, or marking them :nodoc:, etc.
-#  - The entire example from the RD section at the top is replicated in the RDoc
-#    comment for MonitorMixin.  Does the RD section need to remain?
-#  - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
-#    not synchronize.
-#  - mon_owner is in Nutshell, but appears as an accessor in a separate module
-#    here, so is hard/impossible to RDoc.  Some other useful accessors
-#    (mon_count and some queue stuff) are also in this module, and don't appear
-#    directly in the RDoc output.
-#  - in short, it may be worth changing the code layout in this file to make the
-#    documentation easier
-
 # Local variables:
 # mode: Ruby
 # tab-width: 8
diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb
index 0192d83bee..e0fcf0f209 100644
--- a/lib/mutex_m.rb
+++ b/lib/mutex_m.rb
@@ -1,12 +1,10 @@
 #
 #   mutex_m.rb - 
-#   	$Release Version: 3.0$
+#   	$Release Version: 2.0$
 #   	$Revision: 1.7 $
 #   	$Date: 1998/02/27 04:28:57 $
 #       Original from mutex.rb
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#       modified by matz
-#       patched by akira yamada
+#   	by Keiju ISHITSUKA(SHL Japan Inc.)
 #
 # --
 #   Usage:
@@ -15,29 +13,21 @@
 #	obj.extend Mutex_m
 #	...
 #	extended object can be handled like Mutex
-#       or
-#	class Foo
-#	  include Mutex_m
-#	  ...
-#	end
-#	obj = Foo.new
-#	this obj can be handled like Mutex
 #
 
 module Mutex_m
-  def Mutex_m.define_aliases(cl)
-    cl.module_eval %q{
-      alias locked? mu_locked?
-      alias lock mu_lock
-      alias unlock mu_unlock
-      alias try_lock mu_try_lock
-      alias synchronize mu_synchronize
-    }
-  end  
-
   def Mutex_m.append_features(cl)
     super
-    define_aliases(cl) unless cl.instance_of?(Module)
+    unless cl.instance_of?(Module)
+      cl.module_eval %q{
+	alias locked? mu_locked?
+	alias lock mu_lock
+	alias unlock mu_unlock
+	alias try_lock mu_try_lock
+	alias synchronize mu_synchronize
+      }
+    end
+    return self
   end
   
   def Mutex_m.extend_object(obj)
@@ -51,9 +41,15 @@ module Mutex_m
 	    defined? unlock and
 	    defined? try_lock and
 	    defined? synchronize)
-      Mutex_m.define_aliases(class<<self;self;end)
+      eval "class << self
+	alias locked? mu_locked?
+	alias lock mu_lock
+	alias unlock mu_unlock
+	alias try_lock mu_try_lock
+	alias synchronize mu_synchronize
+      end"
     end
-    mu_initialize
+    initialize
   end
   
   # locking 
@@ -106,13 +102,10 @@ module Mutex_m
   
   private
   
-  def mu_initialize
+  def initialize(*args)
+    ret = super
     @mu_waiting = []
     @mu_locked = false;
-  end
-
-  def initialize(*args)
-    mu_initialize
-    super
+    return ret
   end
 end
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
deleted file mode 100644
index 203029ed3d..0000000000
--- a/lib/net/ftp.rb
+++ /dev/null
@@ -1,923 +0,0 @@
-# 
-# = net/ftp.rb
-# 
-# Written by Shugo Maeda <shugo@ruby-lang.org>.
-#
-# Documentation by Gavin Sinclair, sourced from "Programming Ruby" (Hunt/Thomas)
-# and "Ruby In a Nutshell" (Matsumoto), used with permission.
-# 
-# This library is distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
-# It is included in the Ruby standard library.
-#
-# See the Net::FTP class for an overview.
-#
-
-require "socket"
-require "monitor"
-
-module Net # :nodoc:
-
-  # :stopdoc:
-  class FTPError < StandardError; end
-  class FTPReplyError < FTPError; end
-  class FTPTempError < FTPError; end 
-  class FTPPermError < FTPError; end 
-  class FTPProtoError < FTPError; end
-  # :startdoc:
-
-  #
-  # This class implements the File Transfer Protocol.  If you have used a
-  # command-line FTP program, and are familiar with the commands, you will be
-  # able to use this class easily.  Some extra features are included to take
-  # advantage of Ruby's style and strengths.
-  #
-  # == Example
-  # 
-  #   require 'net/ftp'
-  #
-  # === Example 1
-  #  
-  #   ftp = Net::FTP.new('ftp.netlab.co.jp')
-  #   ftp.login
-  #   files = ftp.chdir('pub/lang/ruby/contrib')
-  #   files = ftp.list('n*')
-  #   ftp.getbinaryfile('nif.rb-0.91.gz', 'nif.gz', 1024)
-  #   ftp.close
-  #
-  # === Example 2
-  #
-  #   Net::FTP.open('ftp.netlab.co.jp') do |ftp|
-  #     ftp.login
-  #     files = ftp.chdir('pub/lang/ruby/contrib')
-  #     files = ftp.list('n*')
-  #     ftp.getbinaryfile('nif.rb-0.91.gz', 'nif.gz', 1024)
-  #   end
-  #
-  # == Major Methods
-  #
-  # The following are the methods most likely to be useful to users:
-  # - FTP::open
-  # - #getbinaryfile
-  # - #gettextfile
-  # - #putbinaryfile
-  # - #puttextfile
-  # - #chdir
-  # - #nlst
-  # - #size
-  # - #rename
-  # - #delete
-  #
-  class FTP
-    include MonitorMixin
-    
-    # :stopdoc:
-    FTP_PORT = 21
-    CRLF = "\r\n"
-    DEFAULT_BLOCKSIZE = 4096
-    # :startdoc:
-    
-    # When +true+, transfers are performed in binary mode.  Default: +true+.
-    attr_accessor :binary
-
-    # When +true+, the connection is in passive mode.  Default: false.
-    attr_accessor :passive
-
-    # When +true+, all traffic to and from the server is written
-    # to +$stdout+.  Default: +false+.
-    attr_accessor :debug_mode
-
-    # Sets or retrieves the +resume+ status, which decides whether incomplete
-    # transfers are resumed or restarted.  Default: +false+.
-    attr_accessor :resume
-
-    # The server's welcome message.
-    attr_reader :welcome
-
-    # The server's last response code.
-    attr_reader :last_response_code
-    alias lastresp last_response_code
-
-    # The server's last response.
-    attr_reader :last_response
-    
-    #
-    # A synonym for +FTP.new+, but with a mandatory host parameter.
-    #
-    # If a block is given, it is passed the +FTP+ object, which will be closed
-    # when the block finishes, or when an exception is raised.
-    #
-    def FTP.open(host, user = nil, passwd = nil, acct = nil)
-      if block_given?
-        ftp = new(host, user, passwd, acct)
-        begin
-          yield ftp
-        ensure
-          ftp.close
-        end
-      else
-        new(host, user, passwd, acct)
-      end
-    end
-    
-    #
-    # Creates and returns a new +FTP+ object. If a +host+ is given, a connection
-    # is made. Additionally, if the +user+ is given, the given user name,
-    # password, and (optionally) account are used to log in.  See #login.
-    #
-    def initialize(host = nil, user = nil, passwd = nil, acct = nil)
-      super()
-      @binary = true
-      @passive = false
-      @debug_mode = false
-      @resume = false
-      if host
-	connect(host)
-	if user
-	  login(user, passwd, acct)
-	end
-      end
-    end
-
-    # Obsolete
-    def return_code
-      $stderr.puts("warning: Net::FTP#return_code is obsolete and do nothing")
-      return "\n"
-    end
-
-    # Obsolete
-    def return_code=(s)
-      $stderr.puts("warning: Net::FTP#return_code= is obsolete and do nothing")
-    end
-
-    def open_socket(host, port)
-      if defined? SOCKSsocket and ENV["SOCKS_SERVER"]
-	@passive = true
-	return SOCKSsocket.open(host, port)
-      else
-	return TCPSocket.open(host, port)
-      end
-    end
-    private :open_socket
-    
-    #
-    # Establishes an FTP connection to host, optionally overriding the default
-    # port. If the environment variable +SOCKS_SERVER+ is set, sets up the
-    # connection through a SOCKS proxy. Raises an exception (typically
-    # +Errno::ECONNREFUSED+) if the connection cannot be established.
-    #
-    def connect(host, port = FTP_PORT)
-      if @debug_mode
-	print "connect: ", host, ", ", port, "\n"
-      end
-      synchronize do
-	@sock = open_socket(host, port)
-	voidresp
-      end
-    end
-
-    #
-    # WRITEME or make private
-    #
-    def set_socket(sock, get_greeting = true)
-      synchronize do
-	@sock = sock
-	if get_greeting
-	  voidresp
-	end
-      end
-    end
-
-    def sanitize(s)
-      if s =~ /^PASS /i
-	return s[0, 5] + "*" * (s.length - 5)
-      else
-	return s
-      end
-    end
-    private :sanitize
-    
-    def putline(line)
-      if @debug_mode
-	print "put: ", sanitize(line), "\n"
-      end
-      line = line + CRLF
-      @sock.write(line)
-    end
-    private :putline
-    
-    def getline
-      line = @sock.readline # if get EOF, raise EOFError
-      line.sub!(/(\r\n|\n|\r)\z/n, "")
-      if @debug_mode
-	print "get: ", sanitize(line), "\n"
-      end
-      return line
-    end
-    private :getline
-    
-    def getmultiline
-      line = getline
-      buff = line
-      if line[3] == ?-
-	  code = line[0, 3]
-	begin
-	  line = getline
-	  buff << "\n" << line
-	end until line[0, 3] == code and line[3] != ?-
-      end
-      return buff << "\n"
-    end
-    private :getmultiline
-    
-    def getresp
-      @last_response = getmultiline
-      @last_response_code = @last_response[0, 3]
-      case @last_response_code
-      when /\A[123]/
-	return @last_response
-      when /\A4/
-	raise FTPTempError, @last_response
-      when /\A5/
-	raise FTPPermError, @last_response
-      else
-	raise FTPProtoError, @last_response
-      end
-    end
-    private :getresp
-    
-    def voidresp
-      resp = getresp
-      if resp[0] != ?2
-	raise FTPReplyError, resp
-      end
-    end
-    private :voidresp
-    
-    #
-    # Sends a command and returns the response.
-    #
-    def sendcmd(cmd)
-      synchronize do
-	putline(cmd)
-	return getresp
-      end
-    end
-    
-    #
-    # Sends a command and expect a response beginning with '2'.
-    #
-    def voidcmd(cmd)
-      synchronize do
-	putline(cmd)
-	voidresp
-      end
-    end
-    
-    def sendport(host, port)
-      af = (@sock.peeraddr)[0]
-      if af == "AF_INET"
-	hbytes = host.split(".")
-	pbytes = [port / 256, port % 256]
-	bytes = hbytes + pbytes
-	cmd = "PORT " + bytes.join(",")
-      elsif af == "AF_INET6"
-	cmd = "EPRT |2|" + host + "|" + sprintf("%d", port) + "|"
-      else
-	raise FTPProtoError, host
-      end
-      voidcmd(cmd)
-    end
-    private :sendport
-    
-    def makeport
-      sock = TCPServer.open(@sock.addr[3], 0)
-      port = sock.addr[1]
-      host = sock.addr[3]
-      resp = sendport(host, port)
-      return sock
-    end
-    private :makeport
-    
-    def makepasv
-      if @sock.peeraddr[0] == "AF_INET"
-	host, port = parse227(sendcmd("PASV"))
-      else
-	host, port = parse229(sendcmd("EPSV"))
-	#     host, port = parse228(sendcmd("LPSV"))
-      end
-      return host, port
-    end
-    private :makepasv
-    
-    def transfercmd(cmd, rest_offset = nil)
-      if @passive
-	host, port = makepasv
-	conn = open_socket(host, port)
-	if @resume and rest_offset
-	  resp = sendcmd("REST " + rest_offset.to_s) 
-	  if resp[0] != ?3
-	    raise FTPReplyError, resp
-	  end
-	end
-	resp = sendcmd(cmd)
-	if resp[0] != ?1
-	  raise FTPReplyError, resp
-	end
-      else
-	sock = makeport
-	if @resume and rest_offset
-	  resp = sendcmd("REST " + rest_offset.to_s) 
-	  if resp[0] != ?3
-	    raise FTPReplyError, resp
-	  end
-	end
-	resp = sendcmd(cmd)
-	if resp[0] != ?1
-	  raise FTPReplyError, resp
-	end
-	conn = sock.accept
-	sock.close
-      end
-      return conn
-    end
-    private :transfercmd
-    
-    def getaddress
-      thishost = Socket.gethostname
-      if not thishost.index(".")
-	thishost = Socket.gethostbyname(thishost)[0]
-      end
-      if ENV.has_key?("LOGNAME")
-	realuser = ENV["LOGNAME"]
-      elsif ENV.has_key?("USER")
-	realuser = ENV["USER"]
-      else
-	realuser = "anonymous"
-      end
-      return realuser + "@" + thishost
-    end
-    private :getaddress
-    
-    #
-    # Logs in to the remote host. The session must have been previously
-    # connected.  If +user+ is the string "anonymous" and the +password+ is
-    # +nil+, a password of <tt>user@host</tt> is synthesized. If the +acct+
-    # parameter is not +nil+, an FTP ACCT command is sent following the
-    # successful login.  Raises an exception on error (typically
-    # <tt>Net::FTPPermError</tt>).
-    #
-    def login(user = "anonymous", passwd = nil, acct = nil)
-      if user == "anonymous" and passwd == nil
-	passwd = getaddress
-      end
-      
-      resp = ""
-      synchronize do
-	resp = sendcmd('USER ' + user)
-	if resp[0] == ?3
-	  resp = sendcmd('PASS ' + passwd)
-	end
-	if resp[0] == ?3
-	  resp = sendcmd('ACCT ' + acct)
-	end
-      end
-      if resp[0] != ?2
-	raise FTPReplyError, resp
-      end
-      @welcome = resp
-    end
-    
-    #
-    # Puts the connection into binary (image) mode, issues the given command,
-    # and fetches the data returned, passing it to the associated block in
-    # chunks of +blocksize+ characters. Note that +cmd+ is a server command
-    # (such as "RETR myfile").
-    #
-    def retrbinary(cmd, blocksize, rest_offset = nil) # :yield: data
-      synchronize do
-	voidcmd("TYPE I")
-	conn = transfercmd(cmd, rest_offset)
-	loop do
-	  data = conn.read(blocksize)
-	  break if data == nil
-	  yield(data)
-	end
-	conn.close
-	voidresp
-      end
-    end
-    
-    #
-    # Puts the connection into ASCII (text) mode, issues the given command, and
-    # passes the resulting data, one line at a time, to the associated block. If
-    # no block is given, prints the lines. Note that +cmd+ is a server command
-    # (such as "RETR myfile").
-    #
-    def retrlines(cmd) # :yield: line
-      synchronize do
-	voidcmd("TYPE A")
-	conn = transfercmd(cmd)
-	loop do
-	  line = conn.gets
-	  break if line == nil
-	  if line[-2, 2] == CRLF
-	    line = line[0 .. -3]
-	  elsif line[-1] == ?\n
-	    line = line[0 .. -2]
-	  end
-	  yield(line)
-	end
-	conn.close
-	voidresp
-      end
-    end
-    
-    #
-    # Puts the connection into binary (image) mode, issues the given server-side
-    # command (such as "STOR myfile"), and sends the contents of the file named
-    # +file+ to the server. If the optional block is given, it also passes it
-    # the data, in chunks of +blocksize+ characters.
-    #
-    def storbinary(cmd, file, blocksize, rest_offset = nil, &block) # :yield: data
-      if rest_offset
-        file.seek(rest_offset, IO::SEEK_SET)
-      end
-      synchronize do
-	voidcmd("TYPE I")
-	conn = transfercmd(cmd, rest_offset)
-	loop do
-	  buf = file.read(blocksize)
-	  break if buf == nil
-	  conn.write(buf)
-	  yield(buf) if block
-	end
-	conn.close
-	voidresp
-      end
-    end
-    
-    #
-    # Puts the connection into ASCII (text) mode, issues the given server-side
-    # command (such as "STOR myfile"), and sends the contents of the file
-    # named +file+ to the server, one line at a time. If the optional block is
-    # given, it also passes it the lines.
-    #
-    def storlines(cmd, file, &block) # :yield: line
-      synchronize do
-	voidcmd("TYPE A")
-	conn = transfercmd(cmd)
-	loop do
-	  buf = file.gets
-	  break if buf == nil
-	  if buf[-2, 2] != CRLF
-	    buf = buf.chomp + CRLF
-	  end
-	  conn.write(buf)
-	  yield(buf) if block
-	end
-	conn.close
-	voidresp
-      end
-    end
-
-    #
-    # Retrieves +remotefile+ in binary mode, storing the result in +localfile+.
-    # If a block is supplied, it is passed the retrieved data in +blocksize+
-    # chunks.
-    #
-    def getbinaryfile(remotefile, localfile = File.basename(remotefile),
-		      blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
-      if @resume
-	rest_offset = File.size?(localfile)
-	f = open(localfile, "a")
-      else
-	rest_offset = nil
-	f = open(localfile, "w")
-      end
-      begin
-	f.binmode
-	retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data|
-	  f.write(data)
-	  yield(data) if block
-	end
-      ensure
-	f.close
-      end
-    end
-    
-    #
-    # Retrieves +remotefile+ in ASCII (text) mode, storing the result in
-    # +localfile+. If a block is supplied, it is passed the retrieved data one
-    # line at a time.
-    #
-    def gettextfile(remotefile, localfile = File.basename(remotefile), &block) # :yield: line
-      f = open(localfile, "w")
-      begin
-	retrlines("RETR " + remotefile) do |line|
-	  f.puts(line)
-	  yield(line) if block
-	end
-      ensure
-	f.close
-      end
-    end
-
-    #
-    # Retrieves +remotefile+ in whatever mode the session is set (text or
-    # binary).  See #gettextfile and #getbinaryfile.
-    #
-    def get(remotefile, localfile = File.basename(remotefile),
-	    blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
-      unless @binary
-	gettextfile(remotefile, localfile, &block)
-      else
-	getbinaryfile(remotefile, localfile, blocksize, &block)
-      end
-    end
-    
-    #
-    # Transfers +localfile+ to the server in binary mode, storing the result in
-    # +remotefile+. If a block is supplied, calls it, passing in the transmitted
-    # data in +blocksize+ chunks.
-    #
-    def putbinaryfile(localfile, remotefile = File.basename(localfile),
-		      blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
-      if @resume
-        begin
-          rest_offset = size(remotefile)
-        rescue Net::FTPPermError
-          rest_offset = nil
-        end
-      else
-	rest_offset = nil
-      end
-      f = open(localfile)
-      begin
-	f.binmode
-	storbinary("STOR " + remotefile, f, blocksize, rest_offset, &block)
-      ensure
-	f.close
-      end
-    end
-    
-    #
-    # Transfers +localfile+ to the server in ASCII (text) mode, storing the result
-    # in +remotefile+. If callback or an associated block is supplied, calls it,
-    # passing in the transmitted data one line at a time.
-    #
-    def puttextfile(localfile, remotefile = File.basename(localfile), &block) # :yield: line
-      f = open(localfile)
-      begin
-	storlines("STOR " + remotefile, f, &block)
-      ensure
-	f.close
-      end
-    end
-
-    #
-    # Tranfers +localfile+ to the server in whatever mode the session is set
-    # (text or binary).  See #puttextfile and #putbinaryfile.
-    #
-    def put(localfile, remotefile = File.basename(localfile),
-	    blocksize = DEFAULT_BLOCKSIZE, &block)
-      unless @binary
-	puttextfile(localfile, remotefile, &block)
-      else
-	putbinaryfile(localfile, remotefile, blocksize, &block)
-      end
-    end
-
-    #
-    # Sends the ACCT command.  TODO: more info.
-    #
-    def acct(account)
-      cmd = "ACCT " + account
-      voidcmd(cmd)
-    end
-    
-    #
-    # Returns an array of filenames in the remote directory.
-    #
-    def nlst(dir = nil)
-      cmd = "NLST"
-      if dir
-	cmd = cmd + " " + dir
-      end
-      files = []
-      retrlines(cmd) do |line|
-	files.push(line)
-      end
-      return files
-    end
-    
-    #
-    # Returns an array of file information in the directory (the output is like
-    # `ls -l`).  If a block is given, it iterates through the listing.
-    #
-    def list(*args, &block) # :yield: line
-      cmd = "LIST"
-      args.each do |arg|
-	cmd = cmd + " " + arg
-      end
-      if block
-	retrlines(cmd, &block)
-      else
-	lines = []
-	retrlines(cmd) do |line|
-	  lines << line
-	end
-	return lines
-      end
-    end
-    alias ls list
-    alias dir list
-    
-    #
-    # Renames a file on the server.
-    #
-    def rename(fromname, toname)
-      resp = sendcmd("RNFR " + fromname)
-      if resp[0] != ?3
-	raise FTPReplyError, resp
-      end
-      voidcmd("RNTO " + toname)
-    end
-    
-    #
-    # Deletes a file on the server.
-    #
-    def delete(filename)
-      resp = sendcmd("DELE " + filename)
-      if resp[0, 3] == "250"
-	return
-      elsif resp[0] == ?5
-	raise FTPPermError, resp
-      else
-	raise FTPReplyError, resp
-      end
-    end
-    
-    #
-    # Changes the (remote) directory.
-    #
-    def chdir(dirname)
-      if dirname == ".."
-	begin
-	  voidcmd("CDUP")
-	  return
-	rescue FTPPermError
-	  if $![0, 3] != "500"
-	    raise FTPPermError, $!
-	  end
-	end
-      end
-      cmd = "CWD " + dirname
-      voidcmd(cmd)
-    end
-    
-    #
-    # Returns the size of the given (remote) filename.
-    #
-    def size(filename)
-      voidcmd("TYPE I")
-      resp = sendcmd("SIZE " + filename)
-      if resp[0, 3] != "213" 
-	raise FTPReplyError, resp
-      end
-      return resp[3..-1].strip.to_i
-    end
-    
-    MDTM_REGEXP = /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/  # :nodoc:
-    
-    #
-    # Returns the last modification time of the (remote) file.  If +local+ is
-    # +true+, it is returned as a local time, otherwise it's a UTC time.
-    #
-    def mtime(filename, local = false)
-      str = mdtm(filename)
-      ary = str.scan(MDTM_REGEXP)[0].collect {|i| i.to_i}
-      return local ? Time.local(*ary) : Time.gm(*ary)
-    end
-    
-    #
-    # Creates a remote directory.
-    #
-    def mkdir(dirname)
-      resp = sendcmd("MKD " + dirname)
-      return parse257(resp)
-    end
-    
-    #
-    # Removes a remote directory.
-    #
-    def rmdir(dirname)
-      voidcmd("RMD " + dirname)
-    end
-    
-    #
-    # Returns the current remote directory.
-    #
-    def pwd
-      resp = sendcmd("PWD")
-      return parse257(resp)
-    end
-    alias getdir pwd
-    
-    #
-    # Returns system information.
-    #
-    def system
-      resp = sendcmd("SYST")
-      if resp[0, 3] != "215"
-	raise FTPReplyError, resp
-      end
-      return resp[4 .. -1]
-    end
-    
-    #
-    # Aborts the previous command (ABOR command).
-    #
-    def abort
-      line = "ABOR" + CRLF
-      print "put: ABOR\n" if @debug_mode
-      @sock.send(line, Socket::MSG_OOB)
-      resp = getmultiline
-      unless ["426", "226", "225"].include?(resp[0, 3])
-	raise FTPProtoError, resp
-      end
-      return resp
-    end
-    
-    #
-    # Returns the status (STAT command).
-    #
-    def status
-      line = "STAT" + CRLF
-      print "put: STAT\n" if @debug_mode
-      @sock.send(line, Socket::MSG_OOB)
-      return getresp
-    end
-    
-    #
-    # Issues the MDTM command.  TODO: more info.
-    #
-    def mdtm(filename)
-      resp = sendcmd("MDTM " + filename)
-      if resp[0, 3] == "213"
-	return resp[3 .. -1].strip
-      end
-    end
-    
-    #
-    # Issues the HELP command.
-    #
-    def help(arg = nil)
-      cmd = "HELP"
-      if arg
-	cmd = cmd + " " + arg
-      end
-      sendcmd(cmd)
-    end
-    
-    #
-    # Exits the FTP session.
-    #
-    def quit
-      voidcmd("QUIT")
-    end
-
-    #
-    # Issues a NOOP command.
-    #
-    def noop
-      voidcmd("NOOP")
-    end
-
-    #
-    # Issues a SITE command.
-    #
-    def site(arg)
-      cmd = "SITE " + arg
-      voidcmd(cmd)
-    end
-    
-    #
-    # Closes the connection.  Further operations are impossible until you open
-    # a new connection with #connect.
-    #
-    def close
-      @sock.close if @sock and not @sock.closed?
-    end
-    
-    #
-    # Returns +true+ iff the connection is closed.
-    #
-    def closed?
-      @sock == nil or @sock.closed?
-    end
-    
-    def parse227(resp)
-      if resp[0, 3] != "227"
-	raise FTPReplyError, resp
-      end
-      left = resp.index("(")
-      right = resp.index(")")
-      if left == nil or right == nil
-	raise FTPProtoError, resp
-      end
-      numbers = resp[left + 1 .. right - 1].split(",")
-      if numbers.length != 6
-	raise FTPProtoError, resp
-      end
-      host = numbers[0, 4].join(".")
-      port = (numbers[4].to_i << 8) + numbers[5].to_i
-      return host, port
-    end
-    private :parse227
-    
-    def parse228(resp)
-      if resp[0, 3] != "228"
-	raise FTPReplyError, resp
-      end
-      left = resp.index("(")
-      right = resp.index(")")
-      if left == nil or right == nil
-	raise FTPProtoError, resp
-      end
-      numbers = resp[left + 1 .. right - 1].split(",")
-      if numbers[0] == "4"
-	if numbers.length != 9 || numbers[1] != "4" || numbers[2 + 4] != "2"
-	  raise FTPProtoError, resp
-	end
-	host = numbers[2, 4].join(".")
-	port = (numbers[7].to_i << 8) + numbers[8].to_i
-      elsif numbers[0] == "6"
-	if numbers.length != 21 || numbers[1] != "16" || numbers[2 + 16] != "2"
-	  raise FTPProtoError, resp
-	end
-	v6 = ["", "", "", "", "", "", "", ""]
-	for i in 0 .. 7
-	  v6[i] = sprintf("%02x%02x", numbers[(i * 2) + 2].to_i,
-			  numbers[(i * 2) + 3].to_i)
-	end
-	host = v6[0, 8].join(":")
-	port = (numbers[19].to_i << 8) + numbers[20].to_i
-      end 
-      return host, port
-    end
-    private :parse228
-    
-    def parse229(resp)
-      if resp[0, 3] != "229"
-	raise FTPReplyError, resp
-      end
-      left = resp.index("(")
-      right = resp.index(")")
-      if left == nil or right == nil
-	raise FTPProtoError, resp
-      end
-      numbers = resp[left + 1 .. right - 1].split(resp[left + 1, 1])
-      if numbers.length != 4
-	raise FTPProtoError, resp
-      end
-      port = numbers[3].to_i
-      host = (@sock.peeraddr())[3]
-      return host, port
-    end
-    private :parse229
-    
-    def parse257(resp)
-      if resp[0, 3] != "257"
-	raise FTPReplyError, resp
-      end
-      if resp[3, 2] != ' "'
-	return ""
-      end
-      dirname = ""
-      i = 5
-      n = resp.length
-      while i < n
-	c = resp[i, 1]
-	i = i + 1
-	if c == '"'
-	  if i > n or resp[i, 1] != '"'
-	    break
-	  end
-	  i = i + 1
-	end
-	dirname = dirname + c
-      end
-      return dirname
-    end
-    private :parse257
-  end
-
-end
-
-
-# Documentation comments:
-#  - sourced from pickaxe and nutshell, with improvements (hopefully)
-#  - three methods should be private (search WRITEME)
-#  - two methods need more information (search TODO)
diff --git a/lib/net/http.rb b/lib/net/http.rb
deleted file mode 100644
index 684e55f8db..0000000000
--- a/lib/net/http.rb
+++ /dev/null
@@ -1,1807 +0,0 @@
-#
-# = net/http.rb
-#
-# Copyright (c) 1999-2003 Yukihiro Matsumoto
-# Copyright (c) 1999-2003 Minero Aoki
-# 
-# Written & maintained by Minero Aoki <aamine@loveruby.net>.
-#
-# This file is derived from "http-access.rb".
-#
-# Documented by Minero Aoki; converted to RDoc by William Webber.
-# 
-# This program is free software. You can re-distribute and/or
-# modify this program under the same terms of ruby itself ---
-# Ruby Distribution License or GNU General Public License.
-#
-# See Net:::HTTP for an overview and examples. 
-# 
-# NOTE: You can find Japanese version of this document here:
-# http://www.ruby-lang.org/ja/man-1.6/?cmd=view;name=net%2Fhttp.rb
-# 
-#--
-# $Id$
-#++ 
-
-require 'net/protocol'
-require 'uri'
-
-
-module Net # :nodoc:
-
-  # :stopdoc:
-  class HTTPBadResponse < StandardError; end
-  class HTTPHeaderSyntaxError < StandardError; end
-  # :startdoc:
-
-  # == What Is This Library?
-  # 
-  # This library provides your program functions to access WWW
-  # documents via HTTP, Hyper Text Transfer Protocol version 1.1.
-  # For details of HTTP, refer [RFC2616]
-  # ((<URL:http://www.ietf.org/rfc/rfc2616.txt>)).
-  # 
-  # == Examples
-  # 
-  # === Getting Document From WWW Server
-  # 
-  # (formal version)
-  # 
-  #     require 'net/http'
-  #     Net::HTTP.start('www.example.com', 80) { |http|
-  #         response = http.get('/index.html')
-  #         puts response.body
-  #     }
-  # 
-  # (shorter version)
-  # 
-  #     require 'net/http'
-  #     Net::HTTP.get_print 'www.example.com', '/index.html'
-  # 
-  #             or
-  # 
-  #     require 'net/http'
-  #     require 'uri'
-  #     Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
-  # 
-  # === Posting Form Data
-  # 
-  #     require 'net/http'
-  #     Net::HTTP.start('some.www.server', 80) { |http|
-  #         response = http.post('/cgi-bin/search.rb', 'query=ruby')
-  #     }
-  # 
-  # === Accessing via Proxy
-  # 
-  # Net::HTTP.Proxy creates http proxy class. It has same
-  # methods of Net::HTTP but its instances always connect to
-  # proxy, instead of given host.
-  # 
-  #     require 'net/http'
-  # 
-  #     proxy_addr = 'your.proxy.host'
-  #     proxy_port = 8080
-  #             :
-  #     Net::HTTP::Proxy(proxy_addr, proxy_port).start('www.example.com') {|http|
-  #         # always connect to your.proxy.addr:8080
-  #             :
-  #     }
-  # 
-  # Since Net::HTTP.Proxy returns Net::HTTP itself when proxy_addr is nil,
-  # there's no need to change code if there's proxy or not.
-  # 
-  # There are two additional parameters in Net::HTTP.Proxy which allow to
-  # specify proxy user name and password:
-  # 
-  #     Net::HTTP::Proxy(proxy_addr, proxy_port, proxy_user = nil, proxy_pass = nil)
-  # 
-  # You may use them to work with authorization-enabled proxies:
-  # 
-  #     require 'net/http'
-  #     require 'uri'
-  #     
-  #     proxy_host = 'your.proxy.host'
-  #     proxy_port = 8080
-  #     uri = URI.parse(ENV['http_proxy'])
-  #     proxy_user, proxy_pass = uri.userinfo.split(/:/) if uri.userinfo
-  #     Net::HTTP::Proxy(proxy_host, proxy_port,
-  #                      proxy_user, proxy_pass).start('www.example.com') {|http|
-  #       # always connect to your.proxy.addr:8080 using specified username and password
-  #             :
-  #     }
-  #     
-  # 
-  # === Following Redirection
-  # 
-  #     require 'net/http'
-  #     require 'uri'
-  # 
-  #     def fetch( uri_str, limit = 10 )
-  #       # You should choose better exception. 
-  #       raise ArgumentError, 'http redirect too deep' if limit == 0
-  # 
-  #       response = Net::HTTP.get_response(URI.parse(uri_str))
-  #       case response
-  #       when Net::HTTPSuccess     then response
-  #       when Net::HTTPRedirection then fetch(response['location'], limit - 1)
-  #       else
-  #         response.error!
-  #       end
-  #     end
-  # 
-  #     print fetch('http://www.ruby-lang.org')
-  # 
-  # Net::HTTPSuccess and Net::HTTPRedirection is a HTTPResponse class.
-  # All HTTPResponse objects belong to its own response class which
-  # indicate HTTP result status. For details of response classes,
-  # see section "HTTP Response Classes".
-  # 
-  # === Basic Authentication
-  # 
-  #     require 'net/http'
-  # 
-  #     Net::HTTP.start('www.example.com') {|http|
-  #       req = Net::HTTP::Get.new('/secret-page.html')
-  #       req.basic_auth 'account', 'password'
-  #       response = http.request(req)
-  #       print response.body
-  #     }
-  # 
-  # === HTTP Response Classes
-  #
-  # TODO: write me.
-  # 
-  # == Switching Net::HTTP versions
-  # 
-  # You can use net/http.rb 1.1 features (bundled with Ruby 1.6)
-  # by calling HTTP.version_1_1. Calling Net::HTTP.version_1_2
-  # allows you to use 1.2 features again.
-  # 
-  #     # example
-  #     Net::HTTP.start { |http1| ...(http1 has 1.2 features)... }
-  # 
-  #     Net::HTTP.version_1_1
-  #     Net::HTTP.start { |http2| ...(http2 has 1.1 features)... }
-  # 
-  #     Net::HTTP.version_1_2
-  #     Net::HTTP.start { |http3| ...(http3 has 1.2 features)... }
-  # 
-  # This function is NOT thread-safe.
-  #
-  class HTTP < Protocol
-
-    # :stopdoc:
-    Revision = %q$Revision$.split[1]
-    HTTPVersion = '1.1'
-    @@newimpl = true    # for backward compatability
-    # :startdoc:
-
-    # Turns on net/http 1.2 (ruby 1.8) features.
-    # Defaults to ON in ruby 1.8.
-    #
-    # I strongly recommend to call this method always.
-    #
-    #   require 'net/http'
-    #   Net::HTTP.version_1_2
-    #
-    def HTTP.version_1_2
-      @@newimpl = true
-    end
-
-    # Turns on net/http 1.1 (ruby 1.6) features.
-    # Defaults to OFF in ruby 1.8.
-    def HTTP.version_1_1
-      @@newimpl = false
-    end
-
-    # true if net/http is in version 1.2 mode.
-    # Defaults to true.
-    def HTTP.version_1_2?
-      @@newimpl
-    end
-
-    # true if net/http is in version 1.1 compatible mode.
-    # Defaults to true.
-    def HTTP.version_1_1?
-      not @@newimpl
-    end
-
-    class << HTTP
-      alias is_version_1_1? version_1_1?   #:nodoc:
-      alias is_version_1_2? version_1_2?   #:nodoc:
-    end
-
-    def HTTP.setimplversion( obj )   #:nodoc:
-      f = @@newimpl
-      obj.instance_eval { @newimpl = f }
-    end
-    private_class_method :setimplversion
-
-    #
-    # short cut methods
-    #
-
-    #
-    # Get body from target and output it to +$stdout+.  The
-    # target can either be specified as (+uri+), or as
-    # (+host+, +path+, +port+ = 80); so: 
-    #
-    #    Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
-    #
-    # or:
-    #
-    #    Net::HTTP.get_print('www.example.com', '/index.html')
-    #
-    def HTTP.get_print( arg1, arg2 = nil, port = nil )
-      if arg2
-        addr, path = arg1, arg2
-      else
-        uri = arg1
-        addr = uri.host
-        path = uri.request_uri
-        port = uri.port
-      end
-      new(addr, port || HTTP.default_port).start {|http|
-        http.get path, nil, $stdout
-      }
-      nil
-    end
-
-    # Send a GET request to the target and return the response
-    # as a string.  The target can either be specified as
-    # (+uri+), or as (+host+, +path+, +port+ = 80); so:
-    # 
-    #    print Net::HTTP.get(URI.parse('http://www.example.com/index.html'))
-    #
-    # or:
-    #
-    #    print Net::HTTP.get('www.example.com', '/index.html')
-    #
-    def HTTP.get( arg1, arg2 = nil, arg3 = nil )
-      get_response(arg1,arg2,arg3).body
-    end
-
-    # Send a GET request to the target and return the response
-    # as a Net::HTTPResponse object.  The target can either be specified as
-    # (+uri+), or as (+host+, +path+, +port+ = 80); so:
-    # 
-    #    res = Net::HTTP.get_response(URI.parse('http://www.example.com/index.html'))
-    #    print res.body
-    #
-    # or:
-    #
-    #    res = Net::HTTP.get_response('www.example.com', '/index.html')
-    #    print res.body
-    #
-    def HTTP.get_response( arg1, arg2 = nil, arg3 = nil )
-      if arg2
-        get_by_path(arg1, arg2, arg3)
-      else
-        get_by_uri(arg1)
-      end
-    end
-
-    def HTTP.get_by_path( addr, path, port = nil )   #:nodoc:
-      new(addr, port || HTTP.default_port).start {|http|
-        return http.request(Get.new(path))
-      }
-    end
-    private_class_method :get_by_path
-
-    def HTTP.get_by_uri( uri )   #:nodoc:
-      # Should we allow this?
-      # uri = URI.parse(uri) unless uri.respond_to?(:host)
-      new(uri.host, uri.port).start {|http|
-        return http.request(Get.new(uri.request_uri))
-      }
-    end
-    private_class_method :get_by_uri
-
-    #
-    # HTTP session management
-    #
-
-    # The default port to use for HTTP requests; defaults to 80.
-    def HTTP.default_port
-      80
-    end
-
-    def HTTP.socket_type   #:nodoc: obsolete
-      InternetMessageIO
-    end
-
-    class << HTTP
-      # creates a new Net::HTTP object and opens its TCP connection and 
-      # HTTP session.  If the optional block is given, the newly 
-      # created Net::HTTP object is passed to it and closed when the 
-      # block finishes.  In this case, the return value of this method
-      # is the return value of the block.  If no block is given, the
-      # return value of this method is the newly created Net::HTTP object
-      # itself, and the caller is responsible for closing it upon completion.
-      def start( address, port = nil, p_addr = nil, p_port = nil, p_user = nil, p_pass = nil, &block ) # :yield: +http+
-        new(address, port, p_addr, p_port, p_user, p_pass).start(&block)
-      end
-
-      alias newobj new
-
-      # Creates a new Net::HTTP object.
-      # If +proxy_addr+ is given, creates an Net::HTTP object with proxy support.
-      # This method does not open the TCP connection.
-      def new( address, port = nil, p_addr = nil, p_port = nil, p_user = nil, p_pass = nil )
-        obj = Proxy(p_addr, p_port, p_user, p_pass).newobj(address, port)
-        setimplversion obj
-        obj
-      end
-    end
-
-    # Creates a new Net::HTTP object for the specified +address+.
-    # This method does not open the TCP connection.
-    def initialize( address, port = nil )
-      @address = address
-      @port    = port || HTTP.default_port
-
-      @curr_http_version = HTTPVersion
-      @seems_1_0_server = false
-      @close_on_empty_response = false
-      @socket  = nil
-      @started = false
-
-      @open_timeout = 30
-      @read_timeout = 60
-
-      @debug_output = nil
-    end
-
-    def inspect
-      "#<#{self.class} #{@address}:#{@port} open=#{started?}>"
-    end
-
-    # *WARNING* This method causes serious security hole.
-    # Never use this method in production code.
-    #
-    # Set an output stream for debugging.
-    #
-    #   http = Net::HTTP.new
-    #   http.set_debug_output $stderr
-    #   http.start { .... }
-    #
-    def set_debug_output( output )
-      @debug_output = output
-    end
-
-    # The host name to connect to.
-    attr_reader :address
-
-    # The port number to connect to.
-    attr_reader :port
-
-    # Seconds to wait until connection is opened.
-    # If the HTTP object cannot open a conection in this many seconds,
-    # it raises a TimeoutError exception.
-    attr_accessor :open_timeout
-
-    # Seconds to wait until reading one block (by one read(2) call).
-    # If the HTTP object cannot open a conection in this many seconds,
-    # it raises a TimeoutError exception.
-    attr_reader :read_timeout
-
-    # Setter for the read_timeout attribute.
-    def read_timeout=( sec )
-      @socket.read_timeout = sec if @socket
-      @read_timeout = sec
-    end
-
-    # returns true if the HTTP session is started.
-    def started?
-      @started
-    end
-
-    alias active? started?   #:nodoc: obsolete
-
-    attr_accessor :close_on_empty_response
-
-    # Opens TCP connection and HTTP session.
-    # 
-    # When this method is called with block, gives a HTTP object
-    # to the block and closes the TCP connection / HTTP session
-    # after the block executed.
-    #
-    # When called with a block, returns the return value of the
-    # block; otherwise, returns self.
-    #
-    def start  # :yield: http
-      raise IOError, 'HTTP session already opened' if @started
-      if block_given?
-        begin
-          do_start
-          return yield(self)
-        ensure
-          do_finish
-        end
-      end
-      do_start
-      self
-    end
-
-    def do_start
-      @socket = self.class.socket_type.open(conn_address(), conn_port(),
-                                            @open_timeout, @read_timeout,
-                                            @debug_output)
-      on_connect
-      @started = true
-    end
-    private :do_start
-
-    def on_connect
-    end
-    private :on_connect
-
-    # Finishes HTTP session and closes TCP connection.
-    # Raises IOError if not started.
-    def finish
-      raise IOError, 'HTTP session not started yet' unless started?
-      do_finish
-    end
-
-    def do_finish
-      @started = false
-      @socket.close if @socket and not @socket.closed?
-      @socket = nil
-    end
-    private :do_finish
-
-    #
-    # proxy
-    #
-
-    public
-
-    # no proxy
-    @is_proxy_class = false
-    @proxy_addr = nil
-    @proxy_port = nil
-    @proxy_user = nil
-    @proxy_pass = nil
-
-    # Creates an HTTP proxy class.
-    # Arguments are address/port of proxy host and username/password
-    # if authorization on proxy server is required.
-    # You can replace the HTTP class with created proxy class.
-    # 
-    # If ADDRESS is nil, this method returns self (Net::HTTP).
-    # 
-    #     # Example
-    #     proxy_class = Net::HTTP::Proxy('proxy.example.com', 8080)
-    #                     :
-    #     proxy_class.start('www.ruby-lang.org') {|http|
-    #       # connecting proxy.foo.org:8080
-    #                     :
-    #     }
-    # 
-    def HTTP.Proxy( p_addr, p_port = nil, p_user = nil, p_pass = nil )
-      return self unless p_addr
-
-      delta = ProxyDelta
-      proxyclass = Class.new(self)
-      proxyclass.module_eval {
-        include delta
-        # with proxy
-        @is_proxy_class = true
-        @proxy_address = p_addr
-        @proxy_port    = p_port || default_port()
-        @proxy_user    = p_user
-        @proxy_pass    = p_pass
-      }
-      proxyclass
-    end
-
-    class << HTTP
-      # returns true if self is a class which was created by HTTP::Proxy.
-      def proxy_class?
-        @is_proxy_class
-      end
-
-      attr_reader :proxy_address
-      attr_reader :proxy_port
-      attr_reader :proxy_user
-      attr_reader :proxy_pass
-    end
-
-    # True if self is a HTTP proxy class
-    def proxy?
-      self.class.proxy_class?
-    end
-
-    # Address of proxy host. If self does not use a proxy, nil.
-    def proxy_address
-      self.class.proxy_address
-    end
-
-    # Port number of proxy host. If self does not use a proxy, nil.
-    def proxy_port
-      self.class.proxy_port
-    end
-
-    # User name for accessing proxy. If self does not use a proxy, nil.
-    def proxy_user
-      self.class.proxy_user
-    end
-
-    # User password for accessing proxy. If self does not use a proxy, nil.
-    def proxy_pass
-      self.class.proxy_pass
-    end
-
-    alias proxyaddr proxy_address   #:nodoc: obsolete
-    alias proxyport proxy_port      #:nodoc: obsolete
-
-    private
-
-    # without proxy
-
-    def conn_address
-      address
-    end
-
-    def conn_port
-      port
-    end
-
-    def edit_path( path )
-      path
-    end
-
-    module ProxyDelta   #:nodoc: internal use only
-      private
-
-      # with proxy
-    
-      def conn_address
-        proxy_address()
-      end
-
-      def conn_port
-        proxy_port()
-      end
-
-      def edit_path( path )
-        'http://' + addr_port() + path
-      end
-    end
-
-    #
-    # HTTP operations
-    #
-
-    public
-
-    # Gets data from +path+ on the connected-to host.
-    # +header+ must be a Hash like { 'Accept' => '*/*', ... }.
-    #
-    # In version 1.1 (ruby 1.6), this method returns a pair of objects,
-    # a Net::HTTPResponse object and the entity body string.
-    # In version 1.2 (ruby 1.8), this method returns a Net::HTTPResponse
-    # object.
-    #
-    # If called with a block, yields each fragment of the
-    # entity body in turn as a string as it is read from
-    # the socket.  Note that in this case, the returned response
-    # object will *not* contain a (meaningful) body.
-    #
-    # +dest+ argument is obsolete.
-    # It still works but you must not use it.
-    #
-    # In version 1.1, this method might raise an exception for 
-    # 3xx (redirect). In this case you can get a HTTPResponse object
-    # by "anException.response".
-    #
-    # In version 1.2, this method never raises exception.
-    #
-    #     # version 1.1 (bundled with Ruby 1.6)
-    #     response, body = http.get('/index.html')
-    #
-    #     # version 1.2 (bundled with Ruby 1.8 or later)
-    #     response = http.get('/index.html')
-    #     
-    #     # using block
-    #     File.open('result.txt', 'w') {|f|
-    #       http.get('/~foo/') do |str|
-    #         f.write str
-    #       end
-    #     }
-    #
-    def get( path, initheader = nil, dest = nil, &block ) # :yield: +body_segment+
-      res = nil
-      request(Get.new(path, initheader)) {|r|
-        r.read_body dest, &block
-        res = r
-      }
-      unless @newimpl
-        res.value
-        return res, res.body
-      end
-
-      res
-    end
-
-    # Gets only the header from +path+ on the connected-to host.
-    # +header+ is a Hash like { 'Accept' => '*/*', ... }.
-    # 
-    # This method returns a Net::HTTPResponse object.
-    # 
-    # In version 1.1, this method might raise an exception for 
-    # 3xx (redirect). On the case you can get a HTTPResponse object
-    # by "anException.response".
-    # In version 1.2, this method never raises an exception.
-    # 
-    #     response = nil
-    #     Net::HTTP.start('some.www.server', 80) {|http|
-    #       response = http.head('/index.html')
-    #     }
-    #     p response['content-type']
-    #
-    def head( path, initheader = nil ) 
-      res = request(Head.new(path, initheader))
-      res.value unless @newimpl
-      res
-    end
-
-    # Posts +data+ (must be a String) to +path+. +header+ must be a Hash
-    # like { 'Accept' => '*/*', ... }.
-    # 
-    # In version 1.1 (ruby 1.6), this method returns a pair of objects, a
-    # Net::HTTPResponse object and an entity body string.
-    # In version 1.2 (ruby 1.8), this method returns a Net::HTTPReponse object.
-    # 
-    # If called with a block, yields each fragment of the
-    # entity body in turn as a string as it are read from
-    # the socket.  Note that in this case, the returned response
-    # object will *not* contain a (meaningful) body.
-    #
-    # +dest+ is an alternative method of collecting the body.  It
-    # must be an object responding to the "<<" operator (such as
-    # a String or an Array).  Each fragment of the entity body
-    # will be "<<"-ed in turn onto +dest+ if provided, and it will
-    # also become the body of the returned response object.
-    #
-    # You must *not* provide both +dest+ and a block; doing so
-    # will result in an ArgumentError.
-    # 
-    # In version 1.1, this method might raise an exception for 
-    # 3xx (redirect). In this case you can get an HTTPResponse object
-    # by "anException.response".
-    # In version 1.2, this method never raises exception.
-    # 
-    #     # version 1.1
-    #     response, body = http.post('/cgi-bin/search.rb', 'query=foo')
-    # 
-    #     # version 1.2
-    #     response = http.post('/cgi-bin/search.rb', 'query=foo')
-    # 
-    #     # using block
-    #     File.open('result.txt', 'w') {|f|
-    #       http.post('/cgi-bin/search.rb', 'query=foo') do |str|
-    #         f.write str
-    #       end
-    #     }
-    def post( path, data, initheader = nil, dest = nil, &block ) # :yield: +body_segment+
-      res = nil
-      request(Post.new(path, initheader), data) {|r|
-        r.read_body dest, &block
-        res = r
-      }
-      unless @newimpl
-        res.value
-        return res, res.body
-      end
-
-      res
-    end
-
-    def put( path, data, initheader = nil )   #:nodoc:
-      res = request(Put.new(path, initheader), data)
-      @newimpl or res.value
-      res
-    end
-
-    # Sends a GET request to the +path+ and gets a response,
-    # as an HTTPResponse object.
-    # 
-    # When called with a block, yields an HTTPResponse object.
-    # The body of this response will not have been read yet;
-    # the caller can process it using HTTPResponse#read_body,
-    # if desired.
-    #
-    # Returns the response.
-    # 
-    # This method never raises Net::* exceptions.
-    # 
-    #     response = http.request_get('/index.html')
-    #     # The entity body is already read here.
-    #     p response['content-type']
-    #     puts response.body
-    # 
-    #     # using block
-    #     http.request_get('/index.html') {|response|
-    #       p response['content-type']
-    #       response.read_body do |str|   # read body now
-    #         print str
-    #       end
-    #     }
-    #
-    def request_get( path, initheader = nil, &block ) # :yield: +response+
-      request Get.new(path, initheader), &block
-    end
-
-    # Sends a HEAD request to the +path+ and gets a response,
-    # as an HTTPResponse object.
-    #
-    # Returns the response.
-    # 
-    # This method never raises Net::* exceptions.
-    # 
-    #     response = http.request_head('/index.html')
-    #     p response['content-type']
-    #
-    def request_head( path, initheader = nil, &block )
-      request Head.new(path, initheader), &block
-    end
-
-    # Sends a POST request to the +path+ and gets a response,
-    # as an HTTPResponse object.
-    # 
-    # When called with a block, yields an HTTPResponse object.
-    # The body of this response will not have been read yet;
-    # the caller can process it using HTTPResponse#read_body,
-    # if desired.
-    #
-    # Returns the response.
-    # 
-    # This method never raises Net::* exceptions.
-    # 
-    #     # example
-    #     response = http.request_post('/cgi-bin/nice.rb', 'datadatadata...')
-    #     p response.status
-    #     puts response.body          # body is already read
-    # 
-    #     # using block
-    #     http.request_post('/cgi-bin/nice.rb', 'datadatadata...') {|response|
-    #       p response.status
-    #       p response['content-type']
-    #       response.read_body do |str|   # read body now
-    #         print str
-    #       end
-    #     }
-    def request_post( path, data, initheader = nil, &block ) # :yield: +response+
-      request Post.new(path, initheader), data, &block
-    end
-
-    def request_put( path, data, initheader = nil, &block )   #:nodoc:
-      request Put.new(path, initheader), data, &block
-    end
-
-    alias get2   request_get    #:nodoc: obsolete
-    alias head2  request_head   #:nodoc: obsolete
-    alias post2  request_post   #:nodoc: obsolete
-    alias put2   request_put    #:nodoc: obsolete
-
-
-    # Sends an HTTP request to the HTTP server.
-    # This method also sends DATA string if DATA is given.
-    #
-    # Returns a HTTPResponse object.
-    # 
-    # This method never raises Net::* exceptions.
-    #
-    #    response = http.send_request('GET', '/index.html')
-    #    puts response.body
-    #
-    def send_request( name, path, data = nil, header = nil )
-      r = HTTPGenericRequest.new(name,(data ? true : false),true,path,header)
-      request r, data
-    end
-
-    # Sends an HTTPRequest object REQUEST to the HTTP server.
-    # This method also sends DATA string if REQUEST is a post/put request.
-    # Giving DATA for get/head request causes ArgumentError.
-    # 
-    # When called with a block, yields an HTTPResponse object.
-    # The body of this response will not have been read yet;
-    # the caller can process it using HTTPResponse#read_body,
-    # if desired.
-    #
-    # Returns a HTTPResponse object.
-    # 
-    # This method never raises Net::* exceptions.
-    def request( req, body = nil, &block )  # :yield: +response+
-      unless started?
-        start {
-          req['connection'] = 'close'
-          return request(req, body, &block)
-        }
-      end
-      if proxy_user()
-        req.proxy_basic_auth proxy_user(), proxy_pass()
-      end
-        
-      begin_transport req
-          req.exec @socket, @curr_http_version, edit_path(req.path), body
-          begin
-            res = HTTPResponse.read_new(@socket)
-          end while HTTPContinue === res
-          res.reading_body(@socket, req.response_body_permitted?) {
-            yield res if block_given?
-          }
-      end_transport req, res
-
-      res
-    end
-
-    private
-
-    def begin_transport( req )
-      if @socket.closed?
-        @socket.reopen @open_timeout
-        on_connect
-      end
-      if @seems_1_0_server
-        req['connection'] = 'close'
-      end
-      if not req.response_body_permitted? and @close_on_empty_response
-        req['connection'] = 'close'
-      end
-      req['host'] = addr_port()
-    end
-
-    def end_transport( req, res )
-      @curr_http_version = res.http_version
-
-      if not res.body and @close_on_empty_response
-        D 'Conn close'
-        @socket.close
-      elsif keep_alive? req, res
-        D 'Conn keep-alive'
-        if @socket.closed?
-          D 'Conn (but seems 1.0 server)'
-          @seems_1_0_server = true
-        end
-      else
-        D 'Conn close'
-        @socket.close
-      end
-    end
-
-    def keep_alive?( req, res )
-      /close/i === req['connection'].to_s            and return false
-      @seems_1_0_server                              and return false
-
-      /keep-alive/i === res['connection'].to_s       and return true
-      /close/i      === res['connection'].to_s       and return false
-      /keep-alive/i === res['proxy-connection'].to_s and return true
-      /close/i      === res['proxy-connection'].to_s and return false
-
-      @curr_http_version == '1.1'                    and return true
-      false
-    end
-
-    #
-    # utils
-    #
-
-    private
-
-    def addr_port
-      address + (port == HTTP.default_port ? '' : ":#{port}")
-    end
-
-    def D( msg )
-      if @debug_output
-        @debug_output << msg
-        @debug_output << "\n"
-      end
-    end
-
-  end
-
-  HTTPSession = HTTP
-
-  #
-  # Header module.
-  #
-  # Provides access to @header in the mixed-into class as a hash-like
-  # object, except with case-insensitive keys.  Also provides
-  # methods for accessing commonly-used header values in a more
-  # convenient format.
-  #
-  module HTTPHeader
-
-    def size   #:nodoc: obsolete
-      @header.size
-    end
-
-    alias length size   #:nodoc: obsolete
-
-    # Returns the header field corresponding to the case-insensitive key.
-    # For example, a key of "Content-Type" might return "text/html"
-    def []( key )
-      @header[key.downcase]
-    end
-
-    # Sets the header field corresponding to the case-insensitive key.
-    def []=( key, val )
-      @header[key.downcase] = val
-    end
-
-    # Returns the header field corresponding to the case-insensitive key.
-    # Returns the default value +args+, or the result of the block, or nil,
-    # if there's no header field named key.  See Hash#fetch
-    def fetch( key, *args, &block )  # :yield: +key+
-      @header.fetch(key.downcase, *args, &block)
-    end
-
-    # Iterates for each header names and values.
-    def each_header( &block ) # :yield: +key+, +value+
-      @header.each(&block)
-    end
-
-    alias each each_header
-
-    # Iterates for each header names.
-    def each_key( &block ) # :yield: +key+
-      @header.each_key(&block)
-    end
-
-    # Iterates for each header values.
-    def each_value( &block ) # :yield: +value+
-      @header.each_value(&block)
-    end
-
-    # Removes a header field.
-    def delete( key )
-      @header.delete(key.downcase)
-    end
-
-    # true if +key+ header exists.
-    def key?( key )
-      @header.key?(key.downcase)
-    end
-
-    # Returns a Hash consist of header names and values.
-    def to_hash
-      @header.dup
-    end
-
-    # As for #each_header, except the keys are provided in
-    # canonical form, which is to say, capitalized.
-    def canonical_each
-      @header.each do |k,v|
-        yield canonical(k), v
-      end
-    end
-
-    def canonical( k )
-      k.split(/-/).map {|i| i.capitalize }.join('-')
-    end
-    private :canonical
-
-    # Returns a Range object which represents Range: header field,
-    # or +nil+ if there is no such header.
-    def range
-      s = @header['range'] or return nil
-      s.split(/,/).map {|spec|
-        m = /bytes\s*=\s*(\d+)?\s*-\s*(\d+)?/i.match(spec) or
-                raise HTTPHeaderSyntaxError, "wrong Range: #{spec}"
-        d1 = m[1].to_i
-        d2 = m[2].to_i
-        if    m[1] and m[2] then  d1..d2
-        elsif m[1]          then  d1..-1
-        elsif          m[2] then -d2..-1
-        else
-          raise HTTPHeaderSyntaxError, 'range is not specified'
-        end
-      }
-    end
-
-    # Set Range: header from Range (arg r) or beginning index and
-    # length from it (arg i&len).
-    def range=( r, fin = nil )
-      r = (r ... r + fin) if fin
-
-      case r
-      when Numeric
-        s = r > 0 ? "0-#{r - 1}" : "-#{-r}"
-      when Range
-        first = r.first
-        last = r.last
-        if r.exclude_end?
-          last -= 1
-        end
-
-        if last == -1
-          s = first > 0 ? "#{first}-" : "-#{-first}"
-        else
-          first >= 0 or raise HTTPHeaderSyntaxError, 'range.first is negative' 
-          last > 0  or raise HTTPHeaderSyntaxError, 'range.last is negative' 
-          first < last or raise HTTPHeaderSyntaxError, 'must be .first < .last'
-          s = "#{first}-#{last}"
-        end
-      else
-        raise TypeError, 'Range/Integer is required'
-      end
-
-      @header['range'] = "bytes=#{s}"
-      r
-    end
-
-    alias set_range range=
-
-    # Returns an Integer object which represents the Content-Length: header field
-    # or +nil+ if that field is not provided.
-    def content_length
-      s = @header['content-length'] or return nil
-      m = /\d+/.match(s) or
-              raise HTTPHeaderSyntaxError, 'wrong Content-Length format'
-      m[0].to_i
-    end
-
-    # Returns "true" if the "transfer-encoding" header is present and
-    # set to "chunked".  This is an HTTP/1.1 feature, allowing the 
-    # the content to be sent in "chunks" without at the outset
-    # stating the entire content length.
-    def chunked?
-      s = @header['transfer-encoding']
-      (s and /(?:\A|[^\-\w])chunked(?:[^\-\w]|\z)/i === s) ? true : false
-    end
-
-    # Returns a Range object which represents Content-Range: header field.
-    # This indicates, for a partial entity body, where this fragment
-    # fits inside the full entity body, as range of byte offsets.
-    def content_range
-      s = @header['content-range'] or return nil
-      m = %r<bytes\s+(\d+)-(\d+)/(?:\d+|\*)>i.match(s) or
-              raise HTTPHeaderSyntaxError, 'wrong Content-Range format'
-      m[1].to_i .. m[2].to_i + 1
-    end
-
-    # The length of the range represented in Range: header.
-    def range_length
-      r = self.content_range
-      r and (r.end - r.begin)
-    end
-
-    # Set the Authorization: header for "Basic" authorization.
-    def basic_auth( account, password )
-      @header['authorization'] = basic_encode(account, password)
-    end
-
-    # Set Proxy-Authorization: header for "Basic" authorization.
-    def proxy_basic_auth( account, password )
-      @header['proxy-authorization'] = basic_encode(account, password)
-    end
-
-    def basic_encode( account, password )
-      'Basic ' + ["#{account}:#{password}"].pack('m').strip
-    end
-    private :basic_encode
-
-  end
-
-  #
-  # Parent of HTTPRequest class.  Do not use this directly; use
-  # a subclass of HTTPRequest.
-  #
-  # Mixes in the HTTPHeader module.
-  #
-  class HTTPGenericRequest
-
-    include HTTPHeader
-
-    def initialize( m, reqbody, resbody, path, initheader = nil )
-      @method = m
-      @request_has_body = reqbody
-      @response_has_body = resbody
-      @path = path
-
-      @header = {}
-      return unless initheader
-      initheader.each do |k,v|
-        key = k.downcase
-        $stderr.puts "net/http: warning: duplicated HTTP header: #{k}" if @header.key?(key) and $VERBOSE
-        @header[key] = v.strip
-      end
-      @header['accept'] ||= '*/*'
-    end
-
-    attr_reader :method
-    attr_reader :path
-
-    def inspect
-      "\#<#{self.class} #{@method}>"
-    end
-
-    def request_body_permitted?
-      @request_has_body
-    end
-
-    def response_body_permitted?
-      @response_has_body
-    end
-
-    alias body_exist? response_body_permitted?
-
-    #
-    # write
-    #
-
-    def exec( sock, ver, path, body )   #:nodoc: internal use only
-      if body
-        check_body_permitted
-        send_request_with_body sock, ver, path, body
-      else
-        request sock, ver, path
-      end
-    end
-
-    private
-
-    def check_body_permitted
-      request_body_permitted? or
-          raise ArgumentError, 'HTTP request body is not permitted'
-    end
-
-    def send_request_with_body( sock, ver, path, body )
-      @header['content-length'] = body.length.to_s
-      @header.delete 'transfer-encoding'
-
-      unless @header['content-type']
-        $stderr.puts 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
-        @header['content-type'] = 'application/x-www-form-urlencoded'
-      end
-
-      request sock, ver, path
-      sock.write body
-    end
-
-    def request( sock, ver, path )
-      buf = "#{@method} #{path} HTTP/#{ver}\r\n"
-      canonical_each do |k,v|
-        buf << k + ': ' + v + "\r\n"
-      end
-      buf << "\r\n"
-      sock.write buf
-    end
-  
-  end
-
-
-  # 
-  # HTTP request class. This class wraps request header and entity path.
-  # You *must* use its subclass, Net::HTTP::Get, Post, Head.
-  # 
-  class HTTPRequest < HTTPGenericRequest
-
-    # Creates HTTP request object.
-    def initialize( path, initheader = nil )
-      super self.class::METHOD,
-            self.class::REQUEST_HAS_BODY,
-            self.class::RESPONSE_HAS_BODY,
-            path, initheader
-    end
-  end
-
-
-  class HTTP
-
-    class Get < HTTPRequest
-      METHOD = 'GET'
-      REQUEST_HAS_BODY  = false
-      RESPONSE_HAS_BODY = true
-    end
-
-    class Head < HTTPRequest
-      METHOD = 'HEAD'
-      REQUEST_HAS_BODY = false
-      RESPONSE_HAS_BODY = false
-    end
-
-    class Post < HTTPRequest
-      METHOD = 'POST'
-      REQUEST_HAS_BODY = true
-      RESPONSE_HAS_BODY = true
-    end
-
-    class Put < HTTPRequest
-      METHOD = 'PUT'
-      REQUEST_HAS_BODY = true
-      RESPONSE_HAS_BODY = true
-    end
-
-  end
-
-
-  ###
-  ### Response
-  ###
-
-  # HTTP exception class.
-  # You must use its subclasses.
-  module HTTPExceptions
-    def initialize( msg, res )   #:nodoc:
-      super msg
-      @response = res
-    end
-    attr_reader :response
-    alias data response    #:nodoc: obsolete
-  end
-  class HTTPError < ProtocolError
-    include HTTPExceptions
-  end
-  class HTTPRetriableError < ProtoRetriableError
-    include HTTPExceptions
-  end
-  class HTTPServerException < ProtoServerError
-    # We cannot use the name "HTTPServerError", it is the name of the response.
-    include HTTPExceptions
-  end
-  class HTTPFatalError < ProtoFatalError
-    include HTTPExceptions
-  end
-
-
-  # HTTP response class. This class wraps response header and entity.
-  # Mixes in the HTTPHeader module, which provides access to response
-  # header values both via hash-like methods and individual readers.
-  # Note that each possible HTTP response code defines its own 
-  # HTTPResponse subclass.  These are listed below.
-  # All classes are
-  # defined under the Net module. Indentation indicates inheritance.
-  # 
-  #   xxx        HTTPResponse
-  # 
-  #     1xx        HTTPInformation
-  #       100        HTTPContinue    
-  #       101        HTTPSwitchProtocol
-  # 
-  #     2xx        HTTPSuccess
-  #       200        HTTPOK
-  #       201        HTTPCreated
-  #       202        HTTPAccepted
-  #       203        HTTPNonAuthoritativeInformation
-  #       204        HTTPNoContent
-  #       205        HTTPResetContent
-  #       206        HTTPPartialContent
-  # 
-  #     3xx        HTTPRedirection
-  #       300        HTTPMultipleChoice
-  #       301        HTTPMovedPermanently
-  #       302        HTTPFound
-  #       303        HTTPSeeOther
-  #       304        HTTPNotModified
-  #       305        HTTPUseProxy
-  #       307        HTTPTemporaryRedirect
-  # 
-  #     4xx        HTTPClientError
-  #       400        HTTPBadRequest
-  #       401        HTTPUnauthorized
-  #       402        HTTPPaymentRequired
-  #       403        HTTPForbidden
-  #       404        HTTPNotFound
-  #       405        HTTPMethodNotAllowed
-  #       406        HTTPNotAcceptable
-  #       407        HTTPProxyAuthenticationRequired
-  #       408        HTTPRequestTimeOut
-  #       409        HTTPConflict
-  #       410        HTTPGone
-  #       411        HTTPLengthRequired
-  #       412        HTTPPreconditionFailed
-  #       413        HTTPRequestEntityTooLarge
-  #       414        HTTPRequestURITooLong
-  #       415        HTTPUnsupportedMediaType
-  #       416        HTTPRequestedRangeNotSatisfiable
-  #       417        HTTPExpectationFailed
-  # 
-  #     5xx        HTTPServerError
-  #       500        HTTPInternalServerError
-  #       501        HTTPNotImplemented
-  #       502        HTTPBadGateway
-  #       503        HTTPServiceUnavailable
-  #       504        HTTPGatewayTimeOut
-  #       505        HTTPVersionNotSupported
-  # 
-  #     xxx        HTTPUnknownResponse
-  #
-  class HTTPResponse
-    # true if the reponse has body.
-    def HTTPResponse.body_permitted?
-      self::HAS_BODY
-    end
-
-    def HTTPResponse.exception_type   # :nodoc: internal use only
-      self::EXCEPTION_TYPE
-    end
-  end   # redefined after
-
-  # :stopdoc:
-
-  class HTTPUnknownResponse < HTTPResponse
-    HAS_BODY = true
-    EXCEPTION_TYPE = HTTPError
-  end
-  class HTTPInformation < HTTPResponse           # 1xx
-    HAS_BODY = false
-    EXCEPTION_TYPE = HTTPError
-  end
-  class HTTPSuccess < HTTPResponse               # 2xx
-    HAS_BODY = true
-    EXCEPTION_TYPE = HTTPError
-  end
-  class HTTPRedirection < HTTPResponse           # 3xx
-    HAS_BODY = true
-    EXCEPTION_TYPE = HTTPRetriableError
-  end
-  class HTTPClientError < HTTPResponse           # 4xx
-    HAS_BODY = true
-    EXCEPTION_TYPE = HTTPServerException   # for backward compatibility
-  end
-  class HTTPServerError < HTTPResponse           # 5xx
-    HAS_BODY = true
-    EXCEPTION_TYPE = HTTPFatalError    # for backward compatibility
-  end
-
-  class HTTPContinue < HTTPInformation           # 100
-    HAS_BODY = false
-  end
-  class HTTPSwitchProtocol < HTTPInformation     # 101
-    HAS_BODY = false
-  end
-
-  class HTTPOK < HTTPSuccess                            # 200
-    HAS_BODY = true
-  end
-  class HTTPCreated < HTTPSuccess                       # 201
-    HAS_BODY = true
-  end
-  class HTTPAccepted < HTTPSuccess                      # 202
-    HAS_BODY = true
-  end
-  class HTTPNonAuthoritativeInformation < HTTPSuccess   # 203
-    HAS_BODY = true
-  end
-  class HTTPNoContent < HTTPSuccess                     # 204
-    HAS_BODY = false
-  end
-  class HTTPResetContent < HTTPSuccess                  # 205
-    HAS_BODY = false
-  end
-  class HTTPPartialContent < HTTPSuccess                # 206
-    HAS_BODY = true
-  end
-
-  class HTTPMultipleChoice < HTTPRedirection     # 300
-    HAS_BODY = true
-  end
-  class HTTPMovedPermanently < HTTPRedirection   # 301
-    HAS_BODY = true
-  end
-  class HTTPFound < HTTPRedirection              # 302
-    HAS_BODY = true
-  end
-  HTTPMovedTemporarily = HTTPFound
-  class HTTPSeeOther < HTTPRedirection           # 303
-    HAS_BODY = true
-  end
-  class HTTPNotModified < HTTPRedirection        # 304
-    HAS_BODY = false
-  end
-  class HTTPUseProxy < HTTPRedirection           # 305
-    HAS_BODY = false
-  end
-  # 306 unused
-  class HTTPTemporaryRedirect < HTTPRedirection  # 307
-    HAS_BODY = true
-  end
-
-  class HTTPBadRequest < HTTPClientError                    # 400
-    HAS_BODY = true
-  end
-  class HTTPUnauthorized < HTTPClientError                  # 401
-    HAS_BODY = true
-  end
-  class HTTPPaymentRequired < HTTPClientError               # 402
-    HAS_BODY = true
-  end
-  class HTTPForbidden < HTTPClientError                     # 403
-    HAS_BODY = true
-  end
-  class HTTPNotFound < HTTPClientError                      # 404
-    HAS_BODY = true
-  end
-  class HTTPMethodNotAllowed < HTTPClientError              # 405
-    HAS_BODY = true
-  end
-  class HTTPNotAcceptable < HTTPClientError                 # 406
-    HAS_BODY = true
-  end
-  class HTTPProxyAuthenticationRequired < HTTPClientError   # 407
-    HAS_BODY = true
-  end
-  class HTTPRequestTimeOut < HTTPClientError                # 408
-    HAS_BODY = true
-  end
-  class HTTPConflict < HTTPClientError                      # 409
-    HAS_BODY = true
-  end
-  class HTTPGone < HTTPClientError                          # 410
-    HAS_BODY = true
-  end
-  class HTTPLengthRequired < HTTPClientError                # 411
-    HAS_BODY = true
-  end
-  class HTTPPreconditionFailed < HTTPClientError            # 412
-    HAS_BODY = true
-  end
-  class HTTPRequestEntityTooLarge < HTTPClientError         # 413
-    HAS_BODY = true
-  end
-  class HTTPRequestURITooLong < HTTPClientError             # 414
-    HAS_BODY = true
-  end
-  HTTPRequestURITooLarge = HTTPRequestURITooLong
-  class HTTPUnsupportedMediaType < HTTPClientError          # 415
-    HAS_BODY = true
-  end
-  class HTTPRequestedRangeNotSatisfiable < HTTPClientError  # 416
-    HAS_BODY = true
-  end
-  class HTTPExpectationFailed < HTTPClientError             # 417
-    HAS_BODY = true
-  end
-
-  class HTTPInternalServerError < HTTPServerError   # 500
-    HAS_BODY = true
-  end
-  class HTTPNotImplemented < HTTPServerError        # 501
-    HAS_BODY = true
-  end
-  class HTTPBadGateway < HTTPServerError            # 502
-    HAS_BODY = true
-  end
-  class HTTPServiceUnavailable < HTTPServerError    # 503
-    HAS_BODY = true
-  end
-  class HTTPGatewayTimeOut < HTTPServerError        # 504
-    HAS_BODY = true
-  end
-  class HTTPVersionNotSupported < HTTPServerError   # 505
-    HAS_BODY = true
-  end
-
-  # :startdoc:
-
-
-  class HTTPResponse   # redefine
-
-    CODE_CLASS_TO_OBJ = {
-      '1' => HTTPInformation,
-      '2' => HTTPSuccess,
-      '3' => HTTPRedirection,
-      '4' => HTTPClientError,
-      '5' => HTTPServerError
-    }
-    CODE_TO_OBJ = {
-      '100' => HTTPContinue,
-      '101' => HTTPSwitchProtocol,
-
-      '200' => HTTPOK,
-      '201' => HTTPCreated,
-      '202' => HTTPAccepted,
-      '203' => HTTPNonAuthoritativeInformation,
-      '204' => HTTPNoContent,
-      '205' => HTTPResetContent,
-      '206' => HTTPPartialContent,
-
-      '300' => HTTPMultipleChoice,
-      '301' => HTTPMovedPermanently,
-      '302' => HTTPFound,
-      '303' => HTTPSeeOther,
-      '304' => HTTPNotModified,
-      '305' => HTTPUseProxy,
-      '307' => HTTPTemporaryRedirect,
-
-      '400' => HTTPBadRequest,
-      '401' => HTTPUnauthorized,
-      '402' => HTTPPaymentRequired,
-      '403' => HTTPForbidden,
-      '404' => HTTPNotFound,
-      '405' => HTTPMethodNotAllowed,
-      '406' => HTTPNotAcceptable,
-      '407' => HTTPProxyAuthenticationRequired,
-      '408' => HTTPRequestTimeOut,
-      '409' => HTTPConflict,
-      '410' => HTTPGone,
-      '411' => HTTPLengthRequired,
-      '412' => HTTPPreconditionFailed,
-      '413' => HTTPRequestEntityTooLarge,
-      '414' => HTTPRequestURITooLong,
-      '415' => HTTPUnsupportedMediaType,
-      '416' => HTTPRequestedRangeNotSatisfiable,
-      '417' => HTTPExpectationFailed,
-
-      '501' => HTTPInternalServerError,
-      '501' => HTTPNotImplemented,
-      '502' => HTTPBadGateway,
-      '503' => HTTPServiceUnavailable,
-      '504' => HTTPGatewayTimeOut,
-      '505' => HTTPVersionNotSupported
-    }
-
-
-    class << self
-
-      def read_new( sock )   #:nodoc: internal use only
-        httpv, code, msg = read_status_line(sock)
-        res = response_class(code).new(httpv, code, msg)
-        each_response_header(sock) do |k,v|
-          if res.key? k
-            res[k] << ', ' << v
-          else
-            res[k] = v
-          end
-        end
-
-        res
-      end
-
-      private
-
-      def read_status_line( sock )
-        str = sock.readline
-        m = /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)\s*(.*)\z/in.match(str) or
-                raise HTTPBadResponse, "wrong status line: #{str.dump}"
-        m.to_a[1,3]
-      end
-
-      def response_class( code )
-        CODE_TO_OBJ[code] or
-        CODE_CLASS_TO_OBJ[code[0,1]] or
-        HTTPUnknownResponse
-      end
-
-      def each_response_header( sock )
-        while true
-          line = sock.readuntil("\n", true).sub(/\s+\z/, '')
-          break if line.empty?
-          m = /\A([^:]+):\s*/.match(line) or
-                  raise HTTPBadResponse, 'wrong header line format'
-          yield m[1], m.post_match
-        end
-      end
-
-    end
-
-    # next is to fix bug in RDoc, where the private inside class << self
-    # spills out.
-    public 
-
-    include HTTPHeader
-
-    def initialize( httpv, code, msg )   #:nodoc: internal use only
-      @http_version = httpv
-      @code         = code
-      @message      = msg
-
-      @header = {}
-      @body = nil
-      @read = false
-    end
-
-    # The HTTP version supported by the server.
-    attr_reader :http_version
-
-    # HTTP result code string. For example, '302'.  You can also
-    # determine the response type by which response subclass the
-    # response object is an instance of.
-    attr_reader :code
-
-    # HTTP result message. For example, 'Not Found'.
-    attr_reader :message
-    alias msg message   # :nodoc: obsolete
-
-    def inspect
-      "#<#{self.class} #{@code} readbody=#{@read}>"
-    end
-
-    # For backward compatibility.
-    # To allow Net::HTTP 1.1 style assignment
-    # e.g.
-    #    response, body = Net::HTTP.get(....)
-    # 
-    def to_ary
-      warn "net/http: warning: old style assignment found at #{caller(1)[0]}" if $VERBOSE
-      [self, body()]
-    end
-
-    #
-    # response <-> exception relationship
-    #
-
-    def code_type   #:nodoc:
-      self.class
-    end
-
-    def error!   #:nodoc:
-      raise error_type().new(@code + ' ' + @message.dump, self)
-    end
-
-    def error_type   #:nodoc:
-      self.class::EXCEPTION_TYPE
-    end
-
-    # Raises HTTP error if the response is not 2xx.
-    def value
-      error! unless HTTPSuccess === self
-    end
-
-    #
-    # header (for backward compatibility only; DO NOT USE)
-    #
-
-    def response   #:nodoc:
-      self
-    end
-
-    alias header response        #:nodoc:
-    alias read_header response   #:nodoc:
-
-    #
-    # body
-    #
-
-    def reading_body( sock, reqmethodallowbody )  #:nodoc: internal use only
-      @socket = sock
-      @body_exist = reqmethodallowbody && self.class.body_permitted?
-      begin
-        yield
-        self.body   # ensure to read body
-      ensure
-        @socket = nil
-      end
-    end
-
-    # Gets entity body.  If the block given, yields it to +block+.
-    # The body is provided in fragments, as it is read in from the socket.
-    #
-    # Calling this method a second or subsequent time will return the
-    # already read string.
-    #
-    #   http.request_get('/index.html') {|res|
-    #     puts res.read_body
-    #   }
-    #
-    #   http.request_get('/index.html') {|res|
-    #     p res.read_body.object_id   # 538149362
-    #     p res.read_body.object_id   # 538149362
-    #   }
-    #
-    #   # using iterator
-    #   http.request_get('/index.html') {|res|
-    #     res.read_body do |segment|
-    #       print segment
-    #     end
-    #   }
-    #
-    def read_body( dest = nil, &block )
-      if @read
-        raise IOError, "#{self.class}\#read_body called twice" if dest or block
-        return @body
-      end
-
-      to = procdest(dest, block)
-      stream_check
-      if @body_exist
-        read_body_0 to
-        @body = to
-      else
-        @body = nil
-      end
-      @read = true
-
-      @body
-    end
-
-    # Returns the entity body.
-    #
-    # Calling this method a second or subsequent time will return the
-    # already read string.
-    #
-    #   http.request_get('/index.html') {|res|
-    #     puts res.body
-    #   }
-    #
-    #   http.request_get('/index.html') {|res|
-    #     p res.body.object_id   # 538149362
-    #     p res.body.object_id   # 538149362
-    #   }
-    #
-    def body
-      read_body()
-    end
-
-    alias entity body   #:nodoc: obsolete
-
-    private
-
-    def read_body_0( dest )
-      if chunked?
-        read_chunked dest
-      else
-        clen = content_length()
-        if clen
-          @socket.read clen, dest, true   # ignore EOF
-        else
-          clen = range_length()
-          if clen
-            @socket.read clen, dest
-          else
-            @socket.read_all dest
-          end
-        end
-      end
-    end
-
-    def read_chunked( dest )
-      len = nil
-      total = 0
-
-      while true
-        line = @socket.readline
-        hexlen = line.slice(/[0-9a-fA-F]+/) or
-                raise HTTPBadResponse, "wrong chunk size line: #{line}"
-        len = hexlen.hex
-        break if len == 0
-        @socket.read len, dest; total += len
-        @socket.read 2   # \r\n
-      end
-      until @socket.readline.empty?
-        # none
-      end
-    end
-
-    def stream_check
-      raise IOError, 'try to read body out of block' if @socket.closed?
-    end
-
-    def procdest( dest, block )
-      raise ArgumentError, 'both of arg and block are given for HTTP method'\
-                      if dest and block
-      if block
-        ReadAdapter.new(block)
-      else
-        dest || ''
-      end
-    end
-
-  end
-
-
-  # :enddoc:
-
-  #--
-  # for backward compatibility
-  class HTTP
-    ProxyMod = ProxyDelta
-  end
-  module NetPrivate
-    HTTPRequest = ::Net::HTTPRequest
-  end
-
-  HTTPInformationCode = HTTPInformation
-  HTTPSuccessCode     = HTTPSuccess
-  HTTPRedirectionCode = HTTPRedirection
-  HTTPRetriableCode   = HTTPRedirection
-  HTTPClientErrorCode = HTTPClientError
-  HTTPFatalErrorCode  = HTTPClientError
-  HTTPServerErrorCode = HTTPServerError
-  HTTPResponceReceiver = HTTPResponse
-
-end   # module Net
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
deleted file mode 100644
index 475c2ad0de..0000000000
--- a/lib/net/imap.rb
+++ /dev/null
@@ -1,3258 +0,0 @@
-#
-# = net/imap.rb
-#
-# Copyright (C) 2000  Shugo Maeda <shugo@ruby-lang.org>
-#
-# This library is distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
-# Documentation: Shugo Maeda, with RDoc conversion and overview by William
-# Webber. 
-#
-
-
-require "socket"
-require "monitor"
-require "digest/md5"
-begin
-  require "openssl"
-rescue LoadError
-end
-
-module Net # :nodoc:
-
-  #
-  # Net::IMAP implements Internet Message Access Protocol (IMAP) client
-  # functionality.  The protocol is described in [IMAP].
-  #
-  # == IMAP OVERVIEW
-  #
-  # An IMAP client connects to a server, and then authenticates
-  # itself using either #authenticate() or #login().  Having
-  # authenticated itself, there is a range of commands
-  # available to it.  Most work with mailboxes, which may be
-  # arranged in an hierarchical namespace, and each of which
-  # contains zero or more messages.  How this is implemented on
-  # the server is implementation-dependent; on a UNIX server, it
-  # will frequently be implemented as a files in mailbox format
-  # within a hierarchy of directories.
-  #
-  # To work on the messages within a mailbox, the client must
-  # first select that mailbox, using either #select() or (for
-  # read-only access) #examine().  Once the client has successfully
-  # selected a mailbox, they enter _selected_ state, and that
-  # mailbox becomes the _current_ mailbox, on which mail-item
-  # related commands implicitly operate.  
-  #
-  # Messages have two sorts of identifiers: message sequence
-  # numbers, and UIDs.  
-  #
-  # Message sequence numbers number messages within a mail box 
-  # from 1 up to the number of items in the mail box.  If new
-  # message arrives during a session, it receives a sequence
-  # number equal to the new size of the mail box.  If messages
-  # are expunged from the mailbox, remaining messages have their
-  # sequence numbers "shuffled down" to fill the gaps.
-  #
-  # UIDs, on the other hand, are permanently guaranteed not to
-  # identify another message within the same mailbox, even if 
-  # the existing message is deleted.  UIDs are required to
-  # be assigned in ascending (but not necessarily sequential)
-  # order within a mailbox; this means that if a non-IMAP client
-  # rearranges the order of mailitems within a mailbox, the
-  # UIDs have to be reassigned.  An IMAP client cannot thus
-  # rearrange message orders.
-  #
-  # == EXAMPLES OF USAGE
-  #
-  # === List sender and subject of all recent messages in the default mailbox
-  #
-  #   imap = Net::IMAP.new('mail.example.com')
-  #   imap.authenticate('LOGIN', 'joe_user', 'joes_password')
-  #   imap.examine('INBOX')
-  #   imap.search(["RECENT"]).each do |message_id|
-  #     envelope = imap.fetch(message_id, "ENVELOPE")[0].attr["ENVELOPE"]
-  #     puts "#{envelope.from[0].name}: \t#{envelope.subject}"
-  #   end
-  #
-  # === Move all messages from April 2003 from "Mail/sent-mail" to "Mail/sent-apr03"
-  #
-  #   imap = Net::IMAP.new('mail.example.com')
-  #   imap.authenticate('LOGIN', 'joe_user', 'joes_password')
-  #   imap.select('Mail/sent-mail')
-  #   if not imap.list('Mail/', 'sent-apr03')
-  #     imap.create('Mail/sent-apr03')
-  #   end
-  #   imap.search(["BEFORE", "30-Apr-2003", "SINCE", "1-Apr-2003"]).each do |message_id|
-  #     imap.copy(message_id, "Mail/sent-apr03")
-  #     imap.store(message_id, "+FLAGS", [:Deleted])
-  #   end
-  #   imap.expunge
-  # 
-  # == THREAD-SAFENESS
-  #
-  # Net::IMAP supports concurrent threads. For example,
-  # 
-  #   imap = Net::IMAP.new("imap.foo.net", "imap2")
-  #   imap.authenticate("cram-md5", "bar", "password")
-  #   imap.select("inbox")
-  #   fetch_thread = Thread.start { imap.fetch(1..-1, "UID") }
-  #   search_result = imap.search(["BODY", "hello"])
-  #   fetch_result = fetch_thread.value
-  #   imap.disconnect
-  # 
-  # This script invokes the FETCH command and the SEARCH command concurrently.
-  #
-  # == ERRORS
-  #
-  # An IMAP server can send three different types of responses to indicate
-  # failure:
-  #
-  # NO:: the attempted command could not be successfully completed.  For
-  #      instance, the username/password used for logging in are incorrect;
-  #      the selected mailbox does not exists; etc.  
-  #
-  # BAD:: the request from the client does not follow the server's 
-  #       understanding of the IMAP protocol.  This includes attempting
-  #       commands from the wrong client state; for instance, attempting
-  #       to perform a SEARCH command without having SELECTed a current
-  #       mailbox.  It can also signal an internal server
-  #       failure (such as a disk crash) has occurred.
-  #
-  # BYE:: the server is saying goodbye.  This can be part of a normal
-  #       logout sequence, and can be used as part of a login sequence
-  #       to indicate that the server is (for some reason) unwilling
-  #       to accept our connection.  As a response to any other command,
-  #       it indicates either that the server is shutting down, or that
-  #       the server is timing out the client connection due to inactivity.
-  #
-  # These three error response are represented by the errors
-  # Net::IMAP::NoResponseError, Net::IMAP::BadResponseError, and
-  # Net::IMAP::ByeResponseError, all of which are subclasses of
-  # Net::IMAP::ResponseError.  Essentially, all methods that involve
-  # sending a request to the server can generate one of these errors.
-  # Only the most pertinent instances have been documented below.
-  #
-  # Because the IMAP class uses Sockets for communication, its methods
-  # are also susceptible to the various errors that can occur when
-  # working with sockets.  These are generally represented as
-  # Errno errors.  For instance, any method that involves sending a
-  # request to the server and/or receiving a response from it could
-  # raise an Errno::EPIPE error if the network connection unexpectedly
-  # goes down.  See the socket(7), ip(7), tcp(7), socket(2), connect(2),
-  # and associated man pages.
-  #
-  # Finally, a Net::IMAP::DataFormatError is thrown if low-level data
-  # is found to be in an incorrect format (for instance, when converting
-  # between UTF-8 and UTF-16), and Net::IMAP::ResponseParseError is 
-  # thrown if a server response is non-parseable. 
-  #
-  #
-  # == References
-  #
-  # [[IMAP]]
-  #    M. Crispin, "INTERNET MESSAGE ACCESS PROTOCOL - VERSION 4rev1",
-  #    RFC 2060, December 1996.  (Note: since obsoleted by RFC 3501)
-  #
-  # [[LANGUAGE-TAGS]]
-  #    Alvestrand, H., "Tags for the Identification of
-  #    Languages", RFC 1766, March 1995.
-  #
-  # [[MD5]]
-  #    Myers, J., and M. Rose, "The Content-MD5 Header Field", RFC
-  #    1864, October 1995.
-  #
-  # [[MIME-IMB]]
-  #    Freed, N., and N. Borenstein, "MIME (Multipurpose Internet
-  #    Mail Extensions) Part One: Format of Internet Message Bodies", RFC
-  #    2045, November 1996.
-  #
-  # [[RFC-822]]
-  #    Crocker, D., "Standard for the Format of ARPA Internet Text
-  #    Messages", STD 11, RFC 822, University of Delaware, August 1982.
-  #
-  # [[RFC-2087]]
-  #    Myers, J., "IMAP4 QUOTA extension", RFC 2087, January 1997.
-  #
-  # [[RFC-2086]]
-  #    Myers, J., "IMAP4 ACL extension", RFC 2086, January 1997.
-  #
-  # [[RFC-2195]]
-  #    Klensin, J., Catoe, R., and Krumviede, P., "IMAP/POP AUTHorize Extension
-  #    for Simple Challenge/Response", RFC 2195, September 1997.
-  #
-  # [[SORT-THREAD-EXT]]
-  #    Crispin, M., "INTERNET MESSAGE ACCESS PROTOCOL - SORT and THREAD
-  #    Extensions", draft-ietf-imapext-sort, May 2003.
-  #
-  # [[OSSL]]
-  #    http://www.openssl.org
-  #
-  # [[RSSL]]
-  #    http://savannah.gnu.org/projects/rubypki
-  #
-  # [[UTF7]]
-  #    Goldsmith, D. and Davis, M., "UTF-7: A Mail-Safe Transformation Format of
-  #    Unicode", RFC 2152, May 1997.
-  #
-  class IMAP
-    include MonitorMixin
-    if defined?(OpenSSL)
-      include OpenSSL
-      include SSL
-    end
-
-    #  Returns an initial greeting response from the server.
-    attr_reader :greeting
-
-    # Returns recorded untagged responses.  For example:
-    #
-    #   imap.select("inbox")
-    #   p imap.responses["EXISTS"][-1]
-    #   #=> 2
-    #   p imap.responses["UIDVALIDITY"][-1]
-    #   #=> 968263756
-    attr_reader :responses
-
-    # Returns all response handlers.
-    attr_reader :response_handlers
-
-    # The thread to receive exceptions.
-    attr_accessor :client_thread
-
-    # Flag indicating a message has been seen
-    SEEN = :Seen
-
-    # Flag indicating a message has been answered
-    ANSWERED = :Answered
-
-    # Flag indicating a message has been flagged for special or urgent
-    # attention
-    FLAGGED = :Flagged
-
-    # Flag indicating a message has been marked for deletion.  This
-    # will occur when the mailbox is closed or expunged.
-    DELETED = :Deleted
-
-    # Flag indicating a message is only a draft or work-in-progress version.
-    DRAFT = :Draft
-
-    # Flag indicating that the message is "recent", meaning that this
-    # session is the first session in which the client has been notified
-    # of this message.
-    RECENT = :Recent
-
-    # Flag indicating that a mailbox context name cannot contain
-    # children.
-    NOINFERIORS = :Noinferiors
-
-    # Flag indicating that a mailbox is not selected.
-    NOSELECT = :Noselect
-
-    # Flag indicating that a mailbox has been marked "interesting" by
-    # the server; this commonly indicates that the mailbox contains
-    # new messages.
-    MARKED = :Marked
-
-    # Flag indicating that the mailbox does not contains new messages.
-    UNMARKED = :Unmarked
-
-    # Returns the debug mode.
-    def self.debug
-      return @@debug
-    end
-
-    # Sets the debug mode.
-    def self.debug=(val)
-      return @@debug = val
-    end
-
-    # Adds an authenticator for Net::IMAP#authenticate.  +auth_type+
-    # is the type of authentication this authenticator supports
-    # (for instance, "LOGIN").  The +authenticator+ is an object
-    # which defines a process() method to handle authentication with
-    # the server.  See Net::IMAP::LoginAuthenticator and 
-    # Net::IMAP::CramMD5Authenticator for examples.
-    #
-    # If +auth_type+ refers to an existing authenticator, it will be
-    # replaced by the new one.
-    def self.add_authenticator(auth_type, authenticator)
-      @@authenticators[auth_type] = authenticator
-    end
-
-    # Disconnects from the server.
-    def disconnect
-      @sock.shutdown unless @usessl
-      @receiver_thread.join
-      @sock.close
-    end
-
-    # Sends a CAPABILITY command, and returns an array of
-    # capabilities that the server supports.  Each capability
-    # is a string.  See [IMAP] for a list of possible
-    # capabilities.
-    #
-    # Note that the Net::IMAP class does not modify its
-    # behaviour according to the capabilities of the server;
-    # it is up to the user of the class to ensure that 
-    # a certain capability is supported by a server before
-    # using it.
-    def capability
-      synchronize do
-	send_command("CAPABILITY")
-	return @responses.delete("CAPABILITY")[-1]
-      end
-    end
-
-    # Sends a NOOP command to the server. It does nothing.
-    def noop
-      send_command("NOOP")
-    end
-
-    # Sends a LOGOUT command to inform the server that the client is
-    # done with the connection.
-    def logout
-      send_command("LOGOUT")
-    end
-
-    # Sends an AUTHENTICATE command to authenticate the client.
-    # The +auth_type+ parameter is a string that represents
-    # the authentication mechanism to be used. Currently Net::IMAP
-    # supports authentication mechanisms:
-    #
-    #   LOGIN:: login using cleartext user and password. 
-    #   CRAM-MD5:: login with cleartext user and encrypted password
-    #              (see [RFC-2195] for a full description).  This
-    #              mechanism requires that the server have the user's
-    #              password stored in clear-text password.
-    #
-    # For both these mechanisms, there should be two +args+: username
-    # and (cleartext) password.  A server may not support one or other
-    # of these mechanisms; check #capability() for a capability of
-    # the form "AUTH=LOGIN" or "AUTH=CRAM-MD5".
-    #
-    # Authentication is done using the appropriate authenticator object:
-    # see @@authenticators for more information on plugging in your own
-    # authenticator.
-    #
-    # For example:
-    #
-    #    imap.authenticate('LOGIN', user, password)
-    #
-    # A Net::IMAP::NoResponseError is raised if authentication fails.
-    def authenticate(auth_type, *args)
-      auth_type = auth_type.upcase
-      unless @@authenticators.has_key?(auth_type)
-	raise ArgumentError,
-	  format('unknown auth type - "%s"', auth_type)
-      end
-      authenticator = @@authenticators[auth_type].new(*args)
-      send_command("AUTHENTICATE", auth_type) do |resp|
-	if resp.instance_of?(ContinuationRequest)
-	  data = authenticator.process(resp.data.text.unpack("m")[0])
-	  send_data([data].pack("m").chomp)
-	end
-      end
-    end
-
-    # Sends a LOGIN command to identify the client and carries
-    # the plaintext +password+ authenticating this +user+.  Note
-    # that, unlike calling #authenticate() with an +auth_type+
-    # of "LOGIN", #login() does *not* use the login authenticator.
-    #
-    # A Net::IMAP::NoResponseError is raised if authentication fails.
-    def login(user, password)
-      send_command("LOGIN", user, password)
-    end
-
-    # Sends a SELECT command to select a +mailbox+ so that messages
-    # in the +mailbox+ can be accessed. 
-    #
-    # After you have selected a mailbox, you may retrieve the
-    # number of items in that mailbox from @responses["EXISTS"][-1],
-    # and the number of recent messages from @responses["RECENT"][-1].
-    # Note that these values can change if new messages arrive
-    # during a session; see #add_response_handler() for a way of
-    # detecting this event.
-    #
-    # A Net::IMAP::NoResponseError is raised if the mailbox does not
-    # exist or is for some reason non-selectable.
-    def select(mailbox)
-      synchronize do
-	@responses.clear
-	send_command("SELECT", mailbox)
-      end
-    end
-
-    # Sends a EXAMINE command to select a +mailbox+ so that messages
-    # in the +mailbox+ can be accessed.  Behaves the same as #select(),
-    # except that the selected +mailbox+ is identified as read-only.
-    #
-    # A Net::IMAP::NoResponseError is raised if the mailbox does not
-    # exist or is for some reason non-examinable.
-    def examine(mailbox)
-      synchronize do
-	@responses.clear
-	send_command("EXAMINE", mailbox)
-      end
-    end
-
-    # Sends a CREATE command to create a new +mailbox+.
-    #
-    # A Net::IMAP::NoResponseError is raised if a mailbox with that name
-    # cannot be created.
-    def create(mailbox)
-      send_command("CREATE", mailbox)
-    end
-
-    # Sends a DELETE command to remove the +mailbox+.
-    #
-    # A Net::IMAP::NoResponseError is raised if a mailbox with that name
-    # cannot be deleted, either because it does not exist or because the
-    # client does not have permission to delete it.
-    def delete(mailbox)
-      send_command("DELETE", mailbox)
-    end
-
-    # Sends a RENAME command to change the name of the +mailbox+ to
-    # +newname+.
-    #
-    # A Net::IMAP::NoResponseError is raised if a mailbox with the 
-    # name +mailbox+ cannot be renamed to +newname+ for whatever
-    # reason; for instance, because +mailbox+ does not exist, or
-    # because there is already a mailbox with the name +newname+.
-    def rename(mailbox, newname)
-      send_command("RENAME", mailbox, newname)
-    end
-
-    # Sends a SUBSCRIBE command to add the specified +mailbox+ name to
-    # the server's set of "active" or "subscribed" mailboxes as returned
-    # by #lsub().
-    #
-    # A Net::IMAP::NoResponseError is raised if +mailbox+ cannot be
-    # subscribed to, for instance because it does not exist.
-    def subscribe(mailbox)
-      send_command("SUBSCRIBE", mailbox)
-    end
-
-    # Sends a UNSUBSCRIBE command to remove the specified +mailbox+ name
-    # from the server's set of "active" or "subscribed" mailboxes.
-    #
-    # A Net::IMAP::NoResponseError is raised if +mailbox+ cannot be
-    # unsubscribed from, for instance because the client is not currently
-    # subscribed to it.
-    def unsubscribe(mailbox)
-      send_command("UNSUBSCRIBE", mailbox)
-    end
-
-    # Sends a LIST command, and returns a subset of names from
-    # the complete set of all names available to the client.
-    # +refname+ provides a context (for instance, a base directory
-    # in a directory-based mailbox hierarchy).  +mailbox+ specifies
-    # a mailbox or (via wilcards) mailboxes under that context.
-    # Two wildcards may be used in +mailbox+: '*', which matches
-    # all characters *including* the hierarchy delimiter (for instance,
-    # '/' on a UNIX-hosted directory-based mailbox hierarchy); and '%',
-    # which matches all characters *except* the hierarchy delimiter.
-    #
-    # If +refname+ is empty, +mailbox+ is used directly to determine
-    # which mailboxes to match.  If +mailbox+ is empty, the root
-    # name of +refname+ and the hierarchy delimiter are returned.
-    #
-    # The return value is an array of +Net::IMAP::MailboxList+. For example:
-    #
-    #   imap.create("foo/bar")
-    #   imap.create("foo/baz")
-    #   p imap.list("", "foo/%")
-    #   #=> [#<Net::IMAP::MailboxList attr=[:Noselect], delim="/", name="foo/">, \\ 
-    #        #<Net::IMAP::MailboxList attr=[:Noinferiors, :Marked], delim="/", name="foo/bar">, \\ 
-    #        #<Net::IMAP::MailboxList attr=[:Noinferiors], delim="/", name="foo/baz">]
-    def list(refname, mailbox)
-      synchronize do
-	send_command("LIST", refname, mailbox)
-	return @responses.delete("LIST")
-      end
-    end
-
-    # Sends the GETQUOTAROOT command along with specified +mailbox+.
-    # This command is generally available to both admin and user.
-    # If mailbox exists, returns an array containing objects of
-    # Net::IMAP::MailboxQuotaRoot and Net::IMAP::MailboxQuota.
-    def getquotaroot(mailbox)
-      synchronize do
-        send_command("GETQUOTAROOT", mailbox)
-        result = []
-        result.concat(@responses.delete("QUOTAROOT"))
-        result.concat(@responses.delete("QUOTA"))
-        return result
-      end
-    end
-
-    # Sends the GETQUOTA command along with specified +mailbox+.
-    # If this mailbox exists, then an array containing a
-    # Net::IMAP::MailboxQuota object is returned.  This
-    # command generally is only available to server admin.
-    def getquota(mailbox)
-      synchronize do
-	send_command("GETQUOTA", mailbox)
-	return @responses.delete("QUOTA")
-      end
-    end
-
-    # Sends a SETQUOTA command along with the specified +mailbox+ and
-    # +quota+.  If +quota+ is nil, then quota will be unset for that
-    # mailbox.  Typically one needs to be logged in as server admin
-    # for this to work.  The IMAP quota commands are described in
-    # [RFC-2087].
-    def setquota(mailbox, quota)
-      if quota.nil?
-        data = '()'
-      else
-        data = '(STORAGE ' + quota.to_s + ')'
-      end
-      send_command("SETQUOTA", mailbox, RawData.new(data))
-    end
-
-    # Sends the SETACL command along with +mailbox+, +user+ and the
-    # +rights+ that user is to have on that mailbox.  If +rights+ is nil,
-    # then that user will be stripped of any rights to that mailbox.
-    # The IMAP ACL commands are described in [RFC-2086].
-    def setacl(mailbox, user, rights)
-      if rights.nil? 
-        send_command("SETACL", mailbox, user, "")
-      else
-        send_command("SETACL", mailbox, user, rights)
-      end
-    end
-
-    # Send the GETACL command along with specified +mailbox+.
-    # If this mailbox exists, an array containing objects of
-    # Net::IMAP::MailboxACLItem will be returned.
-    def getacl(mailbox)
-      synchronize do
-	send_command("GETACL", mailbox)
-	return @responses.delete("ACL")[-1]
-      end
-    end
-
-    # Sends a LSUB command, and returns a subset of names from the set
-    # of names that the user has declared as being "active" or
-    # "subscribed".  +refname+ and +mailbox+ are interpreted as 
-    # for #list().
-    # The return value is an array of +Net::IMAP::MailboxList+.
-    def lsub(refname, mailbox)
-      synchronize do
-	send_command("LSUB", refname, mailbox)
-	return @responses.delete("LSUB")
-      end
-    end
-
-    # Sends a STATUS command, and returns the status of the indicated
-    # +mailbox+. +attr+ is a list of one or more attributes that
-    # we are request the status of.  Supported attributes include:
-    #
-    #   MESSAGES:: the number of messages in the mailbox.
-    #   RECENT:: the number of recent messages in the mailbox.
-    #   UNSEEN:: the number of unseen messages in the mailbox.
-    #
-    # The return value is a hash of attributes. For example:
-    #
-    #   p imap.status("inbox", ["MESSAGES", "RECENT"])
-    #   #=> {"RECENT"=>0, "MESSAGES"=>44}
-    #
-    # A Net::IMAP::NoResponseError is raised if status values 
-    # for +mailbox+ cannot be returned, for instance because it
-    # does not exist.
-    def status(mailbox, attr)
-      synchronize do
-	send_command("STATUS", mailbox, attr)
-	return @responses.delete("STATUS")[-1].attr
-      end
-    end
-
-    # Sends a APPEND command to append the +message+ to the end of
-    # the +mailbox+. The optional +flags+ argument is an array of 
-    # flags to initially assing to the new message.  The optional
-    # +date_time+ argument specifies the creation time to assign to the 
-    # new message; it defaults to the current time.
-    # For example:
-    #
-    #   imap.append("inbox", <<EOF.gsub(/\n/, "\r\n"), [:Seen], Time.now)
-    #   Subject: hello
-    #   From: shugo@ruby-lang.org
-    #   To: shugo@ruby-lang.org
-    #   
-    #   hello world
-    #   EOF
-    #
-    # A Net::IMAP::NoResponseError is raised if the mailbox does
-    # not exist (it is not created automatically), or if the flags,
-    # date_time, or message arguments contain errors.
-    def append(mailbox, message, flags = nil, date_time = nil)
-      args = []
-      if flags
-	args.push(flags)
-      end
-      args.push(date_time) if date_time
-      args.push(Literal.new(message))
-      send_command("APPEND", mailbox, *args)
-    end
-
-    # Sends a CHECK command to request a checkpoint of the currently
-    # selected mailbox.  This performs implementation-specific
-    # housekeeping, for instance, reconciling the mailbox's 
-    # in-memory and on-disk state.
-    def check
-      send_command("CHECK")
-    end
-
-    # Sends a CLOSE command to close the currently selected mailbox.
-    # The CLOSE command permanently removes from the mailbox all
-    # messages that have the \Deleted flag set.
-    def close
-      send_command("CLOSE")
-    end
-
-    # Sends a EXPUNGE command to permanently remove from the currently
-    # selected mailbox all messages that have the \Deleted flag set.
-    def expunge
-      synchronize do
-	send_command("EXPUNGE")
-	return @responses.delete("EXPUNGE")
-      end
-    end
-
-    # Sends a SEARCH command to search the mailbox for messages that
-    # match the given searching criteria, and returns message sequence
-    # numbers.  +keys+ can either be a string holding the entire 
-    # search string, or a single-dimension array of search keywords and 
-    # arguments.  The following are some common search criteria;
-    # see [IMAP] section 6.4.4 for a full list.
-    #
-    # <message set>:: a set of message sequence numbers.  ',' indicates
-    #                 an interval, ':' indicates a range.  For instance,
-    #                 '2,10:12,15' means "2,10,11,12,15".
-    #
-    # BEFORE <date>:: messages with an internal date strictly before
-    #                 <date>.  The date argument has a format similar
-    #                 to 8-Aug-2002.
-    #
-    # BODY <string>:: messages that contain <string> within their body.
-    #
-    # CC <string>:: messages containing <string> in their CC field.
-    #
-    # FROM <string>:: messages that contain <string> in their FROM field.
-    #
-    # NEW:: messages with the \Recent, but not the \Seen, flag set.
-    #
-    # NOT <search-key>:: negate the following search key.
-    #
-    # OR <search-key> <search-key>:: "or" two search keys together.
-    #
-    # ON <date>:: messages with an internal date exactly equal to <date>, 
-    #             which has a format similar to 8-Aug-2002.
-    #
-    # SINCE <date>:: messages with an internal date on or after <date>.
-    #
-    # SUBJECT <string>:: messages with <string> in their subject.
-    #
-    # TO <string>:: messages with <string> in their TO field.
-    # 
-    # For example:
-    #
-    #   p imap.search(["SUBJECT", "hello", "NOT", "NEW"])
-    #   #=> [1, 6, 7, 8]
-    def search(keys, charset = nil)
-      return search_internal("SEARCH", keys, charset)
-    end
-
-    # As for #search(), but returns unique identifiers.
-    def uid_search(keys, charset = nil)
-      return search_internal("UID SEARCH", keys, charset)
-    end
-
-    # Sends a FETCH command to retrieve data associated with a message
-    # in the mailbox. The +set+ parameter is a number or an array of
-    # numbers or a Range object. The number is a message sequence
-    # number.  +attr+ is a list of attributes to fetch; see the
-    # documentation for Net::IMAP::FetchData for a list of valid
-    # attributes.
-    # The return value is an array of Net::IMAP::FetchData. For example:
-    #
-    #   p imap.fetch(6..8, "UID")
-    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"UID"=>98}>, \\ 
-    #        #<Net::IMAP::FetchData seqno=7, attr={"UID"=>99}>, \\ 
-    #        #<Net::IMAP::FetchData seqno=8, attr={"UID"=>100}>]
-    #   p imap.fetch(6, "BODY[HEADER.FIELDS (SUBJECT)]")
-    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"BODY[HEADER.FIELDS (SUBJECT)]"=>"Subject: test\r\n\r\n"}>]
-    #   data = imap.uid_fetch(98, ["RFC822.SIZE", "INTERNALDATE"])[0]
-    #   p data.seqno
-    #   #=> 6
-    #   p data.attr["RFC822.SIZE"]
-    #   #=> 611
-    #   p data.attr["INTERNALDATE"]
-    #   #=> "12-Oct-2000 22:40:59 +0900"
-    #   p data.attr["UID"]
-    #   #=> 98
-    def fetch(set, attr)
-      return fetch_internal("FETCH", set, attr)
-    end
-
-    # As for #fetch(), but +set+ contains unique identifiers.
-    def uid_fetch(set, attr)
-      return fetch_internal("UID FETCH", set, attr)
-    end
-
-    # Sends a STORE command to alter data associated with messages
-    # in the mailbox, in particular their flags. The +set+ parameter 
-    # is a number or an array of numbers or a Range object. Each number 
-    # is a message sequence number.  +attr+ is the name of a data item 
-    # to store: 'FLAGS' means to replace the message's flag list
-    # with the provided one; '+FLAGS' means to add the provided flags;
-    # and '-FLAGS' means to remove them.  +flags+ is a list of flags.
-    #
-    # The return value is an array of Net::IMAP::FetchData. For example:
-    #
-    #   p imap.store(6..8, "+FLAGS", [:Deleted])
-    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\ 
-    #        #<Net::IMAP::FetchData seqno=7, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\  
-    #        #<Net::IMAP::FetchData seqno=8, attr={"FLAGS"=>[:Seen, :Deleted]}>]
-    def store(set, attr, flags)
-      return store_internal("STORE", set, attr, flags)
-    end
-
-    # As for #store(), but +set+ contains unique identifiers.
-    def uid_store(set, attr, flags)
-      return store_internal("UID STORE", set, attr, flags)
-    end
-
-    # Sends a COPY command to copy the specified message(s) to the end
-    # of the specified destination +mailbox+. The +set+ parameter is
-    # a number or an array of numbers or a Range object. The number is
-    # a message sequence number.
-    def copy(set, mailbox)
-      copy_internal("COPY", set, mailbox)
-    end
-
-    # As for #copy(), but +set+ contains unique identifiers.
-    def uid_copy(set, mailbox)
-      copy_internal("UID COPY", set, mailbox)
-    end
-
-    # Sends a SORT command to sort messages in the mailbox.
-    # Returns an array of message sequence numbers. For example:
-    #
-    #   p imap.sort(["FROM"], ["ALL"], "US-ASCII")
-    #   #=> [1, 2, 3, 5, 6, 7, 8, 4, 9]
-    #   p imap.sort(["DATE"], ["SUBJECT", "hello"], "US-ASCII")
-    #   #=> [6, 7, 8, 1]
-    #
-    # See [SORT-THREAD-EXT] for more details.
-    def sort(sort_keys, search_keys, charset)
-      return sort_internal("SORT", sort_keys, search_keys, charset)
-    end
-
-    # As for #sort(), but returns an array of unique identifiers.
-    def uid_sort(sort_keys, search_keys, charset)
-      return sort_internal("UID SORT", sort_keys, search_keys, charset)
-    end
-
-    # Adds a response handler. For example, to detect when 
-    # the server sends us a new EXISTS response (which normally
-    # indicates new messages being added to the mail box), 
-    # you could add the following handler after selecting the
-    # mailbox.
-    #
-    #   imap.add_response_handler { |resp|
-    #     if resp.kind_of?(Net::IMAP::UntaggedResponse) and resp.name == "EXISTS"
-    #       puts "Mailbox now has #{resp.data} messages"
-    #     end
-    #   }
-    #
-    def add_response_handler(handler = Proc.new)
-      @response_handlers.push(handler)
-    end
-
-    # Removes the response handler.
-    def remove_response_handler(handler)
-      @response_handlers.delete(handler)
-    end
-
-    # As for #search(), but returns message sequence numbers in threaded
-    # format, as a Net::IMAP::ThreadMember tree.  The supported algorithms
-    # are:
-    #
-    # ORDEREDSUBJECT:: split into single-level threads according to subject,
-    #                  ordered by date.
-    # REFERENCES:: split into threads by parent/child relationships determined
-    #              by which message is a reply to which.
-    #
-    # Unlike #search(), +charset+ is a required argument.  US-ASCII
-    # and UTF-8 are sample values.
-    #
-    # See [SORT-THREAD-EXT] for more details.
-    def thread(algorithm, search_keys, charset)
-      return thread_internal("THREAD", algorithm, search_keys, charset)
-    end
-
-    # As for #thread(), but returns unique identifiers instead of 
-    # message sequence numbers.
-    def uid_thread(algorithm, search_keys, charset)
-      return thread_internal("UID THREAD", algorithm, search_keys, charset)
-    end
-
-    # Decode a string from modified UTF-7 format to UTF-8.
-    #
-    # UTF-7 is a 7-bit encoding of Unicode [UTF7].  IMAP uses a
-    # slightly modified version of this to encode mailbox names
-    # containing non-ASCII characters; see [IMAP] section 5.1.3.
-    #
-    # Net::IMAP does _not_ automatically encode and decode
-    # mailbox names to and from utf7.
-    def self.decode_utf7(s)
-      return s.gsub(/&(.*?)-/n) {
-	if $1.empty?
-	  "&"
-	else
-	  base64 = $1.tr(",", "/")
-	  x = base64.length % 4
-	  if x > 0
-	    base64.concat("=" * (4 - x))
-	  end
-	  u16tou8(base64.unpack("m")[0])
-	end
-      }
-    end
-
-    # Encode a string from UTF-8 format to modified UTF-7.
-    def self.encode_utf7(s)
-      return s.gsub(/(&)|([^\x20-\x25\x27-\x7e]+)/n) { |x|
-	if $1
-	  "&-"
-	else
-	  base64 = [u8tou16(x)].pack("m")
-	  "&" + base64.delete("=\n").tr("/", ",") + "-"
-	end
-      }
-    end
-
-    private
-
-    CRLF = "\r\n"      # :nodoc:
-    PORT = 143         # :nodoc:
-
-    @@debug = false
-    @@authenticators = {}
-
-    # Creates a new Net::IMAP object and connects it to the specified
-    # +port+ (143 by default) on the named +host+.  If +usessl+ is true, 
-    # then an attempt will
-    # be made to use SSL (now TLS) to connect to the server.  For this
-    # to work OpenSSL [OSSL] and the Ruby OpenSSL [RSSL]
-    # extensions need to be installed.  The +certs+ parameter indicates
-    # the path or file containing the CA cert of the server, and the
-    # +verify+ parameter is for the OpenSSL verification callback.
-    #
-    # The most common errors are:
-    #
-    # Errno::ECONNREFUSED:: connection refused by +host+ or an intervening
-    #                       firewall.
-    # Errno::ETIMEDOUT:: connection timed out (possibly due to packets
-    #                    being dropped by an intervening firewall).
-    # Errno::NETUNREACH:: there is no route to that network.
-    # SocketError:: hostname not known or other socket error.
-    # Net::IMAP::ByeResponseError:: we connected to the host, but they 
-    #                               immediately said goodbye to us.
-    def initialize(host, port = PORT, usessl = false, certs = nil, verify = false)
-      super()
-      @host = host
-      @port = port
-      @tag_prefix = "RUBY"
-      @tagno = 0
-      @parser = ResponseParser.new
-      @sock = TCPSocket.open(host, port)
-      if usessl
-        unless defined?(OpenSSL)
-          raise "SSL extension not installed"
-        end
-        @usessl = true
-        @sock = SSLSocket.new(@sock)
-
-        # verify the server.
-        @sock.ca_file = certs if certs && FileTest::file?(certs)
-        @sock.ca_path = certs if certs && FileTest::directory?(certs)
-        @sock.verify_mode = VERIFY_PEER if verify
-        @sock.verify_callback = VerifyCallbackProc if defined?(VerifyCallbackProc)
-
-        @sock.connect   # start ssl session.
-      else
-        @usessl = false
-      end
-      @responses = Hash.new([].freeze)
-      @tagged_responses = {}
-      @response_handlers = []
-      @tag_arrival = new_cond
-
-      @greeting = get_response
-      if /\ABYE\z/ni =~ @greeting.name
-	@sock.close
-	raise ByeResponseError, resp[0]
-      end
-
-      @client_thread = Thread.current
-      @receiver_thread = Thread.start {
-	receive_responses
-      }
-    end
-
-    def receive_responses
-      while true
-        begin
-          resp = get_response
-        rescue Exception
-          @sock.close
-          @client_thread.raise($!)
-          break
-        end
-        break unless resp
-        begin
-          synchronize do
-            case resp
-            when TaggedResponse
-              @tagged_responses[resp.tag] = resp
-              @tag_arrival.broadcast
-            when UntaggedResponse
-              record_response(resp.name, resp.data)
-              if resp.data.instance_of?(ResponseText) &&
-                  (code = resp.data.code)
-                record_response(code.name, code.data)
-              end
-            end
-            @response_handlers.each do |handler|
-              handler.call(resp)
-            end
-          end
-        rescue Exception
-          @client_thread.raise($!)
-        end
-      end
-    end
-
-    def get_tagged_response(tag, cmd)
-      until @tagged_responses.key?(tag)
-	@tag_arrival.wait
-      end
-      resp = @tagged_responses.delete(tag)
-      case resp.name
-      when /\A(?:NO)\z/ni
-	raise NoResponseError, resp.data.text
-      when /\A(?:BAD)\z/ni
-	raise BadResponseError, resp.data.text
-      else
-	return resp
-      end
-    end
-
-    def get_response
-      buff = ""
-      while true
-	s = @sock.gets(CRLF)
-	break unless s
-	buff.concat(s)
-	if /\{(\d+)\}\r\n/n =~ s
-	  s = @sock.read($1.to_i)
-	  buff.concat(s)
-	else
-	  break
-	end
-      end
-      return nil if buff.length == 0
-      if @@debug
-        $stderr.print(buff.gsub(/^/n, "S: "))
-      end
-      return @parser.parse(buff)
-    end
-
-    def record_response(name, data)
-      unless @responses.has_key?(name)
-	@responses[name] = []
-      end
-      @responses[name].push(data)
-    end
-
-    def send_command(cmd, *args, &block)
-      synchronize do
-	tag = generate_tag
-	data = args.collect {|i| format_data(i)}.join(" ")
-	if data.length > 0
-	  put_line(tag + " " + cmd + " " + data)
-	else
-	  put_line(tag + " " + cmd)
-	end
-	if block
-	  add_response_handler(block)
-	end
-	begin
-	  return get_tagged_response(tag, cmd)
-	ensure
-	  if block
-	    remove_response_handler(block)
-	  end
-	end
-      end
-    end
-
-    def generate_tag
-      @tagno += 1
-      return format("%s%04d", @tag_prefix, @tagno)
-    end
-
-    def send_data(*args)
-      data = args.collect {|i| format_data(i)}.join(" ")
-      put_line(data)
-    end
-
-    def put_line(line)
-      line = line + CRLF
-      @sock.print(line)
-      if @@debug
-        $stderr.print(line.gsub(/^/n, "C: "))
-      end
-    end
-
-    def format_data(data)
-      case data
-      when nil
-	return "NIL"
-      when String
-	return format_string(data)
-      when Integer
-	return format_number(data)
-      when Array
-	return format_list(data)
-      when Time
-	return format_time(data)
-      when Symbol
-	return format_symbol(data)
-      else
-	return data.format_data
-      end
-    end
-
-    def format_string(str)
-      case str
-      when ""
-	return '""'
-      when /[\x80-\xff\r\n]/n
-	# literal
-	return "{" + str.length.to_s + "}" + CRLF + str
-      when /[(){ \x00-\x1f\x7f%*"\\]/n
-	# quoted string
-	return '"' + str.gsub(/["\\]/n, "\\\\\\&") + '"'
-      else
-	# atom
-	return str
-      end
-    end
-
-    def format_number(num)
-      if num < 0 || num >= 4294967296
-	raise DataFormatError, num.to_s
-      end
-      return num.to_s
-    end
-
-    def format_list(list)
-      contents = list.collect {|i| format_data(i)}.join(" ")
-      return "(" + contents + ")"
-    end
-
-    DATE_MONTH = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
-
-    def format_time(time)
-      t = time.dup.gmtime
-      return format('"%2d-%3s-%4d %02d:%02d:%02d +0000"',
-		    t.day, DATE_MONTH[t.month - 1], t.year,
-		    t.hour, t.min, t.sec)
-    end
-
-    def format_symbol(symbol)
-      return "\\" + symbol.to_s
-    end
-
-    def search_internal(cmd, keys, charset)
-      if keys.instance_of?(String)
-	keys = [RawData.new(keys)]
-      else
-	normalize_searching_criteria(keys)
-      end
-      synchronize do
-	if charset
-	  send_command(cmd, "CHARSET", charset, *keys)
-	else
-	  send_command(cmd, *keys)
-	end
-	return @responses.delete("SEARCH")[-1]
-      end
-    end
-
-    def fetch_internal(cmd, set, attr)
-      if attr.instance_of?(String)
-	attr = RawData.new(attr)
-      end
-      synchronize do
-	@responses.delete("FETCH")
-	send_command(cmd, MessageSet.new(set), attr)
-	return @responses.delete("FETCH")
-      end
-    end
-
-    def store_internal(cmd, set, attr, flags)
-      if attr.instance_of?(String)
-	attr = RawData.new(attr)
-      end
-      synchronize do
-	@responses.delete("FETCH")
-	send_command(cmd, MessageSet.new(set), attr, flags)
-	return @responses.delete("FETCH")
-      end
-    end
-
-    def copy_internal(cmd, set, mailbox)
-      send_command(cmd, MessageSet.new(set), mailbox)
-    end
-
-    def sort_internal(cmd, sort_keys, search_keys, charset)
-      if search_keys.instance_of?(String)
-	search_keys = [RawData.new(search_keys)]
-      else
-	normalize_searching_criteria(search_keys)
-      end
-      normalize_searching_criteria(search_keys)
-      synchronize do
-	send_command(cmd, sort_keys, charset, *search_keys)
-	return @responses.delete("SORT")[-1]
-      end
-    end
-
-    def thread_internal(cmd, algorithm, search_keys, charset)
-      if search_keys.instance_of?(String)
-	search_keys = [RawData.new(search_keys)]
-      else
-	normalize_searching_criteria(search_keys)
-      end
-      normalize_searching_criteria(search_keys)
-      send_command(cmd, algorithm, charset, *search_keys)
-      return @responses.delete("THREAD")[-1]
-    end
-
-    def normalize_searching_criteria(keys)
-      keys.collect! do |i|
-	case i
-	when -1, Range, Array
-	  MessageSet.new(i)
-	else
-	  i
-	end
-      end
-    end
-
-    def self.u16tou8(s)
-      len = s.length
-      if len < 2
-	return ""
-      end
-      buf = ""
-      i = 0
-      while i < len
-	c = s[i] << 8 | s[i + 1]
-	i += 2
-	if c == 0xfeff
-	  next
-	elsif c < 0x0080
-	  buf.concat(c)
-	elsif c < 0x0800
-	  b2 = c & 0x003f
-	  b1 = c >> 6
-	  buf.concat(b1 | 0xc0)
-	  buf.concat(b2 | 0x80)
-	elsif c >= 0xdc00 && c < 0xe000
-	  raise DataFormatError, "invalid surrogate detected"
-	elsif c >= 0xd800 && c < 0xdc00
-	  if i + 2 > len
-	    raise DataFormatError, "invalid surrogate detected"
-	  end
-	  low = s[i] << 8 | s[i + 1]
-	  i += 2
-	  if low < 0xdc00 || low > 0xdfff
-	    raise DataFormatError, "invalid surrogate detected"
-	  end
-	  c = (((c & 0x03ff)) << 10 | (low & 0x03ff)) + 0x10000
-	  b4 = c & 0x003f
-	  b3 = (c >> 6) & 0x003f
-	  b2 = (c >> 12) & 0x003f
-	  b1 = c >> 18;
-	  buf.concat(b1 | 0xf0)
-	  buf.concat(b2 | 0x80)
-	  buf.concat(b3 | 0x80)
-	  buf.concat(b4 | 0x80)
-	else # 0x0800-0xffff
-	  b3 = c & 0x003f
-	  b2 = (c >> 6) & 0x003f
-	  b1 = c >> 12
-	  buf.concat(b1 | 0xe0)
-	  buf.concat(b2 | 0x80)
-	  buf.concat(b3 | 0x80)
-	end
-      end
-      return buf
-    end
-    private_class_method :u16tou8
-
-    def self.u8tou16(s)
-      len = s.length
-      buf = ""
-      i = 0
-      while i < len
-	c = s[i]
-	if (c & 0x80) == 0
-	  buf.concat(0x00)
-	  buf.concat(c)
-	  i += 1
-	elsif (c & 0xe0) == 0xc0 &&
-	    inlen >= 2 &&
-	    (s[i + 1] & 0xc0) == 0x80
-	  if c == 0xc0 || c == 0xc1
-	    raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
-	  end
-	  u = ((c & 0x1f) << 6) | (s[i + 1] & 0x3f)
-	  buf.concat(u >> 8)
-	  buf.concat(u & 0x00ff)
-	  i += 2
-	elsif (c & 0xf0) == 0xe0 &&
-	    i + 2 < len &&
-	    (s[i + 1] & 0xc0) == 0x80 &&
-	    (s[i + 2] & 0xc0) == 0x80
-	  if c == 0xe0 && s[i + 1] < 0xa0
-	    raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
-	  end
-	  u = ((c & 0x0f) << 12) | ((s[i + 1] & 0x3f) << 6) | (s[i + 2] & 0x3f)
-	  # surrogate chars
-	  if u >= 0xd800 && u <= 0xdfff
-	    raise DataFormatError, format("none-UTF-16 char detected (%04x)", u)
-	  end
-	  buf.concat(u >> 8)
-	  buf.concat(u & 0x00ff)
-	  i += 3
-	elsif (c & 0xf8) == 0xf0 &&
-	    i + 3 < len &&
-	    (s[i + 1] & 0xc0) == 0x80 &&
-	    (s[i + 2] & 0xc0) == 0x80 &&
-	    (s[i + 3] & 0xc0) == 0x80
-	  if c == 0xf0 && s[i + 1] < 0x90
-	    raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
-	  end
-	  u = ((c & 0x07) << 18) | ((s[i + 1] & 0x3f) << 12) |
-	    ((s[i + 2] & 0x3f) << 6) | (s[i + 3] & 0x3f)
-	  if u < 0x10000
-	    buf.concat(u >> 8)
-	    buf.concat(u & 0x00ff)
-	  elsif u < 0x110000
-	    high = ((u - 0x10000) >> 10) | 0xd800
-	    low = (u & 0x03ff) | 0xdc00
-	    buf.concat(high >> 8)
-	    buf.concat(high & 0x00ff)
-	    buf.concat(low >> 8)
-	    buf.concat(low & 0x00ff)
-	  else
-	    raise DataFormatError, format("none-UTF-16 char detected (%04x)", u)
-	  end
-	  i += 4
-	else
-	  raise DataFormatError, format("illegal UTF-8 sequence (%02x)", c)
-	end
-      end
-      return buf
-    end
-    private_class_method :u8tou16
-
-    class RawData # :nodoc:
-      def format_data
-	return @data
-      end
-
-      private
-
-      def initialize(data)
-	@data = data
-      end
-    end
-
-    class Atom # :nodoc:
-      def format_data
-	return @data
-      end
-
-      private
-
-      def initialize(data)
-	@data = data
-      end
-    end
-
-    class QuotedString # :nodoc:
-      def format_data
-	return '"' + @data.gsub(/["\\]/n, "\\\\\\&") + '"'
-      end
-
-      private
-
-      def initialize(data)
-	@data = data
-      end
-    end
-
-    class Literal # :nodoc:
-      def format_data
-	return "{" + @data.length.to_s + "}" + CRLF + @data
-      end
-
-      private
-
-      def initialize(data)
-	@data = data
-      end
-    end
-
-    class MessageSet # :nodoc:
-      def format_data
-	return format_internal(@data)
-      end
-
-      private
-
-      def initialize(data)
-	@data = data
-      end
-
-      def format_internal(data)
-	case data
-	when "*"
-	  return data
-	when Integer
-	  ensure_nz_number(data)
-	  if data == -1
-	    return "*"
-	  else
-	    return data.to_s
-	  end
-	when Range
-	  return format_internal(data.first) +
-	    ":" + format_internal(data.last)
-	when Array
-	  return data.collect {|i| format_internal(i)}.join(",")
-	when ThreadMember
-	  return data.seqno.to_s +
-	    ":" + data.children.collect {|i| format_internal(i).join(",")}
-	else
-	  raise DataFormatError, data.inspect
-	end
-      end
-
-      def ensure_nz_number(num)
-	if num < -1 || num == 0 || num >= 4294967296
-	  raise DataFormatError, num.inspect
-	end
-      end
-    end
-
-    # Net::IMAP::ContinuationRequest represents command continuation requests.
-    # 
-    # The command continuation request response is indicated by a "+" token
-    # instead of a tag.  This form of response indicates that the server is
-    # ready to accept the continuation of a command from the client.  The
-    # remainder of this response is a line of text.
-    # 
-    #   continue_req    ::= "+" SPACE (resp_text / base64)
-    # 
-    # ==== Fields:
-    # 
-    # data:: Returns the data (Net::IMAP::ResponseText).
-    # 
-    # raw_data:: Returns the raw data string.
-    ContinuationRequest = Struct.new(:data, :raw_data)
-
-    # Net::IMAP::UntaggedResponse represents untagged responses.
-    # 
-    # Data transmitted by the server to the client and status responses
-    # that do not indicate command completion are prefixed with the token
-    # "*", and are called untagged responses.
-    # 
-    #   response_data   ::= "*" SPACE (resp_cond_state / resp_cond_bye /
-    #                       mailbox_data / message_data / capability_data)
-    # 
-    # ==== Fields:
-    # 
-    # name:: Returns the name such as "FLAGS", "LIST", "FETCH"....
-    # 
-    # data:: Returns the data such as an array of flag symbols,
-    #         a ((<Net::IMAP::MailboxList>)) object....
-    # 
-    # raw_data:: Returns the raw data string.
-    UntaggedResponse = Struct.new(:name, :data, :raw_data)
-     
-    # Net::IMAP::TaggedResponse represents tagged responses.
-    # 
-    # The server completion result response indicates the success or
-    # failure of the operation.  It is tagged with the same tag as the
-    # client command which began the operation.
-    # 
-    #   response_tagged ::= tag SPACE resp_cond_state CRLF
-    #   
-    #   tag             ::= 1*<any ATOM_CHAR except "+">
-    #   
-    #   resp_cond_state ::= ("OK" / "NO" / "BAD") SPACE resp_text
-    # 
-    # ==== Fields:
-    # 
-    # tag:: Returns the tag.
-    # 
-    # name:: Returns the name. the name is one of "OK", "NO", "BAD".
-    # 
-    # data:: Returns the data. See ((<Net::IMAP::ResponseText>)).
-    # 
-    # raw_data:: Returns the raw data string.
-    #
-    TaggedResponse = Struct.new(:tag, :name, :data, :raw_data)
-     
-    # Net::IMAP::ResponseText represents texts of responses.
-    # The text may be prefixed by the response code.
-    # 
-    #   resp_text       ::= ["[" resp_text_code "]" SPACE] (text_mime2 / text)
-    #                       ;; text SHOULD NOT begin with "[" or "="
-    # 
-    # ==== Fields:
-    # 
-    # code:: Returns the response code. See ((<Net::IMAP::ResponseCode>)).
-    #       
-    # text:: Returns the text.
-    # 
-    ResponseText = Struct.new(:code, :text)
-
-    # 
-    # Net::IMAP::ResponseCode represents response codes.
-    # 
-    #   resp_text_code  ::= "ALERT" / "PARSE" /
-    #                       "PERMANENTFLAGS" SPACE "(" #(flag / "\*") ")" /
-    #                       "READ-ONLY" / "READ-WRITE" / "TRYCREATE" /
-    #                       "UIDVALIDITY" SPACE nz_number /
-    #                       "UNSEEN" SPACE nz_number /
-    #                       atom [SPACE 1*<any TEXT_CHAR except "]">]
-    # 
-    # ==== Fields:
-    # 
-    # name:: Returns the name such as "ALERT", "PERMANENTFLAGS", "UIDVALIDITY"....
-    # 
-    # data:: Returns the data if it exists.
-    #
-    ResponseCode = Struct.new(:name, :data)
-
-    # Net::IMAP::MailboxList represents contents of the LIST response.
-    # 
-    #   mailbox_list    ::= "(" #("\Marked" / "\Noinferiors" /
-    #                       "\Noselect" / "\Unmarked" / flag_extension) ")"
-    #                       SPACE (<"> QUOTED_CHAR <"> / nil) SPACE mailbox
-    # 
-    # ==== Fields:
-    # 
-    # attr:: Returns the name attributes. Each name attribute is a symbol
-    #        capitalized by String#capitalize, such as :Noselect (not :NoSelect).
-    # 
-    # delim:: Returns the hierarchy delimiter
-    # 
-    # name:: Returns the mailbox name.
-    #
-    MailboxList = Struct.new(:attr, :delim, :name)
-
-    # Net::IMAP::MailboxQuota represents contents of GETQUOTA response.
-    # This object can also be a response to GETQUOTAROOT.  In the syntax
-    # specification below, the delimiter used with the "#" construct is a
-    # single space (SPACE).
-    # 
-    #    quota_list      ::= "(" #quota_resource ")"
-    # 
-    #    quota_resource  ::= atom SPACE number SPACE number
-    # 
-    #    quota_response  ::= "QUOTA" SPACE astring SPACE quota_list
-    # 
-    # ==== Fields:
-    # 
-    # mailbox:: The mailbox with the associated quota.
-    # 
-    # usage:: Current storage usage of mailbox.
-    # 
-    # quota:: Quota limit imposed on mailbox.
-    #
-    MailboxQuota = Struct.new(:mailbox, :usage, :quota)
-
-    # Net::IMAP::MailboxQuotaRoot represents part of the GETQUOTAROOT
-    # response. (GETQUOTAROOT can also return Net::IMAP::MailboxQuota.)
-    # 
-    #    quotaroot_response ::= "QUOTAROOT" SPACE astring *(SPACE astring)
-    # 
-    # ==== Fields:
-    # 
-    # mailbox:: The mailbox with the associated quota.
-    # 
-    # quotaroots:: Zero or more quotaroots that effect the quota on the
-    #              specified mailbox.
-    #
-    MailboxQuotaRoot = Struct.new(:mailbox, :quotaroots)
-
-    # Net::IMAP::MailboxACLItem represents response from GETACL.
-    # 
-    #    acl_data        ::= "ACL" SPACE mailbox *(SPACE identifier SPACE rights)
-    # 
-    #    identifier      ::= astring
-    # 
-    #    rights          ::= astring
-    # 
-    # ==== Fields:
-    # 
-    # user:: Login name that has certain rights to the mailbox
-    #        that was specified with the getacl command.
-    # 
-    # rights:: The access rights the indicated user has to the
-    #          mailbox.
-    #
-    MailboxACLItem = Struct.new(:user, :rights)
-
-    # Net::IMAP::StatusData represents contents of the STATUS response.
-    # 
-    # ==== Fields:
-    # 
-    # mailbox:: Returns the mailbox name.
-    # 
-    # attr:: Returns a hash. Each key is one of "MESSAGES", "RECENT", "UIDNEXT",
-    #        "UIDVALIDITY", "UNSEEN". Each value is a number.
-    # 
-    StatusData = Struct.new(:mailbox, :attr)
-
-    # Net::IMAP::FetchData represents contents of the FETCH response.
-    # 
-    # ==== Fields:
-    # 
-    # seqno:: Returns the message sequence number.
-    #         (Note: not the unique identifier, even for the UID command response.)
-    # 
-    # attr:: Returns a hash. Each key is a data item name, and each value is
-    #        its value.
-    # 
-    #        The current data items are:
-    # 
-    #        [BODY]
-    #           A form of BODYSTRUCTURE without extension data.
-    #        [BODY[<section>]<<origin_octet>>]
-    #           A string expressing the body contents of the specified section.
-    #        [BODYSTRUCTURE]
-    #           An object that describes the [MIME-IMB] body structure of a message.
-    #           See Net::IMAP::BodyTypeBasic, Net::IMAP::BodyTypeText,
-    #           Net::IMAP::BodyTypeMessage, Net::IMAP::BodyTypeMultipart.
-    #        [ENVELOPE]
-    #           A Net::IMAP::Envelope object that describes the envelope
-    #           structure of a message.
-    #        [FLAGS]
-    #           A array of flag symbols that are set for this message. flag symbols
-    #           are capitalized by String#capitalize.
-    #        [INTERNALDATE]
-    #           A string representing the internal date of the message.
-    #        [RFC822]
-    #           Equivalent to BODY[].
-    #        [RFC822.HEADER]
-    #           Equivalent to BODY.PEEK[HEADER].
-    #        [RFC822.SIZE]
-    #           A number expressing the [RFC-822] size of the message.
-    #        [RFC822.TEXT]
-    #           Equivalent to BODY[TEXT].
-    #        [UID]
-    #           A number expressing the unique identifier of the message.
-    # 
-    FetchData = Struct.new(:seqno, :attr)
-
-    # Net::IMAP::Envelope represents envelope structures of messages.
-    # 
-    # ==== Fields:
-    # 
-    # date:: Returns a string that represents the date.
-    # 
-    # subject:: Returns a string that represents the subject.
-    # 
-    # from:: Returns an array of Net::IMAP::Address that represents the from.
-    # 
-    # sender:: Returns an array of Net::IMAP::Address that represents the sender.
-    # 
-    # reply_to:: Returns an array of Net::IMAP::Address that represents the reply-to.
-    # 
-    # to:: Returns an array of Net::IMAP::Address that represents the to.
-    # 
-    # cc:: Returns an array of Net::IMAP::Address that represents the cc.
-    # 
-    # bcc:: Returns an array of Net::IMAP::Address that represents the bcc.
-    # 
-    # in_reply_to:: Returns a string that represents the in-reply-to.
-    # 
-    # message_id:: Returns a string that represents the message-id.
-    # 
-    Envelope = Struct.new(:date, :subject, :from, :sender, :reply_to,
-			  :to, :cc, :bcc, :in_reply_to, :message_id)
-
-    # 
-    # Net::IMAP::Address represents electronic mail addresses.
-    # 
-    # ==== Fields:
-    # 
-    # name:: Returns the phrase from [RFC-822] mailbox.
-    # 
-    # route:: Returns the route from [RFC-822] route-addr.
-    # 
-    # mailbox:: nil indicates end of [RFC-822] group.
-    #           If non-nil and host is nil, returns [RFC-822] group name.
-    #           Otherwise, returns [RFC-822] local-part
-    # 
-    # host:: nil indicates [RFC-822] group syntax.
-    #        Otherwise, returns [RFC-822] domain name.
-    #
-    Address = Struct.new(:name, :route, :mailbox, :host)
-
-    # 
-    # Net::IMAP::ContentDisposition represents Content-Disposition fields.
-    # 
-    # ==== Fields:
-    # 
-    # dsp_type:: Returns the disposition type.
-    # 
-    # param:: Returns a hash that represents parameters of the Content-Disposition
-    #         field.
-    # 
-    ContentDisposition = Struct.new(:dsp_type, :param)
-
-    # Net::IMAP::ThreadMember represents a thread-node returned 
-    # by Net::IMAP#thread
-    #
-    # ==== Fields:
-    #
-    # seqno:: The sequence number of this message.
-    #
-    # children:: an array of Net::IMAP::ThreadMember objects for mail
-    # items that are children of this in the thread.
-    #
-    ThreadMember = Struct.new(:seqno, :children)
-
-    # Net::IMAP::BodyTypeBasic represents basic body structures of messages.
-    # 
-    # ==== Fields:
-    # 
-    # media_type:: Returns the content media type name as defined in [MIME-IMB].
-    # 
-    # subtype:: Returns the content subtype name as defined in [MIME-IMB].
-    # 
-    # param:: Returns a hash that represents parameters as defined in [MIME-IMB].
-    # 
-    # content_id:: Returns a string giving the content id as defined in [MIME-IMB].
-    # 
-    # description:: Returns a string giving the content description as defined in
-    #               [MIME-IMB].
-    # 
-    # encoding:: Returns a string giving the content transfer encoding as defined in
-    #            [MIME-IMB].
-    # 
-    # size:: Returns a number giving the size of the body in octets.
-    # 
-    # md5:: Returns a string giving the body MD5 value as defined in [MD5].
-    # 
-    # disposition:: Returns a Net::IMAP::ContentDisposition object giving
-    #               the content disposition.
-    # 
-    # language:: Returns a string or an array of strings giving the body
-    #            language value as defined in [LANGUAGE-TAGS].
-    # 
-    # extension:: Returns extension data.
-    # 
-    # multipart?:: Returns false.
-    # 
-    class BodyTypeBasic < Struct.new(:media_type, :subtype,
-				     :param, :content_id,
-				     :description, :encoding, :size,
-				     :md5, :disposition, :language,
-				     :extension)
-      def multipart?
-	return false
-      end
-
-      # Obsolete: use +subtype+ instead.  Calling this will
-      # generate a warning message to +stderr+, then return 
-      # the value of +subtype+.
-      def media_subtype
-	$stderr.printf("warning: media_subtype is obsolete.\n")
-	$stderr.printf("         use subtype instead.\n")
-	return subtype
-      end
-    end
-
-    # Net::IMAP::BodyTypeText represents TEXT body structures of messages.
-    # 
-    # ==== Fields:
-    # 
-    # lines:: Returns the size of the body in text lines.
-    # 
-    # And Net::IMAP::BodyTypeText has all fields of Net::IMAP::BodyTypeBasic.
-    # 
-    class BodyTypeText < Struct.new(:media_type, :subtype,
-				    :param, :content_id,
-				    :description, :encoding, :size,
-				    :lines,
-				    :md5, :disposition, :language,
-				    :extension)
-      def multipart?
-	return false
-      end
-
-      # Obsolete: use +subtype+ instead.  Calling this will
-      # generate a warning message to +stderr+, then return 
-      # the value of +subtype+.
-      def media_subtype
-	$stderr.printf("warning: media_subtype is obsolete.\n")
-	$stderr.printf("         use subtype instead.\n")
-	return subtype
-      end
-    end
-
-    # Net::IMAP::BodyTypeMessage represents MESSAGE/RFC822 body structures of messages.
-    # 
-    # ==== Fields:
-    # 
-    # envelope:: Returns a Net::IMAP::Envelope giving the envelope structure.
-    # 
-    # body:: Returns an object giving the body structure.
-    # 
-    # And Net::IMAP::BodyTypeMessage has all methods of Net::IMAP::BodyTypeText.
-    #
-    class BodyTypeMessage < Struct.new(:media_type, :subtype,
-				       :param, :content_id,
-				       :description, :encoding, :size,
-				       :envelope, :body, :lines,
-				       :md5, :disposition, :language,
-				       :extension)
-      def multipart?
-	return false
-      end
-
-      # Obsolete: use +subtype+ instead.  Calling this will
-      # generate a warning message to +stderr+, then return 
-      # the value of +subtype+.
-      def media_subtype
-	$stderr.printf("warning: media_subtype is obsolete.\n")
-	$stderr.printf("         use subtype instead.\n")
-	return subtype
-      end
-    end
-
-    # Net::IMAP::BodyTypeMultipart represents multipart body structures 
-    # of messages.
-    # 
-    # ==== Fields:
-    # 
-    # media_type:: Returns the content media type name as defined in [MIME-IMB].
-    # 
-    # subtype:: Returns the content subtype name as defined in [MIME-IMB].
-    # 
-    # parts:: Returns multiple parts.
-    # 
-    # param:: Returns a hash that represents parameters as defined in [MIME-IMB].
-    # 
-    # disposition:: Returns a Net::IMAP::ContentDisposition object giving
-    #               the content disposition.
-    # 
-    # language:: Returns a string or an array of strings giving the body
-    #            language value as defined in [LANGUAGE-TAGS].
-    # 
-    # extension:: Returns extension data.
-    # 
-    # multipart?:: Returns true.
-    # 
-    class BodyTypeMultipart < Struct.new(:media_type, :subtype,
-					 :parts,
-					 :param, :disposition, :language,
-					 :extension)
-      def multipart?
-	return true
-      end
-
-      # Obsolete: use +subtype+ instead.  Calling this will
-      # generate a warning message to +stderr+, then return 
-      # the value of +subtype+.
-      def media_subtype
-	$stderr.printf("warning: media_subtype is obsolete.\n")
-	$stderr.printf("         use subtype instead.\n")
-	return subtype
-      end
-    end
-
-    class ResponseParser # :nodoc:
-      def parse(str)
-	@str = str
-	@pos = 0
-	@lex_state = EXPR_BEG
-	@token = nil
-	return response
-      end
-
-      private
-
-      EXPR_BEG		= :EXPR_BEG
-      EXPR_DATA		= :EXPR_DATA
-      EXPR_TEXT		= :EXPR_TEXT
-      EXPR_RTEXT	= :EXPR_RTEXT
-      EXPR_CTEXT	= :EXPR_CTEXT
-
-      T_SPACE	= :SPACE
-      T_NIL	= :NIL
-      T_NUMBER	= :NUMBER
-      T_ATOM	= :ATOM
-      T_QUOTED	= :QUOTED
-      T_LPAR	= :LPAR
-      T_RPAR	= :RPAR
-      T_BSLASH	= :BSLASH
-      T_STAR	= :STAR
-      T_LBRA	= :LBRA
-      T_RBRA	= :RBRA
-      T_LITERAL	= :LITERAL
-      T_PLUS	= :PLUS
-      T_PERCENT	= :PERCENT
-      T_CRLF	= :CRLF
-      T_EOF	= :EOF
-      T_TEXT	= :TEXT
-
-      BEG_REGEXP = /\G(?:\
-(?# 1:	SPACE	)( )|\
-(?# 2:	NIL	)(NIL)(?=[\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+])|\
-(?# 3:	NUMBER	)(\d+)(?=[\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+])|\
-(?# 4:	ATOM	)([^\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+]+)|\
-(?# 5:	QUOTED	)"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)"|\
-(?# 6:	LPAR	)(\()|\
-(?# 7:	RPAR	)(\))|\
-(?# 8:	BSLASH	)(\\)|\
-(?# 9:	STAR	)(\*)|\
-(?# 10:	LBRA	)(\[)|\
-(?# 11:	RBRA	)(\])|\
-(?# 12:	LITERAL	)\{(\d+)\}\r\n|\
-(?# 13:	PLUS	)(\+)|\
-(?# 14:	PERCENT	)(%)|\
-(?# 15:	CRLF	)(\r\n)|\
-(?# 16:	EOF	)(\z))/ni
-
-      DATA_REGEXP = /\G(?:\
-(?# 1:	SPACE	)( )|\
-(?# 2:	NIL	)(NIL)|\
-(?# 3:	NUMBER	)(\d+)|\
-(?# 4:	QUOTED	)"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)"|\
-(?# 5:	LITERAL	)\{(\d+)\}\r\n|\
-(?# 6:	LPAR	)(\()|\
-(?# 7:	RPAR	)(\)))/ni
-
-      TEXT_REGEXP = /\G(?:\
-(?# 1:	TEXT	)([^\x00\x80-\xff\r\n]*))/ni
-
-      RTEXT_REGEXP = /\G(?:\
-(?# 1:	LBRA	)(\[)|\
-(?# 2:	TEXT	)([^\x00\x80-\xff\r\n]*))/ni
-
-      CTEXT_REGEXP = /\G(?:\
-(?# 1:	TEXT	)([^\x00\x80-\xff\r\n\]]*))/ni
-
-      Token = Struct.new(:symbol, :value)
-
-      def response
-	token = lookahead
-	case token.symbol
-	when T_PLUS
-	  result = continue_req
-	when T_STAR
-	  result = response_untagged
-	else
-	  result = response_tagged
-	end
-	match(T_CRLF)
-	match(T_EOF)
-	return result
-      end
-
-      def continue_req
-	match(T_PLUS)
-	match(T_SPACE)
-	return ContinuationRequest.new(resp_text, @str)
-      end
-
-      def response_untagged
-	match(T_STAR)
-	match(T_SPACE)
-	token = lookahead
-	if token.symbol == T_NUMBER
-	  return numeric_response
-	elsif token.symbol == T_ATOM
-	  case token.value
-	  when /\A(?:OK|NO|BAD|BYE|PREAUTH)\z/ni
-	    return response_cond
-	  when /\A(?:FLAGS)\z/ni
-	    return flags_response
-	  when /\A(?:LIST|LSUB)\z/ni
-	    return list_response
-	  when /\A(?:QUOTA)\z/ni
-	    return getquota_response
-	  when /\A(?:QUOTAROOT)\z/ni
-	    return getquotaroot_response
-	  when /\A(?:ACL)\z/ni
-	    return getacl_response
-	  when /\A(?:SEARCH|SORT)\z/ni
-	    return search_response
-	  when /\A(?:THREAD)\z/ni
-	    return thread_response
-	  when /\A(?:STATUS)\z/ni
-	    return status_response
-	  when /\A(?:CAPABILITY)\z/ni
-	    return capability_response
-	  else
-	    return text_response
-	  end
-	else
-	  parse_error("unexpected token %s", token.symbol)
-	end
-      end
-
-      def response_tagged
-	tag = atom
-	match(T_SPACE)
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return TaggedResponse.new(tag, name, resp_text, @str)
-      end
-
-      def response_cond
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return UntaggedResponse.new(name, resp_text, @str)
-      end
-
-      def numeric_response
-	n = number
-	match(T_SPACE)
-	token = match(T_ATOM)
-	name = token.value.upcase
-	case name
-	when "EXISTS", "RECENT", "EXPUNGE"
-	  return UntaggedResponse.new(name, n, @str)
-	when "FETCH"
-	  shift_token
-	  match(T_SPACE)
-	  data = FetchData.new(n, msg_att)
-	  return UntaggedResponse.new(name, data, @str)
-	end
-      end
-
-      def msg_att
-	match(T_LPAR)
-	attr = {}
-	while true
-	  token = lookahead
-	  case token.symbol
-	  when T_RPAR
-	    shift_token
-	    break
-	  when T_SPACE
-	    shift_token
-	    token = lookahead
-	  end
-	  case token.value
-	  when /\A(?:ENVELOPE)\z/ni
-	    name, val = envelope_data
-	  when /\A(?:FLAGS)\z/ni
-	    name, val = flags_data
-	  when /\A(?:INTERNALDATE)\z/ni
-	    name, val = internaldate_data
-	  when /\A(?:RFC822(?:\.HEADER|\.TEXT)?)\z/ni
-	    name, val = rfc822_text
-	  when /\A(?:RFC822\.SIZE)\z/ni
-	    name, val = rfc822_size
-	  when /\A(?:BODY(?:STRUCTURE)?)\z/ni
-	    name, val = body_data
-	  when /\A(?:UID)\z/ni
-	    name, val = uid_data
-	  else
-	    parse_error("unknown attribute `%s'", token.value)
-	  end
-	  attr[name] = val
-	end
-	return attr
-      end
-
-      def envelope_data
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return name, envelope
-      end
-
-      def envelope
-	@lex_state = EXPR_DATA
-	match(T_LPAR)
-	date = nstring
-	match(T_SPACE)
-	subject = nstring
-	match(T_SPACE)
-	from = address_list
-	match(T_SPACE)
-	sender = address_list
-	match(T_SPACE)
-	reply_to = address_list
-	match(T_SPACE)
-	to = address_list
-	match(T_SPACE)
-	cc = address_list
-	match(T_SPACE)
-	bcc = address_list
-	match(T_SPACE)
-	in_reply_to = nstring
-	match(T_SPACE)
-	message_id = nstring
-	match(T_RPAR)
-	@lex_state = EXPR_BEG
-	return Envelope.new(date, subject, from, sender, reply_to,
-			    to, cc, bcc, in_reply_to, message_id)
-      end
-
-      def flags_data
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return name, flag_list
-      end
-
-      def internaldate_data
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	token = match(T_QUOTED)
-	return name, token.value
-      end
-
-      def rfc822_text
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return name, nstring
-      end
-
-      def rfc822_size
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return name, number
-      end
-
-      def body_data
-	token = match(T_ATOM)
-	name = token.value.upcase
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	  return name, body
-	end
-	name.concat(section)
-	token = lookahead
-	if token.symbol == T_ATOM
-	  name.concat(token.value)
-	  shift_token
-	end
-	match(T_SPACE)
-	data = nstring
-	return name, data
-      end
-
-      def body
-	@lex_state = EXPR_DATA
-	match(T_LPAR)
-	token = lookahead
-	if token.symbol == T_LPAR
-	  result = body_type_mpart
-	else
-	  result = body_type_1part
-	end
-	match(T_RPAR)
-	@lex_state = EXPR_BEG
-	return result
-      end
-
-      def body_type_1part
-	token = lookahead
-	case token.value
-	when /\A(?:TEXT)\z/ni
-	  return body_type_text
-	when /\A(?:MESSAGE)\z/ni
-	  return body_type_msg
-	else
-	  return body_type_basic
-	end
-      end
-
-      def body_type_basic
-	mtype, msubtype = media_type
-	match(T_SPACE)
-	param, content_id, desc, enc, size = body_fields
-	md5, disposition, language, extension = body_ext_1part
-	return BodyTypeBasic.new(mtype, msubtype,
-				 param, content_id,
-				 desc, enc, size,
-				 md5, disposition, language, extension)
-      end
-
-      def body_type_text
-	mtype, msubtype = media_type
-	match(T_SPACE)
-	param, content_id, desc, enc, size = body_fields
-	match(T_SPACE)
-	lines = number
-	md5, disposition, language, extension = body_ext_1part
-	return BodyTypeText.new(mtype, msubtype,
-				param, content_id,
-				desc, enc, size,
-				lines,
-				md5, disposition, language, extension)
-      end
-
-      def body_type_msg
-	mtype, msubtype = media_type
-	match(T_SPACE)
-	param, content_id, desc, enc, size = body_fields
-	match(T_SPACE)
-	env = envelope
-	match(T_SPACE)
-	b = body
-	match(T_SPACE)
-	lines = number
-	md5, disposition, language, extension = body_ext_1part
-	return BodyTypeMessage.new(mtype, msubtype,
-				   param, content_id,
-				   desc, enc, size,
-				   env, b, lines,
-				   md5, disposition, language, extension)
-      end
-
-      def body_type_mpart
-	parts = []
-	while true
-	  token = lookahead
-	  if token.symbol == T_SPACE
-	    shift_token
-	    break
-	  end
-	  parts.push(body)
-	end
-	mtype = "MULTIPART"
-	msubtype = string.upcase
-	param, disposition, language, extension = body_ext_mpart
-	return BodyTypeMultipart.new(mtype, msubtype, parts,
-				     param, disposition, language,
-				     extension)
-      end
-
-      def media_type
-	mtype = string.upcase
-	match(T_SPACE)
-	msubtype = string.upcase
-	return mtype, msubtype
-      end
-
-      def body_fields
-	param = body_fld_param
-	match(T_SPACE)
-	content_id = nstring
-	match(T_SPACE)
-	desc = nstring
-	match(T_SPACE)
-	enc = string.upcase
-	match(T_SPACE)
-	size = number
-	return param, content_id, desc, enc, size
-      end
-
-      def body_fld_param
-	token = lookahead
-	if token.symbol == T_NIL
-	  shift_token
-	  return nil
-	end
-	match(T_LPAR)
-	param = {}
-	while true
-	  token = lookahead
-	  case token.symbol
-	  when T_RPAR
-	    shift_token
-	    break
-	  when T_SPACE
-	    shift_token
-	  end
-	  name = string.upcase
-	  match(T_SPACE)
-	  val = string
-	  param[name] = val
-	end
-	return param
-      end
-
-      def body_ext_1part
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	else
-	  return nil
-	end
-	md5 = nstring
-
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	else
-	  return md5
-	end
-	disposition = body_fld_dsp
-
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	else
-	  return md5, disposition
-	end
-	language = body_fld_lang
-
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	else
-	  return md5, disposition, language
-	end
-
-	extension = body_extensions
-	return md5, disposition, language, extension
-      end
-
-      def body_ext_mpart
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	else
-	  return nil
-	end
-	param = body_fld_param
-
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	else
-	  return param
-	end
-	disposition = body_fld_dsp
-	match(T_SPACE)
-	language = body_fld_lang
-
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	else
-	  return param, disposition, language
-	end
-
-	extension = body_extensions
-	return param, disposition, language, extension
-      end
-
-      def body_fld_dsp
-	token = lookahead
-	if token.symbol == T_NIL
-	  shift_token
-	  return nil
-	end
-	match(T_LPAR)
-	dsp_type = string.upcase
-	match(T_SPACE)
-	param = body_fld_param
-	match(T_RPAR)
-	return ContentDisposition.new(dsp_type, param)
-      end
-
-      def body_fld_lang
-	token = lookahead
-	if token.symbol == T_LPAR
-	  shift_token
-	  result = []
-	  while true
-	    token = lookahead
-	    case token.symbol
-	    when T_RPAR
-	      shift_token
-	      return result
-	    when T_SPACE
-	      shift_token
-	    end
-	    result.push(string.upcase)
-	  end
-	else
-	  lang = nstring
-	  if lang
-	    return lang.upcase
-	  else
-	    return lang
-	  end
-	end
-      end
-
-      def body_extensions
-	result = []
-	while true
-	  token = lookahead
-	  case token.symbol
-	  when T_RPAR
-	    return result
-	  when T_SPACE
-	    shift_token
-	  end
-	  result.push(body_extension)
-	end
-      end
-
-      def body_extension
-	token = lookahead
-	case token.symbol
-	when T_LPAR
-	  shift_token
-	  result = body_extensions
-	  match(T_RPAR)
-	  return result
-	when T_NUMBER
-	  return number
-	else
-	  return nstring
-	end
-      end
-
-      def section
-	str = ""
-	token = match(T_LBRA)
-	str.concat(token.value)
-	token = match(T_ATOM, T_NUMBER, T_RBRA)
-	if token.symbol == T_RBRA
-	  str.concat(token.value)
-	  return str
-	end
-	str.concat(token.value)
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	  str.concat(token.value)
-	  token = match(T_LPAR)
-	  str.concat(token.value)
-	  while true
-	    token = lookahead
-	    case token.symbol
-	    when T_RPAR
-	      str.concat(token.value)
-	      shift_token
-	      break
-	    when T_SPACE
-	      shift_token
-	      str.concat(token.value)
-	    end
-	    str.concat(format_string(astring))
-	  end
-	end
-	token = match(T_RBRA)
-	str.concat(token.value)
-	return str
-      end
-
-      def format_string(str)
-	case str
-	when ""
-	  return '""'
-	when /[\x80-\xff\r\n]/n
-	  # literal
-	  return "{" + str.length.to_s + "}" + CRLF + str
-	when /[(){ \x00-\x1f\x7f%*"\\]/n
-	  # quoted string
-	  return '"' + str.gsub(/["\\]/n, "\\\\\\&") + '"'
-	else
-	  # atom
-	  return str
-	end
-      end
-
-      def uid_data
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return name, number
-      end
-
-      def text_response
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	@lex_state = EXPR_TEXT
-	token = match(T_TEXT)
-	@lex_state = EXPR_BEG
-	return UntaggedResponse.new(name, token.value)
-      end
-
-      def flags_response
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return UntaggedResponse.new(name, flag_list, @str)
-      end
-
-      def list_response
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	return UntaggedResponse.new(name, mailbox_list, @str)
-      end
-
-      def mailbox_list
-	attr = flag_list
-	match(T_SPACE)
-	token = match(T_QUOTED, T_NIL)
-	if token.symbol == T_NIL
-	  delim = nil
-	else
-	  delim = token.value
-	end
-	match(T_SPACE)
-	name = astring
-	return MailboxList.new(attr, delim, name)
-      end
-
-      def getquota_response
-        # If quota never established, get back
-        # `NO Quota root does not exist'.
-        # If quota removed, get `()' after the
-        # folder spec with no mention of `STORAGE'.
-        token = match(T_ATOM)
-        name = token.value.upcase
-        match(T_SPACE)
-        mailbox = astring
-        match(T_SPACE)
-        match(T_LPAR)
-        token = lookahead
-        case token.symbol
-        when T_RPAR
-          shift_token
-          data = MailboxQuota.new(mailbox, nil, nil)
-          return UntaggedResponse.new(name, data, @str)
-        when T_ATOM
-          shift_token
-          match(T_SPACE)
-          token = match(T_NUMBER)
-          usage = token.value
-          match(T_SPACE)
-          token = match(T_NUMBER)
-          quota = token.value
-          match(T_RPAR)
-          data = MailboxQuota.new(mailbox, usage, quota)
-          return UntaggedResponse.new(name, data, @str)
-        else
-          parse_error("unexpected token %s", token.symbol)
-        end
-      end
-
-      def getquotaroot_response
-        # Similar to getquota, but only admin can use getquota.
-        token = match(T_ATOM)
-        name = token.value.upcase
-        match(T_SPACE)
-        mailbox = astring
-        quotaroots = []
-        while true
-          token = lookahead
-          break unless token.symbol == T_SPACE
-          shift_token
-          quotaroots.push(astring)
-        end
-        data = MailboxQuotaRoot.new(mailbox, quotaroots)
-        return UntaggedResponse.new(name, data, @str)
-      end
-
-      def getacl_response
-        token = match(T_ATOM)
-        name = token.value.upcase
-        match(T_SPACE)
-        mailbox = astring
-        data = []
-        token = lookahead
-        if token.symbol == T_SPACE
-          shift_token
-          while true
-            token = lookahead
-            case token.symbol
-            when T_CRLF
-              break
-            when T_SPACE
-              shift_token
-            end
-            user = astring
-            match(T_SPACE)
-            rights = astring
-            ##XXX data.push([user, rights])
-            data.push(MailboxACLItem.new(user, rights))
-          end
-        end
-	return UntaggedResponse.new(name, data, @str)
-      end
-
-      def search_response
-	token = match(T_ATOM)
-	name = token.value.upcase
-	token = lookahead
-	if token.symbol == T_SPACE
-	  shift_token
-	  data = []
-	  while true
-	    token = lookahead
-	    case token.symbol
-	    when T_CRLF
-	      break
-	    when T_SPACE
-	      shift_token
-	    end
-	    data.push(number)
-	  end
-	else
-	  data = []
-	end
-	return UntaggedResponse.new(name, data, @str)
-      end
-
-      def thread_response
-	token = match(T_ATOM)
-	name = token.value.upcase
-	token = lookahead
-
-	if token.symbol == T_SPACE
-	  threads = []
-
-	  while true
-	    shift_token
-	    token = lookahead
-
-	    case token.symbol
-	    when T_LPAR
-	      threads << thread_branch(token)
-	    when T_CRLF
-	      break
-	    end
-	  end
-	else
-	  # no member
-	  threads = []
-	end
-
-	return UntaggedResponse.new(name, threads, @str)
-      end
-
-      def thread_branch(token)
-	rootmember = nil
-	lastmember = nil
-	
-	while true
-	  shift_token    # ignore first T_LPAR
-	  token = lookahead
-	  
-	  case token.symbol
-	  when T_NUMBER
-	    # new member
-	    newmember = ThreadMember.new(number, [])
-	    if rootmember.nil?
-	      rootmember = newmember
-	    else    
-	      lastmember.children << newmember
-	    end     
-	    lastmember = newmember
-	  when T_SPACE 
-	    # do nothing 
-	  when T_LPAR
-	    if rootmember.nil?
-	      # dummy member
-	      lastmember = rootmember = ThreadMember.new(nil, [])
-	    end     
-	    
-	    lastmember.children << thread_branch(token)
-	  when T_RPAR
-	    break   
-	  end     
-	end
-	
-	return rootmember
-      end
-
-      def status_response
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	mailbox = astring
-	match(T_SPACE)
-	match(T_LPAR)
-	attr = {}
-	while true
-	  token = lookahead
-	  case token.symbol
-	  when T_RPAR
-	    shift_token
-	    break
-	  when T_SPACE
-	    shift_token
-	  end
-	  token = match(T_ATOM)
-	  key = token.value.upcase
-	  match(T_SPACE)
-	  val = number
-	  attr[key] = val
-	end
-	data = StatusData.new(mailbox, attr)
-	return UntaggedResponse.new(name, data, @str)
-      end
-
-      def capability_response
-	token = match(T_ATOM)
-	name = token.value.upcase
-	match(T_SPACE)
-	data = []
-	while true
-	  token = lookahead
-	  case token.symbol
-	  when T_CRLF
-	    break
-	  when T_SPACE
-	    shift_token
-	  end
-	  data.push(atom.upcase)
-	end
-	return UntaggedResponse.new(name, data, @str)
-      end
-
-      def resp_text
-	@lex_state = EXPR_RTEXT
-	token = lookahead
-	if token.symbol == T_LBRA
-	  code = resp_text_code
-	else
-	  code = nil
-	end
-	token = match(T_TEXT)
-	@lex_state = EXPR_BEG
-	return ResponseText.new(code, token.value)
-      end
-
-      def resp_text_code
-	@lex_state = EXPR_BEG
-	match(T_LBRA)
-	token = match(T_ATOM)
-	name = token.value.upcase
-	case name
-	when /\A(?:ALERT|PARSE|READ-ONLY|READ-WRITE|TRYCREATE)\z/n
-	  result = ResponseCode.new(name, nil)
-	when /\A(?:PERMANENTFLAGS)\z/n
-	  match(T_SPACE)
-	  result = ResponseCode.new(name, flag_list)
-	when /\A(?:UIDVALIDITY|UIDNEXT|UNSEEN)\z/n
-	  match(T_SPACE)
-	  result = ResponseCode.new(name, number)
-	else
-	  match(T_SPACE)
-	  @lex_state = EXPR_CTEXT
-	  token = match(T_TEXT)
-	  @lex_state = EXPR_BEG
-	  result = ResponseCode.new(name, token.value)
-	end
-	match(T_RBRA)
-	@lex_state = EXPR_RTEXT
-	return result
-      end
-
-      def address_list
-	token = lookahead
-	if token.symbol == T_NIL
-	  shift_token
-	  return nil
-	else
-	  result = []
-	  match(T_LPAR)
-	  while true
-	    token = lookahead
-	    case token.symbol
-	    when T_RPAR
-	      shift_token
-	      break
-	    when T_SPACE
-	      shift_token
-	    end
-	    result.push(address)
-	  end
-	  return result
-	end
-      end
-
-      ADDRESS_REGEXP = /\G\
-(?# 1: NAME	)(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
-(?# 2: ROUTE	)(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
-(?# 3: MAILBOX	)(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
-(?# 4: HOST	)(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)")\
-\)/ni
-
-      def address
-	match(T_LPAR)
-	if @str.index(ADDRESS_REGEXP, @pos)
-	  # address does not include literal.
-	  @pos = $~.end(0)
-	  name = $1
-	  route = $2
-	  mailbox = $3
-	  host = $4
-	  for s in [name, route, mailbox, host]
-	    if s
-	      s.gsub!(/\\(["\\])/n, "\\1")
-	    end
-	  end
-	else
-	  name = nstring
-	  match(T_SPACE)
-	  route = nstring
-	  match(T_SPACE)
-	  mailbox = nstring
-	  match(T_SPACE)
-	  host = nstring
-	  match(T_RPAR)
-	end
-	return Address.new(name, route, mailbox, host)
-      end
-
-#        def flag_list
-#  	result = []
-#  	match(T_LPAR)
-#  	while true
-#  	  token = lookahead
-#  	  case token.symbol
-#  	  when T_RPAR
-#  	    shift_token
-#  	    break
-#  	  when T_SPACE
-#  	    shift_token
-#  	  end
-#  	  result.push(flag)
-#  	end
-#  	return result
-#        end
-
-#        def flag
-#  	token = lookahead
-#  	if token.symbol == T_BSLASH
-#  	  shift_token
-#  	  token = lookahead
-#  	  if token.symbol == T_STAR
-#  	    shift_token
-#  	    return token.value.intern
-#  	  else
-#  	    return atom.intern
-#  	  end
-#  	else
-#  	  return atom
-#  	end
-#        end
-
-      FLAG_REGEXP = /\
-(?# FLAG	)\\([^\x80-\xff(){ \x00-\x1f\x7f%"\\]+)|\
-(?# ATOM	)([^\x80-\xff(){ \x00-\x1f\x7f%*"\\]+)/n
-
-      def flag_list
-	if @str.index(/\(([^)]*)\)/ni, @pos)
-	  @pos = $~.end(0)
-	  return $1.scan(FLAG_REGEXP).collect { |flag, atom|
-	    atom || flag.capitalize.intern
-	  }
-	else
-	  parse_error("invalid flag list")
-	end
-      end
-
-      def nstring
-	token = lookahead
-	if token.symbol == T_NIL
-	  shift_token
-	  return nil
-	else
-	  return string
-	end
-      end
-
-      def astring
-	token = lookahead
-	if string_token?(token)
-	  return string
-	else
-	  return atom
-	end
-      end
-
-      def string
-	token = match(T_QUOTED, T_LITERAL)
-	return token.value
-      end
-
-      STRING_TOKENS = [T_QUOTED, T_LITERAL]
-
-      def string_token?(token)
-	return STRING_TOKENS.include?(token.symbol)
-      end
-
-      def atom
-  	result = ""
-  	while true
-  	  token = lookahead
-  	  if atom_token?(token)
-  	    result.concat(token.value)
-  	    shift_token
-  	  else
-  	    if result.empty?
-  	      parse_error("unexpected token %s", token.symbol)
-  	    else
-  	      return result
-  	    end
-  	  end
-  	end
-      end
-
-      ATOM_TOKENS = [
-	T_ATOM,
-	T_NUMBER,
-	T_NIL,
-	T_LBRA,
-	T_RBRA,
-	T_PLUS
-      ]
-
-      def atom_token?(token)
-	return ATOM_TOKENS.include?(token.symbol)
-      end
-
-      def number
-	token = match(T_NUMBER)
-	return token.value.to_i
-      end
-
-      def nil_atom
-	match(T_NIL)
-	return nil
-      end
-
-      def match(*args)
-	token = lookahead
-	unless args.include?(token.symbol)
-	  parse_error('unexpected token %s (expected %s)',
-		      token.symbol.id2name,
-		      args.collect {|i| i.id2name}.join(" or "))
-	end
-	shift_token
-	return token
-      end
-
-      def lookahead
-	unless @token
-	  @token = next_token
-	end
-	return @token
-      end
-
-      def shift_token
-	@token = nil
-      end
-
-      def next_token
-	case @lex_state
-	when EXPR_BEG
-	  if @str.index(BEG_REGEXP, @pos)
-	    @pos = $~.end(0)
-	    if $1
-	      return Token.new(T_SPACE, $+)
-	    elsif $2
-	      return Token.new(T_NIL, $+)
-	    elsif $3
-	      return Token.new(T_NUMBER, $+)
-	    elsif $4
-	      return Token.new(T_ATOM, $+)
-	    elsif $5
-	      return Token.new(T_QUOTED,
-			       $+.gsub(/\\(["\\])/n, "\\1"))
-	    elsif $6
-	      return Token.new(T_LPAR, $+)
-	    elsif $7
-	      return Token.new(T_RPAR, $+)
-	    elsif $8
-	      return Token.new(T_BSLASH, $+)
-	    elsif $9
-	      return Token.new(T_STAR, $+)
-	    elsif $10
-	      return Token.new(T_LBRA, $+)
-	    elsif $11
-	      return Token.new(T_RBRA, $+)
-	    elsif $12
-	      len = $+.to_i
-	      val = @str[@pos, len]
-	      @pos += len
-	      return Token.new(T_LITERAL, val)
-	    elsif $13
-	      return Token.new(T_PLUS, $+)
-	    elsif $14
-	      return Token.new(T_PERCENT, $+)
-	    elsif $15
-	      return Token.new(T_CRLF, $+)
-	    elsif $16
-	      return Token.new(T_EOF, $+)
-	    else
-	      parse_error("[Net::IMAP BUG] BEG_REGEXP is invalid")
-	    end
-	  else
-	    @str.index(/\S*/n, @pos)
-	    parse_error("unknown token - %s", $&.dump)
-	  end
-	when EXPR_DATA
-	  if @str.index(DATA_REGEXP, @pos)
-	    @pos = $~.end(0)
-	    if $1
-	      return Token.new(T_SPACE, $+)
-	    elsif $2
-	      return Token.new(T_NIL, $+)
-	    elsif $3
-	      return Token.new(T_NUMBER, $+)
-	    elsif $4
-	      return Token.new(T_QUOTED,
-			       $+.gsub(/\\(["\\])/n, "\\1"))
-	    elsif $5
-	      len = $+.to_i
-	      val = @str[@pos, len]
-	      @pos += len
-	      return Token.new(T_LITERAL, val)
-	    elsif $6
-	      return Token.new(T_LPAR, $+)
-	    elsif $7
-	      return Token.new(T_RPAR, $+)
-	    else
-	      parse_error("[Net::IMAP BUG] BEG_REGEXP is invalid")
-	    end
-	  else
-	    @str.index(/\S*/n, @pos)
-	    parse_error("unknown token - %s", $&.dump)
-	  end
-	when EXPR_TEXT
-	  if @str.index(TEXT_REGEXP, @pos)
-	    @pos = $~.end(0)
-	    if $1
-	      return Token.new(T_TEXT, $+)
-	    else
-	      parse_error("[Net::IMAP BUG] TEXT_REGEXP is invalid")
-	    end
-	  else
-	    @str.index(/\S*/n, @pos)
-	    parse_error("unknown token - %s", $&.dump)
-	  end
-	when EXPR_RTEXT
-	  if @str.index(RTEXT_REGEXP, @pos)
-	    @pos = $~.end(0)
-	    if $1
-	      return Token.new(T_LBRA, $+)
-	    elsif $2
-	      return Token.new(T_TEXT, $+)
-	    else
-	      parse_error("[Net::IMAP BUG] RTEXT_REGEXP is invalid")
-	    end
-	  else
-	    @str.index(/\S*/n, @pos)
-	    parse_error("unknown token - %s", $&.dump)
-	  end
-	when EXPR_CTEXT
-	  if @str.index(CTEXT_REGEXP, @pos)
-	    @pos = $~.end(0)
-	    if $1
-	      return Token.new(T_TEXT, $+)
-	    else
-	      parse_error("[Net::IMAP BUG] CTEXT_REGEXP is invalid")
-	    end
-	  else
-	    @str.index(/\S*/n, @pos) #/
-	    parse_error("unknown token - %s", $&.dump)
-	  end
-	else
-	  parse_error("illegal @lex_state - %s", @lex_state.inspect)
-	end
-      end
-
-      def parse_error(fmt, *args)
-	if IMAP.debug
-	  $stderr.printf("@str: %s\n", @str.dump)
-	  $stderr.printf("@pos: %d\n", @pos)
-	  $stderr.printf("@lex_state: %s\n", @lex_state)
-	  if @token.symbol
-	    $stderr.printf("@token.symbol: %s\n", @token.symbol)
-	    $stderr.printf("@token.value: %s\n", @token.value.inspect)
-	  end
-	end
-	raise ResponseParseError, format(fmt, *args)
-      end
-    end
-
-    # Authenticator for the "LOGIN" authentication type.  See
-    # #authenticate().
-    class LoginAuthenticator
-      def process(data)
-	case @state
-	when STATE_USER
-	  @state = STATE_PASSWORD
-	  return @user
-	when STATE_PASSWORD
-	  return @password
-	end
-      end
-
-      private
-
-      STATE_USER = :USER
-      STATE_PASSWORD = :PASSWORD
-
-      def initialize(user, password)
-	@user = user
-	@password = password
-	@state = STATE_USER
-      end
-    end
-    add_authenticator "LOGIN", LoginAuthenticator
-
-    # Authenticator for the "CRAM-MD5" authentication type.  See
-    # #authenticate().
-    class CramMD5Authenticator
-      def process(challenge)
-	digest = hmac_md5(challenge, @password)
-	return @user + " " + digest
-      end
-
-      private
-
-      def initialize(user, password)
-	@user = user
-	@password = password
-      end
-
-      def hmac_md5(text, key)
-	if key.length > 64
-	  key = Digest::MD5.digest(key)
-	end
-
-	k_ipad = key + "\0" * (64 - key.length)
-	k_opad = key + "\0" * (64 - key.length)
-	for i in 0..63
-	  k_ipad[i] ^= 0x36
-	  k_opad[i] ^= 0x5c
-	end
-
-	digest = Digest::MD5.digest(k_ipad + text)
-
-	return Digest::MD5.hexdigest(k_opad + digest)
-      end
-    end
-    add_authenticator "CRAM-MD5", CramMD5Authenticator
-
-    # Superclass of IMAP errors.
-    class Error < StandardError
-    end
-
-    # Error raised when data is in the incorrect format.
-    class DataFormatError < Error
-    end
-
-    # Error raised when a response from the server is non-parseable.
-    class ResponseParseError < Error
-    end
-
-    # Superclass of all errors used to encapsulate "fail" responses
-    # from the server.
-    class ResponseError < Error
-    end
-
-    # Error raised upon a "NO" response from the server, indicating
-    # that the client command could not be completed successfully.
-    class NoResponseError < ResponseError
-    end
-
-    # Error raised upon a "BAD" response from the server, indicating
-    # that the client command violated the IMAP protocol, or an internal
-    # server failure has occurred.
-    class BadResponseError < ResponseError
-    end
-
-    # Error raised upon a "BYE" response from the server, indicating 
-    # that the client is not being allowed to login, or has been timed
-    # out due to inactivity.
-    class ByeResponseError < ResponseError
-    end
-  end
-end
-
-if __FILE__ == $0
-  # :enddoc:
-  require "getoptlong"
-
-  $stdout.sync = true
-  $port = "imap2"
-  $user = ENV["USER"] || ENV["LOGNAME"]
-  $auth = "cram-md5"
-
-  def usage
-    $stderr.print <<EOF
-usage: #{$0} [options] <host>
-
-  --help                        print this message
-  --port=PORT                   specifies port
-  --user=USER                   specifies user
-  --auth=AUTH                   specifies auth type
-EOF
-  end
-
-  def get_password
-    print "password: "
-    system("stty", "-echo")
-    begin
-      return gets.chop
-    ensure
-      system("stty", "echo")
-      print "\n"
-    end
-  end
-
-  def get_command
-    printf("%s@%s> ", $user, $host)
-    if line = gets
-      return line.strip.split(/\s+/)
-    else
-      return nil
-    end
-  end
-
-  parser = GetoptLong.new
-  parser.set_options(['--help', GetoptLong::NO_ARGUMENT],
-		     ['--port', GetoptLong::REQUIRED_ARGUMENT],
-		     ['--user', GetoptLong::REQUIRED_ARGUMENT],
-		     ['--auth', GetoptLong::REQUIRED_ARGUMENT])
-  begin
-    parser.each_option do |name, arg|
-      case name
-      when "--port"
-	$port = arg
-      when "--user"
-	$user = arg
-      when "--auth"
-	$auth = arg
-      when "--help"
-	usage
-	exit(1)
-      end
-    end
-  rescue
-    usage
-    exit(1)
-  end
-
-  $host = ARGV.shift
-  unless $host
-    usage
-    exit(1)
-  end
-    
-  imap = Net::IMAP.new($host, $port)
-  begin
-    password = get_password
-    imap.authenticate($auth, $user, password)
-    while true
-      cmd, *args = get_command
-      break unless cmd
-      begin
-	case cmd
-	when "list"
-	  for mbox in imap.list("", args[0] || "*")
-	    if mbox.attr.include?(Net::IMAP::NOSELECT)
-	      prefix = "!"
-	    elsif mbox.attr.include?(Net::IMAP::MARKED)
-	      prefix = "*"
-	    else
-	      prefix = " "
-	    end
-	    print prefix, mbox.name, "\n"
-	  end
-	when "select"
-	  imap.select(args[0] || "inbox")
-	  print "ok\n"
-	when "close"
-	  imap.close
-	  print "ok\n"
-	when "summary"
-	  unless messages = imap.responses["EXISTS"][-1]
-	    puts "not selected"
-	    next
-	  end
-	  if messages > 0
-	    for data in imap.fetch(1..-1, ["ENVELOPE"])
-	      print data.seqno, ": ", data.attr["ENVELOPE"].subject, "\n"
-	    end
-	  else
-	    puts "no message"
-	  end
-	when "fetch"
-	  if args[0]
-	    data = imap.fetch(args[0].to_i, ["RFC822.HEADER", "RFC822.TEXT"])[0]
-	    puts data.attr["RFC822.HEADER"]
-	    puts data.attr["RFC822.TEXT"]
-	  else
-	    puts "missing argument"
-	  end
-	when "logout", "exit", "quit"
-	  break
-	when "help", "?"
-	  print <<EOF
-list [pattern]			list mailboxes
-select [mailbox]		select mailbox
-close				close mailbox
-summary				display summary
-fetch [msgno]			display message
-logout				logout
-help, ?				display help message
-EOF
-	else
-	  print "unknown command: ", cmd, "\n"
-	end
-      rescue Net::IMAP::Error
-	puts $!
-      end
-    end
-  ensure
-    imap.logout
-    imap.disconnect
-  end
-end
-
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
deleted file mode 100644
index 5ada68fd4d..0000000000
--- a/lib/net/pop.rb
+++ /dev/null
@@ -1,859 +0,0 @@
-# = net/pop.rb
-#
-#--
-# Copyright (c) 1999-2003 Yukihiro Matsumoto
-# Copyright (c) 1999-2003 Minero Aoki
-# 
-# written & maintained by Minero Aoki <aamine@loveruby.net>
-# 
-# This program is free software. You can re-distribute and/or
-# modify this program under the same terms as Ruby itself,
-# Ruby Distribute License or GNU General Public License.
-# 
-# NOTE: You can find Japanese version of this document in
-# the doc/net directory of the standard ruby interpreter package.
-# 
-# $Id$
-#++
-#
-# == What is This Library?
-# 
-# This library provides functionality for retrieving 
-# email via POP3, the Post Office Protocol version 3. For details
-# of POP3, see [RFC1939] (http://www.ietf.org/rfc/rfc1939.txt).
-# 
-# == Examples
-# 
-# === Retrieving Messages 
-# 
-# This example retrieves messages from the server and deletes them 
-# on the server.
-# Messages are written to files named 'inbox/1', 'inbox/2', ....
-# Replace 'pop.example.com' with your POP3 server address, and
-# 'YourAccount' and 'YourPassword' with the appropriate account
-# details.
-# 
-#     require 'net/pop'
-# 
-#     pop = Net::POP3.new('pop.example.com')
-#     pop.start('YourAccount', 'YourPassword')             # (1)
-#     if pop.mails.empty?
-#       puts 'no mail.'
-#     else
-#       i = 0
-#       pop.each_mail do |m|   # or "pop.mails.each ..."   # (2)
-#         File.open("inbox/#{i}", 'w') {|f|
-#           f.write m.pop
-#         }
-#         m.delete
-#         i += 1
-#       end
-#       puts "#{pop.mails.size} mails popped."
-#     end
-#     pop.finish                                           # (3)
-# 
-# 1. call Net::POP3#start and start POP session
-# 2. access messages by using POP3#each_mail and/or POP3#mails
-# 3. close POP session by calling POP3#finish or use the block form of #start.
-# 
-# === Shortened Code
-# 
-# The example above is very verbose. You can shorten the code by using
-# some utility methods. First, the block form of Net::POP3.start can
-# be used instead of POP3.new, POP3#start and POP3#finish.
-# 
-#     require 'net/pop'
-# 
-#     Net::POP3.start('pop.example.com', 110,
-#                     'YourAccount', 'YourPassword') {|pop|
-#       if pop.mails.empty?
-#         puts 'no mail.'
-#       else
-#         i = 0
-#         pop.each_mail do |m|   # or "pop.mails.each ..."
-#           File.open("inbox/#{i}", 'w') {|f|
-#             f.write m.pop
-#           }
-#           m.delete
-#           i += 1
-#         end
-#         puts "#{pop.mails.size} mails popped."
-#       end
-#     }
-# 
-# POP3#delete_all alternates #each_mail and m.delete.
-# 
-#     require 'net/pop'
-# 
-#     Net::POP3.start('pop.example.com', 110,
-#                     'YourAccount', 'YourPassword') {|pop|
-#       if pop.mails.empty?
-#         puts 'no mail.'
-#       else
-#         i = 1
-#         pop.delete_all do |m|
-#           File.open("inbox/#{i}", 'w') {|f|
-#             f.write m.pop
-#           }
-#           i += 1
-#         end
-#       end
-#     }
-# 
-# And here is an even shorter example.
-# 
-#     require 'net/pop'
-# 
-#     i = 0
-#     Net::POP3.delete_all('pop.example.com', 110,
-#                          'YourAccount', 'YourPassword') do |m|
-#       File.open("inbox/#{i}", 'w') {|f|
-#         f.write m.pop
-#       }
-#       i += 1
-#     end
-# 
-# === Memory Space Issues
-# 
-# All the examples above get each message as one big string.
-# This example avoids this.
-# 
-#     require 'net/pop'
-# 
-#     i = 1
-#     Net::POP3.delete_all('pop.example.com', 110,
-#                          'YourAccount', 'YourPassword') do |m|
-#       File.open("inbox/#{i}", 'w') {|f|
-#         m.pop do |chunk|    # get a message little by little.
-#           f.write chunk
-#         end
-#         i += 1
-#       }
-#     end
-# 
-# === Using APOP
-# 
-# The net/pop library supports APOP authentication.
-# To use APOP, use the Net::APOP class instead of the Net::POP3 class.
-# You can use the utility method, Net::POP3.APOP(). For example:
-# 
-#     require 'net/pop'
-# 
-#     # Use APOP authentication if $isapop == true
-#     pop = Net::POP3.APOP($is_apop).new('apop.example.com', 110)
-#     pop.start(YourAccount', 'YourPassword') {|pop|
-#       # Rest code is same.
-#     }
-# 
-# === Fetch Only Selected Mail Using `UIDL' POP Command
-# 
-# If your POP server provides UIDL functionality,
-# you can grab only selected mails from the POP server.
-# e.g.
-# 
-#     def need_pop?( id )
-#       # determine if we need pop this mail...
-#     end
-# 
-#     Net::POP3.start('pop.example.com', 110,
-#                     'Your account', 'Your password') {|pop|
-#       pop.mails.select {|m| need_pop?(m.unique_id) }.each do |m|
-#         do_something(m.pop)
-#       end
-#     }
-# 
-# The POPMail#unique_id() method returns the unique-id of the message as a
-# String. Normally the unique-id is a hash of the message.
-# 
-
-require 'net/protocol'
-require 'digest/md5'
-
-module Net
-
-  # Non-authentication POP3 protocol error
-  # (reply code "-ERR", except authentication).
-  class POPError < ProtocolError; end
-
-  # POP3 authentication error.
-  class POPAuthenticationError < ProtoAuthError; end
-
-  # Unexpected response from the server.
-  class POPBadResponse < POPError; end
-
-
-  #
-  # Class providing POP3 client functionality.
-  #
-  # See documentation for the file pop.rb for examples of usage.
-  #
-  class POP3 < Protocol
-
-    Revision = %q$Revision$.split[1]
-
-    #
-    # Class Parameters
-    #
-
-    # The default port for POP3 connections, port 110
-    def POP3.default_port
-      110
-    end
-
-    def POP3.socket_type   #:nodoc: obsolete
-      Net::InternetMessageIO
-    end
-
-    #
-    # Utilities
-    #
-
-    # Returns the APOP class if +isapop+ is true; otherwise, returns
-    # the POP class.  For example:
-    #
-    #     # Example 1
-    #     pop = Net::POP3::APOP($is_apop).new(addr, port)
-    #
-    #     # Example 2
-    #     Net::POP3::APOP($is_apop).start(addr, port) {|pop|
-    #       ....
-    #     }
-    #
-    def POP3.APOP( isapop )
-      isapop ? APOP : POP3
-    end
-
-    # Starts a POP3 session and iterates over each POPMail object,
-    # yielding it to the +block+.
-    # This method is equivalent to:
-    #
-    #     Net::POP3.start(address, port, account, password) {|pop|
-    #       pop.each_mail do |m|
-    #         yield m
-    #       end
-    #     }
-    #
-    # This method raises a POPAuthenticationError if authentication fails.
-    #
-    #     # Typical usage
-    #     Net::POP3.foreach('pop.example.com', 110,
-    #                       'YourAccount', 'YourPassword') do |m|
-    #       file.write m.pop
-    #       m.delete if $DELETE
-    #     end
-    #
-    def POP3.foreach( address, port = nil,
-                      account = nil, password = nil,
-                      isapop = false, &block )  # :yields: message
-      start(address, port, account, password, isapop) {|pop|
-        pop.each_mail(&block)
-      }
-    end
-
-    # Starts a POP3 session and deletes all messages on the server.
-    # If a block is given, each POPMail object is yielded to it before
-    # being deleted.
-    #
-    # This method raises a POPAuthenticationError if authentication fails.
-    #
-    #     # Example
-    #     Net::POP3.delete_all('pop.example.com', 110,
-    #                          'YourAccount', 'YourPassword') do |m|
-    #       file.write m.pop
-    #     end
-    #
-    def POP3.delete_all( address, port = nil,
-                         account = nil, password = nil,
-                         isapop = false, &block )
-      start(address, port, account, password, isapop) {|pop|
-        pop.delete_all(&block)
-      }
-    end
-
-    # Opens a POP3 session, attempts authentication, and quits.
-    #
-    # This method raises POPAuthenticationError if authentication fails.
-    #
-    #     # Example 1: normal POP3
-    #     Net::POP3.auth_only('pop.example.com', 110,
-    #                         'YourAccount', 'YourPassword')
-    #
-    #     # Example 2: APOP
-    #     Net::POP3.auth_only('pop.example.com', 110,
-    #                         'YourAccount', 'YourPassword', true)
-    #
-    def POP3.auth_only( address, port = nil,
-                        account = nil, password = nil,
-                        isapop = false )
-      new(address, port, isapop).auth_only account, password
-    end
-
-    # Starts a pop3 session, attempts authentication, and quits.
-    # This method must not be called while POP3 session is opened.
-    # This method raises POPAuthenticationError if authentication fails.
-    def auth_only( account, password )
-      raise IOError, 'opening already opened POP session' if started?
-      start(account, password) {
-        ;
-      }
-    end
-
-    #
-    # Session management
-    #
-
-    # Creates a new POP3 object and open the connection.  Equivalent to 
-    # Net::POP3.new(address, port, isapop).start(account, password)
-    #
-    # If +block+ is provided, yields the newly-opened POP3 object to it,
-    # and automatically closes it at the end of the session.
-    #
-    # Typical usage:
-    #
-    #    Net::POP3.start(addr, port, account, password) {|pop|
-    #      pop.each_mail do |m|
-    #        file.write m.pop
-    #        m.delete
-    #      end
-    #    }
-    #
-    def POP3.start( address, port = nil,
-                    account = nil, password = nil,
-                    isapop = false, &block ) # :yield: pop
-      new(address, port, isapop).start(account, password, &block)
-    end
-
-    # Creates a new POP3 object.
-    # +address+ is the hostname or ip address of your POP3 server.
-    # The optional +port+ is the port to connect to; it defaults to 110.
-    # The optional +isapop+ specifies whether this connection is going
-    # to use APOP authentication; it defaults to +false+.
-    # This method does *not* open the TCP connection.
-    def initialize( addr, port = nil, isapop = false )
-      @address = addr
-      @port = port || self.class.default_port
-      @apop = isapop
-
-      @command = nil
-      @socket = nil
-      @started = false
-      @open_timeout = 30
-      @read_timeout = 60
-      @debug_output = nil
-
-      @mails = nil
-      @n_mails = nil
-      @n_bytes = nil
-    end
-
-    # Does this instance use APOP authentication?
-    def apop?
-      @apop
-    end
-
-    # Provide human-readable stringification of class state.
-    def inspect
-      "#<#{self.class} #{@address}:#{@port} open=#{@started}>"
-    end
-
-    # *WARNING*: This method causes a serious security hole.
-    # Use this method only for debugging.
-    #
-    # Set an output stream for debugging.
-    #
-    #   # Example
-    #   pop = Net::POP.new(addr, port)
-    #   pop.set_debug_output $stderr
-    #   pop.start(account, passwd) {
-    #     ....
-    #   }
-    #
-    def set_debug_output( arg )
-      @debug_output = arg
-    end
-
-    # The address to connect to.
-    attr_reader :address
-
-    # The port number to connect to.
-    attr_reader :port
-
-    # Seconds to wait until a connection is opened.
-    # If the POP3 object cannot open a connection within this time,
-    # it raises a TimeoutError exception.
-    attr_accessor :open_timeout
-
-    # Seconds to wait until reading one block (by one read(1) call).
-    # If the POP3 object cannot complete a read() within this time,
-    # it raises a TimeoutError exception.
-    attr_reader :read_timeout
-
-    # Set the read timeout.
-    def read_timeout=( sec )
-      @command.socket.read_timeout = sec if @command
-      @read_timeout = sec
-    end
-
-    # +true+ if the POP3 session has started.
-    def started?
-      @started
-    end
-
-    alias active? started?   #:nodoc: obsolete
-
-    # Starts a POP3 session.
-    #
-    # When called with block, gives a POP3 object to the block and
-    # closes the session after block call finishes.
-    #
-    # This method raises a POPAuthenticationError if authentication fails.
-    def start( account, password ) # :yield: pop
-      raise IOError, 'POP session already started' if @started
-
-      if block_given?
-        begin
-          do_start account, password
-          return yield(self)
-        ensure
-          do_finish
-        end
-      else
-        do_start account, password
-        return self
-      end
-    end
-
-    def do_start( account, password )
-      @socket = self.class.socket_type.open(@address, @port,
-                                   @open_timeout, @read_timeout, @debug_output)
-      on_connect
-      @command = POP3Command.new(@socket)
-      if apop?
-        @command.apop account, password
-      else
-        @command.auth account, password
-      end
-      @started = true
-    ensure
-      do_finish if not @started
-    end
-    private :do_start
-
-    def on_connect
-    end
-    private :on_connect
-
-    # Finishes a POP3 session and closes TCP connection.
-    def finish
-      raise IOError, 'POP session not started yet' unless started?
-      do_finish
-    end
-
-    def do_finish
-      @mails = nil
-      @command.quit if @command
-    ensure
-      @started = false
-      @command = nil
-      @socket.close if @socket and not @socket.closed?
-      @socket = nil
-    end
-    private :do_finish
-
-    def command
-      raise IOError, 'POP session not opened yet' \
-                                      if not @socket or @socket.closed?
-      @command
-    end
-    private :command
-
-    #
-    # POP protocol wrapper
-    #
-
-    # Returns the number of messages on the POP server.
-    def n_mails
-      return @n_mails if @n_mails
-      @n_mails, @n_bytes = command().stat
-      @n_mails
-    end
-
-    # Returns the total size in bytes of all the messages on the POP server.
-    def n_bytes
-      return @n_bytes if @n_bytes
-      @n_mails, @n_bytes = command().stat
-      @n_bytes
-    end
-
-    # Returns an array of Net::POPMail objects, representing all the
-    # messages on the server.  This array is renewed when the session
-    # restarts; otherwise, it is fetched from the server the first time
-    # this method is called (directly or indirectly) and cached.
-    #
-    # This method raises a POPError if an error occurs.
-    def mails
-      return @mails.dup if @mails
-      if n_mails() == 0
-        # some popd raises error for LIST on the empty mailbox.
-        @mails = []
-        return []
-      end
-
-      @mails = command().list.map {|num, size|
-        POPMail.new(num, size, self, command())
-      }
-      @mails.dup
-    end
-
-    # Yields each message to the passed-in block in turn.
-    # Equivalent to:
-    # 
-    #   pop3.mails.each do |popmail|
-    #     ....
-    #   end
-    #
-    # This method raises a POPError if an error occurs.
-    def each_mail( &block )  # :yield: message
-      mails().each(&block)
-    end
-
-    alias each each_mail
-
-    # Deletes all messages on the server.
-    #
-    # If called with a block, yields each message in turn before deleting it.
-    #
-    #     # Example
-    #     n = 1
-    #     pop.delete_all do |m|
-    #       File.open("inbox/#{n}") {|f|
-    #         f.write m.pop
-    #       }
-    #       n += 1
-    #     end
-    #
-    # This method raises a POPError if an error occurs.
-    def delete_all # :yield: message
-      mails().each do |m|
-        yield m if block_given?
-        m.delete unless m.deleted?
-      end
-    end
-
-    # Resets the session.  This clears all "deleted" marks from messages.
-    #
-    # This method raises a POPError if an error occurs.
-    def reset
-      command().rset
-      mails().each do |m|
-        m.instance_eval {
-          @deleted = false
-        }
-      end
-    end
-
-    def set_all_uids   #:nodoc: internal use only (called from POPMail#uidl)
-      command().uidl.each do |num, uid|
-        @mails.find {|m| m.number == num }.uid = uid
-      end
-    end
-
-  end   # class POP3
-
-  # class aliases
-  POP = POP3
-  POPSession  = POP3
-  POP3Session = POP3
-
-  #
-  # This class is equivalent to POP3, except that it uses APOP authentication.
-  #
-  class APOP < POP3
-    # Always returns true.
-    def apop?
-      true
-    end
-  end
-
-  # class aliases
-  APOPSession = APOP
-
-  #
-  # This class represents a message which exists on the POP server.
-  # Instances of this class are created by the POP3 class; they should
-  # not be directly created by the user.
-  #
-  class POPMail
-
-    def initialize( num, len, pop, cmd )   #:nodoc:
-      @number = num
-      @length = len
-      @pop = pop
-      @command = cmd
-      @deleted = false
-      @uid = nil
-    end
-
-    # The sequence number of the message on the server.
-    attr_reader :number
-
-    # The length of the message in octets.
-    attr_reader :length
-    alias size length
-
-    # Provide human-readable stringification of class state.
-    def inspect
-      "#<#{self.class} #{@number}#{@deleted ? ' deleted' : ''}>"
-    end
-
-    # This method fetches the message.  If called with a block, the
-    # message is yielded to the block one chunk at a time.  If called
-    # without a block, the message is returned as a String.  The optional 
-    # +dest+ argument will be prepended to the returned String; this
-    # argument is essentially obsolete.
-    #
-    #     # Example without block
-    #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') {|pop|
-    #       n = 1
-    #       pop.mails.each do |popmail|
-    #         File.open("inbox/#{n}", 'w') {|f|
-    #           f.write popmail.pop              
-    #         }
-    #         popmail.delete
-    #         n += 1
-    #       end
-    #     }
-    #
-    #     # Example with block
-    #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') {|pop|
-    #       n = 1
-    #       pop.mails.each do |popmail|
-    #         File.open("inbox/#{n}", 'w') {|f|
-    #           popmail.pop do |chunk|            ####
-    #             f.write chunk
-    #           end
-    #         }
-    #         n += 1
-    #       end
-    #     }
-    #
-    # This method raises a POPError if an error occurs.
-    def pop( dest = '', &block ) # :yield: message_chunk
-      if block_given?
-        @command.retr(@number, &block)
-        nil
-      else
-        @command.retr(@number) do |chunk|
-          dest << chunk
-        end
-        dest
-      end
-    end
-
-    alias all pop    #:nodoc: obsolete
-    alias mail pop   #:nodoc: obsolete
-
-    # Fetches the message header and +lines+ lines of body. 
-    # The optional +dest+ argument is obsolete.
-    #
-    # This method raises a POPError if an error occurs.
-    def top( lines, dest = '' )
-      @command.top(@number, lines) do |chunk|
-        dest << chunk
-      end
-      dest
-    end
-
-    # Fetches the message header.     
-    # The optional +dest+ argument is obsolete.
-    #
-    # This method raises a POPError if an error occurs.
-    def header( dest = '' )
-      top(0, dest)
-    end
-
-    # Marks a message for deletion on the server.  Deletion does not
-    # actually occur until the end of the session; deletion may be
-    # cancelled for _all_ marked messages by calling POP3#reset().
-    #
-    # This method raises a POPError if an error occurs.
-    #
-    #     # Example
-    #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') {|pop|
-    #       n = 1
-    #       pop.mails.each do |popmail|
-    #         File.open("inbox/#{n}", 'w') {|f|
-    #           f.write popmail.pop
-    #         }
-    #         popmail.delete         ####
-    #         n += 1
-    #       end
-    #     }
-    #
-    def delete
-      @command.dele @number
-      @deleted = true
-    end
-
-    alias delete! delete    #:nodoc: obsolete
-
-    # True if the mail has been deleted.
-    def deleted?
-      @deleted
-    end
-
-    # Returns the unique-id of the message.
-    # Normally the unique-id is a hash string of the message.
-    #
-    # This method raises a POPError if an error occurs.
-    def unique_id
-      return @uid if @uid
-      @pop.set_all_uids
-      @uid
-    end
-
-    alias uidl unique_id
-
-    def uid=( uid )   #:nodoc: internal use only (used from POP3#set_all_uids)
-      @uid = uid
-    end
-
-  end   # class POPMail
-
-
-  class POP3Command   #:nodoc: internal use only
-
-    def initialize( sock )
-      @socket = sock
-      @error_occured = false
-      res = check_response(critical { recv_response() })
-      @apop_stamp = res.slice(/<.+>/)
-    end
-
-    def inspect
-      "#<#{self.class} socket=#{@socket}>"
-    end
-
-    def auth( account, password )
-      check_response_auth(critical {
-        check_response_auth(get_response('USER ' + account))
-        get_response('PASS ' + password)
-      })
-    end
-
-    def apop( account, password )
-      raise POPAuthenticationError, 'not APOP server; cannot login' \
-                                                      unless @apop_stamp
-      check_response_auth(critical {
-        get_response('APOP %s %s',
-                     account,
-                     Digest::MD5.hexdigest(@apop_stamp + password))
-      })
-    end
-
-    def list
-      critical {
-        getok 'LIST'
-        list = []
-        @socket.each_list_item do |line|
-          m = /\A(\d+)[ \t]+(\d+)/.match(line) or
-                  raise POPBadResponse, "bad response: #{line}"
-          list.push  [m[1].to_i, m[2].to_i]
-        end
-        return list
-      }
-    end
-
-    def stat
-      res = check_response(critical { get_response('STAT') })
-      m = /\A\+OK\s+(\d+)\s+(\d+)/.match(res) or
-              raise POPBadResponse, "wrong response format: #{res}"
-      [m[1].to_i, m[2].to_i]
-    end
-
-    def rset
-      check_response(critical { get_response 'RSET' })
-    end
-
-    def top( num, lines = 0, &block )
-      critical {
-        getok('TOP %d %d', num, lines)
-        @socket.each_message_chunk(&block)
-      }
-    end
-
-    def retr( num, &block )
-      critical {
-        getok('RETR %d', num)
-        @socket.each_message_chunk(&block)
-      }
-    end
-    
-    def dele( num )
-      check_response(critical { get_response('DELE %d', num) })
-    end
-
-    def uidl( num = nil )
-      if num
-        res = check_response(critical { get_response('UIDL %d', num) })
-        return res.split(/ /)[1]
-      else
-        critical {
-          getok('UIDL')
-          table = {}
-          @socket.each_list_item do |line|
-            num, uid = line.split
-            table[num.to_i] = uid
-          end
-          return table
-        }
-      end
-    end
-
-    def quit
-      check_response(critical { get_response('QUIT') })
-    end
-
-    private
-
-    def getok( fmt, *fargs )
-      @socket.writeline sprintf(fmt, *fargs)
-      check_response(recv_response())
-    end
-
-    def get_response( fmt, *fargs )
-      @socket.writeline sprintf(fmt, *fargs)
-      recv_response()
-    end
-
-    def recv_response
-      @socket.readline
-    end
-
-    def check_response( res )
-      raise POPError, res unless /\A\+OK/i === res
-      res
-    end
-
-    def check_response_auth( res )
-      raise POPAuthenticationError, res unless /\A\+OK/i === res
-      res
-    end
-
-    def critical
-      return '+OK dummy ok response' if @error_occured
-      begin
-        return yield()
-      rescue Exception
-        @error_occured = true
-        raise
-      end
-    end
-
-  end   # class POP3Command
-
-end   # module Net
-
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
deleted file mode 100644
index 3c76955cfe..0000000000
--- a/lib/net/protocol.rb
+++ /dev/null
@@ -1,449 +0,0 @@
-#
-# = net/protocol.rb
-#
-#--
-# Copyright (c) 1999-2003 Yukihiro Matsumoto
-# Copyright (c) 1999-2003 Minero Aoki
-#
-# written and maintained by Minero Aoki <aamine@loveruby.net>
-#
-# This program is free software. You can re-distribute and/or
-# modify this program under the same terms as Ruby itself,
-# Ruby Distribute License or GNU General Public License.
-#
-# $Id$
-#++
-#
-# WARNING: This file is going to remove.
-# Do not rely on the implementation written in this file.
-#
-
-require 'socket'
-require 'timeout'
-
-module Net # :nodoc:
-
-  class Protocol   #:nodoc: internal use only
-    private
-    def Protocol.protocol_param( name, val )
-      module_eval(<<-End, __FILE__, __LINE__ + 1)
-        def #{name}
-          #{val}
-        end
-      End
-    end
-  end
-
-  class ProtocolError          < StandardError; end
-  class ProtoSyntaxError       < ProtocolError; end
-  class ProtoFatalError        < ProtocolError; end
-  class ProtoUnknownError      < ProtocolError; end
-  class ProtoServerError       < ProtocolError; end
-  class ProtoAuthError         < ProtocolError; end
-  class ProtoCommandError      < ProtocolError; end
-  class ProtoRetriableError    < ProtocolError; end
-  ProtocRetryError = ProtoRetriableError
-
-
-  class InternetMessageIO   #:nodoc: internal use only
-
-    class << self
-      alias open new
-    end
-
-    def initialize( addr, port,
-                    open_timeout = nil, read_timeout = nil,
-                    debug_output = nil )
-      @address      = addr
-      @port         = port
-      @read_timeout = read_timeout
-      @debug_output = debug_output
-      @socket       = nil
-      @rbuf         = nil   # read buffer
-      @wbuf         = nil   # write buffer
-      connect open_timeout
-      LOG 'opened'
-    end
-
-    attr_reader :address
-    attr_reader :port
-
-    def ip_address
-      return '' unless @socket
-      @socket.addr[3]
-    end
-
-    attr_accessor :read_timeout
-
-    attr_reader :socket
-
-    def connect( open_timeout )
-      LOG "opening connection to #{@address}..."
-      timeout(open_timeout) {
-        @socket = TCPsocket.new(@address, @port)
-      }
-      @rbuf = ''
-    end
-    private :connect
-
-    def close
-      if @socket
-        @socket.close
-        LOG 'closed'
-      else
-        LOG 'close call for already closed socket'
-      end
-      @socket = nil
-      @rbuf = ''
-    end
-
-    def reopen( open_timeout = nil )
-      LOG 'reopening...'
-      close
-      connect open_timeout
-      LOG 'reopened'
-    end
-
-    def closed?
-      not @socket
-    end
-
-    def inspect
-      "#<#{self.class} #{closed?() ? 'closed' : 'opened'}>"
-    end
-
-    ###
-    ###  READ
-    ###
-
-    public
-
-    def read( len, dest = '', ignore_eof = false )
-      LOG "reading #{len} bytes..."
-      LOG_off()
-      read_bytes = 0
-      begin
-        while read_bytes + @rbuf.size < len
-          read_bytes += rbuf_moveto(dest, @rbuf.size)
-          rbuf_fill
-        end
-        rbuf_moveto dest, len - read_bytes
-      rescue EOFError
-        raise unless ignore_eof
-      end
-      LOG_on()
-      LOG "read #{read_bytes} bytes"
-      dest
-    end
-
-    def read_all( dest = '' )
-      LOG 'reading all...'
-      LOG_off()
-      read_bytes = 0
-      begin
-        while true
-          read_bytes += rbuf_moveto(dest, @rbuf.size)
-          rbuf_fill
-        end
-      rescue EOFError
-        ;
-      end
-      LOG_on()
-      LOG "read #{read_bytes} bytes"
-      dest
-    end
-
-    def readuntil( terminator, ignore_eof = false )
-      dest = ''
-      begin
-        until idx = @rbuf.index(terminator)
-          rbuf_fill
-        end
-        rbuf_moveto dest, idx + terminator.size
-      rescue EOFError
-        raise unless ignore_eof
-        rbuf_moveto dest, @rbuf.size
-      end
-      dest
-    end
-        
-    def readline
-      readuntil("\n").chop
-    end
-
-    def each_message_chunk
-      LOG 'reading message...'
-      LOG_off()
-      read_bytes = 0
-      while (line = readuntil("\r\n")) != ".\r\n"
-        read_bytes += line.size
-        yield line.sub(/\A\./, '')
-      end
-      LOG_on()
-      LOG "read message (#{read_bytes} bytes)"
-    end
-  
-    # *library private* (cannot handle 'break')
-    def each_list_item
-      while (str = readuntil("\r\n")) != ".\r\n"
-        yield str.chop
-      end
-    end
-
-    private
-
-    def rbuf_fill
-      until IO.select([@socket], nil, nil, @read_timeout)
-        raise TimeoutError, "socket read timeout (#{@read_timeout} sec)"
-      end
-      @rbuf << @socket.sysread(1024)
-    end
-
-    def rbuf_moveto( dest, len )
-      dest << (s = @rbuf.slice!(0, len))
-      @debug_output << %Q[-> #{s.dump}\n] if @debug_output
-      len
-    end
-
-    ###
-    ###  WRITE
-    ###
-
-    public
-
-    def write( str )
-      writing {
-        write0 str
-      }
-    end
-
-    def writeline( str )
-      writing {
-        write0 str + "\r\n"
-      }
-    end
-
-    def write_message( src )
-      LOG "writing message from #{src.class}"
-      LOG_off()
-      len = using_each_crlf_line {
-        write_message_0 src
-      }
-      LOG_on()
-      LOG "wrote #{len} bytes"
-      len
-    end
-
-    def write_message_by_block( &block )
-      LOG 'writing message from block'
-      LOG_off()
-      len = using_each_crlf_line {
-        begin
-          block.call(WriteAdapter.new(self, :write_message_0))
-        rescue LocalJumpError
-          # allow `break' from writer block
-        end
-      }
-      LOG_on()
-      LOG "wrote #{len} bytes"
-      len
-    end
-
-    private
-
-    def writing
-      @written_bytes = 0
-      @debug_output << '<- ' if @debug_output
-      yield
-      @socket.flush
-      @debug_output << "\n" if @debug_output
-      bytes = @written_bytes
-      @written_bytes = nil
-      bytes
-    end
-
-    def write0( str )
-      @debug_output << str.dump if @debug_output
-      len = @socket.write(str)
-      @written_bytes += len
-      len
-    end
-
-    #
-    # Reads string from src calling :each, and write to @socket.
-    # Escapes '.' on the each line head.
-    #
-    def write_message_0( src )
-      prev = @written_bytes
-      each_crlf_line(src) do |line|
-        if line[0] == ?.
-        then write0 '.' + line
-        else write0       line
-        end
-      end
-      @written_bytes - prev
-    end
-
-    #
-    # setup @wbuf for each_crlf_line.
-    #
-    def using_each_crlf_line
-      writing {
-          @wbuf = ''
-          yield
-          if not @wbuf.empty?       # unterminated last line
-            if @wbuf[-1] == ?\r
-              @wbuf.chop!
-            end
-            @wbuf.concat "\r\n"
-            write0 @wbuf
-          elsif @written_bytes == 0   # empty src
-            write0 "\r\n"
-          end
-          write0 ".\r\n"
-          @wbuf = nil
-      }
-    end
-
-    #
-    # extract a CR-LF-terminating-line from @wbuf and yield it.
-    #
-    def each_crlf_line( src )
-      adding(src) do
-        beg = 0
-        buf = @wbuf
-        while buf.index(/\n|\r\n|\r/, beg)
-          m = Regexp.last_match
-          if (m.begin(0) == buf.length - 1) and buf[-1] == ?\r
-            # "...\r" : can follow "\n..."
-            break
-          end
-          str = buf[beg ... m.begin(0)]
-          str.concat "\r\n"
-          yield str
-          beg = m.end(0)
-        end
-        @wbuf = buf[beg ... buf.length]
-      end
-    end
-
-    #
-    # Reads strings from SRC and add to @wbuf, then yield.
-    #
-    def adding( src )
-      case src
-      when String    # for speeding up.
-        0.step(src.size - 1, 2048) do |i|
-          @wbuf << src[i,2048]
-          yield
-        end
-
-      when File    # for speeding up.
-        while s = src.read(2048)
-          s[0,0] = @wbuf
-          @wbuf = s
-          yield
-        end
-
-      else    # generic reader
-        src.each do |s|
-          @wbuf << s
-          yield if @wbuf.size > 2048
-        end
-        yield unless @wbuf.empty?
-      end
-    end
-
-    ###
-    ### DEBUG
-    ###
-
-    private
-
-    def LOG_off
-      @save_debug_out = @debug_output
-      @debug_output = nil
-    end
-
-    def LOG_on
-      @debug_output = @save_debug_out
-    end
-
-    def LOG( msg )
-      return unless @debug_output
-      @debug_output << msg
-      @debug_output << "\n"
-    end
-  
-  end
-
-
-  #
-  # The writer adapter class
-  #
-  class WriteAdapter
-
-    def initialize( sock, mid )
-      @socket = sock
-      @method_id = mid
-    end
-
-    def inspect
-      "#<#{self.class} socket=#{@socket.inspect}>"
-    end
-
-    def write( str )
-      @socket.__send__(@method_id, str)
-    end
-
-    alias print write
-
-    def <<( str )
-      write str
-      self
-    end
-
-    def puts( str = '' )
-      write str.sub(/\n?/, "\n")
-    end
-
-    def printf( *args )
-      write sprintf(*args)
-    end
-  
-  end
-
-
-  class ReadAdapter   #:nodoc: internal use only
-
-    def initialize( block )
-      @block = block
-    end
-
-    def inspect
-      "#<#{self.class}>"
-    end
-
-    def <<( str )
-      call_block(str, &@block) if @block
-    end
-
-    private
-
-    #
-    # This method is needed because @block must be called by yield,
-    # not Proc#call.  You can see difference when using `break' in
-    # the block.
-    #
-    def call_block( str )
-      yield str
-    end
-  
-  end
-
-
-  module NetPrivate   #:nodoc: obsolete
-    Socket = ::Net::InternetMessageIO
-  end
-
-end   # module Net
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
deleted file mode 100644
index 21c04812fe..0000000000
--- a/lib/net/smtp.rb
+++ /dev/null
@@ -1,636 +0,0 @@
-# = net/smtp.rb
-# 
-#--
-# Copyright (c) 1999-2003 Yukihiro Matsumoto
-# Copyright (c) 1999-2003 Minero Aoki
-# 
-# written & maintained by Minero Aoki <aamine@loveruby.net>
-# 
-# This program is free software. You can re-distribute and/or
-# modify this program under the same terms as Ruby itself,
-# Ruby Distribute License or GNU General Public License.
-# 
-# NOTE: You can find Japanese version of this document in
-# the doc/net directory of the standard ruby interpreter package.
-# 
-# $Id$
-#++
-# 
-# == What is This Library?
-# 
-# This library provides functionality to send internet
-# mail via SMTP, the Simple Mail Transfer Protocol. For details of
-# SMTP itself, see [RFC2821] (http://www.ietf.org/rfc/rfc2821.txt).
-# 
-# == What is This Library NOT?
-# 
-# This library does NOT provide functions to compose internet mails.
-# You must create them by yourself. If you want better mail support,
-# try RubyMail or TMail. You can get both libraries from RAA.
-# (http://www.ruby-lang.org/en/raa.html)
-# 
-# FYI: the official documentation on internet mail is: [RFC2822] (http://www.ietf.org/rfc/rfc2822.txt).
-# 
-# == Examples
-# 
-# === Sending Messages
-# 
-# You must open a connection to an SMTP server before sending messages.
-# The first argument is the address of your SMTP server, and the second 
-# argument is the port number. Using SMTP.start with a block is the simplest 
-# way to do this. This way, the SMTP connection is closed automatically 
-# after the block is executed.
-# 
-#     require 'net/smtp'
-#     Net::SMTP.start('your.smtp.server', 25) {|smtp|
-#       # use the SMTP object smtp only in this block
-#     }
-# 
-# Replace 'your.smtp.server' with your SMTP server. Normally
-# your system manager or internet provider supplies a server
-# for you.
-# 
-# Then you can send messages.
-# 
-#     msgstr = <<END_OF_MESSAGE
-#     From: Your Name <your@mail.address>
-#     To: Destination Address <someone@example.com>
-#     Subject: test message
-#     Date: Sat, 23 Jun 2001 16:26:43 +0900
-#     Message-Id: <unique.message.id.string@example.com>
-# 
-#     This is a test message.
-#     END_OF_MESSAGE
-# 
-#     require 'net/smtp'
-#     Net::SMTP.start('your.smtp.server', 25) {|smtp|
-#       smtp.send_message msgstr,
-#                         'your@mail.address',
-#                         'his_addess@example.com'
-#     }
-# 
-# === Closing the Session
-# 
-# You MUST close the SMTP session after sending messages, by calling 
-# the #finish method:
-# 
-#     # using SMTP#finish
-#     smtp = Net::SMTP.start('your.smtp.server', 25)
-#     smtp.send_message msgstr, 'from@address', 'to@address'
-#     smtp.finish
-# 
-# You can also use the block form of SMTP.start/SMTP#start.  This closes
-# the SMTP session automatically:
-# 
-#     # using block form of SMTP.start
-#     Net::SMTP.start('your.smtp.server', 25) {|smtp|
-#       smtp.send_message msgstr, 'from@address', 'to@address'
-#     }
-# 
-# I strongly recommend this scheme.  This form is simpler and more robust.
-# 
-# === HELO domain
-# 
-# In almost all situations, you must provide a third argument
-# to SMTP.start/SMTP#start. This is the domain name which you are on
-# (the host to send mail from). It is called the "HELO domain".
-# The SMTP server will judge whether it should send or reject
-# the SMTP session by inspecting the HELO domain.
-# 
-#     Net::SMTP.start('your.smtp.server', 25,
-#                     'mail.from.domain') {|smtp| ... }
-# 
-# === SMTP Authentication
-# 
-# The Net::SMTP class supports three authentication schemes;
-# PLAIN, LOGIN and CRAM MD5.  (SMTP Authentication: [RFC2554])
-# To use SMTP authentication, pass extra arguments to 
-# SMTP.start/SMTP#start.
-# 
-#     # PLAIN
-#     Net::SMTP.start('your.smtp.server', 25, 'mail.from,domain',
-#                     'Your Account', 'Your Password', :plain)
-#     # LOGIN
-#     Net::SMTP.start('your.smtp.server', 25, 'mail.from,domain',
-#                     'Your Account', 'Your Password', :login)
-# 
-#     # CRAM MD5
-#     Net::SMTP.start('your.smtp.server', 25, 'mail.from,domain',
-#                     'Your Account', 'Your Password', :cram_md5)
-
-require 'net/protocol'
-require 'digest/md5'
-
-
-module Net # :nodoc:
-
-  # Module mixed in to all SMTP error classes
-  module SMTPError
-    # This *class* is module for some reason.
-    # In ruby 1.9.x, this module becomes a class.
-  end
-
-  # Represents an SMTP authentication error.
-  class SMTPAuthenticationError < ProtoAuthError
-    include SMTPError
-  end
-
-  # Represents SMTP error code 420 or 450, a temporary error.
-  class SMTPServerBusy < ProtoServerError
-    include SMTPError
-  end
-
-  # Represents an SMTP command syntax error (error code 500)
-  class SMTPSyntaxError < ProtoSyntaxError
-    include SMTPError
-  end
-
-  # Represents a fatal SMTP error (error code 5xx, except for 500)
-  class SMTPFatalError < ProtoFatalError
-    include SMTPError
-  end
-
-  # Unexpected reply code returned from server.
-  class SMTPUnknownError < ProtoUnknownError
-    include SMTPError
-  end
-
-  #
-  # Class providing SMTP client functionality.
-  #
-  # See documentation for the file smtp.rb for examples of usage.
-  #
-  class SMTP
-
-    Revision = %q$Revision$.split[1]
-
-    # The default SMTP port, port 25.
-    def SMTP.default_port
-      25
-    end
-
-    # Creates a new Net::SMTP object. +address+ is the hostname
-    # or ip address of your SMTP server.  +port+ is the port to
-    # connect to; it defaults to port 25.
-    # This method does not open the TCP connection.
-    def initialize( address, port = nil )
-      @address = address
-      @port = (port || SMTP.default_port)
-      @esmtp = true
-      @socket = nil
-      @started = false
-      @open_timeout = 30
-      @read_timeout = 60
-      @error_occured = false
-      @debug_output = nil
-    end
-
-    # Provide human-readable stringification of class state.
-    def inspect
-      "#<#{self.class} #{@address}:#{@port} started=#{@started}>"
-    end
-
-    # +true+ if the SMTP object uses ESMTP (which it does by default).
-    def esmtp?
-      @esmtp
-    end
-
-    # Set whether to use ESMTP or not.  This should be done before 
-    # calling #start.  Note that if #start is called in ESMTP mode,
-    # and the connection fails due to a ProtocolError, the SMTP
-    # object will automatically switch to plain SMTP mode and
-    # retry (but not vice versa).
-    def esmtp=( bool )
-      @esmtp = bool
-    end
-
-    alias esmtp esmtp?
-
-    # The address of the SMTP server to connect to.
-    attr_reader :address
-
-    # The port number of the SMTP server to connect to.
-    attr_reader :port
-
-    # Seconds to wait while attempting to open a connection.
-    # If the connection cannot be opened within this time, a
-    # TimeoutError is raised.
-    attr_accessor :open_timeout
-
-    # Seconds to wait while reading one block (by one read(2) call).
-    # If the read(2) call does not complete within this time, a
-    # TimeoutError is raised.
-    attr_reader :read_timeout
-
-    # Set the number of seconds to wait until timing-out a read(2)
-    # call.
-    def read_timeout=( sec )
-      @socket.read_timeout = sec if @socket
-      @read_timeout = sec
-    end
-
-    # WARNING: This method causes serious security holes.
-    # Use this method for only debugging.
-    #
-    # Set an output stream for debug logging.
-    # You must call this before #start.
-    #
-    #   # example
-    #   smtp = Net::SMTP.new(addr, port)
-    #   smtp.set_debug_output $stderr
-    #   smtp.start {
-    #     ....
-    #   }
-    def set_debug_output( arg )
-      @debug_output = arg
-    end
-
-    #
-    # SMTP session control
-    #
-
-    # Creates a new Net::SMTP object and connects to the server.
-    #
-    # This method is equivalent to:
-    # 
-    #     Net::SMTP.new(address,port).start(helo_domain,account,password,authtype)
-    #
-    #     # example
-    #     Net::SMTP.start('your.smtp.server') {
-    #       smtp.send_message msgstr, 'from@example.com', ['dest@example.com']
-    #     }
-    #
-    # If called with a block, the newly-opened Net::SMTP object is yielded
-    # to the block, and automatically closed when the block finishes.  If called
-    # without a block, the newly-opened Net::SMTP object is returned to
-    # the caller, and it is the caller's responsibility to close it when
-    # finished.
-    #
-    # +address+ is the hostname or ip address of your smtp server.
-    # +port+ is the port to connect to; it defaults to port 25.
-    # +helo+ is the _HELO_ _domain_ provided by the client to the
-    # server (see overview comments); it defaults to 'localhost.localdomain'. 
-    # The remaining arguments are used for SMTP authentication, if required
-    # or desired.  +user+ is the account name; +secret+ is your password
-    # or other authentication token; and +authtype+ is the authentication
-    # type, one of :plain, :login, or :cram_md5.  See the discussion of
-    # SMTP Authentication in the overview notes.
-    #
-    # This method may raise:
-    #
-    # * Net::SMTPAuthenticationError
-    # * Net::SMTPServerBusy
-    # * Net::SMTPSyntaxError
-    # * Net::SMTPFatalError
-    # * Net::SMTPUnknownError
-    # * IOError
-    # * TimeoutError
-    def SMTP.start( address, port = nil,
-                    helo = 'localhost.localdomain',
-                    user = nil, secret = nil, authtype = nil,
-                    &block) # :yield: smtp
-      new(address, port).start(helo, user, secret, authtype, &block)
-    end
-
-    # +true+ if the SMTP session has been started.
-    def started?
-      @started
-    end
-
-    # Opens a TCP connection and starts the SMTP session.
-    #
-    # +helo+ is the _HELO_ _domain_ that you'll dispatch mails from; see
-    # the discussion in the overview notes.
-    #
-    # When this methods is called with a block, the newly-started SMTP
-    # object is yielded to the block, and automatically closed after
-    # the block call finishes.  Otherwise, it is the caller's 
-    # responsibility to close the session when finished.
-    #
-    # If both of +user+ and +secret+ are given, SMTP authentication 
-    # will be attempted using the AUTH command.  +authtype+ specifies 
-    # the type of authentication to attempt; it must be one of
-    # :login, :plain, and :cram_md5.  See the notes on SMTP Authentication
-    # in the overview.
-    #
-    # If session has already been started, an IOError will be raised.
-    #
-    # This method may raise:
-    #
-    # * Net::SMTPAuthenticationError
-    # * Net::SMTPServerBusy
-    # * Net::SMTPSyntaxError
-    # * Net::SMTPFatalError
-    # * Net::SMTPUnknownError
-    # * IOError
-    # * TimeoutError
-    def start( helo = 'localhost.localdomain',
-               user = nil, secret = nil, authtype = nil ) # :yield: smtp
-      if block_given?
-        begin
-          do_start(helo, user, secret, authtype)
-          return yield(self)
-        ensure
-          do_finish
-        end
-      else
-        do_start(helo, user, secret, authtype)
-        return self
-      end
-    end
-
-    def do_start( helodomain, user, secret, authtype )
-      raise IOError, 'SMTP session already started' if @started
-      check_auth_args user, secret, authtype if user or secret
-
-      @socket = InternetMessageIO.open(@address, @port,
-                                       @open_timeout, @read_timeout,
-                                       @debug_output)
-      check_response(critical { recv_response() })
-      begin
-        if @esmtp
-          ehlo helodomain
-        else
-          helo helodomain
-        end
-      rescue ProtocolError
-        if @esmtp
-          @esmtp = false
-          @error_occured = false
-          retry
-        end
-        raise
-      end
-      authenticate user, secret, authtype if user
-      @started = true
-    ensure
-      @socket.close if not @started and @socket and not @socket.closed?
-    end
-    private :do_start
-
-    # Finishes the SMTP session and closes TCP connection.
-    # Raises IOError if not started.
-    def finish
-      raise IOError, 'not started yet' unless started?
-      do_finish
-    end
-
-    def do_finish
-      quit if @socket and not @socket.closed? and not @error_occured
-    ensure
-      @started = false
-      @error_occured = false
-      @socket.close if @socket and not @socket.closed?
-      @socket = nil
-    end
-    private :do_finish
-
-    #
-    # message send
-    #
-
-    public
-
-    # Sends +msgstr+ as a message.  Single CR ("\r") and LF ("\n") found
-    # in the +msgstr+, are converted into the CR LF pair.  You cannot send a
-    # binary message with this method. +msgstr+ should include both 
-    # the message headers and body.
-    #
-    # +from_addr+ is a String representing the source mail address.
-    # +to_addr+ is a String or Strings or Array of Strings, representing
-    # the destination mail address or addresses.
-    #
-    #     # example
-    #     Net::SMTP.start('smtp.example.com') {|smtp|
-    #       smtp.send_message msgstr,
-    #                         'from@example.com',
-    #                         ['dest@example.com', 'dest2@example.com']
-    #     }
-    #
-    # This method may raise:
-    #
-    # * Net::SMTPServerBusy
-    # * Net::SMTPSyntaxError
-    # * Net::SMTPFatalError
-    # * Net::SMTPUnknownError
-    # * IOError
-    # * TimeoutError
-    def send_message( msgstr, from_addr, *to_addrs )
-      send0(from_addr, to_addrs.flatten) {
-        @socket.write_message msgstr
-      }
-    end
-
-    alias send_mail send_message
-    alias sendmail send_message   # obsolete
-
-    # Opens a message writer stream and gives it to the block.
-    # The stream is valid only in the block, and has these methods:
-    #
-    # puts(str = '')::       outputs STR and CR LF.
-    # print(str)::       outputs STR.
-    # printf(fmt, *args)::       outputs sprintf(fmt,*args).
-    # write(str)::       outputs STR and returns the length of written bytes.
-    # <<(str)::       outputs STR and returns self.
-    #
-    # If a single CR ("\r") or LF ("\n") is found in the message,
-    # it is converted to the CR LF pair.  You cannot send a binary
-    # message with this method.
-    #
-    # +from_addr+ is a String representing the source mail address.
-    # +to_addr+ is a String or Strings or Array of Strings, representing
-    # the destination mail address or addresses.
-    #
-    #     # example
-    #     Net::SMTP.start('smtp.example.com', 25) {|smtp|
-    #       smtp.open_message_stream('from@example.com', ['dest@example.com']) {|f|
-    #         f.puts 'From: from@example.com'
-    #         f.puts 'To: dest@example.com'
-    #         f.puts 'Subject: test message'
-    #         f.puts
-    #         f.puts 'This is a test message.'
-    #       }
-    #     }
-    #
-    # This method may raise:
-    #
-    # * Net::SMTPServerBusy
-    # * Net::SMTPSyntaxError
-    # * Net::SMTPFatalError
-    # * Net::SMTPUnknownError
-    # * IOError
-    # * TimeoutError
-    def open_message_stream( from_addr, *to_addrs, &block ) # :yield: stream
-      send0(from_addr, to_addrs.flatten) {
-        @socket.write_message_by_block(&block)
-      }
-    end
-
-    alias ready open_message_stream   # obsolete
-
-    private
-
-    def send0( from_addr, to_addrs )
-      raise IOError, 'closed session' unless @socket
-      raise ArgumentError, 'mail destination does not given' if to_addrs.empty?
-      if $SAFE > 0
-        raise SecurityError, 'tainted from_addr' if from_addr.tainted?
-        to_addrs.each do |to| 
-          raise SecurityError, 'tainted to_addr' if to.tainted?
-        end
-      end
-
-      mailfrom from_addr
-      to_addrs.each do |to|
-        rcptto to
-      end
-      res = critical {
-        check_response(get_response('DATA'), true)
-        yield
-        recv_response()
-      }
-      check_response(res)
-    end
-
-    #
-    # auth
-    #
-
-    private
-
-    def check_auth_args( user, secret, authtype )
-      raise ArgumentError, 'both of user and secret are required'\
-                      unless user and secret
-      auth_method = "auth_#{authtype || 'cram_md5'}"
-      raise ArgumentError, "wrong auth type #{authtype}"\
-                      unless respond_to?(auth_method, true)
-    end
-
-    def authenticate( user, secret, authtype )
-      __send__("auth_#{authtype || 'cram_md5'}", user, secret)
-    end
-
-    def auth_plain( user, secret )
-      res = critical { get_response('AUTH PLAIN %s',
-                                    base64_encode("\0#{user}\0#{secret}")) }
-      raise SMTPAuthenticationError, res unless /\A2../ === res
-    end
-
-    def auth_login( user, secret )
-      res = critical {
-        check_response(get_response('AUTH LOGIN'), true)
-        check_response(get_response(base64_encode(user)), true)
-        get_response(base64_encode(secret))
-      }
-      raise SMTPAuthenticationError, res unless /\A2../ === res
-    end
-
-    def auth_cram_md5( user, secret )
-      # CRAM-MD5: [RFC2195]
-      res = nil
-      critical {
-        res = check_response(get_response('AUTH CRAM-MD5'), true)
-        challenge = res.split(/ /)[1].unpack('m')[0]
-        secret = Digest::MD5.digest(secret) if secret.size > 64
-
-        isecret = secret + "\0" * (64 - secret.size)
-        osecret = isecret.dup
-        0.upto(63) do |i|
-          isecret[i] ^= 0x36
-          osecret[i] ^= 0x5c
-        end
-        tmp = Digest::MD5.digest(isecret + challenge)
-        tmp = Digest::MD5.hexdigest(osecret + tmp)
-
-        res = get_response(base64_encode(user + ' ' + tmp))
-      }
-      raise SMTPAuthenticationError, res unless /\A2../ === res
-    end
-
-    def base64_encode( str )
-      # expects "str" may not become too long
-      [str].pack('m').gsub(/\s+/, '')
-    end
-
-    #
-    # SMTP command dispatcher
-    #
-
-    private
-
-    def helo( domain )
-      getok('HELO %s', domain)
-    end
-
-    def ehlo( domain )
-      getok('EHLO %s', domain)
-    end
-
-    def mailfrom( fromaddr )
-      getok('MAIL FROM:<%s>', fromaddr)
-    end
-
-    def rcptto( to )
-      getok('RCPT TO:<%s>', to)
-    end
-
-    def quit
-      getok('QUIT')
-    end
-
-    #
-    # row level library
-    #
-
-    private
-
-    def getok( fmt, *args )
-      res = critical {
-        @socket.writeline sprintf(fmt, *args)
-        recv_response()
-      }
-      return check_response(res)
-    end
-
-    def get_response( fmt, *args )
-      @socket.writeline sprintf(fmt, *args)
-      recv_response()
-    end
-
-    def recv_response
-      res = ''
-      while true
-        line = @socket.readline
-        res << line << "\n"
-        break unless line[3] == ?-   # "210-PIPELINING"
-      end
-      res
-    end
-
-    def check_response( res, allow_continue = false )
-      return res if /\A2/ === res
-      return res if allow_continue and /\A3/ === res
-      err = case res
-            when /\A4/  then SMTPServerBusy
-            when /\A50/ then SMTPSyntaxError
-            when /\A55/ then SMTPFatalError
-            else SMTPUnknownError
-            end
-      raise err, res
-    end
-
-    def critical( &block )
-      return '200 dummy reply code' if @error_occured
-      begin
-        return yield()
-      rescue Exception
-        @error_occured = true
-        raise
-      end
-    end
-
-  end   # class SMTP
-
-  SMTPSession = SMTP
-
-end   # module Net
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
deleted file mode 100644
index 55c9a4e6c3..0000000000
--- a/lib/net/telnet.rb
+++ /dev/null
@@ -1,732 +0,0 @@
-# = net/telnet.rb - simple telnet client library
-# 
-# Wakou Aoyama <wakou@ruby-lang.org>
-#
-# == Overview
-#
-# This file holds the class Net::Telnet, which provides client-side
-# telnet functionality.
-#
-# The telnet protocol allows a client to login remotely to a user
-# account on a server and execute commands via a shell.  The equivalent
-# is done by creating a Net::Telnet class with the Host option
-# set to your host, calling #login() with your user and password,
-# issuing one or more #cmd() calls, and then calling #close()
-# to end the session.  The #waitfor(), #print(), #puts(), and
-# #write() methods, which #cmd() is implemented on top of, are
-# only needed if you are doing something more complicated.
-#
-# A Net::Telnet object can also be used to connect to non-telnet
-# services, such as SMTP or HTTP.  In this case, you normally
-# want to provide the Port option to specify the port to
-# connect to, and set the Telnetmode option to false to prevent
-# the client from attempting to interpret telnet command sequences.
-# Generally, #login() will not work with other protocols, and you
-# have to handle authentication yourself.
-# For some protocols, it will be possible to specify the Prompt
-# option once when you create the Telnet object and use #cmd() calls; 
-# for others, you will have to specify the response sequence to
-# look for as the Match option to every #cmd() call, or call
-# #puts() and #waitfor() directly; for yet others, you will have 
-# to use #sysread() instead of #waitfor() and parse server 
-# responses yourself.
-#
-# It is worth noting that when you create a new Net::Telnet object,
-# you can supply a proxy IO channel via the Proxy option.  This
-# can be used to attach the Telnet object to other Telnet objects,
-# to already open sockets, or to any read-write IO object.  This
-# can be useful, for instance, for setting up a test fixture for
-# unit testing.
-# 
-# == Examples of use.
-# 
-# === Log in and send a command, echoing all output to stdout.
-# 
-#   localhost = Net::Telnet::new({"Host" => "localhost",
-#                                 "Timeout" => 10,
-#                                 "Prompt" => /[$%#>] \z/n})
-#   localhost.login("username", "password"){|c| print c }
-#   localhost.cmd("command"){|c| print c }
-#   localhost.close
-# 
-# 
-# === Check a POP server to see if you have mail.
-# 
-#   pop = Net::Telnet::new({"Host" => "your_destination_host_here",
-#                           "Port" => 110,
-#                           "Telnetmode" => false,
-#                           "Prompt" => /^\+OK/n})
-#   pop.cmd("user " + "your_username_here"){|c| print c}
-#   pop.cmd("pass " + "your_password_here"){|c| print c}
-#   pop.cmd("list"){|c| print c}
-#
-# == References.
-#
-# There are a large number of RFCs relevant to the Telnet protocol.
-# RFCs 854-861 define the base protocol.  For a complete listing
-# of relevant RFCs, see
-# http://www.omnifarious.org/~hopper/technical/telnet-rfc.html
-
-
-require "socket"
-require "delegate"
-require "timeout"
-require "English"
-
-module Net # :nodoc:
-
-  # Provides telnet client functionality.
-  #
-  # This class also has, through delegation, all the methods of
-  # a socket object (by default, a TCPSocket, but can be set
-  # by the Proxy option to new()).  This provides methods
-  # such as #close() to end the session and #sysread() to
-  # read data directly from the host, instead of via the
-  # #waitfor() mechanism.  Note that if you do use #sysread() 
-  # directly when in telnet mode, you should probably pass
-  # the output through #preprocess() to extract telnet command
-  # sequences.
-  #
-  # See the documentation to the telnet.rb file for an overview
-  # and examples of usage.
-  class Telnet < SimpleDelegator
-
-    # :stopdoc:
-    IAC   = 255.chr # "\377" # "\xff" # interpret as command
-    DONT  = 254.chr # "\376" # "\xfe" # you are not to use option 
-    DO    = 253.chr # "\375" # "\xfd" # please, you use option 
-    WONT  = 252.chr # "\374" # "\xfc" # I won't use option 
-    WILL  = 251.chr # "\373" # "\xfb" # I will use option 
-    SB    = 250.chr # "\372" # "\xfa" # interpret as subnegotiation 
-    GA    = 249.chr # "\371" # "\xf9" # you may reverse the line 
-    EL    = 248.chr # "\370" # "\xf8" # erase the current line 
-    EC    = 247.chr # "\367" # "\xf7" # erase the current character 
-    AYT   = 246.chr # "\366" # "\xf6" # are you there 
-    AO    = 245.chr # "\365" # "\xf5" # abort output--but let prog finish 
-    IP    = 244.chr # "\364" # "\xf4" # interrupt process--permanently 
-    BREAK = 243.chr # "\363" # "\xf3" # break 
-    DM    = 242.chr # "\362" # "\xf2" # data mark--for connect. cleaning 
-    NOP   = 241.chr # "\361" # "\xf1" # nop 
-    SE    = 240.chr # "\360" # "\xf0" # end sub negotiation 
-    EOR   = 239.chr # "\357" # "\xef" # end of record (transparent mode) 
-    ABORT = 238.chr # "\356" # "\xee" # Abort process 
-    SUSP  = 237.chr # "\355" # "\xed" # Suspend process 
-    EOF   = 236.chr # "\354" # "\xec" # End of file 
-    SYNCH = 242.chr # "\362" # "\xf2" # for telfunc calls 
-
-    OPT_BINARY         =   0.chr # "\000" # "\x00" # Binary Transmission 
-    OPT_ECHO           =   1.chr # "\001" # "\x01" # Echo 
-    OPT_RCP            =   2.chr # "\002" # "\x02" # Reconnection 
-    OPT_SGA            =   3.chr # "\003" # "\x03" # Suppress Go Ahead 
-    OPT_NAMS           =   4.chr # "\004" # "\x04" # Approx Message Size Negotiation 
-    OPT_STATUS         =   5.chr # "\005" # "\x05" # Status 
-    OPT_TM             =   6.chr # "\006" # "\x06" # Timing Mark 
-    OPT_RCTE           =   7.chr # "\a"   # "\x07" # Remote Controlled Trans and Echo 
-    OPT_NAOL           =   8.chr # "\010" # "\x08" # Output Line Width 
-    OPT_NAOP           =   9.chr # "\t"   # "\x09" # Output Page Size 
-    OPT_NAOCRD         =  10.chr # "\n"   # "\x0a" # Output Carriage-Return Disposition 
-    OPT_NAOHTS         =  11.chr # "\v"   # "\x0b" # Output Horizontal Tab Stops 
-    OPT_NAOHTD         =  12.chr # "\f"   # "\x0c" # Output Horizontal Tab Disposition 
-    OPT_NAOFFD         =  13.chr # "\r"   # "\x0d" # Output Formfeed Disposition 
-    OPT_NAOVTS         =  14.chr # "\016" # "\x0e" # Output Vertical Tabstops 
-    OPT_NAOVTD         =  15.chr # "\017" # "\x0f" # Output Vertical Tab Disposition 
-    OPT_NAOLFD         =  16.chr # "\020" # "\x10" # Output Linefeed Disposition 
-    OPT_XASCII         =  17.chr # "\021" # "\x11" # Extended ASCII 
-    OPT_LOGOUT         =  18.chr # "\022" # "\x12" # Logout 
-    OPT_BM             =  19.chr # "\023" # "\x13" # Byte Macro 
-    OPT_DET            =  20.chr # "\024" # "\x14" # Data Entry Terminal 
-    OPT_SUPDUP         =  21.chr # "\025" # "\x15" # SUPDUP 
-    OPT_SUPDUPOUTPUT   =  22.chr # "\026" # "\x16" # SUPDUP Output 
-    OPT_SNDLOC         =  23.chr # "\027" # "\x17" # Send Location 
-    OPT_TTYPE          =  24.chr # "\030" # "\x18" # Terminal Type 
-    OPT_EOR            =  25.chr # "\031" # "\x19" # End of Record 
-    OPT_TUID           =  26.chr # "\032" # "\x1a" # TACACS User Identification 
-    OPT_OUTMRK         =  27.chr # "\e"   # "\x1b" # Output Marking 
-    OPT_TTYLOC         =  28.chr # "\034" # "\x1c" # Terminal Location Number 
-    OPT_3270REGIME     =  29.chr # "\035" # "\x1d" # Telnet 3270 Regime 
-    OPT_X3PAD          =  30.chr # "\036" # "\x1e" # X.3 PAD 
-    OPT_NAWS           =  31.chr # "\037" # "\x1f" # Negotiate About Window Size 
-    OPT_TSPEED         =  32.chr # " "    # "\x20" # Terminal Speed 
-    OPT_LFLOW          =  33.chr # "!"    # "\x21" # Remote Flow Control 
-    OPT_LINEMODE       =  34.chr # "\""   # "\x22" # Linemode 
-    OPT_XDISPLOC       =  35.chr # "#"    # "\x23" # X Display Location 
-    OPT_OLD_ENVIRON    =  36.chr # "$"    # "\x24" # Environment Option 
-    OPT_AUTHENTICATION =  37.chr # "%"    # "\x25" # Authentication Option 
-    OPT_ENCRYPT        =  38.chr # "&"    # "\x26" # Encryption Option 
-    OPT_NEW_ENVIRON    =  39.chr # "'"    # "\x27" # New Environment Option 
-    OPT_EXOPL          = 255.chr # "\377" # "\xff" # Extended-Options-List 
-
-    NULL = "\000" 
-    CR   = "\015"   
-    LF   = "\012" 
-    EOL  = CR + LF 
-    REVISION = '$Id$'
-    # :startdoc:
-
-    # Creates a new Net::Telnet object.
-    #
-    # Attempts to connect to the host (unless the Proxy option is
-    # provided: see below).  If a block is provided, it is yielded
-    # status messages on the attempt to connect to the server, of
-    # the form:
-    # 
-    #   Trying localhost...
-    #   Connected to localhost.
-    #
-    # +options+ is a hash of options.  The following example lists
-    # all options and their default values.
-    # 
-    #   host = Net::Telnet::new({
-    #            "Host"       => "localhost",  # default: "localhost"
-    #            "Port"       => 23,           # default: 23
-    #            "Binmode"    => false,        # default: false
-    #            "Output_log" => "output_log", # default: nil (no output)
-    #            "Dump_log"   => "dump_log",   # default: nil (no output)
-    #            "Prompt"     => /[$%#>] \z/n, # default: /[$%#>] \z/n
-    #            "Telnetmode" => true,         # default: true
-    #            "Timeout"    => 10,           # default: 10
-    #              # if ignore timeout then set "Timeout" to false.
-    #            "Waittime"   => 0,            # default: 0
-    #            "Proxy"      => proxy         # default: nil
-    #                            # proxy is Net::Telnet or IO object
-    #          })
-    #
-    # The options have the following meanings:
-    #
-    # Host:: the hostname or IP address of the host to connect to, as a String. 
-    #        Defaults to "localhost".
-    #
-    # Port:: the port to connect to.  Defaults to 23.
-    #
-    # Binmode:: if false (the default), newline substitution is performed.  
-    #           Outgoing LF is
-    #           converted to CRLF, and incoming CRLF is converted to LF.  If
-    #           true, this substitution is not performed.  This value can
-    #           also be set with the #binmode() method.  The 
-    #           outgoing conversion only applies to the #puts() and #print()
-    #           methods, not the #write() method.  The precise nature of
-    #           the newline conversion is also affected by the telnet options
-    #           SGA and BIN.
-    #
-    # Output_log:: the name of the file to write connection status messages
-    #              and all received traffic to.  In the case of a proper
-    #              Telnet session, this will include the client input as
-    #              echoed by the host; otherwise, it only includes server
-    #              responses.  Output is appended verbatim to this file.  
-    #              By default, no output log is kept.
-    #
-    # Dump_log:: as for Output_log, except that output is written in hexdump
-    #            format (16 bytes per line as hex pairs, followed by their
-    #            printable equivalent), with connection status messages
-    #            preceded by '#', sent traffic preceded by '>', and 
-    #            received traffic preceded by '<'.  By default, not dump log
-    #            is kept.
-    #
-    # Prompt:: a regular expression matching the host's command-line prompt
-    #          sequence.  This is needed by the Telnet class to determine
-    #          when the output from a command has finished and the host is
-    #          ready to receive a new command.  By default, this regular
-    #          expression is /[$%#>] \z/n.
-    #
-    # Telnetmode:: a boolean value, true by default.  In telnet mode, 
-    #              traffic received from the host is parsed for special
-    #              command sequences, and these sequences are escaped
-    #              in outgoing traffic sent using #puts() or #print()
-    #              (but not #write()).  If you are using the Net::Telnet
-    #              object to connect to a non-telnet service (such as
-    #              SMTP or POP), this should be set to "false" to prevent
-    #              undesired data corruption.  This value can also be set
-    #              by the #telnetmode() method.
-    #
-    # Timeout:: the number of seconds to wait before timing out both the
-    #           initial attempt to connect to host (in this constructor),
-    #           and all attempts to read data from the host (in #waitfor(),
-    #           #cmd(), and #login()).  Exceding this timeout causes a
-    #           TimeoutError to be raised.  The default value is 10 seconds.
-    #           You can disable the timeout by setting this value to false.
-    #           In this case, the connect attempt will eventually timeout
-    #           on the underlying connect(2) socket call with an
-    #           Errno::ETIMEDOUT error (but generally only after a few
-    #           minutes), but other attempts to read data from the host
-    #           will hand indefinitely if no data is forthcoming.
-    #
-    # Waittime:: the amount of time to wait after seeing what looks like a 
-    #            prompt (that is, received data that matches the Prompt
-    #            option regular expression) to see if more data arrives.
-    #            If more data does arrive in this time, Net::Telnet assumes
-    #            that what it saw was not really a prompt.  This is to try to 
-    #            avoid false matches, but it can also lead to missing real
-    #            prompts (if, for instance, a background process writes to
-    #            the terminal soon after the prompt is displayed).  By
-    #            default, set to 0, meaning not to wait for more data.
-    #
-    # Proxy:: a proxy object to used instead of opening a direct connection
-    #         to the host.  Must be either another Net::Telnet object or
-    #         an IO object.  If it is another Net::Telnet object, this 
-    #         instance will use that one's socket for communication.  If an
-    #         IO object, it is used directly for communication.  Any other
-    #         kind of object will cause an error to be raised.
-    def initialize(options) # :yield: mesg 
-      @options = options
-      @options["Host"]       = "localhost"   unless @options.has_key?("Host")
-      @options["Port"]       = 23            unless @options.has_key?("Port")
-      @options["Prompt"]     = /[$%#>] \z/n  unless @options.has_key?("Prompt")
-      @options["Timeout"]    = 10            unless @options.has_key?("Timeout")
-      @options["Waittime"]   = 0             unless @options.has_key?("Waittime")
-      unless @options.has_key?("Binmode")
-        @options["Binmode"]    = false         
-      else
-        unless (true == @options["Binmode"] or false == @options["Binmode"])
-          raise ArgumentError, "Binmode option required true or false"
-        end
-      end
-
-      unless @options.has_key?("Telnetmode")
-        @options["Telnetmode"] = true          
-      else
-        unless (true == @options["Telnetmode"] or false == @options["Telnetmode"])
-          raise ArgumentError, "Telnetmode option required true or false"
-        end
-      end
-
-      @telnet_option = { "SGA" => false, "BINARY" => false }
-
-      if @options.has_key?("Output_log")
-        @log = File.open(@options["Output_log"], 'a+')
-        @log.sync = true
-        @log.binmode
-      end
-
-      if @options.has_key?("Dump_log")
-        @dumplog = File.open(@options["Dump_log"], 'a+')
-        @dumplog.sync = true
-        @dumplog.binmode
-        def @dumplog.log_dump(dir, x)  # :nodoc:
-          len = x.length
-          addr = 0
-          offset = 0
-          while 0 < len
-            if len < 16
-              line = x[offset, len]
-            else
-              line = x[offset, 16]
-            end
-            hexvals = line.unpack('H*')[0]
-            hexvals += ' ' * (32 - hexvals.length)
-            hexvals = format("%s %s %s %s  " * 4, *hexvals.unpack('a2' * 16))
-            line = line.gsub(/[\000-\037\177-\377]/n, '.')
-            printf "%s 0x%5.5x: %s%s\n", dir, addr, hexvals, line
-            addr += 16
-            offset += 16
-            len -= 16
-          end
-          print "\n"
-        end
-      end
-
-      if @options.has_key?("Proxy")
-        if @options["Proxy"].kind_of?(Net::Telnet)
-          @sock = @options["Proxy"].sock
-        elsif @options["Proxy"].kind_of?(IO)
-          @sock = @options["Proxy"]
-        else
-          raise "Error; Proxy is Net::Telnet or IO object."
-        end
-      else
-        message = "Trying " + @options["Host"] + "...\n"
-        yield(message) if block_given?
-        @log.write(message) if @options.has_key?("Output_log")
-        @dumplog.log_dump('#', message) if @options.has_key?("Dump_log")
-
-        begin
-          if @options["Timeout"] == false
-            @sock = TCPSocket.open(@options["Host"], @options["Port"])
-          else
-            timeout(@options["Timeout"]) do
-              @sock = TCPSocket.open(@options["Host"], @options["Port"])
-            end
-          end
-        rescue TimeoutError
-          raise TimeoutError, "timed-out; opening of the host"
-        rescue
-          @log.write($ERROR_INFO.to_s + "\n") if @options.has_key?("Output_log")
-          @dumplog.log_dump('#', $ERROR_INFO.to_s + "\n") if @options.has_key?("Dump_log")
-          raise
-        end
-        @sock.sync = true
-        @sock.binmode
-
-        message = "Connected to " + @options["Host"] + ".\n"
-        yield(message) if block_given?
-        @log.write(message) if @options.has_key?("Output_log")
-        @dumplog.log_dump('#', message) if @options.has_key?("Dump_log")
-      end
-
-      super(@sock)
-    end # initialize
-
-    # The socket the Telnet object is using.  Note that this object becomes
-    # a delegate of the Telnet object, so normally you invoke its methods
-    # directly on the Telnet object.
-    attr :sock 
-
-    # Set telnet command interpretation on (+mode+ == true) or off
-    # (+mode+ == false), or return the current value (+mode+ not
-    # provided).  It should be on for true telnet sessions, off if
-    # using Net::Telnet to connect to a non-telnet service such
-    # as SMTP.
-    def telnetmode(mode = nil)
-      case mode
-      when nil
-        @options["Telnetmode"]
-      when true, false
-        @options["Telnetmode"] = mode
-      else
-        raise ArgumentError, "required true or false"
-      end
-    end
-
-    # Turn telnet command interpretation on (true) or off (false).  It
-    # should be on for true telnet sessions, off if using Net::Telnet
-    # to connect to a non-telnet service such as SMTP.
-    def telnetmode=(mode)
-      if (true == mode or false == mode)
-        @options["Telnetmode"] = mode
-      else
-        raise ArgumentError, "required true or false"
-      end
-    end
-
-    # Turn newline conversion on (+mode+ == false) or off (+mode+ == true),
-    # or return the current value (+mode+ is not specified).
-    def binmode(mode = nil)
-      case mode
-      when nil
-        @options["Binmode"] 
-      when true, false
-        @options["Binmode"] = mode
-      else
-        raise ArgumentError, "required true or false"
-      end
-    end
-
-    # Turn newline conversion on (false) or off (true).
-    def binmode=(mode)
-      if (true == mode or false == mode)
-        @options["Binmode"] = mode
-      else
-        raise ArgumentError, "required true or false"
-      end
-    end
-
-    # Preprocess received data from the host.
-    #
-    # Performs newline conversion and detects telnet command sequences.
-    # Called automatically by #waitfor().  You should only use this 
-    # method yourself if you have read input directly using sysread()
-    # or similar, and even then only if in telnet mode.
-    def preprocess(string)
-      # combine CR+NULL into CR
-      string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
-
-      # combine EOL into "\n"
-      string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
-
-      string.gsub(/#{IAC}(
-                   [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
-                   [#{DO}#{DONT}#{WILL}#{WONT}]
-                     [#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}]|
-                   #{SB}[^#{IAC}]*#{IAC}#{SE}
-                 )/xno) do
-        if    IAC == $1  # handle escaped IAC characters
-          IAC
-        elsif AYT == $1  # respond to "IAC AYT" (are you there)
-          self.write("nobody here but us pigeons" + EOL)
-          ''
-        elsif DO[0] == $1[0]  # respond to "IAC DO x"
-          if OPT_BINARY[0] == $1[1]
-            @telnet_option["BINARY"] = true
-            self.write(IAC + WILL + OPT_BINARY)
-          else
-            self.write(IAC + WONT + $1[1..1])
-          end
-          ''
-        elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
-          self.write(IAC + WONT + $1[1..1])
-          ''
-        elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
-          if    OPT_BINARY[0] == $1[1]
-            self.write(IAC + DO + OPT_BINARY)
-          elsif OPT_ECHO[0] == $1[1]
-            self.write(IAC + DO + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = true
-            self.write(IAC + DO + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
-          if    OPT_ECHO[0] == $1[1]
-            self.write(IAC + DONT + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = false
-            self.write(IAC + DONT + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        else
-          ''
-        end
-      end
-    end # preprocess
-
-    # Read data from the host until a certain sequence is matched.
-    #
-    # If a block is given, the received data will be yielded as it
-    # is read in (not necessarily all in one go), or nil if EOF 
-    # occurs before any data is received.  Whether a block is given
-    # or not, all data read will be returned in a single string, or again 
-    # nil if EOF occurs before any data is received.  Note that
-    # received data includes the matched sequence we were looking for.
-    #
-    # +options+ can be either a regular expression or a hash of options.
-    # If a regular expression, this specifies the data to wait for.
-    # If a hash, this can specify the following options:
-    #
-    # Match:: a regular expression, specifying the data to wait for.
-    # Prompt:: as for Match; used only if Match is not specified.
-    # String:: as for Match, except a string that will be converted
-    #          into a regular expression.  Used only if Match and
-    #          Prompt are not specified.
-    # Timeout:: the number of seconds to wait for data from the host
-    #           before raising a TimeoutError.  If set to false, 
-    #           no timeout will occur.  If not specified, the
-    #           Timeout option value specified when this instance
-    #           was created will be used, or, failing that, the
-    #           default value of 10 seconds.
-    # Waittime:: the number of seconds to wait after matching against
-    #            the input data to see if more data arrives.  If more
-    #            data arrives within this time, we will judge ourselves
-    #            not to have matched successfully, and will continue
-    #            trying to match.  If not specified, the Waittime option
-    #            value specified when this instance was created will be
-    #            used, or, failing that, the default value of 0 seconds,
-    #            which means not to wait for more input.
-    #           
-    def waitfor(options) # :yield: recvdata
-      time_out = @options["Timeout"]
-      waittime = @options["Waittime"]
-
-      if options.kind_of?(Hash)
-        prompt   = if options.has_key?("Match")
-                     options["Match"]
-                   elsif options.has_key?("Prompt")
-                     options["Prompt"]
-                   elsif options.has_key?("String")
-                     Regexp.new( Regexp.quote(options["String"]) )
-                   end
-        time_out = options["Timeout"]  if options.has_key?("Timeout")
-        waittime = options["Waittime"] if options.has_key?("Waittime")
-      else
-        prompt = options
-      end
-
-      if time_out == false
-        time_out = nil
-      end
-
-      line = ''
-      buf = ''
-      rest = ''
-      until(prompt === line and not IO::select([@sock], nil, nil, waittime))
-        unless IO::select([@sock], nil, nil, time_out)
-          raise TimeoutError, "timed-out; wait for the next data"
-        end
-        begin
-          c = @sock.sysread(1024 * 1024)
-          @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
-          if @options["Telnetmode"]
-            c = rest + c
-            if Integer(c.rindex(/#{IAC}#{SE}/no)) <
-               Integer(c.rindex(/#{IAC}#{SB}/no))
-              buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
-              rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
-            elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no)
-              buf = preprocess(c[0 ... pt])
-              rest = c[pt .. -1]
-            else
-              buf = preprocess(c)
-              rest = ''
-            end
-         else
-           # Not Telnetmode.
-           #
-           # We cannot use preprocess() on this data, because that
-           # method makes some Telnetmode-specific assumptions.
-           buf = c
-           buf.gsub!(/#{EOL}/no, "\n") unless @options["Binmode"]
-           rest = ''
-          end
-          @log.print(buf) if @options.has_key?("Output_log")
-          line += buf
-          yield buf if block_given?
-        rescue EOFError # End of file reached
-          if line == ''
-            line = nil
-            yield nil if block_given?
-          end
-          break
-        end
-      end
-      line
-    end
-
-    # Write +string+ to the host.
-    #
-    # Does not perform any conversions on +string+.  Will log +string+ to the
-    # dumplog, if the Dump_log option is set.
-    def write(string)
-      length = string.length
-      while 0 < length
-        IO::select(nil, [@sock])
-        @dumplog.log_dump('>', string[-length..-1]) if @options.has_key?("Dump_log")
-        length -= @sock.syswrite(string[-length..-1])
-      end
-    end
-
-    # Sends a string to the host.
-    #
-    # This does _not_ automatically append a newline to the string.  Embedded
-    # newlines may be converted and telnet command sequences escaped 
-    # depending upon the values of telnetmode, binmode, and telnet options
-    # set by the host.
-    def print(string)
-      string = string.gsub(/#{IAC}/no, IAC + IAC) if @options["Telnetmode"]
-
-      if @options["Binmode"]
-        self.write(string)
-      else
-        if @telnet_option["BINARY"] and @telnet_option["SGA"]
-          # IAC WILL SGA IAC DO BIN send EOL --> CR
-          self.write(string.gsub(/\n/n, CR))
-        elsif @telnet_option["SGA"]
-          # IAC WILL SGA send EOL --> CR+NULL
-          self.write(string.gsub(/\n/n, CR + NULL))
-        else
-          # NONE send EOL --> CR+LF
-          self.write(string.gsub(/\n/n, EOL))
-        end
-      end
-    end
-
-    # Sends a string to the host.
-    #
-    # Same as #print(), but appends a newline to the string.
-    def puts(string)
-      self.print(string + "\n")
-    end
-
-    # Send a command to the host.
-    #
-    # More exactly, sends a string to the host, and reads in all received
-    # data until is sees the prompt or other matched sequence.
-    #
-    # If a block is given, the received data will be yielded to it as
-    # it is read in.  Whether a block is given or not, the received data 
-    # will be return as a string.  Note that the received data includes
-    # the prompt and in most cases the host's echo of our command.
-    #
-    # +options+ is either a String, specified the string or command to
-    # send to the host; or it is a hash of options.  If a hash, the
-    # following options can be specified:
-    #
-    # String:: the command or other string to send to the host.
-    # Match:: a regular expression, the sequence to look for in
-    #         the received data before returning.  If not specified,
-    #         the Prompt option value specified when this instance
-    #         was created will be used, or, failing that, the default
-    #         prompt of /[$%#>] \z/n.
-    # Timeout:: the seconds to wait for data from the host before raising
-    #           a Timeout error.  If not specified, the Timeout option
-    #           value specified when this instance was created will be
-    #           used, or, failing that, the default value of 10 seconds.
-    #
-    # The command or other string will have the newline sequence appended
-    # to it.
-    def cmd(options) # :yield: recvdata
-      match    = @options["Prompt"]
-      time_out = @options["Timeout"]
-
-      if options.kind_of?(Hash)
-        string   = options["String"]
-        match    = options["Match"]   if options.has_key?("Match")
-        time_out = options["Timeout"] if options.has_key?("Timeout")
-      else
-        string = options
-      end
-
-      self.puts(string)
-      if block_given?
-        waitfor({"Prompt" => match, "Timeout" => time_out}){|c| yield c }
-      else
-        waitfor({"Prompt" => match, "Timeout" => time_out})
-      end
-    end
-
-    # Login to the host with a given username and password.
-    #
-    # The username and password can either be provided as two string
-    # arguments in that order, or as a hash with keys "Name" and
-    # "Password".    
-    #
-    # This method looks for the strings "login" and "Password" from the
-    # host to determine when to send the username and password.  If the
-    # login sequence does not follow this pattern (for instance, you
-    # are connecting to a service other than telnet), you will need
-    # to handle login yourself.
-    #
-    # The password can be omitted, either by only
-    # provided one String argument, which will be used as the username,
-    # or by providing a has that has no "Password" key.  In this case,
-    # the method will not look for the "Password:" prompt; if it is
-    # sent, it will have to be dealt with by later calls.
-    #
-    # The method returns all data received during the login process from
-    # the host, including the echoed username but not the password (which
-    # the host should not echo).  If a block is passed in, this received
-    # data is also yielded to the block as it is received.
-    def login(options, password = nil) # :yield: recvdata
-      if options.kind_of?(Hash)
-        username = options["Name"]
-        password = options["Password"]
-      else
-        username = options
-      end
-
-      if block_given?
-        line = waitfor(/login[: ]*\z/n){|c| yield c }
-        if password
-          line += cmd({"String" => username,
-                       "Match" => /Password[: ]*\z/n}){|c| yield c }
-          line += cmd(password){|c| yield c }
-        else
-          line += cmd(username){|c| yield c }
-        end
-      else
-        line = waitfor(/login[: ]*\z/n)
-        if password
-          line += cmd({"String" => username,
-                       "Match" => /Password[: ]*\z/n})
-          line += cmd(password)
-        else
-          line += cmd(username)
-        end
-      end
-      line
-    end
-
-  end  # class Telnet
-end  # module Net
-
diff --git a/lib/observer.rb b/lib/observer.rb
index 64c7d81351..0c74b49750 100644
--- a/lib/observer.rb
+++ b/lib/observer.rb
@@ -1,192 +1,42 @@
-#
-# observer.rb implements the _Observer_ object-oriented design pattern.  The
-# following documentation is copied, with modifications, from "Programming
-# Ruby", by Hunt and Thomas; http://www.rubycentral.com/book/lib_patterns.html.
-#
-# == About
-#
-# The Observer pattern, also known as Publish/Subscribe, provides a simple
-# mechanism for one object to inform a set of interested third-party objects
-# when its state changes. 
-#
-# == Mechanism
-#
-# In the Ruby implementation, the notifying class mixes in the +Observable+
-# module, which provides the methods for managing the associated observer
-# objects.
-#
-# The observers must implement the +update+ method to receive notifications.
-#
-# The observable object must:
-# * assert that it has +changed+
-# * call +notify_observers+
-#
-# == Example
-#
-# The following example demonstrates this nicely.  A +Ticker+, when run,
-# continually receives the stock +Price+ for its +@symbol+.  A +Warner+ is a
-# general observer of the price, and two warners are demonstrated, a +WarnLow+
-# and a +WarnHigh+, which print a warning if the price is below or above their
-# set limits, respectively.
-#
-# The +update+ callback allows the warners to run without being explicitly
-# called.  The system is set up with the +Ticker+ and several observers, and the
-# observers do their duty without the top-level code having to interfere.
-#
-# Note that the contract between publisher and subscriber (observable and
-# observer) is not declared or enforced.  The +Ticker+ publishes a time and a
-# price, and the warners receive that.  But if you don't ensure that your
-# contracts are correct, nothing else can warn you.
-#
-#   require "observer"
-#   
-#   class Ticker          ### Periodically fetch a stock price.
-#     include Observable
-#   
-#     def initialize(symbol)
-#       @symbol = symbol
-#     end
-#   
-#     def run
-#       lastPrice = nil
-#       loop do
-#         price = Price.fetch(@symbol)
-#         print "Current price: #{price}\n"
-#         if price != lastPrice
-#           changed                 # notify observers
-#           lastPrice = price
-#           notify_observers(Time.now, price)
-#         end
-#         sleep 1
-#       end
-#     end
-#   end
-#
-#   class Price           ### A mock class to fetch a stock price (60 - 140).
-#     def Price.fetch(symbol)
-#       60 + rand(80)
-#     end
-#   end
-#   
-#   class Warner          ### An abstract observer of Ticker objects.
-#     def initialize(ticker, limit)
-#       @limit = limit
-#       ticker.add_observer(self)
-#     end
-#   end
-#   
-#   class WarnLow < Warner
-#     def update(time, price)       # callback for observer
-#       if price < @limit
-#         print "--- #{time.to_s}: Price below #@limit: #{price}\n"
-#       end
-#     end
-#   end
-#   
-#   class WarnHigh < Warner
-#     def update(time, price)       # callback for observer
-#       if price > @limit
-#         print "+++ #{time.to_s}: Price above #@limit: #{price}\n"
-#       end
-#     end
-#   end
-#
-#   ticker = Ticker.new("MSFT")
-#   WarnLow.new(ticker, 80)
-#   WarnHigh.new(ticker, 120)
-#   ticker.run
-#
-# Produces:
-#
-#   Current price: 83
-#   Current price: 75
-#   --- Sun Jun 09 00:10:25 CDT 2002: Price below 80: 75
-#   Current price: 90
-#   Current price: 134
-#   +++ Sun Jun 09 00:10:25 CDT 2002: Price above 120: 134
-#   Current price: 134
-#   Current price: 112
-#   Current price: 79
-#   --- Sun Jun 09 00:10:25 CDT 2002: Price below 80: 79
+# Observable Mixin
+# 
+# Observers must respond to update
 
-
-#
-# Implements the Observable design pattern as a mixin so that other objects can
-# be notified of changes in state.  See observer.rb for details and an example.
-#
 module Observable
-
-  #
-  # Add +observer+ as an observer on this object. +observer+ will now receive
-  # notifications.
-  #
   def add_observer(observer)
-    @observer_peers = [] unless defined? @observer_peers
-    unless observer.respond_to? :update
-      raise NoMethodError, "observer needs to respond to `update'" 
+    @observer_peers = [] unless @observer_peers
+    unless defined? observer.update
+      raise NameError, "observer needs to respond to `update'" 
     end
     @observer_peers.push observer
   end
-
-  #
-  # Delete +observer+ as an observer on this object. It will no longer receive
-  # notifications.
-  #
   def delete_observer(observer)
-    @observer_peers.delete observer if defined? @observer_peers
+    @observer_peers.delete observer if @observer_peers
   end
-
-  #
-  # Delete all observers associated with this object.
-  #
   def delete_observers
-    @observer_peers.clear if defined? @observer_peers
+    @observer_peers.clear if @observer_peers
   end
-
-  #
-  # Return the number of observers associated with this object.
-  #
   def count_observers
-    if defined? @observer_peers
+    if @observer_peers
       @observer_peers.size
     else
       0
     end
   end
-
-  #
-  # Set the changed state of this object.  Notifications will be sent only if
-  # the changed +state+ is +true+.
-  #
   def changed(state=true)
     @observer_state = state
   end
-
-  #
-  # Query the changed state of this object.
-  #
   def changed?
-    if defined? @observer_state and @observer_state
-      true
-    else
-      false
-    end
+    @observer_state
   end
-
-  #
-  # If this object's changed state is +true+, invoke the update method in each
-  # currently associated observer in turn, passing it the given arguments. The
-  # changed state is then set to +false+.
-  #
   def notify_observers(*arg)
-    if defined? @observer_state and @observer_state
-      if defined? @observer_peers
-	for i in @observer_peers.dup
+    if @observer_state
+      if @observer_peers
+	for i in @observer_peers
 	  i.update(*arg)
 	end
       end
       @observer_state = false
     end
   end
-
 end
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
deleted file mode 100644
index 8ff5a10b86..0000000000
--- a/lib/open-uri.rb
+++ /dev/null
@@ -1,402 +0,0 @@
-#= open-uri.rb
-#
-#open-uri.rb is easy-to-use wrapper for net/http and net/ftp.
-# 
-#== Example
-#
-#It is possible to open http/ftp URL as usual a file:
-#
-#  open("http://www.ruby-lang.org/") {|f|
-#    f.each_line {|line| p line}
-#  }
-#
-#The opened file has several methods for meta information as follows since
-#it is extended by OpenURI::Meta.
-#
-#  open("http://www.ruby-lang.org/en") {|f|
-#    f.each_line {|line| p line}
-#    p f.base_uri         # <URI::HTTP:0x40e6ef2 URL:http://www.ruby-lang.org/en/>
-#    p f.content_type     # "text/html"
-#    p f.charset          # "iso-8859-1"
-#    p f.content_encoding # []
-#    p f.last_modified    # Thu Dec 05 02:45:02 UTC 2002
-#  }
-#
-#Additional header fields can be specified by an optional hash argument.
-#
-#  open("http://www.ruby-lang.org/en/",
-#    "User-Agent" => "Ruby/#{RUBY_VERSION}",
-#    "From" => "foo@bar.invalid",
-#    "Referer" => "http://www.ruby-lang.org/") {|f|
-#    ...
-#  }
-#
-#The environment variables such as http_proxy and ftp_proxy are in effect by
-#default.  :proxy => nil disables proxy.
-#
-#  open("http://www.ruby-lang.org/en/raa.html",
-#    :proxy => nil) {|f|
-#    ...
-#  }
-#
-#URI objects can be opened in similar way.
-# 
-#  uri = URI.parse("http://www.ruby-lang.org/en/")
-#  uri.open {|f|
-#    ...
-#  }
-#
-#URI objects can be read directly.
-#The returned string is also extended by OpenURI::Meta.
-#
-#  str = uri.read
-#  p str.base_uri
-#
-#Author:: Tanaka Akira <akr@m17n.org>
-
-require 'uri'
-require 'stringio'
-require 'time'
-
-module Kernel
-  private
-  alias open_uri_original_open open # :nodoc:
-
-  # makes possible to open URIs.
-  # If the first argument is URI::HTTP, URI::FTP or 
-  # String beginning with http:// or ftp://,
-  # the URI is opened.
-  # The opened file object is extended by OpenURI::Meta.
-  def open(name, *rest, &block)
-    if name.respond_to?("open")
-      name.open(*rest, &block)
-    elsif name.respond_to?("to_str") && %r{\A(http|ftp)://} =~ name
-      OpenURI.open_uri(name, *rest, &block)
-    else
-      open_uri_original_open(name, *rest, &block)
-    end
-  end
-  module_function :open
-end
-
-module OpenURI
-  def OpenURI.scan_open_optional_arguments(*rest) # :nodoc:
-    if !rest.empty? && (String === rest.first || Integer === rest.first)
-      mode = rest.shift
-      if !rest.empty? && Integer === rest.first
-        perm = rest.shift
-      end
-    end
-    return mode, perm, rest
-  end
-
-  def OpenURI.open_uri(name, *rest) # :nodoc:
-    uri = URI::Generic === name ? name : URI.parse(name)
-    mode, perm, rest = OpenURI.scan_open_optional_arguments(*rest)
-    options = rest.shift if !rest.empty? && Hash === rest.first
-    raise ArgumentError.new("extra arguments") if !rest.empty?
-
-    unless mode == nil ||
-           mode == 'r' || mode == 'rb' ||
-           mode == O_RDONLY
-      raise ArgumentError.new("invalid access mode #{mode} (#{uri.class} resource is read only.)")
-    end
-
-    io = open_loop(uri, options || {})
-    if block_given?
-      begin
-        yield io
-      ensure
-        io.close
-      end
-    else
-      io
-    end
-  end
-
-  def OpenURI.open_loop(uri, options) # :nodoc:
-    header = {}
-    options.each {|k, v|
-      if String === k
-        header[k] = v
-      end
-    }
-
-    case opt_proxy = options.fetch(:proxy, true)
-    when true
-      find_proxy = lambda {|u| u.find_proxy}
-    when nil, false
-      find_proxy = lambda {|u| nil}
-    when String
-      opt_proxy = URI.parse(opt_proxy)
-      find_proxy = lambda {|u| opt_proxy}
-    when URI::Generic
-      find_proxy = lambda {|u| opt_proxy}
-    else
-      raise ArgumentError.new("Invalid proxy option: #{opt_proxy}")
-    end
-
-    uri_set = {}
-    begin
-      buf = Buffer.new
-      if proxy_uri = find_proxy.call(uri)
-        proxy_uri.proxy_open(buf, uri, header)
-      else
-        uri.direct_open(buf, header)
-      end
-    rescue Redirect
-      loc = $!.uri
-      if loc.relative?
-        # Although it violates RFC 2616, Location: field may have relative URI.
-        # It is converted to absolute URI using uri.
-        loc = uri + loc
-      end
-      uri = loc
-      raise "HTTP redirection loop: #{uri}" if uri_set.include? uri.to_s
-      uri_set[uri.to_s] = true 
-      retry
-    end
-    io = buf.io
-    io.base_uri = uri
-    io
-  end
-
-  class Redirect < StandardError # :nodoc:
-    def initialize(uri)
-      super("redirection to #{uri.to_s}")
-      @uri = uri
-    end
-    attr_reader :uri
-  end
-
-  class HTTPError < StandardError
-    def initialize(message, io)
-      super(message)
-      @io = io
-    end
-    attr_reader :io
-  end
-
-  class Buffer # :nodoc:
-    def initialize
-      @io = StringIO.new
-    end
-
-    StringMax = 10240
-    def <<(str)
-      @io << str
-      if StringIO === @io && StringMax < @io.size
-        require 'tempfile'
-        io = Tempfile.new('open-uri')
-        Meta.init io, @io if Meta === @io
-        io << @io.string
-        @io = io
-      end
-    end
-
-    def io
-      Meta.init @io unless Meta === @io
-      @io
-    end
-  end
-
-  # Mixin for holding meta-information.
-  module Meta
-    def Meta.init(obj, src=nil) # :nodoc:
-      obj.extend Meta
-      obj.instance_eval {
-        @base_uri = nil
-        @meta = {}
-      }
-      if src
-        obj.status = src.status
-        obj.base_uri = src.base_uri
-        src.meta.each {|name, value|
-          obj.meta_add_field(name, value)
-        }
-      end
-    end
-
-    # returns an Array which consits status code and message.
-    attr_accessor :status
-
-    # returns a URI which is base of relative URIs in the data.
-    # It may differ from the URI supplied by a user because redirection.
-    attr_accessor :base_uri
-
-    # returns a Hash which represents header fields.
-    # The Hash keys are downcased for canonicalization.
-    attr_reader :meta
-
-    def meta_add_field(name, value) # :nodoc:
-      @meta[name.downcase] = value
-    end
-
-    # returns a Time which represents Last-Modified field.
-    def last_modified
-      if v = @meta['last-modified']
-        Time.httpdate(v)
-      else
-        nil
-      end
-    end
-
-    RE_LWS = /[\r\n\t ]+/n
-    RE_TOKEN = %r{[^\x00- ()<>@,;:\\"/\[\]?={}\x7f]+}n
-    RE_QUOTED_STRING = %r{"(?:[\r\n\t !#-\[\]-~\x80-\xff]|\\[\x00-\x7f])"}n
-    RE_PARAMETERS = %r{(?:;#{RE_LWS}?#{RE_TOKEN}#{RE_LWS}?=#{RE_LWS}?(?:#{RE_TOKEN}|#{RE_QUOTED_STRING})#{RE_LWS}?)*}n
-
-    def content_type_parse # :nodoc:
-      v = @meta['content-type']
-      if v && %r{\A#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?/(#{RE_TOKEN})#{RE_LWS}?(#{RE_PARAMETERS})\z}o =~ v
-        type = $1.downcase
-        subtype = $2.downcase
-        parameters = []
-        $3.scan(/;#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?=#{RE_LWS}?(?:(#{RE_TOKEN})|(#{RE_QUOTED_STRING}))/o) {|att, val, qval|
-          val = qval.gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/) { $1 ? $1[1,1] : $& } if qval
-          parameters << [att.downcase, val]
-        }
-        ["#{type}/#{subtype}", *parameters]
-      else
-        nil
-      end
-    end
-
-    # returns "type/subtype" which is MIME Content-Type.
-    # It is downcased for canonicalization.
-    # Content-Type parameters are stripped.
-    def content_type
-      type, *parameters = content_type_parse
-      type || 'application/octet-stream'
-    end
-
-    # returns a charset parameter in Content-Type field.
-    # It is downcased for canonicalization.
-    #
-    # If charset parameter is not given but a block is given,
-    # the block is called and its result is returned.
-    # It can be used to guess charset.
-    #
-    # If charset parameter and block is not given,
-    # nil is returned except text type in HTTP.
-    # In that case, "iso-8859-1" is returned as defined by RFC2616 3.7.1.
-    def charset
-      type, *parameters = content_type_parse
-      if pair = parameters.assoc('charset')
-        pair.last.downcase
-      elsif block_given?
-        yield
-      elsif type && %r{\Atext/} =~ type &&
-            @base_uri && @base_uri.scheme == 'http'
-        "iso-8859-1" # RFC2616 3.7.1
-      else
-        nil
-      end
-    end
-
-    # returns a list of encodings in Content-Encoding field
-    # as an Array of String.
-    # The encodings are downcased for canonicalization.
-    def content_encoding
-      v = @meta['content-encoding']
-      if v && %r{\A#{RE_LWS}?#{RE_TOKEN}#{RE_LWS}?(?:,#{RE_LWS}?#{RE_TOKEN}#{RE_LWS}?)*}o =~ v
-        v.scan(RE_TOKEN).map {|content_coding| content_coding.downcase}
-      else
-        []
-      end
-    end
-  end
-
-  # Mixin for URIs.
-  module OpenRead
-    # opens the URI.  
-    def open(*rest, &block)
-      OpenURI.open_uri(self, *rest, &block)
-    end
-
-    # reads a content of the URI.  
-    def read(options={})
-      self.open(options) {|f|
-        str = f.read
-        Meta.init str, f
-        str
-      }
-    end
-  end
-end
-
-module URI
-  class Generic
-    # returns a proxy URI.
-    # The proxy URI is obtained from environment variables such as http_proxy,
-    # ftp_proxy, no_proxy, etc.
-    # If there is no proper proxy, nil is returned.
-    def find_proxy
-      name = self.scheme + '_proxy'
-      if proxy_uri = ENV[name] || ENV[name.upcase]
-        proxy_uri = URI.parse(proxy_uri)
-        name = 'no_proxy'
-        if no_proxy = ENV[name] || ENV[name.upcase]
-          no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port|
-            if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host &&
-               (!port || self.port == port.to_i)
-              proxy_uri = nil
-              break
-            end
-          }
-        end
-        proxy_uri
-      else
-        nil
-      end
-    end
-  end
-
-  class HTTP
-    def direct_open(buf, header) # :nodoc:
-      proxy_open(buf, request_uri, header)
-    end
-
-    def proxy_open(buf, uri, header) # :nodoc:
-      require 'net/http'
-      resp = Net::HTTP.start(self.host, self.port) {|http|
-               http.get(uri.to_s, header) {|str| buf << str}
-             }
-      io = buf.io
-      io.rewind
-      io.status = [resp.code, resp.message]
-      resp.each {|name,value| buf.io.meta_add_field name, value }
-      case resp
-      when Net::HTTPSuccess
-      when Net::HTTPMovedPermanently, # 301
-           Net::HTTPFound, # 302
-           Net::HTTPSeeOther, # 303
-           Net::HTTPTemporaryRedirect # 307
-        raise OpenURI::Redirect.new(URI.parse(resp['location']))
-      else
-        raise OpenURI::HTTPError.new(io.status.join(' '), io)
-      end
-    end
-
-    include OpenURI::OpenRead
-  end
-
-  class FTP
-    def direct_open(buf, header) # :nodoc:
-      require 'net/ftp'
-      # xxx: header is discarded. 
-      # todo: extract user/passwd from .netrc.
-      user = 'anonymous'
-      passwd = nil
-      user, passwd = self.userinfo.split(/:/) if self.userinfo
-
-      ftp = Net::FTP.open(self.host)
-      ftp.login(user, passwd)
-      ftp.getbinaryfile(self.path, '/dev/null', Net::FTP::DEFAULT_BLOCKSIZE) {|str| buf << str}
-      ftp.close
-      buf.io.rewind
-    end
-
-    include OpenURI::OpenRead
-  end
-end
diff --git a/lib/open3.rb b/lib/open3.rb
index 407cd7662c..9e34acffc9 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -1,57 +1,41 @@
-# open3.rb: Spawn a program like popen, but with stderr, too. You might also
-# want to use this if you want to bypass the shell. (By passing multiple args,
-# which IO#popen does not allow)
-#
 # Usage:
 #	require "open3"
 #
-#      stdin, stdout, stderr = Open3.popen3('nroff -man')
+#	in, out, err = Open3.popen3('nroff -man')
 #  or
 #	include Open3
-#      stdin, stdout, stderr = popen3('nroff -man')
+#	in, out, err = popen3('nroff -man')
+#
 
 module Open3
   #[stdin, stdout, stderr] = popen3(command);
-  def popen3(*cmd)
+  def popen3(cmd)
     pw = IO::pipe   # pipe[0] for read, pipe[1] for write
     pr = IO::pipe
     pe = IO::pipe
 
-    pid = fork{
-      # child
-      fork{
-	# grandchild
-	pw[1].close
-	STDIN.reopen(pw[0])
-	pw[0].close
+    pid = fork
+    if pid == nil then # child
+      pw[1].close
+      STDIN.reopen(pw[0])
+      pw[0].close
 
-	pr[0].close
-	STDOUT.reopen(pr[1])
-	pr[1].close
+      pr[0].close
+      STDOUT.reopen(pr[1])
+      pr[1].close
 
-	pe[0].close
-	STDERR.reopen(pe[1])
-	pe[1].close
+      pe[0].close
+      STDERR.reopen(pe[1])
+      pe[1].close
 
-	exec(*cmd)
-      }
-      exit!
-    }
-
-    pw[0].close
-    pr[1].close
-    pe[1].close
-    Process.waitpid(pid)
-    pi = [pw[1], pr[0], pe[0]]
-    pw[1].sync = true
-    if defined? yield
-      begin
-	return yield(*pi)
-      ensure
-	pi.each{|p| p.close unless p.closed?}
-      end
+      exec(cmd)
+      exit
+    else
+      pw[0].close
+      pr[1].close
+      pe[1].close
+      pi = [ pw[1], pr[0], pe[0] ]
     end
-    pi
   end
   module_function :popen3
 end
@@ -59,12 +43,13 @@ end
 if $0 == __FILE__
   a = Open3.popen3("nroff -man")
   Thread.start do
-    while line = gets
-      a[0].print line
+    while gets
+      a[0].print $_
     end
     a[0].close
   end
-  while line = a[1].gets
-    print ":", line
+  while a[1].gets
+    print ":", $_
   end
 end
+
diff --git a/lib/optparse.rb b/lib/optparse.rb
deleted file mode 100644
index 22c03ff5ee..0000000000
--- a/lib/optparse.rb
+++ /dev/null
@@ -1,1680 +0,0 @@
-# optparse library, not octopus.
-
-=begin
-= Summary
-Library for command line option analysis.
-
-features:
-(1) It is possible <option switch of a short form and a long form> to
-    exist together. It is also possible in one to bring the switch of
-    a short form together.
-(2) It is possible to write bringing specification and the handler of
-    the switch together respectively in one place.
-(3) The argument of the switch is converted into the class which
-    automatically specifies it.
-(4) The option summary can be made.
-(5) The option can be added on the way later.
-
-=end #'#"#`#
-# Not yet (;_;)
-=begin
-
-== Class tree
-   * ((<OptionParser>)) front end
-   * ((<OptionParser::Switch>)) each switches
-   * ((<OptionParser::List>)) options list
-   * ((<OptionParser::ParseError>)) errors on parsing
-     * ((<OptionParser::AmbiguousOption>))
-     * ((<OptionParser::NeedlessArgument>))
-     * ((<OptionParser::MissingArgument>))
-     * ((<OptionParser::InvalidOption>))
-     * ((<OptionParser::InvalidArgument>))
-       * ((<OptionParser::AmbiguousArgument>))
-
-== Object relations
-   +--------------+
-   | OptionParser |<>-----+
-   +--------------+       |          	         +--------+
-                          |          	       ,-| Switch |
-        on_head -------->+---------------+    /  +--------+
-        accept/reject -->| List        	 |<|>-
-                         |             	 |<|>-  +----------+
-        on ------------->+---------------+    `-| argument |
-                         :             	 :      |  class   |
-                         +---------------+      |==========|
-        on_tail -------->|             	 |      |pattern   |
-                         +---------------+      |----------|
-   OptionParser.accept ->| DefaultList 	 |      |converter |
-                reject   |(shared between|      +----------+
-                         | all instances)|
-                         +---------------+
-
-=end #'#"#`#
-
-=begin
-= Classes & Modules
-=end #'#"#`#
-
-class OptionParser
-  RCSID = %w$Id$[1..-1].each {|s| s.freeze}.freeze
-  Version = (RCSID[1].split('.').collect {|s| s.to_i}.extend(Comparable).freeze if RCSID[1])
-  LastModified = (Time.gm(*RCSID[2, 2].join('-').scan(/\d+/).collect {|s| s.to_i}) if RCSID[2])
-  Release = RCSID[2]
-
-  NoArgument = [NO_ARGUMENT = :NONE, nil].freeze
-  RequiredArgument = [REQUIRED_ARGUMENT = :REQUIRED, true].freeze
-  OptionalArgument = [OPTIONAL_ARGUMENT = :OPTIONAL, false].freeze
-
-=begin private
-== ((:OptionParser::Completion:))
-Keyword completion module.
-=end #'#"#`#
-  module Completion
-=begin private
---- OptionParser::Completion#complete(key[, pat])
-    Searches ((|key|)), or ((|pat|)) with completion if not found.
-    :Parameters:
-      : ((|key|))
-        keyword to search.
-      : ((|pat|))
-        completion pattern.
-=end #'#"#`#
-    def complete(key, pat = nil)
-      pat ||= Regexp.new('\A' + Regexp.quote(key).gsub(/\w+(?=.)/, '\&\w*'), true)
-      canon, sw, k, v = nil
-      each do |k, *v|
-	(if Regexp === k
-	   k === key
-	 else
-	   pat === (defined?(k.id2name) ? k.id2name : k)
-	 end) or next
-	v << k if v.empty?
-	unless canon
-	  canon, sw = k, v
-	else
-	  throw :ambiguous, key unless sw == v
-	end
-      end
-      if canon
-	block_given? or return key, *sw
-	yield(key, *sw)
-      end
-    end
-
-=begin private
---- OptionParser::Completion#convert(opt, *val)
-    Extracts the first element from result of
-    ((<OptionParser::Completion#complete>)).
-=end #'#"#`#
-    def convert(opt = nil, val = nil, *)
-      val
-    end
-  end
-
-=begin private
-== ((:OptionParser::OptionMap:))
-Map from option/keyword string to object with completion.
-=== Superclass
-(({Hash}))
-=== Including modules
-((<OptionParser::Completion>))
-=end #'#"#`#
-  class OptionMap < Hash
-    include Completion
-  end
-
-
-=begin
-== ((:OptionParser::Switch:))
-Individual switch class.
-=end #'#"#`#
-  class Switch
-    attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
-
-=begin private
-=== Class methods
-=end
-=begin private
---- OptionParser::Switch.guess(arg)
-    Guesses argument style from ((|arg|)).
-    Returns corresponding ((<OptionParser::Switch>)) subclass.
-=end #'#"#`#
-    def self.guess(arg)
-      case arg
-      when ""
-        t = self
-      when /\A=?\[/
-        t = Switch::OptionalArgument
-      when /\A\s+\[/
-        t = Switch::PlacedArgument
-      else
-        t = Switch::RequiredArgument
-      end
-      self >= t or incompatible_argument_styles(arg, t)
-      t
-    end
-
-    def self.incompatible_argument_styles(arg, t)
-      raise ArgumentError, "#{arg}: incompatible argument styles\n  #{self}, #{t}"
-    end
-
-    def self.pattern
-      NilClass
-    end
-
-=begin private
---- OptionParser::Switch.new
-=end #'#"#`#
-    def initialize(pattern = nil, conv = nil,
-		   short = nil, long = nil, arg = nil,
-		   desc = ([] if short or long), block = Proc.new)
-      raise if Array === pattern
-      @pattern, @conv, @short, @long, @arg, @desc, @block =
-	pattern, conv, short, long, arg, desc, block
-    end
-
-=begin
-=== Instance methods
-=end
-=begin private
---- OptionParser::Switch#parse_arg(arg) {non-serious error handler}
-    Parses argument and returns rest of ((|arg|)), and matched portion
-    to the argument pattern.
-    :Parameters:
-      : ((|arg|))
-        option argument to be parsed.
-      : (({block}))
-        yields when the pattern doesn't match sub-string.
-=end #'#"#`#
-    def parse_arg(arg)
-      pattern or return nil, arg
-      unless m = pattern.match(arg)
-	yield(InvalidArgument, arg)
-	return arg, nil
-      end
-      if String === m
-	m = [s = m]
-      else
-	m = m.to_a
-	s = m[0]
-	return nil, m unless String === s
-      end
-      raise InvalidArgument, arg unless arg.rindex(s, 0)
-      return nil, m if s.length == arg.length
-      yield(InvalidArgument, arg) # didn't match whole arg
-      return arg[s.length..-1], m
-    end
-    private :parse_arg
-
-=begin private
---- OptionParser::Switch#conv_arg(arg, val) {semi-error handler}
-    Parses argument, convert and returns ((|arg|)), ((|block|)) and
-    result of conversion.
-    : Arguments to ((|@conv|))
-      substrings matched to ((|@pattern|)), ((|$&|)), ((|$1|)),
-      ((|$2|)) and so on.
-    :Parameters:
-      : ((|arg|))
-        argument string follows the switch.
-      : ((|val|))
-        following argument.
-      : (({block}))
-        (({yields})) at semi-error condition, instead of raises exception.
-=end #'#"#`#
-    def conv_arg(arg, val = nil)
-      if block
-        if conv
-          val = conv.call(*val)
-        else
-          val = *val
-        end
-	return arg, block, val
-      else
-	return arg, nil
-      end
-    end
-    private :conv_arg
-
-=begin private
---- OptionParser::Switch#summarize(sdone, ldone, width, max, indent)
-    Makes summary strings.
-    :Parameters:
-      : ((|sdone|))
-        already summarized short style options keyed hash.
-      : ((|ldone|))
-        already summarized long style options keyed hash.
-      : ((|width|))
-        width of left side, option part. in other word, right side,
-        description part strings start at ((|width|)) column.
-      : ((|max|))
-        maximum width of left side, options are filled within ((|max|)) columns.
-      : ((|indent|))
-        prefix string indents each summarized lines.
-      : (({block}))
-        to be passed each lines(without newline).
-=end #'#"#`#
-    def summarize(sdone = [], ldone = [], width = 1, max = width - 1, indent = "")
-      sopts, lopts, s = [], [], nil
-      @short.each {|s| sdone.fetch(s) {sopts << s}; sdone[s] = true} if @short
-      @long.each {|s| ldone.fetch(s) {lopts << s}; ldone[s] = true} if @long
-      return if sopts.empty? and lopts.empty? # completely hidden
-
-      left = [sopts.join(', ')]
-      right = desc.dup
-
-      while s = lopts.shift
-	l = left[-1].length + s.length
-	l += arg.length if left.size == 1 && arg
-	l < max or left << ''
-	left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
-      end
-
-      left[0] << arg if arg
-      mlen = left.collect {|s| s.length}.max.to_i
-      while mlen > width and l = left.shift
-	mlen = left.collect {|s| s.length}.max.to_i if l.length == mlen
-	yield(indent + l)
-      end
-
-      while (l = left.shift; r = right.shift; l or r)
-	l = l.to_s.ljust(width) + ' ' + r if r and !r.empty?
-	yield(indent + l)
-      end
-
-      self
-    end
-
-=begin private
-== Switch classes
-=end #'#"#`#
-
-=begin private
-=== ((:OptionParser::Switch::NoArgument:))
-Switch that takes no arguments.
-==== Superclass
-((<OptionParser::Switch>))
-==== Instance methods
---- OptionParser::Switch::NoArgument#parse
-    Raises an exception if any arguments given.
-=end #'#"#`#
-    class NoArgument < self
-      def parse(arg, argv, &error)
-	yield(NeedlessArgument, arg) if arg
-	conv_arg(arg)
-      end
-      def self.incompatible_argument_styles(*)
-      end
-      def self.pattern
-	Object
-      end
-    end
-
-=begin private
-=== ((:OptionParser::Switch::RequiredArgument:))
-Switch that takes an argument.
-==== Superclass
-((<OptionParser::Switch>))
-==== Instance methods
---- OptionParser::Switch::RequiredArgument#parse
-    Raises an exception if argument is not present.
-=end #'#"#`#
-    class RequiredArgument < self
-      def parse(arg, argv, &error)
-	unless arg
-	  raise MissingArgument if argv.empty?
-	  arg = argv.shift
-	end
-	conv_arg(*parse_arg(arg, &error))
-      end
-    end
-
-=begin private
-=== ((:OptionParser::Switch::OptionalArgument:))
-Switch that can omit argument.
-==== Superclass
-((<OptionParser::Switch>))
-==== Instance methods
---- OptionParser::Switch::OptionalArgument#parse
-    Parses argument if given, or uses default value.
-=end #'#"#`#
-    class OptionalArgument < self
-      def parse(arg, argv, &error)
-	if arg
-	  conv_arg(*parse_arg(arg, &error))
-	else
-	  conv_arg(arg)
-	end
-      end
-    end
-
-    class PlacedArgument < self
-      def parse(arg, argv, &error)
-	if !(val = arg) and (argv.empty? or /\A-/ =~ (val = argv[0]))
-	  return nil, block, nil
-	end
-        opt = (val = parse_arg(val, &error))[1]
-        val = conv_arg(*val)
-        if opt
-          argv.shift
-        else
-          val[0] = nil
-        end
-        val
-      end
-    end
-  end
-
-
-=begin
-== ((:OptionParser::List:))
-Simple option list providing mapping from short and/or long option
-string to ((<OptionParser::Switch>)), and mapping from acceptable
-argument to matching pattern and converter pair.  Also provides
-summary feature.
-=end #'#"#`#
-  class List
-=begin
-=== Class methods
-=end #'#"#`#
-=begin private
---- OptionParser::List.new
-    Just initializes all instance variables.
-=end #'#"#`#
-    def initialize
-      @atype = {}
-      @short = OptionMap.new
-      @long = OptionMap.new
-      @list = []
-    end
-
-=begin
-=== Instance methods
-=end #'#"#`#
-=begin
---- OptionParser::List#atype
-    Map from acceptable argument types to pattern and converter pairs.
---- OptionParser::List#short
-    Map from short style option switches to actual switch objects.
---- OptionParser::List#long
-    Map from long style option switches to actual switch objects.
---- OptionParser::List#list
-    List of all switches and summary string.
-=end #'#"#`#
-    attr_reader :atype, :short, :long, :list
-
-=begin private
---- OptionParser::List#accept(type[, pattern]) {...}
-    see ((<OptionParser.accept>)).
---- OptionParser::List#reject(type)
-    see ((<OptionParser.reject>)).
-=end #'#"#`#
-    def accept(t, pat = /.*/, &block)
-      if pat
-	pat.respond_to?(:match) or raise TypeError, "has no `match'"
-      else
-	pat = t if t.respond_to?(:match)
-      end
-      unless block
-	block = pat.method(:convert).to_proc if pat.respond_to?(:convert)
-      end
-      @atype[t] = [pat, block]
-    end
-
-    def reject(t)
-      @atype.delete(t)
-    end
-
-=begin private
---- OptionParser::List#update(sw, sopts, lopts, nlopts = nil)
-    Adds ((|sw|)) according to ((|sopts|)), ((|lopts|)) and
-    ((|nlopts|)).
-    :Parameters:
-      : ((|sw|))
-        ((<OptionParser::Switch>)) instance to be added.
-      : ((|sopts|))
-        short style options list.
-      : ((|lopts|))
-        long style options list.
-      : ((|nlopts|))
-        negated long style options list.
-=end #'#"#`#
-    def update(sw, sopts, lopts, nsw = nil, nlopts = nil)
-      o = nil
-      sopts.each {|o| @short[o] = sw} if sopts
-      lopts.each {|o| @long[o] = sw} if lopts
-      nlopts.each {|o| @long[o] = nsw} if nsw and nlopts
-      used = @short.invert.update(@long.invert)
-      @list.delete_if {|o| Switch === o and !used[o]}
-    end
-    private :update
-
-=begin
---- OptionParser::List#prepend(switch, short_opts, long_opts, nolong_opts)
-    Inserts ((|switch|)) at head of the list, and associates short,
-    long and negated long options.
---- OptionParser::List#append(switch, short_opts, long_opts, nolong_opts)
-    Appends ((|switch|)) at tail of the list, and associates short,
-    long and negated long options.
-    :Parameters:
-      : ((|switch|))
-        ((<OptionParser::Switch>)) instance to be inserted.
-      : ((|short_opts|))
-        list of short style options.
-      : ((|long_opts|))
-        list of long style options.
-      : ((|nolong_opts|))
-        list of long style options with (({"no-"})) prefix.
-=end #'#"#`#
-    def prepend(*args)
-      update(*args)
-      @list.unshift(args[0])
-    end
-
-    def append(*args)
-      update(*args)
-      @list.push(args[0])
-    end
-
-=begin
---- OptionParser::List#search(id, key) [{block}]
-    Searches ((|key|)) in ((|id|)) list.
-    :Parameters:
-      : ((|id|))
-        searching list.
-      : ((|k|))
-        searching key.
-      : (({block}))
-        yielded with the found value when succeeded.
-=end #'#"#`#
-    def search(id, key)
-      if list = __send__(id)
-	val = list.fetch(key) {return nil}
-	return val unless block_given?
-	yield(val)
-      end
-    end
-
-=begin
---- OptionParser::List#complete(id, opt, *pat, &block)
-    Searches list ((|id|)) for ((|opt|)) and ((|*pat|)).
-    :Parameters:
-      : ((|id|))
-        searching list.
-      : ((|opt|))
-        searching key.
-      : ((|*pat|))
-        optional pattern for completion.
-      : (({block}))
-        yielded with the found value when succeeded.
-=end #'#"#`#
-    def complete(id, opt, *pat, &block)
-      __send__(id).complete(opt, *pat, &block)
-    end
-
-=begin
---- OptionParser::List#summarize(*args) {...}
-    Making summary table, yields the (({block})) with each lines.
-    Each elements of (({@list})) should be able to (({summarize})).
-    :Parameters:
-      : ((|args|))
-        passed to elements#summarize through.
-      : (({block}))
-        to be passed each lines(without newline).
-=end #'#"#`#
-    def summarize(*args, &block)
-      list.each do |opt|
-	if opt.respond_to?(:summarize) # perhaps OptionParser::Switch
-	  opt.summarize(*args, &block)
-	elsif opt.empty?
-	  yield("")
-	else
-	  opt.each(&block)
-	end
-      end
-    end
-  end
-
-
-=begin private
-== ((:OptionParser::CompletingHash:))
-(({Hash})) with completion search feature.
-=== Superclass
-(({Hash}))
-=== Including modules
-((<OptionParser::Completion>))
-=end #'#"#`#
-  class CompletingHash < Hash
-    include Completion
-
-=begin private
-=== Instance methods
---- OptionParser::CompletingHash#match(key)
-    Completion for hash key.
-=end #'#"#`#
-    def match(key)
-      return key, *fetch(key) {
-	raise AmbiguousArgument, catch(:ambiguous) {return complete(key)}
-      }.to_a
-    end
-  end
-
-
-=begin
-== ((:OptionParser:))
-The front-end of (({OptionParser})).
-=end #'#"#`#
-
-=begin
-=== Constants
-=end #'#"#`#
-
-=begin
---- OptionParser::ArgumentStyle
-    Enumeration of acceptable argument styles; possible values are:
-    : OptionParser::NO_ARGUMENT
-      the switch takes no arguments. ((({:NONE}))) 
-    : OptionParser::REQUIRED_ARGUMENT
-      the switch requires an argument. ((({:REQUIRED})))
-    : OptionParser::OPTIONAL_ARGUMENT
-      the switch requires an optional argument, that is, may take or
-      not. ((({:OPTIONAL})))
-
-    Use like (({--switch=argument}))(long style) or
-    (({-Xargument}))(short style). For short style, only portion
-    matched to ((<argument pattern>)) is dealed as argument.
-=end #'#"#`#
-  ArgumentStyle = {}
-  NoArgument.each {|el| ArgumentStyle[el] = Switch::NoArgument}
-  RequiredArgument.each {|el| ArgumentStyle[el] = Switch::RequiredArgument}
-  OptionalArgument.each {|el| ArgumentStyle[el] = Switch::OptionalArgument}
-  ArgumentStyle.freeze
-
-=begin private
---- OptionParser::DefaultList
-    Switches common used such as '--', and also provides default
-    argument classes
-=end #'#"#`#
-  DefaultList = List.new
-  DefaultList.short['-'] = Switch::NoArgument.new {}
-  DefaultList.long[''] = Switch::NoArgument.new {throw :terminate}
-
-=begin undocumented
-=== Default options
-Default options, which never appear in option summary.
---- --help
-    Shows option summary.
---- --version
-    Shows version string if (({::Version})) is defined.
-=end #'#"#`#
-  DefaultList.long['help'] = Switch::NoArgument.new do
-    puts ARGV.options
-    exit
-  end
-  DefaultList.long['version'] = Switch::OptionalArgument.new do |pkg|
-    if pkg
-      begin
-        require 'optparse/version'
-      rescue LoadError
-        pkg = nil
-      else
-        show_version(*pkg.split(/,/))
-      end
-    end
-    unless pkg
-      v = ARGV.options.ver and puts v
-    end
-    exit
-  end
-
-=begin
-=== Class methods
-=end #'#"#`#
-
-=begin
---- OptionParser.with([banner[, width[, indent]]]) [{...}]
-    Initializes new instance, and evaluates the block in context of
-    the instance if called as iterator.  This behavior is equivalent
-    to older (({new})).  This is ((*deprecated*)) method.
-    
-    cf. ((<OptionParser.new>))
-    :Parameters:
-      : ((|banner|))
-        banner message.
-      : ((|width|))
-        summary width.
-      : ((|indent|))
-        summary indent.
-      : (({block}))
-        to be evaluated in the new instance context.
-=end #'#"#`#
-  def self.with(*args, &block)
-    opts = new(*args)
-    opts.instance_eval(&block)
-    opts
-  end
-
-=begin
---- OptionParser.inc(arg[, default])
---- OptionParser#inc(arg[, default])
-    Returns incremented value of ((|default|)) according to ((|arg|)).
-=end
-  def self.inc(arg, default = nil)
-    case arg
-    when Integer
-      arg.nonzero?
-    when nil
-      default.to_i + 1
-    end
-  end
-  def inc(*args)
-    self.class.inc(*args)
-  end
-
-=begin
---- OptionParser.new([banner[, width[, indent]]]) [{...}]
-    Initializes the instance, and yields itself if called as iterator.
-    :Parameters:
-      : ((|banner|))
-        banner message.
-      : ((|width|))
-        summary width.
-      : ((|indent|))
-        summary indent.
-      : (({block}))
-        to be evaluated in the new instance context.
-=end #'#"#`#
-  def initialize(banner = nil, width = 32, indent = ' ' * 4)
-    @stack = [DefaultList, List.new, List.new]
-    @program_name = nil
-    @banner = banner
-    @summary_width = width
-    @summary_indent = indent
-    yield self if block_given?
-  end
-
-=begin
---- OptionParser.terminate([arg])
-    Terminates option parsing. Optional parameter ((|arg|)) would be
-    pushed back if given.
-    :Parameters:
-      : ((|arg|))
-        string pushed back to be first non-option argument
-=end #'#"#`#
-  def terminate(arg = nil)
-    self.class.terminate(arg)
-  end
-  def self.terminate(arg = nil)
-    throw :terminate, arg
-  end
-
-  @stack = [DefaultList]
-  def self.top() DefaultList end
-
-=begin
---- OptionParser.accept(t, [pat]) {...}
---- OptionParser#accept(t, [pat]) {...}
-    Directs to accept specified class argument.
-    :Parameters:
-      : ((|t|))
-        argument class specifier, any object including Class.
-      : ((|pat|))
-        pattern for argument, defaulted to ((|t|)) if it respond to (({match})).
-      : (({block}))
-        receives argument string and should be convert to desired class.
-=end #'#"#`#
-  def accept(*args, &blk) top.accept(*args, &blk) end
-  def self.accept(*args, &blk) top.accept(*args, &blk) end
-
-=begin
---- OptionParser.reject(t)
---- OptionParser#reject(t)
-    Directs to reject specified class argument.
-    :Parameters:
-      : ((|t|))
-        argument class specifier, any object including Class.
-=end #'#"#`#
-  def reject(*args, &blk) top.reject(*args, &blk) end
-  def self.reject(*args, &blk) top.reject(*args, &blk) end
-
-
-=begin
-=== Instance methods
-=end #'#"#`#
-
-=begin
---- OptionParser#banner
---- OptionParser#banner=(heading)
-    Heading banner preceding summary.
---- OptionParser#summary_width
---- OptionParser#summary_width=(width)
-    Width for option list portion of summary. Must be (({Numeric})).
---- OptionParser#summary_indent
---- OptionParser#summary_indent=(indent)
-    Indentation for summary. Must be (({String})) (or have (({+ String}))).
---- OptionParser#program_name
---- OptionParser#program_name=(name)
-    Program name to be emitted in error message and default banner,
-    defaulted to (({$0})).
-=end #'#"#`#
-  attr_writer :banner, :program_name
-  attr_accessor :summary_width, :summary_indent
-
-  def banner
-    @banner ||= "Usage: #{program_name} [options]"
-  end
-
-  def program_name
-    @program_name || File.basename($0, '.*')
-  end
-
-# for experimental cascading :-)
-  alias set_banner banner=
-  alias set_program_name program_name=
-  alias set_summary_width summary_width=
-  alias set_summary_indent summary_indent=
-
-=begin
---- OptionParser#version
---- OptionParser#version=(ver)
-    Version.
---- OptionParser#release
---- OptionParser#release=(rel)
-    Release code.
---- OptionParser#ver
-    Returns version string from ((<program_name>)), (({version})) and
-    (({release})).
-=end #'#"#`#
-  attr_writer :version, :release
-
-  def version
-    @version || (defined?(::Version) && ::Version) || (defined?(::VERSION) && ::VERSION)
-  end
-
-  def release
-    @release || (defined?(::Release) && ::Release) || (defined?(::RELEASE) && ::RELEASE)
-  end
-
-  def ver
-    if v = version
-      str = "#{program_name} #{[v].join('.')}"
-      str << " (#{v})" if v = release
-      str
-    end
-  end
-
-  def warn(mesg = $!)
-    super(program_name + ': ' + mesg)
-  end
-
-  def abort(mesg = $!)
-    super(program_name + ': ' + mesg)
-  end
-
-=begin
---- OptionParser#top
-    Subject of ((<on>))/((<on_head>)), ((<accept>))/((<reject>)).
-=end #'#"#`#
-  def top
-    @stack[-1]
-  end
-
-=begin
---- OptionParser#base
-    Subject of ((<on_tail>)).
-=end #'#"#`#
-  def base
-    @stack[1]
-  end
-
-=begin
---- OptionParser#new
-    Pushes a new (({List})).
-=end #'#"#`#
-  def new
-    @stack.push(List.new)
-    if block_given?
-      yield self
-    else
-      self
-    end
-  end
-
-=begin
---- OptionParser#remove
-    Removes the last (({List})).
-=end #'#"#`#
-  def remove
-    @stack.pop
-  end
-
-
-=begin
---- OptionParser#summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent)
-    Puts option summary into ((|to|)), and returns ((|to|)).
-    :Parameters:
-      : ((|to|))
-        output destination, which must have method ((|<<|)). Defaulted to (({[]})).
-      : ((|width|))
-        width of left side. Defaulted to ((|@summary_width|))
-      : ((|max|))
-        maximum length allowed for left side. Defaulted to (({((|width|)) - 1}))
-      : ((|indent|))
-        indentation. Defaulted to ((|@summary_indent|))
-      : (({block}))
-        yields with each line if called as iterator.
-=end #'#"#`#
-  def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
-    visit(:summarize, {}, {}, width, max, indent, &(blk || proc {|l| to << l + $/}))
-    to
-  end
-
-=begin
---- OptionParser#help
---- OptionParser#to_s
-    Returns option summary string.
-=end #'#"#`#
-  def help; summarize(banner.to_s.sub(/\n?\z/, "\n")) end
-  alias to_s help
-
-=begin
---- OptionParser#to_a
-    Returns option summary list.
-=end #'#"#`#
-  def to_a; summarize(banner.to_a.dup) end
-
-
-=begin
---- OptionParser#switch
-    Creates ((<OptionParser::Switch>)).
-    :Parameters:
-      : ((|*opts|))
-        option definition:
-        : argument style
-          see ((<OptionParser::ArgumentStyle>))
-        : argument pattern
-          acceptable option argument format, must pre-defined with
-          ((<OptionParser.accept>)) or ((<OptionParser#accept>)), or
-          (({Regexp})). This can appear once or assigned as (({String}))
-          if not present, otherwise causes exception (({ArgumentError})).
-          
-          cf. ((<Acceptable argument classes>)).
-        : Hash
-        : Array
-          possible argument values.
-        : Proc
-        : Method
-          alternative way to give the ((*handler*)).
-        : "--switch=MANDATORY", "--switch[=OPTIONAL]", "--switch"
-          specifies long style switch that takes ((*mandatory*)),
-          ((*optional*)) and ((*no*)) argument, respectively.
-        : "-xMANDATORY", "-x[OPTIONAL]", "-x"
-          specifies short style switch that takes ((*mandatory*)),
-          ((*optional*)) and ((*no*)) argument, respectively.
-        : "-[a-z]MANDATORY", "-[a-z][OPTIONAL]", "-[a-z]"
-          special form short style switch that matches character
-          range(not fullset of regular expression).
-        : "=MANDATORY", "=[OPTIONAL]"
-          argument style and description.
-        : "description", ...
-          ((*description*)) for this option.
-      : (({block}))
-        ((*handler*)) to convert option argument to arbitrary (({Class})).
-=end #'#"#`#
-=begin private
---- OptionParser#notwice(obj, prv, msg)
-    Checks never given twice an argument.
-    ((*Called from OptionParser#switch only*))
-    :Parameters:
-      : ((|obj|))
-        new argument.
-      : ((|prv|))
-        previously specified argument.
-      : ((|msg|))
-        exception message
-=end #'#"#`#
-  def notwice(obj, prv, msg)
-    unless !prv or prv == obj
-      begin
-	raise ArgumentError, "argument #{msg} given twice: #{obj}"
-      rescue
-	$@[0, 2] = nil
-	raise
-      end
-    end
-    obj
-  end
-  private :notwice
-
-  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
-    default_pattern = nil
-    klass = nil
-    o = nil
-    n, q, a = nil
-
-    opts.each do |o|
-      # argument class
-      next if search(:atype, o) do |pat, c|
-	klass = notwice(o, klass, 'type')
-	if not_style and not_style != Switch::NoArgument
-	  not_pattern, not_conv = pat, c
-	else
-	  default_pattern, conv = pat, c
-	end
-      end
-
-      # directly specified pattern(any object possible to match)
-      if !(String === o) and o.respond_to?(:match)
-	pattern = notwice(o, pattern, 'pattern')
-	conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
-	next
-      end
-
-      # anything others
-      case o
-      when Proc, Method
-	block = notwice(o, block, 'block')
-      when Array, Hash
-	case pattern
-	when CompletingHash
-	when nil
-	  pattern = CompletingHash.new
-	  conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
-	else
-	  raise ArgumentError, "argument pattern given twice"
-	end
-	if Array === o
-	  o.each {|o| pattern[(Array === o ? o[0] : o)] = o}
-	else
-	  pattern.update(o)
-	end
-      when Module
-	raise ArgumentError, "unsupported argument type: #{o}"
-      when *ArgumentStyle.keys
-	style = notwice(ArgumentStyle[o], style, 'style')
-      when /^--no-([^\[\]=\s]*)(.+)?/
-	q, a = $1, $2
-	o = notwice(a ? Object : TrueClass, klass, 'type')
-	not_pattern, not_conv = search(:atype, o) unless not_style
-	not_style = (not_style || default_style).guess(arg = a) if a
-	default_style = Switch::NoArgument
-	default_pattern, conv = search(:atype, FalseClass) unless default_pattern
-	ldesc << "--no-#{q}"
-	long << 'no-' + (q = q.downcase)
-	nolong << q
-      when /^--\[no-\]([^\[\]=\s]*)(.+)?/
-	q, a = $1, $2
-	o = notwice(a ? Object : TrueClass, klass, 'type')
-	if a
-	  default_style = default_style.guess(arg = a)
-	  default_pattern, conv = search(:atype, o) unless default_pattern
-	end
-	ldesc << "--#{q}"
-	long << (o = q.downcase)
-	not_pattern, not_conv = search(:atype, FalseClass) unless not_style
-	not_style = Switch::NoArgument
-	nolong << 'no-' + o
-      when /^--([^\[\]=\s]*)(.+)?/
-	q, a = $1, $2
-	if a
-	  o = notwice(NilClass, klass, 'type')
-	  default_style = default_style.guess(arg = a)
-	  default_pattern, conv = search(:atype, o) unless default_pattern
-	end
-	ldesc << "--#{q}"
-	long << (o = q.downcase)
-      when /^-(\[\^?\]?(?:[^\\\]]|\\.)*\])(.+)?/
-	q, a = $1, $2
-	o = notwice(Object, klass, 'type')
-	if a
-	  default_style = default_style.guess(arg = a)
-	  default_pattern, conv = search(:atype, o) unless default_pattern
-	end
-	sdesc << "-#{q}"
-	short << Regexp.new(q)
-      when /^-(.)(.+)?/
-	q, a = $1, $2
-	if a
-	  o = notwice(NilClass, klass, 'type')
-	  default_style = default_style.guess(arg = a)
-	  default_pattern, conv = search(:atype, o) unless default_pattern
-	end
-	sdesc << "-#{q}"
-	short << q
-      when /^=/
-	style = notwice(default_style.guess(arg = o), style, 'style')
-	default_pattern, conv = search(:atype, Object) unless default_pattern
-      else
-	desc.push(o)
-      end
-    end
-
-    default_pattern, conv = search(:atype, default_style.pattern) unless default_pattern
-    s = if short.empty? and long.empty?
-	  raise ArgumentError, "no switch given" if style or pattern or block
-	  desc
-	else
-	  (style || default_style).new(pattern || default_pattern,
-				       conv, sdesc, ldesc, arg, desc, block)
-	end
-    return s, short, long,
-      (not_style.new(not_pattern, not_conv, sdesc, ldesc, nil, desc, block) if not_style),
-      nolong
-  end
-
-=begin
---- OptionParser#on(*opts) [{...}]
---- OptionParser#def_option(*opts) [{...}]
---- OptionParser#on_head(*opts) [{...}]
---- OptionParser#def_head_option(*opts) [{...}]
---- OptionParser#on_tail(*opts) [{...}]
---- OptionParser#def_tail_option(*opts) [{...}]
-    Defines option switch and handler. (({on_head})), (({def_head_option}))
-    and (({on_tail})), (({def_tail_option})) put the switch at head
-    and tail of summary, respectively.
-
-    cf. ((<OptionParser#switch>)).
-=end #'#"#`#
-  def define(*opts, &block)
-    top.append(*(sw = make_switch(*opts, &block)))
-    sw[0]
-  end
-  def on(*opts, &block)
-    define(*opts, &block)
-    self
-  end
-  alias def_option define
-
-  def define_head(*opts, &block)
-    top.prepend(*(sw = make_switch(*opts, &block)))
-    sw[0]
-  end
-  def on_head(*opts, &block)
-    define_head(*opts, &block)
-    self
-  end
-  alias def_head_option define_head
-
-  def define_tail(*opts, &block)
-    base.append(*(sw = make_switch(*opts, &block)))
-    sw[0]
-  end
-  def on_tail(*opts, &block)
-    define_tail(*opts, &block)
-    self
-  end
-  alias def_tail_option define_tail
-
-  def separator(string)
-    top.append(string, nil, nil)
-  end
-
-
-=begin
---- OptionParser#order(*argv) [{...}]
---- OptionParser#order!([argv = ARGV]) [{...}]
-    Parses ((|argv|)) in order. When non-option argument encountered,
-    yields it if called as iterator, otherwise terminates the parse
-    process.
-    Returns rest of ((|argv|)) left unparsed.
-    
-    (({order!})) takes argument array itself, and removes switches
-    destructively.
-    Defaults to parse ((|ARGV|)).
-    :Parameters:
-      : ((|argv|))
-        command line arguments to be parsed.
-      : (({block}))
-        called with each non-option argument.
-=end #'#"#`#
-  def order(*argv, &block)
-    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    order!(argv, &block)
-  end
-
-  def order!(argv = ARGV, &nonopt)
-    opt, arg, sw, val, rest = nil
-    nonopt ||= proc {|arg| throw :terminate, arg}
-    argv.unshift(arg) if arg = catch(:terminate) {
-      while arg = argv.shift
-	case arg
-	# long option
-	when /\A--([^=]*)(?:=(.*))?/
-	  opt, rest = $1, $2
-	  begin
-	    sw, = complete(:long, opt)
-	  rescue ParseError
-	    raise $!.set_option(arg, true)
-	  end
-	  begin
-	    opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-	    sw.call(val) if sw
-	  rescue ParseError
-	    raise $!.set_option(arg, rest)
-	  end
-
-	# short option
-	when /\A-(.)((=).*|.+)?/
-	  opt, has_arg, eq, val, rest = $1, $3, $3, $2, $2
-	  begin
-	    unless sw = search(:short, opt)
-	      begin
-		sw, = complete(:short, opt)
-		# short option matched.
-		val = arg.sub(/\A-/, '')
-		has_arg = true
-	      rescue InvalidOption
-		# if no short options match, try completion with long
-		# options.
-		sw, = complete(:long, opt)
-		eq ||= !rest
-	      end
-	    end
-	  rescue ParseError
-	    raise $!.set_option(arg, true)
-	  end
-	  begin
-	    opt, sw, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
-	    raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
-	    argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-'
-	    sw.call(val) if sw
-	  rescue ParseError
-	    raise $!.set_option(arg, has_arg)
-	  end
-
-	# non-option argument
-	else
-	  nonopt.call(arg)
-	end
-      end
-
-      nil
-    }
-
-    argv
-  end
-
-=begin
---- OptionParser#permute(*argv)
---- OptionParser#permute!([argv = ARGV])
-    Parses ((|argv|)) in permutation mode, and returns list of
-    non-option arguments.
-    
-    (({permute!})) takes argument array itself, and removes switches
-    destructively.
-    Defaults to parse ((|ARGV|)).
-    :Parameters:
-      : ((|argv|))
-        command line arguments to be parsed.
-=end #'#"#`#
-  def permute(*argv)
-    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    permute!(argv)
-  end
-
-  def permute!(argv = ARGV)
-    nonopts = []
-    arg = nil
-    order!(argv) {|arg| nonopts << arg}
-    argv[0, 0] = nonopts
-    argv
-  end
-
-=begin
---- OptionParser#parse(*argv)
---- OptionParser#parse!([argv = ARGV])
-    Parses ((|argv|)) in order when environment variable (({POSIXLY_CORRECT}))
-    is set, otherwise permutation mode
-    
-    (({parse!})) takes argument array itself, and removes switches
-    destructively.
-    Defaults to parse ((|ARGV|)).
-    :Parameters:
-      : ((|argv|))
-        command line arguments to be parsed.
-=end #'#"#`#
-  def parse(*argv)
-    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    parse!(argv)
-  end
-
-  def parse!(argv = ARGV)
-    if ENV.include?('POSIXLY_CORRECT')
-      order!(argv)
-    else
-      permute!(argv)
-    end
-  end
-
-
-=begin private
---- OptionParser#visit(id, *args) {block}
-    Traverses (({stack}))s calling method ((|id|)) with ((|*args|)).
-    :Parameters:
-      : ((|id|))
-        called method in each elements of (({stack}))s.
-      : ((|*args|))
-        passed to ((|id|)).
-      : (({block}))
-        passed to ((|id|)).
-=end #'#"#`#
-  def visit(id, *args, &block)
-    el = nil
-    @stack.reverse_each do |el|
-      el.send(id, *args, &block)
-    end
-    nil
-  end
-  private :visit
-
-=begin private
---- OptionParser#search(id, k)
-    Searches ((|k|)) in stack for ((|id|)) hash, and returns it or yielded
-    value if called as iterator.
-    :Parameters:
-      : ((|id|))
-        searching table.
-      : ((|k|))
-        searching key.
-      : (({block}))
-        yielded with the found value when succeeded.
-=end #'#"#`#
-  def search(id, k)
-    visit(:search, id, k) do |k|
-      return k unless block_given?
-      return yield(k)
-    end
-  end
-  private :search
-
-=begin private
---- OptionParser#complete(typ, opt, *etc)
-    Completes shortened long style option switch, and returns pair of
-    canonical switch and switch descriptor((<OptionParser::Switch>)).
-    :Parameters:
-      : ((|id|))
-        searching table.
-      : ((|opt|))
-        searching key.
-      : ((|*pat|))
-        optional pattern for completion.
-      : (({block}))
-        yielded with the found value when succeeded.
-=end #'#"#`#
-  def complete(typ, opt, *pat)
-    if pat.empty?
-      search(typ, opt) {|sw| return [sw, opt]} # exact match or...
-    end
-    raise AmbiguousOption, catch(:ambiguous) {
-      visit(:complete, typ, opt, *pat) {|opt, *sw| return sw}
-      raise InvalidOption, opt
-    }
-  end
-  private :complete
-
-=begin undocumented
---- OptionParser#load([filename])
-    Loads options from file named as ((|filename|)). Does nothing when
-    the file is not present. Returns whether successfuly loaded.
-    :Parameters:
-      : ((|filename|))
-        option file name.  defaulted to basename of the program without
-        suffix in a directory ((%~/.options%)).
-=end #'#"#`#
-  def load(filename = nil)
-    begin
-      filename ||= File.expand_path(File.basename($0, '.*'), '~/.options')
-    rescue
-      return false
-    end
-    begin
-      parse(*IO.readlines(filename).each {|s| s.chomp!})
-      true
-    rescue Errno::ENOENT, Errno::ENOTDIR
-      false
-    end
-  end
-
-=begin undocumented
---- OptionParser#environment([env])
-    Parses environment variable ((|env|)) or its uppercase with spliting
-    like as shell.
-    :Parameters:
-      : ((|env|))
-        defaulted to basename of the program.
-=end #'#"#`#
-  def environment(env = File.basename($0, '.*'))
-    env = ENV[env] || ENV[env.upcase] or return
-    parse(*Shellwords.shellwords(env))
-  end
-
-
-=begin
-= Acceptable argument classes
-=end #'#"#`#
-
-=begin
-: Object
-  any string, and no conversion. this is fall-back.
-=end #'#"#`#
-  accept(Object) {|s,|s or s.nil?}
-
-  accept(NilClass) {|s,|s}
-
-=begin
-: String
-  any none-empty string, and no conversion.
-=end #'#"#`#
-  accept(String, /.+/) {|s,*|s}
-
-=begin
-: Integer
-  Ruby/C-like integer, octal for (({0-7})) sequence, binary for
-  (({0b})), hexadecimal for (({0x})), and decimal for others; with
-  optional sign prefix. Converts to (({Integer})).
-=end #'#"#`#
-  decimal = '\d+(?:_\d+)*'
-  binary = 'b[01]+(?:_[01]+)*'
-  hex = 'x[\da-f]+(?:_[\da-f]+)*'
-  octal = "0(?:[0-7]*(?:_[0-7]+)*|#{binary}|#{hex})"
-  integer = "#{octal}|#{decimal}"
-  accept(Integer, %r"\A[-+]?(?:#{integer})"io) {|s,| Integer(s) if s}
-
-=begin
-: Float
-  Float number format, and converts to (({Float})).
-=end #'#"#`#
-  float = "(?:#{decimal}(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?"
-  floatpat = %r"\A[-+]?#{float}"io
-  accept(Float, floatpat) {|s,| s.to_f if s}
-
-=begin
-: Numeric
-  Generic numeric format, and converts to (({Integer})) for integer
-  format, (({Float})) for float format.
-=end #'#"#`#
-  accept(Numeric, %r"\A[-+]?(?:#{octal}|#{float})"io) {|s,| eval(s) if s}
-
-=begin
-: OptionParser::DecimalInteger
-  Decimal integer format, to be converted to (({Integer})).
-=end #'#"#`#
-  DecimalInteger = /\A[-+]?#{decimal}/io
-  accept(DecimalInteger) {|s,| s.to_i if s}
-
-=begin
-: OptionParser::OctalInteger
-  Ruby/C like octal/hexadecimal/binary integer format, to be converted
-  to (({Integer})).
-=end #'#"#`#
-  OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))/io
-  accept(OctalInteger) {|s,| s.oct if s}
-
-=begin
-: OptionParser::DecimalNumeric
-  Decimal integer/float number format, to be converted to
-  (({Integer})) for integer format, (({Float})) for float format.
-=end #'#"#`#
-  DecimalNumeric = floatpat	# decimal integer is allowed as float also.
-  accept(DecimalNumeric) {|s,| eval(s) if s}
-
-=begin
-: TrueClass
-  Boolean switch, which means whether it is present or not, whether it
-  is absent or not with prefix (({no-})), or it takes an argument
-  (({yes/no/true/false/+/-})).
-: FalseClass
-  Similar to ((<TrueClass>)), but defaulted to (({false})).
-=end #'#"#`#
-  yesno = CompletingHash.new
-  %w[- no false].each {|el| yesno[el] = false}
-  %w[+ yes true].each {|el| yesno[el] = true}
-  yesno['nil'] = false		# shoud be nil?
-  accept(TrueClass, yesno) {|arg, val| val == nil or val}
-  accept(FalseClass, yesno) {|arg, val| val != nil and val}
-
-=begin
-: Array
-  List of strings separated by ","
-=end #'#"#`#
-  accept(Array) do |s,|
-    if s
-      s = s.split(',').collect {|s| s unless s.empty?}
-    end
-    s
-  end
-
-
-=begin
-= Exceptions
-=end #'#"#`#
-
-=begin
-== ((:OptionParser::ParseError:))
-Base class of exceptions from ((<OptionParser>))
-=== Superclass
-(({RuntimeError}))
-=== Constants
-: OptionParser::ParseError::Reason
-  Reason caused error.
-=== Instance methods
---- OptionParser::ParseError#recover(argv)
-    Push backs erred argument(s) to ((|argv|)).
---- OptionParser::ParseError#reason
-    Returns error reason. Override this to I18N.
---- OptionParser::ParseError#inspect
-    Returns inspection string.
---- OptionParser::ParseError#message
---- OptionParser::ParseError#to_s
---- OptionParser::ParseError#to_str
-    Default stringizing method to emit standard error message.
-=end #'#"#`#
-  class ParseError < RuntimeError
-    Reason = 'parse error'.freeze
-
-    def initialize(*args)
-      @args = args
-      @reason = nil
-    end
-
-    attr_reader :args
-    attr_writer :reason
-
-    def recover(argv)
-      argv[0, 0] = @args
-      argv
-    end
-
-    def set_option(opt, eq)
-      if eq
-	@args[0] = opt
-      else
-	@args.unshift(opt)
-      end
-      self
-    end
-
-    def reason
-      @reason || self.class::Reason
-    end
-
-    def inspect
-      "#<#{self.class.to_s}: #{args.join(' ')}>"
-    end
-
-    def message
-      reason + ': ' + args.join(' ')
-    end
-
-    alias to_s message
-    alias to_str message
-  end
-
-=begin
-== ((:OptionParser::AmbiguousOption:))
-Raises when encountered ambiguously completable string.
-=== Superclass
-((<OptionParser::ParseError>))
-=end #'#"#`#
-  class AmbiguousOption < ParseError
-    const_set(:Reason, 'ambiguous option'.freeze)
-  end
-
-=begin
-== ((:OptionParser::NeedlessArgument:))
-Raises when encountered argument for switch defined as which takes no
-argument.
-=== Superclass
-((<OptionParser::ParseError>))
-=end #'#"#`#
-  class NeedlessArgument < ParseError
-    const_set(:Reason, 'needles argument'.freeze)
-  end
-
-=begin
-== ((:OptionParser::MissingArgument:))
-Raises when no argument found for switch defined as which needs
-argument.
-=== Superclass
-((<OptionParser::ParseError>))
-=end #'#"#`#
-  class MissingArgument < ParseError
-    const_set(:Reason, 'missing argument'.freeze)
-  end
-
-=begin
-== ((:OptionParser::InvalidOption:))
-Raises when undefined switch.
-=== Superclass
-((<OptionParser::ParseError>))
-=end #'#"#`#
-  class InvalidOption < ParseError
-    const_set(:Reason, 'invalid option'.freeze)
-  end
-
-=begin
-== ((:OptionParser::InvalidArgument:))
-Raises when the given argument does not match required format.
-=== Superclass
-((<OptionParser::ParseError>))
-=end #'#"#`#
-  class InvalidArgument < ParseError
-    const_set(:Reason, 'invalid argument'.freeze)
-  end
-
-=begin
-== ((:OptionParser::AmbiguousArgument:))
-Raises when the given argument word can't completed uniquely.
-=== Superclass
-((<OptionParser::InvalidArgument>))
-=end #'#"#`#
-  class AmbiguousArgument < InvalidArgument
-    const_set(:Reason, 'ambiguous argument'.freeze)
-  end
-
-
-=begin
-= Miscellaneous
-=end #'#"#`#
-=begin
-== ((:OptionParser::Arguable:))
-Extends command line arguments array to parse itself.
-=end #'#"#`#
-  module Arguable
-=begin
---- OptionParser::Arguable#options=(opt)
-    Sets ((<OptionParser>)) object, when ((|opt|)) is (({false})) or
-    (({nil})), methods ((<OptionParser::Arguable#options>)) and
-    ((<OptionParser::Arguable#options=>)) are undefined.  Thus, there
-    is no ways to access the ((<OptionParser>)) object via the
-    receiver object.
-=end #'#"#`#
-    def options=(opt)
-      unless @optparse = opt
-	class << self
-	  undef_method(:options)
-	  undef_method(:options=)
-	end
-      end
-    end
-
-=begin
---- OptionParser::Arguable#options
-    Actual ((<OptionParser>)) object, automatically created if not
-    yet.
-
-    If called as iterator, yields with the ((<OptionParser>)) object
-    and returns the result of the block. In this case, rescues any
-    ((<OptionParser::ParseError>)) exceptions in the block, just emits
-    error message to ((<STDERR>)) and returns (({nil})).
-
-    :Parameters:
-      : (({block}))
-        Yielded with the ((<OptionParser>)) instance.
-
-=end #'#"#`#
-    def options
-      @optparse ||= OptionParser.new
-      block_given? or return @optparse
-      begin
-	yield @optparse
-      rescue ParseError
-	@optparse.warn $!
-	nil
-      end
-    end
-
-=begin
---- OptionParser::Arguable#order!
---- OptionParser::Arguable#permute!
---- OptionParser::Arguable#parse!
-    Parses ((|self|)) destructively, and returns ((|self|)) just contains
-    rest arguments left without parsed.
-=end #'#"#`#
-    def order!(&blk) options.order!(self, &blk) end
-    def permute!() options.permute!(self) end
-    def parse!() options.parse!(self) end
-
-=begin private
-Initializes instance variable.
-=end #'#"#`#
-    def self.extend_object(obj)
-      super
-      obj.instance_eval {@optparse = nil}
-    end
-    def initialize(*args)
-      super
-      @optparse = nil
-    end
-  end
-
-=begin
-== OptionParser::Acceptables
-Acceptable argument classes.  Now contains (({DecimalInteger})),
-(({OctalInteger})) and (({DecimalNumeric})).
-see ((<Acceptable argument classes>)).
-=end #'#"#`#
-  module Acceptables
-    const_set(:DecimalInteger, OptionParser::DecimalInteger)
-    const_set(:OctalInteger, OptionParser::OctalInteger)
-    const_set(:DecimalNumeric, OptionParser::DecimalNumeric)
-  end
-end
-
-# ARGV is arguable by OptionParser
-ARGV.extend(OptionParser::Arguable)
-
-
-if $0 == __FILE__
-  Version = OptionParser::Version
-  ARGV.options {|q|
-    q.parse!.empty? or puts "what's #{ARGV.join(' ')}?"
-  } or exit 1
-end
-__END__
-=begin example
-= Example
-<<< opttest.rb
-=end #'#"#`#
diff --git a/lib/optparse/date.rb b/lib/optparse/date.rb
deleted file mode 100644
index d680559f37..0000000000
--- a/lib/optparse/date.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'optparse'
-require 'date'
-
-OptionParser.accept(DateTime) do |s,|
-  begin
-    DateTime.parse(s) if s
-  rescue ArgumentError
-    raise OptionParser::InvalidArgument, s
-  end
-end
-OptionParser.accept(Date) do |s,|
-  begin
-    Date.parse(s) if s
-  rescue ArgumentError
-    raise OptionParser::InvalidArgument, s
-  end
-end
diff --git a/lib/optparse/shellwords.rb b/lib/optparse/shellwords.rb
deleted file mode 100644
index 0422d7c887..0000000000
--- a/lib/optparse/shellwords.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- ruby -*-
-
-require 'shellwords'
-require 'optparse'
-
-OptionParser.accept(Shellwords) {|s,| Shellwords.shellwords(s)}
diff --git a/lib/optparse/time.rb b/lib/optparse/time.rb
deleted file mode 100644
index 402cadcf16..0000000000
--- a/lib/optparse/time.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'optparse'
-require 'time'
-
-OptionParser.accept(Time) do |s,|
-  begin
-    (Time.httpdate(s) rescue Time.parse(s)) if s
-  rescue
-    raise OptionParser::InvalidArgument, s
-  end
-end
diff --git a/lib/optparse/uri.rb b/lib/optparse/uri.rb
deleted file mode 100644
index 024dc69eac..0000000000
--- a/lib/optparse/uri.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- ruby -*-
-
-require 'optparse'
-require 'uri'
-
-OptionParser.accept(URI) {|s,| URI.parse(s) if s}
diff --git a/lib/optparse/version.rb b/lib/optparse/version.rb
deleted file mode 100644
index 8e99836878..0000000000
--- a/lib/optparse/version.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# OptionParser internal utility
-
-class << OptionParser
-  def show_version(*pkg)
-    progname = ARGV.options.program_name
-    show = proc do |klass, version|
-      version = version.join(".") if Array === version
-      str = "#{progname}"
-      str << ": #{klass}" unless klass == Object
-      str << " version #{version}"
-      case
-      when klass.const_defined?(:Release)
-        str << " (#{klass.const_get(:Release)})"
-      when klass.const_defined?(:RELEASE)
-        str << " (#{klass.const_get(:Release)})"
-      end
-      puts str
-    end
-    if pkg.size == 1 and pkg[0] == "all"
-      self.search_const(::Object, /\AV(?:ERSION|ersion)\z/) do |klass, cname, version|
-        unless cname[1] == ?e and klass.const_defined?(:Version)
-          show.call(klass, version)
-        end
-      end
-    else
-      pkg.each do |pkg|
-        /\A[A-Z]\w*((::|\/)[A-Z]\w*)*\z/ni =~ pkg or next
-        begin
-          pkg = eval(pkg)
-          v = case
-              when pkg.const_defined?(:Version)
-                pkg.const_get(:Version)
-              when pkg.const_defined?(:VERSION)
-                pkg.const_get(:VERSION)
-              else
-                "unknown"
-              end
-          show.call(pkg, v)
-        rescue NameError
-          puts "#{progname}: #$!"
-        end
-      end
-    end
-    exit
-  end
-
-  def each_const(path, klass = ::Object)
-    path.split(/::|\//).inject(klass) do |klass, name|
-      raise NameError, path unless Module === klass
-      klass.constants.grep(/#{name}/i) do |c|
-        klass.const_defined?(c) or next
-        c = klass.const_get(c)
-      end
-    end
-  end
-
-  def search_const(klass, name)
-    klasses = [klass]
-    while klass = klasses.shift
-      klass.constants.each do |cname|
-        klass.const_defined?(cname) or next
-        const = klass.const_get(cname)
-        yield klass, cname, const if name === cname
-        klasses << const if Module === const and const != ::Object
-      end
-    end
-  end
-end
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index eea7132ca0..f083677d8e 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -13,7 +13,7 @@ class OpenStruct
     @table = {}
     if hash
       for k,v in hash
-	@table[k.to_sym] = v
+	@table[k] = v
       end
     end
   end
@@ -25,35 +25,31 @@ class OpenStruct
       if len != 1
 	raise ArgumentError, "wrong # of arguments (#{len} for 1)", caller(1)
       end
-      if self.frozen?
-	raise TypeError, "can't modify frozen #{self.class}", caller(1)
-      end
       mname.chop!
-      @table[mname.intern] = args[0]
-    elsif len == 0
-      @table[mid]
+      @table[mname] = args[0]
+    elsif args.length == 0
+      @table[mname]
     else
-      raise NoMethodError, "undefined method `#{mname}' for #{self}", caller(1)
+      raise NameError, "undefined method `#{mname}'", caller(1)
     end
   end
-
+  
   def delete_field(name)
-    @table.delete name.to_sym
+    if name.type == Fixnum
+      name = name.id2name
+    end
+    @table.delete name
   end
 
   def inspect
-    str = "<#{self.class}"
+    str = "<#{self.type}"
     for k,v in @table
-      str << " #{k}=#{v.inspect}"
+      str += " "
+      str += k
+      str += "="
+      str += v.inspect
     end
-    str << ">"
-  end
-
-  attr_reader :table
-  protected :table
-
-  def ==(other)
-    return false unless(other.kind_of?(OpenStruct))
-    return @table == other.table
+    str += ">"
+    str
   end
 end
diff --git a/lib/parsearg.rb b/lib/parsearg.rb
index d5f3c9638d..b9f41d5e5f 100644
--- a/lib/parsearg.rb
+++ b/lib/parsearg.rb
@@ -73,7 +73,7 @@ def parseArgs(argc, nopt, single_opts, *opts)
       end
     rescue
       print "Format Error!! : \"" + nopt + "\"\t[parseArgs]\n"
-      exit!(-1)
+      exit! -1
     end
   end
   if ARGV.length < argc
diff --git a/lib/parsedate.rb b/lib/parsedate.rb
index 405ab46907..6afec0ff06 100644
--- a/lib/parsedate.rb
+++ b/lib/parsedate.rb
@@ -1,15 +1,88 @@
-# parsedate.rb: Written by Tadayoshi Funaba 2001, 2002
-# $Id: parsedate.rb,v 2.6 2002-05-14 07:43:18+09 tadf Exp $
-
-require 'date/format'
-
 module ParseDate
+  MONTHS = {
+    'jan' => 1, 'feb' => 2, 'mar' => 3, 'apr' => 4,
+    'may' => 5, 'jun' => 6, 'jul' => 7, 'aug' => 8,
+    'sep' => 9, 'oct' =>10, 'nov' =>11, 'dec' =>12 }
+  MONTHPAT = MONTHS.keys.join('|')
+  DAYS = {
+    'sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3,
+    'thu' => 4, 'fri' => 5, 'sat' => 6 }
+  DAYPAT = DAYS.keys.join('|')
 
-  def parsedate(str, comp=false)
-    Date._parse(str, comp).
-      values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday)
+  def parsedate(date, guess=false) 
+    # part of ISO 8601
+    # yyyy-mm-dd | yyyy-mm | yyyy
+    # date hh:mm:ss | date Thh:mm:ss
+    if date =~ /^(\d\d\d\d)-?(?:(\d\d)-?(\d\d)?)? *T?(?:(\d\d):?(\d\d):?(\d\d)?)?$/
+      return $1.to_i,
+	if $2 then $2.to_i else 1 end,
+	if $3 then $3.to_i else 1 end,
+	if $4 then $4.to_i end,
+	if $5 then $5.to_i end,
+	if $6 then $6.to_i end,
+	nil,
+	nil
+    end
+    date = date.dup
+    if date.sub!(/(#{DAYPAT})[a-z]*,?/i, ' ')
+      wday = DAYS[$1.downcase]
+    end
+    if date.sub!(/(\d+):(\d+)(?::(\d+))?\s*(am|pm)?\s*(?:\s+([a-z]{1,4}(?:\s+[a-z]{1,4})?|[-+]\d{4}))?/i, ' ')
+      hour = $1.to_i
+      min = $2.to_i
+      if $3
+	sec = $3.to_i
+      end
+      if $4 == 'pm'
+	hour += 12
+      end
+      if $5
+	zone = $5
+      end
+    end
+    if date.sub!(/(\d+)\S*\s+(#{MONTHPAT})\S*(?:\s+(\d+))?/i, ' ')
+      mday = $1.to_i
+      mon = MONTHS[$2.downcase]
+      if $3
+	year = $3.to_i
+      end
+    elsif date.sub!(/(#{MONTHPAT})\S*\s+(\d+)\S*,?(?:\s+(\d+))?/i, ' ')
+      mon = MONTHS[$1.downcase]
+      mday = $2.to_i
+      if $3
+	year = $3.to_i
+      end
+    elsif date.sub!(/(\d+)\/(\d+)(?:\/(\d+))/, ' ')
+      mon = $1.to_i
+      mday = $2.to_i
+      if $3
+	year = $3.to_i
+      end
+    elsif date.sub!(/(\d+)-(#{MONTHPAT})-(\d+)/i, ' ')
+      mday = $1.to_i
+      mon = MONTHS[$2.downcase]
+      year = $3.to_i
+    end
+    if guess
+      if year < 100
+	if year >= 69
+	  year += 1900
+	else
+	  year += 2000
+	end
+      end
+    elsif date.sub!(/(\d+)-(#{MONTHPAT})-(\d+)/i, ' ')
+      mday = $1.to_i
+      mon = MONTHS[$2.downcase]
+      year = $3.to_i
+    end
+    return year, mon, mday, hour, min, sec, zone, wday
   end
 
   module_function :parsedate
+end
 
+if __FILE__ == $0
+  p Time.now.asctime
+  p ParseDate.parsedate(Time.now.asctime)
 end
diff --git a/lib/pathname.rb b/lib/pathname.rb
deleted file mode 100644
index b4462bfeaf..0000000000
--- a/lib/pathname.rb
+++ /dev/null
@@ -1,687 +0,0 @@
-# Object-Oriented Pathname Class
-#
-# Author:: Tanaka Akira <akr@m17n.org>
-
-# Pathname represents a pathname which locates a file in a filesystem.
-#
-# Pathname is immutable.  It has no method for destructive update.
-#
-# pathname.rb is distributed with Ruby since 1.8.0.
-class Pathname
-  def initialize(path)
-    @path = path.to_str.dup
-    @path.freeze
-
-    if /\0/ =~ @path
-      raise ArgumentError, "pathname contains \\0: #{@path.inspect}"
-    end
-  end
-
-  def ==(other)
-    return false unless Pathname === other
-    other.to_s == @path
-  end
-  alias === ==
-  alias eql? ==
-
-  def <=>(other)
-    return nil unless Pathname === other
-    @path.tr('/', "\0") <=> other.to_s.tr('/', "\0")
-  end
-
-  def hash
-    @path.hash
-  end
-
-  def to_s
-    @path.dup
-  end
-
-  # to_str is implemented for Pathname object usable with File.open, etc.
-  alias to_str to_s
-
-  def inspect
-    "#<#{self.class}:#{@path}>"
-  end
-
-  # cleanpath returns clean pathname of self which is without consecutive
-  # slashes and useless dots.
-  #
-  # If true is given as the optional argument consider_symlink,
-  # symbolic links are considered.  It makes more dots are retained.
-  #
-  # cleanpath doesn't access actual filesystem.
-  def cleanpath(consider_symlink=false)
-    if consider_symlink
-      cleanpath_conservative
-    else
-      cleanpath_aggressive
-    end
-  end
-
-  def cleanpath_aggressive # :nodoc:
-    # cleanpath_aggressive assumes:
-    # * no symlink
-    # * all pathname prefix contained in the pathname is existing directory
-    return Pathname.new('') if @path == ''
-    absolute = absolute?
-    names = []
-    @path.scan(%r{[^/]+}) {|name|
-      next if name == '.'
-      if name == '..'
-        if names.empty?
-          next if absolute
-        else
-          if names.last != '..'
-            names.pop
-            next
-          end
-        end
-      end
-      names << name
-    }
-    return Pathname.new(absolute ? '/' : '.') if names.empty?
-    path = absolute ? '/' : ''
-    path << names.join('/')
-    Pathname.new(path)
-  end
-
-  def cleanpath_conservative # :nodoc:
-    return Pathname.new('') if @path == ''
-    names = @path.scan(%r{[^/]+})
-    last_dot = names.last == '.'
-    names.delete('.')
-    names.shift while names.first == '..' if absolute?
-    return Pathname.new(absolute? ? '/' : '.') if names.empty?
-    path = absolute? ? '/' : ''
-    path << names.join('/')
-    if names.last != '..'
-      if last_dot
-        path << '/.'
-      elsif %r{/\z} =~ @path
-        path << '/'
-      end
-    end
-    Pathname.new(path)
-  end
-
-  # realpath returns a real pathname of self in actual filesystem.
-  # The real pathname doesn't contain a symlink and useless dots.
-  #
-  # If false is given for the optional argument force_absolute,
-  # it may return relative pathname.
-  # Otherwise it returns absolute pathname.
-  def realpath(force_absolute=true)
-    if %r{\A/} =~ @path
-      top = '/'
-      unresolved = @path.scan(%r{[^/]+})
-    elsif force_absolute
-      # Although POSIX getcwd returns a pathname which contains no symlink,
-      # 4.4BSD-Lite2 derived getcwd may return the environment variable $PWD
-      # which may contain a symlink.
-      # So the return value of Dir.pwd should be examined.
-      top = '/'
-      unresolved = Dir.pwd.scan(%r{[^/]+}) + @path.scan(%r{[^/]+})
-    else
-      top = ''
-      unresolved = @path.scan(%r{[^/]+})
-    end
-    resolved = []
-
-    until unresolved.empty?
-      case unresolved.last
-      when '.'
-        unresolved.pop
-      when '..'
-        resolved.unshift unresolved.pop
-      else
-        loop_check = {}
-        while (stat = File.lstat(path = top + unresolved.join('/'))).symlink?
-          symlink_id = "#{stat.dev}:#{stat.ino}"
-          raise Errno::ELOOP.new(path) if loop_check[symlink_id]
-          loop_check[symlink_id] = true
-          if %r{\A/} =~ (link = File.readlink(path))
-            top = '/'
-            unresolved = link.scan(%r{[^/]+})
-          else
-            unresolved[-1,1] = link.scan(%r{[^/]+})
-          end
-        end
-        next if (filename = unresolved.pop) == '.'
-        if filename != '..' && resolved.first == '..'
-          resolved.shift
-        else
-          resolved.unshift filename
-        end
-      end
-    end
-
-    if top == '/'
-      resolved.shift while resolved[0] == '..'
-    end
-    
-    if resolved.empty?
-      Pathname.new(top.empty? ? '.' : '/')
-    else
-      Pathname.new(top + resolved.join('/'))
-    end
-  end
-
-  # parent method returns parent directory, i.e. ".." is joined at last.
-  def parent
-    self.join('..')
-  end
-
-  # mountpoint? method returns true if self points a mountpoint.
-  def mountpoint?
-    begin
-      stat1 = self.lstat
-      stat2 = self.parent.lstat
-      stat1.dev == stat2.dev && stat1.ino == stat2.ino ||
-      stat1.dev != stat2.dev
-    rescue Errno::ENOENT
-      false
-    end
-  end
-
-  # root? method is a predicate for root directory.
-  # I.e. it returns true if the pathname consists of consecutive slashes.
-  #
-  # It doesn't access actual filesystem.
-  # So it may return false for some pathnames
-  # which points root such as "/usr/..".
-  def root?
-    %r{\A/+\z} =~ @path ? true : false
-  end
-
-  # absolute? method is a predicate for absolute pathname.
-  # It returns true if self is beginning with a slash.
-  def absolute?
-    %r{\A/} =~ @path ? true : false
-  end
-
-  # relative? method is a predicate for relative pathname.
-  # It returns true unless self is beginning with a slash.
-  def relative?
-    !absolute?
-  end
-
-  # each_filename iterates over self for each filename components.
-  def each_filename
-    @path.scan(%r{[^/]+}) { yield $& }
-  end
-
-  # Pathname#+ return new pathname which is concatenated with self and
-  # an argument.
-  # If the argument is absolute pathname, it is just returned.
-  def +(other)
-    other = Pathname.new(other) unless Pathname === other
-    if other.absolute?
-      other
-    elsif %r{/\z} =~ @path
-      Pathname.new(@path + other.to_s)
-    else
-      Pathname.new(@path + '/' + other.to_s)
-    end
-  end
-
-  # Pathname#children returns the children of the directory as an array of
-  # pathnames.  
-  #
-  # By default, self is prepended to each pathname in the result.
-  # It is disabled if false is given for the optional argument
-  # prepend_directory.
-  #
-  # Note that the result never contain '.' and '..' because they are not
-  # child.
-  #
-  # This method is exist since 1.8.1.
-  def children(prepend_directory=true)
-    result = []
-    Dir.foreach(@path) {|e|
-      next if e == '.' || e == '..'
-      if prepend_directory
-        result << Pathname.new(File.join(@path, e))
-      else
-        result << Pathname.new(e)
-      end
-    }
-    result
-  end
-
-  # Pathname#relative_path_from returns a relative path from the argument to
-  # self.
-  # If self is absolute, the argument must be absolute too.
-  # If self is relative, the argument must be relative too.
-  #
-  # relative_path_from doesn't access actual filesystem.
-  # It assumes no symlinks.
-  #
-  # ArgumentError is raised when it cannot find a relative path.
-  #
-  # This method is exist since 1.8.1.
-  def relative_path_from(base_directory)
-    if self.absolute? != base_directory.absolute?
-      raise ArgumentError,
-        "relative path between absolute and relative path: #{self.inspect}, #{base_directory.inspect}"
-    end
-
-    dest = []
-    self.cleanpath.each_filename {|f|
-      next if f == '.'
-      dest << f
-    }
-
-    base = []
-    base_directory.cleanpath.each_filename {|f|
-      next if f == '.'
-      base << f
-    }
-
-    while !base.empty? && !dest.empty? && base[0] == dest[0]
-      base.shift
-      dest.shift
-    end
-
-    if base.include? '..'
-      raise ArgumentError, "base_directory has ..: #{base_directory.inspect}"
-    end
-
-    base.fill '..'
-    relpath = base + dest
-    if relpath.empty?
-      Pathname.new(".")
-    else
-      Pathname.new(relpath.join('/'))
-    end
-  end
-
-end
-
-# IO
-class Pathname
-  # Pathname#each_line iterates over lines of the file.
-  # It's yields a String object for each line.
-  #
-  # This method is exist since 1.8.1.
-  def each_line(*args, &block) IO.foreach(@path, *args, &block) end
-
-  # Pathname#foreachline is obsoleted at 1.8.1.
-  #
-  def foreachline(*args, &block) # compatibility to 1.8.0.  obsoleted.
-    warn "Pathname#foreachline is obsoleted.  Use Pathname#each_line."
-    each_line(*args, &block)
-  end
-
-  def read(*args) IO.read(@path, *args) end
-  def readlines(*args) IO.readlines(@path, *args) end
-  def sysopen(*args) IO.sysopen(@path, *args) end
-end
-
-# File
-class Pathname
-  def atime() File.atime(@path) end
-  def ctime() File.ctime(@path) end
-  def mtime() File.mtime(@path) end
-  def chmod(mode) File.chmod(mode, @path) end
-  def lchmod(mode) File.chmod(mode, @path) end
-  def chown(owner, group) File.chown(owner, group, @path) end
-  def lchown(owner, group) File.lchown(owner, group, @path) end
-  def fnmatch(pattern, *args) File.fnmatch(pattern, @path, *args) end
-  def fnmatch?(pattern, *args) File.fnmatch?(pattern, @path, *args) end
-  def ftype() File.ftype(@path) end
-  def link(old) File.link(old, @path) end
-  def open(*args, &block) File.open(@path, *args, &block) end
-  def readlink() Pathname.new(File.readlink(@path)) end
-  def rename(to) File.rename(@path, to) end
-  def stat() File.stat(@path) end
-  def lstat() File.lstat(@path) end
-  def symlink(old) File.symlink(old, @path) end
-  def truncate(length) File.truncate(@path, length) end
-  def utime(atime, mtime) File.utime(atime, mtime, @path) end
-  def basename(*args) Pathname.new(File.basename(@path, *args)) end
-  def dirname() Pathname.new(File.dirname(@path)) end
-  def extname() File.extname(@path) end
-  def expand_path(*args) Pathname.new(File.expand_path(@path, *args)) end
-  def join(*args) Pathname.new(File.join(@path, *args)) end
-  def split() File.split(@path).map {|f| Pathname.new(f) } end
-end
-
-# FileTest
-class Pathname
-  def blockdev?() FileTest.blockdev?(@path) end
-  def chardev?() FileTest.chardev?(@path) end
-  def executable?() FileTest.executable?(@path) end
-  def executable_real?() FileTest.executable_real?(@path) end
-  def exist?() FileTest.exist?(@path) end
-  def grpowned?() FileTest.grpowned?(@path) end
-  def directory?() FileTest.directory?(@path) end
-  def file?() FileTest.file?(@path) end
-  def pipe?() FileTest.pipe?(@path) end
-  def socket?() FileTest.socket?(@path) end
-  def owned?() FileTest.owned?(@path) end
-  def readable?() FileTest.readable?(@path) end
-  def readable_real?() FileTest.readable_real?(@path) end
-  def setuid?() FileTest.setuid?(@path) end
-  def setgid?() FileTest.setgid?(@path) end
-  def size() FileTest.size(@path) end
-  def size?() FileTest.size?(@path) end
-  def sticky?() FileTest.sticky?(@path) end
-  def symlink?() FileTest.symlink?(@path) end
-  def writable?() FileTest.writable?(@path) end
-  def writable_real?() FileTest.writable_real?(@path) end
-  def zero?() FileTest.zero?(@path) end
-end
-
-# Dir
-class Pathname
-  def Pathname.glob(*args)
-    if block_given?
-      Dir.glob(*args) {|f| yield Pathname.new(f) }
-    else
-      Dir.glob(*args).map {|f| Pathname.new(f) }
-    end
-  end
-
-  def Pathname.getwd() Pathname.new(Dir.getwd) end
-  class << self; alias pwd getwd end
-
-  # Pathname#chdir is obsoleted at 1.8.1.
-  #
-  def chdir(&block) # compatibility to 1.8.0.
-    warn "Pathname#chdir is obsoleted.  Use Dir.chdir."
-    Dir.chdir(@path, &block)
-  end
-
-  # Pathname#chroot is obsoleted at 1.8.1.
-  #
-  def chroot # compatibility to 1.8.0.
-    warn "Pathname#chroot is obsoleted.  Use Dir.chroot."
-    Dir.chroot(@path)
-  end
-
-  def rmdir() Dir.rmdir(@path) end
-  def entries() Dir.entries(@path).map {|f| Pathname.new(f) } end
-
-  # Pathname#each_entry iterates over entries of the directory.
-  # It's yields Pathname objects for each entry.
-  #
-  # This method is exist since 1.8.1.
-  def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
-
-  # Pathname#dir_foreach is obsoleted at 1.8.1.
-  #
-  def dir_foreach(*args, &block) # compatibility to 1.8.0.  obsoleted.
-    warn "Pathname#dir_foreach is obsoleted.  Use Pathname#each_entry."
-    each_entry(*args, &block)
-  end
-
-  def mkdir(*args) Dir.mkdir(@path, *args) end
-  def opendir(&block) Dir.open(@path, &block) end
-end
-
-# Find
-class Pathname
-  def find(&block)
-    require 'find'
-    Find.find(@path) {|f| yield Pathname.new(f) }
-  end
-end
-
-# FileUtils
-class Pathname
-  def mkpath
-    require 'fileutils'
-    FileUtils.mkpath(@path)
-    nil
-  end
-
-  def rmtree
-    # The name "rmtree" is borrowed from File::Path of Perl.
-    # File::Path provides "mkpath" and "rmtree".
-    require 'fileutils'
-    FileUtils.rm_r(@path)
-    nil
-  end
-end
-
-# mixed
-class Pathname
-  def unlink()
-    if FileTest.directory? @path
-      Dir.unlink @path
-    else
-      File.unlink @path
-    end
-  end
-  alias delete unlink
-
-  # This method is obsoleted at 1.8.1.
-  #
-  def foreach(*args, &block) # compatibility to 1.8.0.  obsoleted.
-    warn "Pathname#foreach is obsoleted.  Use each_line or each_entry."
-    if FileTest.directory? @path
-      # For polymorphism between Dir.foreach and IO.foreach,
-      # Pathname#foreach doesn't yield Pathname object.
-      Dir.foreach(@path, *args, &block)
-    else
-      IO.foreach(@path, *args, &block)
-    end
-  end
-end
-
-if $0 == __FILE__
-  require 'test/unit'
-
-  class PathnameTest < Test::Unit::TestCase # :nodoc:
-    class AnotherStringLike # :nodoc:
-      def initialize(s) @s = s end
-      def to_str() @s end
-      def ==(other) @s == other end
-    end
-
-    def test_equality
-      obj = Pathname.new("a")
-      str = "a"
-      sym = :a
-      ano = AnotherStringLike.new("a")
-      assert_equal(false, obj == str)
-      assert_equal(false, str == obj)
-      assert_equal(false, obj == ano)
-      assert_equal(false, ano == obj)
-      assert_equal(false, obj == sym)
-      assert_equal(false, sym == obj)
-
-      obj2 = Pathname.new("a")
-      assert_equal(true, obj == obj2)
-      assert_equal(true, obj === obj2)
-      assert_equal(true, obj.eql?(obj2))
-    end
-
-    def test_hashkey
-      h = {}
-      h[Pathname.new("a")] = 1
-      h[Pathname.new("a")] = 2
-      assert_equal(1, h.size)
-    end
-
-    def assert_pathname_cmp(e, s1, s2)
-      p1 = Pathname.new(s1)
-      p2 = Pathname.new(s2)
-      r = p1 <=> p2
-      assert(e == r,
-        "#{p1.inspect} <=> #{p2.inspect}: <#{e}> expected but was <#{r}>")
-    end
-    def test_comparison
-      assert_pathname_cmp( 0, "a", "a")
-      assert_pathname_cmp( 1, "b", "a")
-      assert_pathname_cmp(-1, "a", "b")
-      ss = %w(
-        a
-        a/
-        a/b
-        a.
-        a0
-      )
-      s1 = ss.shift
-      ss.each {|s2|
-        assert_pathname_cmp(-1, s1, s2)
-        s1 = s2
-      }
-    end
-
-    def test_comparison_string
-      assert_equal(nil, Pathname.new("a") <=> "a")
-      assert_equal(nil, "a" <=> Pathname.new("a"))
-    end
-
-    def test_syntactical
-      assert_equal(true, Pathname.new("/").root?)
-      assert_equal(true, Pathname.new("//").root?)
-      assert_equal(true, Pathname.new("///").root?)
-      assert_equal(false, Pathname.new("").root?)
-      assert_equal(false, Pathname.new("a").root?)
-    end
-
-    def test_cleanpath
-      assert_equal('/', Pathname.new('/').cleanpath(true).to_s)
-      assert_equal('/', Pathname.new('//').cleanpath(true).to_s)
-      assert_equal('', Pathname.new('').cleanpath(true).to_s)
-
-      assert_equal('.', Pathname.new('.').cleanpath(true).to_s)
-      assert_equal('..', Pathname.new('..').cleanpath(true).to_s)
-      assert_equal('a', Pathname.new('a').cleanpath(true).to_s)
-      assert_equal('/', Pathname.new('/.').cleanpath(true).to_s)
-      assert_equal('/', Pathname.new('/..').cleanpath(true).to_s)
-      assert_equal('/a', Pathname.new('/a').cleanpath(true).to_s)
-      assert_equal('.', Pathname.new('./').cleanpath(true).to_s)
-      assert_equal('..', Pathname.new('../').cleanpath(true).to_s)
-      assert_equal('a/', Pathname.new('a/').cleanpath(true).to_s)
-
-      assert_equal('a/b', Pathname.new('a//b').cleanpath(true).to_s)
-      assert_equal('a/.', Pathname.new('a/.').cleanpath(true).to_s)
-      assert_equal('a/.', Pathname.new('a/./').cleanpath(true).to_s)
-      assert_equal('a/..', Pathname.new('a/../').cleanpath(true).to_s)
-      assert_equal('/a/.', Pathname.new('/a/.').cleanpath(true).to_s)
-      assert_equal('..', Pathname.new('./..').cleanpath(true).to_s)
-      assert_equal('..', Pathname.new('../.').cleanpath(true).to_s)
-      assert_equal('..', Pathname.new('./../').cleanpath(true).to_s)
-      assert_equal('..', Pathname.new('.././').cleanpath(true).to_s)
-      assert_equal('/', Pathname.new('/./..').cleanpath(true).to_s)
-      assert_equal('/', Pathname.new('/../.').cleanpath(true).to_s)
-      assert_equal('/', Pathname.new('/./../').cleanpath(true).to_s)
-      assert_equal('/', Pathname.new('/.././').cleanpath(true).to_s)
-
-      assert_equal('a/b/c', Pathname.new('a/b/c').cleanpath(true).to_s)
-      assert_equal('b/c', Pathname.new('./b/c').cleanpath(true).to_s)
-      assert_equal('a/c', Pathname.new('a/./c').cleanpath(true).to_s)
-      assert_equal('a/b/.', Pathname.new('a/b/.').cleanpath(true).to_s)
-      assert_equal('a/..', Pathname.new('a/../.').cleanpath(true).to_s)
-
-      assert_equal('/a', Pathname.new('/../.././../a').cleanpath(true).to_s)
-      assert_equal('a/b/../../../../c/../d',
-        Pathname.new('a/b/../../../../c/../d').cleanpath(true).to_s)
-    end
-
-    def test_cleanpath_no_symlink
-      assert_equal('/', Pathname.new('/').cleanpath.to_s)
-      assert_equal('/', Pathname.new('//').cleanpath.to_s)
-      assert_equal('', Pathname.new('').cleanpath.to_s)
-
-      assert_equal('.', Pathname.new('.').cleanpath.to_s)
-      assert_equal('..', Pathname.new('..').cleanpath.to_s)
-      assert_equal('a', Pathname.new('a').cleanpath.to_s)
-      assert_equal('/', Pathname.new('/.').cleanpath.to_s)
-      assert_equal('/', Pathname.new('/..').cleanpath.to_s)
-      assert_equal('/a', Pathname.new('/a').cleanpath.to_s)
-      assert_equal('.', Pathname.new('./').cleanpath.to_s)
-      assert_equal('..', Pathname.new('../').cleanpath.to_s)
-      assert_equal('a', Pathname.new('a/').cleanpath.to_s)
-
-      assert_equal('a/b', Pathname.new('a//b').cleanpath.to_s)
-      assert_equal('a', Pathname.new('a/.').cleanpath.to_s)
-      assert_equal('a', Pathname.new('a/./').cleanpath.to_s)
-      assert_equal('.', Pathname.new('a/../').cleanpath.to_s)
-      assert_equal('/a', Pathname.new('/a/.').cleanpath.to_s)
-      assert_equal('..', Pathname.new('./..').cleanpath.to_s)
-      assert_equal('..', Pathname.new('../.').cleanpath.to_s)
-      assert_equal('..', Pathname.new('./../').cleanpath.to_s)
-      assert_equal('..', Pathname.new('.././').cleanpath.to_s)
-      assert_equal('/', Pathname.new('/./..').cleanpath.to_s)
-      assert_equal('/', Pathname.new('/../.').cleanpath.to_s)
-      assert_equal('/', Pathname.new('/./../').cleanpath.to_s)
-      assert_equal('/', Pathname.new('/.././').cleanpath.to_s)
-
-      assert_equal('a/b/c', Pathname.new('a/b/c').cleanpath.to_s)
-      assert_equal('b/c', Pathname.new('./b/c').cleanpath.to_s)
-      assert_equal('a/c', Pathname.new('a/./c').cleanpath.to_s)
-      assert_equal('a/b', Pathname.new('a/b/.').cleanpath.to_s)
-      assert_equal('.', Pathname.new('a/../.').cleanpath.to_s)
-
-      assert_equal('/a', Pathname.new('/../.././../a').cleanpath.to_s)
-      assert_equal('../../d', Pathname.new('a/b/../../../../c/../d').cleanpath.to_s)
-    end
-
-    def test_destructive_update
-      path = Pathname.new("a")
-      path.to_s.replace "b"
-      assert_equal(Pathname.new("a"), path)
-    end
-
-    def test_null_character
-      assert_raises(ArgumentError) { Pathname.new("\0") }
-    end
-
-    def assert_relpath(result, dest, base)
-      assert_equal(Pathname.new(result),
-        Pathname.new(dest).relative_path_from(Pathname.new(base)))
-    end
-
-    def assert_relpath_err(dest, base)
-      assert_raises(ArgumentError) {
-        Pathname.new(dest).relative_path_from(Pathname.new(base))
-      }
-    end
-
-    def test_relative_path_from
-      assert_relpath("../a", "a", "b")
-      assert_relpath("../a", "a", "b/")
-      assert_relpath("../a", "a/", "b")
-      assert_relpath("../a", "a/", "b/")
-      assert_relpath("../a", "/a", "/b")
-      assert_relpath("../a", "/a", "/b/")
-      assert_relpath("../a", "/a/", "/b")
-      assert_relpath("../a", "/a/", "/b/")
-
-      assert_relpath("../b", "a/b", "a/c")
-      assert_relpath("../a", "../a", "../b")
-
-      assert_relpath("a", "a", ".")
-      assert_relpath("..", ".", "a")
-
-      assert_relpath(".", ".", ".")
-      assert_relpath(".", "..", "..")
-      assert_relpath("..", "..", ".")
-
-      assert_relpath("c/d", "/a/b/c/d", "/a/b")
-      assert_relpath("../..", "/a/b", "/a/b/c/d")
-      assert_relpath("../../../../e", "/e", "/a/b/c/d")
-      assert_relpath("../b/c", "a/b/c", "a/d")
-
-      assert_relpath("../a", "/../a", "/b")
-      assert_relpath("../../a", "../a", "b")
-      assert_relpath(".", "/a/../../b", "/b")
-      assert_relpath("..", "a/..", "a")
-      assert_relpath(".", "a/../b", "b")
-
-      assert_relpath("a", "a", "b/..")
-      assert_relpath("b/c", "b/c", "b/..")
-
-      assert_relpath_err("/", ".")
-      assert_relpath_err(".", "/")
-      assert_relpath_err("a", "..")
-      assert_relpath_err(".", "..")
-    end
-
-  end
-end
diff --git a/lib/ping.rb b/lib/ping.rb
index d90551e671..065b1d2303 100644
--- a/lib/ping.rb
+++ b/lib/ping.rb
@@ -38,17 +38,15 @@
 #=end
 
 require 'timeout'
-require "socket"
 
 module Ping
+  require "socket"
   def pingecho(host, timeout=5, service="echo")
     begin
       timeout(timeout) do
-	s = TCPSocket.new(host, service)
+	s = TCPsocket.new(host, service)
 	s.close
       end
-    rescue Errno::ECONNREFUSED
-      return true
     rescue
       return false
     end
diff --git a/lib/pp.rb b/lib/pp.rb
deleted file mode 100644
index 9babc1e7a9..0000000000
--- a/lib/pp.rb
+++ /dev/null
@@ -1,595 +0,0 @@
-# $Id$
-
-=begin
-= Pretty-printer for Ruby objects.
-
-== Which seems better?
-
-non-pretty-printed output by (({p})) is:
-  #<PP:0x81fedf0 @genspace=#<Proc:0x81feda0>, @group_queue=#<PrettyPrint::GroupQueue:0x81fed3c @queue=[[#<PrettyPrint::Group:0x81fed78 @breakables=[], @depth=0, @break=false>], []]>, @buffer=[], @newline="\n", @group_stack=[#<PrettyPrint::Group:0x81fed78 @breakables=[], @depth=0, @break=false>], @buffer_width=0, @indent=0, @maxwidth=79, @output_width=2, @output=#<IO:0x8114ee4>>
-
-pretty-printed output by (({pp})) is:
-  #<PP:0x81fedf0
-   @buffer=[],
-   @buffer_width=0,
-   @genspace=#<Proc:0x81feda0>,
-   @group_queue=
-    #<PrettyPrint::GroupQueue:0x81fed3c
-     @queue=
-      [[#<PrettyPrint::Group:0x81fed78 @break=false, @breakables=[], @depth=0>],
-       []]>,
-   @group_stack=
-    [#<PrettyPrint::Group:0x81fed78 @break=false, @breakables=[], @depth=0>],
-   @indent=0,
-   @maxwidth=79,
-   @newline="\n",
-   @output=#<IO:0x8114ee4>,
-   @output_width=2>
-
-I like the latter.  If you do too, this library is for you.
-
-== Usage
-
-: pp(obj)
-    output ((|obj|)) to (({$>})) in pretty printed format.
-
-    It returns (({nil})).
-
-== Output Customization
-To define your customized pretty printing function for your classes,
-redefine a method (({pretty_print(((|pp|)))})) in the class.
-It takes an argument ((|pp|)) which is an instance of the class ((<PP>)).
-The method should use PP#text, PP#breakable, PP#nest, PP#group and
-PP#pp to print the object.
-
-= PP
-== super class
-((<PrettyPrint>))
-
-== class methods
---- PP.pp(obj[, out[, width]])
-    outputs ((|obj|)) to ((|out|)) in pretty printed format of
-    ((|width|)) columns in width.
-
-    If ((|out|)) is ommitted, (({$>})) is assumed.
-    If ((|width|)) is ommitted, 79 is assumed.
-
-    PP.pp returns ((|out|)).
-
---- PP.singleline_pp(obj[, out])
-    outputs ((|obj|)) to ((|out|)) like (({PP.pp})) but with no indent and
-    newline.
-
-    PP.singleline_pp returns ((|out|)).
-
---- PP.sharing_detection
-    returns the sharing detection flag as a boolean value.
-    It is false by default.
-
---- PP.sharing_detection = boolean_value
-    sets the sharing detection flag.
-
-== methods
---- pp(obj)
-    adds ((|obj|)) to the pretty printing buffer
-    using Object#pretty_print or Object#pretty_print_cycle.
-
-    Object#pretty_print_cycle is used when ((|obj|)) is already
-    printed, a.k.a the object reference chain has a cycle.
-
---- object_group(obj) { ... }
-    is a convenience method which is same as follows:
-
-      group(1, '#<' + obj.class.name, '>') { ... }
-
---- comma_breakable
-    is a convenience method which is same as follows:
-
-      text ','
-      breakable
-
-= Object
---- pretty_print(pp)
-    is a default pretty printing method for general objects.
-    It calls (({pretty_print_instance_variables})) to list instance variables.
-
-    If (({self})) has a customized (redefined) (({inspect})) method,
-    the result of (({self.inspect})) is used but it obviously has no
-    line break hints.
-
-    This module provides predefined pretty_print() methods for some of
-    the most commonly used built-in classes for convenience.
-
---- pretty_print_cycle(pp)
-    is a default pretty printing method for general objects that are
-    detected as part of a cycle.
-
---- pretty_print_instance_variables
-    returns a sorted array of instance variable names.
-
-    This method should return an array of names of instance variables as symbols or strings as:
-    (({[:@a, :@b]})).
-
---- pretty_print_inspect
-    is (({inspect})) implementation using (({pretty_print})).
-    If you implement (({pretty_print})), it can be used as follows.
-
-      alias inspect pretty_print_inspect
-
-== AUTHOR
-Tanaka Akira <akr@m17n.org>
-=end
-
-require 'prettyprint'
-
-module Kernel
-  private
-  def pp(*objs)
-    objs.each {|obj|
-      PP.pp(obj)
-    }
-    nil
-  end
-  module_function :pp
-end
-
-class PP < PrettyPrint
-  def PP.pp(obj, out=$>, width=79)
-    pp = PP.new(out, width)
-    pp.guard_inspect_key {pp.pp obj}
-    pp.flush
-    #$pp = pp
-    out << "\n"
-  end
-
-  def PP.singleline_pp(obj, out=$>)
-    pp = SingleLine.new(out)
-    pp.guard_inspect_key {pp.pp obj}
-    pp.flush
-    out
-  end
-
-  @sharing_detection = false
-  class << self
-    attr_accessor :sharing_detection
-  end
-
-  module PPMethods
-    InspectKey = :__inspect_key__
-
-    def guard_inspect_key
-      if Thread.current[InspectKey] == nil
-        Thread.current[InspectKey] = []
-      end
-
-      save = Thread.current[InspectKey]
-
-      begin
-        Thread.current[InspectKey] = []
-        yield
-      ensure
-        Thread.current[InspectKey] = save
-      end
-    end
-
-    def pp(obj)
-      id = obj.__id__
-
-      if Thread.current[InspectKey].include? id
-        group {obj.pretty_print_cycle self}
-        return
-      end
-
-      begin
-        Thread.current[InspectKey] << id
-        group {obj.pretty_print self}
-      ensure
-        Thread.current[InspectKey].pop unless PP.sharing_detection
-      end
-    end
-
-    def object_group(obj, &block)
-      group(1, '#<' + obj.class.name, '>', &block)
-    end
-
-    def object_address_group(obj, &block)
-      group(1, sprintf('#<%s:0x%x', obj.class.to_s, obj.__id__ * 2), '>', &block)
-    end
-
-    def comma_breakable
-      text ','
-      breakable
-    end
-
-    def pp_object(obj)
-      object_address_group(obj) {
-        obj.pretty_print_instance_variables.each {|v|
-          v = v.to_s if Symbol === v
-          text ',' unless first?
-          breakable
-          text v
-          text '='
-          group(1) {
-            breakable ''
-            pp(obj.instance_eval(v))
-          }
-        }
-      }
-    end
-
-    def pp_hash(obj)
-      group(1, '{', '}') {
-        obj.each {|k, v|
-          comma_breakable unless first?
-          group {
-            pp k
-            text '=>'
-            group(1) {
-              breakable ''
-              pp v
-            }
-          }
-        }
-      }
-    end
-  end
-
-  include PPMethods
-
-  class SingleLine < PrettyPrint::SingleLine
-    include PPMethods
-  end
-
-  module ObjectMixin
-    # 1. specific pretty_print
-    # 2. specific inspect
-    # 3. specific to_s if instance variable is empty
-    # 4. generic pretty_print
-
-    def pretty_print(pp)
-      if /\(Kernel\)#/ !~ method(:inspect).inspect
-        pp.text self.inspect
-      elsif /\(Kernel\)#/ !~ method(:to_s).inspect && instance_variables.empty?
-        pp.text self.to_s
-      else
-        pp.pp_object(self)
-      end
-    end
-
-    def pretty_print_cycle(pp)
-      pp.object_address_group(self) {
-        pp.breakable
-        pp.text '...'
-      }
-    end
-
-    def pretty_print_instance_variables
-      instance_variables.sort
-    end
-
-    def pretty_print_inspect
-      if /\(PP::ObjectMixin\)#/ =~ method(:pretty_print).inspect
-        raise "pretty_print is not overriden."
-      end
-      PP.singleline_pp(self, '')
-    end
-  end
-end
-
-class Array
-  def pretty_print(pp)
-    pp.group(1, '[', ']') {
-      self.each {|v|
-        pp.comma_breakable unless pp.first?
-        pp.pp v
-      }
-    }
-  end
-
-  def pretty_print_cycle(pp)
-    pp.text(empty? ? '[]' : '[...]')
-  end
-end
-
-class Hash
-  def pretty_print(pp)
-    pp.pp_hash self
-  end
-
-  def pretty_print_cycle(pp)
-    pp.text(empty? ? '{}' : '{...}')
-  end
-end
-
-class << ENV
-  def pretty_print(pp)
-    pp.pp_hash self
-  end
-end
-
-class Struct
-  def pretty_print(pp)
-    pp.object_group(self) {
-      self.members.each {|member|
-        pp.text "," unless pp.first?
-        pp.breakable
-        pp.text member.to_s
-        pp.text '='
-        pp.group(1) {
-          pp.breakable ''
-          pp.pp self[member]
-        }
-      }
-    }
-  end
-
-  def pretty_print_cycle(pp)
-    pp.text sprintf("#<%s:...>", self.class.name)
-  end
-end
-
-class Range
-  def pretty_print(pp)
-    pp.pp self.begin
-    pp.breakable ''
-    pp.text(self.exclude_end? ? '...' : '..')
-    pp.breakable ''
-    pp.pp self.end
-  end
-end
-
-class File
-  class Stat
-    def pretty_print(pp)
-      require 'etc.so'
-      pp.object_group(self) {
-        pp.breakable
-        pp.text sprintf("dev=0x%x", self.dev); pp.comma_breakable
-        pp.text "ino="; pp.pp self.ino; pp.comma_breakable
-        pp.group {
-          m = self.mode
-          pp.text sprintf("mode=0%o", m)
-          pp.breakable
-          pp.text sprintf("(%s %c%c%c%c%c%c%c%c%c)",
-            self.ftype,
-            (m & 0400 == 0 ? ?- : ?r),
-            (m & 0200 == 0 ? ?- : ?w),
-            (m & 0100 == 0 ? (m & 04000 == 0 ? ?- : ?S) :
-                             (m & 04000 == 0 ? ?x : ?s)),
-            (m & 0040 == 0 ? ?- : ?r),
-            (m & 0020 == 0 ? ?- : ?w),
-            (m & 0010 == 0 ? (m & 02000 == 0 ? ?- : ?S) :
-                             (m & 02000 == 0 ? ?x : ?s)),
-            (m & 0004 == 0 ? ?- : ?r),
-            (m & 0002 == 0 ? ?- : ?w),
-            (m & 0001 == 0 ? (m & 01000 == 0 ? ?- : ?T) :
-                             (m & 01000 == 0 ? ?x : ?t)))
-        }
-        pp.comma_breakable
-        pp.text "nlink="; pp.pp self.nlink; pp.comma_breakable
-        pp.group {
-          pp.text "uid="; pp.pp self.uid
-          begin
-            name = Etc.getpwuid(self.uid).name
-            pp.breakable; pp.text "(#{name})"
-          rescue ArgumentError
-          end
-        }
-        pp.comma_breakable
-        pp.group {
-          pp.text "gid="; pp.pp self.gid
-          begin
-            name = Etc.getgrgid(self.gid).name
-            pp.breakable; pp.text "(#{name})"
-          rescue ArgumentError
-          end
-        }
-        pp.comma_breakable
-        pp.group {
-          pp.text sprintf("rdev=0x%x", self.rdev)
-          pp.breakable
-          pp.text sprintf('(%d, %d)', self.rdev_major, self.rdev_minor)
-        }
-        pp.comma_breakable
-        pp.text "size="; pp.pp self.size; pp.comma_breakable
-        pp.text "blksize="; pp.pp self.blksize; pp.comma_breakable
-        pp.text "blocks="; pp.pp self.blocks; pp.comma_breakable
-        pp.group {
-          t = self.atime
-          pp.text "atime="; pp.pp t
-          pp.breakable; pp.text "(#{t.tv_sec})"
-        }
-        pp.comma_breakable
-        pp.group {
-          t = self.mtime
-          pp.text "mtime="; pp.pp t
-          pp.breakable; pp.text "(#{t.tv_sec})"
-        }
-        pp.comma_breakable
-        pp.group {
-          t = self.ctime
-          pp.text "ctime="; pp.pp t
-          pp.breakable; pp.text "(#{t.tv_sec})"
-        }
-      }
-    end
-  end
-end
-
-class MatchData
-  def pretty_print(pp)
-    pp.object_group(self) {
-      pp.breakable
-      1.upto(self.size) {|i|
-        pp.breakable unless pp.first?
-        pp.pp self[i-1]
-      }
-    }
-  end
-end
-
-class Object
-  include PP::ObjectMixin
-end
-
-[Numeric, Symbol, FalseClass, TrueClass, NilClass, Module].each {|c|
-  c.class_eval {
-    def pretty_print_cycle(pp)
-      pp.text inspect
-    end
-  }
-}
-
-if __FILE__ == $0
-  require 'test/unit'
-
-  class PPTest < Test::Unit::TestCase
-    def test_list0123_12
-      assert_equal("[0, 1, 2, 3]\n", PP.pp([0,1,2,3], '', 12))
-    end
-
-    def test_list0123_11
-      assert_equal("[0,\n 1,\n 2,\n 3]\n", PP.pp([0,1,2,3], '', 11))
-    end
-  end
-
-  class HasInspect
-    def initialize(a)
-      @a = a
-    end
-
-    def inspect
-      return "<inspect:#{@a.inspect}>"
-    end
-  end
-
-  class HasPrettyPrint
-    def initialize(a)
-      @a = a
-    end
-
-    def pretty_print(pp)
-      pp.text "<pretty_print:"
-      pp.pp @a
-      pp.text ">"
-    end
-  end
-
-  class HasBoth
-    def initialize(a)
-      @a = a
-    end
-
-    def inspect
-      return "<inspect:#{@a.inspect}>"
-    end
-
-    def pretty_print(pp)
-      pp.text "<pretty_print:"
-      pp.pp @a
-      pp.text ">"
-    end
-  end
-
-  class PrettyPrintInspect < HasPrettyPrint
-    alias inspect pretty_print_inspect
-  end
-
-  class PrettyPrintInspectWithoutPrettyPrint
-    alias inspect pretty_print_inspect
-  end
-
-  class PPInspectTest < Test::Unit::TestCase
-    def test_hasinspect
-      a = HasInspect.new(1)
-      assert_equal("<inspect:1>\n", PP.pp(a, ''))
-    end
-
-    def test_hasprettyprint
-      a = HasPrettyPrint.new(1)
-      assert_equal("<pretty_print:1>\n", PP.pp(a, ''))
-    end
-
-    def test_hasboth
-      a = HasBoth.new(1)
-      assert_equal("<pretty_print:1>\n", PP.pp(a, ''))
-    end
-
-    def test_pretty_print_inspect
-      a = PrettyPrintInspect.new(1)
-      assert_equal("<pretty_print:1>", a.inspect)
-      a = PrettyPrintInspectWithoutPrettyPrint.new
-      assert_raises(RuntimeError) { a.inspect }
-    end
-
-    def test_proc
-      a = proc {1}
-      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
-    end
-
-    def test_to_s_with_iv
-      a = Object.new
-      def a.to_s() "aaa" end
-      a.instance_eval { @a = nil }
-      result = PP.pp(a, '')
-      assert_equal("#{a.inspect}\n", result)
-      assert_match(/\A#<Object.*>\n\z/m, result)
-    end
-    
-    def test_to_s_without_iv
-      a = Object.new
-      def a.to_s() "aaa" end
-      result = PP.pp(a, '')
-      assert_equal("#{a.inspect}\n", result)
-      assert_equal("aaa\n", result)
-    end
-  end
-
-  class PPCycleTest < Test::Unit::TestCase
-    def test_array
-      a = []
-      a << a
-      assert_equal("[[...]]\n", PP.pp(a, ''))
-    end
-
-    def test_hash
-      a = {}
-      a[0] = a
-      assert_equal("{0=>{...}}\n", PP.pp(a, ''))
-    end
-
-    S = Struct.new("S", :a, :b)
-    def test_struct
-      a = S.new(1,2)
-      a.b = a
-      assert_equal("#<Struct::S a=1, b=#<Struct::S:...>>\n", PP.pp(a, ''))
-    end
-
-    def test_object
-      a = Object.new
-      a.instance_eval {@a = a}
-      assert_equal(a.inspect + "\n", PP.pp(a, ''))
-    end
-
-    def test_anonymous
-      a = Class.new.new
-      assert_equal(a.inspect + "\n", PP.pp(a, ''))
-    end
-
-    def test_withinspect
-      a = []
-      a << HasInspect.new(a)
-      assert_equal("[<inspect:[...]>]\n", PP.pp(a, ''))
-    end
-
-    def test_share_nil
-      begin
-        PP.sharing_detection = true
-        a = [nil, nil]
-        assert_equal("[nil, nil]\n", PP.pp(a, ''))
-      ensure
-        PP.sharing_detection = false
-      end
-    end
-  end
-end
diff --git a/lib/prettyprint.rb b/lib/prettyprint.rb
deleted file mode 100644
index a815f64538..0000000000
--- a/lib/prettyprint.rb
+++ /dev/null
@@ -1,911 +0,0 @@
-# $Id$
-
-=begin
-= PrettyPrint
-The class implements pretty printing algorithm.
-It finds line breaks and nice indentations for grouped structure.
-
-By default, the class assumes that primitive elements are strings and
-each byte in the strings have single column in width.
-But it can be used for other situasions
-by giving suitable arguments for some methods:
-newline object and space generation block for (({PrettyPrint.new})),
-optional width argument for (({PrettyPrint#text})),
-(({PrettyPrint#breakable})), etc.
-There are several candidates to use them:
-text formatting using proportional fonts,
-multibyte characters which has columns diffrent to number of bytes,
-non-string formatting, etc.
-
-== class methods
---- PrettyPrint.new([output[, maxwidth[, newline]]]) [{|width| ...}]
-    creates a buffer for pretty printing.
-
-    ((|output|)) is an output target.
-    If it is not specified, (({''})) is assumed.
-    It should have a (({<<})) method which accepts
-    the first argument ((|obj|)) of (({PrettyPrint#text})),
-    the first argument ((|sep|)) of (({PrettyPrint#breakable})),
-    the first argument ((|newline|)) of (({PrettyPrint.new})),
-    and
-    the result of a given block for (({PrettyPrint.new})).
-
-    ((|maxwidth|)) specifies maximum line length.
-    If it is not specified, 79 is assumed.
-    However actual outputs may overflow ((|maxwidth|)) if
-    long non-breakable texts are provided.
-
-    ((|newline|)) is used for line breaks.
-    (({"\n"})) is used if it is not specified.
-
-    The block is used to generate spaces.
-    (({{|width| ' ' * width}})) is used if it is not given.
-
---- PrettyPrint.format([output[, maxwidth[, newline[, genspace]]]]) {|pp| ...}
-    is a convenience method which is same as follows:
-
-      begin
-        pp = PrettyPrint.new(output, maxwidth, newline, &genspace)
-        ...
-        pp.flush
-        output
-      end
-
---- PrettyPrint.singleline_format([output[, maxwidth[, newline[, genspace]]]]) {|pp| ...}
-    is similar to (({PrettyPrint.format})) but the result has no breaks.
-
-    ((|maxwidth|)), ((|newline|)) and ((|genspace|)) are ignored.
-    The invocation of (({breakable})) in the block doesn't break a line and
-    treated as just an invocation of (({text})).
-
-== methods
---- text(obj[, width])
-    adds ((|obj|)) as a text of ((|width|)) columns in width.
-
-    If ((|width|)) is not specified, (({((|obj|)).length})) is used.
-
---- breakable([sep[, width]])
-    tells "you can break a line here if necessary", and a
-    ((|width|))-column text ((|sep|)) is inserted if a line is not
-    broken at the point.
-
-    If ((|sep|)) is not specified, (({" "})) is used.
-
-    If ((|width|)) is not specified, (({((|sep|)).length})) is used.
-    You will have to specify this when ((|sep|)) is a multibyte
-    character, for example.
-
---- nest(indent) {...}
-    increases left margin after newline with ((|indent|)) for line breaks added
-    in the block.
-
---- group([indent[, open_obj[, close_obj[, open_width[, close_width]]]]]) {...}
-    groups line break hints added in the block.
-    The line break hints are all to be breaked or not.
-
-    If ((|indent|)) is specified, the method call is regarded as nested by
-    (({nest(((|indent|))) { ... }})).
-
-    If ((|open_obj|)) is specified, (({text open_obj, open_width})) is called
-    at first.
-    If ((|close_obj|)) is specified, (({text close_obj, close_width})) is
-    called at last.
-
---- flush
-    outputs buffered data.
-
---- first?
-    is a predicate to test the call is a first call to (({first?})) with
-    current group.
-    It is useful to format comma separated values as:
-
-      pp.group(1, '[', ']') {
-        xxx.each {|yyy|
-          unless pp.first?
-            pp.text ','
-            pp.breakable
-          end
-          ... pretty printing yyy ...
-        }
-      }
-
-== Bugs
-* Box based formatting?  Other (better) model/algorithm?
-
-== References
-Christian Lindig, Strictly Pretty, March 2000,
-((<URL:http://www.gaertner.de/~lindig/papers/strictly-pretty.html>))
-
-Philip Wadler, A prettier printer, March 1998,
-((<URL:http://www.research.avayalabs.com/user/wadler/topics/recent.html#prettier>))
-
-== AUTHOR
-Tanaka Akira <akr@m17n.org>
-=end
-
-class PrettyPrint
-  def PrettyPrint.format(output='', maxwidth=79, newline="\n", genspace=lambda {|n| ' ' * n})
-    pp = PrettyPrint.new(output, maxwidth, newline, &genspace)
-    yield pp
-    pp.flush
-    output
-  end
-
-  def PrettyPrint.singleline_format(output='', maxwidth=nil, newline=nil, genspace=nil)
-    pp = SingleLine.new(output)
-    yield pp
-    output
-  end
-
-  def initialize(output='', maxwidth=79, newline="\n", &genspace)
-    @output = output
-    @maxwidth = maxwidth
-    @newline = newline
-    @genspace = genspace || lambda {|n| ' ' * n}
-
-    @output_width = 0
-    @buffer_width = 0
-    @buffer = []
-
-    root_group = Group.new(0)
-    @group_stack = [root_group]
-    @group_queue = GroupQueue.new(root_group)
-    @indent = 0
-  end
-  attr_reader :output, :maxwidth, :newline, :genspace
-  attr_reader :indent, :group_queue
-
-  def current_group
-    @group_stack.last
-  end
-
-  def first?
-    current_group.first?
-  end
-
-  def break_outmost_groups
-    while @maxwidth < @output_width + @buffer_width
-      return unless group = @group_queue.deq
-      until group.breakables.empty?
-        data = @buffer.shift
-        @output_width = data.output(@output, @output_width)
-        @buffer_width -= data.width
-      end
-      while !@buffer.empty? && Text === @buffer.first
-        text = @buffer.shift
-        @output_width = text.output(@output, @output_width)
-        @buffer_width -= text.width
-      end
-    end
-  end
-
-  def text(obj, width=obj.length)
-    if @buffer.empty?
-      @output << obj
-      @output_width += width
-    else
-      text = @buffer.last
-      unless Text === text
-        text = Text.new
-        @buffer << text
-      end
-      text.add(obj, width)
-      @buffer_width += width
-      break_outmost_groups
-    end
-  end
-
-  def fill_breakable(sep=' ', width=sep.length)
-    group { breakable sep, width }
-  end
-
-  def breakable(sep=' ', width=sep.length)
-    group = @group_stack.last
-    if group.break?
-      flush
-      @output << @newline
-      @output << @genspace.call(@indent)
-      @output_width = @indent
-      @buffer_width = 0
-    else
-      @buffer << Breakable.new(sep, width, self)
-      @buffer_width += width
-      break_outmost_groups
-    end
-  end
-
-  def group(indent=0, open_obj='', close_obj='', open_width=open_obj.length, close_width=close_obj.length)
-    text open_obj, open_width
-    group_sub {
-      nest(indent) {
-        yield
-      }
-    }
-    text close_obj, close_width
-  end
-
-  def group_sub
-    group = Group.new(@group_stack.last.depth + 1)
-    @group_stack.push group
-    @group_queue.enq group
-    begin
-      yield
-    ensure
-      @group_stack.pop
-      if group.breakables.empty?
-        @group_queue.delete group
-      end
-    end
-  end
-
-  def nest(indent)
-    @indent += indent
-    begin
-      yield
-    ensure
-      @indent -= indent
-    end
-  end
-
-  def flush
-    @buffer.each {|data|
-      @output_width = data.output(@output, @output_width)
-    }
-    @buffer.clear
-    @buffer_width = 0
-  end
-
-  class Text
-    def initialize
-      @objs = []
-      @width = 0
-    end
-    attr_reader :width
-
-    def output(out, output_width)
-      @objs.each {|obj| out << obj}
-      output_width + @width
-    end
-
-    def add(obj, width)
-      @objs << obj
-      @width += width
-    end
-  end
-
-  class Breakable
-    def initialize(sep, width, pp)
-      @obj = sep
-      @width = width
-      @pp = pp
-      @indent = pp.indent
-      @group = pp.current_group
-      @group.breakables.push self
-    end
-    attr_reader :obj, :width, :indent
-
-    def output(out, output_width)
-      @group.breakables.shift
-      if @group.break?
-        out << @pp.newline
-        out << @pp.genspace.call(@indent)
-        @indent
-      else
-        @pp.group_queue.delete @group if @group.breakables.empty?
-        out << @obj
-        output_width + @width
-      end
-    end
-  end
-
-  class Group
-    def initialize(depth)
-      @depth = depth
-      @breakables = []
-      @break = false
-    end
-    attr_reader :depth, :breakables
-
-    def break
-      @break = true
-    end
-
-    def break?
-      @break
-    end
-
-    def first?
-      if defined? @first
-        false
-      else
-        @first = false
-        true
-      end
-    end
-  end
-
-  class GroupQueue
-    def initialize(*groups)
-      @queue = []
-      groups.each {|g| enq g}
-    end
-
-    def enq(group)
-      depth = group.depth
-      @queue << [] until depth < @queue.length
-      @queue[depth] << group
-    end
-
-    def deq
-      @queue.each {|gs|
-        (gs.length-1).downto(0) {|i|
-          unless gs[i].breakables.empty?
-            group = gs.slice!(i, 1).first
-            group.break
-            return group
-          end
-        }
-        gs.each {|group| group.break}
-        gs.clear
-      }
-      return nil
-    end
-
-    def delete(group)
-      @queue[group.depth].delete(group)
-    end
-  end
-
-  class SingleLine
-    def initialize(output, maxwidth=nil, newline=nil)
-      @output = output
-      @first = [true]
-    end
-
-    def text(obj, width=nil)
-      @output << obj
-    end
-
-    def breakable(sep=' ', width=nil)
-      @output << sep
-    end
-
-    def nest(indent)
-      yield
-    end
-
-    def group(indent=nil, open_obj='', close_obj='', open_width=nil, close_width=nil)
-      @first.push true
-      @output << open_obj
-      yield
-      @output << close_obj
-      @first.pop
-    end
-
-    def flush
-    end
-
-    def first?
-      result = @first[-1]
-      @first[-1] = false
-      result
-    end
-  end
-end
-
-if __FILE__ == $0
-  require 'test/unit'
-
-  class WadlerExample < Test::Unit::TestCase
-    def setup
-      @tree = Tree.new("aaaa", Tree.new("bbbbb", Tree.new("ccc"),
-                                                 Tree.new("dd")),
-                               Tree.new("eee"),
-                               Tree.new("ffff", Tree.new("gg"),
-                                                Tree.new("hhh"),
-                                                Tree.new("ii")))
-    end
-
-    def hello(width)
-      PrettyPrint.format('', width) {|hello|
-        hello.group {
-          hello.group {
-            hello.group {
-              hello.group {
-                hello.text 'hello'
-                hello.breakable; hello.text 'a'
-              }
-              hello.breakable; hello.text 'b'
-            }
-            hello.breakable; hello.text 'c'
-          }
-          hello.breakable; hello.text 'd'
-        }
-      }
-    end
-
-    def test_hello_00_06
-      expected = <<'End'.chomp
-hello
-a
-b
-c
-d
-End
-      assert_equal(expected, hello(0))
-      assert_equal(expected, hello(6))
-    end
-
-    def test_hello_07_08
-      expected = <<'End'.chomp
-hello a
-b
-c
-d
-End
-      assert_equal(expected, hello(7))
-      assert_equal(expected, hello(8))
-    end
-
-    def test_hello_09_10
-      expected = <<'End'.chomp
-hello a b
-c
-d
-End
-      out = hello(9); assert_equal(expected, out)
-      out = hello(10); assert_equal(expected, out)
-    end
-
-    def test_hello_11_12
-      expected = <<'End'.chomp
-hello a b c
-d
-End
-      assert_equal(expected, hello(11))
-      assert_equal(expected, hello(12))
-    end
-
-    def test_hello_13
-      expected = <<'End'.chomp
-hello a b c d
-End
-      assert_equal(expected, hello(13))
-    end
-
-    def tree(width)
-      PrettyPrint.format('', width) {|pp| @tree.show(pp)}
-    end
-
-    def test_tree_00_19
-      expected = <<'End'.chomp
-aaaa[bbbbb[ccc,
-           dd],
-     eee,
-     ffff[gg,
-          hhh,
-          ii]]
-End
-      assert_equal(expected, tree(0))
-      assert_equal(expected, tree(19))
-    end
-
-    def test_tree_20_22
-      expected = <<'End'.chomp
-aaaa[bbbbb[ccc, dd],
-     eee,
-     ffff[gg,
-          hhh,
-          ii]]
-End
-      assert_equal(expected, tree(20))
-      assert_equal(expected, tree(22))
-    end
-
-    def test_tree_23_43
-      expected = <<'End'.chomp
-aaaa[bbbbb[ccc, dd],
-     eee,
-     ffff[gg, hhh, ii]]
-End
-      assert_equal(expected, tree(23))
-      assert_equal(expected, tree(43))
-    end
-
-    def test_tree_44
-      assert_equal(<<'End'.chomp, tree(44))
-aaaa[bbbbb[ccc, dd], eee, ffff[gg, hhh, ii]]
-End
-    end
-
-    def tree_alt(width)
-      PrettyPrint.format('', width) {|pp| @tree.altshow(pp)}
-    end
-
-    def test_tree_alt_00_18
-      expected = <<'End'.chomp
-aaaa[
-  bbbbb[
-    ccc,
-    dd
-  ],
-  eee,
-  ffff[
-    gg,
-    hhh,
-    ii
-  ]
-]
-End
-      assert_equal(expected, tree_alt(0))
-      assert_equal(expected, tree_alt(18))
-    end
-
-    def test_tree_alt_19_20
-      expected = <<'End'.chomp
-aaaa[
-  bbbbb[ ccc, dd ],
-  eee,
-  ffff[
-    gg,
-    hhh,
-    ii
-  ]
-]
-End
-      assert_equal(expected, tree_alt(19))
-      assert_equal(expected, tree_alt(20))
-    end
-
-    def test_tree_alt_20_49
-      expected = <<'End'.chomp
-aaaa[
-  bbbbb[ ccc, dd ],
-  eee,
-  ffff[ gg, hhh, ii ]
-]
-End
-      assert_equal(expected, tree_alt(21))
-      assert_equal(expected, tree_alt(49))
-    end
-
-    def test_tree_alt_50
-      expected = <<'End'.chomp
-aaaa[ bbbbb[ ccc, dd ], eee, ffff[ gg, hhh, ii ] ]
-End
-      assert_equal(expected, tree_alt(50))
-    end
-
-    class Tree
-      def initialize(string, *children)
-        @string = string
-        @children = children
-      end
-
-      def show(pp)
-        pp.group {
-          pp.text @string
-          pp.nest(@string.length) {
-            unless @children.empty?
-              pp.text '['
-              pp.nest(1) {
-                first = true
-                @children.each {|t|
-                  if first
-                    first = false
-                  else
-                    pp.text ','
-                    pp.breakable
-                  end
-                  t.show(pp)
-                }
-              }
-              pp.text ']'
-            end
-          }
-        }
-      end
-
-      def altshow(pp)
-        pp.group {
-          pp.text @string
-          unless @children.empty?
-            pp.text '['
-            pp.nest(2) {
-              pp.breakable
-              first = true
-              @children.each {|t|
-                if first
-                  first = false
-                else
-                  pp.text ','
-                  pp.breakable
-                end
-                t.altshow(pp)
-              }
-            }
-            pp.breakable
-            pp.text ']'
-          end
-        }
-      end
-
-    end
-  end
-
-  class StrictPrettyExample < Test::Unit::TestCase
-    def prog(width)
-      PrettyPrint.format('', width) {|pp|
-        pp.group {
-          pp.group {pp.nest(2) {
-                       pp.text "if"; pp.breakable;
-                       pp.group {
-                         pp.nest(2) {
-                           pp.group {pp.text "a"; pp.breakable; pp.text "=="}
-                           pp.breakable; pp.text "b"}}}}
-          pp.breakable
-          pp.group {pp.nest(2) {
-                       pp.text "then"; pp.breakable;
-                       pp.group {
-                         pp.nest(2) {
-                           pp.group {pp.text "a"; pp.breakable; pp.text "<<"}
-                           pp.breakable; pp.text "2"}}}}
-          pp.breakable
-          pp.group {pp.nest(2) {
-                       pp.text "else"; pp.breakable;
-                       pp.group {
-                         pp.nest(2) {
-                           pp.group {pp.text "a"; pp.breakable; pp.text "+"}
-                           pp.breakable; pp.text "b"}}}}}
-      }
-    end
-
-    def test_00_04
-      expected = <<'End'.chomp
-if
-  a
-    ==
-    b
-then
-  a
-    <<
-    2
-else
-  a
-    +
-    b
-End
-      assert_equal(expected, prog(0))
-      assert_equal(expected, prog(4))
-    end
-
-    def test_05
-      expected = <<'End'.chomp
-if
-  a
-    ==
-    b
-then
-  a
-    <<
-    2
-else
-  a +
-    b
-End
-      assert_equal(expected, prog(5))
-    end
-
-    def test_06
-      expected = <<'End'.chomp
-if
-  a ==
-    b
-then
-  a <<
-    2
-else
-  a +
-    b
-End
-      assert_equal(expected, prog(6))
-    end
-
-    def test_07
-      expected = <<'End'.chomp
-if
-  a ==
-    b
-then
-  a <<
-    2
-else
-  a + b
-End
-      assert_equal(expected, prog(7))
-    end
-
-    def test_08
-      expected = <<'End'.chomp
-if
-  a == b
-then
-  a << 2
-else
-  a + b
-End
-      assert_equal(expected, prog(8))
-    end
-
-    def test_09
-      expected = <<'End'.chomp
-if a == b
-then
-  a << 2
-else
-  a + b
-End
-      assert_equal(expected, prog(9))
-    end
-
-    def test_10
-      expected = <<'End'.chomp
-if a == b
-then
-  a << 2
-else a + b
-End
-      assert_equal(expected, prog(10))
-    end
-
-    def test_11_31
-      expected = <<'End'.chomp
-if a == b
-then a << 2
-else a + b
-End
-      assert_equal(expected, prog(11))
-      assert_equal(expected, prog(15))
-      assert_equal(expected, prog(31))
-    end
-
-    def test_32
-      expected = <<'End'.chomp
-if a == b then a << 2 else a + b
-End
-      assert_equal(expected, prog(32))
-    end
-
-  end
-
-  class TailGroup < Test::Unit::TestCase
-    def test_1
-      out = PrettyPrint.format('', 10) {|pp|
-        pp.group {
-          pp.group {
-            pp.text "abc"
-            pp.breakable
-            pp.text "def"
-          }
-          pp.group {
-            pp.text "ghi"
-            pp.breakable
-            pp.text "jkl"
-          }
-        }
-      }
-      assert_equal("abc defghi\njkl", out)
-    end
-  end
-
-  class NonString < Test::Unit::TestCase
-    def format(width)
-      PrettyPrint.format([], width, 'newline', lambda {|n| "#{n} spaces"}) {|pp|
-        pp.text(3, 3)
-        pp.breakable(1, 1)
-        pp.text(3, 3)
-      }
-    end
-
-    def test_6
-      assert_equal([3, "newline", "0 spaces", 3], format(6))
-    end
-
-    def test_7
-      assert_equal([3, 1, 3], format(7))
-    end
-
-  end
-
-  class Fill < Test::Unit::TestCase
-    def format(width)
-      PrettyPrint.format('', width) {|pp|
-        pp.group {
-          pp.text 'abc'
-          pp.fill_breakable
-          pp.text 'def'
-          pp.fill_breakable
-          pp.text 'ghi'
-          pp.fill_breakable
-          pp.text 'jkl'
-          pp.fill_breakable
-          pp.text 'mno'
-          pp.fill_breakable
-          pp.text 'pqr'
-          pp.fill_breakable
-          pp.text 'stu'
-        }
-      }
-    end
-
-    def test_00_06
-      expected = <<'End'.chomp
-abc
-def
-ghi
-jkl
-mno
-pqr
-stu
-End
-      assert_equal(expected, format(0))
-      assert_equal(expected, format(6))
-    end
-
-    def test_07_10
-      expected = <<'End'.chomp
-abc def
-ghi jkl
-mno pqr
-stu
-End
-      assert_equal(expected, format(7))
-      assert_equal(expected, format(10))
-    end
-
-    def test_11_14
-      expected = <<'End'.chomp
-abc def ghi
-jkl mno pqr
-stu
-End
-      assert_equal(expected, format(11))
-      assert_equal(expected, format(14))
-    end
-
-    def test_15_18
-      expected = <<'End'.chomp
-abc def ghi jkl
-mno pqr stu
-End
-      assert_equal(expected, format(15))
-      assert_equal(expected, format(18))
-    end
-
-    def test_19_22
-      expected = <<'End'.chomp
-abc def ghi jkl mno
-pqr stu
-End
-      assert_equal(expected, format(19))
-      assert_equal(expected, format(22))
-    end
-
-    def test_23_26
-      expected = <<'End'.chomp
-abc def ghi jkl mno pqr
-stu
-End
-      assert_equal(expected, format(23))
-      assert_equal(expected, format(26))
-    end
-
-    def test_27
-      expected = <<'End'.chomp
-abc def ghi jkl mno pqr stu
-End
-      assert_equal(expected, format(27))
-    end
-
-  end
-end
diff --git a/lib/profile.rb b/lib/profile.rb
index 104cb205b9..e4b1b4b189 100644
--- a/lib/profile.rb
+++ b/lib/profile.rb
@@ -1,6 +1,55 @@
-require 'profiler'
 
-END {
-  Profiler__::print_profile(STDERR)
-}
-Profiler__::start_profile
+module Profiler__
+  Start = Float(Time.times[0])
+  top = "toplevel".intern
+  Stack = [[0, 0, top]]
+  MAP = {top => [1, 0, 0, "#toplevel"]}
+
+  p = proc{|event, file, line, id, binding, klass|
+    case event
+    when "call", "c-call"
+      now = Float(Time.times[0])
+      Stack.push [now, 0.0, id]
+    when "return", "c-return"
+      now = Float(Time.times[0])
+      tick = Stack.pop
+      data = MAP[id]
+      unless data
+	name = klass.to_s
+	if name.nil? then name = '' end
+	if klass.kind_of? Class
+	  name += "#"
+	else
+	  name += "."
+	end
+	data = [0.0, 0.0, 0.0, name+id.id2name]
+	MAP[id] = data
+      end
+      data[0] += 1
+      cost = now - tick[0]
+      data[1] += cost
+      data[2] += cost - tick[1]
+      Stack[-1][1] += cost
+    end
+  }
+  END {
+    set_trace_func nil
+    total = Float(Time.times[0]) - Start
+    if total == 0 then total = 0.01 end
+    MAP[:toplevel][1] = total
+#    f = open("./rmon.out", "w")
+    f = STDERR
+    data = MAP.values.sort!{|a,b| b[2] <=> a[2]}
+    sum = 0
+    f.printf "  %%   cumulative   self              self     total\n"           
+    f.printf " time   seconds   seconds    calls  ms/call  ms/call  name\n"
+    for d in data
+      sum += d[2]
+      f.printf "%6.2f %8.2f  %8.2f %8d ", d[2]/total*100, sum, d[2], d[0]
+      f.printf "%8.2f %8.2f  %s\n", d[2]*1000/d[0], d[1]*1000/d[0], d[3]
+    end
+    p total
+    f.close
+  }
+  set_trace_func p
+end
diff --git a/lib/profiler.rb b/lib/profiler.rb
deleted file mode 100644
index 74e9b96295..0000000000
--- a/lib/profiler.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-module Profiler__
-  Times = if defined? Process.times then Process else Time end
-  # internal values
-  @@start = @@stack = @@map = nil
-  PROFILE_PROC = proc{|event, file, line, id, binding, klass|
-    case event
-    when "call", "c-call"
-      now = Float(Times::times[0])
-      @@stack.push [now, 0.0, id]
-    when "return", "c-return"
-      now = Float(Times::times[0])
-      tick = @@stack.pop
-      name = klass.to_s
-      if name.nil? then name = '' end
-      if klass.kind_of? Class
-	name += "#"
-      else
-	name += "."
-      end
-      name += id.id2name
-      data = @@map[name]
-      unless data
-	data = [0.0, 0.0, 0.0, name]
-	@@map[name] = data
-      end
-      data[0] += 1
-      cost = now - tick[0]
-      data[1] += cost
-      data[2] += cost - tick[1]
-      @@stack[-1][1] += cost
-    end
-  }
-module_function
-  def start_profile
-    @@start = Float(Times::times[0])
-    @@stack = [[0, 0, :toplevel], [0, 0, :dummy]]
-    @@map = {"#toplevel" => [1, 0, 0, "#toplevel"]}
-    set_trace_func PROFILE_PROC
-  end
-  def stop_profile
-    set_trace_func nil
-  end
-  def print_profile(f)
-    stop_profile
-    total = Float(Times::times[0]) - @@start
-    if total == 0 then total = 0.01 end
-    @@map["#toplevel"][1] = total
-    data = @@map.values
-    data.sort!{|a,b| b[2] <=> a[2]}
-    sum = 0
-    f.printf "  %%   cumulative   self              self     total\n"           
-    f.printf " time   seconds   seconds    calls  ms/call  ms/call  name\n"
-    for d in data
-      sum += d[2]
-      f.printf "%6.2f %8.2f  %8.2f %8d ", d[2]/total*100, sum, d[2], d[0]
-      f.printf "%8.2f %8.2f  %s\n", d[2]*1000/d[0], d[1]*1000/d[0], d[3]
-    end
-  end
-end
diff --git a/lib/pstore.rb b/lib/pstore.rb
index 93795495fc..2aa9864b58 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -12,8 +12,7 @@
 #   p db["root"]
 # end
 
-require "ftools"
-require "digest/md5"
+require "marshal"
 
 class PStore
   class Error < StandardError
@@ -24,6 +23,9 @@ class PStore
     unless File::directory? dir
       raise PStore::Error, format("directory %s does not exist", dir)
     end
+    unless File::writable? dir
+      raise PStore::Error, format("directory %s not writable", dir)
+    end
     if File::exist? file and not File::readable? file
       raise PStore::Error, format("file %s not readable", file)
     end
@@ -39,26 +41,16 @@ class PStore
 
   def [](name)
     in_transaction
-    @table[name]
-  end
-  def fetch(name, default=PStore::Error)
-    unless @table.key? name
-      if default==PStore::Error
-	raise PStore::Error, format("undefined root name `%s'", name)
-      else
-	default
-      end
+    value = @table[name]
+    if value == nil
+      raise PStore::Error, format("undefined root name `%s'", name)
     end
-    self[name]
+    value
   end
   def []=(name, value)
     in_transaction
     @table[name] = value
   end
-  def delete(name)
-    in_transaction
-    @table.delete name
-  end
 
   def roots
     in_transaction
@@ -73,38 +65,24 @@ class PStore
   end
 
   def commit
-    in_transaction
     @abort = false
     throw :pstore_abort_transaction
   end
   def abort
-    in_transaction
     @abort = true
     throw :pstore_abort_transaction
   end
 
-  def transaction(read_only=false)
+  def transaction
     raise PStore::Error, "nested transaction" if @transaction
     begin
       @transaction = true
-      value = nil
-      backup = @filename+"~"
+      value = file = nil
       begin
-	file = File::open(@filename, read_only ? "rb" : "rb+")
-	orig = true
+	File::open(@filename, "r") do |file|
+	  @table = Marshal.load(file)
+	end
       rescue Errno::ENOENT
-	raise if read_only
-	file = File::open(@filename, "wb+")
-      end
-      file.flock(read_only ? File::LOCK_SH : File::LOCK_EX)
-      if read_only
-	@table = Marshal::load(file)
-      elsif orig and (content = file.read) != ""
-	@table = Marshal::load(content)
-	size = content.size
-	md5 = Digest::MD5.digest(content)
-	content = nil		# unreference huge data
-      else
 	@table = {}
       end
       begin
@@ -115,30 +93,25 @@ class PStore
 	@abort = true
 	raise
       ensure
-	if !read_only and !@abort
-	  file.rewind
-	  content = Marshal::dump(@table)
-	  if !md5 || size != content.size || md5 != Digest::MD5.digest(content)
-	    File::copy @filename, backup
-	    begin
-	      file.write(content)
-	      file.truncate(file.pos)
-	      content = nil		# unreference huge data
-	    rescue
-	      File::rename backup, @filename if File::exist?(backup)
-	      raise
+	unless @abort
+	  begin
+	    File::rename @filename, @filename+"~"
+	  rescue Errno::ENOENT
+	    no_orig = true
+	  end
+	  begin
+	    File::open(@filename, "w") do |file|
+	      Marshal::dump(@table, file)
 	    end
+	  rescue
+	    File::rename @filename+"~", @filename unless no_orig
 	  end
 	end
-	if @abort and !orig
-	  File.unlink(@filename)
-	end
 	@abort = false
       end
     ensure
       @table = nil
       @transaction = false
-      file.close if file
     end
     value
   end
@@ -158,8 +131,4 @@ if __FILE__ == $0
       p db["root"][0]
     end
   end
-
-  db.transaction(true) do
-    p db["root"]
-  end
 end
diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb
deleted file mode 100644
index ae7bec577a..0000000000
--- a/lib/racc/parser.rb
+++ /dev/null
@@ -1,475 +0,0 @@
-#
-# parser.rb
-#
-#   Copyright (c) 1999-2002 Minero Aoki <aamine@loveruby.net>
-#
-#   This program is free software.
-#   You can distribute/modify this program under the same terms of ruby.
-#
-#   As a special exception, when this code is copied by Racc
-#   into a Racc output file, you may use that output file
-#   without restriction.
-#
-#   $Id$
-#
-
-module Racc
-  class ParseError < StandardError; end
-end
-unless defined? ::ParseError then
-  ParseError = Racc::ParseError
-end
-
-
-module Racc
-
-  unless defined? Racc_No_Extentions then
-    Racc_No_Extentions = false
-  end
-
-  class Parser
-
-    Racc_Runtime_Version = '1.4.2'
-    Racc_Runtime_Revision = '$Revision$'.split(/\s+/)[1]
-
-    Racc_Runtime_Core_Version_R = '1.4.2'
-    Racc_Runtime_Core_Revision_R = '$Revision$'.split(/\s+/)[1]
-    begin
-      require 'racc/cparse'
-    # Racc_Runtime_Core_Version_C  = (defined in extention)
-      Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split(/\s+/)[2]
-      unless new.respond_to? :_racc_do_parse_c, true then
-        raise LoadError, 'old cparse.so'
-      end
-      if Racc_No_Extentions then
-        raise LoadError, 'selecting ruby version of racc runtime core'
-      end
-
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_c
-      Racc_YY_Parse_Method         = :_racc_yyparse_c
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_C
-      Racc_Runtime_Type            = 'c'
-    rescue LoadError
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
-      Racc_YY_Parse_Method         = :_racc_yyparse_rb
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_R
-      Racc_Runtime_Type            = 'ruby'
-    end
-
-    def self.racc_runtime_type
-      Racc_Runtime_Type
-    end
-
-
-    private
-
-
-    def _racc_setup
-      t = self.class
-
-      unless t::Racc_debug_parser then
-        @yydebug = false
-      end
-      @yydebug = false unless defined? @yydebug
-
-      if @yydebug then
-        @racc_debug_out = $stderr unless defined? @racc_debug_out
-        @racc_debug_out ||= $stderr
-      end
-
-      arg = t::Racc_arg
-      if arg.size < 14 then
-        arg[13] = true
-      end
-      arg
-    end
-
-    def _racc_init_sysvars
-      @racc_state = [ 0 ]
-      @racc_tstack = []
-      @racc_vstack = []
-
-      @racc_t = nil
-      @racc_val = nil
-
-      @racc_read_next = true
-
-      @racc_user_yyerror = false
-      @racc_error_status = 0
-    end
-
-
-    ###
-    ### do_parse
-    ###
-
-    def do_parse
-      __send__ Racc_Main_Parsing_Routine, _racc_setup(), false
-    end
-
-    def next_token
-      raise NotImplementedError, "#{self.class}\#next_token is not defined"
-    end
-
-    def _racc_do_parse_rb( arg, in_debug )
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-
-      _racc_init_sysvars
-      tok = act = i = nil
-      nerr = 0
-
-
-      catch( :racc_end_parse ) {
-      while true do
-
-        if i = action_pointer[ @racc_state[-1] ] then
-          if @racc_read_next then
-            if @racc_t != 0 then   # not EOF
-              tok, @racc_val = next_token()
-              unless tok then   # EOF
-                @racc_t = 0
-              else
-                @racc_t = (token_table[tok] or 1)   # error token
-              end
-              racc_read_token( @racc_t, tok, @racc_val ) if @yydebug
-
-              @racc_read_next = false
-            end
-          end
-          i += @racc_t
-          if i >= 0 and act = action_table[i] and
-             action_check[i] == @racc_state[-1] then
-            ;
-          else
-            act = action_default[ @racc_state[-1] ]
-          end
-        else
-          act = action_default[ @racc_state[-1] ]
-        end
-
-        while act = _racc_evalact( act, arg ) do end
-
-      end
-      }
-    end
-
-
-    ###
-    ### yyparse
-    ###
-
-    def yyparse( recv, mid )
-      __send__ Racc_YY_Parse_Method, recv, mid, _racc_setup(), true
-    end
-
-    def _racc_yyparse_rb( recv, mid, arg, c_debug )
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-
-      _racc_init_sysvars
-      tok = nil
-      act = nil
-      i = nil
-      nerr = 0
-
-
-      catch( :racc_end_parse ) {
-        until i = action_pointer[ @racc_state[-1] ] do
-          while act = _racc_evalact(
-                  action_default[ @racc_state[-1] ], arg ) do end
-        end
-
-        recv.__send__( mid ) do |tok, val|
-# $stderr.puts "rd: tok=#{tok}, val=#{val}"
-          unless tok then
-            @racc_t = 0
-          else
-            @racc_t = (token_table[tok] or 1)   # error token
-          end
-          @racc_val = val
-          @racc_read_next = false
-
-          i += @racc_t
-          if i >= 0 and act = action_table[i] and
-             action_check[i] == @racc_state[-1] then
-# $stderr.puts "01: act=#{act}"
-          else
-            act = action_default[ @racc_state[-1] ]
-# $stderr.puts "02: act=#{act}"
-# $stderr.puts "curstate=#{@racc_state[-1]}"
-          end
-
-          while act = _racc_evalact( act, arg ) do end
-
-          while not (i = action_pointer[ @racc_state[-1] ]) or
-                not @racc_read_next or
-                @racc_t == 0 do   # $
-            if i and i += @racc_t and
-               i >= 0 and
-               act = action_table[i] and
-               action_check[i] == @racc_state[-1] then
-# $stderr.puts "03: act=#{act}"
-              ;
-            else
-# $stderr.puts "04: act=#{act}"
-              act = action_default[ @racc_state[-1] ]
-            end
-
-            while act = _racc_evalact( act, arg ) do end
-          end
-        end
-      }
-    end
-
-
-    ###
-    ### common
-    ###
-
-    def _racc_evalact( act, arg )
-# $stderr.puts "ea: act=#{act}"
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-nerr = 0   # tmp
-
-      if act > 0 and act < shift_n then
-        #
-        # shift
-        #
-
-        if @racc_error_status > 0 then
-          @racc_error_status -= 1 unless @racc_t == 1   # error token
-        end
-
-        @racc_vstack.push @racc_val
-        @racc_state.push act
-        @racc_read_next = true
-
-        if @yydebug then
-          @racc_tstack.push @racc_t
-          racc_shift( @racc_t, @racc_tstack, @racc_vstack )
-        end
-
-      elsif act < 0 and act > -reduce_n then
-        #
-        # reduce
-        #
-
-        code = catch( :racc_jump ) {
-          @racc_state.push _racc_do_reduce( arg, act )
-          false
-        }
-        if code then
-          case code
-          when 1 # yyerror
-            @racc_user_yyerror = true   # user_yyerror
-            return -reduce_n
-          when 2 # yyaccept
-            return shift_n
-          else
-            raise RuntimeError, '[Racc Bug] unknown jump code'
-          end
-        end
-
-      elsif act == shift_n then
-        #
-        # accept
-        #
-
-        racc_accept if @yydebug
-        throw :racc_end_parse, @racc_vstack[0]
-
-      elsif act == -reduce_n then
-        #
-        # error
-        #
-
-        case @racc_error_status
-        when 0
-          unless arg[21] then   # user_yyerror
-            nerr += 1
-            on_error @racc_t, @racc_val, @racc_vstack
-          end
-        when 3
-          if @racc_t == 0 then   # is $
-            throw :racc_end_parse, nil
-          end
-          @racc_read_next = true
-        end
-        @racc_user_yyerror = false
-        @racc_error_status = 3
-
-        while true do
-          if i = action_pointer[ @racc_state[-1] ] then
-            i += 1   # error token
-            if i >= 0 and
-               (act = action_table[i]) and
-               action_check[i] == @racc_state[-1]  then
-               break
-            end
-          end
-
-          throw :racc_end_parse, nil if @racc_state.size < 2
-          @racc_state.pop
-          @racc_vstack.pop
-          if @yydebug then
-            @racc_tstack.pop
-            racc_e_pop( @racc_state, @racc_tstack, @racc_vstack )
-          end
-        end
-
-        return act
-
-      else
-        raise RuntimeError, "[Racc Bug] unknown action #{act.inspect}"
-      end
-
-      racc_next_state( @racc_state[-1], @racc_state ) if @yydebug
-
-      nil
-    end
-
-    def _racc_do_reduce( arg, act )
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-      state = @racc_state
-      vstack = @racc_vstack
-      tstack = @racc_tstack
-
-      i = act * -3
-      len       = reduce_table[i]
-      reduce_to = reduce_table[i+1]
-      method_id = reduce_table[i+2]
-      void_array = []
-
-      tmp_t = tstack[ -len, len ] if @yydebug
-      tmp_v = vstack[ -len, len ]
-      tstack[ -len, len ] = void_array if @yydebug
-      vstack[ -len, len ] = void_array
-      state[ -len, len ]  = void_array
-
-      # tstack must be updated AFTER method call
-      if use_result then
-        vstack.push __send__(method_id, tmp_v, vstack, tmp_v[0])
-      else
-        vstack.push __send__(method_id, tmp_v, vstack)
-      end
-      tstack.push reduce_to
-
-      racc_reduce( tmp_t, reduce_to, tstack, vstack ) if @yydebug
-
-      k1 = reduce_to - nt_base
-      if i = goto_pointer[ k1 ] then
-        i += state[-1]
-        if i >= 0 and (curstate = goto_table[i]) and goto_check[i] == k1 then
-          return curstate
-        end
-      end
-      goto_default[ k1 ]
-    end
-
-    def on_error( t, val, vstack )
-      raise ParseError, sprintf("\nparse error on value %s (%s)",
-                                val.inspect,
-                                token_to_str(t) || '?')
-    end
-
-    def yyerror
-      throw :racc_jump, 1
-    end
-
-    def yyaccept
-      throw :racc_jump, 2
-    end
-
-    def yyerrok
-      @racc_error_status = 0
-    end
-
-
-    # for debugging output
-
-    def racc_read_token( t, tok, val )
-      @racc_debug_out.print 'read    '
-      @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
-      @racc_debug_out.puts val.inspect
-      @racc_debug_out.puts
-    end
-
-    def racc_shift( tok, tstack, vstack )
-      @racc_debug_out.puts "shift   #{racc_token2str tok}"
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_reduce( toks, sim, tstack, vstack )
-      out = @racc_debug_out
-      out.print 'reduce '
-      if toks.empty? then
-        out.print ' <none>'
-      else
-        toks.each {|t| out.print ' ', racc_token2str(t) }
-      end
-      out.puts " --> #{racc_token2str(sim)}"
-          
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_accept
-      @racc_debug_out.puts 'accept'
-      @racc_debug_out.puts
-    end
-
-    def racc_e_pop( state, tstack, vstack )
-      @racc_debug_out.puts 'error recovering mode: pop token'
-      racc_print_states state
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_next_state( curstate, state )
-      @racc_debug_out.puts  "goto    #{curstate}"
-      racc_print_states state
-      @racc_debug_out.puts
-    end
-
-    def racc_print_stacks( t, v )
-      out = @racc_debug_out
-      out.print '        ['
-      t.each_index do |i|
-        out.print ' (', racc_token2str(t[i]), ' ', v[i].inspect, ')'
-      end
-      out.puts ' ]'
-    end
-
-    def racc_print_states( s )
-      out = @racc_debug_out
-      out.print '        ['
-      s.each {|st| out.print ' ', st }
-      out.puts ' ]'
-    end
-
-    def racc_token2str( tok )
-      self.class::Racc_token_to_s_table[tok] or
-        raise RuntimeError, "[Racc Bug] can't convert token #{tok} to string"
-    end
-
-    def token_to_str( t )
-      self.class::Racc_token_to_s_table[t]
-    end
-
-  end
-
-end
diff --git a/lib/rational.rb b/lib/rational.rb
index 38af7b8a81..f976cf034f 100644
--- a/lib/rational.rb
+++ b/lib/rational.rb
@@ -1,14 +1,14 @@
 #
 #   rational.rb - 
 #   	$Release Version: 0.5 $
-#   	$Revision: 1.7 $
-#   	$Date: 1999/08/24 12:49:28 $
+#   	$Revision: 1.3 $
+#   	$Date: 1998/03/11 14:09:03 $
 #   	by Keiju ISHITSUKA(SHL Japan Inc.)
 #
 # --
 #   Usage:
 #   class Rational < Numeric
-#      (include Comparable)
+#      (include Compareable)
 #
 #   Rational(a, b) --> a/b
 #
@@ -31,9 +31,8 @@
 #   Integer::to_r
 #
 #   Fixnum::**
-#   Fixnum::quo
 #   Bignum::**
-#   Bignum::quo
+#   
 #
 
 def Rational(a, b = 1)
@@ -45,10 +44,10 @@ def Rational(a, b = 1)
 end
   
 class Rational < Numeric
-  @RCS_ID='-$Id: rational.rb,v 1.7 1999/08/24 12:49:28 keiju Exp keiju $-'
+  @RCS_ID='-$Id: rational.rb,v 1.3 1998/03/11 14:09:03 keiju Exp keiju $-'
 
   def Rational.reduce(num, den = 1)
-    raise ZeroDivisionError, "denominator is 0" if den == 0
+    raise ZeroDivisionError, "denometor is 0" if den == 0
 
     if den < 0
       num = -num
@@ -67,9 +66,7 @@ class Rational < Numeric
   def Rational.new!(num, den = 1)
     new(num, den)
   end
-
-  private_class_method :new
-
+  
   def initialize(num, den)
     if den < 0
       num = -num
@@ -94,7 +91,7 @@ class Rational < Numeric
     elsif a.kind_of?(Float)
       Float(self) + a
     else
-      x, y = a.coerce(self)
+      x , y = a.coerce(self)
       x + y
     end
   end
@@ -109,7 +106,7 @@ class Rational < Numeric
     elsif a.kind_of?(Float)
       Float(self) - a
     else
-      x, y = a.coerce(self)
+      x , y = a.coerce(self)
       x - y
     end
   end
@@ -124,7 +121,7 @@ class Rational < Numeric
     elsif a.kind_of?(Float)
       Float(self) * a
     else
-      x, y = a.coerce(self)
+      x , y = a.coerce(self)
       x * y
     end
   end
@@ -135,12 +132,12 @@ class Rational < Numeric
       den = @denominator * a.numerator
       Rational(num, den)
     elsif a.kind_of?(Integer)
-      raise ZeroDivisionError, "divided by 0" if a == 0
+      raise ZeroDivisionError, "devided by 0" if a == 0
       self / Rational.new!(a, 1)
     elsif a.kind_of?(Float)
       Float(self) / a
     else
-      x, y = a.coerce(self)
+      x , y = a.coerce(self)
       x / y
     end
   end
@@ -163,7 +160,7 @@ class Rational < Numeric
     elsif other.kind_of?(Float)
       Float(self) ** other
     else
-      x, y = other.coerce(self)
+      x , y = other.coerce(self)
       x ** y
     end
   end
@@ -186,18 +183,6 @@ class Rational < Numeric
     end
   end
 
-  def == (other)
-    if other.kind_of?(Rational)
-      @numerator == other.numerator and @denominator == other.denominator
-    elsif other.kind_of?(Integer)
-      self == Rational.new!(other, 1)
-    elsif other.kind_of?(Float)
-      Float(self) == other
-    else
-      other == self
-    end
-  end
-
   def <=> (other)
     if other.kind_of?(Rational)
       num = @numerator * other.denominator
@@ -214,11 +199,9 @@ class Rational < Numeric
       return self <=> Rational.new!(other, 1)
     elsif other.kind_of?(Float)
       return Float(self) <=> other
-    elsif defined? other.coerce
-      x, y = other.coerce(self)
-      return x <=> y
     else
-      return nil
+      x , y = other.coerce(self)
+      return x <=> y
     end
   end
 
@@ -252,12 +235,8 @@ class Rational < Numeric
     self
   end
   
-  def inspect
-    sprintf("Rational(%s, %s)", @numerator.inspect, @denominator.inspect)
-  end
-  
   def hash
-    @numerator.hash ^ @denominator.hash
+    @numerator ^ @denominator
   end
   
   attr :numerator
@@ -271,7 +250,7 @@ class Integer
     self
   end
   
-  def denominator
+  def denomerator
     1
   end
   
@@ -279,27 +258,7 @@ class Integer
     Rational(self, 1)
   end
   
-  def gcd(n)
-    m = self.abs
-    n = n.abs
-
-    return n if m == 0
-    return m if n == 0
-
-    b = 0
-    while n[0] == 0 && m[0] == 0
-      b += 1; n >>= 1; m >>= 1
-    end
-    m >>= 1 while m[0] == 0
-    n >>= 1 while n[0] == 0
-    while m != n
-      m, n = n, m if n > m
-      m -= n; m >>= 1 while m[0] == 0
-    end
-    m << b
-  end
-  
-  def gcd2(int)
+  def gcd(int)
     a = self.abs
     b = int.abs
   
@@ -311,7 +270,7 @@ class Integer
     end
     return a
   end
-
+  
   def lcm(int)
     a = self.abs
     b = int.abs
@@ -329,11 +288,41 @@ class Integer
 end
 
 class Fixnum
-  undef quo
-  def quo(other)
+  alias div! /;
+  def div(other)
+    if other.kind_of?(Fixnum)
+      self.div!(other)
+    elsif other.kind_of?(Bignum)
+      x, y = other.coerce(self)
+      x.div!(y)
+    else
+      x, y = other.coerce(self)
+      x / y
+    end
+  end
+  
+#  alias divmod! divmod
+  
+  if not defined? Complex
+    alias power! **;
+  end
+  
+#   def rdiv(other)
+#     if other.kind_of?(Fixnum)
+#       Rational(self, other)
+#     elsif
+#       x, y = other.coerce(self)
+#       if defined?(x.div())
+# 	x.div(y)
+#       else
+# 	x / y
+#       end
+#     end
+  #   end
+  
+  def rdiv(other)
     Rational.new!(self,1) / other
   end
-  alias rdiv quo
   
   def rpower (other)
     if other >= 0
@@ -342,23 +331,24 @@ class Fixnum
       Rational.new!(self,1)**other
     end
   end
-
-  unless defined? 1.power!
-    alias power! ** 
+    
+  if not defined? Complex
     alias ** rpower
   end
 end
 
 class Bignum
-  unless defined? Complex
+  alias div! /;
+  alias div /;
+  alias divmod! divmod
+  
+  if not defined? power!
     alias power! **
   end
-
-  undef quo
-  def quo(other)
+  
+  def rdiv(other)
     Rational.new!(self,1) / other
   end
-  alias rdiv quo
   
   def rpower (other)
     if other >= 0
@@ -368,7 +358,9 @@ class Bignum
     end
   end
   
-  unless defined? Complex
+  if not defined? Complex
     alias ** rpower
   end
+  
 end
+
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
deleted file mode 100644
index 560a813d66..0000000000
--- a/lib/resolv-replace.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'socket'
-require 'resolv'
-
-class BasicSocket
-  alias original_resolv_send send
-  def send(mesg, flags, *rest)
-    rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
-    original_resolv_send(mesg, flags, *rest)
-  end
-end
-
-class << IPSocket
-  alias original_resolv_getaddress getaddress
-  def getaddress(host)
-    return Resolv.getaddress(host).to_s
-  end
-end
-
-class TCPSocket
-  alias original_resolv_initialize initialize
-  def initialize(host, serv, *rest)
-    rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
-    original_resolv_initialize(Resolv.getaddress(host).to_s, serv, *rest)
-  end
-end
-
-class UDPSocket
-  alias original_resolv_bind bind
-  def bind(host, port)
-    original_resolv_bind(Resolv.getaddress(host).to_s, port)
-  end
-
-  alias original_resolv_connect connect
-  def connect(host, port)
-    original_resolv_connect(Resolv.getaddress(host).to_s, port)
-  end
-
-  alias original_resolv_send send
-  def send(mesg, flags, *rest)
-    rest[0] = Resolv.getaddress(rest[0]).to_s unless rest.empty?
-    original_resolv_send(mesg, flags, *rest)
-  end
-end
-
-class SOCKSSocket
-  alias original_resolv_initialize initialize
-  def initialize(host, serv)
-    original_resolv_initialize(Resolv.getaddress(host).to_s, port)
-  end
-end if defined? SOCKSSocket
diff --git a/lib/resolv.rb b/lib/resolv.rb
deleted file mode 100644
index edc17c2f19..0000000000
--- a/lib/resolv.rb
+++ /dev/null
@@ -1,1710 +0,0 @@
-=begin
-= resolv library
-resolv.rb is a resolver library written in Ruby.
-Since it is written in Ruby, it is thread-aware.
-I.e. it can resolv many hostnames concurrently.
-
-It is possible to lookup various resources of DNS using DNS module directly.
-
-== example
-  Resolv.getaddress("www.ruby-lang.org")
-  Resolv.getname("210.251.121.214")
-
-  dns = Resolv::DNS.new
-  dns.getresources("www.ruby-lang.org", Resolv::DNS::Resource::IN::A).collect {|r| r.address}
-  dns.getresources("ruby-lang.org", Resolv::DNS::Resource::IN::MX).collect {|r| [r.exchange.to_s, r.preference]}
-
-== Resolv class
-
-=== class methods
---- Resolv.getaddress(name)
---- Resolv.getaddresses(name)
---- Resolv.each_address(name) {|address| ...}
-    They lookups IP addresses of ((|name|)) which represents a hostname
-    as a string by default resolver.
-
-    getaddress returns first entry of lookupped addresses.
-    getaddresses returns lookupped addresses as an array.
-    each_address iterates over lookupped addresses.
-
---- Resolv.getname(address)
---- Resolv.getnames(address)
---- Resolv.each_name(address) {|name| ...}
-    lookups hostnames of ((|address|)) which represents IP address as a string.
-
-    getname returns first entry of lookupped names.
-    getnames returns lookupped names as an array.
-    each_names iterates over lookupped names.
-
-== Resolv::Hosts class
-hostname resolver using /etc/hosts format.
-
-=== class methods
---- Resolv::Hosts.new(hosts='/etc/hosts')
-
-=== methods
---- Resolv::Hosts#getaddress(name)
---- Resolv::Hosts#getaddresses(name)
---- Resolv::Hosts#each_address(name) {|address| ...}
-    address lookup methods.
-
---- Resolv::Hosts#getname(address)
---- Resolv::Hosts#getnames(address)
---- Resolv::Hosts#each_name(address) {|name| ...}
-    hostnames lookup methods.
-
-== Resolv::DNS class
-DNS stub resolver.
-
-=== class methods
---- Resolv::DNS.new(resolv_conf='/etc/resolv.conf')
-
---- Resolv::DNS.open(resolv_conf='/etc/resolv.conf')
---- Resolv::DNS.open(resolv_conf='/etc/resolv.conf') {|dns| ...}
-
-=== methods
---- Resolv::DNS#close
-
---- Resolv::DNS#getaddress(name)
---- Resolv::DNS#getaddresses(name)
---- Resolv::DNS#each_address(name) {|address| ...}
-    address lookup methods.
-
-    ((|name|)) must be a instance of Resolv::DNS::Name or String.  Lookupped
-    address is represented as an instance of Resolv::IPv4 or Resolv::IPv6.
-
---- Resolv::DNS#getname(address)
---- Resolv::DNS#getnames(address)
---- Resolv::DNS#each_name(address) {|name| ...}
-    hostnames lookup methods.
-
-    ((|address|)) must be a instance of Resolv::IPv4, Resolv::IPv6 or String.
-    Lookupped name is represented as an instance of Resolv::DNS::Name.
-
---- Resolv::DNS#getresource(name, typeclass)
---- Resolv::DNS#getresources(name, typeclass)
---- Resolv::DNS#each_resource(name, typeclass) {|resource| ...}
-    They lookup DNS resources of ((|name|)).
-    ((|name|)) must be a instance of Resolv::Name or String.
-
-    ((|typeclass|)) should be one of follows:
-    * Resolv::DNS::Resource::IN::ANY
-    * Resolv::DNS::Resource::IN::NS
-    * Resolv::DNS::Resource::IN::CNAME
-    * Resolv::DNS::Resource::IN::SOA
-    * Resolv::DNS::Resource::IN::HINFO
-    * Resolv::DNS::Resource::IN::MINFO
-    * Resolv::DNS::Resource::IN::MX
-    * Resolv::DNS::Resource::IN::TXT
-    * Resolv::DNS::Resource::IN::ANY
-    * Resolv::DNS::Resource::IN::A
-    * Resolv::DNS::Resource::IN::WKS
-    * Resolv::DNS::Resource::IN::PTR
-    * Resolv::DNS::Resource::IN::AAAA
-
-    Lookupped resource is represented as an instance of (a subclass of)
-    Resolv::DNS::Resource. 
-    (Resolv::DNS::Resource::IN::A, etc.)
-
-== Resolv::DNS::Resource::IN::NS class
---- name
-== Resolv::DNS::Resource::IN::CNAME class
---- name
-== Resolv::DNS::Resource::IN::SOA class
---- mname
---- rname
---- serial
---- refresh
---- retry
---- expire
---- minimum
-== Resolv::DNS::Resource::IN::HINFO class
---- cpu
---- os
-== Resolv::DNS::Resource::IN::MINFO class
---- rmailbx
---- emailbx
-== Resolv::DNS::Resource::IN::MX class
---- preference
---- exchange
-== Resolv::DNS::Resource::IN::TXT class
---- data
-== Resolv::DNS::Resource::IN::A class
---- address
-== Resolv::DNS::Resource::IN::WKS class
---- address
---- protocol
---- bitmap
-== Resolv::DNS::Resource::IN::PTR class
---- name
-== Resolv::DNS::Resource::IN::AAAA class
---- address
-
-== Resolv::DNS::Name class
-
-=== class methods
---- Resolv::DNS::Name.create(name)
-
-=== methods
---- Resolv::DNS::Name#to_s
-
-== Resolv::DNS::Resource class
-
-== Resolv::IPv4 class
-=== class methods
---- Resolv::IPv4.create(address)
-
-=== methods
---- Resolv::IPv4#to_s
---- Resolv::IPv4#to_name
-
-=== constants
---- Resolv::IPv4::Regex
-    regular expression for IPv4 address.
-
-== Resolv::IPv6 class
-=== class methods
---- Resolv::IPv6.create(address)
-
-=== methods
---- Resolv::IPv6#to_s
---- Resolv::IPv6#to_name
-
-=== constants
---- Resolv::IPv6::Regex
-    regular expression for IPv6 address.
-
-== Bugs
-* NIS is not supported.
-* /etc/nsswitch.conf is not supported.
-* IPv6 is not supported.
-
-=end
-
-require 'socket'
-require 'fcntl'
-require 'timeout'
-require 'thread'
-
-class Resolv
-  def self.getaddress(name)
-    DefaultResolver.getaddress(name)
-  end
-
-  def self.getaddresses(name)
-    DefaultResolver.getaddresses(name)
-  end
-
-  def self.each_address(name, &block)
-    DefaultResolver.each_address(name, &block)
-  end
-
-  def self.getname(address)
-    DefaultResolver.getname(address)
-  end
-
-  def self.getnames(address)
-    DefaultResolver.getnames(address)
-  end
-
-  def self.each_name(address, &proc)
-    DefaultResolver.each_name(address, &proc)
-  end
-
-  def initialize(resolvers=[Hosts.new, DNS.new])
-    @resolvers = resolvers
-  end
-
-  def getaddress(name)
-    each_address(name) {|address| return address}
-    raise ResolvError.new("no address for #{name}")
-  end
-
-  def getaddresses(name)
-    ret = []
-    each_address(name) {|address| ret << address}
-    return ret
-  end
-
-  def each_address(name)
-    if AddressRegex =~ name
-      yield name
-      return
-    end
-    yielded = false
-    @resolvers.each {|r|
-      r.each_address(name) {|address|
-        yield address.to_s
-        yielded = true
-      }
-      return if yielded
-    }
-  end
-
-  def getname(address)
-    each_name(address) {|name| return name}
-    raise ResolvError.new("no name for #{address}")
-  end
-
-  def getnames(address)
-    ret = []
-    each_name(address) {|name| ret << name}
-    return ret
-  end
-
-  def each_name(address)
-    yielded = false
-    @resolvers.each {|r|
-      r.each_name(address) {|name|
-        yield name.to_s
-        yielded = true
-      }
-      return if yielded
-    }
-  end
-
-  class ResolvError < StandardError
-  end
-
-  class ResolvTimeout < TimeoutError
-  end
-
-  class Hosts
-    if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
-      require 'win32/resolv'
-      DefaultFileName = Win32::Resolv.get_hosts_path
-    else
-      DefaultFileName = '/etc/hosts'
-    end
-
-    def initialize(filename = DefaultFileName)
-      @filename = filename
-      @mutex = Mutex.new
-      @initialized = nil
-    end
-
-    def lazy_initialize
-      @mutex.synchronize {
-        unless @initialized
-          @name2addr = {}
-          @addr2name = {}
-          open(@filename) {|f|
-            f.each {|line|
-              line.sub!(/#.*/, '')
-              addr, hostname, *aliases = line.split(/\s+/)
-              next unless addr
-              addr.untaint
-              hostname.untaint
-              @addr2name[addr] = [] unless @addr2name.include? addr
-              @addr2name[addr] << hostname
-              @addr2name[addr] += aliases
-              @name2addr[hostname] = [] unless @name2addr.include? hostname
-              @name2addr[hostname] << addr
-              aliases.each {|n|
-                n.untaint
-                @name2addr[n] = [] unless @name2addr.include? n
-                @name2addr[n] << addr
-              }
-            }
-          }
-          @name2addr.each {|name, arr| arr.reverse!}
-          @initialized = true
-        end
-      }
-    end
-
-    def getaddress(name)
-      each_address(name) {|address| return address}
-      raise ResolvError.new("#{@filename} has no name: #{name}")
-    end
-
-    def getaddresses(name)
-      ret = []
-      each_address(name) {|address| ret << address}
-      return ret
-    end
-
-    def each_address(name, &proc)
-      lazy_initialize
-      if @name2addr.include?(name)
-        @name2addr[name].each(&proc)
-      end
-    end
-
-    def getname(address)
-      each_name(address) {|name| return name}
-      raise ResolvError.new("#{@filename} has no address: #{address}")
-    end
-
-    def getnames(address)
-      ret = []
-      each_name(address) {|name| ret << name}
-      return ret
-    end
-
-    def each_name(address, &proc)
-      lazy_initialize
-      if @addr2name.include?(address)
-        @addr2name[address].each(&proc)
-      end
-    end
-  end
-
-  class DNS
-    # STD0013 (RFC 1035, etc.)
-    # ftp://ftp.isi.edu/in-notes/iana/assignments/dns-parameters
-
-    Port = 53
-    UDPSize = 512
-
-    DNSThreadGroup = ThreadGroup.new
-
-    def self.open(*args)
-      dns = new(*args)
-      return dns unless block_given?
-      begin
-        yield dns
-      ensure
-        dns.close
-      end
-    end
-
-    def initialize(config="/etc/resolv.conf")
-      @mutex = Mutex.new
-      @config = Config.new(config)
-      @initialized = nil
-    end
-
-    def lazy_initialize
-      @mutex.synchronize {
-        unless @initialized
-          @config.lazy_initialize
-
-          if nameserver = @config.single?
-            @requester = Requester::ConnectedUDP.new(nameserver)
-          else
-            @requester = Requester::UnconnectedUDP.new
-          end
-
-          @initialized = true
-        end
-      }
-    end
-
-    def close
-      @mutex.synchronize {
-        if @initialized
-          @requester.close if @requester
-          @requester = nil
-          @initialized = false
-        end
-      }
-    end
-
-    def getaddress(name)
-      each_address(name) {|address| return address}
-      raise ResolvError.new("DNS result has no information for #{name}")
-    end
-
-    def getaddresses(name)
-      ret = []
-      each_address(name) {|address| ret << address}
-      return ret
-    end
-
-    def each_address(name)
-      each_resource(name, Resource::IN::A) {|resource| yield resource.address}
-    end
-
-    def getname(address)
-      each_name(address) {|name| return name}
-      raise ResolvError.new("DNS result has no information for #{address}")
-    end
-
-    def getnames(address)
-      ret = []
-      each_name(address) {|name| ret << name}
-      return ret
-    end
-
-    def each_name(address)
-      case address
-      when Name
-        ptr = address
-      when IPv4::Regex
-        ptr = IPv4.create(address).to_name
-      when IPv6::Regex
-        ptr = IPv6.create(address).to_name
-      else
-        raise ResolvError.new("cannot interpret as address: #{address}")
-      end
-      each_resource(ptr, Resource::IN::PTR) {|resource| yield resource.name}
-    end
-
-    def getresource(name, typeclass)
-      each_resource(name, typeclass) {|resource| return resource}
-      raise ResolvError.new("DNS result has no information for #{name}")
-    end
-
-    def getresources(name, typeclass)
-      ret = []
-      each_resource(name, typeclass) {|resource| ret << resource}
-      return ret
-    end
-
-    def each_resource(name, typeclass, &proc)
-      lazy_initialize
-      q = Queue.new
-      senders = {}
-      begin
-        @config.resolv(name) {|candidate, tout, nameserver|
-          msg = Message.new
-          msg.rd = 1
-          msg.add_question(candidate, typeclass)
-          unless sender = senders[[candidate, nameserver]]
-            sender = senders[[candidate, nameserver]] =
-              @requester.sender(msg, candidate, q, nameserver)
-          end
-          sender.send
-          reply = reply_name = nil
-          timeout(tout, ResolvTimeout) { reply, reply_name = q.pop }
-          case reply.rcode
-          when RCode::NoError
-            extract_resources(reply, reply_name, typeclass, &proc)
-            return
-          when RCode::NXDomain
-            raise Config::NXDomain.new(reply_name.to_s)
-          else
-            raise Config::OtherResolvError.new(reply_name.to_s)
-          end
-        }
-      ensure
-        @requester.delete(q)
-      end
-    end
-
-    def extract_resources(msg, name, typeclass)
-      if typeclass < Resource::ANY
-        n0 = Name.create(name)
-        msg.each_answer {|n, ttl, data|
-          yield data if n0 == n
-        }
-      end
-      yielded = false
-      n0 = Name.create(name)
-      msg.each_answer {|n, ttl, data|
-        if n0 == n
-          case data
-          when typeclass
-            yield data
-            yielded = true
-          when Resource::CNAME
-            n0 = data.name
-          end
-        end
-      }
-      return if yielded
-      msg.each_answer {|n, ttl, data|
-        if n0 == n
-          case data
-          when typeclass
-            yield data
-          end
-        end
-      }
-    end
-
-    class Requester
-      def initialize
-        @senders = {}
-      end
-
-      def close
-        thread, sock, @thread, @sock = @thread, @sock
-        begin
-          if thread
-            thread.kill
-            thread.join
-          end
-        ensure
-          sock.close if sock
-        end
-      end
-
-      def delete(arg)
-        case arg
-        when Sender
-          @senders.delete_if {|k, s| s == arg }
-        when Queue
-          @senders.delete_if {|k, s| s.queue == arg }
-        else
-          raise ArgumentError.new("neither Sender or Queue: #{arg}")
-        end
-      end
-
-      class Sender
-        def initialize(msg, data, sock, queue)
-          @msg = msg
-          @data = data
-          @sock = sock
-          @queue = queue
-        end
-        attr_reader :queue
-
-        def recv(msg)
-          @queue.push([msg, @data])
-        end
-      end
-
-      class UnconnectedUDP < Requester
-        def initialize
-          super()
-          @sock = UDPSocket.new
-          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
-          @id = {}
-          @id.default = -1
-          @thread = Thread.new {
-            DNSThreadGroup.add Thread.current
-            loop {
-              reply, from = @sock.recvfrom(UDPSize)
-              msg = begin
-                Message.decode(reply)
-              rescue DecodeError
-                STDERR.print("DNS message decoding error: #{reply.inspect}\n")
-                next
-              end
-              if s = @senders[[[from[3],from[1]],msg.id]]
-                s.recv msg
-              else
-                #STDERR.print("non-handled DNS message: #{msg.inspect} from #{from.inspect}\n")
-              end
-            }
-          }
-        end
-
-        def sender(msg, data, queue, host, port=Port)
-          service = [host, port]
-          id = Thread.exclusive {
-            @id[service] = (@id[service] + 1) & 0xffff
-          }
-          request = msg.encode
-          request[0,2] = [id].pack('n')
-          return @senders[[service, id]] =
-            Sender.new(request, data, @sock, host, port, queue)
-        end
-
-        class Sender < Requester::Sender
-          def initialize(msg, data, sock, host, port, queue)
-            super(msg, data, sock, queue)
-            @host = host
-            @port = port
-          end
-
-          def send
-            @sock.send(@msg, 0, @host, @port)
-          end
-        end
-      end
-
-      class ConnectedUDP < Requester
-        def initialize(host, port=Port)
-          super()
-          @host = host
-          @port = port
-          @sock = UDPSocket.new
-          @sock.connect(host, port)
-          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
-          @id = -1
-          @thread = Thread.new {
-            DNSThreadGroup.add Thread.current
-            loop {
-              reply = @sock.recv(UDPSize)
-              msg = begin
-                Message.decode(reply)
-              rescue DecodeError
-                STDERR.print("DNS message decoding error: #{reply.inspect}")
-                next
-              end
-              if s = @senders[msg.id]
-                s.recv msg
-              else
-                #STDERR.print("non-handled DNS message: #{msg.inspect}")
-              end
-            }
-          }
-        end
-
-        def sender(msg, data, queue, host=@host, port=@port)
-          unless host == @host && port == @port
-            raise RequestError.new("host/port don't match: #{host}:#{port}")
-          end
-          id = Thread.exclusive { @id = (@id + 1) & 0xffff }
-          request = msg.encode
-          request[0,2] = [id].pack('n')
-          return @senders[id] = Sender.new(request, data, @sock, queue)
-        end
-
-        class Sender < Requester::Sender
-          def send
-            @sock.send(@msg, 0)
-          end
-        end
-      end
-
-      class TCP < Requester
-        def initialize(host, port=Port)
-          super()
-          @host = host
-          @port = port
-          @sock = TCPSocket.new
-          @sock.connect(host, port)
-          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
-          @id = -1
-          @senders = {}
-          @thread = Thread.new {
-            DNSThreadGroup.add Thread.current
-            loop {
-              len = @sock.read(2).unpack('n')
-              reply = @sock.read(len)
-              msg = begin
-                Message.decode(reply)
-              rescue DecodeError
-                STDERR.print("DNS message decoding error: #{reply.inspect}")
-                next
-              end
-              if s = @senders[msg.id]
-                s.push msg
-              else
-                #STDERR.print("non-handled DNS message: #{msg.inspect}")
-              end
-            }
-          }
-        end
-
-        def sender(msg, data, queue, host=@host, port=@port)
-          unless host == @host && port == @port
-            raise RequestError.new("host/port don't match: #{host}:#{port}")
-          end
-          id = Thread.exclusive { @id = (@id + 1) & 0xffff }
-          request = msg.encode
-          request[0,2] = [request.length, id].pack('nn')
-          return @senders[id] = Sender.new(request, data, @sock, queue)
-        end
-
-        class Sender < Requester::Sender
-          def send
-            @sock.print(@msg)
-            @sock.flush
-          end
-        end
-      end
-
-      class RequestError < StandardError
-      end
-    end
-
-    class Config
-      def initialize(filename="/etc/resolv.conf")
-        @mutex = Mutex.new
-        @filename = filename
-        @initialized = nil
-      end
-
-      def lazy_initialize
-        @mutex.synchronize {
-          unless @initialized
-            @nameserver = []
-            @search = nil
-            @ndots = 1
-            begin
-              open(@filename) {|f|
-                f.each {|line|
-                  line.sub!(/[#;].*/, '')
-                  keyword, *args = line.split(/\s+/)
-                  args.each { |arg|
-                    arg.untaint
-                  }
-                  next unless keyword
-                  case keyword
-                  when 'nameserver'
-                    @nameserver += args
-                  when 'domain'
-                    @search = [Label.split(args[0])]
-                  when 'search'
-                    @search = args.map {|arg| Label.split(arg)}
-                  end
-                }
-              }
-            rescue Errno::ENOENT
-              if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
-                search, nameserver = Win32::Resolv.get_resolv_info
-                @search = [search] if search
-                @nameserver = nameserver if nameserver
-              end
-            end
-
-            @nameserver = ['0.0.0.0'] if @nameserver.empty?
-            unless @search
-              hostname = Socket.gethostname
-              if /\./ =~ hostname
-                @search = [Label.split($')]
-              else
-                @search = [[]]
-              end
-            end
-            @initialized = true
-          end
-        }
-      end
-
-      def single?
-        lazy_initialize
-        if @nameserver.length == 1
-          return @nameserver[0]
-        else
-          return nil
-        end
-      end
-
-      def generate_candidates(name)
-        candidates = nil
-        name = Name.create(name)
-        if name.absolute?
-          candidates = [name]
-        else
-          if @ndots <= name.length - 1
-            candidates = [Name.new(name.to_a)]
-          else
-            candidates = []
-          end
-          candidates.concat(@search.map {|domain| Name.new(name.to_a + domain)})
-        end
-        return candidates
-      end
-
-      InitialTimeout = 5
-
-      def generate_timeouts
-        ts = [InitialTimeout]
-        ts << ts[-1] * 2 / @nameserver.length
-        ts << ts[-1] * 2
-        ts << ts[-1] * 2
-        return ts
-      end
-
-      def resolv(name)
-        candidates = generate_candidates(name)
-        timeouts = generate_timeouts
-        begin
-          candidates.each {|candidate|
-            begin
-              timeouts.each {|tout|
-                @nameserver.each {|nameserver|
-                  begin
-                    yield candidate, tout, nameserver
-                  rescue ResolvTimeout
-                  end
-                }
-              }
-              raise ResolvError.new("DNS resolv timeout: #{name}")
-            rescue NXDomain
-            end
-          }
-        rescue OtherResolvError
-          raise ResolvError.new("DNS error: #{$!.message}")
-        end
-        raise ResolvError.new("DNS resolv error: #{name}")
-      end
-
-      class NXDomain < ResolvError
-      end
-
-      class OtherResolvError < ResolvError
-      end
-    end
-
-    module OpCode
-      Query = 0
-      IQuery = 1
-      Status = 2
-      Notify = 4
-      Update = 5
-    end
-
-    module RCode
-      NoError = 0
-      FormErr = 1
-      ServFail = 2
-      NXDomain = 3
-      NotImp = 4
-      Refused = 5
-      YXDomain = 6
-      YXRRSet = 7
-      NXRRSet = 8
-      NotAuth = 9
-      NotZone = 10
-      BADVERS = 16
-      BADSIG = 16
-      BADKEY = 17
-      BADTIME = 18
-      BADMODE = 19
-      BADNAME = 20
-      BADALG = 21
-    end
-
-    class DecodeError < StandardError
-    end
-
-    class EncodeError < StandardError
-    end
-
-    module Label
-      def self.split(arg)
-        labels = []
-        arg.scan(/[^\.]+/) {labels << Str.new($&)}
-        return labels
-      end
-
-      class Str
-        def initialize(string)
-          @string = string
-          @downcase = string.downcase
-        end
-        attr_reader :string, :downcase
-
-        def to_s
-          return @string
-        end
-
-        def inspect
-          return "#<#{self.class} #{self.to_s}>"
-        end
-
-        def ==(other)
-          return @downcase == other.downcase
-        end
-
-        def eql?(other)
-          return self == other
-        end
-
-        def hash
-          return @downcase.hash
-        end
-      end
-    end
-
-    class Name
-      def self.create(arg)
-        case arg
-        when Name
-          return arg
-        when String
-          return Name.new(Label.split(arg), /\.\z/ =~ arg ? true : false)
-        else
-          raise ArgumentError.new("cannot interpret as DNS name: #{arg.inspect}")
-        end
-      end
-
-      def initialize(labels, absolute=true)
-        @labels = labels
-        @absolute = absolute
-      end
-
-      def absolute?
-        return @absolute
-      end
-
-      def ==(other)
-        return @labels == other.to_a && @absolute == other.absolute?
-      end
-      alias eql? ==
-
-      def hash
-        return @labels.hash ^ @absolute.hash
-      end
-
-      def to_a
-        return @labels
-      end
-
-      def length
-        return @labels.length
-      end
-
-      def [](i)
-        return @labels[i]
-      end
-
-      def to_s
-        return @labels.join('.')
-      end
-    end
-
-    class Message
-      @@identifier = -1
-
-      def initialize(id = (@@identifier += 1) & 0xffff)
-        @id = id
-        @qr = 0
-        @opcode = 0
-        @aa = 0
-        @tc = 0
-        @rd = 0 # recursion desired
-        @ra = 0 # recursion available
-        @rcode = 0
-        @question = []
-        @answer = []
-        @authority = []
-        @additional = []
-      end
-
-      attr_accessor :id, :qr, :opcode, :aa, :tc, :rd, :ra, :rcode
-      attr_reader :question, :answer, :authority, :additional
-
-      def ==(other)
-        return @id == other.id &&
-               @qr == other.qr &&
-               @opcode == other.opcode &&
-               @aa == other.aa &&
-               @tc == other.tc &&
-               @rd == other.rd &&
-               @ra == other.ra &&
-               @rcode == other.rcode &&
-               @question == other.question &&
-               @answer == other.answer &&
-               @authority == other.authority &&
-               @additional == other.additional
-      end
-
-      def add_question(name, typeclass)
-        @question << [Name.create(name), typeclass]
-      end
-
-      def each_question
-        @question.each {|name, typeclass|
-          yield name, typeclass
-        }
-      end
-
-      def add_answer(name, ttl, data)
-        @answer << [Name.create(name), ttl, data]
-      end
-
-      def each_answer
-        @answer.each {|name, ttl, data|
-          yield name, ttl, data
-        }
-      end
-
-      def add_authority(name, ttl, data)
-        @authority << [Name.create(name), ttl, data]
-      end
-
-      def each_authority
-        @authority.each {|name, ttl, data|
-          yield name, ttl, data
-        }
-      end
-
-      def add_additional(name, ttl, data)
-        @additional << [Name.create(name), ttl, data]
-      end
-
-      def each_additional
-        @additional.each {|name, ttl, data|
-          yield name, ttl, data
-        }
-      end
-
-      def each_resource
-        each_answer {|name, ttl, data| yield name, ttl, data}
-        each_authority {|name, ttl, data| yield name, ttl, data}
-        each_additional {|name, ttl, data| yield name, ttl, data}
-      end
-
-      def encode
-        return MessageEncoder.new {|msg|
-          msg.put_pack('nnnnnn',
-            @id,
-            (@qr & 1) << 15 |
-            (@opcode & 15) << 11 |
-            (@aa & 1) << 10 |
-            (@tc & 1) << 9 |
-            (@rd & 1) << 8 |
-            (@ra & 1) << 7 |
-            (@rcode & 15),
-            @question.length,
-            @answer.length,
-            @authority.length,
-            @additional.length)
-          @question.each {|q|
-            name, typeclass = q
-            msg.put_name(name)
-            msg.put_pack('nn', typeclass::TypeValue, typeclass::ClassValue)
-          }
-          [@answer, @authority, @additional].each {|rr|
-            rr.each {|r|
-              name, ttl, data = r
-              msg.put_name(name)
-              msg.put_pack('nnN', data.class::TypeValue, data.class::ClassValue, ttl)
-              msg.put_length16 {data.encode_rdata(msg)}
-            }
-          }
-        }.to_s
-      end
-
-      class MessageEncoder
-        def initialize
-          @data = ''
-          @names = {}
-          yield self
-        end
-
-        def to_s
-          return @data
-        end
-
-        def put_bytes(d)
-          @data << d
-        end
-
-        def put_pack(template, *d)
-          @data << d.pack(template)
-        end
-
-        def put_length16
-          length_index = @data.length
-          @data << "\0\0"
-          data_start = @data.length
-          yield
-          data_end = @data.length
-          @data[length_index, 2] = [data_end - data_start].pack("n")
-        end
-
-        def put_string(d)
-          self.put_pack("C", d.length)
-          @data << d
-        end
-
-        def put_name(d)
-          put_labels(d.to_a)
-        end
-
-        def put_labels(d)
-          d.each_index {|i|
-            domain = d[i..-1]
-            if idx = @names[domain]
-              self.put_pack("n", 0xc000 | idx)
-              return
-            else
-              @names[domain] = @data.length
-              self.put_label(d[i])
-            end
-          }
-          @data << "\0"
-        end
-
-        def put_label(d)
-          self.put_string(d.string)
-        end
-      end
-
-      def Message.decode(m)
-        o = Message.new(0)
-        MessageDecoder.new(m) {|msg|
-          id, flag, qdcount, ancount, nscount, arcount =
-            msg.get_unpack('nnnnnn')
-          o.id = id
-          o.qr = (flag >> 15) & 1
-          o.opcode = (flag >> 11) & 15
-          o.aa = (flag >> 10) & 1
-          o.tc = (flag >> 9) & 1
-          o.rd = (flag >> 8) & 1
-          o.ra = (flag >> 7) & 1
-          o.rcode = flag & 15
-          (1..qdcount).each {
-            name, typeclass = msg.get_question
-            o.add_question(name, typeclass)
-          }
-          (1..ancount).each {
-            name, ttl, data = msg.get_rr
-            o.add_answer(name, ttl, data)
-          }
-          (1..nscount).each {
-            name, ttl, data = msg.get_rr
-            o.add_authority(name, ttl, data)
-          }
-          (1..arcount).each {
-            name, ttl, data = msg.get_rr
-            o.add_additional(name, ttl, data)
-          }
-        }
-        return o
-      end
-
-      class MessageDecoder
-        def initialize(data)
-          @data = data
-          @index = 0
-          @limit = data.length
-          yield self
-        end
-
-        def get_length16
-          len, = self.get_unpack('n')
-          save_limit = @limit
-          @limit = @index + len
-          d = yield(len)
-          if @index < @limit
-            raise DecodeError.new("junk exist")
-          elsif @limit < @index
-            raise DecodeError.new("limit exceed")
-          end
-          @limit = save_limit
-          return d
-        end
-
-        def get_bytes(len = @limit - @index)
-          d = @data[@index, len]
-          @index += len
-          return d
-        end
-
-        def get_unpack(template)
-          len = 0
-          template.each_byte {|byte|
-            case byte
-            when ?c, ?C
-              len += 1
-            when ?n
-              len += 2
-            when ?N
-              len += 4
-            else
-              raise StandardError.new("unsupported template: '#{byte.chr}' in '#{template}'")
-            end
-          }
-          raise DecodeError.new("limit exceed") if @limit < @index + len
-          arr = @data.unpack("@#{@index}#{template}")
-          @index += len
-          return arr
-        end
-
-        def get_string
-          len = @data[@index]
-          raise DecodeError.new("limit exceed") if @limit < @index + 1 + len
-          d = @data[@index + 1, len]
-          @index += 1 + len
-          return d
-        end
-
-        def get_name
-          return Name.new(self.get_labels)
-        end
-
-        def get_labels(limit=nil)
-          limit = @index if !limit || @index < limit
-          d = []
-          while true
-            case @data[@index]
-            when 0
-              @index += 1
-              return d
-            when 192..255
-              idx = self.get_unpack('n')[0] & 0x3fff
-              if limit <= idx
-                raise DecodeError.new("non-backward name pointer")
-              end
-              save_index = @index
-              @index = idx
-              d += self.get_labels(limit)
-              @index = save_index
-              return d
-            else
-              d << self.get_label
-            end
-          end
-          return d
-        end
-
-        def get_label
-          return Label::Str.new(self.get_string)
-        end
-
-        def get_question
-          name = self.get_name
-          type, klass = self.get_unpack("nn")
-          return name, Resource.get_class(type, klass)
-        end
-
-        def get_rr
-          name = self.get_name
-          type, klass, ttl = self.get_unpack('nnN')
-          typeclass = Resource.get_class(type, klass)
-          return name, ttl, self.get_length16 {typeclass.decode_rdata(self)}
-        end
-      end
-    end
-
-    class Query
-      def encode_rdata(msg)
-        raise EncodeError.new("#{self.class} is query.") 
-      end
-
-      def self.decode_rdata(msg)
-        raise DecodeError.new("#{self.class} is query.") 
-      end
-    end
-
-    class Resource < Query
-      ClassHash = {}
-
-      def encode_rdata(msg)
-        raise NotImplementedError.new
-      end
-
-      def self.decode_rdata(msg)
-        raise NotImplementedError.new
-      end
-
-      def ==(other)
-        return self.class == other.class &&
-          self.instance_variables == other.instance_variables &&
-          self.instance_variables.collect {|name| self.instance_eval name} ==
-            other.instance_variables.collect {|name| other.instance_eval name}
-      end
-
-      def eql?(other)
-        return self == other
-      end
-
-      def hash
-        h = 0
-        self.instance_variables.each {|name|
-          h ^= self.instance_eval("#{name}.hash")
-        }
-        return h
-      end
-
-      def self.get_class(type_value, class_value)
-        return ClassHash[[type_value, class_value]] ||
-               Generic.create(type_value, class_value)
-      end
-
-      class Generic < Resource
-        def initialize(data)
-          @data = data
-        end
-        attr_reader :data
-
-        def encode_rdata(msg)
-          msg.put_bytes(data)
-        end
-
-        def self.decode_rdata(msg)
-          return self.new(msg.get_bytes)
-        end
-
-        def self.create(type_value, class_value)
-          c = Class.new(Generic)
-          c.const_set(:TypeValue, type_value)
-          c.const_set(:ClassValue, class_value)
-          Generic.const_set("Type#{type_value}_Class#{class_value}", c)
-          ClassHash[[type_value, class_value]] = c
-          return c
-        end
-      end
-
-      class DomainName < Resource
-        def initialize(name)
-          @name = name
-        end
-        attr_reader :name
-
-        def encode_rdata(msg)
-          msg.put_name(@name)
-        end
-
-        def self.decode_rdata(msg)
-          return self.new(msg.get_name)
-        end
-      end
-
-      # Standard (class generic) RRs
-      ClassValue = nil
-
-      class NS < DomainName
-        TypeValue = 2
-      end
-
-      class CNAME < DomainName
-        TypeValue = 5
-      end
-
-      class SOA < Resource
-        TypeValue = 6
-
-        def initialize(mname, rname, serial, refresh, retry_, expire, minimum)
-          @mname = mname
-          @rname = rname
-          @serial = serial
-          @refresh = refresh
-          @retry = retry_
-          @expire = expire
-          @minimum = minimum
-        end
-        attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
-
-        def encode_rdata(msg)
-          msg.put_name(@mname)
-          msg.put_name(@rname)
-          msg.put_pack('NNNNN', @serial, @refresh, @retry, @expire, @minimum)
-        end
-
-        def self.decode_rdata(msg)
-          mname = msg.get_name
-          rname = msg.get_name
-          serial, refresh, retry_, expire, minimum = msg.get_unpack('NNNNN')
-          return self.new(
-            mname, rname, serial, refresh, retry_, expire, minimum)
-        end
-      end
-
-      class PTR < DomainName
-        TypeValue = 12
-      end
-
-      class HINFO < Resource
-        TypeValue = 13
-
-        def initialize(cpu, os)
-          @cpu = cpu
-          @os = os
-        end
-        attr_reader :cpu, :os
-
-        def encode_rdata(msg)
-          msg.put_string(@cpu)
-          msg.put_string(@os)
-        end
-
-        def self.decode_rdata(msg)
-          cpu = msg.get_string
-          os = msg.get_string
-          return self.new(cpu, os)
-        end
-      end
-
-      class MINFO < Resource
-        TypeValue = 14
-
-        def initialize(rmailbx, emailbx)
-          @rmailbx = rmailbx
-          @emailbx = emailbx
-        end
-        attr_reader :rmailbx, :emailbx
-
-        def encode_rdata(msg)
-          msg.put_name(@rmailbx)
-          msg.put_name(@emailbx)
-        end
-
-        def self.decode_rdata(msg)
-          rmailbx = msg.get_string
-          emailbx = msg.get_string
-          return self.new(rmailbx, emailbx)
-        end
-      end
-
-      class MX < Resource
-        TypeValue= 15
-
-        def initialize(preference, exchange)
-          @preference = preference
-          @exchange = exchange
-        end
-        attr_reader :preference, :exchange
-
-        def encode_rdata(msg)
-          msg.put_pack('n', @preference)
-          msg.put_name(@exchange)
-        end
-
-        def self.decode_rdata(msg)
-          preference, = msg.get_unpack('n')
-          exchange = msg.get_name
-          return self.new(preference, exchange)
-        end
-      end
-
-      class TXT < Resource
-        TypeValue = 16
-
-        def initialize(data)
-          @data = data
-        end
-        attr_reader :data
-
-        def encode_rdata(msg)
-          msg.put_string(@data)
-        end
-
-        def self.decode_rdata(msg)
-          data = msg.get_string
-          return self.new(data)
-        end
-      end
-
-      class ANY < Query
-        TypeValue = 255
-      end
-
-      ClassInsensitiveTypes = [
-        NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, ANY
-      ]
-
-      # ARPA Internet specific RRs
-      module IN
-        ClassValue = 1
-
-        ClassInsensitiveTypes.each {|s|
-          c = Class.new(s)
-          c.const_set(:TypeValue, s::TypeValue)
-          c.const_set(:ClassValue, ClassValue)
-          ClassHash[[s::TypeValue, ClassValue]] = c
-          self.const_set(s.name.sub(/.*::/, ''), c)
-        }
-
-        class A < Resource
-          ClassHash[[TypeValue = 1, ClassValue = ClassValue]] = self
-
-          def initialize(address)
-            @address = IPv4.create(address)
-          end
-          attr_reader :address
-
-          def encode_rdata(msg)
-            msg.put_bytes(@address.address)
-          end
-
-          def self.decode_rdata(msg)
-            return self.new(IPv4.new(msg.get_bytes(4)))
-          end
-        end
-
-        class WKS < Resource
-          ClassHash[[TypeValue = 11, ClassValue = ClassValue]] = self
-
-          def initialize(address, protocol, bitmap)
-            @address = IPv4.create(address)
-            @protocol = protocol
-            @bitmap = bitmap
-          end
-          attr_reader :address, :protocol, :bitmap
-
-          def encode_rdata(msg)
-            msg.put_bytes(@address.address)
-            msg.put_pack("n", @protocol)
-            msg.put_bytes(@bitmap)
-          end
-
-          def self.decode_rdata(msg)
-            address = IPv4.new(msg.get_bytes(4))
-            protocol, = msg.get_unpack("n")
-            bitmap = msg.get_bytes
-            return self.new(address, protocol, bitmap)
-          end
-        end
-
-        class AAAA < Resource
-          ClassHash[[TypeValue = 28, ClassValue = ClassValue]] = self
-
-          def initialize(address)
-            @address = IPv6.create(address)
-          end
-          attr_reader :address
-
-          def encode_rdata(msg)
-            msg.put_bytes(@address.address)
-          end
-
-          def self.decode_rdata(msg)
-            return self.new(IPv6.new(msg.get_bytes(16)))
-          end
-        end
-      end
-    end
-  end
-
-  class IPv4
-    Regex = /\A(\d+)\.(\d+)\.(\d+)\.(\d+)\z/
-
-    def self.create(arg)
-      case arg
-      when IPv4
-        return arg
-      when Regex
-        if (0..255) === (a = $1.to_i) &&
-           (0..255) === (b = $2.to_i) &&
-           (0..255) === (c = $3.to_i) &&
-           (0..255) === (d = $4.to_i)
-          return self.new([a, b, c, d].pack("CCCC"))
-        else
-          raise ArgumentError.new("IPv4 address with invalid value: " + arg)
-        end
-      else
-        raise ArgumentError.new("cannot interprete as IPv4 address: #{arg.inspect}")
-      end
-    end
-
-    def initialize(address)
-      unless address.kind_of?(String) && address.length == 4
-        raise ArgumentError.new('IPv4 address must be 4 bytes')
-      end
-      @address = address
-    end
-    attr_reader :address
-
-    def to_s
-      return sprintf("%d.%d.%d.%d", *@address.unpack("CCCC"))
-    end
-
-    def inspect
-      return "#<#{self.class} #{self.to_s}>"
-    end
-
-    def to_name
-      return DNS::Name.create(
-        '%d.%d.%d.%d.in-addr.arpa.' % @address.unpack('CCCC').reverse)
-    end
-
-    def ==(other)
-      return @address == other.address
-    end
-
-    def eql?(other)
-      return self == other
-    end
-
-    def hash
-      return @address.hash
-    end
-  end
-
-  class IPv6
-    Regex_8Hex = /\A
-      (?:[0-9A-Fa-f]{1,4}:){7}
-         [0-9A-Fa-f]{1,4}
-      \z/x
-
-    Regex_CompressedHex = /\A
-      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
-      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)
-      \z/x
-
-    Regex_6Hex4Dec = /\A
-      ((?:[0-9A-Fa-f]{1,4}:){6,6})
-      (\d+)\.(\d+)\.(\d+)\.(\d+)
-      \z/x
-
-    Regex_CompressedHex4Dec = /\A
-      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
-      ((?:[0-9A-Fa-f]{1,4}:)*)
-      (\d+)\.(\d+)\.(\d+)\.(\d+)
-      \z/x
-
-    Regex = /
-      (?:#{Regex_8Hex.source}) |
-      (?:#{Regex_CompressedHex.source}) |
-      (?:#{Regex_6Hex4Dec.source}) |
-      (?:#{Regex_CompressedHex4Dec.source})/x
-
-    def self.create(arg)
-      case arg
-      when IPv6
-        return arg
-      when String
-        address = ''
-        if Regex_8Hex =~ arg
-          arg.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
-        elsif Regex_CompressedHex =~ arg
-          prefix = $1
-          suffix = $2
-          a1 = ''
-          a2 = ''
-          prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
-          suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
-          omitlen = 16 - a1.length - a2.length
-          address << a1 << "\0" * omitlen << a2
-        elsif Regex_6Hex4Dec =~ arg
-          prefix, a, b, c, d = $1, $2.to_i, $3.to_i, $4.to_i, $5.to_i
-          if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
-            prefix.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
-            address << [a, b, c, d].pack('CCCC')
-          else
-            raise ArgumentError.new("not numeric IPv6 address: " + arg)
-          end
-        elsif Regex_CompressedHex4Dec =~ arg
-          prefix, suffix, a, b, c, d = $1, $2, $3.to_i, $4.to_i, $5.to_i, $6.to_i
-          if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
-            a1 = ''
-            a2 = ''
-            prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
-            suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
-            omitlen = 12 - a1.length - a2.length
-            address << a1 << "\0" * omitlen << a2 << [a, b, c, d].pack('CCCC')
-          else
-            raise ArgumentError.new("not numeric IPv6 address: " + arg)
-          end
-        else
-          raise ArgumentError.new("not numeric IPv6 address: " + arg)
-        end
-        return IPv6.new(address)
-      else
-        raise ArgumentError.new("cannot interprete as IPv6 address: #{arg.inspect}")
-      end
-    end
-
-    def initialize(address)
-      unless address.kind_of?(String) && address.length == 16
-        raise ArgumentError.new('IPv6 address must be 16 bytes')
-      end
-      @address = address
-    end
-    attr_reader :address
-
-    def to_s
-      address = sprintf("%X:%X:%X:%X:%X:%X:%X:%X", *@address.unpack("nnnnnnnn"))
-      unless address.sub!(/(^|:)0(:0)+(:|$)/, '::')
-        address.sub!(/(^|:)0(:|$)/, '::')
-      end
-      return address
-    end
-
-    def inspect
-      return "#<#{self.class} #{self.to_s}>"
-    end
-
-    def to_name
-      # ip6.arpa should be searched too. [RFC3152]
-      return DNS::Name.new(
-        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'int'])
-    end
-
-    def ==(other)
-      return @address == other.address
-    end
-
-    def eql?(other)
-      return self == other
-    end
-
-    def hash
-      return @address.hash
-    end
-  end
-
-  DefaultResolver = self.new
-  AddressRegex = /(?:#{IPv4::Regex.source})|(?:#{IPv6::Regex.source})/
-end
diff --git a/lib/rexml/attlistdecl.rb b/lib/rexml/attlistdecl.rb
deleted file mode 100644
index d4b5c38af6..0000000000
--- a/lib/rexml/attlistdecl.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#vim:ts=2 sw=2 noexpandtab:
-require 'rexml/child'
-require 'rexml/source'
-
-module REXML
-	# This class needs:
-	# * Documentation
-	# * Work!  Not all types of attlists are intelligently parsed, so we just
-	# spew back out what we get in.  This works, but it would be better if
-	# we formatted the output ourselves.
-	#
-	# AttlistDecls provide *just* enough support to allow namespace
-	# declarations.  If you need some sort of generalized support, or have an
-	# interesting idea about how to map the hideous, terrible design of DTD
-	# AttlistDecls onto an intuitive Ruby interface, let me know.  I'm desperate
-	# for anything to make DTDs more palateable.
-	class AttlistDecl < Child
-		include Enumerable
-
-		# What is this?  Got me.
-		attr_reader :element_name
-
-		# Create an AttlistDecl, pulling the information from a Source.  Notice
-		# that this isn't very convenient; to create an AttlistDecl, you basically
-		# have to format it yourself, and then have the initializer parse it.
-		# Sorry, but for the forseeable future, DTD support in REXML is pretty
-		# weak on convenience.  Have I mentioned how much I hate DTDs?
-		def initialize(source)
-			super()
-			if (source.kind_of? Array)
-				@element_name, @pairs, @contents = *source
-			end
-		end
-	
-		# Access the attlist attribute/value pairs.
-		#  value = attlist_decl[ attribute_name ]
-		def [](key)
-			@pairs[key]
-		end
-
-		# Whether an attlist declaration includes the given attribute definition
-		#  if attlist_decl.include? "xmlns:foobar"
-		def include?(key)
-			@pairs.keys.include? key
-		end
-
-		# Itterate over the key/value pairs:
-		#  attlist_decl.each { |attribute_name, attribute_value| ... }
-		def each(&block)
-			@pairs.each(&block)
-		end
-
-		# Write out exactly what we got in.
-		def write out, indent=-1
-			out << @contents
-		end
-
-		def node_type
-			:attlistdecl
-		end
-	end
-end
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb
deleted file mode 100644
index 4aef0944dc..0000000000
--- a/lib/rexml/attribute.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-require "rexml/namespace"
-require 'rexml/text'
-
-module REXML
-	# Defines an Element Attribute; IE, a attribute=value pair, as in:
-	# <element attribute="value"/>.  Attributes can be in their own
-	# namespaces.  General users of REXML will not interact with the
-	# Attribute class much.
-	class Attribute
-		include Node
-		include Namespace
-
-		# The element to which this attribute belongs
-		attr_reader :element
-		# The normalized value of this attribute.  That is, the attribute with
-		# entities intact.
-		attr_writer :normalized	
-		PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
-
-		# Constructor.
-		#
-		#  Attribute.new( attribute_to_clone )
-		#  Attribute.new( source )
-		#  Attribute.new( "attr", "attr_value" )
-		#  Attribute.new( "attr", "attr_value", parent_element )
-		def initialize( first, second=nil, parent=nil )
-			@normalized = @unnormalized = @element = nil
-			if first.kind_of? Attribute
-				self.name = first.expanded_name
-				@value = first.value
-				if second.kind_of? Element
-					@element = second
-				else
-					@element = first.element
-				end
-			elsif first.kind_of? String
-				@element = parent if parent.kind_of? Element
-				self.name = first
-				@value = second
-			else
-				raise "illegal argument #{first.type} to Attribute constructor"
-			end
-		end
-
-		# Returns the namespace of the attribute.
-		# 
-		#  e = Element.new( "elns:myelement" )
-		#  e.add_attribute( "nsa:a", "aval" )
-		#  e.add_attribute( "b", "bval" )
-		#  e.attributes.get_attribute( "a" ).prefix   # -> "nsa"
-		#  e.attributes.get_attribute( "b" ).prefix   # -> "elns"
-		#  a = Attribute.new( "x", "y" )
-		#  a.prefix                                   # -> ""
-		def prefix
-			pf = super
-			if pf == ""
-				pf = @element.prefix if @element
-			end
-			pf
-		end
-
-		# Returns the namespace URL, if defined, or nil otherwise
-		# 
-		#  e = Element.new("el")
-		#  e.add_attributes({"xmlns:ns", "http://url"})
-		#  e.namespace( "ns" )              # -> "http://url"
-		def namespace arg=nil
-			arg = prefix if arg.nil?
-			@element.namespace arg
-		end
-
-		# Returns true if other is an Attribute and has the same name and value,
-		# false otherwise.
-		def ==( other )
-			other.kind_of?(Attribute) and other.name==name and other.value==@value
-		end
-
-		# Creates (and returns) a hash from both the name and value
-		def hash
-			name.hash + value.hash
-		end
-
-		# Returns this attribute out as XML source, expanding the name
-		#
-		#  a = Attribute.new( "x", "y" )
-		#  a.to_string     # -> "x='y'"
-		#  b = Attribute.new( "ns:x", "y" )
-		#  b.to_string     # -> "ns:x='y'"
-		def to_string
-			"#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
-		end
-
-		# Returns the attribute value, with entities replaced
-		def to_s
-			return @normalized if @normalized
-
-			doctype = nil
-			if @element
-				doc = @element.document
-				doctype = doc.doctype if doc
-			end
-
-			@unnormalized = nil
-			@value = @normalized = Text::normalize( @value, doctype )
-		end
-
-		# Returns the UNNORMALIZED value of this attribute.  That is, entities
-		# have been expanded to their values
-		def value
-			@unnormalized if @unnormalized
-			doctype = nil
-			if @element
-				doc = @element.document
-				doctype = doc.doctype if doc
-			end
-			@normalized = nil
-			@value = @unnormalized = Text::unnormalize( @value, doctype )
-		end
-
-		# Returns a copy of this attribute
-		def clone
-			Attribute.new self
-		end
-
-		# Sets the element of which this object is an attribute.  Normally, this
-		# is not directly called.
-		#
-		# Returns this attribute
-		def element=( element )
-			@element = element
-			self
-		end
-
-		# Removes this Attribute from the tree, and returns true if successfull
-		# 
-		# This method is usually not called directly.
-		def remove
-			@element.attributes.delete self.name unless @element.nil?
-		end
-
-		# Writes this attribute (EG, puts 'key="value"' to the output)
-		def write( output, indent=-1 )
-			output << to_string
-		end
-
-    def node_type
-      :attribute
-    end
-	end
-end
-#vim:ts=2 sw=2 noexpandtab:
diff --git a/lib/rexml/cdata.rb b/lib/rexml/cdata.rb
deleted file mode 100644
index 402a0187ff..0000000000
--- a/lib/rexml/cdata.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require "rexml/text"
-
-module REXML
-	class CData < Text
-		START = '<![CDATA['
-		STOP = ']]>'
-		ILLEGAL = /(\]\]>)/
-
-		#	Constructor.  CData is data between <![CDATA[ ... ]]>
-		#
-		# _Examples_
-		#  CData.new( source )
-		#  CData.new( "Here is some CDATA" )
-		#  CData.new( "Some unprocessed data", respect_whitespace_TF, parent_element )
-		def initialize( first, whitespace=true, parent=nil )
-			super( first, whitespace, parent, true, true, ILLEGAL )
-		end
-
-		# Make a copy of this object
-		# 
-		# _Examples_
-		#  c = CData.new( "Some text" )
-		#  d = c.clone
-		#  d.to_s        # -> "Some text"
-		def clone
-			CData.new self
-		end
-
-		# Returns the content of this CData object
-		#
-		# _Examples_
-		#  c = CData.new( "Some text" )
-		#  c.to_s        # -> "Some text"
-		def to_s
-			@string
-		end
-
-		# Generates XML output of this object
-		#
-		# output::
-		#   Where to write the string.  Defaults to $stdout
-		# indent::
-		#   An integer.  If -1, no indenting will be used; otherwise, the
-		#   indentation will be this number of spaces, and children will be
-		#   indented an additional amount.  Defaults to -1.
-		# transitive::
-		#   If transitive is true and indent is >= 0, then the output will be
-		#   pretty-printed in such a way that the added whitespace does not affect
-		#   the absolute *value* of the document -- that is, it leaves the value
-		#   and number of Text nodes in the document unchanged.
-		# ie_hack::
-		#   Internet Explorer is the worst piece of crap to have ever been
-		#   written, with the possible exception of Windows itself.  Since IE is
-		#   unable to parse proper XML, we have to provide a hack to generate XML
-		#   that IE's limited abilities can handle.  This hack inserts a space 
-		#   before the /> on empty tags.
-		#
-		# _Examples_
-		#  c = CData.new( " Some text " )
-		#  c.write( $stdout )     #->  <![CDATA[ Some text ]]>
-		def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
-			indent( output, indent )
-			output << START
-			output << @string
-			output << STOP
-		end
-	end
-end
diff --git a/lib/rexml/child.rb b/lib/rexml/child.rb
deleted file mode 100644
index 6d3c9df5e6..0000000000
--- a/lib/rexml/child.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-require "rexml/node"
-
-module REXML
-	##
-	# A Child object is something contained by a parent, and this class
-	# contains methods to support that.  Most user code will not use this
-	# class directly.
-	class Child
-		include Node
-		attr_reader :parent		# The Parent of this object
-
-		# Constructor.  Any inheritors of this class should call super to make
-		# sure this method is called.
-		# parent::
-		#   if supplied, the parent of this child will be set to the
-		#   supplied value, and self will be added to the parent
-		def initialize( parent = nil )
-			@parent = nil  
-			# Declare @parent, but don't define it.  The next line sets the 
-			# parent.
-			parent.add( self ) if parent
-		end
-
-		# Replaces this object with another object.  Basically, calls
-		# Parent.replace_child
-		#
-		# Returns:: self
-		def replace_with( child )
-			@parent.replace_child( self, child )
-			self
-		end
-
-		# Removes this child from the parent.
-		#
-		# Returns:: self
-		def remove
-			unless @parent.nil?
-				@parent.delete self
-			end
-			self
-		end
-
-		# Sets the parent of this child to the supplied argument.
-		#
-		# other::
-		#   Must be a Parent object.  If this object is the same object as the
-		#   existing parent of this child, no action is taken. Otherwise, this
-		#   child is removed from the current parent (if one exists), and is added
-		#   to the new parent.
-		# Returns:: The parent added
-		def parent=( other )
-			return @parent if @parent == other
-			@parent.delete self if defined? @parent and @parent
-			@parent = other
-		end
-
-		alias :next_sibling :next_sibling_node
-		alias :previous_sibling :previous_sibling_node
-
-		# Sets the next sibling of this child.  This can be used to insert a child
-		# after some other child.
-		#  a = Element.new("a")
-		#  b = a.add_element("b")
-		#  c = Element.new("c")
-		#  b.next_sibling = c
-		#  # => <a><b/><c/></a>
-		def next_sibling=( other )
-		  parent.insert_after self, other
-		end
-
-		# Sets the previous sibling of this child.  This can be used to insert a 
-		# child before some other child.
-		#  a = Element.new("a")
-		#  b = a.add_element("b")
-		#  c = Element.new("c")
-		#  b.previous_sibling = c
-		#  # => <a><b/><c/></a>
-		def previous_sibling=(other)
-		  parent.insert_before self, other
-		end
-
-		# Returns:: the document this child belongs to, or nil if this child
-		# belongs to no document
-		def document
-			return parent.document unless parent.nil?
-			nil
-		end
-
-		# This doesn't yet handle encodings
-		def bytes
-			encoding = document.encoding
-
-			to_s
-		end
-	end
-end
diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb
deleted file mode 100644
index e439ddf9d8..0000000000
--- a/lib/rexml/comment.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require "rexml/child"
-
-module REXML
-	##
-	# Represents an XML comment; that is, text between <!-- ... -->
-	class Comment < Child
-		include Comparable
-		START = "<!--"
-		STOP = "-->"
-
-		attr_accessor :string			# The content text
-
-		##
-		# Constructor.  The first argument can be one of three types:
-		# @param first If String, the contents of this comment are set to the 
-		# argument.  If Comment, the argument is duplicated.  If
-		# Source, the argument is scanned for a comment.
-		# @param second If the first argument is a Source, this argument 
-		# should be nil, not supplied, or a Parent to be set as the parent 
-		# of this object
-		def initialize( first, second = nil )
-			#puts "IN COMMENT CONSTRUCTOR; SECOND IS #{second.type}"
-			super(second)
-			if first.kind_of? String
-				@string = first
-			elsif first.kind_of? Comment
-				@string = first.string
-			end
-		end
-
-		def clone
-			Comment.new self
-		end
-
-		# output::
-		#   Where to write the string
-		# indent::
-		#   An integer.  If -1, no indenting will be used; otherwise, the
-		#   indentation will be this number of spaces, and children will be
-		#   indented an additional amount.
-		# transitive::
-		#   Who knows?
-		# ie_hack::
-		#   Internet Explorer is the worst piece of crap to have ever been
-		#   written, with the possible exception of Windows itself.  Since IE is
-		#   unable to parse proper XML, we have to provide a hack to generate XML
-		#   that IE's limited abilities can handle.  This hack inserts a space 
-		#   before the /> on empty tags.
-		#
-		def write( output, indent=-1, transitive=false, ie_hack=false )
-			indent( output, indent )
-			output << START
-			output << @string
-			output << STOP
-		end
-
-		alias :to_s :string
-
-		##
-		# Compares this Comment to another; the contents of the comment are used
-		# in the comparison.
-		def <=>(other)
-			other.to_s <=> @string
-		end
-
-		##
-		# Compares this Comment to another; the contents of the comment are used
-		# in the comparison.
-		def ==( other )
-			other.kind_of? Comment and
-			(other <=> self) == 0
-		end
-
-    def node_type
-      :comment
-    end
-	end
-end
-#vim:ts=2 sw=2 noexpandtab:
diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
deleted file mode 100644
index d70ea6fd6c..0000000000
--- a/lib/rexml/doctype.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-require "rexml/parent"
-require "rexml/parseexception"
-require "rexml/namespace"
-require 'rexml/entity'
-require 'rexml/attlistdecl'
-require 'rexml/xmltokens'
-
-module REXML
-	# Represents an XML DOCTYPE declaration; that is, the contents of <!DOCTYPE
-	# ... >.  DOCTYPES can be used to declare the DTD of a document, as well as
-	# being used to declare entities used in the document.
-	class DocType < Parent
-		include XMLTokens
-		START = "<!DOCTYPE"
-		STOP = ">"
-		SYSTEM = "SYSTEM"
-		PUBLIC = "PUBLIC"
-		DEFAULT_ENTITIES = { 
-			'gt'=>EntityConst::GT, 
-			'lt'=>EntityConst::LT, 
-			'quot'=>EntityConst::QUOT, 
-			"apos"=>EntityConst::APOS 
-		}
-
-		# name is the name of the doctype
-		# external_id is the referenced DTD, if given
-		attr_reader :name, :external_id, :entities, :namespaces
-
-		# Constructor
-		#
-		#	 dt = DocType.new( 'foo', '-//I/Hate/External/IDs' )
-		#	 # <!DOCTYPE foo '-//I/Hate/External/IDs'>
-		#	 dt = DocType.new( doctype_to_clone )
-		#	 # Incomplete.  Shallow clone of doctype
-		#	 source = Source.new( '<!DOCTYPE foo "bar">' )
-		#	 dt = DocType.new( source )
-		#	 # <!DOCTYPE foo "bar">
-		#	 dt = DocType.new( source, some_document )
-		#	 # Creates a doctype, and adds to the supplied document
-		def initialize( first, parent=nil )
-			@entities = DEFAULT_ENTITIES
-			@long_name = @uri = nil
-			if first.kind_of? String
-				super()
-				@name = first
-				@external_id = parent
-			elsif first.kind_of? DocType
-				super( parent )
-				@name = first.name
-				@external_id = first.external_id
-			elsif first.kind_of? Array
-				super( parent )
-				@name = first[0]
-				@external_id = first[1]
-				@long_name = first[2]
-				@uri = first[3]
-			end
-		end
-
-		def node_type
-			:doctype
-		end
-
-		def attributes_of element
-			rv = []
-			each do |child|
-				child.each do |key,val|
-					rv << Attribute.new(key,val)
-				end if child.kind_of? AttlistDecl and child.element_name == element
-			end
-			rv
-		end
-
-		def attribute_of element, attribute
-			att_decl = find do |child|
-				child.kind_of? AttlistDecl and
-				child.element_name == element and
-				child.include? attribute
-			end
-			return nil unless att_decl
-			att_decl[attribute]
-		end
-
-		def clone
-			DocType.new self
-		end
-
-		# output::
-		#   Where to write the string
-		# indent::
-		#   An integer.  If -1, no indenting will be used; otherwise, the
-		#   indentation will be this number of spaces, and children will be
-		#   indented an additional amount.
-		# transitive::
-		#   Who knows?
-		# ie_hack::
-		#   Internet Explorer is the worst piece of crap to have ever been
-		#   written, with the possible exception of Windows itself.  Since IE is
-		#   unable to parse proper XML, we have to provide a hack to generate XML
-		#   that IE's limited abilities can handle.  This hack inserts a space 
-		#   before the /> on empty tags.
-		#
-		def write( output, indent=0, transitive=false, ie_hack=false )
-			indent( output, indent )
-			output << START
-			output << ' '
-			output << @name
-			output << " #@external_id" if @external_id
-			output << " #@long_name" if @long_name
-			output << " #@uri" if @uri
-			unless @children.empty?
-				next_indent = indent + 2
-				output << ' ['
-				child = nil		# speed
-				@children.each { |child|
-					output << "\n"
-					child.write( output, next_indent )
-				}
-				output << "\n"
-				#output << '   '*next_indent
-				output << "]"
-			end
-			output << STOP
-		end
-
-		def entity( name )
-			@entities[name].unnormalized if @entities[name]
-		end
-
-		def add child
-			super(child)
-			@entities = DEFAULT_ENTITIES.clone if @entities == DEFAULT_ENTITIES
-			@entities[ child.name ] = child if child.kind_of? Entity
-		end
-	end
-
-	# We don't really handle any of these since we're not a validating
-	# parser, so we can be pretty dumb about them.  All we need to be able
-	# to do is spew them back out on a write()
-
-	# This is an abstract class.  You never use this directly; it serves as a
-	# parent class for the specific declarations.
-	class Declaration < Child
-		def initialize src
-			super()
-			@string = src
-		end
-
-		def to_s
-			@string+'>'
-		end
-
-		def write( output, indent )
-			output << ('   '*indent) if indent > 0
-			output << to_s
-		end
-	end
-	
-	public
-	class ElementDecl < Declaration
-		def initialize( src )
-			super
-		end
-	end
-
-	class NotationDecl < Child
-		def initialize name, middle, rest
-			@name = name
-			@middle = middle
-			@rest = rest
-		end
-
-		def to_s
-			"<!NOTATION #@name #@middle #@rest>"
-		end
-
-		def write( output, indent=-1 )
-			output << ('   '*indent) if indent > 0
-			output << to_s
-		end
-	end
-end
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb
deleted file mode 100644
index 8617f904e6..0000000000
--- a/lib/rexml/document.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-require "rexml/element"
-require "rexml/xmldecl"
-require "rexml/source"
-require "rexml/comment"
-require "rexml/doctype"
-require "rexml/instruction"
-require "rexml/rexml"
-require "rexml/parseexception"
-require "rexml/output"
-require "rexml/parsers/baseparser"
-require "rexml/parsers/streamparser"
-
-module REXML
-  # Represents a full XML document, including PIs, a doctype, etc.  A
-  # Document has a single child that can be accessed by root().
-  # Note that if you want to have an XML declaration written for a document
-  # you create, you must add one; REXML documents do not write a default
-	# declaration for you.  See |DECLARATION| and |write|.
-	class Document < Element
-		# A convenient default XML declaration.  If you want an XML declaration,
-		# the easiest way to add one is mydoc << Document::DECLARATION
-		DECLARATION = XMLDecl.new( "1.0", "UTF-8" )
-
-		# Constructor
-		# @param source if supplied, must be a Document, String, or IO. 
-		# Documents have their context and Element attributes cloned.
-	  # Strings are expected to be valid XML documents.  IOs are expected
-	  # to be sources of valid XML documents.
-	  # @param context if supplied, contains the context of the document;
-	  # this should be a Hash.
-	  # NOTE that I'm not sure what the context is for; I cloned it out of
-	  # the Electric XML API (in which it also seems to do nothing), and it
-	  # is now legacy.  It may do something, someday... it may disappear.
-		def initialize( source = nil, context = {} )
-			super()
-			@context = context
-			return if source.nil?
-			if source.kind_of? Document
-				@context = source.context
-				super source
-			else
-				build(  source )
-			end
-		end
-
-    def node_type
-      :document
-    end
-
-		# Should be obvious
-		def clone
-			Document.new self
-		end
-
-		# According to the XML spec, a root node has no expanded name
-		def expanded_name
-			''
-			#d = doc_type
-			#d ? d.name : "UNDEFINED"
-		end
-
-		alias :name :expanded_name
-
-		# We override this, because XMLDecls and DocTypes must go at the start
-		# of the document
-		def add( child )
-			if child.kind_of? XMLDecl
-				@children.unshift child
-			elsif child.kind_of? DocType
-				if @children[0].kind_of? XMLDecl
-					@children[1,0] = child
-				else
-					@children.unshift child
-				end
-				child.parent = self
-			else
-				rv = super
-				raise "attempted adding second root element to document" if @elements.size > 1
-				rv
-			end
-		end
-		alias :<< :add
-
-		def add_element(arg=nil, arg2=nil)
-			rv = super
-			raise "attempted adding second root element to document" if @elements.size > 1
-			rv
-		end
-
-		# @return the root Element of the document, or nil if this document
-		# has no children.
-		def root
-			@children.find { |item| item.kind_of? Element }
-		end
-
-		# @return the DocType child of the document, if one exists,
-		# and nil otherwise.
-		def doctype
-			@children.find { |item| item.kind_of? DocType }
-		end
-
-		# @return the XMLDecl of this document; if no XMLDecl has been
-		# set, the default declaration is returned.
-		def xml_decl
-			rv = @children.find { |item| item.kind_of? XMLDecl }
-			rv = DECLARATION if rv.nil?
-			rv
-		end
-
-		# @return the XMLDecl version of this document as a String.
-		# If no XMLDecl has been set, returns the default version.
-		def version
-			decl = xml_decl()
-			decl.nil? ? XMLDecl.DEFAULT_VERSION : decl.version
-		end
-
-		# @return the XMLDecl encoding of this document as a String.
-		# If no XMLDecl has been set, returns the default encoding.
-		def encoding
-			decl = xml_decl()
-			decl.nil? or decl.encoding.nil? ? XMLDecl.DEFAULT_ENCODING : decl.encoding
-		end
-
-		# @return the XMLDecl standalone value of this document as a String.
-		# If no XMLDecl has been set, returns the default setting.
-		def stand_alone?
-			decl = xml_decl()
-			decl.nil? ? XMLDecl.DEFAULT_STANDALONE : decl.stand_alone?
-		end
-
-		# Write the XML tree out, optionally with indent.  This writes out the
-		# entire XML document, including XML declarations, doctype declarations,
-		# and processing instructions (if any are given).
-		# A controversial point is whether Document should always write the XML
-		# declaration (<?xml version='1.0'?>) whether or not one is given by the
-		# user (or source document).  REXML does not write one if one was not
-		# specified, because it adds unneccessary bandwidth to applications such
-		# as XML-RPC.
-		#
-		#
-		# output::
-		#	  output an object which supports '<< string'; this is where the
-		#   document will be written.
-		# indent::
-		#   An integer.  If -1, no indenting will be used; otherwise, the
-		#   indentation will be this number of spaces, and children will be
-		#   indented an additional amount.  Defaults to -1
-		# transitive::
-		#   What the heck does this do? Defaults to false
-		# ie_hack::
-		#   Internet Explorer is the worst piece of crap to have ever been
-		#   written, with the possible exception of Windows itself.  Since IE is
-		#   unable to parse proper XML, we have to provide a hack to generate XML
-		#   that IE's limited abilities can handle.  This hack inserts a space 
-		#   before the /> on empty tags.  Defaults to false
-		def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
-			output = Output.new( output, xml_decl.encoding ) if xml_decl.encoding != "UTF-8"
-			@children.each { |node|
-				node.write( output, indent, transitive, ie_hack )
-				output << "\n" unless indent<0 or node == @children[-1]
-			}
-		end
-
-		
-		def Document::parse_stream( source, listener )
-			Parsers::StreamParser.new( source, listener ).parse
-		end
-
-		private
-		def build( source )
-			build_context = self
-			parser = Parsers::BaseParser.new( source )
-			tag_stack = []
-			in_doctype = false
-			entities = nil
-			while true
-				event = parser.pull
-				case event[0]
-				when :end_document
-					return
-				when :start_element
-					tag_stack.push(event[1])
-					# find the observers for namespaces
-					build_context = build_context.add_element( event[1], event[2] )
-				when :end_element
-					tag_stack.pop
-					build_context = build_context.parent
-				when :text
-					if not in_doctype
-						if build_context[-1].instance_of? Text
-							build_context[-1] << event[1]
-						else
-							build_context.add( 
-								Text.new( event[1], true, nil, true ) 
-							) unless (
-								event[1].strip.size == 0 and 
-								build_context.ignore_whitespace_nodes
-							)
-						end
-					end
-				when :comment
-					c = Comment.new( event[1] )
-					build_context.add( c )
-				when :cdata
-					c = CData.new( event[1] )
-					build_context.add( c )
-				when :processing_instruction
-					build_context.add( Instruction.new( event[1], event[2] ) )
-				when :end_doctype
-					in_doctype = false
-					entities.each { |k,v| entities[k] = build_context.entities[k].value }
-					build_context = build_context.parent
-				when :start_doctype
-					doctype = DocType.new( event[1..-1], build_context )
-					build_context = doctype
-					entities = {}
-					in_doctype = true
-				when :attlistdecl
-					n = AttlistDecl.new( event[1..-1] )
-					build_context.add( n )
-				when :elementdecl
-					n = ElementDecl.new( event[1] )
-					build_context.add(n)
-				when :entitydecl
-					entities[ event[1] ] = event[2] unless event[2] =~ /PUBLIC|SYSTEM/
-					build_context.add(Entity.new(event))
-				when :notationdecl
-					n = NotationDecl.new( *event[1..-1] )
-					build_context.add( n )
-				when :xmldecl
-					x = XMLDecl.new( event[1], event[2], event[3] )
-					build_context.add( x )
-				end
-			end
-		end
-	end
-end
diff --git a/lib/rexml/dtd/attlistdecl.rb b/lib/rexml/dtd/attlistdecl.rb
deleted file mode 100644
index e176bb0749..0000000000
--- a/lib/rexml/dtd/attlistdecl.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require "rexml/child"
-module REXML
-	module DTD
-		class AttlistDecl < Child
-			START = "<!ATTLIST"
-			START_RE = /^\s*#{START}/um
-			PATTERN_RE = /\s*(#{START}.*?>)/um
-		end
-	end
-end
diff --git a/lib/rexml/dtd/dtd.rb b/lib/rexml/dtd/dtd.rb
deleted file mode 100644
index 81119cfa9b..0000000000
--- a/lib/rexml/dtd/dtd.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require "rexml/dtd/elementdecl"
-require "rexml/dtd/entitydecl"
-require "rexml/comment"
-require "rexml/dtd/notationdecl"
-require "rexml/dtd/attlistdecl"
-require "rexml/parent"
-
-module REXML
-	module DTD
-		class Parser
-			def Parser.parse( input )
-				case input
-				when String
-					parse_helper input
-				when File
-					parse_helper input.read
-				end
-			end
-
-			# Takes a String and parses it out
-			def Parser.parse_helper( input )
-				contents = Parent.new
-				while input.size > 0
-					case input
-					when ElementDecl.PATTERN_RE
-						match = $&
-						source = $'
-						contents << EleemntDecl.new( match )
-					when AttlistDecl.PATTERN_RE
-						matchdata = $~
-						source = $'
-						contents << AttlistDecl.new( matchdata )
-					when EntityDecl.PATTERN_RE
-						matchdata = $~
-						source = $'
-						contents << EntityDecl.new( matchdata )
-					when Comment.PATTERN_RE
-						matchdata = $~
-						source = $'
-						contents << Comment.new( matchdata )
-					when NotationDecl.PATTERN_RE
-						matchdata = $~
-						source = $'
-						contents << NotationDecl.new( matchdata )
-					end
-				end
-				contents
-			end
-		end
-	end
-end
diff --git a/lib/rexml/dtd/elementdecl.rb b/lib/rexml/dtd/elementdecl.rb
deleted file mode 100644
index c4e620f389..0000000000
--- a/lib/rexml/dtd/elementdecl.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "rexml/child"
-module REXML
-	module DTD
-		class ElementDecl < Child
-			START = "<!ELEMENT"
-			START_RE = /^\s*#{START}/um
-			PATTERN_RE = /^\s*(#{START}.*?)>/um
-			PATTERN_RE = /^\s*#{START}\s+((?:[:\w_][-\.\w_]*:)?[-!\*\.\w_]*)(.*?)>/
-			#\s*((((["']).*?\5)|[^\/'">]*)*?)(\/)?>/um, true)
-
-			def initialize match
-				@name = match[1]
-				@rest = match[2]
-			end
-		end
-	end
-end
diff --git a/lib/rexml/dtd/entitydecl.rb b/lib/rexml/dtd/entitydecl.rb
deleted file mode 100644
index 164825570f..0000000000
--- a/lib/rexml/dtd/entitydecl.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require "rexml/child"
-module REXML
-	module DTD
-		class EntityDecl < Child
-			START = "<!ENTITY"
-			START_RE = /^\s*#{START}/um
-			PUBLIC = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+PUBLIC\s+((["']).*?\3)\s+((["']).*?\5)\s*>/um
-			SYSTEM = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+SYSTEM\s+((["']).*?\3)(?:\s+NDATA\s+\w+)?\s*>/um
-			PLAIN = /^\s*#{START}\s+(\w+)\s+((["']).*?\3)\s*>/um
-			PERCENT = /^\s*#{START}\s+%\s+(\w+)\s+((["']).*?\3)\s*>/um
-			# <!ENTITY name SYSTEM "...">
-			# <!ENTITY name "...">
-			def initialize src
-				super()
-				md = nil
-				if src.match( PUBLIC )
-					md = src.match( PUBLIC, true )
-					@middle = "PUBLIC"
-					@content = "#{md[2]} #{md[4]}"
-				elsif src.match( SYSTEM )
-					md = src.match( SYSTEM, true )
-					@middle = "SYSTEM"
-					@content = md[2]
-				elsif src.match( PLAIN )
-					md = src.match( PLAIN, true )
-					@middle = ""
-					@content = md[2]
-				elsif src.match( PERCENT )
-					md = src.match( PERCENT, true )
-					@middle = ""
-					@content = md[2]
-				end
-				raise ParseException.new("failed Entity match", src) if md.nil?
-				@name = md[1]
-			end
-
-			def to_s
-				rv = "<!ENTITY #@name "
-				rv << "#@middle " if @middle.size > 0
-				rv << @content
-				rv
-			end
-
-			def write( output, indent )
-				output << ('   '*indent) if indent > 0
-				output << to_s
-			end
-
-			def EntityDecl.parse_source source, listener
-				md = source.match( PATTERN_RE, true )
-				thing = md[0].squeeze(" \t\n\r")
-				listener.send inspect.downcase, thing 
-			end
-		end
-	end
-end
diff --git a/lib/rexml/dtd/notationdecl.rb b/lib/rexml/dtd/notationdecl.rb
deleted file mode 100644
index d577ce0631..0000000000
--- a/lib/rexml/dtd/notationdecl.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "rexml/child"
-module REXML
-	module DTD
-		class NotationDecl < Child
-			START = "<!NOTATION"
-			START_RE = /^\s*#{START}/um
-			PUBLIC = /^\s*#{START}\s+(\w[\w-]*)\s+(PUBLIC)\s+((["']).*?\4)\s*>/um
-			SYSTEM = /^\s*#{START}\s+(\w[\w-]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um
-			def initialize src
-				super()
-				if src.match( PUBLIC )
-					md = src.match( PUBLIC, true )
-				elsif src.match( SYSTEM )
-					md = src.match( SYSTEM, true )
-				else
-					raise ParseException.new( "error parsing notation: no matching pattern", src )
-				end
-				@name = md[1]
-				@middle = md[2]
-				@rest = md[3]
-			end
-
-			def to_s
-				"<!NOTATION #@name #@middle #@rest>"
-			end
-
-			def write( output, indent )
-				output << ('   '*indent) if indent > 0
-				output << to_s
-			end
-
-			def NotationDecl.parse_source source, listener
-				md = source.match( PATTERN_RE, true )
-				thing = md[0].squeeze(" \t\n\r")
-				listener.send inspect.downcase, thing 
-			end
-		end
-	end
-end
diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
deleted file mode 100644
index ffaeddbf54..0000000000
--- a/lib/rexml/element.rb
+++ /dev/null
@@ -1,1147 +0,0 @@
-require "rexml/parent"
-require "rexml/namespace"
-require "rexml/attribute"
-require "rexml/cdata"
-require "rexml/xpath"
-require "rexml/parseexception"
-
-module REXML
-	# Represents a tagged XML element.  Elements are characterized by
-	# having children, attributes, and names, and can themselves be
-	# children.
-	class Element < Parent
-		include Namespace
-
-		UNDEFINED = "UNDEFINED";		# The default name
-
-		# Mechanisms for accessing attributes and child elements of this
-		# element.
-		attr_reader :attributes, :elements
-		# The context holds information about the processing environment, such as
-		# whitespace handling.
-		attr_accessor :context
-
-		# Constructor
-		# arg:: 
-		# 	if not supplied, will be set to the default value.
-		# 	If a String, the name of this object will be set to the argument.
-		# 	If an Element, the object will be shallowly cloned; name, 
-		# 	attributes, and namespaces will be copied.  Children will +not+ be
-		# 	copied.
-		# 	If a Source, the source will be scanned and parsed for an Element,
-		# 	and all child elements will be recursively parsed as well.
-		# parent:: 
-		# 	if supplied, must be a Parent, and will be used as
-		# 	the parent of this object.
-		# context::
-		# 	If supplied, must be a hash containing context items.  Context items
-		# 	include:
-		# * <tt>:respect_whitespace</tt> the value of this is :+all+ or an array of
-		#   strings being the names of the elements to respect
-		#   whitespace for.  Defaults to :+all+.
-		# * <tt>:compress_whitespace</tt> the value can be :+all+ or an array of
-		#   strings being the names of the elements to ignore whitespace on.
-		#   Overrides :+respect_whitespace+.
-		# * <tt>:ignore_whitespace_nodes</tt> the value can be :+all+ or an array
-		#   of strings being the names of the elements in which to ignore
-		#   whitespace-only nodes.  If this is set, Text nodes which contain only
-		#   whitespace will not be added to the document tree.
-		# * <tt>:raw</tt> can be :+all+, or an array of strings being the names of
-		#   the elements to process in raw mode.  In raw mode, special
-		#   characters in text is not converted to or from entities.
-		def initialize( arg = UNDEFINED, parent=nil, context=nil )
-			super(parent)
-
-			@elements = Elements.new(self)
-			@attributes = Attributes.new(self)
-			@context = context
-
-			if arg.kind_of? String
-				self.name = arg
-			elsif arg.kind_of? Element
-				self.name = arg.expanded_name
-				arg.attributes.each_attribute{ |attribute|
-					@attributes << Attribute.new( attribute )
-				}
-				@context = arg.context
-			end
-		end
-
-		# Creates a shallow copy of self.
-		#   d = Document.new "<a><b/><b/><c><d/></c></a>"
-		#   new_a = d.root.clone
-		#   puts new_a  # => "<a/>"
-		def clone
-			Element.new self
-		end
-
-		# Evaluates to the root element of the document that this element 
-		# belongs to. If this element doesn't belong to a document, but does
-		# belong to another Element, the parent's root will be returned, until the
-		# earliest ancestor is found.
-		#  d = Document.new '<a><b><c/></b></a>'
-		#  a = d[1] ; c = a[1][1]
-		#  d.root        # These all evaluate to the same Element,
-		#  a.root        # namely, <a>
-		#  c.root        #
-		def root
-			parent.nil? ? self : parent.root
-		end
-
-		# Evaluates to the document to which this element belongs, or nil if this
-		# element doesn't belong to a document.
-		def document
-			root.parent if root
-		end
-
-		# Evaluates to +true+ if whitespace is respected for this element.  This
-		# is the case if:
-		# 1. Neither :+respect_whitespace+ nor :+compress_whitespace+ has any value
-		# 2. The context has :+respect_whitespace+ set to :+all+ or
-		#    an array containing the name of this element, and :+compress_whitespace+
-		#    isn't set to :+all+ or an array containing the name of this element.
-		# The evaluation is tested against +expanded_name+, and so is namespace
-		# sensitive.
-		def whitespace
-			@whitespace = nil
-			if @context
-				if @context[:respect_whitespace]
-					@whitespace = (@context[:respect_whitespace] == :all or
-												 @context[:respect_whitespace].include? expanded_name)
-				end
-				@whitespace = false if (@context[:compress_whitespace] and
-					(@context[:compress_whitespace] == :all or
-					 @context[:compress_whitespace].include? expanded_name)
-				)
-			end
-			@whitespace = true unless @whitespace == false
-			@whitespace
-		end
-
-		def ignore_whitespace_nodes
-			@ignore_whitespace_nodes = false
-			if @context
-				if @context[:ignore_whitespace_nodes]
-					@ignore_whitespace_nodes = 
-						(@context[:ignore_whitespace_nodes] == :all or
-						 @context[:ignore_whitespace_nodes].include? expanded_name)
-				end
-			end
-		end
-
-		# Evaluates to +true+ if raw mode is set for this element.  This
-		# is the case if the context has :+raw+ set to :+all+ or
-		# an array containing the name of this element.
-		#
-		# The evaluation is tested against +expanded_name+, and so is namespace
-		# sensitive.
-		def raw
-			@raw = (@context and @context[:raw] and
-			(@context[:raw] == :all or
-			@context[:raw].include? expanded_name))
-			@raw
-		end
-
-		#once :whitespace, :raw, :ignore_whitespace_nodes
-
-		#################################################
-		# Namespaces                                    #
-		#################################################
-
-		# Evaluates to an +Array+ containing the prefixes (names) of all defined
-		# namespaces at this context node.
-		#  doc = Document.new("<a xmlns:x='1' xmlns:y='2'><b/><c xmlns:z='3'/></a>")
-		#  doc.elements['//b'].prefixes # -> ['x', 'y']
-		def prefixes
-			prefixes = []
-			prefixes = parent.prefixes if parent
-			prefixes |= attributes.prefixes
-			return prefixes
-		end
-
-		def namespaces
-			namespaces = []
-			namespaces = parent.namespaces if parent
-			namespaces |= attributes.namespaces
-			return namespaces
-		end
-
-		# Evalutas to the URI for a prefix, or the empty string if no such 
-		# namespace is declared for this element. Evaluates recursively for
-		# ancestors.  Returns the default namespace, if there is one.
-		# prefix:: 
-		#   the prefix to search for.  If not supplied, returns the default
-		#   namespace if one exists
-		# Returns:: 
-		#   the namespace URI as a String, or nil if no such namespace
-		#   exists.  If the namespace is undefined, returns an empty string
-		#  doc = Document.new("<a xmlns='1' xmlns:y='2'><b/><c xmlns:z='3'/></a>")
-		#  b = doc.elements['//b']
-		#  b.namespace           # -> '1'
-		#  b.namespace("y")      # -> '2'
-		def namespace(prefix=nil)
-			if prefix.nil?
-				prefix = prefix()
-			end
-			if prefix == ''
-				prefix = "xmlns"
-			else
-				prefix = "xmlns:#{prefix}" unless prefix[0,5] == 'xmlns'
-			end
-			ns = attributes[ prefix ]
-			ns = parent.namespace(prefix) if ns.nil? and parent
-			ns = '' if ns.nil? and prefix == 'xmlns'
-			return ns
-		end
-
-		# Adds a namespace to this element.
-		# prefix:: 
-		#   the prefix string, or the namespace URI if +uri+ is not
-		#   supplied
-		# uri::    
-		#   the namespace URI.  May be nil, in which +prefix+ is used as
-		#   the URI
-		# Evaluates to: this Element
-		#  a = Element.new("a")
-		#  a.add_namespace("xmlns:foo", "bar" )
-		#  a.add_namespace("foo", "bar")  # shorthand for previous line
-		#  a.add_namespace("twiddle")
-		#  puts a   #-> <a xmlns:foo='bar' xmlns='twiddle'/>
-		def add_namespace( prefix, uri=nil )
-			unless uri
-				@attributes["xmlns"] = prefix
-			else
-				prefix = "xmlns:#{prefix}" unless prefix =~ /^xmlns:/
-				@attributes[ prefix ] = uri
-			end
-			self
-		end
-
-		# Removes a namespace from this node.  This only works if the namespace is
-		# actually declared in this node.  If no argument is passed, deletes the
-		# default namespace.
-		#
-		# Evaluates to: this element
-		#  doc = Document.new "<a xmlns:foo='bar' xmlns='twiddle'/>"
-		#  doc.root.delete_namespace
-		#  puts doc     # -> <a xmlns:foo='bar'/>
-		#  doc.root.delete_namespace 'foo'
-		#  puts doc     # -> <a/>
-		def delete_namespace namespace="xmlns"
-			namespace = "xmlns:#{namespace}" unless namespace == 'xmlns'
-			attribute = attributes.get_attribute(namespace)
-			attribute.remove unless attribute.nil?
-			self
-		end
-
-		#################################################
-		# Elements                                      #
-		#################################################
-
-		# Adds a child to this element, optionally setting attributes in
-		# the element.
-		# element:: 
-		#   optional.  If Element, the element is added.
-		#   Otherwise, a new Element is constructed with the argument (see
-		#   Element.initialize).
-		# attrs:: 
-		#   If supplied, must be a Hash containing String name,value 
-		#   pairs, which will be used to set the attributes of the new Element.
-		# Returns:: the Element that was added
-		#  el = doc.add_element 'my-tag'
-		#  el = doc.add_element 'my-tag', {'attr1'=>'val1', 'attr2'=>'val2'}
-		#  el = Element.new 'my-tag'
-		#  doc.add_element el
-		def add_element element=nil, attrs=nil
-			el = @elements.add(element)
-			if attrs.kind_of? Hash
-				attrs.each do |key, value|
-					el.attributes[key]=value if key =~ /^xmlns:/
-				end
-				attrs.each do |key, value|
-					el.attributes[key]=value if key !~ /^xmlns:/
-				end
-			end
-			el
-		end
-
-		# Deletes a child element.
-		# element:: 
-		#   Must be an +Element+, +String+, or +Integer+.  If Element, 
-		#   the element is removed.  If String, the element is found (via XPath) 
-		#   and removed.  <em>This means that any parent can remove any
-		#   descendant.<em>  If Integer, the Element indexed by that number will be
-		#   removed.
-		# Returns:: the element that was removed.
-		#  doc.delete_element "/a/b/c[@id='4']"
-		#  doc.delete_element doc.elements["//k"]
-		#  doc.delete_element 1
-		def delete_element element
-			@elements.delete element
-		end
-
-		# Evaluates to +true+ if this element has at least one child Element
-		#  doc = Document.new "<a><b/><c>Text</c></a>"
-		#  doc.root.has_elements               # -> true
-		#  doc.elements["/a/b"].has_elements   # -> false
-		#  doc.elements["/a/c"].has_elements   # -> false
-		def has_elements?
-			!@elements.empty?
-		end
-
-		# Iterates through the child elements, yielding for each Element that
-		# has a particular attribute set.
-		# key:: 
-		#   the name of the attribute to search for
-		# value:: 
-		#   the value of the attribute
-		# max:: 
-		#   (optional) causes this method to return after yielding 
-		#   for this number of matching children
-		# name:: 
-		#   (optional) if supplied, this is an XPath that filters
-		#   the children to check.
-		#
-		#  doc = Document.new "<a><b @id='1'/><c @id='2'/><d @id='1'/><e/></a>"
-		#  # Yields b, c, d
-		#  doc.root.each_element_with_attribute( 'id' ) {|e| p e}
-		#  # Yields b, d
-		#  doc.root.each_element_with_attribute( 'id', '1' ) {|e| p e}
-		#  # Yields b
-		#  doc.root.each_element_with_attribute( 'id', '1', 1 ) {|e| p e}
-		#  # Yields d
-		#  doc.root.each_element_with_attribute( 'id', '1', 0, 'd' ) {|e| p e}
-		def each_element_with_attribute( key, value=nil, max=0, name=nil, &block ) # :yields: Element
-			each_with_something( proc {|child| 
-				if value.nil?
-					child.attributes[key] != nil
-				else
-					child.attributes[key]==value
-				end
-			}, max, name, &block )
-		end
-
-		# Iterates through the children, yielding for each Element that
-		# has a particular text set.
-		# text:: 
-		#   the text to search for.  If nil, or not supplied, will itterate
-		#   over all +Element+ children that contain at least one +Text+ node.
-		# max:: 
-		#   (optional) causes this method to return after yielding
-		#   for this number of matching children
-		# name:: 
-		#   (optional) if supplied, this is an XPath that filters
-		#   the children to check.
-		#
-		#  doc = Document.new '<a><b>b</b><c>b</c><d>d</d><e/></a>'
-		#  # Yields b, c, d
-		#  doc.each_element_with_text {|e|p e}
-		#  # Yields b, c
-		#  doc.each_element_with_text('b'){|e|p e}
-		#  # Yields b
-		#  doc.each_element_with_text('b', 1){|e|p e}
-		#  # Yields d
-		#  doc.each_element_with_text(nil, 0, 'd'){|e|p e}
-		def each_element_with_text( text=nil, max=0, name=nil, &block ) # :yields: Element
-			each_with_something( proc {|child| 
-				if text.nil?
-					child.has_text?
-				else
-					child.text == text
-				end
-			}, max, name, &block )
-		end
-
-		# Synonym for Element.elements.each
-		def each_element( xpath=nil, &block ) # :yields: Element
-			@elements.each( xpath, &block )
-		end
-
-		# Synonym for Element.to_a
-		# This is a little slower than calling elements.each directly.
-		# xpath:: any XPath by which to search for elements in the tree
-		# Returns:: an array of Elements that match the supplied path
-		def get_elements( xpath )
-			@elements.to_a( xpath )
-		end
-
-		# Returns the next sibling that is an element, or nil if there is
-		# no Element sibling after this one
-		#  doc = Document.new '<a><b/>text<c/></a>'
-		#  doc.root.elements['b'].next_element          #-> <c/>
-		#  doc.root.elements['c'].next_element          #-> nil
-		def next_element
-			element = next_sibling
-			element = element.next_sibling until element.nil? or element.kind_of? Element 
-			return element
-		end
-
-		# Returns the previous sibling that is an element, or nil if there is
-		# no Element sibling prior to this one
-		#  doc = Document.new '<a><b/>text<c/></a>'
-		#  doc.root.elements['c'].previous_element          #-> <b/>
-		#  doc.root.elements['b'].previous_element          #-> nil
-		def previous_element
-			element = previous_sibling
-			element = element.previous_sibling until element.nil? or element.kind_of? Element
-			return element
-		end
-
-
-		#################################################
-		# Text                                          #
-		#################################################
-
-		# Evaluates to +true+ if this element has at least one Text child
-		def has_text?
-			not text().nil?
-		end
-
-		# A convenience method which returns the String value of the _first_
-		# child text element, if one exists, and +nil+ otherwise.
-		#
-		# <em>Note that an element may have multiple Text elements, perhaps
-		# separated by other children</em>.  Be aware that this method only returns
-		# the first Text node.
-		#
-		# This method returns the +value+ of the first text child node, which
-		# ignores the +raw+ setting, so always returns normalized text. See
-		# the Text::value documentation.
-		#
-		#  doc = Document.new "<p>some text <b>this is bold!</b> more text</p>"
-		#  # The element 'p' has two text elements, "some text " and " more text".
-		#  doc.root.text              #-> "some text "
-		def text( path = nil )
-			rv = get_text(path)
-			return rv.value unless rv.nil?
-			nil
-		end
-
-		# Returns the first child Text node, if any, or +nil+ otherwise.
-		# This method returns the actual +Text+ node, rather than the String content.
-		#  doc = Document.new "<p>some text <b>this is bold!</b> more text</p>"
-		#  # The element 'p' has two text elements, "some text " and " more text".
-		#  doc.root.get_text.value            #-> "some text "
-		def get_text path = nil
-			rv = nil
-			if path
-				element = @elements[ path ]
-				rv = element.get_text unless element.nil?
-			else
-				rv = find { |node| node.kind_of? Text }
-			end
-			return rv
-		end
-
-		# Sets the first Text child of this object.  See text() for a
-		# discussion about Text children.
-		#
-		# If a Text child already exists, the child is replaced by this
-		# content.  This means that Text content can be deleted by calling
-		# this method with a nil argument.  In this case, the next Text
-		# child becomes the first Text child.  In no case is the order of
-		# any siblings disturbed.
-		# text:: 
-		#   If a String, a new Text child is created and added to
-		#   this Element as the first Text child.  If Text, the text is set
-		#   as the first Child element.  If nil, then any existing first Text
-		#   child is removed.
-		# Returns:: this Element.
-		#  doc = Document.new '<a><b/></a>'
-		#  doc.root.text = 'Sean'      #-> '<a><b/>Sean</a>'
-		#  doc.root.text = 'Elliott'   #-> '<a><b/>Elliott</a>'
-		#  doc.root.add_element 'c'    #-> '<a><b/>Elliott<c/></a>'
-		#  doc.root.text = 'Russell'   #-> '<a><b/>Russell<c/></a>'
-		#  doc.root.text = nil         #-> '<a><b/><c/></a>'
-		def text=( text )
-			text = Text.new( text, whitespace(), nil, raw() ) if text.kind_of? String
-			old_text = get_text
-			if text.nil?
-				old_text.remove unless old_text.nil?
-			else
-				if old_text.nil?
-					self << text
-				else
-					old_text.replace_with( text )
-				end
-			end
-			return self
-		end
-
-		# A helper method to add a Text child.  Actual Text instances can
-		# be added with regular Parent methods, such as add() and <<()
-		# text::
-		#   if a String, a new Text instance is created and added
-		#   to the parent.  If Text, the object is added directly.
-		# Returns:: this Element
-		#  e = Element.new('a')          #-> <e/>
-		#  e.add_text 'foo'              #-> <e>foo</e>
-		#  e.add_text Text.new(' bar')    #-> <e>foo bar</e>
-		# Note that at the end of this example, the branch has <b>3</b> nodes; the 'e'
-		# element and <b>2</b> Text node children.
-		def add_text( text )
-			if text.kind_of? String 
-				if @children[-1].kind_of? Text
-					@children[-1] << text
-					return
-				end
-				text = Text.new( text, whitespace(), nil, raw() )
-			end
-			self << text unless text.nil?
-			return self
-		end
-
-    def node_type
-      :element
-    end
-
-		#################################################
-		# Attributes                                    #
-		#################################################
-
-		def attribute( name, namespace=nil )
-			prefix = ''
-			if namespace
-				prefix = attributes.prefixes.each { |prefix|
-					return "#{prefix}:" if namespace( prefix ) == namespace
-				} || ''
-			end
-			attributes.get_attribute( "#{prefix}#{name}" )
-		end
-
-		# Evaluates to +true+ if this element has any attributes set, false
-		# otherwise.
-		def has_attributes?
-			return !@attributes.empty?
-		end
-
-		# Adds an attribute to this element, overwriting any existing attribute
-		# by the same name.
-		# key::
-		#   can be either an Attribute or a String.  If an Attribute,
-		#   the attribute is added to the list of Element attributes.  If String,
-		#   the argument is used as the name of the new attribute, and the value
-		#   parameter must be supplied.
-		# value:: 
-		#   Required if +key+ is a String, and ignored if the first argument is
-		#   an Attribute.  This is a String, and is used as the value
-		#   of the new Attribute.
-		# Returns:: the Attribute added
-		#  e = Element.new 'e'
-		#  e.add_attribute( 'a', 'b' )               #-> <e a='b'/>
-		#  e.add_attribute( 'x:a', 'c' )             #-> <e a='b' x:a='c'/>
-		#  e.add_attribute Attribute.new('b', 'd')   #-> <e a='b' x:a='c' b='d'/>
-		def add_attribute( key, value=nil )
-			if key.kind_of? Attribute
-				@attributes << key
-			else
-				@attributes[key] = value
-			end
-		end
-
-		# Add multiple attributes to this element.
-		# hash:: is either a hash, or array of arrays
-		#  el.add_attributes( {"name1"=>"value1", "name2"=>"value2"} )
-		#  el.add_attributes( [ ["name1","value1"], ["name2"=>"value2"] ] )
-		def add_attributes hash
-			if hash.kind_of? Hash
-				hash.each_pair {|key, value| @attributes[key] = value }
-			elsif hash.kind_of? Array
-				hash.each { |value| @attributes[ value[0] ] = value[1] }
-			end
-		end
-
-		# Removes an attribute
-		# key::
-		#   either an Attribute or a String.  In either case, the
-		#   attribute is found by matching the attribute name to the argument,
-		#   and then removed.  If no attribute is found, no action is taken.
-		# Returns:: 
-		#   the attribute removed, or nil if this Element did not contain
-		#   a matching attribute
-		#  e = Element.new('E')
-		#  e.add_attribute( 'name', 'Sean' )             #-> <E name='Sean'/>
-		#  r = e.add_attribute( 'sur:name', 'Russell' )  #-> <E name='Sean' sur:name='Russell'/>
-		#  e.delete_attribute( 'name' )                  #-> <E sur:name='Russell'/>
-		#  e.delete_attribute( r )                       #-> <E/>
-		def delete_attribute(key)
-			attr = @attributes.get_attribute(key)
-			attr.remove unless attr.nil?
-		end
-
-		#################################################
-		# Other Utilities                               #
-		#################################################
-
-		# Get an array of all CData children.  
-		# IMMUTABLE
-		def cdatas
-			find_all { |child| child.kind_of? CData }.freeze
-		end
-
-		# Get an array of all Comment children.
-		# IMMUTABLE
-		def comments
-			find_all { |child| child.kind_of? Comment }.freeze
-		end
-
-		# Get an array of all Instruction children.
-		# IMMUTABLE
-		def instructions
-			find_all { |child| child.kind_of? Instruction }.freeze
-		end
-
-		# Get an array of all Text children.
-		# IMMUTABLE
-		def texts
-			find_all { |child| child.kind_of? Text }.freeze
-		end
-
-		# Writes out this element, and recursively, all children.
-		# output::
-		#	  output an object which supports '<< string'; this is where the
-		#   document will be written.
-		# indent::
-		#   An integer.  If -1, no indenting will be used; otherwise, the
-		#   indentation will be this number of spaces, and children will be
-		#   indented an additional amount.  Defaults to -1
-		# transitive::
-		#   What the heck does this do? Defaults to false
-		# ie_hack::
-		#   Internet Explorer is the worst piece of crap to have ever been
-		#   written, with the possible exception of Windows itself.  Since IE is
-		#   unable to parse proper XML, we have to provide a hack to generate XML
-		#   that IE's limited abilities can handle.  This hack inserts a space 
-		#   before the /> on empty tags.  Defaults to false
-		#
-		#  out = ''
-		#  doc.write( out )     #-> doc is written to the string 'out'
-		#  doc.write( $stdout ) #-> doc written to the console
-		def write(writer=$stdout, indent=-1, transitive=false, ie_hack=false)
-			#print "ID:#{indent}"
-			writer << "<#@expanded_name"
-
-			@attributes.each_attribute do |attr|
-				writer << " "
-				attr.write( writer, indent )
-			end unless @attributes.empty?
-
-			if @children.empty?
-				writer << " " if ie_hack
-				writer << "/" 
-			else
-				if transitive and indent>-1 and !@children[0].kind_of? Text
-					writer << "\n"
-					indent writer, indent+2
-				end
-				writer << ">"
-				write_children( writer, indent, transitive, ie_hack )
-				writer << "</#{expanded_name}"
-			end
-			if transitive and indent>-1
-				writer << "\n"
-				indent -= 2 if next_sibling.nil?
-				indent(writer, indent)
-			end
-			writer << ">"
-		end
-
-
-		private
-		# A private helper method
-		def each_with_something( test, max=0, name=nil )
-			num = 0
-			child=nil
-			@elements.each( name ){ |child|
-				yield child if test.call(child) and num += 1
-				return if max>0 and num == max
-			}
-		end
-
-		# A private helper method
-		def write_children( writer, indent, transitive, ie_hack )
-			cr = (indent < 0) ? '' : "\n"
-			#if size == 1 and @children[0].kind_of?(Text)
-			#	self[0].write( writer, -1 )
-			if indent == -1
-				each { |child| child.write( writer, indent, transitive, ie_hack ) }
-			else
-				next_indent = indent+2
-				last_child=nil
-				each { |child|
-					unless child.kind_of? Text or last_child.kind_of? Text or transitive
-						writer << cr
-						indent(writer, next_indent)
-					end
-					child.write( writer, next_indent, transitive, ie_hack )
-					last_child = child
-				}
-				unless last_child.kind_of? Text or transitive
-					writer << cr
-					indent( writer, indent )
-				end
-			end
-		end
-	end
-
-	########################################################################
-	# ELEMENTS                                                             #
-	########################################################################
-
-	# A class which provides filtering of children for Elements, and
-	# XPath search support.  You are expected to only encounter this class as
-	# the <tt>element.elements</tt> object.  Therefore, you are 
-	# _not_ expected to instantiate this yourself.
-	class Elements
-		include Enumerable
-		# Constructor
-		# parent:: the parent Element
-		def initialize parent
-			@element = parent
-		end
-
-		# Fetches a child element.  Filters only Element children, regardless of
-		# the XPath match.
-		# index:: 
-		#   the search parameter.  This is either an Integer, which
-		#   will be used to find the index'th child Element, or an XPath,
-		#   which will be used to search for the Element.  <em>Because
-		#   of the nature of XPath searches, any element in the connected XML
-		#   document can be fetched through any other element.</em>  <b>The
-		#   Integer index is 1-based, not 0-based.</b>  This means that the first
-		#   child element is at index 1, not 0, and the +n+th element is at index
-		#   +n+, not <tt>n-1</tt>.  This is because XPath indexes element children
-		#   starting from 1, not 0, and the indexes should be the same.
-		# name:: 
-		#   optional, and only used in the first argument is an
-		#   Integer.  In that case, the index'th child Element that has the
-		#   supplied name will be returned.  Note again that the indexes start at 1.
-		# Returns:: the first matching Element, or nil if no child matched
-		#  doc = Document.new '<a><b/><c id="1"/><c id="2"/><d/></a>'
-		#  doc.root.elements[1]       #-> <b/>
-		#  doc.root.elements['c']     #-> <c id="1"/>
-		#  doc.root.elements[2,'c']   #-> <c id="2"/>
-		def []( index, name=nil)
-			if index.kind_of? Integer
-				raise "index (#{index}) must be >= 1" if index < 1
-				name = literalize(name) if name
-				num = 0
-				child = nil
-				@element.find { |child|
-					child.kind_of? Element and
-					(name.nil? ? true : child.has_name?( name )) and 
-					(num += 1) == index
-				}
-			else
-				return XPath::first( @element, index )
-				#{ |element| 
-				#	return element if element.kind_of? Element
-				#}
-				#return nil
-			end
-		end
-
-		# Sets an element, replacing any previous matching element.  If no
-		# existing element is found ,the element is added.
-		# index:: Used to find a matching element to replace.  See []().
-		# element:: 
-		#   The element to replace the existing element with
-		#   the previous element
-		# Returns:: nil if no previous element was found.
-		#
-		#  doc = Document.new '<a/>'
-		#  doc.root.elements[10] = Element.new('b')    #-> <a><b/></a>
-		#  doc.root.elements[1]                        #-> <b/>
-		#  doc.root.elements[1] = Element.new('c')     #-> <a><c/></a>
-		#  doc.root.elements['c'] = Element.new('d')   #-> <a><d/></a>
-		def []=( index, element )
-			previous = self[index]
-			if previous.nil?
-				@element.add element
-			else
-				previous.replace_with element
-			end
-			return previous
-		end
-
-		# Returns +true+ if there are no +Element+ children, +false+ otherwise
-		def empty?
-			@element.find{ |child| child.kind_of? Element}.nil?
-		end
-
-		# Returns the index of the supplied child (starting at 1), or -1 if 
-		# the element is not a child
-		# element:: an +Element+ child
-		def index element
-			rv = 0
-			found = @element.find do |child| 
-				child.kind_of? Element and
-				(rv += 1) and
-				child == element
-			end
-			return rv if found == element
-			return -1
-		end
-
-		# Deletes a child Element
-		# element:: 
-		#   Either an Element, which is removed directly; an
-		#   xpath, where the first matching child is removed; or an Integer,
-		#   where the n'th Element is removed.
-		# Returns:: the removed child
-		#  doc = Document.new '<a><b/><c/><c id="1"/></a>'
-		#  b = doc.root.elements[1]
-		#  doc.root.elements.delete b           #-> <a><c/><c id="1"/></a>
-		#  doc.elements.delete("a/c[@id='1']")  #-> <a><c/></a>
-		#  doc.root.elements.delete 1           #-> <a/>
-		def delete element
-			if element.kind_of? Element
-				@element.delete element
-			else
-				el = self[element]
-				el.remove if el
-			end
-		end
-
-		# Removes multiple elements.  Filters for Element children, regardless of
-		# XPath matching.
-		# xpath:: all elements matching this String path are removed.
-		# Returns:: an Array of Elements that have been removed
-		#  doc = Document.new '<a><c/><c/><c/><c/></a>'
-		#  deleted = doc.elements.delete_all 'a/c' #-> [<c/>, <c/>, <c/>, <c/>]
-		def delete_all( xpath )
-			rv = []
-			XPath::each( @element, xpath) {|element| 
-				rv << element if element.kind_of? Element
-			}
-			rv.each do |element|
-				@element.delete element
-				element.remove
-			end
-			return rv
-		end
-
-		# Adds an element
-		# element:: 
-		#   if supplied, is either an Element, String, or
-		#   Source (see Element.initialize).  If not supplied or nil, a
-		#   new, default Element will be constructed
-		# Returns:: the added Element
-		#  a = Element.new 'a'
-		#  a.elements.add Element.new 'b'  #-> <a><b/></a>
-		#  a.elements.add 'c'              #-> <a><b/><c/></a>
-		def add element=nil
-			rv = nil
-			if element.nil?
-				Element.new "", self, @element.context
-			elsif not element.kind_of?(Element)
-				Element.new element, self, @element.context
-			else
-				@element << element
-				element.context = @element.context
-				element
-			end
-		end
-
-		alias :<< :add
-
-		# Iterates through all of the child Elements, optionally filtering
-		# them by a given XPath
-		# xpath:: 
-		#   optional.  If supplied, this is a String XPath, and is used to 
-		#   filter the children, so that only matching children are yielded.  Note
-		#   that XPaths are automatically filtered for Elements, so that
-		#   non-Element children will not be yielded
-		#  doc = Document.new '<a><b/><c/><d/>sean<b/><c/><d/></a>'
-		#  doc.root.each {|e|p e}       #-> Yields b, c, d, b, c, d elements
-		#  doc.root.each('b') {|e|p e}  #-> Yields b, b elements
-		#  doc.root.each('child::node()')  {|e|p e}
-		#  #-> Yields <b/>, <c/>, <d/>, <b/>, <c/>, <d/>
-		#  XPath.each(doc.root, 'child::node()', &block)
-		#  #-> Yields <b/>, <c/>, <d/>, sean, <b/>, <c/>, <d/>
-		def each( xpath=nil, &block)
-			XPath::each( @element, xpath ) {|e| yield e if e.kind_of? Element }
-		end
-
-		# Returns the number of +Element+ children of the parent object.
-		#  doc = Document.new '<a>sean<b/>elliott<b/>russell<b/></a>'
-		#  doc.root.size            #-> 6, 3 element and 3 text nodes
-		#  doc.root.elements.size   #-> 3
-		def size
-			count = 0
-			@element.each {|child| count+=1 if child.kind_of? Element }
-			count
-		end
-
-		# Returns an Array of Element children.  An XPath may be supplied to
-		# filter the children.  Only Element children are returned, even if the
-		# supplied XPath matches non-Element children.
-		#  doc = Document.new '<a>sean<b/>elliott<c/></a>'
-		#  doc.root.elements.to_a                  #-> [ <b/>, <c/> ]
-		#  doc.root.elements.to_a("child::node()") #-> [ <b/>, <c/> ] 
-		#  XPath.match(doc.root, "child::node()")  #-> [ sean, <b/>, elliott, <c/> ]
-		def to_a( xpath=nil )
-			rv = XPath.match( @element, xpath )
-			return rv.find_all{|e| e.kind_of? Element} if xpath
-			rv
-		end
-
-		private
-		# Private helper class.  Removes quotes from quoted strings
-		def literalize name
-			name = name[1..-2] if name[0] == ?' or name[0] == ?"               #'
-			name
-		end
-	end
-
-	########################################################################
-	# ATTRIBUTES                                                           #
-	########################################################################
-
-	# A class that defines the set of Attributes of an Element and provides 
-	# operations for accessing elements in that set.
-	class Attributes < Hash
-		# Constructor
-		# element:: the Element of which this is an Attribute
-		def initialize element
-			@element = element
-		end
-
-		# Fetches an attribute value.  If you want to get the Attribute itself,
-		# use get_attribute()
-		# name:: an XPath attribute name.  Namespaces are relevant here.
-		# Returns:: 
-		#   the String value of the matching attribute, or +nil+ if no
-		#   matching attribute was found.
-		# 
-		#  doc = Document.new "<a foo:att='1' bar:att='2' att='3'/>"
-		#  doc.root.attributes['att']         #-> '3'
-		#  doc.root.attributes['bar:att']     #-> '2'
-		def [](name)
-			attr = get_attribute(name)
-			return attr.value unless attr.nil?
-			return nil
-		end
-
-		# Returns the number of attributes the owning Element contains.
-		#  doc = Document "<a x='1' y='2' foo:x='3'/>"
-		#  doc.root.attributes.length        #-> 3
-		def length
-			c = 0
-			each_attribute { c+=1 }
-			c
-		end
-		alias :size :length
-
-		# Itterates over the attributes of an Element.  Yields actual Attribute
-		# nodes, not String values.
-		# 
-		#  doc = Document.new '<a x="1" y="2"/>'
-		#  doc.root.attributes.each_attribute {|attr|
-		#    p attr.expanded_name+" => "+attr.value
-		#  }
-		def each_attribute # :yields: attribute
-			each_value do |val|
-				if val.kind_of? Attribute
-					yield val
-				else
-					val.each_value { |atr| yield atr }
-				end
-			end
-		end
-
-		# Itterates over each attribute of an Element, yielding the expanded name
-		# and value as a pair of Strings.
-		#
-		#  doc = Document.new '<a x="1" y="2"/>'
-		#  doc.root.attributes.each {|name, value| p name+" => "+value }
-		def each
-			each_attribute do |attr|
-				yield attr.expanded_name, attr.value
-			end
-		end
-
-		# Fetches an attribute
-		# name:: 
-		#   the name by which to search for the attribute.  Can be a
-		#   <tt>prefix:name</tt> namespace name.
-		# Returns:: The first matching attribute, or nil if there was none.  This
-		# value is an Attribute node, not the String value of the attribute.
-		#  doc = Document.new '<a x:foo="1" foo="2" bar="3"/>'
-		#  doc.root.attributes.get_attribute("foo").value    #-> "2"
-		#  doc.root.attributes.get_attribute("x:foo").value  #-> "1"
-		def get_attribute( name )
-			attr = fetch( name, nil )
-			if attr.nil?
-				return nil if name.nil?
-				# Look for prefix
-				name =~ Namespace::NAMESPLIT
-				prefix, n = $1, $2
-				if prefix
-					attr = fetch( n, nil )
-					# check prefix
-					if attr == nil
-					elsif attr.kind_of? Attribute
-						return attr if prefix == attr.prefix
-					else
-						attr = attr[ prefix ]
-						return attr
-					end
-				end
-				if @element.document and @element.document.doctype
-					expn = @element.expanded_name
-					expn = @element.document.doctype.name if expn.size == 0
-					attr_val = @element.document.doctype.attribute_of(expn, name)
-					return Attribute.new( name, attr_val ) if attr_val
-				end
-				return nil
-			end
-			if attr.kind_of? Hash
-				attr = attr[ @element.prefix ]
-			end
-			return attr
-		end
-
-		# Sets an attribute, overwriting any existing attribute value by the
-		# same name.  Namespace is significant.
-		# name:: the name of the attribute
-		# value:: 
-		#   (optional) If supplied, the value of the attribute.  If
-		#   nil, any existing matching attribute is deleted.
-		# Returns:: 
-		#   Owning element
-		#  doc = Document.new "<a x:foo='1' foo='3'/>"
-		#  doc.root.attributes['y:foo'] = '2'
-		#  doc.root.attributes['foo'] = '4'
-		#  doc.root.attributes['x:foo'] = nil
-		def []=( name, value )
-			if value.nil?		# Delete the named attribute
-				attr = get_attribute(name)
-				delete attr
-				return
-			end
-			value = Attribute.new(name, value) unless value.kind_of? Attribute
-			value.element = @element
-			old_attr = fetch(value.name, nil)
-			if old_attr.nil?
-				store(value.name, value)
-			elsif old_attr.kind_of? Hash
-				old_attr[value.prefix] = value
-			elsif old_attr.prefix != value.prefix
-				# Check for conflicting namespaces
-				raise ParseException.new( 
-					"Namespace conflict in adding attribute \"#{value.name}\": "+
-					"Prefix \"#{old_attr.prefix}\" = "+
-					"\"#{@element.namespace(old_attr.prefix)}\" and prefix "+
-					"\"#{value.prefix}\" = \"#{@element.namespace(value.prefix)}\"") if 
-					value.prefix != "xmlns" and old_attr.prefix != "xmlns" and
-					@element.namespace( old_attr.prefix ) == 
-					@element.namespace( value.prefix )
-				store value.name, { old_attr.prefix	=> old_attr,
-														value.prefix		=> value }
-			else
-				store value.name, value
-			end
-			return @element
-		end
-
-		# Returns an array of Strings containing all of the prefixes declared 
-		# by this set of # attributes.  The array does not include the default
-		# namespace declaration, if one exists.
-		#  doc = Document.new("<a xmlns='foo' xmlns:x='bar' xmlns:y='twee' "+
-		#        "z='glorp' p:k='gru'/>")
-		#  prefixes = doc.root.attributes.prefixes    #-> ['x', 'y']
-		def prefixes
-			ns = []
-			each_attribute do |attribute|
-				ns << attribute.name if attribute.prefix == 'xmlns'
-			end
-			if @element.document and @element.document.doctype
-				expn = @element.expanded_name
-				expn = @element.document.doctype.name if expn.size == 0
-				@element.document.doctype.attributes_of(expn).each {
-					|attribute|
-					ns << attribute.name if attribute.prefix == 'xmlns'
-				}
-			end
-			ns
-		end
-
-		def namespaces
-			namespaces = []
-			each_attribute do |attribute|
-				namespaces << attribute.value if attribute.prefix == 'xmlns' or attribute.name == 'xmlns'
-			end
-			if @element.document and @element.document.doctype
-				expn = @element.expanded_name
-				expn = @element.document.doctype.name if expn.size == 0
-				@element.document.doctype.attributes_of(expn).each {
-					|attribute|
-					namespaces << attribute.value if attribute.prefix == 'xmlns' or attribute.name == 'xmlns'
-				}
-			end
-			namespaces
-		end
-
-		# Removes an attribute
-		# attribute:: 
-		#   either a String, which is the name of the attribute to remove --
-		#   namespaces are significant here -- or the attribute to remove.
-		# Returns:: the owning element
-		#  doc = Document.new "<a y:foo='0' x:foo='1' foo='3' z:foo='4'/>"
-		#  doc.root.attributes.delete 'foo'   #-> <a y:foo='0' x:foo='1' z:foo='4'/>"
-		#  doc.root.attributes.delete 'x:foo' #-> <a y:foo='0' z:foo='4'/>"
-		#  attr = doc.root.attributes.get_attribute('y:foo')
-		#  doc.root.attributes.delete attr    #-> <a z:foo='4'/>"
-		def delete( attribute )
-			name = nil
-			prefix = nil
-			if attribute.kind_of? Attribute
-				name = attribute.name
-				prefix = attribute.prefix
-			else
-				attribute =~ Namespace::NAMESPLIT
-				prefix, name = $1, $2
-				prefix = '' unless prefix
-			end
-			old = fetch(name, nil)
-			attr = nil
-			if old.kind_of? Hash # the supplied attribute is one of many
-				attr = old.delete(prefix)
-				if old.size == 1
-					repl = nil
-					old.each_value{|v| repl = v}
-					store name, repl
-				end
-			elsif old.nil?
-				return @element
-			else # the supplied attribute is a top-level one
-				attr = old
-				res = super(name)
-			end
-			@element
-		end
-
-		# Adds an attribute, overriding any existing attribute by the
-		# same name.  Namespaces are significant.
-		# attribute:: An Attribute
-		def add( attribute )
-			self[attribute.name] = attribute
-		end
-
-		alias :<< :add
-
-		# Deletes all attributes matching a name.  Namespaces are significant.
-		# name:: 
-		#   A String; all attributes that match this path will be removed
-		# Returns:: an Array of the Attributes that were removed
-		def delete_all( name )
-			rv = []
-			each_attribute { |attribute| 
-				rv << attribute if attribute.expanded_name == name
-			}
-			rv.each{ |attr| attr.remove }
-			return rv
-		end
-	end
-end
diff --git a/lib/rexml/encoding.rb b/lib/rexml/encoding.rb
deleted file mode 100644
index ad8ba7e342..0000000000
--- a/lib/rexml/encoding.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-module REXML
-	module Encoding
-		@@uconv_available = false
-
-		# Native, default format is UTF-8, so it is declared here rather than in
-		# an encodings/ definition.
-		UTF_8 = 'UTF-8'
-		UTF_16 = 'UTF-16'
-		UNILE = 'UNILE'
-
-		# ID ---> Encoding name
-		attr_reader :encoding
-		def encoding=( enc )
-			old_verbosity = $VERBOSE
-			begin
-				$VERBOSE = false
-				return if defined? @encoding and enc == @encoding
-				if enc and enc != UTF_8
-					@encoding = enc.upcase
-					begin
-						load 'rexml/encodings/ICONV.rb'
-						Iconv::iconv( UTF_8, @encoding, "" )
-					rescue LoadError, Exception => err
-						enc_file = File.join( "rexml", "encodings", "#@encoding.rb" )
-						begin
-							load enc_file
-						rescue LoadError
-							raise Exception.new( "No decoder found for encoding #@encoding.  Please install iconv." )
-						end
-					end
-				else
-					enc = UTF_8
-					@encoding = enc.upcase
-					load 'rexml/encodings/UTF-8.rb'
-				end
-			ensure
-				$VERBOSE = old_verbosity
-			end
-		end
-
-		def check_encoding str
-			# We have to recognize UTF-16, LSB UTF-16, and UTF-8
-			return UTF_16 if str[0] == 254 && str[1] == 255
-			return UNILE if str[0] == 255 && str[1] == 254
-			str =~ /^\s*<?xml\s*version=(['"]).*?\2\s*encoding=(["'])(.*?)\2/um
-			return $1.upcase if $1
-			return UTF_8
-		end
-	end
-end
diff --git a/lib/rexml/encodings/EUC-JP.rb b/lib/rexml/encodings/EUC-JP.rb
deleted file mode 100644
index 8b146e5f0a..0000000000
--- a/lib/rexml/encodings/EUC-JP.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-begin
-	require 'uconv'
-
-	module REXML
-		module Encoding
-			def decode(str)
-				return Uconv::euctou8(str)
-			end
-
-			def encode content
-				return Uconv::u8toeuc(content)
-			end
-		end
-	end
-rescue LoadError
-  begin
-		require 'iconv'
-		module REXML
-			module Encoding
-				def decode(str)
-					return Iconv::iconv("utf-8", "euc-jp", str)[0]
-				end
-
-				def encode content
-					return Iconv::iconv("euc-jp", "utf-8", content)[0]
-				end
-			end
-		end
-  rescue LoadError
-		raise "uconv or iconv is required for Japanese encoding support."
-  end
-end
diff --git a/lib/rexml/encodings/ICONV.rb b/lib/rexml/encodings/ICONV.rb
deleted file mode 100644
index f1b5c80b87..0000000000
--- a/lib/rexml/encodings/ICONV.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require "iconv"
-raise LoadError unless defined? Iconv
-
-module REXML
-	module Encoding
-		def decode( str )
-			return Iconv::iconv(UTF_8, @encoding, str)[0]
-		end
-
-		def encode( content )
-			return Iconv::iconv(@encoding, UTF_8, content)[0]
-		end
-	end
-end
diff --git a/lib/rexml/encodings/ISO-8859-1.rb b/lib/rexml/encodings/ISO-8859-1.rb
deleted file mode 100644
index 0cb9afd147..0000000000
--- a/lib/rexml/encodings/ISO-8859-1.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module REXML
-	module Encoding
-		# Convert from UTF-8
-		def encode content
-			array_utf8 = content.unpack('U*')
-			array_enc = []
-			array_utf8.each do |num|
-				if num <= 0xFF
-					array_enc << num
-				else
-					# Numeric entity (&#nnnn;); shard by  Stefan Scholl
-					array_enc.concat "&\##{num};".unpack('C*')
-				end
-			end
-			array_enc.pack('C*')
-		end
-
-		# Convert to UTF-8
-		def decode(str)
-			str.unpack('C*').pack('U*')
-		end
-	end
-end
diff --git a/lib/rexml/encodings/SHIFT-JIS.rb b/lib/rexml/encodings/SHIFT-JIS.rb
deleted file mode 100644
index 2c2a6890c8..0000000000
--- a/lib/rexml/encodings/SHIFT-JIS.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'rexml/encodings/SHIFT_JIS'
diff --git a/lib/rexml/encodings/SHIFT_JIS.rb b/lib/rexml/encodings/SHIFT_JIS.rb
deleted file mode 100644
index 27e4569403..0000000000
--- a/lib/rexml/encodings/SHIFT_JIS.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-begin
-	require 'uconv'
-
-	module REXML
-		module Encoding
-			def to_shift_jis content
-				Uconv::u8tosjis(content)
-			end
-
-			def from_shift_jis(str)
-				Uconv::sjistou8(str)
-			end
-		end
-	end
-rescue LoadError
-  begin
-	require 'iconv'
-	module REXML
-		module Encoding
-			def from_shift_jis(str)
-				return Iconv::iconv("utf-8", "shift_jis", str).join('')
-			end
-
-			def to_shift_jis content
-				return Iconv::iconv("shift_jis", "utf-8", content).join('')
-			end
-		end
-	end
-  rescue LoadError
-	raise "uconv or iconv is required for Japanese encoding support."
-  end
-
-end
diff --git a/lib/rexml/encodings/UNILE.rb b/lib/rexml/encodings/UNILE.rb
deleted file mode 100644
index e57a784061..0000000000
--- a/lib/rexml/encodings/UNILE.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-module REXML
-	module Encoding
-		def encode content
-			array_utf8 = content.unpack("U*")
-			array_enc = []
-			array_utf8.each do |num|
-				if ((num>>16) > 0)
-					array_enc << ??
-					array_enc << 0
-				else
-					array_enc << (num & 0xFF)
-					array_enc << (num >> 8)
-				end
-			end
-			array_enc.pack('C*')
-		end
-
-		def decode(str)
-			array_enc=str.unpack('C*')
-			array_utf8 = []
-			2.step(array_enc.size-1, 2){|i| 
-				array_utf8 << (array_enc.at(i) + array_enc.at(i+1)*0x100)
-			}
-			array_utf8.pack('U*')
-		end
-	end
-end
diff --git a/lib/rexml/encodings/US-ASCII.rb b/lib/rexml/encodings/US-ASCII.rb
deleted file mode 100644
index 0cb9afd147..0000000000
--- a/lib/rexml/encodings/US-ASCII.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module REXML
-	module Encoding
-		# Convert from UTF-8
-		def encode content
-			array_utf8 = content.unpack('U*')
-			array_enc = []
-			array_utf8.each do |num|
-				if num <= 0xFF
-					array_enc << num
-				else
-					# Numeric entity (&#nnnn;); shard by  Stefan Scholl
-					array_enc.concat "&\##{num};".unpack('C*')
-				end
-			end
-			array_enc.pack('C*')
-		end
-
-		# Convert to UTF-8
-		def decode(str)
-			str.unpack('C*').pack('U*')
-		end
-	end
-end
diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb
deleted file mode 100644
index 31f2d81a5b..0000000000
--- a/lib/rexml/encodings/UTF-16.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-module REXML
-	module Encoding
-		def encode content
-			array_utf8 = content.unpack("U*")
-			array_enc = []
-			array_utf8.each do |num|
-				if ((num>>16) > 0)
-					array_enc << 0
-					array_enc << ??
-				else
-					array_enc << (num >> 8)
-					array_enc << (num & 0xFF)
-				end
-			end
-			array_enc.pack('C*')
-		end
-
-		def decode(str)
-			array_enc=str.unpack('C*')
-			array_utf8 = []
-			2.step(arrayEnc.size-1, 2){|i| 
-				array_utf8 << (array_enc.at(i+1) + array_enc.at(i)*0x100)
-			}
-			array_utf8.pack('U*')
-		end
-	end
-end
diff --git a/lib/rexml/encodings/UTF-8.rb b/lib/rexml/encodings/UTF-8.rb
deleted file mode 100644
index 96fee4c4c0..0000000000
--- a/lib/rexml/encodings/UTF-8.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module REXML
-	module Encoding
-		def encode content
-			content
-		end
-
-		def decode(str)
-			str
-		end
-	end
-end
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb
deleted file mode 100644
index 4b88a3c553..0000000000
--- a/lib/rexml/entity.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-require 'rexml/child'
-require 'rexml/source'
-require 'rexml/xmltokens'
-
-module REXML
-	# God, I hate DTDs.  I really do.  Why this idiot standard still
-	# plagues us is beyond me.
-	class Entity < Child
-		include XMLTokens
-		PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
-		SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))}
-		PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')}
-		EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))"
-		NDATADECL = "\\s+NDATA\\s+#{NAME}"
-		PEREFERENCE = "%#{NAME};"
-		ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))}
-		PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})"
-		ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))"
-		PEDECL = "<!ENTITY\\s+(%)\\s+#{NAME}\\s+#{PEDEF}\\s*>"
-		GEDECL = "<!ENTITY\\s+#{NAME}\\s+#{ENTITYDEF}\\s*>"
-		ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um
-
-		attr_reader :name, :external, :ref, :ndata, :pubid
-
-		# Create a new entity.  Simple entities can be constructed by passing a
-		# name, value to the constructor; this creates a generic, plain entity
-		# reference. For anything more complicated, you have to pass a Source to
-		# the constructor with the entity definiton, or use the accessor methods.
-		# +WARNING+: There is no validation of entity state except when the entity
-		# is read from a stream.  If you start poking around with the accessors,
-		# you can easily create a non-conformant Entity.  The best thing to do is
-		# dump the stupid DTDs and use XMLSchema instead.
-		# 
-		#  e = Entity.new( 'amp', '&' )
-		def initialize stream, value=nil, parent=nil, reference=false
-			super(parent)
-			@ndata = @pubid = @value = @external = nil
-			if stream.kind_of? Array
-				@name = stream[1]
-				if stream[-1] == '%'
-					@reference = true 
-					stream.pop
-				else
-					@reference = false
-				end
-				if stream[2] =~ /SYSTEM|PUBLIC/
-					@external = stream[2]
-					if @external == 'SYSTEM'
-						@ref = stream[3]
-						@ndata = stream[4] if stream.size == 5
-					else
-						@pubid = stream[3]
-						@ref = stream[4]
-					end
-				else
-					@value = stream[2]
-				end
-			else
-				@reference = reference
-				@external = nil
-				@name = stream
-				@value = value
-			end
-		end
-
-		# Evaluates whether the given string matchs an entity definition,
-		# returning true if so, and false otherwise.
-		def Entity::matches? string
-			(ENTITYDECL =~ string) == 0
-		end
-
-		# Evaluates to the unnormalized value of this entity; that is, replacing
-		# all entities -- both %ent; and &ent; entities.  This differs from
-		# +value()+ in that +value+ only replaces %ent; entities.
-		def unnormalized
-			v = value()
-			return nil if v.nil?
-			@unnormalized = Text::unnormalize(v, parent)
-			@unnormalized
-		end
-
-		#once :unnormalized
-
-		# Returns the value of this entity unprocessed -- raw.  This is the
-		# normalized value; that is, with all %ent; and &ent; entities intact
-		def normalized
-			@value
-		end
-
-		# Write out a fully formed, correct entity definition (assuming the Entity
-		# object itself is valid.)
-		def write out, indent=-1
-			out << '<!ENTITY '
-			out << '% ' if @reference
-			out << @name
-			out << ' '
-			if @external
-				out << @external << ' '
-				if @pubid
-					q = @pubid.include?('"')?"'":'"'
-					out << q << @pubid << q << ' '
-				end
-				q = @ref.include?('"')?"'":'"'
-				out << q << @ref << q
-				out << ' NDATA ' << @ndata if @ndata
-			else
-				q = @value.include?('"')?"'":'"'
-				out << q << @value << q
-			end
-			out << '>'
-		end
-
-		# Returns this entity as a string.  See write().
-		def to_s
-			rv = ''
-			write rv
-			rv
-		end
-
-		PEREFERENCE_RE = /#{PEREFERENCE}/um
-		# Returns the value of this entity.  At the moment, only internal entities
-		# are processed.  If the value contains internal references (IE,
-		# %blah;), those are replaced with their values.  IE, if the doctype
-		# contains:
-		#  <!ENTITY % foo "bar">
-		#  <!ENTITY yada "nanoo %foo; nanoo>
-		# then:
-		#  doctype.entity('yada').value   #-> "nanoo bar nanoo"
-		def value
-			if @value
-				matches = @value.scan(PEREFERENCE_RE)
-				rv = @value.clone
-				if @parent
-					matches.each do |entity_reference|
-						entity_value = @parent.entity( entity_reference[0] )
-						rv.gsub!( /%#{entity_reference};/um, entity_value )
-					end
-				end
-				return rv
-			end
-			nil
-		end
-	end
-
-	# This is a set of entity constants -- the ones defined in the XML
-	# specification.  These are +gt+, +lt+, +amp+, +quot+ and +apos+.
-	module EntityConst
-		# +>+
-		GT = Entity.new( 'gt', '>' )
-		# +<+
-		LT = Entity.new( 'lt', '<' )
-		# +&+
-		AMP = Entity.new( 'amp', '&' )
-		# +"+
-		QUOT = Entity.new( 'quot', '"' )
-		# +'+
-		APOS = Entity.new( 'apos', "'" )
-	end
-end
diff --git a/lib/rexml/functions.rb b/lib/rexml/functions.rb
deleted file mode 100644
index d2d078640b..0000000000
--- a/lib/rexml/functions.rb
+++ /dev/null
@@ -1,360 +0,0 @@
-module REXML
-	# If you add a method, keep in mind two things:
-	# (1) the first argument will always be a list of nodes from which to
-	# filter.  In the case of context methods (such as position), the function
-	# should return an array with a value for each child in the array.
-	# (2) all method calls from XML will have "-" replaced with "_".
-	# Therefore, in XML, "local-name()" is identical (and actually becomes)
-	# "local_name()"
-	module Functions
-		@@node = nil
-    @@index = nil
-    @@size = nil
-		@@variables = {}
-		@@namespace_context = {}
-
-		def Functions::node=(value); @@node = value; end
-		def Functions::index=(value); @@index = value; end
-		def Functions::size=(value); @@size = value; end
-		def Functions::variables=(value); @@variables = value; end
-		def Functions::namespace_context=(value)
-			@@namespace_context = value
-		end
-		def Functions::node; @@node; end
-		def Functions::index; @@index; end
-		def Functions::size; @@size; end
-		def Functions::variables; @@variables; end
-		def Functions::namespace_context; @@namespace_context; end
-
-		def Functions::text( )
-			return true if @@node.node_type == :text
-		end
-
-		def Functions::last( )
-			@@size
-		end
-
-		def Functions::position( )
-			@@index
-		end
-
-		def Functions::count( node_set )
-			node_set.size
-		end
-
-		# Since REXML is non-validating, this method is not implemented as it
-		# requires a DTD
-		def Functions::id( object )
-		end
-
-		# UNTESTED
-		def Functions::local_name( node_set=nil )
-			get_namespace( node_set ) do |node|
-				return node.local_name 
-			end
-		end
-
-		def Functions::namespace_uri( node_set=nil )
-			get_namespace( node_set ) {|node| node.namespace}
-		end
-
-		def Functions::name( node_set=nil )
-			get_namespace( node_set ) do |node| 
-				node.expanded_name
-			end
-		end
-
-		# Helper method.
-		def Functions::get_namespace( node_set = nil )
-			if node_set == nil
-				yield @@node if defined? @@node.namespace
-			else	
-				if node_set.namespace
-					yield node_set
-				else
-					return unless node_set.kind_of? Enumerable
-					node_set.each { |node| yield node if defined? node.namespace }
-				end
-			end
-		end
-
-		# A node-set is converted to a string by returning the string-value of the
-		# node in the node-set that is first in document order. If the node-set is
-		# empty, an empty string is returned.
-		#
-		# A number is converted to a string as follows
-		#
-		# NaN is converted to the string NaN 
-		#
-		# positive zero is converted to the string 0 
-		#
-		# negative zero is converted to the string 0 
-		#
-		# positive infinity is converted to the string Infinity 
-		#
-		# negative infinity is converted to the string -Infinity 
-		#
-		# if the number is an integer, the number is represented in decimal form
-		# as a Number with no decimal point and no leading zeros, preceded by a
-		# minus sign (-) if the number is negative
-		#
-		# otherwise, the number is represented in decimal form as a Number
-		# including a decimal point with at least one digit before the decimal
-		# point and at least one digit after the decimal point, preceded by a
-		# minus sign (-) if the number is negative; there must be no leading zeros
-		# before the decimal point apart possibly from the one required digit
-		# immediately before the decimal point; beyond the one required digit
-		# after the decimal point there must be as many, but only as many, more
-		# digits as are needed to uniquely distinguish the number from all other
-		# IEEE 754 numeric values.
-		#
-		# The boolean false value is converted to the string false. The boolean
-		# true value is converted to the string true.
-		#
-		# An object of a type other than the four basic types is converted to a
-		# string in a way that is dependent on that type.
-		def Functions::string( object=nil )
-			#object = @context unless object
-			if object.instance_of? Array
-				string( object[0] )
-			elsif defined? object.node_type
-				if object.node_type == :attribute
-					object.value
-				elsif object.node_type == :element
-					object.text
-				else
-					object.to_s
-				end
-			else
-				object.to_s
-			end
-		end
-
-		# UNTESTED
-		def Functions::concat( *objects )
-			objects.join
-		end
-
-		# Fixed by Mike Stok
-		def Functions::starts_with( string, test )
-			string(string).index(string(test)) == 0
-		end
-
-		# Fixed by Mike Stok
-		def Functions::contains( string, test )
-			string(string).include? string(test)
-		end
-
-		# Kouhei fixed this 
-		def Functions::substring_before( string, test )
-			ruby_string = string(string)
-			ruby_index = ruby_string.index(string(test))
-			if ruby_index.nil?
-				""
-			else
-				ruby_string[ 0...ruby_index ]
-			end
-		end
- 
-		# Kouhei fixed this too
-		def Functions::substring_after( string, test )
-			ruby_string = string(string)
-			ruby_index = ruby_string.index(string(test))
-			if ruby_index.nil?
-				""
-			else
-				ruby_string[ ruby_index+1..-1 ]
-			end
-		end
-
-		# Take equal portions of Mike Stok and Sean Russell; mix 
-		# vigorously, and pour into a tall, chilled glass.  Serves 10,000.
-		def Functions::substring( string, start, length=nil )
-			ruby_string = string(string)
-			ruby_length = if length.nil? 
-											ruby_string.length.to_f
-										else
-											number(length)
-										end
-			ruby_start = number(start)
-
-			# Handle the special cases
-			return '' if (
-				ruby_length.nan? or 
-				ruby_start.nan? or
-				ruby_start.infinite?
-			)
-
-			infinite_length = ruby_length.infinite? == 1
-			ruby_length = ruby_string.length if infinite_length
-				
-			# Now, get the bounds.  The XPath bounds are 1..length; the ruby bounds 
-			# are 0..length.  Therefore, we have to offset the bounds by one.
-			ruby_start = ruby_start.round - 1
-			ruby_length = ruby_length.round
-
-			if ruby_start < 0
-			 ruby_length += ruby_start unless infinite_length
-			 ruby_start = 0
-			end
-			return '' if ruby_length <= 0
-			ruby_string[ruby_start,ruby_length]
-		end
-
-		# UNTESTED
-		def Functions::string_length( string )
-			string(string).length
-		end
-
-		# UNTESTED
-		def Functions::normalize_space( string=nil )
-			string = string(@@node) if string.nil?
-			if string.kind_of? Array
-				string.collect{|x| string.to_s.strip.gsub(/\s+/um, ' ') if string}
-			else
-				string.to_s.strip.gsub(/\s+/um, ' ')
-			end
-		end
-
-		# This is entirely Mike Stok's beast
-		def Functions::translate( string, tr1, tr2 )
-			from = string(tr1)
-			to = string(tr2)
-
-			# the map is our translation table.
-			#
-			# if a character occurs more than once in the
-			# from string then we ignore the second &
-			# subsequent mappings
-			#
-			# if a charactcer maps to nil then we delete it
-			# in the output.  This happens if the from
-			# string is longer than the to string
-			#
-			# there's nothing about - or ^ being special in
-			# http://www.w3.org/TR/xpath#function-translate
-			# so we don't build ranges or negated classes
-
-			map = Hash.new
-			0.upto(from.length - 1) { |pos|
-				from_char = from[pos]
-				unless map.has_key? from_char
-					map[from_char] = 
-					if pos < to.length
-						to[pos]
-					else
-						nil
-					end
-				end
-			}
-
-			string(string).unpack('U*').collect { |c|
-				if map.has_key? c then map[c] else c end
-			}.compact.pack('U*')
-		end
-
-		# UNTESTED
-		def Functions::boolean( object=nil )
-			if object.kind_of? String
-				if object =~ /\d+/u
-					return object.to_f != 0
-				else
-					return object.size > 0
-				end
-			elsif object.kind_of? Array
-				object = object.find{|x| x and true}
-			end
-			return object ? true : false
-		end
-
-		# UNTESTED
-		def Functions::not( object )
-			not boolean( object )
-		end
-
-		# UNTESTED
-		def Functions::true( )
-			true
-		end
-
-		# UNTESTED
-		def Functions::false(  )
-			false
-		end
-
-		# UNTESTED
-		def Functions::lang( language )
-			lang = false
-			node = @@node
-			attr = nil
-			until node.nil?
-				if node.node_type == :element
-					attr = node.attributes["xml:lang"]
-					unless attr.nil?
-						lang = compare_language(string(language), attr)
-						break
-					else
-					end
-				end
-				node = node.parent
-			end
-			lang
-		end
-
-		def Functions::compare_language lang1, lang2
-			lang2.downcase.index(lang1.downcase) == 0
-		end
-
-		# a string that consists of optional whitespace followed by an optional
-		# minus sign followed by a Number followed by whitespace is converted to
-		# the IEEE 754 number that is nearest (according to the IEEE 754
-		# round-to-nearest rule) to the mathematical value represented by the
-		# string; any other string is converted to NaN
-		#
-		# boolean true is converted to 1; boolean false is converted to 0
-		#
-		# a node-set is first converted to a string as if by a call to the string
-		# function and then converted in the same way as a string argument
-		#
-		# an object of a type other than the four basic types is converted to a
-		# number in a way that is dependent on that type
-		def Functions::number( object=nil )
-			object = @@node unless object
-			if object == true
-				Float(1)
-			elsif object == false
-				Float(0)
-			elsif object.kind_of? Array
-				string( object ).to_f
-			elsif object.kind_of? Float
-				object
-			else
-				object.to_s.to_f
-			end
-		end
-
-		def Functions::sum( nodes )
-		end
-		
-		def Functions::floor( number )
-			number(number).floor
-		end
-
-		def Functions::ceiling( number )
-			number(number).ceil
-		end
-
-		def Functions::round( number )
-			begin
-				number(number).round
-			rescue FloatDomainError
-				number(number)
-			end
-		end
-
-		def Functions::method_missing( id )
-			puts "METHOD MISSING #{id.id2name}"
-			XPath.match( @@node, id.id2name )
-		end
-	end
-end
diff --git a/lib/rexml/instruction.rb b/lib/rexml/instruction.rb
deleted file mode 100644
index 0b770d4b3d..0000000000
--- a/lib/rexml/instruction.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require "rexml/child"
-require "rexml/source"
-
-module REXML
-	# Represents an XML Instruction; IE, <? ... ?>
-	# TODO: Add parent arg (3rd arg) to constructor
-	class Instruction < Child
-		START = '<\?'
-		STOP = '\?>'
-
-		# target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
-		# content is everything else.
-		attr_accessor :target, :content
-
-		# Constructs a new Instruction
-		# @param target can be one of a number of things.  If String, then 
-		# the target of this instruction is set to this.  If an Instruction,
-		# then the Instruction is shallowly cloned (target and content are
-		# copied).  If a Source, then the source is scanned and parsed for
-		# an Instruction declaration.
-		# @param content Must be either a String, or a Parent.  Can only
-		# be a Parent if the target argument is a Source.  Otherwise, this
-		# String is set as the content of this instruction.
-		def initialize(target, content=nil)
-			if target.kind_of? String
-				super()
-				@target = target
-				@content = content
-			elsif target.kind_of? Instruction
-				super(content)
-				@target = target.target
-				@content = target.content
-			end
-			@content.strip! if @content
-		end
-
-		def clone
-			Instruction.new self
-		end
-		
-		def write writer, indent=-1, transitive=false, ie_hack=false
-			indent(writer, indent)
-			writer << START.sub(/\\/u, '')
-			writer << @target
-			writer << ' '
-			writer << @content
-			writer << STOP.sub(/\\/u, '')
-		end
-
-		# @return true if other is an Instruction, and the content and target
-		# of the other matches the target and content of this object.
-		def ==( other )
-			other.kind_of? Instruction and
-			other.target == @target and
-			other.content == @content
-		end
-
-    def node_type
-      :processing_instruction
-    end
-	end
-end
diff --git a/lib/rexml/light/node.rb b/lib/rexml/light/node.rb
deleted file mode 100644
index ff8cb987f0..0000000000
--- a/lib/rexml/light/node.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-require 'rexml/xmltokens'
-require 'rexml/light/node'
-
-# [ :element, parent, name, attributes, children* ]
-	# a = Node.new
-	# a << "B"		# => <a>B</a>
-	# a.b			# => <a>B<b/></a>
-	# a.b[1]			# => <a>B<b/><b/><a>
-	# a.b[1]["x"] = "y"	# => <a>B<b/><b x="y"/></a>
-	# a.b[0].c		# => <a>B<b><c/></b><b x="y"/></a>
-	# a.b.c << "D"		# => <a>B<b><c>D</c></b><b x="y"/></a>
-module REXML
-	module Light
-		# Represents a tagged XML element.  Elements are characterized by
-		# having children, attributes, and names, and can themselves be
-		# children.
-		class Node
-			NAMESPLIT = /^(?:(#{XMLTokens::NCNAME_STR}):)?(#{XMLTokens::NCNAME_STR})/u
-			PARENTS = [ :element, :document, :doctype ]
-			# Create a new element.
-			def initialize node=nil
-				@node = node
-				if node.kind_of? String
-					node = [ :text, node ]
-				elsif node.nil?
-					node = [ :document, nil, nil ]
-				elsif node[0] == :start_element
-					node[0] = :element
-				elsif node[0] == :start_doctype
-					node[0] = :doctype
-				elsif node[0] == :start_document
-					node[0] = :document
-				end
-			end
-
-			def size
-				if PARENTS.include? @node[0]
-					@node[-1].size
-				else
-					0
-				end
-			end
-
-			def each( &block )
-				size.times { |x| yield( at(x+4) ) }
-			end
-
-			def name
-				at(2)
-			end
-
-			def name=( name_str, ns=nil )
-				pfx = ''
-				pfx = "#{prefix(ns)}:" if ns
-				_old_put(2, "#{pfx}#{name_str}")
-			end
-
-			def parent=( node )
-				_old_put(1,node)
-			end
-
-			def local_name
-				namesplit
-				@name
-			end
-
-			def local_name=( name_str )
-				_old_put( 1, "#@prefix:#{name_str}" )
-			end
-
-			def prefix( namespace=nil )
-				prefix_of( self, namespace )
-			end
-
-			def namespace( prefix=prefix() )
-				namespace_of( self, prefix )
-			end
-
-			def namespace=( namespace )
-				@prefix = prefix( namespace )
-				pfx = ''
-				pfx = "#@prefix:" if @prefix.size > 0
-				_old_put(1, "#{pfx}#@name")
-			end
-
-			def []( reference, ns=nil )
-				if reference.kind_of? String
-					pfx = ''
-					pfx = "#{prefix(ns)}:" if ns
-					at(3)["#{pfx}#{reference}"]
-				elsif reference.kind_of? Range
-					_old_get( Range.new(4+reference.begin, reference.end, reference.exclude_end?) )
-				else
-					_old_get( 4+reference )
-				end
-			end
-
-			def =~( path )
-				XPath.match( self, path )
-			end
-
-			# Doesn't handle namespaces yet
-			def []=( reference, ns, value=nil )
-				if reference.kind_of? String
-					value = ns unless value
-					at( 3 )[reference] = value
-				elsif reference.kind_of? Range
-					_old_put( Range.new(3+reference.begin, reference.end, reference.exclude_end?), ns )
-				else
-					if value
-						_old_put( 4+reference, ns, value )
-					else
-						_old_put( 4+reference, ns )
-					end
-				end
-			end
-
-			# Append a child to this element, optionally under a provided namespace.
-			# The namespace argument is ignored if the element argument is an Element
-			# object.  Otherwise, the element argument is a string, the namespace (if
-			# provided) is the namespace the element is created in.
-			def << element
-				if node_type() == :text
-					at(-1) << element
-				else
-					newnode = Node.new( element )
-					newnode.parent = self
-					self.push( newnode )
-				end
-				at(-1)
-			end
-
-			def node_type
-				_old_get(0)
-			end
-
-			def text=( foo )
-				replace = at(4).kind_of?(String) ? 1 : 0
-				_old_put(4, replace, normalizefoo)
-			end
-
-			def root
-				context = self
-				context = context.at(1) while context.at(1)
-			end
-
-			def has_name?( name, namespace = '' )
-				at(3) == name and namespace() == namespace
-			end
-
-			def children
-				self
-			end
-
-			def parent
-				at(1)
-			end
-
-			def to_s
-
-			end
-
-			private
-
-			def namesplit
-				return if @name.defined?
-				at(2) =~ NAMESPLIT
-				@prefix = '' || $1
-				@name = $2
-			end
-
-			def namespace_of( node, prefix=nil )
-				if not prefix
-					name = at(2)
-					name =~ NAMESPLIT
-					prefix = $1
-				end
-				to_find = 'xmlns'
-				to_find = "xmlns:#{prefix}" if not prefix.nil?
-				ns = at(3)[ to_find ]
-				ns ? ns : namespace_of( @node[0], prefix )
-			end
-
-			def prefix_of( node, namespace=nil )
-				if not namespace
-					name = node.name
-					name =~ NAMESPLIT
-					$1
-				else
-					ns = at(3).find { |k,v| v == namespace }
-					ns ? ns : prefix_of( node.parent, namespace )
-				end
-			end
-		end
-	end
-end
diff --git a/lib/rexml/namespace.rb b/lib/rexml/namespace.rb
deleted file mode 100644
index 3e8790580b..0000000000
--- a/lib/rexml/namespace.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'rexml/xmltokens'
-
-module REXML
-	# Adds named attributes to an object.
-	module Namespace
-		# The name of the object, valid if set
-		attr_reader :name, :expanded_name
-		# The expanded name of the object, valid if name is set
-		attr_accessor :prefix
-		include XMLTokens
-		NAMESPLIT = /^(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})/u
-
-		# Sets the name and the expanded name
-		def name=( name )
-			@expanded_name = name
-			name =~ NAMESPLIT
-			if $1
-				@prefix = $1
-			else
-				@prefix = ""
-				@namespace = ""
-			end
-			@name = $2
-		end
-
-		# Compares names optionally WITH namespaces
-		def has_name?( other, ns=nil )
-			if ns
-				return (namespace() == ns and name() == other)
-			elsif other.include? ":"
-				return fully_expanded_name == other
-			else
-				return name == other
-			end
-		end
-
-		alias :local_name :name
-
-		# Fully expand the name, even if the prefix wasn't specified in the
-		# source file.
-		def fully_expanded_name
-			ns = prefix
-			return "#{ns}:#@name" if ns.size > 0 
-			return @name
-		end
-	end
-end
diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb
deleted file mode 100644
index 41d9eee43b..0000000000
--- a/lib/rexml/node.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "rexml/parseexception"
-
-module REXML
-	# Represents a node in the tree.  Nodes are never encountered except as
-	# superclasses of other objects.  Nodes have siblings.
-	module Node
-		# @return the next sibling (nil if unset)
-		def next_sibling_node
-			return nil if @parent.nil?
-			@parent[ @parent.index(self) + 1 ]
-		end
-
-		# @return the previous sibling (nil if unset)
-		def previous_sibling_node
-			return nil if @parent.nil?
-			ind = @parent.index(self)
-			return nil if ind == 0
-			@parent[ ind - 1 ]
-		end
-
-		def to_s indent=-1
-			rv = ""
-			write rv,indent
-			rv
-		end
-
-		def indent to, ind
-			to << " "*ind unless ind<1
-		end
-
-		def parent?
-			false;
-		end
-	end
-end
diff --git a/lib/rexml/output.rb b/lib/rexml/output.rb
deleted file mode 100644
index c4a7473bfb..0000000000
--- a/lib/rexml/output.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'rexml/encoding'
-
-module REXML
-	class Output
-		include Encoding
-		attr_reader :encoding
-		def initialize real_IO, encd="iso-8859-1"
-			@output = real_IO
-			self.encoding = encd
-
-			@to_utf = encd == UTF_8 ? false : true
-		end
-
-		def <<( content )
-			@output << (@to_utf ? encode(content) : content)
-		end
-	end
-end
diff --git a/lib/rexml/parent.rb b/lib/rexml/parent.rb
deleted file mode 100644
index 5c1ed97324..0000000000
--- a/lib/rexml/parent.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require "rexml/child"
-
-module REXML
-	# A parent has children, and has methods for accessing them.  The Parent
-  # class is never encountered except as the superclass for some other
-  # object.
-	class Parent < Child
-		include Enumerable
-
-		# Constructor
-		# @param parent if supplied, will be set as the parent of this object
-		def initialize parent=nil
-			super(parent)
-			@children = []
-		end
-
-		def add( object )
-			#puts "PARENT GOTS #{size} CHILDREN"
-			object.parent = self
-			@children << object
-			#puts "PARENT NOW GOTS #{size} CHILDREN"
-			object
-		end
-
-		alias :push :add
-		alias :<< :push
-
-		def unshift( object )
-			object.parent = self
-			@children.unshift object
-		end
-
-		def delete( object )
-			return unless @children.include? object
-			@children.delete object
-			object.parent = nil
-		end
-
-		def each(&block)
-			@children.each(&block)
-		end
-
-		def delete_if( &block )
-			@children.delete_if(&block)
-		end
-
-		def delete_at( index )
-			@children.delete_at index
-		end
-
-		def each_index( &block )
-			@children.each_index(&block)
-		end
-
-		# Fetches a child at a given index
-		# @param index the Integer index of the child to fetch
-		def []( index )
-			@children[index]
-		end
-
-		alias :each_child :each
-
-
-
-		# Set an index entry.  See Array.[]=
-		# @param index the index of the element to set
-		# @param opt either the object to set, or an Integer length
-		# @param child if opt is an Integer, this is the child to set
-		# @return the parent (self)
-		def []=( *args )
-			args[-1].parent = self
-			@children[*args[0..-2]] = args[-1]
-		end
-
-		# Inserts an child before another child
-		# @param child1 this is either an xpath or an Element.  If an Element,
-		# child2 will be inserted before child1 in the child list of the parent.
-		# If an xpath, child2 will be inserted before the first child to match
-		# the xpath.
-		# @param child2 the child to insert
-		# @return the parent (self)
-		def insert_before( child1, child2 )
-			if child1.kind_of? String
-				child1 = XPath.first( self, child1 )
-				child1.parent.insert_before child1, child2
-			else
-				ind = index(child1)
-				child2.parent.delete(child2) if child2.parent
-				@children[ind,0] = child2
-				child2.parent = self
-			end
-			self
-		end
-
-		# Inserts an child after another child
-		# @param child1 this is either an xpath or an Element.  If an Element,
-		# child2 will be inserted after child1 in the child list of the parent.
-		# If an xpath, child2 will be inserted after the first child to match
-		# the xpath.
-		# @param child2 the child to insert
-		# @return the parent (self)
-		def insert_after( child1, child2 )
-			if child1.kind_of? String
-				child1 = XPath.first( self, child1 )
-				child1.parent.insert_after child1, child2
-			else
-				ind = index(child1)+1
-				child2.parent.delete(child2) if child2.parent
-				@children[ind,0] = child2
-				child2.parent = self
-			end
-			self
-		end
-
-		def to_a
-			@children.dup
-		end
-
-		# Fetches the index of a given child
-		# @param child the child to get the index of
-		# @return the index of the child, or nil if the object is not a child
-		# of this parent.
-		def index( child )
-			count = -1
-			@children.find { |i| count += 1 ; i.hash == child.hash }
-			count
-		end
-
-		# @return the number of children of this parent
-		def size
-			@children.size
-		end
-
-		# Replaces one child with another, making sure the nodelist is correct
-		# @param to_replace the child to replace (must be a Child)
-		# @param replacement the child to insert into the nodelist (must be a 
-		# Child)
-		def replace_child( to_replace, replacement )
-			ind = @children.index( to_replace )
-			to_replace.parent = nil
-			@children[ind,0] = replacement
-			replacement.parent = self
-		end
-
-		# Deeply clones this object.  This creates a complete duplicate of this
-		# Parent, including all descendants.
-		def deep_clone
-			cl = clone()
-			each do |child|
-				if child.kind_of? Parent
-					cl << child.deep_clone
-				else
-					cl << child.clone
-				end
-			end
-			cl
-		end
-
-		alias :children :to_a
-
-		def parent?
-			true
-		end
-	end
-end
diff --git a/lib/rexml/parseexception.rb b/lib/rexml/parseexception.rb
deleted file mode 100644
index 0fee3ae620..0000000000
--- a/lib/rexml/parseexception.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-module REXML
-	class ParseException < RuntimeError
-		attr_accessor :source, :parser, :continued_exception
-
-		def initialize( message, source=nil, parser=nil, exception=nil )
-			super(message)
-			@source = source
-			@parser = parser
-			@continued_exception = exception
-		end
-
-		def to_s
-			# Quote the original exception, if there was one
-			if @continued_exception
-				err = @continued_exception.inspect
-				err << "\n"
-				err << @continued_exception.backtrace.join("\n")
-				err << "\n...\n"
-			else
-				err = ""
-			end
-
-			# Get the stack trace and error message
-			err << super
-
-			# Add contextual information
-			if @source
-				err << "\nLine: #{line}\n"
-				err << "Position: #{position}\n"
-				err << "Last 80 unconsumed characters:\n"
-				err << @source.buffer[0..80].gsub(/\n/, ' ')
-				err << "\n"
-				err << @source.buffer[0..80].unpack("U*").inspect
-			end
-			
-			err
-		end
-
-		def position
-			@source.current_line[0] if @source and @source.current_line
-		end
-
-		def line
-			@source.current_line[2] if @source and @source.current_line
-		end
-
-		def context
-			@source.current_line
-		end
-	end	
-end
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
deleted file mode 100644
index 276af03389..0000000000
--- a/lib/rexml/parsers/baseparser.rb
+++ /dev/null
@@ -1,402 +0,0 @@
-require 'rexml/parseexception'
-require 'rexml/source'
-
-module REXML
-	module Parsers
-		# = Using the Pull Parser
-		# <em>This API is experimental, and subject to change.</em>
-		#  parser = PullParser.new( "<a>text<b att='val'/>txet</a>" )
-		#  while parser.has_next?
-		#    res = parser.next
-		#    puts res[1]['att'] if res.start_tag? and res[0] == 'b'
-		#  end
-		# See the PullEvent class for information on the content of the results.
-		# The data is identical to the arguments passed for the various events to
-		# the StreamListener API.
-		#
-		# Notice that:
-		#  parser = PullParser.new( "<a>BAD DOCUMENT" )
-		#  while parser.has_next?
-		#    res = parser.next
-		#    raise res[1] if res.error?
-		#  end
-		#
-		# Nat Price gave me some good ideas for the API.
-		class BaseParser
-			NCNAME_STR= '[\w:][\-\w\d.]*'
-			NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
-
-			NAMECHAR = '[\-\w\d\.:]'
-			NAME = "([\\w:]#{NAMECHAR}*)"
-			NMTOKEN = "(?:#{NAMECHAR})+"
-			NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
-			REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
-			REFERENCE_RE = /#{REFERENCE}/
-
-			DOCTYPE_START = /\A\s*<!DOCTYPE\s/um
-			DOCTYPE_PATTERN = /\s*<!DOCTYPE\s+(.*?)(\[|>)/um
-			ATTRIBUTE_PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
-			COMMENT_START = /\A<!--/u
-			COMMENT_PATTERN = /<!--(.*?)-->/um
-			CDATA_START = /\A<!\[CDATA\[/u
-			CDATA_END = /^\s*\]\s*>/um
-			CDATA_PATTERN = /<!\[CDATA\[(.*?)\]\]>/um
-			XMLDECL_START = /\A<\?xml\s/u;
-			XMLDECL_PATTERN = /<\?xml\s+(.*?)\?>*/um
-			INSTRUCTION_START = /\A<\?/u
-			INSTRUCTION_PATTERN = /<\?(.*?)(\s+.*?)?\?>/um
-			TAG_MATCH = /^<((?>#{NAME_STR}))\s*((?>\s+#{NAME_STR}\s*=\s*(["']).*?\3)*)\s*(\/)?>/um
-			CLOSE_MATCH = /^\s*<\/(#{NAME_STR})\s*>/um
-
-			VERSION = /\bversion\s*=\s*["'](.*?)['"]/um
-			ENCODING = /\bencoding=["'](.*?)['"]/um
-			STANDALONE = /\bstandalone=["'](.*?)['"]/um
-
-			ENTITY_START = /^\s*<!ENTITY/
-			IDENTITY = /^([!\*\w\-]+)(\s+#{NCNAME_STR})?(\s+["'].*?['"])?(\s+['"].*?["'])?/u
-			ELEMENTDECL_START = /^\s*<!ELEMENT/um
-			ELEMENTDECL_PATTERN = /^\s*(<!ELEMENT.*?)>/um
-			ENUMERATION = "\\(\\s*#{NMTOKEN}(?:\\s*\\|\\s*#{NMTOKEN})*\\s*\\)"
-			NOTATIONTYPE = "NOTATION\\s+\\(\\s*#{NAME}(?:\\s*\\|\\s*#{NAME})*\\s*\\)"
-			ENUMERATEDTYPE = "(?:(?:#{NOTATIONTYPE})|(?:#{ENUMERATION}))"
-			ATTTYPE = "(CDATA|ID|IDREF|IDREFS|ENTITY|ENTITIES|NMTOKEN|NMTOKENS|#{ENUMERATEDTYPE})"
-			ATTVALUE = "(?:\"((?:[^<&\"]|#{REFERENCE})*)\")|(?:'((?:[^<&']|#{REFERENCE})*)')"
-			DEFAULTDECL = "(#REQUIRED|#IMPLIED|(?:(#FIXED\\s+)?#{ATTVALUE}))"
-			ATTDEF = "\\s+#{NAME}\\s+#{ATTTYPE}\\s+#{DEFAULTDECL}"
-			ATTDEF_RE = /#{ATTDEF}/
-			ATTLISTDECL_START = /^\s*<!ATTLIST/um
-			ATTLISTDECL_PATTERN = /^\s*<!ATTLIST\s+#{NAME}(?:#{ATTDEF})*\s*>/um
-			NOTATIONDECL_START = /^\s*<!NOTATION/um
-			PUBLIC = /^\s*<!NOTATION\s+(\w[\-\w]*)\s+(PUBLIC)\s+((["']).*?\4)\s*>/um
-			SYSTEM = /^\s*<!NOTATION\s+(\w[\-\w]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um
-
-			TEXT_PATTERN = /\A([^<]*)/um
-
-			# Entity constants
-			PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
-			SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))}
-			PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')}
-			EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))"
-			NDATADECL = "\\s+NDATA\\s+#{NAME}"
-			PEREFERENCE = "%#{NAME};"
-			ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))}
-			PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})"
-			ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))"
-			PEDECL = "<!ENTITY\\s+(%)\\s+#{NAME}\\s+#{PEDEF}\\s*>"
-			GEDECL = "<!ENTITY\\s+#{NAME}\\s+#{ENTITYDEF}\\s*>"
-			ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um
-
-			EREFERENCE = /&(?!#{NAME};)/
-
-			DEFAULT_ENTITIES = { 
-				'gt' => [/&gt;/, '&gt;', '>', />/], 
-				'lt' => [/&lt;/, '&lt;', '<', /</], 
-				'quot' => [/&quot;/, '&quot;', '"', /"/], 
-				"apos" => [/&apos;/, "&apos;", "'", /'/] 
-			}
-
-			def initialize( source )
-				self.stream = source
-			end
-
-			def stream=( source )
-				if source.kind_of? String
-					@source = Source.new(source)
-				elsif source.kind_of? IO
-					@source = IOSource.new(source)
-				elsif source.kind_of? Source
-					@source = source
-				elsif defined? StringIO and source.kind_of? StringIO
-					@source = IOSource.new(source)
-				else
-					raise "#{source.class} is not a valid input stream.  It must be \n"+
-					"either a String, IO, StringIO or Source."
-				end
-				@closed = nil
-				@document_status = nil
-				@tags = []
-				@stack = []
-				@entities = []
-			end
-
-			# Returns true if there are no more events
-			def empty?
-				!has_next?
-			end
-
-			# Returns true if there are more events.  Synonymous with !empty?
-			def has_next?
-				return true if @closed
-				@source.read if @source.buffer.size==0 and !@source.empty?
-				(!@source.empty? and @source.buffer.strip.size>0) or @stack.size>0 or @closed
-			end
-
-			# Push an event back on the head of the stream.  This method
-			# has (theoretically) infinite depth.
-			def unshift token
-				@stack.unshift(token)
-			end
-
-			# Peek at the +depth+ event in the stack.  The first element on the stack
-			# is at depth 0.  If +depth+ is -1, will parse to the end of the input
-			# stream and return the last event, which is always :end_document.
-			# Be aware that this causes the stream to be parsed up to the +depth+ 
-			# event, so you can effectively pre-parse the entire document (pull the 
-			# entire thing into memory) using this method.  
-			def peek depth=0
-				raise %Q[Illegal argument "#{depth}"] if depth < -1
-				temp = []
-				if depth == -1
-					temp.push(pull()) until empty?
-				else
-					while @stack.size+temp.size < depth+1
-						temp.push(pull())
-					end
-				end
-				@stack += temp if temp.size > 0
-				@stack[depth]
-			end
-
-			# Returns the next event.  This is a +PullEvent+ object.
-			def pull
-				return [ :end_document ] if empty?
-				if @closed
-					x, @closed = @closed, nil
-					return [ :end_element, x ]
-				end
-				return @stack.shift if @stack.size > 0
-				@source.read if @source.buffer.size==0
-				if @document_status == nil
-					@source.consume( /^\s*/um )
-					word = @source.match( /(<[^>]*)>/um )
-					word = word[1] unless word.nil?
-					case word
-					when COMMENT_START
-						return [ :comment, @source.match( COMMENT_PATTERN, true )[1] ]
-					when XMLDECL_START
-						results = @source.match( XMLDECL_PATTERN, true )[1]
-						version = VERSION.match( results )
-						version = version[1] unless version.nil?
-						encoding = ENCODING.match(results)
-						encoding = encoding[1] unless encoding.nil?
-						@source.encoding = encoding
-						standalone = STANDALONE.match(results)
-						standalone = standalone[1] unless standalone.nil?
-						return [ :xmldecl, version, encoding, standalone]
-					when INSTRUCTION_START
-						return [ :processing_instruction, *@source.match(INSTRUCTION_PATTERN, true)[1,2] ]
-					when DOCTYPE_START
-						md = @source.match( DOCTYPE_PATTERN, true )
-						identity = md[1]
-						close = md[2]
-						identity =~ IDENTITY
-						name = $1
-						raise REXML::ParseException("DOCTYPE is missing a name") if name.nil?
-						pub_sys = $2.nil? ? nil : $2.strip
-						long_name = $3.nil? ? nil : $3.strip
-						uri = $4.nil? ? nil : $4.strip
-						args = [ :start_doctype, name, pub_sys, long_name, uri ]
-						if close == ">"
-							@document_status = :after_doctype
-							@source.read if @source.buffer.size==0
-							md = @source.match(/^\s*/um, true)
-							@stack << [ :end_doctype ]
-						else
-							@document_status = :in_doctype
-						end
-						return args
-					else
-						@document_status = :after_doctype
-						@source.read if @source.buffer.size==0
-						md = @source.match(/\s*/um, true)
-					end
-				end
-				if @document_status == :in_doctype
-					md = @source.match(/\s*(.*?>)/um)
-					case md[1]
-					when ELEMENTDECL_START
-						return [ :elementdecl, @source.match( ELEMENTDECL_PATTERN, true )[1] ]
-					when ENTITY_START
-						match = @source.match( ENTITYDECL, true ).to_a.compact
-						match[0] = :entitydecl
-						ref = false
-						if match[1] == '%'
-							ref = true
-							match.delete_at 1
-						end
-						# Now we have to sort out what kind of entity reference this is
-						if match[2] == 'SYSTEM'
-							# External reference
-							match[3] = match[3][1..-2] # PUBID
-							match.delete_at(4) if match.size > 4 # Chop out NDATA decl
-							# match is [ :entity, name, SYSTEM, pubid(, ndata)? ]
-						elsif match[2] == 'PUBLIC'
-							# External reference
-							match[3] = match[3][1..-2] # PUBID
-							match[4] = match[4][1..-2] # HREF
-							# match is [ :entity, name, PUBLIC, pubid, href ]
-						else
-							match[2] = match[2][1..-2]
-							match.pop if match.size == 4
-							# match is [ :entity, name, value ]
-						end
-						match << '%' if ref
-						return match
-					when ATTLISTDECL_START
-						md = @source.match( ATTLISTDECL_PATTERN, true )
-						raise REXML::ParseException.new( "Bad ATTLIST declaration!", @source ) if md.nil?
-						element = md[1]
-						contents = md[0]
-
-						pairs = {}
-						values = md[0].scan( ATTDEF_RE )
-						values.each do |attdef|
-							unless attdef[3] == "#IMPLIED"
-								attdef.compact!
-								val = attdef[3]
-								val = attdef[4] if val == "#FIXED "
-								pairs[attdef[0]] = val
-							end
-						end
-						return [ :attlistdecl, element, pairs, contents ]
-					when NOTATIONDECL_START
-						md = nil
-						if @source.match( PUBLIC )
-							md = @source.match( PUBLIC, true )
-						elsif @source.match( SYSTEM )
-							md = @source.match( SYSTEM, true )
-						else
-							raise REXML::ParseException.new( "error parsing notation: no matching pattern", @source )
-						end
-						return [ :notationdecl, md[1], md[2], md[3] ]
-					when CDATA_END
-						@document_status = :after_doctype
-						@source.match( CDATA_END, true )
-						return [ :end_doctype ]
-					end
-				end
-				begin
-					if @source.buffer[0] == ?<
-						if @source.buffer[1] == ?/
-							last_tag = @tags.pop
-							#md = @source.match_to_consume( '>', CLOSE_MATCH)
-							md = @source.match( CLOSE_MATCH, true )
-							raise REXML::ParseException.new( "Missing end tag for '#{last_tag}' "+
-								"(got \"#{md[1]}\")", @source) unless last_tag == md[1]
-							return [ :end_element, last_tag ]
-						elsif @source.buffer[1] == ?!
-							md = @source.match(/\A(\s*[^>]*>)/um)
-							#puts "SOURCE BUFFER = #{source.buffer}, #{source.buffer.size}"
-							raise REXML::ParseException.new("Malformed node", @source) unless md
-							if md[0][2] == ?-
-								md = @source.match( COMMENT_PATTERN, true )
-								return [ :comment, md[1] ] if md
-							else
-								md = @source.match( CDATA_PATTERN, true )
-								return [ :cdata, md[1] ] if md
-							end
-							raise REXML::ParseException.new( "Declarations can only occur "+
-								"in the doctype declaration.", @source)
-						elsif @source.buffer[1] == ??
-							md = @source.match( INSTRUCTION_PATTERN, true )
-							return [ :processing_instruction, md[1], md[2] ] if md
-							raise REXML::ParseException.new( "Bad instruction declaration",
-								@source)
-						else
-							# Get the next tag
-							md = @source.match(TAG_MATCH, true)
-							raise REXML::ParseException.new("malformed XML: missing tag start", @source) unless md
-							attrs = []
-							if md[2].size > 0
-								attrs = md[2].scan( ATTRIBUTE_PATTERN )
-								raise REXML::ParseException.new( "error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"", @source) if $' and $'.strip.size > 0
-							end
-				
-							if md[4]
-								@closed = md[1]
-							else
-								@tags.push( md[1] )
-							end
-							attributes = {}
-							attrs.each { |a,b,c| attributes[a] = c }
-							return [ :start_element, md[1], attributes ]
-						end
-					else
-						md = @source.match( TEXT_PATTERN, true )
-						#md = @source.match_to_consume( '<', TEXT_PATTERN )
-						#@source.read
-						raise REXML::ParseException("no text to add") if md[0].length == 0
-						# unnormalized = Text::unnormalize( md[1], self )
-						# return PullEvent.new( :text, md[1], unnormalized )
-						return [ :text, md[1] ]
-					end
-				rescue REXML::ParseException
-					raise
-				rescue Exception, NameError => error
-					raise REXML::ParseException.new( "Exception parsing",
-						@source, self, (error ? error : $!) )
-				end
-				return [ :dummy ]
-			end
-
-			def entity( reference, entities )
-				value = nil
-				value = entities[ reference ] if entities
-				if not value
-					value = DEFAULT_ENTITIES[ reference ]
-					value = value[2] if value
-				end
-				unnormalize( value, entities ) if value
-			end
-
-			# Escapes all possible entities
-			def normalize( input, entities=nil, entity_filter=nil )
-				copy = input.clone
-				# Doing it like this rather than in a loop improves the speed
-				copy.gsub!( EREFERENCE, '&amp;' )
-				entities.each do |key, value|
-					copy.gsub!( value, "&#{key};" ) unless entity_filter and 
-																			entity_filter.include?(entity)
-				end if entities
-				copy.gsub!( EREFERENCE, '&amp;' )
-				DEFAULT_ENTITIES.each do |key, value|
-					copy.gsub!( value[3], value[1] )
-				end
-				copy
-			end
-
-			# Unescapes all possible entities
-			def unnormalize( string, entities=nil, filter=nil )
-				rv = string.clone
-				rv.gsub!( /\r\n?/, "\n" )
-				matches = rv.scan( REFERENCE_RE )
-				return rv if matches.size == 0
-				rv.gsub!( /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) {|m|
-					m=$1
-					m = "0#{m}" if m[0] == ?x
-					[Integer(m)].pack('U*')
-				}
-				matches.collect!{|x|x[0]}.compact!
-				if matches.size > 0
-					matches.each do |entity_reference|
-						unless filter and filter.include?(entity_reference)
-							entity_value = entity( entity_reference, entities )
-							if entity_value
-								re = /&#{entity_reference};/
-								rv.gsub!( re, entity_value )
-							end
-						end
-					end
-					matches.each do |entity_reference|
-						unless filter and filter.include?(entity_reference)
-							er = DEFAULT_ENTITIES[entity_reference]
-							rv.gsub!( er[0], er[2] ) if er
-						end
-					end
-					rv.gsub!( /&amp;/, '&' )
-				end
-				rv
-			end
-		end
-	end
-end
diff --git a/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb
deleted file mode 100644
index 8c555f7960..0000000000
--- a/lib/rexml/parsers/lightparser.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'rexml/parsers/streamparser'
-require 'rexml/parsers/baseparser'
-require 'rexml/light/node'
-
-module REXML
-	module Parsers
-		class LightParser
-			def initialize stream
-				@stream = stream
-				@parser = REXML::Parsers::BaseParser.new( stream )
-			end
-
-      def rewind
-        @stream.rewind
-        @parser.stream = @stream
-      end
-
-			def parse
-				root = context = [ :document ]
-				while true
-					event = @parser.pull
-					case event[0]
-					when :end_document
-						break
-					when :end_doctype
-						context = context[1]
-					when :start_element, :start_doctype
-						new_node = event
-						context << new_node
-						new_node[1,0] = [context]
-						context = new_node
-					when :end_element, :end_doctype
-						context = context[1]
-					else
-						new_node = event
-						context << new_node
-						new_node[1,0] = [context]
-					end
-				end
-				root
-			end
-		end
-
-		# An element is an array.  The array contains:
-		#  0			The parent element
-		#  1			The tag name
-		#  2			A hash of attributes
-		#  3..-1	The child elements
-		# An element is an array of size > 3
-		# Text is a String
-		# PIs are [ :processing_instruction, target, data ]
-		# Comments are [ :comment, data ]
-		# DocTypes are DocType structs
-		# The root is an array with XMLDecls, Text, DocType, Array, Text
-	end
-end
diff --git a/lib/rexml/parsers/pullparser.rb b/lib/rexml/parsers/pullparser.rb
deleted file mode 100644
index aeda6251fe..0000000000
--- a/lib/rexml/parsers/pullparser.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-require 'rexml/parseexception'
-require 'rexml/parsers/baseparser'
-require 'rexml/xmltokens'
-
-module REXML
-	module Parsers
-		# = Using the Pull Parser
-		# <em>This API is experimental, and subject to change.</em>
-		#  parser = PullParser.new( "<a>text<b att='val'/>txet</a>" )
-		#  while parser.has_next?
-		#    res = parser.next
-		#    puts res[1]['att'] if res.start_tag? and res[0] == 'b'
-		#  end
-		# See the PullEvent class for information on the content of the results.
-		# The data is identical to the arguments passed for the various events to
-		# the StreamListener API.
-		#
-		# Notice that:
-		#  parser = PullParser.new( "<a>BAD DOCUMENT" )
-		#  while parser.has_next?
-		#    res = parser.next
-		#    raise res[1] if res.error?
-		#  end
-		#
-		# Nat Price gave me some good ideas for the API.
-		class PullParser < BaseParser
-			include XMLTokens
-
-			def initialize stream
-				super
-				@entities = {}
-			end
-
-			def each
-				while has_next?
-					yield self.pull
-				end
-			end
-
-			def peek depth=0
-				PullEvent.new(super)
-			end
-
-			def pull
-				event = super
-				case event[0]
-				when :entitydecl
-					@entities[ event[1] ] = 
-						event[2] unless event[2] =~ /PUBLIC|SYSTEM/
-				when :text
-					unnormalized = unnormalize( event[1], @entities )
-					event << unnormalized
-				end
-				PullEvent.new( event )
-			end
-		end
-
-		# A parsing event.  The contents of the event are accessed as an +Array?,
-		# and the type is given either by the ...? methods, or by accessing the
-		# +type+ accessor.  The contents of this object vary from event to event,
-		# but are identical to the arguments passed to +StreamListener+s for each
-		# event.
-		class PullEvent
-			# The type of this event.  Will be one of :tag_start, :tag_end, :text,
-			# :processing_instruction, :comment, :doctype, :attlistdecl, :entitydecl,
-			# :notationdecl, :entity, :cdata, :xmldecl, or :error.
-			def initialize(arg)
-				@contents = arg
-			end
-			def []( index )
-				@contents[index+1]
-			end
-			def event_type
-				@contents[0]
-			end
-			# Content: [ String tag_name, Hash attributes ]
-			def start_element?
-				@contents[0] == :start_element
-			end
-			# Content: [ String tag_name ]
-			def end_element?
-				@contents[0] == :end_element
-			end
-			# Content: [ String raw_text, String unnormalized_text ]
-			def text?
-				@contents[0] == :text
-			end
-			# Content: [ String text ]
-			def instruction?
-				@contents[0] == :processing_instruction
-			end
-			# Content: [ String text ]
-			def comment?
-				@contents[0] == :comment
-			end
-			# Content: [ String name, String pub_sys, String long_name, String uri ]
-			def doctype?
-				@contents[0] == :start_doctype
-			end
-			# Content: [ String text ]
-			def attlistdecl?
-				@contents[0] == :attlistdecl
-			end
-			# Content: [ String text ]
-			def elementdecl?
-				@contents[0] == :elementdecl
-			end
-			# Due to the wonders of DTDs, an entity declaration can be just about
-			# anything.  There's no way to normalize it; you'll have to interpret the
-			# content yourself.  However, the following is true:
-			#
-			# * If the entity declaration is an internal entity:
-			#   [ String name, String value ]
-			# Content: [ String text ]
-			def entitydecl?
-				@contents[0] == :entitydecl
-			end
-			# Content: [ String text ]
-			def notationdecl?
-				@contents[0] == :notationdecl
-			end
-			# Content: [ String text ]
-			def entity?
-				@contents[0] == :entity
-			end
-			# Content: [ String text ]
-			def cdata?
-				@contents[0] == :cdata
-			end
-			# Content: [ String version, String encoding, String standalone ]
-			def xmldecl?
-				@contents[0] == :xmldecl
-			end
-			def error?
-				@contents[0] == :error
-			end
-
-			def inspect
-				@contents[0].to_s + ": " + @contents[1..-1].inspect
-			end
-		end
-	end
-end
diff --git a/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb
deleted file mode 100644
index 2280b983a3..0000000000
--- a/lib/rexml/parsers/sax2parser.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-module REXML
-	module Parsers
-		class SAX2Parser
-			def initialize source
-				@parser = BaseParser.new(source)
-				@listeners = []
-				@procs = []
-				@namespace_stack = []
-				@has_listeners = false
-				@tag_stack = []
-			end
-			
-			# Listen arguments:
-			#
-			# Symbol, Array, Block
-			# 	Listen to Symbol events on Array elements
-			# Symbol, Block
-			#   Listen to Symbol events
-			# Array, Listener
-			# 	Listen to all events on Array elements
-			# Array, Block
-			# 	Listen to :start_element events on Array elements
-			# Listener
-			# 	Listen to All events
-			#
-			# Symbol can be one of: :start_element, :end_element,
-			# :start_prefix_mapping, :end_prefix_mapping, :characters,
-			# :processing_instruction, :doctype, :attlistdecl, :elementdecl,
-			# :entitydecl, :notationdecl, :cdata, :xmldecl, :comment
-			#
-			# Array contains regular expressions or strings which will be matched
-			# against fully qualified element names.
-			#
-			# Listener must implement the methods in SAX2Listener
-			#
-			# Block will be passed the same arguments as a SAX2Listener method would
-			# be, where the method name is the same as the matched Symbol.
-			# See the SAX2Listener for more information.
-			def listen( *args, &blok )
-				if args[0].kind_of? Symbol
-					if args.size == 2
-						args[1].each { |match| @procs << [args[0], match, blok] }
-					else
-						add( [args[0], /.*/, blok] )
-					end
-				elsif args[0].kind_of? Array
-					if args.size == 2
-						args[0].each { |match| add( [nil, match, args[1]] ) }
-					else
-						args[0].each { |match| add( [ :start_element, match, blok ] ) }
-					end
-				else
-					add([nil, /.*/, args[0]])
-				end
-			end
-			
-			def deafen( listener=nil, &blok )
-				if listener
-					@listeners.delete_if {|item| item[-1] == listener }
-					@has_listeners = false if @listeners.size == 0
-				else
-					@procs.delete_if {|item| item[-1] == blok }
-				end
-			end
-			
-			def parse
-				@procs.each { |sym,match,block| block.call if sym == :start_document }
-				@listeners.each { |sym,match,block| 
-					block.start_document if sym == :start_document or sym.nil?
-				}
-				root = context = []
-				while true
-					event = @parser.pull
-					case event[0]
-					when :end_document
-						handle( :end_document )
-						break
-					when :end_doctype
-						context = context[1]
-					when :start_element
-						@tag_stack.push(event[1])
-						# find the observers for namespaces
-						procs = get_procs( :start_prefix_mapping, event[1] )
-						listeners = get_listeners( :start_prefix_mapping, event[1] )
-						if procs or listeners
-							# break out the namespace declarations
-							# The attributes live in event[2]
-							nsdecl = event[2].find_all { |n, value| n =~ /^xmlns:/ }
-							nsdecl.collect! { |n, value| [ n[6..-1], value ] }
-							@namespace_stack.push({})
-							nsdecl.each do |n,v|
-								@namespace_stack[-1][n] = v
-								# notify observers of namespaces
-								procs.each { |ob| ob.call( n, v ) } if procs
-								listeners.each { |ob| ob.start_prefix_mapping(n, v) } if listeners
-							end
-						end
-						event[1] =~ Namespace::NAMESPLIT
-						prefix = $1
-						local = $2
-						uri = get_namespace(prefix)
-						# find the observers for start_element
-						procs = get_procs( :start_element, event[1] )
-						listeners = get_listeners( :start_element, event[1] )
-						# notify observers
-						procs.each { |ob| ob.call( uri, local, event[1], event[2] ) } if procs
-						listeners.each { |ob| 
-							ob.start_element( uri, local, event[1], event[2] ) 
-						} if listeners
-					when :end_element
-						@tag_stack.pop
-						event[1] =~ Namespace::NAMESPLIT
-						prefix = $1
-						local = $2
-						uri = get_namespace(prefix)
-						# find the observers for start_element
-						procs = get_procs( :end_element, event[1] )
-						listeners = get_listeners( :end_element, event[1] )
-						# notify observers
-						procs.each { |ob| ob.call( uri, local, event[1] ) } if procs
-						listeners.each { |ob| 
-							ob.end_element( uri, local, event[1] ) 
-						} if listeners
-
-						namespace_mapping = @namespace_stack.pop
-						# find the observers for namespaces
-						procs = get_procs( :end_prefix_mapping, event[1] )
-						listeners = get_listeners( :end_prefix_mapping, event[1] )
-						if procs or listeners
-							namespace_mapping.each do |prefix, uri|
-								# notify observers of namespaces
-								procs.each { |ob| ob.call( prefix ) } if procs
-								listeners.each { |ob| ob.end_prefix_mapping(prefix) } if listeners
-							end
-						end
-					when :text
-						normalized = @parser.normalize( event[1] )
-						handle( :characters, normalized )
-					when :processing_instruction, :comment, :doctype, :attlistdecl, 
-						:elementdecl, :entitydecl, :cdata, :notationdecl, :xmldecl
-						handle( *event )
-					end
-				end
-			end
-
-			private
-			def handle( symbol, *arguments )
-				tag = @tag_stack[-1]
-				procs = get_procs( symbol, tag )
-				listeners = get_listeners( symbol, tag )
-				# notify observers
-				procs.each { |ob| ob.call( *arguments ) } if procs
-				listeners.each { |l| 
-					l.send( symbol.to_s, *arguments ) 
-				} if listeners
-			end
-
-			# The following methods are duplicates, but it is faster than using
-			# a helper
-			def get_procs( symbol, name )
-				return nil if @procs.size == 0
-				@procs.find_all do |sym, match, block|
-					(
-						(sym.nil? or symbol == sym) and 
-						(name.nil? or (
-							(name == match) or
-							(match.kind_of? Regexp and name =~ match)
-							)
-						)
-					)
-				end.collect{|x| x[-1]}
-			end
-			def get_listeners( symbol, name )
-				return nil if @listeners.size == 0
-				@listeners.find_all do |sym, match, block|
-					(
-						(sym.nil? or symbol == sym) and 
-						(name.nil? or (
-							(name == match) or
-							(match.kind_of? Regexp and name =~ match)
-							)
-						)
-					)
-				end.collect{|x| x[-1]}
-			end
-
-			def add( pair )
-				if pair[-1].respond_to? :call
-					@procs << pair unless @procs.include? pair
-				else
-					@listeners << pair unless @listeners.include? pair
-					@has_listeners = true
-				end
-			end
-
-			def get_namespace( prefix ) 
-				uri = @namespace_stack.find do |ns|
-					not ns[prefix].nil?
-				end
-				uri[prefix] unless uri.nil?
-			end
-		end
-	end
-end
diff --git a/lib/rexml/parsers/streamparser.rb b/lib/rexml/parsers/streamparser.rb
deleted file mode 100644
index 51441289d9..0000000000
--- a/lib/rexml/parsers/streamparser.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module REXML
-	module Parsers
-		class StreamParser
-			def initialize source, listener
-				@listener = listener
-				@parser = BaseParser.new( source )
-			end
-
-			def parse
-				# entity string
-				while true
-					event = @parser.pull
-					case event[0]
-					when :end_document
-						return
-					when :start_element
-						@listener.tag_start( event[1], event[2] )
-					when :end_element
-						@listener.tag_end( event[1] )
-					when :text
-						normalized = @parser.unnormalize( event[1] )
-						@listener.text( normalized )
-					when :processing_instruction
-						@listener.instruction( *event[1,2] )
-					when :comment, :doctype, :attlistdecl, 
-						:elementdecl, :entitydecl, :cdata, :notationdecl, :xmldecl
-						@listener.send( event[0].to_s, *event[1..-1] )
-					end
-				end
-			end
-		end
-	end
-end
diff --git a/lib/rexml/parsers/ultralightparser.rb b/lib/rexml/parsers/ultralightparser.rb
deleted file mode 100644
index f3b208bf0f..0000000000
--- a/lib/rexml/parsers/ultralightparser.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'rexml/parsers/streamparser'
-require 'rexml/parsers/baseparser'
-
-module REXML
-	module Parsers
-		class UltraLightParser
-			def initialize stream
-				@stream = stream
-				@parser = REXML::Parsers::BaseParser.new( stream )
-			end
-
-      def rewind
-        @stream.rewind
-        @parser.stream = @stream
-      end
-
-			def parse
-				root = context = []
-				while true
-					event = @parser.pull
-					case event[0]
-					when :end_document
-						break
-					when :end_doctype
-						context = context[1]
-					when :start_element, :doctype
-						context << event
-						event[1,0] = [context]
-						context = event
-					when :end_element
-						context = context[1]
-					else
-						context << event
-					end
-				end
-				root
-			end
-		end
-
-		# An element is an array.  The array contains:
-		#  0			The parent element
-		#  1			The tag name
-		#  2			A hash of attributes
-		#  3..-1	The child elements
-		# An element is an array of size > 3
-		# Text is a String
-		# PIs are [ :processing_instruction, target, data ]
-		# Comments are [ :comment, data ]
-		# DocTypes are DocType structs
-		# The root is an array with XMLDecls, Text, DocType, Array, Text
-	end
-end
diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb
deleted file mode 100644
index da27e7c705..0000000000
--- a/lib/rexml/parsers/xpathparser.rb
+++ /dev/null
@@ -1,598 +0,0 @@
-require 'rexml/namespace'
-require 'rexml/xmltokens'
-
-module REXML
-	module Parsers
-		# You don't want to use this class.  Really.  Use XPath, which is a wrapper
-		# for this class.  Believe me.  You don't want to poke around in here.
-		# There is strange, dark magic at work in this code.  Beware.  Go back!  Go
-		# back while you still can!
-		class XPathParser
-			include XMLTokens
-			LITERAL		= /^'([^']*)'|^"([^"]*)"/u
-
-			def namespaces=( namespaces )
-				Functions::namespace_context = namespaces
-				@namespaces = namespaces
-			end
-
-			def parse path
-				path.gsub!(/([\(\[])\s+/, '\1') # Strip ignorable spaces
-				path.gsub!( /\s+([\]\)])/, '\1' )
-				parsed = []
-				path = LocationPath(path, parsed)
-				parsed
-			end
-
-			def predicate path
-				parsed = []
-				Predicate( "[#{path}]", parsed )
-				parsed
-			end
-
-			def to_string( path )
-				string = ""
-				while path.size > 0
-					case path[0]
-					when :ancestor, :ancestor_or_self, :attribute, :child, :descendant, :descendant_or_self, :following, :following_sibling, :namespace, :parent, :preceding, :preceding_sibling, :self
-						op = path.shift
-						string << "/" unless string.size == 0
-						string << op.to_s
-						string << "::"
-					when :any
-						path.shift
-						string << "*"
-					when :qname
-						path.shift
-						prefix = path.shift
-						name = path.shift
-						string << prefix+":" if prefix.size > 0
-						string << name
-					when :predicate
-						path.shift
-						string << '['
-						string << predicate_to_string( path.shift )
-						string << ' ]'
-					else
-						string << "/" unless string.size == 0
-						string << "UNKNOWN("
-						string << path.shift.inspect
-						string << ")"
-					end
-				end
-				return string
-			end
-
-			def predicate_to_string( path )
-				string = ""
-				case path[0]
-				when :and, :or, :mult, :plus, :minus, :neq, :eq, :lt, :gt, :lteq, :gteq, :div, :mod, :neq, :union
-					op = path.shift
-					left = predicate_to_string( path.shift )
-					right = predicate_to_string( path.shift )
-					string << " "
-					string << left
-					string << " "
-					string << op.to_s
-					string << " "
-					string << right
-					string << " "
-				when :function
-					path.shift
-					name = path.shift
-					string << name
-					string << "( "
-					string << predicate_to_string( path.shift )
-					string << " )"
-				when :literal
-					path.shift
-					string << " "
-					string << path.shift.inspect
-					string << " "
-				else
-					string << " "
-					string << to_string( path )
-					string << " "
-				end
-				return string.squeeze(" ")
-			end
-
-			private
-			#LocationPath
-			#	| RelativeLocationPath
-			#	| '/' RelativeLocationPath?
-			#	| '//' RelativeLocationPath
-			def LocationPath path, parsed
-        #puts "LocationPath '#{path}'"
-        path = path.strip
-        if path[0] == ?/
-          parsed << :document
-					if path[1] == ?/
-						parsed << :descendant_or_self
-						parsed << :node
-						path = path[2..-1]
-					else
-						path = path[1..-1]
-					end
-        end
-        #puts parsed.inspect
-				return RelativeLocationPath( path, parsed ) if path.size > 0
-			end
-
-			#RelativeLocationPath
-			#	|																										Step
-			#		| (AXIS_NAME '::' | '@' | '') 										AxisSpecifier
-			#			NodeTest
-			#				Predicate
-			#		| '.' | '..'																			AbbreviatedStep
-			#	|	RelativeLocationPath '/' Step
-			#	| RelativeLocationPath '//' Step
-			AXIS = /^(ancestor|ancestor-or-self|attribute|child|descendant|descendant-or-self|following|following-sibling|namespace|parent|preceding|preceding-sibling|self)::/
-			def RelativeLocationPath path, parsed
-				#puts "RelativeLocationPath #{path}"
-				while path.size > 0
-					# (axis or @ or <child::>) nodetest predicate	>
-					# OR																					>	/ Step
-					# (. or ..)																		>
-					if path[0] == ?.
-						if path[1] == ?.
-							parsed << :parent
-							parsed << :node
-							path = path[2..-1]
-						else
-							parsed << :self
-							parsed << :node
-							path = path[1..-1]
-						end
-					else
-						if path[0] == ?@
-							#puts "ATTRIBUTE"
-							parsed << :attribute
-							path = path[1..-1]
-							# Goto Nodetest
-						elsif path =~ AXIS
-							parsed << $1.tr('-','_').intern
-							path = $'
-							# Goto Nodetest
-						else
-							parsed << :child
-						end
-
-						#puts "NODETESTING '#{path}'"
-						n = []
-						path = NodeTest( path, n)
-						#puts "NODETEST RETURNED '#{path}'"
-
-						if path[0] == ?[
-							path = Predicate( path, n )
-						end
-
-						parsed.concat(n)
-					end
-					
-					if path.size > 0
-						if path[0] == ?/
-							if path[1] == ?/
-								parsed << :descendant_or_self
-								parsed << :node
-								path = path[2..-1]
-							else
-								path = path[1..-1]
-							end
-						else
-							return path
-						end
-					end
-				end
-				return path
-			end
-
-			# Returns a 1-1 map of the nodeset
-			# The contents of the resulting array are either:
-			# 	true/false, if a positive match
-			# 	String, if a name match
-			#NodeTest
-			#	| ('*' | NCNAME ':' '*' | QNAME)								NameTest
-			#	| NODE_TYPE '(' ')'															NodeType
-			#	| PI '(' LITERAL ')'														PI
-			#		| '[' expr ']'																Predicate
-			NCNAMETEST= /^(#{NCNAME_STR}):\*/u
-			QNAME 		= Namespace::NAMESPLIT
-			NODE_TYPE	= /^(comment|text|node)\(\s*\)/m
-			PI				= /^processing-instruction\(/
-			def NodeTest path, parsed
-        #puts "NodeTest with #{path}"
-				res = nil
-				case path
-				when /^\*/
-					path = $'
-					parsed << :any
-				when NODE_TYPE
-					type = $1
-					path = $'
-					parsed << type.tr('-', '_').intern
-				when PI
-					path = $'
-					literal = nil
-					if path !~ /^\s*\)/
-						path =~ LITERAL
-						literal = $1
-						path = $'
-						raise ParseException.new("Missing ')' after processing instruction") if path[0] != ?)
-						path = path[1..-1]
-					end
-					parsed << :processing_instruction
-					parsed << literal
-				when NCNAMETEST
-					#puts "NCNAMETEST"
-					prefix = $1
-					path = $'
-					parsed << :namespace
-					parsed << prefix
-				when QNAME
-					#puts "QNAME"
-					prefix = $1
-					name = $2
-					path = $'
-					prefix = "" unless prefix
-					parsed << :qname
-					parsed << prefix
-					parsed << name
-				end
-				return path
-			end
-
-			# Filters the supplied nodeset on the predicate(s)
-			def Predicate path, parsed
-        #puts "PREDICATE with #{path}"
-				return nil unless path[0] == ?[
-				predicates = []
-				while path[0] == ?[
-					path, expr = get_group(path)
-					predicates << expr[1..-2] if expr
-				end
-        #puts "PREDICATES = #{predicates.inspect}"
-				predicates.each{ |expr| 
-					#puts "ORING #{expr}"
-					preds = []
-					parsed << :predicate
-					parsed << preds
-					OrExpr(expr, preds) 
-				}
-        #puts "PREDICATES = #{predicates.inspect}"
-				path
-			end
-
-			# The following return arrays of true/false, a 1-1 mapping of the
-			# supplied nodeset, except for axe(), which returns a filtered
-			# nodeset
-
-			#| OrExpr S 'or' S AndExpr
-			#| AndExpr
-			def OrExpr path, parsed
-				#puts "OR >>> #{path}"
-				n = []
-				rest = AndExpr( path, n )
-				#puts "OR <<< #{rest}"
-				if rest != path
-					while rest =~ /^\s*( or )/
-						n = [ :or, n, [] ]
-						rest = AndExpr( $', n[-1] )
-					end
-				end
-				if parsed.size == 0 and n.size != 0
-					parsed.replace(n)
-				elsif n.size > 0
-					parsed << n
-				end
-				rest
-			end
-
-			#| AndExpr S 'and' S EqualityExpr
-			#| EqualityExpr
-			def AndExpr path, parsed
-				#puts "AND >>> #{path}"
-				n = []
-				rest = EqualityExpr( path, n )
-				#puts "AND <<< #{rest}"
-				if rest != path
-					while rest =~ /^\s*( and )/
-						n = [ :and, n, [] ]
-						#puts "AND >>> #{rest}"
-						rest = EqualityExpr( $', n[-1] )
-						#puts "AND <<< #{rest}"
-					end
-				end
-				if parsed.size == 0 and n.size != 0
-					parsed.replace(n)
-				elsif n.size > 0
-					parsed << n
-				end
-				rest
-			end
-
-			#| EqualityExpr ('=' | '!=')  RelationalExpr
-			#| RelationalExpr
-			def EqualityExpr path, parsed
-				#puts "EQUALITY >>> #{path}"
-				n = []
-				rest = RelationalExpr( path, n )
-				#puts "EQUALITY <<< #{rest}"
-				if rest != path
-					while rest =~ /^\s*(!?=)\s*/
-						if $1[0] == ?!
-							n = [ :neq, n, [] ]
-						else
-							n = [ :eq, n, [] ]
-						end
-						rest = RelationalExpr( $', n[-1] )
-					end
-				end
-				if parsed.size == 0 and n.size != 0
-					parsed.replace(n)
-				elsif n.size > 0
-					parsed << n
-				end
-				rest
-			end
-
-			#| RelationalExpr ('<' | '>' | '<=' | '>=') AdditiveExpr
-			#| AdditiveExpr
-			def RelationalExpr path, parsed
-				#puts "RELATION >>> #{path}"
-				n = []
-				rest = AdditiveExpr( path, n )
-				#puts "RELATION <<< #{rest}"
-				if rest != path
-					while rest =~ /^\s*([<>]=?)\s*/
-						if $1[0] == ?<
-							sym = "lt"
-						else
-							sym = "gt"
-						end
-						sym << "eq" if $1[-1] == ?=
-						n = [ sym.intern, n, [] ]
-						rest = AdditiveExpr( $', n[-1] )
-					end
-				end
-				if parsed.size == 0 and n.size != 0
-					parsed.replace(n)
-				elsif n.size > 0
-					parsed << n
-				end
-				rest
-			end
-
-			#| AdditiveExpr ('+' | S '-') MultiplicativeExpr
-			#| MultiplicativeExpr
-			def AdditiveExpr path, parsed
-				#puts "ADDITIVE >>> #{path}"
-				n = []
-				rest = MultiplicativeExpr( path, n )
-				#puts "ADDITIVE <<< #{rest}"
-				if rest != path
-					while rest =~ /^\s*(\+| -)\s*/
-						if $1[0] == ?+
-							n = [ :plus, n, [] ]
-						else
-							n = [ :minus, n, [] ]
-						end
-						rest = MultiplicativeExpr( $', n[-1] )
-					end
-				end
-				if parsed.size == 0 and n.size != 0
-					parsed.replace(n)
-				elsif n.size > 0
-					parsed << n
-				end
-				rest
-			end
-
-			#| MultiplicativeExpr ('*' | S ('div' | 'mod') S) UnaryExpr
-			#| UnaryExpr
-			def MultiplicativeExpr path, parsed
-				#puts "MULT >>> #{path}"
-				n = []
-				rest = UnaryExpr( path, n )
-				#puts "MULT <<< #{rest}"
-				if rest != path
-					while rest =~ /^\s*(\*| div | mod )\s*/
-						if $1[0] == ?*
-							n = [ :mult, n, [] ]
-						elsif $1.include?( "div" )
-							n = [ :div, n, [] ]
-						else
-							n = [ :mod, n, [] ]
-						end
-						rest = UnaryExpr( $', n[-1] )
-					end
-				end
-				if parsed.size == 0 and n.size != 0
-					parsed.replace(n)
-				elsif n.size > 0
-					parsed << n
-				end
-				rest
-			end
-
-			#| '-' UnaryExpr
-			#| UnionExpr
-			def UnaryExpr path, parsed
-				path =~ /^(\-*)/
-				path = $'
-				if $1 and (($1.size % 2) != 0)
-					mult = -1
-				else
-					mult = 1
-				end
-				parsed << :neg if mult < 0
-
-				#puts "UNARY >>> #{path}"
-				n = []
-				path = UnionExpr( path, n )
-				#puts "UNARY <<< #{path}"
-				parsed.concat( n )
-				path
-			end
-
-			#| UnionExpr '|' PathExpr
-			#| PathExpr
-			def UnionExpr path, parsed
-				#puts "UNION >>> #{path}"
-				n = []
-				rest = PathExpr( path, n )
-				#puts "UNION <<< #{rest}"
-				if rest != path
-					while rest =~ /^\s*(\|)\s*/
-						n = [ :union, n, [] ]
-						rest = PathExpr( $', n[-1] )
-					end
-				end
-				if parsed.size == 0 and n.size != 0
-					parsed.replace( n )
-				elsif n.size > 0
-					parsed << n
-				end
-				rest
-			end
-
-			#| LocationPath
-			#| FilterExpr ('/' | '//') RelativeLocationPath
-			def PathExpr path, parsed
-        path =~ /^\s*/
-        path = $'
-				#puts "PATH >>> #{path}"
-				n = []
-				rest = FilterExpr( path, n )
-				#puts "PATH <<< '#{rest}'"
-				if rest != path
-					if rest and rest[0] == ?/
-						return RelativeLocationPath(rest, n)
-					end
-				end
-				#puts "BEFORE WITH '#{rest}'"
-				rest = LocationPath(rest, n) if rest =~ /^[\/\.\@\[\w_*]/
-				parsed.concat(n)
-				return rest
-			end
-
-			#| FilterExpr Predicate
-			#| PrimaryExpr
-			def FilterExpr path, parsed
-				#puts "FILTER >>> #{path}"
-				n = []
-				path = PrimaryExpr( path, n )
-				#puts "FILTER <<< #{path}"
-				path = Predicate(path, n) if path and path[0] == ?[
-				#puts "FILTER <<< #{path}"
-				parsed.concat(n)
-				path
-			end
-
-			#| VARIABLE_REFERENCE
-			#| '(' expr ')'
-			#| LITERAL
-			#| NUMBER
-			#| FunctionCall
-			VARIABLE_REFERENCE	= /^\$(#{NAME_STR})/u
-			NUMBER							= /^(\d*\.?\d+)/
-			NT				= /^comment|text|processing-instruction|node$/
-			def PrimaryExpr path, parsed
-				arry = []
-				case path
-				when VARIABLE_REFERENCE
-					varname = $1
-					path = $'
-					parsed << :variable
-					parsed << varname
-					#arry << @variables[ varname ]
-				when /^(\w[-\w]*)(?:\()/
-					fname = $1
-					path = $'
-					return nil if fname =~ NT
-					parsed << :function
-					parsed << fname
-					path = FunctionCall(path, parsed)
-				when LITERAL, NUMBER
-					#puts "LITERAL or NUMBER: #$1"
-					varname = $1.nil? ? $2 : $1
-					path = $'
-					parsed << :literal 
-					parsed << varname
-				when /^\(/ 																							#/
-					path, contents = get_group(path)
-					contents = contents[1..-2]
-					n = []
-					OrExpr( contents, n )
-					parsed.concat(n)
-				end
-				path
-			end
-
-			#| FUNCTION_NAME '(' ( expr ( ',' expr )* )? ')'
-			def FunctionCall rest, parsed
-				path, arguments = parse_args(rest)
-        argset = []
-        for argument in arguments
-          args = []
-          OrExpr( argument, args )
-          argset << args
-        end
-				parsed << argset
-				path
-			end
-
-			# get_group( '[foo]bar' ) -> ['bar', '[foo]']
-			def get_group string
-				ind = 0
-				depth = 0
-				st = string[0,1]
-				en = (st == "(" ? ")" : "]")
-				begin
-					case string[ind,1]
-					when st
-						depth += 1
-					when en
-						depth -= 1
-					end
-					ind += 1
-				end while depth > 0 and ind < string.length
-				return nil unless depth==0
-				[string[ind..-1], string[0..ind-1]]
-			end
-			
-			def parse_args( string )
-				arguments = []
-				ind = 0
-				depth = 1
-				begin
-					case string[ind]
-					when ?(
-						depth += 1
-						if depth == 1
-							string = string[1..-1]
-							ind -= 1
-						end
-					when ?)
-						depth -= 1
-						if depth == 0
-							s = string[0,ind].strip
-							arguments << s unless s == ""
-							string = string[ind+1..-1]
-						end
-					when ?,
-						if depth == 1
-							s = string[0,ind].strip
-							arguments << s unless s == ""
-							string = string[ind+1..-1]
-							ind = 0
-						end
-					end
-					ind += 1
-				end while depth > 0 and ind < string.length
-				return nil unless depth==0
-				[string,arguments]
-			end
-		end
-	end
-end
diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb
deleted file mode 100644
index c099db8579..0000000000
--- a/lib/rexml/quickpath.rb
+++ /dev/null
@@ -1,266 +0,0 @@
-require 'rexml/functions'
-require 'rexml/xmltokens'
-
-module REXML
-	class QuickPath
-		include Functions
-		include XMLTokens
-
-		EMPTY_HASH = {}
-
-		def QuickPath::first element, path, namespaces=EMPTY_HASH
-			match(element, path, namespaces)[0]
-		end
-
-		def QuickPath::each element, path, namespaces=EMPTY_HASH, &block
-			path = "*" unless path
-			match(element, path, namespaces).each( &block )
-		end
-
-		def QuickPath::match element, path, namespaces=EMPTY_HASH
-			raise "nil is not a valid xpath" unless path
-			results = nil
-			Functions::namespace_context = namespaces
-			case path
-			when /^\/([^\/]|$)/u
-				# match on root
-				path = path[1..-1]
-				return [element.root.parent] if path == ''
-				results = filter([element.root], path)
-			when /^[-\w]*::/u
-				results = filter([element], path)
-			when /^\*/u
-				results = filter(element.to_a, path)
-			when /^[\[!\w:]/u
-				# match on child
-				matches = []
-				children = element.to_a
-				results = filter(children, path)
-			else
-				results = filter([element], path)
-			end
-			return results
-		end
-
-		# Given an array of nodes it filters the array based on the path. The
-		# result is that when this method returns, the array will contain elements
-		# which match the path
-		def QuickPath::filter elements, path
-			return elements if path.nil? or path == '' or elements.size == 0
-			case path
-			when /^\/\//u											# Descendant
-				return axe( elements, "descendant-or-self", $' )
-			when /^\/?\b(\w[-\w]*)\b::/u							# Axe
-				axe_name = $1
-				rest = $'
-				return axe( elements, $1, $' )
-			when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u	# Child
-				rest = $'
-				results = []
-				elements.each do |element|
-					results |= filter( element.to_a, rest )
-				end
-				return results
-			when /^\/?(\w[-\w]*)\(/u							# / Function
-				return function( elements, $1, $' )
-			when Namespace::NAMESPLIT		# Element name
-				name = $2
-				ns = $1
-				rest = $'
-				elements.delete_if do |element|
-					!(element.kind_of? Element and 
-						(element.expanded_name == name or
-						 (element.name == name and
-						  element.namespace == Functions.namespace_context[ns])))
-				end
-				return filter( elements, rest )
-			when /^\/\[/u
-				matches = []
-				elements.each do |element|
-					matches |= predicate( element.to_a, path[1..-1] ) if element.kind_of? Element
-				end
-				return matches
-			when /^\[/u												# Predicate
-				return predicate( elements, path )
-			when /^\/?\.\.\./u										# Ancestor
-				return axe( elements, "ancestor", $' )
-			when /^\/?\.\./u											# Parent
-				return filter( elements.collect{|e|e.parent}, $' )
-			when /^\/?\./u												# Self
-				return filter( elements, $' )
-			when /^\*/u													# Any
-				results = []
-				elements.each do |element|
-					results |= filter( [element], $' ) if element.kind_of? Element
-					#if element.kind_of? Element
-					#	children = element.to_a
-					#	children.delete_if { |child| !child.kind_of?(Element) }
-					#	results |= filter( children, $' )
-					#end
-				end
-				return results
-			end
-			return []
-		end
-
-		def QuickPath::axe( elements, axe_name, rest )
-			matches = []
-			matches = filter( elements.dup, rest ) if axe_name =~ /-or-self$/u
-			case axe_name
-			when /^descendant/u
-				elements.each do |element|
-					matches |= filter( element.to_a, "descendant-or-self::#{rest}" ) if element.kind_of? Element
-				end
-			when /^ancestor/u
-				elements.each do |element|
-					while element.parent
-						matches << element.parent
-						element = element.parent
-					end
-				end
-				matches = filter( matches, rest )
-			when "self"
-				matches = filter( elements, rest )
-			when "child"
-				elements.each do |element|
-					matches |= filter( element.to_a, rest ) if element.kind_of? Element
-				end
-			when "attribute"
-				elements.each do |element|
-					matches << element.attributes[ rest ] if element.kind_of? Element
-				end
-			when "parent"
-				matches = filter(elements.collect{|element| element.parent}.uniq, rest)
-			when "following-sibling"
-				matches = filter(elements.collect{|element| element.next_sibling}.uniq,
-					rest)
-			when "previous-sibling"
-				matches = filter(elements.collect{|element| 
-					element.previous_sibling}.uniq, rest )
-			end
-			return matches.uniq
-		end
-
-		# A predicate filters a node-set with respect to an axis to produce a
-		# new node-set. For each node in the node-set to be filtered, the 
-		# PredicateExpr is evaluated with that node as the context node, with 
-		# the number of nodes in the node-set as the context size, and with the 
-		# proximity position of the node in the node-set with respect to the
-		# axis as the context position; if PredicateExpr evaluates to true for
-		# that node, the node is included in the new node-set; otherwise, it is
-		# not included.
-		#
-		# A PredicateExpr is evaluated by evaluating the Expr and converting
-		# the result to a boolean. If the result is a number, the result will
-		# be converted to true if the number is equal to the context position
-		# and will be converted to false otherwise; if the result is not a
-		# number, then the result will be converted as if by a call to the
-		# boolean function. Thus a location path para[3] is equivalent to
-		# para[position()=3].
-		def QuickPath::predicate( elements, path ) 
-			ind = 1
-			bcount = 1
-			while bcount > 0
-				bcount += 1 if path[ind] == ?[
-				bcount -= 1 if path[ind] == ?]
-				ind += 1
-			end
-			ind -= 1
-			predicate = path[1..ind-1]
-			rest = path[ind+1..-1]
-
-			# have to change 'a [=<>] b [=<>] c' into 'a [=<>] b and b [=<>] c'
-			predicate.gsub!( /([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)/u ) { 
-				"#$1 #$2 #$3 and #$3 #$4 #$5"
-			}
-			# Let's do some Ruby trickery to avoid some work:
-			predicate.gsub!( /&/u, "&&" )
-			predicate.gsub!( /=/u, "==" )
-			predicate.gsub!( /@(\w[-\w.]*)/u ) {
-				"attribute(\"#$1\")" 
-			}
-			predicate.gsub!( /\bmod\b/u, "%" )
-			predicate.gsub!( /\b(\w[-\w.]*\()/u ) {
-				fname = $1
-				fname.gsub( /-/u, "_" )
-			}
-			
-			Functions.pair = [ 0, elements.size ]
-			results = []
-			elements.each do |element|
-				Functions.pair[0] += 1
-				Functions.node = element
-				res = eval( predicate )
-				case res
-				when true
-					results << element
-				when Fixnum
-					results << element if Functions.pair[0] == res
-				when String
-					results << element
-				end
-			end
-			return filter( results, rest )
-		end
-
-		def QuickPath::attribute( name )
-			return Functions.node.attributes[name] if Functions.node.kind_of? Element
-		end
-
-		def QuickPath::name()
-			return Functions.node.name if Functions.node.kind_of? Element
-		end
-
-		def QuickPath::method_missing( id, *args )
-			begin
-				Functions.send( id.id2name, *args )
-			rescue Exception
-				raise "METHOD: #{id.id2name}(#{args.join ', '})\n#{$!.message}"
-			end
-		end
-
-		def QuickPath::function( elements, fname, rest )
-			args = parse_args( elements, rest )
-			Functions.pair = [0, elements.size]
-			results = []
-			elements.each do |element|
-				Functions.pair[0] += 1
-				Functions.node = element
-				res = Functions.send( fname, *args )
-				case res
-				when true
-					results << element
-				when Fixnum
-					results << element if Functions.pair[0] == res
-				end
-			end
-			return results
-		end
-
-		def QuickPath::parse_args( element, string )
-			# /.*?(?:\)|,)/
-			arguments = []
-			buffer = ""
-			while string and string != ""
-				c = string[0]
-				string.sub!(/^./u, "")
-				case c
-				when ?,
-					# if depth = 1, then we start a new argument
-					arguments << evaluate( buffer )
-					#arguments << evaluate( string[0..count] )
-				when ?(
-					# start a new method call
-					function( element, buffer, string )
-					buffer = ""
-				when ?)
-					# close the method call and return arguments
-					return arguments
-				else
-					buffer << c
-				end
-			end
-			""
-		end
-	end
-end
diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb
deleted file mode 100644
index 8c402dd23f..0000000000
--- a/lib/rexml/rexml.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# REXML is an XML parser for Ruby, in Ruby.
-# 
-# URL: http://www.germane-software.com/software/rexml
-# Author: Sean Russell <ser@germane-software.com>
-# Version: 2.5.6
-# Date: +2003/054
-
-
-
-# 
-# Short Description:
-# Why did I write REXML?   At the time of this writing, there were already
-# two XML parsers for Ruby. The first is a Ruby binding to a native XML
-# parser.  This is a fast parser, using proven technology. However,
-# it isn't very portable. The second is a native Ruby implementation, but
-# I didn't like its API very much.  I wrote REXML for myself, so that I'd
-# have an XML parser that had an intuitive API.
-#
-# API documentation can be downloaded from the REXML home page, or can
-# be accessed online at http://www.germane-software.com/software/rexml_doc
-# A tutorial is available in docs/tutorial.html
-module REXML
-	Copyright = "Copyright #{Time.now.year} Sean Russell <ser@germane-software.com>"
-	Date = "+2003/283"
-	Version = "2.7.2"
-end
diff --git a/lib/rexml/sax2listener.rb b/lib/rexml/sax2listener.rb
deleted file mode 100644
index 40a77ed464..0000000000
--- a/lib/rexml/sax2listener.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-module REXML
-	# A template for stream parser listeners.
-	# Note that the declarations (attlistdecl, elementdecl, etc) are trivially
-	# processed; REXML doesn't yet handle doctype entity declarations, so you 
-	# have to parse them out yourself.
-	# === Missing methods from SAX2
-	#  ignorable_whitespace
-	# === Methods extending SAX2 
-	# +WARNING+
-	# These methods are certainly going to change, until DTDs are fully
-	# supported.  Be aware of this.
-	#  start_document
-	#  end_document
-	#  doctype
-	#  elementdecl
-	#  attlistdecl
-	#  entitydecl
-	#  notationdecl
-	#  cdata
-	#  xmldecl
-	#  comment
-	module SAX2Listener
-		def start_document
-		end
-		def end_document
-		end
-		def start_prefix_mapping prefix, uri
-		end
-		def end_prefix_mapping prefix
-		end
-		def start_element uri, localname, qname, attributes
-		end
-		def end_element uri, localname, qname
-		end
-		def characters text
-		end
-		def processing_instruction target, data
-		end
-		# Handles a doctype declaration. Any attributes of the doctype which are
-		# not supplied will be nil.  # EG, <!DOCTYPE me PUBLIC "foo" "bar">
-		# @p name the name of the doctype; EG, "me"
-		# @p pub_sys "PUBLIC", "SYSTEM", or nil.  EG, "PUBLIC"
-		# @p long_name the supplied long name, or nil.  EG, "foo"
-		# @p uri the uri of the doctype, or nil.  EG, "bar"
-		def doctype name, pub_sys, long_name, uri
-		end
-		# If a doctype includes an ATTLIST declaration, it will cause this
-		# method to be called.  The content is the declaration itself, unparsed.
-		# EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
-		# attr CDATA #REQUIRED".  This is the same for all of the .*decl
-		# methods.
-		def attlistdecl(element, pairs, contents)
-		end
-		# <!ELEMENT ...>
-		def elementdecl content
-		end
-		# <!ENTITY ...>
-		# The argument passed to this method is an array of the entity
-		# declaration.  It can be in a number of formats, but in general it
-		# returns (example, result):
-		#  <!ENTITY % YN '"Yes"'>  
-		#  ["%", "YN", "'\"Yes\"'", "\""]
-		#  <!ENTITY % YN 'Yes'>
-		#  ["%", "YN", "'Yes'", "s"]
-		#  <!ENTITY WhatHeSaid "He said %YN;">
-		#  ["WhatHeSaid", "\"He said %YN;\"", "YN"]
-		#  <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
-		#  ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
-		#  <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
-		#  ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
-		#  <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
-		#  ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
-		def entitydecl content
-		end
-		# <!NOTATION ...>
-		def notationdecl content
-		end
-		# Called when <![CDATA[ ... ]]> is encountered in a document.
-		# @p content "..."
-		def cdata content
-		end
-		# Called when an XML PI is encountered in the document.
-		# EG: <?xml version="1.0" encoding="utf"?>
-		# @p version the version attribute value.  EG, "1.0"
-		# @p encoding the encoding attribute value, or nil.  EG, "utf"
-		# @p standalone the standalone attribute value, or nil.  EG, nil
-		def xmldecl version, encoding, standalone
-		end
-		# Called when a comment is encountered.
-		# @p comment The content of the comment
-		def comment comment
-		end
-	end	
-end
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
deleted file mode 100644
index 8161750694..0000000000
--- a/lib/rexml/source.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-require 'rexml/encoding'
-
-module REXML
-	# Generates Source-s.  USE THIS CLASS.
-	class SourceFactory
-		# Generates a Source object
-		# @param arg Either a String, or an IO
-		# @return a Source, or nil if a bad argument was given
-		def SourceFactory::create_from arg#, slurp=true
-			if arg.kind_of? String
-				source = Source.new(arg)
-			elsif arg.kind_of? IO
-				source = IOSource.new(arg)
-			end
-			source
-		end
-	end
-
-	# A Source can be searched for patterns, and wraps buffers and other
-	# objects and provides consumption of text
-	class Source
-		include Encoding
-		# The current buffer (what we're going to read next)
-		attr_reader :buffer
-		# The line number of the last consumed text
-		attr_reader :line
-		attr_reader :encoding
-
-		# Constructor
-		# @param arg must be a String, and should be a valid XML document
-		def initialize arg
-			@orig = @buffer = arg
-			self.encoding = check_encoding( @buffer )
-			#@buffer = decode(@buffer) unless @encoding == UTF_8
-			@line = 0
-		end
-
-		# Inherited from Encoding
-		# Overridden to support optimized en/decoding
-		def encoding=(enc)
-			super
-			@line_break = encode( '>' )
-			if enc != UTF_8
-				@buffer = decode(@buffer)
-				@to_utf = true
-			else
-				@to_utf = false
-			end
-		end
-
-		# Scans the source for a given pattern.  Note, that this is not your
-		# usual scan() method.  For one thing, the pattern argument has some
-		# requirements; for another, the source can be consumed.  You can easily
-		# confuse this method.  Originally, the patterns were easier
-		# to construct and this method more robust, because this method 
-		# generated search regexes on the fly; however, this was 
-		# computationally expensive and slowed down the entire REXML package 
-		# considerably, since this is by far the most commonly called method.
-		# @param pattern must be a Regexp, and must be in the form of
-		# /^\s*(#{your pattern, with no groups})(.*)/.  The first group
-		# will be returned; the second group is used if the consume flag is
-		# set.
-		# @param consume if true, the pattern returned will be consumed, leaving
-		# everything after it in the Source.
-		# @return the pattern, if found, or nil if the Source is empty or the
-		# pattern is not found.
-		def scan pattern, consume=false
-			return nil if @buffer.nil?
-			rv = @buffer.scan(pattern)
-			@buffer = $' if consume and rv.size>0
-			rv
-		end
-
-		def read
-		end
-
-		def consume( pattern )
-			@buffer = $' if pattern.match( @buffer )
-		end
-
-		def match_to( char, pattern )
-			return pattern.match(@buffer)
-		end
-
-		def match_to_consume( char, pattern )
-			md = pattern.match(@buffer)
-			@buffer = $'
-			return md
-		end
-
-		def match pattern, consume=false
-			md = pattern.match(@buffer)
-			@buffer = $' if consume and md
-			return md
-		end
-
-		# @return true if the Source is exhausted
-		def empty?
-			@buffer.nil? or @buffer.strip.nil?
-		end
-
-		# @return the current line in the source
-		def current_line
-			lines = @orig.split
-			res = lines.grep(@buffer[0..30])
-			res = res[-1] if res.kind_of? Array
-			lines.index( res ) if res
-		end
-	end
-
-	# A Source that wraps an IO.  See the Source class for method
-	# documentation
-	class IOSource < Source
-		#attr_reader :block_size
-
-		def initialize arg, block_size=500
-			@er_source = @source = arg
-			@to_utf = false
-			# READLINE OPT
-			# The following was commented out when IOSource started using readline
-			# to pull the data from the stream.
-			#@block_size = block_size
-			#super @source.read(@block_size)
-			@line_break = '>'
-			#super @source.readline( "\n" )
-			super @source.readline( @line_break )+@source.read
-			@line_break = encode( '>' )
-		end
-
-		def scan pattern, consume=false
-			rv = super
-			# You'll notice that this next section is very similar to the same
-			# section in match(), but just a liiittle different.  This is
-			# because it is a touch faster to do it this way with scan()
-			# than the way match() does it; enough faster to warrent duplicating
-			# some code
-			if rv.size == 0
-				until @buffer =~ pattern or @source.nil?
-					begin
-						# READLINE OPT
-						#str = @source.read(@block_size)
-						str = @source.readline(@line_break)
-						str = decode(str) if @to_utf and str
-						@buffer << str
-					rescue
-						@source = nil
-					end
-				end
-				rv = super
-			end
-			rv.taint
-			rv
-		end
-
-		def read
-			begin
-				str = @source.readline('>')
-				str = decode(str) if @to_utf and str 
-				@buffer << str
-			rescue Exception, NameError
-				@source = nil
-			end
-		end
-
-		def consume( pattern )
-			match( pattern, true )
-		end
-
-		def match pattern, consume=false
-			rv = pattern.match(@buffer)
-			@buffer = $' if consume and rv
-			while !rv and @source
-				begin
-					str = @source.readline('>')
-					str = decode(str) if @to_utf and str
-					@buffer << str
-					rv = pattern.match(@buffer)
-					@buffer = $' if consume and rv
-				rescue
-					@source = nil
-				end
-			end
-			rv.taint
-			rv
-		end
-		
-		def empty?
-			super and ( @source.nil? || @source.eof? )
-		end
-
-		# @return the current line in the source
-		def current_line
-			pos = @er_source.pos				# The byte position in the source
-			lineno = @er_source.lineno	# The XML < position in the source
-			@er_source.rewind
-			line = 0										# The \r\n position in the source
-			begin
-				while @er_source.pos < pos
-					@er_source.readline
-					line += 1
-				end
-			rescue
-			end
-			[pos, lineno, line]
-		end
-	end
-end
diff --git a/lib/rexml/streamlistener.rb b/lib/rexml/streamlistener.rb
deleted file mode 100644
index 3c3c5e3684..0000000000
--- a/lib/rexml/streamlistener.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-module REXML
-	# A template for stream parser listeners.
-	# Note that the declarations (attlistdecl, elementdecl, etc) are trivially
-	# processed; REXML doesn't yet handle doctype entity declarations, so you 
-	# have to parse them out yourself.
-	module StreamListener
-		# Called when a tag is encountered.
-		# @p name the tag name
-		# @p attrs an array of arrays of attribute/value pairs, suitable for
-		# use with assoc or rassoc.  IE, <tag attr1="value1" attr2="value2">
-		# will result in 
-		# tag_start( "tag", # [["attr1","value1"],["attr2","value2"]])
-		def tag_start name, attrs
-		end
-		# Called when the end tag is reached.  In the case of <tag/>, tag_end
-		# will be called immidiately after tag_start
-		# @p the name of the tag
-		def tag_end name
-		end
-		# Called when text is encountered in the document
-		# @p text the text content.
-		def text text
-		end
-		# Called when an instruction is encountered.  EG: <?xsl sheet='foo'?>
-		# @p name the instruction name; in the example, "xsl"
-		# @p instruction the rest of the instruction.  In the example,
-		# "sheet='foo'"
-		def instruction name, instruction
-		end
-		# Called when a comment is encountered.
-		# @p comment The content of the comment
-		def comment comment
-		end
-		# Handles a doctype declaration. Any attributes of the doctype which are
-		# not supplied will be nil.  # EG, <!DOCTYPE me PUBLIC "foo" "bar">
-		# @p name the name of the doctype; EG, "me"
-		# @p pub_sys "PUBLIC", "SYSTEM", or nil.  EG, "PUBLIC"
-		# @p long_name the supplied long name, or nil.  EG, "foo"
-		# @p uri the uri of the doctype, or nil.  EG, "bar"
-		def doctype name, pub_sys, long_name, uri
-		end
-		# If a doctype includes an ATTLIST declaration, it will cause this
-		# method to be called.  The content is the declaration itself, unparsed.
-		# EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
-		# attr CDATA #REQUIRED".  This is the same for all of the .*decl
-		# methods.
-		def attlistdecl element_name, attributes, raw_content
-		end
-		# <!ELEMENT ...>
-		def elementdecl content
-		end
-		# <!ENTITY ...>
-		# The argument passed to this method is an array of the entity
-		# declaration.  It can be in a number of formats, but in general it
-		# returns (example, result):
-		#  <!ENTITY % YN '"Yes"'>  
-		#  ["%", "YN", "'\"Yes\"'", "\""]
-		#  <!ENTITY % YN 'Yes'>
-		#  ["%", "YN", "'Yes'", "s"]
-		#  <!ENTITY WhatHeSaid "He said %YN;">
-		#  ["WhatHeSaid", "\"He said %YN;\"", "YN"]
-		#  <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
-		#  ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
-		#  <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
-		#  ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
-		#  <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
-		#  ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
-		def entitydecl content
-		end
-		# <!NOTATION ...>
-		def notationdecl content
-		end
-		# Called when %foo; is encountered in a doctype declaration.
-		# @p content "foo"
-		def entity content
-		end
-		# Called when <![CDATA[ ... ]]> is encountered in a document.
-		# @p content "..."
-		def cdata content
-		end
-		# Called when an XML PI is encountered in the document.
-		# EG: <?xml version="1.0" encoding="utf"?>
-		# @p version the version attribute value.  EG, "1.0"
-		# @p encoding the encoding attribute value, or nil.  EG, "utf"
-		# @p standalone the standalone attribute value, or nil.  EG, nil
-		def xmldecl version, encoding, standalone
-		end
-	end
-end
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
deleted file mode 100644
index 0614e51d47..0000000000
--- a/lib/rexml/text.rb
+++ /dev/null
@@ -1,279 +0,0 @@
-require 'rexml/entity'
-
-module REXML
-	# Represents text nodes in an XML document
-	class Text < Child
-		include Comparable
-		# The order in which the substitutions occur
-		SPECIALS = [ /&(?!#?[\w-]+;)/u, /</u, />/u, /"/u, /'/u, /\r/u ]
-		SUBSTITUTES = ['&amp;', '&lt;', '&gt;', '&quot;', '&apos;', '&#13;']
-		# Characters which are substituted in written strings
-		SLAICEPS = [ '<', '>', '"', "'", '&' ]
-		SETUTITSBUS = [ /&lt;/u, /&gt;/u, /&quot;/u, /&apos;/u, /&amp;/u ]
-
-		# If +raw+ is true, then REXML leaves the value alone
-		attr_accessor :raw
-
-		ILLEGAL = /(<|&(?!(#{Entity::NAME})|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));))/um
-		NUMERICENTITY = /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ 
-
-		# Constructor
-		# +arg+ if a String, the content is set to the String.  If a Text,
-		# the object is shallowly cloned.  
-		#
-		# +respect_whitespace+ (boolean, false) if true, whitespace is
-		# respected
-		#
-		# +parent+ (nil) if this is a Parent object, the parent
-		# will be set to this.  
-		#
-		# +raw+ (nil) This argument can be given three values.
-		# If true, then the value of used to construct this object is expected to 
-		# contain no unescaped XML markup, and REXML will not change the text. If 
-		# this value is false, the string may contain any characters, and REXML will
-		# escape any and all defined entities whose values are contained in the
-		# text.  If this value is nil (the default), then the raw value of the 
-		# parent will be used as the raw value for this node.  If there is no raw
-		# value for the parent, and no value is supplied, the default is false.
-		#   Text.new( "<&", false, nil, false ) #-> "&lt;&amp;"
-		#   Text.new( "<&", false, nil, true )  #-> IllegalArgumentException
-		#   Text.new( "&lt;&amp;", false, nil, true )  #-> "&lt;&amp;"
-		#   # Assume that the entity "s" is defined to be "sean"
-		#   # and that the entity    "r" is defined to be "russell"
-		#   Text.new( "sean russell" )          #-> "&s; &r;"
-		#   Text.new( "sean russell", false, nil, true ) #-> "sean russell"
-		#
-		# +entity_filter+ (nil) This can be an array of entities to match in the
-		# supplied text.  This argument is only useful if +raw+ is set to false.
-		#   Text.new( "sean russell", false, nil, false, ["s"] ) #-> "&s; russell"
-		#   Text.new( "sean russell", false, nil, true, ["s"] ) #-> "sean russell"
-		# In the last example, the +entity_filter+ argument is ignored.
-		#
-		# +pattern+ INTERNAL USE ONLY
-		def initialize(arg, respect_whitespace=false, parent=nil, raw=nil, 
-			entity_filter=nil, illegal=ILLEGAL )
-
-			@raw = false
-
-			if parent
-				super( parent )
-				@raw = parent.raw 
-			else
-				@parent = nil
-			end
-
-			@raw = raw unless raw.nil?
-			@entity_filter = entity_filter
-			@normalized = @unnormalized = nil
-
-			if arg.kind_of? String
-				@string = arg.clone
-				@string.squeeze!(" \n\t") unless respect_whitespace
-			elsif arg.kind_of? Text
-				@string = arg.to_s
-				@raw = arg.raw
-			elsif
-				raise Exception.new( "Illegal argument of type #{arg.type} for Text constructor (#{arg})" )
-			end
-
-			@string.gsub!( /\r\n?/, "\n" )
-
-			# check for illegal characters
-			if @raw
-				if @string =~ illegal
-					raise Exception.new(
-						"Illegal character '#{$1}' in raw string \"#{@string}\""
-					)
-				end
-			end
-		end
-
-		def node_type
-			:text
-		end
-
-		def empty?
-			@string.size==0
-		end
-
-
-		def clone
-			return Text.new(self)
-		end
-
-
-		# Appends text to this text node.  The text is appended in the +raw+ mode
-		# of this text node.
-		def <<( to_append )
-			@string << to_append.gsub( /\r\n?/, "\n" )
-		end
-
-
-		# +other+ a String or a Text
-		# +returns+ the result of (to_s <=> arg.to_s)
-		def <=>( other )
-			to_s() <=> other.to_s
-		end
-
-		REFERENCE = /#{Entity::REFERENCE}/
-		# Returns the string value of this text node.  This string is always
-		# escaped, meaning that it is a valid XML text node string, and all
-		# entities that can be escaped, have been inserted.  This method respects
-		# the entity filter set in the constructor.
-		#   
-		#   # Assume that the entity "s" is defined to be "sean", and that the 
-		#   # entity "r" is defined to be "russell"
-		#   t = Text.new( "< & sean russell", false, nil, false, ['s'] ) 
-		#   t.to_s   #-> "&lt; &amp; &s; russell"
-		#   t = Text.new( "< & &s; russell", false, nil, false ) 
-		#   t.to_s   #-> "&lt; &amp; &s; russell"
-		#   u = Text.new( "sean russell", false, nil, true )
-		#   u.to_s   #-> "sean russell"
-		def to_s
-			return @string if @raw
-			return @normalized if @normalized
-
-			doctype = nil
-			if @parent
-				doc = @parent.document
-				doctype = doc.doctype if doc
-			end
-
-			@normalized = Text::normalize( @string, doctype, @entity_filter )
-		end
-
-		# Returns the string value of this text.  This is the text without
-		# entities, as it might be used programmatically, or printed to the
-		# console.  This ignores the 'raw' attribute setting, and any
-		# entity_filter.
-		#
-		#   # Assume that the entity "s" is defined to be "sean", and that the 
-		#   # entity "r" is defined to be "russell"
-		#   t = Text.new( "< & sean russell", false, nil, false, ['s'] ) 
-		#   t.string   #-> "< & sean russell"
-		#   t = Text.new( "< & &s; russell", false, nil, false )
-		#   t.string   #-> "< & sean russell"
-		#   u = Text.new( "sean russell", false, nil, true )
-		#   u.string   #-> "sean russell"
-		def value
-			@unnormalized if @unnormalized
-			doctype = nil
-			if @parent
-				doc = @parent.document
-				doctype = doc.doctype if doc
-			end
-			@unnormalized = Text::unnormalize( @string, doctype )
-		end
-
-		def write( writer, indent=-1, transitive=false, ie_hack=false ) 
-			writer << to_s()
-		end
-
-		# Writes out text, substituting special characters beforehand.
-		# +out+ A String, IO, or any other object supporting <<( String )
-		# +input+ the text to substitute and the write out
-		#
-		#   z=utf8.unpack("U*")
-		#   ascOut=""
-		#   z.each{|r|
-		#     if r <  0x100
-		#       ascOut.concat(r.chr)
-		#     else
-		#       ascOut.concat(sprintf("&#x%x;", r))
-		#     end
-		#   }
-		#   puts ascOut
-		def write_with_substitution out, input
-			copy = input.clone
-			# Doing it like this rather than in a loop improves the speed
-			copy.gsub!( SPECIALS[0], SUBSTITUTES[0] )
-			copy.gsub!( SPECIALS[1], SUBSTITUTES[1] )
-			copy.gsub!( SPECIALS[2], SUBSTITUTES[2] )
-			copy.gsub!( SPECIALS[3], SUBSTITUTES[3] )
-			copy.gsub!( SPECIALS[4], SUBSTITUTES[4] )
-			copy.gsub!( SPECIALS[5], SUBSTITUTES[5] )
-			out << copy
-		end
-
-		# Reads text, substituting entities
-		def Text::read_with_substitution( input, illegal=nil )
-			copy = input.clone
-
-			if copy =~ illegal
-				raise ParseException.new( "malformed text: Illegal character #$& in \"#{copy}\"" )
-			end if illegal
-			
-			copy.gsub!( /\r\n?/, "\n" )
-			if copy.include? ?&
-				copy.gsub!( SETUTITSBUS[0], SLAICEPS[0] )
-				copy.gsub!( SETUTITSBUS[1], SLAICEPS[1] )
-				copy.gsub!( SETUTITSBUS[2], SLAICEPS[2] )
-				copy.gsub!( SETUTITSBUS[3], SLAICEPS[3] )
-				copy.gsub!( SETUTITSBUS[4], SLAICEPS[4] )
-				copy.gsub!( /&#0*((?:\d+)|(?:x[a-f0-9]+));/ ) {|m|
-					m=$1
-					#m='0' if m==''
-					m = "0#{m}" if m[0] == ?x
-					[Integer(m)].pack('U*')
-				}
-			end
-			copy
-		end
-
-		EREFERENCE = /&(?!#{Entity::NAME};)/
-		# Escapes all possible entities
-		def Text::normalize( input, doctype=nil, entity_filter=nil )
-			copy = input.clone
-			# Doing it like this rather than in a loop improves the speed
-			if doctype
-				copy.gsub!( EREFERENCE, '&amp;' )
-				doctype.entities.each_value do |entity|
-					copy.gsub!( entity.value, 
-						"&#{entity.name};" ) if entity.value and 
-							not( entity_filter and entity_filter.include?(entity) )
-				end
-			else
-				copy.gsub!( EREFERENCE, '&amp;' )
-				DocType::DEFAULT_ENTITIES.each_value do |entity|
-					copy.gsub!(entity.value, "&#{entity.name};" )
-				end
-			end
-			copy
-		end
-
-		# Unescapes all possible entities
-		def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
-			rv = string.clone
-			rv.gsub!( /\r\n?/, "\n" )
-			matches = rv.scan(REFERENCE)
-			return rv if matches.size == 0
-			rv.gsub!( NUMERICENTITY ) {|m|
-				m=$1
-				m = "0#{m}" if m[0] == ?x
-				[Integer(m)].pack('U*')
-			}
-			matches.collect!{|x|x[0]}.compact!
-			if matches.size > 0
-				if doctype
-					matches.each do |entity_reference|
-						unless filter and filter.include?(entity_reference)
-							entity_value = doctype.entity( entity_reference )
-							re = /&#{entity_reference};/
-							rv.gsub!( re, entity_value ) if entity_value
-						end
-					end
-				else
-					matches.each do |entity_reference|
-						unless filter and filter.include?(entity_reference)
-							entity_value = DocType::DEFAULT_ENTITIES[ entity_reference ]
-							re = /&#{entity_reference};/
-							rv.gsub!( re, entity_value.value ) if entity_value
-						end
-					end
-				end
-				rv.gsub!( /&amp;/, '&' )
-			end
-			rv
-		end
-	end
-end
diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb
deleted file mode 100644
index 6a6cc31a53..0000000000
--- a/lib/rexml/xmldecl.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-require 'rexml/encoding'
-require 'rexml/source'
-
-module REXML
-	# NEEDS DOCUMENTATION
-	class XMLDecl < Child
-		include Encoding
-
-		DEFAULT_VERSION = "1.0";
-		DEFAULT_ENCODING = "UTF-8";
-		DEFAULT_STANDALONE = "no";
-		START = '<\?xml';
-		STOP = '\?>';
-
-		attr_accessor :version, :standalone
-
-		def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
-			@encoding_set = !encoding.nil?
-			if version.kind_of? XMLDecl
-				super()
-				@version = version.version
-				self.encoding = version.encoding
-				@standalone = version.standalone
-			else
-				super()
-				@version = version
-				self.encoding = encoding
-				@standalone = standalone
-			end
-			@version = DEFAULT_VERSION if @version.nil?
-		end
-
-		def clone
-			XMLDecl.new(self)
-		end
-
-		def write writer, indent=-1, transitive=false, ie_hack=false
-			indent( writer, indent )
-			writer << START.sub(/\\/u, '')
-			writer << " #{content}"
-			writer << STOP.sub(/\\/u, '')
-		end
-
-		def ==( other )
-		  other.kind_of?(XMLDecl) and
-		  other.version == @version and
-		  other.encoding == self.encoding and
-		  other.standalone == @standalone
-		end
-
-		def xmldecl version, encoding, standalone
-			@version = version
-			@encoding_set = !encoding.nil?
-			self.encoding = encoding
-			@standalone = standalone
-		end
-
-		def node_type
-			:xmldecl
-		end
-
-		alias :stand_alone? :standalone
-
-		private
-		def content
-			rv = "version='#@version'"
-			rv << " encoding='#{encoding}'" if @encoding_set
-			rv << " standalone='#@standalone'" if @standalone
-			rv
-		end
-	end
-end
diff --git a/lib/rexml/xmltokens.rb b/lib/rexml/xmltokens.rb
deleted file mode 100644
index 6bbe5b07d5..0000000000
--- a/lib/rexml/xmltokens.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module REXML
-	# Defines a number of tokens used for parsing XML.  Not for general
-	# consumption.
-	module XMLTokens
-		NCNAME_STR= '[\w:][\-\w\d.]*'
-		NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
-
-		NAMECHAR = '[\-\w\d\.:]'
-		NAME = "([\\w:]#{NAMECHAR}*)"
-		NMTOKEN = "(?:#{NAMECHAR})+"
-		NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
-		REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
-
-		#REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})"
-		#ENTITYREF = "&#{NAME};"
-		#CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;"
-	end
-end
diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb
deleted file mode 100644
index c9c216fe27..0000000000
--- a/lib/rexml/xpath.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'rexml/functions'
-require 'rexml/xpath_parser'
-
-module REXML
-	# Wrapper class.  Use this class to access the XPath functions.
-	class XPath
-		include Functions
-		EMPTY_HASH = {}
-
-		# Finds and returns the first node that matches the supplied xpath.
-		# element::
-		# 	The context element
-		# path::
-		# 	The xpath to search for.  If not supplied or nil, returns the first
-		# 	node matching '*'.
-		# namespaces::
-		# 	If supplied, a Hash which defines a namespace mapping.
-		#
-		#  XPath.first( node )
-		#  XPath.first( doc, "//b"} )
-		#  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
-		def XPath::first element, path=nil, namespaces={}, variables={}
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path, element)[0]
-		end
-
-		# Itterates over nodes that match the given path, calling the supplied
-		# block with the match.
-		# element::
-		#   The context element
-		# path::
-		#   The xpath to search for.  If not supplied or nil, defaults to '*'
-		# namespaces::
-		# 	If supplied, a Hash which defines a namespace mapping
-		#
-		#  XPath.each( node ) { |el| ... }
-		#  XPath.each( node, '/*[@attr='v']' ) { |el| ... }
-		#  XPath.each( node, 'ancestor::x' ) { |el| ... }
-		def XPath::each element, path=nil, namespaces={}, variables={}, &block
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path, element).each( &block )
-		end
-
-		# Returns an array of nodes matching a given XPath.  
-		def XPath::match element, path=nil, namespaces={}, variables={}
-			parser = XPathParser.new
-			parser.namespaces = namespaces
-			parser.variables = variables
-			path = "*" unless path
-			element = [element] unless element.kind_of? Array
-			parser.parse(path,element)
-		end
-	end
-end
diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
deleted file mode 100644
index 9cd1e5d64c..0000000000
--- a/lib/rexml/xpath_parser.rb
+++ /dev/null
@@ -1,523 +0,0 @@
-require 'rexml/namespace'
-require 'rexml/xmltokens'
-require 'rexml/parsers/xpathparser'
-
-module REXML
-	# You don't want to use this class.  Really.  Use XPath, which is a wrapper
-	# for this class.  Believe me.  You don't want to poke around in here.
-	# There is strange, dark magic at work in this code.  Beware.  Go back!  Go
-	# back while you still can!
-	class XPathParser
-		include XMLTokens
-		LITERAL		= /^'([^']*)'|^"([^"]*)"/u
-
-		def initialize( )
-			@parser = REXML::Parsers::XPathParser.new
-			@namespaces = {}
-			@variables = {}
-		end
-
-		def namespaces=( namespaces={} )
-			Functions::namespace_context = namespaces
-			@namespaces = namespaces
-		end
-
-		def variables=( vars={} )
-			Functions::variables = vars
-			@variables = vars
-		end
-
-		def parse path, nodeset
-			path_stack = @parser.parse( path )
-			#puts "PARSE: #{path} => #{path_stack.inspect}"
-			match( path_stack, nodeset )
-		end
-
-		def predicate path, nodeset
-			path_stack = @parser.predicate( path )
-			return Predicate( path_stack, nodeset )
-		end
-
-		def []=( variable_name, value )
-			@variables[ variable_name ] = value
-		end
-
-		private
-
-		def match( path_stack, nodeset ) 
-			while ( path_stack.size > 0 and nodeset.size > 0 ) 
-				#puts "PARSE: #{path_stack.inspect} '#{nodeset.collect{|n|n.type}.inspect}'"
-				nodeset = internal_parse( path_stack, nodeset )
-				#puts "NODESET: #{nodeset.size}"
-				#puts "PATH_STACK: #{path_stack.inspect}"
-			end
-			nodeset
-		end
-
-		def internal_parse path_stack, nodeset
-			return nodeset if nodeset.size == 0 or path_stack.size == 0
-			#puts "INTERNAL_PARSE: #{path_stack.inspect}, #{nodeset.collect{|n| n.type}.inspect}"
-			case path_stack.shift
-			when :document
-				return [ nodeset[0].root.parent ]
-
-			when :qname
-				prefix = path_stack.shift
-				name = path_stack.shift
-				#puts "QNAME #{prefix}#{prefix.size>0?':':''}#{name}"
-				n = nodeset.clone
-				ns = @namespaces[prefix]
-				ns = ns ? ns : ''
-				n.delete_if do |node|
-					# FIXME: This DOUBLES the time XPath searches take
-					ns = node.namespace( prefix ) if node.node_type == :element and ns == ''
-					#puts "NODE: '#{node.to_s}'; node.has_name?( #{name.inspect}, #{ns.inspect} ): #{ node.has_name?( name, ns )}; node.namespace() = #{node.namespace().inspect}; node.prefix = #{node.prefix().inspect}" if node.node_type == :element
-					!(node.node_type == :element and node.name == name and node.namespace == ns )
-				end
-				return n
-
-			when :any
-				n = nodeset.clone
-				n.delete_if { |node| node.node_type != :element }
-				return n
-
-			when :self
-				# THIS SPACE LEFT INTENTIONALLY BLANK
-
-			when :processing_instruction
-				target = path_stack.shift
-				n = nodeset.clone
-				n.delete_if do |node|
-					(node.node_type != :processing_instruction) or 
-					( !target.nil? and ( node.target != target ) )
-				end
-				return n
-
-			when :text
-				#puts ":TEXT"
-				n = nodeset.clone
-				n.delete_if do |node|
-					#puts "#{node} :: #{node.node_type}"
-					node.node_type != :text
-				end
-				return n
-
-			when :comment
-				n = nodeset.clone
-				n.delete_if do |node|
-					node.node_type != :comment
-				end
-				return n
-
-			when :node
-				return nodeset
-				#n = nodeset.clone
-				#n.delete_if do |node|
-				#	!node.node?
-				#end
-				#return n
-			
-			# FIXME:  I suspect the following XPath will fail:
-			# /a/*/*[1]
-			when :child
-				#puts "CHILD"
-				new_nodeset = []
-				nt = nil
-				for node in nodeset
-					nt = node.node_type
-					new_nodeset += node.children if nt == :element or nt == :document
-				end
-				#path_stack[0,(path_stack.size-ps_clone.size)] = []
-				return new_nodeset
-
-			when :literal
-				literal = path_stack.shift
-				if literal =~ /^\d+(\.\d+)?$/
-					return ($1 ? literal.to_f : literal.to_i) 
-				end
-				#puts "RETURNING '#{literal}'"
-				return literal
-				
-			when :attribute
-				#puts ":ATTRIBUTE"
-				new_nodeset = []
-				case path_stack.shift
-				when :qname
-					prefix = path_stack.shift
-					name = path_stack.shift
-					for element in nodeset
-						if element.node_type == :element
-							#puts element.name
-							#puts "looking for attribute #{name} in '#{@namespaces[prefix]}'"
-							attr = element.attribute( name, @namespaces[prefix] )
-							#puts ":ATTRIBUTE: attr => #{attr}"
-							new_nodeset << attr if attr
-						end
-					end
-				when :any
-					for element in nodeset
-						if element.node_type == :element
-							attr = element.attributes
-						end
-					end
-				end
-				#puts "RETURNING #{new_nodeset.collect{|n|n.to_s}.inspect}"
-				return new_nodeset
-
-			when :parent
-				return internal_parse( path_stack, nodeset.collect{|n| n.parent}.compact )
-
-			when :ancestor
-				#puts "ANCESTOR"
-				new_nodeset = []
-				for node in nodeset
-					while node.parent
-						node = node.parent
-						new_nodeset << node unless new_nodeset.include? node
-					end
-				end
-				#nodeset = new_nodeset.uniq
-				return new_nodeset
-
-			when :ancestor_or_self
-				new_nodeset = []
-				for node in nodeset
-					if node.node_type == :element
-						new_nodeset << node
-						while ( node.parent )
-							node = node.parent
-							new_nodeset << node unless new_nodeset.includes? node
-						end
-					end
-				end
-				#nodeset = new_nodeset.uniq
-				return new_nodeset
-
-			when :predicate
-				#puts "@"*80
-				#puts "NODESET = #{nodeset.collect{|n|n.to_s}.inspect}"
-				predicate = path_stack.shift
-				new_nodeset = []
-				Functions::size = nodeset.size
-				nodeset.size.times do |index|
-					node = nodeset[index]
-					Functions::node = node
-					Functions::index = index+1
-					#puts "Node #{node} and index=#{index+1}"
-					result = Predicate( predicate, node )
-					#puts "Predicate returned #{result} (#{result.type}) for #{node.type}"
-					if result.kind_of? Numeric
-						#puts "#{result} == #{index} => #{result == index}"
-						new_nodeset << node if result == (index+1)
-					elsif result.instance_of? Array
-						new_nodeset << node if result.size > 0
-					else
-						new_nodeset << node if result
-					end
-				end
-				#puts "Nodeset after predicate #{predicate.inspect} has #{new_nodeset.size} nodes"
-				#puts "NODESET: #{new_nodeset.collect{|n|n.to_s}.inspect}"
-				return new_nodeset
-
-			when :descendant_or_self
-				rv = descendant_or_self( path_stack, nodeset )
-				path_stack.clear
-				return rv
-
-			when :descendant
-				#puts ":DESCENDANT"
-				results = []
-				nt = nil
-				for node in nodeset
-					nt = node.node_type
-					results += internal_parse( path_stack.clone.unshift( :descendant_or_self ),
-						node.children ) if nt == :element or nt == :document
-				end
-				return results
-
-			when :following_sibling
-				results = []
-				for node in nodeset
-					all_siblings = node.parent.children
-					current_index = all_siblings.index( node )
-					following_siblings = all_siblings[ current_index+1 .. -1 ]
-					results += internal_parse( path_stack.clone, following_siblings )
-				end
-				return results
-
-			when :preceding_sibling
-				results = []
-				for node in nodeset
-					all_siblings = node.parent.children
-					current_index = all_siblings.index( node )
-					preceding_siblings = all_siblings[ 0 .. current_index-1 ]
-					results += internal_parse( path_stack.clone, preceding_siblings )
-				end
-				return results
-
-			when :preceding
-				new_nodeset = []
-				for node in nodeset
-					new_nodeset += preceding( node )
-				end
-				return new_nodeset
-
-			when :following
-				new_nodeset = []
-				for node in nodeset
-					new_nodeset += following( node )
-				end
-				return new_nodeset
-
-			when :namespace
-				new_set = []
-				for node in nodeset
-					new_nodeset << node.namespace if node.node_type == :element or node.node_type == :attribute
-				end
-				return new_nodeset
-
-			when :variable
-				var_name = path_stack.shift
-				return @variables[ var_name ]
-
-			end
-			nodeset
-		end
-
-		##########################################################
-		# The next two methods are BAD MOJO!
-		# This is my achilles heel.  If anybody thinks of a better
-		# way of doing this, be my guest.  This really sucks, but 
-		# it took me three days to get it to work at all.
-		# ########################################################
-		
-		def descendant_or_self( path_stack, nodeset )
-			rs = []
-			d_o_s( path_stack, nodeset, rs )
-			#puts "RS = #{rs.collect{|n|n.to_s}.inspect}"
-			rs.flatten.compact
-		end
-
-		def d_o_s( p, ns, r )
-			#puts r.collect{|n|n.to_s}.inspect
-			#puts ns.collect{|n|n.to_s}.inspect
-			nt = nil
-			ns.each_index do |i|
-				n = ns[i]
-				x = match( p.clone, [ n ] )
-				#puts "Got a match on #{p.inspect} for #{ns.collect{|n|n.to_s+"("+n.type.to_s+")"}.inspect}"
-				nt = n.node_type
-				d_o_s( p, n.children, x ) if nt == :element or nt == :document
-				r[i,0] = [x] if x.size > 0
-			end
-		end
-
-    def recurse( nodeset, &block )
-      for node in nodeset
-	      yield node
-        recurse( node, &block ) if node.node_type == :element
-      end
-    end
-
-
-		# Given a predicate, a node, and a context, evaluates to true or false.
-		def Predicate( predicate, node )
-			predicate = predicate.clone
-			#puts "#"*20
-			#puts "Predicate( #{predicate.inspect}, #{node.type} )"
-			results = []
-			case (predicate[0])
-			when :and, :or, :eq, :neq, :lt, :lteq, :gt, :gteq
-				eq = predicate.shift
-				left = Predicate( predicate.shift, node )
-				right = Predicate( predicate.shift, node )
-				return equality_relational_compare( left, eq, right )
-
-			when :div, :mod, :mult, :plus, :minus, :union
-				op = predicate.shift
-				left = Predicate( predicate.shift, node )
-				right = Predicate( predicate.shift, node )
-				left = Functions::number( left )
-				right = Functions::number( right )
-				case op
-				when :div
-					return left.to_f / right.to_f
-				when :mod
-					return left % right
-				when :mult
-					return left * right
-				when :plus
-					return left + right
-				when :minus
-					return left - right
-				when :union
-					return (left | right)
-				end
-
-			when :neg
-				predicate.shift
-				operand = Functions::number(Predicate( predicate, node ))
-				return -operand
-
-			when :not
-				predicate.shift
-				return !Predicate( predicate.shift, node )
-
-			when :function
-				predicate.shift
-				func_name = predicate.shift.tr('-', '_')
-				arguments = predicate.shift
-				#puts "\nFUNCTION: #{func_name}"
-				#puts "ARGUMENTS: #{arguments.inspect} #{node.to_s}"
-				args = arguments.collect { |arg| Predicate( arg, node ) }
-				#puts "FUNCTION: #{func_name}( #{args.collect{|n|n.to_s}.inspect} )"
-				result = Functions.send( func_name, *args )
-				#puts "RESULTS: #{result.inspect}"
-				return result
-
-			else
-				return match( predicate, [ node ] )
-
-			end
-		end
-
-		# Builds a nodeset of all of the following nodes of the supplied node,
-		# in document order
-		def following( node )
-			all_siblings = node.parent.children
-			current_index = all_siblings.index( node )
-			following_siblings = all_siblings[ current_index+1 .. -1 ]
-			following = []
-			recurse( following_siblings ) { |node| following << node }
-			following.shift
-			#puts "following is returning #{puta following}"
-			following
-		end
-
-		# Builds a nodeset of all of the preceding nodes of the supplied node,
-		# in reverse document order
-		def preceding( node )
-			all_siblings = node.parent.children
-			current_index = all_siblings.index( node )
-			preceding_siblings = all_siblings[ 0 .. current_index-1 ]
-
-			preceding_siblings.reverse!
-			preceding = []
-			recurse( preceding_siblings ) { |node| preceding << node }
-			preceding.reverse
-		end
-
-		def equality_relational_compare( set1, op, set2 )
-			#puts "EQ_REL_COMP: #{set1.to_s}, #{op}, #{set2.to_s}"
-			if set1.kind_of? Array and set2.kind_of? Array
-				if set1.size == 1 and set2.size == 1
-					set1 = set1[0]
-					set2 = set2[0]
-				else
-					set1.each do |i1| 
-						i1 = i1.to_s
-						set2.each do |i2| 
-							i2 = i2.to_s
-							return true if compare( i1, op, i2 )
-						end
-					end
-					return false
-				end
-			end
-			#puts "COMPARING VALUES"
-			# If one is nodeset and other is number, compare number to each item
-			# in nodeset s.t. number op number(string(item))
-			# If one is nodeset and other is string, compare string to each item
-			# in nodeset s.t. string op string(item)
-			# If one is nodeset and other is boolean, compare boolean to each item
-			# in nodeset s.t. boolean op boolean(item)
-			if set1.kind_of? Array or set2.kind_of? Array
-				#puts "ISA ARRAY"
-				if set1.kind_of? Array
-					a = set1
-					b = set2.to_s
-				else
-					a = set2
-					b = set1.to_s
-				end
-
-				case b
-				when 'true', 'false'
-					b = Functions::boolean( b )
-					for v in a
-						v = Functions::boolean(v)
-						return true if compare( v, op, b )
-					end
-				when /^\d+(\.\d+)?$/
-					b = Functions::number( b )
-					for v in a
-						v = Functions::number(v)
-						return true if compare( v, op, b )
-					end
-				else
-					b = Functions::string( b )
-					for v in a
-						v = Functions::string(v)
-						return true if compare( v, op, b )
-					end
-				end
-			else
-				# If neither is nodeset,
-				#   If op is = or !=
-				#     If either boolean, convert to boolean
-				#     If either number, convert to number
-				#     Else, convert to string
-				#   Else
-				#     Convert both to numbers and compare
-				s1 = set1.to_s
-				s2 = set2.to_s
-				#puts "EQ_REL_COMP: #{set1}=>#{s1}, #{set2}=>#{s2}"
-				if s1 == 'true' or s1 == 'false' or s2 == 'true' or s2 == 'false'
-					#puts "Functions::boolean(#{set1})=>#{Functions::boolean(set1)}"
-					#puts "Functions::boolean(#{set2})=>#{Functions::boolean(set2)}"
-					set1 = Functions::boolean( set1 )
-					set2 = Functions::boolean( set2 )
-				else
-					if op == :eq or op == :neq
-						if s1 =~ /^\d+(\.\d+)?$/ or s2 =~ /^\d+(\.\d+)?$/
-							set1 = Functions::number( s1 )
-							set2 = Functions::number( s2 )
-						else
-							set1 = Functions::string( set1 )
-							set2 = Functions::string( set2 )
-						end
-					else
-						set1 = Functions::number( set1 )
-						set2 = Functions::number( set2 )
-					end
-				end
-				#puts "EQ_REL_COMP: #{set1} #{op} #{set2}"
-				return compare( set1, op, set2 )
-			end
-			return false
-		end
-
-		def compare a, op, b
-			case op
-			when :eq
-				a == b
-			when :neq
-				a != b
-			when :lt
-				a < b
-			when :lteq
-				a <= b
-			when :gt
-				a > b
-			when :gteq
-				a >= b
-			when :and
-				a and b
-			when :or
-				a or b
-			else
-				false
-			end
-		end
-	end
-end
diff --git a/lib/rinda/rinda.rb b/lib/rinda/rinda.rb
deleted file mode 100644
index 72b0e45cdf..0000000000
--- a/lib/rinda/rinda.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-require 'thread'
-
-module Rinda
-  class RequestCanceledError < ThreadError; end
-  class RequestExpiredError < ThreadError; end
-
-  class Tuple
-    def initialize(ary_or_hash)
-      if Hash === ary_or_hash
-	init_with_hash(ary_or_hash)
-      else
-	init_with_ary(ary_or_hash)
-      end
-    end
-
-    def size
-      @tuple.size
-    end
-
-    def [](k)
-      @tuple[k]
-    end
-
-    def each # FIXME
-      if Hash === @tuple
-	@tuple.each { |k, v| yield(k, v) }
-      else
-	@tuple.each_with_index { |v, k| yield(k, v) }
-      end
-    end
-
-    def value
-      @tuple
-    end
-
-    private
-    def init_with_ary(ary)
-      @tuple_size = ary.size
-      @tuple = Array.new(@tuple_size)
-      @tuple.size.times do |i|
-	@tuple[i] = ary[i]
-      end
-    end
-
-    def init_with_hash(hash)
-      @tuple_size = hash[:size]
-      @tuple = Hash.new
-      hash.each do |k, v|
-	next unless String === k
-	@tuple[k] = v
-      end
-    end
-  end
-
-  class Template < Tuple
-    def match(tuple)
-      return false unless tuple.respond_to?(:size)
-      return false unless tuple.respond_to?(:[])
-      return false if @tuple_size && (@tuple_size != tuple.size)
-      each do |k, v|
-	next if v.nil?
-	return false unless (v === tuple[k] rescue false)
-      end
-      return true
-    end
-    
-    def ===(tuple)
-      match(tuple)
-    end
-  end
-  
-  class DRbObjectTemplate
-    def initialize(uri=nil, ref=nil)
-      @drb_uri = uri
-      @drb_ref = ref
-    end
-    
-    def ===(ro)
-      return true if super(ro)
-      unless @drb_uri.nil?
-	return false unless (@drb_uri === ro.__drburi rescue false)
-      end
-      unless @drb_ref.nil?
-	return false unless (@drb_ref === ro.__drbref rescue false)
-      end
-      true
-    end
-  end
-
-  class TupleSpaceProxy
-    def initialize(ts)
-      @ts = ts
-    end
-    
-    def write(tuple, sec=nil)
-      @ts.write(tuple, sec)
-    end
-    
-    def take(tuple, sec=nil, &block)
-      port = []
-      @ts.move(DRbObject.new(port), tuple, sec, &block)
-      port[0]
-    end
-    
-    def read(tuple, sec=nil)
-      @ts.read(tuple, sec)
-    end
-    
-    def read_all(tuple)
-      @ts.read_all
-    end
-    
-    def notify(ev, tuple, sec=nil)
-      @ts.notify(ev, tuple, sec)
-    end
-  end
-
-  class SimpleRenewer
-    include DRbUndumped
-    def initialize(sec=180)
-      @sec = sec
-    end
-
-    def renew
-      @sec
-    end
-  end
-end
-
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
deleted file mode 100644
index 7152dfb72e..0000000000
--- a/lib/rinda/ring.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# Note: Rinda::Ring API is unstable.
-#
-require 'drb/drb'
-require 'rinda/rinda'
-require 'thread'
-
-module Rinda
-  Ring_PORT = 7647
-  class RingServer
-    include DRbUndumped
-
-    def initialize(ts, port=Ring_PORT)
-      @ts = ts
-      @soc = UDPSocket.open
-      @soc.bind('', port)
-      @w_service = write_service
-      @r_service = reply_service
-    end
-
-    def write_service
-      Thread.new do
-	loop do
-	  msg, addr = @soc.recvfrom(1024)
-	  do_write(msg)
-	end
-      end
-    end
-  
-    def do_write(msg)
-      Thread.new do
-	begin
-	  tuple, sec = Marshal.load(msg)
-	  @ts.write(tuple, sec)
-	rescue
-	end
-      end
-    end
-
-    def reply_service
-      Thread.new do
-	loop do
-	  do_reply
-	end
-      end
-    end
-    
-    def do_reply
-      tuple = @ts.take([:lookup_ring, DRbObject])
-      Thread.new { tuple[1].call(@ts) rescue nil}
-    rescue
-    end
-  end
-
-  class RingFinger
-    @@finger = nil
-    def self.finger
-      unless @@finger 
-	@@finger = self.new
-	@@finger.lookup_ring_any
-      end
-      @@finger
-    end
-
-    def self.primary
-      finger.primary
-    end
-
-    def self.to_a
-      finger.to_a
-    end
-
-    @@broadcast_list = ['<broadcast>', 'localhost']
-    def initialize(broadcast_list=@@broadcast_list, port=Ring_PORT)
-      @broadcast_list = broadcast_list || ['localhost']
-      @port = port
-      @primary = nil
-      @rings = []
-    end
-    attr_accessor :broadcast_list, :port, :primary
-
-    def to_a
-      @rings
-    end
-
-    def each
-      lookup_ring_any unless @primary
-      return unless @primary
-      yield(@primary)
-      @rings.each { |x| yield(x) }
-    end
-
-    def lookup_ring(timeout=5, &block)
-      return lookup_ring_any(timeout) unless block_given?
-
-      msg = Marshal.dump([[:lookup_ring, DRbObject.new(block)], timeout])
-      @broadcast_list.each do |it|
-	soc = UDPSocket.open
-	begin
-	  soc.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
-	  soc.send(msg, 0, it, @port)
-	rescue
-	  nil
-	ensure
-	  soc.close
-	end
-      end
-      sleep(timeout)
-    end
-
-    def lookup_ring_any(timeout=5)
-      queue = Queue.new
-
-      th = Thread.new do
-	self.lookup_ring(timeout) do |ts|
-	  queue.push(ts)
-	end
-	queue.push(nil)
-	while it = queue.pop
-	  @rings.push(it)
-	end
-      end
-      
-      @primary = queue.pop
-      raise('RingNotFound') if @primary.nil?
-      @primary
-    end
-  end
-
-  class RingProvider
-    def initialize(klass, front, desc, renewer = nil)
-      @tuple = [:name, klass, front, desc]
-      @renewer = renewer || Rinda::SimpleRenewer.new
-    end
-
-    def provide
-      ts = Rinda::RingFinger.primary
-      ts.write(@tuple, @renewer)
-    end
-  end
-end
-
-if __FILE__ == $0
-  DRb.start_service
-  case ARGV.shift
-  when 's'
-    require 'rinda/tuplespace'
-    ts = Rinda::TupleSpace.new
-    place = Rinda::RingServer.new(ts)
-    $stdin.gets
-  when 'w'
-    finger = Rinda::RingFinger.new(nil)
-    finger.lookup_ring do |ts|
-      p ts
-      ts.write([:hello, :world])
-    end
-  when 'r'
-    finger = Rinda::RingFinger.new(nil)
-    finger.lookup_ring do |ts|
-      p ts
-      p ts.take([nil, nil])
-    end
-  end
-end
diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb
deleted file mode 100644
index 4bd4a42af5..0000000000
--- a/lib/rinda/tuplespace.rb
+++ /dev/null
@@ -1,356 +0,0 @@
-require 'monitor'
-require 'thread'
-require 'drb/drb'
-require 'rinda/rinda'
-
-module Rinda
-  class TupleEntry
-    include DRbUndumped
-
-    def initialize(ary, sec=nil)
-      @cancel = false
-      @ary = make_tuple(ary)
-      @renewer = nil
-      renew(sec)
-    end
-    attr_accessor :expires
-
-    def cancel
-      @cancel = true
-    end
-
-    def alive?
-      !canceled? && !expired?
-    end
-
-    def value; @ary.value; end
-    def canceled?; @cancel; end
-    def expired?
-      return true unless @expires
-      return false if @expires > Time.now
-      return true if @renewer.nil?
-      renew(@renewer)
-      return true unless @expires
-      return @expires < Time.now
-    end
-
-    def renew(sec_or_renewer)
-      sec, @renewer = get_renewer(sec_or_renewer)
-      @expires = make_expires(sec)
-    end
-    
-    def make_expires(sec=nil)
-      case sec
-      when Numeric
-	Time.now + sec
-      when true
-	Time.at(1)
-      when nil
-	Time.at(2**31-1)
-      end
-    end
-
-    def [](key)
-      @ary[key]
-    end
-
-    def size
-      @ary.size
-    end
-    
-    def make_tuple(ary)
-      Rinda::Tuple.new(ary)
-    end
-    
-    private
-    def get_renewer(it)
-      case it
-      when Numeric, true, nil
-	return it, nil
-      else
-	begin
-	  return it.renew, it
-	rescue Exception
-	  return it, nil
-	end
-      end
-    end
-  end
-
-  class TemplateEntry < TupleEntry
-    def initialize(ary, expires=nil)
-      super(ary, expires)
-      @template = Rinda::Template.new(ary)
-    end
-
-    def match(tuple)
-      @template.match(tuple)
-    end
-
-    def ===(tuple)
-      match(tuple)
-    end
-
-    def make_tuple(ary)
-      Rinda::Template.new(ary)
-    end
-  end
-
-  class WaitTemplateEntry < TemplateEntry
-    def initialize(place, ary, expires=nil)
-      super(ary, expires)
-      @place = place
-      @cond = place.new_cond
-      @found = nil
-    end
-    attr_reader :found
-
-    def cancel
-      super
-      signal
-    end
-
-    def wait
-      @cond.wait
-    end
-    
-    def read(tuple)
-      @found = tuple
-      signal
-    end
-    
-    def signal
-      @place.synchronize do
-	@cond.signal
-      end
-    end
-  end
-
-  class NotifyTemplateEntry < TemplateEntry
-    def initialize(place, event, tuple, expires=nil)
-      ary = [event, Rinda::Template.new(tuple)]
-      super(ary, expires)
-      @queue = Queue.new
-      @done = false
-    end
-    
-    def notify(ev)
-      @queue.push(ev)
-    end
-
-    def pop
-      raise RequestExpiredError if @done
-      it = @queue.pop
-      @done = true if it[0] == 'close'
-      return it
-    end
- 
-    def each
-      while !@done
-        it = pop
-        yield(it)
-      end
-    rescue 
-    ensure
-      cancel
-    end
-  end
-
-  class TupleBag
-    def initialize
-      @hash = {}
-    end
-    
-    def push(ary)
-      size = ary.size
-      @hash[size] ||= []
-      @hash[size].push(ary)
-    end
-    
-    def delete(ary)
-      size = ary.size
-      @hash.fetch(size, []).delete(ary)
-    end
-
-    def find_all(template)
-      @hash.fetch(template.size, []).find_all do |tuple|
-	tuple.alive? && template.match(tuple)
-      end
-    end
-
-    def find(template)
-      @hash.fetch(template.size, []).find do |tuple|
-	tuple.alive? && template.match(tuple)
-      end
-    end
-
-    def find_all_template(tuple)
-      @hash.fetch(tuple.size, []).find_all do |template|
-	template.alive? && template.match(tuple)
-      end
-    end
-
-    def delete_unless_alive
-      deleted = []
-      @hash.keys.each do |size|
-	ary = []
-	@hash[size].each do |tuple|
-	  if tuple.alive?
-	    ary.push(tuple)
-	  else
-	    deleted.push(tuple)
-	  end
-	end
-	@hash[size] = ary
-      end
-      deleted
-    end
-  end
-
-  class TupleSpace
-    include DRbUndumped
-    include MonitorMixin
-    def initialize(timeout=60)
-      super()
-      @bag = TupleBag.new
-      @read_waiter = TupleBag.new
-      @take_waiter = TupleBag.new
-      @notify_waiter = TupleBag.new
-      @timeout = timeout
-      @period = timeout * 2
-      @keeper = keeper
-    end
-
-    def write(tuple, sec=nil)
-      entry = TupleEntry.new(tuple, sec)
-      synchronize do
-	if entry.expired?
-	  @read_waiter.find_all_template(entry).each do |template|
-	    template.read(tuple)
-	  end
-	  notify_event('write', entry.value)
-	  notify_event('delete', entry.value)
-	else
-	  @bag.push(entry)
-	  @read_waiter.find_all_template(entry).each do |template|
-	    template.read(tuple)
-	  end
-	  @take_waiter.find_all_template(entry).each do |template|
-	    template.signal
-	  end
-	  notify_event('write', entry.value)
-	end
-      end
-      entry
-    end
-
-    def take(tuple, sec=nil, &block)
-      move(nil, tuple, sec, &block)
-    end
-
-    def move(port, tuple, sec=nil)
-      template = WaitTemplateEntry.new(self, tuple, sec)
-      yield(template) if block_given?
-      synchronize do
-	entry = @bag.find(template)
-	if entry
-	  port.push(entry.value) if port
-	  @bag.delete(entry)
-	  notify_event('take', entry.value)
-	  return entry.value
-	end
-	return nil if template.expired?
-
-	begin
-	  @take_waiter.push(template)
-	  while true
-	    raise RequestCanceledError if template.canceled?
-	    raise RequestExpiredError if template.expired?
-	    entry = @bag.find(template)
-	    if entry
-	      port.push(entry.value) if port
-	      @bag.delete(entry)
-	      notify_event('take', entry.value)
-	      return entry.value
-	    end
-	    template.wait
-	  end
-	ensure
-	  @take_waiter.delete(template)
-	end
-      end
-    end
-
-    def read(tuple, sec=nil)
-      template = WaitTemplateEntry.new(self, tuple, sec)
-      yield(template) if block_given?
-      synchronize do
-	entry = @bag.find(template)
-	return entry.value if entry
-	return nil if template.expired?
-
-	begin
-	  @read_waiter.push(template)
-	  template.wait
-	  raise RequestCanceledError if template.canceled?
-	  raise RequestExpiredError if template.expired?
-	  return template.found
-	ensure
-	  @read_waiter.delete(template)
-	end
-      end
-    end
-
-    def read_all(tuple)
-      template = WaitTemplateEntry.new(self, tuple, nil)
-      synchronize do
-	entry = @bag.find_all(template)
-	entry.collect do |e|
-	  e.value
-	end
-      end
-    end
-
-    def notify(event, tuple, sec=nil)
-      template = NotifyTemplateEntry.new(self, event, tuple, sec)
-      synchronize do
-	@notify_waiter.push(template)
-      end
-      template
-    end
-    
-    private
-    def keep_clean
-      synchronize do
-	@read_waiter.delete_unless_alive.each do |e|
-	  e.signal
-	end
-	@take_waiter.delete_unless_alive.each do |e|
-	  e.signal
-	end
-	@notify_waiter.delete_unless_alive.each do |e|
-	  e.notify(['close'])
-	end
-	@bag.delete_unless_alive.each do |e|
-	  notify_event('delete', e.value)
-	end
-      end
-    end
-    
-    def notify_event(event, tuple)
-      ev = [event, tuple]
-      @notify_waiter.find_all_template(ev).each do |template|
-	template.notify(ev)
-      end
-    end
-
-    def keeper
-      Thread.new do
-	loop do
-	  sleep(@period)
-	  keep_clean
-	end
-      end
-    end
-  end
-end
diff --git a/lib/rubyunit.rb b/lib/rubyunit.rb
deleted file mode 100644
index 1aca37864f..0000000000
--- a/lib/rubyunit.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'runit/testcase'
-require 'test/unit'
diff --git a/lib/runit/assert.rb b/lib/runit/assert.rb
deleted file mode 100644
index c752b19a25..0000000000
--- a/lib/runit/assert.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/assertions'
-require 'runit/error'
-
-module RUNIT
-  module Assert
-    include Test::Unit::Assertions
-
-    def setup_assert
-    end
-
-    def assert_no_exception(*args, &block)
-      assert_nothing_raised(*args, &block)
-    end
-
-    # To deal with the fact that RubyUnit does not check that the
-    # regular expression is, indeed, a regular expression, if it is
-    # not, we do our own assertion using the same semantics as
-    # RubyUnit
-    def assert_match(actual_string, expected_re, message="")
-      _wrap_assertion {
-        full_message = build_message(message, "Expected <?> to match <?>", actual_string, expected_re)
-        assert_block(full_message) {
-          expected_re =~ actual_string
-        }
-        Regexp.last_match
-      }
-    end
-
-    def assert_not_nil(actual, message="")
-      assert(!actual.nil?, message)
-    end
-
-    def assert_not_match(actual_string, expected_re, message="")
-      assert_no_match(expected_re, actual_string, message)
-    end
-
-    def assert_matches(*args)
-      assert_match(*args)
-    end
-
-    def assert_fail(message="")
-      flunk(message)
-    end
-
-    def assert_equal_float(expected, actual, delta, message="")
-      assert_in_delta(expected, actual, delta, message)
-    end
-
-    def assert_send(object, method, *args)
-      super([object, method, *args])
-    end
-
-    def assert_exception(exception, message="", &block)
-      assert_raises(exception, message, &block)
-    end
-
-    def assert_respond_to(method, object, message="")
-      if (called_internally?)
-        super
-      else
-        super(object, method, message)
-      end
-    end
-
-    def called_internally?
-      /assertions\.rb/.match(caller[1])
-    end
-  end
-end
diff --git a/lib/runit/cui/testrunner.rb b/lib/runit/cui/testrunner.rb
deleted file mode 100644
index 0106b6c859..0000000000
--- a/lib/runit/cui/testrunner.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/ui/console/testrunner'
-require 'runit/testresult'
-
-module RUNIT
-  module CUI
-    class TestRunner < Test::Unit::UI::Console::TestRunner
-      @@quiet_mode = false
-      
-      def self.run(suite)
-        self.new().run(suite)
-      end
-      
-      def initialize
-        super nil
-      end
-      
-      def run(suite, quiet_mode=@@quiet_mode)
-        @suite = suite
-        def @suite.suite
-          self
-        end
-        @output_level = (quiet_mode ? PROGRESS_ONLY : NORMAL)
-        start
-      end
-      
-      def create_mediator(suite)
-        mediator = Test::Unit::UI::TestRunnerMediator.new(suite)
-        class << mediator
-          attr_writer :result_delegate
-          def create_result
-            return @result_delegate.create_result
-          end
-        end
-        mediator.result_delegate = self
-        return mediator
-      end
-      
-      def create_result
-        return RUNIT::TestResult.new
-      end
-      
-      def self.quiet_mode=(boolean)
-        @@quiet_mode = boolean
-      end
-    end
-  end
-end
diff --git a/lib/runit/error.rb b/lib/runit/error.rb
deleted file mode 100644
index 4a727fb02b..0000000000
--- a/lib/runit/error.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/assertionfailederror.rb'
-
-module RUNIT
-  AssertionFailedError = Test::Unit::AssertionFailedError
-end
diff --git a/lib/runit/testcase.rb b/lib/runit/testcase.rb
deleted file mode 100644
index 4576cb8644..0000000000
--- a/lib/runit/testcase.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'runit/testresult'
-require 'runit/testsuite'
-require 'runit/assert'
-require 'runit/error'
-require 'test/unit/testcase'
-
-module RUNIT
-  class TestCase < Test::Unit::TestCase  
-    include RUNIT::Assert
-    
-    def self.suite
-      method_names = instance_methods(true)
-      tests = method_names.delete_if { |method_name| method_name !~ /^test/ }
-      suite = TestSuite.new(name)
-      tests.each {
-        |test|
-        catch(:invalid_test) {
-          suite << new(test, name)
-        }
-      }
-      return suite
-    end
-    
-    def initialize(test_name, suite_name=self.class.name)
-      super(test_name)
-    end
-    
-    def assert_equals(*args)
-      assert_equal(*args)
-    end
-    
-    def name
-      super.sub(/^(.*?)\((.*)\)$/, '\2#\1')
-    end
-    
-    def run(result, &progress_block)
-      progress_block = proc {} unless (block_given?)
-      super(result, &progress_block)
-    end
-  end
-end
diff --git a/lib/runit/testresult.rb b/lib/runit/testresult.rb
deleted file mode 100644
index 7f70778171..0000000000
--- a/lib/runit/testresult.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/testresult'
-
-module RUNIT
-  class TestResult < Test::Unit::TestResult
-    attr_reader(:errors, :failures)
-    def succeed?
-      return passed?
-    end
-    def failure_size
-      return failure_count
-    end
-    def run_asserts
-      return assertion_count
-    end
-    def error_size
-      return error_count
-    end
-    def run_tests
-      return run_count
-    end
-    def add_failure(failure)
-      def failure.at
-        return location
-      end
-      def failure.err
-        return message
-      end
-      super(failure)
-    end
-    def add_error(error)
-      def error.at
-        return location
-      end
-      def error.err
-        return exception
-      end
-      super(error)
-    end
-  end
-end
diff --git a/lib/runit/testsuite.rb b/lib/runit/testsuite.rb
deleted file mode 100644
index 63baf65707..0000000000
--- a/lib/runit/testsuite.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/testsuite'
-
-module RUNIT
-  class TestSuite < Test::Unit::TestSuite
-    def add_test(*args)
-      add(*args)
-    end
-    
-    def add(*args)
-      self.<<(*args)
-    end
-    
-    def count_test_cases
-      return size
-    end
-    
-    def run(result, &progress_block)
-      progress_block = proc {} unless (block_given?)
-      super(result, &progress_block)
-    end
-  end
-end
diff --git a/lib/runit/topublic.rb b/lib/runit/topublic.rb
deleted file mode 100644
index 566f0dd35c..0000000000
--- a/lib/runit/topublic.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-module RUNIT
-  module ToPublic
-  end
-end
diff --git a/lib/scanf.rb b/lib/scanf.rb
deleted file mode 100644
index d518df8fb4..0000000000
--- a/lib/scanf.rb
+++ /dev/null
@@ -1,697 +0,0 @@
-# scanf for Ruby
-#
-# $Release Version: 1.1.2 $
-# $Revision$
-# $Id$
-# $Author$
-# $Date$
-#
-# A product of the Austin Ruby Codefest (Austin, Texas, August 2002)
-
-=begin
-
-=scanf for Ruby
-
-==Description
-
-scanf for Ruby is an implementation of the C function scanf(3),
-modified as necessary for Ruby compatibility.
-
-The methods provided are String#scanf, IO#scanf, and
-Kernel#scanf. Kernel#scanf is a wrapper around STDIN.scanf.  IO#scanf
-can be used on any IO stream, including file handles and sockets.
-scanf can be called either with or without a block.
-
-scanf for Ruby scans an input string or stream according to a
-<b>format</b>, as described below ("Conversions"), and returns an
-array of matches between the format and the input.  The format is
-defined in a string, and is similar (though not identical) to the
-formats used in Kernel#printf and Kernel#sprintf.
-
-The format may contain <b>conversion specifiers</b>, which tell scanf
-what form (type) each particular matched substring should be converted
-to (e.g., decimal integer, floating point number, literal string,
-etc.)  The matches and conversions take place from left to right, and
-the conversions themselves are returned as an array.
-
-The format string may also contain characters other than those in the
-conversion specifiers.  White space (blanks, tabs, or newlines) in the
-format string matches any amount of white space, including none, in
-the input.  Everything else matches only itself.
-
-Scanning stops, and scanf returns, when any input character fails to
-match the specifications in the format string, or when input is
-exhausted, or when everything in the format string has been
-matched. All matches found up to the stopping point are returned in
-the return array (or yielded to the block, if a block was given).
-
-
-==Basic usage
-
-   require 'scanf.rb'
-
-   # String#scanf and IO#scanf take a single argument (a format string)
-   array = aString.scanf("%d%s")
-   array = anIO.scanf("%d%s")
-
-   # Kernel#scanf reads from STDIN
-   array = scanf("%d%s")
-
-==Block usage
-
-When called with a block, scanf keeps scanning the input, cycling back
-to the beginning of the format string, and yields a new array of
-conversions to the block every time the format string is matched
-(including partial matches, but not including complete failures).  The
-actual return value of scanf when called with a block is an array
-containing the results of all the executions of the block. 
-
-   str = "123 abc 456 def 789 ghi"
-   str.scanf("%d%s") { |num,str| [ num * 2, str.upcase ] }
-     # => [[246, "ABC"], [912, "DEF"], [1578, "GHI"]]
-
-==Conversions
-
-The single argument to scanf is a format string, which generally
-includes one or more conversion specifiers. Conversion specifiers
-begin with the percent character ('%') and include information about
-what scanf should next scan for (string, decimal number, single
-character, etc.).
-
-There may be an optional maximum field width, expressed as a decimal
-integer, between the % and the conversion. If no width is given, a
-default of `infinity' is used (with the exception of the %c specifier;
-see below).  Otherwise, given a field width of <em>n</em> for a given
-conversion, at most <em>n</em> characters are scanned in processing
-that conversion.  Before conversion begins, most conversions skip
-white space in the input string; this white space is not counted
-against the field width.
-
-The following conversions are available. (See the files EXAMPLES
-and <tt>tests/scanftests.rb</tt> for examples.)
-
-[%]
-  Matches a literal `%'. That is, `%%' in the format string matches a
-  single input `%' character. No conversion is done, and the resulting
-  '%' is not included in the return array.
-
-[d]
-  Matches an optionally signed decimal integer.
-
-[u]
-  Same as d.
-
-[i] 
-  Matches an optionally signed integer. The integer is read in base
-  16 if it begins with `0x' or `0X', in base 8 if it begins with `0',
-  and in base 10 other- wise. Only characters that correspond to the
-  base are recognized.
-
-[o]
-  Matches an optionally signed octal integer.
-
-[x,X]
-  Matches an optionally signed hexadecimal integer,
-
-[f,g,e,E]
-  Matches an optionally signed floating-point number.
-
-[s]
-  Matches a sequence of non-white-space character. The input string stops at
-  white space or at the maximum field width, whichever occurs first.
-
-[c]
-  Matches a single character, or a sequence of <em>n</em> characters if a
-  field width of <em>n</em> is specified. The usual skip of leading white
-  space is suppressed. To skip white space first, use an explicit space in
-  the format.
-
-[<tt>[</tt>]
-  Matches a nonempty sequence of characters from the specified set
-  of accepted characters.  The usual skip of leading white space is
-  suppressed.  This bracketed sub-expression is interpreted exactly like a
-  character class in a Ruby regular expression.  (In fact, it is placed as-is
-  in a regular expression.)  The matching against the input string ends with
-  the appearance of a character not in (or, with a circumflex, in) the set,
-  or when the field width runs out, whichever comes first.
-
-===Assignment suppression
-
-To require that a particular match occur, but without including the result
-in the return array, place the <b>assignment suppression flag</b>, which is
-the star character ('*'), immediately after the leading '%' of a format
-specifier (just before the field width, if any).
-
-==Examples
-
-See the files <tt>EXAMPLES</tt> and <tt>tests/scanftests.rb</tt>.
-
-==scanf for Ruby compared with scanf in C
-
-scanf for Ruby is based on the C function scanf(3), but with modifications,
-dictated mainly by the underlying differences between the languages.
-
-===Unimplemented flags and specifiers
-
-* The only flag implemented in scanf for Ruby is '<tt>*</tt>' (ignore
-  upcoming conversion). Many of the flags available in C versions of scanf(4)
-  have to do with the type of upcoming pointer arguments, and are literally
-  meaningless in Ruby.
-
-* The <tt>n</tt> specifier (store number of characters consumed so far in
-  next pointer) is not implemented.
-
-* The <tt>p</tt> specifier (match a pointer value) is not implemented.
-
-===Altered specifiers
-
-[o,u,x,X]
-  In scanf for Ruby, all of these specifiers scan for an optionally signed
-  integer, rather than for an unsigned integer like their C counterparts.
-
-===Return values
-
-scanf for Ruby returns an array of successful conversions, whereas
-scanf(3) returns the number of conversions successfully
-completed. (See below for more details on scanf for Ruby's return
-values.)
-
-==Return values
-
-Without a block, scanf returns an array containing all the conversions
-it has found. If none are found, scanf will return an empty array. An
-unsuccesful match is never ignored, but rather always signals the end
-of the scanning operation. If the first unsuccessful match takes place
-after one or more successful matches have already taken place, the
-returned array will contain the results of those successful matches.
-
-With a block scanf returns a 'map'-like array of transformations from
-the block -- that is, an array reflecting what the block did with each
-yielded result from the iterative scanf operation.  (See "Block
-usage", above.)
-
-==Test suite
-
-scanf for Ruby includes a suite of unit tests (requiring the
-<tt>TestUnit</tt> package), which can be run with the command <tt>ruby
-tests/scanftests.rb</tt> or the command <tt>make test</tt>.
-
-==Current limitations and bugs
-
-When using IO#scanf under Windows, make sure you open your files in
-binary mode:
-
-    File.open("filename", "rb")
-
-so that scanf can keep track of characters correctly.
-
-Support for character classes is reasonably complete (since it
-essentially piggy-backs on Ruby's regular expression handling of
-character classes), but users are advised that character class testing
-has not been exhaustive, and that they should exercise some caution
-in using any of the more complex and/or arcane character class
-idioms.
-
-
-==Technical notes
-
-===Rationale behind scanf for Ruby
-
-The impetus for a scanf implementation in Ruby comes chiefly from the fact
-that existing pattern matching operations, such as Regexp#match and
-String#scan, return all results as strings, which have to be converted to
-integers or floats explicitly in cases where what's ultimately wanted are
-integer or float values.
-
-===Design of scanf for Ruby
-
-scanf for Ruby is essentially a <format string>-to-<regular
-expression> converter.
-
-When scanf is called, a FormatString object is generated from the
-format string ("%d%s...") argument. The FormatString object breaks the
-format string down into atoms ("%d", "%5f", "blah", etc.), and from
-each atom it creates a FormatSpecifier object, which it
-saves.
-
-Each FormatSpecifier has a regular expression fragment and a "handler"
-associated with it. For example, the regular expression fragment
-associated with the format "%d" is "([-+]?\d+)", and the handler
-associated with it is a wrapper around String#to_i. scanf itself calls
-FormatString#match, passing in the input string. FormatString#match
-iterates through its FormatSpecifiers; for each one, it matches the
-corresponding regular expression fragment against the string. If
-there's a match, it sends the matched string to the handler associated
-with the FormatSpecifier.
-
-Thus, to follow up the "%d" example: if "123" occurs in the input
-string when a FormatSpecifier consisting of "%d" is reached, the "123"
-will be matched against "([-+]?\d+)", and the matched string will be
-rendered into an integer by a call to to_i.
-
-The rendered match is then saved to an accumulator array, and the
-input string is reduced to the post-match substring. Thus the string
-is "eaten" from the left as the FormatSpecifiers are applied in
-sequence.  (This is done to a duplicate string; the original string is
-not altered.)
-
-As soon as a regular expression fragment fails to match the string, or
-when the FormatString object runs out of FormatSpecifiers, scanning
-stops and results accumulated so far are returned in an array.
-
-==License and copyright
-
-Copyright:: (c) 2002-2003 David Alan Black
-License:: Distributed on the same licensing terms as Ruby itself
-
-==Warranty disclaimer
-
-This software is provided "as is" and without any express or implied
-warranties, including, without limitation, the implied warranties of
-merchantibility and fitness for a particular purpose.
-
-==Credits and acknowledgements
-
-scanf for Ruby was developed as the major activity of the Austin
-Ruby Codefest (Austin, Texas, August 2002).
-
-Principal author:: David Alan Black (mailto:dblack@superlink.net)
-Co-author:: Hal Fulton (mailto:hal9000@hypermetrics.com)
-Project contributors:: Nolan Darilek, Jason Johnston
-
-Thanks to Hal Fulton for hosting the Codefest.
-
-Thanks to Matz for suggestions about the class design.  
-
-Thanks to Gavin Sinclair for some feedback on the documentation.
-
-The text for parts of this document, especially the Description and
-Conversions sections, above, were adapted from the Linux Programmer's
-Manual manpage for scanf(3), dated 1995-11-01.
-
-==Bugs and bug reports
-
-scanf for Ruby is based on something of an amalgam of C scanf
-implementations and documentation, rather than on a single canonical
-description. Suggestions for features and behaviors which appear in
-other scanfs, and would be meaningful in Ruby, are welcome, as are
-reports of suspicious behaviors and/or bugs. (Please see "Credits and
-acknowledgements", above, for email addresses.)
-
-=end
-
-module Scanf
-
-  class FormatSpecifier
-
-    attr_reader :re_string, :matched_string, :conversion, :matched
-
-    private
-
-    def skip;  /^\s*%\*/.match(@spec_string); end
-
-    def extract_float(s); s.to_f if s &&! skip; end
-    def extract_decimal(s); s.to_i if s &&! skip; end
-    def extract_hex(s); s.hex if s &&! skip; end
-    def extract_octal(s); s.oct if s &&! skip; end
-    def extract_integer(s); Integer(s) if s &&! skip; end
-    def extract_plain(s); s unless skip; end
-
-    def nil_proc(s); nil; end
-
-    public
-
-    def to_s
-      @spec_string
-    end
-
-    def count_space?
-      /(?:\A|\S)%\*?\d*c|\[/.match(@spec_string)
-    end
-
-    def initialize(str)
-      @spec_string = str
-
-      h = '[A-Fa-f0-9]'
-
-      @re_string, @handler = 
-        case @spec_string
-
-          # %[[:...:]]
-        when /%\*?(\[\[:[a-z]+:\]\])/
-          [ "(#{$1}+)", :extract_plain ]
-
-          # %5[[:...:]]
-        when /%\*?(\d+)(\[\[:[a-z]+:\]\])/
-          [ "(#{$2}{1,#{$1}})", :extract_plain ]
-
-          # %[...]
-        when /%\*?\[([^\]]*)\]/
-          yes = $1
-          if /^\^/.match(yes) then no = yes[1..-1] else no = '^' + yes end
-          [ "([#{yes}]+)(?=[#{no}]|\\z)", :extract_plain ]
-
-          # %5[...]
-        when /%\*?(\d+)\[([^\]]*)\]/
-          yes = $2
-          w = $1
-          [ "([#{yes}]{1,#{w}})", :extract_plain ]
-
-          # %i
-        when /%\*?i/
-          [ "([-+]?(?:(?:0[0-7]+)|(?:0[Xx]#{h}+)|(?:[1-9]\\d+)))", :extract_integer ]
-
-          # %5i
-        when /%\*?(\d+)i/
-          n = $1.to_i
-          s = "("
-          if n > 1 then s += "[1-9]\\d{1,#{n-1}}|" end
-          if n > 1 then s += "0[0-7]{1,#{n-1}}|" end
-          if n > 2 then s += "[-+]0[0-7]{1,#{n-2}}|" end
-          if n > 2 then s += "[-+][1-9]\\d{1,#{n-2}}|" end
-          if n > 2 then s += "0[Xx]#{h}{1,#{n-2}}|" end
-          if n > 3 then s += "[-+]0[Xx]#{h}{1,#{n-3}}|" end
-          s += "\\d"
-          s += ")"
-          [ s, :extract_integer ]
-
-          # %d, %u
-        when /%\*?[du]/
-          [ '([-+]?\d+)', :extract_decimal ]
-
-          # %5d, %5u
-        when /%\*?(\d+)[du]/
-          n = $1.to_i
-          s = "("
-          if n > 1 then s += "[-+]\\d{1,#{n-1}}|" end
-          s += "\\d{1,#{$1}})"
-          [ s, :extract_decimal ]
-
-          # %x
-        when /%\*?[Xx]/
-          [ "([-+]?(?:0[Xx])?#{h}+)", :extract_hex ]
-
-          # %5x
-        when /%\*?(\d+)[Xx]/
-          n = $1.to_i
-          s = "("
-          if n > 3 then s += "[-+]0[Xx]#{h}{1,#{n-3}}|" end
-          if n > 2 then s += "0[Xx]#{h}{1,#{n-2}}|" end
-          if n > 1 then s += "[-+]#{h}{1,#{n-1}}|" end
-          s += "#{h}{1,#{n}}"
-          s += ")"
-          [ s, :extract_hex ]
-
-          # %o
-        when /%\*?o/
-          [ '([-+]?[0-7]+)', :extract_octal ]
-
-          # %5o
-        when /%\*?(\d+)o/
-          [ "([-+][0-7]{1,#{$1.to_i-1}}|[0-7]{1,#{$1}})", :extract_octal ]
-
-          # %f
-        when /%\*?f/
-          [ '([-+]?((\d+(?>(?=[^\d.]|$)))|(\d*(\.(\d*([eE][-+]?\d+)?)))))', :extract_float ]
-
-          # %5f
-        when /%\*?(\d+)f/
-          [ "(\\S{1,#{$1}})", :extract_float ]
-
-          # %5s
-        when /%\*?(\d+)s/
-          [ "(\\S{1,#{$1}})", :extract_plain ]
-
-          # %s
-        when /%\*?s/
-          [ '(\S+)', :extract_plain ]
-
-          # %c
-        when /\s%\*?c/
-          [ "\\s*(.)", :extract_plain ]
-
-          # %c
-        when /%\*?c/
-          [ "(.)", :extract_plain ]
-
-          # %5c (whitespace issues are handled by the count_*_space? methods)
-        when /%\*?(\d+)c/
-          [ "(.{1,#{$1}})", :extract_plain ]
-
-          # %%
-        when /%%/
-          [ '(\s*%)', :nil_proc ]
-
-          # literal characters
-        else
-          [ "(#{Regexp.escape(@spec_string)})", :nil_proc ]
-        end
-
-      @re_string = '\A' + @re_string
-    end
-
-    def to_re
-      Regexp.new(@re_string,Regexp::MULTILINE)
-    end
-
-    def match(str)
-      @matched = false
-      s = str.dup
-      s.sub!(/\A\s+/,'') unless count_space?
-      res = to_re.match(s)
-      if res
-        @conversion = send(@handler, res[1])
-        @matched_string = @conversion.to_s
-        @matched = true
-      end
-      res
-    end
-
-    def letter
-      /%\*?\d*([a-z\[])/.match(@spec_string).to_a[1]
-    end
-
-    def width
-      w = /%\*?(\d+)/.match(@spec_string).to_a[1]
-      w && w.to_i
-    end
-
-    def mid_match?
-      return false unless @matched
-      cc_no_width    = letter == '[' &&! width
-      c_or_cc_width  = (letter == 'c' || letter == '[') && width
-      width_left     = c_or_cc_width && (matched_string.size < width)
-
-      return width_left || cc_no_width
-    end
-    
-  end
-
-  class FormatString
-
-    attr_reader :string_left, :last_spec_tried,
-                :last_match_tried, :matched_count, :space
-
-    SPECIFIERS = 'diuXxofeEgsc'
-    REGEX = /
-        # possible space, followed by...
-          (?:\s*
-          # percent sign, followed by...
-            %
-            # another percent sign, or...
-              (?:%|
-        	 # optional assignment suppression flag
-        	 \*?
-        	 # optional maximum field width
-        	 \d*
-        	   # named character class, ...
-        	   (?:\[\[:\w+:\]\]|
-        	   # traditional character class, or...
-        	      \[[^\]]*\]|
-        	   # specifier letter.
-        	      [#{SPECIFIERS}])))|
-            # or miscellaneous characters
-              [^%\s]+/ix
-
-    def initialize(str)
-      @specs = []
-      @i = 1
-      s = str.to_s
-      return unless /\S/.match(s)
-      @space = true if /\s\z/.match(s)
-      @specs.replace s.scan(REGEX).map {|spec| FormatSpecifier.new(spec) }
-    end
-
-    def to_s
-      @spec_string
-    end
-
-    def prune(n=matched_count)
-      n.times { @specs.shift }
-    end
-
-    def spec_count
-      @specs.size
-    end
-
-    def last_spec
-      @i == spec_count - 1
-    end
-
-    def match(str)
-      accum = []
-      @string_left = str
-      @matched_count = 0
-
-      @specs.each_with_index do |spec,@i|
-        @last_spec_tried = spec
-        @last_match_tried = spec.match(@string_left)
-        break unless @last_match_tried
-        @matched_count += 1
-
-        accum << spec.conversion
-
-        @string_left = @last_match_tried.post_match
-        break if @string_left.empty?
-      end
-      return accum.compact
-    end
-  end
-end
-
-class IO
-
-# The trick here is doing a match where you grab one *line*
-# of input at a time.  The linebreak may or may not occur
-# at the boundary where the string matches a format specifier.
-# And if it does, some rule about whitespace may or may not
-# be in effect...
-#
-# That's why this is much more elaborate than the string
-# version.
-#
-# For each line:
-# Match succeeds (non-emptily)
-# and the last attempted spec/string sub-match succeeded:
-#
-#   could the last spec keep matching?
-#     yes: save interim results and continue (next line)
-#
-# The last attempted spec/string did not match:
-#
-# are we on the next-to-last spec in the string?
-#   yes:
-#     is fmt_string.string_left all spaces?
-#       yes: does current spec care about input space?
-#         yes: fatal failure
-#         no: save interim results and continue
-#   no: continue  [this state could be analyzed further]
-#
-#
-  def scanf(str,&b)
-    return block_scanf(str,&b) if b
-    return [] unless str.size > 0
-
-    start_position = pos
-    matched_so_far = 0
-    source_buffer = ""
-    result_buffer = []
-    final_result = []
-
-    fstr = Scanf::FormatString.new(str)
-
-    loop do
-      if eof
-        final_result.concat(result_buffer)
-        break
-      end
-
-      source_buffer << gets
-      current_match = fstr.match(source_buffer)
-
-      spec = fstr.last_spec_tried
-
-      if spec.matched
-        if spec.mid_match?
-          result_buffer.replace(current_match)
-          next
-        end
-      elsif (fstr.matched_count == fstr.spec_count - 1)
-        if /\A\s*\z/.match(fstr.string_left)
-          break if spec.count_space?
-          result_buffer.replace(current_match)
-          next
-        end
-      end
-
-      final_result.concat(current_match)
-
-      matched_so_far += source_buffer.size
-      source_buffer.replace(fstr.string_left)
-      matched_so_far -= source_buffer.size
-      break if fstr.last_spec
-      fstr.prune
-    end
-    
-    seek(start_position + matched_so_far, IO::SEEK_SET) rescue Errno::ESPIPE
-    soak_up_spaces if fstr.last_spec && fstr.space
-    
-    return final_result
-  end
-
-  private
-
-  def soak_up_spaces
-    c = getc
-    ungetc(c) if c
-    until eof ||! c || /\S/.match(c.chr)
-      c = getc
-    end
-    ungetc(c) if c
-  end
-
-  def block_scanf(str)
-    final = []
-    begin
-      current = scanf(str)
-      final.push(yield(current)) unless current.empty?
-    end until current.empty? || eof
-    return final
-  end
-end
-
-class String
-
-  def scanf(fstr,&b)
-    if b
-      block_scanf(fstr,&b)
-    else
-      fs = 
-        if fstr.is_a? Scanf::FormatString
-          fstr 
-        else 
-          Scanf::FormatString.new(fstr)
-        end
-      fs.match(self)
-    end
-  end
-
-  def block_scanf(fstr,&b)
-    fs = Scanf::FormatString.new(fstr)
-    str = self.dup
-    final = []
-    begin
-      current = str.scanf(fs)
-      final.push(yield(current)) unless current.empty?
-      str = fs.string_left
-    end until current.empty? || str.empty?
-    return final
-  end
-end
-
-module Kernel
-  private
-  def scanf(fs)
-    STDIN.scanf(fs)
-  end
-end
diff --git a/lib/set.rb b/lib/set.rb
deleted file mode 100644
index a19a4f3b55..0000000000
--- a/lib/set.rb
+++ /dev/null
@@ -1,1212 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# set.rb - defines the Set class
-#++
-# Copyright (c) 2002 Akinori MUSHA <knu@iDaemons.org>
-#
-# Documentation by Akinori MUSHA and Gavin Sinclair. 
-#
-# All rights reserved.  You can redistribute and/or modify it under the same
-# terms as Ruby.
-#
-#   $Id$
-#
-# == Overview 
-# 
-# This library provides the Set class, which deals with a collection
-# of unordered values with no duplicates.  It is a hybrid of Array's
-# intuitive inter-operation facilities and Hash's fast lookup.  If you
-# need to keep values ordered, use the SortedSet class.
-#
-# The method +to_set+ is added to Enumerable for convenience.
-#
-# See the Set class for an example of usage.
-
-
-#
-# Set implements a collection of unordered values with no duplicates.
-# This is a hybrid of Array's intuitive inter-operation facilities and
-# Hash's fast lookup.
-#
-# Several methods accept any Enumerable object (implementing +each+)
-# for greater flexibility: new, replace, merge, subtract, |, &, -, ^.
-#
-# The equality of each couple of elements is determined according to
-# Object#eql? and Object#hash, since Set uses Hash as storage.
-#
-# Finally, if you are using class Set, you can also use Enumerable#to_set
-# for convenience.
-#
-# == Example
-#
-#   require 'set'
-#   s1 = Set.new [1, 2]                   # -> #<Set: {1, 2}>
-#   s2 = [1, 2].to_set                    # -> #<Set: {1, 2}>
-#   s1 == s2                              # -> true
-#   s1.add("foo")                         # -> #<Set: {1, 2, "foo"}>
-#   s1.merge([2, 6])                      # -> #<Set: {6, 1, 2, "foo"}>
-#   s1.subset? s2                         # -> false
-#   s2.subset? s1                         # -> true
-#
-class Set
-  include Enumerable
-
-  # Creates a new set containing the given objects.
-  def self.[](*ary)
-    new(ary)
-  end
-
-  # Creates a new set containing the elements of the given enumerable
-  # object.
-  #
-  # If a block is given, the elements of enum are preprocessed by the
-  # given block.
-  def initialize(enum = nil, &block) # :yields: o
-    @hash ||= Hash.new
-
-    enum.nil? and return
-
-    if block
-      enum.each { |o| add(block[o]) }
-    else
-      merge(enum)
-    end
-  end
-
-  # Duplicates the set.
-  def dup
-    myhash = @hash
-    self.class.new.instance_eval {
-      @hash.replace(myhash)
-      self
-    }
-  end
-
-  # Returns the number of elements.
-  def size
-    @hash.size
-  end
-  alias length size
-
-  # Returns true if the set contains no elements.
-  def empty?
-    @hash.empty?
-  end
-
-  # Removes all elements and returns self.
-  def clear
-    @hash.clear
-    self
-  end
-
-  # Replaces the contents of the set with the contents of the given
-  # enumerable object and returns self.
-  def replace(enum)
-    if enum.class == self.class
-      @hash.replace(enum.instance_eval { @hash })
-    else
-      enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-      clear
-      enum.each { |o| add(o) }
-    end
-
-    self
-  end
-
-  # Converts the set to an array.  The order of elements is uncertain.
-  def to_a
-    @hash.keys
-  end
-
-  def flatten_merge(set, seen = Set.new)
-    set.each { |e|
-      if e.is_a?(Set)
-	if seen.include?(e_id = e.object_id)
-	  raise ArgumentError, "tried to flatten recursive Set"
-	end
-
-	seen.add(e_id)
-	flatten_merge(e, seen)
-	seen.delete(e_id)
-      else
-	add(e)
-      end
-    }
-
-    self
-  end
-  protected :flatten_merge
-
-  # Returns a new set that is a copy of the set, flattening each
-  # containing set recursively.
-  def flatten
-    self.class.new.flatten_merge(self)
-  end
-
-  # Equivalent to Set#flatten, but replaces the receiver with the
-  # result in place.  Returns nil if no modifications were made.
-  def flatten!
-    if detect { |e| e.is_a?(Set) }
-      replace(flatten())
-    else
-      nil
-    end
-  end
-
-  # Returns true if the set contains the given object.
-  def include?(o)
-    @hash.include?(o)
-  end
-  alias member? include?
-
-  # Returns true if the set is a superset of the given set.
-  def superset?(set)
-    set.is_a?(Set) or raise ArgumentError, "value must be a set"
-    return false if size < set.size
-    set.all? { |o| include?(o) }
-  end
-
-  # Returns true if the set is a proper superset of the given set.
-  def proper_superset?(set)
-    set.is_a?(Set) or raise ArgumentError, "value must be a set"
-    return false if size <= set.size
-    set.all? { |o| include?(o) }
-  end
-
-  # Returns true if the set is a subset of the given set.
-  def subset?(set)
-    set.is_a?(Set) or raise ArgumentError, "value must be a set"
-    return false if set.size < size
-    all? { |o| set.include?(o) }
-  end
-
-  # Returns true if the set is a proper subset of the given set.
-  def proper_subset?(set)
-    set.is_a?(Set) or raise ArgumentError, "value must be a set"
-    return false if set.size <= size
-    all? { |o| set.include?(o) }
-  end
-
-  # Calls the given block once for each element in the set, passing
-  # the element as parameter.
-  def each
-    @hash.each_key { |o| yield(o) }
-    self
-  end
-
-  # Adds the given object to the set and returns self.  Use +merge+ to
-  # add several elements at once.
-  def add(o)
-    @hash[o] = true
-    self
-  end
-  alias << add
-
-  # Adds the given object to the set and returns self.  If the
-  # object is already in the set, returns nil.
-  def add?(o)
-    if include?(o)
-      nil
-    else
-      add(o)
-    end
-  end
-
-  # Deletes the given object from the set and returns self.  Use +subtract+ to
-  # delete several items at once.
-  def delete(o)
-    @hash.delete(o)
-    self
-  end
-
-  # Deletes the given object from the set and returns self.  If the
-  # object is not in the set, returns nil.
-  def delete?(o)
-    if include?(o)
-      delete(o)
-    else
-      nil
-    end
-  end
-
-  # Deletes every element of the set for which block evaluates to
-  # true, and returns self.
-  def delete_if
-    @hash.delete_if { |o,| yield(o) }
-    self
-  end
-
-  # Do collect() destructively.
-  def collect!
-    set = self.class.new
-    each { |o| set << yield(o) }
-    replace(set)
-  end
-  alias map! collect!
-
-  # Equivalent to Set#delete_if, but returns nil if no changes were
-  # made.
-  def reject!
-    n = size
-    delete_if { |o| yield(o) }
-    size == n ? nil : self
-  end
-
-  # Merges the elements of the given enumerable object to the set and
-  # returns self.
-  def merge(enum)
-    if enum.class == self.class
-      @hash.update(enum.instance_eval { @hash })
-    else
-      enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-      enum.each { |o| add(o) }
-    end
-
-    self
-  end
-
-  # Deletes every element that appears in the given enumerable object
-  # and returns self.
-  def subtract(enum)
-    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-    enum.each { |o| delete(o) }
-    self
-  end
-
-  # Returns a new set built by merging the set and the elements of the
-  # given enumerable object.
-  def |(enum)
-    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-    dup.merge(enum)
-  end
-  alias + |		##
-  alias union |		##
-
-  # Returns a new set built by duplicating the set, removing every
-  # element that appears in the given enumerable object.
-  def -(enum)
-    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-    dup.subtract(enum)
-  end
-  alias difference -	##
-
-  # Returns a new array containing elements common to the set and the
-  # given enumerable object.
-  def &(enum)
-    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-    n = self.class.new
-    enum.each { |o| include?(o) and n.add(o) }
-    n
-  end
-  alias intersection &	##
-
-  # Returns a new array containing elements exclusive between the set
-  # and the given enumerable object.  (set ^ enum) is equivalent to
-  # ((set | enum) - (set & enum)).
-  def ^(enum)
-    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-    n = dup
-    enum.each { |o| if n.include?(o) then n.delete(o) else n.add(o) end }
-    n
-  end
-
-  # Returns true if two sets are equal.  The equality of each couple
-  # of elements is defined according to Object#eql?.
-  def ==(set)
-    equal?(set) and return true
-
-    set.is_a?(Set) && size == set.size or return false
-
-    set.all? { |o| include?(o) }
-  end
-
-  def hash	# :nodoc:
-    @hash.hash
-  end
-
-  def eql?(o)	# :nodoc:
-    @hash.hash == o.hash
-  end
-
-  # Classifies the set by the return value of the given block and
-  # returns a hash of {value => set of elements} pairs.  The block is
-  # called once for each element of the set, passing the element as
-  # parameter.
-  #
-  # e.g.:
-  #
-  #   require 'set'
-  #   files = Set.new(Dir.glob("*.rb"))
-  #   hash = files.classify { |f| File.mtime(f).year }
-  #   p hash    # => {2000=>#<Set: {"a.rb", "b.rb"}>,
-  #             #     2001=>#<Set: {"c.rb", "d.rb", "e.rb"}>,
-  #             #     2002=>#<Set: {"f.rb"}>}
-  def classify # :yields: o
-    h = {}
-
-    each { |i|
-      x = yield(i)
-      (h[x] ||= self.class.new).add(i)
-    }
-
-    h
-  end
-
-  # Divides the set into a set of subsets according to the commonality
-  # defined by the given block.
-  #
-  # If the arity of the block is 2, elements o1 and o2 are in common
-  # if block.call(o1, o2) is true.  Otherwise, elements o1 and o2 are
-  # in common if block.call(o1) == block.call(o2).
-  #
-  # e.g.:
-  #
-  #   require 'set'
-  #   numbers = Set[1, 3, 4, 6, 9, 10, 11]
-  #   set = numbers.divide { |i,j| (i - j).abs == 1 }
-  #   p set     # => #<Set: {#<Set: {1}>,
-  #             #            #<Set: {11, 9, 10}>,
-  #             #            #<Set: {3, 4}>,
-  #             #            #<Set: {6}>}>
-  def divide(&func)
-    if func.arity == 2
-      require 'tsort'
-
-      class << dig = {}		# :nodoc:
-	include TSort
-
-	alias tsort_each_node each_key
-	def tsort_each_child(node, &block)
-	  fetch(node).each(&block)
-	end
-      end
-
-      each { |u|
-	dig[u] = a = []
-	each{ |v| func.call(u, v) and a << v }
-      }
-
-      set = Set.new()
-      dig.each_strongly_connected_component { |css|
-	set.add(self.class.new(css))
-      }
-      set
-    else
-      Set.new(classify(&func).values)
-    end
-  end
-
-  InspectKey = :__inspect_key__         # :nodoc:
-
-  # Returns a string containing a human-readable representation of the
-  # set. ("#<Set: {element1, element2, ...}>")
-  def inspect
-    ids = (Thread.current[InspectKey] ||= [])
-
-    if ids.include?(object_id)
-      return sprintf('#<%s: {...}>', self.class.name)
-    end
-
-    begin
-      ids << object_id
-      return sprintf('#<%s: {%s}>', self.class, to_a.inspect[1..-2])
-    ensure
-      ids.pop
-    end
-  end
-
-  def pretty_print(pp)	# :nodoc:
-    pp.text sprintf('#<%s: {', self.class.name)
-    pp.nest(1) {
-      first = true
-      each { |o|
-	if first
-	  first = false
-	else
-	  pp.text ","
-	  pp.breakable
-	end
-	pp.pp o
-      }
-    }
-    pp.text "}>"
-  end
-
-  def pretty_print_cycle(pp)	# :nodoc:
-    pp.text sprintf('#<%s: {%s}>', self.class.name, empty? ? '' : '...')
-  end
-end
-
-# SortedSet implements a set which elements are sorted in order.  See Set.
-class SortedSet < Set
-  @@setup = false
-
-  class << self
-    def [](*ary)	# :nodoc:
-      new(ary)
-    end
-
-    def setup	# :nodoc:
-      @@setup and return
-
-      begin
-	require 'rbtree'
-
-	module_eval %{
-	  def initialize(*args, &block)
-	    @hash = RBTree.new
-	    super
-	  end
-	}
-      rescue LoadError
-	module_eval %{
-	  def initialize(*args, &block)
-	    @keys = nil
-	    super
-	  end
-
-	  def clear
-	    @keys = nil
-	    super
-	  end
-
-	  def replace(enum)
-	    @keys = nil
-	    super
-	  end
-
-	  def add(o)
-	    @keys = nil
-	    @hash[o] = true
-	    self
-	  end
-	  alias << add
-
-	  def delete(o)
-	    @keys = nil
-	    @hash.delete(o)
-	    self
-	  end
-
-	  def delete_if
-	    n = @hash.size
-	    @hash.delete_if { |o,| yield(o) }
-	    @keys = nil if @hash.size != n
-	    self
-	  end
-
-	  def merge(enum)
-	    @keys = nil
-	    super
-	  end
-
-	  def each
-	    to_a.each { |o| yield(o) }
-	  end
-
-	  def to_a
-	    (@keys = @hash.keys).sort! unless @keys
-	    @keys
-	  end
-	}
-      end
-
-      @@setup = true
-    end
-  end
-
-  def initialize(*args, &block)	# :nodoc:
-    SortedSet.setup
-    initialize(*args, &block)
-  end
-end
-
-module Enumerable
-  # Makes a set from the enumerable object with given arguments.
-  def to_set(klass = Set, *args, &block)
-    klass.new(self, *args, &block)
-  end
-end
-
-# =begin
-# == RestricedSet class
-# RestricedSet implements a set with restrictions defined by a given
-# block.
-# 
-# === Super class
-#     Set
-# 
-# === Class Methods
-# --- RestricedSet::new(enum = nil) { |o| ... }
-# --- RestricedSet::new(enum = nil) { |rset, o| ... }
-#     Creates a new restricted set containing the elements of the given
-#     enumerable object.  Restrictions are defined by the given block.
-# 
-#     If the block's arity is 2, it is called with the RestrictedSet
-#     itself and an object to see if the object is allowed to be put in
-#     the set.
-# 
-#     Otherwise, the block is called with an object to see if the object
-#     is allowed to be put in the set.
-# 
-# === Instance Methods
-# --- restriction_proc
-#     Returns the restriction procedure of the set.
-# 
-# =end
-# 
-# class RestricedSet < Set
-#   def initialize(*args, &block)
-#     @proc = block or raise ArgumentError, "missing a block"
-# 
-#     if @proc.arity == 2
-#       instance_eval %{
-# 	def add(o)
-# 	  @hash[o] = true if @proc.call(self, o)
-# 	  self
-# 	end
-# 	alias << add
-# 
-# 	def add?(o)
-# 	  if include?(o) || !@proc.call(self, o)
-# 	    nil
-# 	  else
-# 	    @hash[o] = true
-# 	    self
-# 	  end
-# 	end
-# 
-# 	def replace(enum)
-# 	  enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-# 	  clear
-# 	  enum.each { |o| add(o) }
-# 
-# 	  self
-# 	end
-# 
-# 	def merge(enum)
-# 	  enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
-# 	  enum.each { |o| add(o) }
-# 
-# 	  self
-# 	end
-#       }
-#     else
-#       instance_eval %{
-# 	def add(o)
-# 	  @hash[o] = true if @proc.call(o)
-# 	  self
-# 	end
-# 	alias << add
-# 
-# 	def add?(o)
-# 	  if include?(o) || !@proc.call(o)
-# 	    nil
-# 	  else
-# 	    @hash[o] = true
-# 	    self
-# 	  end
-# 	end
-#       }
-#     end
-# 
-#     super(*args)
-#   end
-# 
-#   def restriction_proc
-#     @proc
-#   end
-# end
-
-if $0 == __FILE__
-  eval DATA.read, nil, $0, __LINE__+4
-end
-
-__END__
-
-require 'test/unit'
-
-class TC_Set < Test::Unit::TestCase
-  def test_aref
-    assert_nothing_raised {
-      Set[]
-      Set[nil]
-      Set[1,2,3]
-    }
-
-    assert_equal(0, Set[].size)
-    assert_equal(1, Set[nil].size)
-    assert_equal(1, Set[[]].size)
-    assert_equal(1, Set[[nil]].size)
-
-    set = Set[2,4,6,4]
-    assert_equal(Set.new([2,4,6]), set)
-  end
-
-  def test_s_new
-    assert_nothing_raised {
-      Set.new()
-      Set.new(nil)
-      Set.new([])
-      Set.new([1,2])
-      Set.new('a'..'c')
-      Set.new('XYZ')
-    }
-    assert_raises(ArgumentError) {
-      Set.new(false)
-    }
-    assert_raises(ArgumentError) {
-      Set.new(1)
-    }
-    assert_raises(ArgumentError) {
-      Set.new(1,2)
-    }
-
-    assert_equal(0, Set.new().size)
-    assert_equal(0, Set.new(nil).size)
-    assert_equal(0, Set.new([]).size)
-    assert_equal(1, Set.new([nil]).size)
-
-    ary = [2,4,6,4]
-    set = Set.new(ary)
-    ary.clear
-    assert_equal(false, set.empty?)
-    assert_equal(3, set.size)
-
-    ary = [1,2,3]
-
-    s = Set.new(ary) { |o| o * 2 }
-    assert_equal([2,4,6], s.sort)
-  end
-
-  def test_dup
-    set1 = Set[1,2]
-    set2 = set1.dup
-
-    assert_not_same(set1, set2)
-
-    assert_equal(set1, set2)
-
-    set1.add(3)
-
-    assert_not_equal(set1, set2)
-  end
-
-  def test_size
-    assert_equal(0, Set[].size)
-    assert_equal(2, Set[1,2].size)
-    assert_equal(2, Set[1,2,1].size)
-  end
-
-  def test_empty?
-    assert_equal(true, Set[].empty?)
-    assert_equal(false, Set[1, 2].empty?)
-  end
-
-  def test_clear
-    set = Set[1,2]
-    ret = set.clear
-
-    assert_same(set, ret)
-    assert_equal(true, set.empty?)
-  end
-
-  def test_replace
-    set = Set[1,2]
-    ret = set.replace('a'..'c')
-
-    assert_same(set, ret)
-    assert_equal(Set['a','b','c'], set)
-  end
-
-  def test_to_a
-    set = Set[1,2,3,2]
-    ary = set.to_a
-
-    assert_equal([1,2,3], ary.sort)
-  end
-
-  def test_flatten
-    # test1
-    set1 = Set[
-      1,
-      Set[
-	5,
-	Set[7,
-	  Set[0]
-	],
-	Set[6,2],
-	1
-      ],
-      3,
-      Set[3,4]
-    ]
-
-    set2 = set1.flatten
-    set3 = Set.new(0..7)
-
-    assert_not_same(set2, set1)
-    assert_equal(set3, set2)
-
-    # test2; destructive
-    orig_set1 = set1
-    set1.flatten!
-
-    assert_same(orig_set1, set1)
-    assert_equal(set3, set1)
-
-    # test3; multiple occurences of a set in an set
-    set1 = Set[1, 2]
-    set2 = Set[set1, Set[set1, 4], 3]
-
-    assert_nothing_raised {
-      set2.flatten!
-    }
-
-    assert_equal(Set.new(1..4), set2)
-
-    # test4; recursion
-    set2 = Set[]
-    set1 = Set[1, set2]
-    set2.add(set1)
-
-    assert_raises(ArgumentError) {
-      set1.flatten!
-    }
-
-    # test5; miscellaneus
-    empty = Set[]
-    set =  Set[Set[empty, "a"],Set[empty, "b"]]
-
-    assert_nothing_raised {
-      set.flatten
-    }
-
-    set1 = empty.merge(Set["no_more", set])
-
-    assert_nil(Set.new(0..31).flatten!)
-
-    x = Set[Set[],Set[1,2]].flatten!
-    y = Set[1,2]
-
-    assert_equal(x, y)
-  end
-
-  def test_include?
-    set = Set[1,2,3]
-
-    assert_equal(true, set.include?(1))
-    assert_equal(true, set.include?(2))
-    assert_equal(true, set.include?(3))
-    assert_equal(false, set.include?(0))
-    assert_equal(false, set.include?(nil))
-
-    set = Set["1",nil,"2",nil,"0","1",false]
-    assert_equal(true, set.include?(nil))
-    assert_equal(true, set.include?(false))
-    assert_equal(true, set.include?("1"))
-    assert_equal(false, set.include?(0))
-    assert_equal(false, set.include?(true))
-  end
-
-  def test_superset?
-    set = Set[1,2,3]
-
-    assert_raises(ArgumentError) {
-      set.superset?()
-    }
-
-    assert_raises(ArgumentError) {
-      set.superset?(2)
-    }
-
-    assert_raises(ArgumentError) {
-      set.superset?([2])
-    }
-
-    assert_equal(true, set.superset?(Set[]))
-    assert_equal(true, set.superset?(Set[1,2]))
-    assert_equal(true, set.superset?(Set[1,2,3]))
-    assert_equal(false, set.superset?(Set[1,2,3,4]))
-    assert_equal(false, set.superset?(Set[1,4]))
-
-    assert_equal(true, Set[].superset?(Set[]))
-  end
-
-  def test_proper_superset?
-    set = Set[1,2,3]
-
-    assert_raises(ArgumentError) {
-      set.proper_superset?()
-    }
-
-    assert_raises(ArgumentError) {
-      set.proper_superset?(2)
-    }
-
-    assert_raises(ArgumentError) {
-      set.proper_superset?([2])
-    }
-
-    assert_equal(true, set.proper_superset?(Set[]))
-    assert_equal(true, set.proper_superset?(Set[1,2]))
-    assert_equal(false, set.proper_superset?(Set[1,2,3]))
-    assert_equal(false, set.proper_superset?(Set[1,2,3,4]))
-    assert_equal(false, set.proper_superset?(Set[1,4]))
-
-    assert_equal(false, Set[].proper_superset?(Set[]))
-  end
-
-  def test_subset?
-    set = Set[1,2,3]
-
-    assert_raises(ArgumentError) {
-      set.subset?()
-    }
-
-    assert_raises(ArgumentError) {
-      set.subset?(2)
-    }
-
-    assert_raises(ArgumentError) {
-      set.subset?([2])
-    }
-
-    assert_equal(true, set.subset?(Set[1,2,3,4]))
-    assert_equal(true, set.subset?(Set[1,2,3]))
-    assert_equal(false, set.subset?(Set[1,2]))
-    assert_equal(false, set.subset?(Set[]))
-
-    assert_equal(true, Set[].subset?(Set[1]))
-    assert_equal(true, Set[].subset?(Set[]))
-  end
-
-  def test_proper_subset?
-    set = Set[1,2,3]
-
-    assert_raises(ArgumentError) {
-      set.proper_subset?()
-    }
-
-    assert_raises(ArgumentError) {
-      set.proper_subset?(2)
-    }
-
-    assert_raises(ArgumentError) {
-      set.proper_subset?([2])
-    }
-
-    assert_equal(true, set.proper_subset?(Set[1,2,3,4]))
-    assert_equal(false, set.proper_subset?(Set[1,2,3]))
-    assert_equal(false, set.proper_subset?(Set[1,2]))
-    assert_equal(false, set.proper_subset?(Set[]))
-
-    assert_equal(false, Set[].proper_subset?(Set[]))
-  end
-
-  def test_each
-    ary = [1,3,5,7,10,20]
-    set = Set.new(ary)
-
-    assert_raises(LocalJumpError) {
-      set.each
-    }
-
-    assert_nothing_raised {
-      set.each { |o|
-	ary.delete(o) or raise "unexpected element: #{o}"
-      }
-
-      ary.empty? or raise "forgotten elements: #{ary.join(', ')}"
-    }
-  end
-
-  def test_add
-    set = Set[1,2,3]
-
-    ret = set.add(2)
-    assert_same(set, ret)
-    assert_equal(Set[1,2,3], set)
-
-    ret = set.add?(2)
-    assert_nil(ret)
-    assert_equal(Set[1,2,3], set)
-
-    ret = set.add(4)
-    assert_same(set, ret)
-    assert_equal(Set[1,2,3,4], set)
-
-    ret = set.add?(5)
-    assert_same(set, ret)
-    assert_equal(Set[1,2,3,4,5], set)
-  end
-
-  def test_delete
-    set = Set[1,2,3]
-
-    ret = set.delete(4)
-    assert_same(set, ret)
-    assert_equal(Set[1,2,3], set)
-
-    ret = set.delete?(4)
-    assert_nil(ret)
-    assert_equal(Set[1,2,3], set)
-
-    ret = set.delete(2)
-    assert_equal(set, ret)
-    assert_equal(Set[1,3], set)
-
-    ret = set.delete?(1)
-    assert_equal(set, ret)
-    assert_equal(Set[3], set)
-  end
-
-  def test_delete_if
-    set = Set.new(1..10)
-    ret = set.delete_if { |i| i > 10 }
-    assert_same(set, ret)
-    assert_equal(Set.new(1..10), set)
-
-    set = Set.new(1..10)
-    ret = set.delete_if { |i| i % 3 == 0 }
-    assert_same(set, ret)
-    assert_equal(Set[1,2,4,5,7,8,10], set)
-  end
-
-  def test_collect!
-    set = Set[1,2,3,'a','b','c',-1..1,2..4]
-
-    ret = set.collect! { |i|
-      case i
-      when Numeric
-	i * 2
-      when String
-	i.upcase
-      else
-	nil
-      end
-    }
-
-    assert_same(set, ret)
-    assert_equal(Set[2,4,6,'A','B','C',nil], set)
-  end
-
-  def test_reject!
-    set = Set.new(1..10)
-
-    ret = set.reject! { |i| i > 10 }
-    assert_nil(ret)
-    assert_equal(Set.new(1..10), set)
-
-    ret = set.reject! { |i| i % 3 == 0 }
-    assert_same(set, ret)
-    assert_equal(Set[1,2,4,5,7,8,10], set)
-  end
-
-  def test_merge
-    set = Set[1,2,3]
-
-    ret = set.merge([2,4,6])
-    assert_same(set, ret)
-    assert_equal(Set[1,2,3,4,6], set)
-  end
-
-  def test_subtract
-    set = Set[1,2,3]
-
-    ret = set.subtract([2,4,6])
-    assert_same(set, ret)
-    assert_equal(Set[1,3], set)
-  end
-
-  def test_plus
-    set = Set[1,2,3]
-
-    ret = set + [2,4,6]
-    assert_not_same(set, ret)
-    assert_equal(Set[1,2,3,4,6], ret)
-  end
-
-  def test_minus
-    set = Set[1,2,3]
-
-    ret = set - [2,4,6]
-    assert_not_same(set, ret)
-    assert_equal(Set[1,3], ret)
-  end
-
-  def test_and
-    set = Set[1,2,3,4]
-
-    ret = set & [2,4,6]
-    assert_not_same(set, ret)
-    assert_equal(Set[2,4], ret)
-  end
-
-  def test_eq
-    set1 = Set[2,3,1]
-    set2 = Set[1,2,3]
-
-    assert_equal(set1, set1)
-    assert_equal(set1, set2)
-    assert_not_equal(Set[1], [1])
-
-    set1 = Class.new(Set)["a", "b"]
-    set2 = Set["a", "b", set1]
-    set1 = set1.add(set1.clone)
-
-    assert_equal(set1, set2)
-    assert_equal(set2, set1)
-    assert_equal(set2, set2.clone)
-    assert_equal(set1.clone, set1)
-  end
-
-  # def test_hash
-  # end
-
-  # def test_eql?
-  # end
-
-  def test_classify
-    set = Set.new(1..10)
-    ret = set.classify { |i| i % 3 }
-
-    assert_equal(3, ret.size)
-    assert_instance_of(Hash, ret)
-    ret.each_value { |value| assert_instance_of(Set, value) }
-    assert_equal(Set[3,6,9], ret[0])
-    assert_equal(Set[1,4,7,10], ret[1])
-    assert_equal(Set[2,5,8], ret[2])
-  end
-
-  def test_divide
-    set = Set.new(1..10)
-    ret = set.divide { |i| i % 3 }
-
-    assert_equal(3, ret.size)
-    n = 0
-    ret.each { |s| n += s.size }
-    assert_equal(set.size, n)
-    assert_equal(set, ret.flatten)
-
-    set = Set[7,10,5,11,1,3,4,9,0]
-    ret = set.divide { |a,b| (a - b).abs == 1 }
-
-    assert_equal(4, ret.size)
-    n = 0
-    ret.each { |s| n += s.size }
-    assert_equal(set.size, n)
-    assert_equal(set, ret.flatten)
-    ret.each { |s|
-      if s.include?(0)
-	assert_equal(Set[0,1], s)
-      elsif s.include?(3)
-	assert_equal(Set[3,4,5], s)
-      elsif s.include?(7)
-	assert_equal(Set[7], s)
-      elsif s.include?(9)
-	assert_equal(Set[9,10,11], s)
-      else
-	raise "unexpected group: #{s.inspect}"
-      end
-    }
-  end
-
-  def test_inspect
-    set1 = Set[1]
-
-    assert_equal('#<Set: {1}>', set1.inspect)
-
-    set2 = Set[Set[0], 1, 2, set1]
-    assert_equal(false, set2.inspect.include?('#<Set: {...}>'))
-
-    set1.add(set2)
-    assert_equal(true, set1.inspect.include?('#<Set: {...}>'))
-  end
-
-  # def test_pretty_print
-  # end
-
-  # def test_pretty_print_cycle
-  # end
-end
-
-class TC_SortedSet < Test::Unit::TestCase
-  def test_sortedset
-    s = SortedSet[4,5,3,1,2]
-
-    assert_equal([1,2,3,4,5], s.to_a)
-
-    prev = nil
-    s.each { |o| assert(prev < o) if prev; prev = o }
-    assert_not_nil(prev)
-
-    s.map! { |o| -2 * o }
-
-    assert_equal([-10,-8,-6,-4,-2], s.to_a)
-
-    prev = nil
-    s.each { |o| assert(prev < o) if prev; prev = o }
-    assert_not_nil(prev)
-
-    s = SortedSet.new([2,1,3]) { |o| o * -2 }
-    assert_equal([-6,-4,-2], s.to_a)
-  end
-end
-
-class TC_Enumerable < Test::Unit::TestCase
-  def test_to_set
-    ary = [2,5,4,3,2,1,3]
-
-    set = ary.to_set
-    assert_instance_of(Set, set)
-    assert_equal([1,2,3,4,5], set.sort)
-
-    set = ary.to_set { |o| o * -2 }
-    assert_instance_of(Set, set)
-    assert_equal([-10,-8,-6,-4,-2], set.sort)
-
-    set = ary.to_set(SortedSet)
-    assert_instance_of(SortedSet, set)
-    assert_equal([1,2,3,4,5], set.to_a)
-
-    set = ary.to_set(SortedSet) { |o| o * -2 }
-    assert_instance_of(SortedSet, set)
-    assert_equal([-10,-8,-6,-4,-2], set.sort)
-  end
-end
-
-# class TC_RestricedSet < Test::Unit::TestCase
-#   def test_s_new
-#     assert_raises(ArgumentError) { RestricedSet.new }
-# 
-#     s = RestricedSet.new([-1,2,3]) { |o| o > 0 }
-#     assert_equal([2,3], s.sort)
-#   end
-# 
-#   def test_restriction_proc
-#     s = RestricedSet.new([-1,2,3]) { |o| o > 0 }
-# 
-#     f = s.restriction_proc
-#     assert_instance_of(Proc, f)
-#     assert(f[1])
-#     assert(!f[0])
-#   end
-# 
-#   def test_replace
-#     s = RestricedSet.new(-3..3) { |o| o > 0 }
-#     assert_equal([1,2,3], s.sort)
-# 
-#     s.replace([-2,0,3,4,5])
-#     assert_equal([3,4,5], s.sort)
-#   end
-# 
-#   def test_merge
-#     s = RestricedSet.new { |o| o > 0 }
-#     s.merge(-5..5)
-#     assert_equal([1,2,3,4,5], s.sort)
-# 
-#     s.merge([10,-10,-8,8])
-#     assert_equal([1,2,3,4,5,8,10], s.sort)
-#   end
-# end
diff --git a/lib/shell.rb b/lib/shell.rb
deleted file mode 100644
index 039f849ef5..0000000000
--- a/lib/shell.rb
+++ /dev/null
@@ -1,269 +0,0 @@
-#
-#   shell.rb - 
-#   	$Release Version: 0.6.0 $
-#   	$Revision: 1.8 $
-#   	$Date: 2001/03/19 09:01:11 $
-#   	by Keiju ISHITSUKA(Nippon Rational Inc.)
-#
-# --
-#
-#   
-#
-
-require "e2mmap"
-require "thread"
-
-require "shell/error"
-require "shell/command-processor"
-require "shell/process-controller"
-
-class Shell
-  @RCS_ID='-$Id: shell.rb,v 1.8 2001/03/19 09:01:11 keiju Exp keiju $-'
-
-  include Error
-  extend Exception2MessageMapper
-
-#  @cascade = true
-  # debug: true -> normal debug
-  # debug: 1    -> eval definition debug
-  # debug: 2    -> detail inspect debug
-  @debug = false
-  @verbose = true
-
-  class << Shell
-    attr :cascade, true
-    attr :debug, true
-    attr :verbose, true
-
-#    alias cascade? cascade
-    alias debug? debug
-    alias verbose? verbose
-    @verbose = true
-
-    def debug=(val)
-      @debug = val
-      @verbose = val if val
-    end
-
-    def cd(path)
-      sh = new
-      sh.cd path
-      sh
-    end
-
-    def default_system_path
-      if @default_system_path
-	@default_system_path
-      else
-	ENV["PATH"].split(":")
-      end
-    end
-
-    def default_system_path=(path)
-      @default_system_path = path
-    end
-
-    def default_record_separator
-      if @default_record_separator
-	@default_record_separator
-      else
-	$/
-      end
-    end
-
-    def default_record_separator=(rs)
-      @default_record_separator = rs
-    end
-  end
-
-  def initialize
-    @cwd = Dir.pwd
-    @dir_stack = []
-    @umask = nil
-
-    @system_path = Shell.default_system_path
-    @record_separator = Shell.default_record_separator
-
-    @command_processor = CommandProcessor.new(self)
-    @process_controller = ProcessController.new(self)
-
-    @verbose = Shell.verbose
-    @debug = Shell.debug
-  end
-
-  attr_reader :system_path
-
-  def system_path=(path)
-    @system_path = path
-    rehash
-  end
-
-  attr :umask, true
-  attr :record_separator, true
-
-  attr :verbose, true
-  attr :debug, true
-
-  def debug=(val)
-    @debug = val
-    @verbose = val if val
-  end
-
-  alias verbose? verbose
-  alias debug? debug
-
-  attr_reader :command_processor
-  attr_reader :process_controller
-
-  def expand_path(path)
-    File.expand_path(path, @cwd)
-  end
-
-  # Most Shell commands are defined via CommandProcessor
-
-  #
-  # Dir related methods
-  #
-  # Shell#cwd/dir/getwd/pwd
-  # Shell#chdir/cd
-  # Shell#pushdir/pushd
-  # Shell#popdir/popd
-  # Shell#mkdir
-  # Shell#rmdir
-
-  attr :cwd
-  alias dir cwd
-  alias getwd cwd
-  alias pwd cwd
-
-  attr :dir_stack
-  alias dirs dir_stack
-
-  # If called as iterator, it restores the current directory when the
-  # block ends.
-  def chdir(path = nil)
-    if iterator?
-      cwd_old = @cwd
-      begin
-	chdir(path)
-	yield
-      ensure
-	chdir(cwd_old)
-      end
-    else
-      path = "~" unless path
-      @cwd = expand_path(path)
-      notify "current dir: #{@cwd}"
-      rehash
-      self
-    end
-  end
-  alias cd chdir
-
-  def pushdir(path = nil)
-    if iterator?
-      pushdir(path)
-      begin
-	yield
-      ensure
-	popdir
-      end
-    elsif path
-      @dir_stack.push @cwd
-      chdir path
-      notify "dir stack: [#{@dir_stack.join ', '}]"
-      self
-    else
-      if pop = @dir_stack.pop
-	@dir_stack.push @cwd
-	chdir pop
-	notify "dir stack: [#{@dir_stack.join ', '}]"
-	self
-      else
-	Shell.Fail DirStackEmpty
-      end
-    end
-  end
-  alias pushd pushdir
-
-  def popdir
-    if pop = @dir_stack.pop
-      chdir pop
-      notify "dir stack: [#{@dir_stack.join ', '}]"
-      self
-    else
-      Shell.Fail DirStackEmpty
-    end
-  end
-  alias popd popdir
-
-
-  #
-  # process management
-  #
-  def jobs
-    @process_controller.jobs
-  end
-
-  def kill(sig, command)
-    @process_controller.kill_job(sig, command)
-  end
-
-  #
-  # command definitions
-  #
-  def Shell.def_system_command(command, path = command)
-    CommandProcessor.def_system_command(command, path)
-  end
-
-  def Shell.undef_system_command(command)
-    CommandProcessor.undef_system_command(command)
-  end
-
-  def Shell.alias_command(ali, command, *opts, &block)
-    CommandProcessor.alias_command(ali, command, *opts, &block)
-  end
-
-  def Shell.unalias_command(ali)
-    CommandProcessor.unalias_command(ali)
-  end
-
-  def Shell.install_system_commands(pre = "sys_")
-    CommandProcessor.install_system_commands(pre)
-  end
-
-  #
-  def inspect
-    if debug.kind_of?(Integer) && debug > 2
-      super
-    else
-      to_s
-    end
-  end
-
-  def self.notify(*opts, &block)
-    Thread.exclusive do
-    if opts[-1].kind_of?(String)
-      yorn = verbose?
-    else
-      yorn = opts.pop
-    end
-    return unless yorn
-
-    _head = true
-    print opts.collect{|mes|
-      mes = mes.dup
-      yield mes if iterator?
-      if _head
-	_head = false
-	"shell: " + mes
-      else
-	"       " + mes
-      end
-    }.join("\n")+"\n"
-    end
-  end
-
-  CommandProcessor.initialize
-  CommandProcessor.run_config
-end
diff --git a/lib/shell/builtin-command.rb b/lib/shell/builtin-command.rb
deleted file mode 100644
index db1adfa48b..0000000000
--- a/lib/shell/builtin-command.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-#   shell/builtin-command.rb - 
-#   	$Release Version: 0.6.0 $
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "shell/filter"
-
-class Shell
-  class BuiltInCommand<Filter
-    def wait?
-      false
-    end
-    def active?
-      true
-    end
-  end
-
-  class Echo < BuiltInCommand
-    def initialize(sh, *strings)
-      super sh
-      @strings = strings
-    end
-    
-    def each(rs = nil)
-      rs =  @shell.record_separator unless rs
-      for str  in @strings
-	yield str + rs
-      end
-    end
-  end
-
-  class Cat < BuiltInCommand
-    def initialize(sh, *filenames)
-      super sh
-      @cat_files = filenames
-    end
-
-    def each(rs = nil)
-      if @cat_files.empty?
-	super
-      else
-	for src in @cat_files
-	  @shell.foreach(src, rs){|l| yield l}
-	end
-      end
-    end
-  end
-
-  class Glob < BuiltInCommand
-    def initialize(sh, pattern)
-      super sh
-
-      @pattern = pattern
-      Thread.critical = true
-      back = Dir.pwd
-      begin
-	Dir.chdir @shell.cwd
-	@files = Dir[pattern]
-      ensure
-	Dir.chdir back
-	Thread.critical = false
-      end
-    end
-
-    def each(rs = nil)
-      rs =  @shell.record_separator unless rs
-      for f  in @files
-	yield f+rs
-      end
-    end
-  end
-
-#   class Sort < Cat
-#     def initialize(sh, *filenames)
-#       super
-#     end
-#
-#     def each(rs = nil)
-#       ary = []
-#       super{|l|	ary.push l}
-#       for l in ary.sort!
-# 	yield l
-#       end
-#     end
-#   end
-
-  class AppendIO < BuiltInCommand
-    def initialize(sh, io, filter)
-      super sh
-      @input = filter
-      @io = io
-    end
-
-    def input=(filter)
-      @input.input=filter
-      for l in @input
-	@io << l
-      end
-    end
-
-  end
-
-  class AppendFile < AppendIO
-    def initialize(sh, to_filename, filter)
-      @file_name = to_filename
-      io = sh.open(to_filename, "a")
-      super(sh, io, filter)
-    end
-
-    def input=(filter)
-      begin
-	super
-      ensure
-	@io.close
-      end
-    end
-  end
-
-  class Tee < BuiltInCommand
-    def initialize(sh, filename)
-      super sh
-      @to_filename = filename
-    end
-
-    def each(rs = nil)
-      to = @shell.open(@to_filename, "w")
-      begin
-	super{|l| to << l; yield l}
-      ensure
-	to.close
-      end
-    end
-  end
-
-  class Concat < BuiltInCommand
-    def initialize(sh, *jobs)
-      super(sh)
-      @jobs = jobs
-    end
-
-    def each(rs = nil)
-      while job = @jobs.shift
-	job.each{|l| yield l}
-      end
-    end
-  end
-end
diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
deleted file mode 100644
index ce5102a9c4..0000000000
--- a/lib/shell/command-processor.rb
+++ /dev/null
@@ -1,584 +0,0 @@
-#
-#   shell/command-controller.rb - 
-#   	$Release Version: 0.6.0 $
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nippon Rational Inc.)
-#
-# --
-#
-#   
-#
-
-require "e2mmap"
-require "ftools"
-require "thread"
-
-require "shell/error"
-require "shell/filter"
-require "shell/system-command"
-require "shell/builtin-command"
-
-class Shell
-  class CommandProcessor
-
-    #
-    # initialize of Shell and related classes.
-    #
-    NoDelegateMethods = ["initialize", "expand_path"]
-    def self.initialize
-
-      install_builtin_commands
-
-      # define CommandProccessor#methods to Shell#methods and Filter#methods
-      for m in CommandProcessor.instance_methods(false) - NoDelegateMethods
-	add_delegate_command_to_shell(m)
-      end
-      
-      def self.method_added(id)
-	add_delegate_command_to_shell(id)
-      end
-    end
-
-    #
-    # include run file.
-    #
-    def self.run_config
-      begin
-	load File.expand_path("~/.rb_shell") if ENV.key?("HOME")
-      rescue LoadError, Errno::ENOENT
-      rescue
-	print "load error: #{rc}\n"
-	print $!.class, ": ", $!, "\n"
-	for err in $@[0, $@.size - 2]
-	  print "\t", err, "\n"
-	end
-      end
-    end
-
-    def initialize(shell)
-      @shell = shell
-      @system_commands = {}
-    end
-
-    #
-    # CommandProcessor#expand_path(path)
-    #	  path:	  String
-    #	  return: String
-    #	returns the absolute path for <path>
-    #
-    def expand_path(path)
-      @shell.expand_path(path)
-    end
-
-    #
-    # File related commands
-    # Shell#foreach
-    # Shell#open
-    # Shell#unlink
-    # Shell#test
-    #
-    # -
-    #	
-    # CommandProcessor#foreach(path, rs)
-    #	  path: String
-    #	  rs:	String - record separator
-    #	  iterator
-    #	Same as:
-    #	  File#foreach (when path is file)
-    #	  Dir#foreach (when path is directory)
-    #	path is relative to pwd
-    #
-    def foreach(path = nil, *rs)
-      path = "." unless path
-      path = expand_path(path)
-
-      if File.directory?(path)
-	Dir.foreach(path){|fn| yield fn}
-      else
-	IO.foreach(path, *rs){|l| yield l}
-      end
-    end
-
-    #
-    # CommandProcessor#open(path, mode)
-    #	  path:	  String
-    #	  mode:	  String
-    #	  return: File or Dir
-    #	Same as:
-    #	  File#open (when path is file)
-    #	  Dir#open  (when path is directory)
-    #	mode has an effect only when path is a file
-    #
-    def open(path, mode)
-      path = expand_path(path)
-      if File.directory?(path)
-	Dir.open(path)
-      else
-	effect_umask do
-	  File.open(path, mode)
-	end
-      end
-    end
-    #  public :open
-
-    #
-    # CommandProcessor#unlink(path)
-    #	same as:
-    #	  Dir#unlink  (when path is directory)
-    #	  File#unlink (when path is file)
-    #
-    def unlink(path)
-      path = expand_path(path)
-      if File.directory?(path)
-	Dir.unlink(path)
-      else
-	IO.unlink(path)
-      end
-    end
-
-    #
-    # CommandProcessor#test(command, file1, file2)
-    # CommandProcessor#[command, file1, file2]
-    #	  command: char or String or Symbol
-    #	  file1:   String
-    #	  file2:   String(optional)
-    #	  return: Boolean
-    #	same as:
-    #	  test()	   (when command is char or length 1 string or sumbol)
-    #	  FileTest.command (others)
-    #	example:
-    #	  sh[?e, "foo"]
-    #	  sh[:e, "foo"]
-    #	  sh["e", "foo"]
-    #	  sh[:exists?, "foo"]
-    #	  sh["exists?", "foo"]
-    #	  
-    def test(command, file1, file2=nil)
-      file1 = expand_path(file1)
-      file2 = expand_path(file2) if file2
-      command = command.id2name if command.kind_of?(Symbol)
-
-      case command
-      when Integer
-	top_level_test(command, file1, file2)
-      when String
-	if command.size == 1
-	  if file2
-	    top_level_test(command, file1, file2)
-	  else
-	    top_level_test(command, file1)
-	  end
-	else
-	  if file2
-	    FileTest.send(command, file1, file2)
-	  else
-	    FileTest.send(command, file1)
-	  end
-	end
-      end
-    end
-    alias [] test
-
-    #
-    # Dir related methods
-    #
-    # Shell#mkdir
-    # Shell#rmdir
-    #
-    #--
-    #
-    # CommandProcessor#mkdir(*path)
-    #	  path: String
-    #	same as Dir.mkdir()
-    #	  
-    def mkdir(*path)
-      for dir in path
-	Dir.mkdir(expand_path(dir))
-      end
-    end
-
-    #
-    # CommandProcessor#rmdir(*path)
-    #	  path: String
-    #	same as Dir.rmdir()
-    #	  
-    def rmdir(*path)
-      for dir in path
-	Dir.rmdir(expand_path(dir))
-      end
-    end
-
-    #
-    # CommandProcessor#system(command, *opts)
-    #	  command: String
-    #	  opts:	   String
-    #	  retuen:  SystemCommand
-    #	Same as system() function
-    #	example:
-    #	  print sh.system("ls", "-l")
-    #	  sh.system("ls", "-l") | sh.head > STDOUT
-    # 
-    def system(command, *opts)
-      SystemCommand.new(@shell, find_system_command(command), *opts)
-    end
-
-    #
-    # ProcessCommand#rehash
-    #	clear command hash table.
-    #
-    def rehash
-      @system_commands = {}
-    end
-
-    #
-    # ProcessCommand#transact
-    #
-    def check_point
-      @shell.process_controller.wait_all_jobs_execution
-    end
-    alias finish_all_jobs check_point
-
-    def transact(&block)
-      begin
-	@shell.instance_eval(&block)
-      ensure
-	check_point
-      end
-    end
-
-    #
-    # internal commands
-    #
-    def out(dev = STDOUT, &block)
-      dev.print transact(&block)
-    end
-
-    def echo(*strings)
-      Echo.new(@shell, *strings)
-    end
-
-    def cat(*filenames)
-      Cat.new(@shell, *filenames)
-    end
-
-    #   def sort(*filenames)
-    #     Sort.new(self, *filenames)
-    #   end
-
-    def glob(pattern)
-      Glob.new(@shell, pattern)
-    end
-
-    def append(to, filter)
-      case to
-      when String
-	AppendFile.new(@shell, to, filter)
-      when IO
-	AppendIO.new(@shell, to, filter)
-      else
-	Shell.Fail CantApplyMethod, "append", to.class
-      end
-    end
-
-    def tee(file)
-      Tee.new(@shell, file)
-    end
-
-    def concat(*jobs)
-      Concat.new(@shell, *jobs)
-    end
-
-    # %pwd, %cwd -> @pwd
-    def notify(*opts, &block)
-      Thread.exclusive do
-	Shell.notify(*opts) {|mes|
-	  yield mes if iterator?
-	
-	  mes.gsub!("%pwd", "#{@cwd}")
-	  mes.gsub!("%cwd", "#{@cwd}")
-	}
-      end
-    end
-
-    #
-    # private functions
-    #
-    def effect_umask
-      if @shell.umask
-	Thread.critical = true
-	save = File.umask
-	begin
-	  yield
-	ensure
-	  File.umask save
-	  Thread.critical = false
-	end
-      else
-	yield
-      end
-    end
-    private :effect_umask
-
-    def find_system_command(command)
-      return command if /^\// =~ command
-      case path = @system_commands[command]
-      when String
-	if exists?(path)
-	  return path
-	else
-	  Shell.Fail CommandNotFound, command
-	end
-      when false
-	Shell.Fail CommandNotFound, command
-      end
-
-      for p in @shell.system_path
-	path = join(p, command)
-	if FileTest.exists?(path)
-	  @system_commands[command] = path
-	  return path
-	end
-      end
-      @system_commands[command] = false
-      Shell.Fail CommandNotFound, command
-    end
-
-    #
-    # CommandProcessor.def_system_command(command, path)
-    #	  command:  String
-    #	  path:	    String
-    #	define 'command()' method as method.
-    #
-    def self.def_system_command(command, path = command)
-      begin
-	eval((d = %Q[def #{command}(*opts)
-     	          SystemCommand.new(@shell, '#{path}', *opts)
-               end]), nil, __FILE__, __LINE__ - 1)
-      rescue SyntaxError
-	Shell.notify "warn: Can't define #{command} path: #{path}." 
-      end
-      Shell.notify "Define #{command} path: #{path}.", Shell.debug?
-      Shell.notify("Definition of #{command}: ", d, 
-	     Shell.debug.kind_of?(Integer) && Shell.debug > 1)
-    end
-
-    def self.undef_system_command(command)
-      command = command.id2name if command.kind_of?(Symbol)
-      remove_method(command)
-      Shell.module_eval{remove_method(command)}
-      Filter.module_eval{remove_method(command)}
-      self
-    end
-
-    # define command alias
-    # ex)
-    # def_alias_command("ls_c", "ls", "-C", "-F")
-    # def_alias_command("ls_c", "ls"){|*opts| ["-C", "-F", *opts]}
-    #
-    @alias_map = {}
-    def self.alias_map
-      @alias_map
-    end
-    def self.alias_command(ali, command, *opts, &block)
-      ali = ali.id2name if ali.kind_of?(Symbol)
-      command = command.id2name if command.kind_of?(Symbol)
-      begin
-	if iterator?
-	  @alias_map[ali.intern] = proc
-
-	  eval((d = %Q[def #{ali}(*opts)
-                          @shell.__send__(:#{command},
-                                          *(CommandProcessor.alias_map[:#{ali}].call *opts))
-	                end]), nil, __FILE__, __LINE__ - 1)
-    
-	else
-           args = opts.collect{|opt| '"' + opt + '"'}.join(",")
-           eval((d = %Q[def #{ali}(*opts)
-                          @shell.__send__(:#{command}, #{args}, *opts)
-                        end]), nil, __FILE__, __LINE__ - 1)
-	end
-      rescue SyntaxError
-	Shell.notify "warn: Can't alias #{ali} command: #{command}." 
-	Shell.notify("Definition of #{ali}: ", d)
-	raise
-      end
-      Shell.notify "Define #{ali} command: #{command}.", Shell.debug?
-      Shell.notify("Definition of #{ali}: ", d, 
-	     Shell.debug.kind_of?(Integer) && Shell.debug > 1)
-      self
-    end
-   
-    def self.unalias_command(ali)
-      ali = ali.id2name if ali.kind_of?(Symbol)
-      @alias_map.delete ali.intern
-      undef_system_command(ali)
-    end
-   
-    #
-    # CommandProcessor.def_builtin_commands(delegation_class, command_specs)
-    #	  delegation_class: Class or Module
-    #	  command_specs: [[command_name, [argument,...]],...]
-    #	     command_name: String
-    #	     arguments:	   String
-    #		FILENAME?? -> expand_path(filename??)
-    #		*FILENAME?? -> filename??.collect{|f|expand_path(f)}.join(", ")
-    #	define command_name(argument,...) as
-    #	    delegation_class.command_name(argument,...)
-    #
-    def self.def_builtin_commands(delegation_class, command_specs)
-      for meth, args in command_specs
-	arg_str = args.collect{|arg| arg.downcase}.join(", ")
-	call_arg_str = args.collect{
-	  |arg|
-	  case arg
-	  when /^(FILENAME.*)$/
-	    format("expand_path(%s)", $1.downcase)
-	  when /^(\*FILENAME.*)$/
-	    # \*FILENAME* -> filenames.collect{|fn| expand_path(fn)}.join(", ")
-	    $1.downcase + '.collect{|fn| expand_path(fn)}'
-	  else
-	    arg
-	  end
-	}.join(", ")
-	d = %Q[def #{meth}(#{arg_str})
-		    #{delegation_class}.#{meth}(#{call_arg_str})
-		 end]
-	Shell.notify "Define #{meth}(#{arg_str})", Shell.debug?
-	Shell.notify("Definition of #{meth}: ", d, 
-	     Shell.debug.kind_of?(Integer) && Shell.debug > 1)
-	eval d
-      end
-    end
-
-    #
-    # CommandProcessor.install_system_commands(pre)
-    #	    pre: String - command name prefix
-    # defines every command which belongs in default_system_path via
-    # CommandProcessor.command().  It doesn't define already defined
-    # methods twice.  By default, "pre_" is prefixes to each method
-    # name.  Characters that may not be used in a method name are
-    # all converted to '_'.  Definition errors are just ignored.
-    #
-    def self.install_system_commands(pre = "sys_")
-      defined_meth = {}
-      for m in Shell.methods
-	defined_meth[m] = true
-      end
-      sh = Shell.new
-      for path in Shell.default_system_path
-	next unless sh.directory? path
-	sh.cd path
-	sh.foreach do
-	  |cn|
-	  if !defined_meth[pre + cn] && sh.file?(cn) && sh.executable?(cn)
-	    command = (pre + cn).gsub(/\W/, "_").sub(/^([0-9])/, '_\1')
-	    begin
-	      def_system_command(command, sh.expand_path(cn))
-	    rescue
-	      Shell.notify "warn: Can't define #{command} path: #{cn}"
-	    end
-	    defined_meth[command] = command
-	  end
-	end
-      end
-    end
-
-    #----------------------------------------------------------------------
-    #
-    #  class initializing methods  - 
-    #
-    #----------------------------------------------------------------------
-    def self.add_delegate_command_to_shell(id)
-      id = id.intern if id.kind_of?(String)
-      name = id.id2name
-      if Shell.method_defined?(id)
-	Shell.notify "warn: override definnition of Shell##{name}."
-	Shell.notify "warn: alias Shell##{name} to Shell##{name}_org.\n"
-	Shell.module_eval "alias #{name}_org #{name}"
-      end
-      Shell.notify "method added: Shell##{name}.", Shell.debug?
-      Shell.module_eval(%Q[def #{name}(*args, &block)
-			    begin
-			      @command_processor.__send__(:#{name}, *args, &block)
-			    rescue Exception
-			      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
-	                      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
-			    raise
-			    end
-                          end], __FILE__, __LINE__)
-
-      if Shell::Filter.method_defined?(id)
-	Shell.notify "warn: override definnition of Shell::Filter##{name}."
-	Shell.notify "warn: alias Shell##{name} to Shell::Filter##{name}_org."
-	Filter.module_eval "alias #{name}_org #{name}"
-      end
-      Shell.notify "method added: Shell::Filter##{name}.", Shell.debug?
-      Filter.module_eval(%Q[def #{name}(*args, &block)
-			    begin
-			      self | @shell.__send__(:#{name}, *args, &block)
-			    rescue Exception
-			      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
-	                      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
-			    raise
-			    end
-                          end], __FILE__, __LINE__)
-    end
-
-    #
-    # define default builtin commands
-    #
-    def self.install_builtin_commands
-      # method related File.
-      #	(exclude open/foreach/unlink)
-      normal_delegation_file_methods = [
-	["atime", ["FILENAME"]],
-	["basename", ["fn", "*opts"]],
-	["chmod", ["mode", "*FILENAMES"]], 
-	["chown", ["owner", "group", "*FILENAME"]],
-	["ctime", ["FILENAMES"]],
-	["delete", ["*FILENAMES"]],
-	["dirname", ["FILENAME"]],
-	["ftype", ["FILENAME"]],
-	["join", ["*items"]],
-	["link", ["FILENAME_O", "FILENAME_N"]],
-	["lstat", ["FILENAME"]],
-	["mtime", ["FILENAME"]],
-	["readlink", ["FILENAME"]],
-	["rename", ["FILENAME_FROM", "FILENAME_TO"]],
-	#      ["size", ["FILENAME"]],
-	["split", ["pathname"]],
-	["stat", ["FILENAME"]],
-	["symlink", ["FILENAME_O", "FILENAME_N"]],
-	["truncate", ["FILENAME", "length"]],
-	["utime", ["atime", "mtime", "*FILENAMES"]]]
-
-      def_builtin_commands(File, normal_delegation_file_methods)
-      alias_method :rm, :delete
-
-      # method related FileTest
-      def_builtin_commands(FileTest, 
-		   FileTest.singleton_methods(false).collect{|m| [m, ["FILENAME"]]})
-
-      # method related ftools
-      normal_delegation_ftools_methods = [
-	["syscopy", ["FILENAME_FROM", "FILENAME_TO"]],
-	["copy", ["FILENAME_FROM", "FILENAME_TO"]],
-	["move", ["FILENAME_FROM", "FILENAME_TO"]],
-	["compare", ["FILENAME_FROM", "FILENAME_TO"]],
-	["safe_unlink", ["*FILENAMES"]],
-	["makedirs", ["*FILENAMES"]],
-	#    ["chmod", ["mode", "*FILENAMES"]],
-	["install", ["FILENAME_FROM", "FILENAME_TO", "mode"]],
-      ]
-      def_builtin_commands(File,
-		   normal_delegation_ftools_methods)
-      alias_method :cmp, :compare
-      alias_method :mv, :move
-      alias_method :cp, :copy
-      alias_method :rm_f, :safe_unlink
-      alias_method :mkpath, :makedirs
-    end
-
-  end
-end
diff --git a/lib/shell/error.rb b/lib/shell/error.rb
deleted file mode 100644
index d338b1c5d1..0000000000
--- a/lib/shell/error.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#   shell/error.rb - 
-#   	$Release Version: 0.6.0 $
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "e2mmap"
-
-class Shell
-  module Error
-    extend Exception2MessageMapper
-    def_e2message TypeError, "wrong argument type %s (expected %s)"
-
-    def_exception :DirStackEmpty, "Directory stack empty."
-    def_exception :CantDefine, "Can't define method(%s, %s)."
-    def_exception :CantApplyMethod, "This method(%s) does not apply to this type(%s)."
-    def_exception :CommandNotFound, "Command not found(%s)."
-  end
-end
-
diff --git a/lib/shell/filter.rb b/lib/shell/filter.rb
deleted file mode 100644
index 4cf793a3b3..0000000000
--- a/lib/shell/filter.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-#   shell/filter.rb - 
-#   	$Release Version: 0.6.0 $
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-class Shell
-  #
-  # Filter
-  # A method to require
-  #    each()
-  #
-  class Filter
-    include Enumerable
-    include Error
-
-    def initialize(sh)
-      @shell = sh	  # parent shell
-      @input = nil	  # input filter
-    end
-
-    attr_reader :input
-
-    def input=(filter)
-      @input = filter
-    end
-    
-    def each(rs = nil)
-      rs = @shell.record_separator unless rs
-      if @input
-	@input.each(rs){|l| yield l}
-      end
-    end
-
-    def < (src)
-      case src
-      when String
-	cat = Cat.new(@shell, src)
-	cat | self
-      when IO
-	self.input = src
-	self
-      else
-	Filter.Fail CantApplyMethod, "<", to.class
-      end
-    end
-
-    def > (to)
-      case to
-      when String
-	dst = @shell.open(to, "w")
-	begin
-	  each(){|l| dst << l}
-	ensure
-	  dst.close
-	end
-      when IO
-	each(){|l| to << l}
-      else
-	Filter.Fail CantApplyMethod, ">", to.class
-      end
-      self
-    end
-
-    def >> (to)
-      begin
-	Shell.cd(@shell.pwd).append(to, self)
-      rescue CantApplyMethod
-	Shell.Fail CantApplyMethod, ">>", to.class
-      end
-    end
-
-    def | (filter)
-      filter.input = self
-      if active?
-	@shell.process_controller.start_job filter
-      end
-      filter
-    end
-
-    def + (filter)
-      Join.new(@shell, self, filter)
-    end
-
-    def to_a
-      ary = []
-      each(){|l| ary.push l}
-      ary
-    end
-
-    def to_s
-      str = ""
-      each(){|l| str.concat l}
-      str
-    end
-
-    def inspect
-      if @shell.debug.kind_of?(Integer) && @shell.debug > 2
-	super
-      else
-	to_s
-      end
-    end
-  end
-end
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
deleted file mode 100644
index f74abfd686..0000000000
--- a/lib/shell/process-controller.rb
+++ /dev/null
@@ -1,258 +0,0 @@
-#
-#   shell/process-controller.rb - 
-#   	$Release Version: 0.6.0 $
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "mutex_m"
-require "monitor"
-require "sync"
-
-class Shell
-  class ProcessController
-
-    @ProcessControllers = {}
-    @ProcessControllers.extend Mutex_m
-
-    class<<self
-
-      def process_controllers_exclusive
-	begin
-	  @ProcessControllers.lock unless Thread.critical 
-	  yield
-	ensure
-	  @ProcessControllers.unlock unless Thread.critical 
-	end
-      end
-
-      def activate(pc)
-	process_controllers_exclusive do
-	  @ProcessControllers[pc] ||= 0
-	  @ProcessControllers[pc] += 1
-	end
-      end
-
-      def inactivate(pc)
-	process_controllers_exclusive do
-	  if @ProcessControllers[pc]
-	    if (@ProcessControllers[pc] -= 1) == 0
-	      @ProcessControllers.delete(pc)
-	    end
-	  end
-	end
-      end
-
-      def each_active_object
-	process_controllers_exclusive do
-	  for ref in @ProcessControllers.keys
-	    yield ref
-	  end
-	end
-      end
-    end
-
-    def initialize(shell)
-      @shell = shell
-      @waiting_jobs = []
-      @active_jobs = []
-      @jobs_sync = Sync.new
-
-      @job_monitor = Mutex.new
-      @job_condition = ConditionVariable.new
-    end
-
-    def jobs
-      jobs = []
-      @jobs_sync.synchronize(:SH) do
-	jobs.concat @waiting_jobs
-	jobs.concat @active_jobs
-      end
-      jobs
-    end
-
-    def active_jobs
-      @active_jobs
-    end
-
-    def waiting_jobs
-      @waiting_jobs
-    end
-    
-    def jobs_exist?
-      @jobs_sync.synchronize(:SH) do
-	@active_jobs.empty? or @waiting_jobs.empty?
-      end
-    end
-
-    def active_jobs_exist?
-      @jobs_sync.synchronize(:SH) do
-	@active_jobs.empty?
-      end
-    end
-
-    def waiting_jobs_exist?
-      @jobs_sync.synchronize(:SH) do
-	@waiting_jobs.empty?
-      end
-    end
-
-    # schedule a command
-    def add_schedule(command)
-      @jobs_sync.synchronize(:EX) do
-	ProcessController.activate(self)
-	if @active_jobs.empty?
-	  start_job command
-	else
-	  @waiting_jobs.push(command)
-	end
-      end
-    end
-
-    # start a job
-    def start_job(command = nil)
-      @jobs_sync.synchronize(:EX) do
-	if command
-	  return if command.active?
-	  @waiting_jobs.delete command
-	else
-	  command = @waiting_jobs.shift
-	  return unless command
-	end
-	@active_jobs.push command
-	command.start
-
-	# start all jobs that input from the job
-	for job in @waiting_jobs
-	  start_job(job) if job.input == command
-	end
-      end
-    end
-
-    def waiting_job?(job)
-      @jobs_sync.synchronize(:SH) do
-	@waiting_jobs.include?(job)
-      end
-    end
-
-    def active_job?(job)
-      @jobs_sync.synchronize(:SH) do
-	@active_jobs.include?(job)
-      end
-    end
-
-    # terminate a job
-    def terminate_job(command)
-      @jobs_sync.synchronize(:EX) do
-	@active_jobs.delete command
-	ProcessController.inactivate(self)
-	if @active_jobs.empty?
-	  start_job
-	end
-      end
-    end
-
-    # kill a job
-    def kill_job(sig, command)
-      @jobs_sync.synchronize(:SH) do
-	if @waiting_jobs.delete command
-	  ProcessController.inactivate(self)
-	  return
-	elsif @active_jobs.include?(command)
-	  begin
-	    r = command.kill(sig)
-	    ProcessController.inactivate(self)
-	  rescue
-	    print "Shell: Warn: $!\n" if @shell.verbose?
-	    return nil
-	  end
-	  @active_jobs.delete command
-	  r
-	end
-      end
-    end
-
-    # wait for all jobs to terminate
-    def wait_all_jobs_execution
-      @job_monitor.synchronize do
-	begin
-	  while !jobs.empty?
-	    @job_condition.wait(@job_monitor)
-	  end
-	ensure
-	  redo unless jobs.empty?
-	end
-      end
-    end
-
-    # simple fork
-    def sfork(command, &block)
-      pipe_me_in, pipe_peer_out = IO.pipe
-      pipe_peer_in, pipe_me_out = IO.pipe
-      Thread.critical = true
-
-      STDOUT.flush
-      ProcessController.each_active_object do |pc|
-	for jobs in pc.active_jobs
-	  jobs.flush
-	end
-      end
-      
-      pid = fork {
-	Thread.critical = true
-
-	Thread.list.each do |th| 
-	  th.kill unless [Thread.main, Thread.current].include?(th)
-	end
-
-	STDIN.reopen(pipe_peer_in)
-	STDOUT.reopen(pipe_peer_out)
-
-	ObjectSpace.each_object(IO) do |io| 
-	  if ![STDIN, STDOUT, STDERR].include?(io)
-	    io.close unless io.closed?
-	  end
-	end
-	yield
-      }
-
-      pipe_peer_in.close
-      pipe_peer_out.close
-      command.notify "job(%name:##{pid}) start", @shell.debug?
-      Thread.critical = false
-
-      th = Thread.start {
-	Thread.critical = true
-	begin
-	  _pid = nil
-	  command.notify("job(%id) start to waiting finish.", @shell.debug?)
-	  Thread.critical = false
-	  _pid = Process.waitpid(pid, nil)
-	rescue Errno::ECHILD
-	  command.notify "warn: job(%id) was done already waitipd."
-	  _pid = true
-	ensure
-	  # when the process ends, wait until the command termintes
-	  if _pid
-	  else
-	    command.notify("notice: Process finishing...",
-			   "wait for Job[%id] to finish.",
-			   "You can use Shell#transact or Shell#check_point for more safe execution.")
-	    redo
-	  end
-	  Thread.exclusive do
-	    terminate_job(command)
-	    @job_condition.signal
-	    command.notify "job(%id) finish.", @shell.debug?
-	  end
-	end
-      }
-      return pid, pipe_me_in, pipe_me_out
-    end
-  end
-end
diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb
deleted file mode 100644
index 6071c1c841..0000000000
--- a/lib/shell/system-command.rb
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-#   shell/system-command.rb - 
-#   	$Release Version: 0.6.0 $
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-require "shell/filter"
-
-class Shell
-  class SystemCommand < Filter
-    def initialize(sh, command, *opts)
-      if t = opts.find{|opt| !opt.kind_of?(String) && opt.class}
-	Shell.Fail TypeError, t.class, "String"
-      end
-      super(sh)
-      @command = command
-      @opts = opts
-      
-      @input_queue = Queue.new
-      @pid = nil
-
-      sh.process_controller.add_schedule(self)
-    end
-
-    attr_reader :command
-    alias name command
-
-    def wait?
-      @shell.process_controller.waiting_job?(self)
-    end
-
-    def active?
-      @shell.process_controller.active_job?(self)
-    end
-
-    def input=(inp)
-      super
-      if active?
-	start_export
-      end
-    end
-
-    def start
-      @pid, @pipe_in, @pipe_out = @shell.process_controller.sfork(self) {
-	Dir.chdir @shell.pwd
-	exec(@command, *@opts)
-      }
-      if @input
-	start_export
-      end
-      start_import
-    end
-
-    def flush
-      @pipe_out.flush if @pipe_out and !@pipe_out.closed?
-    end
-
-    def terminate
-      begin
-	@pipe_in.close
-      rescue IOError
-      end
-      begin
-	@pipe_out.close
-      rescue IOError
-      end
-    end
-
-    def kill(sig)
-      if @pid
-	Process.kill(sig, @pid)
-      end
-    end
-
-
-    def start_import
-#      Thread.critical = true
-      notify "Job(%id) start imp-pipe.", @shell.debug?
-      rs = @shell.record_separator unless rs
-      _eop = true
-#      Thread.critical = false
-      th = Thread.start {
-	Thread.critical = true
-	begin
-	  Thread.critical = false
-	  while l = @pipe_in.gets
-	    @input_queue.push l
-	  end
-	  _eop = false
-	rescue Errno::EPIPE
-	  _eop = false
-	ensure
-	  if _eop
-	    notify("warn: Process finishing...",
-		   "wait for Job[%id] to finish pipe importing.",
-		   "You can use Shell#transact or Shell#check_point for more safe execution.")
-#	    Tracer.on
-	    Thread.current.run
-	    redo
-	  end
-	  Thread.exclusive do
-	    notify "job(%id}) close imp-pipe.", @shell.debug?
-	    @input_queue.push :EOF
-	    @pipe_in.close
-	  end
-	end
-      }
-    end
-
-    def start_export
-      notify "job(%id) start exp-pipe.", @shell.debug?
-      _eop = true
-      th = Thread.start{
-	Thread.critical = true
-	begin
-	  Thread.critical = false
-	  @input.each{|l| @pipe_out.print l}
-	  _eop = false
-	rescue Errno::EPIPE
-	  _eop = false
-	ensure
-	  if _eop
-	    notify("shell: warn: Process finishing...",
-		   "wait for Job(%id) to finish pipe exporting.",
-		   "You can use Shell#transact or Shell#check_point for more safe execution.")
-#	    Tracer.on
-	    redo
-	  end
-	  Thread.exclusive do
-	    notify "job(%id) close exp-pipe.", @shell.debug?
-	    @pipe_out.close
-	  end
-	end
-      }
-    end
-
-    alias super_each each
-    def each(rs = nil)
-      while (l = @input_queue.pop) != :EOF
-	yield l
-      end
-    end
-
-    # ex)
-    #    if you wish to output: 
-    #	    "shell: job(#{@command}:#{@pid}) close pipe-out."
-    #	 then 
-    #	    mes: "job(%id) close pipe-out."
-    #    yorn: Boolean(@shell.debug? or @shell.verbose?)
-    def notify(*opts, &block)
-      Thread.exclusive do
-	@shell.notify(*opts) {|mes|
-	  yield mes if iterator?
-
-	  mes.gsub!("%id", "#{@command}:##{@pid}")
-	  mes.gsub!("%name", "#{@command}")
-	  mes.gsub!("%pid", "#{@pid}")
-	}
-      end
-    end
-  end
-end
diff --git a/lib/shell/version.rb b/lib/shell/version.rb
deleted file mode 100644
index 6694c804d8..0000000000
--- a/lib/shell/version.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#   version.rb - shell version definition file
-#   	$Release Version: 0.6.0$
-#   	$Revision$
-#   	$Date$
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-# --
-#
-#   
-#
-
-class Shell
-  @RELEASE_VERSION = "0.6.0"
-  @LAST_UPDATE_DATE = "01/03/19"
-end
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index 99c0bf8437..60996be17c 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -1,60 +1,46 @@
+# shellwords.rb
+# original is shellwords.pl
 #
-# shellwords.rb: Split text into an array of tokens a la UNIX shell
+# Usage:
+#       require 'shellwords.rb'
+#       words = Shellwords.shellwords(line)
 #
-
-#
-# This module is originally a port of shellwords.pl, but modified to
-# conform to POSIX / SUSv3 (IEEE Std 1003.1-2001).
-#
-# Examples:
-#
-#   require 'shellwords'
-#   words = Shellwords.shellwords(line)
-#
-# or
+#	   or
 #
-#   require 'shellwords'
-#   include Shellwords
-#   words = shellwords(line)
-#
-module Shellwords
+#       include Shellwords
+#       words = shellwords(line)
 
-  #
-  # Split text into an array of tokens in the same way the UNIX Bourne
-  # shell does.
-  #
-  # See the +Shellwords+ module documentation for an example.
-  #
+module Shellwords
   def shellwords(line)
-    line = String.new(line) rescue
-      raise(ArgumentError, "Argument must be a string")
-    line.lstrip!
+    return '' unless line
+    line.sub! /^\s+/, ''
     words = []
-    until line.empty?
+    while line != ''
       field = ''
-      loop do
-	if line.sub!(/\A"(([^"\\]|\\.)*)"/, '') then
-	  snippet = $1.gsub(/\\(.)/, '\1')
-	elsif line =~ /\A"/ then
-	  raise ArgumentError, "Unmatched double quote: #{line}"
-	elsif line.sub!(/\A'([^']*)'/, '') then
+      while true
+	if line.sub! /^"(([^"\\]|\\.)*)"/, '' then #"
 	  snippet = $1
-	elsif line =~ /\A'/ then
-	  raise ArgumentError, "Unmatched single quote: #{line}"
-	elsif line.sub!(/\A\\(.)/, '') then
+	  snippet.gsub! /\\(.)/, '\1'
+	elsif line =~ /^"/ then #"
+	  raise ArgError, "Unmatched double quote: #{line}"
+        elsif line.sub! /^'(([^'\\]|\\.)*)'/, '' then #'
 	  snippet = $1
-	elsif line.sub!(/\A([^\s\\'"]+)/, '') then
+	  snippet.gsub! /\\(.)/, '\1'
+	elsif line =~ /^'/ then #'
+	  raise ArgError, "Unmatched single quote: #{line}"
+	elsif line.sub! /^\\(.)/, '' then
+	  snippet = $1
+	elsif line.sub! /^([^\s\\'"]+)/, '' then #'
 	  snippet = $1
 	else
-	  line.lstrip!
+	  line.sub! /^\s+/, ''
 	  break
 	end
-	field.concat(snippet)
+	field += snippet
       end
-      words.push(field)
+      words += field
     end
     words
   end
-
   module_function :shellwords
 end
diff --git a/lib/singleton.rb b/lib/singleton.rb
index 2954bfa153..8167a01aa8 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -1,360 +1,37 @@
-# The Singleton module implements the Singleton pattern.
+#  Singleton module that ensures only one object to be allocated.
 #
 # Usage:
-#    class Klass
-#       include Singleton
-#       # ...
-#    end
-#
-# *  this ensures that only one instance of Klass lets call it
-#    ``the instance'' can be created.
-#
-#    a,b  = Klass.instance, Klass.instance
-#    a == b   # => true
-#    a.new    #  NoMethodError - new is private ...
-#
-# *  ``The instance'' is created at instanciation time, in other
-#    words the first call of Klass.instance(), thus
-#
-#    class OtherKlass
-#        include Singleton
-#        # ...
-#    end
-#    ObjectSpace.each_object(OtherKlass){} # => 0.
-#
-# *  This behavior is preserved under inheritance and cloning.
-#
-#
-#
-# This is achieved by marking
-# *  Klass.new and Klass.allocate - as private
-#
-# Providing (or modifying) the class methods
-# *  Klass.inherited(sub_klass) and Klass.clone()  - 
-#    to ensure that the Singleton pattern is properly
-#    inherited and cloned.
-#
-# *  Klass.instance()  -  returning ``the instance''. After a
-#    successful self modifying (normally the first) call the
-#    method body is a simple:
-#
-#       def Klass.instance()
-#         return @__instance__
-#       end
-#
-# *  Klass._load(str)  -  calling Klass.instance()
-#
-# *  Klass._instanciate?()  -  returning ``the instance'' or
-#    nil. This hook method puts a second (or nth) thread calling
-#    Klass.instance() on a waiting loop. The return value
-#    signifies the successful completion or premature termination
-#    of the first, or more generally, current "instanciation thread".
-#
-#
-# The instance method of Singleton are
-# * clone and dup - raising TypeErrors to prevent cloning or duping
-#
-# *  _dump(depth) - returning the empty string.  Marshalling strips
-#    by default all state information, e.g. instance variables and
-#    taint state, from ``the instance''.  Providing custom _load(str)
-#    and _dump(depth) hooks allows the (partially) resurrections of
-#    a previous state of ``the instance''.
-
-
+#   class SomeSingletonClass
+#     include Singleton
+#    #....
+#   end
+#   a = SomeSingletonClass.instance
+#   b = SomeSingletonClass.instance	# a and b are same object
+#   p [a,b]
+#   a = SomeSingletonClass.new		# error (`new' is private)
 
 module Singleton
-  #  disable build-in copying methods
-  def clone
-    raise TypeError, "can't clone instance of singleton #{self.class}"
-  end
-  def dup
-    raise TypeError, "can't dup instance of singleton #{self.class}"
-  end
-  
-  private 
-  #  default marshalling strategy
-  def _dump(depth=-1) 
-    ''
-  end
-end
-
-
-class << Singleton
-  #  Method body of first instance call.
-  FirstInstanceCall = proc do
-    #  @__instance__ takes on one of the following values
-    #  * nil     -  before and after a failed creation
-    #  * false  -  during creation
-    #  * sub_class instance  -  after a successful creation
-    #  the form makes up for the lack of returns in progs
-    Thread.critical = true
-    if  @__instance__.nil?
-      @__instance__  = false
-      Thread.critical = false
-      begin
-        @__instance__ = new
-      ensure
-        if @__instance__
-          class <<self
-            remove_method :instance
-            def instance; @__instance__ end
-          end
-        else
-          @__instance__ = nil #  failed instance creation
-        end
-      end
-    elsif  _instanciate?()
-      Thread.critical = false    
-    else
-      @__instance__  = false
-      Thread.critical = false
-      begin
-        @__instance__ = new
-      ensure
-        if @__instance__
-          class <<self
-            remove_method :instance
-            def instance; @__instance__ end
-          end
-        else
-          @__instance__ = nil
-        end
+  def Singleton.append_features(klass)
+    klass.private_class_method(:new)
+    klass.instance_eval %{
+      def instance
+	unless @__instance__
+	  @__instance__ = new
+	end
+	return @__instance__
       end
-    end
-    @__instance__
-  end
-  
-  module SingletonClassMethods  
-    # properly clone the Singleton pattern - did you know
-    # that duping doesn't copy class methods?  
-    def clone
-      Singleton.__init__(super)
-    end
-    
-    private
-    
-    #  ensure that the Singleton pattern is properly inherited   
-    def inherited(sub_klass)
-      super
-      Singleton.__init__(sub_klass)
-    end
-    
-    def _load(str) 
-      instance 
-    end
-    
-    # waiting-loop hook
-    def _instanciate?()
-      while false.equal?(@__instance__)
-        Thread.critical = false
-        sleep(0.08)   # timeout
-        Thread.critical = true
-      end
-      @__instance__
-    end
-  end
-  
-  def __init__(klass)
-    klass.instance_eval { @__instance__ = nil }
-    class << klass
-      define_method(:instance,FirstInstanceCall)
-    end
-    klass
-  end
-  
-  private
-  #  extending an object with Singleton is a bad idea
-  undef_method :extend_object
-  
-  def append_features(mod)
-    #  help out people counting on transitive mixins
-    unless mod.instance_of?(Class)
-      raise TypeError, "Inclusion of the OO-Singleton module in module #{mod}"
-    end
-    super
-  end
-  
-  def included(klass)
-    super
-    klass.private_class_method  :new, :allocate
-    klass.extend SingletonClassMethods
-    Singleton.__init__(klass)
-  end
-end
- 
-
-
-if __FILE__ == $0
-
-def num_of_instances(klass)
-    "#{ObjectSpace.each_object(klass){}} #{klass} instance(s)"
-end 
-
-# The basic and most important example.
-
-class SomeSingletonClass
-  include Singleton
-end
-puts "There are #{num_of_instances(SomeSingletonClass)}" 
-
-a = SomeSingletonClass.instance
-b = SomeSingletonClass.instance # a and b are same object
-puts "basic test is #{a == b}"
-
-begin
-  SomeSingletonClass.new
-rescue  NoMethodError => mes
-  puts mes
-end
-
-
-
-puts "\nThreaded example with exception and customized #_instanciate?() hook"; p
-Thread.abort_on_exception = false
-
-class Ups < SomeSingletonClass
-  def initialize
-    self.class.__sleep
-    puts "initialize called by thread ##{Thread.current[:i]}"
-  end
-end
-  
-class << Ups
-  def _instanciate?
-    @enter.push Thread.current[:i]
-    while false.equal?(@__instance__)
-      Thread.critical = false
-      sleep 0.08 
-      Thread.critical = true
-    end
-    @leave.push Thread.current[:i]
-    @__instance__
-  end
-  
-  def __sleep
-    sleep(rand(0.08))
-  end
-  
-  def new
-    begin
-      __sleep
-      raise  "boom - thread ##{Thread.current[:i]} failed to create instance"
-    ensure
-      # simple flip-flop
-      class << self
-        remove_method :new
-      end
-    end
-  end
-  
-  def instanciate_all
-    @enter = []
-    @leave = []
-    1.upto(9) {|i|  
-      Thread.new { 
-        begin
-          Thread.current[:i] = i
-          __sleep
-          instance
-        rescue RuntimeError => mes
-          puts mes
-        end
-      }
     }
-    puts "Before there were #{num_of_instances(self)}"
-    sleep 3
-    puts "Now there is #{num_of_instances(self)}"
-    puts "#{@enter.join '; '} was the order of threads entering the waiting loop"
-    puts "#{@leave.join '; '} was the order of threads leaving the waiting loop"
-  end
-end
-
-
-Ups.instanciate_all
-# results in message like
-# Before there were 0 Ups instance(s)
-# boom - thread #6 failed to create instance
-# initialize called by thread #3
-# Now there is 1 Ups instance(s)
-# 3; 2; 1; 8; 4; 7; 5 was the order of threads entering the waiting loop
-# 3; 2; 1; 7; 4; 8; 5 was the order of threads leaving the waiting loop
-
-
-puts "\nLets see if class level cloning really works"
-Yup = Ups.clone
-def Yup.new
-  begin
-    __sleep
-    raise  "boom - thread ##{Thread.current[:i]} failed to create instance"
-  ensure
-    # simple flip-flop
-    class << self
-      remove_method :new
-    end
   end
 end
-Yup.instanciate_all
 
-
-puts "\n\n","Customized marshalling"
-class A
-  include Singleton
-  attr_accessor :persist, :die
-  def _dump(depth)
-    # this strips the @die information from the instance
-    Marshal.dump(@persist,depth)
-  end
-end
-
-def A._load(str)
-  instance.persist = Marshal.load(str)
-  instance
-end
-
-a = A.instance
-a.persist = ["persist"]
-a.die = "die"
-a.taint
-
-stored_state = Marshal.dump(a)
-# change state
-a.persist = nil
-a.die = nil
-b = Marshal.load(stored_state)
-p a == b  #  => true
-p a.persist  #  => ["persist"]
-p a.die      #  => nil
-
-
-puts "\n\nSingleton with overridden default #inherited() hook"
-class Up
-end
-def Up.inherited(sub_klass)
-  puts "#{sub_klass} subclasses #{self}"
-end
-
-
-class Middle < Up
-  include Singleton
-end
-
-class Down < Middle; end
-
-puts  "and basic \"Down test\" is #{Down.instance == Down.instance}\n
-Various exceptions"  
-
-begin
-  module AModule
+if __FILE__ == $0
+  class SomeSingletonClass
     include Singleton
+    #....
   end
-rescue TypeError => mes
-  puts mes  #=> Inclusion of the OO-Singleton module in module AModule
-end
-
-begin
-  'aString'.extend Singleton
-rescue NoMethodError => mes
-  puts mes  #=> undefined method `extend_object' for Singleton:Module
-end
 
+  a = SomeSingletonClass.instance
+  b = SomeSingletonClass.instance	# a and b are same object
+  p [a,b]
+  a = SomeSingletonClass.new		# error (`new' is private)
 end
diff --git a/lib/soap/baseData.rb b/lib/soap/baseData.rb
deleted file mode 100644
index c175072e4d..0000000000
--- a/lib/soap/baseData.rb
+++ /dev/null
@@ -1,790 +0,0 @@
-=begin
-SOAP4R - Base type library
-Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/datatypes'
-require 'soap/soap'
-
-
-module SOAP
-
-
-###
-## Mix-in module for SOAP base type classes.
-#
-module SOAPModuleUtils
-  include SOAP
-
-public
-
-  def decode(elename)
-    d = self.new
-    d.elename = elename
-    d
-  end
-end
-
-
-###
-## Marker of SOAP/DM types.
-#
-module SOAPType; end
-
-
-###
-## Mix-in module for SOAP base type instances.
-#
-module SOAPBasetype
-  include SOAPType
-  include SOAP
-
-  attr_accessor :encodingstyle
-
-  attr_accessor :elename
-  attr_accessor :id
-  attr_reader :precedents
-  attr_accessor :root
-  attr_accessor :parent
-  attr_accessor :position
-  attr_reader :extraattr
-
-public
-
-  def initialize(*vars)
-    super(*vars)
-    @encodingstyle = nil
-    @elename = XSD::QName.new
-    @id = nil
-    @precedents = []
-    @parent = nil
-    @position = nil
-    @extraattr = {}
-  end
-end
-
-
-###
-## Mix-in module for SOAP compound type instances.
-#
-module SOAPCompoundtype
-  include SOAPType
-  include SOAP
-
-  attr_accessor :encodingstyle
-
-  attr_accessor :elename
-  attr_accessor :id
-  attr_reader :precedents
-  attr_accessor :root
-  attr_accessor :parent
-  attr_accessor :position
-  attr_reader :extraattr
-
-  attr_accessor :definedtype
-
-public
-
-  def initialize(type)
-    super()
-    @type = type
-    @encodingstyle = nil
-    @elename = XSD::QName.new
-    @id = nil
-    @precedents = []
-    @root = false
-    @parent = nil
-    @position = nil
-    @definedtype = nil
-    @extraattr = {}
-  end
-end
-
-
-###
-## Convenience datatypes.
-#
-class SOAPReference < XSD::NSDBase
-  include SOAPBasetype
-  extend SOAPModuleUtils
-
-public
-
-  attr_accessor :refid
-  attr_accessor :elename
-
-  # Override the definition in SOAPBasetype.
-  def initialize(refid = nil)
-    super()
-    @type = XSD::QName.new
-    @encodingstyle = nil
-    @elename = XSD::QName.new
-    @id = nil
-    @precedents = []
-    @root = false
-    @parent = nil
-    @refid = refid
-    @obj = nil
-  end
-
-  def __getobj__
-    @obj
-  end
-
-  def __setobj__(obj)
-    @obj = obj
-    @refid = SOAPReference.create_refid(@obj)
-    @obj.id = @refid unless @obj.id
-    @obj.precedents << self
-    # Copies NSDBase information
-    @obj.type = @type unless @obj.type
-  end
-
-  # Why don't I use delegate.rb?
-  # -> delegate requires target object type at initialize time.
-  # Why don't I use forwardable.rb?
-  # -> forwardable requires a list of forwarding methods.
-  #
-  # ToDo: Maybe I should use forwardable.rb and give it a methods list like
-  # delegate.rb...
-  #
-  def method_missing(msg_id, *params)
-    if @obj
-      @obj.send(msg_id, *params)
-    else
-      nil
-    end
-  end
-
-  def self.decode(elename, refid)
-    d = super(elename)
-    d.refid = refid
-    d
-  end
-
-  def self.create_refid(obj)
-    'id' << obj.__id__.to_s
-  end
-end
-
-class SOAPNil < XSD::XSDNil
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-# SOAPRawString is for sending raw string.  In contrast to SOAPString,
-# SOAP4R does not do XML encoding and does not convert its CES.  The string it
-# holds is embedded to XML instance directly as a 'xsd:string'.
-class SOAPRawString < XSD::XSDString
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-
-###
-## Basic datatypes.
-#
-class SOAPAnySimpleType < XSD::XSDAnySimpleType
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPString < XSD::XSDString
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPBoolean < XSD::XSDBoolean
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPDecimal < XSD::XSDDecimal
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPFloat < XSD::XSDFloat
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPDouble < XSD::XSDDouble
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPDuration < XSD::XSDDuration
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPDateTime < XSD::XSDDateTime
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPTime < XSD::XSDTime
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPDate < XSD::XSDDate
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPGYearMonth < XSD::XSDGYearMonth
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPGYear < XSD::XSDGYear
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPGMonthDay < XSD::XSDGMonthDay
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPGDay < XSD::XSDGDay
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPGMonth < XSD::XSDGMonth
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPHexBinary < XSD::XSDHexBinary
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPBase64 < XSD::XSDBase64Binary
-  include SOAPBasetype
-  extend SOAPModuleUtils
-  Type = QName.new(EncodingNamespace, Base64Literal)
-
-public
-  # Override the definition in SOAPBasetype.
-  def initialize(value = nil)
-    super(value)
-    @type = Type
-  end
-
-  def as_xsd
-    @type = XSD::XSDBase64Binary::Type
-  end
-end
-
-class SOAPAnyURI < XSD::XSDAnyURI
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPQName < XSD::XSDQName
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-
-class SOAPInteger < XSD::XSDInteger
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPLong < XSD::XSDLong
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPInt < XSD::XSDInt
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-class SOAPShort < XSD::XSDShort
-  include SOAPBasetype
-  extend SOAPModuleUtils
-end
-
-
-###
-## Compound datatypes.
-#
-class SOAPStruct < XSD::NSDBase
-  include SOAPCompoundtype
-  include Enumerable
-
-public
-
-  def initialize(type = nil)
-    super(type || XSD::QName.new)
-    @array = []
-    @data = []
-  end
-
-  def to_s()
-    str = ''
-    self.each do |key, data|
-      str << "#{ key }: #{ data }\n"
-    end
-    str
-  end
-
-  def add(name, value)
-    add_member(name, value)
-  end
-
-  def [](idx)
-    if idx.is_a?(Range)
-      @data[idx]
-    elsif idx.is_a?(Integer)
-      if (idx > @array.size)
-        raise ArrayIndexOutOfBoundsError.new('In ' << @type.name)
-      end
-      @data[idx]
-    else
-      if @array.include?(idx)
-	@data[@array.index(idx)]
-      else
-	nil
-      end
-    end
-  end
-
-  def []=(idx, data)
-    if @array.include?(idx)
-      @data[@array.index(idx)] = data
-    else
-      add(idx, data)
-    end
-  end
-
-  def key?(name)
-    @array.include?(name)
-  end
-
-  def members
-    @array
-  end
-
-  def each
-    for i in 0..(@array.length - 1)
-      yield(@array[i], @data[i])
-    end
-  end
-
-  def replace
-    members.each do |member|
-      self[member] = yield(self[member])
-    end
-  end
-
-  def self.decode(elename, type)
-    s = SOAPStruct.new(type)
-    s.elename = elename
-    s
-  end
-
-private
-
-  def add_member(name, value = nil)
-    value = SOAPNil.new() unless value
-    @array.push(name)
-    value.elename = value.elename.dup_name(name)
-    @data.push(value)
-  end
-end
-
-
-# SOAPElement is not typed so it does not derive NSDBase.
-class SOAPElement
-  include Enumerable
-
-  attr_accessor :encodingstyle
-  attr_accessor :extraattr
-  attr_reader :precedents
-
-  attr_accessor :qualified
-  attr_accessor :elename
-
-  def initialize(elename, text = nil)
-    if !elename.is_a?(XSD::QName)
-      elename = XSD::QName.new(nil, elename)
-    end
-    @encodingstyle = LiteralNamespace
-    @extraattr = {}
-    @precedents = []
-
-    @qualified = false
-    @elename = elename
-
-    @array = []
-    @data = []
-    @text = text
-  end
-
-  # Text interface.
-  attr_accessor :text
-
-  # Element interfaces.
-  def add(value)
-    add_member(value.elename.name, value)
-  end
-
-  def [](idx)
-    if @array.include?(idx)
-      @data[@array.index(idx)]
-    else
-      nil
-    end
-  end
-
-  def []=(idx, data)
-    if @array.include?(idx)
-      @data[@array.index(idx)] = data
-    else
-      add(data)
-    end
-  end
-
-  def key?(name)
-    @array.include?(name)
-  end
-
-  def members
-    @array
-  end
-
-  def to_obj
-    if members.empty?
-      @text
-    else
-      hash = {}
-      each do |k, v|
-	hash[k] = v.to_obj
-      end
-      hash
-    end
-  end
-
-  def each
-    for i in 0..(@array.length - 1)
-      yield(@array[i], @data[i])
-    end
-  end
-
-  def self.decode(elename)
-    o = SOAPElement.new
-    o.elename = elename
-    o
-  end
-
-  def self.from_obj(hash_or_string)
-    o = SOAPElement.new(nil)
-    if hash_or_string.is_a?(Hash)
-      hash_or_string.each do |k, v|
-	child = self.from_obj(v)
-	child.elename = XSD::QName.new(nil, k)
-	o.add(child)
-      end
-    else
-      o.text = hash_or_string
-    end
-    o
-  end
-
-private
-
-  def add_member(name, value)
-    add_accessor(name)
-    @array.push(name)
-    @data.push(value)
-  end
-
-  def add_accessor(name)
-    methodname = name
-    if self.respond_to?(methodname)
-      methodname = safe_accessor_name(methodname)
-    end
-    begin
-      instance_eval <<-EOS
-        def #{ methodname }()
-	  @data[@array.index('#{ name }')]
-        end
-
-        def #{ methodname }=(value)
-	  @data[@array.index('#{ name }')] = value
-        end
-      EOS
-    rescue SyntaxError
-      methodname = safe_accessor_name(methodname)
-      retry
-    end
-  end
-
-  def safe_accessor_name(name)
-    "var_" << name.gsub(/[^a-zA-Z0-9_]/, '')
-  end
-end
-
-
-class SOAPArray < XSD::NSDBase
-  include SOAPCompoundtype
-  include Enumerable
-
-public
-
-  attr_accessor :sparse
-
-  attr_reader :offset, :rank
-  attr_accessor :size, :size_fixed
-  attr_reader :arytype
-
-  def initialize(type = nil, rank = 1, arytype = nil)
-    super(type || XSD::QName.new)
-    @rank = rank
-    @data = Array.new
-    @sparse = false
-    @offset = Array.new(rank, 0)
-    @size = Array.new(rank, 0)
-    @size_fixed = false
-    @position = nil
-    @arytype = arytype
-  end
-
-  def offset=(var)
-    @offset = var
-    @sparse = true
-  end
-
-  def add(value)
-    self[*(@offset)] = value
-  end
-
-  def [](*idxary)
-    if idxary.size != @rank
-      raise ArgumentError.new("Given #{ idxary.size } params does not match rank: #{ @rank }")
-    end
-
-    retrieve(idxary)
-  end
-
-  def []=(*idxary)
-    value = idxary.slice!(-1)
-
-    if idxary.size != @rank
-      raise ArgumentError.new("Given #{ idxary.size } params(#{ idxary }) does not match rank: #{ @rank }")
-    end
-
-    for i in 0..(idxary.size - 1)
-      if idxary[i] + 1 > @size[i]
-	@size[i] = idxary[i] + 1
-      end
-    end
-
-    data = retrieve(idxary[0, idxary.size - 1])
-    data[idxary.last] = value
-
-    if value.is_a?(SOAPType)
-      value.elename = value.elename.dup_name('item')
-      
-      # Sync type
-      unless @type.name
-	@type = XSD::QName.new(value.type.namespace,
-	  SOAPArray.create_arytype(value.type.name, @rank))
-      end
-
-      unless value.type
-	value.type = @type
-      end
-    end
-
-    @offset = idxary
-    offsetnext
-  end
-
-  def each
-    @data.each do |data|
-      yield(data)
-    end
-  end
-
-  def to_a
-    @data.dup
-  end
-
-  def replace
-    @data = deep_map(@data) do |ele|
-      yield(ele)
-    end
-  end
-
-  def deep_map(ary, &block)
-    ary.collect do |ele|
-      if ele.is_a?(Array)
-	deep_map(ele, &block)
-      else
-	new_obj = block.call(ele)
-	new_obj.elename = new_obj.elename.dup_name('item')
-	new_obj
-      end
-    end
-  end
-
-  def include?(var)
-    traverse_data(@data) do |v, *rank|
-      if v.is_a?(SOAPBasetype) && v.data == var
-	return true
-      end
-    end
-    false
-  end
-
-  def traverse
-    traverse_data(@data) do |v, *rank|
-      unless @sparse
-       yield(v)
-      else
-       yield(v, *rank) if v && !v.is_a?(SOAPNil)
-      end
-    end
-  end
-
-  def soap2array(ary)
-    traverse_data(@data) do |v, *position|
-      iteary = ary
-      for rank in 1..(position.size - 1)
-	idx = position[rank - 1]
-	if iteary[idx].nil?
-	  iteary = iteary[idx] = Array.new
-	else
-	  iteary = iteary[idx]
-	end
-      end
-      if block_given?
-	iteary[position.last] = yield(v)
-      else
-	iteary[position.last] = v
-      end
-    end
-  end
-
-  def position
-    @position
-  end
-
-private
-
-  def retrieve(idxary)
-    data = @data
-    for rank in 1..(idxary.size)
-      idx = idxary[rank - 1]
-      if data[idx].nil?
-	data = data[idx] = Array.new
-      else
-	data = data[idx]
-      end
-    end
-    data
-  end
-
-  def traverse_data(data, rank = 1)
-    for idx in 0..(ranksize(rank) - 1)
-      if rank < @rank
-	traverse_data(data[idx], rank + 1) do |*v|
-	  v[1, 0] = idx
-       	  yield(*v)
-	end
-      else
-	yield(data[idx], idx)
-      end
-    end
-  end
-
-  def ranksize(rank)
-    @size[rank - 1]
-  end
-
-  def offsetnext
-    move = false
-    idx = @offset.size - 1
-    while !move && idx >= 0
-      @offset[idx] += 1
-      if @size_fixed
-	if @offset[idx] < @size[idx]
-	  move = true
-	else
-	  @offset[idx] = 0
-	  idx -= 1
-	end
-      else
-	move = true
-      end
-    end
-  end
-
-  # Module function
-
-public
-
-  def self.decode(elename, type, arytype)
-    typestr, nofary = parse_type(arytype.name)
-    rank = nofary.count(',') + 1
-    plain_arytype = XSD::QName.new(arytype.namespace, typestr)
-    o = SOAPArray.new(type, rank, plain_arytype)
-    size = []
-    nofary.split(',').each do |s|
-      if s.empty?
-	size.clear
-	break
-      else
-	size << s.to_i
-      end
-    end
-    unless size.empty?
-      o.size = size
-      o.size_fixed = true
-    end
-    o.elename = elename
-    o
-  end
-
-private
-
-  def self.create_arytype(typename, rank)
-    "#{ typename }[" << ',' * (rank - 1) << ']'
-  end
-
-  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$')
-
-  def self.parse_type(string)
-    TypeParseRegexp =~ string
-    return $1, $2
-  end
-end
-
-
-require 'soap/mapping/typeMap'
-
-
-end
diff --git a/lib/soap/element.rb b/lib/soap/element.rb
deleted file mode 100644
index 561cb1b071..0000000000
--- a/lib/soap/element.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-=begin
-SOAP4R - SOAP elements library
-Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/qname'
-require 'soap/baseData'
-
-
-module SOAP
-
-
-###
-## SOAP elements
-#
-module SOAPEnvelopeElement; end
-
-class SOAPFault < SOAPStruct
-  include SOAPEnvelopeElement
-  include SOAPCompoundtype
-
-public
-
-  def faultcode
-    self['faultcode']
-  end
-
-  def faultstring
-    self['faultstring']
-  end
-
-  def faultactor
-    self['faultactor']
-  end
-
-  def detail
-    self['detail']
-  end
-
-  def faultcode=(rhs)
-    self['faultcode'] = rhs
-  end
-
-  def faultstring=(rhs)
-    self['faultstring'] = rhs
-  end
-
-  def faultactor=(rhs)
-    self['faultactor'] = rhs
-  end
-
-  def detail=(rhs)
-    self['detail'] = rhs
-  end
-
-  def initialize(faultcode = nil, faultstring = nil, faultactor = nil, detail = nil)
-    super(EleFaultName)
-    @elename = EleFaultName
-    @encodingstyle = EncodingNamespace
-
-    if faultcode
-      self.faultcode = faultcode
-      self.faultstring = faultstring
-      self.faultactor = faultactor
-      self.detail = detail
-      self.faultcode.elename = EleFaultCodeName if self.faultcode
-      self.faultstring.elename = EleFaultStringName if self.faultstring
-      self.faultactor.elename = EleFaultActorName if self.faultactor
-      self.detail.elename = EleFaultDetailName if self.detail
-    end
-  end
-
-  def encode(generator, ns, attrs = {})
-    SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
-    SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
-    attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
-    name = ns.name(@elename)
-    generator.encode_tag(name, attrs)
-    yield(self.faultcode, false)
-    yield(self.faultstring, false)
-    yield(self.faultactor, false)
-    yield(self.detail, false) if self.detail
-    generator.encode_tag_end(name, true)
-  end
-end
-
-
-class SOAPBody < SOAPStruct
-  include SOAPEnvelopeElement
-
-public
-
-  def initialize(data = nil, is_fault = false)
-    super(nil)
-    @elename = EleBodyName
-    @encodingstyle = nil
-    add(data.elename.name, data) if data
-    @is_fault = is_fault
-  end
-
-  def encode(generator, ns, attrs = {})
-    name = ns.name(@elename)
-    generator.encode_tag(name, attrs)
-    if @is_fault
-      yield(@data, true)
-    else
-      @data.each do |data|
-	yield(data, true)
-      end
-    end
-    generator.encode_tag_end(name, true)
-  end
-
-  def root_node
-    @data.each do |node|
-      if node.root == 1
-	return node
-      end
-    end
-    # No specified root...
-    @data.each do |node|
-      if node.root != 0
-	return node
-      end
-    end
-
-    raise SOAPParser::FormatDecodeError.new('No root element.')
-  end
-end
-
-
-class SOAPHeaderItem < XSD::NSDBase
-  include SOAPEnvelopeElement
-  include SOAPCompoundtype
-
-public
-
-  attr_accessor :content
-  attr_accessor :mustunderstand
-  attr_accessor :encodingstyle
-
-  def initialize(content, mustunderstand = true, encodingstyle = nil)
-    super(nil)
-    @content = content
-    @mustunderstand = mustunderstand
-    @encodingstyle = encodingstyle || LiteralNamespace
-  end
-
-  def encode(generator, ns, attrs = {})
-    attrs.each do |key, value|
-      @content.attr[key] = value
-    end
-    @content.attr[ns.name(EnvelopeNamespace, AttrMustUnderstand)] =
-      (@mustunderstand ? '1' : '0')
-    if @encodingstyle
-      @content.attr[ns.name(EnvelopeNamespace, AttrEncodingStyle)] =
-      	@encodingstyle
-    end
-    @content.encodingstyle = @encodingstyle if !@content.encodingstyle
-    yield(@content, true)
-  end
-end
-
-
-class SOAPHeader < SOAPArray
-  include SOAPEnvelopeElement
-
-  def initialize()
-    super(nil, 1)	# rank == 1
-    @elename = EleHeaderName
-    @encodingstyle = nil
-  end
-
-  def encode(generator, ns, attrs = {})
-    name = ns.name(@elename)
-    generator.encode_tag(name, attrs)
-    @data.each do |data|
-      yield(data, true)
-    end
-    generator.encode_tag_end(name, true)
-  end
-
-  def length
-    @data.length
-  end
-end
-
-
-class SOAPEnvelope < XSD::NSDBase
-  include SOAPEnvelopeElement
-  include SOAPCompoundtype
-
-  attr_accessor :header
-  attr_accessor :body
-
-  def initialize(header = nil, body = nil)
-    super(nil)
-    @elename = EleEnvelopeName
-    @encodingstyle = nil
-    @header = header
-    @body = body
-  end
-
-  def encode(generator, ns, attrs = {})
-    SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace,
-      SOAPNamespaceTag)
-    name = ns.name(@elename)
-    generator.encode_tag(name, attrs)
-
-    yield(@header, true) if @header and @header.length > 0
-    yield(@body, true)
-
-    generator.encode_tag_end(name, true)
-  end
-end
-
-
-end
diff --git a/lib/soap/encodingstyle/aspDotNetHandler.rb b/lib/soap/encodingstyle/aspDotNetHandler.rb
deleted file mode 100644
index b00084e3a9..0000000000
--- a/lib/soap/encodingstyle/aspDotNetHandler.rb
+++ /dev/null
@@ -1,231 +0,0 @@
-=begin
-SOAP4R - ASP.NET EncodingStyle handler library
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/encodingstyle/handler'
-
-
-module SOAP
-module EncodingStyle
-
-
-class ASPDotNetHandler < Handler
-  Namespace = 'http://tempuri.org/ASP.NET'
-  add_handler
-
-  def initialize(charset = nil)
-    super(charset)
-    @textbuf = ''
-    @decode_typemap = nil
-  end
-
-
-  ###
-  ## encode interface.
-  #
-  def encode_data(generator, ns, qualified, data, parent)
-    attrs = {}
-    name = if qualified and data.elename.namespace
-        SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
-        ns.name(data.elename)
-      else
-        data.elename.name
-      end
-
-    case data
-    when SOAPRawString
-      generator.encode_tag(name, attrs)
-      generator.encode_rawstring(data.to_s)
-    when XSD::XSDString
-      generator.encode_tag(name, attrs)
-      generator.encode_string(@charset ? XSD::Charset.encoding_to_xml(data.to_s, @charset) : data.to_s)
-    when XSD::XSDAnySimpleType
-      generator.encode_tag(name, attrs)
-      generator.encode_string(data.to_s)
-    when SOAPStruct
-      generator.encode_tag(name, attrs)
-      data.each do |key, value|
-	if !value.elename.namespace
-          value.elename.namespace = data.elename.namespace 
-        end
-        yield(value, true)
-      end
-    when SOAPArray
-      generator.encode_tag(name, attrs)
-      data.traverse do |child, *rank|
-	data.position = nil
-        yield(child, true)
-      end
-    else
-      raise EncodingStyleError.new("Unknown object:#{ data } in this encodingSt
-yle.")
-    end
-  end
-
-  def encode_data_end(generator, ns, qualified, data, parent)
-    name = if qualified and data.elename.namespace
-        ns.name(data.elename)
-      else
-        data.elename.name
-      end
-    cr = data.is_a?(SOAPCompoundtype)
-    generator.encode_tag_end(name, cr)
-  end
-
-
-  ###
-  ## decode interface.
-  #
-  class SOAPTemporalObject
-    attr_accessor :parent
-
-    def initialize
-      @parent = nil
-    end
-  end
-
-  class SOAPUnknown < SOAPTemporalObject
-    def initialize(handler, elename)
-      super()
-      @handler = handler
-      @elename = elename
-    end
-
-    def as_struct
-      o = SOAPStruct.decode(@elename, XSD::AnyTypeName)
-      o.parent = @parent
-      o.type.name = @name
-      @handler.decode_parent(@parent, o)
-      o
-    end
-
-    def as_string
-      o = SOAPString.decode(@elename)
-      o.parent = @parent
-      @handler.decode_parent(@parent, o)
-      o
-    end
-
-    def as_nil
-      o = SOAPNil.decode(@elename)
-      o.parent = @parent
-      @handler.decode_parent(@parent, o)
-      o
-    end
-  end
-
-  def decode_tag(ns, elename, attrs, parent)
-    # ToDo: check if @textbuf is empty...
-    @textbuf = ''
-    o = SOAPUnknown.new(self, elename)
-    o.parent = parent
-    o
-  end
-
-  def decode_tag_end(ns, node)
-    o = node.node
-    if o.is_a?(SOAPUnknown)
-      newnode = o.as_string
-#	if /\A\s*\z/ =~ @textbuf
-#	  o.as_struct
-#	else
-#	  o.as_string
-#	end
-      node.replace_node(newnode)
-      o = node.node
-    end
-
-    decode_textbuf(o)
-    @textbuf = ''
-  end
-
-  def decode_text(ns, text)
-    # @textbuf is set at decode_tag_end.
-    @textbuf << text
-  end
-
-  def decode_prologue
-  end
-
-  def decode_epilogue
-  end
-
-  def decode_parent(parent, node)
-    case parent.node
-    when SOAPUnknown
-      newparent = parent.node.as_struct
-      node.parent = newparent
-      parent.replace_node(newparent)
-      decode_parent(parent, node)
-
-    when SOAPStruct
-      data = parent.node[node.elename.name]
-      case data
-      when nil
-	parent.node.add(node.elename.name, node)
-      when SOAPArray
-	name, type_ns = node.elename.name, node.type.namespace
-	data.add(node)
-	node.elename, node.type.namespace = name, type_ns
-      else
-	parent.node[node.elename.name] = SOAPArray.new
-	name, type_ns = data.elename.name, data.type.namespace
-	parent.node[node.elename.name].add(data)
-	data.elename.name, data.type.namespace = name, type_ns
-	name, type_ns = node.elename.name, node.type.namespace
-	parent.node[node.elename.name].add(node)
-	node.elename.name, node.type.namespace = name, type_ns
-      end
-
-    when SOAPArray
-      if node.position
-	parent.node[*(decode_arypos(node.position))] = node
-	parent.node.sparse = true
-      else
-	parent.node.add(node)
-      end
-
-    when SOAPBasetype
-      raise EncodingStyleError.new("SOAP base type must not have a child.")
-
-    else
-      # SOAPUnknown does not have parent.
-      # raise EncodingStyleError.new("Illegal parent: #{ parent }.")
-    end
-  end
-
-private
-
-  def decode_textbuf(node)
-    if node.is_a?(XSD::XSDString)
-      if @charset
-	node.set(XSD::Charset.encoding_from_xml(@textbuf, @charset))
-      else
-	node.set(@textbuf)
-      end
-    else
-      # Nothing to do...
-    end
-  end
-end
-
-ASPDotNetHandler.new
-
-
-end
-end
diff --git a/lib/soap/encodingstyle/handler.rb b/lib/soap/encodingstyle/handler.rb
deleted file mode 100644
index 2cbbd893d8..0000000000
--- a/lib/soap/encodingstyle/handler.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-=begin
-SOAP4R - EncodingStyle handler library
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/soap'
-require 'soap/baseData'
-require 'soap/element'
-
-
-module SOAP
-module EncodingStyle
-
-
-class Handler
-  @@handlers = {}
-
-  class EncodingStyleError < Error; end
-
-  class << self
-    def uri
-      self::Namespace
-    end
-
-    def handler(uri)
-      @@handlers[uri]
-    end
-
-    def each
-      @@handlers.each do |key, value|
-	yield(value)
-      end
-    end
-
-  private
-
-    def add_handler
-      @@handlers[self.uri] = self
-    end
-  end
-
-  attr_reader :charset
-  attr_accessor :generate_explicit_type
-  def decode_typemap=(complextypes)
-    @decode_typemap = complextypes
-  end
-
-  def initialize(charset)
-    @charset = charset
-    @generate_explicit_type = true
-    @decode_typemap = nil
-  end
-
-  ###
-  ## encode interface.
-  #
-  # Returns a XML instance as a string.
-  def encode_data(generator, ns, qualified, data, parent)
-    raise NotImplementError.new('Method encode_data must be defined in derived class.')
-  end
-
-  def encode_data_end(generator, ns, qualified, data, parent)
-    raise NotImplementError.new('Method encode_data must be defined in derived class.')
-  end
-
-  def encode_prologue
-  end
-
-  def encode_epilogue
-  end
-
-  ###
-  ## decode interface.
-  #
-  # Returns SOAP/OM data.
-  def decode_tag(ns, name, attrs, parent)
-    raise NotImplementError.new('Method decode_tag must be defined in derived class.')
-  end
-
-  def decode_tag_end(ns, name)
-    raise NotImplementError.new('Method decode_tag_end must be defined in derived class.')
-  end
-
-  def decode_text(ns, text)
-    raise NotImplementError.new('Method decode_text must be defined in derived class.')
-  end
-
-  def decode_prologue
-  end
-
-  def decode_epilogue
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/encodingstyle/literalHandler.rb b/lib/soap/encodingstyle/literalHandler.rb
deleted file mode 100644
index 5ff0e5dd66..0000000000
--- a/lib/soap/encodingstyle/literalHandler.rb
+++ /dev/null
@@ -1,216 +0,0 @@
-=begin
-SOAP4R - XML Literal EncodingStyle handler library
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/encodingstyle/handler'
-
-
-module SOAP
-module EncodingStyle
-
-
-class LiteralHandler < Handler
-  Namespace = SOAP::LiteralNamespace
-  add_handler
-
-  def initialize(charset = nil)
-    super(charset)
-    @textbuf = ''
-  end
-
-
-  ###
-  ## encode interface.
-  #
-  def encode_data(generator, ns, qualified, data, parent)
-    attrs = {}
-    name = if qualified and data.elename.namespace
-        SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
-        ns.name(data.elename)
-      else
-        data.elename.name
-      end
-
-    case data
-    when SOAPRawString
-      generator.encode_tag(name, attrs)
-      generator.encode_rawstring(data.to_s)
-    when XSD::XSDString
-      generator.encode_tag(name, attrs)
-      generator.encode_string(@charset ? XSD::Charset.encoding_to_xml(data.to_s, @charset) : data.to_s)
-    when XSD::XSDAnySimpleType
-      generator.encode_tag(name, attrs)
-      generator.encode_string(data.to_s)
-    when SOAPStruct
-      generator.encode_tag(name, attrs)
-      data.each do |key, value|
-	value.elename.namespace = data.elename.namespace if !value.elename.namespace
-        yield(value, true)
-      end
-    when SOAPArray
-      generator.encode_tag(name, attrs)
-      data.traverse do |child, *rank|
-	data.position = nil
-        yield(child, true)
-      end
-    when SOAPElement
-      generator.encode_tag(name, attrs.update(data.extraattr))
-      generator.encode_rawstring(data.text) if data.text
-      data.each do |key, value|
-	value.elename.namespace = data.elename.namespace if !value.elename.namespace
-	#yield(value, data.qualified)
-	yield(value, qualified)
-      end
-    else
-      raise EncodingStyleError.new("Unknown object:#{ data } in this encodingStyle.")
-    end
-  end
-
-  def encode_data_end(generator, ns, qualified, data, parent)
-    name = if qualified and data.elename.namespace
-        ns.name(data.elename)
-      else
-        data.elename.name
-      end
-    generator.encode_tag_end(name)
-  end
-
-
-  ###
-  ## decode interface.
-  #
-  class SOAPTemporalObject
-    attr_accessor :parent
-
-    def initialize
-      @parent = nil
-    end
-  end
-
-  class SOAPUnknown < SOAPTemporalObject
-    def initialize(handler, elename)
-      super()
-      @handler = handler
-      @elename = elename
-    end
-
-    def as_struct
-      o = SOAPStruct.decode(@elename, XSD::AnyTypeName)
-      o.parent = @parent
-      @handler.decode_parent(@parent, o)
-      o
-    end
-
-    def as_string
-      o = SOAPString.decode(@elename)
-      o.parent = @parent
-      @handler.decode_parent(@parent, o)
-      o
-    end
-
-    def as_nil
-      o = SOAPNil.decode(@elename)
-      o.parent = @parent
-      @handler.decode_parent(@parent, o)
-      o
-    end
-  end
-
-  def decode_tag(ns, elename, attrs, parent)
-    # ToDo: check if @textbuf is empty...
-    @textbuf = ''
-    o = SOAPUnknown.new(self, elename)
-    o.parent = parent
-    o
-  end
-
-  def decode_tag_end(ns, node)
-    o = node.node
-    if o.is_a?(SOAPUnknown)
-      newnode = if /\A\s*\z/ =~ @textbuf
-	  o.as_struct
-	else
-	  o.as_string
-	end
-      node.replace_node(newnode)
-      o = node.node
-    end
-
-    decode_textbuf(o)
-    @textbuf = ''
-  end
-
-  def decode_text(ns, text)
-    # @textbuf is set at decode_tag_end.
-    @textbuf << text
-  end
-
-  def decode_prologue
-  end
-
-  def decode_epilogue
-  end
-
-  def decode_parent(parent, node)
-    case parent.node
-    when SOAPUnknown
-      newparent = parent.node.as_struct
-      node.parent = newparent
-      parent.replace_node(newparent)
-      decode_parent(parent, node)
-
-    when SOAPStruct
-      parent.node.add(node.name, node)
-
-    when SOAPArray
-      if node.position
-	parent.node[*(decode_arypos(node.position))] = node
-	parent.node.sparse = true
-      else
-	parent.node.add(node)
-      end
-
-    when SOAPBasetype
-      raise EncodingStyleError.new("SOAP base type must not have a child.")
-
-    else
-      # SOAPUnknown does not have parent.
-      # raise EncodingStyleError.new("Illegal parent: #{ parent }.")
-    end
-  end
-
-private
-
-  def decode_textbuf(node)
-    if node.is_a?(XSD::XSDString)
-      if @charset
-	node.set(XSD::Charset.encoding_from_xml(@textbuf, @charset))
-      else
-	node.set(@textbuf)
-      end
-    else
-      # Nothing to do...
-    end
-  end
-end
-
-LiteralHandler.new
-
-
-end
-end
diff --git a/lib/soap/encodingstyle/soapHandler.rb b/lib/soap/encodingstyle/soapHandler.rb
deleted file mode 100644
index 0c68810cce..0000000000
--- a/lib/soap/encodingstyle/soapHandler.rb
+++ /dev/null
@@ -1,565 +0,0 @@
-=begin
-SOAP4R - SOAP EncodingStyle handler library
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/encodingstyle/handler'
-
-
-module SOAP
-module EncodingStyle
-
-
-class SOAPHandler < Handler
-  Namespace = SOAP::EncodingNamespace
-  add_handler
-
-  def initialize(charset = nil)
-    super(charset)
-    @refpool = []
-    @idpool = []
-    @textbuf = ''
-    @is_first_top_ele = true
-  end
-
-
-  ###
-  ## encode interface.
-  #
-  def encode_data(generator, ns, qualified, data, parent)
-    attrs = encode_attrs(generator, ns, data, parent)
-
-    if parent && parent.is_a?(SOAPArray) && parent.position
-      attrs[ns.name(AttrPositionName)] = '[' << parent.position.join(',') << ']'
-    end
-
-    name = nil
-    if qualified and data.elename.namespace
-      SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
-      name = ns.name(data.elename)
-    else
-      name = data.elename.name
-    end
-
-    case data
-    when SOAPReference
-      attrs['href'] = '#' << data.refid
-      generator.encode_tag(name, attrs)
-    when SOAPRawString
-      generator.encode_tag(name, attrs)
-      generator.encode_rawstring(data.to_s)
-    when XSD::XSDString
-      generator.encode_tag(name, attrs)
-      generator.encode_string(@charset ? XSD::Charset.encoding_to_xml(data.to_s, @charset) : data.to_s)
-    when XSD::XSDAnySimpleType
-      generator.encode_tag(name, attrs)
-      generator.encode_string(data.to_s)
-    when SOAPStruct
-      generator.encode_tag(name, attrs)
-      data.each do |key, value|
-	yield(value, false)
-      end
-    when SOAPArray
-      generator.encode_tag(name, attrs)
-      data.traverse do |child, *rank|
-	data.position = data.sparse ? rank : nil
-	yield(child, false)
-      end
-    else
-      raise EncodingStyleError.new(
-	"Unknown object:#{ data } in this encodingStyle.")
-    end
-  end
-
-  def encode_data_end(generator, ns, qualified, data, parent)
-    name = if qualified and data.elename.namespace
-        ns.name(data.elename)
-      else
-        data.elename.name
-      end
-    cr = data.is_a?(SOAPCompoundtype)
-    generator.encode_tag_end(name, cr)
-  end
-
-
-  ###
-  ## decode interface.
-  #
-  class SOAPTemporalObject
-    attr_accessor :parent
-    attr_accessor :position
-    attr_accessor :id
-    attr_accessor :root
-
-    def initialize
-      @parent = nil
-      @position = nil
-      @id = nil
-      @root = nil
-    end
-  end
-
-  class SOAPUnknown < SOAPTemporalObject
-    attr_reader :type
-    attr_accessor :definedtype
-    attr_reader :extraattr
-
-    def initialize(handler, elename, type, extraattr)
-      super()
-      @handler = handler
-      @elename = elename
-      @type = type
-      @extraattr = extraattr
-      @definedtype = nil
-    end
-
-    def as_struct
-      o = SOAPStruct.decode(@elename, @type)
-      o.id = @id
-      o.root = @root
-      o.parent = @parent
-      o.position = @position
-      o.extraattr.update(@extraattr)
-      @handler.decode_parent(@parent, o)
-      o
-    end
-
-    def as_string
-      o = SOAPString.decode(@elename)
-      o.id = @id
-      o.root = @root
-      o.parent = @parent
-      o.position = @position
-      o.extraattr.update(@extraattr)
-      @handler.decode_parent(@parent, o)
-      o
-    end
-
-    def as_nil
-      o = SOAPNil.decode(@elename)
-      o.id = @id
-      o.root = @root
-      o.parent = @parent
-      o.position = @position
-      o.extraattr.update(@extraattr)
-      @handler.decode_parent(@parent, o)
-      o
-    end
-  end
-
-  def decode_tag(ns, elename, attrs, parent)
-    # ToDo: check if @textbuf is empty...
-    @textbuf = ''
-    is_nil, type, arytype, root, offset, position, href, id, extraattr =
-      decode_attrs(ns, attrs)
-    o = nil
-    if is_nil
-      o = SOAPNil.decode(elename)
-    elsif href
-      o = SOAPReference.decode(elename, href)
-      @refpool << o
-    elsif @decode_typemap &&
-	(parent.node.class != SOAPBody || @is_first_top_ele)
-      # multi-ref element should be parsed by decode_tag_by_type.
-      @is_first_top_ele = false
-      o = decode_tag_by_wsdl(ns, elename, type, parent.node, arytype, extraattr)
-    else
-      o = decode_tag_by_type(ns, elename, type, parent.node, arytype, extraattr)
-    end
-
-    if o.is_a?(SOAPArray)
-      if offset
-	o.offset = decode_arypos(offset)
-	o.sparse = true
-      else
-	o.sparse = false
-      end
-    end
-
-    o.parent = parent
-    o.id = id
-    o.root = root
-    o.position = position
-
-    unless o.is_a?(SOAPTemporalObject)
-      @idpool << o if o.id
-      decode_parent(parent, o)
-    end
-    o
-  end
-
-  def decode_tag_end(ns, node)
-    o = node.node
-    if o.is_a?(SOAPUnknown)
-      newnode = if /\A\s*\z/ =~ @textbuf
-	o.as_struct
-      else
-	o.as_string
-      end
-      if newnode.id
-	@idpool << newnode
-      end
-      node.replace_node(newnode)
-      o = node.node
-    end
-    if o.is_a?(SOAPCompoundtype)
-      o.definedtype = nil
-    end
-
-    decode_textbuf(o)
-    @textbuf = ''
-  end
-
-  def decode_text(ns, text)
-    # @textbuf is set at decode_tag_end.
-    @textbuf << text
-  end
-
-  def decode_prologue
-    @refpool.clear
-    @idpool.clear
-    @is_first_top_ele = true
-  end
-
-  def decode_epilogue
-    decode_resolve_id
-  end
-
-  def decode_parent(parent, node)
-    case parent.node
-    when SOAPUnknown
-      newparent = parent.node.as_struct
-      node.parent = newparent
-      if newparent.id
-	@idpool << newparent
-      end
-      parent.replace_node(newparent)
-      decode_parent(parent, node)
-
-    when SOAPStruct
-      parent.node.add(node.elename.name, node)
-      node.parent = parent.node
-
-    when SOAPArray
-      if node.position
-	parent.node[*(decode_arypos(node.position))] = node
-	parent.node.sparse = true
-      else
-	parent.node.add(node)
-      end
-      node.parent = parent.node
-
-    when SOAPBasetype
-      raise EncodingStyleError.new("SOAP base type must not have a child.")
-
-    else
-      raise EncodingStyleError.new("Illegal parent: #{ parent.node }.")
-    end
-  end
-
-private
-
-  def content_ranksize(typename)
-    typename.scan(/\[[\d,]*\]$/)[0]
-  end
-
-  def content_typename(typename)
-    typename.sub(/\[,*\]$/, '')
-  end
-
-  def create_arytype(ns, data)
-    XSD::QName.new(data.arytype.namespace,
-      content_typename(data.arytype.name) << '[' << data.size.join(',') << ']')
-  end
-
-  def encode_attrs(generator, ns, data, parent)
-    return {} if data.is_a?(SOAPReference)
-    attrs = {}
-
-    if !parent || parent.encodingstyle != EncodingNamespace
-      if @generate_explicit_type
-        SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
-        attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
-      end
-      data.encodingstyle = EncodingNamespace
-    end
-
-    if data.is_a?(SOAPNil)
-      attrs[ns.name(XSD::AttrNilName)] = XSD::NilValue
-    elsif @generate_explicit_type
-      if data.type.namespace
-        SOAPGenerator.assign_ns(attrs, ns, data.type.namespace)
-      end
-      if data.is_a?(SOAPArray)
-	if data.arytype.namespace
-          SOAPGenerator.assign_ns(attrs, ns, data.arytype.namespace)
-   	end
-	SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
-	attrs[ns.name(AttrArrayTypeName)] = ns.name(create_arytype(ns, data))
-	if data.type.name
-	  attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
-	end
-      elsif parent && parent.is_a?(SOAPArray) && (parent.arytype == data.type)
-	# No need to add.
-      elsif !data.type.namespace
-	# No need to add.
-      else
-	attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
-      end
-    end
-
-    data.extraattr.each do |key, value|
-      SOAPGenerator.assign_ns(attrs, ns, key.namespace)
-      attrs[ns.name(key)] = encode_attr_value(generator, ns, key, value)
-    end
-    if data.id
-      attrs['id'] = data.id
-    end
-    attrs
-  end
-
-  def encode_attr_value(generator, ns, qname, value)
-    if value.is_a?(SOAPType)
-      refid = SOAPReference.create_refid(value)
-      value.id = refid
-      generator.add_reftarget(qname.name, value)
-      '#' + refid
-    else
-      value.to_s
-    end
-  end
-
-  def decode_tag_by_wsdl(ns, elename, typestr, parent, arytypestr, extraattr)
-    if parent.class == SOAPBody
-      # Unqualified name is allowed here.
-      type = @decode_typemap[elename] || @decode_typemap.find_name(elename.name)
-      unless type
-	raise EncodingStyleError.new("Unknown operation '#{ elename }'.")
-      end
-      o = SOAPStruct.new(elename)
-      o.definedtype = type
-      return o
-    end
-
-    if parent.type == XSD::AnyTypeName
-      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
-	extraattr)
-    end
-
-    # parent.definedtype is nil means the parent is SOAPUnknown.  SOAPUnknown is
-    # generated by decode_tag_by_type when its type is anyType.
-    parenttype = parent.definedtype || @decode_typemap[parent.type]
-    unless parenttype
-      raise EncodingStyleError.new("Unknown type '#{ parent.type }'.")
-    end
-    typename = parenttype.child_type(elename)
-    if typename
-      if (klass = TypeMap[typename])
-	return klass.decode(elename)
-      elsif typename == XSD::AnyTypeName
-	return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
-	  extraattr)
-      end
-    end
-
-    type = if typename
-	@decode_typemap[typename]
-      else
-	parenttype.child_defined_complextype(elename)
-      end
-    unless type
-      raise EncodingStyleError.new("Unknown type '#{ typename }'.")
-    end
-
-    case type.compoundtype
-    when :TYPE_STRUCT
-      o = SOAPStruct.decode(elename, typename)
-      o.definedtype = type
-      return o
-    when :TYPE_ARRAY
-      expected_arytype = type.find_arytype
-      actual_arytype = if arytypestr
-	  XSD::QName.new(expected_arytype.namespace,
-	    content_typename(expected_arytype.name) <<
-	    content_ranksize(arytypestr))
-	else
-       	  expected_arytype
-	end
-      o = SOAPArray.decode(elename, typename, actual_arytype)
-      o.definedtype = type
-      return o
-    end
-    return nil
-  end
-
-  def decode_tag_by_type(ns, elename, typestr, parent, arytypestr, extraattr)
-    if arytypestr
-      type = typestr ? ns.parse(typestr) : ValueArrayName
-      node = SOAPArray.decode(elename, type, ns.parse(arytypestr))
-      node.extraattr.update(extraattr)
-      return node
-    end
-
-    type = nil
-    if typestr
-      type = ns.parse(typestr)
-    elsif parent.is_a?(SOAPArray)
-      type = parent.arytype
-    else
-      # Since it's in dynamic(without any type) encoding process,
-      # assumes entity as its type itself.
-      #   <SOAP-ENC:Array ...> => type Array in SOAP-ENC.
-      #   <Country xmlns="foo"> => type Country in foo.
-      type = elename
-    end
-
-    if (klass = TypeMap[type])
-      node = klass.decode(elename)
-      node.extraattr.update(extraattr)
-      return node
-    end
-
-    # Unknown type... Struct or String
-    SOAPUnknown.new(self, elename, type, extraattr)
-  end
-
-  def decode_textbuf(node)
-    case node
-    when XSD::XSDHexBinary, XSD::XSDBase64Binary
-      node.set_encoded(@textbuf)
-    when XSD::XSDString
-      if @charset
-	node.set(XSD::Charset.encoding_from_xml(@textbuf, @charset))
-      else
-	node.set(@textbuf)
-      end
-    when SOAPNil
-      # Nothing to do.
-    when SOAPBasetype
-      node.set(@textbuf)
-    else
-      # Nothing to do...
-    end
-  end
-
-  NilLiteralMap = {
-    'true' => true,
-    '1' => true,
-    'false' => false,
-    '0' => false
-  }
-  RootLiteralMap = {
-    '1' => 1,
-    '0' => 0
-  }
-  def decode_attrs(ns, attrs)
-    is_nil = false
-    type = nil
-    arytype = nil
-    root = nil
-    offset = nil
-    position = nil
-    href = nil
-    id = nil
-    extraattr = {}
-
-    attrs.each do |key, value|
-      qname = ns.parse(key)
-      case qname.namespace
-      when XSD::InstanceNamespace
-        case qname.name
-        when XSD::NilLiteral
-          is_nil = NilLiteralMap[value] or
-            raise EncodingStyleError.new("Cannot accept attribute value: #{ value } as the value of xsi:#{ XSD::NilLiteral } (expected 'true', 'false', '1', or '0').")
-          next
-        when XSD::AttrType
-          type = value
-          next
-        end
-      when EncodingNamespace
-        case qname.name
-        when AttrArrayType
-          arytype = value
-          next
-        when AttrRoot
-          root = RootLiteralMap[value] or
-            raise EncodingStyleError.new(
-	      "Illegal root attribute value: #{ value }.")
-          next
-        when AttrOffset
-          offset = value
-          next
-        when AttrPosition
-          position = value
-          next
-        end
-      end
-      if key == 'href'
-        href = value
-        next
-      elsif key == 'id'
-        id = value
-        next
-      end
-      extraattr[qname] = decode_attr_value(ns, qname, value)
-    end
-
-    return is_nil, type, arytype, root, offset, position, href, id, extraattr
-  end
-
-  def decode_attr_value(ns, qname, value)
-    if /\A#/ =~ value
-      o = SOAPReference.new(value)
-      @refpool << o
-      o
-    else
-      value
-    end
-  end
-
-  def decode_arypos(position)
-    /^\[(.+)\]$/ =~ position
-    $1.split(',').collect { |s| s.to_i }
-  end
-
-  def decode_resolve_id
-    count = @refpool.length	# To avoid infinite loop
-    while !@refpool.empty? && count > 0
-      @refpool = @refpool.find_all { |ref|
-	o = @idpool.find { |item|
-	  '#' + item.id == ref.refid
-	}
-	unless o
-	  raise EncodingStyleError.new("Unresolved reference: #{ ref.refid }.")
-	end
-	if o.is_a?(SOAPReference)
-	  true
-	else
-	  ref.__setobj__(o)
-	  false
-	end
-      }
-      count -= 1
-    end
-  end
-end
-
-SOAPHandler.new
-
-
-end
-end
diff --git a/lib/soap/generator.rb b/lib/soap/generator.rb
deleted file mode 100644
index 7ddb105f7d..0000000000
--- a/lib/soap/generator.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-=begin
-SOAP4R - SOAP XML Instance Generator library.
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/ns'
-require 'soap/soap'
-require 'soap/baseData'
-require 'soap/encodingstyle/handler'
-
-
-module SOAP
-
-
-###
-## CAUTION: MT-unsafe
-#
-class SOAPGenerator
-  include SOAP
-
-  class FormatEncodeError < Error; end
-
-public
-
-  attr_accessor :charset
-  attr_accessor :default_encodingstyle
-  attr_accessor :generate_explicit_type
-
-  def initialize(opt = {})
-    @reftarget = nil
-    @handlers = {}
-    @charset = opt[:charset] || XSD::Charset.encoding_label
-    @default_encodingstyle = opt[:default_encodingstyle] || EncodingNamespace
-    @generate_explicit_type =
-      opt.key?(:generate_explicit_type) ? opt[:generate_explicit_type] : true
-    @buf = @indent = @curr = nil
-  end
-
-  def generate(obj, io = nil)
-    @buf = io || ''
-    @indent = ''
-
-    prologue
-    @handlers.each do |uri, handler|
-      handler.encode_prologue
-    end
-
-    ns = XSD::NS.new
-    @buf << xmldecl
-    encode_data(ns, true, obj, nil)
-
-    @handlers.each do |uri, handler|
-      handler.encode_epilogue
-    end
-    epilogue
-
-    @buf
-  end
-
-  def encode_data(ns, qualified, obj, parent)
-    if obj.is_a?(SOAPEnvelopeElement)
-      encode_element(ns, qualified, obj, parent)
-      return
-    end
-
-    if @reftarget && !obj.precedents.empty?
-      add_reftarget(obj.elename.name, obj)
-      ref = SOAPReference.new
-      ref.elename.name = obj.elename.name
-      ref.__setobj__(obj)
-      obj.precedents.clear	# Avoid cyclic delay.
-      obj.encodingstyle = parent.encodingstyle
-      # SOAPReference is encoded here.
-      obj = ref
-    end
-
-    encodingstyle = obj.encodingstyle
-    # Children's encodingstyle is derived from its parent.
-    encodingstyle ||= parent.encodingstyle if parent
-    obj.encodingstyle = encodingstyle
-
-    handler = find_handler(encodingstyle || @default_encodingstyle)
-    unless handler
-      raise FormatEncodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
-    end
-
-    if !obj.elename.name
-      raise FormatEncodeError.new("Element name not defined: #{ obj }.")
-    end
-
-    handler.encode_data(self, ns, qualified, obj, parent) do |child, child_q|
-      indent_backup, @indent = @indent, @indent + '  '
-      encode_data(ns.clone_ns, child_q, child, obj)
-      @indent = indent_backup
-    end
-    handler.encode_data_end(self, ns, qualified, obj, parent)
-  end
-
-  def add_reftarget(name, node)
-    unless @reftarget
-      raise FormatEncodeError.new("Reftarget is not defined.")
-    end
-    @reftarget.add(name, node)
-  end
-
-  def encode_element(ns, qualified, obj, parent)
-    attrs = {}
-    if obj.is_a?(SOAPBody)
-      @reftarget = obj
-      obj.encode(self, ns, attrs) do |child, child_q|
-	indent_backup, @indent = @indent, @indent + '  '
-        encode_data(ns.clone_ns, child_q, child, obj)
-	@indent = indent_backup
-      end
-      @reftarget = nil
-    else
-      if obj.is_a?(SOAPEnvelope)
-        # xsi:nil="true" can appear even if dumping without explicit type.
-        SOAPGenerator.assign_ns(attrs, ns,
-	  XSD::InstanceNamespace, XSINamespaceTag)
-        if @generate_explicit_type
-          SOAPGenerator.assign_ns(attrs, ns, XSD::Namespace, XSDNamespaceTag)
-        end
-      end
-      obj.encode(self, ns, attrs) do |child, child_q|
-	indent_backup, @indent = @indent, @indent + '  '
-        encode_data(ns.clone_ns, child_q, child, obj)
-	@indent = indent_backup
-      end
-    end
-  end
-
-  def encode_tag(elename, attrs = nil)
-    if !attrs or attrs.empty?
-      @buf << "\n#{ @indent }<#{ elename }>"
-    elsif attrs.size == 1
-      key, value = attrs.shift
-      @buf << %Q[\n#{ @indent }<#{ elename } #{ key }="#{ value }">]
-    else
-      @buf << "\n#{ @indent }<#{ elename } " <<
-        attrs.collect { |key, value|
-          %Q[#{ key }="#{ value }"]
-        }.join("\n#{ @indent }    ") <<
-	'>'
-    end
-  end
-
-  def encode_tag_end(elename, cr = nil)
-    if cr
-      @buf << "\n#{ @indent }</#{ elename }>"
-    else
-      @buf << "</#{ elename }>"
-    end
-  end
-
-  def encode_rawstring(str)
-    @buf << str
-  end
-
-  EncodeMap = {
-    '&' => '&amp;',
-    '<' => '&lt;',
-    '>' => '&gt;',
-    '"' => '&quot;',
-    '\'' => '&apos;',
-    "\r" => '&#xd;'
-  }
-  EncodeCharRegexp = Regexp.new("[#{EncodeMap.keys.join}]")
-  def encode_string(str)
-    @buf << str.gsub(EncodeCharRegexp) { |c| EncodeMap[c] }
-  end
-
-  def self.assign_ns(attrs, ns, namespace, tag = nil)
-    if namespace and !ns.assigned?(namespace)
-      tag = ns.assign(namespace, tag)
-      attrs['xmlns:' << tag] = namespace
-    end
-  end
-
-private
-
-  def prologue
-  end
-
-  def epilogue
-  end
-
-  def find_handler(encodingstyle)
-    unless @handlers.key?(encodingstyle)
-      handler = SOAP::EncodingStyle::Handler.handler(encodingstyle).new(@charset)
-      handler.generate_explicit_type = @generate_explicit_type
-      handler.encode_prologue
-      @handlers[encodingstyle] = handler
-    end
-    @handlers[encodingstyle]
-  end
-
-  def xmldecl
-    if @charset
-      %Q[<?xml version="1.0" encoding="#{ @charset }" ?>]
-    else
-      %Q[<?xml version="1.0" ?>]
-    end
-  end
-end
-
-
-end
diff --git a/lib/soap/mapping.rb b/lib/soap/mapping.rb
deleted file mode 100644
index 8da1978a4f..0000000000
--- a/lib/soap/mapping.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-=begin
-SOAP4R - Ruby type mapping utility.
-Copyright (C) 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/mapping/mapping'
-require 'soap/mapping/registry'
diff --git a/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb
deleted file mode 100644
index 6a34da55a8..0000000000
--- a/lib/soap/mapping/factory.rb
+++ /dev/null
@@ -1,347 +0,0 @@
-=begin
-SOAP4R - Mapping factory.
-Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module SOAP
-module Mapping
-
-
-class Factory
-  include TraverseSupport
-
-  def initialize
-    # nothing to do
-  end
-
-  def obj2soap(soap_class, obj, info, map)
-    raise NotImplementError.new
-    # return soap_obj
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    raise NotImplementError.new
-    # return convert_succeeded_or_not, obj
-  end
-
-  if Object.respond_to?(:allocate)
-    # ruby/1.7 or later.
-    def create_empty_object(klass)
-      klass.allocate
-    end
-  else
-    def create_empty_object(klass)
-      name = klass.name
-      # Below line is from TANAKA, Akira's amarshal.rb.
-      # See http://cvs.m17n.org/cgi-bin/viewcvs/amarshal/?cvsroot=ruby
-      ::Marshal.load(sprintf("\004\006o:%c%s\000", name.length + 5, name))
-    end
-  end
-
-  def setiv2obj(obj, node, map)
-    return if node.nil?
-    vars = {}
-    node.each do |name, value|
-      vars[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
-    end
-    Mapping.set_instance_vars(obj, vars)
-  end
-
-  def setiv2soap(node, obj, map)
-    obj.instance_variables.each do |var|
-      name = var.sub(/^@/, '')
-      node.add(Mapping.name2elename(name),
-        Mapping._obj2soap(obj.instance_eval(var), map))
-    end
-  end
-
-  # It breaks Thread.current[:SOAPMarshalDataKey].
-  def mark_marshalled_obj(obj, soap_obj)
-    Thread.current[:SOAPMarshalDataKey][obj.__id__] = soap_obj
-  end
-
-  # It breaks Thread.current[:SOAPMarshalDataKey].
-  def mark_unmarshalled_obj(node, obj)
-    Thread.current[:SOAPMarshalDataKey][node.id] = obj
-  end
-
-  def name2typename(name)
-    capitalize(name)
-  end
-
-  def capitalize(target)
-    target.gsub(/^([a-z])/) { $1.tr!('[a-z]', '[A-Z]') }
-  end
-end
-
-class StringFactory_ < Factory
-  def initialize(allow_original_mapping = false)
-    super()
-    @allow_original_mapping = allow_original_mapping
-  end
-
-  def obj2soap(soap_class, obj, info, map)
-    if !@allow_original_mapping and !obj.instance_variables.empty?
-      return nil
-    end
-    begin
-      unless XSD::Charset.is_ces(obj, $KCODE)
-	return nil
-      end
-      encoded = XSD::Charset.encoding_conv(obj, $KCODE, XSD::Charset.encoding)
-      soap_obj = soap_class.new(encoded)
-    rescue XSD::ValueSpaceError
-      return nil
-    end
-    mark_marshalled_obj(obj, soap_obj)
-    soap_obj
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    obj = create_empty_object(obj_class)
-    decoded = XSD::Charset.encoding_conv(node.data, XSD::Charset.encoding, $KCODE)
-    obj.replace(decoded)
-    mark_unmarshalled_obj(node, obj)
-    return true, obj
-  end
-end
-
-class BasetypeFactory_ < Factory
-  def initialize(allow_original_mapping = false)
-    super()
-    @allow_original_mapping = allow_original_mapping
-  end
-
-  def obj2soap(soap_class, obj, info, map)
-    if !@allow_original_mapping and !obj.instance_variables.empty?
-      return nil
-    end
-    soap_obj = nil
-    begin
-      soap_obj = soap_class.new(obj)
-    rescue XSD::ValueSpaceError
-      return nil
-    end
-    # Basetype except String should not be multiref-ed in SOAP/1.1.
-    soap_obj
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    obj = node.data
-    mark_unmarshalled_obj(node, obj)
-    return true, obj
-  end
-end
-
-class DateTimeFactory_ < Factory
-  def initialize(allow_original_mapping = false)
-    super()
-    @allow_original_mapping = allow_original_mapping
-  end
-
-  def obj2soap(soap_class, obj, info, map)
-    if !@allow_original_mapping and
-	Time === obj and !obj.instance_variables.empty?
-      return nil
-    end
-    soap_obj = nil
-    begin
-      soap_obj = soap_class.new(obj)
-    rescue XSD::ValueSpaceError
-      return nil
-    end
-    mark_marshalled_obj(obj, soap_obj)
-    soap_obj
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    obj = nil
-    if obj_class == Time
-      obj = node.to_time
-      if obj.nil?
-        # Is out of range as a Time
-        return false
-      end
-    elsif obj_class == Date
-      obj = node.data
-    else
-      return false
-    end
-    mark_unmarshalled_obj(node, obj)
-    return true, obj
-  end
-end
-
-class Base64Factory_ < Factory
-  def obj2soap(soap_class, obj, info, map)
-    return nil unless obj.instance_variables.empty?
-    soap_obj = soap_class.new(obj)
-    mark_marshalled_obj(obj, soap_obj) if soap_obj
-    soap_obj
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    obj = node.string
-    mark_unmarshalled_obj(node, obj)
-    return true, obj
-  end
-end
-
-class ArrayFactory_ < Factory
-  def initialize(allow_original_mapping = false)
-    super()
-    @allow_original_mapping = allow_original_mapping
-  end
-
-  # [[1], [2]] is converted to Array of Array, not 2-D Array.
-  # To create M-D Array, you must call Mapping.ary2md.
-  def obj2soap(soap_class, obj, info, map)
-    if !@allow_original_mapping and !obj.instance_variables.empty?
-      return nil
-    end
-    arytype = Mapping.obj2element(obj)
-    if arytype.name
-      arytype.namespace ||= RubyTypeNamespace
-    else
-      arytype = XSD::AnyTypeName
-    end
-    param = SOAPArray.new(ValueArrayName, 1, arytype)
-    mark_marshalled_obj(obj, param)
-    obj.each do |var|
-      param.add(Mapping._obj2soap(var, map))
-    end
-    param
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    obj = create_empty_object(obj_class)
-    mark_unmarshalled_obj(node, obj)
-    node.soap2array(obj) do |elem|
-      elem ? Mapping._soap2obj(elem, map) : nil
-    end
-    return true, obj
-  end
-end
-
-class TypedArrayFactory_ < Factory
-  def initialize(allow_original_mapping = false)
-    super()
-    @allow_original_mapping = allow_original_mapping
-  end
-
-  def obj2soap(soap_class, obj, info, map)
-    if !@allow_original_mapping and !obj.instance_variables.empty?
-      return nil
-    end
-    arytype = info[:type] || info[0]
-    param = SOAPArray.new(ValueArrayName, 1, arytype)
-    mark_marshalled_obj(obj, param)
-    obj.each do |var|
-      param.add(Mapping._obj2soap(var, map))
-    end
-    param
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    if node.rank > 1
-      return false
-    end
-    arytype = info[:type] || info[0]
-    unless node.arytype == arytype
-      return false
-    end
-    obj = create_empty_object(obj_class)
-    mark_unmarshalled_obj(node, obj)
-    node.soap2array(obj) do |elem|
-      elem ? Mapping._soap2obj(elem, map) : nil
-    end
-    return true, obj
-  end
-end
-
-class TypedStructFactory_ < Factory
-  def obj2soap(soap_class, obj, info, map)
-    type = info[:type] || info[0]
-    param = soap_class.new(type)
-    mark_marshalled_obj(obj, param)
-    if obj.class <= SOAP::Marshallable
-      setiv2soap(param, obj, map)
-    else
-      setiv2soap(param, obj, map)
-    end
-    param
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    type = info[:type] || info[0]
-    unless node.type == type
-      return false
-    end
-    obj = create_empty_object(obj_class)
-    mark_unmarshalled_obj(node, obj)
-    setiv2obj(obj, node, map)
-    return true, obj
-  end
-end
-
-MapQName = XSD::QName.new(ApacheSOAPTypeNamespace, 'Map')
-class HashFactory_ < Factory
-  def initialize(allow_original_mapping = false)
-    super()
-    @allow_original_mapping = allow_original_mapping
-  end
-
-  def obj2soap(soap_class, obj, info, map)
-    if !@allow_original_mapping and !obj.instance_variables.empty?
-      return nil
-    end
-    if !obj.default.nil? or
-	(obj.respond_to?(:default_proc) and obj.default_proc)
-      return nil
-    end
-    param = SOAPStruct.new(MapQName)
-    mark_marshalled_obj(obj, param)
-    obj.each do |key, value|
-      elem = SOAPStruct.new
-      elem.add("key", Mapping._obj2soap(key, map))
-      elem.add("value", Mapping._obj2soap(value, map))
-      # ApacheAxis allows only 'item' here.
-      param.add("item", elem)
-    end
-    param
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    unless node.type == MapQName
-      return false
-    end
-    if node.key?('default')
-      return false
-    end
-    obj = create_empty_object(obj_class)
-    mark_unmarshalled_obj(node, obj)
-    node.each do |key, value|
-      obj[Mapping._soap2obj(value['key'], map)] =
-	Mapping._soap2obj(value['value'], map)
-    end
-    return true, obj
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb
deleted file mode 100644
index f660c2c63f..0000000000
--- a/lib/soap/mapping/mapping.rb
+++ /dev/null
@@ -1,228 +0,0 @@
-=begin
-SOAP4R - Ruby type mapping utility.
-Copyright (C) 2000, 2001, 2003 NAKAMURA Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module SOAP
-
-
-module Mapping
-  RubyTypeNamespace = 'http://www.ruby-lang.org/xmlns/ruby/type/1.6'
-  RubyTypeInstanceNamespace =
-    'http://www.ruby-lang.org/xmlns/ruby/type-instance'
-  RubyCustomTypeNamespace = 'http://www.ruby-lang.org/xmlns/ruby/type/custom'
-  ApacheSOAPTypeNamespace = 'http://xml.apache.org/xml-soap'
-
-
-  # TraverseSupport breaks Thread.current[:SOAPMarshalDataKey].
-  module TraverseSupport
-    def mark_marshalled_obj(obj, soap_obj)
-      Thread.current[:SOAPMarshalDataKey][obj.__id__] = soap_obj
-    end
-
-    def mark_unmarshalled_obj(node, obj)
-      # node.id is not Object#id but SOAPReference#id
-      Thread.current[:SOAPMarshalDataKey][node.id] = obj
-    end
-  end
-
-
-  def self.obj2soap(obj, registry = nil, type = nil)
-    registry ||= Mapping::DefaultRegistry
-    Thread.current[:SOAPMarshalDataKey] = {}
-    soap_obj = _obj2soap(obj, registry, type)
-    Thread.current[:SOAPMarshalDataKey] = nil
-    soap_obj
-  end
-
-  def self.soap2obj(node, registry = nil)
-    registry ||= Mapping::DefaultRegistry
-    Thread.current[:SOAPMarshalDataKey] = {}
-    obj = _soap2obj(node, registry)
-    Thread.current[:SOAPMarshalDataKey] = nil
-    obj
-  end
-
-  def self.ary2soap(ary, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil)
-    registry ||= Mapping::DefaultRegistry
-    type = XSD::QName.new(type_ns, typename)
-    soap_ary = SOAPArray.new(ValueArrayName, 1, type)
-    Thread.current[:SOAPMarshalDataKey] = {}
-    ary.each do |ele|
-      soap_ary.add(_obj2soap(ele, registry, type))
-    end
-    Thread.current[:SOAPMarshalDataKey] = nil
-    soap_ary
-  end
-
-  def self.ary2md(ary, rank, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil)
-    registry ||= Mapping::DefaultRegistry
-    type = XSD::QName.new(type_ns, typename)
-    md_ary = SOAPArray.new(ValueArrayName, rank, type)
-    Thread.current[:SOAPMarshalDataKey] = {}
-    add_md_ary(md_ary, ary, [], registry)
-    Thread.current[:SOAPMarshalDataKey] = nil
-    md_ary
-  end
-
-  def self.fault2exception(e, registry = nil)
-    registry ||= Mapping::DefaultRegistry
-    detail = if e.detail
-        soap2obj(e.detail, registry) || ""
-      else
-        ""
-      end
-    if detail.is_a?(Mapping::SOAPException)
-      begin
-        raise detail.to_e
-      rescue Exception => e2
-        detail.set_backtrace(e2)
-        raise
-      end
-    else
-      e.detail = detail
-      e.set_backtrace(
-        if detail.is_a?(Array)
-	  detail
-        else
-          [detail.to_s]
-        end
-      )
-      raise
-    end
-  end
-
-  def self._obj2soap(obj, registry, type = nil)
-    if referent = Thread.current[:SOAPMarshalDataKey][obj.__id__]
-      soap_obj = SOAPReference.new
-      soap_obj.__setobj__(referent)
-      soap_obj
-    else
-      registry.obj2soap(obj.class, obj, type)
-    end
-  end
-
-  def self._soap2obj(node, registry)
-    if node.is_a?(SOAPReference)
-      target = node.__getobj__
-      # target.id is not Object#id but SOAPReference#id
-      if referent = Thread.current[:SOAPMarshalDataKey][target.id]
-        return referent
-      else
-        return _soap2obj(target, registry)
-      end
-    end
-    return registry.soap2obj(node.class, node)
-  end
-
-  def self.set_instance_vars(obj, values)
-    values.each do |name, value|
-      setter = name + "="
-      if obj.respond_to?(setter)
-	obj.__send__(setter, value)
-      else
-	obj.instance_eval("@#{ name } = value")
-      end
-    end
-  end
-
-  # Allow only (Letter | '_') (Letter | Digit | '-' | '_')* here.
-  # Caution: '.' is not allowed here.
-  # To follow XML spec., it should be NCName.
-  #   (denied chars) => .[0-F][0-F]
-  #   ex. a.b => a.2eb
-  #
-  def self.name2elename(name)
-    name.gsub(/([^a-zA-Z0-9:_\-]+)/n) {
-      '.' << $1.unpack('H2' * $1.size).join('.')
-    }.gsub(/::/n, '..')
-  end
-
-  def self.elename2name(name)
-    name.gsub(/\.\./n, '::').gsub(/((?:\.[0-9a-fA-F]{2})+)/n) {
-      [$1.delete('.')].pack('H*')
-    }
-  end
-
-  def self.class_from_name(name)
-    if /^[A-Z]/ !~ name
-      return nil
-    end
-    klass = ::Object
-    name.split('::').each do |klass_str|
-      if klass.const_defined?(klass_str)
-        klass = klass.const_get(klass_str)
-      else
-        return nil
-      end
-    end
-    klass
-  end
-
-  def self.class2qname(klass)
-    name = if klass.class_variables.include?("@@schema_type")
-        klass.class_eval("@@schema_type")
-      else
-        nil
-      end
-    namespace = if klass.class_variables.include?("@@schema_ns")
-        klass.class_eval("@@schema_ns")
-      else
-        nil
-      end
-    XSD::QName.new(namespace, name)
-  end
-
-  def self.class2element(klass)
-    type = Mapping.class2qname(klass)
-    type.name ||= Mapping.name2elename(klass.name)
-    type.namespace ||= RubyCustomTypeNamespace
-    type
-  end
-
-  def self.obj2element(obj)
-    name = namespace = nil
-    ivars = obj.instance_variables
-    if ivars.include?("@schema_type")
-      name = obj.instance_eval("@schema_type")
-    end
-    if ivars.include?("@schema_ns")
-      namespace = obj.instance_eval("@schema_ns")
-    end
-    if !name or !namespace
-      class2qname(obj.class)
-    else
-      XSD::QName.new(namespace, name)
-    end
-  end
-
-  class << Mapping
-  private
-    def add_md_ary(md_ary, ary, indices, registry)
-      for idx in 0..(ary.size - 1)
-        if ary[idx].is_a?(Array)
-          add_md_ary(md_ary, ary[idx], indices + [idx], registry)
-        else
-          md_ary[*(indices + [idx])] = _obj2soap(ary[idx], registry)
-        end
-      end
-    end
-  end
-end
-
-
-end
diff --git a/lib/soap/mapping/registry.rb b/lib/soap/mapping/registry.rb
deleted file mode 100644
index bdf14d4fc6..0000000000
--- a/lib/soap/mapping/registry.rb
+++ /dev/null
@@ -1,457 +0,0 @@
-=begin
-SOAP4R - Mapping registry.
-Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/baseData'
-require 'soap/mapping/mapping'
-require 'soap/mapping/typeMap'
-require 'soap/mapping/factory'
-require 'soap/mapping/rubytypeFactory'
-
-
-module SOAP
-
-
-module Marshallable
-  # @@type_ns = Mapping::RubyCustomTypeNamespace
-end
-
-
-module Mapping
-
-  
-module MappedException; end
-
-
-RubyTypeName = XSD::QName.new(RubyTypeInstanceNamespace, 'rubyType')
-RubyExtendName = XSD::QName.new(RubyTypeInstanceNamespace, 'extends')
-RubyIVarName = XSD::QName.new(RubyTypeInstanceNamespace, 'ivars')
-
-
-# Inner class to pass an exception.
-class SOAPException; include Marshallable
-  attr_reader :excn_type_name, :message, :backtrace, :cause
-  def initialize(e)
-    @excn_type_name = Mapping.name2elename(e.class.to_s)
-    @message = e.message
-    @backtrace = e.backtrace
-    @cause = e
-  end
-
-  def to_e
-    if @cause.is_a?(::Exception)
-      @cause.extend(::SOAP::Mapping::MappedException)
-      return @cause
-    end
-    klass = Mapping.class_from_name(
-      Mapping.elename2name(@excn_type_name.to_s))
-    if klass.nil?
-      raise RuntimeError.new(@message)
-    end
-    unless klass <= ::Exception
-      raise NameError.new
-    end
-    obj = klass.new(@message)
-    obj.extend(::SOAP::Mapping::MappedException)
-    obj
-  end
-
-  def set_backtrace(e)
-    e.set_backtrace(
-      if @backtrace.is_a?(Array)
-        @backtrace
-      else
-        [@backtrace.inspect]
-      end
-  )
-  end
-end
-
-
-# For anyType object: SOAP::Mapping::Object not ::Object
-class Object; include Marshallable
-  def set_property(name, value)
-    var_name = name
-    begin
-      instance_eval <<-EOS
-        def #{ var_name }
-          @#{ var_name }
-        end
-
-        def #{ var_name }=(value)
-          @#{ var_name } = value
-        end
-      EOS
-      self.send(var_name + '=', value)
-    rescue SyntaxError
-      var_name = safe_name(var_name)
-      retry
-    end
-
-    var_name
-  end
-
-  def members
-    instance_variables.collect { |str| str[1..-1] }
-  end
-
-  def [](name)
-    if self.respond_to?(name)
-      self.send(name)
-    else
-      self.send(safe_name(name))
-    end
-  end
-
-  def []=(name, value)
-    if self.respond_to?(name)
-      self.send(name + '=', value)
-    else
-      self.send(safe_name(name) + '=', value)
-    end
-  end
-
-private
-
-  def safe_name(name)
-    require 'md5'
-    "var_" << MD5.new(name).hexdigest
-  end
-end
-
-
-class MappingError < Error; end
-
-
-class Registry
-  class Map
-    def initialize(registry)
-      @map = []
-      @registry = registry
-    end
-
-    def obj2soap(klass, obj)
-      @map.each do |obj_class, soap_class, factory, info|
-        if klass == obj_class or
-            (info[:derived_class] and klass <= obj_class)
-          ret = factory.obj2soap(soap_class, obj, info, @registry)
-          return ret if ret
-        end
-      end
-      nil
-    end
-
-    def soap2obj(klass, node)
-      @map.each do |obj_class, soap_class, factory, info|
-        if klass == soap_class or
-            (info[:derived_class] and klass <= soap_class)
-          conv, obj = factory.soap2obj(obj_class, node, info, @registry)
-          return true, obj if conv
-        end
-      end
-      return false
-    end
-
-    # Give priority to former entry.
-    def init(init_map = [])
-      clear
-      init_map.reverse_each do |obj_class, soap_class, factory, info|
-        add(obj_class, soap_class, factory, info)
-      end
-    end
-
-    # Give priority to latter entry.
-    def add(obj_class, soap_class, factory, info)
-      info ||= {}
-      @map.unshift([obj_class, soap_class, factory, info])
-    end
-
-    def clear
-      @map.clear
-    end
-
-    def find_mapped_soap_class(target_obj_class)
-      @map.each do |obj_class, soap_class, factory, info|
-        if obj_class == target_obj_class
-          return soap_class
-        end
-      end
-      nil
-    end
-
-    def find_mapped_obj_class(target_soap_class)
-      @map.each do |obj_class, soap_class, factory, info|
-        if soap_class == target_soap_class
-          return obj_class
-        end
-      end
-      nil
-    end
-  end
-
-  StringFactory = StringFactory_.new
-  BasetypeFactory = BasetypeFactory_.new
-  DateTimeFactory = DateTimeFactory_.new
-  ArrayFactory = ArrayFactory_.new
-  Base64Factory = Base64Factory_.new
-  TypedArrayFactory = TypedArrayFactory_.new
-  TypedStructFactory = TypedStructFactory_.new
-
-  HashFactory = HashFactory_.new
-
-  SOAPBaseMap = [
-    [::NilClass,     ::SOAP::SOAPNil,        BasetypeFactory],
-    [::TrueClass,    ::SOAP::SOAPBoolean,    BasetypeFactory],
-    [::FalseClass,   ::SOAP::SOAPBoolean,    BasetypeFactory],
-    [::String,       ::SOAP::SOAPString,     StringFactory],
-    [::DateTime,     ::SOAP::SOAPDateTime,   DateTimeFactory],
-    [::Date,         ::SOAP::SOAPDateTime,   DateTimeFactory],
-    [::Date,         ::SOAP::SOAPDate,       DateTimeFactory],
-    [::Time,         ::SOAP::SOAPDateTime,   DateTimeFactory],
-    [::Time,         ::SOAP::SOAPTime,       DateTimeFactory],
-    [::Float,        ::SOAP::SOAPDouble,     BasetypeFactory,
-      {:derived_class => true}],
-    [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
-      {:derived_class => true}],
-    [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
-      {:derived_class => true}],
-    [::Integer,      ::SOAP::SOAPLong,       BasetypeFactory,
-      {:derived_class => true}],
-    [::Integer,      ::SOAP::SOAPInteger,    BasetypeFactory,
-      {:derived_class => true}],
-    [::Integer,      ::SOAP::SOAPShort,      BasetypeFactory,
-      {:derived_class => true}],
-    [::URI::Generic, ::SOAP::SOAPAnyURI,     BasetypeFactory,
-      {:derived_class => true}],
-    [::String,       ::SOAP::SOAPBase64,     Base64Factory],
-    [::String,       ::SOAP::SOAPHexBinary,  Base64Factory],
-    [::String,       ::SOAP::SOAPDecimal,    BasetypeFactory],
-    [::String,       ::SOAP::SOAPDuration,   BasetypeFactory],
-    [::String,       ::SOAP::SOAPGYearMonth, BasetypeFactory],
-    [::String,       ::SOAP::SOAPGYear,      BasetypeFactory],
-    [::String,       ::SOAP::SOAPGMonthDay,  BasetypeFactory],
-    [::String,       ::SOAP::SOAPGDay,       BasetypeFactory],
-    [::String,       ::SOAP::SOAPGMonth,     BasetypeFactory],
-    [::String,       ::SOAP::SOAPQName,      BasetypeFactory],
-
-    [::Array,        ::SOAP::SOAPArray,      ArrayFactory,
-      {:derived_class => true}],
-
-    [::Hash,         ::SOAP::SOAPStruct,     HashFactory],
-    [::SOAP::Mapping::SOAPException,
-		     ::SOAP::SOAPStruct,     TypedStructFactory,
-      {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}],
- ]
-
-  RubyOriginalMap = [
-    [::NilClass,     ::SOAP::SOAPNil,        BasetypeFactory],
-    [::TrueClass,    ::SOAP::SOAPBoolean,    BasetypeFactory],
-    [::FalseClass,   ::SOAP::SOAPBoolean,    BasetypeFactory],
-    [::String,       ::SOAP::SOAPString,     StringFactory],
-    [::DateTime,     ::SOAP::SOAPDateTime,   DateTimeFactory],
-    [::Date,         ::SOAP::SOAPDateTime,   DateTimeFactory],
-    [::Date,         ::SOAP::SOAPDate,       DateTimeFactory],
-    [::Time,         ::SOAP::SOAPDateTime,   DateTimeFactory],
-    [::Time,         ::SOAP::SOAPTime,       DateTimeFactory],
-    [::Float,        ::SOAP::SOAPDouble,     BasetypeFactory,
-      {:derived_class => true}],
-    [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
-      {:derived_class => true}],
-    [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
-      {:derived_class => true}],
-    [::Integer,      ::SOAP::SOAPLong,       BasetypeFactory,
-      {:derived_class => true}],
-    [::Integer,      ::SOAP::SOAPInteger,    BasetypeFactory,
-      {:derived_class => true}],
-    [::Integer,      ::SOAP::SOAPShort,      BasetypeFactory,
-      {:derived_class => true}],
-    [::URI::Generic, ::SOAP::SOAPAnyURI,     BasetypeFactory,
-      {:derived_class => true}],
-    [::String,       ::SOAP::SOAPBase64,     Base64Factory],
-    [::String,       ::SOAP::SOAPHexBinary,  Base64Factory],
-    [::String,       ::SOAP::SOAPDecimal,    BasetypeFactory],
-    [::String,       ::SOAP::SOAPDuration,   BasetypeFactory],
-    [::String,       ::SOAP::SOAPGYearMonth, BasetypeFactory],
-    [::String,       ::SOAP::SOAPGYear,      BasetypeFactory],
-    [::String,       ::SOAP::SOAPGMonthDay,  BasetypeFactory],
-    [::String,       ::SOAP::SOAPGDay,       BasetypeFactory],
-    [::String,       ::SOAP::SOAPGMonth,     BasetypeFactory],
-    [::String,       ::SOAP::SOAPQName,      BasetypeFactory],
-
-    # Does not allow Array's subclass here.
-    [::Array,        ::SOAP::SOAPArray,      ArrayFactory],
-
-    [::Hash,         ::SOAP::SOAPStruct,     HashFactory],
-    [::SOAP::Mapping::SOAPException,
-                     ::SOAP::SOAPStruct,     TypedStructFactory,
-      {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}],
-  ]
-
-  def initialize(config = {})
-    @config = config
-    @map = Map.new(self)
-    if @config[:allow_original_mapping]
-      @allow_original_mapping = true
-      @map.init(RubyOriginalMap)
-    else
-      @allow_original_mapping = false
-      @map.init(SOAPBaseMap)
-    end
-
-    @allow_untyped_struct = @config.key?(:allow_untyped_struct) ?
-      @config[:allow_untyped_struct] : true
-    @rubytype_factory = RubytypeFactory.new(
-      :allow_untyped_struct => @allow_untyped_struct,
-      :allow_original_mapping => @allow_original_mapping
-    )
-    @default_factory = @rubytype_factory
-    @excn_handler_obj2soap = nil
-    @excn_handler_soap2obj = nil
-  end
-
-  def add(obj_class, soap_class, factory, info = nil)
-    @map.add(obj_class, soap_class, factory, info)
-  end
-  alias :set :add
-
-  # This mapping registry ignores type hint.
-  def obj2soap(klass, obj, type = nil)
-    soap = _obj2soap(klass, obj, type)
-    if @allow_original_mapping
-      addextend2soap(soap, obj)
-    end
-    soap
-  end
-
-  def soap2obj(klass, node)
-    obj = _soap2obj(klass, node)
-    if @allow_original_mapping
-      addextend2obj(obj, node.extraattr[RubyExtendName])
-      addiv2obj(obj, node.extraattr[RubyIVarName])
-    end
-    obj
-  end
-
-  def default_factory=(factory)
-    @default_factory = factory
-  end
-
-  def excn_handler_obj2soap=(handler)
-    @excn_handler_obj2soap = handler
-  end
-
-  def excn_handler_soap2obj=(handler)
-    @excn_handler_soap2obj = handler
-  end
-
-  def find_mapped_soap_class(obj_class)
-    @map.find_mapped_soap_class(obj_class)
-  end
-
-  def find_mapped_obj_class(soap_class)
-    @map.find_mapped_obj_class(soap_class)
-  end
-
-private
-
-  def _obj2soap(klass, obj, type)
-    ret = nil
-    if obj.is_a?(SOAPStruct) or obj.is_a?(SOAPArray)
-      obj.replace do |ele|
-        Mapping._obj2soap(ele, self)
-      end
-      return obj
-    elsif obj.is_a?(SOAPBasetype)
-      return obj
-    end
-    begin 
-      ret = @map.obj2soap(klass, obj) ||
-        @default_factory.obj2soap(klass, obj, nil, self)
-    rescue MappingError
-    end
-    return ret if ret
-    if @excn_handler_obj2soap
-      ret = @excn_handler_obj2soap.call(obj) { |yield_obj|
-        Mapping._obj2soap(yield_obj, self)
-      }
-    end
-    return ret if ret
-    raise MappingError.new("Cannot map #{ klass.name } to SOAP/OM.")
-  end
-
-  # Might return nil as a mapping result.
-  def _soap2obj(klass, node)
-    if node.extraattr.key?(RubyTypeName)
-      conv, obj = @rubytype_factory.soap2obj(klass, node, nil, self)
-      return obj if conv
-    else
-      conv, obj = @map.soap2obj(klass, node)
-      return obj if conv
-      conv, obj = @default_factory.soap2obj(klass, node, nil, self)
-      return obj if conv
-    end
-
-    if @excn_handler_soap2obj
-      begin
-        return @excn_handler_soap2obj.call(node) { |yield_node|
-	    Mapping._soap2obj(yield_node, self)
-	  }
-      rescue Exception
-      end
-    end
-    raise MappingError.new("Cannot map #{ node.type.name } to Ruby object.")
-  end
-
-  def addiv2obj(obj, attr)
-    return unless attr
-    vars = {}
-    attr.__getobj__.each do |name, value|
-      vars[name] = Mapping._soap2obj(value, self)
-    end
-    Mapping.set_instance_vars(obj, vars)
-  end
-
-  def addextend2obj(obj, attr)
-    return unless attr
-    attr.split(/ /).reverse_each do |mstr|
-      obj.extend(Mapping.class_from_name(mstr))
-    end
-  end
-
-  def addextend2soap(node, obj)
-    return if obj.is_a?(Symbol) or obj.is_a?(Fixnum)
-    list = (class << obj; self; end).ancestors - obj.class.ancestors
-    unless list.empty?
-      node.extraattr[RubyExtendName] = list.collect { |c|
-	if c.name.empty?
-  	  raise TypeError.new("singleton can't be dumped #{ obj }")
-   	end
-	c.name
-      }.join(" ")
-    end
-  end
-
-end
-
-
-DefaultRegistry = Registry.new
-RubyOriginalRegistry = Registry.new(:allow_original_mapping => true)
-
-
-end
-end
diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb
deleted file mode 100644
index 3ebb799220..0000000000
--- a/lib/soap/mapping/rubytypeFactory.rb
+++ /dev/null
@@ -1,460 +0,0 @@
-=begin
-SOAP4R - Ruby type mapping factory.
-Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module SOAP
-module Mapping
-
-
-class RubytypeFactory < Factory
-  TYPE_STRING = XSD::QName.new(RubyTypeNamespace, 'String')
-  TYPE_TIME = XSD::QName.new(RubyTypeNamespace, 'Time')
-  TYPE_ARRAY = XSD::QName.new(RubyTypeNamespace, 'Array')
-  TYPE_REGEXP = XSD::QName.new(RubyTypeNamespace, 'Regexp')
-  TYPE_RANGE = XSD::QName.new(RubyTypeNamespace, 'Range')
-  TYPE_CLASS = XSD::QName.new(RubyTypeNamespace, 'Class')
-  TYPE_MODULE = XSD::QName.new(RubyTypeNamespace, 'Module')
-  TYPE_SYMBOL = XSD::QName.new(RubyTypeNamespace, 'Symbol')
-  TYPE_STRUCT = XSD::QName.new(RubyTypeNamespace, 'Struct')
-  TYPE_HASH = XSD::QName.new(RubyTypeNamespace, 'Map')
-
-  def initialize(config = {})
-    @config = config
-    @allow_untyped_struct = @config.key?(:allow_untyped_struct) ?
-      @config[:allow_untyped_struct] : true
-    @allow_original_mapping = @config.key?(:allow_original_mapping) ?
-      @config[:allow_original_mapping] : false
-    @string_factory = StringFactory_.new(true)
-    @basetype_factory = BasetypeFactory_.new(true)
-    @datetime_factory = DateTimeFactory_.new(true)
-    @array_factory = ArrayFactory_.new(true)
-    @hash_factory = HashFactory_.new(true)
-  end
-
-  def obj2soap(soap_class, obj, info, map)
-    param = nil
-    case obj
-    when String
-      unless @allow_original_mapping
-        return nil
-      end
-      param = @string_factory.obj2soap(SOAPString, obj, info, map)
-      if obj.class != String
-        param.extraattr[RubyTypeName] = obj.class.name
-      end
-      addiv2soapattr(param, obj, map)
-    when Time
-      unless @allow_original_mapping
-        return nil
-      end
-      param = @datetime_factory.obj2soap(SOAPDateTime, obj, info, map)
-      if obj.class != Time
-        param.extraattr[RubyTypeName] = obj.class.name
-      end
-      addiv2soapattr(param, obj, map)
-    when Array
-      unless @allow_original_mapping
-        return nil
-      end
-      param = @array_factory.obj2soap(nil, obj, info, map)
-      if obj.class != Array
-        param.extraattr[RubyTypeName] = obj.class.name
-      end
-      addiv2soapattr(param, obj, map)
-    when NilClass
-      unless @allow_original_mapping
-        return nil
-      end
-      param = @basetype_factory.obj2soap(SOAPNil, obj, info, map)
-      addiv2soapattr(param, obj, map)
-    when FalseClass, TrueClass
-      unless @allow_original_mapping
-        return nil
-      end
-      param = @basetype_factory.obj2soap(SOAPBoolean, obj, info, map)
-      addiv2soapattr(param, obj, map)
-    when Integer
-      unless @allow_original_mapping
-        return nil
-      end
-      param = @basetype_factory.obj2soap(SOAPInt, obj, info, map)
-      param ||= @basetype_factory.obj2soap(SOAPInteger, obj, info, map)
-      param ||= @basetype_factory.obj2soap(SOAPDecimal, obj, info, map)
-      addiv2soapattr(param, obj, map)
-    when Float
-      unless @allow_original_mapping
-        return nil
-      end
-      param = @basetype_factory.obj2soap(SOAPDouble, obj, info, map)
-      if obj.class != Float
-        param.extraattr[RubyTypeName] = obj.class.name
-      end
-      addiv2soapattr(param, obj, map)
-    when Hash
-      unless @allow_original_mapping
-        return nil
-      end
-      if obj.respond_to?(:default_proc) && obj.default_proc
-        raise TypeError.new("cannot dump hash with default proc")
-      end
-      param = SOAPStruct.new(TYPE_HASH)
-      mark_marshalled_obj(obj, param)
-      if obj.class != Hash
-        param.extraattr[RubyTypeName] = obj.class.name
-      end
-      obj.each do |key, value|
-        elem = SOAPStruct.new # Undefined type.
-        elem.add("key", Mapping._obj2soap(key, map))
-        elem.add("value", Mapping._obj2soap(value, map))
-        param.add("item", elem)
-      end
-      param.add('default', Mapping._obj2soap(obj.default, map))
-      addiv2soapattr(param, obj, map)
-    when Regexp
-      unless @allow_original_mapping
-        return nil
-      end
-      param = SOAPStruct.new(TYPE_REGEXP)
-      mark_marshalled_obj(obj, param)
-      if obj.class != Regexp
-        param.extraattr[RubyTypeName] = obj.class.name
-      end
-      param.add('source', SOAPBase64.new(obj.source))
-      if obj.respond_to?('options')
-        # Regexp#options is from Ruby/1.7
-        options = obj.options
-      else
-        options = 0
-        obj.inspect.sub(/^.*\//, '').each_byte do |c|
-          options += case c
-            when ?i
-              1
-            when ?x
-              2
-            when ?m
-              4
-            when ?n
-              16
-            when ?e
-              32
-            when ?s
-              48
-            when ?u
-              64
-            end
-        end
-      end
-      param.add('options', SOAPInt.new(options))
-      addiv2soapattr(param, obj, map)
-    when Range
-      unless @allow_original_mapping
-        return nil
-      end
-      param = SOAPStruct.new(TYPE_RANGE)
-      mark_marshalled_obj(obj, param)
-      if obj.class != Range
-        param.extraattr[RubyTypeName] = obj.class.name
-      end
-      param.add('begin', Mapping._obj2soap(obj.begin, map))
-      param.add('end', Mapping._obj2soap(obj.end, map))
-      param.add('exclude_end', SOAP::SOAPBoolean.new(obj.exclude_end?))
-      addiv2soapattr(param, obj, map)
-    when Class
-      unless @allow_original_mapping
-        return nil
-      end
-      if obj.name.empty?
-        raise TypeError.new("Can't dump anonymous class #{ obj }.")
-      end
-      param = SOAPStruct.new(TYPE_CLASS)
-      mark_marshalled_obj(obj, param)
-      param.add('name', SOAPString.new(obj.name))
-      addiv2soapattr(param, obj, map)
-    when Module
-      unless @allow_original_mapping
-        return nil
-      end
-      if obj.name.empty?
-        raise TypeError.new("Can't dump anonymous module #{ obj }.")
-      end
-      param = SOAPStruct.new(TYPE_MODULE)
-      mark_marshalled_obj(obj, param)
-      param.add('name', SOAPString.new(obj.name))
-      addiv2soapattr(param, obj, map)
-    when Symbol
-      unless @allow_original_mapping
-        return nil
-      end
-      param = SOAPStruct.new(TYPE_SYMBOL)
-      mark_marshalled_obj(obj, param)
-      param.add('id', SOAPString.new(obj.id2name))
-      addiv2soapattr(param, obj, map)
-    when Struct
-      unless @allow_original_mapping
-        return nil
-      end
-      param = SOAPStruct.new(TYPE_STRUCT)
-      mark_marshalled_obj(obj, param)
-      param.add('type', ele_type = SOAPString.new(obj.class.to_s))
-      ele_member = SOAPStruct.new
-      obj.members.each do |member|
-        ele_member.add(Mapping.name2elename(member),
-          Mapping._obj2soap(obj[member], map))
-      end
-      param.add('member', ele_member)
-      addiv2soapattr(param, obj, map)
-    when IO, Binding, Continuation, Data, Dir, File::Stat, MatchData, Method,
-        Proc, Thread, ThreadGroup # from 1.8: Process::Status, UnboundMethod
-      return nil
-    when ::SOAP::Mapping::Object
-      param = SOAPStruct.new(XSD::AnyTypeName)
-      mark_marshalled_obj(obj, param)
-      addiv2soapattr(param, obj, map)
-    when Exception
-      typestr = Mapping.name2elename(obj.class.to_s)
-      param = SOAPStruct.new(XSD::QName.new(RubyTypeNamespace, typestr))
-      mark_marshalled_obj(obj, param)
-      param.add('message', Mapping._obj2soap(obj.message, map))
-      param.add('backtrace', Mapping._obj2soap(obj.backtrace, map))
-      addiv2soapattr(param, obj, map)
-    else
-      param = unknownobj2soap(soap_class, obj, info, map)
-    end
-    param
-  end
-
-  def soap2obj(obj_class, node, info, map)
-    rubytype = node.extraattr[RubyTypeName]
-    if rubytype or node.type.namespace == RubyTypeNamespace
-      rubytype2obj(node, info, map, rubytype)
-    elsif node.type == XSD::AnyTypeName or node.type == XSD::AnySimpleTypeName
-      anytype2obj(node, info, map)
-    else
-      unknowntype2obj(node, info, map)
-    end
-  end
-
-private
-
-  def addiv2soapattr(node, obj, map)
-    return if obj.instance_variables.empty?
-    ivars = SOAPStruct.new    # Undefined type.
-    setiv2soap(ivars, obj, map)
-    node.extraattr[RubyIVarName] = ivars
-  end
-
-  def unknownobj2soap(soap_class, obj, info, map)
-    if obj.class.name.empty?
-      raise TypeError.new("Can't dump anonymous class #{ obj }.")
-    end
-    singleton_class = class << obj; self; end
-    if !singleton_methods_true(obj).empty? or
-	!singleton_class.instance_variables.empty?
-      raise TypeError.new("singleton can't be dumped #{ obj }")
-    end
-    if !(singleton_class.ancestors - obj.class.ancestors).empty?
-      typestr = Mapping.name2elename(obj.class.to_s)
-      type = XSD::QName.new(RubyTypeNamespace, typestr)
-    else
-      type = Mapping.class2element(obj.class)
-    end
-    param = SOAPStruct.new(type)
-    mark_marshalled_obj(obj, param)
-    setiv2soap(param, obj, map)
-    param
-  end
-
-  if RUBY_VERSION >= '1.8.0'
-    def singleton_methods_true(obj)
-      obj.singleton_methods(true)
-    end
-  else
-    def singleton_methods_true(obj)
-      obj.singleton_methods
-    end
-  end
-
-  def rubytype2obj(node, info, map, rubytype)
-    klass = rubytype ? Mapping.class_from_name(rubytype) : nil
-    obj = nil
-    case node
-    when SOAPString
-      return @string_factory.soap2obj(klass || String, node, info, map)
-    when SOAPDateTime
-      #return @datetime_factory.soap2obj(klass || Time, node, info, map)
-      klass ||= Time
-      t = node.to_time
-      arg = [t.year, t.month, t.mday, t.hour, t.min, t.sec, t.usec]
-      obj = t.gmt? ? klass.gm(*arg) : klass.local(*arg)
-      mark_unmarshalled_obj(node, obj)
-      return true, obj
-    when SOAPArray
-      return @array_factory.soap2obj(klass || Array, node, info, map)
-    when SOAPNil, SOAPBoolean, SOAPInt, SOAPInteger, SOAPDecimal, SOAPDouble
-      return @basetype_factory.soap2obj(nil, node, info, map)
-    when SOAPStruct
-      return rubytypestruct2obj(node, info, map, rubytype)
-    else
-      raise
-    end
-  end
-
-  def rubytypestruct2obj(node, info, map, rubytype)
-    klass = rubytype ? Mapping.class_from_name(rubytype) : nil
-    obj = nil
-    case node.type
-    when TYPE_HASH
-      klass = rubytype ? Mapping.class_from_name(rubytype) : Hash
-      obj = create_empty_object(klass)
-      mark_unmarshalled_obj(node, obj)
-      node.each do |key, value|
-        next unless key == 'item'
-        obj[Mapping._soap2obj(value['key'], map)] =
-          Mapping._soap2obj(value['value'], map)
-      end
-      if node.key?('default')
-        obj.default = Mapping._soap2obj(node['default'], map)
-      end
-    when TYPE_REGEXP
-      klass = rubytype ? Mapping.class_from_name(rubytype) : Regexp
-      obj = create_empty_object(klass)
-      mark_unmarshalled_obj(node, obj)
-      source = node['source'].string
-      options = node['options'].data || 0
-      Regexp.instance_method(:initialize).bind(obj).call(source, options)
-    when TYPE_RANGE
-      klass = rubytype ? Mapping.class_from_name(rubytype) : Range
-      obj = create_empty_object(klass)
-      mark_unmarshalled_obj(node, obj)
-      first = Mapping._soap2obj(node['begin'], map)
-      last = Mapping._soap2obj(node['end'], map)
-      exclude_end = node['exclude_end'].data
-      Range.instance_method(:initialize).bind(obj).call(first, last, exclude_end)
-    when TYPE_CLASS
-      obj = Mapping.class_from_name(node['name'].data)
-    when TYPE_MODULE
-      obj = Mapping.class_from_name(node['name'].data)
-    when TYPE_SYMBOL
-      obj = node['id'].data.intern
-    when TYPE_STRUCT
-      typestr = Mapping.elename2name(node['type'].data)
-      klass = Mapping.class_from_name(typestr)
-      if klass.nil?
-        klass = Mapping.class_from_name(name2typename(typestr))
-      end
-      if klass.nil?
-        return false
-      end
-      unless klass <= ::Struct
-        return false
-      end
-      obj = create_empty_object(klass)
-      mark_unmarshalled_obj(node, obj)
-      node['member'].each do |name, value|
-        obj[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
-      end
-    else
-      return unknowntype2obj(node, info, map)
-    end
-    return true, obj
-  end
-
-  def anytype2obj(node, info, map)
-    case node
-    when SOAPBasetype
-      return true, node.data
-    when SOAPStruct
-      klass = ::SOAP::Mapping::Object
-      obj = klass.new
-      mark_unmarshalled_obj(node, obj)
-      node.each do |name, value|
-        obj.set_property(name, Mapping._soap2obj(value, map))
-      end
-      return true, obj
-    else
-      return false
-    end
-  end
-
-  def unknowntype2obj(node, info, map)
-    if node.is_a?(SOAPStruct)
-      obj = unknownstruct2obj(node, info, map)
-      return true, obj if obj
-      if !@allow_untyped_struct
-        return false
-      end
-      return anytype2obj(node, info, map)
-    else
-      # Basetype which is not defined...
-      return false
-    end
-  end
-
-  def unknownstruct2obj(node, info, map)
-    unless node.type.name
-      return nil
-    end
-    typestr = Mapping.elename2name(node.type.name)
-    klass = Mapping.class_from_name(typestr)
-    if klass.nil?
-      klass = Mapping.class_from_name(name2typename(typestr))
-    end
-    if klass.nil?
-      return nil
-    end
-    if klass <= ::Exception
-      return exception2obj(klass, node, map)
-    end
-    klass_type = Mapping.class2qname(klass)
-    return nil unless node.type.match(klass_type)
-    obj = create_empty_object(klass)
-    mark_unmarshalled_obj(node, obj)
-    setiv2obj(obj, node, map)
-    obj
-  end
-
-  def exception2obj(klass, node, map)
-    message = Mapping._soap2obj(node['message'], map)
-    backtrace = Mapping._soap2obj(node['backtrace'], map)
-    obj = create_empty_object(klass)
-    obj = obj.exception(message)
-    mark_unmarshalled_obj(node, obj)
-    obj.set_backtrace(backtrace)
-    obj
-  end
-
-  # Only creates empty array.  Do String#replace it with real string.
-  def array2obj(node, map, rubytype)
-    klass = rubytype ? Mapping.class_from_name(rubytype) : Array
-    obj = create_empty_object(klass)
-    mark_unmarshalled_obj(node, obj)
-    obj
-  end
-
-  # Only creates empty string.  Do String#replace it with real string.
-  def string2obj(node, map, rubytype)
-    klass = rubytype ? Mapping.class_from_name(rubytype) : String
-    obj = create_empty_object(klass)
-    mark_unmarshalled_obj(node, obj)
-    obj
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/mapping/typeMap.rb b/lib/soap/mapping/typeMap.rb
deleted file mode 100644
index c62f1482c1..0000000000
--- a/lib/soap/mapping/typeMap.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-=begin
-SOAP4R - Base type mapping definition
-Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module SOAP
-
-
-TypeMap = {
-  XSD::XSDAnySimpleType::Type => SOAPAnySimpleType,
-  XSD::XSDString::Type => SOAPString,
-  XSD::XSDBoolean::Type => SOAPBoolean,
-  XSD::XSDDecimal::Type => SOAPDecimal,
-  XSD::XSDFloat::Type => SOAPFloat,
-  XSD::XSDDouble::Type => SOAPDouble,
-  XSD::XSDDuration::Type => SOAPDuration,
-  XSD::XSDDateTime::Type => SOAPDateTime,
-  XSD::XSDTime::Type => SOAPTime,
-  XSD::XSDDate::Type => SOAPDate,
-  XSD::XSDGYearMonth::Type => SOAPGYearMonth,
-  XSD::XSDGYear::Type => SOAPGYear,
-  XSD::XSDGMonthDay::Type => SOAPGMonthDay,
-  XSD::XSDGDay::Type => SOAPGDay,
-  XSD::XSDGMonth::Type => SOAPGMonth,
-  XSD::XSDHexBinary::Type => SOAPHexBinary,
-  XSD::XSDBase64Binary::Type => SOAPBase64,
-  XSD::XSDAnyURI::Type => SOAPAnyURI,
-  XSD::XSDQName::Type => SOAPQName,
-  XSD::XSDInteger::Type => SOAPInteger,
-  XSD::XSDLong::Type => SOAPLong,
-  XSD::XSDInt::Type => SOAPInt,
-  XSD::XSDShort::Type => SOAPShort,
-
-  SOAP::SOAPBase64::Type => SOAPBase64,
-}
-
-
-end
diff --git a/lib/soap/mapping/wsdlRegistry.rb b/lib/soap/mapping/wsdlRegistry.rb
deleted file mode 100644
index 4b5beabe72..0000000000
--- a/lib/soap/mapping/wsdlRegistry.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-=begin
-SOAP4R - WSDL mapping registry.
-Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/baseData'
-require 'soap/mapping/mapping'
-require 'soap/mapping/typeMap'
-
-
-module SOAP
-module Mapping
-
-
-class WSDLRegistry
-  include TraverseSupport
-
-  attr_reader :complextypes
-
-  def initialize(complextypes, config = {})
-    @complextypes = complextypes
-    @config = config
-    @excn_handler_obj2soap = nil
-    # For mapping AnyType element.
-    @rubytype_factory = RubytypeFactory.new(
-      :allow_untyped_struct => true,
-      :allow_original_mapping => true
-    )
-  end
-
-  def obj2soap(klass, obj, type_qname)
-    soap_obj = nil
-    if obj.nil?
-      soap_obj = SOAPNil.new
-    elsif obj.is_a?(XSD::NSDBase)
-      soap_obj = soap2soap(obj, type_qname)
-    elsif (type = @complextypes[type_qname])
-      case type.compoundtype
-      when :TYPE_STRUCT
-        soap_obj = struct2soap(obj, type_qname, type)
-      when :TYPE_ARRAY
-        soap_obj = array2soap(obj, type_qname, type)
-      end
-    elsif (type = TypeMap[type_qname])
-      soap_obj = base2soap(obj, type)
-    elsif type_qname == XSD::AnyTypeName
-      soap_obj = @rubytype_factory.obj2soap(nil, obj, nil, nil)
-    end
-    return soap_obj if soap_obj
-
-    if @excn_handler_obj2soap
-      soap_obj = @excn_handler_obj2soap.call(obj) { |yield_obj|
-        Mapping._obj2soap(yield_obj, self)
-      }
-    end
-    return soap_obj if soap_obj
-
-    raise MappingError.new("Cannot map #{ klass.name } to SOAP/OM.")
-  end
-
-  def soap2obj(klass, node)
-    raise RuntimeError.new("#{ self } is for obj2soap only.")
-  end
-
-  def excn_handler_obj2soap=(handler)
-    @excn_handler_obj2soap = handler
-  end
-
-private
-
-  def soap2soap(obj, type_qname)
-    if obj.is_a?(SOAPBasetype)
-      obj
-    elsif obj.is_a?(SOAPStruct) && (type = @complextypes[type_qname])
-      soap_obj = obj
-      mark_marshalled_obj(obj, soap_obj)
-      elements2soap(obj, soap_obj, type.content.elements)
-      soap_obj
-    elsif obj.is_a?(SOAPArray) && (type = @complextypes[type_qname])
-      soap_obj = obj
-      contenttype = type.child_type
-      mark_marshalled_obj(obj, soap_obj)
-      obj.replace do |ele|
-	Mapping._obj2soap(ele, self, contenttype)
-      end
-      soap_obj
-    else
-      nil
-    end
-  end
-
-  def base2soap(obj, type)
-    soap_obj = nil
-    if type <= XSD::XSDString
-      soap_obj = type.new(XSD::Charset.is_ces(obj, $KCODE) ?
-        XSD::Charset.encoding_conv(obj, $KCODE, XSD::Charset.encoding) : obj)
-      mark_marshalled_obj(obj, soap_obj)
-    else
-      soap_obj = type.new(obj)
-    end
-    soap_obj
-  end
-
-  def struct2soap(obj, type_qname, type)
-    soap_obj = SOAPStruct.new(type_qname)
-    mark_marshalled_obj(obj, soap_obj)
-    elements2soap(obj, soap_obj, type.content.elements)
-    soap_obj
-  end
-
-  def array2soap(obj, type_qname, type)
-    contenttype = type.child_type
-    soap_obj = SOAPArray.new(ValueArrayName, 1, contenttype)
-    mark_marshalled_obj(obj, soap_obj)
-    obj.each do |item|
-      soap_obj.add(Mapping._obj2soap(item, self, contenttype))
-    end
-    soap_obj
-  end
-
-  def elements2soap(obj, soap_obj, elements)
-    elements.each do |element|
-      name = element.name.name
-      child_obj = obj.instance_eval("@#{ name }")
-      soap_obj.add(name, Mapping._obj2soap(child_obj, self, element.type))
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/marshal.rb b/lib/soap/marshal.rb
deleted file mode 100644
index 5c25fad0de..0000000000
--- a/lib/soap/marshal.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-=begin
-SOAP4R - Marshalling/Unmarshalling Ruby's object using SOAP Encoding.
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-# The original version of the marshal.rb to marshal/unmarshal Ruby's object
-# using SOAP Encoding was written by Michael Neumann.  His valuable comments
-# and his program inspired me to write this.  Thanks.
-
-
-require "soap/mapping"
-require "soap/processor"
-
-
-module SOAP
-
-
-module Marshal
-  # Trying xsd:dateTime data to be recovered as aTime.  aDateTime if it fails.
-  MarshalMappingRegistry = Mapping::Registry.new(:allow_original_mapping => true)
-  MarshalMappingRegistry.add(
-    Time,
-    ::SOAP::SOAPDateTime,
-    ::SOAP::Mapping::Registry::DateTimeFactory
-  )
-
-  class << self
-  public
-    def dump(obj, io = nil)
-      marshal(obj, MarshalMappingRegistry, io)
-    end
-
-    def load(stream)
-      unmarshal(stream, MarshalMappingRegistry)
-    end
-
-    def marshal(obj, mapping_registry = MarshalMappingRegistry, io = nil)
-      elename = Mapping.name2elename(obj.class.to_s)
-      soap_obj = Mapping.obj2soap(obj, mapping_registry)
-      body = SOAPBody.new
-      body.add(elename, soap_obj)
-      SOAP::Processor.marshal(nil, body, {}, io)
-    end
-
-    def unmarshal(stream, mapping_registry = MarshalMappingRegistry)
-      header, body = SOAP::Processor.unmarshal(stream)
-      #Mapping.soap2obj(body.root_node, mapping_registry)
-      Mapping.soap2obj(body.root_node, mapping_registry)
-    end
-  end
-end
-
-
-end
-
-
-SOAPMarshal = SOAP::Marshal
diff --git a/lib/soap/netHttpClient.rb b/lib/soap/netHttpClient.rb
deleted file mode 100644
index facdcb7279..0000000000
--- a/lib/soap/netHttpClient.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-=begin
-SOAP4R - net/http wrapper
-Copyright (C) 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'net/http'
-
-
-module SOAP
-
-
-class NetHttpClient
-
-  attr_accessor :proxy
-  attr_accessor :no_proxy
-  attr_accessor :debug_dev
-  attr_reader :session_manager
-
-  class SessionManager
-    attr_accessor :connect_timeout
-    attr_accessor :send_timeout
-    attr_accessor :receive_timeout
-  end
-
-  class Response
-    attr_reader :content
-    attr_reader :status
-    attr_reader :reason
-    attr_reader :contenttype
-
-    def initialize(res)
-      @status = res.code.to_i
-      @reason = res.message
-      @contenttype = res['content-type']
-      @content = res.body
-    end
-  end
-
-  def initialize(proxy = nil, agent = nil)
-    @proxy = proxy ? URI.parse(proxy) : nil
-    @agent = agent
-    @debug_dev = nil
-    @session_manager = SessionManager.new
-    name = 'no_proxy'
-    @no_proxy = ENV[name] || ENV[name.upcase]
-  end
-
-  def reset(url)
-    # ignored.
-  end
-
-  def post(url, req_body, header = {})
-    url = URI.parse(url)
-    extra = header.dup
-    extra['User-Agent'] = @agent if @agent
-    res = start(url) { |http|
-	http.post(url.request_uri, req_body, extra)
-      }
-    Response.new(res)
-  end
-
-  def get_content(url, header = {})
-    url = URI.parse(url)
-    extra = header.dup
-    extra['User-Agent'] = @agent if @agent
-    res = start(url) { |http|
-	http.get(url.request_uri, extra)
-      }
-    res.body
-  end
-
-private
-
-  def start(url)
-    proxy_host = proxy_port = nil
-    unless no_proxy?(url)
-      proxy_host = @proxy.host
-      proxy_port = @proxy.port
-    end
-    response = nil
-    Net::HTTP::Proxy(proxy_host, proxy_port).start(url.host, url.port) { |http|
-      if http.respond_to?(:set_debug_output)
-	http.set_debug_output(@debug_dev)
-      end
-      response, = yield(http)
-      http.finish
-    }
-    response
-  end
-
-  NO_PROXY_HOSTS = ['localhost']
-
-  def no_proxy?(uri)
-    if !@proxy or NO_PROXY_HOSTS.include?(uri.host)
-      return true
-    end
-    if @no_proxy
-      @no_proxy.scan(/([^:,]*)(?::(\d+))?/) do |host, port|
-  	if /(\A|\.)#{Regexp.quote(host)}\z/i =~ uri.host &&
-	    (!port || uri.port == port.to_i)
-	  return true
-	end
-      end
-    else
-      false
-    end
-  end
-end
-
-
-end
diff --git a/lib/soap/parser.rb b/lib/soap/parser.rb
deleted file mode 100644
index 67782566c3..0000000000
--- a/lib/soap/parser.rb
+++ /dev/null
@@ -1,252 +0,0 @@
-=begin
-SOAP4R - SOAP XML Instance Parser library.
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/ns'
-require 'xsd/xmlparser'
-require 'soap/soap'
-require 'soap/baseData'
-require 'soap/encodingstyle/handler'
-
-
-module SOAP
-
-
-class Parser
-  include SOAP
-
-  class ParseError < Error; end
-  class FormatDecodeError < ParseError; end
-  class UnexpectedElementError < ParseError; end
-
-private
-
-  class ParseFrame
-    attr_reader :node
-    attr_reader :name
-    attr_reader :ns, :encodingstyle
-
-    class NodeContainer
-      def initialize(node)
-	@node = node
-      end
-
-      def node
-	@node
-      end
-
-      def replace_node(node)
-	@node = node
-      end
-    end
-
-  public
-
-    def initialize(ns, name, node, encodingstyle)
-      @ns = ns
-      @name = name
-      self.node = node
-      @encodingstyle = encodingstyle
-    end
-
-    def node=(node)
-      @node = NodeContainer.new(node)
-    end
-  end
-
-public
-
-  attr_accessor :default_encodingstyle
-  attr_accessor :decode_typemap
-  attr_accessor :allow_unqualified_element
-
-  def initialize(opt = {})
-    @parser = XSD::XMLParser.create_parser(self, opt)
-    @parsestack = nil
-    @lastnode = nil
-    @handlers = {}
-    @default_encodingstyle = opt[:default_encodingstyle] || EncodingNamespace
-    @decode_typemap = opt[:decode_typemap] || nil
-    @allow_unqualified_element = opt[:allow_unqualified_element] || false
-  end
-
-  def charset
-    @parser.charset
-  end
-
-  def parse(string_or_readable)
-    @parsestack = []
-    @lastnode = nil
-
-    @handlers.each do |uri, handler|
-      handler.decode_prologue
-    end
-
-    @parser.do_parse(string_or_readable)
-
-    unless @parsestack.empty?
-      raise FormatDecodeError.new("Unbalanced tag in XML.")
-    end
-
-    @handlers.each do |uri, handler|
-      handler.decode_epilogue
-    end
-
-    @lastnode
-  end
-
-  def start_element(name, attrs)
-    lastframe = @parsestack.last
-    ns = parent = parent_encodingstyle = nil
-    if lastframe
-      ns = lastframe.ns.clone_ns
-      parent = lastframe.node
-      parent_encodingstyle = lastframe.encodingstyle
-    else
-      ns = XSD::NS.new
-      parent = ParseFrame::NodeContainer.new(nil)
-      parent_encodingstyle = nil
-    end
-
-    attrs = XSD::XMLParser.filter_ns(ns, attrs)
-    encodingstyle = find_encodingstyle(ns, attrs)
-
-    # Children's encodingstyle is derived from its parent.
-    encodingstyle ||= parent_encodingstyle || @default_encodingstyle
-
-    node = decode_tag(ns, name, attrs, parent, encodingstyle)
-
-    @parsestack << ParseFrame.new(ns, name, node, encodingstyle)
-  end
-
-  def characters(text)
-    lastframe = @parsestack.last
-    if lastframe
-      # Need not to be cloned because character does not have attr.
-      ns = lastframe.ns
-      parent = lastframe.node
-      encodingstyle = lastframe.encodingstyle
-      decode_text(ns, text, encodingstyle)
-    else
-      # Ignore Text outside of SOAP Envelope.
-      p text if $DEBUG
-    end
-  end
-
-  def end_element(name)
-    lastframe = @parsestack.pop
-    unless name == lastframe.name
-      raise UnexpectedElementError.new("Closing element name '#{ name }' does not match with opening element '#{ lastframe.name }'.")
-    end
-    decode_tag_end(lastframe.ns, lastframe.node, lastframe.encodingstyle)
-    @lastnode = lastframe.node.node
-  end
-
-private
-
-  def find_encodingstyle(ns, attrs)
-    attrs.each do |key, value|
-      if (ns.compare(EnvelopeNamespace, AttrEncodingStyle, key))
-	return value
-      end
-    end
-    nil
-  end
-
-  def decode_tag(ns, name, attrs, parent, encodingstyle)
-    ele = ns.parse(name)
-
-    # Envelope based parsing.
-    if ((ele.namespace == EnvelopeNamespace) ||
-	(@allow_unqualified_element && ele.namespace.nil?))
-      o = decode_soap_envelope(ns, ele, attrs, parent)
-      return o if o
-    end
-
-    # Encoding based parsing.
-    handler = find_handler(encodingstyle)
-    if handler
-      return handler.decode_tag(ns, ele, attrs, parent)
-    else
-      raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
-    end
-  end
-
-  def decode_tag_end(ns, node, encodingstyle)
-    return unless encodingstyle
-
-    handler = find_handler(encodingstyle)
-    if handler
-      return handler.decode_tag_end(ns, node)
-    else
-      raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
-    end
-  end
-
-  def decode_text(ns, text, encodingstyle)
-    handler = find_handler(encodingstyle)
-
-    if handler
-      handler.decode_text(ns, text)
-    else
-      # How should I do?
-    end
-  end
-
-  def decode_soap_envelope(ns, ele, attrs, parent)
-    o = nil
-    if ele.name == EleEnvelope
-      o = SOAPEnvelope.new
-    elsif ele.name == EleHeader
-      unless parent.node.is_a?(SOAPEnvelope)
-	raise FormatDecodeError.new("Header should be a child of Envelope.")
-      end
-      o = SOAPHeader.new
-      parent.node.header = o
-    elsif ele.name == EleBody
-      unless parent.node.is_a?(SOAPEnvelope)
-	raise FormatDecodeError.new("Body should be a child of Envelope.")
-      end
-      o = SOAPBody.new
-      parent.node.body = o
-    elsif ele.name == EleFault
-      unless parent.node.is_a?(SOAPBody)
-	raise FormatDecodeError.new("Fault should be a child of Body.")
-      end
-      o = SOAPFault.new
-      parent.node.fault = o
-    end
-    o.parent = parent if o
-    o
-  end
-
-  def find_handler(encodingstyle)
-    unless @handlers.key?(encodingstyle)
-      handler_factory = SOAP::EncodingStyle::Handler.handler(encodingstyle) ||
-	SOAP::EncodingStyle::Handler.handler(EncodingNamespace)
-      handler = handler_factory.new(@parser.charset)
-      handler.decode_typemap = @decode_typemap
-      handler.decode_prologue
-      @handlers[encodingstyle] = handler
-    end
-    @handlers[encodingstyle]
-  end
-end
-
-
-end
diff --git a/lib/soap/processor.rb b/lib/soap/processor.rb
deleted file mode 100644
index 47df772a9d..0000000000
--- a/lib/soap/processor.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-=begin
-SOAP4R - marshal/unmarshal interface.
-Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/datatypes'
-require 'soap/soap'
-require 'soap/element'
-require 'soap/parser'
-require 'soap/generator'
-require 'soap/encodingstyle/soapHandler'
-require 'soap/encodingstyle/literalHandler'
-require 'soap/encodingstyle/aspDotNetHandler'
-
-
-module SOAP
-
-
-module Processor
-  @@default_parser_option = {}
-
-  class << self
-  public
-
-    def marshal(header, body, opt = {}, io = nil)
-      env = SOAPEnvelope.new(header, body)
-      generator = create_generator(opt)
-      generator.generate(env, io)
-    end
-
-    def unmarshal(stream, opt = {})
-      parser = create_parser(opt)
-      env = parser.parse(stream)
-      if env
-	return env.header, env.body
-      else
-	return nil, nil
-      end
-    end
-
-    def default_parser_option=(rhs)
-      @@default_parser_option = rhs
-    end
-
-    def default_parser_option
-      @@default_parser_option
-    end
-
-  private
-
-    def create_generator(opt)
-      SOAPGenerator.new(opt)
-    end
-
-    def create_parser(opt)
-      if opt.empty?
-	opt = @@default_parser_option
-      end
-      ::SOAP::Parser.new(opt)
-    end
-  end
-end
-
-
-end
diff --git a/lib/soap/rpc/cgistub.rb b/lib/soap/rpc/cgistub.rb
deleted file mode 100644
index e89314d132..0000000000
--- a/lib/soap/rpc/cgistub.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-=begin
-SOAP4R - CGI stub library
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/streamHandler'
-require 'webrick/httpresponse'
-require 'webrick/httpstatus'
-require 'logger'
-require 'soap/rpc/router'
-
-
-module SOAP
-module RPC
-
-
-###
-# SYNOPSIS
-#   CGIStub.new
-#
-# DESCRIPTION
-#   To be written...
-#
-class CGIStub < Logger::Application
-  include SOAP
-
-  # There is a client which does not accept the media-type which is defined in
-  # SOAP spec.
-  attr_accessor :mediatype
-
-  class CGIError < Error; end
-
-  class SOAPRequest
-    ALLOWED_LENGTH = 1024 * 1024
-
-    def initialize(stream = $stdin)
-      @method = ENV['REQUEST_METHOD']
-      @size = ENV['CONTENT_LENGTH'].to_i || 0
-      @contenttype = ENV['CONTENT_TYPE']
-      @charset = nil
-      @soapaction = ENV['HTTP_SOAPAction']
-      @source = stream
-      @body = nil
-    end
-
-    def init
-      validate
-      @charset = StreamHandler.parse_media_type(@contenttype)
-      @body = @source.read(@size)
-      self
-    end
-
-    def dump
-      @body.dup
-    end
-
-    def soapaction
-      @soapaction
-    end
-
-    def charset
-      @charset
-    end
-
-    def to_s
-      "method: #{ @method }, size: #{ @size }"
-    end
-
-  private
-
-    def validate # raise CGIError
-      if @method != 'POST'
-	raise CGIError.new("Method '#{ @method }' not allowed.")
-      end
-
-      if @size > ALLOWED_LENGTH
-        raise CGIError.new("Content-length too long.")
-      end
-    end
-  end
-
-  def initialize(appname, default_namespace)
-    super(appname)
-    set_log(STDERR)
-    self.level = ERROR
-    @default_namespace = default_namespace
-    @router = SOAP::RPC::Router.new(appname)
-    @remote_user = ENV['REMOTE_USER'] || 'anonymous'
-    @remote_host = ENV['REMOTE_HOST'] || ENV['REMOTE_ADDR'] || 'unknown'
-    @request = nil
-    @response = nil
-    @mediatype = MediaType
-    on_init
-  end
-  
-  def add_servant(obj, namespace = @default_namespace, soapaction = nil)
-    RPC.defined_methods(obj).each do |name|
-      qname = XSD::QName.new(namespace, name)
-      param_size = obj.method(name).arity.abs
-      params = (1..param_size).collect { |i| "p#{ i }" }
-      param_def = SOAP::RPC::SOAPMethod.create_param_def(params)
-      @router.add_method(obj, qname, soapaction, name, param_def)
-    end
-  end
-
-  def on_init
-    # Override this method in derived class to call 'add_method' to add methods.
-  end
-
-  def mapping_registry
-    @router.mapping_registry
-  end
-
-  def mapping_registry=(value)
-    @router.mapping_registry = value
-  end
-
-  def add_method(receiver, name, *param)
-    add_method_with_namespace_as(@default_namespace, receiver,
-      name, name, *param)
-  end
-
-  def add_method_as(receiver, name, name_as, *param)
-    add_method_with_namespace_as(@default_namespace, receiver,
-      name, name_as, *param)
-  end
-
-  def add_method_with_namespace(namespace, receiver, name, *param)
-    add_method_with_namespace_as(namespace, receiver, name, name, *param)
-  end
-
-  def add_method_with_namespace_as(namespace, receiver, name, name_as, *param)
-    param_def = if param.size == 1 and param[0].is_a?(Array)
-        param[0]
-      else
-        SOAP::RPC::SOAPMethod.create_param_def(param)
-      end
-    qname = XSD::QName.new(namespace, name_as)
-    @router.add_method(receiver, qname, nil, name, param_def)
-  end
-
-  def route(request_string, charset)
-    @router.route(request_string, charset)
-  end
-
-  def create_fault_response(e)
-    @router.create_fault_response(e)
-  end
-
-private
-  
-  def run
-    prologue
-
-    httpversion = WEBrick::HTTPVersion.new('1.0')
-    @response = WEBrick::HTTPResponse.new({:HTTPVersion => httpversion})
-    begin
-      log(INFO) { "Received a request from '#{ @remote_user }@#{ @remote_host }'." }
-      # SOAP request parsing.
-      @request = SOAPRequest.new.init
-      @response['Status'] = 200
-      req_charset = @request.charset
-      req_string = @request.dump
-      log(DEBUG) { "XML Request: #{req_string}" }
-      res_string, is_fault = route(req_string, req_charset)
-      log(DEBUG) { "XML Response: #{res_string}" }
-
-      @response['Cache-Control'] = 'private'
-      if req_charset
-	@response['content-type'] = "#{@mediatype}; charset=\"#{req_charset}\""
-      else
-	@response['content-type'] = @mediatype
-      end
-      if is_fault
-	@response['Status'] = 500
-      end
-      @response.body = res_string
-    rescue Exception
-      res_string = create_fault_response($!)
-      @response['Cache-Control'] = 'private'
-      @response['content-type'] = @mediatype
-      @response['Status'] = 500
-    ensure
-      buf = ''
-      @response.send_response(buf)
-      buf.sub!(/^[^\r]+\r\n/, '')       # Trim status line.
-      log(DEBUG) { "SOAP CGI Response:\n#{ buf }" }
-      print buf
-      epilogue
-    end
-
-    0
-  end
-
-  def prologue; end
-  def epilogue; end
-end
-
-
-end
-end
diff --git a/lib/soap/rpc/driver.rb b/lib/soap/rpc/driver.rb
deleted file mode 100644
index 76fd14e34b..0000000000
--- a/lib/soap/rpc/driver.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-=begin
-SOAP4R - SOAP RPC driver
-Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/soap'
-require 'soap/mapping'
-require 'soap/rpc/rpc'
-require 'soap/rpc/proxy'
-require 'soap/rpc/element'
-require 'soap/streamHandler'
-
-
-module SOAP
-module RPC
-
-
-class Driver
-public
-  class EmptyResponseError < Error; end
-
-  attr_accessor :mapping_registry
-  attr_accessor :soapaction
-  attr_reader :endpoint_url
-  attr_reader :wiredump_dev
-  attr_reader :wiredump_file_base
-  attr_reader :httpproxy
-
-  def initialize(endpoint_url, namespace, soapaction = nil)
-    @endpoint_url = endpoint_url
-    @namespace = namespace
-    @mapping_registry = nil      # for unmarshal
-    @soapaction = soapaction
-    @wiredump_dev = nil
-    @wiredump_file_base = nil
-    @httpproxy = ENV['httpproxy'] || ENV['HTTP_PROXY']
-    @handler = HTTPPostStreamHandler.new(@endpoint_url, @httpproxy,
-      XSD::Charset.encoding_label)
-    @proxy = Proxy.new(@handler, @soapaction)
-    @proxy.allow_unqualified_element = true
-  end
-
-  def endpoint_url=(endpoint_url)
-    @endpoint_url = endpoint_url
-    if @handler
-      @handler.endpoint_url = @endpoint_url
-      @handler.reset
-    end
-  end
-
-  def wiredump_dev=(dev)
-    @wiredump_dev = dev
-    if @handler
-      @handler.wiredump_dev = @wiredump_dev
-      @handler.reset
-    end
-  end
-
-  def wiredump_file_base=(base)
-    @wiredump_file_base = base
-  end
-
-  def httpproxy=(httpproxy)
-    @httpproxy = httpproxy
-    if @handler
-      @handler.proxy = @httpproxy
-      @handler.reset
-    end
-  end
-
-  def default_encodingstyle
-    @proxy.default_encodingstyle
-  end
-
-  def default_encodingstyle=(encodingstyle)
-    @proxy.default_encodingstyle = encodingstyle
-  end
-
-
-  ###
-  ## Method definition interfaces.
-  #
-  # params: [[param_def...]] or [paramname, paramname, ...]
-  # param_def: See proxy.rb.  Sorry.
-
-  def add_method(name, *params)
-    add_method_with_soapaction_as(name, name, @soapaction, *params)
-  end
-
-  def add_method_as(name, name_as, *params)
-    add_method_with_soapaction_as(name, name_as, @soapaction, *params)
-  end
-
-  def add_method_with_soapaction(name, soapaction, *params)
-    add_method_with_soapaction_as(name, name, soapaction, *params)
-  end
-
-  def add_method_with_soapaction_as(name, name_as, soapaction, *params)
-    param_def = if params.size == 1 and params[0].is_a?(Array)
-        params[0]
-      else
-        SOAPMethod.create_param_def(params)
-      end
-    qname = XSD::QName.new(@namespace, name_as)
-    @proxy.add_method(qname, soapaction, name, param_def)
-    add_rpc_method_interface(name, param_def)
-  end
-
-
-  ###
-  ## Driving interface.
-  #
-  def invoke(headers, body)
-    if @wiredump_file_base
-      @handler.wiredump_file_base =
-	@wiredump_file_base + '_' << body.elename.name
-    end
-    @proxy.invoke(headers, body)
-  end
-
-  def call(name, *params)
-    # Convert parameters: params array => SOAPArray => members array
-    params = Mapping.obj2soap(params, @mapping_registry).to_a
-    if @wiredump_file_base
-      @handler.wiredump_file_base = @wiredump_file_base + '_' << name
-    end
-
-    # Then, call @proxy.call like the following.
-    header, body = @proxy.call(nil, name, *params)
-    unless body
-      raise EmptyResponseError.new("Empty response.")
-    end
-
-    begin
-      @proxy.check_fault(body)
-    rescue SOAP::FaultError => e
-      Mapping.fault2exception(e)
-    end
-
-    ret = body.response ? Mapping.soap2obj(body.response, @mapping_registry) : nil
-    if body.outparams
-      outparams = body.outparams.collect { |outparam| Mapping.soap2obj(outparam) }
-      return [ret].concat(outparams)
-    else
-      return ret
-    end
-  end
-
-  def reset_stream
-    @handler.reset
-  end
-
-private
-
-  def add_rpc_method_interface(name, param_def)
-    param_names = []
-    i = 0
-    @proxy.method[name].each_param_name(RPC::SOAPMethod::IN,
-	RPC::SOAPMethod::INOUT) do |param_name|
-      i += 1
-      param_names << "arg#{ i }"
-    end
-
-    callparam = (param_names.collect { |pname| ", " + pname }).join
-    self.instance_eval <<-EOS
-      def #{ name }(#{ param_names.join(", ") })
-        call("#{ name }"#{ callparam })
-      end
-    EOS
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/rpc/element.rb b/lib/soap/rpc/element.rb
deleted file mode 100644
index d1e1931fa3..0000000000
--- a/lib/soap/rpc/element.rb
+++ /dev/null
@@ -1,278 +0,0 @@
-=begin
-SOAP4R - RPC element definition.
-Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/baseData'
-
-
-module SOAP
-
-# Add method definitions for RPC to common definition in element.rb
-class SOAPBody < SOAPStruct
-  public
-
-  def request
-    root_node
-  end
-
-  def response
-    if !@is_fault
-      if void?
-        nil
-      else
-        # Initial element is [retval].
-        root_node[0]
-      end
-    else
-      root_node
-    end
-  end
-
-  def outparams
-    if !@is_fault and !void?
-      op = root_node[1..-1]
-      op = nil if op && op.empty?
-      op
-    else
-      nil
-    end
-  end
-
-  def void?
-    root_node.nil? # || root_node.is_a?(SOAPNil)
-  end
-
-  def fault
-    if @is_fault
-      self['fault']
-    else
-      nil
-    end
-  end
-
-  def fault=(fault)
-    @is_fault = true
-    add_member('fault', fault)
-  end
-end
-
-
-module RPC
-
-
-class RPCError < Error; end
-class MethodDefinitionError < RPCError; end
-class ParameterError < RPCError; end
-
-class SOAPMethod < SOAPStruct
-  RETVAL = 'retval'
-  IN = 'in'
-  OUT = 'out'
-  INOUT = 'inout'
-
-  attr_reader :param_def
-  attr_reader :inparam
-  attr_reader :outparam
-
-  def initialize(qname, param_def = nil)
-    super(nil)
-    @elename = qname
-    @encodingstyle = nil
-
-    @param_def = param_def
-
-    @signature = []
-    @inparam_names = []
-    @inoutparam_names = []
-    @outparam_names = []
-
-    @inparam = {}
-    @outparam = {}
-    @retval_name = nil
-
-    init_param(@param_def) if @param_def
-  end
-
-  def have_outparam?
-    @outparam_names.size > 0
-  end
-
-  def each_param_name(*type)
-    @signature.each do |io_type, name, param_type|
-      if type.include?(io_type)
-        yield(name)
-      end
-    end
-  end
-
-  def set_param(params)
-    params.each do |param, data|
-      @inparam[param] = data
-      data.elename.name = param
-    end
-  end
-
-  def set_outparam(params)
-    params.each do |param, data|
-      @outparam[param] = data
-      data.elename.name = param
-    end
-  end
-
-  def SOAPMethod.create_param_def(param_names)
-    param_def = []
-    param_names.each do |param_name|
-      param_def.push([IN, param_name, nil])
-    end
-    param_def.push([RETVAL, 'return', nil])
-    param_def
-  end
-
-private
-
-  def init_param(param_def)
-    param_def.each do |io_type, name, param_type|
-      case io_type
-      when IN
-        @signature.push([IN, name, param_type])
-        @inparam_names.push(name)
-      when OUT
-        @signature.push([OUT, name, param_type])
-        @outparam_names.push(name)
-      when INOUT
-        @signature.push([INOUT, name, param_type])
-        @inoutparam_names.push(name)
-      when RETVAL
-        if (@retval_name)
-          raise MethodDefinitionError.new('Duplicated retval')
-        end
-        @retval_name = name
-      else
-        raise MethodDefinitionError.new("Unknown type: #{ io_type }")
-      end
-    end
-  end
-end
-
-
-class SOAPMethodRequest < SOAPMethod
-  attr_accessor :soapaction
-
-  def SOAPMethodRequest.create_request(qname, *params)
-    param_def = []
-    param_value = []
-    i = 0
-    params.each do |param|
-      param_name = "p#{ i }"
-      i += 1
-      param_def << [IN, nil, param_name]
-      param_value << [param_name, param]
-    end
-    param_def << [RETVAL, nil, 'return']
-    o = new(qname, param_def)
-    o.set_param(param_value)
-    o
-  end
-
-  def initialize(qname, param_def = nil, soapaction = nil)
-    check_elename(qname)
-    super(qname, param_def)
-    @soapaction = soapaction
-  end
-
-  def each
-    each_param_name(IN, INOUT) do |name|
-      unless @inparam[name]
-        raise ParameterError.new("Parameter: #{ name } was not given.")
-      end
-      yield(name, @inparam[name])
-    end
-  end
-
-  def dup
-    req = self.class.new(@elename.dup, @param_def, @soapaction)
-    req.encodingstyle = @encodingstyle
-    req
-  end
-
-  def create_method_response
-    SOAPMethodResponse.new(
-      XSD::QName.new(@elename.namespace, @elename.name + 'Response'),
-      @param_def)
-  end
-
-private
-
-  def check_elename(qname)
-    # NCName & ruby's method name
-    unless /\A[\w_][\w\d_\-]*\z/ =~ qname.name
-      raise MethodDefinitionError.new("Element name '#{qname.name}' not allowed")
-    end
-  end
-end
-
-
-class SOAPMethodResponse < SOAPMethod
-
-  def initialize(qname, param_def = nil)
-    super(qname, param_def)
-    @retval = nil
-  end
-
-  def retval=(retval)
-    @retval = retval
-    @retval.elename = @retval.elename.dup_name('return')
-  end
-
-  def each
-    if @retval_name and !@retval.is_a?(SOAPVoid)
-      yield(@retval_name, @retval)
-    end
-
-    each_param_name(OUT, INOUT) do |param_name|
-      unless @outparam[param_name]
-        raise ParameterError.new("Parameter: #{ param_name } was not given.")
-      end
-      yield(param_name, @outparam[param_name])
-    end
-  end
-end
-
-
-# To return(?) void explicitly.
-#  def foo(input_var)
-#    ...
-#    return SOAP::RPC::SOAPVoid.new
-#  end
-class SOAPVoid < XSD::XSDAnySimpleType
-  include SOAPBasetype
-  extend SOAPModuleUtils
-  Name = XSD::QName.new(Mapping::RubyCustomTypeNamespace, nil)
-
-public
-  def initialize()
-    @elename = Name
-    @id = nil
-    @precedents = []
-    @parent = nil
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/rpc/proxy.rb b/lib/soap/rpc/proxy.rb
deleted file mode 100644
index 39a095838c..0000000000
--- a/lib/soap/rpc/proxy.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-=begin
-SOAP4R - RPC Proxy library.
-Copyright (C) 2000, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/soap'
-require 'soap/processor'
-require 'soap/mapping'
-require 'soap/rpc/rpc'
-require 'soap/rpc/element'
-require 'soap/streamHandler'
-
-
-module SOAP
-module RPC
-
-
-class Proxy
-  include SOAP
-
-public
-
-  attr_accessor :soapaction
-  attr_accessor :allow_unqualified_element, :default_encodingstyle
-  attr_reader :method
-
-  def initialize(stream_handler, soapaction = nil)
-    @handler = stream_handler
-    @soapaction = soapaction
-    @method = {}
-    @allow_unqualified_element = false
-    @default_encodingstyle = nil
-  end
-
-  class Request
-    include RPC
-
-  public
-
-    attr_reader :method
-    attr_reader :namespace
-    attr_reader :name
-
-    def initialize(model, values)
-      @method = model.dup
-      @namespace = @method.elename.namespace
-      @name = @method.elename.name
-
-      params = {}
-    
-      if ((values.size == 1) and (values[0].is_a?(Hash)))
-        params = values[0]
-      else
-        i = 0
-        @method.each_param_name(SOAPMethod::IN, SOAPMethod::INOUT) do |name|
-          params[name] = values[i] || SOAPNil.new
-          i += 1
-        end
-      end
-      @method.set_param(params)
-    end
-  end
-
-  def add_method(qname, soapaction, name, param_def)
-    @method[name] = SOAPMethodRequest.new(qname, param_def, soapaction)
-  end
-
-  def create_request(name, *values)
-    if (@method.key?(name))
-      method = @method[name]
-      method.encodingstyle = @default_encodingstyle if @default_encodingstyle
-    else
-      raise SOAP::RPC::MethodDefinitionError.new(
-	"Method: #{ name } not defined.")
-    end
-
-    Request.new(method, values)
-  end
-
-  def invoke(req_header, req_body, soapaction = nil)
-    if req_header and !req_header.is_a?(SOAPHeader)
-      req_header = create_header(req_header)
-    end
-    if !req_body.is_a?(SOAPBody)
-      req_body = SOAPBody.new(req_body)
-    end
-    opt = create_options
-    send_string = Processor.marshal(req_header, req_body, opt)
-    data = @handler.send(send_string, soapaction)
-    if data.receive_string.empty?
-      return nil, nil
-    end
-    res_charset = StreamHandler.parse_media_type(data.receive_contenttype)
-    opt = create_options
-    opt[:charset] = res_charset
-    res_header, res_body = Processor.unmarshal(data.receive_string, opt)
-    return res_header, res_body
-  end
-
-  def call(headers, name, *values)
-    req = create_request(name, *values)
-    return invoke(headers, req.method, req.method.soapaction || @soapaction)
-  end
-
-  def check_fault(body)
-    if body.fault
-      raise SOAP::FaultError.new(body.fault)
-    end
-  end
-
-private
-
-  def create_header(headers)
-    header = SOAPHeader.new()
-    headers.each do |content, mustunderstand, encodingstyle|
-      header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
-    end
-    header
-  end
-
-  def create_options
-    opt = {}
-    opt[:default_encodingstyle] = @default_encodingstyle
-    if @allow_unqualified_element
-      opt[:allow_unqualified_element] = true
-    end
-    opt
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/rpc/router.rb b/lib/soap/rpc/router.rb
deleted file mode 100644
index 20396a4a7d..0000000000
--- a/lib/soap/rpc/router.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-=begin
-SOAP4R - RPC Routing library
-Copyright (C) 2001, 2002  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/soap'
-require 'soap/processor'
-require 'soap/mapping'
-require 'soap/rpc/rpc'
-require 'soap/rpc/element'
-
-
-module SOAP
-module RPC
-
-
-class Router
-  include SOAP
-
-  attr_reader :actor
-  attr_accessor :allow_unqualified_element
-  attr_accessor :default_encodingstyle
-  attr_accessor :mapping_registry
-
-  def initialize(actor)
-    @actor = actor
-    @receiver = {}
-    @method_name = {}
-    @method = {}
-    @allow_unqualified_element = false
-    @default_encodingstyle = nil
-    @mapping_registry = nil
-  end
-
-  def add_method(receiver, qname, soapaction, name, param_def)
-    fqname = fqname(qname)
-    @receiver[fqname] = receiver
-    @method_name[fqname] = name
-    @method[fqname] = RPC::SOAPMethodRequest.new(qname, param_def, soapaction)
-  end
-
-  def add_header_handler
-    raise NotImplementedError.new
-  end
-
-  # Routing...
-  def route(soap_string, charset = nil)
-    opt = options
-    opt[:charset] = charset
-    is_fault = false
-    begin
-      header, body = Processor.unmarshal(soap_string, opt)
-      # So far, header is omitted...
-      soap_request = body.request
-      unless soap_request.is_a?(SOAPStruct)
-	raise RPCRoutingError.new("Not an RPC style.")
-      end
-      soap_response = dispatch(soap_request)
-    rescue Exception
-      soap_response = fault($!)
-      is_fault = true
-    end
-
-    header = SOAPHeader.new
-    body = SOAPBody.new(soap_response)
-    response_string = Processor.marshal(header, body, opt)
-
-    return response_string, is_fault
-  end
-
-  # Create fault response string.
-  def create_fault_response(e, charset = nil)
-    header = SOAPHeader.new
-    soap_response = fault(e)
-    body = SOAPBody.new(soap_response)
-    opt = options
-    opt[:charset] = charset
-    Processor.marshal(header, body, opt)
-  end
-
-private
-
-  # Create new response.
-  def create_response(qname, result)
-    name = fqname(qname)
-    if (@method.key?(name))
-      method = @method[name]
-    else
-      raise RPCRoutingError.new("Method: #{ name } not defined.")
-    end
-
-    soap_response = method.create_method_response
-    if soap_response.have_outparam?
-      unless result.is_a?(Array)
-	raise RPCRoutingError.new("Out parameter was not returned.")
-      end
-      outparams = {}
-      i = 1
-      soap_response.each_param_name('out', 'inout') do |outparam|
-	outparams[outparam] = Mapping.obj2soap(result[i], @mapping_registry)
-	i += 1
-      end
-      soap_response.set_outparam(outparams)
-      soap_response.retval = Mapping.obj2soap(result[0], @mapping_registry)
-    else
-      soap_response.retval = Mapping.obj2soap(result, @mapping_registry)
-    end
-    soap_response
-  end
-
-  # Create fault response.
-  def fault(e)
-    detail = Mapping::SOAPException.new(e)
-    SOAPFault.new(
-      SOAPString.new('Server'),
-      SOAPString.new(e.to_s),
-      SOAPString.new(@actor),
-      Mapping.obj2soap(detail, @mapping_registry))
-  end
-
-  # Dispatch to defined method.
-  def dispatch(soap_method)
-    request_struct = Mapping.soap2obj(soap_method, @mapping_registry)
-    values = soap_method.collect { |key, value| request_struct[key] }
-    method = lookup(soap_method.elename, values)
-    unless method
-      raise RPCRoutingError.new(
-	"Method: #{ soap_method.elename } not supported.")
-    end
-
-    result = method.call(*values)
-    create_response(soap_method.elename, result)
-  end
-
-  # Method lookup
-  def lookup(qname, values)
-    name = fqname(qname)
-    # It may be necessary to check all part of method signature...
-    if @method.member?(name)
-      @receiver[name].method(@method_name[name].intern)
-    else
-      nil
-    end
-  end
-
-  def fqname(qname)
-    "#{ qname.namespace }:#{ qname.name }"
-  end
-
-  def options
-    opt = {}
-    opt[:default_encodingstyle] = @default_encodingstyle
-    if @allow_unqualified_element
-      opt[:allow_unqualified_element] = true
-    end
-    opt
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/rpc/rpc.rb b/lib/soap/rpc/rpc.rb
deleted file mode 100644
index c3cb3228f5..0000000000
--- a/lib/soap/rpc/rpc.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-=begin
-SOAP4R - RPC utility.
-Copyright (C) 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module SOAP
-
-
-module RPC
-  ServerException = Mapping::MappedException
-
-  def self.defined_methods(obj)
-    if obj.is_a?(Module)
-      obj.methods - Module.methods
-    else
-      obj.methods - Kernel.instance_methods(true)
-    end
-  end
-end
-
-
-end
diff --git a/lib/soap/rpc/soaplet.rb b/lib/soap/rpc/soaplet.rb
deleted file mode 100644
index 1a4ef99b76..0000000000
--- a/lib/soap/rpc/soaplet.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-=begin
-SOAP4R - SOAP handler servlet for WEBrick
-Copyright (C) 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'webrick/httpservlet/abstract'
-require 'webrick/httpstatus'
-require 'soap/rpc/router'
-require 'soap/streamHandler'
-
-module SOAP
-module RPC
-
-
-class SOAPlet < WEBrick::HTTPServlet::AbstractServlet
-public
-  attr_reader :app_scope_router
-
-  def initialize
-    @router_map = {}
-    @app_scope_router = ::SOAP::RPC::Router.new(self.class.name)
-  end
-
-  # Add servant klass whose object has request scope.  A servant object is
-  # instanciated for each request.
-  #
-  # Bare in mind that servant klasses are distinguished by HTTP SOAPAction
-  # header in request.  Client which calls request-scoped servant must have a
-  # SOAPAction header which is a namespace of the servant klass.
-  # I mean, use Driver#add_method_with_soapaction instead of Driver#add_method
-  # at client side.
-  #
-  def add_rpc_request_servant(klass, namespace, mapping_registry = nil)
-    router = RequestRouter.new(klass, namespace, mapping_registry)
-    add_router(namespace, router)
-  end
-
-  # Add servant object which has application scope.
-  def add_rpc_servant(obj, namespace)
-    router = @app_scope_router
-    SOAPlet.add_servant_to_router(router, obj, namespace)
-    add_router(namespace, router)
-  end
-  alias add_servant add_rpc_servant
-
-
-  ###
-  ## Servlet interfaces for WEBrick.
-  #
-  def get_instance(config, *options)
-    @config = config
-    self
-  end
-
-  def require_path_info?
-    false
-  end
-
-  def do_GET(req, res)
-    res.header['Allow'] = 'POST'
-    raise WEBrick::HTTPStatus::MethodNotAllowed, "GET request not allowed."
-  end
-
-  def do_POST(req, res)
-    namespace = parse_soapaction(req.meta_vars['HTTP_SOAPACTION'])
-    router = lookup_router(namespace)
-
-    is_fault = false
-
-    charset = ::SOAP::StreamHandler.parse_media_type(req['content-type'])
-    begin
-      response_stream, is_fault = router.route(req.body, charset)
-    rescue Exception => e
-      response_stream = router.create_fault_response(e)
-      is_fault = true
-    end
-
-    res.body = response_stream
-    res['content-type'] = "text/xml; charset=\"#{charset}\""
-    if response_stream.is_a?(IO)
-      res.chunked = true
-    end
-
-    if is_fault
-      res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
-    end
-  end
-
-private
-
-  class RequestRouter < ::SOAP::RPC::Router
-    def initialize(klass, namespace, mapping_registry = nil)
-      super(namespace)
-      if mapping_registry
-	self.mapping_registry = mapping_registry
-      end
-      @klass = klass
-      @namespace = namespace
-    end
-
-    def route(soap_string)
-      obj = @klass.new
-      namespace = self.actor
-      router = ::SOAP::RPC::Router.new(@namespace)
-      SOAPlet.add_servant_to_router(router, obj, namespace)
-      router.route(soap_string)
-    end
-  end
-
-  def add_router(namespace, router)
-    @router_map[namespace] = router
-  end
-
-  def parse_soapaction(soapaction)
-    if /^"(.*)"$/ =~ soapaction
-      soapaction = $1
-    end
-    if soapaction.empty?
-      return nil
-    end
-    soapaction
-  end
-
-  def lookup_router(namespace)
-    if namespace
-      @router_map[namespace] || @app_scope_router
-    else
-      @app_scope_router
-    end
-  end
-
-  class << self
-  public
-    def add_servant_to_router(router, obj, namespace)
-      ::SOAP::RPC.defined_methods(obj).each do |name|
-	add_servant_method_to_router(router, obj, namespace, name)
-      end
-    end
-
-    def add_servant_method_to_router(router, obj, namespace, name)
-      qname = XSD::QName.new(namespace, name)
-      soapaction = nil
-      method = obj.method(name)
-      param_def = ::SOAP::RPC::SOAPMethod.create_param_def(
-        (1..method.arity.abs).collect { |i| "p#{ i }" })
-      router.add_method(obj, qname, soapaction, name, param_def)
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/rpc/standaloneServer.rb b/lib/soap/rpc/standaloneServer.rb
deleted file mode 100644
index 8862f7606e..0000000000
--- a/lib/soap/rpc/standaloneServer.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-=begin
-SOAP4R - WEBrick Server
-Copyright (C) 2003 by NAKAMURA, Hiroshi
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'logger'
-require 'soap/rpc/soaplet'
-require 'soap/streamHandler'
-
-# require 'webrick'
-require 'webrick/compat.rb'
-require 'webrick/version.rb'
-require 'webrick/config.rb'
-require 'webrick/log.rb'
-require 'webrick/server.rb'
-require 'webrick/utils.rb'
-require 'webrick/accesslog'
-# require 'webrick/htmlutils.rb'
-require 'webrick/httputils.rb'
-# require 'webrick/cookie.rb'
-require 'webrick/httpversion.rb'
-require 'webrick/httpstatus.rb'
-require 'webrick/httprequest.rb'
-require 'webrick/httpresponse.rb'
-require 'webrick/httpserver.rb'
-# require 'webrick/httpservlet.rb'
-# require 'webrick/httpauth.rb'
-
-
-module SOAP
-module RPC
-
-
-class StandaloneServer < Logger::Application
-  attr_reader :server
-
-  def initialize(app_name, namespace, host = "0.0.0.0", port = 8080)
-    super(app_name)
-    self.level = Logger::Severity::INFO
-    @namespace = namespace
-    @host = host
-    @port = port
-    @server = nil
-    @soaplet = ::SOAP::RPC::SOAPlet.new
-    on_init
-  end
-
-  def on_init
-    # define extra methods in derived class.
-  end
-  
-  def add_rpc_request_servant(klass, namespace = @namespace, mapping_registry = nil)
-    @soaplet.add_rpc_request_servant(klass, namespace, mapping_registry)
-  end
-
-  def add_rpc_servant(obj, namespace = @namespace)
-    @soaplet.add_rpc_servant(obj, namespace)
-  end
-  alias add_servant add_rpc_servant
-
-  def mapping_registry
-    @soaplet.app_scope_router.mapping_registry
-  end
-
-  def mapping_registry=(mapping_registry)
-    @soaplet.app_scope_router.mapping_registry = mapping_registry
-  end
-
-  def add_method(obj, name, *param)
-    add_method_as(obj, name, name, *param)
-  end
-
-  def add_method_as(obj, name, name_as, *param)
-    qname = XSD::QName.new(@namespace, name_as)
-    soapaction = nil
-    method = obj.method(name)
-    param_def = if param.size == 1 and param[0].is_a?(Array)
-        param[0]
-      elsif param.empty?
-	::SOAP::RPC::SOAPMethod.create_param_def(
-	  (1..method.arity.abs).collect { |i| "p#{ i }" })
-      else
-        SOAP::RPC::SOAPMethod.create_param_def(param)
-      end
-    @soaplet.app_scope_router.add_method(obj, qname, soapaction, name, param_def)
-  end
-
-private
-
-  def run
-    @server = WEBrick::HTTPServer.new(
-      :BindAddress => @host,
-      :Logger => @log,
-      :AccessLog => [],
-      :Port => @port
-    )
-    @server.mount('/', @soaplet)
-    @server.start
-  end
-end
-
-
-end
-end
diff --git a/lib/soap/soap.rb b/lib/soap/soap.rb
deleted file mode 100644
index 313af3a059..0000000000
--- a/lib/soap/soap.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-=begin
-SOAP4R - Base definitions.
-Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/qname'
-require 'xsd/charset'
-
-
-module SOAP
-
-
-Version = '1.5.0'
-
-EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
-EncodingNamespace = 'http://schemas.xmlsoap.org/soap/encoding/'
-LiteralNamespace = 'http://xml.apache.org/xml-soap/literalxml'
-
-NextActor = 'http://schemas.xmlsoap.org/soap/actor/next'
-
-EleEnvelope = 'Envelope'
-EleHeader = 'Header'
-EleBody = 'Body'
-EleFault = 'Fault'
-EleFaultString = 'faultstring'
-EleFaultActor = 'faultactor'
-EleFaultCode = 'faultcode'
-EleFaultDetail = 'detail'
-
-AttrMustUnderstand = 'mustUnderstand'
-AttrEncodingStyle = 'encodingStyle'
-AttrActor = 'actor'
-AttrRoot = 'root'
-AttrArrayType = 'arrayType'
-AttrOffset = 'offset'
-AttrPosition = 'position'
-ValueArray = 'Array'
-
-EleEnvelopeName = XSD::QName.new(EnvelopeNamespace, EleEnvelope)
-EleHeaderName = XSD::QName.new(EnvelopeNamespace, EleHeader)
-EleBodyName = XSD::QName.new(EnvelopeNamespace, EleBody)
-EleFaultName = XSD::QName.new(EnvelopeNamespace, EleFault)
-EleFaultStringName = XSD::QName.new(nil, EleFaultString)
-EleFaultActorName = XSD::QName.new(nil, EleFaultActor)
-EleFaultCodeName = XSD::QName.new(nil, EleFaultCode)
-EleFaultDetailName = XSD::QName.new(nil, EleFaultDetail)
-AttrEncodingStyleName = XSD::QName.new(EnvelopeNamespace, AttrEncodingStyle)
-AttrRootName = XSD::QName.new(EncodingNamespace, AttrRoot)
-AttrArrayTypeName = XSD::QName.new(EncodingNamespace, AttrArrayType)
-AttrOffsetName = XSD::QName.new(EncodingNamespace, AttrOffset)
-AttrPositionName = XSD::QName.new(EncodingNamespace, AttrPosition)
-ValueArrayName = XSD::QName.new(EncodingNamespace, ValueArray)
-
-Base64Literal = 'base64'
-
-SOAPNamespaceTag = 'env'
-XSDNamespaceTag = 'xsd'
-XSINamespaceTag = 'xsi'
-
-MediaType = 'text/xml'
-
-class Error < StandardError; end
-
-class StreamError < Error; end
-class HTTPStreamError < StreamError; end
-class PostUnavailableError < HTTPStreamError; end
-class MPostUnavailableError < HTTPStreamError; end
-
-class ArrayIndexOutOfBoundsError < Error; end
-class ArrayStoreError < Error; end
-
-class RPCRoutingError < Error; end
-
-class FaultError < Error
-  attr_reader :faultcode
-  attr_reader :faultstring
-  attr_reader :faultactor
-  attr_accessor :detail
-
-  def initialize(fault)
-    @faultcode = fault.faultcode
-    @faultstring = fault.faultstring
-    @faultactor = fault.faultactor
-    @detail = fault.detail
-    super(self.to_s)
-  end
-
-  def to_s
-    str = nil
-    if @faultstring && @faultstring.respond_to?('data')
-      str = @faultstring.data
-    end
-    str || '(No faultstring)'
-  end
-end
-
-
-end
diff --git a/lib/soap/streamHandler.rb b/lib/soap/streamHandler.rb
deleted file mode 100644
index a9068b368d..0000000000
--- a/lib/soap/streamHandler.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-=begin
-SOAP4R - Stream handler.
-Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'soap/soap'
-
-
-module SOAP
-
-
-class StreamHandler
-  Client = begin
-      require 'http-access2'
-      if HTTPAccess2::VERSION < "2.0"
-	raise LoadError.new("http-access/2.0 or later is required.")
-      end
-      HTTPAccess2::Client
-    rescue LoadError
-      STDERR.puts "Loading http-access2 failed.  Net/http is used." if $DEBUG
-      require 'soap/netHttpClient'
-      SOAP::NetHttpClient
-    end
-
-  RUBY_VERSION_STRING = "ruby #{ RUBY_VERSION } (#{ RUBY_RELEASE_DATE }) [#{ RUBY_PLATFORM }]"
-
-  class ConnectionData
-    attr_accessor :send_string
-    attr_accessor :send_contenttype
-    attr_accessor :receive_string
-    attr_accessor :receive_contenttype
-
-    def initialize
-      @send_string = nil
-      @send_contenttype = nil
-      @receive_string = nil
-      @receive_contenttype = nil
-      @bag = {}
-    end
-
-    def [](idx)
-      @bag[idx]
-    end
-
-    def []=(idx, value)
-      @bag[idx] = value
-    end
-  end
-
-  attr_accessor :endpoint_url
-
-  def initialize(endpoint_url)
-    @endpoint_url = endpoint_url
-  end
-
-  def self.parse_media_type(str)
-    if /^#{ MediaType }(?:\s*;\s*charset=([^"]+|"[^"]+"))?$/i !~ str
-      raise StreamError.new("Illegal media type.");
-    end
-    charset = $1
-    charset.gsub!(/"/, '') if charset
-    charset
-  end
-
-  def self.create_media_type(charset)
-    "#{ MediaType }; charset=#{ charset }"
-  end
-end
-
-
-class HTTPPostStreamHandler < StreamHandler
-  include SOAP
-
-public
-  
-  attr_accessor :wiredump_dev
-  attr_accessor :wiredump_file_base
-  attr_accessor :charset
-  
-  NofRetry = 10       	# [times]
-  ConnectTimeout = 20   # [sec]
-  SendTimeout = 60	# [sec]
-  ReceiveTimeout = 60   # [sec]
-
-  def initialize(endpoint_url, proxy = nil, charset = nil)
-    super(endpoint_url)
-    @proxy = proxy || ENV['http_proxy'] || ENV['HTTP_PROXY']
-    @charset = charset || XSD::Charset.charset_label($KCODE)
-    @wiredump_dev = nil	# Set an IO to get wiredump.
-    @wiredump_file_base = nil
-    @client = Client.new(@proxy, "SOAP4R/#{ Version }")
-    @client.session_manager.connect_timeout = ConnectTimeout
-    @client.session_manager.send_timeout = SendTimeout
-    @client.session_manager.receive_timeout = ReceiveTimeout
-  end
-
-  def proxy=(proxy)
-    @proxy = proxy
-    @client.proxy = @proxy
-  end
-
-  def send(soap_string, soapaction = nil, charset = @charset)
-    send_post(soap_string, soapaction, charset)
-  end
-
-  def reset
-    @client.reset(@endpoint_url)
-  end
-
-private
-
-  def send_post(soap_string, soapaction, charset)
-    data = ConnectionData.new
-    data.send_string = soap_string
-    data.send_contenttype = StreamHandler.create_media_type(charset)
-
-    wiredump_dev = if @wiredump_dev && @wiredump_dev.respond_to?("<<")
-	@wiredump_dev
-      else
-	nil
-      end
-    @client.debug_dev = wiredump_dev
-
-    if @wiredump_file_base
-      filename = @wiredump_file_base + '_request.xml'
-      f = File.open(filename, "w")
-      f << soap_string
-      f.close
-    end
-
-    extra = {}
-    extra['Content-Type'] = data.send_contenttype
-    extra['SOAPAction'] = "\"#{ soapaction }\""
-
-    wiredump_dev << "Wire dump:\n\n" if wiredump_dev
-    begin
-      res = @client.post(@endpoint_url, soap_string, extra)
-    rescue
-      @client.reset(@endpoint_url)
-      raise
-    end
-    wiredump_dev << "\n\n" if wiredump_dev
-
-    receive_string = res.content
-
-    if @wiredump_file_base
-      filename = @wiredump_file_base + '_response.xml'
-      f = File.open(filename, "w")
-      f << receive_string
-      f.close
-    end
-
-    case res.status
-    when 405
-      raise PostUnavailableError.new("#{ res.status }: #{ res.reason }")
-    when 200, 500
-      # Nothing to do.
-    else
-      raise HTTPStreamError.new("#{ res.status }: #{ res.reason }")
-    end
-
-    data.receive_string = receive_string
-    data.receive_contenttype = res.contenttype
-
-    return data
-  end
-
-  CRLF = "\r\n"
-end
-
-
-end
diff --git a/lib/soap/wsdlDriver.rb b/lib/soap/wsdlDriver.rb
deleted file mode 100644
index 6ecc4b4f6e..0000000000
--- a/lib/soap/wsdlDriver.rb
+++ /dev/null
@@ -1,491 +0,0 @@
-=begin
-SOAP4R - SOAP WSDL driver
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/parser'
-require 'wsdl/importer'
-require 'xsd/qname'
-require 'soap/element'
-require 'soap/baseData'
-require 'soap/streamHandler'
-require 'soap/mapping'
-require 'soap/mapping/wsdlRegistry'
-require 'soap/rpc/rpc'
-require 'soap/rpc/element'
-require 'soap/processor'
-require 'logger'
-
-
-module SOAP
-
-
-class WSDLDriverFactory
-  class FactoryError < StandardError; end
-
-  attr_reader :wsdl
-
-  def initialize(wsdl, logdev = nil)
-    @logdev = logdev
-    @wsdl = import(wsdl)
-  end
-
-  def create_driver(servicename = nil, portname = nil, opt = {})
-    service = if servicename
-	@wsdl.service(XSD::QName.new(@wsdl.targetnamespace, servicename))
-      else
-	@wsdl.services[0]
-      end
-    if service.nil?
-      raise FactoryError.new("Service #{ servicename } not found in WSDL.")
-    end
-    port = if portname
-	service.ports[XSD::QName.new(@wsdl.targetnamespace, portname)]
-      else
-	service.ports[0]
-      end
-    if port.nil?
-      raise FactoryError.new("Port #{ portname } not found in WSDL.")
-    end
-    if port.soap_address.nil?
-      raise FactoryError.new("soap:address element not found in WSDL.")
-    end
-    WSDLDriver.new(@wsdl, port, @logdev, opt)
-  end
-
-  # Backward compatibility.
-  alias createDriver create_driver
-
-private
-  
-  def import(location)
-    WSDL::Importer.import(location)
-  end
-end
-
-
-class WSDLDriver
-  class << self
-    def __attr_proxy(symbol, assignable = false)
-      name = symbol.to_s
-      module_eval <<-EOD
-       	def #{name}
-	  @servant.#{name}
-	end
-      EOD
-      if assignable
-   	module_eval <<-EOD
-	  def #{name}=(rhs)
-	    @servant.#{name} = rhs
-	  end
-	EOD
-      end
-    end
-  end
-
-  __attr_proxy :opt
-  __attr_proxy :logdev, true
-  __attr_proxy :mapping_registry, true		# for RPC unmarshal
-  __attr_proxy :wsdl_mapping_registry, true	# for RPC marshal
-  __attr_proxy :endpoint_url, true
-  __attr_proxy :wiredump_dev, true
-  __attr_proxy :wiredump_file_base, true
-  __attr_proxy :httpproxy, true
-
-  __attr_proxy :default_encodingstyle, true
-  __attr_proxy :allow_unqualified_element, true
-  __attr_proxy :generate_explicit_type, true
-
-  def reset_stream
-    @servant.reset_stream
-  end
-
-  # Backward compatibility.
-  alias generateEncodeType= generate_explicit_type=
-
-  class Servant__
-    include Logger::Severity
-    include SOAP
-
-    attr_reader :opt
-    attr_accessor :logdev
-    attr_accessor :mapping_registry
-    attr_accessor :wsdl_mapping_registry
-    attr_reader :endpoint_url
-    attr_reader :wiredump_dev
-    attr_reader :wiredump_file_base
-    attr_reader :httpproxy
-
-    attr_accessor :default_encodingstyle
-    attr_accessor :allow_unqualified_element
-    attr_accessor :generate_explicit_type
-
-    class Mapper
-      def initialize(elements, types)
-	@elements = elements
-	@types = types
-      end
-
-      def obj2ele(obj, name)
-	if ele = @elements[name]
-	  _obj2ele(obj, ele)
-	elsif type = @types[name]
-	  obj2type(obj, type)
-	else
-	  raise RuntimeError.new("Cannot find name #{name} in schema.")
-	end
-      end
-
-      def ele2obj(ele, *arg)
-	raise NotImplementedError.new
-      end
-
-    private
-
-      def _obj2ele(obj, ele)
-	o = nil
-	if ele.type
-	  if type = @types[ele.type]
-	    o = obj2type(obj, type)
-	  elsif type = TypeMap[ele.type]
-	    o = base2soap(obj, type)
-	  else
-	    raise RuntimeError.new("Cannot find type #{ele.type}.")
-	  end
-	  o.elename = ele.name
-	elsif ele.local_complextype
-	  o = SOAPElement.new(ele.name)
-	  ele.local_complextype.each_element do |child_name, child_ele|
-	    o.add(_obj2ele(find_attribute(obj, child_name.name), child_ele))
-	  end
-	else
-	  raise RuntimeError.new("Illegal schema?")
-	end
-	o
-      end
-
-      def obj2type(obj, type)
-	o = SOAPElement.new(type.name)
-	type.each_element do |child_name, child_ele|
-	  o.add(_obj2ele(find_attribute(obj, child_name.name), child_ele))
-	end
-	o
-      end
-
-      def _ele2obj(ele)
-	raise NotImplementedError.new
-      end
-
-      def base2soap(obj, type)
-	soap_obj = nil
-	if type <= XSD::XSDString
-	  soap_obj = type.new(XSD::Charset.is_ces(obj, $KCODE) ?
-	    XSD::Charset.encoding_conv(obj, $KCODE, XSD::Charset.encoding) : obj)
-	else
-	  soap_obj = type.new(obj)
-	end
-	soap_obj
-      end
-
-      def find_attribute(obj, attr_name)
-	if obj.respond_to?(attr_name)
-	  obj.__send__(attr_name)
-	elsif obj.is_a?(Hash)
-	  obj[attr_name] || obj[attr_name.intern]
-	else
-	  obj.instance_eval("@#{ attr_name }")
-	end
-      end
-    end
-
-    def initialize(host, wsdl, port, logdev, opt)
-      @host = host
-      @wsdl = wsdl
-      @port = port
-      @logdev = logdev
-      @opt = opt.dup
-      @mapping_registry = nil		# for rpc unmarshal
-      @wsdl_mapping_registry = nil	# for rpc marshal
-      @endpoint_url = nil
-      @wiredump_dev = nil
-      @wiredump_file_base = nil
-      name = 'http_proxy'
-      @httpproxy = ENV[name] || ENV[name.upcase]
-
-      @wsdl_elements = @wsdl.collect_elements
-      @wsdl_types = @wsdl.collect_complextypes
-      @rpc_decode_typemap = @wsdl_types + @wsdl.soap_rpc_complextypes(port.find_binding)
-      @wsdl_mapping_registry = Mapping::WSDLRegistry.new(@rpc_decode_typemap)
-      @doc_mapper = Mapper.new(@wsdl_elements, @wsdl_types)
-      @default_encodingstyle = EncodingNamespace
-      @allow_unqualified_element = true
-      @generate_explicit_type = false
-
-      create_handler
-      @operations = {}
-      # Convert a map which key is QName, to a Hash which key is String.
-      @port.inputoperation_map.each do |op_name, op_info|
-	@operations[op_name.name] = op_info
-	add_method_interface(op_info)
-      end
-    end
-
-    def endpoint_url=(endpoint_url)
-      @endpoint_url = endpoint_url
-      if @handler
-	@handler.endpoint_url = @endpoint_url
-	@handler.reset
-      end
-      log(DEBUG) { "endpoint_url=: set endpoint_url #{ @endpoint_url }." }
-    end
-
-    def wiredump_dev=(dev)
-      @wiredump_dev = dev
-      if @handler
-	@handler.wiredump_dev = @wiredump_dev
-	@handler.reset
-      end
-    end
-
-    def wiredump_file_base=(base)
-      @wiredump_file_base = base
-    end
-
-    def httpproxy=(httpproxy)
-      @httpproxy = httpproxy
-      if @handler
-	@handler.proxy = @httpproxy
-	@handler.reset
-      end
-      log(DEBUG) { "httpproxy=: set httpproxy #{ @httpproxy }." }
-    end
-
-    def reset_stream
-      @handler.reset
-    end
-
-    def rpc_send(method_name, *params)
-      log(INFO) { "call: calling method '#{ method_name }'." }
-      log(DEBUG) { "call: parameters '#{ params.inspect }'." }
-
-      op_info = @operations[method_name]
-      parts_names = op_info.bodyparts.collect { |part| part.name }
-      obj = create_method_obj(parts_names, params)
-      method = Mapping.obj2soap(obj, @wsdl_mapping_registry, op_info.optype_name)
-      method.elename = op_info.op_name
-      method.type = XSD::QName.new	# Request should not be typed.
-      req_header = nil
-      req_body = SOAPBody.new(method)
-
-      if @wiredump_file_base
-	@handler.wiredump_file_base = @wiredump_file_base + '_' << method_name
-      end
-
-      begin
-	opt = create_options
-	opt[:decode_typemap] = @rpc_decode_typemap
-	res_header, res_body = invoke(req_header, req_body, op_info, opt)
-	if res_body.fault
-	  raise SOAP::FaultError.new(res_body.fault)
-	end
-      rescue SOAP::FaultError => e
-	Mapping.fault2exception(e)
-      end
-
-      ret = res_body.response ?
-	Mapping.soap2obj(res_body.response, @mapping_registry) : nil
-
-      if res_body.outparams
-	outparams = res_body.outparams.collect { |outparam|
-  	  Mapping.soap2obj(outparam)
-   	}
-    	return [ret].concat(outparams)
-      else
-      	return ret
-      end
-    end
-
-    # req_header: [[element, mustunderstand, encodingstyle(QName/String)], ...]
-    # req_body: SOAPBasetype/SOAPCompoundtype
-    def document_send(name, header_obj, body_obj)
-      log(INFO) { "document_send: sending document '#{ name }'." }
-      op_info = @operations[name]
-      req_header = header_from_obj(header_obj, op_info)
-      req_body = body_from_obj(body_obj, op_info)
-      opt = create_options
-      res_header, res_body = invoke(req_header, req_body, op_info, opt)
-      if res_body.fault
-	raise SOAP::FaultError.new(res_body.fault)
-      end
-      res_body_obj = res_body.response ?
-	Mapping.soap2obj(res_body.response, @mapping_registry) : nil
-      return res_header, res_body_obj
-    end
-
-  private
-
-    def create_handler
-      endpoint_url = @endpoint_url || @port.soap_address.location
-      @handler = HTTPPostStreamHandler.new(endpoint_url, @httpproxy,
-	XSD::Charset.encoding_label)
-      @handler.wiredump_dev = @wiredump_dev
-    end
-
-    def create_method_obj(names, params)
-      o = Object.new
-      for idx in 0 ... params.length
-	o.instance_eval("@#{ names[idx] } = params[idx]")
-      end
-      o
-    end
-
-    def invoke(req_header, req_body, op_info, opt)
-      send_string = Processor.marshal(req_header, req_body, opt)
-      log(DEBUG) { "invoke: sending string #{ send_string }" }
-      data = @handler.send(send_string, op_info.soapaction)
-      log(DEBUG) { "invoke: received string #{ data.receive_string }" }
-      if data.receive_string.empty?
-	return nil, nil
-      end
-      res_charset = StreamHandler.parse_media_type(data.receive_contenttype)
-      opt[:charset] = res_charset
-      res_header, res_body = Processor.unmarshal(data.receive_string, opt)
-      return res_header, res_body
-    end
-
-    def header_from_obj(obj, op_info)
-      if obj.is_a?(SOAPHeader)
-	obj
-      elsif op_info.headerparts.empty?
-	if obj.nil?
-	  nil
-	else
-	  raise RuntimeError.new("No header definition in schema.")
-	end
-      elsif op_info.headerparts.size == 1
-       	part = op_info.headerparts[0]
-	header = SOAPHeader.new()
-	header.add(headeritem_from_obj(obj, part.element || part.eletype))
-	header
-      else
-	header = SOAPHeader.new()
-	op_info.headerparts.each do |part|
-	  child = obj[part.elename.name]
-	  ele = headeritem_from_obj(child, part.element || part.eletype)
-	  header.add(ele)
-	end
-	header
-      end
-    end
-
-    def headeritem_from_obj(obj, name)
-      if obj.nil?
-	SOAPElement.new(name)
-      elsif obj.is_a?(SOAPHeaderItem)
-	obj
-      else
-	@doc_mapper.obj2ele(obj, name)
-      end
-    end
-
-    def body_from_obj(obj, op_info)
-      if obj.is_a?(SOAPBody)
-	obj
-      elsif op_info.bodyparts.empty?
-	if obj.nil?
-	  nil
-	else
-	  raise RuntimeError.new("No body found in schema.")
-	end
-      elsif op_info.bodyparts.size == 1
-       	part = op_info.bodyparts[0]
-	ele = bodyitem_from_obj(obj, part.element || part.type)
-	SOAPBody.new(ele)
-      else
-	body = SOAPBody.new
-	op_info.bodyparts.each do |part|
-	  child = obj[part.elename.name]
-	  ele = bodyitem_from_obj(child, part.element || part.type)
-	  body.add(ele.elename.name, ele)
-	end
-	body
-      end
-    end
-
-    def bodyitem_from_obj(obj, name)
-      if obj.nil?
-	SOAPElement.new(name)
-      elsif obj.is_a?(SOAPElement)
-	obj
-      else
-	@doc_mapper.obj2ele(obj, name)
-      end
-    end
-
-    def add_method_interface(op_info)
-      case op_info.style
-      when :document
-	add_document_method_interface(op_info.op_name.name)
-      when :rpc
-	parts_names = op_info.bodyparts.collect { |part| part.name }
-	add_rpc_method_interface(op_info.op_name.name, parts_names)
-      else
-	raise RuntimeError.new("Unknown style: #{op_info.style}")
-      end
-    end
-
-    def add_document_method_interface(name)
-      @host.instance_eval <<-EOS
-	def #{ name }(headers, body)
-	  @servant.document_send(#{ name.dump }, headers, body)
-	end
-      EOS
-    end
-
-    def add_rpc_method_interface(name, parts_names)
-      i = 0
-      param_names = parts_names.collect { |orgname| i += 1; "arg#{ i }" }
-      callparam_str = (param_names.collect { |pname| ", " + pname }).join
-      @host.instance_eval <<-EOS
-	def #{ name }(#{ param_names.join(", ") })
-	  @servant.rpc_send(#{ name.dump }#{ callparam_str })
-	end
-      EOS
-    end
-
-    def create_options
-      opt = @opt.dup
-      opt[:default_encodingstyle] = @default_encodingstyle
-      opt[:allow_unqualified_element] = @allow_unqualified_element
-      opt[:generate_explicit_type] = @generate_explicit_type
-      opt
-    end
-
-    def log(sev)
-      @logdev.add(sev, nil, self.class) { yield } if @logdev
-    end
-  end
-
-  def initialize(wsdl, port, logdev, opt)
-    @servant = Servant__.new(self, wsdl, port, logdev, opt)
-  end
-end
-
-
-end
-
-
diff --git a/lib/sync.rb b/lib/sync.rb
index 79522ed885..f1410af1a9 100644
--- a/lib/sync.rb
+++ b/lib/sync.rb
@@ -1,9 +1,10 @@
 #
 #   sync.rb - 2 phase lock with counter
-#   	$Release Version: 1.0$
+#   	$Release Version: 0.2$
 #   	$Revision$
 #   	$Date$
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#   	by Keiju ISHITSUKA
+#   	modified by matz
 #
 # --
 #  Sync_m, Synchronizer_m
@@ -11,7 +12,7 @@
 #   obj.extend(Sync_m)
 #   or
 #   class Foo
-#	include Sync_m
+#	Sync_m.include_to self
 #	:
 #   end
 #
@@ -75,32 +76,29 @@ module Sync_m
     end
   end
   
-  def Sync_m.define_aliases(cl)
-    cl.module_eval %q{
-      alias locked? sync_locked?
-      alias shared? sync_shared?
-      alias exclusive? sync_exclusive?
-      alias lock sync_lock
-      alias unlock sync_unlock
-      alias try_lock sync_try_lock
-      alias synchronize sync_synchronize
-    }
-  end
-  
   def Sync_m.append_features(cl)
     super
     unless cl.instance_of?(Module)
       # do nothing for Modules
       # make aliases and include the proper module.
-      define_aliases(cl)
+      cl.module_eval %q{
+	alias locked? sync_locked?
+	alias shared? sync_shared?
+	alias exclusive? sync_exclusive?
+	alias lock sync_lock
+	alias unlock sync_unlock
+	alias try_lock sync_try_lock
+	alias synchronize sync_synchronize
+      }
     end
+    return self
   end
   
   def Sync_m.extend_object(obj)
     super
     obj.sync_extended
   end
-
+  
   def sync_extended
     unless (defined? locked? and
 	    defined? shared? and
@@ -109,11 +107,19 @@ module Sync_m
 	    defined? unlock and
 	    defined? try_lock and
 	    defined? synchronize)
-      Sync_m.define_aliases(class<<self;self;end)
+      eval "class << self
+	alias locked? sync_locked?
+        alias shared? sync_shared?
+        alias exclusive? sync_exclusive?
+	alias lock sync_lock
+	alias unlock sync_unlock
+	alias try_lock sync_try_lock
+	alias synchronize sync_synchronize
+      end"
     end
-    sync_initialize
+    initialize
   end
-
+  
   # accessing
   def sync_locked?
     sync_mode != UN
@@ -224,38 +230,34 @@ module Sync_m
   end
   
   def sync_synchronize(mode = EX)
+    sync_lock(mode)
     begin
-      sync_lock(mode)
       yield
     ensure
       sync_unlock
     end
   end
-
+  
   attr :sync_mode, true
-    
   attr :sync_waiting, true
   attr :sync_upgrade_waiting, true
   attr :sync_sh_locker, true
   attr :sync_ex_locker, true
   attr :sync_ex_count, true
-    
+
   private
 
-  def sync_initialize
+  def initialize(*args)
+    ret = super
     @sync_mode = UN
     @sync_waiting = []
     @sync_upgrade_waiting = []
     @sync_sh_locker = Hash.new
     @sync_ex_locker = nil
     @sync_ex_count = 0
+    return ret
   end
-
-  def initialize(*args)
-    sync_initialize
-    super
-  end
-    
+  
   def sync_try_lock_sub(m)
     case m
     when SH
@@ -300,12 +302,12 @@ end
 Synchronizer_m = Sync_m
 
 class Sync
-  #Sync_m.extend_class self
   include Sync_m
+  
+  private
     
   def initialize
     super
   end
-    
 end
 Synchronizer = Sync
diff --git a/lib/telnet.rb b/lib/telnet.rb
new file mode 100644
index 0000000000..5a0ae40443
--- /dev/null
+++ b/lib/telnet.rb
@@ -0,0 +1,628 @@
+=begin
+$Date: 1999/07/16 13:39:42 $
+
+== SIMPLE TELNET CLIANT LIBRARY
+
+telnet.rb
+
+Version 0.231
+
+Wakou Aoyama <wakou@fsinet.or.jp>
+
+
+=== MAKE NEW TELNET OBJECT
+
+	host = Telnet.new({"Binmode" => false,           # default: false
+	                   "Host" => "localhost",        # default: "localhost"
+	                   "Output_log" => "output_log", # default: not output
+	                   "Dump_log" => "dump_log",     # default: not output
+	                   "Port" => 23,                 # default: 23
+	                   "Prompt" => /[$%#>] \z/n,     # default: /[$%#>] \z/n
+	                   "Telnetmode" => true,         # default: true
+	                   "Timeout" => 10,              # default: 10
+	                     # if ignore timeout then set "Timeout" to false.
+	                   "Waittime" => 0,              # default: 0
+	                   "Proxy" => proxy})            # default: nil
+                                    # proxy is Telnet or TCPsocket object
+
+Telnet object has socket class methods.
+
+if set "Telnetmode" option to false. not telnet command interpretation.
+"Waittime" is time to confirm "Prompt". There is a possibility that
+the same character as "Prompt" is included in the data, and, when
+the network or the host is very heavy, the value is enlarged.
+
+=== STATUS OUTPUT
+
+	host = Telnet.new({"Hosh" => "localhost"){|c| print c }
+
+connection status output.
+
+example
+
+	Trying localhost...
+	Connected to localhost.
+
+
+=== WAIT FOR MATCH
+
+	line = host.waitfor(/match/)
+	line = host.waitfor({"Match"   => /match/,
+	                     "String"  => "string",
+	                     "Timeout" => secs})
+	                       # if ignore timeout then set "Timeout" to false.
+
+if set "String" option, then Match == Regexp.new(quote("string"))
+
+
+==== REALTIME OUTPUT
+
+	host.waitfor(/match/){|c| print c }
+	host.waitfor({"Match"   => /match/,
+	              "String"  => "string",
+	              "Timeout" => secs}){|c| print c}
+
+of cource, set sync=true or flush is necessary.
+
+
+=== SEND STRING AND WAIT PROMPT
+
+	line = host.cmd("string")
+	line = host.cmd({"String" => "string",
+	                 "Prompt" => /[$%#>] \z/n,
+	                 "Timeout" => 10})
+
+
+==== REALTIME OUTPUT
+
+	host.cmd("string"){|c| print c }
+	host.cmd({"String" => "string",
+	          "Prompt" => /[$%#>] \z/n,
+	          "Timeout" => 10}){|c| print c }
+
+of cource, set sync=true or flush is necessary.
+
+
+=== SEND STRING
+
+	host.print("string")
+
+
+=== TURN TELNET COMMAND INTERPRETATION
+
+	host.telnetmode        # turn on/off
+	host.telnetmode(true)  # on
+	host.telnetmode(false) # off
+
+
+=== TOGGLE NEWLINE TRANSLATION
+
+	host.binmode        # turn true/false
+	host.binmode(true)  # no translate newline
+	host.binmode(false) # translate newline
+
+
+=== LOGIN
+
+	host.login("username", "password")
+	host.login({"Name" => "username",
+	            "Password" => "password",
+	            "Prompt" => /[$%#>] \z/n,
+	            "Timeout" => 10})
+
+
+==== REALTIME OUTPUT
+
+	host.login("username", "password"){|c| print c }
+	host.login({"Name" => "username",
+	            "Password" => "password",
+	            "Prompt" => /[$%#>] \z/n,
+	            "Timeout" => 10}){|c| print c }
+
+of cource, set sync=true or flush is necessary.
+
+
+== EXAMPLE
+
+=== LOGIN AND SEND COMMAND
+
+	localhost = Telnet.new({"Host" => "localhost",
+	                        "Timeout" => 10,
+	                        "Prompt" => /[$%#>] \z/n})
+	localhost.login("username", "password"){|c| print c }
+	localhost.cmd("command"){|c| print c }
+	localhost.close
+
+
+=== CHECKS A POP SERVER TO SEE IF YOU HAVE MAIL
+
+	pop = Telnet.new({"Host" => "your_destination_host_here",
+	                  "Port" => 110,
+	                  "Telnetmode" => false,
+	                  "Prompt" => /^\+OK/n})
+	pop.cmd("user " + "your_username_here"){|c| print c}
+	pop.cmd("pass " + "your_password_here"){|c| print c}
+	pop.cmd("list"){|c| print c}
+
+
+== HISTORY
+
+=== Version 0.231
+
+1999/07/16 13:39:42
+
+- TRUE --> true, FALSE --> false
+
+=== Version 0.23
+
+1999/07/15 22:32:09
+
+- waitfor: if end of file reached, then return nil.
+
+=== Version 0.22
+
+1999/06/29 09:08:51
+
+- new, waitfor, cmd: {"Timeout" => false}  # ignore timeout
+
+=== Version 0.21
+
+1999/06/28 18:18:55
+
+- waitfor: not rescue (EOFError)
+
+=== Version 0.20
+
+1999/06/04 06:24:58
+
+- waitfor: support for divided telnet command
+
+=== Version 0.181
+
+1999/05/22
+
+- bug fix: print method
+
+=== Version 0.18
+
+1999/05/14
+
+- respond to "IAC WON'T SGA" with "IAC DON'T SGA"
+- DON'T SGA : end of line --> CR + LF
+- bug fix: preprocess method
+
+=== Version 0.17
+
+1999/04/30
+
+- bug fix: $! + "\n"  -->  $!.to_s + "\n"
+
+=== Version 0.163
+
+1999/04/11
+
+- STDOUT.write(message) --> yield(message) if iterator?
+
+=== Version 0.162
+
+1999/03/17
+
+- add "Proxy" option
+- required timeout.rb
+
+=== Version 0.161
+
+1999/02/03
+
+- select --> IO::select
+
+=== Version 0.16
+
+1998/10/09
+
+- preprocess method change for the better
+- add binmode method.
+- change default Binmode. TRUE --> FALSE
+
+=== Version 0.15
+
+1998/10/04
+
+- add telnetmode method.
+
+=== Version 0.141
+
+1998/09/22
+
+- change default prompt. /[$%#>] $/ --> /[$%#>] \Z/
+
+=== Version 0.14
+
+1998/09/01
+
+- IAC WILL SGA             send EOL --> CR+NULL
+- IAC WILL SGA IAC DO BIN  send EOL --> CR
+- NONE                     send EOL --> LF
+- add Dump_log option.
+
+=== Version 0.13
+
+1998/08/25
+
+- add print method.
+
+=== Version 0.122
+
+1998/08/05
+
+- support for HP-UX 10.20    thanks to WATANABE Tetsuya <tetsu@jpn.hp.com>
+- socket.<< --> socket.write
+
+=== Version 0.121
+
+1998/07/15
+
+- string.+= --> string.concat
+
+=== Version 0.12
+
+1998/06/01
+
+- add timeout, waittime.
+
+=== Version 0.11
+
+1998/04/21
+
+- add realtime output.
+
+=== Version 0.10
+
+1998/04/13
+
+- first release.
+
+=end
+
+require "socket"
+require "delegate"
+require "thread"
+require "timeout"
+TimeOut = TimeoutError
+
+class Telnet < SimpleDelegator
+
+  IAC   = 255.chr # "\377" # interpret as command:
+  DONT  = 254.chr # "\376" # you are not to use option
+  DO    = 253.chr # "\375" # please, you use option
+  WONT  = 252.chr # "\374" # I won't use option
+  WILL  = 251.chr # "\373" # I will use option
+  SB    = 250.chr # "\372" # interpret as subnegotiation
+  GA    = 249.chr # "\371" # you may reverse the line
+  EL    = 248.chr # "\370" # erase the current line
+  EC    = 247.chr # "\367" # erase the current character
+  AYT   = 246.chr # "\366" # are you there
+  AO    = 245.chr # "\365" # abort output--but let prog finish
+  IP    = 244.chr # "\364" # interrupt process--permanently
+  BREAK = 243.chr # "\363" # break
+  DM    = 242.chr # "\362" # data mark--for connect. cleaning
+  NOP   = 241.chr # "\361" # nop
+  SE    = 240.chr # "\360" # end sub negotiation
+  EOR   = 239.chr # "\357" # end of record (transparent mode)
+  ABORT = 238.chr # "\356" # Abort process
+  SUSP  = 237.chr # "\355" # Suspend process
+  EOF   = 236.chr # "\354" # End of file
+  SYNCH = 242.chr # "\362" # for telfunc calls
+
+  OPT_BINARY         =   0.chr # "\000" # Binary Transmission
+  OPT_ECHO           =   1.chr # "\001" # Echo
+  OPT_RCP            =   2.chr # "\002" # Reconnection
+  OPT_SGA            =   3.chr # "\003" # Suppress Go Ahead
+  OPT_NAMS           =   4.chr # "\004" # Approx Message Size Negotiation
+  OPT_STATUS         =   5.chr # "\005" # Status
+  OPT_TM             =   6.chr # "\006" # Timing Mark
+  OPT_RCTE           =   7.chr # "\a"   # Remote Controlled Trans and Echo
+  OPT_NAOL           =   8.chr # "\010" # Output Line Width
+  OPT_NAOP           =   9.chr # "\t"   # Output Page Size
+  OPT_NAOCRD         =  10.chr # "\n"   # Output Carriage-Return Disposition
+  OPT_NAOHTS         =  11.chr # "\v"   # Output Horizontal Tab Stops
+  OPT_NAOHTD         =  12.chr # "\f"   # Output Horizontal Tab Disposition
+  OPT_NAOFFD         =  13.chr # "\r"   # Output Formfeed Disposition
+  OPT_NAOVTS         =  14.chr # "\016" # Output Vertical Tabstops
+  OPT_NAOVTD         =  15.chr # "\017" # Output Vertical Tab Disposition
+  OPT_NAOLFD         =  16.chr # "\020" # Output Linefeed Disposition
+  OPT_XASCII         =  17.chr # "\021" # Extended ASCII
+  OPT_LOGOUT         =  18.chr # "\022" # Logout
+  OPT_BM             =  19.chr # "\023" # Byte Macro
+  OPT_DET            =  20.chr # "\024" # Data Entry Terminal
+  OPT_SUPDUP         =  21.chr # "\025" # SUPDUP
+  OPT_SUPDUPOUTPUT   =  22.chr # "\026" # SUPDUP Output
+  OPT_SNDLOC         =  23.chr # "\027" # Send Location
+  OPT_TTYPE          =  24.chr # "\030" # Terminal Type
+  OPT_EOR            =  25.chr # "\031" # End of Record
+  OPT_TUID           =  26.chr # "\032" # TACACS User Identification
+  OPT_OUTMRK         =  27.chr # "\e"   # Output Marking
+  OPT_TTYLOC         =  28.chr # "\034" # Terminal Location Number
+  OPT_3270REGIME     =  29.chr # "\035" # Telnet 3270 Regime
+  OPT_X3PAD          =  30.chr # "\036" # X.3 PAD
+  OPT_NAWS           =  31.chr # "\037" # Negotiate About Window Size
+  OPT_TSPEED         =  32.chr # " "    # Terminal Speed
+  OPT_LFLOW          =  33.chr # "!"    # Remote Flow Control
+  OPT_LINEMODE       =  34.chr # "\""   # Linemode
+  OPT_XDISPLOC       =  35.chr # "#"    # X Display Location
+  OPT_OLD_ENVIRON    =  36.chr # "$"    # Environment Option
+  OPT_AUTHENTICATION =  37.chr # "%"    # Authentication Option
+  OPT_ENCRYPT        =  38.chr # "&"    # Encryption Option
+  OPT_NEW_ENVIRON    =  39.chr # "'"    # New Environment Option
+  OPT_EXOPL          = 255.chr # "\377" # Extended-Options-List
+
+  NULL = "\000"
+  CR   = "\015"
+  LF   = "\012"
+  EOL  = CR + LF
+v = $-v
+$-v = false
+  VERSION = "0.231"
+  RELEASE_DATE = "$Date: 1999/07/16 13:39:42 $"
+$-v = v
+
+  def initialize(options)
+    @options = options
+    @options["Binmode"]    = false         unless @options.key?("Binmode")
+    @options["Host"]       = "localhost"   unless @options.key?("Host")
+    @options["Port"]       = 23            unless @options.key?("Port")
+    @options["Prompt"]     = /[$%#>] \z/n  unless @options.key?("Prompt")
+    @options["Telnetmode"] = true          unless @options.key?("Telnetmode")
+    @options["Timeout"]    = 10            unless @options.key?("Timeout")
+    @options["Waittime"]   = 0             unless @options.key?("Waittime")
+
+    @telnet_option = { "SGA" => false, "BINARY" => false }
+
+    if @options.key?("Output_log")
+      @log = File.open(@options["Output_log"], 'a+')
+      @log.sync = true
+      @log.binmode
+    end
+
+    if @options.key?("Dump_log")
+      @dumplog = File.open(@options["Dump_log"], 'a+')
+      @dumplog.sync = true
+      @dumplog.binmode
+    end
+
+    if @options.key?("Proxy")
+      if @options["Proxy"].kind_of?(Telnet)
+        @sock = @options["Proxy"].sock
+      elsif @options["Proxy"].kind_of?(TCPsocket)
+        @sock = @options["Proxy"]
+      else
+        raise "Error; Proxy is Telnet or TCPSocket object."
+      end
+    else
+      message = "Trying " + @options["Host"] + "...\n"
+      yield(message) if iterator?
+      @log.write(message) if @options.key?("Output_log")
+      @dumplog.write(message) if @options.key?("Dump_log")
+
+      begin
+        if @options["Timeout"] == false
+          @sock = TCPsocket.open(@options["Host"], @options["Port"])
+        else
+          timeout(@options["Timeout"]){
+            @sock = TCPsocket.open(@options["Host"], @options["Port"])
+          }
+        end
+      rescue TimeoutError
+        raise TimeOut, "timed-out; opening of the host"
+      rescue
+        @log.write($!.to_s + "\n") if @options.key?("Output_log")
+        @dumplog.write($!.to_s + "\n") if @options.key?("Dump_log")
+        raise
+      end
+      @sock.sync = true
+      @sock.binmode
+
+      message = "Connected to " + @options["Host"] + ".\n"
+      yield(message) if iterator?
+      @log.write(message) if @options.key?("Output_log")
+      @dumplog.write(message) if @options.key?("Dump_log")
+    end
+
+    super(@sock)
+  end # initialize
+
+  attr :sock
+
+  def telnetmode(mode = 'turn')
+    if 'turn' == mode
+      @options["Telnetmode"] = @options["Telnetmode"] ? false : true
+    else
+      @options["Telnetmode"] = mode ? true : false
+    end
+  end
+
+  def binmode(mode = 'turn')
+    if 'turn' == mode
+      @options["Binmode"] = @options["Binmode"] ? false : true
+    else
+      @options["Binmode"] = mode ? true : false
+    end
+  end
+
+  def preprocess(string)
+    str = string.dup
+
+    # combine CR+NULL into CR
+    str.gsub!(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
+
+    # combine EOL into "\n"
+    str.gsub!(/#{EOL}/no, "\n") unless @options["Binmode"]
+
+    # respond to "IAC DO x"
+    str.gsub!(/([^#{IAC}]?)#{IAC}#{DO}([#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}])/no){
+      if OPT_BINARY == $2
+        @telnet_option["BINARY"] = true
+        @sock.write(IAC + WILL + OPT_BINARY)
+      else
+        @sock.write(IAC + WONT + $2)
+      end
+      $1
+    }
+
+    # respond to "IAC DON'T x" with "IAC WON'T x"
+    str.gsub!(/([^#{IAC}]?)#{IAC}#{DONT}([#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}])/no){
+      @sock.write(IAC + WONT + $2)
+      $1
+    }
+
+    # respond to "IAC WILL x"
+    str.gsub!(/([^#{IAC}]?)#{IAC}#{WILL}([#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}])/no){
+      if OPT_ECHO == $2
+        @sock.write(IAC + DO + OPT_ECHO)
+      elsif OPT_SGA == $2
+        @telnet_option["SGA"] = true
+        @sock.write(IAC + DO + OPT_SGA)
+      end
+      $1
+    }
+
+    # respond to "IAC WON'T x"
+    str.gsub!(/([^#{IAC}]?)#{IAC}#{WONT}([#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}])/no){
+      if OPT_ECHO == $2
+        @sock.write(IAC + DONT + OPT_ECHO)
+      elsif OPT_SGA == $2
+        @telnet_option["SGA"] = false
+        @sock.write(IAC + DONT + OPT_SGA)
+      end
+      $1
+    }
+
+    # respond to "IAC AYT" (are you there)
+    str.gsub!(/([^#{IAC}]?)#{IAC}#{AYT}/no){
+      @sock.write("nobody here but us pigeons" + EOL)
+      $1
+    }
+
+    str.gsub!(/#{IAC}#{IAC}/no, IAC) # handle escaped IAC characters
+
+    str
+  end # preprocess
+
+  def waitfor(options)
+    time_out = @options["Timeout"]
+    waittime = @options["Waittime"]
+
+    if options.kind_of?(Hash)
+      prompt   = if options.key?("Match")
+                   options["Match"]   
+                 elsif options.key?("Prompt")
+                   options["Prompt"]
+                 elsif options.key?("String")
+                   Regexp.new( Regexp.quote(options["String"]) )
+                 end
+      time_out = options["Timeout"]  if options.key?("Timeout")
+      waittime = options["Waittime"] if options.key?("Waittime")
+    else
+      prompt = options
+    end
+
+    if time_out == false
+      time_out = nil
+    end
+
+    line = ''
+    buf = ''
+    until(not IO::select([@sock], nil, nil, waittime) and prompt === line)
+      unless IO::select([@sock], nil, nil, time_out)
+        raise TimeOut, "timed-out; wait for the next data"
+      end
+      begin
+        c = @sock.sysread(1024 * 1024)
+        @dumplog.print(c) if @options.key?("Dump_log")
+        buf.concat c
+        if @options["Telnetmode"]
+          buf = preprocess(buf) 
+          if /#{IAC}.?\z/no === buf
+            next
+          end 
+        end 
+        @log.print(buf) if @options.key?("Output_log")
+        yield buf if iterator?
+        line.concat(buf)
+        buf = ''
+      rescue EOFError # End of file reached
+        if line == ''
+          line = nil
+          yield nil if iterator?
+        end
+        break
+      end
+    end
+    line
+  end
+
+  def print(string)
+    str = string.dup + "\n"
+
+    str.gsub!(/#{IAC}/no, IAC + IAC) if @options["Telnetmode"]
+
+    unless @options["Binmode"]
+      if @telnet_option["BINARY"] and @telnet_option["SGA"]
+        # IAC WILL SGA IAC DO BIN send EOL --> CR
+        str.gsub!(/\n/n, CR)
+      elsif @telnet_option["SGA"]
+        # IAC WILL SGA send EOL --> CR+NULL
+        str.gsub!(/\n/n, CR + NULL)
+      else
+        # NONE send EOL --> CR+LF
+        str.gsub!(/\n/n, EOL)
+      end
+    end
+
+    @sock.write(str)
+  end
+
+  def cmd(options)
+    match    = @options["Prompt"]
+    time_out = @options["Timeout"]
+
+    if options.kind_of?(Hash)
+      string   = options["String"]
+      match    = options["Match"]   if options.key?("Match")
+      time_out = options["Timeout"] if options.key?("Timeout")
+    else
+      string = options
+    end
+
+    IO::select(nil, [@sock])
+    self.print(string)
+    if iterator?
+      waitfor({"Prompt" => match, "Timeout" => time_out}){|c| yield c }
+    else
+      waitfor({"Prompt" => match, "Timeout" => time_out})
+    end
+  end
+
+  def login(options, password = '')
+    if options.kind_of?(Hash)
+      username = options["Name"]
+      password = options["Password"]
+    else
+      username = options
+    end
+
+    if iterator?
+      line = waitfor(/login[: ]*\z/n){|c| yield c }
+      line.concat( cmd({"String" => username,
+                        "Match" => /Password[: ]*\z/n}){|c| yield c } )
+      line.concat( cmd(password){|c| yield c } )
+    else
+      line = waitfor(/login[: ]*\z/n)
+      line.concat( cmd({"String" => username,
+                        "Match" => /Password[: ]*\z/n}) )
+      line.concat( cmd(password) )
+    end
+    line
+  end
+
+end
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index f5dc801b21..11a8fba979 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -1,174 +1,86 @@
 #
-# tempfile - manipulates temporary files
-#
 # $Id$
 #
+# The class for temporary files.
+#  o creates a temporary file, which name is "basename.pid.n" with mode "w+".
+#  o Tempfile objects can be used like IO object.
+#  o with tmpfile.close(true) created temporary files are removed.
+#  o created files are also removed on script termination.
+#  o with Tempfile#open, you can reopen the temporary file.
+#  o file mode of the temporary files are 0600.
 
 require 'delegate'
-require 'tmpdir'
+require 'final'
 
-# A class for managing temporary files.  This library is written to be
-# thread safe.
 class Tempfile < SimpleDelegator
-  MAX_TRY = 10
-  @@cleanlist = []
+  Max_try = 10
 
-  # Creates a temporary file of mode 0600 in the temporary directory
-  # whose name is basename.pid.n and opens with mode "w+".  A Tempfile
-  # object works just like a File object.
-  #
-  # If tmpdir is omitted, the temporary directory is determined by
-  # Dir::tmpdir provided by 'tmpdir.rb'.
-  # When $SAFE > 0 and the given tmpdir is tainted, it uses
-  # /tmp. (Note that ENV values are tainted by default)
-  def initialize(basename, tmpdir=Dir::tmpdir)
-    if $SAFE > 0 and tmpdir.tainted?
-      tmpdir = '/tmp'
-    end
+  def Tempfile.callback(path)
+    lambda{
+      print "removing ", path, "..." if $DEBUG
+      if File.exist?(path)
+	File.unlink(path) 
+      end
+      if File.exist?(path + '.lock')
+	Dir.rmdir(path + '.lock')
+      end
+      print "done\n" if $DEBUG
+    }
+  end
 
-    lock = nil
-    n = failure = 0
-    
+  def initialize(basename, tmpdir=ENV['TMPDIR']||ENV['TMP']||ENV['TEMP']||'/tmp')
+    umask = File.umask(0177)
     begin
-      Thread.critical = true
-
-      begin
-	tmpname = sprintf('%s/%s%d.%d', tmpdir, basename, $$, n)
-	lock = tmpname + '.lock'
+      n = 0
+      while true
+	begin
+	  tmpname = sprintf('%s/%s%d.%d', tmpdir, basename, $$, n)
+	  lock = tmpname + '.lock'
+	  unless File.exist?(tmpname) or File.exist?(lock)
+	    Dir.mkdir(lock)
+	    break
+	  end
+	rescue
+	  raise "cannot generate tmpfile `%s'" % tmpname if n >= Max_try
+	  #sleep(1)
+	end
 	n += 1
-      end while @@cleanlist.include?(tmpname) or
-	File.exist?(lock) or File.exist?(tmpname)
+      end
+
+      @clean_files = Tempfile.callback(tmpname)
+      ObjectSpace.define_finalizer(self, @clean_files)
 
-      Dir.mkdir(lock)
-    rescue
-      failure += 1
-      retry if failure < MAX_TRY
-      raise "cannot generate tempfile `%s'" % tmpname
+      @tmpfile = File.open(tmpname, 'w+')
+      @tmpname = tmpname
+      super(@tmpfile)
+      Dir.rmdir(lock)
     ensure
-      Thread.critical = false
+      File.umask(umask)
     end
+  end
 
-    @data = [tmpname]
-    @clean_proc = Tempfile.callback(@data)
-    ObjectSpace.define_finalizer(self, @clean_proc)
-
-    @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600)
-    @tmpname = tmpname
-    @@cleanlist << @tmpname
-    @data[1] = @tmpfile
-    @data[2] = @@cleanlist
-
-    super(@tmpfile)
-
-    # Now we have all the File/IO methods defined, you must not
-    # carelessly put bare puts(), etc. after this.
-
-    Dir.rmdir(lock)
+  def Tempfile.open(*args)
+    Tempfile.new(*args)
   end
 
-  # Opens or reopens the file with mode "r+".
   def open
     @tmpfile.close if @tmpfile
     @tmpfile = File.open(@tmpname, 'r+')
-    @data[1] = @tmpfile
     __setobj__(@tmpfile)
   end
 
-  def _close	# :nodoc:
+  def close(real=false)
     @tmpfile.close if @tmpfile
-    @data[1] = @tmpfile = nil
-  end    
-  protected :_close
-
-  # Closes the file.  If the optional flag is true, unlinks the file
-  # after closing.
-  #
-  # If you don't explicitly unlink the temporary file, the removal
-  # will be delayed until the object is finalized.
-  def close(unlink_now=false)
-    if unlink_now
-      close!
-    else
-      _close
+    @tmpfile = nil
+    if real
+      @clean_files.call
+      ObjectSpace.undefine_finalizer(self)
     end
   end
 
-  # Closes and unlinks the file.
-  def close!
-    _close
-    @clean_proc.call
-    ObjectSpace.undefine_finalizer(self)
-  end
-
-  # Unlinks the file.  On UNIX-like systems, it is often a good idea
-  # to unlink a temporary file immediately after creating and opening
-  # it, because it leaves other programs zero chance to access the
-  # file.
-  def unlink
-    # keep this order for thread safeness
-    File.unlink(@tmpname) if File.exist?(@tmpname)
-    @@cleanlist.delete(@tmpname) if @@cleanlist
-  end
-  alias delete unlink
-
-  # Returns the full path name of the temporary file.
   def path
     @tmpname
   end
-
-  # Returns the size of the temporary file.  As a side effect, the IO
-  # buffer is flushed before determining the size.
-  def size
-    if @tmpfile
-      @tmpfile.flush
-      @tmpfile.stat.size
-    else
-      0
-    end
-  end
-  alias length size
-
-  class << self
-    def callback(data)	# :nodoc:
-      pid = $$
-      lambda{
-	if pid == $$ 
-	  path, tmpfile, cleanlist = *data
-
-	  print "removing ", path, "..." if $DEBUG
-
-	  tmpfile.close if tmpfile
-
-	  # keep this order for thread safeness
-	  File.unlink(path) if File.exist?(path)
-	  cleanlist.delete(path) if cleanlist
-
-	  print "done\n" if $DEBUG
-	end
-      }
-    end
-
-    # If no block is given, this is a synonym for new().
-    #
-    # If a block is given, it will be passed tempfile as an argument,
-    # and the tempfile will automatically be closed when the block
-    # terminates.  In this case, open() returns nil.
-    def open(*args)
-      tempfile = new(*args)
-
-      if block_given?
-	begin
-	  yield(tempfile)
-	ensure
-	  tempfile.close
-	end
-
-	nil
-      else
-	tempfile
-      end
-    end
-  end
 end
 
 if __FILE__ == $0
@@ -178,5 +90,5 @@ if __FILE__ == $0
   f.close
   f.open
   p f.gets # => "foo\n"
-  f.close!
+  f.close(true)
 end
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
deleted file mode 100644
index 6fab874f23..0000000000
--- a/lib/test/unit.rb
+++ /dev/null
@@ -1,275 +0,0 @@
-# = Test::Unit - Ruby Unit Testing Framework
-# 
-# == Introduction
-# 
-# Unit testing is making waves all over the place, largely due to the
-# fact that it is a core practice of XP. While XP is great, unit testing
-# has been around for a long time and has always been a good idea. One
-# of the keys to good unit testing, though, is not just writing tests,
-# but having tests. What's the difference? Well, if you just _write_ a
-# test and throw it away, you have no guarantee that something won't
-# change later which breaks your code. If, on the other hand, you _have_
-# tests (obviously you have to write them first), and run them as often
-# as possible, you slowly build up a wall of things that cannot break
-# without you immediately knowing about it. This is when unit testing
-# hits its peak usefulness.
-# 
-# Enter Test::Unit, a framework for unit testing in Ruby, helping you to
-# design, debug and evaluate your code by making it easy to write and
-# have tests for it.
-# 
-# 
-# == Notes
-# 
-# Test::Unit has grown out of and superceded Lapidary.
-# 
-# 
-# == Feedback
-# 
-# I like (and do my best to practice) XP, so I value early releases,
-# user feedback, and clean, simple, expressive code. There is always
-# room for improvement in everything I do, and Test::Unit is no
-# exception. Please, let me know what you think of Test::Unit as it
-# stands, and what you'd like to see expanded/changed/improved/etc. If
-# you find a bug, let me know ASAP; one good way to let me know what the
-# bug is is to submit a new test that catches it :-) Also, I'd love to
-# hear about any successes you have with Test::Unit, and any
-# documentation you might add will be greatly appreciated. My contact
-# info is below.
-# 
-# 
-# == Contact Information
-# 
-# A lot of discussion happens about Ruby in general on the ruby-talk
-# mailing list (http://www.ruby-lang.org/en/ml.html), and you can ask
-# any questions you might have there. I monitor the list, as do many
-# other helpful Rubyists, and you're sure to get a quick answer. Of
-# course, you're also welcome to email me (Nathaniel Talbott) directly
-# at mailto:testunit@talbott.ws, and I'll do my best to help you out.
-# 
-# 
-# == Credits
-# 
-# I'd like to thank...
-# 
-# Matz, for a great language!
-# 
-# Masaki Suketa, for his work on RubyUnit, which filled a vital need in
-# the Ruby world for a very long time. I'm also grateful for his help in
-# polishing Test::Unit and getting the RubyUnit compatibility layer
-# right. His graciousness in allowing Test::Unit to supercede RubyUnit
-# continues to be a challenge to me to be more willing to defer my own
-# rights.
-# 
-# Ken McKinlay, for his interest and work on unit testing, and for his
-# willingness to dialog about it. He was also a great help in pointing
-# out some of the holes in the RubyUnit compatibility layer.
-# 
-# Dave Thomas, for the original idea that led to the extremely simple
-# "require 'test/unit'", plus his code to improve it even more by
-# allowing the selection of tests from the command-line. Also, without
-# RDoc, the documentation for Test::Unit would stink a lot more than it
-# does now.
-# 
-# Everyone who's helped out with bug reports, feature ideas,
-# encouragement to continue, etc. It's a real privilege to be a part of
-# the Ruby community.
-# 
-# The guys at RoleModel Software, for putting up with me repeating, "But
-# this would be so much easier in Ruby!" whenever we're coding in Java.
-# 
-# My Creator, for giving me life, and giving it more abundantly.
-# 
-# 
-# == License
-# 
-# Test::Unit is copyright (c) 2000-2003 Nathaniel Talbott. It is free
-# software, and is distributed under the Ruby license. See the COPYING
-# file in the standard Ruby distribution for details.
-# 
-# 
-# == Warranty
-# 
-# This software is provided "as is" and without any express or
-# implied warranties, including, without limitation, the implied
-# warranties of merchantibility and fitness for a particular
-# purpose.
-# 
-# 
-# == Author
-# 
-# Nathaniel Talbott.
-# Copyright (c) 2000-2003, Nathaniel Talbott
-#
-# ----
-#
-# = Usage
-#
-# The general idea behind unit testing is that you write a _test_
-# _method_ that makes certain _assertions_ about your code, working
-# against a _test_ _fixture_. A bunch of these _test_ _methods_ are
-# bundled up into a _test_ _suite_ and can be run any time the
-# developer wants. The results of a run are gathered in a _test_
-# _result_ and displayed to the user through some UI. So, lets break
-# this down and see how Test::Unit provides each of these necessary
-# pieces.
-#
-#
-# == Assertions
-#
-# These are the heart of the framework. Think of an assertion as a
-# statement of expected outcome, i.e. "I assert that x should be equal
-# to y". If, when the assertion is executed, it turns out to be
-# correct, nothing happens, and life is good. If, on the other hand,
-# your assertion turns out to be false, an error is propagated with
-# pertinent information so that you can go back and make your
-# assertion succeed, and, once again, life is good. For an explanation
-# of the current assertions, see Test::Unit::Assertions.
-#
-#
-# == Test Method & Test Fixture
-#
-# Obviously, these assertions have to be called within a context that
-# knows about them and can do something meaningful with their
-# pass/fail value. Also, it's handy to collect a bunch of related
-# tests, each test represented by a method, into a common test class
-# that knows how to run them. The tests will be in a separate class
-# from the code they're testing for a couple of reasons. First of all,
-# it allows your code to stay uncluttered with test code, making it
-# easier to maintain. Second, it allows the tests to be stripped out
-# for deployment, since they're really there for you, the developer,
-# and your users don't need them. Third, and most importantly, it
-# allows you to set up a common test fixture for your tests to run
-# against.
-#
-# What's a test fixture? Well, tests do not live in a vacuum; rather,
-# they're run against the code they are testing. Often, a collection
-# of tests will run against a common set of data, also called a
-# fixture. If they're all bundled into the same test class, they can
-# all share the setting up and tearing down of that data, eliminating
-# unnecessary duplication and making it much easier to add related
-# tests.
-#
-# Test::Unit::TestCase wraps up a collection of test methods together
-# and allows you to easily set up and tear down the same test fixture
-# for each test. This is done by overriding #setup and/or #teardown,
-# which will be called before and after each test method that is
-# run. The TestCase also knows how to collect the results of your
-# assertions into a Test::Unit::TestResult, which can then be reported
-# back to you... but I'm getting ahead of myself. To write a test,
-# follow these steps:
-#
-# * Make sure Test::Unit is in your library path.
-# * require 'test/unit' in your test script.
-# * Create a class that subclasses Test::Unit::TestCase.
-# * Add a method that begins with "test" to your class.
-# * Make assertions in your test method.
-# * Optionally define #setup and/or #teardown to set up and/or tear
-#   down your common test fixture.
-# * You can now run your test as you would any other Ruby
-#   script... try it and see!
-#
-# A really simple test might look like this (#setup and #teardown are
-# commented out to indicate that they are completely optional):
-#
-#     require 'test/unit'
-#     
-#     class TC_MyTest < Test::Unit::TestCase
-#       # def setup
-#       # end
-#     
-#       # def teardown
-#       # end
-#     
-#       def test_fail
-#         assert(false, 'Assertion was false.')
-#       end
-#     end
-#
-#
-# == Test Runners
-#
-# So, now you have this great test class, but you still need a way to
-# run it and view any failures that occur during the run. This is
-# where Test::Unit::UI::Console::TestRunner (and others, such as
-# Test::Unit::UI::GTK::TestRunner) comes into play. The console test
-# runner is automatically invoked for you if you require 'test/unit'
-# and simply run the file. To use another runner, or to manually
-# invoke a runner, simply call its run class method and pass in an
-# object that responds to the suite message with a
-# Test::Unit::TestSuite. This can be as simple as passing in your
-# TestCase class (which has a class suite method). It might look
-# something like this:
-#
-#    require 'test/unit/ui/console/testrunner'
-#    Test::Unit::UI::Console::TestRunner.run(TC_MyTest)
-#
-#
-# == Test Suite
-#
-# As more and more unit tests accumulate for a given project, it
-# becomes a real drag running them one at a time, and it also
-# introduces the potential to overlook a failing test because you
-# forget to run it. Suddenly it becomes very handy that the
-# TestRunners can take any object that returns a Test::Unit::TestSuite
-# in response to a suite method. The TestSuite can, in turn, contain
-# other TestSuites or individual tests (typically created by a
-# TestCase). In other words, you can easily wrap up a group of
-# TestCases and TestSuites like this:
-#
-#  require 'test/unit/testsuite'
-#  require 'tc_myfirsttests'
-#  require 'tc_moretestsbyme'
-#  require 'ts_anothersetoftests'
-#
-#  class TS_MyTests
-#    def self.suite
-#      suite = Test::Unit::TestSuite.new
-#      suite << TC_MyFirstTests.suite
-#      suite << TC_MoreTestsByMe.suite
-#      suite << TS_AnotherSetOfTests.suite
-#      return suite
-#    end
-#  end
-#  Test::Unit::UI::Console::TestRunner.run(TS_MyTests)
-#
-# Now, this is a bit cumbersome, so Test::Unit does a little bit more
-# for you, by wrapping these up automatically when you require
-# 'test/unit'. What does this mean? It means you could write the above
-# test case like this instead:
-#
-#  require 'test/unit'
-#  require 'tc_myfirsttests'
-#  require 'tc_moretestsbyme'
-#  require 'ts_anothersetoftests'
-#
-# Test::Unit is smart enough to find all the test cases existing in
-# the ObjectSpace and wrap them up into a suite for you. It then runs
-# the dynamic suite using the console TestRunner.
-#
-#
-# == Questions?
-#
-# I'd really like to get feedback from all levels of Ruby
-# practitioners about typos, grammatical errors, unclear statements,
-# missing points, etc., in this document (or any other).
-
-
-
-
-require 'test/unit/testcase'
-require 'test/unit/autorunner'
-
-module Test
-  module Unit
-    def self.run=(flag)
-      @run = flag
-    end
-
-    def self.run?
-      @run ||= false
-    end
-  end
-end
-
-at_exit{Test::Unit::AutoRunner.run($0) unless(Test::Unit.run?)}
diff --git a/lib/test/unit/assertionfailederror.rb b/lib/test/unit/assertionfailederror.rb
deleted file mode 100644
index 9b9e53f16c..0000000000
--- a/lib/test/unit/assertionfailederror.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-module Test
-  module Unit
-
-    # Thrown by Test::Unit::Assertions when an assertion fails.
-    class AssertionFailedError < Exception
-    end
-  end
-end
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
deleted file mode 100644
index fdb9632e09..0000000000
--- a/lib/test/unit/assertions.rb
+++ /dev/null
@@ -1,444 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/assertionfailederror'
-require 'test/unit/util/backtracefilter'
-
-module Test # :nodoc:
-  module Unit # :nodoc:
-
-    # Contains all of the standard Test::Unit assertions. Mixed in
-    # to Test::Unit::TestCase. To mix it in and use its
-    # functionality, you simply need to rescue
-    # Test::Unit::AssertionFailedError, and you can additionally
-    # override add_assertion to be notified whenever an assertion
-    # is made.
-    #
-    # Notes:
-    # * The message to each assertion, if given, will be
-    #   propagated with the failure.
-    # * It's easy to add your own assertions based on assert_block().
-    module Assertions
-
-      # The assertion upon which all other assertions are
-      # based. Passes if the block yields true.
-      public
-      def assert_block(message="assert_block failed.") # :yields: 
-        _wrap_assertion do
-          if (! yield)
-            raise AssertionFailedError.new(message.to_s)
-          end
-        end
-      end
-
-      # Passes if boolean is true.
-      public
-      def assert(boolean, message=nil)
-        _wrap_assertion do
-          assert_block("assert should not be called with a block.") { !block_given? }
-          assert_block(build_message(message, "<?> is not true.", boolean)) { boolean }
-        end
-      end
-
-      # Passes if expected == actual. Note that the ordering of
-      # arguments is important, since a helpful error message is
-      # generated when this one fails that tells you the values
-      # of expected and actual.
-      public
-      def assert_equal(expected, actual, message=nil)
-        full_message = build_message(message, <<EOT, expected, actual)
-<?> expected but was
-<?>.
-EOT
-        assert_block(full_message) { expected == actual }
-      end
-
-      # Passes if block raises exception.
-      public
-      def assert_raises(expected_exception_klass, message="")
-        _wrap_assertion do
-          assert_instance_of(Class, expected_exception_klass, "Should expect a class of exception")
-          actual_exception = nil
-          full_message = build_message(message, "<?> exception expected but none was thrown.", expected_exception_klass)
-          assert_block(full_message) do
-            thrown = false
-            begin
-              yield
-            rescue Exception => thrown_exception
-              actual_exception = thrown_exception
-              thrown = true
-            end
-            thrown
-          end
-          full_message = build_message(message, "<?> exception expected but was\n?", expected_exception_klass, actual_exception)
-          assert_block(full_message) { expected_exception_klass == actual_exception.class }
-          actual_exception
-        end
-      end
-
-      # Passes if object.class == klass.
-      public
-      def assert_instance_of(klass, object, message="")
-        _wrap_assertion do
-          assert_equal(Class, klass.class, "assert_instance_of takes a Class as its first argument")
-          full_message = build_message(message, <<EOT, object, klass, object.class)
-<?> expected to be an instance of
-<?> but was
-<?>.
-EOT
-          assert_block(full_message){object.instance_of?(klass)}
-        end
-      end
-
-      # Passes if object.nil?.
-      public
-      def assert_nil(object, message="")
-        assert_equal(nil, object, message)
-      end
-
-      # Passes if object.kind_of?(klass).
-      public
-      def assert_kind_of(klass, object, message="")
-        _wrap_assertion do
-          assert(klass.kind_of?(Module), "The first parameter to assert_kind_of should be a kind_of Module.")
-          full_message = build_message(message, "<?>\nexpected to be kind_of\\?<?>.", object, klass)
-          assert_block(full_message){object.kind_of?(klass)}
-        end
-      end
-
-      # Passes if object.respond_to?(method) is true.
-      public
-      def assert_respond_to(object, method, message="")
-        _wrap_assertion do
-          full_message = build_message(nil, "<?>\ngiven as the method name argument to #assert_respond_to must be a Symbol or #respond_to\\?(:to_str).", method)
-
-          assert_block(full_message) do
-            method.kind_of?(Symbol) || method.respond_to?(:to_str)
-          end
-          full_message = build_message(message, <<EOT, object, object.class, method)
-<?>
-of type <?>
-expected to respond_to\\?<?>.
-EOT
-          assert_block(full_message) { object.respond_to?(method) }
-        end
-      end
-
-      # Passes if string =~ pattern.
-      public
-      def assert_match(pattern, string, message="")
-        _wrap_assertion do
-          pattern = case(pattern)
-            when String
-              Regexp.new(Regexp.escape(pattern))
-            else
-              pattern
-          end
-          full_message = build_message(message, "<?> expected to be =~\n<?>.", string, pattern)
-          assert_block(full_message) { string =~ pattern }
-        end
-      end
-
-      # Passes if actual.equal?(expected) (i.e. they are the
-      # same instance).
-      public
-      def assert_same(expected, actual, message="")
-        full_message = build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__)
-<?>
-with id <?> expected to be equal\\? to
-<?>
-with id <?>.
-EOT
-        assert_block(full_message) { actual.equal?(expected) }
-      end
-
-      # Compares the two objects based on the passed
-      # operator. Passes if object1.send(operator, object2) is
-      # true.
-      public
-      def assert_operator(object1, operator, object2, message="")
-        _wrap_assertion do
-          full_message = build_message(nil, "<?>\ngiven as the operator for #assert_operator must be a Symbol or #respond_to\\?(:to_str).", operator)
-          assert_block(full_message){operator.kind_of?(Symbol) || operator.respond_to?(:to_str)}
-          full_message = build_message(message, <<EOT, object1, AssertionMessage.literal(operator), object2)
-<?> expected to be
-?
-<?>.
-EOT
-          assert_block(full_message) { object1.send(operator, object2) }
-        end
-      end
-
-      # Passes if block does not raise an exception.
-      public
-      def assert_nothing_raised(*args)
-        _wrap_assertion do
-          message = ""
-          if (!args[-1].instance_of?(Class))
-            message = args.pop
-          end
-          begin
-            yield
-          rescue Exception => e
-            if ((args.empty? && !e.instance_of?(AssertionFailedError)) || args.include?(e.class))
-              assert_block(build_message(message, "Exception raised:\n?", e)){false}
-            else
-              raise e.class, e.message, e.backtrace
-            end
-          end
-          nil
-        end
-      end
-
-      # Always fails.
-      public
-      def flunk(message="Flunked")
-        assert_block(build_message(message)){false}
-      end
-
-      # Passes if !actual.equal?(expected).
-      public
-      def assert_not_same(expected, actual, message="")
-        full_message = build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__)
-<?>
-with id <?> expected to not be equal\\? to
-<?>
-with id <?>.
-EOT
-        assert_block(full_message) { !actual.equal?(expected) }
-      end
-
-      # Passes if expected != actual.
-      public
-      def assert_not_equal(expected, actual, message="")
-        full_message = build_message(message, "<?> expected to be != to\n<?>.", expected, actual)
-        assert_block(full_message) { expected != actual }
-      end
-
-      # Passes if !object.nil?.
-      public
-      def assert_not_nil(object, message="")
-        warn("Assertions#assert_not_nil is deprecated and will be removed after 1.8.1. Use #assert.")
-        full_message = build_message(message, "<?> expected to not be nil.", object)
-        assert_block(full_message){!object.nil?}
-      end
-
-      # Passes if string !~ regularExpression.
-      public
-      def assert_no_match(regexp, string, message="")
-        _wrap_assertion do
-          assert_instance_of(Regexp, regexp, "The first argument to assert_does_not_match should be a Regexp.")
-          full_message = build_message(message, "<?> expected to not match\n<?>.", regexp, string)
-          assert_block(full_message) { regexp !~ string }
-        end
-      end
-
-      # Passes if block throws symbol.
-      public
-      def assert_throws(expected_symbol, message="", &proc)
-        _wrap_assertion do
-          assert_instance_of(Symbol, expected_symbol, "assert_throws expects the symbol that should be thrown for its first argument")
-          assert_block("Should have passed a block to assert_throws."){block_given?}
-          caught = true
-          begin
-            catch(expected_symbol) do
-              proc.call
-              caught = false
-            end
-            full_message = build_message(message, "<?> should have been thrown.", expected_symbol)
-            assert_block(full_message){caught}
-          rescue NameError => name_error
-            if ( name_error.message !~ /^uncaught throw `(.+)'$/ )  #`
-              raise name_error
-            end
-            full_message = build_message(message, "<?> expected to be thrown but\n<?> was thrown.", expected_symbol, $1.intern)
-            flunk(full_message)
-          end  
-        end
-      end
-
-      # Passes if block does not throw anything.
-      public
-      def assert_nothing_thrown(message="", &proc)
-        _wrap_assertion do
-          assert(block_given?, "Should have passed a block to assert_nothing_thrown")
-          begin
-            proc.call
-          rescue NameError => name_error
-            if (name_error.message !~ /^uncaught throw `(.+)'$/ )  #`
-              raise name_error
-            end
-            full_message = build_message(message, "<?> was thrown when nothing was expected", $1.intern)
-            flunk(full_message)
-          end
-          assert(true, "Expected nothing to be thrown")
-        end
-      end
-
-      # Passes if expected_float and actual_float are equal
-      # within delta tolerance.
-      public
-      def assert_in_delta(expected_float, actual_float, delta, message="")
-        _wrap_assertion do
-          {expected_float => "first float", actual_float => "second float", delta => "delta"}.each do |float, name|
-            assert_respond_to(float, :to_f, "The arguments must respond to to_f; the #{name} did not")
-          end
-          assert_operator(delta, :>=, 0.0, "The delta should not be negative")
-          full_message = build_message(message, <<EOT, expected_float, actual_float, delta)
-<?> and
-<?> expected to be within
-<?> of each other.
-EOT
-          assert_block(full_message) { (expected_float.to_f - actual_float.to_f).abs <= delta.to_f }
-        end
-      end
-
-      # Passes if the method sent returns a true value.
-      public
-      def assert_send(send_array, message="")
-        _wrap_assertion do
-          assert_instance_of(Array, send_array, "assert_send requires an array of send information")
-          assert(send_array.size >= 2, "assert_send requires at least a receiver and a message name")
-          full_message = build_message(message, <<EOT, send_array[0], AssertionMessage.literal(send_array[1].to_s), send_array[2..-1])
-<?> expected to respond to
-<?(?)> with a true value.
-EOT
-          assert_block(full_message) { send_array[0].__send__(send_array[1], *send_array[2..-1]) }
-        end
-      end
-
-      public
-      def build_message(head, template=nil, *arguments) # :nodoc:
-        template &&= template.chomp
-        return AssertionMessage.new(head, template, arguments)
-      end
-
-      private
-      def _wrap_assertion # :nodoc:
-        @_assertion_wrapped ||= false
-        unless (@_assertion_wrapped)
-          @_assertion_wrapped = true
-          begin
-            add_assertion
-            return yield
-          ensure
-            @_assertion_wrapped = false
-          end
-        else
-          return yield
-        end
-      end
-      
-      # Called whenever an assertion is made.
-      private
-      def add_assertion
-      end
-
-      # Select whether or not to use the prettyprinter. If this
-      # option is set to false before any assertions are made, the
-      # prettyprinter will not be required at all.
-      public
-      def self.use_pp=(value)
-        AssertionMessage.use_pp = value
-      end
-      
-      class AssertionMessage # :nodoc: all
-        @use_pp = true
-        class << self
-          attr_accessor :use_pp
-        end
-
-        class Literal
-          def initialize(value)
-            @value = value
-          end
-          
-          def inspect
-            @value.to_s
-          end
-        end
-
-        class Template
-          def self.create(string)
-            parts = (string ? string.scan(/(?=[^\\])\?|(?:\\\?|[^\?])+/m) : [])
-            self.new(parts)
-          end
-
-          attr_reader :count
-
-          def initialize(parts)
-            @parts = parts
-            @count = parts.find_all{|e| e == '?'}.size
-          end
-
-          def result(parameters)
-            raise "The number of parameters does not match the number of substitutions." if(parameters.size != count)
-            params = parameters.dup
-            @parts.collect{|e| e == '?' ? params.shift : e.gsub(/\\\?/m, '?')}.join('')
-          end
-        end
-
-        def self.literal(value)
-          Literal.new(value)
-        end
-
-        include Util::BacktraceFilter
-
-        def initialize(head, template_string, parameters)
-          @head = head
-          @template_string = template_string
-          @parameters = parameters
-        end
-
-        def convert(object)
-          case object
-            when Exception
-              <<EOM.chop
-Class: <#{convert(object.class)}>
-Message: <#{convert(object.message)}>
----Backtrace---
-#{filter_backtrace(object.backtrace).join("\n")}
----------------
-EOM
-            else
-              if(self.class.use_pp)
-                begin
-                  require 'pp'
-                rescue LoadError
-                  self.class.use_pp = false
-                  return object.inspect
-                end unless(defined?(PP))
-                PP.pp(object, '').chomp
-              else
-                object.inspect
-              end
-          end
-        end
-
-        def template
-          @template ||= Template.create(@template_string)
-        end
-
-        def add_period(string)
-          (string =~ /\.\Z/ ? string : string + '.')
-        end
-
-        def to_s
-          message_parts = []
-          if (@head)
-            head = @head.to_s 
-            unless(head.empty?)
-              message_parts << add_period(head)
-            end
-          end
-          tail = template.result(@parameters.collect{|e| convert(e)})
-          message_parts << tail unless(tail.empty?)
-          message_parts.join("\n")
-        end
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/autorunner.rb b/lib/test/unit/autorunner.rb
deleted file mode 100644
index 803dc27d8b..0000000000
--- a/lib/test/unit/autorunner.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-require 'optparse'
-
-require 'test/unit/ui/console/testrunner'
-          
-module Test
-  module Unit
-    class AutoRunner
-      def self.run(current_file=nil, default_dir=nil, &block)
-        if(!current_file || current_file == $0)
-          r = new(!current_file, &block)
-          if(default_dir && r.to_run.empty?)
-            r.to_run = default_dir
-          end
-          r.run
-        end
-      end
-
-      RUNNERS = {
-        :console => proc do |r|
-          output_level = r.output_level || Test::Unit::UI::Console::TestRunner::NORMAL
-          passed = Test::Unit::UI::Console::TestRunner.run(r.suite, output_level).passed?
-          exit(passed ? 0 : 1)
-        end,
-        :gtk => proc do |r|
-          require 'test/unit/ui/gtk/testrunner'
-          Test::Unit::UI::GTK::TestRunner.run(r.suite)
-        end,
-        :fox => proc do |r|
-          require 'test/unit/ui/fox/testrunner'
-          Test::Unit::UI::Fox::TestRunner.run(r.suite)
-        end,
-      }
-
-      OUTPUT_LEVELS = {
-        :silent => UI::Console::TestRunner::SILENT,
-        :progress => UI::Console::TestRunner::PROGRESS_ONLY,
-        :normal => UI::Console::TestRunner::NORMAL,
-        :verbose => UI::Console::TestRunner::VERBOSE,
-      }
-
-      COLLECTORS = {
-        :objectspace => proc do |r|
-          require 'test/unit/collector/objectspace'
-          c = Collector::ObjectSpace.new
-          c.filter = r.filters
-          c.collect($0.sub(/\.rb\Z/, ''))
-        end,
-        :dir => proc do |r|
-          require 'test/unit/collector/dir'
-          c = Collector::Dir.new
-          c.filter = r.filters
-          c.pattern = r.pattern if(r.pattern)
-          c.collect(*(r.to_run.empty? ? ['.'] : r.to_run))
-        end,
-      }
-
-      attr_reader :suite
-      attr_accessor :output_level, :filters, :to_run, :pattern
-      attr_writer :runner, :collector
-
-      def initialize(standalone)
-        Unit.run = true
-        @standalone = standalone
-        @runner = RUNNERS[:console]
-        @collector = COLLECTORS[(standalone ? :dir : :objectspace)]
-        @filters = []
-        @to_run = []
-        process_args
-        yield(self) if(block_given?)
-      end
-
-      def process_args
-        catch(:stop_processing) do
-          ARGV.options do |o|
-            o.program_name = "test/unit.rb"
-            o.banner = "Test::Unit automatic runner."
-            o.banner = "#{$0} [options] [-- untouched arguments]"
-
-            o.on
-            o.on('-r', '--runner=RUNNER', RUNNERS.keys,
-              "Use the given RUNNER.",
-              "(" + keyword_display(RUNNERS.keys) + ")") do |r|
-              @runner = RUNNERS[r]
-            end
-
-            if(@standalone)
-              o.on('-a', '--add=TORUN', Array,
-                "Add TORUN to the list of things to run;",
-                "can be a file or a directory.") do |a|
-                @to_run.concat(a)
-              end
-
-              o.on('-p', '--pattern=PATTERN', String,
-                "Match files to collect against PATTERN.") do |e|
-                @pattern = Regexp.new(e.sub(%r{\A/(.*)/\Z}m, '\\1'))
-              end
-            end
-
-            o.on('-n', '--name=NAME', String,
-              "Runs tests matching NAME.",
-              "(patterns may be used).") do |n|
-              n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
-              case n
-                when Regexp
-                  @filters << proc{|t| n =~ t.method_name ? true : nil}
-                else
-                  @filters << proc{|t| n == t.method_name ? true : nil}
-              end
-            end
-            
-            o.on('-t', '--testcase=TESTCASE', String,
-              "Runs tests in TestCases matching TESTCASE.",
-              "(patterns may be used).") do |n|
-              n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
-              case n
-                when Regexp
-                  @filters << proc{|t| n =~ t.class.name ? true : nil}
-                else
-                  @filters << proc{|t| n == t.class.name ? true : nil}
-              end
-            end
-            
-            o.on('-v', '--verbose=[LEVEL]', OUTPUT_LEVELS.keys,
-              "Set the output level (default is verbose).",
-              "(" + keyword_display(OUTPUT_LEVELS.keys) + ")") do |l|
-              @output_level = (l ? OUTPUT_LEVELS[l] : OUTPUT_LEVELS[:verbose])
-            end
-
-            o.on('--',
-              "Stop processing options so that the",
-              "remaining options will be passed to the",
-              "test."){throw :stop_processing}
-
-            o.on('-h', '--help', 'Display this help.'){puts o; exit(0)}
-
-            o.on_tail
-            o.on_tail('Deprecated options:')
-            
-            o.on_tail('--console', 'Console runner (use --runner).') do
-              warn("Deprecated option (--console).")
-              @runner = RUNNERS[:console]
-            end
-            
-            o.on_tail('--gtk', 'GTK runner (use --runner).') do
-              warn("Deprecated option (--gtk).")
-              @runner = RUNNERS[:gtk]
-            end
-            
-            o.on_tail('--fox', 'Fox runner (use --runner).') do
-              warn("Deprecated option (--fox).")
-              @runner = RUNNERS[:fox]
-            end
-            
-            o.on_tail
-
-            begin
-              o.parse!
-            rescue OptionParser::ParseError => e
-              puts e
-              puts o
-              exit(1)
-            end
-          end
-        end
-        @filters << proc{false} unless(@filters.empty?)
-      end
-
-      def keyword_display(array)
-        array.collect{|e| e.to_s.sub(/^(.)(.+)$/, '\\1[\\2]')}.join(", ")
-      end
-
-      def run
-        @suite = @collector[self]
-        @runner[self]
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/collector.rb b/lib/test/unit/collector.rb
deleted file mode 100644
index 9e9e654147..0000000000
--- a/lib/test/unit/collector.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-module Test
-  module Unit
-    module Collector
-      def initialize
-        @filters = []
-      end
-
-      def filter=(filters)
-        @filters = case(filters)
-          when Proc
-            [filters]
-          when Array
-            filters
-        end
-      end
-
-      def add_suite(destination, suite)
-        to_delete = suite.tests.find_all{|t| !include?(t)}
-        to_delete.each{|t| suite.delete(t)}
-        destination << suite unless(suite.size == 0)
-      end
-
-      def include?(test)
-        return true if(@filters.empty?)
-        @filters.each do |filter|
-          result = filter[test]
-          if(result.nil?)
-            next
-          elsif(!result)
-            return false
-          else
-            return true
-          end
-        end
-        true
-      end
-
-      def sort(suites)
-        suites.sort_by{|s| s.name}
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
deleted file mode 100644
index c4a4c16dfd..0000000000
--- a/lib/test/unit/collector/dir.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'test/unit/testsuite'
-require 'test/unit/collector'
-
-module Test
-  module Unit
-    module Collector
-      class Dir
-        include Collector
-
-        attr_writer :pattern
-
-        def initialize(dir=::Dir, file=::File, object_space=::ObjectSpace, req=nil)
-          super()
-          @dir = dir
-          @file = file
-          @object_space = object_space
-          @req = req
-          @pattern = /\Atest_.*\.rb\Z/m
-        end
-
-        def collect(*from)
-          if(from.empty?)
-            recursive_collect('.', find_test_cases)
-          elsif(from.size == 1)
-            recursive_collect(from.first, find_test_cases)
-          else
-            suites = []
-            from.each do |f|
-              suite = recursive_collect(f, find_test_cases)
-              suites << suite unless(suite.tests.empty?)
-            end
-            suite = TestSuite.new("[#{from.join(', ')}]")
-            sort(suites).each{|s| suite << s}
-            suite
-          end
-        end
-
-        def find_test_cases(ignore=[])
-          cases = []
-          @object_space.each_object(Class) do |c|
-            cases << c if(c < TestCase && !ignore.include?(c))
-          end
-          ignore.concat(cases)
-          cases
-        end
-
-        def recursive_collect(name, already_gathered)
-          sub_suites = []
-          if(@file.directory?(name))
-            @dir.entries(name).each do |e|
-              next if(e == '.' || e == '..')
-              e_name = @file.join(name, e)
-              if(@file.directory?(e_name))
-                sub_suite = recursive_collect(e_name, already_gathered)
-                sub_suites << sub_suite unless(sub_suite.empty?)
-              else
-                (next unless(@pattern =~ e)) if(@pattern)
-                collect_file(e_name, sub_suites, already_gathered)
-              end
-            end
-          else
-            collect_file(name, sub_suites, already_gathered)
-          end
-          suite = TestSuite.new(@file.basename(name))
-          sort(sub_suites).each{|s| suite << s}
-          suite
-        end
-
-        def collect_file(name, suites, already_gathered)
-          loadpath = $:.dup
-          $:.unshift(File.dirname(name))
-          if(@req)
-            @req.require(name)
-          else
-            require(name)
-          end
-          find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
-        rescue LoadError, SystemExit
-        ensure
-          $:.replace(loadpath)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/collector/objectspace.rb b/lib/test/unit/collector/objectspace.rb
deleted file mode 100644
index d1127a981f..0000000000
--- a/lib/test/unit/collector/objectspace.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/collector'
-
-module Test
-  module Unit
-    module Collector
-      class ObjectSpace
-        include Collector
-        
-        NAME = 'collected from the ObjectSpace'
-        
-        def initialize(source=::ObjectSpace)
-          super()
-          @source = source
-        end
-        
-        def collect(name=NAME)
-          suite = TestSuite.new(name)
-          sub_suites = []
-          @source.each_object(Class) do |klass|
-            if(Test::Unit::TestCase > klass)
-              add_suite(sub_suites, klass.suite)
-            end
-          end
-          sort(sub_suites).each{|s| suite << s}
-          suite
-        end
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/error.rb b/lib/test/unit/error.rb
deleted file mode 100644
index 90ac04cf3b..0000000000
--- a/lib/test/unit/error.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/util/backtracefilter'
-
-module Test
-  module Unit
-
-    # Encapsulates an error in a test. Created by
-    # Test::Unit::TestCase when it rescues an exception thrown
-    # during the processing of a test.
-    class Error
-      include Util::BacktraceFilter
-
-      attr_reader(:test_name, :exception)
-
-      SINGLE_CHARACTER = 'E'
-
-      # Creates a new Error with the given test_name and
-      # exception.
-      def initialize(test_name, exception)
-        @test_name = test_name
-        @exception = exception
-      end
-
-      # Returns a single character representation of an error.
-      def single_character_display
-        SINGLE_CHARACTER
-      end
-
-      # Returns the message associated with the error.
-      def message
-        "#{@exception.class.name}: #{@exception.message}"
-      end
-
-      # Returns a brief version of the error description.
-      def short_display
-        "#@test_name: #{message.split("\n")[0]}"
-      end
-
-      # Returns a verbose version of the error description.
-      def long_display
-        backtrace = filter_backtrace(@exception.backtrace).join("\n    ")
-        "Error:\n#@test_name:\n#{message}\n    #{backtrace}"
-      end
-
-      # Overridden to return long_display.
-      def to_s
-        long_display
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/failure.rb b/lib/test/unit/failure.rb
deleted file mode 100644
index 42cc9d4b8c..0000000000
--- a/lib/test/unit/failure.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-module Test
-  module Unit
-
-    # Encapsulates a test failure. Created by Test::Unit::TestCase
-    # when an assertion fails.
-    class Failure
-      attr_reader :test_name, :location, :message
-      
-      SINGLE_CHARACTER = 'F'
-
-      # Creates a new Failure with the given location and
-      # message.
-      def initialize(test_name, location, message)
-        @test_name = test_name
-        @location = location
-        @message = message
-      end
-      
-      # Returns a single character representation of a failure.
-      def single_character_display
-        SINGLE_CHARACTER
-      end
-
-      # Returns a brief version of the error description.
-      def short_display
-        "#@test_name: #{@message.split("\n")[0]}"
-      end
-
-      # Returns a verbose version of the error description.
-      def long_display
-        location_display = if(location.size == 1)
-          location[0].sub(/\A(.+:\d+).*/, ' [\\1]')
-        else
-          "\n    [#{location.join("\n     ")}]"
-        end
-        "Failure:\n#@test_name#{location_display}:\n#@message"
-      end
-
-      # Overridden to return long_display.
-      def to_s
-        long_display
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/testcase.rb b/lib/test/unit/testcase.rb
deleted file mode 100644
index f258c23ca1..0000000000
--- a/lib/test/unit/testcase.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/assertions'
-require 'test/unit/failure'
-require 'test/unit/error'
-require 'test/unit/testsuite'
-require 'test/unit/assertionfailederror'
-require 'test/unit/util/backtracefilter'
-
-module Test
-  module Unit
-
-    # Ties everything together. If you subclass and add your own
-    # test methods, it takes care of making them into tests and
-    # wrapping those tests into a suite. It also does the
-    # nitty-gritty of actually running an individual test and
-    # collecting its results into a Test::Unit::TestResult object.
-    class TestCase
-      include Assertions
-      include Util::BacktraceFilter
-      
-      attr_reader :method_name
-      
-      STARTED = name + "::STARTED"
-      FINISHED = name + "::FINISHED"
-
-      # Creates a new instance of the fixture for running the
-      # test represented by test_method_name.
-      def initialize(test_method_name)
-        unless(respond_to?(test_method_name) && method(test_method_name).arity == 0)
-          throw :invalid_test
-        end
-        @method_name = test_method_name
-        @test_passed = true
-      end
-
-      # Rolls up all of the test* methods in the fixture into
-      # one suite, creating a new instance of the fixture for
-      # each method.
-      def self.suite
-        method_names = public_instance_methods(true)
-        tests = method_names.delete_if {|method_name| method_name !~ /^test./}
-        suite = TestSuite.new(name)
-        tests.sort.each do
-          |test|
-          catch(:invalid_test) do
-            suite << new(test)
-          end
-        end
-        if (suite.empty?)
-          catch(:invalid_test) do
-            suite << new(:default_test)
-          end
-        end
-        return suite
-      end
-
-      # Runs the individual test method represented by this
-      # instance of the fixture, collecting statistics, failures
-      # and errors in result.
-      def run(result)
-        yield(STARTED, name)
-        @_result = result
-        begin
-          setup
-          send(@method_name)
-        rescue AssertionFailedError => e
-          add_failure(e.message, e.backtrace)
-        rescue StandardError, ScriptError
-          add_error($!)
-        ensure
-          begin
-            teardown
-          rescue AssertionFailedError => e
-            add_failure(e.message, e.backtrace)
-          rescue StandardError, ScriptError
-            add_error($!)
-          end
-        end
-        result.add_run
-        yield(FINISHED, name)
-      end
-
-      # Called before every test method runs. Can be used
-      # to set up fixture information.
-      def setup
-      end
-
-      # Called after every test method runs. Can be used to tear
-      # down fixture information.
-      def teardown
-      end
-      
-      def default_test
-        flunk("No tests were specified")
-      end
-
-      # Returns whether this individual test passed or
-      # not. Primarily for use in teardown so that artifacts
-      # can be left behind if the test fails.
-      def passed?
-        return @test_passed
-      end
-      private :passed?
-
-      def size # :nodoc:
-        1
-      end
-
-      def add_assertion # :nodoc:
-        @_result.add_assertion
-      end
-      private :add_assertion
-
-      def add_failure(message, all_locations=caller()) # :nodoc:
-        @test_passed = false
-        @_result.add_failure(Failure.new(name, filter_backtrace(all_locations), message))
-      end
-      private :add_failure
-
-      def add_error(exception) # :nodoc:
-        @test_passed = false
-        @_result.add_error(Error.new(name, exception))
-      end
-      private :add_error
-
-      # Returns a human-readable name for the specific test that
-      # this instance of TestCase represents.
-      def name
-        "#{@method_name}(#{self.class.name})"
-      end
-
-      # Overriden to return #name.
-      def to_s
-        name
-      end
-      
-      # It's handy to be able to compare TestCase instances.
-      def ==(other)
-        return false unless(other.kind_of?(self.class))
-        return false unless(@method_name == other.method_name)
-        self.class == other.class
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/testresult.rb b/lib/test/unit/testresult.rb
deleted file mode 100644
index b1bfbf72e4..0000000000
--- a/lib/test/unit/testresult.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/util/observable'
-
-module Test
-  module Unit
-
-    # Collects Test::Unit::Failure and Test::Unit::Error so that
-    # they can be displayed to the user. To this end, observers
-    # can be added to it, allowing the dynamic updating of, say, a
-    # UI.
-    class TestResult
-      include Util::Observable
-
-      CHANGED = "CHANGED"
-      FAULT = "FAULT"
-
-      attr_reader(:run_count, :assertion_count)
-
-      # Constructs a new, empty TestResult.
-      def initialize
-        @run_count, @assertion_count = 0, 0
-        @failures, @errors = Array.new, Array.new
-      end
-
-      # Records a test run.
-      def add_run
-        @run_count += 1
-        notify_listeners(CHANGED, self)
-      end
-
-      # Records a Test::Unit::Failure.
-      def add_failure(failure)
-        @failures << failure
-        notify_listeners(FAULT, failure)
-        notify_listeners(CHANGED, self)
-      end
-
-      # Records a Test::Unit::Error.
-      def add_error(error)
-        @errors << error
-        notify_listeners(FAULT, error)
-        notify_listeners(CHANGED, self)
-      end
-
-      # Records an individual assertion.
-      def add_assertion
-        @assertion_count += 1
-        notify_listeners(CHANGED, self)
-      end
-
-      # Returns a string contain the recorded runs, assertions,
-      # failures and errors in this TestResult.
-      def to_s
-        "#{run_count} tests, #{assertion_count} assertions, #{failure_count} failures, #{error_count} errors"
-      end
-
-      # Returns whether or not this TestResult represents
-      # successful completion.
-      def passed?
-        return @failures.empty? && @errors.empty?
-      end
-
-      # Returns the number of failures this TestResult has
-      # recorded.
-      def failure_count
-        return @failures.size
-      end
-
-      # Returns the number of errors this TestResult has
-      # recorded.
-      def error_count
-        return @errors.size
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/testsuite.rb b/lib/test/unit/testsuite.rb
deleted file mode 100644
index b3a704ec63..0000000000
--- a/lib/test/unit/testsuite.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-module Test
-  module Unit
-
-    # A collection of tests which can be #run.
-    #
-    # Note: It is easy to confuse a TestSuite instance with
-    # something that has a static suite method; I know because _I_
-    # have trouble keeping them straight. Think of something that
-    # has a suite method as simply providing a way to get a
-    # meaningful TestSuite instance.
-    class TestSuite
-      attr_reader :name, :tests
-      
-      STARTED = name + "::STARTED"
-      FINISHED = name + "::FINISHED"
-
-      # Creates a new TestSuite with the given name.
-      def initialize(name="Unnamed TestSuite")
-        @name = name
-        @tests = []
-      end
-
-      # Runs the tests and/or suites contained in this
-      # TestSuite.
-      def run(result, &progress_block)
-        yield(STARTED, name)
-        @tests.each do |test|
-          test.run(result, &progress_block)
-        end
-        yield(FINISHED, name)
-      end
-
-      # Adds the test to the suite.
-      def <<(test)
-        @tests << test
-        self
-      end
-
-      def delete(test)
-        @tests.delete(test)
-      end
-
-      # Retuns the rolled up number of tests in this suite;
-      # i.e. if the suite contains other suites, it counts the
-      # tests within those suites, not the suites themselves.
-      def size
-        total_size = 0
-        @tests.each { |test| total_size += test.size }
-        total_size
-      end
-      
-      def empty?
-        tests.empty?
-      end
-
-      # Overriden to return the name given the suite at
-      # creation.
-      def to_s
-        @name
-      end
-      
-      # It's handy to be able to compare TestSuite instances.
-      def ==(other)
-        return false unless(other.kind_of?(self.class))
-        return false unless(@name == other.name)
-        @tests == other.tests
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/ui/console/testrunner.rb b/lib/test/unit/ui/console/testrunner.rb
deleted file mode 100644
index dab07ddbc4..0000000000
--- a/lib/test/unit/ui/console/testrunner.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/ui/testrunnermediator'
-require 'test/unit/ui/testrunnerutilities'
-
-module Test
-  module Unit
-    module UI
-      module Console # :nodoc:
-
-        # Runs a Test::Unit::TestSuite on the console.
-        class TestRunner
-          extend TestRunnerUtilities
-          
-          SILENT = 0
-          PROGRESS_ONLY = 1
-          NORMAL = 2
-          VERBOSE = 3
-
-          # Creates a new TestRunner and runs the suite.
-          def self.run(suite, output_level=NORMAL)
-            return new(suite, output_level).start
-          end
-
-          # Creates a new TestRunner for running the passed
-          # suite. If quiet_mode is true, the output while
-          # running is limited to progress dots, errors and
-          # failures, and the final result. io specifies
-          # where runner output should go to; defaults to
-          # STDOUT.
-          def initialize(suite, output_level=NORMAL, io=STDOUT)
-            if (suite.respond_to?(:suite))
-              @suite = suite.suite
-            else
-              @suite = suite
-            end
-            @output_level = output_level
-            @io = io
-            @already_outputted = false
-            @faults = []
-          end
-
-          # Begins the test run.
-          def start
-            setup_mediator
-            attach_to_mediator
-            return start_mediator
-          end
-
-          private
-          def setup_mediator # :nodoc:
-            @mediator = create_mediator(@suite)
-            suite_name = @suite.to_s
-            if ( @suite.kind_of?(Module) )
-              suite_name = @suite.name
-            end
-            output("Loaded suite #{suite_name}")
-          end
-          
-          def create_mediator(suite) # :nodoc:
-            return TestRunnerMediator.new(suite)
-          end
-          
-          def attach_to_mediator # :nodoc:
-            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
-            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
-            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
-            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
-            @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
-          end
-          
-          def start_mediator # :nodoc:
-            return @mediator.run_suite
-          end
-          
-          def add_fault(fault) # :nodoc:
-            @faults << fault
-            output_single(fault.single_character_display, PROGRESS_ONLY)
-            @already_outputted = true
-          end
-          
-          def started(result)
-            @result = result
-            output("Started")
-          end
-          
-          def finished(elapsed_time)
-            nl
-            output("Finished in #{elapsed_time} seconds.")
-            @faults.each_with_index do |fault, index|
-              nl
-              output("%3d) %s" % [index + 1, fault.long_display])
-            end
-            nl
-            output(@result)
-          end
-          
-          def test_started(name)
-            output_single(name + ": ", VERBOSE)
-          end
-          
-          def test_finished(name)
-            output_single(".", PROGRESS_ONLY) unless (@already_outputted)
-            nl(VERBOSE)
-            @already_outputted = false
-          end
-          
-          def nl(level=NORMAL)
-            output("", level)
-          end
-          
-          def output(something, level=NORMAL)
-            @io.puts(something) if (output?(level))
-            @io.flush
-          end
-          
-          def output_single(something, level=NORMAL)
-            @io.write(something) if (output?(level))
-            @io.flush
-          end
-          
-          def output?(level)
-            level <= @output_level
-          end
-        end
-      end
-    end
-  end
-end
-
-if __FILE__ == $0
-  Test::Unit::UI::Console::TestRunner.start_command_line_test
-end
diff --git a/lib/test/unit/ui/fox/testrunner.rb b/lib/test/unit/ui/fox/testrunner.rb
deleted file mode 100644
index 8b82ec634d..0000000000
--- a/lib/test/unit/ui/fox/testrunner.rb
+++ /dev/null
@@ -1,270 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'fox'
-require 'test/unit/ui/testrunnermediator'
-require 'test/unit/ui/testrunnerutilities'
-
-include Fox
-
-module Test
-  module Unit
-    module UI
-      module Fox # :nodoc:
-
-        # Runs a Test::Unit::TestSuite in a Fox UI. Obviously,
-        # this one requires you to have Fox
-        # (http://www.fox-toolkit.org/fox.html) and the Ruby
-        # Fox extension (http://fxruby.sourceforge.net/)
-        # installed.
-        class TestRunner
-
-          extend TestRunnerUtilities
-          
-          RED_STYLE = FXRGBA(0xFF,0,0,0xFF) #0xFF000000
-          GREEN_STYLE = FXRGBA(0,0xFF,0,0xFF) #0x00FF0000
-  
-          # Creates a new TestRunner and runs the suite.
-          def self.run(suite)
-            new(suite).start
-          end
-
-          # Creates a new TestRunner for running the passed
-          # suite.
-          def initialize(suite)
-            if (suite.respond_to?(:suite))
-              @suite = suite.suite
-            else
-              @suite = suite
-            end
-
-            @red = false
-          end
-  
-          # Begins the test run.
-          def start
-            setup_ui
-            setup_mediator
-            attach_to_mediator
-            start_ui
-          end
-
-          def setup_mediator # :nodoc:
-            @mediator = TestRunnerMediator.new(@suite)
-            suite_name = @suite.to_s
-            if ( @suite.kind_of?(Module) )
-              suite_name = @suite.name
-            end
-            @suite_name_entry.text = suite_name
-          end
-          
-          def attach_to_mediator # :nodoc:
-            @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
-            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
-            @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
-            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
-            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
-            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
-          end
-  
-          def start_ui # :nodoc:
-            @application.create
-            @window.show(PLACEMENT_SCREEN)
-            @application.addTimeout(1) do
-              @mediator.run_suite
-            end
-            @application.run
-          end
-          
-          def stop # :nodoc:
-            @application.exit(0)
-          end
-          
-          def reset_ui(count) # :nodoc:
-            @test_progress_bar.barColor = GREEN_STYLE
-            @test_progress_bar.total = count
-            @test_progress_bar.progress = 0
-            @red = false
-  
-            @test_count_label.text = "0"
-            @assertion_count_label.text = "0"
-            @failure_count_label.text = "0"
-            @error_count_label.text = "0"
-  
-            @fault_list.clearItems
-          end
-          
-          def add_fault(fault) # :nodoc:
-            if ( ! @red )
-              @test_progress_bar.barColor = RED_STYLE
-              @red = true
-            end
-            item = FaultListItem.new(fault)
-            @fault_list.appendItem(item)
-          end
-          
-          def show_fault(fault) # :nodoc:
-            raw_show_fault(fault.long_display)
-          end
-          
-          def raw_show_fault(string) # :nodoc:
-            @detail_text.setText(string)
-          end
-          
-          def clear_fault # :nodoc:
-            raw_show_fault("")
-          end
-          
-          def result_changed(result) # :nodoc:
-            @test_progress_bar.progress = result.run_count
-  
-            @test_count_label.text = result.run_count.to_s
-            @assertion_count_label.text = result.assertion_count.to_s
-            @failure_count_label.text = result.failure_count.to_s
-            @error_count_label.text = result.error_count.to_s
-
-             # repaint now!
-             @info_panel.repaint
-             @application.flush
-          end
-          
-          def started(result) # :nodoc:
-            output_status("Started...")
-          end
-          
-          def test_started(test_name)
-            output_status("Running #{test_name}...")
-          end
-          
-          def finished(elapsed_time)
-            output_status("Finished in #{elapsed_time} seconds")
-          end
-          
-          def output_status(string)
-            @status_entry.text = string
-            @status_entry.repaint
-          end
-  
-          def setup_ui # :nodoc:
-            @application = create_application
-            create_tooltip(@application)
-
-            @window = create_window(@application)
-            
-            @status_entry = create_entry(@window)
-            
-            main_panel = create_main_panel(@window)
-            
-            suite_panel = create_suite_panel(main_panel)
-            create_label(suite_panel, "Suite:")
-            @suite_name_entry = create_entry(suite_panel)
-            create_button(suite_panel, "&Run\tRun the current suite", proc { @mediator.run_suite })
-            
-            @test_progress_bar = create_progress_bar(main_panel)
-            
-            @info_panel = create_info_panel(main_panel)
-            create_label(@info_panel, "Tests:")
-            @test_count_label = create_label(@info_panel, "0")
-            create_label(@info_panel, "Assertions:")
-            @assertion_count_label = create_label(@info_panel, "0")
-            create_label(@info_panel, "Failures:")
-            @failure_count_label = create_label(@info_panel, "0")
-            create_label(@info_panel, "Errors:")
-            @error_count_label = create_label(@info_panel, "0")
-            
-            list_panel = create_list_panel(main_panel)
-            @fault_list = create_fault_list(list_panel)
-            
-            detail_panel = create_detail_panel(main_panel)
-            @detail_text = create_text(detail_panel)
-          end
-          
-          def create_application # :nodoc:
-            app = FXApp.new("TestRunner", "Test::Unit")
-            app.init([])
-            app
-          end
-          
-          def create_window(app)
-            FXMainWindow.new(app, "Test::Unit TestRunner", nil, nil, DECOR_ALL, 0, 0, 450)
-          end
-          
-          def create_tooltip(app)
-            FXTooltip.new(app)
-          end
-  
-          def create_main_panel(parent) # :nodoc:
-            panel = FXVerticalFrame.new(parent, LAYOUT_FILL_X | LAYOUT_FILL_Y)
-            panel.vSpacing = 10
-            panel
-          end
-  
-          def create_suite_panel(parent) # :nodoc:
-            FXHorizontalFrame.new(parent, LAYOUT_SIDE_LEFT | LAYOUT_FILL_X)
-          end
-          
-          def create_button(parent, text, action) # :nodoc:
-            FXButton.new(parent, text).connect(SEL_COMMAND, &action)
-          end
-          
-          def create_progress_bar(parent) # :nodoc:
-            FXProgressBar.new(parent, nil, 0, PROGRESSBAR_NORMAL | LAYOUT_FILL_X)
-          end
-          
-          def create_info_panel(parent) # :nodoc:
-            FXMatrix.new(parent, 1, MATRIX_BY_ROWS | LAYOUT_FILL_X)
-          end
-          
-          def create_label(parent, text)
-            FXLabel.new(parent, text, nil, JUSTIFY_CENTER_X | LAYOUT_FILL_COLUMN)
-          end
-          
-          def create_list_panel(parent) # :nodoc:
-            FXHorizontalFrame.new(parent, LAYOUT_FILL_X | FRAME_SUNKEN | FRAME_THICK)
-          end
-          
-          def create_fault_list(parent) # :nodoc:
-            list = FXList.new(parent, 10, nil, 0, LIST_SINGLESELECT | LAYOUT_FILL_X) #, 0, 0, 0, 150)
-            list.connect(SEL_COMMAND) do |sender, sel, ptr|
-              if sender.retrieveItem(sender.currentItem).selected?
-                show_fault(sender.retrieveItem(sender.currentItem).fault)
-              else
-                clear_fault
-              end
-            end
-            list
-          end
-          
-          def create_detail_panel(parent) # :nodoc:
-            FXHorizontalFrame.new(parent, LAYOUT_FILL_X | LAYOUT_FILL_Y | FRAME_SUNKEN | FRAME_THICK)
-          end
-          
-          def create_text(parent) # :nodoc:
-            FXText.new(parent, nil, 0, TEXT_READONLY | LAYOUT_FILL_X | LAYOUT_FILL_Y)
-          end
-          
-          def create_entry(parent) # :nodoc:
-            entry = FXTextField.new(parent, 30, nil, 0, TEXTFIELD_NORMAL | LAYOUT_SIDE_BOTTOM | LAYOUT_FILL_X)
-            entry.disable
-            entry
-          end
-        end
-  
-        class FaultListItem < FXListItem # :nodoc: all
-          attr_reader(:fault)
-          def initialize(fault)
-            super(fault.short_display)
-            @fault = fault
-          end
-        end
-      end
-    end
-  end
-end
-
-if __FILE__ == $0
-  Test::Unit::UI::Fox::TestRunner.start_command_line_test
-end
diff --git a/lib/test/unit/ui/gtk/testrunner.rb b/lib/test/unit/ui/gtk/testrunner.rb
deleted file mode 100644
index 229df3e358..0000000000
--- a/lib/test/unit/ui/gtk/testrunner.rb
+++ /dev/null
@@ -1,389 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'gtk'
-require 'test/unit/ui/testrunnermediator'
-require 'test/unit/ui/testrunnerutilities'
-
-module Test
-  module Unit
-    module UI
-      module GTK # :nodoc:
-
-        # Runs a Test::Unit::TestSuite in a Gtk UI. Obviously,
-        # this one requires you to have Gtk
-        # (http://www.gtk.org/) and the Ruby Gtk extension
-        # (http://ruby-gnome.sourceforge.net/) installed.
-        class TestRunner
-          extend TestRunnerUtilities
-
-          # Creates a new TestRunner and runs the suite.
-          def self.run(suite)
-            new(suite).start
-            
-          end
-
-          # Creates a new TestRunner for running the passed
-          # suite.
-          def initialize(suite)
-            if (suite.respond_to?(:suite))
-              @suite = suite.suite
-            else
-              @suite = suite
-            end
-          end
-
-          # Begins the test run.
-          def start
-            setup_mediator
-            setup_ui
-            attach_to_mediator
-            start_ui
-          end
-
-          private
-          def setup_mediator # :nodoc:
-            @mediator = TestRunnerMediator.new(@suite)
-            suite_name = @suite.to_s
-            if ( @suite.kind_of?(Module) )
-              suite_name = @suite.name
-            end
-            suite_name_entry.set_text(suite_name)
-          end
-          
-          def attach_to_mediator # :nodoc:
-            run_button.signal_connect("clicked", nil) { @mediator.run_suite }
-            @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
-            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
-            @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
-            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
-            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
-            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
-          end
-          
-          def start_ui # :nodoc:
-            timer = Gtk::timeout_add(0) {
-              Gtk::timeout_remove(timer)
-              @mediator.run_suite
-            }
-            Gtk.main
-          end
-          
-          def stop # :nodoc:
-            Gtk.main_quit
-          end
-          
-          def reset_ui(count) # :nodoc:
-            test_progress_bar.set_style(green_style)
-            test_progress_bar.configure(0, 0, count)
-            @red = false
-  
-            run_count_label.set_text("0")
-            assertion_count_label.set_text("0")
-            failure_count_label.set_text("0")
-            error_count_label.set_text("0")
-  
-            fault_list.remove_items(fault_list.children)
-          end
-          
-          def add_fault(fault) # :nodoc:
-            if ( ! @red )
-              test_progress_bar.set_style(red_style)
-              @red = true
-            end
-            item = FaultListItem.new(fault)
-            item.show
-            fault_list.append_items([item])
-          end
-          
-          def show_fault(fault) # :nodoc:
-            raw_show_fault(fault.longDisplay)
-          end
-          
-          def raw_show_fault(string) # :nodoc:
-            faultDetailLabel.set_text(string)
-            outerDetailSubPanel.queue_resize
-          end
-          
-          def clear_fault # :nodoc:
-            raw_show_fault("")
-          end
-          
-          def result_changed(result) # :nodoc:
-            test_progress_bar.set_value(test_progress_bar.get_value + 1)
-  
-            run_count_label.set_text(result.run_count.to_s)
-            assertion_count_label.set_text(result.assertion_count.to_s)
-            failure_count_label.set_text(result.failure_count.to_s)
-            error_count_label.set_text(result.error_count.to_s)
-          end
-          
-          def started(result) # :nodoc:
-            output_status("Started...")
-          end
-          
-          def test_started(test_name)
-            output_status("Running #{test_name}...")
-          end
-          
-          def finished(elapsed_time)
-            output_status("Finished in #{elapsed_time} seconds")
-          end
-          
-          def output_status(string) # :nodoc:
-            status_entry.set_text(string)
-          end
-  
-          def setup_ui # :nodoc:
-            main_window.signal_connect("destroy", nil) { stop }
-            main_window.show_all
-            fault_list.signal_connect("select-child", nil) {
-              | list, item, data |
-              show_fault(item.fault)
-            }
-            fault_list.signal_connect("unselect-child", nil) {
-              clear_fault
-            }
-            @red = false
-          end
-          
-          def main_window # :nodoc:
-            lazy_initialize(:main_window) {
-              @main_window = Gtk::Window.new(Gtk::WINDOW_TOPLEVEL)
-              @main_window.set_title("Test::Unit TestRunner")
-              @main_window.set_usize(800, 600)
-              @main_window.set_uposition(20, 20)
-              @main_window.set_policy(true, true, false)
-              @main_window.add(main_panel)
-            }
-          end
-          
-          def main_panel # :nodoc:
-            lazy_initialize(:main_panel) {
-              @main_panel = Gtk::VBox.new(false, 0)
-              @main_panel.pack_start(suite_panel, false, false, 0)
-              @main_panel.pack_start(progress_panel, false, false, 0)
-              @main_panel.pack_start(info_panel, false, false, 0)
-              @main_panel.pack_start(list_panel, false, false, 0)
-              @main_panel.pack_start(detail_panel, true, true, 0)
-              @main_panel.pack_start(status_panel, false, false, 0)
-            }
-          end
-          
-          def suite_panel # :nodoc:
-            lazy_initialize(:suite_panel) {
-              @suite_panel = Gtk::HBox.new(false, 10)
-              @suite_panel.border_width(10)
-              @suite_panel.pack_start(Gtk::Label.new("Suite:"), false, false, 0)
-              @suite_panel.pack_start(suite_name_entry, true, true, 0)
-              @suite_panel.pack_start(run_button, false, false, 0)
-            }
-          end
-          
-          def suite_name_entry # :nodoc:
-            lazy_initialize(:suite_name_entry) {
-              @suite_name_entry = Gtk::Entry.new
-              @suite_name_entry.set_editable(false)
-            }
-          end
-          
-          def run_button # :nodoc:
-            lazy_initialize(:run_button) {
-              @run_button = Gtk::Button.new("Run")
-            }
-          end
-          
-          def progress_panel # :nodoc:
-            lazy_initialize(:progress_panel) {
-              @progress_panel = Gtk::HBox.new(false, 10)
-              @progress_panel.border_width(10)
-              @progress_panel.pack_start(test_progress_bar, true, true, 0)
-            }
-          end
-          
-          def test_progress_bar # :nodoc:
-            lazy_initialize(:test_progress_bar) {
-              @test_progress_bar = EnhancedProgressBar.new
-              @test_progress_bar.set_usize(@test_progress_bar.allocation.width, 50)
-              @test_progress_bar.set_style(green_style)
-            }
-          end
-          
-          def green_style # :nodoc:
-            lazy_initialize(:green_style) {
-              @green_style = Gtk::Style.new
-              @green_style.set_bg(Gtk::STATE_PRELIGHT, 0x0000, 0xFFFF, 0x0000)
-            }
-          end
-          
-          def red_style # :nodoc:
-            lazy_initialize(:red_style) {
-              @red_style = Gtk::Style.new
-              @red_style.set_bg(Gtk::STATE_PRELIGHT, 0xFFFF, 0x0000, 0x0000)
-            }
-          end
-          
-          def info_panel # :nodoc:
-            lazy_initialize(:info_panel) {
-              @info_panel = Gtk::HBox.new(false, 0)
-              @info_panel.border_width(10)
-              @info_panel.pack_start(Gtk::Label.new("Runs:"), false, false, 0)
-              @info_panel.pack_start(run_count_label, true, false, 0)
-              @info_panel.pack_start(Gtk::Label.new("Assertions:"), false, false, 0)
-              @info_panel.pack_start(assertion_count_label, true, false, 0)
-              @info_panel.pack_start(Gtk::Label.new("Failures:"), false, false, 0)
-              @info_panel.pack_start(failure_count_label, true, false, 0)
-              @info_panel.pack_start(Gtk::Label.new("Errors:"), false, false, 0)
-              @info_panel.pack_start(error_count_label, true, false, 0)
-            }
-          end
-          
-          def run_count_label # :nodoc:
-            lazy_initialize(:run_count_label) {
-              @run_count_label = Gtk::Label.new("0")
-              @run_count_label.set_justify(Gtk::JUSTIFY_LEFT)
-            }
-          end
-          
-          def assertion_count_label # :nodoc:
-            lazy_initialize(:assertion_count_label) {
-              @assertion_count_label = Gtk::Label.new("0")
-              @assertion_count_label.set_justify(Gtk::JUSTIFY_LEFT)
-            }
-          end
-          
-          def failure_count_label # :nodoc:
-            lazy_initialize(:failure_count_label) {
-              @failure_count_label = Gtk::Label.new("0")
-              @failure_count_label.set_justify(Gtk::JUSTIFY_LEFT)
-            }
-          end
-          
-          def error_count_label # :nodoc:
-            lazy_initialize(:error_count_label) {
-              @error_count_label = Gtk::Label.new("0")
-              @error_count_label.set_justify(Gtk::JUSTIFY_LEFT)
-            }
-          end
-          
-          def list_panel # :nodoc:
-            lazy_initialize(:list_panel) {
-              @list_panel = Gtk::HBox.new
-              @list_panel.border_width(10)
-              @list_panel.pack_start(list_scrolled_window, true, true, 0)
-            }
-          end
-          
-          def list_scrolled_window # :nodoc:
-            lazy_initialize(:list_scrolled_window) {
-              @list_scrolled_window = Gtk::ScrolledWindow.new
-              @list_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
-              @list_scrolled_window.set_usize(@list_scrolled_window.allocation.width, 150)
-              @list_scrolled_window.add_with_viewport(fault_list)
-            }
-          end
-          
-          def fault_list # :nodoc:
-            lazy_initialize(:fault_list) {
-              @fault_list = Gtk::List.new
-            }
-          end
-          
-          def detail_panel # :nodoc:
-            lazy_initialize(:detail_panel) {
-              @detail_panel = Gtk::HBox.new
-              @detail_panel.border_width(10)
-              @detail_panel.pack_start(detail_scrolled_window, true, true, 0)
-            }
-          end
-          
-          def detail_scrolled_window # :nodoc:
-            lazy_initialize(:detail_scrolled_window) {
-              @detail_scrolled_window = Gtk::ScrolledWindow.new
-              @detail_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
-              @detail_scrolled_window.set_usize(400, @detail_scrolled_window.allocation.height)
-              @detail_scrolled_window.add_with_viewport(outer_detail_sub_panel)
-            }
-          end
-          
-          def outer_detail_sub_panel # :nodoc:
-            lazy_initialize(:outer_detail_sub_panel) {
-              @outer_detail_sub_panel = Gtk::VBox.new
-              @outer_detail_sub_panel.pack_start(inner_detail_sub_panel, false, false, 0)
-            }
-          end
-          
-          def inner_detail_sub_panel # :nodoc:
-            lazy_initialize(:inner_detail_sub_panel) {
-              @inner_detail_sub_panel = Gtk::HBox.new
-              @inner_detail_sub_panel.pack_start(fault_detail_label, false, false, 0)
-            }
-          end
-          
-          def fault_detail_label # :nodoc:
-            lazy_initialize(:fault_detail_label) {
-              @fault_detail_label = EnhancedLabel.new("")
-              style = Gtk::Style.new
-              font = Gdk::Font.font_load("-*-Courier New-medium-r-normal--*-120-*-*-*-*-*-*")
-              style.set_font(font)
-              @fault_detail_label.set_style(style)
-              @fault_detail_label.set_justify(Gtk::JUSTIFY_LEFT)
-              @fault_detail_label.set_line_wrap(false)
-            }
-          end
-          
-          def status_panel # :nodoc:
-            lazy_initialize(:status_panel) {
-              @status_panel = Gtk::HBox.new
-              @status_panel.border_width(10)
-              @status_panel.pack_start(status_entry, true, true, 0)
-            }
-          end
-          
-          def status_entry # :nodoc:
-            lazy_initialize(:status_entry) {
-              @status_entry = Gtk::Entry.new
-              @status_entry.set_editable(false)
-            }
-          end
-  
-          def lazy_initialize(symbol) # :nodoc:
-            if (!instance_eval("defined?(@#{symbol.to_s})"))
-              yield
-            end
-            return instance_eval("@" + symbol.to_s)
-          end
-        end
-  
-        class EnhancedProgressBar < Gtk::ProgressBar # :nodoc: all
-          def set_style(style)
-            super
-            hide
-            show
-          end
-        end
-  
-        class EnhancedLabel < Gtk::Label # :nodoc: all
-          def set_text(text)
-            super(text.gsub(/\n\t/, "\n" + (" " * 4)))
-          end
-        end
-  
-        class FaultListItem < Gtk::ListItem # :nodoc: all
-          attr_reader(:fault)
-          def initialize(fault)
-            super(fault.short_display)
-            @fault = fault
-          end
-        end
-      end
-    end
-  end
-end
-
-if __FILE__ == $0
-  Test::Unit::UI::GTK::TestRunner.start_command_line_test
-end
diff --git a/lib/test/unit/ui/testrunnermediator.rb b/lib/test/unit/ui/testrunnermediator.rb
deleted file mode 100644
index bd051e2a51..0000000000
--- a/lib/test/unit/ui/testrunnermediator.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/util/observable'
-require 'test/unit/testresult'
-
-module Test
-  module Unit
-    module UI # :nodoc:
-
-      # Provides an interface to write any given UI against,
-      # hopefully making it easy to write new UIs.
-      class TestRunnerMediator
-        RESET = name + "::RESET"
-        STARTED = name + "::STARTED"
-        FINISHED = name + "::FINISHED"
-        
-        include Util::Observable
-        
-        # Creates a new TestRunnerMediator initialized to run
-        # the passed suite.
-        def initialize(suite)
-          @suite = suite
-        end
-
-        # Runs the suite the TestRunnerMediator was created
-        # with.
-        def run_suite
-          Unit.run = true
-          begin_time = Time.now
-          notify_listeners(RESET, @suite.size)
-          result = create_result
-          notify_listeners(STARTED, result)
-          result_listener = result.add_listener(TestResult::CHANGED) do |updated_result|
-            notify_listeners(TestResult::CHANGED, updated_result)
-          end
-          
-          fault_listener = result.add_listener(TestResult::FAULT) do |fault|
-            notify_listeners(TestResult::FAULT, fault)
-          end
-          
-          @suite.run(result) do |channel, value|
-            notify_listeners(channel, value)
-          end
-          
-          result.remove_listener(TestResult::FAULT, fault_listener)
-          result.remove_listener(TestResult::CHANGED, result_listener)
-          end_time = Time.now
-          elapsed_time = end_time - begin_time
-          notify_listeners(FINISHED, elapsed_time) #"Finished in #{elapsed_time} seconds.")
-          return result
-        end
-
-        private
-        # A factory method to create the result the mediator
-        # should run with. Can be overridden by subclasses if
-        # one wants to use a different result.
-        def create_result
-          return TestResult.new
-        end
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/ui/testrunnerutilities.rb b/lib/test/unit/ui/testrunnerutilities.rb
deleted file mode 100644
index 69811608c2..0000000000
--- a/lib/test/unit/ui/testrunnerutilities.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-module Test
-  module Unit
-    module UI
-
-      # Provides some utilities common to most, if not all,
-      # TestRunners.
-      #
-      #--
-      #
-      # Perhaps there ought to be a TestRunner superclass? There
-      # seems to be a decent amount of shared code between test
-      # runners.
-
-      module TestRunnerUtilities
-
-        # Takes care of the ARGV parsing and suite
-        # determination necessary for running one of the
-        # TestRunners from the command line.
-        def start_command_line_test
-          if ARGV.empty?
-            puts "You should supply the name of a test suite file to the runner"
-            exit
-          end
-          require ARGV[0].gsub(/.+::/, '')
-          new(eval(ARGV[0])).start
-        end
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/util/backtracefilter.rb b/lib/test/unit/util/backtracefilter.rb
deleted file mode 100644
index 3a423aa6a1..0000000000
--- a/lib/test/unit/util/backtracefilter.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module Test
-  module Unit
-    module Util
-      module BacktraceFilter
-        TESTUNIT_FILE_SEPARATORS = %r{[\\/:]}
-        TESTUNIT_PREFIX = __FILE__.split(TESTUNIT_FILE_SEPARATORS)[0..-3]
-        TESTUNIT_RB_FILE = /\.rb\Z/
-        
-        def filter_backtrace(backtrace, prefix=nil)
-          split_p = if(prefix)
-            prefix.split(TESTUNIT_FILE_SEPARATORS)
-          else
-            TESTUNIT_PREFIX
-          end
-          match = proc do |e|
-            split_e = e.split(TESTUNIT_FILE_SEPARATORS)[0, split_p.size]
-            next false unless(split_e[0..-2] == split_p[0..-2])
-            split_e[-1].sub(TESTUNIT_RB_FILE, '') == split_p[-1]
-          end
-          return backtrace unless(backtrace.detect(&match))
-          found_prefix = false
-          new_backtrace = backtrace.reverse.reject do |e|
-            if(match[e])
-              found_prefix = true
-              true
-            elsif(found_prefix)
-              false
-            else
-              true
-            end
-          end.reverse
-          new_backtrace = (new_backtrace.empty? ? backtrace : new_backtrace)
-          new_backtrace = new_backtrace.reject(&match)
-          new_backtrace.empty? ? backtrace : new_backtrace
-        end
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/util/observable.rb b/lib/test/unit/util/observable.rb
deleted file mode 100644
index f5066d3425..0000000000
--- a/lib/test/unit/util/observable.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-require 'test/unit/util/procwrapper'
-
-module Test
-  module Unit
-    module Util # :nodoc:
-
-      # This is a utility class that allows anything mixing
-      # it in to notify a set of listeners about interesting
-      # events.
-      module Observable
-        # We use this for defaults since nil might mean something
-        NOTHING = "NOTHING/#{__id__}"
-
-        # Adds the passed proc as a listener on the
-        # channel indicated by channel_name. listener_key
-        # is used to remove the listener later; if none is
-        # specified, the proc itself is used.
-        #
-        # Whatever is used as the listener_key is
-        # returned, making it very easy to use the proc
-        # itself as the listener_key:
-        #
-        #  listener = add_listener("Channel") { ... }
-        #  remove_listener("Channel", listener)
-        def add_listener(channel_name, listener_key=NOTHING, &listener) # :yields: value
-          unless(block_given?)
-            raise ArgumentError.new("No callback was passed as a listener")
-          end
-      
-          key = listener_key
-          if (listener_key == NOTHING)
-            listener_key = listener
-            key = ProcWrapper.new(listener)
-          end
-      
-          channels[channel_name] ||= {}
-          channels[channel_name][key] = listener
-          return listener_key
-        end
-
-        # Removes the listener indicated by listener_key
-        # from the channel indicated by
-        # channel_name. Returns the registered proc, or
-        # nil if none was found.
-        def remove_listener(channel_name, listener_key)
-          channel = channels[channel_name]
-          return nil unless (channel)
-          key = listener_key
-          if (listener_key.instance_of?(Proc))
-            key = ProcWrapper.new(listener_key)
-          end
-          if (channel.has_key?(key))
-            return channel.delete(key)
-          end
-          return nil
-        end
-
-        # Calls all the procs registered on the channel
-        # indicated by channel_name. If value is
-        # specified, it is passed in to the procs,
-        # otherwise they are called with no arguments.
-        #
-        #--
-        #
-        # Perhaps this should be private? Would it ever
-        # make sense for an external class to call this
-        # method directly?
-        def notify_listeners(channel_name, *arguments)
-          channel = channels[channel_name]
-          return 0 unless (channel)
-          listeners = channel.values
-          listeners.each { |listener| listener.call(*arguments) }
-          return listeners.size
-        end
-
-        private
-        def channels # :nodoc:
-          @channels ||= {}
-          return @channels
-        end
-      end
-    end
-  end
-end
diff --git a/lib/test/unit/util/procwrapper.rb b/lib/test/unit/util/procwrapper.rb
deleted file mode 100644
index fea66d7671..0000000000
--- a/lib/test/unit/util/procwrapper.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# :nodoc:
-#
-# Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-# License:: Ruby license.
-
-module Test
-  module Unit
-    module Util
-
-      # Allows the storage of a Proc passed through '&' in a
-      # hash.
-      #
-      # Note: this may be inefficient, since the hash being
-      # used is not necessarily very good. In Observable,
-      # efficiency is not too important, since the hash is
-      # only accessed when adding and removing listeners,
-      # not when notifying.
-
-      class ProcWrapper
-
-        # Creates a new wrapper for a_proc.
-        def initialize(a_proc)
-          @a_proc = a_proc
-          @hash = a_proc.inspect.sub(/^(#<#{a_proc.class}:)/){''}.sub(/(>)$/){''}.hex
-        end
-
-        def hash # :nodoc:
-          return @hash
-        end
-
-        def ==(other) # :nodoc:
-          case(other)
-            when ProcWrapper
-              return @a_proc == other.to_proc
-            else
-              return super
-          end
-        end
-        alias :eql? :==
-
-        def to_proc # :nodoc:
-          return @a_proc
-        end
-      end
-    end
-  end
-end
diff --git a/lib/thread.rb b/lib/thread.rb
index 2769c54c3e..22610f2992 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -1,11 +1,7 @@
 #
 #		thread.rb - thread support classes
 #			$Date$
-#			by Yukihiro Matsumoto <matz@netlab.co.jp>
-#
-# Copyright (C) 2001  Yukihiro Matsumoto
-# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-# Copyright (C) 2000  Information-technology Promotion Agency, Japan
+#			by Yukihiro Matsumoto <matz@caelum.co.jp>
 #
 
 unless defined? Thread
@@ -21,40 +17,16 @@ if $DEBUG
   Thread.abort_on_exception = true
 end
 
-#
-# FIXME: not documented in Pickaxe or Nutshell.
-#
 def Thread.exclusive
-  _old = Thread.critical
   begin
     Thread.critical = true
-    return yield
+    r = yield
   ensure
-    Thread.critical = _old
+    Thread.critical = false
   end
+  r
 end
 
-#
-# +Mutex+ implements a simple semaphore that can be used to coordinate access to
-# shared data from multiple concurrent threads.
-#
-# Example:
-#
-#   require 'thread'
-#   semaphore = Mutex.new
-#   
-#   a = Thread.new {
-#     semaphore.synchronize {
-#       # access shared resource
-#     }
-#   }
-#   
-#   b = Thread.new {
-#     semaphore.synchronize {
-#       # access shared resource
-#     }
-#   }
-#
 class Mutex
   def initialize
     @waiting = []
@@ -63,17 +35,10 @@ class Mutex
     self.taint
   end
 
-  #
-  # Returns +true+ if this lock is currently held by some thread.
-  #
   def locked?
     @locked
   end
 
-  #
-  # Attempts to obtain the lock and returns immediately. Returns +true+ if the
-  # lock was granted.
-  #
   def try_lock
     result = false
     Thread.critical = true
@@ -85,9 +50,6 @@ class Mutex
     result
   end
 
-  #
-  # Attempts to grab the lock and waits if it isn't available.
-  #
   def lock
     while (Thread.critical = true; @locked)
       @waiting.push Thread.current
@@ -98,31 +60,16 @@ class Mutex
     self
   end
 
-  #
-  # Releases the lock. Returns +nil+ if ref wasn't locked.
-  #
   def unlock
     return unless @locked
     Thread.critical = true
+    t = @waiting.shift
     @locked = false
-    begin
-      t = @waiting.shift
-      t.wakeup if t
-    rescue ThreadError
-      retry
-    end
     Thread.critical = false
-    begin
-      t.run if t
-    rescue ThreadError
-    end
+    t.run if t
     self
   end
 
-  #
-  # Obtains a lock, runs the block, and releases the lock when the block
-  # completes.  See the example under +Mutex+.
-  #
   def synchronize
     lock
     begin
@@ -132,60 +79,23 @@ class Mutex
     end
   end
 
-  #
-  # FIXME: not documented in Pickaxe/Nutshell.
-  #
   def exclusive_unlock
     return unless @locked
     Thread.exclusive do
+      t = @waiting.shift
       @locked = false
-      begin
-	t = @waiting.shift
-	t.wakeup if t
-      rescue ThreadError
-	retry
-      end
+      t.wakeup if t
       yield
     end
     self
   end
 end
 
-# 
-# +ConditionVariable+ objects augment class +Mutex+. Using condition variables,
-# it is possible to suspend while in the middle of a critical section until a
-# resource becomes available (see the discussion on page 117).
-#
-# Example:
-#
-#   require 'thread'
-#
-#   mutex = Mutex.new
-#   resource = ConditionVariable.new
-#   
-#   a = Thread.new {
-#     mutex.synchronize {
-#       # Thread 'a' now needs the resource
-#       resource.wait(mutex)
-#       # 'a' can now have the resource
-#     }
-#   }
-#   
-#   b = Thread.new {
-#     mutex.synchronize {
-#       # Thread 'b' has finished using the resource
-#       resource.signal
-#     }
-#   }
-#
 class ConditionVariable
   def initialize
     @waiters = []
   end
   
-  #
-  # Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
-  #
   def wait(mutex)
     mutex.exclusive_unlock do
       @waiters.push(Thread.current)
@@ -194,21 +104,11 @@ class ConditionVariable
     mutex.lock
   end
   
-  #
-  # Wakes up the first thread in line waiting for this lock.
-  #
   def signal
-    begin
-      t = @waiters.shift
-      t.run if t
-    rescue ThreadError
-      retry
-    end
+    t = @waiters.shift
+    t.run if t
   end
     
-  #
-  # Wakes up all threads waiting for this lock.
-  #
   def broadcast
     waiters0 = nil
     Thread.exclusive do
@@ -216,24 +116,12 @@ class ConditionVariable
       @waiters.clear
     end
     for t in waiters0
-      begin
-	t.run
-      rescue ThreadError
-      end
+      t.run
     end
   end
 end
 
-#
-# This class provides a way to communicate data between threads.
-#
-# TODO: an example (code or English) would really help here.  How do you set up
-# a queue between two threads?
-#
 class Queue
-  #
-  # Creates a new queue.
-  #
   def initialize
     @que = []
     @waiting = []
@@ -242,111 +130,70 @@ class Queue
     self.taint
   end
 
-  #
-  # Pushes +obj+ to the queue.
-  #
   def push(obj)
     Thread.critical = true
     @que.push obj
-    begin
-      t = @waiting.shift
-      t.wakeup if t
-    rescue ThreadError
-      retry
-    ensure
-      Thread.critical = false
-    end
-    begin
-      t.run if t
-    rescue ThreadError
-    end
+    t = @waiting.shift
+    Thread.critical = false
+    t.run if t
   end
-  alias << push
   alias enq push
 
-  #
-  # Retrieves data from the queue.  If the queue is empty, the calling thread is
-  # suspended until data is pushed onto the queue.  If +non_block+ is true, the
-  # thread isn't suspended, and an exception is raised.
-  #
-  def pop(non_block=false)
-    while (Thread.critical = true; @que.empty?)
-      raise ThreadError, "queue empty" if non_block
-      @waiting.push Thread.current
-      Thread.stop
+  def pop non_block=false
+    Thread.critical = true
+    begin
+      loop do
+	if @que.length == 0
+	  if non_block
+	    raise ThreadError, "queue empty"
+	  end
+	  @waiting.push Thread.current
+	  Thread.stop
+	else
+	  return @que.shift
+	end
+      end
+    ensure
+      Thread.critical = false
     end
-    @que.shift
-  ensure
-    Thread.critical = false
   end
   alias shift pop
   alias deq pop
 
-  #
-  # Returns +true+ is the queue is empty.
-  #
   def empty?
-    @que.empty?
+    @que.length == 0
   end
 
-  #
-  # Removes all objects from the queue.
-  #
   def clear
-    @que.clear
+    @que.replace([])
   end
 
-  #
-  # Returns the length of the queue.
-  #
   def length
     @que.length
   end
+  alias size length
 
-  #
-  # Alias of length.
-  #
-  def size
-    length
-  end
 
-  #
-  # Returns the number of threads waiting on the queue.
-  #
   def num_waiting
     @waiting.size
   end
 end
 
-#
-# This class represents queues of specified size capacity.  The +push+ operation
-# may be blocked if the capacity is full.
-#
 class SizedQueue<Queue
-  #
-  # Creates a fixed-length queue with a maximum size of +max+.
-  #
   def initialize(max)
-    raise ArgumentError, "queue size must be positive" unless max > 0
     @max = max
     @queue_wait = []
     @queue_wait.taint		# enable tainted comunication
     super()
   end
 
-  #
-  # Returns the maximum size of the queue.
-  #
   def max
     @max
   end
 
-  #
-  # Sets the maximum size of the queue.
-  #
   def max=(max)
     Thread.critical = true
-    if max <= @max
+    if @max >= max
       @max = max
       Thread.critical = false
     else
@@ -354,12 +201,8 @@ class SizedQueue<Queue
       @max = max
       Thread.critical = false
       diff.times do
-	begin
-	  t = @queue_wait.shift
-	  t.run if t
-	rescue ThreadError
-	  retry
-	end
+	t = @queue_wait.shift
+	t.run if t
       end
     end
     max
@@ -374,42 +217,17 @@ class SizedQueue<Queue
     end
     super
   end
-  alias << push
-  alias enq push
 
   def pop(*args)
-    retval = super
     Thread.critical = true
     if @que.length < @max
-      begin
-	t = @queue_wait.shift
-	t.wakeup if t
-      rescue ThreadError
-	retry
-      ensure
-	Thread.critical = false
-      end
-      begin
-	t.run if t
-      rescue ThreadError
-      end
+      t = @queue_wait.shift
+      t.run if t
     end
-    retval
+    super
   end
-  alias shift pop
-  alias deq pop
 
   def num_waiting
     @waiting.size + @queue_wait.size
   end
 end
-
-# Documentation comments:
-#  - SizedQueue #push and #pop deserve some documentation, as they are different
-#    from the Queue implementations.
-#  - Some methods are not documented in Pickaxe/Nutshell, and are therefore not
-#    documented here.  See FIXME notes.
-#  - Reference to Pickaxe page numbers should be replaced with either a section
-#    name or a summary.
-#  - How do you document aliases?
-#  - How do you make RDoc inherit documentation from superclass?
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 4512209604..958163edef 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -39,33 +39,18 @@
 require "thread.rb"
 require "e2mmap.rb"
 
-#
-# This class watches for termination of multiple threads.  Basic functionality
-# (wait until specified threads have terminated) can be accessed through the
-# class method ThreadsWait::all_waits.  Finer control can be gained using
-# instance methods.
-#
-# Example:
-#
-#   ThreadsWait.all_wait(thr1, thr2, ...) do |t|
-#     STDERR.puts "Thread #{t} has terminated."
-#   end
-#
 class ThreadsWait
   RCS_ID='-$Id: thwait.rb,v 1.3 1998/06/26 03:19:34 keiju Exp keiju $-'
   
   Exception2MessageMapper.extend_to(binding)
   def_exception("ErrNoWaitingThread", "No threads for waiting.")
-  def_exception("ErrNoFinishedThread", "No finished threads.")
+  def_exception("ErrNoFinshedThread", "No finished threads.")
   
-  #
-  # Waits until all specified threads have terminated.  If a block is provided,
-  # it is executed for each thread termination.
-  #
-  def ThreadsWait.all_waits(*threads) # :yield: thread
+  def ThreadsWait.all_waits(*threads)
     tw = ThreadsWait.new(*threads)
-    if block_given?
-      tw.all_waits do |th|
+    if iterator?
+      tw.all_waits do
+	|th|
 	yield th
       end
     else
@@ -73,94 +58,76 @@ class ThreadsWait
     end
   end
   
-  #
-  # Creates a ThreadsWait object, specifying the threads to wait on.
-  # Non-blocking.
-  #
   def initialize(*threads)
     @threads = []
     @wait_queue = Queue.new
     join_nowait(*threads) unless threads.empty?
   end
   
-  # Returns the array of threads in the wait queue.
+  # accessing
+  #	threads - list threads to be synchronized
   attr :threads
   
-  #
-  # Returns +true+ if there are no threads to be synchronized.
-  #
+  # testing
+  #	empty?
+  #	finished?
+
+  # is there any thread to be synchronized.
   def empty?
     @threads.empty?
   end
   
-  #
-  # Returns +true+ if any thread has terminated.
-  #
+  # is there already terminated thread.
   def finished?
     !@wait_queue.empty?
   end
   
-  #
-  # Waits for specified threads to terminate.
-  #
+  # main process:
+  #	join
+  #	join_nowait
+  #	next_wait
+  #	all_wait
+  
+  # adds thread(s) to join,  waits for any of waiting threads to terminate.
   def join(*threads)
     join_nowait(*threads)
     next_wait
   end
   
-  #
-  # Specifies the threads that this object will wait for, but does not actually
-  # wait.
-  #
+  # adds thread(s) to join, no wait.
   def join_nowait(*threads)
-    threads.flatten!
     @threads.concat threads
     for th in threads
-      Thread.start(th) do |t|
-	t.join
-	@wait_queue.push t
+      Thread.start do
+	th = th.join
+	@wait_queue.push th
       end
     end
   end
   
-  #
-  # Waits until any of the specified threads has terminated, and returns the one
-  # that does.
-  #
-  # If there is no thread to wait, raises +ErrNoWaitingThread+.  If +nonblock+
-  # is true, and there is no terminated thread, raises +ErrNoFinishedThread+.
-  #
+  # waits for any of waiting threads to terminate
+  # if there is no thread to wait, raises ErrNoWaitingThread.
+  # if `nonblock' is true, and there is no terminated thread,
+  # raises ErrNoFinishedThread.
   def next_wait(nonblock = nil)
     ThreadsWait.fail ErrNoWaitingThread if @threads.empty?
     begin
       @threads.delete(th = @wait_queue.pop(nonblock))
       th
     rescue ThreadError
-      ThreadsWait.fail ErrNoFinishedThread
+      ThreadsWait.fail ErrNoFinshedThread
     end
   end
   
-  #
-  # Waits until all of the specified threads are terminated.  If a block is
-  # supplied for the method, it is executed for each thread termination.
-  #
-  # Raises exceptions in the same manner as +next_wait+.
-  #
+  # waits until all of specified threads are terminated.
+  # if a block is supplied for the method, evaluates it for
+  # each thread termination.
   def all_waits
     until @threads.empty?
       th = next_wait
-      yield th if block_given?
+      yield th if iterator?
     end
   end
 end
 
 ThWait = ThreadsWait
-
-
-# Documentation comments:
-#  - Source of doumentation is evenly split between Nutshell, existing
-#    comments, and my own rephrasing.
-#  - I'm not particularly confident that the comments are all exactly correct.
-#  - The history, etc., up the top appears in the RDoc output.  Perhaps it would
-#    be better to direct that not to appear, and put something else there
-#    instead.
diff --git a/lib/time.rb b/lib/time.rb
deleted file mode 100644
index 9d2ac558d9..0000000000
--- a/lib/time.rb
+++ /dev/null
@@ -1,599 +0,0 @@
-
-#
-# == Introduction
-# 
-# This library extends the Time class:
-# * conversion between date string and time object.
-#   * date-time defined by RFC 2822
-#   * HTTP-date defined by RFC 2616
-#   * dateTime defined by XML Schema Part 2: Datatypes (ISO 8601)
-#   * various formats handled by ParseDate (string to time only)
-# 
-# == Design Issues
-# 
-# === Specialized interface
-# 
-# This library provides methods dedicated to special puposes:
-# * RFC 2822, RFC 2616 and XML Schema.
-# * They makes usual life easier.
-# 
-# === Doesn't depend on strftime
-# 
-# This library doesn't use +strftime+.  Especially #rfc2822 doesn't depend
-# on +strftime+ because:
-# 
-# * %a and %b are locale sensitive
-# 
-#   Since they are locale sensitive, they may be replaced to
-#   invalid weekday/month name in some locales.
-#   Since ruby-1.6 doesn't invoke setlocale by default,
-#   the problem doesn't arise until some external library invokes setlocale.
-#   Ruby/GTK is the example of such library.
-# 
-# * %z is not portable
-# 
-#   %z is required to generate zone in date-time of RFC 2822
-#   but it is not portable.
-#
-# == Revision Information
-#
-# $Id$
-#
-
-require 'parsedate'
-
-#
-# Implements the extensions to the Time class that are described in the
-# documentation for the time.rb library.
-#
-class Time
-  class << Time
-
-    ZoneOffset = {
-      'UTC' => 0,
-      # ISO 8601
-      'Z' => 0,
-      # RFC 822
-      'UT' => 0, 'GMT' => 0,
-      'EST' => -5, 'EDT' => -4,
-      'CST' => -6, 'CDT' => -5,
-      'MST' => -7, 'MDT' => -6,
-      'PST' => -8, 'PDT' => -7,
-      # Following definition of military zones is original one.
-      # See RFC 1123 and RFC 2822 for the error of RFC 822.
-      'A' => +1, 'B' => +2, 'C' => +3, 'D' => +4,  'E' => +5,  'F' => +6, 
-      'G' => +7, 'H' => +8, 'I' => +9, 'K' => +10, 'L' => +11, 'M' => +12,
-      'N' => -1, 'O' => -2, 'P' => -3, 'Q' => -4,  'R' => -5,  'S' => -6, 
-      'T' => -7, 'U' => -8, 'V' => -9, 'W' => -10, 'X' => -11, 'Y' => -12,
-    }
-    def zone_offset(zone, year=Time.now.year)
-      off = nil
-      zone = zone.upcase
-      if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone
-        off = ($1 == '-' ? -1 : 1) * ($2.to_i * 60 + $3.to_i) * 60
-      elsif /\A[+-]\d\d\z/ =~ zone
-        off = zone.to_i * 3600
-      elsif ZoneOffset.include?(zone)
-        off = ZoneOffset[zone] * 3600
-      elsif ((t = Time.local(year, 1, 1)).zone.upcase == zone rescue false)
-        off = t.utc_offset
-      elsif ((t = Time.local(year, 7, 1)).zone.upcase == zone rescue false)
-        off = t.utc_offset
-      end
-      off
-    end
-
-    #
-    # Parses +date+ using ParseDate.parsedate and converts it to a Time object.
-    #
-    # If a block is given, the year described in +date+ is converted by the
-    # block.  For example:
-    #
-    #     Time.parse(...) {|y| y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
-    #
-    # If the upper components of the given time are broken or missing, they are
-    # supplied with those of +now+.  For the lower components, the minimum
-    # values (1 or 0) are assumed if broken or missing.  For example:
-    #
-    #     # Suppose it is "Thu Nov 29 14:33:20 GMT 2001" now and
-    #     # your timezone is GMT:
-    #     Time.parse("16:30")     #=> Thu Nov 29 16:30:00 GMT 2001
-    #     Time.parse("7/23")      #=> Mon Jul 23 00:00:00 GMT 2001
-    #     Time.parse("Aug 31")    #=> Fri Aug 31 00:00:00 GMT 2001
-    #
-    # Since there are numerous conflicts among locally defined timezone
-    # abbreviations all over the world, this method is not made to
-    # understand all of them.  For example, the abbreviation "CST" is
-    # used variously as:
-    #
-    #     -06:00 in America/Chicago,
-    #     -05:00 in America/Havana,
-    #     +08:00 in Asia/Harbin,
-    #     +09:30 in Australia/Darwin,
-    #     +10:30 in Australia/Adelaide,
-    #     etc.
-    #
-    # Based on the fact, this method only understands the timezone
-    # abbreviations described in RFC 822 and the system timezone, in the
-    # order named. (i.e. a definition in RFC 822 overrides the system
-    # timezone definition.)  The system timezone is taken from
-    # <tt>Time.local(year, 1, 1).zone</tt> and
-    # <tt>Time.local(year, 7, 1).zone</tt>.
-    # If the extracted timezone abbreviation does not match any of them,
-    # it is ignored and the given time is regarded as a local time.
-    #
-    # ArgumentError is raised if ParseDate cannot extract information from
-    # +date+ or Time class cannot represent specified date.
-    #
-    # This method can be used as fail-safe for other parsing methods as:
-    #
-    #   Time.rfc2822(date) rescue Time.parse(date)
-    #   Time.httpdate(date) rescue Time.parse(date)
-    #   Time.xmlschema(date) rescue Time.parse(date)
-    #
-    # A failure for Time.parse should be checked, though.
-    #
-    def parse(date, now=Time.now)
-      year, mon, day, hour, min, sec, zone, _ = ParseDate.parsedate(date)
-      year = yield(year) if year && block_given?
-
-      if now
-        begin
-          break if year; year = now.year
-          break if mon; mon = now.mon
-          break if day; day = now.day
-          break if hour; hour = now.hour
-          break if min; min = now.min
-          break if sec; sec = now.sec
-        end until true
-      end
-
-      year ||= 1970
-      mon ||= 1
-      day ||= 1
-      hour ||= 0
-      min ||= 0
-      sec ||= 0
-
-      off = nil
-      off = zone_offset(zone, year) if zone
-
-      if off
-        t = Time.utc(year, mon, day, hour, min, sec) - off
-        t.localtime if off != 0
-        t
-      else
-        Time.local(year, mon, day, hour, min, sec)
-      end
-    end
-
-    MonthValue = {
-      'JAN' => 1, 'FEB' => 2, 'MAR' => 3, 'APR' => 4, 'MAY' => 5, 'JUN' => 6,
-      'JUL' => 7, 'AUG' => 8, 'SEP' => 9, 'OCT' =>10, 'NOV' =>11, 'DEC' =>12
-    }
-
-    #
-    # Parses +date+ as date-time defined by RFC 2822 and converts it to a Time
-    # object.  The format is identical to the date format defined by RFC 822 and
-    # updated by RFC 1123.
-    #
-    # ArgumentError is raised if +date+ is not compliant with RFC 2822
-    # or Time class cannot represent specified date.
-    #
-    # See #rfc2822 for more information on this format.
-    #
-    def rfc2822(date)
-      if /\A\s*
-          (?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*,\s*)?
-          (\d{1,2})\s+
-          (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+
-          (\d{2,})\s+
-          (\d{2})\s*
-          :\s*(\d{2})\s*
-          (?::\s*(\d{2}))?\s+
-          ([+-]\d{4}|
-           UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])/ix =~ date
-        # Since RFC 2822 permit comments, the regexp has no right anchor.
-        day = $1.to_i
-        mon = MonthValue[$2.upcase]
-        year = $3.to_i
-        hour = $4.to_i
-        min = $5.to_i
-        sec = $6 ? $6.to_i : 0
-        zone = $7
-
-        # following year completion is compliant with RFC 2822.
-        year = if year < 50
-                 2000 + year
-               elsif year < 1000
-                 1900 + year
-               else
-                 year
-               end
-
-        t = Time.utc(year, mon, day, hour, min, sec)
-        offset = zone_offset(zone)
-	t = (t - offset).localtime if offset != 0 || zone == '+0000'
-	t
-      else
-        raise ArgumentError.new("not RFC 2822 compliant date: #{date.inspect}")
-      end
-    end
-    alias rfc822 rfc2822
-
-    #
-    # Parses +date+ as HTTP-date defined by RFC 2616 and converts it to a Time
-    # object.
-    #
-    # ArgumentError is raised if +date+ is not compliant with RFC 2616 or Time
-    # class cannot represent specified date.
-    #
-    # See #httpdate for more information on this format.
-    #
-    def httpdate(date)
-      if /\A\s*
-          (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\x20
-          (\d{2})\x20
-          (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
-          (\d{4})\x20
-          (\d{2}):(\d{2}):(\d{2})\x20
-          GMT
-          \s*\z/ix =~ date
-        Time.rfc2822(date)
-      elsif /\A\s*
-             (?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday),\x20
-             (\d\d)-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d\d)\x20
-             (\d\d):(\d\d):(\d\d)\x20
-             GMT
-             \s*\z/ix =~ date
-        Time.parse(date)
-      elsif /\A\s*
-             (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\x20
-             (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
-             (\d\d|\x20\d)\x20
-             (\d\d):(\d\d):(\d\d)\x20
-             (\d{4})
-             \s*\z/ix =~ date
-        Time.utc($6.to_i, MonthValue[$1.upcase], $2.to_i,
-                 $3.to_i, $4.to_i, $5.to_i)
-      else
-        raise ArgumentError.new("not RFC 2616 compliant date: #{date.inspect}")
-      end
-    end
-
-    #
-    # Parses +date+ as dateTime defined by XML Schema and converts it to a Time
-    # object.  The format is restricted version of the format defined by ISO
-    # 8601.
-    #
-    # ArgumentError is raised if +date+ is not compliant with the format or Time
-    # class cannot represent specified date.
-    #
-    # See #xmlschema for more information on this format.
-    #
-    def xmlschema(date)
-      if /\A\s*
-          (-?\d+)-(\d\d)-(\d\d)
-          T
-          (\d\d):(\d\d):(\d\d)
-          (\.\d*)?
-          (Z|[+-]\d\d:\d\d)?
-          \s*\z/ix =~ date
-	datetime = [$1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i] 
-	datetime << $7.to_f * 1000000 if $7
-	if $8
-	  Time.utc(*datetime) - zone_offset($8)
-	else
-	  Time.local(*datetime)
-	end
-      else
-        raise ArgumentError.new("invalid date: #{date.inspect}")
-      end
-    end
-    alias iso8601 xmlschema
-  end # class << self
-
-  #
-  # Returns a string which represents the time as date-time defined by RFC 2822:
-  #
-  #   day-of-week, DD month-name CCYY hh:mm:ss zone
-  #
-  # where zone is [+-]hhmm.
-  #
-  # If +self+ is a UTC time, -0000 is used as zone.
-  #
-  def rfc2822
-    sprintf('%s, %02d %s %d %02d:%02d:%02d ',
-      RFC2822_DAY_NAME[wday],
-      day, RFC2822_MONTH_NAME[mon-1], year,
-      hour, min, sec) +
-    if utc?
-      '-0000'
-    else
-      off = utc_offset
-      sign = off < 0 ? '-' : '+'
-      sprintf('%s%02d%02d', sign, *(off.abs / 60).divmod(60))
-    end
-  end
-  alias rfc822 rfc2822
-
-  RFC2822_DAY_NAME = [
-    'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
-  ]
-  RFC2822_MONTH_NAME = [
-    'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-    'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
-  ]
-
-  #
-  # Returns a string which represents the time as rfc1123-date of HTTP-date
-  # defined by RFC 2616: 
-  # 
-  #   day-of-week, DD month-name CCYY hh:mm:ss GMT
-  #
-  # Note that the result is always UTC (GMT).
-  #
-  def httpdate
-    t = dup.utc
-    sprintf('%s, %02d %s %d %02d:%02d:%02d GMT',
-      RFC2822_DAY_NAME[t.wday],
-      t.day, RFC2822_MONTH_NAME[t.mon-1], t.year,
-      t.hour, t.min, t.sec)
-  end
-
-  #
-  # Returns a string which represents the time as dateTime defined by XML
-  # Schema:
-  #
-  #   CCYY-MM-DDThh:mm:ssTZD
-  #   CCYY-MM-DDThh:mm:ss.sssTZD
-  #
-  # where TZD is Z or [+-]hh:mm.
-  #
-  # If self is a UTC time, Z is used as TZD.  [+-]hh:mm is used otherwise.
-  #
-  # +fractional_seconds+ specifies a number of digits of fractional seconds.
-  # Its default value os 0.
-  #
-  def xmlschema(fraction_digits=0)
-    sprintf('%d-%02d-%02dT%02d:%02d:%02d',
-      year, mon, day, hour, min, sec) +
-    if fraction_digits == 0
-      ''
-    elsif fraction_digits <= 6
-      '.' + sprintf('%06d', usec)[0, fraction_digits]
-    else
-      '.' + sprintf('%06d', usec) + '0' * (fraction_digits - 6)
-    end +
-    if utc?
-      'Z'
-    else
-      off = utc_offset
-      sign = off < 0 ? '-' : '+'
-      sprintf('%s%02d:%02d', sign, *(off.abs / 60).divmod(60))
-    end
-  end
-  alias iso8601 xmlschema
-end
-
-if __FILE__ == $0
-  require 'test/unit'
-
-  class TimeExtentionTest < Test::Unit::TestCase # :nodoc:
-    def test_rfc822
-      assert_equal(Time.utc(1976, 8, 26, 14, 30) + 4 * 3600,
-                   Time.rfc2822("26 Aug 76 14:30 EDT"))
-      assert_equal(Time.utc(1976, 8, 27, 9, 32) + 7 * 3600,
-                   Time.rfc2822("27 Aug 76 09:32 PDT"))
-    end
-
-    def test_rfc2822
-      assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600,
-                   Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600"))
-      assert_equal(Time.utc(2003, 7, 1, 10, 52, 37) - 2 * 3600,
-                   Time.rfc2822("Tue, 1 Jul 2003 10:52:37 +0200"))
-      assert_equal(Time.utc(1969, 2, 13, 23, 32, 54) + 3 * 3600 + 30 * 60,
-                   Time.rfc2822("Thu, 13 Feb 1969 23:32:54 -0330"))
-      assert_equal(Time.utc(1997, 11, 21, 10, 1, 10) + 6 * 3600,
-                   Time.rfc2822("Fri, 21 Nov 1997 10:01:10 -0600"))
-      assert_equal(Time.utc(1997, 11, 21, 11, 0, 0) + 6 * 3600,
-                   Time.rfc2822("Fri, 21 Nov 1997 11:00:00 -0600"))
-      assert_equal(Time.utc(1997, 11, 24, 14, 22, 1) + 8 * 3600,
-                   Time.rfc2822("Mon, 24 Nov 1997 14:22:01 -0800"))
-      assert_equal(Time.utc(1969, 2, 13, 23, 32, 0) + 3 * 3600 + 30 * 60,
-                   Time.rfc2822(" Thu,
-      13
-        Feb
-          1969
-      23:32
-               -0330 (Newfoundland Time)"))
-      assert_equal(Time.utc(1997, 11, 21, 9, 55, 6),
-                   Time.rfc2822("21 Nov 97 09:55:06 GMT"))
-      assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600,
-                   Time.rfc2822("Fri, 21 Nov 1997 09 :   55  :  06 -0600"))
-      assert_raises(ArgumentError) {
-        # inner comment is not supported.
-        Time.rfc2822("Fri, 21 Nov 1997 09(comment):   55  :  06 -0600")
-      }
-    end
-
-    def test_rfc2616
-      t = Time.utc(1994, 11, 6, 8, 49, 37)
-      assert_equal(t, Time.httpdate("Sun, 06 Nov 1994 08:49:37 GMT"))
-      assert_equal(t, Time.httpdate("Sunday, 06-Nov-94 08:49:37 GMT"))
-      assert_equal(t, Time.httpdate("Sun Nov  6 08:49:37 1994"))
-      assert_equal(Time.utc(1995, 11, 15, 6, 25, 24),
-                   Time.httpdate("Wed, 15 Nov 1995 06:25:24 GMT"))
-      assert_equal(Time.utc(1995, 11, 15, 4, 58, 8),
-                   Time.httpdate("Wed, 15 Nov 1995 04:58:08 GMT"))
-      assert_equal(Time.utc(1994, 11, 15, 8, 12, 31),
-                   Time.httpdate("Tue, 15 Nov 1994 08:12:31 GMT"))
-      assert_equal(Time.utc(1994, 12, 1, 16, 0, 0),
-                   Time.httpdate("Thu, 01 Dec 1994 16:00:00 GMT"))
-      assert_equal(Time.utc(1994, 10, 29, 19, 43, 31),
-                   Time.httpdate("Sat, 29 Oct 1994 19:43:31 GMT"))
-      assert_equal(Time.utc(1994, 11, 15, 12, 45, 26),
-                   Time.httpdate("Tue, 15 Nov 1994 12:45:26 GMT"))
-      assert_equal(Time.utc(1999, 12, 31, 23, 59, 59),
-                   Time.httpdate("Fri, 31 Dec 1999 23:59:59 GMT"))
-    end
-
-    def test_rfc3339
-      t = Time.utc(1985, 4, 12, 23, 20, 50, 520000)
-      s = "1985-04-12T23:20:50.52Z"
-      assert_equal(t, Time.iso8601(s))
-      assert_equal(s, t.iso8601(2))
-
-      t = Time.utc(1996, 12, 20, 0, 39, 57)
-      s = "1996-12-19T16:39:57-08:00"
-      assert_equal(t, Time.iso8601(s))
-      # There is no way to generate time string with arbitrary timezone.
-      s = "1996-12-20T00:39:57Z"
-      assert_equal(t, Time.iso8601(s))
-      assert_equal(s, t.iso8601)
-
-      t = Time.utc(1990, 12, 31, 23, 59, 60)
-      s = "1990-12-31T23:59:60Z"
-      assert_equal(t, Time.iso8601(s))
-      # leap second is representable only if timezone file has it.
-      s = "1990-12-31T15:59:60-08:00"
-      assert_equal(t, Time.iso8601(s))
-
-      t = Time.utc(1937, 1, 1, 11, 40, 27, 870000)
-      s = "1937-01-01T12:00:27.87+00:20"
-      assert_equal(t, Time.iso8601(s))
-    end
-
-    # http://www.w3.org/TR/xmlschema-2/
-    def test_xmlschema
-      assert_equal(Time.utc(1999, 5, 31, 13, 20, 0) + 5 * 3600,
-                   Time.xmlschema("1999-05-31T13:20:00-05:00"))
-      assert_equal(Time.local(2000, 1, 20, 12, 0, 0),
-                   Time.xmlschema("2000-01-20T12:00:00"))
-      assert_equal(Time.utc(2000, 1, 20, 12, 0, 0),
-                   Time.xmlschema("2000-01-20T12:00:00Z"))
-      assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) - 12 * 3600,
-                   Time.xmlschema("2000-01-20T12:00:00+12:00"))
-      assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) + 13 * 3600,
-                   Time.xmlschema("2000-01-20T12:00:00-13:00"))
-      assert_equal(Time.utc(2000, 3, 4, 23, 0, 0) - 3 * 3600,
-                   Time.xmlschema("2000-03-04T23:00:00+03:00"))
-      assert_equal(Time.utc(2000, 3, 4, 20, 0, 0),
-                   Time.xmlschema("2000-03-04T20:00:00Z"))
-      assert_equal(Time.local(2000, 1, 15, 0, 0, 0),
-                   Time.xmlschema("2000-01-15T00:00:00"))
-      assert_equal(Time.local(2000, 2, 15, 0, 0, 0),
-                   Time.xmlschema("2000-02-15T00:00:00"))
-      assert_equal(Time.local(2000, 1, 15, 12, 0, 0),
-                   Time.xmlschema("2000-01-15T12:00:00"))
-      assert_equal(Time.utc(2000, 1, 16, 12, 0, 0),
-                   Time.xmlschema("2000-01-16T12:00:00Z"))
-      assert_equal(Time.local(2000, 1, 1, 12, 0, 0),
-                   Time.xmlschema("2000-01-01T12:00:00"))
-      assert_equal(Time.utc(1999, 12, 31, 23, 0, 0),
-                   Time.xmlschema("1999-12-31T23:00:00Z"))
-      assert_equal(Time.local(2000, 1, 16, 12, 0, 0),
-                   Time.xmlschema("2000-01-16T12:00:00"))
-      assert_equal(Time.local(2000, 1, 16, 0, 0, 0),
-                   Time.xmlschema("2000-01-16T00:00:00"))
-      assert_equal(Time.utc(2000, 1, 12, 12, 13, 14),
-                   Time.xmlschema("2000-01-12T12:13:14Z"))
-      assert_equal(Time.utc(2001, 4, 17, 19, 23, 17, 300000),
-		   Time.xmlschema("2001-04-17T19:23:17.3Z"))
-    end
-
-    def test_encode_xmlschema
-      t = Time.utc(2001, 4, 17, 19, 23, 17, 300000)
-      assert_equal("2001-04-17T19:23:17Z", t.xmlschema)
-      assert_equal("2001-04-17T19:23:17.3Z", t.xmlschema(1))
-      assert_equal("2001-04-17T19:23:17.300000Z", t.xmlschema(6))
-      assert_equal("2001-04-17T19:23:17.3000000Z", t.xmlschema(7))
-
-      t = Time.utc(2001, 4, 17, 19, 23, 17, 123456)
-      assert_equal("2001-04-17T19:23:17.1234560Z", t.xmlschema(7))
-      assert_equal("2001-04-17T19:23:17.123456Z", t.xmlschema(6))
-      assert_equal("2001-04-17T19:23:17.12345Z", t.xmlschema(5))
-      assert_equal("2001-04-17T19:23:17.1Z", t.xmlschema(1))
-
-      t = Time.utc(1960, 12, 31, 23, 0, 0, 123456)
-      assert_equal("1960-12-31T23:00:00.123456Z", t.xmlschema(6))
-    end
-
-    def test_completion
-      now = Time.local(2001,11,29,21,26,35)
-      assert_equal(Time.local( 2001,11,29,21,12),
-                   Time.parse("2001/11/29 21:12", now))
-      assert_equal(Time.local( 2001,11,29),
-                   Time.parse("2001/11/29", now))
-      assert_equal(Time.local( 2001,11,29),
-                   Time.parse(     "11/29", now))
-      #assert_equal(Time.local(2001,11,1), Time.parse("Nov", now))
-      assert_equal(Time.local( 2001,11,29,10,22),
-                   Time.parse(           "10:22", now))
-    end
-
-    def test_invalid
-      # They were actually used in some web sites.
-      assert_raises(ArgumentError) { Time.httpdate("1 Dec 2001 10:23:57 GMT") }
-      assert_raises(ArgumentError) { Time.httpdate("Sat, 1 Dec 2001 10:25:42 GMT") }
-      assert_raises(ArgumentError) { Time.httpdate("Sat,  1-Dec-2001 10:53:55 GMT") }
-      assert_raises(ArgumentError) { Time.httpdate("Saturday, 01-Dec-2001 10:15:34 GMT") }
-      assert_raises(ArgumentError) { Time.httpdate("Saturday, 01-Dec-101 11:10:07 GMT") }
-      assert_raises(ArgumentError) { Time.httpdate("Fri, 30 Nov 2001 21:30:00 JST") }
-
-      # They were actually used in some mails.
-      assert_raises(ArgumentError) { Time.rfc2822("01-5-20") }
-      assert_raises(ArgumentError) { Time.rfc2822("7/21/00") }
-      assert_raises(ArgumentError) { Time.rfc2822("2001-8-28") }
-      assert_raises(ArgumentError) { Time.rfc2822("00-5-6 1:13:06") }
-      assert_raises(ArgumentError) { Time.rfc2822("2001-9-27 9:36:49") }
-      assert_raises(ArgumentError) { Time.rfc2822("2000-12-13 11:01:11") }
-      assert_raises(ArgumentError) { Time.rfc2822("2001/10/17 04:29:55") }
-      assert_raises(ArgumentError) { Time.rfc2822("9/4/2001 9:23:19 PM") }
-      assert_raises(ArgumentError) { Time.rfc2822("01 Nov 2001 09:04:31") }
-      assert_raises(ArgumentError) { Time.rfc2822("13 Feb 2001 16:4 GMT") }
-      assert_raises(ArgumentError) { Time.rfc2822("01 Oct 00 5:41:19 PM") }
-      assert_raises(ArgumentError) { Time.rfc2822("2 Jul 00 00:51:37 JST") }
-      assert_raises(ArgumentError) { Time.rfc2822("01 11 2001 06:55:57 -0500") }
-      assert_raises(ArgumentError) { Time.rfc2822("18 \343\366\356\341\370 2000") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fri, Oct 2001  18:53:32") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fri, 2 Nov 2001 03:47:54") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fri, 27 Jul 2001 11.14.14 +0200") }
-      assert_raises(ArgumentError) { Time.rfc2822("Thu, 2 Nov 2000 04:13:53 -600") }
-      assert_raises(ArgumentError) { Time.rfc2822("Wed, 5 Apr 2000 22:57:09 JST") }
-      assert_raises(ArgumentError) { Time.rfc2822("Mon, 11 Sep 2000 19:47:33 00000") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fri, 28 Apr 2000 20:40:47 +-900") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fri, 19 Jan 2001 8:15:36 AM -0500") }
-      assert_raises(ArgumentError) { Time.rfc2822("Thursday, Sep 27 2001 7:42:35 AM EST") }
-      assert_raises(ArgumentError) { Time.rfc2822("3/11/2001 1:31:57 PM Pacific Daylight Time") }
-      assert_raises(ArgumentError) { Time.rfc2822("Mi, 28 Mrz 2001 11:51:36") }
-      assert_raises(ArgumentError) { Time.rfc2822("P, 30 sept 2001 23:03:14") }
-      assert_raises(ArgumentError) { Time.rfc2822("fr, 11 aug 2000 18:39:22") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fr, 21 Sep 2001 17:44:03 -1000") }
-      assert_raises(ArgumentError) { Time.rfc2822("Mo, 18 Jun 2001 19:21:40 -1000") }
-      assert_raises(ArgumentError) { Time.rfc2822("l\366, 12 aug 2000 18:53:20") }
-      assert_raises(ArgumentError) { Time.rfc2822("l\366, 26 maj 2001 00:15:58") }
-      assert_raises(ArgumentError) { Time.rfc2822("Dom, 30 Sep 2001 17:36:30") }
-      assert_raises(ArgumentError) { Time.rfc2822("%&, 31 %2/ 2000 15:44:47 -0500") }
-      assert_raises(ArgumentError) { Time.rfc2822("dom, 26 ago 2001 03:57:07 -0300") }
-      assert_raises(ArgumentError) { Time.rfc2822("ter, 04 set 2001 16:27:58 -0300") }
-      assert_raises(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
-      assert_raises(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
-      assert_raises(ArgumentError) { Time.rfc2822("ele, 11 h: 2000 12:42:15 -0500") }
-      assert_raises(ArgumentError) { Time.rfc2822("Tue, 14 Aug 2001 3:55:3 +0200") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fri, 25 Aug 2000 9:3:48 +0800") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fri, 1 Dec 2000 0:57:50 EST") }
-      assert_raises(ArgumentError) { Time.rfc2822("Mon, 7 May 2001 9:39:51 +0200") }
-      assert_raises(ArgumentError) { Time.rfc2822("Wed, 1 Aug 2001 16:9:15 +0200") }
-      assert_raises(ArgumentError) { Time.rfc2822("Wed, 23 Aug 2000 9:17:36 +0800") }
-      assert_raises(ArgumentError) { Time.rfc2822("Fri, 11 Aug 2000 10:4:42 +0800") }
-      assert_raises(ArgumentError) { Time.rfc2822("Sat, 15 Sep 2001 13:22:2 +0300") }
-      assert_raises(ArgumentError) { Time.rfc2822("Wed,16 \276\305\324\302 2001 20:06:25 +0800") }
-      assert_raises(ArgumentError) { Time.rfc2822("Wed,7 \312\256\322\273\324\302 2001 23:47:22 +0800") }
-      assert_raises(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=C5=DA),?= 10   2 2001 23:32:26 +0900 (JST)") }
-      assert_raises(ArgumentError) { Time.rfc2822("\307\341\314\343\332\311, 30 \344\346\335\343\310\321 2001 10:01:06") }
-      assert_raises(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=BF=E5),?= 12  =?iso-8859-1?Q?9=B7=EE?= 2001 14:52:41\n+0900 (JST)") }
-    end
-  end
-
-end
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 5c6a72652a..d4ea758acd 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -1,9 +1,6 @@
 #
 # timeout.rb -- execution timeout
 #
-# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-# Copyright (C) 2000  Information-technology Promotion Agency, Japan
-#
 #= SYNOPSIS
 #
 #   require 'timeout'
@@ -23,56 +20,23 @@
 #
 #    The time in seconds to wait for block teminatation.   
 #
-#  : [exception]
-#
-#    The exception classs to be raised on timeout.
-#
 #=end
 
-module Timeout
-  class Error<Interrupt
-  end
-
-  def timeout(sec, exception=Error)
-    return yield if sec == nil or sec.zero?
-    begin
-      x = Thread.current
-      y = Thread.start {
-        sleep sec
-        x.raise exception, "execution expired" if x.alive?
-      }
-      yield sec
-      #    return true
-    ensure
-      y.kill if y and y.alive?
-    end
-  end
-  module_function :timeout
+class TimeoutError<StandardError
 end
 
-# compatible
-def timeout(n, e=Timeout::Error, &block)
-  Timeout::timeout(n, e, &block)
-end
-TimeoutError = Timeout::Error
+Thread.abort_on_exception = true
 
-if __FILE__ == $0
-  p timeout(5) {
-    45
-  }
-  p timeout(5, TimeoutError) {
-    45
-  }
-  p timeout(nil) {
-    54
-  }
-  p timeout(0) {
-    54
-  }
-  p timeout(5) {
-    loop {
-      p 10
-      sleep 1
+def timeout(sec)
+  begin
+    x = Thread.current
+    y = Thread.start {
+      sleep sec
+      x.raise TimeoutError, "execution expired" if x.status
     }
-  }
+    yield sec
+    return true
+  ensure
+    Thread.kill y if y.status
+  end
 end
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
deleted file mode 100644
index bee99c41cb..0000000000
--- a/lib/tmpdir.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# tmpdir - retrieve temporary directory path
-#
-# $Id$
-#
-
-class Dir
-
-  @@systmpdir = '/tmp'
-
-  begin
-    require 'Win32API'
-    max_pathlen = 260
-    windir = ' '*(max_pathlen+1)
-    begin
-      getdir = Win32API.new('kernel32', 'GetSystemWindowsDirectory', 'PL', 'L')
-    rescue RuntimeError
-      getdir = Win32API.new('kernel32', 'GetWindowsDirectory', 'PL', 'L')
-    end
-    getdir.call(windir, windir.size)
-    windir = File.expand_path(windir.rstrip.untaint)
-    temp = File.join(windir, 'temp')
-    @@systmpdir = temp if File.directory?(temp) and File.writable?(temp)
-  rescue LoadError
-  end
-
-  def Dir::tmpdir
-    tmp = '.'
-    if $SAFE > 0
-      tmp = @@systmpdir
-    else
-      for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'],
-	          ENV['USERPROFILE'], @@systmpdir, '/tmp']
-	if dir and File.directory?(dir) and File.writable?(dir)
-	  tmp = dir
-	  break
-	end
-      end
-    end
-    File.expand_path(tmp)
-  end
-end
diff --git a/lib/tracer.rb b/lib/tracer.rb
index 3ccf1b5017..a8dc2a104d 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -16,13 +16,11 @@
 class Tracer
   @RCS_ID='-$Id: tracer.rb,v 1.8 1998/05/19 03:42:49 keiju Exp keiju $-'
 
-  @stdout = STDOUT
-  @verbose = false
   class << self
-    attr :verbose, true
+    attr :verbose, TRUE
     alias verbose? verbose
-    attr :stdout, true
   end
+  verbose = TRUE
   
   MY_FILE_NAME = caller(0)[0].scan(/^(.*):[0-9]+$/)[0][0]
   
@@ -31,30 +29,24 @@ class Tracer
     "call" => ">",
     "return" => "<",
     "class" => "C",
-    "end" => "E",
-    "c-call" => ">",
-    "c-return" => "<",
-  }
+    "end" => "E"}
   
   def initialize
     @threads = Hash.new
     if defined? Thread.main
-      @threads[Thread.main.object_id] = 0
+      @threads[Thread.main.id] = 0
     else
-      @threads[Thread.current.object_id] = 0
+      @threads[Thread.current.id] = 0
     end
 
     @get_line_procs = {}
+    @sources = {}
 
     @filters = []
   end
   
-  def stdout
-    Tracer.stdout
-  end
-
   def on
-    if block_given?
+    if iterator?
       on
       begin
 	yield
@@ -62,14 +54,16 @@ class Tracer
 	off
       end
     else
-      set_trace_func method(:trace_func).to_proc
-      stdout.print "Trace on\n" if Tracer.verbose?
+      set_trace_func proc{|event, file, line, id, binding, klass|
+	trace_func event, file, line, id, binding
+      }
+      print "Trace on\n" if Tracer.verbose?
     end
   end
   
   def off
     set_trace_func nil
-    stdout.print "Trace off\n" if Tracer.verbose?
+    print "Trace off\n" if Tracer.verbose?
   end
 
   def add_filter(p = proc)
@@ -82,19 +76,20 @@ class Tracer
   
   def get_line(file, line)
     if p = @get_line_procs[file]
-      return p.call(line)
+      return p.call line
     end
 
-    unless list = SCRIPT_LINES__[file]
+    unless list = @sources[file]
+#      print file if $DEBUG
       begin
 	f = open(file)
 	begin 
-	  SCRIPT_LINES__[file] = list = f.readlines
+	  @sources[file] = list = f.readlines
 	ensure
 	  f.close
 	end
       rescue
-	SCRIPT_LINES__[file] = list = []
+	@sources[file] = list = []
       end
     end
     if l = list[line - 1]
@@ -105,35 +100,34 @@ class Tracer
   end
   
   def get_thread_no
-    if no = @threads[Thread.current.object_id]
+    if no = @threads[Thread.current.id]
       no
     else
-      @threads[Thread.current.object_id] = @threads.size
+      @threads[Thread.current.id] = @threads.size
     end
   end
   
-  def trace_func(event, file, line, id, binding, klass, *)
+  def trace_func(event, file, line, id, binding)
     return if file == MY_FILE_NAME
+    #printf "Th: %s\n", Thread.current.inspect
     
     for p in @filters
-      return unless p.call event, file, line, id, binding, klass
+      return unless p.call event, file, line, id, binding
     end
     
-    saved_crit = Thread.critical
-    Thread.critical = true
-    stdout.printf("#%d:%s:%d:%s:%s: %s",
-      get_thread_no,
-      file,
-      line,
-      klass || '',
-      EVENT_SYMBOL[event],
-      get_line(file, line))
-    Thread.critical = saved_crit
+    Thread.critical = TRUE
+    printf("#%d:%s:%d:%s: %s",
+	   get_thread_no,
+	   file,
+	   line,
+	   EVENT_SYMBOL[event],
+	   get_line(file, line))
+    Thread.critical = FALSE
   end
 
   Single = new
   def Tracer.on
-    if block_given?
+    if iterator?
       Single.on{yield}
     else
       Single.on
@@ -154,8 +148,6 @@ class Tracer
   
 end
 
-SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
-
 if caller(0).size == 1
   if $0 == Tracer::MY_FILE_NAME
     # direct call
diff --git a/lib/tsort.rb b/lib/tsort.rb
deleted file mode 100644
index 3bf8c33bbf..0000000000
--- a/lib/tsort.rb
+++ /dev/null
@@ -1,310 +0,0 @@
-=begin
-= tsort.rb
-
-tsort.rb provides a module for topological sorting and
-strongly connected components.
-
-== Example
-
-  require 'tsort'
-
-  class Hash
-    include TSort
-    alias tsort_each_node each_key
-    def tsort_each_child(node, &block)
-      fetch(node).each(&block)
-    end
-  end
-
-  {1=>[2, 3], 2=>[3], 3=>[], 4=>[]}.tsort
-  #=> [3, 2, 1, 4]
-
-  {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}.strongly_connected_components
-  #=> [[4], [2, 3], [1]]
-
-== TSort module
-TSort implements topological sorting using Tarjan's algorithm for
-strongly connected components.
-
-TSort is designed to be able to use with any object which can be interpreted
-as a directed graph.
-TSort requires two methods to interpret a object as a graph:
-tsort_each_node and tsort_each_child.
-
-* tsort_each_node is used to iterate for all nodes over a graph.
-* tsort_each_child is used to iterate for child nodes of a given node.
-
-The equality of nodes are defined by eql? and hash since
-TSort uses Hash internally.
-
-=== methods
---- tsort 
-    returns a topologically sorted array of nodes.
-    The array is sorted from children to parents:
-    I.e. the first element has no child and the last node has no parent.
-
-    If there is a cycle, (({TSort::Cyclic})) is raised.
-
---- tsort_each {|node| ...}
-    is the iterator version of the (({tsort})) method.
-    (({((|obj|)).tsort_each})) is similar to (({((|obj|)).tsort.each})) but
-    modification of ((|obj|)) during the iteration may cause unexpected result.
-
-    (({tsort_each})) returns (({nil})).
-    If there is a cycle, (({TSort::Cyclic})) is raised.
-
---- strongly_connected_components
-    returns strongly connected components as an array of array of nodes.
-    The array is sorted from children to parents.
-    Each elements of the array represents a strongly connected component.
-
---- each_strongly_connected_component {|nodes| ...}
-    is the iterator version of the (({strongly_connected_components})) method.
-    (({((|obj|)).each_strongly_connected_component})) is similar to
-    (({((|obj|)).strongly_connected_components.each})) but
-    modification of ((|obj|)) during the iteration may cause unexpected result.
-
-    (({each_strongly_connected_component})) returns (({nil})).
-
---- each_strongly_connected_component_from(node) {|nodes| ...}
-    iterates over strongly connected component in the subgraph reachable from 
-    ((|node|)).
-
-    Return value is unspecified.
-
-    (({each_strongly_connected_component_from})) doesn't call
-    (({tsort_each_node})).
-
---- tsort_each_node {|node| ...}
-    should be implemented by a extended class.
-
-    (({tsort_each_node})) is used to iterate for all nodes over a graph.
-
---- tsort_each_child(node) {|child| ...}
-    should be implemented by a extended class.
-
-    (({tsort_each_child})) is used to iterate for child nodes of ((|node|)).
-
-== More Realistic Example
-Very simple `make' like tool can be implemented as follows:
-
-  require 'tsort'
-
-  class Make
-    def initialize
-      @dep = {}
-      @dep.default = []
-    end
-
-    def rule(outputs, inputs=[], &block)
-      triple = [outputs, inputs, block]
-      outputs.each {|f| @dep[f] = [triple]}
-      @dep[triple] = inputs
-    end
-
-    def build(target)
-      each_strongly_connected_component_from(target) {|ns|
-        if ns.length != 1
-          fs = ns.delete_if {|n| Array === n}
-          raise TSort::Cyclic.new("cyclic dependencies: #{fs.join ', '}")
-        end
-        n = ns.first
-        if Array === n
-          outputs, inputs, block = n
-          inputs_time = inputs.map {|f| File.mtime f}.max
-          begin
-            outputs_time = outputs.map {|f| File.mtime f}.min
-          rescue Errno::ENOENT
-            outputs_time = nil
-          end
-          if outputs_time == nil ||
-             inputs_time != nil && outputs_time <= inputs_time
-            sleep 1 if inputs_time != nil && inputs_time.to_i == Time.now.to_i
-            block.call
-          end
-        end
-      }
-    end
-
-    def tsort_each_child(node, &block)
-      @dep[node].each(&block)
-    end
-    include TSort
-  end
-
-  def command(arg)
-    print arg, "\n"
-    system arg
-  end
-
-  m = Make.new
-  m.rule(%w[t1]) { command 'date > t1' }
-  m.rule(%w[t2]) { command 'date > t2' }
-  m.rule(%w[t3]) { command 'date > t3' }
-  m.rule(%w[t4], %w[t1 t3]) { command 'cat t1 t3 > t4' }
-  m.rule(%w[t5], %w[t4 t2]) { command 'cat t4 t2 > t5' }
-  m.build('t5')
-
-== Bugs
-
-* (('tsort.rb')) is wrong name because this library uses
-  Tarjan's algorithm for strongly connected components.
-  Although (('strongly_connected_components.rb')) is correct but too long,
-
-== References
-R. E. Tarjan, 
-Depth First Search and Linear Graph Algorithms,
-SIAM Journal on Computing, Vol. 1, No. 2, pp. 146-160, June 1972.
-
-#@Article{Tarjan:1972:DFS,
-#  author =       "R. E. Tarjan",
-#  key =          "Tarjan",
-#  title =        "Depth First Search and Linear Graph Algorithms",
-#  journal =      j-SIAM-J-COMPUT,
-#  volume =       "1",
-#  number =       "2",
-#  pages =        "146--160",
-#  month =        jun,
-#  year =         "1972",
-#  CODEN =        "SMJCAT",
-#  ISSN =         "0097-5397 (print), 1095-7111 (electronic)",
-#  bibdate =      "Thu Jan 23 09:56:44 1997",
-#  bibsource =    "Parallel/Multi.bib, Misc/Reverse.eng.bib",
-#}
-=end
-
-module TSort
-  class Cyclic < StandardError
-  end
-
-  def tsort
-    result = []
-    tsort_each {|element| result << element}
-    result
-  end
-
-  def tsort_each
-    each_strongly_connected_component {|component|
-      if component.size == 1
-        yield component.first
-      else
-        raise Cyclic.new("topological sort failed: #{component.inspect}")
-      end
-    }
-  end
-
-  def strongly_connected_components
-    result = []
-    each_strongly_connected_component {|component| result << component}
-    result
-  end
-
-  def each_strongly_connected_component
-    id_map = {}
-    stack = []
-    tsort_each_node {|node|
-      unless id_map.include? node
-        each_strongly_connected_component_from(node, id_map, stack) {|c|
-          yield c
-        }
-      end
-    }
-    nil
-  end
-
-  def each_strongly_connected_component_from(node, id_map={}, stack=[])
-    minimum_id = node_id = id_map[node] = id_map.size
-    stack_length = stack.length
-    stack << node
-
-    tsort_each_child(node) {|child|
-      if id_map.include? child
-        child_id = id_map[child]
-        minimum_id = child_id if child_id && child_id < minimum_id
-      else
-        sub_minimum_id =
-          each_strongly_connected_component_from(child, id_map, stack) {|c|
-            yield c
-          }
-        minimum_id = sub_minimum_id if sub_minimum_id < minimum_id
-      end
-    }
-
-    if node_id == minimum_id
-      component = stack.slice!(stack_length .. -1)
-      component.each {|n| id_map[n] = nil}
-      yield component
-    end
-
-    minimum_id
-  end
-
-  def tsort_each_node
-    raise NotImplementedError.new
-  end
-
-  def tsort_each_child(node)
-    raise NotImplementedError.new
-  end
-end
-
-if __FILE__ == $0
-  require 'test/unit'
-
-  class Hash
-    include TSort
-    alias tsort_each_node each_key
-    def tsort_each_child(node, &block)
-      fetch(node).each(&block)
-    end
-  end
-
-  class Array
-    include TSort
-    alias tsort_each_node each_index
-    def tsort_each_child(node, &block)
-      fetch(node).each(&block)
-    end
-  end
-
-  class TSortTest < Test::Unit::TestCase
-    def test_dag
-      h = {1=>[2, 3], 2=>[3], 3=>[]}
-      assert_equal([3, 2, 1], h.tsort)
-      assert_equal([[3], [2], [1]], h.strongly_connected_components)
-    end
-
-    def test_cycle
-      h = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
-      assert_equal([[4], [2, 3], [1]],
-        h.strongly_connected_components.map {|nodes| nodes.sort})
-      assert_raises(TSort::Cyclic) { h.tsort }
-    end
-
-    def test_array
-      a = [[1], [0], [0], [2]]
-      assert_equal([[0, 1], [2], [3]],
-        a.strongly_connected_components.map {|nodes| nodes.sort})
-
-      a = [[], [0]]
-      assert_equal([[0], [1]],
-        a.strongly_connected_components.map {|nodes| nodes.sort})
-    end
-
-    def orphaned_proc(block_str)
-      eval "lambda {#{block_str}}"
-    end
-
-    def test_orphaned_break
-      a = [[1], [2], []]
-      @n = 0
-      x = orphaned_proc %{|c| @n += 1; break :break_value}
-      assert_nothing_raised {
-        assert_equal(:break_value, a.each_strongly_connected_component(&x))
-      }
-      assert_equal(1, @n)
-    end
-  end
-
-end
-
diff --git a/lib/un.rb b/lib/un.rb
deleted file mode 100644
index c665f659b1..0000000000
--- a/lib/un.rb
+++ /dev/null
@@ -1,227 +0,0 @@
-# 
-# = un.rb
-# 
-# Copyright (c) 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-# 
-# This program is free software.
-# You can distribute/modify this program under the same terms of Ruby.
-# 
-# == Utilities to replace common UNIX commands in Makefiles etc
-#
-# == SYNOPSIS
-#
-#   ruby -run -e cp -- [OPTION] SOURCE DEST
-#   ruby -run -e ln -- [OPTION] TARGET LINK_NAME
-#   ruby -run -e mv -- [OPTION] SOURCE DEST
-#   ruby -run -e rm -- [OPTION] FILE
-#   ruby -run -e mkdir -- [OPTION] DIRS
-#   ruby -run -e rmdir -- [OPTION] DIRS
-#   ruby -run -e install -- [OPTION] SOURCE DEST
-#   ruby -run -e chmod -- [OPTION] OCTAL-MODE FILE
-#   ruby -run -e touch -- [OPTION] FILE
-#   ruby -run -e help [COMMAND]
-
-require 'fileutils'
-require 'getopts'
-
-module FileUtils
-#  @fileutils_label = ''
-  @fileutils_output = $stdout
-end
-
-def setup(options = "")
-  options += "v"
-  ARGV.map! do |x|
-    case x
-    when /^-/
-      x.delete "^-#{options}"
-    when /[*?\[{]/
-      Dir[x]
-    else
-      x
-    end
-  end
-  ARGV.flatten!
-  ARGV.delete_if{|x| x == '-'}
-  getopts(options)
-  options = {}
-  options[:verbose] = true if $OPT["v"]
-  options[:force] = true if $OPT["f"]
-  options[:preserve] = true if $OPT["p"]
-  yield ARGV, options, $OPT
-end
-
-##
-# Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY
-#
-#   ruby -run -e cp -- [OPTION] SOURCE DEST
-#
-#   -p		preserve file attributes if possible
-#   -r		copy recursively
-#   -v		verbose
-#
-
-def cp
-  setup("pr") do |argv, options, opt|
-    cmd = "cp"
-    cmd += "_r" if opt["r"]
-    dest = argv.pop
-    argv = argv[0] if argv.size == 1
-    FileUtils.send cmd, argv, dest, options
-  end
-end
-
-##
-# Create a link to the specified TARGET with LINK_NAME.
-#
-#   ruby -run -e ln -- [OPTION] TARGET LINK_NAME
-#
-#   -s		make symbolic links instead of hard links
-#   -f		remove existing destination files
-#   -v		verbose
-#
-
-def ln
-  setup("sf") do |argv, options, opt|
-    cmd = "ln"
-    cmd += "_s" if opt["s"]
-    dest = argv.pop
-    argv = argv[0] if argv.size == 1
-    FileUtils.send cmd, argv, dest, options
-  end
-end
-
-##
-# Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.
-#
-#   ruby -run -e mv -- [OPTION] SOURCE DEST
-#
-#   -v		verbose
-#
-
-def mv
-  setup do |argv, options|
-    dest = argv.pop
-    argv = argv[0] if argv.size == 1
-    FileUtils.mv argv, dest, options
-  end
-end
-
-##
-# Remove the FILE
-#
-#   ruby -run -e rm -- [OPTION] FILE
-#
-#   -f		ignore nonexistent files
-#   -r		remove the contents of directories recursively
-#   -v		verbose
-#
-
-def rm
-  setup("fr") do |argv, options, opt|
-    cmd = "rm"
-    cmd += "_r" if opt["r"]
-    FileUtils.send cmd, argv, options
-  end
-end
-
-##
-# Create the DIR, if they do not already exist.
-#
-#   ruby -run -e mkdir -- [OPTION] DIR
-#
-#   -p		no error if existing, make parent directories as needed
-#   -v		verbose
-#
-
-def mkdir
-  setup("p") do |argv, options, opt|
-    cmd = "mkdir"
-    cmd += "_p" if options.delete :preserve
-    FileUtils.send cmd, argv, options
-  end
-end
-
-##
-# Remove the DIR.
-#
-#   ruby -run -e rmdir -- [OPTION] DIR
-#
-#   -v		verbose
-#
-
-def rmdir
-  setup do |argv, options|
-    FileUtils.rmdir argv, options
-  end
-end
-
-##
-# Copy SOURCE to DEST.
-#
-#   ruby -run -e install -- [OPTION] SOURCE DEST
-#
-#   -p		apply access/modification times of SOURCE files to
-#  		corresponding destination files
-#   -m		set permission mode (as in chmod), instead of 0755
-#   -v		verbose
-#
-
-def install
-  setup("pm:") do |argv, options, opt|
-    options[:mode] = opt["m"] ? opt["m"].oct : 0755
-    dest = argv.pop
-    argv = argv[0] if argv.size == 1
-    FileUtils.install argv, dest, options
-  end
-end
-
-##
-# Change the mode of each FILE to OCTAL-MODE.
-#
-#   ruby -run -e chmod -- [OPTION] OCTAL-MODE FILE
-#
-#   -v		verbose
-#
-
-def chmod
-  setup do |argv, options|
-    mode = argv.shift.oct
-    FileUtils.chmod mode, argv, options
-  end
-end
-
-##
-# Update the access and modification times of each FILE to the current time.
-#
-#   ruby -run -e touch -- [OPTION] FILE
-#
-#   -v		verbose
-#
-
-def touch
-  setup do |argv, options|
-    FileUtils.touch argv, options
-  end
-end
-
-##
-# Display help message.
-#
-#   ruby -run -e help [COMMAND]
-#
-
-def help
-  setup do |argv,|
-    all = argv.empty?
-    open(__FILE__) do |me|
-      while me.gets("##\n")
-	if help = me.gets("\n\n")
-	  if all or argv.delete help[/-e \w+/].sub(/-e /, "")
-	    print help.gsub(/^# ?/, "")
-	  end
-	end
-      end
-    end
-  end
-end
diff --git a/lib/uri.rb b/lib/uri.rb
deleted file mode 100644
index fe1fdbe571..0000000000
--- a/lib/uri.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
-# You can redistribute it and/or modify it under the same term as Ruby.
-#
-
-=begin
-
-  Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
-  You can redistribute it and/or modify it under the same term as Ruby.
-
-= URI - URI support for Ruby
-
-=end
-
-module URI
-  VERSION_CODE = '000911'.freeze
-  VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
-end
-
-=begin
-
-== Components
-
-  * ((<URI>)) Module
-  * ((<URI::Generic>)) Class
-  * ((<URI::FTP>)) Class
-  * ((<URI::HTTP>)) Class
-  * ((<URI::HTTPS>)) Class
-  * ((<URI::LDAP>)) Class
-  * ((<URI::MailTo>)) Class
-
-=end
-require 'uri/common'
-require 'uri/generic'
-require 'uri/ftp'
-require 'uri/http'
-require 'uri/https'
-require 'uri/ldap'
-require 'uri/mailto'
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
deleted file mode 100644
index 5d6a3b5519..0000000000
--- a/lib/uri/common.rb
+++ /dev/null
@@ -1,424 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
-# You can redistribute it and/or modify it under the same term as Ruby.
-#
-
-=begin
-
-== URI
-
-=end
-
-module URI
-  module REGEXP
-    module PATTERN
-      # RFC 2396 (URI Generic Syntax)
-      # RFC 2732 (IPv6 Literal Addresses in URL's)
-      # RFC 2373 (IPv6 Addressing Architecture)
-
-      # alpha         = lowalpha | upalpha
-      ALPHA = "a-zA-Z"
-      # alphanum      = alpha | digit
-      ALNUM = "#{ALPHA}\\d"
-
-      # hex           = digit | "A" | "B" | "C" | "D" | "E" | "F" |
-      #                         "a" | "b" | "c" | "d" | "e" | "f"
-      HEX     = "a-fA-F\\d"
-      # escaped       = "%" hex hex
-      ESCAPED = "%[#{HEX}]{2}"
-      # mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" |
-      #                 "(" | ")"
-      # unreserved    = alphanum | mark
-      UNRESERVED = "-_.!~*'()#{ALNUM}"
-      # reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-      #                 "$" | ","
-      # reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | 
-      #                 "$" | "," | "[" | "]" (RFC 2732)
-      RESERVED = ";/?:@&=+$,\\[\\]"
-
-      # uric          = reserved | unreserved | escaped
-      URIC = "(?:[#{UNRESERVED}#{RESERVED}]|#{ESCAPED})"
-      # uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" |
-      #                 "&" | "=" | "+" | "$" | ","
-      URIC_NO_SLASH = "(?:[#{UNRESERVED};?:@&=+$,]|#{ESCAPED})"
-      # query         = *uric
-      QUERY = "#{URIC}*"
-      # fragment      = *uric
-      FRAGMENT = "#{URIC}*"
-
-      # domainlabel   = alphanum | alphanum *( alphanum | "-" ) alphanum
-      DOMLABEL = "(?:[#{ALNUM}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
-      # toplabel      = alpha | alpha *( alphanum | "-" ) alphanum
-      TOPLABEL = "(?:[#{ALPHA}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
-      # hostname      = *( domainlabel "." ) toplabel [ "." ]
-      HOSTNAME = "(?:#{DOMLABEL}\\.)*#{TOPLABEL}\\.?"
-
-      # RFC 2373, APPENDIX B:
-      # IPv6address = hexpart [ ":" IPv4address ]
-      # IPv4address   = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
-      # hexpart = hexseq | hexseq "::" [ hexseq ] | "::" [ hexseq ]
-      # hexseq  = hex4 *( ":" hex4)
-      # hex4    = 1*4HEXDIG
-      #
-      # XXX: This definition has a flaw. "::" + IPv4address must be
-      # allowed too.  Here is a replacement.
-      #
-      # IPv4address = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
-      IPV4ADDR = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}"
-      # hex4     = 1*4HEXDIG
-      HEX4 = "[#{HEX}]{1,4}"
-      # lastpart = hex4 | IPv4address
-      LASTPART = "(?:#{HEX4}|#{IPV4ADDR})"
-      # hexseq1  = *( hex4 ":" ) hex4
-      HEXSEQ1 = "(?:#{HEX4}:)*#{HEX4}"
-      # hexseq2  = *( hex4 ":" ) lastpart
-      HEXSEQ2 = "(?:#{HEX4}:)*#{LASTPART}"
-      # IPv6address = hexseq2 | [ hexseq1 ] "::" [ hexseq2 ]
-      IPV6ADDR = "(?:#{HEXSEQ2}|(?:#{HEXSEQ1})?::(?:#{HEXSEQ2})?)"
-
-      # IPv6prefix  = ( hexseq1 | [ hexseq1 ] "::" [ hexseq1 ] ) "/" 1*2DIGIT
-      # unused
-
-      # ipv6reference = "[" IPv6address "]" (RFC 2732)
-      IPV6REF = "\\[#{IPV6ADDR}\\]"
-
-      # host          = hostname | IPv4address
-      # host          = hostname | IPv4address | IPv6reference (RFC 2732)
-      HOST = "(?:#{HOSTNAME}|#{IPV4ADDR}|#{IPV6REF})"
-      # port          = *digit
-      PORT = "\d*"
-      # hostport      = host [ ":" port ]
-      HOSTPORT = "#{HOST}(?:#{PORT})?"
-
-      # userinfo      = *( unreserved | escaped |
-      #                    ";" | ":" | "&" | "=" | "+" | "$" | "," )
-      USERINFO = "(?:[#{UNRESERVED};:&=+$,]|#{ESCAPED})*"
-
-      # pchar         = unreserved | escaped |
-      #                 ":" | "@" | "&" | "=" | "+" | "$" | ","
-      PCHAR = "(?:[#{UNRESERVED}:@&=+$,]|#{ESCAPED})"
-      # param         = *pchar
-      PARAM = "#{PCHAR}*"
-      # segment       = *pchar *( ";" param )
-      SEGMENT = "#{PCHAR}*(?:;#{PARAM})*"
-      # path_segments = segment *( "/" segment )
-      PATH_SEGMENTS = "#{SEGMENT}(?:/#{SEGMENT})*"
-
-      # server        = [ [ userinfo "@" ] hostport ]
-      SERVER = "(?:#{USERINFO}@)?#{HOSTPORT}"
-      # reg_name      = 1*( unreserved | escaped | "$" | "," |
-      #                     ";" | ":" | "@" | "&" | "=" | "+" )
-      REG_NAME = "(?:[#{UNRESERVED}$,;+@&=+]|#{ESCAPED})+"
-      # authority     = server | reg_name
-      AUTHORITY = "(?:#{SERVER}|#{REG_NAME})"
-
-      # rel_segment   = 1*( unreserved | escaped |
-      #                     ";" | "@" | "&" | "=" | "+" | "$" | "," )
-      REL_SEGMENT = "(?:[#{UNRESERVED};@&=+$,]|#{ESCAPED})+"
-
-      # scheme        = alpha *( alpha | digit | "+" | "-" | "." )
-      SCHEME = "[#{ALPHA}][-+.#{ALPHA}\\d]*"
-
-      # abs_path      = "/"  path_segments
-      ABS_PATH = "/#{PATH_SEGMENTS}"
-      # rel_path      = rel_segment [ abs_path ]
-      REL_PATH = "#{REL_SEGMENT}(?:#{ABS_PATH})?"
-      # net_path      = "//" authority [ abs_path ]
-      NET_PATH   = "//#{AUTHORITY}(?:#{ABS_PATH})?"
-
-      # hier_part     = ( net_path | abs_path ) [ "?" query ]
-      HIER_PART   = "(?:#{NET_PATH}|#{ABS_PATH})(?:\\?(?:#{QUERY}))?"
-      # opaque_part   = uric_no_slash *uric
-      OPAQUE_PART = "#{URIC_NO_SLASH}#{URIC}*"
-
-      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
-      ABS_URI   = "#{SCHEME}:(?:#{HIER_PART}|#{OPAQUE_PART})"
-      # relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
-      REL_URI = "(?:#{NET_PATH}|#{ABS_PATH}|#{REL_PATH})(?:\\?#{QUERY})?"
-
-      # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
-      URI_REF = "(?:#{ABS_URI}|#{REL_URI})?(?:##{FRAGMENT})?"
-
-      # XXX:
-      X_ABS_URI = "
-	(#{PATTERN::SCHEME}):                     (?# 1: scheme)
-	(?:
-	   (#{PATTERN::OPAQUE_PART})              (?# 2: opaque)
-	|
-	   (?:(?:
-	     //(?:
-		 (?:(?:(#{PATTERN::USERINFO})@)?  (?# 3: userinfo)
-		   (?:(#{PATTERN::HOST})(?::(\\d*))?))?(?# 4: host, 5: port)
-	       |
-		 (#{PATTERN::REG_NAME})           (?# 6: registry)
-	       )
-	     |
-	     (?!//))                              (?# XXX: '//' is the mark for hostport)
-	     (#{PATTERN::ABS_PATH})?              (?# 7: path)
-	   )(?:\\?(#{PATTERN::QUERY}))?           (?# 8: query)
-	)
-	(?:\\#(#{PATTERN::FRAGMENT}))?            (?# 9: fragment)
-      "
-      X_REL_URI = "
-        (?:
-          (?:
-            //
-            (?:
-              (?:(#{PATTERN::USERINFO})@)?       (?# 1: userinfo)
-                (#{PATTERN::HOST})?(?::(\\d*))?  (?# 2: host, 3: port)
-            |
-              (#{PATTERN::REG_NAME})             (?# 4: registry)
-            )
-          )
-        |
-          (#{PATTERN::REL_SEGMENT})              (?# 5: rel_segment)
-        )?
-        (#{PATTERN::ABS_PATH})?                  (?# 6: abs_path)
-        (?:\\?(#{PATTERN::QUERY}))?              (?# 7: query)
-        (?:\\#(#{PATTERN::FRAGMENT}))?           (?# 8: fragment)
-      "
-    end # PATTERN
-
-    # for URI::split
-    ABS_URI = Regexp.new('^' + PATTERN::X_ABS_URI + '$', #'
-			 Regexp::EXTENDED, 'N').freeze
-    REL_URI = Regexp.new('^' + PATTERN::X_REL_URI + '$', #'
-			 Regexp::EXTENDED, 'N').freeze
-
-    # for URI::extract
-    URI_REF     = Regexp.new(PATTERN::URI_REF, false, 'N').freeze
-    ABS_URI_REF = Regexp.new(PATTERN::X_ABS_URI, Regexp::EXTENDED, 'N').freeze
-    REL_URI_REF = Regexp.new(PATTERN::X_REL_URI, Regexp::EXTENDED, 'N').freeze
-
-    # for URI::escape/unescape
-    ESCAPED = Regexp.new(PATTERN::ESCAPED, false, 'N').freeze
-    UNSAFE  = Regexp.new("[^#{PATTERN::UNRESERVED}#{PATTERN::RESERVED}]",
-			 false, 'N').freeze
-
-    # for Generic#initialize
-    SCHEME   = Regexp.new("^#{PATTERN::SCHEME}$", false, 'N').freeze #"
-    USERINFO = Regexp.new("^#{PATTERN::USERINFO}$", false, 'N').freeze #"
-    HOST     = Regexp.new("^#{PATTERN::HOST}$", false, 'N').freeze #"
-    PORT     = Regexp.new("^#{PATTERN::PORT}$", false, 'N').freeze #"
-    OPAQUE   = Regexp.new("^#{PATTERN::OPAQUE_PART}$", false, 'N').freeze #"
-    REGISTRY = Regexp.new("^#{PATTERN::REG_NAME}$", false, 'N').freeze #"
-    ABS_PATH = Regexp.new("^#{PATTERN::ABS_PATH}$", false, 'N').freeze #"
-    REL_PATH = Regexp.new("^#{PATTERN::REL_PATH}$", false, 'N').freeze #"
-    QUERY    = Regexp.new("^#{PATTERN::QUERY}$", false, 'N').freeze #"
-    FRAGMENT = Regexp.new("^#{PATTERN::FRAGMENT}$", false, 'N').freeze #"
-  end # REGEXP
-
-  module Util
-    def make_components_hash(klass, array_hash)
-      tmp = {}
-      if array_hash.kind_of?(Array) &&
-	  array_hash.size == klass.component.size - 1
-	klass.component[1..-1].each_index do |i|
-	  begin
-	    tmp[klass.component[i + 1]] = array_hash[i].clone
-	  rescue TypeError
-	    tmp[klass.component[i + 1]] = array_hash[i]
-	  end
-	end
-
-      elsif array_hash.kind_of?(Hash)
-	array_hash.each do |key, value|
-	  begin
-	    tmp[key] = value.clone
-	  rescue TypeError
-	    tmp[key] = value
-	  end
-	end
-      else
-	raise ArgumentError, 
-	  "expected Array of or Hash of components of #{klass.to_s} (#{klass.component[1..-1].join(', ')})"
-      end
-      tmp[:scheme] = klass.to_s.sub(/\A.*::/, '').downcase
-
-      return tmp
-    end
-    module_function :make_components_hash
-  end
-
-  module Escape
-    include REGEXP
-
-    def escape(str, unsafe = UNSAFE)
-      unless unsafe.kind_of?(Regexp)
-	# perhaps unsafe is String object
-	unsafe = Regexp.new(Regexp.quote(unsafe), false, 'N')
-      end
-      str.gsub(unsafe) do |us|
-	tmp = ''
-	us.each_byte do |uc|
-	  tmp << sprintf('%%%02X', uc)
-	end
-	tmp
-      end
-    end
-    alias encode escape
-
-    def unescape(str)
-      str.gsub(ESCAPED) do
-	$&[1,2].hex.chr
-      end
-    end
-    alias decode unescape
-  end
-
-  include REGEXP
-  extend Escape
-
-  @@schemes = {}
-
-  class Error < StandardError; end
-  class InvalidURIError < Error; end # it is not URI.
-  class InvalidComponentError < Error; end # it is not component of URI.
-  class BadURIError < Error; end # the URI is valid but it is bad for the position.
-
-=begin
-
-=== Methods
-
---- URI::split(uri)
-
-=end
-
-  def self.split(uri)
-    case uri
-    when ''
-      # null uri
-
-    when ABS_URI
-      scheme, opaque, userinfo, host, port, 
-	registry, path, query, fragment = $~[1..-1]
-
-      # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
-
-      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
-      # hier_part     = ( net_path | abs_path ) [ "?" query ]
-      # opaque_part   = uric_no_slash *uric
-
-      # abs_path      = "/"  path_segments
-      # net_path      = "//" authority [ abs_path ]
-
-      # authority     = server | reg_name
-      # server        = [ [ userinfo "@" ] hostport ]
-
-      if !scheme
-	raise InvalidURIError, 
-	  "bad URI(absolute but no scheme): #{uri}"
-      end
-      if !opaque && (!path && (!host && !registry))
-	raise InvalidURIError,
-	  "bad URI(absolute but no path): #{uri}" 
-      end
-
-    when REL_URI
-      scheme = nil
-      opaque = nil
-
-      userinfo, host, port, registry, 
-	rel_segment, abs_path, query, fragment = $~[1..-1]
-      if rel_segment && abs_path
-	path = rel_segment + abs_path
-      elsif rel_segment
-	path = rel_segment
-      elsif abs_path
-	path = abs_path
-      end
-
-      # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
-
-      # relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
-
-      # net_path      = "//" authority [ abs_path ]
-      # abs_path      = "/"  path_segments
-      # rel_path      = rel_segment [ abs_path ]
-
-      # authority     = server | reg_name
-      # server        = [ [ userinfo "@" ] hostport ]
-
-    else
-      raise InvalidURIError, "bad URI(is not URI?): #{uri}"
-    end
-
-    path = '' if !path && !opaque # (see RFC2396 Section 5.2)
-    ret = [
-      scheme, 
-      userinfo, host, port, 	# X
-      registry,			# X
-      path, 			# Y
-      opaque,			# Y
-      query,
-      fragment
-    ]
-    return ret
-  end
-
-=begin
-
---- URI::parse(uri_str)
-
-=end
-  def self.parse(uri)
-    scheme, userinfo, host, port, 
-      registry, path, opaque, query, fragment = self.split(uri)
-
-    if scheme && @@schemes.include?(scheme.upcase)
-      @@schemes[scheme.upcase].new(scheme, userinfo, host, port, 
-				   registry, path, opaque, query, 
-				   fragment)
-    else
-      Generic.new(scheme, userinfo, host, port, 
-		  registry, path, opaque, query, 
-		  fragment)
-    end
-  end
-
-=begin
-
---- URI::join(str[, str, ...])
-
-=end
-  def self.join(*str)
-    u = self.parse(str[0])
-    str[1 .. -1].each do |x|
-      u = u.merge(x)
-    end
-    u
-  end
-
-=begin
-
---- URI::extract(str[, schemes])
-
-=end
-  def self.extract(str, schemes = [])
-    urls = []
-    regexp = ABS_URI_REF
-    unless schemes.empty?
-      regexp = Regexp.new('(?=' + schemes.collect{|s| 
-			    Regexp.quote(s + ':')
-			  }.join('|') + ')' + PATTERN::X_ABS_URI, 
-			  Regexp::EXTENDED, 'N')
-    end
-
-    str.scan(regexp) {
-      if block_given?
-	yield($&)
-      else
-	urls << $&
-      end
-    }
-
-    if block_given?
-      return nil
-    else
-      return urls
-    end
-  end
-
-end # URI
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
deleted file mode 100644
index 8183fbcd51..0000000000
--- a/lib/uri/ftp.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
-# You can redistribute it and/or modify it under the same term as Ruby.
-#
-
-require 'uri/generic'
-
-module URI
-
-=begin
-
-== URI::FTP
-
-=== Super Class
-
-((<URI::Generic>))
-
-=end
-
-  # RFC1738 section 3.2.
-  class FTP < Generic
-    DEFAULT_PORT = 21
-
-    COMPONENT = [
-      :scheme, 
-      :userinfo, :host, :port,
-      :path, :typecode
-    ].freeze
-
-    TYPECODE = ['a', 'i', 'd'].freeze
-    TYPECODE_PREFIX = ';type='.freeze
-
-=begin
-
-=== Class Methods
-
---- URI::FTP::build
-    Create a new URI::FTP object from components of URI::FTP with
-    check.  It is scheme, userinfo, host, port, path and typecode. It
-    provided by an Array or a Hash. typecode is "a", "i" or "d".
-
---- URI::FTP::new
-    Create a new URI::FTP object from ``generic'' components with no
-    check.
-
-=end
-
-    def self.new2(user, password, host, port, path, 
-		  typecode = nil, arg_check = true)
-      typecode = nil if typecode.size == 0
-      if typecode && !TYPECODE.include?(typecode)
-	raise ArgumentError,
-	  "bad typecode is specified: #{typecode}"
-      end
-
-      # do escape
-
-      self.new('ftp',
-	       [user, password], 
-	       host, port, nil, 
-	       typecode ? path + TYPECODE_PREFIX + typecode : path, 
-	       nil, nil, nil, arg_check)
-    end
-
-    def self.build(args)
-      tmp = Util::make_components_hash(self, args)
-
-      if tmp[:typecode]
-	if tmp[:typecode].size == 1
-	  tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode] 
-	end
-	tmp[:path] << tmp[:typecode]
-      end
-
-      return super(tmp)
-    end
-
-    def initialize(*arg)
-      super(*arg)
-      @typecode = nil
-      tmp = @path.index(TYPECODE_PREFIX)
-      if tmp
-	typecode = @path[tmp + TYPECODE_PREFIX.size..-1]
-	self.set_path(@path[0..tmp - 1])
-	
-	if arg[-1]
-	  self.typecode = typecode
-	else
-	  self.set_typecode(typecode)
-	end
-      end
-    end
-    attr_reader :typecode
-
-    #
-    # methods for typecode
-    #
-
-    def check_typecode(v)
-      if TYPECODE.include?(v)
-	return true
-      else
-	raise InvalidComponentError,
-	  "bad typecode(expected #{TYPECODE.join(', ')}): #{v}"
-      end
-    end
-    private :check_typecode
-
-    def set_typecode(v)
-      @typecode = v
-    end
-    protected :set_typecode
-
-    def typecode=(typecode)
-      check_typecode(typecode)
-      set_typecode(typecode)
-      typecode
-    end
-
-=begin
-=end
-    def merge(oth)
-      tmp = super(oth)
-      if self != tmp
-	tmp.set_typecode(oth.typecode)
-      end
-
-      return tmp
-    end
-
-=begin
-=end
-    def to_s
-      save_path = nil
-      if @typecode
-	save_path = @path
-	@path = @path + TYPECODE_PREFIX + @typecode
-      end
-      str = super
-      if @typecode
-	@path = save_path
-      end
-
-      return str
-    end
-  end # FTP
-  @@schemes['FTP'] = FTP
-end # URI
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
deleted file mode 100644
index 59f36ad4c3..0000000000
--- a/lib/uri/generic.rb
+++ /dev/null
@@ -1,1149 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
-# You can redistribute it and/or modify it under the same term as Ruby.
-#
-
-require 'uri/common'
-
-module URI
-
-=begin
-
-== URI::Generic
-
-=== Super Class
-
-Object
-
-=end
-
-  class Generic
-    include URI
-    include REGEXP
-
-=begin
-
-=== Class Methods
-
---- URI::Generic::default_port
-
-=end
-    DEFAULT_PORT = nil
-
-    def self.default_port
-      self::DEFAULT_PORT
-    end
-
-    def default_port
-      self.class.default_port
-    end
-
-=begin
---- URI::Generic::component
-=end
-    COMPONENT = [
-      :scheme, 
-      :userinfo, :host, :port, :registry, 
-      :path, :opaque, 
-      :query, 
-      :fragment
-    ].freeze
-
-    def self.component
-      self::COMPONENT
-    end
-
-=begin
---- URI::Generic::use_registry
-=end
-    USE_REGISTRY = false
-
-    def self.use_registry
-      self::USE_REGISTRY
-    end
-
-=begin
-
---- URI::Generic::build2
-    At first, try to create a new URI::Generic object using
-    URI::Generic::build. But, if you get a exception
-    URI::InvalidComponentError, then re-try to create an object with
-    escaped components.
-
---- URI::Generic::build
-    Create a new URI::Generic object from components of URI::Generic
-    with check.  It is scheme, userinfo, host, port, registry, path,
-    opaque, query and fragment. It provided by an Array of a Hash.
-
---- URI::Generic::new
-    Create new URI::Generic object from ``generic'' components with no
-    check.
-
-=end
-    def self.build2(args)
-      begin
-	return self.build(args)
-      rescue InvalidComponentError
-	if args.kind_of?(Array)
-	  return self.build(args.collect{|x| 
-			      if x
-				URI.escape(x)
-			      else
-				x
-			      end
-			    })
-	elsif args.kind_of?(Hash)
-	  tmp = {}
-	  args.each do |key, value|
-	    tmp[key] = if value
-			 URI.escape(value)
-		       else
-			 value
-		       end
-	  end
-	  return self.build(tmp)
-	end
-      end
-    end
-
-    def self.build(args)
-      if args.kind_of?(Array) &&
-	  args.size == ::URI::Generic::COMPONENT.size
-	tmp = args
-      elsif args.kind_of?(Hash)
-	tmp = ::URI::Generic::COMPONENT.collect do |c|
-	  if args.include?(c)
-	    args[c]
-	  else
-	    nil
-	  end
-	end
-      else
-	raise ArgumentError, 
-	  "expected Array of or Hash of components of #{self.class} (#{self.class.component.join(', ')})"
-      end
-
-      tmp << true
-      return self.new(*tmp)
-    end
-
-    def initialize(scheme, 
-		   userinfo, host, port, registry, 
-		   path, opaque, 
-		   query, 
-		   fragment,
-		   arg_check = false)
-      @scheme = nil
-      @user = nil
-      @password = nil
-      @host = nil
-      @port = nil
-      @path = nil
-      @query = nil
-      @opaque = nil
-      @registry = nil
-      @fragment = nil
-
-      if arg_check
-	self.scheme = scheme
-	self.userinfo = userinfo
-	self.host = host
-	self.port = port
-	self.path = path
-	self.query = query
-	self.opaque = opaque
-	self.registry = registry
-	self.fragment = fragment
-      else
-	self.set_scheme(scheme)
-	self.set_userinfo(userinfo)
-	self.set_host(host)
-	self.set_port(port)
-	self.set_path(path)
-	self.set_query(query)
-	self.set_opaque(opaque)
-	self.set_registry(registry)
-	self.set_fragment(fragment)
-      end
-      if @registry && !self.class.use_registry
-	raise InvalidURIError, "the scheme #{@scheme} does not accept registry part: #{@registry} (or bad hostname?)"
-      end
-      
-      @scheme.freeze if @scheme
-      self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2)
-      self.set_port(self.default_port) if self.default_port && !@port
-    end
-    attr_reader :scheme
-    attr_reader :host
-    attr_reader :port
-    attr_reader :registry
-    attr_reader :path
-    attr_reader :query
-    attr_reader :opaque
-    attr_reader :fragment
-
-    # replace self by other URI object
-    def replace!(oth)
-      if self.class != oth.class
-	raise ArgumentError, "expected #{self.class} object"
-      end
-
-      component.each do |c|
-	self.__send__("#{c}=", oth.__send__(c))
-      end
-    end
-    private :replace!
-
-=begin
-
-=== Instance Methods
-
-=end
-
-=begin
-
---- URI::Generic#component
-
-=end
-    def component
-      self.class.component
-    end
-
-    # set_XXX method sets value to @XXX instance variable with no check, 
-    # so be careful if you use these methods. or, you use these method 
-    # with check_XXX method, or you use XXX= methods.
-
-=begin
-
---- URI::Generic#scheme
-
---- URI::Generic#scheme=(v)
-
-=end
-    #
-    # methods for scheme
-    #
-    def check_scheme(v)
-      if v && SCHEME !~ v
-	raise InvalidComponentError,
-	  "bad component(expected scheme component): #{v}"
-      end
-
-      return true
-    end
-    private :check_scheme
-
-    def set_scheme(v)
-      @scheme = v
-    end
-    protected :set_scheme
-
-    def scheme=(v)
-      check_scheme(v)
-      set_scheme(v)
-      v
-    end
-
-=begin
-
---- URI::Generic#userinfo
-
---- URI::Generic#userinfo=(v)
-
---- URI::Generic#user
-
---- URI::Generic#user=(v)
-
---- URI::Generic#password
-
---- URI::Generic#password=(v)
-
-=end
-    #
-    # methods for userinfo
-    #
-    def check_userinfo(user, password = nil)
-      if (user || password) &&
-	  (@registry || @opaque)
-	raise InvalidURIError, 
-	  "can not set userinfo with registry or opaque"
-      end
-
-      if !password
-	user, password = split_userinfo(user)
-      end
-      check_user(user)
-      check_password(password)
-
-      return true
-    end
-    private :check_userinfo
-
-    def check_user(v)
-      return v unless v
-
-      if USERINFO !~ v
-	raise InvalidComponentError,
-	  "bad component(expected userinfo component or user component): #{v}"
-      end
-
-      return true
-    end
-    private :check_user
-
-    def check_password(v)
-      return v unless v
-
-      if !@password
-	raise InvalidURIError,
-	  "password component depends user component"
-      end
-
-      if USERINFO !~ v
-	raise InvalidComponentError,
-	  "bad component(expected user component): #{v}"
-      end
-
-      return true
-    end
-    private :check_password
-
-    def userinfo=(userinfo)
-      if userinfo.nil?
-	return nil
-      end
-      check_userinfo(*userinfo)
-      set_userinfo(*userinfo)
-      userinfo
-    end
-
-    def user=(user)
-      check_user(user)
-      set_user(user)
-      user
-    end
-
-    def password=(password)
-      check_password(password)
-      set_password(password)
-      password
-    end
-
-    def set_userinfo(user, password = nil)
-      unless password 
-	user, password = split_userinfo(user)
-      end
-      @user     = user
-      @password = password if password
-
-      [@user, @password]
-    end
-    protected :set_userinfo
-
-    def set_user(v)
-      set_userinfo(v, @password)
-      v
-    end
-    protected :set_user
-
-    def set_password(v)
-      set_userinfo(@user, v)
-      v
-    end
-    protected :set_password
-
-    def split_userinfo(ui)
-      return nil, nil unless ui
-      tmp = ui.index(':')
-      if tmp
-	user     = ui[0..tmp - 1]
-	password = ui[tmp + 1..-1]
-      else
-	user     = ui
-	password = nil
-      end
-
-      return user, password
-    end
-    private :split_userinfo
-
-    def escape_userpass(v)
-      v = URI.escape(v, /[@:\/]/o) # RFC 1738 section 3.1 #/
-    end
-    private :escape_userpass
-
-    def userinfo
-      if !@password
-	@user
-      else
-	@user + ':' + @password
-      end
-    end
-
-    def user
-      @user
-    end
-
-    def password
-      @password
-    end
-
-=begin
-
---- URI::Generic#host
-
---- URI::Generic#host=(v)
-
-=end
-    #
-    # methods for host
-    #
-
-    def check_host(v)
-      return v unless v
-
-      if @registry || @opaque
-	raise InvalidURIError, 
-	  "can not set host with registry or opaque"
-      elsif HOST !~ v
-	raise InvalidComponentError,
-	  "bad component(expected host component): #{v}"
-      end
-
-      return true
-    end
-    private :check_host
-
-    def set_host(v)
-      @host = v
-    end
-    protected :set_host
-
-    def host=(v)
-      check_host(v)
-      set_host(v)
-      v
-    end
-
-=begin
-
---- URI::Generic#port
-
---- URI::Generic#port=(v)
-
-=end
-    #
-    # methods for port
-    #
-
-    def check_port(v)
-      return v unless v
-
-      if @registry || @opaque
-	raise InvalidURIError, 
-	  "can not set port with registry or opaque"
-      elsif !v.kind_of?(Fixnum) && PORT !~ v
-	raise InvalidComponentError,
-	  "bad component(expected port component): #{v}"
-      end
-
-      return true
-    end
-    private :check_port
-
-    def set_port(v)
-      unless !v || v.kind_of?(Fixnum)
-	if v.empty?
-	  v = nil
-	else
-	  v = v.to_i
-	end
-      end
-      @port = v
-    end
-    protected :set_port
-
-    def port=(v)
-      check_port(v)
-      set_port(v)
-      port
-    end
-
-=begin
-
---- URI::Generic#registry
-
---- URI::Generic#registry=(v)
-
-=end
-    #
-    # methods for registry
-    #
-
-    def check_registry(v)
-      return v unless v
-
-      # raise if both server and registry are not nil, because:
-      # authority     = server | reg_name
-      # server        = [ [ userinfo "@" ] hostport ]
-      if @host || @port || @user # userinfo = @user + ':' + @password
-	raise InvalidURIError, 
-	  "can not set registry with host, port, or userinfo"
-      elsif v && REGISTRY !~ v
-	raise InvalidComponentError,
-	  "bad component(expected registry component): #{v}"
-      end
-
-      return true
-    end
-    private :check_registry
-
-    def set_registry(v)
-      @registry = v
-    end
-    protected :set_registry
-
-    def registry=(v)
-      check_registry(v)
-      set_registry(v)
-      v
-    end
-
-=begin
-
---- URI::Generic#path
-
---- URI::Generic#path=(v)
-
-=end
-    #
-    # methods for path
-    #
-
-    def check_path(v)
-      # raise if both hier and opaque are not nil, because:
-      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
-      # hier_part     = ( net_path | abs_path ) [ "?" query ]
-      if v && @opaque
-	raise InvalidURIError, 
-	  "path conflicts with opaque"
-      end
-
-      if @scheme
-	if v && v != '' && ABS_PATH !~ v
-	  raise InvalidComponentError, 
-	    "bad component(expected absolute path component): #{v}"
-	end
-      else
-	if v && v != '' && ABS_PATH !~ v && REL_PATH !~ v
-	  raise InvalidComponentError, 
-	    "bad component(expected relative path component): #{v}"
-	end
-      end
-
-      return true
-    end
-    private :check_path
-
-    def set_path(v)
-      @path = v
-    end
-    protected :set_path
-
-    def path=(v)
-      check_path(v)
-      set_path(v)
-      v
-    end
-
-=begin
-
---- URI::Generic#query
-
---- URI::Generic#query=(v)
-
-=end
-    #
-    # methods for query
-    #
-
-    def check_query(v)
-      return v unless v
-
-      # raise if both hier and opaque are not nil, because:
-      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
-      # hier_part     = ( net_path | abs_path ) [ "?" query ]
-      if @opaque
-	raise InvalidURIError, 
-	  "query conflicts with opaque"
-      end
-
-      if v && v != '' && QUERY !~ v
-	  raise InvalidComponentError, 
-	    "bad component(expected query component): #{v}"
-	end
-
-      return true
-    end
-    private :check_query
-
-    def set_query(v)
-      @query = v
-    end
-    protected :set_query
-
-    def query=(v)
-      check_query(v)
-      set_query(v)
-      v
-    end
-
-=begin
-
---- URI::Generic#opaque
-
---- URI::Generic#opaque=(v)
-
-=end
-    #
-    # methods for opaque
-    #
-
-    def check_opaque(v)
-      return v unless v
-
-      # raise if both hier and opaque are not nil, because:
-      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
-      # hier_part     = ( net_path | abs_path ) [ "?" query ]
-      if @host || @port || @usr || @path  # userinfo = @user + ':' + @password
-	raise InvalidURIError, 
-	  "can not set opaque with host, port, userinfo or path"
-      elsif v && OPAQUE !~ v
-	raise InvalidComponentError,
-	  "bad component(expected opaque component): #{v}"
-      end
-
-      return true
-    end
-    private :check_opaque
-
-    def set_opaque(v)
-      @opaque = v
-    end
-    protected :set_opaque
-
-    def opaque=(v)
-      check_opaque(v)
-      set_opaque(v)
-      v
-    end
-
-=begin
-
---- URI::Generic#fragment
-
---- URI::Generic#fragment=(v)
-
-=end
-    #
-    # methods for fragment
-    #
-
-    def check_fragment(v)
-      return v unless v
-
-      if v && v != '' && FRAGMENT !~ v
-	raise InvalidComponentError, 
-	  "bad component(expected fragment component): #{v}"
-      end
-
-      return true
-    end
-    private :check_fragment
-
-    def set_fragment(v)
-      @fragment = v
-    end
-    protected :set_fragment
-
-    def fragment=(v)
-      check_fragment(v)
-      set_fragment(v)
-      v
-    end
-
-=begin
-
---- URI::Generic#hierarchical?
-
-=end
-    def hierarchical?
-      if @path
-	true
-      else
-	false
-      end
-    end
-
-=begin
-
---- URI::Generic#absolute?
-
-=end
-    def absolute?
-      if @scheme
-	true
-      else
-	false
-      end
-    end
-    alias absolute absolute?
-
-=begin
-
---- URI::Generic#relative?
-
-=end
-    def relative?
-      !absolute?
-    end
-
-=begin
-
---- URI::Generic#merge(rel)
---- URI::Generic#merge!(rel)
---- URI::Generic#+(rel)
-
-=end
-    def split_path(path)
-      path.split(%r{/+}, -1)
-    end
-    private :split_path
-
-    def merge_path(base, rel)
-      # RFC2396, Section 5.2, 5)
-      if rel[0] == ?/ #/
-	# RFC2396, Section 5.2, 5)
-	return rel
-
-      else
-	# RFC2396, Section 5.2, 6)
-	base_path = split_path(base)
-	rel_path  = split_path(rel)
-
-	if base_path.empty?
-	  base_path = [''] # XXX
-	end
-
-	# RFC2396, Section 5.2, 6), a)
-	base_path.pop unless base_path.size == 1
-
-	# RFC2396, Section 5.2, 6), c)
- 	# RFC2396, Section 5.2, 6), d)
-	rel_path.push('') if rel_path.last == '.'
-	rel_path.delete('.')
-
-	# RFC2396, Section 5.2, 6), e)
-	tmp = []
-	rel_path.each do |x|
-	  if x == '..' &&
-	      !(tmp.empty? || tmp.last == '..')
-	    tmp.pop
-	  else
-	    tmp << x
-	  end
-	end
-
-	add_trailer_slash = true
-	while x = tmp.shift
-	  if x == '..' && base_path.size > 1
-	    # RFC2396, Section 4
-	    # a .. or . in an absolute path has no special meaning
-	    base_path.pop
-	  else
-	    # if x == '..'
-	    #   valid absolute (but abnormal) path "/../..."
-	    # else
-	    #   valid absolute path
-	    # end
-	    base_path << x
-	    tmp.each {|t| base_path << t}
-	    add_trailer_slash = false
-	    break
-	  end
-	end
-	base_path.push('') if add_trailer_slash
-
-	return base_path.join('/')
-      end
-    end
-    private :merge_path
-
-    def merge!(oth)
-      t = merge(oth)
-      if self == t
-	nil
-      else
-	replace!(t)
-	self
-      end
-    end
-
-    # abs(self) + rel(oth) => abs(new)
-    def merge(oth)
-      base, rel = merge0(oth)
-      if base == rel
-	return base
-      end
-
-      authority = rel.userinfo || rel.host || rel.port
-
-      # RFC2396, Section 5.2, 2)
-      if rel.path.empty? && !authority && !rel.query
-	base.set_fragment(rel.fragment) if rel.fragment
-	return base
-      end
-
-      base.set_query(nil)
-      base.set_fragment(nil)
-
-      # RFC2396, Section 5.2, 4)
-      if !authority
-	base.set_path(merge_path(base.path, rel.path))
-      else
-	# RFC2396, Section 5.2, 4)
-	base.set_path(rel.path)
-      end
-
-      # RFC2396, Section 5.2, 7)
-      base.set_userinfo(rel.userinfo) if rel.userinfo
-      base.set_host(rel.host)         if rel.host
-      base.set_port(rel.port)         if rel.port
-      base.set_query(rel.query)       if rel.query
-      base.set_fragment(rel.fragment) if rel.fragment
-
-      return base
-    end # merge
-    alias + merge
-
-    # return base and rel.
-    # you can modify `base', but can not `rel'.
-    def merge0(oth)
-      case oth
-      when Generic
-      when String
-	oth = URI.parse(oth)
-      else
-	raise ArgumentError,
-	  "bad argument(expected URI object or URI string)"
-      end
-
-      if self.relative? && oth.relative?
-	raise BadURIError, 
-	  "both URI are relative"
-      end
-
-      if self.absolute? && oth.absolute?
-	#raise BadURIError, 
-	#  "both URI are absolute"
-	# hmm... should return oth for usability?
-	return oth, oth
-      end
-
-      if !self.hierarchical?
-	raise BadURIError, 
-	  "not hierarchical URI: #{self}"
-      elsif !oth.hierarchical?
-	raise BadURIError, 
-	  "not hierarchical URI: #{oth}"
-      end
-
-      if self.absolute?
-	return self.dup, oth
-      else
-	return oth, oth
-      end
-    end
-    private :merge0
-
-=begin
-
---- URI::Generic#route_from(src)
---- URI::Generic#-(src)
-
-=end
-    def route_from_path(src, dst)
-      # RFC2396, Section 4.2
-      return '' if src == dst
-
-      src_path = split_path(src)
-      dst_path = split_path(dst)
-
-      # hmm... dst has abnormal absolute path, 
-      # like "/./", "/../", "/x/../", ...
-      if dst_path.include?('..') ||
-	  dst_path.include?('.')
-	return dst.dup
-      end
-
-      src_path.pop
-
-      # discard same parts
-      while dst_path.first == src_path.first
-	break if dst_path.empty?
-
-	src_path.shift
-	dst_path.shift
-      end
-
-      tmp = dst_path.join('/')
-
-      # calculate
-      if src_path.empty?
-	if tmp.empty?
-	  return './'
-	elsif dst_path.first.include?(':') # (see RFC2396 Section 5)
-	  return './' + tmp
-	else
-	  return tmp
-	end
-      end
-
-      return '../' * src_path.size + tmp
-    end
-    private :route_from_path
-
-    def route_from0(oth)
-      case oth
-      when Generic
-      when String
-	oth = URI.parse(oth)
-      else
-	raise ArgumentError,
-	  "bad argument(expected URI object or URI string)"
-      end
-
-      if self.relative?
-	raise BadURIError, 
-	  "relative URI: #{self}"
-      end
-      if oth.relative?
-	raise BadURIError, 
-	  "relative URI: #{oth}"
-      end
-
-      if !self.hierarchical? || !oth.hierarchical?
-	return self, self.dup
-      end
-
-      if self.scheme != oth.scheme
-	return oth, oth.dup
-      end
-      rel = URI::Generic.new(nil, # it is relative URI
-			     self.userinfo, self.host, self.port, 
-			     self.registry, self.path, self.opaque,
-			     self.query, self.fragment)
-
-      if rel.userinfo != oth.userinfo ||
-	  rel.host != oth.host ||
-	  rel.port != oth.port
-	rel.set_port(nil) if rel.port == oth.default_port
-	return rel, rel
-      end
-      rel.set_userinfo(nil)
-      rel.set_host(nil)
-      rel.set_port(nil)
-
-      if rel.path == oth.path
-	rel.set_path('')
-	rel.set_query(nil) if rel.query == oth.query
-	return rel, rel
-      end
-
-      # you can modify `rel', but can not `oth'.
-      return oth, rel
-    end
-    private :route_from0
-
-    # calculate relative path from oth to self
-    def route_from(oth)
-      # you can modify `rel', but can not `oth'.
-      oth, rel = route_from0(oth)
-      if oth == rel
-	return rel
-      end
-
-      rel.set_path(route_from_path(oth.path, self.path))
-      if rel.path == './' && self.query
-	# "./?foo" -> "?foo"
-	rel.set_path('')
-      end
-
-      return rel
-    end
-    # abs1 - abs2 => relative_path_to_abs1_from_abs2
-    # (see http://www.nikonet.or.jp/spring/what_v/what_v_4.htm :-)
-    alias - route_from
-
-=begin
-
---- URI::Generic#route_to(dst)
-
-=end
-    # calculate relative path to oth from self
-    def route_to(oth)
-      case oth
-      when Generic
-      when String
-	oth = URI.parse(oth)
-      else
-	raise ArgumentError,
-	  "bad argument(expected URI object or URI string)"
-      end
-
-      oth.route_from(self)
-    end
-
-=begin
-
---- URI::Generic#normalize
---- URI::Generic#normalize!
-
-=end
-    def normalize
-      uri = dup
-      uri.normalize!
-      uri
-    end
-
-    def normalize!
-      if path && path == ''
-	set_path('/')
-      end
-      if host && host != host.downcase
-	set_host(self.host.downcase)
-      end	
-    end
-
-=begin
-
---- URI::Generic#to_s
-
-=end
-    def path_query
-      str = @path
-      if @query
-	str += '?' + @query
-      end
-      str
-    end
-    private :path_query
-
-    def to_s
-      str = ''
-      if @scheme
-	str << @scheme
-	str << ':'
-      end
-
-      if @opaque
-	str << @opaque
-
-      else
-	if @registry
-	  str << @registry
-	else
-	  if @host
-	    str << '//'
-	  end
-	  if self.userinfo
-	    str << self.userinfo
-	    str << '@'
-	  end
-	  if @host
-	    str << @host
-	  end
-	  if @port && @port != self.default_port
-	    str << ':'
-	    str << @port.to_s
-	  end
-	end
-
-	str << path_query
-      end
-
-      if @fragment
-	str << '#'
-	str << @fragment
-      end
-
-      str
-    end
-
-=begin
-
---- URI::Generic#==(oth)
-
-=end
-    def ==(oth)
-      if self.class == oth.class
-	self.normalize.component_ary == oth.normalize.component_ary
-      else
-	false
-      end
-    end
-
-=begin
-
---- URI::Generic#===(oth)
-
-=end
-#    def ===(oth)
-#      raise NotImplementedError
-#    end
-
-=begin
-=end
-    def component_ary
-      component.collect do |x|
-	self.send(x)
-      end
-    end
-    protected :component_ary
-
-=begin
---- URI::Generic#select(*components)
-=end
-    def select(*components)
-      components.collect do |c|
-	if component.include?(c)
-	  self.send(c)
-	else
-	  raise ArgumentError, 
-	    "expected of components of #{self.class} (#{self.class.component.join(', ')})"
-	end
-      end
-    end
-
-=begin
-=end
-    def inspect
-      sprintf("#<%s:0x%x URL:%s>", self.class.to_s, self.object_id, self.to_s)
-    end
-
-=begin
-=end
-    def coerce(oth)
-      case oth
-      when String
-	oth = URI.parse(oth)
-      else
-	super
-      end
-
-      return oth, self
-    end
-  end # Generic
-end # URI
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
deleted file mode 100644
index 3e5b209d49..0000000000
--- a/lib/uri/http.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
-# You can redistribute it and/or modify it under the same term as Ruby.
-#
-
-require 'uri/generic'
-
-module URI
-
-=begin
-
-== URI::HTTP
-
-=== Super Class
-
-((<URI::Generic>))
-
-=end
-
-  # RFC1738 section 3.3.
-  class HTTP < Generic
-    DEFAULT_PORT = 80
-
-    COMPONENT = [
-      :scheme, 
-      :userinfo, :host, :port, 
-      :path, 
-      :query, 
-      :fragment
-    ].freeze
-
-=begin
-
-=== Class Methods
-
---- URI::HTTP::build
-    Create a new URI::HTTP object from components of URI::HTTP with
-    check.  It is scheme, userinfo, host, port, path, query and
-    fragment. It provided by an Array of a Hash.
-
---- URI::HTTP::new
-    Create a new URI::HTTP object from ``generic'' components with no
-    check.
-
-=end
-
-    def self.build(args)
-      tmp = Util::make_components_hash(self, args)
-      return super(tmp)
-    end
-
-    def initialize(*arg)
-      super(*arg)
-    end
-
-=begin
-
-=== Instance Methods
-
---- URI::HTTP#request_uri
-
-=end
-    def request_uri
-      r = path_query
-      if r[0] != ?/
-	r = '/' + r
-      end
-
-      r
-    end
-  end # HTTP
-
-  @@schemes['HTTP'] = HTTP
-end # URI
diff --git a/lib/uri/https.rb b/lib/uri/https.rb
deleted file mode 100644
index 691198fafa..0000000000
--- a/lib/uri/https.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
-# You can redistribute it and/or modify it under the same term as Ruby.
-#
-
-require 'uri/http'
-
-module URI
-
-=begin
-
-== URI::HTTPS
-
-=== Super Class
-
-((<URI::HTTP>))
-
-=end
-
-  class HTTPS < HTTP
-    DEFAULT_PORT = 443
-  end
-  @@schemes['HTTPS'] = HTTPS
-end # URI
diff --git a/lib/uri/ldap.rb b/lib/uri/ldap.rb
deleted file mode 100644
index ae85bb2164..0000000000
--- a/lib/uri/ldap.rb
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# $Id$
-#
-
-require 'uri/generic'
-
-module URI
-
-=begin
-
-== URI::LDAP
-
-URI::LDAP is copyrighted free software by Takaaki Tateishi and akira yamada.
-
-  Copyright (c) 2001 Takaaki Tateishi <ttate@jaist.ac.jp> and 
-  akira yamada <akira@ruby-lang.org>.
-  You can redistribute it and/or modify it under the same term as Ruby.
-
-=== Super Class
-
-((<URI::Generic>))
-
-=end
-
-  # LDAP URI SCHEMA (described in RFC2255)
-  # ldap://<host>/<dn>[?<attrs>[?<scope>[?<filter>[?<extensions>]]]]
-  class LDAP < Generic
-
-    DEFAULT_PORT = 389
-    
-    COMPONENT = [
-      :scheme,
-      :host, :port,
-      :dn,
-      :attributes,
-      :scope,
-      :filter,
-      :extensions,
-    ].freeze
-
-    SCOPE = [
-      SCOPE_ONE = 'one',
-      SCOPE_SUB = 'sub',
-      SCOPE_BASE = 'base',
-    ].freeze
-
-=begin
-
-=== Class Methods
-
---- URI::LDAP::build
-
---- URI::LDAP::new
-
-=end
-
-    def self.build(args)
-      tmp = Util::make_components_hash(self, args)
-
-      if tmp[:dn]
-	tmp[:path] = tmp[:dn]
-      end
-
-      query = []
-      [:extensions, :filter, :scope, :attributes].collect do |x|
-	next if !tmp[x] && query.size == 0
-	query.unshift(tmp[x])
-      end
-
-      tmp[:query] = query.join('?')
-
-      return super(tmp)
-    end
-
-    def initialize(*arg)
-      super(*arg)
-
-      if @fragment
-	raise InvalidURIError, 'bad LDAP URL'
-      end
-
-      parse_dn
-      parse_query
-    end
-
-    def parse_dn
-      @dn = @path[1..-1]
-    end
-    private :parse_dn
-
-    def parse_query
-      @attributes = nil
-      @scope      = nil
-      @filter     = nil
-      @extensions = nil
-
-      if @query
-	attrs, scope, filter, extensions = @query.split('?')
-
-	@attributes = attrs if attrs && attrs.size > 0
-	@scope      = scope if scope && scope.size > 0
-	@filter     = filter if filter && filter.size > 0
-	@extensions = extensions if extensions && extensions.size > 0
-      end
-    end
-    private :parse_query
-
-    def build_path_query
-      @path = '/' + @dn
-
-      query = []
-      [@extensions, @filter, @scope, @attributes].each do |x|
-	next if !x && query.size == 0
-	query.unshift(x)
-      end
-      @query = query.join('?')
-    end
-    private :build_path_query
-
-=begin
-
-=== Instance Methods
-
---- URI::LDAP#dn
-
---- URI::LDAP#dn=(v)
-
-=end
-
-    def dn
-      @dn
-    end
-
-    def set_dn(val)
-      @dn = val
-      build_path_query
-      @dn
-    end
-    protected :set_dn
-
-    def dn=(val)
-      set_dn(val)
-      val
-    end
-
-=begin
-
---- URI::LDAP#attributes
-
---- URI::LDAP#attributes=(v)
-
-=end
-
-    def attributes
-      @attributes
-    end
-
-    def set_attributes(val)
-      @attributes = val
-      build_path_query
-      @attributes
-    end
-    protected :set_attributes
-
-    def attributes=(val)
-      set_attributes(val)
-      val
-    end
-
-=begin
-
---- URI::LDAP#scope
-
---- URI::LDAP#scope=(v)
-
-=end
-
-    def scope
-      @scope
-    end
-
-    def set_scope(val)
-      @scope = val
-      build_path_query
-      @scope
-    end
-    protected :set_scope
-
-    def scope=(val)
-      set_scope(val)
-      val
-    end
-
-=begin
-
---- URI::LDAP#filter
-
---- URI::LDAP#filter=(v)
-
-=end
-
-    def filter
-      @filter
-    end
-
-    def set_filter(val)
-      @filter = val
-      build_path_query
-      @filter
-    end
-    protected :set_filter
-
-    def filter=(val)
-      set_filter(val)
-      val
-    end
-
-=begin
-
---- URI::LDAP#extensions
-
---- URI::LDAP#extensions=(v)
-
-=end
-
-    def extensions
-      @extensions
-    end
-
-    def set_extensions(val)
-      @extensions = val
-      build_path_query
-      @extensions
-    end
-    protected :set_extensions
-
-    def extensions=(val)
-      set_extensions(val)
-      val
-    end
-  end
-
-  def hierarchical?
-    false
-  end
-
-  @@schemes['LDAP'] = LDAP
-end
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
deleted file mode 100644
index f01673fd63..0000000000
--- a/lib/uri/mailto.rb
+++ /dev/null
@@ -1,264 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
-# You can redistribute it and/or modify it under the same term as Ruby.
-#
-
-require 'uri/generic'
-
-module URI
-
-=begin
-
-== URI::MailTo
-
-=== Super Class
-
-((<URI::Generic>))
-
-=end
-
-  # RFC2368, The mailto URL scheme
-  class MailTo < Generic
-    include REGEXP
-
-    DEFAULT_PORT = nil
-
-    COMPONENT = [
-      :scheme,
-      :to, :headers
-    ].freeze
-
-    #  "hname" and "hvalue" are encodings of an RFC 822 header name and
-    #  value, respectively. As with "to", all URL reserved characters must
-    #  be encoded.
-    #
-    #  "#mailbox" is as specified in RFC 822 [RFC822]. This means that it
-    #  consists of zero or more comma-separated mail addresses, possibly
-    #  including "phrase" and "comment" components. Note that all URL
-    #  reserved characters in "to" must be encoded: in particular,
-    #  parentheses, commas, and the percent sign ("%"), which commonly occur
-    #  in the "mailbox" syntax.
-    #
-    #  Within mailto URLs, the characters "?", "=", "&" are reserved.
-
-    # hname      =  *urlc
-    # hvalue     =  *urlc
-    # header     =  hname "=" hvalue
-    HEADER_PATTERN = "(?:[^?=&]*=[^?=&]*)".freeze
-    HEADER_REGEXP  = Regexp.new(HEADER_PATTERN, 'N').freeze
-    # headers    =  "?" header *( "&" header )
-    # to         =  #mailbox
-    # mailtoURL  =  "mailto:" [ to ] [ headers ]
-    MAILBOX_PATTERN = "(?:#{PATTERN::ESCAPED}|[^(),%?=&])".freeze
-    MAILTO_REGEXP = Regexp.new("
-      \\A
-      (#{MAILBOX_PATTERN}*?)                          (?# 1: to)
-      (?:
-        \\?
-        (#{HEADER_PATTERN}(?:\\&#{HEADER_PATTERN})*)  (?# 2: headers)
-      )?
-      \\z
-    ", Regexp::EXTENDED, 'N').freeze
-
-=begin
-
-=== Class Methods
-
---- URI::MailTo::build
-    Create a new URI::MailTo object from components of URI::MailTo
-    with check.  It is to and headers. It provided by an Array of a
-    Hash. You can provide headers as an String like
-    "subject=subscribe&cc=addr" or an Array like [["subject",
-    "subscribe"], ["cc", "addr"]]
-
---- URI::MailTo::new
-    Create a new URI::MailTo object from ``generic'' components with
-    no check. Because, this method is usually called from URI::parse
-    and the method checks validity of each components.
-
-=end
-
-    def self.build(args)
-      tmp = Util::make_components_hash(self, args)
-
-      if tmp[:to]
-	tmp[:opaque] = tmp[:to]
-      else
-	tmp[:opaque] = ''
-      end
-
-      if tmp[:headers]
-	tmp[:opaque] << '?'
-
-	if tmp[:headers].kind_of?(Array)
-	  tmp[:opaque] << tmp[:headers].collect { |x|
-	    if x.kind_of?(Array)
-	      x[0] + '=' + x[1..-1].to_s
-	    else
-	      x.to_s
-	    end
-	  }.join('&')
-
-	elsif tmp[:headers].kind_of?(Hash)
-	  tmp[:opaque] << tmp[:headers].collect { |h,v|
-	    h + '=' + v
-	  }.join('&')
-
-	else
-	  tmp[:opaque] << tmp[:headers].to_s
-	end
-      end
-
-      return super(tmp)
-    end
-
-    def initialize(*arg)
-      super(*arg)
-
-      @to = nil
-      @headers = []
-
-      if MAILTO_REGEXP =~ @opaque
- 	if arg[-1]
-	  self.to = $1
-	  self.headers = $2
-	else
-	  set_to($1)
-	  set_headers($2)
-	end
-
-      else
-	raise InvalidComponentError,
-	  "unrecognised opaque part for mailtoURL: #{@opaque}"
-      end
-    end
-    attr_reader :to
-    attr_reader :headers
-
-=begin
-
-=== Instance Methods
-
---- URI::MailTo#to
-
---- URI::MailTo#to=(v)
-
-=end
-
-    #
-    # methods for to
-    #
-
-    def check_to(v)
-      return true unless v
-      return true if v.size == 0
-
-      if OPAQUE !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v
-	raise InvalidComponentError,
-	  "bad component(expected opaque component): #{v}"
-      end
-
-      return true
-    end
-    private :check_to
-
-    def set_to(v)
-      @to = v
-    end
-    protected :set_to
-
-    def to=(v)
-      check_to(v)
-      set_to(v)
-      v
-    end
-
-=begin
-
---- URI::MailTo#headers
-
---- URI::MailTo#headers=(v)
-
-=end
-
-    #
-    # methods for headers
-    #
-
-    def check_headers(v)
-      return true unless v
-      return true if v.size == 0
-
-      if OPAQUE !~ v || 
-	  /\A(#{HEADER_PATTERN}(?:\&#{HEADER_PATTERN})*)\z/o !~ v
-	raise InvalidComponentError,
-	  "bad component(expected opaque component): #{v}"
-      end
-
-      return true
-    end
-    private :check_headers
-
-    def set_headers(v)
-      @headers = []
-      if v
-	v.scan(HEADER_REGEXP) do |x|
-	  @headers << x.split(/=/o, 2)
-	end
-      end
-    end
-    protected :set_headers
-
-    def headers=(v)
-      check_headers(v)
-      set_headers(v)
-      v
-    end
-
-    def to_s
-      @scheme + ':' + 
-	if @to 
-	  @to
-	else
-	  ''
-	end + 
-	if @headers.size > 0
-	  '?' + @headers.collect{|x| x.join('=')}.join('&')
-	else
-	  ''
-	end
-    end
-
-=begin
-
---- URI::MailTo#to_mailtext
-
-=end
-    def to_mailtext
-      to = URI::unescape(@to)
-      head = ''
-      body = ''
-      @headers.each do |x|
-	case x[0]
-	when 'body'
-	  body = URI::unescape(x[1])
-	when 'to'
-	  to << ', ' + URI::unescape(x[1])
-	else
-	  head << URI::unescape(x[0]).capitalize + ': ' +
-	    URI::unescape(x[1])  + "\n"
-	end
-      end
-
-      return "To: #{to}
-#{head}
-#{body}
-"
-    end
-    alias to_rfc822text to_mailtext
-  end # MailTo
-
-  @@schemes['MAILTO'] = MailTo
-end # URI
diff --git a/lib/weakref.rb b/lib/weakref.rb
index 2e2a55ebe6..c6fe8cd21b 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -18,57 +18,49 @@ class WeakRef<Delegator
 
   ID_MAP =  {}		    # obj -> [ref,...]
   ID_REV_MAP =  {}          # ref -> obj
-  @@final = lambda{|id|
-    __old_status = Thread.critical
-    Thread.critical = true
-    begin
-      rids = ID_MAP[id]
-      if rids
-	for rid in rids
-	  ID_REV_MAP.delete(rid)
-	end
-	ID_MAP.delete(id)
-      end
-      rid = ID_REV_MAP[id]
-      if rid
-	ID_REV_MAP.delete(id)
-	ID_MAP[rid].delete(id)
-	ID_MAP.delete(rid) if ID_MAP[rid].empty?
-      end
-    ensure
-      Thread.critical = __old_status
-    end
-  }
+  ObjectSpace.add_finalizer(lambda{|id|
+			      rids = ID_MAP[id]
+			      if rids
+				for rid in rids
+				  ID_REV_MAP[rid] = nil
+				end
+				ID_MAP[id] = nil
+			      end
+			      rid = ID_REV_MAP[id]
+			      if rid
+				ID_REV_MAP[id] = nil
+				ID_MAP[rid].delete(id)
+      				ID_MAP[rid] = nil if ID_MAP[rid].empty?
+			      end
+			    })
 
   def initialize(orig)
     super
     @__id = orig.__id__
-    ObjectSpace.define_finalizer orig, @@final
-    ObjectSpace.define_finalizer self, @@final
-    __old_status = Thread.critical
-    begin
-      Thread.critical = true
-      ID_MAP[@__id] = [] unless ID_MAP[@__id]
-    ensure
-      Thread.critical = __old_status
-    end
-    ID_MAP[@__id].push self.__id__
-    ID_REV_MAP[self.__id__] = @__id
+    ObjectSpace.call_finalizer orig
+    ObjectSpace.call_finalizer self
+    ID_MAP[@__id] = [] unless ID_MAP[@__id]
+    ID_MAP[@__id].concat self.__id__
+    ID_REV_MAP[self.id] = @__id
   end
 
   def __getobj__
-    unless ID_REV_MAP[self.__id__] == @__id
-      raise RefError, "Illegal Reference - probably recycled", caller(2)
-    end
-    begin
-      ObjectSpace._id2ref(@__id)
-    rescue RangeError
+    unless ID_MAP[@__id]
       raise RefError, "Illegal Reference - probably recycled", caller(2)
     end
+    ObjectSpace._id2ref(@__id)
   end
 
   def weakref_alive?
-    ID_REV_MAP[self.__id__] == @__id
+    if ID_MAP[@__id]
+      true
+    else
+      false
+    end
+  end
+
+  def []
+    __getobj__
   end
 end
 
diff --git a/lib/webrick.rb b/lib/webrick.rb
deleted file mode 100644
index 8fca81bafb..0000000000
--- a/lib/webrick.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# WEBrick -- WEB server toolkit.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: webrick.rb,v 1.12 2002/10/01 17:16:31 gotoyuzo Exp $
-
-require 'webrick/compat.rb'
-
-require 'webrick/version.rb'
-require 'webrick/config.rb'
-require 'webrick/log.rb'
-require 'webrick/server.rb'
-require 'webrick/utils.rb'
-require 'webrick/accesslog'
-
-require 'webrick/htmlutils.rb'
-require 'webrick/httputils.rb'
-require 'webrick/cookie.rb'
-require 'webrick/httpversion.rb'
-require 'webrick/httpstatus.rb'
-require 'webrick/httprequest.rb'
-require 'webrick/httpresponse.rb'
-require 'webrick/httpserver.rb'
-require 'webrick/httpservlet.rb'
-require 'webrick/httpauth.rb'
diff --git a/lib/webrick/accesslog.rb b/lib/webrick/accesslog.rb
deleted file mode 100644
index 25dcbc1be8..0000000000
--- a/lib/webrick/accesslog.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# accesslog.rb -- Access log handling utilities
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2002 keita yamaguchi
-# Copyright (c) 2002 Internet Programming with Ruby writers
-#
-# $IPR: accesslog.rb,v 1.1 2002/10/01 17:16:32 gotoyuzo Exp $
-
-module WEBrick
-  module AccessLog
-    class AccessLogError < StandardError; end
-
-    CLF_TIME_FORMAT     = "[%d/%b/%Y:%H:%M:%S %Z]"
-    COMMON_LOG_FORMAT   = "%h %l %u %t \"%r\" %s %b"
-    CLF                 = COMMON_LOG_FORMAT
-    REFERER_LOG_FORMAT  = "%{Referer}i -> %U"
-    AGENT_LOG_FORMAT    = "%{User-Agent}i"
-    COMBINED_LOG_FORMAT = "#{CLF} \"%{Referer}i\" \"%{User-agent}i\""
-
-    module_function
-
-    # This format specification is a subset of mod_log_config of Apache.
-    #   http://httpd.apache.org/docs/mod/mod_log_config.html#formats
-    def setup_params(config, req, res)
-      params = Hash.new("")
-      params["a"] = req.peeraddr[3]
-      params["b"] = res.sent_size
-      params["e"] = ENV
-      params["f"] = res.filename || ""
-      params["h"] = req.peeraddr[2]
-      params["i"] = req
-      params["l"] = "-"
-      params["m"] = req.request_method
-      params["o"] = res
-      params["p"] = req.port
-      params["q"] = req.query_string
-      params["r"] = req.request_line.sub(/\x0d?\x0a\z/o, '')
-      params["s"] = res.status       # won't support "%>s"
-      params["t"] = req.request_time
-      params["T"] = Time.now - req.request_time
-      params["u"] = req.user || "-"
-      params["U"] = req.unparsed_uri
-      params["v"] = config[:ServerName]
-      params
-    end
-
-    def format(format_string, params)
-      format_string.gsub(/\%(?:\{(.*?)\})?>?([a-zA-Z])/){
-         param, spec = $1, $2
-         case spec[0]
-         when ?e, ?i, ?o
-           raise AccessLogError,
-             "parameter is required for \"#{spec}\"" unless param
-           params[spec][param] || "-"
-         when ?t
-           params[spec].strftime(param || CLF_TIME_FORMAT)
-         else
-           params[spec]
-         end
-      }
-    end
-  end
-end
diff --git a/lib/webrick/compat.rb b/lib/webrick/compat.rb
deleted file mode 100644
index ad7760b640..0000000000
--- a/lib/webrick/compat.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# compat.rb -- cross platform compatibility
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2002 GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: compat.rb,v 1.6 2002/10/01 17:16:32 gotoyuzo Exp $
-
-module Errno
-  class EPROTO       < SystemCallError; end
-  class ECONNRESET   < SystemCallError; end
-  class ECONNABORTED < SystemCallError; end
-end
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
deleted file mode 100644
index 31c0053363..0000000000
--- a/lib/webrick/config.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# config.rb -- Default configurations.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: config.rb,v 1.52 2003/07/22 19:20:42 gotoyuzo Exp $
-
-require 'webrick/version'
-require 'webrick/httpversion'
-require 'webrick/httputils'
-require 'webrick/utils'
-require 'webrick/log'
-
-module WEBrick
-  module Config
-    LIBDIR = File::dirname(__FILE__)
-
-    # for GenericServer
-    General = {
-      :ServerName     => Utils::getservername,
-      :BindAddress    => nil,   # "0.0.0.0" or "::" or nil
-      :Port           => nil,   # users MUST specifiy this!!
-      :MaxClients     => 100,   # maximum number of the concurrent connections
-      :ServerType     => nil,   # default: WEBrick::SimpleServer
-      :Logger         => nil,   # default: WEBrick::Log.new
-      :ServerSoftware => "WEBrick/#{WEBrick::VERSION} " +
-                         "(Ruby/#{RUBY_VERSION}/#{RUBY_RELEASE_DATE})",
-      :TempDir        => ENV['TMPDIR']||ENV['TMP']||ENV['TEMP']||'/tmp',
-      :DoNotListen    => false,
-      :StartCallback  => nil,
-      :StopCallback   => nil,
-      :AcceptCallback => nil,
-    }
-
-    # for HTTPServer, HTTPRequest, HTTPResponse ...
-    HTTP = General.dup.update(
-      :Port           => 80,
-      :RequestTimeout => 30,
-      :HTTPVersion    => HTTPVersion.new("1.1"),
-      :AccessLog      => nil,
-      :MimeTypes      => HTTPUtils::DefaultMimeTypes,
-      :DirectoryIndex => ["index.html","index.htm","index.cgi","index.rhtml"],
-      :DocumentRoot   => nil,
-      :DocumentRootOptions => { :FancyIndexing => true },
-
-      :RequestHandler => nil,
-      :ProxyAuthProc  => nil,
-      :ProxyContentHandler => nil,
-      :ProxyVia       => true,
-      :ProxyTimeout   => true,
-
-      # upstream proxy server
-      :ProxyURI       => nil,
-
-      :CGIInterpreter => nil,
-      :CGIPathEnv     => nil,
-
-      # workaround: if Request-URIs contain 8bit chars,
-      # they should be escaped before calling of URI::parse().
-      :Escape8bitURI  => false
-    )
-
-    FileHandler = {
-      :NondisclosureName => ".ht*",
-      :FancyIndexing     => false,
-      :HandlerTable      => {},
-      :HandlerCallback   => nil,
-      :DirectoryCallback => nil,
-      :FileCallback      => nil,
-      :UserDir           => "public_html",
-    }
-
-    BasicAuth = {
-      :AutoReloadUserDB     => true,
-    }
-
-    DigestAuth = {
-      :Algorithm            => 'MD5-sess', # or 'MD5' 
-      :Domain               => nil,        # an array includes domain names.
-      :Qop                  => [ 'auth' ], # 'auth' or 'auth-int' or both.
-      :UseOpaque            => true,
-      :UseNextNonce         => false,
-      :CheckNc              => false,
-      :UseAuthenticationInfoHeader => true,
-      :AutoReloadUserDB     => true,
-      :NonceExpirePeriod    => 30*60,
-      :NonceExpireDelta     => 60,
-      :InternetExplorerHack => true,
-      :OperaHack            => true,
-    }
-  end
-end
diff --git a/lib/webrick/cookie.rb b/lib/webrick/cookie.rb
deleted file mode 100644
index 4785b2bb33..0000000000
--- a/lib/webrick/cookie.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# cookie.rb -- Cookie class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: cookie.rb,v 1.16 2002/09/21 12:23:35 gotoyuzo Exp $
-
-require 'time'
-require 'webrick/httputils'
-
-module WEBrick
-  class Cookie
-
-    attr_reader :name
-    attr_accessor :value, :version
-    attr_accessor :domain, :path, :secure
-    attr_accessor :comment, :max_age
-    #attr_accessor :comment_url, :discard, :port
-
-    def initialize(name, value)
-      @name = name
-      @value = value
-      @version = 0     # Netscape Cookie
-
-      @domain = @path = @secure = @comment = @max_age =
-      @expires = @comment_url = @discard = @port = nil
-    end
-
-    def expires=(t)
-      @expires = t && (t.is_a?(Time) ? t.httpdate : t.to_s)
-    end
-
-    def expires
-      @expires && Time.parse(@expires)
-    end
-
-    def to_s
-      ret = ""
-      ret << @name << "=" << @value
-      ret << "; " << "Version=" << @version.to_s if @version > 0
-      ret << "; " << "Domain="  << @domain  if @domain
-      ret << "; " << "Expires=" << @expires if @expires
-      ret << "; " << "Max-Age=" << @max_age.to_s if @max_age
-      ret << "; " << "Comment=" << @comment if @comment
-      ret << "; " << "Path="    << @path if @path
-      ret << "; " << "Secure"   if @secure
-      ret
-    end
-
-    # Cookie::parse()
-    #   It parses Cookie field sent from the user agent.
-    def self.parse(str)
-      if str
-        ret = []
-        cookie = nil
-        ver = 0
-        str.split(/[;,]\s+/).each{|x|
-          key, val = x.split(/=/,2)
-          val = val ? HTTPUtils::dequote(val) : ""
-          case key
-          when "$Version"; ver = val.to_i
-          when "$Path";    cookie.path = val
-          when "$Domain";  cookie.domain = val
-          when "$Port";    cookie.port = val
-          else
-            ret << cookie if cookie
-            cookie = self.new(key, val)
-            cookie.version = ver
-          end
-        }
-        ret << cookie if cookie
-        ret
-      end
-    end
-
-  end
-end
diff --git a/lib/webrick/htmlutils.rb b/lib/webrick/htmlutils.rb
deleted file mode 100644
index cf8d542c09..0000000000
--- a/lib/webrick/htmlutils.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# htmlutils.rb -- HTMLUtils Module
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: htmlutils.rb,v 1.7 2002/09/21 12:23:35 gotoyuzo Exp $
-
-module WEBrick
-  module HTMLUtils
-
-    def escape(string)
-      str = string ? string.dup : ""
-      str.gsub!(/&/n, '&amp;')
-      str.gsub!(/\"/n, '&quot;')
-      str.gsub!(/>/n, '&gt;')
-      str.gsub!(/</n, '&lt;')
-      str
-    end
-    module_function :escape
-
-  end
-end
diff --git a/lib/webrick/httpauth.rb b/lib/webrick/httpauth.rb
deleted file mode 100644
index 3f0b83339d..0000000000
--- a/lib/webrick/httpauth.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# httpauth.rb -- HTTP access authentication
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpauth.rb,v 1.14 2003/07/22 19:20:42 gotoyuzo Exp $
-
-require 'base64'
-require 'webrick/httpauth/basicauth'
-require 'webrick/httpauth/digestauth'
-require 'webrick/httpauth/htpasswd'
-require 'webrick/httpauth/htdigest'
-require 'webrick/httpauth/htgroup'
-
-module WEBrick
-  module HTTPAuth
-    module_function
-
-    def _basic_auth(req, res, realm, req_field, res_field, err_type, block)
-      user = pass = nil
-      if /^Basic\s+(.*)/o =~ req[req_field]
-        userpass = $1
-        user, pass = decode64(userpass).split(":", 2)
-      end
-      if block.call(user, pass)
-        req.user = user
-        return
-      end
-      res[res_field] = "Basic realm=\"#{realm}\""
-      raise err_type
-    end
-
-    def basic_auth(req, res, realm, &block)
-      _basic_auth(req, res, realm, "Authorization", "WWW-Authenticate",
-                  HTTPStatus::Unauthorized, block)
-    end
-
-    def proxy_basic_auth(req, res, realm, &block)
-      _basic_auth(req, res, realm, "Proxy-Authorization", "Proxy-Authenticate",
-                  HTTPStatus::ProxyAuthenticationRequired, block)
-    end
-  end
-end
diff --git a/lib/webrick/httpauth/authenticator.rb b/lib/webrick/httpauth/authenticator.rb
deleted file mode 100644
index fe2dbf4e0c..0000000000
--- a/lib/webrick/httpauth/authenticator.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# httpauth/authenticator.rb -- Authenticator mix-in module.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: authenticator.rb,v 1.3 2003/02/20 07:15:47 gotoyuzo Exp $
-
-module WEBrick
-  module HTTPAuth
-    module Authenticator
-      RequestField      = "Authorization"
-      ResponseField     = "WWW-Authenticate"
-      ResponseInfoField = "Authentication-Info"
-      AuthException     = HTTPStatus::Unauthorized
-      AuthScheme        = nil # must override by the derived class
-
-      attr_reader :realm, :userdb, :logger
-
-      private
-
-      def check_init(config)
-        [:UserDB, :Realm].each{|sym|
-          unless config[sym]
-            raise ArgumentError, "Argument #{sym.inspect} missing."
-          end
-        } 
-        @realm     = config[:Realm]
-        @userdb    = config[:UserDB]
-        @logger    = config[:Logger] || Log::new($stderr)
-        @reload_db = config[:AutoReloadUserDB]
-        @request_field   = self::class::RequestField
-        @response_field  = self::class::ResponseField
-        @resp_info_field = self::class::ResponseInfoField
-        @auth_exception  = self::class::AuthException
-        @auth_scheme     = self::class::AuthScheme
-      end
-
-      def check_scheme(req)
-        unless credentials = req[@request_field]
-          error("no credentials in the request.")
-          return nil 
-        end  
-        unless match = /^#{@auth_scheme}\s+/.match(credentials)
-          error("invalid scheme in %s.", credentials)
-          info("%s: %s", @request_field, credentials) if $DEBUG
-          return nil
-        end
-        return match.post_match
-      end
-
-      def log(meth, fmt, *args)
-        msg = format("%s %s: ", @auth_scheme, @realm)
-        msg << fmt % args
-        @logger.send(meth, msg)
-      end
-
-      def error(fmt, *args)
-        if @logger.error?
-          log(:error, fmt, *args)
-        end
-      end                             
-
-      def info(fmt, *args)
-        if @logger.info?
-          log(:info, fmt, *args)
-        end
-      end
-    end
-
-    module ProxyAuthenticator
-      RequestField  = "Proxy-Authorization"
-      ResponseField = "Proxy-Authenticate"
-      InfoField     = "Proxy-Authentication-Info"
-      AuthException = HTTPStatus::ProxyAuthenticationRequired
-    end
-  end
-end
diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb
deleted file mode 100644
index 926a6b8289..0000000000
--- a/lib/webrick/httpauth/basicauth.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# httpauth/basicauth.rb -- HTTP basic access authentication
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: basicauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
-
-require 'webrick/config'
-require 'webrick/httpstatus'
-require 'webrick/httpauth/authenticator'
-require 'base64'
-
-module WEBrick
-  module HTTPAuth
-    class BasicAuth
-      include Authenticator
-
-      AuthScheme = "Basic"
-
-      def self.make_passwd(realm, user, pass)
-        pass ||= ""
-        pass.crypt(Utils::random_string(2))
-      end
-
-      attr_reader :realm, :userdb, :logger
-
-      def initialize(config, default=Config::BasicAuth)
-        check_init(config)
-        @config = default.dup.update(config)
-      end
-
-      def authenticate(req, res)
-        unless basic_credentials = check_scheme(req)
-          challenge(req, res)
-        end
-        userid, password = decode64(basic_credentials).split(":", 2) 
-        password ||= ""
-        if userid.empty?
-          error("user id was not given.")
-          challenge(req, res)
-        end
-        unless encpass = @userdb.get_passwd(@realm, userid, @reload_db)
-          error("%s: the user is not allowed.", userid)
-          challenge(req, res)
-        end
-        if password.crypt(encpass) != encpass
-          error("%s: password unmatch.", userid)
-          challenge(req, res)
-        end
-        info("%s: authentication succeeded.", userid)
-        req.user = userid
-      end
-
-      def challenge(req, res)
-        res[@response_field] = "#{@auth_scheme} realm=\"#{@realm}\""
-        raise @auth_exception
-      end
-    end
-
-    class ProxyBasicAuth < BasicAuth
-      include ProxyAuthenticator
-    end
-  end
-end
diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb
deleted file mode 100644
index 2b0660ed29..0000000000
--- a/lib/webrick/httpauth/digestauth.rb
+++ /dev/null
@@ -1,348 +0,0 @@
-#
-# httpauth/digestauth.rb -- HTTP digest access authentication
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers.
-# Copyright (c) 2003 H.M.
-#
-# The original implementation is provided by H.M.
-#   URL: http://rwiki.jin.gr.jp/cgi-bin/rw-cgi.rb?cmd=view;name=
-#        %C7%A7%BE%DA%B5%A1%C7%BD%A4%F2%B2%FE%C2%A4%A4%B7%A4%C6%A4%DF%A4%EB
-#
-# $IPR: digestauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
-
-require 'webrick/config'
-require 'webrick/httpstatus'
-require 'webrick/httpauth/authenticator'
-require 'digest/md5'
-require 'digest/sha1'
-require 'base64'
-
-module WEBrick
-  module HTTPAuth
-    class DigestAuth
-      include Authenticator
-
-      AuthScheme = "Digest"
-      OpaqueInfo = Struct.new(:time, :nonce, :nc)
-      attr_reader :algorithm, :qop
-
-      def self.make_passwd(realm, user, pass)
-        pass ||= ""
-        Digest::MD5::hexdigest([user, realm, pass].join(":"))
-      end
-
-      def initialize(config, default=Config::DigestAuth)
-        check_init(config)
-        @config                 = default.dup.update(config)
-        @algorithm              = @config[:Algorithm]
-        @domain                 = @config[:Domain]
-        @qop                    = @config[:Qop]
-        @use_opaque             = @config[:UseOpaque]
-        @use_next_nonce         = @config[:UseNextNonce]
-        @check_nc               = @config[:CheckNc]
-        @use_auth_info_header   = @config[:UseAuthenticationInfoHeader]
-        @nonce_expire_period    = @config[:NonceExpirePeriod]
-        @nonce_expire_delta     = @config[:NonceExpireDelta]
-        @internet_explorer_hack = @config[:InternetExplorerHack]
-        @opera_hack             = @config[:OperaHack]
-
-        case @algorithm
-        when 'MD5','MD5-sess'
-          @h = Digest::MD5
-        when 'SHA1','SHA1-sess'  # it is a bonus feature :-)
-          @h = Digest::SHA1
-        else
-          msg = format('Alogrithm "%s" is not supported.', @algorithm)
-          raise ArgumentError.new(msg)
-        end
-
-        @instance_key = hexdigest(self.__id__, Time.now.to_i, Process.pid)
-        @opaques = {}
-        @last_nonce_expire = Time.now
-        @mutex = Mutex.new
-      end
-
-      def authenticate(req, res)
-        unless result = @mutex.synchronize{ _authenticate(req, res) }
-          challenge(req, res)
-        end
-        if result == :nonce_is_stale
-          challenge(req, res, true)
-        end
-        return true
-      end
-
-      def challenge(req, res, stale=false)
-        nonce = generate_next_nonce(req)
-        if @use_opaque
-          opaque = generate_opaque(req)
-          @opaques[opaque].nonce = nonce
-        end
-
-        param = Hash.new
-        param["realm"]  = HTTPUtils::quote(@realm)
-        param["domain"] = HTTPUtils::quote(@domain.to_a.join(" ")) if @domain
-        param["nonce"]  = HTTPUtils::quote(nonce)
-        param["opaque"] = HTTPUtils::quote(opaque) if opaque
-        param["stale"]  = stale.to_s
-        param["algorithm"] = @algorithm
-        param["qop"]    = HTTPUtils::quote(@qop.to_a.join(",")) if @qop
-
-        res[@response_field] =
-          "#{@auth_scheme} " + param.map{|k,v| "#{k}=#{v}" }.join(", ")
-        info("%s: %s", @response_field, res[@response_field]) if $DEBUG
-        raise @auth_exception
-      end
-
-      private
-
-      MustParams = ['username','realm','nonce','uri','response']
-      MustParamsAuth = ['cnonce','nc']
-
-      def _authenticate(req, res)
-        unless digest_credentials = check_scheme(req)
-          return false
-        end
-
-        auth_req = split_param_value(digest_credentials)
-        if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
-          req_params = MustParams + MustParamsAuth
-        else
-          req_params = MustParams
-        end
-        req_params.each{|key|
-          unless auth_req.has_key?(key)
-            error('%s: parameter missing. "%s"', auth_req['username'], key)
-            raise HTTPStatus::BadRequest
-          end
-        }
-
-        if !check_uri(req, auth_req)
-          raise HTTPStatus::BadRequest  
-        end
-
-        if auth_req['realm'] != @realm  
-          error('%s: realm unmatch. "%s" for "%s"',
-                auth_req['username'], auth_req['realm'], @realm)
-          return false
-        end
-
-        auth_req['algorithm'] ||= 'MD5' 
-        if auth_req['algorithm'] != @algorithm &&
-           (@opera_hack && auth_req['algorithm'] != @algorithm.upcase)
-          error('%s: algorithm unmatch. "%s" for "%s"',
-                auth_req['username'], auth_req['algorithm'], @algorithm)
-          return false
-        end
-
-        if (@qop.nil? && auth_req.has_key?('qop')) ||
-           (@qop && (! @qop.member?(auth_req['qop'])))
-          error('%s: the qop is not allowed. "%s"',
-                auth_req['username'], auth_req['qop'])
-          return false
-        end
-
-        password = @userdb.get_passwd(@realm, auth_req['username'], @reload_db)
-        unless password
-          error('%s: the user is not allowd.', auth_req['username'])
-          return false
-        end
-
-        nonce_is_invalid = false
-        if @use_opaque
-          info("@opaque = %s", @opaque.inspect) if $DEBUG
-          if !(opaque = auth_req['opaque'])
-            error('%s: opaque is not given.', auth_req['username'])
-            nonce_is_invalid = true
-          elsif !(opaque_struct = @opaques[opaque])
-            error('%s: invalid opaque is given.', auth_req['username'])
-            nonce_is_invalid = true
-          elsif !check_opaque(opaque_struct, req, auth_req)
-            @opaques.delete(auth_req['opaque'])
-            nonce_is_invalid = true
-          end
-        elsif !check_nonce(req, auth_req)
-          nonce_is_invalid = true
-        end
-
-        if /-sess$/ =~ auth_req['algorithm'] ||
-           (@opera_hack && /-SESS$/ =~ auth_req['algorithm'])
-          ha1 = hexdigest(password, auth_req['nonce'], auth_req['cnonce'])
-        else
-          ha1 = password
-        end
-
-        if auth_req['qop'] == "auth" || auth_req['qop'] == nil
-          ha2 = hexdigest(req.request_method, auth_req['uri'])
-          ha2_res = digest("", auth_req['uri'])
-        elsif auth_req['qop'] == "auth-int"
-          ha2 = hexdigest(req.request_method, auth_req['uri'],
-                          hexdigest(req.body))
-          ha2_res = digest("", auth_req['uri'], hexdigest(req.body))
-        end
-
-        if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
-          param2 = ['nonce', 'nc', 'cnonce', 'qop'].map{|key|
-            auth_req[key]
-          }.join(':')
-          digest     = hexdigest(ha1, param2, ha2)
-          digest_res = hexdigest(ha1, param2, ha2_res)
-        else
-          digest     = hexdigest(ha1, auth_req['nonce'], ha2)
-          digest_res = hexdigest(ha1, auth_req['nonce'], ha2_res)
-        end
-
-        if digest != auth_req['response']
-          error("%s: digest unmatch.", auth_req['username'])
-          return false
-        elsif nonce_is_invalid
-          error('%s: digest is valid, but nonce is not valid.',
-                auth_req['username'])
-          return :nonce_is_stale
-        elsif @use_auth_info_header
-          auth_info = {
-            'nextnonce' => generate_next_nonce(req),
-            'rspauth'   => digest_res
-          }
-          if @use_opaque
-            opaque_struct.time  = req.request_time
-            opaque_struct.nonce = auth_info['nextnonce']
-            opaque_struct.nc    = "%08x" % (auth_req['nc'].hex + 1)
-          end
-          if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
-            ['qop','cnonce','nc'].each{|key|
-              auth_info[key] = auth_req[key]
-            }
-          end
-          res[@resp_info_field] = auth_info.keys.map{|key|
-            if key == 'nc'
-              key + '=' + auth_info[key]
-            else
-              key + "=" + HTTPUtils::quote(auth_info[key])
-            end
-          }.join(', ')
-        end
-        info('%s: authentication scceeded.', auth_req['username'])
-        req.user = auth_req['username']
-        return true
-      end
-
-      def split_param_value(string)
-        ret = {}
-        while string.size != 0
-          case string           
-          when /^\s*([\w\-\.\*\%\!]+)=\s*\"((\\.|[^\"])*)\"\s*,?/
-            key = $1
-            matched = $2
-            string = $'
-            ret[key] = matched.gsub(/\\(.)/, "\\1")
-          when /^\s*([\w\-\.\*\%\!]+)=\s*([^,\"]*),?/
-            key = $1
-            matched = $2
-            string = $'
-            ret[key] = matched.clone
-          when /^s*^,/
-            string = $'
-          else
-            break
-          end
-        end
-        ret
-      end
-
-      def generate_next_nonce(req)
-        now = "%012d" % req.request_time.to_i
-        pk  = hexdigest(now, @instance_key)[0,32]
-        nonce = encode64(now + ":" + pk).chop # it has 60 length of chars.
-        nonce
-      end
-
-      def check_nonce(req, auth_req)
-        username = auth_req['username']
-        nonce = auth_req['nonce']
-
-        pub_time, pk = decode64(nonce).split(":", 2)
-        if (!pub_time || !pk)
-          error("%s: empty nonce is given", username)
-          return false
-        elsif (hexdigest(pub_time, @instance_key)[0,32] != pk)
-          error("%s: invalid private-key: %s for %s",
-                username, hexdigest(pub_time, @instance_key)[0,32], pk)
-          return false
-        end
-
-        diff_time = req.request_time.to_i - pub_time.to_i
-        if (diff_time < 0)
-          error("%s: difference of time-stamp is negative.", username)
-          return false
-        elsif diff_time > @nonce_expire_period
-          error("%s: nonce is expired.", username)
-          return false
-        end
-
-        return true
-      end
-
-      def generate_opaque(req)
-        @mutex.synchronize{
-          now = req.request_time
-          if now - @last_nonce_expire > @nonce_expire_delta
-            @opaques.delete_if{|key,val|
-              (now - val.time) > @nonce_expire_period
-            }
-            @last_nonce_expire = now
-          end
-          begin
-            opaque = Utils::random_string(16)
-          end while @opaques[opaque]
-          @opaques[opaque] = OpaqueInfo.new(now, nil, '00000001')
-          opaque
-        }
-      end
-
-      def check_opaque(opaque_struct, req, auth_req)
-        if (@use_next_nonce && auth_req['nonce'] != opaque_struct.nonce)
-          error('%s: nonce unmatched. "%s" for "%s"',
-                auth_req['username'], auth_req['nonce'], opaque_struct.nonce)
-          return false
-        elsif !check_nonce(req, auth_req)
-          return false
-        end
-        if (@check_nc && auth_req['nc'] != opaque_struct.nc)
-          error('%s: nc unmatched."%s" for "%s"',
-                auth_req['username'], auth_req['nc'], opaque_struct.nc)
-          return false
-        end
-        true
-      end
-
-      def check_uri(req, auth_req)
-        uri = auth_req['uri']
-        if uri != req.request_uri.to_s && uri != req.unparsed_uri &&
-           (@internet_explorer_hack && uri != req.path)
-          error('%s: uri unmatch. "%s" for "%s"', auth_req['username'], 
-                auth_req['uri'], req.request_uri.to_s)
-          return false
-        end
-        true
-      end
-
-      def hexdigest(*args)
-        @h.hexdigest(args.join(":"))
-      end
-
-      def digest(*args)
-        @h.digest(args.join(":"))
-      end
-    end
-
-    class ProxyDigestAuth < DigestAuth
-      include ProxyAuthenticator
-
-      def check_uri(req, auth_req)
-        return true
-      end
-    end
-  end
-end
diff --git a/lib/webrick/httpauth/htdigest.rb b/lib/webrick/httpauth/htdigest.rb
deleted file mode 100644
index 3949756f2b..0000000000
--- a/lib/webrick/httpauth/htdigest.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# httpauth/htdigest.rb -- Apache compatible htdigest file
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: htdigest.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
-
-require 'webrick/httpauth/userdb'
-require 'webrick/httpauth/digestauth'
-require 'tempfile'
-
-module WEBrick
-  module HTTPAuth
-    class Htdigest
-      include UserDB
-
-      def initialize(path)
-        @path = path
-        @mtime = Time.at(0)
-        @digest = Hash.new
-        @mutex = Mutex::new
-        @auth_type = DigestAuth
-        open(@path,"a").close unless File::exist?(@path)
-        reload
-      end
-
-      def reload
-        mtime = File::mtime(@path)
-        if mtime > @mtime
-          @digest.clear
-          open(@path){|io|
-            while line = io.gets
-              line.chomp!
-              user, realm, pass = line.split(/:/, 3)
-              unless @digest[realm]
-                @digest[realm] = Hash.new
-              end
-              @digest[realm][user] = pass
-            end
-          }
-          @mtime = mtime
-        end
-      end
-
-      def flush(output=nil)
-        output ||= @path
-        tmp = Tempfile.new("htpasswd", File::dirname(output))
-        begin
-          each{|item| tmp.puts(item.join(":")) }
-          tmp.close
-          File::rename(tmp.path, output)
-        rescue
-          tmp.close(true)
-        end
-      end
-
-      def get_passwd(realm, user, reload_db)
-        reload() if reload_db
-        if hash = @digest[realm]
-          hash[user]
-        end
-      end
-
-      def set_passwd(realm, user, pass)
-        @mutex.synchronize{
-          unless @digest[realm]
-            @digest[realm] = Hash.new
-          end
-          @digest[realm][user] = make_passwd(realm, user, pass)
-        }
-      end
-
-      def delete_passwd(realm, user)
-        if hash = @digest[realm]
-          hash.delete(user)
-        end
-      end
-
-      def each
-        @digest.keys.sort.each{|realm|
-          hash = @digest[realm]
-          hash.keys.sort.each{|user|
-            yield([user, realm, hash[user]])
-          }
-        }
-      end
-    end
-  end
-end
diff --git a/lib/webrick/httpauth/htgroup.rb b/lib/webrick/httpauth/htgroup.rb
deleted file mode 100644
index c9270c61cc..0000000000
--- a/lib/webrick/httpauth/htgroup.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# httpauth/htgroup.rb -- Apache compatible htgroup file
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: htgroup.rb,v 1.1 2003/02/16 22:22:56 gotoyuzo Exp $
-
-require 'tempfile'
-
-module WEBrick
-  module HTTPAuth
-    class Htgroup
-      def initialize(path)
-        @path = path
-        @mtime = Time.at(0)
-        @group = Hash.new
-        open(@path,"a").close unless File::exist?(@path)
-        reload
-      end
-
-      def reload
-        if (mtime = File::mtime(@path)) > @mtime
-          @group.clear
-          open(@path){|io|
-            while line = io.gets
-              line.chomp!
-              group, members = line.split(/:\s*/)
-              @group[group] = members.split(/\s+/)
-            end
-          }
-          @mtime = mtime
-        end
-      end
-
-      def flush(output=nil)
-        output ||= @path
-        tmp = Tempfile.new("htgroup", File::dirname(output))
-        begin
-          @group.keys.sort.each{|group|
-            tmp.puts(format("%s: %s", group, self.members(group).join(" ")))
-          }
-          tmp.close
-          File::rename(tmp.path, output)
-        rescue
-          tmp.close(true)
-        end
-      end
-
-      def members(group)
-        reload
-        @group[group] || []
-      end
-
-      def add(group, members)
-        @group[group] = members(group) | members
-      end
-    end
-  end
-end
diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb
deleted file mode 100644
index a4a80647d8..0000000000
--- a/lib/webrick/httpauth/htpasswd.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# httpauth/htpasswd -- Apache compatible htpasswd file
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: htpasswd.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
-
-require 'webrick/httpauth/userdb'
-require 'webrick/httpauth/basicauth'
-require 'tempfile'
-
-module WEBrick
-  module HTTPAuth
-    class Htpasswd
-      include UserDB
-
-      def initialize(path)
-        @path = path
-        @mtime = Time.at(0)
-        @passwd = Hash.new
-        @auth_type = BasicAuth
-        open(@path,"a").close unless File::exist?(@path)
-        reload
-      end
-
-      def reload
-        mtime = File::mtime(@path)
-        if mtime > @mtime
-          @passwd.clear
-          open(@path){|io|
-            while line = io.gets
-              line.chomp!
-              user, pass = line.split(":")
-              @passwd[user] = pass
-            end
-          }
-          @mtime = mtime
-        end
-      end
-
-      def flush(output=nil)
-        output ||= @path
-        tmp = Tempfile.new("htpasswd", File::dirname(output))
-        begin
-          each{|item| tmp.puts(item.join(":")) }
-          tmp.close
-          File::rename(tmp.path, output)
-        rescue
-          tmp.close(true)
-        end
-      end
-
-      def get_passwd(realm, user, reload_db)
-        reload() if reload_db
-        @passwd[user]
-      end
-
-      def set_passwd(realm, user, pass)
-        @passwd[user] = make_passwd(realm, user, pass)
-      end
-
-      def delete_passwd(realm, user)
-        @passwd.delete(user)
-      end
-
-      def each
-        @passwd.keys.sort.each{|user|
-          yield([user, @passwd[user]])
-        }
-      end
-    end
-  end
-end
diff --git a/lib/webrick/httpauth/userdb.rb b/lib/webrick/httpauth/userdb.rb
deleted file mode 100644
index 33e01405f4..0000000000
--- a/lib/webrick/httpauth/userdb.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# httpauth/userdb.rb -- UserDB mix-in module.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: userdb.rb,v 1.2 2003/02/20 07:15:48 gotoyuzo Exp $
-
-module WEBrick
-  module HTTPAuth
-    module UserDB
-      attr_accessor :auth_type # BasicAuth or DigestAuth
-
-      def make_passwd(realm, user, pass)
-        @auth_type::make_passwd(realm, user, pass)
-      end
-
-      def set_passwd(realm, user, pass)
-        self[user] = pass
-      end                             
-
-      def get_passwd(realm, user, reload_db=false)
-        # reload_db is dummy
-        make_passwd(realm, user, self[user])
-      end
-    end
-  end
-end
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
deleted file mode 100644
index c3bbbc54be..0000000000
--- a/lib/webrick/httpproxy.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-#
-# httpproxy.rb -- HTTPProxy Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2002 GOTO Kentaro
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpproxy.rb,v 1.18 2003/03/08 18:58:10 gotoyuzo Exp $
-# $kNotwork: straw.rb,v 1.3 2002/02/12 15:13:07 gotoken Exp $
-
-require "webrick/httpserver"
-require "net/http"
-
-Net::HTTP::version_1_2 if RUBY_VERSION < "1.7"
-
-module WEBrick
-  class HTTPProxyServer < HTTPServer
-    def initialize(config)
-      super
-      c = @config
-      @via = "#{c[:HTTPVersion]} #{c[:ServerName]}:#{c[:Port]}"
-    end
-
-    def service(req, res)
-      if req.request_method == "CONNECT"
-        proxy_connect(req, res)
-      elsif req.unparsed_uri =~ %r!^http://!
-        proxy_service(req, res)
-      else
-        super(req, res)
-      end
-    end
-
-    def proxy_auth(req, res)
-      if proc = @config[:ProxyAuthProc]
-        proc.call(req, res)
-      end
-      req.header.delete("proxy-authorization")
-    end
-
-    # Some header fields shuold not be transfered.
-    HopByHop = %w( connection keep-alive proxy-authenticate upgrade
-                   proxy-authorization te trailers transfer-encoding )
-    ShouldNotTransfer = %w( set-cookie proxy-connection )
-    def split_field(f) f ? f.split(/,\s+/).collect{|i| i.downcase } : [] end
-
-    def choose_header(src, dst)
-      connections = split_field(src['connection'])
-      src.each{|key, value|
-        key = key.downcase
-        if HopByHop.member?(key)          || # RFC2616: 13.5.1
-           connections.member?(key)       || # RFC2616: 14.10
-           ShouldNotTransfer.member?(key)    # pragmatics
-          @logger.debug("choose_header: `#{key}: #{value}'")
-          next
-        end
-        dst[key] = value
-      }
-    end
-
-    # Net::HTTP is stupid about the multiple header fields.
-    # Here is workaround:
-    def set_cookie(src, dst)
-      if str = src['set-cookie']
-        cookies = []
-        str.split(/,\s*/).each{|token|
-          if /^[^=]+;/o =~ token
-            cookies[-1] << ", " << token
-          elsif /=/o =~ token
-            cookies << token
-          else
-            cookies[-1] << ", " << token
-          end
-        }
-        dst.cookies.replace(cookies)
-      end
-    end
-
-    def set_via(h)
-      if @config[:ProxyVia]
-        if  h['via']
-          h['via'] << ", " << @via
-        else
-          h['via'] = @via
-        end
-      end
-    end
-
-    def proxy_uri(req, res)
-      @config[:ProxyURI]
-    end
-
-    def proxy_service(req, res)
-      # Proxy Authentication
-      proxy_auth(req, res)      
-
-      # Create Request-URI to send to the origin server
-      uri  = req.request_uri
-      path = uri.path.dup
-      path << "?" << uri.query if uri.query
-
-      # Choose header fields to transfer
-      header = Hash.new
-      choose_header(req, header)
-      set_via(header)
-
-      # select upstream proxy server
-      if proxy = proxy_uri(req, res)
-        proxy_host = proxy.host
-        proxy_port = proxy.port
-        if proxy.userinfo
-          credentials = "Basic " + encode64(proxy.userinfo)
-          header['proxy-authorization'] = credentials
-        end
-      end
-
-      response = nil
-      begin
-        http = Net::HTTP.new(uri.host, uri.port, proxy_host, proxy_port)
-        http.start{
-          if @config[:ProxyTimeout]
-            ##################################   these issues are 
-            http.open_timeout = 30   # secs  #   necessary (maybe bacause
-            http.read_timeout = 60   # secs  #   Ruby's bug, but why?)
-            ##################################
-          end
-          case req.request_method
-          when "GET"  then response = http.get(path, header)
-          when "POST" then response = http.post(path, req.body || "", header)
-          when "HEAD" then response = http.head(path, header)
-          else
-            raise HTTPStatus::MethodNotAllowed,
-              "unsupported method `#{req.request_method}'."
-          end
-        }
-      rescue => err
-        logger.debug("#{err.class}: #{err.message}")
-        raise HTTPStatus::ServiceUnavailable, err.message
-      end
-  
-      # Persistent connction requirements are mysterious for me.
-      # So I will close the connection in every response.
-      res['proxy-connection'] = "close"
-      res['connection'] = "close"
-
-      # Convert Net::HTTP::HTTPResponse to WEBrick::HTTPProxy
-      res.status = response.code.to_i
-      choose_header(response, res)
-      set_cookie(response, res)
-      set_via(res)
-      res.body = response.body
-
-      # Process contents
-      if handler = @config[:ProxyContentHandler]
-        handler.call(req, res)
-      end
-    end
-
-    def proxy_connect(req, res)
-      # Proxy Authentication
-      proxy_auth(req, res)
-
-      ua = Thread.current[:WEBrickSocket]  # User-Agent
-      raise HTTPStatus::InternalServerError,
-        "[BUG] cannot get socket" unless ua
-
-      host, port = req.unparsed_uri.split(":", 2)
-      # Proxy authentication for upstream proxy server
-      if proxy = proxy_uri(req, res)
-        proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
-        if proxy.userinfo
-          credentials = "Basic " + encode64(proxy.userinfo)
-        end
-        host, port = proxy.host, proxy.port
-      end
-
-      begin
-        @logger.debug("CONNECT: upstream proxy is `#{host}:#{port}'.")
-        os = TCPSocket.new(host, port)     # origin server
-
-        if proxy
-          @logger.debug("CONNECT: sending a Request-Line")
-          os << proxy_request_line << CRLF
-          @logger.debug("CONNECT: > #{proxy_request_line}")
-          if credentials
-            @logger.debug("CONNECT: sending a credentials")
-            os << "Proxy-Authorization: " << credentials << CRLF
-          end
-          os << CRLF
-          proxy_status_line = os.gets(LF)
-          @logger.debug("CONNECT: read a Status-Line form the upstream server")
-          @logger.debug("CONNECT: < #{proxy_status_line}")
-          if %r{^HTTP/\d+\.\d+\s+200\s*} =~ proxy_status_line
-            while line = os.gets(LF)
-              break if /\A(#{CRLF}|#{LF})\z/om =~ line
-            end
-          else
-            raise HTTPStatus::BadGateway
-          end
-        end
-        @logger.debug("CONNECT #{host}:#{port}: succeeded")
-        res.status = HTTPStatus::RC_OK
-      rescue => ex
-        @logger.debug("CONNECT #{host}:#{port}: failed `#{ex.message}'")
-        res.set_error(ex)
-        raise HTTPStatus::EOFError
-      ensure
-        res.send_response(ua)
-        access_log(@config, req, res)
-      end
-
-      begin
-        while fds = IO::select([ua, os])
-          if fds[0].member?(ua)
-            buf = ua.sysread(1024);
-            @logger.debug("CONNECT: #{buf.size} byte from User-Agent")
-            os.syswrite(buf)
-          elsif fds[0].member?(os)
-            buf = os.sysread(1024);
-            @logger.debug("CONNECT: #{buf.size} byte from #{host}:#{port}")
-            ua.syswrite(buf)
-          end
-        end
-      rescue => ex
-        os.close
-        @logger.debug("CONNECT #{host}:#{port}: closed")
-      end
-
-      raise HTTPStatus::EOFError
-    end
-
-    def do_OPTIONS(req, res)
-      res['allow'] = "GET,HEAD,POST,OPTIONS,CONNECT"
-    end
-  end
-end
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
deleted file mode 100644
index a25c9933c5..0000000000
--- a/lib/webrick/httprequest.rb
+++ /dev/null
@@ -1,339 +0,0 @@
-#
-# httprequest.rb -- HTTPRequest Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $
-
-require 'timeout'
-require 'uri'
-
-require 'webrick/httpversion'
-require 'webrick/httpstatus'
-require 'webrick/httputils'
-require 'webrick/cookie'
-
-module WEBrick
-
-  class HTTPRequest
-    BODY_CONTAINABLE_METHODS = [ "POST", "PUT" ]
-    BUFSIZE = 1024*4
-
-    # Request line
-    attr_reader :request_line
-    attr_reader :request_method, :unparsed_uri, :http_version
-
-    # Request-URI
-    attr_reader :request_uri, :host, :port, :path, :query_string
-    attr_accessor :script_name, :path_info
-
-    # Header and entity body
-    attr_reader :raw_header, :header, :cookies
-
-    # Misc
-    attr_accessor :user
-    attr_reader :addr, :peeraddr
-    attr_reader :attributes
-    attr_reader :keep_alive
-    attr_reader :request_time
-
-    def initialize(config)
-      @config = config
-      @logger = config[:Logger]
-
-      @request_line = @request_method =
-        @unparsed_uri = @http_version = nil
-
-      @request_uri = @host = @port = @path = nil
-      @script_name = @path_info = nil
-      @query_string = nil
-      @query = nil
-      @form_data = nil
-
-      @raw_header = Array.new
-      @header = nil
-      @cookies = []
-      @body = ""
-
-      @addr = @peeraddr = nil
-      @attributes = {}
-      @user = nil
-      @keep_alive = false
-      @request_time = nil
-
-      @remaining_size = nil
-      @socket = nil
-    end
-
-    def parse(socket=nil)
-      @socket = socket
-      begin
-        @peeraddr = socket.respond_to?(:peeraddr) ? socket.peeraddr : []
-        @addr = socket.respond_to?(:addr) ? socket.addr : []
-      rescue Errno::ENOTCONN
-        raise HTTPStatus::EOFError
-      end
-
-      read_request_line(socket)
-      if @http_version.major > 0
-        read_header(socket)
-        @header['cookie'].each{|cookie|
-          @cookies += Cookie::parse(cookie)
-        }
-      end
-      return if @request_method == "CONNECT"
-      return if @unparsed_uri == "*"
-
-      begin
-        @request_uri = parse_uri(@unparsed_uri)
-        @path = HTTPUtils::unescape(@request_uri.path)
-        @path = HTTPUtils::normalize_path(@path)
-        @host = @request_uri.host
-        @port = @request_uri.port
-        @query_string = @request_uri.query
-        @script_name = ""
-        @path_info = @path.dup
-      rescue
-        raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
-      end
-
-      if /close/io =~ self["connection"]
-        @keep_alive = false
-      elsif /keep-alive/io =~ self["connection"]
-        @keep_alive = true
-      elsif @http_version < "1.1"
-        @keep_alive = false
-      else
-        @keep_alive = true
-      end
-    end
-
-    def body(&block)
-      block ||= Proc.new{|chunk| @body << chunk }
-      read_body(@socket, block)
-      @body.empty? ? nil : @body
-    end
-
-    def query
-      unless @query
-        parse_query()
-      end
-      @query
-    end
-
-    def [](header_name)
-      if @header
-        value = @header[header_name.downcase]
-        value.empty? ? nil : value.join(", ")
-      end
-    end
-
-    def each
-      @header.each{|k, v|
-        value = @header[k]
-        yield(k, value.empty? ? nil : value.join(", "))
-      }
-    end
-
-    def keep_alive?
-      @keep_alive
-    end
-
-    def to_s
-      ret = @request_line.dup
-      @raw_header.each{|line| ret << line }
-      ret << CRLF
-      ret << body if body
-      ret
-    end
-
-    def fixup()
-      begin
-        body{|chunk| }   # read remaining body
-      rescue HTTPStatus::Error => ex
-        @logger.error("HTTPRequest#fixup: #{ex.class} occured.")
-        @keep_alive = false
-      rescue => ex
-        @logger.error(ex)
-        @keep_alive = false
-      end
-    end
-
-    def meta_vars
-      # This method provides the metavariables defined by the revision 3
-      # of ``The WWW Common Gateway Interface Version 1.1''.
-      # (http://Web.Golux.Com/coar/cgi/)
-
-      meta = Hash.new
-
-      cl = self["Content-Length"]
-      ct = self["Content-Type"]
-      meta["CONTENT_LENGTH"]    = cl if cl.to_i > 0
-      meta["CONTENT_TYPE"]      = ct.dup if ct
-      meta["GATEWAY_INTERFACE"] = "CGI/1.1"
-      meta["PATH_INFO"]         = @path_info.dup
-     #meta["PATH_TRANSLATED"]   = nil      # no plan to be provided
-      meta["QUERY_STRING"]      = @query_string ? @query_string.dup : ""
-      meta["REMOTE_ADDR"]       = @peeraddr[3]
-      meta["REMOTE_HOST"]       = @peeraddr[2]
-     #meta["REMOTE_IDENT"]      = nil      # no plan to be provided
-      meta["REMOTE_USER"]       = @user
-      meta["REQUEST_METHOD"]    = @request_method.dup
-      meta["REQUEST_URI"]       = @request_uri.to_s
-      meta["SCRIPT_NAME"]       = @script_name.dup
-      meta["SERVER_NAME"]       = @host
-      meta["SERVER_PORT"]       = @port.to_s
-      meta["SERVER_PROTOCOL"]   = "HTTP/" + @config[:HTTPVersion].to_s
-      meta["SERVER_SOFTWARE"]   = @config[:ServerSoftware].dup
-
-      self.each{|key, val|
-        name = "HTTP_" + key
-        name.gsub!(/-/o, "_")
-        name.upcase!
-        meta[name] = val
-      }
-
-      meta
-    end
-
-    private
-
-    def read_request_line(socket)
-      @request_line = read_line(socket) if socket
-      @request_time = Time.now
-      raise HTTPStatus::EOFError unless @request_line
-      if /^(\S+)\s+(\S+)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line
-        @request_method = $1
-        @unparsed_uri   = $2
-        @http_version   = HTTPVersion.new($3 ? $3 : "0.9")
-      else
-        rl = @request_line.sub(/\x0d?\x0a\z/o, '')
-        raise HTTPStatus::BadRequest, "bad Request-Line `#{rl}'."
-      end
-    end
-
-    def read_header(socket)
-      if socket
-        while line = read_line(socket)
-          break if /\A(#{CRLF}|#{LF})\z/om =~ line
-          @raw_header << line
-        end
-      end
-      begin
-        @header = HTTPUtils::parse_header(@raw_header)
-      rescue => ex
-        raise  HTTPStatus::BadRequest, ex.message
-      end
-    end
-
-    def parse_uri(str, scheme="http")
-      if @config[:Escape8bitURI]
-        str = HTTPUtils::escape8bit(str)
-      end
-      uri = URI::parse(str)
-      return uri if uri.absolute?
-      if self["host"]
-        host, port = self['host'].split(":", 2)
-      elsif @addr.size > 0
-        host, port = @addr[2], @addr[1]
-      else
-        host, port = @config[:ServerName], @config[:Port]
-      end
-      uri.scheme = scheme
-      uri.host = host
-      uri.port = port ? port.to_i : nil
-      return URI::parse(uri.to_s)
-    end
-
-    def read_body(socket, block)
-      return unless socket
-      if tc = self['transfer-encoding']
-        case tc
-        when /chunked/io then read_chunked(socket, block)
-        else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
-        end
-      elsif self['content-length'] || @remaining_size
-        @remaining_size ||= self['content-length'].to_i
-        while @remaining_size > 0 
-          sz = BUFSIZE < @remaining_size ? BUFSIZE : @remaining_size
-          break unless buf = read_data(socket, sz)
-          @remaining_size -= buf.size
-          block.call(buf)
-        end
-        if @remaining_size > 0 && @socket.eof?
-          raise HTTPStatus::BadRequest, "invalid body size."
-        end
-      elsif BODY_CONTAINABLE_METHODS.member?(@request_method)
-        raise HTTPStatus::LengthRequired
-      end
-      return @body
-    end
-
-    def read_chunk_size(socket)
-      line = read_line(socket)
-      if /^([0-9a-fA-F]+)(?:;(\S+))?/ =~ line
-        chunk_size = $1.hex
-        chunk_ext = $2
-        [ chunk_size, chunk_ext ]
-      else
-        raise HTTPStatus::BadRequest, "bad chunk `#{line}'."
-      end
-    end
-
-    def read_chunked(socket, block)
-      chunk_size, = read_chunk_size(socket)
-      while chunk_size > 0
-        data = read_data(socket, chunk_size) # read chunk-data
-        if data.nil? || data.size != chunk_size
-          raise BadRequest, "bad chunk data size."
-        end
-        read_line(socket)                    # skip CRLF
-        block.call(data)
-        chunk_size, = read_chunk_size(socket)
-      end
-      read_header(socket)                    # trailer + CRLF
-      @header.delete("transfer-encoding")
-      @remaining_size = 0
-    end
-
-    def _read_data(io, method, arg)
-      begin
-        timeout(@config[:RequestTimeout]){
-          return io.__send__(method, arg)
-        }
-      rescue Errno::ECONNRESET
-        return nil
-      rescue TimeoutError
-        raise HTTPStatus::RequestTimeout
-      end
-    end
-
-    def read_line(io)
-      _read_data(io, :gets, LF)
-    end
-
-    def read_data(io, size)
-      _read_data(io, :read, size)
-    end
-
-    def parse_query()
-      begin
-        if @request_method == "GET" || @request_method == "HEAD"
-          @query = HTTPUtils::parse_query(@query_string)
-        elsif self['content-type'] =~ /^application\/x-www-form-urlencoded/
-          @query = HTTPUtils::parse_query(body)
-        elsif self['content-type'] =~ /^multipart\/form-data; boundary=(.+)/
-          boundary = HTTPUtils::dequote($1)
-          @query = HTTPUtils::parse_form_data(body, boundary)
-        else
-          @query = Hash.new
-        end
-      rescue => ex
-        raise HTTPStatus::BadRequest, ex.message
-      end
-    end
-  end
-end
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
deleted file mode 100644
index 6b00c2b88b..0000000000
--- a/lib/webrick/httpresponse.rb
+++ /dev/null
@@ -1,304 +0,0 @@
-#
-# httpresponse.rb -- HTTPResponse Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpresponse.rb,v 1.45 2003/07/11 11:02:25 gotoyuzo Exp $
-
-require 'time'
-require 'webrick/httpversion'
-require 'webrick/htmlutils'
-require 'webrick/httputils'
-require 'webrick/httpstatus'
-
-module WEBrick
-  class HTTPResponse
-    BUFSIZE = 1024*4
-
-    attr_reader :http_version, :status, :header
-    attr_reader :cookies
-    attr_accessor :reason_phrase
-    attr_accessor :body
-
-    attr_accessor :request_method, :request_uri, :request_http_version
-    attr_accessor :filename
-    attr_reader :config, :keep_alive, :sent_size
-
-    def initialize(config)
-      @config = config
-      @logger = config[:Logger]
-      @header = Hash.new
-      @status = HTTPStatus::RC_OK
-      @reason_phrase = nil
-      @http_version = HTTPVersion::convert(@config[:HTTPVersion])
-      @body = ''
-      @keep_alive = true
-      @cookies = []
-      @request_method = nil
-      @request_uri = nil
-      @request_http_version = @http_version  # temporary
-      @chunked = false
-      @filename = nil
-      @sent_size = 0
-    end
-
-    def status_line
-      "HTTP/#@http_version #@status #@reason_phrase #{CRLF}"
-    end
-
-    def status=(status)
-      @status = status
-      @reason_phrase = HTTPStatus::reason_phrase(status)
-    end
-
-    def [](field)
-      @header[field.downcase]
-    end
-
-    def []=(field, value)
-      @header[field.downcase] = value.to_s
-    end
-
-    def each
-      @header.each{|k, v|  yield(k, v) }
-    end
-
-    def chunked?
-      @chunked
-    end
-
-    def chunked=(val)
-      @chunked = val ? true : false
-    end
-
-    def keep_alive?
-      @keep_alive
-    end
-
-    def send_response(socket)
-      begin
-        setup_header()
-        send_header(socket)
-        send_body(socket)
-      rescue Errno::EPIPE
-        @logger.error("HTTPResponse#send_response: EPIPE occured.")
-        @keep_alive = false
-      rescue => ex
-        @logger.error(ex)
-        @keep_alive = false
-      end
-    end
-
-    def setup_header()
-      @reason_phrase    ||= HTTPStatus::reason_phrase(@status)
-      @header['server'] ||= @config[:ServerSoftware]
-      @header['date']   ||= Time.now.httpdate
-
-      # HTTP/0.9 features
-      if @request_http_version < "1.0"
-        @http_version = HTTPVersion.new("0.9")
-        @keep_alive = false
-      end
-
-      # HTTP/1.0 features
-      if @request_http_version < "1.1"
-        if chunked?
-          @chunked = false
-          ver = @request_http_version.to_s
-          msg = "chunked is set for an HTTP/#{ver} request. (ignored)"
-          @logger.warn(msg)
-        end
-      end
-
-      # Determin the message length (RFC2616 -- 4.4 Message Length)
-      if @status == 304 || @status == 204 || HTTPStatus::info?(@status)
-        @header.delete('content-length')
-        @body = ""
-      elsif chunked?
-        @header["transfer-encoding"] = "chunked"
-        @header.delete('content-length')
-      elsif %r{^multipart/byteranges} =~ @header['content-type']
-        @header.delete('content-length')
-      elsif @header['content-length'].nil?
-        unless @body.is_a?(IO)
-          @header['content-length'] = @body ? @body.size : 0
-        end
-      end
-
-      # Keep-Alive connection.
-      if @header['connection'] == "close"
-         @keep_alive = false
-      end
-      if keep_alive?
-        if chunked? || @header['content-length']
-          @header['connection'] = "Keep-Alive"
-        end
-      end
-
-      # Location is a single absoluteURI.
-      if location = @header['location']
-        if @request_uri
-          @header['location'] = @request_uri.merge(location)
-        end
-      end
-    end
-
-    def send_header(socket)
-      if @http_version.major > 0
-        data = status_line()
-        @header.each{|key, value|
-          tmp = key.gsub(/\bwww|^te$|\b\w/){|s| s.upcase }
-          data << "#{tmp}: #{value}" << CRLF
-        }
-        @cookies.each{|cookie|
-          data << "Set-Cookie: " << cookie.to_s << CRLF
-        }
-        data << CRLF
-        _write_data(socket, data)
-      end
-    end
-
-    def send_body(socket)
-      case @body
-      when IO then send_body_io(socket)
-      else send_body_string(socket)
-      end
-    end
-
-    def to_s
-      ret = ""
-      send_response(ret)
-      ret
-    end
-
-    def set_redirect(status, url)
-      @body = "<HTML><A HREF=\"#{url.to_s}\">#{url.to_s}</A>.</HTML>\n"
-      @header['location'] = url.to_s
-      raise status
-    end
-
-    def set_error(ex, backtrace=false)
-      case ex
-      when HTTPStatus::Status 
-        @keep_alive = false if HTTPStatus::error?(ex.code)
-        self.status = ex.code
-      else 
-        @keep_alive = false
-        self.status = HTTPStatus::RC_INTERNAL_SERVER_ERROR
-      end
-      @header['content-type'] = "text/html"
-
-      if respond_to?(:create_error_page)
-        create_error_page()
-        return
-      end
-
-      if @request_uri
-        host, port = @request_uri.host, @request_uri.port
-      else
-        host, port = @config[:ServerName], @config[:Port]
-      end
-
-      @body = ''
-      @body << <<-_end_of_html_
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-  <HEAD><TITLE>#{HTMLUtils::escape(@reason_phrase)}</TITLE></HEAD>
-  <BODY>
-    <H1>#{HTMLUtils::escape(@reason_phrase)}</H1>
-    #{HTMLUtils::escape(ex.message)}
-    <HR>
-      _end_of_html_
-
-      if backtrace && $DEBUG
-        @body << "backtrace of `#{HTMLUtils::escape(ex.class.to_s)}' "
-        @body << "#{HTMLUtils::escape(ex.message)}"
-        @body << "<PRE>"
-        ex.backtrace.each{|line| @body << "\t#{line}\n"}
-        @body << "</PRE><HR>"
-      end
-
-      @body << <<-_end_of_html_
-    <ADDRESS>
-     #{HTMLUtils::escape(@config[:ServerSoftware])} at
-     #{host}:#{port}
-    </ADDRESS>
-  </BODY>
-</HTML>
-      _end_of_html_
-    end
-
-    private
-
-    def send_body_io(socket)
-      if @request_method == "HEAD"
-        # do nothing
-      elsif chunked?
-        while buf = @body.read(BUFSIZE)
-          next if buf.empty?
-          data = ""
-          data << format("%x", buf.size) << CRLF
-          data << buf << CRLF
-          _write_data(socket, data)
-          @sent_size += buf.size
-        end
-        _write_data(socket, "0#{CRLF}#{CRLF}")
-      else
-        size = @header['content-length'].to_i
-        _send_file(socket, @body, 0, size.to_i)
-        @sent_size = size
-      end
-      @body.close
-    end
-
-    def send_body_string(socket)
-      if @request_method == "HEAD"
-        # do nothing
-      elsif chunked?
-        remain = body ? @body.size : 0
-        while buf = @body[@sent_size, BUFSIZE]
-          break if buf.empty?
-          data = ""
-          data << format("%x", buf.size) << CRLF
-          data << buf << CRLF
-          _write_data(socket, data)
-          @sent_size += buf.size
-        end
-        _write_data(socket, "0#{CRLF}#{CRLF}")
-      else
-        if @body && @body.size > 0
-          _write_data(socket, @body)
-          @sent_size = @body.size
-        end
-      end
-    end
-
-    def _send_file(output, input, offset, size)
-      while offset > 0
-        sz = BUFSIZE < offset ? BUFSIZE : offset
-        buf = input.read(sz)
-        offset -= buf.size
-      end
-
-      if size == 0
-        while buf = input.read(BUFSIZE)
-          _write_data(output, buf)
-        end
-      else
-        while size > 0
-          sz = BUFSIZE < size ? BUFSIZE : size
-          buf = input.read(sz)
-          _write_data(output, buf)
-          size -= buf.size
-        end
-      end
-    end
-
-    def _write_data(socket, data)
-      socket << data
-    end
-  end
-end
diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb
deleted file mode 100644
index 4e44cfab32..0000000000
--- a/lib/webrick/https.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# https.rb -- SSL/TLS enhancement for HTTPServer
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: https.rb,v 1.15 2003/07/22 19:20:42 gotoyuzo Exp $
-
-require 'webrick/ssl'
-
-module WEBrick
-  module Config
-    HTTP.update(SSL)
-  end
-
-  class HTTPRequest
-    attr_reader :cipher, :server_cert, :client_cert
-
-    alias orig_parse parse
-
-    def parse(socket=nil)
-      if socket && socket.is_a?(OpenSSL::SSL::SSLSocket)
-        @server_cert = @config[:SSLCertificate]
-        @client_cert = socket.peer_cert
-        @cipher      = socket.cipher
-      end
-      orig_parse(socket)
-    end
-
-    alias orig_parse_uri parse_uri
-
-    def parse_uri(str, scheme="https")
-      if @server_cert
-        return orig_parse_uri(str, scheme)
-      end
-      return orig_parse_uri(str)
-    end
-
-    alias orig_meta_vars meta_vars
-
-    def meta_vars
-      meta = orig_meta_vars
-      if @server_cert
-        meta["HTTPS"] = "on"
-        meta["SSL_SERVER_CERT"] = @server_cert.to_pem
-        meta["SSL_CLIENT_CERT"] = @client_cert ? @client_cert.to_pem : ""
-        meta["SSL_CIPHER"] = @cipher[0]
-      end
-      meta
-    end
-  end
-end
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
deleted file mode 100644
index cb5cd2af2f..0000000000
--- a/lib/webrick/httpserver.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-#
-# httpserver.rb -- HTTPServer Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpserver.rb,v 1.63 2002/10/01 17:16:32 gotoyuzo Exp $
-
-require 'webrick/server'
-require 'webrick/httputils'
-require 'webrick/httpstatus'
-require 'webrick/httprequest'
-require 'webrick/httpresponse'
-require 'webrick/httpservlet'
-require 'webrick/accesslog'
-
-module WEBrick
-  class HTTPServerError < ServerError; end
-
-  class HTTPServer < ::WEBrick::GenericServer
-    def initialize(config={}, default=Config::HTTP)
-      super
-      @http_version = HTTPVersion::convert(@config[:HTTPVersion])
-
-      @mount_tab = MountTable.new
-      if @config[:DocumentRoot]
-        mount("/", HTTPServlet::FileHandler, @config[:DocumentRoot],
-              @config[:DocumentRootOptions])
-      end
-
-      unless @config[:AccessLog]
-        @config[:AccessLog] = [
-          [ $stderr, AccessLog::COMMON_LOG_FORMAT ],
-          [ $stderr, AccessLog::REFERER_LOG_FORMAT ]
-        ]
-      end
-    end
-
-    def run(sock)
-      while true 
-        res = HTTPResponse.new(@config)
-        req = HTTPRequest.new(@config)
-        begin
-          req.parse(sock)
-          res.request_method = req.request_method
-          res.request_uri = req.request_uri
-          res.request_http_version = req.http_version
-          if handler = @config[:RequestHandler]
-            handler.call(req, res)
-          end
-          service(req, res)
-        rescue HTTPStatus::EOFError, HTTPStatus::RequestTimeout => ex
-          res.set_error(ex)
-        rescue HTTPStatus::Error => ex
-          res.set_error(ex)
-        rescue HTTPStatus::Status => ex
-          res.status = ex.code
-        rescue StandardError => ex
-          @logger.error(ex)
-          res.set_error(ex, true)
-        ensure
-          if req.request_line
-            req.fixup()
-            res.send_response(sock)
-            access_log(@config, req, res)
-          end
-        end
-        break if @http_version < "1.1"
-        break unless req.keep_alive?
-        break unless res.keep_alive?
-      end
-    end
-
-    def service(req, res)
-      if req.unparsed_uri == "*"
-        if req.request_method == "OPTIONS"
-          do_OPTIONS(req, res)
-          raise HTTPStatus::OK
-        end
-        raise HTTPStatus::NotFound, "`#{req.unparsed_uri}' not found."
-      end
-
-      servlet, options, script_name, path_info = search_servlet(req.path)
-      raise HTTPStatus::NotFound, "`#{req.path}' not found." unless servlet
-      req.script_name = script_name
-      req.path_info = path_info
-      si = servlet.get_instance(self, *options)
-      @logger.debug(format("%s is invoked.", si.class.name))
-      si.service(req, res)
-    end
-
-    def do_OPTIONS(req, res)
-      res["allow"] = "GET,HEAD,POST,OPTIONS"
-    end
-
-    def mount(dir, servlet, *options)
-      @logger.debug(sprintf("%s is mounted on %s.", servlet.inspect, dir))
-      @mount_tab[dir] = [ servlet, options ]
-    end
-
-    def mount_proc(dir, proc=nil, &block)
-      proc ||= block
-      raise HTTPServerError, "must pass a proc or block" unless proc
-      mount(dir, HTTPServlet::ProcHandler.new(proc))
-    end
-
-    def unmount(dir)
-      @logger.debug(sprintf("unmount %s.", inspect, dir))
-      @mount_tab.delete(dir)
-    end
-    alias umount unmount
-
-    def search_servlet(path)
-      script_name, path_info = @mount_tab.scan(path)
-      servlet, options = @mount_tab[script_name]
-      if servlet
-        [ servlet, options, script_name, path_info ]
-      end
-    end
-
-    def access_log(config, req, res)
-      param = AccessLog::setup_params(config, req, res)
-      @config[:AccessLog].each{|logger, fmt|
-        logger << AccessLog::format(fmt+"\n", param)
-      }
-    end
-
-    class MountTable
-      def initialize
-        @tab = Hash.new
-        compile
-      end
-
-      def [](dir)
-        dir = normalize(dir)
-        @tab[dir]
-      end
-
-      def []=(dir, val)
-        dir = normalize(dir)
-        @tab[dir] = val
-        compile
-        val
-      end
-
-      def delete(dir)
-        dir = normalize(dir)
-        res = @tab.delete(dir)
-        compile
-        res
-      end
-
-      def scan(path)
-        @scanner =~ path
-        [ $&, $' ]
-      end
-
-      private
-
-      def compile
-        k = @tab.keys
-        k.sort!
-        k.reverse!
-        k.collect!{|path| Regexp.escape(path) }
-        @scanner = Regexp.new("^(" + k.join("|") +")(?=/|$)")
-      end
-
-      def normalize(dir)
-        ret = dir ? dir.dup : ""
-        ret.sub!(%r|/+$|, "")
-        ret
-      end
-    end
-  end
-end
diff --git a/lib/webrick/httpservlet.rb b/lib/webrick/httpservlet.rb
deleted file mode 100644
index ac7c022bd7..0000000000
--- a/lib/webrick/httpservlet.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# httpservlet.rb -- HTTPServlet Utility File
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpservlet.rb,v 1.21 2003/02/23 12:24:46 gotoyuzo Exp $
-
-require 'webrick/httpservlet/abstract'
-require 'webrick/httpservlet/filehandler'
-require 'webrick/httpservlet/cgihandler'
-require 'webrick/httpservlet/erbhandler'
-require 'webrick/httpservlet/prochandler'
-
-module WEBrick
-  module HTTPServlet
-    FileHandler.add_handler("cgi", CGIHandler)
-    FileHandler.add_handler("rhtml", ERBHandler)
-  end
-end
diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb
deleted file mode 100644
index 03861e8fc7..0000000000
--- a/lib/webrick/httpservlet/abstract.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# httpservlet.rb -- HTTPServlet Module
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $
-
-require 'thread'
-
-require 'webrick/htmlutils'
-require 'webrick/httputils'
-require 'webrick/httpstatus'
-
-module WEBrick
-  module HTTPServlet
-    class HTTPServletError < StandardError; end
-
-    class AbstractServlet
-      def self.get_instance(config, *options)
-        self.new(config, *options)
-      end
-
-      def initialize(server, *options)
-        @server = @config = server
-        @logger = @server[:Logger]
-        @options = options
-      end
-
-      def service(req, res)
-        method_name = "do_" + req.request_method.gsub(/-/, "_")
-        if respond_to?(method_name)
-          __send__(method_name, req, res)
-        else
-          raise HTTPStatus::MethodNotAllowed,
-                "unsupported method `#{req.request_method}'."
-        end
-      end
-
-      def do_GET(req, res)
-        raise HTTPStatus::NotFound, "not found."
-      end
-
-      def do_HEAD(req, res)
-        do_GET(req, res)
-      end
-
-      def do_OPTIONS(req, res)
-        m = self.methods.grep(/^do_[A-Z]+$/)
-        m.collect!{|i| i.sub(/do_/, "") }
-        m.sort!
-        res["allow"] = m.join(",")
-      end
-
-      private
-
-      def redirect_to_directory_uri(req, res)
-        if req.path[-1] != ?/
-          location = req.path + "/"
-          if req.query_string && req.query_string.size > 0
-            location << "?" << req.query_string
-          end
-          res.set_redirect(HTTPStatus::MovedPermanently, location)
-        end
-      end
-    end
-
-  end
-end
diff --git a/lib/webrick/httpservlet/cgi_runner.rb b/lib/webrick/httpservlet/cgi_runner.rb
deleted file mode 100644
index 1069a68d58..0000000000
--- a/lib/webrick/httpservlet/cgi_runner.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# cgi_runner.rb -- CGI launcher.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: cgi_runner.rb,v 1.9 2002/09/25 11:33:15 gotoyuzo Exp $
-
-def sysread(io, size)
-  buf = ""
-  while size > 0
-    tmp = io.sysread(size)
-    buf << tmp
-    size -= tmp.size
-  end
-  return buf
-end
-
-STDIN.binmode
-
-buf = ""
-len = sysread(STDIN, 8).to_i
-out = sysread(STDIN, len)
-STDOUT.reopen(open(out, "w"))
-
-len = sysread(STDIN, 8).to_i
-err = sysread(STDIN, len)
-STDERR.reopen(open(err, "w"))
-
-len  = sysread(STDIN, 8).to_i
-dump = sysread(STDIN, len)
-hash = Marshal.restore(dump)
-ENV.keys.each{|name| ENV.delete(name) }
-hash.each{|k, v| ENV[k] = v if v }
-
-dir = File::dirname(ENV["SCRIPT_FILENAME"])
-Dir::chdir dir
-
-if interpreter = ARGV[0]
-  exec(interpreter, ENV["SCRIPT_FILENAME"])
-  # NOTREACHED
-end
-exec ENV["SCRIPT_FILENAME"]
diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb
deleted file mode 100644
index aa92bb4a2c..0000000000
--- a/lib/webrick/httpservlet/cgihandler.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# 
-# cgihandler.rb -- CGIHandler Class
-#       
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#   
-# $IPR: cgihandler.rb,v 1.27 2003/03/21 19:56:01 gotoyuzo Exp $
-
-require 'rbconfig'
-require 'tempfile'
-require 'webrick/config'
-require 'webrick/httpservlet/abstract'
-
-module WEBrick
-  module HTTPServlet
-
-    class CGIHandler < AbstractServlet
-      Ruby = File::join(::Config::CONFIG['bindir'],
-                        ::Config::CONFIG['ruby_install_name'])
-      Ruby << ::Config::CONFIG['EXEEXT']
-      CGIRunner = "\"#{Ruby}\" \"#{Config::LIBDIR}/httpservlet/cgi_runner.rb\""
-
-      def initialize(server, name)
-        super
-        @script_filename = name
-        @tempdir = server[:TempDir]
-        @cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}"
-      end
-
-      def do_GET(req, res)
-        data = nil
-        status = -1
-
-        cgi_in = IO::popen(@cgicmd, "wb")
-        cgi_out = Tempfile.new("webrick.cgiout.", @tempdir)
-        cgi_err = Tempfile.new("webrick.cgierr.", @tempdir)
-        begin
-          cgi_in.sync = true
-          meta = req.meta_vars
-          meta["SCRIPT_FILENAME"] = @script_filename
-          meta["PATH"] = @config[:CGIPathEnv]
-          dump = Marshal.dump(meta)
-
-          cgi_in.write("%8d" % cgi_out.path.size)
-          cgi_in.write(cgi_out.path)
-          cgi_in.write("%8d" % cgi_err.path.size)
-          cgi_in.write(cgi_err.path)
-          cgi_in.write("%8d" % dump.size)
-          cgi_in.write(dump)
-
-          if req.body and req.body.size > 0
-            cgi_in.write(req.body)
-          end
-        ensure
-          cgi_in.close
-          status = $? >> 8
-          sleep 0.1 if /mswin/ =~ RUBY_PLATFORM
-          data = cgi_out.read
-          cgi_out.close(true)
-          if errmsg = cgi_err.read
-            if errmsg.size > 0
-              @logger.error("CGIHandler: #{@script_filename}:\n" + errmsg)
-            end
-          end 
-          cgi_err.close(true)
-        end
-        
-        if status != 0
-          @logger.error("CGIHandler: #{@script_filename} exit with #{status}")
-        end
-
-        data = "" unless data
-        raw_header, body = data.split(/^[\xd\xa]+/on, 2) 
-        raise HTTPStatus::InternalServerError,
-          "The server encontered a script error." if body.nil?
-
-        begin
-          header = HTTPUtils::parse_header(raw_header)
-          if /^(\d+)/ =~ header['status'][0]
-            res.status = $1.to_i
-            header.delete('status')
-          end
-          header.each{|key, val| res[key] = val.join(", ") }
-        rescue => ex
-          raise HTTPStatus::InternalServerError, ex.message
-        end
-        res.body = body
-      end
-      alias do_POST do_GET
-    end
-
-  end
-end
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
deleted file mode 100644
index 40b7a57610..0000000000
--- a/lib/webrick/httpservlet/erbhandler.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# 
-# erbhandler.rb -- ERBHandler Class
-# 
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-# 
-# $IPR: erbhandler.rb,v 1.25 2003/02/24 19:25:31 gotoyuzo Exp $
-
-require 'webrick/httpservlet/abstract.rb'
-
-require 'erb'
-
-module WEBrick
-  module HTTPServlet
-
-    class ERBHandler < AbstractServlet
-      def initialize(server, name)
-        super
-        @script_filename = name
-      end
-
-      def do_GET(req, res)
-        unless defined?(ERB)
-          @logger.warn "#{self.class}: ERB not defined."
-          raise HTTPStatus::Forbidden, "ERBHandler cannot work."
-        end
-        begin
-          data = open(@script_filename){|io| io.read }
-          res.body = evaluate(ERB.new(data), req, res)
-          res['content-type'] = "text/html"
-        rescue StandardError => ex
-          raise
-        rescue Exception => ex
-          @logger.error(ex)
-          raise HTTPStatus::InternalServerError, ex.message
-        end
-      end
-
-      alias do_POST do_GET
-
-      private
-      def evaluate(erb, servlet_request, servlet_response)
-        Module.new.module_eval{
-          meta_vars = servlet_request.meta_vars
-          query = servlet_request.query
-          erb.result(binding)
-        }
-      end
-    end
-  end
-end
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
deleted file mode 100644
index 9e1a439b14..0000000000
--- a/lib/webrick/httpservlet/filehandler.rb
+++ /dev/null
@@ -1,330 +0,0 @@
-#
-# filehandler.rb -- FileHandler Module
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: filehandler.rb,v 1.44 2003/06/07 01:34:51 gotoyuzo Exp $
-
-require 'thread'
-require 'time'
-
-require 'webrick/htmlutils'
-require 'webrick/httputils'
-require 'webrick/httpstatus'
-
-module WEBrick
-  module HTTPServlet
-
-    class DefaultFileHandler < AbstractServlet
-      def initialize(server, local_path)
-        super
-        @local_path = local_path
-      end
-
-      def do_GET(req, res)
-        st = File::stat(@local_path)
-        mtime = st.mtime
-        res['etag'] = sprintf("%x-%x-%x", st.ino, st.size, st.mtime.to_i)
-
-        if not_modified?(req, res, mtime, res['etag'])
-          res.body = ''
-          raise HTTPStatus::NotModified
-        elsif req['range'] 
-          make_partial_content(req, res, @local_path, st.size)
-          raise HTTPStatus::PartialContent
-        else
-          mtype = HTTPUtils::mime_type(@local_path, @config[:MimeTypes])
-          res['content-type'] = mtype
-          res['content-length'] = st.size
-          res['last-modified'] = mtime.httpdate
-          res.body = open(@local_path, "rb")
-        end
-      end
-
-      def not_modified?(req, res, mtime, etag)
-        if ir = req['if-range']
-          begin
-            if Time.httpdate(ir) >= mtime
-              return true
-            end
-          rescue
-            if HTTPUtils::split_header_valie(ir).member?(res['etag'])
-              return true
-            end
-          end
-        end
-
-        if (ims = req['if-modified-since']) && Time.parse(ims) >= mtime
-          return true
-        end
-
-        if (inm = req['if-none-match']) &&
-           HTTPUtils::split_header_value(inm).member?(res['etag'])
-          return true
-        end
-
-        return false
-      end
-
-      def make_partial_content(req, res, filename, filesize)
-        mtype = HTTPUtils::mime_type(filename, @config[:MimeTypes])
-        unless ranges = HTTPUtils::parse_range_header(req['range'])
-          raise BadRequest, "Unrecognized range-spec: \"#{range}\""
-        end
-        open(filename, "rb"){|io|
-          if ranges.size > 1
-            boundary = "#{time.sec}_#{time.usec}_#{Process::pid}"
-            body = ''
-            ranges.each{|r|
-              first, last = prepare_range(range, filesize)
-              next if first < 0
-              io.pos = first
-              content = io.read(last-first+1)
-              body << "--" << boundary << CRLF
-              body << "Content-Type: #{mtype}" << CRLF
-              body << "Content-Range: #{first}-#{last}/#{filesize}" << CRLF
-              body << CRLF
-              body << content
-              body << CRLF
-            }
-            raise HTTPStatus::RequestRangeNotSatisfiable if body.empty?
-            body << "--" << boundary << "--" << CRLF
-          elsif range = ranges[0]
-            first, last = prepare_range(range, filesize)
-            raise HTTPStatus::RequestRangeNotSatisfiable if first < 0
-            if last == filesize - 1
-              content = io.dup
-              content.pos = first
-            else
-              io.pos = first
-              content = io.read(last-first+1)
-            end
-            res['content-type'] = mtype
-            res['content-range'] = "#{first}-#{last}/#{filesize}"
-            res['content-length'] = last - first + 1
-            res.body = content
-          else
-            raise HTTPStatus::BadRequest
-          end
-        }
-      end
-
-      def prepare_range(range, filesize)
-        first = range.first < 0 ? filesize + range.first : range.first
-        return -1, -1 if first < 0 || first >= filesize
-        last = range.last < 0 ? filesize + range.last : range.last
-        last = filesize - 1 if last >= filesize
-        return first, last
-      end
-    end
-
-    class FileHandler < AbstractServlet
-      HandlerTable = Hash.new(DefaultFileHandler)
-
-      def self.add_handler(suffix, handler)
-        HandlerTable[suffix] = handler
-      end
-
-      def self.remove_handler(suffix)
-        HandlerTable.delete(suffix)
-      end
-
-      def initialize(server, root, options={}, default=Config::FileHandler)
-        @config = server.config
-        @logger = @config[:Logger]
-        @root = root
-        if options == true || options == false
-          options = { :FancyIndexing => options }
-        end
-        @options = default.dup.update(options)
-      end
-
-      def service(req, res)
-        # if this class is mounted on "/" and /~username is requested.
-        # we're going to override path informations before invoking service.
-        if defined?(Etc) && @options[:UserDir] && req.script_name.empty?
-          if %r|^(/~([^/]+))| =~ req.path_info
-            script_name, user = $1, $2
-            path_info = $'
-            begin
-              passwd = Etc::getpwnam(user)
-              @root = File::join(passwd.dir, @options[:UserDir])
-              req.script_name = script_name
-              req.path_info = path_info
-            rescue
-              @logger.debug "#{self.class}#do_GET: getpwnam(#{user}) failed"
-            end
-          end
-        end
-        super(req, res)
-      end
-
-      def do_GET(req, res)
-        unless exec_handler(req, res)
-          set_dir_list(req, res)
-        end
-      end
-
-      def do_POST(req, res)
-        unless exec_handler(req, res)
-          raise HTTPStatus::NotFound, "`#{req.path}' not found."
-        end
-      end
-
-      def do_OPTIONS(req, res)
-        unless exec_handler(req, res)
-          super(req, res)
-        end
-      end
-
-      # ToDo
-      # RFC2518: HTTP Extensions for Distributed Authoring -- WEBDAV
-      #
-      # PROPFIND PROPPATCH MKCOL DELETE PUT COPY MOVE
-      # LOCK UNLOCK
-
-      # RFC3253: Versioning Extensions to WebDAV
-      #          (Web Distributed Authoring and Versioning)
-      #
-      # VERSION-CONTROL REPORT CHECKOUT CHECK_IN UNCHECKOUT
-      # MKWORKSPACE UPDATE LABEL MERGE ACTIVITY
-
-      private
-
-      def exec_handler(req, res)
-        raise HTTPStatus::NotFound, "`#{req.path}' not found" unless @root
-        if set_filename(req, res)
-          suffix = (/\.(\w+)$/ =~ res.filename) && $1
-          handler = @options[:HandlerTable][suffix] || HandlerTable[suffix]
-          call_callback(:HandlerCallback, req, res)
-          h = handler.get_instance(@config, res.filename)
-          h.service(req, res)
-          return true
-        end
-        call_callback(:HandlerCallback, req, res)
-        return false
-      end
-
-      def set_filename(req, res)
-        handler = nil
-        res.filename = @root.dup
-        path_info = req.path_info.scan(%r|/[^/]*|)
-
-        while name = path_info.shift
-          if name == "/"
-            indices = @config[:DirectoryIndex]
-            index = indices.find{|i| FileTest::file?("#{res.filename}/#{i}") }
-            name = "/#{index}" if index
-          end
-          res.filename << name
-          req.script_name << name
-          req.path_info = path_info.join
-
-          if File::fnmatch("/#{@options[:NondisclosureName]}", name)
-            @logger.log(Log::WARN,
-               "the request refers nondisclosure name `#{name}'.")
-            raise HTTPStatus::Forbidden, "`#{req.path}' not found."
-          end
-          st = (File::stat(res.filename) rescue nil)
-          raise HTTPStatus::NotFound, "`#{req.path}' not found." unless st
-          raise HTTPStatus::Forbidden,
-            "no access permission to `#{req.path}'." unless st.readable?
-
-          if st.directory?
-            call_callback(:DirectoryCallback, req, res)
-          else
-            call_callback(:FileCallback, req, res)
-            return true
-          end
-        end
-        return false
-      end
-
-      def call_callback(callback_name, req, res)
-        if cb = @options[callback_name]
-          cb.call(req, res)
-        end
-      end
-
-      def set_dir_list(req, res)
-        redirect_to_directory_uri(req, res)
-        unless @options[:FancyIndexing]
-          raise HTTPStatus::Forbidden, "no access permission to `#{req.path}'"
-        end
-        local_path = res.filename
-        list = Dir::entries(local_path).collect{|name|
-          next if name == "." || name == ".."
-          next if File::fnmatch(@options[:NondisclosureName], name)
-          st = (File::stat(local_path + name) rescue nil)
-          if st.nil?
-            [ name, nil, -1 ]
-          elsif st.directory?
-            [ name + "/", st.mtime, -1 ]
-          else
-            [ name, st.mtime, st.size ]
-          end
-        }
-        list.compact!
-
-        if    d0 = req.query["N"]; idx = 0
-        elsif d0 = req.query["M"]; idx = 1
-        elsif d0 = req.query["S"]; idx = 2
-        else  d0 = "A"           ; idx = 0
-        end
-        d1 = (d0 == "A") ? "D" : "A"
-
-        if d0 == "A"
-          list.sort!{|a,b| a[idx] <=> b[idx] }
-        else
-          list.sort!{|a,b| b[idx] <=> a[idx] }
-        end
-
-        res['content-type'] = "text/html"
-
-        res.body = <<-_end_of_html_
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-  <HEAD><TITLE>Index of #{HTMLUtils::escape(req.path)}</TITLE></HEAD>
-  <BODY>
-    <H1>Index of #{HTMLUtils::escape(req.path)}</H1>
-        _end_of_html_
-
-        res.body << "<PRE>\n"
-        res.body << " <A HREF=\"?N=#{d1}\">Name</A>                          "
-        res.body << "<A HREF=\"?M=#{d1}\">Last modified</A>         "
-        res.body << "<A HREF=\"?S=#{d1}\">Size</A>\n"
-        res.body << "<HR>\n"
-       
-        list.unshift [ "..", File::mtime(local_path+".."), -1 ]
-        list.each{ |name, time, size|
-          if name == ".."
-            dname = "Parent Directory"
-          elsif name.size > 25
-            dname = name.sub(/^(.{23})(.*)/){ $1 + ".." }
-          else
-            dname = name
-          end
-          s =  " <A HREF=\"#{HTTPUtils::escape(name)}\">#{dname}</A>"
-          s << " " * (30 - dname.size)
-          s << (time ? time.strftime("%Y/%m/%d %H:%M      ") : " " * 22)
-          s << (size >= 0 ? size.to_s : "-") << "\n"
-          res.body << s
-        }
-        res.body << "</PRE><HR>"
-
-        res.body << <<-_end_of_html_    
-    <ADDRESS>
-     #{HTMLUtils::escape(@config[:ServerSoftware])}<BR>
-     at #{req.host}:#{req.port}
-    </ADDRESS>
-  </BODY>
-</HTML>
-        _end_of_html_
-      end
-
-    end
-  end
-end
diff --git a/lib/webrick/httpservlet/prochandler.rb b/lib/webrick/httpservlet/prochandler.rb
deleted file mode 100644
index 783cb27896..0000000000
--- a/lib/webrick/httpservlet/prochandler.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# 
-# prochandler.rb -- ProcHandler Class
-#       
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#   
-# $IPR: prochandler.rb,v 1.7 2002/09/21 12:23:42 gotoyuzo Exp $
-
-require 'webrick/httpservlet/abstract.rb'
-
-module WEBrick
-  module HTTPServlet
-
-    class ProcHandler < AbstractServlet
-      def get_instance(server, *options)
-        self
-      end  
-
-      def initialize(proc)
-        @proc = proc
-      end
-
-      def do_GET(request, response)
-        @proc.call(request, response)
-      end
-
-      alias do_POST do_GET
-    end
-
-  end
-end
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb
deleted file mode 100644
index 0b22c992b3..0000000000
--- a/lib/webrick/httpstatus.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# httpstatus.rb -- HTTPStatus Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpstatus.rb,v 1.11 2003/03/24 20:18:55 gotoyuzo Exp $
-
-module WEBrick
-
-  module HTTPStatus
-
-    class Status      < StandardError; end
-    class Info        < Status; end
-    class Success     < Status; end
-    class Redirect    < Status; end
-    class Error       < Status; end
-    class ClientError < Error; end
-    class ServerError < Error; end
-    
-    class EOFError < StandardError; end
-
-    StatusMessage = {
-      100, 'Continue',
-      101, 'Switching Protocols',
-      200, 'OK',
-      201, 'Created',
-      202, 'Accepted',
-      203, 'Non-Authoritative Information',
-      204, 'No Content',
-      205, 'Reset Content',
-      206, 'Partial Content',
-      300, 'Multiple Choices',
-      301, 'Moved Permanently',
-      302, 'Found',
-      303, 'See Other',
-      304, 'Not Modified',
-      305, 'Use Proxy',
-      307, 'Temporary Redirect',
-      400, 'Bad Request',
-      401, 'Unauthorized',
-      402, 'Payment Required',
-      403, 'Forbidden',
-      404, 'Not Found',
-      405, 'Method Not Allowed',
-      406, 'Not Acceptable',
-      407, 'Proxy Authentication Required',
-      408, 'Request Timeout',
-      409, 'Conflict',
-      410, 'Gone',
-      411, 'Length Required',
-      412, 'Precondition Failed',
-      413, 'Request Entity Too Large',
-      414, 'Request-URI Too Large',
-      415, 'Unsupported Media Type',
-      416, 'Request Range Not Satisfiable',
-      417, 'Expectation Failed',
-      500, 'Internal Server Error',
-      501, 'Not Implemented',
-      502, 'Bad Gateway',
-      503, 'Service Unavailable',
-      504, 'Gateway Timeout',
-      505, 'HTTP Version Not Supported'
-    }
-
-    CodeToError = {}
-
-    StatusMessage.each{|code, message|
-      var_name = message.gsub(/[ \-]/,'_').upcase
-      err_name = message.gsub(/[ \-]/,'')
-
-      case code
-      when 100...200; parent = Info
-      when 200...300; parent = Success
-      when 300...400; parent = Redirect
-      when 400...500; parent = ClientError
-      when 500...600; parent = ServerError
-      end
-
-      eval %-
-        RC_#{var_name} = #{code}
-        class #{err_name} < #{parent}
-          def self.code() RC_#{var_name} end
-          def self.reason_phrase() StatusMessage[code] end
-          def code() self::class::code end 
-          def reason_phrase() self::class::reason_phrase end
-          alias to_i code
-        end
-      -
-
-      CodeToError[code] = const_get(err_name)
-    }
-
-    def reason_phrase(code)
-      StatusMessage[code.to_i]
-    end
-    def info?(code)
-      code.to_i >= 100 and code.to_i < 200
-    end
-    def success?(code)
-      code.to_i >= 200 and code.to_i < 300
-    end
-    def redirect?(code)
-      code.to_i >= 300 and code.to_i < 400
-    end
-    def error?(code)
-      code.to_i >= 400 and code.to_i < 600
-    end
-    def client_error?(code)
-      code.to_i >= 400 and code.to_i < 500
-    end
-    def server_error?(code)
-      code.to_i >= 500 and code.to_i < 600
-    end
-
-    def self.[](code)
-      CodeToError[code]
-    end
-
-    module_function :reason_phrase
-    module_function :info?, :success?, :redirect?, :error?
-    module_function :client_error?, :server_error?
-  end
-end
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
deleted file mode 100644
index 6b8704cc7f..0000000000
--- a/lib/webrick/httputils.rb
+++ /dev/null
@@ -1,373 +0,0 @@
-#
-# httputils.rb -- HTTPUtils Module
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httputils.rb,v 1.34 2003/06/05 21:34:08 gotoyuzo Exp $
-
-require 'socket'
-require 'tempfile'
-
-module WEBrick
-  CR   = "\x0d"
-  LF   = "\x0a"
-  CRLF = "\x0d\x0a"
-
-  module HTTPUtils
-
-    def normalize_path(path)
-      raise "abnormal path `#{path}'" if path[0] != ?/
-      ret = path.dup
-
-      ret.gsub!(%r{/+}o, '/')                    # //      => /
-      while ret.sub!(%r{/\.(/|\Z)}o, '/'); end   # /.      => /
-      begin                                      # /foo/.. => /foo
-        match = ret.sub!(%r{/([^/]+)/\.\.(/|\Z)}o){
-          if $1 == ".."
-            raise "abnormal path `#{path}'"
-          else
-            "/"
-          end
-        }
-      end while match
-
-      raise "abnormal path `#{path}'" if %r{/\.\.(/|\Z)} =~ ret
-      ret
-    end
-    module_function :normalize_path
-
-    #####
-
-    DefaultMimeTypes = {
-      "ai"    => "application/postscript",
-      "asc"   => "text/plain",
-      "avi"   => "video/x-msvideo",
-      "bin"   => "application/octet-stream",
-      "bmp"   => "image/bmp",
-      "class" => "application/octet-stream",
-      "cer"   => "application/pkix-cert",
-      "crl"   => "application/pkix-crl",
-      "crt"   => "application/x-x509-ca-cert",
-     #"crl"   => "application/x-pkcs7-crl",
-      "css"   => "text/css",
-      "dms"   => "application/octet-stream",
-      "doc"   => "application/msword",
-      "dvi"   => "application/x-dvi",
-      "eps"   => "application/postscript",
-      "etx"   => "text/x-setext",
-      "exe"   => "application/octet-stream",
-      "gif"   => "image/gif",
-      "htm"   => "text/html",
-      "html"  => "text/html",
-      "jpe"   => "image/jpeg",
-      "jpeg"  => "image/jpeg",
-      "jpg"   => "image/jpeg",
-      "lha"   => "application/octet-stream",
-      "lzh"   => "application/octet-stream",
-      "mov"   => "video/quicktime",
-      "mpe"   => "video/mpeg",
-      "mpeg"  => "video/mpeg",
-      "mpg"   => "video/mpeg",
-      "pbm"   => "image/x-portable-bitmap",
-      "pdf"   => "application/pdf",
-      "pgm"   => "image/x-portable-graymap",
-      "png"   => "image/png",
-      "pnm"   => "image/x-portable-anymap",
-      "ppm"   => "image/x-portable-pixmap",
-      "ppt"   => "application/vnd.ms-powerpoint",
-      "ps"    => "application/postscript",
-      "qt"    => "video/quicktime",
-      "ras"   => "image/x-cmu-raster",
-      "rb"    => "text/plain",
-      "rd"    => "text/plain",
-      "rtf"   => "application/rtf",
-      "sgm"   => "text/sgml",
-      "sgml"  => "text/sgml",
-      "tif"   => "image/tiff",
-      "tiff"  => "image/tiff",
-      "txt"   => "text/plain",
-      "xbm"   => "image/x-xbitmap",
-      "xls"   => "application/vnd.ms-excel",
-      "xml"   => "text/xml",
-      "xpm"   => "image/x-xpixmap",
-      "xwd"   => "image/x-xwindowdump",
-      "zip"   => "application/zip",
-    }
-
-    # Load Apache compatible mime.types file.
-    def load_mime_types(file)
-      open(file){ |io|
-        hash = Hash.new
-        io.each{ |line|
-          next if /^#/ =~ line
-          line.chomp!
-          mimetype, ext0 = line.split(/\s+/, 2)
-          next unless ext0   
-          next if ext0.empty?
-          ext0.split(/\s+/).each{ |ext| hash[ext] = mimetype }
-        }
-        hash
-      }
-    end
-    module_function :load_mime_types
-
-    def mime_type(filename, mime_tab)
-      if suffix = (/\.(\w+)$/ =~ filename && $1)
-        mtype = mime_tab[suffix.downcase]
-      end
-      mtype || "application/octet-stream"
-    end
-    module_function :mime_type
-
-    #####
-
-    def parse_header(raw)
-      header = Hash.new([].freeze)
-      field = nil
-      raw.each{|line|
-        case line
-        when /^([A-Za-z0-9_\-]+):\s*(.*?)\s*\z/om
-          field, value = $1, $2
-          field.downcase!
-          header[field] = [] unless header.has_key?(field)
-          header[field] << value
-        when /^\s+(.*?)\s*\z/om
-          value = $1
-          unless field
-            raise "bad header '#{line.inspect}'."
-          end
-          header[field][-1] << " " << value
-        else
-          raise "bad header '#{line.inspect}'."
-        end
-      }
-      header.each{|key, values|
-        values.each{|value|
-          value.strip!
-          value.gsub!(/\s+/, " ")
-        }
-      }
-      header
-    end
-    module_function :parse_header
-
-    def split_header_value(str)
-      str.scan(/((?:"(?:\\.|[^"])+?"|[^",]+)+)
-                (?:,\s*|\Z)/xn).collect{|v| v[0] }
-    end
-    module_function :split_header_value
-
-    def parse_range_header(ranges_specifier)
-      if /^bytes=(.*)/ =~ ranges_specifier
-        byte_range_set = split_header_value($1)
-        byte_range_set.collect{|range_spec|
-          case range_spec
-          when /^(\d+)-(\d+)/ then $1.to_i .. $2.to_i
-          when /^(\d+)-/      then $1.to_i .. -1
-          when /^(\d+)/       then -($1.to_i) .. -1
-          else return nil
-          end
-        }
-      end
-    end
-    module_function :parse_range_header
-
-    #####
-
-    def dequote(str)
-      ret = (/\A"(.*)"\Z/ =~ str) ? $1 : str.dup
-      ret.gsub!(/\\(.)/, "\\1")
-      ret
-    end
-    module_function :dequote
-
-    def quote(str)
-      '"' << str.gsub(/[\\\"]/o, "\\\1") << '"'
-    end
-    module_function :quote
-
-    #####
-
-    class FormData < String
-      EmptyRawHeader = [].freeze
-      EmptyHeader = {}.freeze
-
-      attr_accessor :name, :filename, :next_data
-      protected :next_data
-
-      def initialize(*args)
-        @name = @filename = @next_data = nil
-        if args.empty?
-          @raw_header = []
-          @header = nil
-          super("")
-        else
-          @raw_header = EmptyRawHeader
-          @header = EmptyHeader 
-          super(args.shift)
-          unless args.empty?
-            @next_data = self.class.new(*args)
-          end
-        end
-      end
-
-      def [](*key)
-        begin
-          @header[key[0].downcase].join(", ")
-        rescue StandardError, NameError
-          super
-        end
-      end
-
-      def <<(str)
-        if @header
-          super
-        elsif str == CRLF
-          @header = HTTPUtils::parse_header(@raw_header)
-          if cd = self['content-disposition']
-            if /\s+name="(.*?)"/ =~ cd then @name = $1 end
-            if /\s+filename="(.*?)"/ =~ cd then @filename = $1 end
-          end
-        else
-          @raw_header << str
-        end
-        self
-      end
-
-      def append_data(data)
-        tmp = self
-        while tmp
-          unless tmp.next_data 
-            tmp.next_data = data
-            break
-          end
-          tmp = tmp.next_data
-        end
-        self
-      end
-
-      def each_data
-        tmp = self
-        while tmp
-          next_data = tmp.next_data
-          yield(tmp)
-          tmp = next_data
-        end
-      end
-
-      def list
-        ret = []
-        each_data{|data|
-          ret << data.to_s
-        }
-        ret
-      end
-
-      alias :to_ary :list
-
-      def to_s
-        String.new(self)
-      end
-    end
-
-    def parse_query(str)
-      query = Hash.new
-      if str
-        str.split(/[&;]/).each{|x|
-          key, val = x.split(/=/,2)
-          key = unescape_form(key)
-          val = unescape_form(val.to_s)
-          val = FormData.new(val)
-          val.name = key
-          if query.has_key?(key)
-            query[key].append_data(val)
-            next
-          end
-          query[key] = val
-        }
-      end
-      query
-    end
-    module_function :parse_query
-
-    def parse_form_data(io, boundary)
-      boundary_regexp = /\A--#{boundary}(--)?#{CRLF}\z/
-      form_data = Hash.new
-      data = nil
-      io.each{|line|
-        if boundary_regexp =~ line
-          if data
-            data.chop!
-            key = data.name
-            if form_data.has_key?(key)
-              form_data[key].append_data(data)
-            else
-              form_data[key] = data 
-            end
-          end
-          data = FormData.new
-          next
-        else
-          if data
-            data << line
-          end
-        end
-      }
-      return form_data
-    end
-    module_function :parse_form_data
-
-    #####
-
-    reserved = ';/?:@&=+$,'
-    num      = '0123456789'
-    lowalpha = 'abcdefghijklmnopqrstuvwxyz'
-    upalpha  = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-    mark     = '-_.!~*\'()'
-    unreserved = num + lowalpha + upalpha + mark
-    control  = (0x0..0x1f).collect{|c| c.chr }.join + "\x7f"
-    space    = " "
-    delims   = '<>#%"'
-    unwise   = '{}|\\^[]`'
-    nonascii = (0x80..0xff).collect{|c| c.chr }.join
-
-    def _make_regex(str) /([#{Regexp.escape(str)}])/n end
-    def _escape(str, regex) str.gsub(regex){ "%%%02X" % $1[0] } end
-    def _unescape(str, regex) str.gsub(regex){ $1.hex.chr } end
-    module_function :_make_regex, :_escape, :_unescape
-
-    UNESCAPED = _make_regex(control+delims+unwise+nonascii)
-    UNESCAPED_FORM = _make_regex(reserved+control+delims+unwise+nonascii)
-    NONASCII  = _make_regex(nonascii)
-    ESCAPED   = /%([0-9a-fA-F]{2})/
-
-    def escape(str)
-      _escape(str, UNESCAPED)
-    end
-
-    def unescape(str)
-      _unescape(str, ESCAPED)
-    end
-
-    def escape_form(str)
-      ret = _escape(str, UNESCAPED_FORM)
-      ret.gsub!(/ /, "+")
-      ret
-    end
-
-    def unescape_form(str)
-      _unescape(str.gsub(/\+/, " "), ESCAPED)
-    end
-
-    def escape8bit(str)
-      _escape(str, NONASCII)
-    end
-
-    module_function :escape, :unescape, :escape_form, :unescape_form,
-                    :escape8bit
-
-  end
-end
diff --git a/lib/webrick/httpversion.rb b/lib/webrick/httpversion.rb
deleted file mode 100644
index 86907a26bd..0000000000
--- a/lib/webrick/httpversion.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# HTTPVersion.rb -- presentation of HTTP version
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpversion.rb,v 1.5 2002/09/21 12:23:37 gotoyuzo Exp $
-
-module WEBrick
-  class HTTPVersion
-    include Comparable
-
-    attr_accessor :major, :minor
-
-    def self.convert(version)
-      version.is_a?(self) ? version : new(version)
-    end
-
-    def initialize(version)
-      case version
-      when HTTPVersion
-        @major, @minor = version.major, version.minor
-      when String
-        if /^(\d+)\.(\d+)$/ =~ version
-          @major, @minor = $1.to_i, $2.to_i
-        end
-      end
-      if @major.nil? || @minor.nil?
-        raise ArgumentError,
-          format("cannot convert %s into %s", version.class, self.class)
-      end
-    end
-
-    def <=>(other)
-      unless other.is_a?(self.class)
-        other = self.class.new(other)
-      end
-      if (ret = @major <=> other.major) == 0
-        return @minor <=> other.minor
-      end
-      return ret
-    end
-
-    def to_s
-      format("%d.%d", @major, @minor)
-    end
-  end
-end
diff --git a/lib/webrick/log.rb b/lib/webrick/log.rb
deleted file mode 100644
index 5d4fd0a174..0000000000
--- a/lib/webrick/log.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# log.rb -- Log Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: log.rb,v 1.26 2002/10/06 17:06:10 gotoyuzo Exp $
-
-module WEBrick
-  class BasicLog
-    # log-level constant
-    FATAL, ERROR, WARN, INFO, DEBUG = 1, 2, 3, 4, 5
-
-    attr_accessor :level
-
-    def initialize(log_file=nil, level=nil)
-      @level = level || INFO
-      case log_file
-      when String
-        @log = open(log_file, "a+")
-        @log.sync = true
-        @opened = true
-      when NilClass
-        @log = $stderr
-      else
-        @log = log_file  # requires "<<". (see BasicLog#log)
-      end
-    end
-
-    def close
-      @log.close if @opened
-      @log = nil
-    end
-
-    def log(level, data)
-      if @log && level <= @level
-        data += "\n" if /\n\Z/ !~ data
-        @log << data
-      end
-    end
-
-    def <<(obj)
-      log(INFO, obj.to_s)
-    end
-
-    def fatal(msg) log(FATAL, "FATAL " << format(msg)); end
-    def error(msg) log(ERROR, "ERROR " << format(msg)); end
-    def warn(msg)  log(WARN,  "WARN  " << format(msg)); end
-    def info(msg)  log(INFO,  "INFO  " << format(msg)); end
-    def debug(msg) log(DEBUG, "DEBUG " << format(msg)); end
-
-    def fatal?; @level >= FATAL; end
-    def error?; @level >= ERROR; end
-    def warn?;  @level >= WARN; end
-    def info?;  @level >= INFO; end
-    def debug?; @level >= DEBUG; end
-
-    private
-
-    def format(arg)
-      str = if arg.is_a?(Exception)
-        "#{arg.class}: #{arg.message}\n\t" <<
-        arg.backtrace.join("\n\t") << "\n"
-      elsif arg.respond_to?(:to_str)
-        arg.to_str
-      else
-        arg.inspect
-      end
-    end
-  end
-
-  class Log < BasicLog
-    attr_accessor :time_format 
-
-    def initialize(log_file=nil, level=nil)
-      super(log_file, level)
-      @time_format = "[%Y-%m-%d %H:%M:%S]"
-    end
-
-    def log(level, data)
-      tmp = Time.now.strftime(@time_format)
-      tmp << " " << data
-      super(level, tmp)
-    end
-  end
-end
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
deleted file mode 100644
index f89115f035..0000000000
--- a/lib/webrick/server.rb
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# server.rb -- GenericServer Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: server.rb,v 1.62 2003/07/22 19:20:43 gotoyuzo Exp $
-
-require 'thread'
-require 'socket'
-require 'timeout'
-require 'webrick/config'
-require 'webrick/log'
-
-module WEBrick
-
-  class ServerError < StandardError; end
-
-  class SimpleServer
-    def SimpleServer.start
-      yield
-    end
-  end
-
-  class Daemon
-    def Daemon.start
-      exit!(0) if fork
-      Process::setsid
-      exit!(0) if fork
-      Dir::chdir("/")
-      File::umask(0)
-      [ STDIN, STDOUT, STDERR ].each{|io|
-        io.reopen("/dev/null", "r+")
-      }
-      yield if block_given?
-    end
-  end
-
-  class GenericServer
-    attr_reader :status, :config, :logger, :tokens, :listeners
-
-    def initialize(config={}, default=Config::General)
-      @config = default.dup.update(config)
-      @status = :Stop
-      @config[:Logger] ||= Log::new
-      @logger = @config[:Logger]
-
-      @tokens = SizedQueue.new(@config[:MaxClients])
-      @config[:MaxClients].times{ @tokens.push(nil) }
-
-      webrickv = WEBrick::VERSION
-      rubyv = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-      @logger.info("WEBrick #{webrickv}")
-      @logger.info("ruby #{rubyv}")
-
-      @listeners = []
-      unless @config[:DoNotListen]
-        if @config[:Listen]
-          warn(":Listen option is deprecated; use GenericServer#listen")
-        end
-        listen(@config[:BindAddress], @config[:Port])
-      end
-    end
-
-    def [](key)
-      @config[key]
-    end
-
-    def listen(address, port)
-      @listeners += Utils::create_listeners(address, port, @logger)
-    end
-
-    def start(&block)
-      raise ServerError, "already started." if @status != :Stop
-      server_type = @config[:ServerType] || SimpleServer
-
-      server_type.start{
-        @logger.info \
-          "#{self.class}#start: pid=#{$$} port=#{@config[:Port]}"
-        call_callback(:StartCallback)
-
-        thgroup = ThreadGroup.new
-        @status = :Running
-        while @status == :Running
-          begin
-            if svrs = IO.select(@listeners, nil, nil, 2.0)
-              svrs[0].each{|svr|
-                @tokens.pop          # blocks while no token is there.
-                sock = svr.accept
-                sock.sync = true
-                Utils::set_close_on_exec(sock)
-                th = start_thread(sock, &block)
-                th[:WEBrickThread] = true
-                thgroup.add(th)
-              }
-            end
-          rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPROTO => ex
-            # TCP connection was established but RST segment was sent
-            # from peer before calling TCPServer#accept.
-          rescue Errno::EBADF, IOError => ex
-            # if the listening socket was closed in GenericServer#shutdown,
-            # IO::select raise it.
-          rescue => ex
-            msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
-            @logger.error msg
-          end
-        end
-
-        @logger.info "going to shutdown ..."
-        thgroup.list.each{|th| th.join if th[:WEBrickThread] }
-        call_callback(:StopCallback)
-        @logger.info "#{self.class}#start done."
-        @status = :Stop
-      }
-    end
-
-    def stop
-      if @status == :Running
-        @status = :Shutdown
-      end
-    end
-
-    def shutdown
-      stop
-      @listeners.each{|s|
-        if @logger.debug?
-          addr = s.addr
-          @logger.debug("close TCPSocket(#{addr[2]}, #{addr[1]})")
-        end
-        s.close
-      }
-      @listeners.clear
-    end
-
-    def run(sock)
-      @logger.fatal "run() must be provided by user."
-    end
-
-    private
-
-    def start_thread(sock, &block)
-      Thread.start{
-        begin
-          Thread.current[:WEBrickSocket] = sock
-          addr = sock.peeraddr
-          @logger.debug "accept: #{addr[3]}:#{addr[1]}"
-          call_callback(:AcceptCallback, sock)
-          block ? block.call(sock) : run(sock)
-        rescue ServerError, Errno::ENOTCONN => ex
-          msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
-          @logger.error msg
-        rescue Exception => ex
-          @logger.error ex
-        ensure
-          Thread.current[:WEBrickSocket] = nil
-          @logger.debug "close: #{addr[3]}:#{addr[1]}"
-          sock.close
-        end
-        @tokens.push(nil)
-      }
-    end
-
-    def call_callback(callback_name, *args)
-      if cb = @config[callback_name]
-        cb.call(*args)
-      end
-    end
-  end    # end of GenericServer
-end
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
deleted file mode 100644
index 402fd5d993..0000000000
--- a/lib/webrick/ssl.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# ssl.rb -- SSL/TLS enhancement for GenericServer
-#
-# Copyright (c) 2003 GOTOU Yuuzou All rights reserved.
-# 
-# $Id$
-
-require 'webrick'
-require 'openssl'
-
-module WEBrick
-  module Config
-    svrsoft = General[:ServerSoftware]
-    osslv = ::OpenSSL::OPENSSL_VERSION.split[1]
-    SSL = {
-      :ServerSoftware       => "#{svrsoft} OpenSSL/#{osslv}",
-      :SSLEnable            => true,
-      :SSLCertificate       => nil,
-      :SSLPrivateKey        => nil,
-      :SSLClientCA          => nil,
-      :SSLCACertificateFile => nil,
-      :SSLCACertificatePath => nil,
-      :SSLCertificateStore  => nil,
-      :SSLVerifyClient      => ::OpenSSL::SSL::VERIFY_NONE,
-      :SSLVerifyDepth       => nil,
-      :SSLVerifyCallback    => nil,   # custom verification
-      :SSLTimeout           => nil,
-      :SSLOptions           => nil,
-      :SSLStartImmediately  => true,
-      # Must specify if you use auto generated certificate.
-      :SSLCertName          => nil,
-      :SSLCertComment       => "Generated by Ruby/OpenSSL"
-    }
-    General.update(SSL)
-  end
-
-  module Utils
-    def create_self_signed_cert(bits, cn, comment)
-      rsa = OpenSSL::PKey::RSA.new(bits){|p, n|
-        case p
-        when 0; $stderr.putc "."  # BN_generate_prime
-        when 1; $stderr.putc "+"  # BN_generate_prime
-        when 2; $stderr.putc "*"  # searching good prime,  
-                                  # n = #of try,
-                                  # but also data from BN_generate_prime
-        when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
-                                  # but also data from BN_generate_prime
-        else;   $stderr.putc "*"  # BN_generate_prime
-        end
-      }
-      cert = OpenSSL::X509::Certificate.new
-      cert.version = 3
-      cert.serial = 0
-      name = OpenSSL::X509::Name.new(cn)
-      cert.subject = name
-      cert.issuer = name
-      cert.not_before = Time.now
-      cert.not_after = Time.now + (365*24*60*60)
-      cert.public_key = rsa.public_key
-
-      ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
-      ef.issuer_certificate = cert
-      cert.extensions = [
-        ef.create_extension("basicConstraints","CA:FALSE"),
-        ef.create_extension("keyUsage", "keyEncipherment"),
-        ef.create_extension("subjectKeyIdentifier", "hash"),
-        ef.create_extension("extendedKeyUsage", "serverAuth"),
-        ef.create_extension("nsComment", comment),
-      ]
-      aki = ef.create_extension("authorityKeyIdentifier",
-                                "keyid:always,issuer:always")
-      cert.add_extension(aki)
-      cert.sign(rsa, OpenSSL::Digest::SHA1.new)
-
-      return [ cert, rsa ]
-    end
-    module_function :create_self_signed_cert
-  end
-
-  class GenericServer
-    def ssl_context
-      @ssl_context ||= nil
-    end
-
-    def listen(address, port)
-      listeners = Utils::create_listeners(address, port, @logger)
-      if @config[:SSLEnable]
-        unless ssl_context
-          @ssl_context = setup_ssl_context(@config)
-          @logger.info("\n" + @config[:SSLCertificate].to_text) 
-        end
-        listeners.collect!{|svr|
-          ssvr = ::OpenSSL::SSL::SSLServer.new(svr, ssl_context)
-          ssvr.start_immediately = @config[:SSLStartImmediately]
-          ssvr
-        }
-      end
-      @listeners += listeners
-    end
-
-    def setup_ssl_context(config)
-      unless config[:SSLCertificate]
-        cn = config[:SSLCertName]
-        comment = config[:SSLCertComment]
-        cert, key = Utils::create_self_signed_cert(1024, cn, comment)
-        config[:SSLCertificate] = cert
-        config[:SSLPrivateKey] = key
-      end
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.key = config[:SSLPrivateKey]
-      ctx.cert = config[:SSLCertificate]
-      ctx.client_ca = config[:SSLClientCA]
-      ctx.ca_file = config[:SSLCACertificateFile]
-      ctx.ca_path = config[:SSLCACertificatePath]
-      ctx.cert_store = config[:SSLCertificateStore]
-      ctx.verify_mode = config[:SSLVerifyClient]
-      ctx.verify_depth = config[:SSLVerifyDepth]
-      ctx.verify_callback = config[:SSLVerifyCallback]
-      ctx.timeout = config[:SSLTimeout]
-      ctx.options = config[:SSLOptions]
-      ctx
-    end
-  end
-end
diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb
deleted file mode 100644
index 41b54271c7..0000000000
--- a/lib/webrick/utils.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# utils.rb -- Miscellaneous utilities
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: utils.rb,v 1.10 2003/02/16 22:22:54 gotoyuzo Exp $
-
-require 'socket'
-require 'fcntl'
-begin
-  require 'etc'
-rescue LoadError
-  nil
-end
-
-module WEBrick
-  module Utils
-
-    def set_close_on_exec(io)
-      if defined?(Fcntl::FD_CLOEXEC)
-        io.fcntl(Fcntl::FD_CLOEXEC, 1)
-      end
-    end
-    module_function :set_close_on_exec
-
-    def su(user)
-      if defined?(Etc)
-        pw = Etc.getpwnam(user)
-        Process::initgroups(user, pw.gid)
-        Process::Sys::setgid(pw.gid)
-        Process::Sys::setuid(pw.uid)
-      else
-        warn("WEBrick::Utils::su doesn't work on this platform")
-      end
-    end
-    module_function :su
-
-    def getservername
-      host = Socket::gethostname
-      begin
-        Socket::gethostbyname(host)[0]
-      rescue
-        host
-      end
-    end
-    module_function :getservername
-
-    def create_listeners(address, port, logger=nil)
-      res = Socket::getaddrinfo(address, port,
-                                Socket::AF_UNSPEC,   # address family
-                                Socket::SOCK_STREAM, # socket type
-                                0,                   # protocol
-                                Socket::AI_PASSIVE)  # flag
-      last_error = nil
-      sockets = []
-      res.each{|ai|
-        begin
-          logger.debug("TCPServer.new(#{ai[3]}, #{ai[1]})") if logger
-          sock = TCPServer.new(ai[3], ai[1])
-          Utils::set_close_on_exec(sock)
-          sockets << sock
-        rescue => ex
-          logger.warn("TCPServer Error: #{ex}") if logger
-          last_error  = ex
-        end
-      }
-      raise last_error if sockets.empty?
-      return sockets
-    end
-    module_function :create_listeners
-
-    RAND_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
-                 "0123456789" +
-                 "abcdefghijklmnopqrstuvwxyz" 
-
-    def random_string(len)
-      rand_max = RAND_CHARS.size
-      ret = "" 
-      len.times{ ret << RAND_CHARS[rand(rand_max)] }
-      ret 
-    end
-    module_function :random_string
-
-  end
-end
diff --git a/lib/webrick/version.rb b/lib/webrick/version.rb
deleted file mode 100644
index b2b9fd3b78..0000000000
--- a/lib/webrick/version.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# version.rb -- version and release date
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: version.rb,v 1.74 2003/07/22 19:20:43 gotoyuzo Exp $
-
-module WEBrick
-  VERSION      = "1.3.1"
-end
diff --git a/lib/wsdl/binding.rb b/lib/wsdl/binding.rb
deleted file mode 100644
index 349d6edcb6..0000000000
--- a/lib/wsdl/binding.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-=begin
-WSDL4R - WSDL binding definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'xsd/namedelements'
-
-
-module WSDL
-
-
-class Binding < Info
-  attr_reader :name		# required
-  attr_reader :type		# required
-  attr_reader :operations
-  attr_reader :soapbinding
-
-  def initialize
-    super
-    @name = nil
-    @type = nil
-    @operations = XSD::NamedElements.new
-    @soapbinding = nil
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def parse_element(element)
-    case element
-    when OperationName
-      o = OperationBinding.new
-      @operations << o
-      o
-    when SOAPBindingName
-      o = WSDL::SOAP::Binding.new
-      @soapbinding = o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value)
-    when TypeAttrName
-      @type = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
diff --git a/lib/wsdl/data.rb b/lib/wsdl/data.rb
deleted file mode 100644
index 4f3b845316..0000000000
--- a/lib/wsdl/data.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-=begin
-WSDL4R - WSDL data definitions.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/documentation'
-require 'wsdl/definitions'
-require 'wsdl/types'
-require 'wsdl/message'
-require 'wsdl/part'
-require 'wsdl/portType'
-require 'wsdl/operation'
-require 'wsdl/param'
-require 'wsdl/binding'
-require 'wsdl/operationBinding'
-require 'wsdl/service'
-require 'wsdl/port'
-require 'wsdl/import'
-
-
-module WSDL
-
-
-BindingName = XSD::QName.new(Namespace, 'binding')
-DefinitionsName = XSD::QName.new(Namespace, 'definitions')
-DocumentationName = XSD::QName.new(Namespace, 'documentation')
-FaultName = XSD::QName.new(Namespace, 'fault')
-ImportName = XSD::QName.new(Namespace, 'import')
-InputName = XSD::QName.new(Namespace, 'input')
-MessageName = XSD::QName.new(Namespace, 'message')
-OperationName = XSD::QName.new(Namespace, 'operation')
-OutputName = XSD::QName.new(Namespace, 'output')
-PartName = XSD::QName.new(Namespace, 'part')
-PortName = XSD::QName.new(Namespace, 'port')
-PortTypeName = XSD::QName.new(Namespace, 'portType')
-ServiceName = XSD::QName.new(Namespace, 'service')
-TypesName = XSD::QName.new(Namespace, 'types')
-
-SchemaName = XSD::QName.new(XSD::Namespace, 'schema')
-
-SOAPAddressName = XSD::QName.new(SOAPBindingNamespace, 'address')
-SOAPBindingName = XSD::QName.new(SOAPBindingNamespace, 'binding')
-SOAPHeaderName = XSD::QName.new(SOAPBindingNamespace, 'header')
-SOAPBodyName = XSD::QName.new(SOAPBindingNamespace, 'body')
-SOAPFaultName = XSD::QName.new(SOAPBindingNamespace, 'fault')
-SOAPOperationName = XSD::QName.new(SOAPBindingNamespace, 'operation')
-
-BindingAttrName = XSD::QName.new(nil, 'binding')
-ElementAttrName = XSD::QName.new(nil, 'element')
-LocationAttrName = XSD::QName.new(nil, 'location')
-MessageAttrName = XSD::QName.new(nil, 'message')
-NameAttrName = XSD::QName.new(nil, 'name')
-NamespaceAttrName = XSD::QName.new(nil, 'namespace')
-ParameterOrderAttrName = XSD::QName.new(nil, 'parameterOrder')
-TargetNamespaceAttrName = XSD::QName.new(nil, 'targetNamespace')
-TypeAttrName = XSD::QName.new(nil, 'type')
-
-
-end
diff --git a/lib/wsdl/definitions.rb b/lib/wsdl/definitions.rb
deleted file mode 100644
index 7a0cff01e7..0000000000
--- a/lib/wsdl/definitions.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-=begin
-WSDL4R - WSDL definitions.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'xsd/namedelements'
-
-
-module WSDL
-
-
-class Definitions < Info
-  attr_reader :name
-  attr_reader :targetnamespace
-  attr_reader :imports
-
-  # Overrides Info#root
-  def root
-    @root
-  end
-
-  def root=(root)
-    @root = root
-  end
-
-  def initialize
-    super
-    @name = nil
-    @targetnamespace = nil
-    @types = nil
-    @imports = []
-    @messages = XSD::NamedElements.new
-    @porttypes = XSD::NamedElements.new
-    @bindings = XSD::NamedElements.new
-    @services = XSD::NamedElements.new
-
-    @anontypes = XSD::NamedElements.new
-    @root = self
-  end
-
-  def targetnamespace=(targetnamespace)
-    @targetnamespace = targetnamespace
-    if @name
-      @name = XSD::QName.new(@targetnamespace, @name.name)
-    end
-  end
-
-  def collect_elements
-    result = XSD::NamedElements.new
-    if @types
-      @types.schemas.each do |schema|
-	result.concat(schema.elements)
-      end
-    end
-    @imports.each do |import|
-      result.concat(import.content.collect_elements)
-    end
-    result
-  end
-
-  def collect_complextypes
-    result = @anontypes.dup
-    if @types
-      @types.schemas.each do |schema|
-	result.concat(schema.complextypes)
-      end
-    end
-    @imports.each do |import|
-      result.concat(import.content.collect_complextypes)
-    end
-    result
-  end
-
-  def add_type(complextype)
-    @anontypes << complextype
-  end
-
-  def messages
-    result = @messages.dup
-    @imports.each do |import|
-      result.concat(import.content.messages) if self.class === import.content
-    end
-    result
-  end
-
-  def porttypes
-    result = @porttypes.dup
-    @imports.each do |import|
-      result.concat(import.content.porttypes) if self.class === import.content
-    end
-    result
-  end
-
-  def bindings
-    result = @bindings.dup
-    @imports.each do |import|
-      result.concat(import.content.bindings) if self.class === import.content
-    end
-    result
-  end
-
-  def services
-    result = @services.dup
-    @imports.each do |import|
-      result.concat(import.content.services) if self.class === import.content
-    end
-    result
-  end
-
-  def message(name)
-    message = @messages[name]
-    return message if message
-    @imports.each do |import|
-      message = import.content.message(name) if self.class === import.content
-      return message if message
-    end
-    nil
-  end
-
-  def porttype(name)
-    porttype = @porttypes[name]
-    return porttype if porttype
-    @imports.each do |import|
-      porttype = import.content.porttype(name) if self.class === import.content
-      return porttype if porttype
-    end
-    nil
-  end
-
-  def binding(name)
-    binding = @bindings[name]
-    return binding if binding
-    @imports.each do |import|
-      binding = import.content.binding(name) if self.class === import.content
-      return binding if binding
-    end
-    nil
-  end
-
-  def service(name)
-    service = @services[name]
-    return service if service
-    @imports.each do |import|
-      service = import.content.service(name) if self.class === import.content
-      return service if service
-    end
-    nil
-  end
-
-  def porttype_binding(name)
-    binding = @bindings.find { |item| item.type == name }
-    return binding if binding
-    @imports.each do |import|
-      binding = import.content.porttype_binding(name) if self.class === import.content
-      return binding if binding
-    end
-    nil
-  end
-
-  def parse_element(element)
-    case element
-    when ImportName
-      o = Import.new
-      @imports << o
-      o
-    when TypesName
-      o = Types.new
-      @types = o
-      o
-    when MessageName
-      o = Message.new
-      @messages << o
-      o
-    when PortTypeName
-      o = PortType.new
-      @porttypes << o
-      o
-    when BindingName
-      o = Binding.new
-      @bindings << o
-      o
-    when ServiceName
-      o = Service.new
-      @services << o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = XSD::QName.new(@targetnamespace, value)
-    when TargetNamespaceAttrName
-      self.targetnamespace = value
-    else
-      nil
-    end
-  end
-
-  def self.parse_element(element)
-    if element == DefinitionsName
-      Definitions.new
-    else
-      nil
-    end
-  end
-
-private
-
-end
-
-
-end
diff --git a/lib/wsdl/documentation.rb b/lib/wsdl/documentation.rb
deleted file mode 100644
index 00e78a99df..0000000000
--- a/lib/wsdl/documentation.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP documentation element.
-Copyright (C) 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class Documentation < Info
-  def initialize
-    super
-  end
-
-  def parse_element(element)
-    # Accepts any element.
-    self
-  end
-
-  def parse_attr(attr, value)
-    # Accepts any attribute.
-    true
-  end
-end
-
-
-end
diff --git a/lib/wsdl/import.rb b/lib/wsdl/import.rb
deleted file mode 100644
index a0fa26afaf..0000000000
--- a/lib/wsdl/import.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-=begin
-WSDL4R - WSDL import definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'wsdl/importer'
-
-
-module WSDL
-
-
-class Import < Info
-  attr_reader :namespace
-  attr_reader :location
-  attr_reader :content
-
-  def initialize
-    super
-    @namespace = nil
-    @location = nil
-    @content = nil
-    @web_client = nil
-  end
-
-  def parse_element(element)
-    case element
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NamespaceAttrName
-      @namespace = value
-      if @content
-	@content.targetnamespace = @namespace
-      end
-      @namespace
-    when LocationAttrName
-      @location = value
-      @content = import(@location)
-      if @content.is_a?(Definitions)
-	@content.root = root
-	if @namespace
-	  @content.targetnamespace = @namespace
-	end
-      end
-      @location
-    else
-      nil
-    end
-  end
-
-private
-
-  def import(location)
-    Importer.import(location)
-  end
-end
-
-
-end
diff --git a/lib/wsdl/importer.rb b/lib/wsdl/importer.rb
deleted file mode 100644
index 794e7fc74d..0000000000
--- a/lib/wsdl/importer.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-=begin
-WSDL4R - WSDL importer library.
-Copyright (C) 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class Importer
-  def self.import(location)
-    new.import(location)
-  end
-
-  def initialize
-    @web_client = nil
-  end
-
-  def import(location)
-    content = nil
-    if FileTest.exist?(location)
-      content = File.open(location).read
-    else
-      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-      content = web_client.new(proxy, "WSDL4R").get_content(location)
-    end
-    opt = {}	# charset?
-    begin
-      WSDL::Parser.new(opt).parse(content)
-    rescue WSDL::Parser::ParseError => orgexcn
-      begin
-	require 'wsdl/xmlSchema/parser'
-	WSDL::XMLSchema::Parser.new(opt).parse(content)
-      rescue
-	raise orgexcn
-      end
-    end
-  end
-
-private
-
-  def web_client
-    @web_client ||= begin
-	require 'http-access2'
-	if HTTPAccess2::VERSION < "2.0"
-	  raise LoadError.new("http-access/2.0 or later is required.")
-	end
-	HTTPAccess2::Client
-      rescue LoadError
-	STDERR.puts "Loading http-access2 failed.  Net/http is used." if $DEBUG
-	require 'soap/netHttpClient'
-	::SOAP::NetHttpClient
-      end
-    @web_client
-  end
-end
-
-
-end
diff --git a/lib/wsdl/info.rb b/lib/wsdl/info.rb
deleted file mode 100644
index 886b9255ae..0000000000
--- a/lib/wsdl/info.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-=begin
-WSDL4R - WSDL information base.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module WSDL
-
-
-class Info
-  attr_accessor :parent
-  attr_accessor :id
-
-  def initialize
-    @parent = nil
-    @id = nil
-  end
-
-  def root
-    @parent.root
-  end
-
-  def parse_element(element); end	# abstract
-  
-  def parse_attr(attr, value); end	# abstract
-
-  def parse_epilogue; end		# abstract
-end
-
-
-end
diff --git a/lib/wsdl/message.rb b/lib/wsdl/message.rb
deleted file mode 100644
index 68f3bb89dd..0000000000
--- a/lib/wsdl/message.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-=begin
-WSDL4R - WSDL message definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class Message < Info
-  attr_reader :name	# required
-  attr_reader :parts
-
-  def initialize
-    super
-    @name = nil
-    @parts = []
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def parse_element(element)
-    case element
-    when PartName
-      o = Part.new
-      @parts << o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = XSD::QName.new(parent.targetnamespace, value)
-    else
-      nil
-    end
-  end
-end
-
-
-end
diff --git a/lib/wsdl/operation.rb b/lib/wsdl/operation.rb
deleted file mode 100644
index ff3450d234..0000000000
--- a/lib/wsdl/operation.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-=begin
-WSDL4R - WSDL operation definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class Operation < Info
-  class NameInfo
-    attr_reader :op_name
-    attr_reader :optype_name
-    attr_reader :parts
-    def initialize(op_name, optype_name, parts)
-      @op_name = op_name
-      @optype_name = optype_name
-      @parts = parts
-    end
-  end
-
-  attr_reader :name		# required
-  attr_reader :parameter_order	# optional
-  attr_reader :input
-  attr_reader :output
-  attr_reader :fault
-  attr_reader :type		# required
-
-  def initialize
-    super
-    @name = nil
-    @type = nil
-    @parameter_order = nil
-    @input = nil
-    @output = nil
-    @fault = nil
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def input_info
-    op_name = @name
-    optype_name = XSD::QName.new(targetnamespace, input.name ? input.name.name : @name.name)
-    NameInfo.new(op_name, optype_name, inputparts)
-  end
-
-  def output_info
-    op_name = @name
-    optype_name = XSD::QName.new(targetnamespace, output.name ? output.name.name : @name.name)
-    NameInfo.new(op_name, optype_name, outputparts)
-  end
-
-  def inputparts
-    sort_parts(input.find_message.parts)
-  end
-
-  def outputparts
-    sort_parts(output.find_message.parts)
-  end
-
-  def faultparts
-    sort_parts(fault.find_message.parts)
-  end
-
-  def outputname
-    XSD::QName.new(targetnamespace,
-      output.name ? output.name.name : @name.name + 'Response')
-  end
-
-  def parse_element(element)
-    case element
-    when InputName
-      o = Param.new
-      @input = o
-      o
-    when OutputName
-      o = Param.new
-      @output = o
-      o
-    when FaultName
-      o = Param.new
-      @fault = o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value)
-    when TypeAttrName
-      @type = value
-    when ParameterOrderAttrName
-      @parameter_order = value.split(/\s+/)
-    else
-      nil
-    end
-  end
-
-private
-
-  def sort_parts(parts)
-    return parts.dup unless parameter_order
-    result = []
-    parameter_order.each do |orderitem|
-      if (ele = parts.find { |part| part.name == orderitem })
-	result << ele
-      end
-    end
-    if result.length == 0
-      return parts.dup
-    end
-    if parts.length != result.length
-      raise RuntimeError.new("Incomplete prarmeterOrder list.")
-    end
-    result
-  end
-end
-
-
-end
diff --git a/lib/wsdl/operationBinding.rb b/lib/wsdl/operationBinding.rb
deleted file mode 100644
index 0bd0d9b105..0000000000
--- a/lib/wsdl/operationBinding.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-=begin
-WSDL4R - WSDL bound operation definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class OperationBinding < Info
-  attr_reader :name		# required
-  attr_reader :input
-  attr_reader :output
-  attr_reader :fault
-  attr_reader :soapoperation
-
-  def initialize
-    super
-    @name = nil
-    @input = nil
-    @output = nil
-    @fault = nil
-    @soapoperation = nil
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def porttype
-    root.porttype(parent.type)
-  end
-
-  def find_operation
-    porttype.operations[@name]
-  end
-
-  def parse_element(element)
-    case element
-    when InputName
-      o = Param.new
-      @input = o
-      o
-    when OutputName
-      o = Param.new
-      @output = o
-      o
-    when FaultName
-      o = Param.new
-      @fault = o
-      o
-    when SOAPOperationName
-      o = WSDL::SOAP::Operation.new
-      @soapoperation = o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value)
-    else
-      nil
-    end
-  end
-end
-
-
-end
diff --git a/lib/wsdl/param.rb b/lib/wsdl/param.rb
deleted file mode 100644
index 10111677d2..0000000000
--- a/lib/wsdl/param.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-=begin
-WSDL4R - WSDL param definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class Param < Info
-  attr_reader :message	# required
-  attr_reader :name	# optional but required for fault.
-  attr_reader :soapbody
-  attr_reader :soapheader
-  attr_reader :soapfault
-
-  def initialize
-    super
-    @message = nil
-    @name = nil
-    @soapbody = nil
-    @soapheader = []
-    @soapfault = nil
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def find_message
-    root.message(@message)
-  end
-
-  def parse_element(element)
-    case element
-    when SOAPBodyName
-      o = WSDL::SOAP::Body.new
-      @soapbody = o
-      o
-    when SOAPHeaderName
-      o = WSDL::SOAP::Header.new
-      @soapheader << o
-      o
-    when SOAPFaultName
-      o = WSDL::SOAP::Fault.new
-      @soap_fault = o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when MessageAttrName
-      @message = value
-    when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value)
-    else
-      nil
-    end
-  end
-end
-
-
-end
diff --git a/lib/wsdl/parser.rb b/lib/wsdl/parser.rb
deleted file mode 100644
index e0a8945bb0..0000000000
--- a/lib/wsdl/parser.rb
+++ /dev/null
@@ -1,170 +0,0 @@
-=begin
-WSDL4R - WSDL XML Instance parser library.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/qname'
-require 'xsd/ns'
-require 'xsd/charset'
-require 'xsd/datatypes'
-require 'xsd/xmlparser'
-require 'wsdl/wsdl'
-require 'wsdl/data'
-require 'wsdl/xmlSchema/data'
-require 'wsdl/soap/data'
-
-
-module WSDL
-
-
-class Parser
-  include WSDL
-
-  class ParseError < Error; end
-  class FormatDecodeError < ParseError; end
-  class UnknownElementError < FormatDecodeError; end
-  class UnknownAttributeError < FormatDecodeError; end
-  class UnexpectedElementError < FormatDecodeError; end
-  class ElementConstraintError < FormatDecodeError; end
-  class AttributeConstraintError < FormatDecodeError; end
-
-private
-
-  class ParseFrame
-    attr_reader :ns
-    attr_reader :name
-    attr_accessor :node
-
-  private
-
-    def initialize(ns, name, node)
-      @ns = ns
-      @name = name
-      @node = node
-    end
-  end
-
-public
-
-  def initialize(opt = {})
-    @parser = XSD::XMLParser.create_parser(self, opt)
-    @parsestack = nil
-    @lastnode = nil
-  end
-
-  def parse(string_or_readable)
-    @parsestack = []
-    @lastnode = nil
-    @textbuf = ''
-    @parser.do_parse(string_or_readable)
-    @lastnode
-  end
-
-  def charset
-    @parser.charset
-  end
-
-  def start_element(name, attrs)
-    lastframe = @parsestack.last
-    ns = parent = nil
-    if lastframe
-      ns = lastframe.ns.clone_ns
-      parent = lastframe.node
-    else
-      ns = XSD::NS.new
-      parent = nil
-    end
-    attrs = XSD::XMLParser.filter_ns(ns, attrs)
-    node = decode_tag(ns, name, attrs, parent)
-    @parsestack << ParseFrame.new(ns, name, node)
-  end
-
-  def characters(text)
-    lastframe = @parsestack.last
-    if lastframe
-      # Need not to be cloned because character does not have attr.
-      ns = lastframe.ns
-      decode_text(ns, text)
-    else
-      p text if $DEBUG
-    end
-  end
-
-  def end_element(name)
-    lastframe = @parsestack.pop
-    unless name == lastframe.name
-      raise UnexpectedElementError.new("Closing element name '#{ name }' does not match with opening element '#{ lastframe.name }'.")
-    end
-    decode_tag_end(lastframe.ns, lastframe.node)
-    @lastnode = lastframe.node
-  end
-
-private
-
-  def decode_tag(ns, name, attrs, parent)
-    o = nil
-    element = ns.parse(name)
-    if !parent
-      if element == DefinitionsName
-	o = Definitions.parse_element(element)
-      else
-	raise UnknownElementError.new("Unknown element #{ element }.")
-      end
-    else
-      o = parent.parse_element(element)
-      unless o
-	STDERR.puts("Unknown element #{ element }.")
-	o = Documentation.new	# which accepts any element.
-      end
-      o.parent = parent
-    end
-    attrs.each do |key, value|
-      attr = unless /:/ =~ key
-	  XSD::QName.new(nil, key)
-	else
-	  ns.parse(key)
-	end
-      value_ele = if /:/ !~ value
-	  value
-	elsif /^http:\/\// =~ value	# ToDo: ugly.
-	  value
-	else
-	  begin
-	    ns.parse(value)
-	  rescue
-	    value
-	  end
-	end
-      unless o.parse_attr(attr, value_ele)
-	STDERR.puts("Unknown attr #{ attr }.")
-	# raise UnknownAttributeError.new("Unknown attr #{ attr }.")
-      end
-    end
-    o
-  end
-
-  def decode_tag_end(ns, node)
-    node.parse_epilogue
-  end
-
-  def decode_text(ns, text)
-    @textbuf << text
-  end
-end
-
-
-end
diff --git a/lib/wsdl/part.rb b/lib/wsdl/part.rb
deleted file mode 100644
index 2aeb457c4e..0000000000
--- a/lib/wsdl/part.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-=begin
-WSDL4R - WSDL part definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class Part < Info
-  attr_reader :name	# required
-  attr_reader :element	# optional
-  attr_reader :type	# optional
-
-  def initialize
-    super
-    @name = nil
-    @element = nil
-    @type = nil
-  end
-
-  def parse_element(element)
-    case element
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = value
-    when ElementAttrName
-      @element = value
-    when TypeAttrName
-      @type = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
diff --git a/lib/wsdl/port.rb b/lib/wsdl/port.rb
deleted file mode 100644
index b389f6ca02..0000000000
--- a/lib/wsdl/port.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-=begin
-WSDL4R - WSDL port definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class Port < Info
-  attr_reader :name		# required
-  attr_reader :binding		# required
-  attr_reader :soap_address
-
-  def initialize
-    super
-    @name = nil
-    @binding = nil
-    @soap_address = nil
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def porttype
-    root.porttype(find_binding.type)
-  end
-
-  def find_binding
-    root.binding(@binding)
-  end
-
-  def inputoperation_map
-    result = {}
-    find_binding.operations.each do |op_bind|
-      op_info = op_bind.soapoperation.input_info
-      result[op_info.op_name] = op_info
-    end
-    result
-  end
-
-  def outputoperation_map
-    result = {}
-    find_binding.operations.each do |op_bind|
-      op_info = op_bind.soapoperation.output_info
-      result[op_info.op_name] = op_info
-    end
-    result
-  end
-
-  def parse_element(element)
-    case element
-    when SOAPAddressName
-      o = WSDL::SOAP::Address.new
-      @soap_address = o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value)
-    when BindingAttrName
-      @binding = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
diff --git a/lib/wsdl/portType.rb b/lib/wsdl/portType.rb
deleted file mode 100644
index b3a99b3bc0..0000000000
--- a/lib/wsdl/portType.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-=begin
-WSDL4R - WSDL portType definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'xsd/namedelements'
-
-
-module WSDL
-
-
-class PortType < Info
-  attr_reader :name		# required
-  attr_reader :operations
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def initialize
-    super
-    @name = nil
-    @operations = XSD::NamedElements.new
-  end
-
-  def find_binding
-    root.bindings.find { |item| item.type == @name }
-  end
-
-  def locations
-    bind_name = find_binding.name
-    result = []
-    root.services.each do |service|
-      service.ports.each do |port|
-        if port.binding == bind_name
-          result << port.soap_address.location if port.soap_address
-        end
-      end
-    end
-    result
-  end
-
-  def parse_element(element)
-    case element
-    when OperationName
-      o = Operation.new
-      @operations << o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value)
-    else
-      nil
-    end
-  end
-end
-
-
-end
diff --git a/lib/wsdl/service.rb b/lib/wsdl/service.rb
deleted file mode 100644
index efaeaa727a..0000000000
--- a/lib/wsdl/service.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-=begin
-WSDL4R - WSDL service definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'xsd/namedelements'
-
-
-module WSDL
-
-
-class Service < Info
-  attr_reader :name		# required
-  attr_reader :ports
-  attr_reader :soap_address
-
-  def initialize
-    super
-    @name = nil
-    @ports = XSD::NamedElements.new
-    @soap_address = nil
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def parse_element(element)
-    case element
-    when PortName
-      o = Port.new
-      @ports << o
-      o
-    when SOAPAddressName
-      o = WSDL::SOAP::Address.new
-      @soap_address = o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value)
-    else
-      nil
-    end
-  end
-end
-
-
-end
diff --git a/lib/wsdl/soap/address.rb b/lib/wsdl/soap/address.rb
deleted file mode 100644
index 759918c95b..0000000000
--- a/lib/wsdl/soap/address.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP address definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module SOAP
-
-
-class Address < Info
-  attr_reader :location
-
-  def initialize
-    super
-    @location = nil
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when LocationAttrName
-      @location = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/soap/binding.rb b/lib/wsdl/soap/binding.rb
deleted file mode 100644
index e9ba3a48d1..0000000000
--- a/lib/wsdl/soap/binding.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP binding definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module SOAP
-
-
-class Binding < Info
-  attr_reader :style
-  attr_reader :transport
-
-  def initialize
-    super
-    @style = nil
-    @transport = nil
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when StyleAttrName
-      if ["document", "rpc"].include?(value)
-	@style = value.intern
-      else
-	raise AttributeConstraintError.new("Unexpected value #{ value }.")
-      end
-    when TransportAttrName
-      @transport = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/soap/body.rb b/lib/wsdl/soap/body.rb
deleted file mode 100644
index f209622410..0000000000
--- a/lib/wsdl/soap/body.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP body definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module SOAP
-
-
-class Body < Info
-  attr_reader :parts
-  attr_reader :use	# required
-  attr_reader :encodingstyle
-  attr_reader :namespace
-
-  def initialize
-    super
-    @parts = nil
-    @use = nil
-    @encodingstyle = nil
-    @namespace = nil
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when PartsAttrName
-      @parts = value
-    when UseAttrName
-      @use = value
-    when EncodingStyleAttrName
-      @encodingstyle = value
-    when NamespaceAttrName
-      @namespace = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/soap/complexType.rb b/lib/wsdl/soap/complexType.rb
deleted file mode 100644
index f47ddee449..0000000000
--- a/lib/wsdl/soap/complexType.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-=begin
-WSDL4R - SOAP complexType definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/xmlSchema/complexType'
-
-
-module WSDL
-module XMLSchema
-
-
-class ComplexType < Info
-  def compoundtype
-    @compoundtype ||= check_type
-  end
-
-  def check_type
-    if content
-      :TYPE_STRUCT
-    elsif complexcontent and complexcontent.base == ::SOAP::ValueArrayName
-      :TYPE_ARRAY
-    else
-      raise NotImplementedError.new("Unknown kind of complexType.")
-    end
-  end
-
-  def child_type(name = nil)
-    case compoundtype
-    when :TYPE_STRUCT
-      if ele = find_element(name)
-        ele.type
-      elsif ele = find_element_by_name(name.name)
-	ele.type
-      else
-        nil
-      end
-    when :TYPE_ARRAY
-      @contenttype ||= content_arytype
-    end
-  end
-
-  def child_defined_complextype(name)
-    unless compoundtype == :TYPE_STRUCT
-      raise RuntimeError.new("Assert: not for struct")
-    end
-    unless ele = find_element(name)
-      if name.namespace.nil?
-	ele = find_element_by_name(name.name)
-      end
-    end
-    unless ele
-      raise RuntimeError.new("Cannot find #{name} as a children of #{@name}.")
-    end
-    ele.local_complextype
-  end
-
-  def find_arytype
-    complexcontent.attributes.each do |attribute|
-      if attribute.ref == ::SOAP::AttrArrayTypeName
-	return attribute.arytype
-      end
-    end
-    nil
-  end
-
-private
-
-  def content_arytype
-    unless compoundtype == :TYPE_ARRAY
-      raise RuntimeError.new("Assert: not for array")
-    end
-    arytype = find_arytype
-    ns = arytype.namespace
-    name = arytype.name.sub(/\[(?:,)*\]$/, '')
-    XSD::QName.new(ns, name)
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/soap/data.rb b/lib/wsdl/soap/data.rb
deleted file mode 100644
index 301ae9951d..0000000000
--- a/lib/wsdl/soap/data.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP binding data definitions.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/qname'
-require 'wsdl/soap/definitions'
-require 'wsdl/soap/binding'
-require 'wsdl/soap/operation'
-require 'wsdl/soap/body'
-require 'wsdl/soap/header'
-require 'wsdl/soap/headerfault'
-require 'wsdl/soap/fault'
-require 'wsdl/soap/address'
-require 'wsdl/soap/complexType'
-
-
-module WSDL
-module SOAP
-
-
-HeaderFaultName = XSD::QName.new(SOAPBindingNamespace, 'headerfault')
-
-LocationAttrName = XSD::QName.new(nil, 'location')
-StyleAttrName = XSD::QName.new(nil, 'style')
-TransportAttrName = XSD::QName.new(nil, 'transport')
-UseAttrName = XSD::QName.new(nil, 'use')
-PartsAttrName = XSD::QName.new(nil, 'parts')
-PartAttrName = XSD::QName.new(nil, 'part')
-NameAttrName = XSD::QName.new(nil, 'name')
-MessageAttrName = XSD::QName.new(nil, 'message')
-EncodingStyleAttrName = XSD::QName.new(nil, 'encodingStyle')
-NamespaceAttrName = XSD::QName.new(nil, 'namespace')
-SOAPActionAttrName = XSD::QName.new(nil, 'soapAction')
-
-
-end
-end
diff --git a/lib/wsdl/soap/definitions.rb b/lib/wsdl/soap/definitions.rb
deleted file mode 100644
index 08df0dcc68..0000000000
--- a/lib/wsdl/soap/definitions.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-=begin
-WSDL4R - WSDL additional definitions for SOAP.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'xsd/namedelements'
-require 'soap/mapping'
-
-
-module WSDL
-
-
-class Definitions < Info
-  def soap_rpc_complextypes(binding)
-    types = rpc_operation_complextypes(binding)
-    types << array_complextype
-    types << fault_complextype
-    types << exception_complextype
-    types
-  end
-
-private
-
-  def rpc_operation_complextypes(binding)
-    types = XSD::NamedElements.new
-    binding.operations.each do |op_bind|
-      if op_bind_rpc?(op_bind)
-	operation = op_bind.find_operation
-	if op_bind.input
-	  type = XMLSchema::ComplexType.new(operation_input_name(operation))
-	  message = messages[operation.input.message]
-	  type.sequence_elements = elements_from_message(message)
-	  types << type
-	end
-	if op_bind.output
-	  type = XMLSchema::ComplexType.new(operation_output_name(operation))
-	  message = messages[operation.output.message]
-	  type.sequence_elements = elements_from_message(message)
-	  types << type
-	end
-      end
-    end
-    types
-  end
-
-  def operation_input_name(operation)
-    operation.input.name || operation.name
-  end
-
-  def operation_output_name(operation)
-    operation.output.name ||
-      XSD::QName.new(operation.name.namespace, operation.name.name + "Response")
-  end
-
-  def op_bind_rpc?(op_bind)
-    op_bind.soapoperation and op_bind.soapoperation.operation_style == :rpc
-  end
-
-  def elements_from_message(message)
-    message.parts.collect { |part|
-      qname = XSD::QName.new(nil, part.name)
-      XMLSchema::Element.new(qname, part.type)
-    }
-  end
-
-  def array_complextype
-    type = XMLSchema::ComplexType.new(::SOAP::ValueArrayName)
-    type.complexcontent = XMLSchema::ComplexContent.new
-    type.complexcontent.base = ::SOAP::ValueArrayName
-    attr = XMLSchema::Attribute.new
-    attr.ref = ::SOAP::AttrArrayTypeName
-    anytype = XSD::AnyTypeName.dup
-    anytype.name += '[]'
-    attr.arytype = anytype
-    type.complexcontent.attributes << attr
-    type
-  end
-
-=begin
-<xs:complexType name="Fault" final="extension">
-  <xs:sequence>
-    <xs:element name="faultcode" type="xs:QName" /> 
-    <xs:element name="faultstring" type="xs:string" /> 
-    <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" /> 
-    <xs:element name="detail" type="tns:detail" minOccurs="0" /> 
-  </xs:sequence>
-</xs:complexType>
-=end
-  def fault_complextype
-    type = XMLSchema::ComplexType.new(::SOAP::EleFaultName)
-    faultcode = XMLSchema::Element.new(::SOAP::EleFaultCodeName, XSD::XSDQName::Type)
-    faultstring = XMLSchema::Element.new(::SOAP::EleFaultStringName, XSD::XSDString::Type)
-    faultactor = XMLSchema::Element.new(::SOAP::EleFaultActorName, XSD::XSDAnyURI::Type)
-    faultactor.minoccurs = 0
-    detail = XMLSchema::Element.new(::SOAP::EleFaultDetailName, XSD::AnyTypeName)
-    detail.minoccurs = 0
-    type.all_elements = [faultcode, faultstring, faultactor, detail]
-    type.final = 'extension'
-    type
-  end
-
-  def exception_complextype
-    type = XMLSchema::ComplexType.new(XSD::QName.new(
-	::SOAP::Mapping::RubyCustomTypeNamespace, 'SOAPException'))
-    excn_name = XMLSchema::Element.new(XSD::QName.new(nil, 'exceptionTypeName'), XSD::XSDString::Type)
-    cause = XMLSchema::Element.new(XSD::QName.new(nil, 'cause'), XSD::AnyTypeName)
-    backtrace = XMLSchema::Element.new(XSD::QName.new(nil, 'backtrace'), ::SOAP::ValueArrayName)
-    message = XMLSchema::Element.new(XSD::QName.new(nil, 'message'), XSD::XSDString::Type)
-    type.all_elements = [excn_name, cause, backtrace, message]
-    type
-  end
-end
-
-
-end
diff --git a/lib/wsdl/soap/fault.rb b/lib/wsdl/soap/fault.rb
deleted file mode 100644
index eb57cb0233..0000000000
--- a/lib/wsdl/soap/fault.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP body definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module SOAP
-
-
-class Fault < Info
-  attr_reader :name	# required
-  attr_reader :use	# required
-  attr_reader :encodingstyle
-  attr_reader :namespace
-
-  def initialize
-    super
-    @name = nil
-    @use = nil
-    @encodingstyle = nil
-    @namespace = nil
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      @name = value
-    when UseAttrName
-      @use = value
-    when EncodingStyleAttrName
-      @encodingstyle = value
-    when NamespaceAttrName
-      @namespace = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/soap/header.rb b/lib/wsdl/soap/header.rb
deleted file mode 100644
index f779ba5c08..0000000000
--- a/lib/wsdl/soap/header.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP body definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module SOAP
-
-
-class Header < Info
-  attr_reader :headerfault
-
-  attr_reader :message	# required
-  attr_reader :part	# required
-  attr_reader :use	# required
-  attr_reader :encodingstyle
-  attr_reader :namespace
-
-  def initialize
-    super
-    @message = nil
-    @part = nil
-    @use = nil
-    @encodingstyle = nil
-    @namespace = nil
-    @headerfault = nil
-  end
-
-  def find_message
-    root.message(@message)
-  end
-
-  def find_part
-    find_message.parts.each do |part|
-      if part.name == @part
-	return part
-      end
-    end
-    nil
-  end
-
-  def parse_element(element)
-    case element
-    when HeaderFaultName
-      o = WSDL::SOAP::HeaderFault.new
-      @headerfault = o
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when MessageAttrName
-      @message = value
-    when PartAttrName
-      @part = value
-    when UseAttrName
-      @use = value
-    when EncodingStyleAttrName
-      @encodingstyle = value
-    when NamespaceAttrName
-      @namespace = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/soap/headerfault.rb b/lib/wsdl/soap/headerfault.rb
deleted file mode 100644
index c0d58e2230..0000000000
--- a/lib/wsdl/soap/headerfault.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP body definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module SOAP
-
-
-class HeaderFault < Info
-  attr_reader :message	# required
-  attr_reader :part	# required
-  attr_reader :use	# required
-  attr_reader :encodingstyle
-  attr_reader :namespace
-
-  def initialize
-    super
-    @message = nil
-    @part = nil
-    @use = nil
-    @encodingstyle = nil
-    @namespace = nil
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when MessageAttrName
-      @message = value
-    when PartAttrName
-      @part = value
-    when UseAttrName
-      @use = value
-    when EncodingStyleAttrName
-      @encodingstyle = value
-    when NamespaceAttrName
-      @namespace = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/soap/operation.rb b/lib/wsdl/soap/operation.rb
deleted file mode 100644
index 2e88522f5c..0000000000
--- a/lib/wsdl/soap/operation.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-=begin
-WSDL4R - WSDL SOAP operation definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module SOAP
-
-
-class Operation < Info
-  class OperationInfo
-    attr_reader :style
-    attr_reader :op_name
-    attr_reader :optype_name
-    attr_reader :headerparts
-    attr_reader :bodyparts
-    attr_reader :faultpart
-    attr_reader :soapaction
-    
-    def initialize(style, op_name, optype_name, headerparts, bodyparts, faultpart, soapaction)
-      @style = style
-      @op_name = op_name
-      @optype_name = optype_name
-      @headerparts = headerparts
-      @bodyparts = bodyparts
-      @faultpart = faultpart
-      @soapaction = soapaction
-    end
-  end
-
-  attr_reader :soapaction
-  attr_reader :style
-
-  def initialize
-    super
-    @soapaction = nil
-    @style = nil
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when StyleAttrName
-      if ["document", "rpc"].include?(value)
-	@style = value.intern
-      else
-	raise AttributeConstraintError.new("Unexpected value #{ value }.")
-      end
-    when SOAPActionAttrName
-      @soapaction = value
-    else
-      nil
-    end
-  end
-
-  def input_info
-    name_info = parent.find_operation.input_info
-    param_info(name_info, parent.input)
-  end
-
-  def output_info
-    name_info = parent.find_operation.output_info
-    param_info(name_info, parent.output)
-  end
-
-  def operation_style
-    return @style if @style
-    if parent_binding.soapbinding
-      return parent_binding.soapbinding.style
-    end
-    nil
-  end
-
-private
-
-  def parent_binding
-    parent.parent
-  end
-
-  def param_info(name_info, param)
-    op_name = name_info.op_name
-    optype_name = name_info.optype_name
-
-    soapheader = param.soapheader
-    headerparts = soapheader.collect { |item| item.find_part }
-
-    soapbody = param.soapbody
-    if soapbody.encodingstyle and
-	soapbody.encodingstyle != ::SOAP::EncodingNamespace
-      raise NotImplementedError.new(
-	"EncodingStyle '#{ soapbody.encodingstyle }' not supported.")
-    end
-    if soapbody.namespace
-      op_name = op_name.dup
-      op_name.namespace = soapbody.namespace
-    end
-    if soapbody.parts
-      raise NotImplementedError.new("soap:body parts")
-    else
-      bodyparts = name_info.parts
-    end
-
-    faultpart = nil
-    soapaction = parent.soapoperation.soapaction
-    OperationInfo.new(operation_style, op_name, optype_name, headerparts, bodyparts, faultpart, soapaction)
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/types.rb b/lib/wsdl/types.rb
deleted file mode 100644
index 420ab8d387..0000000000
--- a/lib/wsdl/types.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-=begin
-WSDL4R - WSDL types definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-
-
-class Types < Info
-  attr_reader :schemas
-
-  def initialize
-    super
-    @schemas = []
-  end
-
-  def parse_element(element)
-    case element
-    when SchemaName
-      o = XMLSchema::Schema.new
-      @schemas << o
-      o
-    when DocumentationName
-      o = Documentation.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    nil
-  end
-end
-
-
-end
diff --git a/lib/wsdl/wsdl.rb b/lib/wsdl/wsdl.rb
deleted file mode 100644
index 23fd764065..0000000000
--- a/lib/wsdl/wsdl.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-=begin
-WSDL4R - Base definitions.
-Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/qname'
-
-
-module WSDL
-
-
-Version = '0.0.2'
-
-Namespace = 'http://schemas.xmlsoap.org/wsdl/'
-SOAPBindingNamespace ='http://schemas.xmlsoap.org/wsdl/soap/'
-
-class Error < StandardError; end
-
-
-end
diff --git a/lib/wsdl/xmlSchema/all.rb b/lib/wsdl/xmlSchema/all.rb
deleted file mode 100644
index 7db0fbc939..0000000000
--- a/lib/wsdl/xmlSchema/all.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-=begin
-WSDL4R - XMLSchema complexType definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class All < Info
-  attr_reader :minoccurs
-  attr_reader :maxoccurs
-  attr_reader :elements
-
-  def initialize
-    super()
-    @minoccurs = 1
-    @maxoccurs = 1
-    @elements = []
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def <<(element)
-    @elements << element
-  end
-
-  def parse_element(element)
-    case element
-    when AnyName
-      o = Any.new
-      @elements << o
-      o
-    when ElementName
-      o = Element.new
-      @elements << o
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when MaxOccursAttrName
-      @maxoccurs = value
-    when MinOccursAttrName
-      @minoccurs = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/any.rb b/lib/wsdl/xmlSchema/any.rb
deleted file mode 100644
index 46904c4107..0000000000
--- a/lib/wsdl/xmlSchema/any.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-=begin
-WSDL4R - XMLSchema any definition for WSDL.
-Copyright (C) 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class Any < Info
-  attr_accessor :maxoccurs
-  attr_accessor :minoccurs
-  attr_accessor :namespace
-  attr_accessor :process_contents
-
-  def initialize
-    super()
-    @maxoccurs = 1
-    @minoccurs = 1
-    @namespace = '##any'
-    @process_contents = 'strict'
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when MaxOccursAttrName
-      @maxoccurs = value
-    when MinOccursAttrName
-      @minoccurs = value
-    when NamespaceAttrName
-      @namespace = value
-    when ProcessContentsAttrName
-      @process_contents = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/attribute.rb b/lib/wsdl/xmlSchema/attribute.rb
deleted file mode 100644
index 08cc9e931b..0000000000
--- a/lib/wsdl/xmlSchema/attribute.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-=begin
-WSDL4R - XMLSchema attribute definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class Attribute < Info
-  attr_accessor :ref
-  attr_accessor :use
-  attr_accessor :form
-  attr_accessor :name
-  attr_accessor :type
-  attr_accessor :default
-  attr_accessor :fixed
-
-  attr_accessor :arytype
-
-  def initialize
-    super
-    @ref = nil
-    @use = nil
-    @form = nil
-    @name = nil
-    @type = nil
-    @default = nil
-    @fixed = nil
-
-    @arytype = nil
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when RefAttrName
-      @ref = value
-    when UseAttrName
-      @use = value
-    when FormAttrName
-      @form = value
-    when NameAttrName
-      @name = value
-    when TypeAttrName
-      @type = value
-    when DefaultAttrName
-      @default = value
-    when FixedAttrName
-      @fixed = value
-    when ArrayTypeAttrName
-      @arytype = if value.is_a?(XSD::QName)
-	  value
-	else
-	  XSD::QName.new(XSD::Namespace, value)
-	end
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/choice.rb b/lib/wsdl/xmlSchema/choice.rb
deleted file mode 100644
index f31e93b3f1..0000000000
--- a/lib/wsdl/xmlSchema/choice.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-=begin
-WSDL4R - XMLSchema complexType definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class Choice < Info
-  attr_reader :minoccurs
-  attr_reader :maxoccurs
-  attr_reader :elements
-
-  def initialize
-    super()
-    @minoccurs = 1
-    @maxoccurs = 1
-    @elements = []
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def <<(element)
-    @elements << element
-  end
-
-  def parse_element(element)
-    case element
-    when AnyName
-      o = Any.new
-      @elements << o
-      o
-    when ElementName
-      o = Element.new
-      @elements << o
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when MaxOccursAttrName
-      @maxoccurs = value
-    when MinOccursAttrName
-      @minoccurs = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/complexContent.rb b/lib/wsdl/xmlSchema/complexContent.rb
deleted file mode 100644
index 79c231ac2d..0000000000
--- a/lib/wsdl/xmlSchema/complexContent.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-=begin
-WSDL4R - XMLSchema complexContent definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'xsd/namedelements'
-
-
-module WSDL
-module XMLSchema
-
-
-class ComplexContent < Info
-  attr_accessor :base
-  attr_reader :derivetype
-  attr_reader :content
-  attr_reader :attributes
-
-  def initialize
-    super
-    @base = nil
-    @derivetype = nil
-    @content = nil
-    @attributes = XSD::NamedElements.new
-  end
-
-  def parse_element(element)
-    case element
-    when RestrictionName, ExtensionName
-      @derivetype = element.name
-      self
-    when AllName
-      if @derivetype.nil?
-	raise Parser::ElementConstraintError.new("base attr not found.")
-      end
-      @content = All.new
-      @content
-    when SequenceName
-      if @derivetype.nil?
-	raise Parser::ElementConstraintError.new("base attr not found.")
-      end
-      @content = Sequence.new
-      @content
-    when ChoiceName
-      if @derivetype.nil?
-	raise Parser::ElementConstraintError.new("base attr not found.")
-      end
-      @content = Choice.new
-      @content
-    when AttributeName
-      if @derivetype.nil?
-	raise Parser::ElementConstraintError.new("base attr not found.")
-      end
-      o = Attribute.new
-      @attributes << o
-      o
-    end
-  end
-
-  def parse_attr(attr, value)
-    if @derivetype.nil?
-      return nil
-    end
-    case attr
-    when BaseAttrName
-      @base = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/complexType.rb b/lib/wsdl/xmlSchema/complexType.rb
deleted file mode 100644
index c34be3e57b..0000000000
--- a/lib/wsdl/xmlSchema/complexType.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-=begin
-WSDL4R - XMLSchema complexType definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'wsdl/xmlSchema/content'
-require 'xsd/namedelements'
-
-
-module WSDL
-module XMLSchema
-
-
-class ComplexType < Info
-  attr_accessor :name
-  attr_accessor :complexcontent
-  attr_accessor :content
-  attr_accessor :final
-  attr_accessor :mixed
-  attr_reader :attributes
-
-  def initialize(name = nil)
-    super()
-    @name = name
-    @complexcontent = nil
-    @content = nil
-    @final = nil
-    @mixed = false
-    @attributes = XSD::NamedElements.new
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def each_element
-    if @content
-      @content.elements.each do |element|
-	yield(element.name, element)
-      end
-    end
-  end
-
-  def find_element(name)
-    if @content
-      @content.elements.each do |element|
-	return element if name == element.name
-      end
-    end
-    nil
-  end
-
-  def find_element_by_name(name)
-    if @content
-      @content.elements.each do |element|
-	return element if name == element.name.name
-      end
-    end
-    nil
-  end
-
-  def sequence_elements=(elements)
-    @content = Sequence.new
-    elements.each do |element|
-      @content << element
-    end
-  end
-
-  def all_elements=(elements)
-    @content = All.new
-    elements.each do |element|
-      @content << element
-    end
-  end
-
-  def parse_element(element)
-    case element
-    when AllName
-      @content = All.new
-      @content
-    when SequenceName
-      @content = Sequence.new
-      @content
-    when ChoiceName
-      @content = Choice.new
-      @content
-    when ComplexContentName
-      @complexcontent = ComplexContent.new
-      @complexcontent
-    when AttributeName
-      o = Attribute.new
-      @attributes << o
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when FinalAttrName
-      @final = value
-    when MixedAttrName
-      @mixed = (value == 'true')
-    when NameAttrName
-      @name = XSD::QName.new(targetnamespace, value)
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/content.rb b/lib/wsdl/xmlSchema/content.rb
deleted file mode 100644
index a1bd302701..0000000000
--- a/lib/wsdl/xmlSchema/content.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-=begin
-WSDL4R - XMLSchema complexType definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class Content < Info
-  attr_accessor :final
-  attr_accessor :mixed
-  attr_accessor :type
-  attr_reader :contents
-  attr_reader :elements
-
-  def initialize
-    super()
-    @final = nil
-    @mixed = false
-    @type = nil
-    @contents = []
-    @elements = []
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def <<(content)
-    @contents << content
-    update_elements
-  end
-
-  def each
-    @contents.each do |content|
-      yield content
-    end
-  end
-
-  def parse_element(element)
-    case element
-    when AllName, SequenceName, ChoiceName
-      o = Content.new
-      o.type = element.name
-      @contents << o
-      o
-    when AnyName
-      o = Any.new
-      @contents << o
-      o
-    when ElementName
-      o = Element.new
-      @contents << o
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when FinalAttrName
-      @final = value
-    when MixedAttrName
-      @mixed = (value == 'true')
-    else
-      nil
-    end
-  end
-
-  def parse_epilogue
-    update_elements
-  end
-
-private
-
-  def update_elements
-    @elements = []
-    @contents.each do |content|
-      if content.is_a?(Element)
-	@elements << [content.name, content]
-      end
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/data.rb b/lib/wsdl/xmlSchema/data.rb
deleted file mode 100644
index 539cf357c6..0000000000
--- a/lib/wsdl/xmlSchema/data.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-=begin
-WSDL4R - XMLSchema data definitions.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/xmlSchema/schema'
-require 'wsdl/xmlSchema/import'
-require 'wsdl/xmlSchema/complexType'
-require 'wsdl/xmlSchema/complexContent'
-require 'wsdl/xmlSchema/any'
-require 'wsdl/xmlSchema/element'
-require 'wsdl/xmlSchema/all'
-require 'wsdl/xmlSchema/choice'
-require 'wsdl/xmlSchema/sequence'
-require 'wsdl/xmlSchema/attribute'
-require 'wsdl/xmlSchema/unique'
-
-
-module WSDL
-module XMLSchema
-
-
-AllName = XSD::QName.new(XSD::Namespace, 'all')
-AnyName = XSD::QName.new(XSD::Namespace, 'any')
-ArrayTypeAttrName = XSD::QName.new(XSD::Namespace, 'arrayType')
-AttributeName = XSD::QName.new(XSD::Namespace, 'attribute')
-ChoiceName = XSD::QName.new(XSD::Namespace, 'choice')
-ComplexContentName = XSD::QName.new(XSD::Namespace, 'complexContent')
-ComplexTypeName = XSD::QName.new(XSD::Namespace, 'complexType')
-ElementName = XSD::QName.new(XSD::Namespace, 'element')
-ExtensionName = XSD::QName.new(XSD::Namespace, 'extension')
-ImportName = XSD::QName.new(XSD::Namespace, 'import')
-RestrictionName = XSD::QName.new(XSD::Namespace, 'restriction')
-SequenceName = XSD::QName.new(XSD::Namespace, 'sequence')
-SchemaName = XSD::QName.new(XSD::Namespace, 'schema')
-SimpleTypeName = XSD::QName.new(XSD::Namespace, 'simpleType')
-UniqueName = XSD::QName.new(XSD::Namespace, 'unique')
-
-AttributeFormDefaultAttrName = XSD::QName.new(nil, 'attributeFormDefault')
-BaseAttrName = XSD::QName.new(nil, 'base')
-DefaultAttrName = XSD::QName.new(nil, 'default')
-ElementFormDefaultAttrName = XSD::QName.new(nil, 'elementFormDefault')
-FinalAttrName = XSD::QName.new(nil, 'final')
-FixedAttrName = XSD::QName.new(nil, 'fixed')
-FormAttrName = XSD::QName.new(nil, 'form')
-IdAttrName = XSD::QName.new(nil, 'id')
-MaxOccursAttrName = XSD::QName.new(nil, 'maxOccurs')
-MinOccursAttrName = XSD::QName.new(nil, 'minOccurs')
-MixedAttrName = XSD::QName.new(nil, 'mixed')
-NameAttrName = XSD::QName.new(nil, 'name')
-NamespaceAttrName = XSD::QName.new(nil, 'namespace')
-NillableAttrName = XSD::QName.new(nil, 'nillable')
-RefAttrName = XSD::QName.new(nil, 'ref')
-SchemaLocationAttrName = XSD::QName.new(nil, 'schemaLocation')
-TargetNamespaceAttrName = XSD::QName.new(nil, 'targetNamespace')
-TypeAttrName = XSD::QName.new(nil, 'type')
-UseAttrName = XSD::QName.new(nil, 'use')
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/element.rb b/lib/wsdl/xmlSchema/element.rb
deleted file mode 100644
index d6d17c08cf..0000000000
--- a/lib/wsdl/xmlSchema/element.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-=begin
-WSDL4R - XMLSchema element definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class Element < Info
-  attr_accessor :name	# required
-  attr_accessor :type
-  attr_accessor :local_complextype
-  attr_accessor :constraint
-  attr_accessor :maxoccurs
-  attr_accessor :minoccurs
-  attr_accessor :nillable
-
-  def initialize(name = nil, type = XSD::AnyTypeName)
-    super()
-    @name = name
-    @type = type
-    @local_complextype = nil
-    @constraint = nil
-    @maxoccurs = 1
-    @minoccurs = 1
-    @nillable = nil
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def parse_element(element)
-    case element
-    when ComplexTypeName
-      @type = nil
-      @local_complextype = ComplexType.new
-      @local_complextype
-    when UniqueName
-      @constraint = Unique.new
-      @constraint
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NameAttrName
-      #@name = XSD::QName.new(nil, value)
-      @name = XSD::QName.new(targetnamespace, value)
-    when TypeAttrName
-      @type = if value.is_a?(XSD::QName)
-	  value
-	else
-	  XSD::QName.new(XSD::Namespace, value)
-	end
-    when MaxOccursAttrName
-      case parent
-      when All
-	if value != '1'
-	  raise Parser::AttrConstraintError.new(
-	    "Cannot parse #{ value } for #{ attr }.")
-	end
-	@maxoccurs = value
-      when Sequence
-	@maxoccurs = value
-      else
-	raise NotImplementedError.new
-      end
-      @maxoccurs
-    when MinOccursAttrName
-      case parent
-      when All
-	if ['0', '1'].include?(value)
-	  @minoccurs = value
-	else
-	  raise Parser::AttrConstraintError.new(
-	    "Cannot parse #{ value } for #{ attr }.")
-	end
-      when Sequence
-	@minoccurs = value
-      else
-	raise NotImplementedError.new
-      end
-      @minoccurs
-    when NillableAttrName
-      @nillable = (value == 'true')
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/import.rb b/lib/wsdl/xmlSchema/import.rb
deleted file mode 100644
index 2267125a70..0000000000
--- a/lib/wsdl/xmlSchema/import.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-=begin
-WSDL4R - XMLSchema import definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class Import < Info
-  attr_reader :namespace
-  attr_reader :schemalocation
-
-  def initialize
-    super
-    @namespace = nil
-    @schemalocation = nil
-  end
-
-  def parse_element(element)
-    nil
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when NamespaceAttrName
-      @namespace = value
-    when SchemaLocationAttrName
-      @schemalocation = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/parser.rb b/lib/wsdl/xmlSchema/parser.rb
deleted file mode 100644
index 6e893cdc7e..0000000000
--- a/lib/wsdl/xmlSchema/parser.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-=begin
-WSDL4R - WSDL XML Instance parser library.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/qname'
-require 'xsd/ns'
-require 'xsd/charset'
-require 'xsd/datatypes'
-require 'xsd/xmlparser'
-require 'wsdl/xmlSchema/data'
-
-
-module WSDL
-module XMLSchema
-
-
-class Parser
-  include XSD
-
-  class ParseError < Error; end
-  class FormatDecodeError < Error; end
-  class UnknownElementError < FormatDecodeError; end
-  class UnknownAttributeError < FormatDecodeError; end
-  class UnexpectedElementError < FormatDecodeError; end
-  class ElementConstraintError < FormatDecodeError; end
-  class AttributeConstraintError < FormatDecodeError; end
-
-private
-
-  class ParseFrame
-    attr_reader :ns
-    attr_reader :name
-    attr_accessor :node
-
-  private
-
-    def initialize(ns, name, node)
-      @ns = ns
-      @name = name
-      @node = node
-    end
-  end
-
-public
-
-  def initialize(opt = {})
-    @parser = XSD::XMLParser.create_parser(self, opt)
-    @parsestack = nil
-    @lastnode = nil
-  end
-
-  def parse(string_or_readable)
-    @parsestack = []
-    @lastnode = nil
-    @textbuf = ''
-    @parser.do_parse(string_or_readable)
-    @lastnode
-  end
-
-  def charset
-    @parser.charset
-  end
-
-  def start_element(name, attrs)
-    lastframe = @parsestack.last
-    ns = parent = nil
-    if lastframe
-      ns = lastframe.ns.clone_ns
-      parent = lastframe.node
-    else
-      ns = XSD::NS.new
-      parent = nil
-    end
-    attrs = XSD::XMLParser.filter_ns(ns, attrs)
-    node = decode_tag(ns, name, attrs, parent)
-    @parsestack << ParseFrame.new(ns, name, node)
-  end
-
-  def characters(text)
-    lastframe = @parsestack.last
-    if lastframe
-      # Need not to be cloned because character does not have attr.
-      ns = lastframe.ns
-      decode_text(ns, text)
-    else
-      p text if $DEBUG
-    end
-  end
-
-  def end_element(name)
-    lastframe = @parsestack.pop
-    unless name == lastframe.name
-      raise UnexpectedElementError.new("Closing element name '#{ name }' does not match with opening element '#{ lastframe.name }'.")
-    end
-    decode_tag_end(lastframe.ns, lastframe.node)
-    @lastnode = lastframe.node
-  end
-
-private
-
-  def decode_tag(ns, name, attrs, parent)
-    o = nil
-    element = ns.parse(name)
-    if !parent
-      if element == SchemaName
-	o = Schema.parse_element(element)
-      else
-	raise UnknownElementError.new("Unknown element #{ element }.")
-      end
-    else
-      o = parent.parse_element(element)
-      unless o
-	raise UnknownElementError.new("Unknown element #{ element }.")
-      end
-      o.parent = parent
-    end
-    attrs.each do |key, value|
-      attr = unless /:/ =~ key
-	  XSD::QName.new(nil, key)
-	else
-	  ns.parse(key)
-	end
-      value_ele = if /:/ !~ value
-	  value
-	elsif /^http:\/\// =~ value	# ToDo: ugly.
-	  value
-	else
-	  begin
-	    ns.parse(value)
-	  rescue
-	    value
-	  end
-	end
-      if attr == IdAttrName
-	o.id = value_ele
-      else
-	unless o.parse_attr(attr, value_ele)
-	  STDERR.puts("Unknown attr #{ attr }.")
-	  # raise UnknownAttributeError.new("Unknown attr #{ attr }.")
-   	end
-      end
-    end
-    o
-  end
-
-  def decode_tag_end(ns, node)
-    node.parse_epilogue
-  end
-
-  def decode_text(ns, text)
-    @textbuf << text
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/schema.rb b/lib/wsdl/xmlSchema/schema.rb
deleted file mode 100644
index 3a9aa6842e..0000000000
--- a/lib/wsdl/xmlSchema/schema.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-=begin
-WSDL4R - XMLSchema schema definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-require 'xsd/namedelements'
-
-
-module WSDL
-module XMLSchema
-
-
-class Schema < Info
-  attr_reader :targetnamespace	# required
-  attr_reader :complextypes
-  attr_reader :elements
-  attr_reader :attributes
-  attr_reader :imports
-  attr_accessor :attributeformdefault
-  attr_accessor :elementformdefault
-
-  def initialize
-    super
-    @targetnamespace = nil
-    @complextypes = XSD::NamedElements.new
-    @elements = XSD::NamedElements.new
-    @attributes = XSD::NamedElements.new
-    @imports = []
-    @elementformdefault = nil
-  end
-
-  def parse_element(element)
-    case element
-    when ImportName
-      o = Import.new
-      @imports << o
-      o
-    when ComplexTypeName
-      o = ComplexType.new
-      @complextypes << o
-      o
-    when ElementName
-      o = Element.new
-      @elements << o
-      o
-    when AttributeName
-      o = Attribute.new
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when TargetNamespaceAttrName
-      @targetnamespace = value
-    when AttributeFormDefaultAttrName
-      @attributeformdefault = value
-    when ElementFormDefaultAttrName
-      @elementformdefault = value
-    else
-      nil
-    end
-  end
-
-  def collect_elements
-    result = XSD::NamedElements.new
-    result.concat(@elements)
-    result
-  end
-
-  def collect_complextypes
-    result = XSD::NamedElements.new
-    result.concat(@complextypes)
-    result
-  end
-
-  def self.parse_element(element)
-    if element == SchemaName
-      Schema.new
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/sequence.rb b/lib/wsdl/xmlSchema/sequence.rb
deleted file mode 100644
index fb5ca1aef6..0000000000
--- a/lib/wsdl/xmlSchema/sequence.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-=begin
-WSDL4R - XMLSchema complexType definition for WSDL.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class Sequence < Info
-  attr_reader :minoccurs
-  attr_reader :maxoccurs
-  attr_reader :elements
-
-  def initialize
-    super()
-    @minoccurs = 1
-    @maxoccurs = 1
-    @elements = []
-  end
-
-  def targetnamespace
-    parent.targetnamespace
-  end
-
-  def <<(element)
-    @elements << element
-  end
-
-  def parse_element(element)
-    case element
-    when AnyName
-      o = Any.new
-      @elements << o
-      o
-    when ElementName
-      o = Element.new
-      @elements << o
-      o
-    else
-      nil
-    end
-  end
-
-  def parse_attr(attr, value)
-    case attr
-    when MaxOccursAttrName
-      @maxoccurs = value
-    when MinOccursAttrName
-      @minoccurs = value
-    else
-      nil
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/wsdl/xmlSchema/unique.rb b/lib/wsdl/xmlSchema/unique.rb
deleted file mode 100644
index 1d2573f6b0..0000000000
--- a/lib/wsdl/xmlSchema/unique.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-=begin
-WSDL4R - XMLSchema unique element.
-Copyright (C) 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'wsdl/info'
-
-
-module WSDL
-module XMLSchema
-
-
-class Unique < Info
-  def initialize
-    super
-  end
-
-  def parse_element(element)
-    # Accepts any element.
-    self
-  end
-
-  def parse_attr(attr, value)
-    # Accepts any attribute.
-    true
-  end
-end
-
-
-end
-end
diff --git a/lib/xmlrpc/base64.rb b/lib/xmlrpc/base64.rb
deleted file mode 100644
index f9a21c703a..0000000000
--- a/lib/xmlrpc/base64.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-=begin
-= xmlrpc/base64.rb
-Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-
-Released under the same term of license as Ruby.
-
-= Classes
-* ((<XMLRPC::Base64>))
-
-= XMLRPC::Base64
-== Description
-This class is necessary for (('xmlrpc4r')) to determine that a string should 
-be transmitted base64-encoded and not as a raw-string. 
-You can use (({XMLRPC::Base64})) on the client and server-side as a 
-parameter and/or return-value.
-
-== Class Methods
---- XMLRPC::Base64.new( str, state = :dec )
-    Creates a new (({XMLRPC::Base64})) instance with string ((|str|)) as the
-    internal string. When ((|state|)) is (({:dec})) it assumes that the 
-    string ((|str|)) is not in base64 format (perhaps already decoded), 
-    otherwise if ((|state|)) is (({:enc})) it decodes ((|str|)) 
-    and stores it as the internal string.
-    
---- XMLRPC::Base64.decode( str )
-    Decodes string ((|str|)) with base64 and returns that value.
-
---- XMLRPC::Base64.encode( str )
-    Encodes string ((|str|)) with base64 and returns that value.
-
-== Instance Methods
---- XMLRPC::Base64#decoded
-    Returns the internal string decoded.
-
---- XMLRPC::Base64#encoded
-    Returns the internal string encoded with base64.
-
-=end
-
-module XMLRPC
-
-class Base64
-  
-  def initialize(str, state = :dec)
-    case state
-    when :enc
-      @str = Base64.decode(str)
-    when :dec
-      @str = str
-    else
-      raise ArgumentError, "wrong argument; either :enc or :dec"
-    end
-  end
-  
-  def decoded
-    @str  
-  end
-  
-  def encoded
-    Base64.encode(@str)
-  end
-
-
-  def Base64.decode(str)
-    str.gsub(/\s+/, "").unpack("m")[0]
-  end
-
-  def Base64.encode(str)
-    [str].pack("m")
-  end
-
-end
-
-
-end # module XMLRPC
-
-
-=begin
-= History
-    $Id$
-=end
diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb
deleted file mode 100644
index 198819ba66..0000000000
--- a/lib/xmlrpc/client.rb
+++ /dev/null
@@ -1,570 +0,0 @@
-=begin
-= xmlrpc/client.rb
-Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-
-Released under the same term of license as Ruby.
-
-= Classes
-* ((<XMLRPC::Client>))
-* ((<XMLRPC::Client::Proxy>))
-
-
-= XMLRPC::Client
-== Synopsis
-    require "xmlrpc/client"
-
-    server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
-    begin
-      param = server.call("michael.add", 4, 5)
-      puts "4 + 5 = #{param}"
-    rescue XMLRPC::FaultException => e
-      puts "Error:"
-      puts e.faultCode
-      puts e.faultString
-    end
-
-or
-
-    require "xmlrpc/client"
-  
-    server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
-    ok, param = server.call2("michael.add", 4, 5)
-    if ok then
-      puts "4 + 5 = #{param}"
-    else
-      puts "Error:"
-      puts param.faultCode
-      puts param.faultString
-    end
-
-== Description
-Class (({XMLRPC::Client})) provides remote procedure calls to a XML-RPC server.
-After setting the connection-parameters with ((<XMLRPC::Client.new>)) which
-creates a new (({XMLRPC::Client})) instance, you can execute a remote procedure 
-by sending the ((<call|XMLRPC::Client#call>)) or ((<call2|XMLRPC::Client#call2>))
-message to this new instance. The given parameters indicate which method to 
-call on the remote-side and of course the parameters for the remote procedure.
-
-== Class Methods
---- XMLRPC::Client.new( host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil, user=nil, password=nil, use_ssl=false, timeout =nil)
-    Creates an object which represents the remote XML-RPC server on the 
-    given host ((|host|)). If the server is CGI-based, ((|path|)) is the
-    path to the CGI-script, which will be called, otherwise (in the
-    case of a standalone server) ((|path|)) should be (({"/RPC2"})).
-    ((|port|)) is the port on which the XML-RPC server listens.
-    If ((|proxy_host|)) is given, then a proxy server listening at
-    ((|proxy_host|)) is used. ((|proxy_port|)) is the port of the
-    proxy server.
-
-    Default values for ((|host|)), ((|path|)) and ((|port|)) are 'localhost', '/RPC2' and
-    '80' respectively using SSL '443'.
-
-    If ((|user|)) and ((|password|)) are given, each time a request is send, 
-    a Authorization header is send. Currently only Basic Authentification is 
-    implemented no Digest.
-
-    If ((|use_ssl|)) is set to (({true})), comunication over SSL is enabled.
-    Note, that you need the SSL package from RAA installed.
-
-    Parameter ((|timeout|)) is the time to wait for a XML-RPC response, defaults to 30.
-
---- XMLRPC::Client.new2( uri, proxy=nil, timeout=nil)
-:   uri
-    URI specifying protocol (http or https), host, port, path, user and password.
-    Example: https://user:password@host:port/path
-
-:   proxy
-    Is of the form "host:port".
- 
-:   timeout
-    Defaults to 30. 
-
---- XMLRPC::Client.new3( hash={} )
-    Parameter ((|hash|)) has following case-insensitive keys:
-    * host
-    * path
-    * port
-    * proxy_host
-    * proxy_port
-    * user
-    * password
-    * use_ssl
-    * timeout
-
-    Calls ((<XMLRPC::Client.new>)) with the corresponding values.
-
-== Instance Methods
---- XMLRPC::Client#call( method, *args )
-    Invokes the method named ((|method|)) with the parameters given by 
-    ((|args|)) on the XML-RPC server.
-    The parameter ((|method|)) is converted into a (({String})) and should 
-    be a valid XML-RPC method-name.  
-    Each parameter of ((|args|)) must be of one of the following types,
-    where (({Hash})), (({Struct})) and (({Array})) can contain any of these listed ((:types:)):
-    * (({Fixnum})), (({Bignum}))
-    * (({TrueClass})), (({FalseClass})) ((({true})), (({false})))
-    * (({String})), (({Symbol}))
-    * (({Float}))
-    * (({Hash})), (({Struct}))
-    * (({Array}))
-    * (({Date})), (({Time})), (({XMLRPC::DateTime}))
-    * (({XMLRPC::Base64})) 
-    * A Ruby object which class includes XMLRPC::Marshallable (only if Config::ENABLE_MARSHALLABLE is (({true}))). 
-      That object is converted into a hash, with one additional key/value pair "___class___" which contains the class name
-      for restoring later that object.
-    
-    The method returns the return-value from the RPC 
-    ((-stands for Remote Procedure Call-)). 
-    The type of the return-value is one of the above shown,
-    only that a (({Bignum})) is only allowed when it fits in 32-bit and
-    that a XML-RPC (('dateTime.iso8601')) type is always returned as
-    a ((<(({XMLRPC::DateTime}))|URL:datetime.html>)) object and 
-    a (({Struct})) is never returned, only a (({Hash})), the same for a (({Symbol})), where
-    always a (({String})) is returned. 
-    A (({XMLRPC::Base64})) is returned as a (({String})) from xmlrpc4r version 1.6.1 on.
-    
-    If the remote procedure returned a fault-structure, then a 
-    (({XMLRPC::FaultException})) exception is raised, which has two accessor-methods
-    (({faultCode})) and (({faultString})) of type (({Integer})) and (({String})).
-
---- XMLRPC::Client#call2( method, *args )
-    The difference between this method and ((<call|XMLRPC::Client#call>)) is, that
-    this method do ((*not*)) raise a (({XMLRPC::FaultException})) exception.
-    The method returns an array of two values. The first value indicates if 
-    the second value is a return-value ((({true}))) or an object of type
-    (({XMLRPC::FaultException})). 
-    Both are explained in ((<call|XMLRPC::Client#call>)).
-
---- XMLRPC::Client#multicall( *methods )
-    You can use this method to execute several methods on a XMLRPC server which supports
-    the multi-call extension.
-    Example:
-
-      s.multicall(
-        ['michael.add', 3, 4],
-        ['michael.sub', 4, 5]
-      )
-      # => [7, -1]
-
---- XMLRPC::Client#multicall2( *methods )
-    Same as ((<XMLRPC::Client#multicall>)), but returns like ((<XMLRPC::Client#call2>)) two parameters 
-    instead of raising an (({XMLRPC::FaultException})).
-
---- XMLRPC::Client#proxy( prefix, *args )
-    Returns an object of class (({XMLRPC::Client::Proxy})), initialized with
-    ((|prefix|)) and ((|args|)). A proxy object returned by this method behaves
-    like ((<XMLRPC::Client#call>)), i.e. a call on that object will raise a
-    (({XMLRPC::FaultException})) when a fault-structure is returned by that call. 
-
---- XMLRPC::Client#proxy2( prefix, *args )
-    Almost the same like ((<XMLRPC::Client#proxy>)) only that a call on the returned
-    (({XMLRPC::Client::Proxy})) object behaves like ((<XMLRPC::Client#call2>)), i.e.
-    a call on that object will return two parameters. 
-
-
-
-
---- XMLRPC::Client#call_async(...)
---- XMLRPC::Client#call2_async(...)
---- XMLRPC::Client#multicall_async(...)
---- XMLRPC::Client#multicall2_async(...)
---- XMLRPC::Client#proxy_async(...)
---- XMLRPC::Client#proxy2_async(...)
-    In contrast to corresponding methods without "_async", these can be
-    called concurrently and use for each request a new connection, where the 
-    non-asynchronous counterparts use connection-alive (one connection for all requests)
-    if possible. 
-
-    Note, that you have to use Threads to call these methods concurrently. 
-    The following example calls two methods concurrently:
-    
-      Thread.new {
-        p client.call_async("michael.add", 4, 5)
-      }
- 
-      Thread.new {
-        p client.call_async("michael.div", 7, 9)
-      }
- 
-
---- XMLRPC::Client#timeout
---- XMLRPC::Client#user
---- XMLRPC::Client#password
-    Return the corresponding attributes.
-
---- XMLRPC::Client#timeout= (new_timeout)
---- XMLRPC::Client#user= (new_user)
---- XMLRPC::Client#password= (new_password)
-    Set the corresponding attributes.
-    
-
---- XMLRPC::Client#set_writer( writer )
-    Sets the XML writer to use for generating XML output.
-    Should be an instance of a class from module (({XMLRPC::XMLWriter})).
-    If this method is not called, then (({XMLRPC::Config::DEFAULT_WRITER})) is used. 
-
---- XMLRPC::Client#set_parser( parser )
-    Sets the XML parser to use for parsing XML documents.
-    Should be an instance of a class from module (({XMLRPC::XMLParser})).
-    If this method is not called, then (({XMLRPC::Config::DEFAULT_PARSER})) is used.
-
-
-= XMLRPC::Client::Proxy
-== Synopsis
-    require "xmlrpc/client"
-
-    server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
-
-    michael  = server.proxy("michael")
-    michael2 = server.proxy("michael", 4)
-
-    # both calls should return the same value '9'.
-    p michael.add(4,5)
-    p michael2.add(5)
-
-== Description
-Class (({XMLRPC::Client::Proxy})) makes XML-RPC calls look nicer!
-You can call any method onto objects of that class - the object handles 
-(({method_missing})) and will forward the method call to a XML-RPC server.
-Don't use this class directly, but use instead method ((<XMLRPC::Client#proxy>)) or
-((<XMLRPC::Client#proxy2>)).
-
-== Class Methods
---- XMLRPC::Client::Proxy.new( server, prefix, args=[], meth=:call, delim="." ) 
-    Creates an object which provides (({method_missing})).
-
-    ((|server|)) must be of type (({XMLRPC::Client})), which is the XML-RPC server to be used
-    for a XML-RPC call. ((|prefix|)) and ((|delim|)) will be prepended to the methodname
-    called onto this object. 
-
-    Parameter ((|meth|)) is the method (call, call2, call_async, call2_async) to use for
-    a RPC.
-
-    ((|args|)) are arguments which are automatically given
-    to every XML-RPC call before the arguments provides through (({method_missing})).
-    
-== Instance Methods
-Every method call is forwarded to the XML-RPC server defined in ((<new|XMLRPC::Client::Proxy#new>)).
-    
-Note: Inherited methods from class (({Object})) cannot be used as XML-RPC names, because they get around
-(({method_missing})). 
-          
-
-
-= History
-    $Id$
-
-=end
-
-
-
-require "xmlrpc/parser"
-require "xmlrpc/create"
-require "xmlrpc/config"
-require "xmlrpc/utils"     # ParserWriterChooseMixin
-require "net/http"
-
-module XMLRPC
-
-  class Client
-   
-    USER_AGENT = "XMLRPC::Client (Ruby #{RUBY_VERSION})"
-
-    include ParserWriterChooseMixin
-    include ParseContentType
-
-
-    # Constructors -------------------------------------------------------------------
-
-    def initialize(host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil, 
-                   user=nil, password=nil, use_ssl=nil, timeout=nil)
-
-      @host       = host || "localhost"
-      @path       = path || "/RPC2"
-      @proxy_host = proxy_host
-      @proxy_port = proxy_port
-      @proxy_host ||= 'localhost' if @proxy_port != nil
-      @proxy_port ||= 8080 if @proxy_host != nil
-      @use_ssl    = use_ssl || false
-      @timeout    = timeout || 30
-
-      if use_ssl
-        require "net/https"
-        @port = port || 443
-      else
-        @port = port || 80
-      end
-
-      @user, @password = user, password
-
-      set_auth
-
-      # convert ports to integers
-      @port = @port.to_i if @port != nil
-      @proxy_port = @proxy_port.to_i if @proxy_port != nil
-
-      # HTTP object for synchronous calls
-      Net::HTTP.version_1_2
-      @http = Net::HTTP.new(@host, @port, @proxy_host, @proxy_port) 
-      @http.use_ssl = @use_ssl if @use_ssl
-      @http.read_timeout = @timeout
-      @http.open_timeout = @timeout
-
-      @parser = nil
-      @create = nil
-    end
-
-
-    def self.new2(uri, proxy=nil, timeout=nil)
-      if match = /^([^:]+):\/\/(([^@]+)@)?([^\/]+)(\/.*)?$/.match(uri)
-        proto = match[1]
-        user, passwd = (match[3] || "").split(":")
-        host, port = match[4].split(":") 
-        path = match[5]
-
-        if proto != "http" and proto != "https"
-          raise "Wrong protocol specified. Only http or https allowed!"
-        end
-
-      else
-        raise "Wrong URI as parameter!"
-      end
- 
-      proxy_host, proxy_port = (proxy || "").split(":")
-
-      self.new(host, path, port, proxy_host, proxy_port, user, passwd, (proto == "https"), timeout)
-    end
- 
-
-    def self.new3(hash={})
-
-      # convert all keys into lowercase strings
-      h = {}
-      hash.each { |k,v| h[k.to_s.downcase] = v }
-
-      self.new(h['host'], h['path'], h['port'], h['proxy_host'], h['proxy_port'], h['user'], h['password'],
-               h['use_ssl'], h['timeout'])
-    end
-
-
-    # Attribute Accessors -------------------------------------------------------------------
-
-    attr_reader :timeout, :user, :password
-
-    def timeout=(new_timeout)
-      @timeout = new_timeout
-      @http.read_timeout = @timeout
-      @http.open_timeout = @timeout
-    end
-
-    def user=(new_user)
-      @user = new_user
-      set_auth
-    end
-
-    def password=(new_password)
-      @password = new_password
-      set_auth
-    end
-
-    # Call methods --------------------------------------------------------------
-
-    def call(method, *args)
-      ok, param = call2(method, *args) 
-      if ok
-        param
-      else
-        raise param
-      end
-    end 
-
-    def call2(method, *args)
-      request = create().methodCall(method, *args)
-      data = do_rpc(request, false)
-      parser().parseMethodResponse(data)
-    end
-
-    def call_async(method, *args)
-      ok, param = call2_async(method, *args) 
-      if ok
-        param
-      else
-        raise param
-      end
-    end 
-
-    def call2_async(method, *args)
-      request = create().methodCall(method, *args)
-      data = do_rpc(request, true)
-      parser().parseMethodResponse(data)
-    end
-
-
-    # Multicall methods --------------------------------------------------------------
-
-    def multicall(*methods)
-      ok, params = multicall2(*methods)
-      if ok
-        params
-      else
-        raise params
-      end
-    end
-
-    def multicall2(*methods)
-      gen_multicall(methods, false)
-    end
-
-    def multicall_async(*methods)
-      ok, params = multicall2_async(*methods)
-      if ok
-        params
-      else
-        raise params
-      end
-    end
-
-    def multicall2_async(*methods)
-      gen_multicall(methods, true)
-    end
-
-
-    # Proxy generating methods ------------------------------------------
-    
-    def proxy(prefix, *args)
-      Proxy.new(self, prefix, args, :call)
-    end
-
-    def proxy2(prefix, *args)
-      Proxy.new(self, prefix, args, :call2)
-    end
-
-    def proxy_async(prefix, *args)
-      Proxy.new(self, prefix, args, :call_async)
-    end
-
-    def proxy2_async(prefix, *args)
-      Proxy.new(self, prefix, args, :call2_async)
-    end
-
-
-    private # ----------------------------------------------------------
-
-    def set_auth
-      if @user.nil?
-        @auth = nil
-      else
-        a =  "#@user"
-        a << ":#@password" if @password != nil
-        @auth = ("Basic " + [a].pack("m")).chomp
-      end
-    end
-
-    def do_rpc(request, async=false)
-      header = {  
-       "User-Agent"     =>  USER_AGENT,
-       "Content-Type"   => "text/xml",
-       "Content-Length" => request.size.to_s, 
-       "Connection"     => (async ? "close" : "keep-alive")
-      }
-
-      if @auth != nil
-        # add authorization header
-        header["Authorization"] = @auth
-      end
- 
-      resp = nil
-
-      if async
-        # use a new HTTP object for each call 
-        Net::HTTP.version_1_2
-        http = Net::HTTP.new(@host, @port, @proxy_host, @proxy_port) 
-        http.use_ssl = @use_ssl if @use_ssl
-        http.read_timeout = @timeout
-        http.open_timeout = @timeout
-        
-        # post request
-        http.start {
-          resp = http.post2(@path, request, header) 
-        }
-      else
-        # reuse the HTTP object for each call => connection alive is possible
-        
-        # post request
-        resp = @http.post2(@path, request, header) 
-      end
-  
-      data = resp.body
-
-      if resp.code == "401"
-        # Authorization Required
-        raise "Authorization failed.\nHTTP-Error: #{resp.code} #{resp.message}" 
-      elsif resp.code[0,1] != "2"
-        raise "HTTP-Error: #{resp.code} #{resp.message}" 
-      end
-
-      ct = parse_content_type(resp["Content-Type"]).first
-      if ct != "text/xml"
-        if ct == "text/html"
-          raise "Wrong content-type: \n#{data}"
-        else
-          raise "Wrong content-type"
-        end
-      end
-
-      expected = resp["Content-Length"] || "<unknown>"
-      if data.nil? or data.size == 0 
-        raise "Wrong size. Was #{data.size}, should be #{expected}" 
-      elsif expected.to_i != data.size and resp["Transfer-Encoding"].nil?
-        raise "Wrong size. Was #{data.size}, should be #{expected}"
-      end
-
-      return data
-    end
-
-    def gen_multicall(methods=[], async=false)
-      meth = :call2
-      meth = :call2_async if async
-
-      ok, params = self.send(meth, "system.multicall", 
-        methods.collect {|m| {'methodName' => m[0], 'params' => m[1..-1]} }
-      )
-
-      if ok 
-        params = params.collect do |param|
-          if param.is_a? Array
-            param[0]
-          elsif param.is_a? Hash
-            XMLRPC::FaultException.new(param["faultCode"], param["faultString"])
-          else
-            raise "Wrong multicall return value"
-          end 
-        end
-      end
-
-      return ok, params
-    end
-
-
-
-    class Proxy
-
-      def initialize(server, prefix, args=[], meth=:call, delim=".")
-	@server = server
-	@prefix = prefix + delim
-	@args   = args 
-        @meth   = meth
-      end
-
-      def method_missing(mid, *args)
-	pre = @prefix + mid.to_s
-	arg = @args + args
-	@server.send(@meth, pre, *arg)
-      end
-
-    end # class Proxy
-
-  end # class Client
-
-end # module XMLRPC
-
diff --git a/lib/xmlrpc/config.rb b/lib/xmlrpc/config.rb
deleted file mode 100644
index c4d2c41aac..0000000000
--- a/lib/xmlrpc/config.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# $Id$
-# Configuration file for XML-RPC for Ruby
-#
-
-module XMLRPC
-
-  module Config
-
-    DEFAULT_WRITER = XMLWriter::Simple            # or XMLWriter::XMLParser
-    
-    # available parser:
-    #   * XMLParser::NQXMLTreeParser
-    #   * XMLParser::NQXMLStreamParser
-    #   * XMLParser::XMLTreeParser
-    #   * XMLParser::XMLStreamParser (fastest)
-    #   * XMLParser::REXMLStreamParser
-    #   * XMLParser::XMLScanStreamParser
-    DEFAULT_PARSER = XMLParser::REXMLStreamParser
-
-    # enable <nil/> tag
-    ENABLE_NIL_CREATE    = false
-    ENABLE_NIL_PARSER    = false
-    
-    # allows integers greater than 32-bit if true
-    ENABLE_BIGINT        = false
-
-    # enable marshalling ruby objects which include XMLRPC::Marshallable
-    ENABLE_MARSHALLING   = true 
-
-    # enable multiCall extension by default
-    ENABLE_MULTICALL     = false
-    
-    # enable Introspection extension by default
-    ENABLE_INTROSPECTION = false
-
-  end
-
-end
-
diff --git a/lib/xmlrpc/create.rb b/lib/xmlrpc/create.rb
deleted file mode 100644
index 072e72ab46..0000000000
--- a/lib/xmlrpc/create.rb
+++ /dev/null
@@ -1,280 +0,0 @@
-#
-# Creates XML-RPC call/response documents
-# 
-# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-#
-# $Id$
-#
-
-require "date"
-require "xmlrpc/base64"
-
-module XMLRPC
-
-  module XMLWriter
-
-    class Abstract
-      def ele(name, *children)
-	element(name, nil, *children)
-      end
-
-      def tag(name, txt)
-	element(name, nil, text(txt))
-      end
-    end
-
-
-    class Simple < Abstract
-
-      def document_to_str(doc)
-	doc
-      end
-
-      def document(*params)
-	params.join("")
-      end
-
-      def pi(name, *params)
-	"<?#{name} " + params.join(" ") + " ?>"
-      end
-
-      def element(name, attrs, *children)
-	raise "attributes not yet implemented" unless attrs.nil?
-        if children.empty?
-          "<#{name}/>" 
-        else
-          "<#{name}>" + children.join("") + "</#{name}>"
-        end
-      end
-
-      def text(txt)
-        cleaned = txt.dup
-        cleaned.gsub!(/&/, '&amp;')
-        cleaned.gsub!(/</, '&lt;')
-        cleaned.gsub!(/>/, '&gt;')
-        cleaned
-      end
-
-    end # class Simple
-
-
-    class XMLParser < Abstract
-
-      def initialize
-	require "xmltreebuilder"
-      end
-
-      def document_to_str(doc)
-	doc.to_s
-      end
-
-      def document(*params)
-	XML::SimpleTree::Document.new(*params) 
-      end
-
-      def pi(name, *params)
-	XML::SimpleTree::ProcessingInstruction.new(name, *params)
-      end
-
-      def element(name, attrs, *children)
-	XML::SimpleTree::Element.new(name, attrs, *children)
-      end
-
-      def text(txt)
-	XML::SimpleTree::Text.new(txt)
-      end
-
-    end # class XMLParser
-
-  end # module XMLWriter
-
-  class Create
-
-    def initialize(xml_writer = nil)
-      @writer = xml_writer || Config::DEFAULT_WRITER.new
-    end
-
-
-    def methodCall(name, *params)
-      name = name.to_s
-
-      if name !~ /[a-zA-Z0-9_.:\/]+/
-	raise ArgumentError, "Wrong XML-RPC method-name"
-      end
-
-      parameter = params.collect do |param|
-	@writer.ele("param", conv2value(param))
-      end
-
-      tree = @writer.document(
-	       @writer.pi("xml", 'version="1.0"'),
-	       @writer.ele("methodCall",   
-		 @writer.tag("methodName", name),
-		 @writer.ele("params", *parameter)    
-	       )
-	     )
-
-      @writer.document_to_str(tree) + "\n"
-    end
-
-
-
-    #
-    # generates a XML-RPC methodResponse document
-    #
-    # if is_ret == false then the params array must
-    # contain only one element, which is a structure
-    # of a fault return-value.
-    # 
-    # if is_ret == true then a normal 
-    # return-value of all the given params is created.
-    #
-    def methodResponse(is_ret, *params)
-
-      if is_ret 
-	resp = params.collect do |param|
-	  @writer.ele("param", conv2value(param))
-	end
-     
-	resp = [@writer.ele("params", *resp)]
-      else
-	if params.size != 1 or params[0] === XMLRPC::FaultException 
-	  raise ArgumentError, "no valid fault-structure given"
-	end
-	resp = @writer.ele("fault", conv2value(params[0].to_h))
-      end
-
-	
-      tree = @writer.document(
-	       @writer.pi("xml", 'version="1.0"'),
-	       @writer.ele("methodResponse", resp) 
-	     )
-
-      @writer.document_to_str(tree) + "\n"
-    end
-
-
-
-    #####################################
-    private
-    #####################################
-
-    #
-    # converts a Ruby object into
-    # a XML-RPC <value> tag
-    #
-    def conv2value(param)
-
-	val = case param
-	when Fixnum 
-	  @writer.tag("i4", param.to_s)
-
-	when Bignum
-          if Config::ENABLE_BIGINT
-            @writer.tag("i4", param.to_s)
-          else
-            if param >= -(2**31) and param <= (2**31-1)
-              @writer.tag("i4", param.to_s)
-            else
-              raise "Bignum is too big! Must be signed 32-bit integer!"
-            end
-          end
-	when TrueClass, FalseClass
-	  @writer.tag("boolean", param ? "1" : "0")
-
-	when String 
-	  @writer.tag("string", param)
-
-	when Symbol 
-	  @writer.tag("string", param.to_s)
-
-        when NilClass
-          if Config::ENABLE_NIL_CREATE
-            @writer.ele("nil")
-          else
-            raise "Wrong type NilClass. Not allowed!"
-          end
-
-	when Float
-	  @writer.tag("double", param.to_s)
-
-	when Struct
-	  h = param.members.collect do |key| 
-	    value = param[key]
-	    @writer.ele("member", 
-	      @writer.tag("name", key.to_s),
-	      conv2value(value) 
-	    )
-	  end
-
-	  @writer.ele("struct", *h) 
-
-	when Hash
-	  # TODO: can a Hash be empty?
-	  
-	  h = param.collect do |key, value|
-	    @writer.ele("member", 
-	      @writer.tag("name", key.to_s),
-	      conv2value(value) 
-	    )
-	  end
-
-	  @writer.ele("struct", *h) 
-
-	when Array
-	  # TODO: can an Array be empty?
-	  a = param.collect {|v| conv2value(v) }
-	  
-	  @writer.ele("array", 
-	    @writer.ele("data", *a)
-	  )
-
-	when Date
-	  t = param
-	  @writer.tag("dateTime.iso8601", 
-	    format("%.4d%02d%02dT00:00:00", t.year, t.month, t.day))
-
-	when Time
-	  @writer.tag("dateTime.iso8601", param.strftime("%Y%m%dT%H:%M:%S"))  
-
-	when XMLRPC::DateTime
-	  @writer.tag("dateTime.iso8601", 
-	    format("%.4d%02d%02dT%02d:%02d:%02d", *param.to_a))
-   
-	when XMLRPC::Base64
-	  @writer.tag("base64", param.encoded) 
-
-	else 
-          if Config::ENABLE_MARSHALLING and param.class.included_modules.include? XMLRPC::Marshallable
-            # convert Ruby object into Hash
-            ret = {"___class___" => param.class.name}
-            param.__get_instance_variables.each {|name, val| 
-              if val.nil?
-                ret[name] = val if Config::ENABLE_NIL_CREATE
-              else
-                ret[name] = val
-              end
-            }
-            return conv2value(ret)
-          else 
-            ok, pa = wrong_type(param)
-            if ok
-              return conv2value(pa)
-            else 
-              raise "Wrong type!"
-            end
-          end
-	end
-	 
-	@writer.ele("value", val)
-    end
-
-    def wrong_type(value)
-      false
-    end
-
-    
-  end # class Create
-
-end # module XMLRPC
-
diff --git a/lib/xmlrpc/datetime.rb b/lib/xmlrpc/datetime.rb
deleted file mode 100644
index e3bc6943f0..0000000000
--- a/lib/xmlrpc/datetime.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-=begin
-= xmlrpc/datetime.rb
-Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-
-Released under the same term of license as Ruby.
-
-= Classes
-* ((<XMLRPC::DateTime>))
-
-= XMLRPC::DateTime
-== Description
-This class is important to handle XMLRPC (('dateTime.iso8601')) values,
-correcly, because normal UNIX-dates (class (({Date}))) only handle dates 
-from year 1970 on, and class (({Time})) handles dates without the time
-component. (({XMLRPC::DateTime})) is able to store a XMLRPC 
-(('dateTime.iso8601')) value correctly.
-
-== Class Methods
---- XMLRPC::DateTime.new( year, month, day, hour, min, sec )
-    Creates a new (({XMLRPC::DateTime})) instance with the
-    parameters ((|year|)), ((|month|)), ((|day|)) as date and 
-    ((|hour|)), ((|min|)), ((|sec|)) as time.
-    Raises (({ArgumentError})) if a parameter is out of range, or ((|year|)) is not
-    of type (({Integer})).
-    
-== Instance Methods
---- XMLRPC::DateTime#year
---- XMLRPC::DateTime#month
---- XMLRPC::DateTime#day
---- XMLRPC::DateTime#hour
---- XMLRPC::DateTime#min
---- XMLRPC::DateTime#sec
-    Return the value of the specified date/time component.
-
---- XMLRPC::DateTime#mon
-    Alias for ((<XMLRPC::DateTime#month>)).
-
---- XMLRPC::DateTime#year=( value )
---- XMLRPC::DateTime#month=( value )
---- XMLRPC::DateTime#day=( value )
---- XMLRPC::DateTime#hour=( value )
---- XMLRPC::DateTime#min=( value )
---- XMLRPC::DateTime#sec=( value )
-    Set ((|value|)) as the new date/time component.
-    Raises (({ArgumentError})) if ((|value|)) is out of range, or in the case
-    of (({XMLRPC::DateTime#year=})) if ((|value|)) is not of type (({Integer})).
-
---- XMLRPC::DateTime#mon=( value )
-    Alias for ((<XMLRPC::DateTime#month=>)).
-
---- XMLRPC::DateTime#to_time
-    Return a (({Time})) object of the date/time which (({self})) represents.
-    If the (('year')) is below 1970, this method returns (({nil})), 
-    because (({Time})) cannot handle years below 1970.
-    The used timezone is GMT.
-
---- XMLRPC::DateTime#to_date
-    Return a (({Date})) object of the date which (({self})) represents.
-    The (({Date})) object do ((*not*)) contain the time component (only date).
-
---- XMLRPC::DateTime#to_a
-    Returns all date/time components in an array.
-    Returns (({[year, month, day, hour, min, sec]})).
-=end
-
-require "date"
-
-module XMLRPC
-
-class DateTime
-  
-  attr_reader :year, :month, :day, :hour, :min, :sec
-
-  def year= (value)
-    raise ArgumentError, "date/time out of range" unless value.is_a? Integer
-    @year = value
-  end
-
-  def month= (value)
-    raise ArgumentError, "date/time out of range" unless (1..12).include? value
-    @month = value
-  end
-
-  def day= (value)
-    raise ArgumentError, "date/time out of range" unless (1..31).include? value
-    @day = value
-  end
-
-  def hour= (value)
-    raise ArgumentError, "date/time out of range" unless (0..24).include? value
-    @hour = value
-  end
-
-  def min= (value)
-    raise ArgumentError, "date/time out of range" unless (0..59).include? value
-    @min = value
-  end
-
-  def sec= (value)
-    raise ArgumentError, "date/time out of range" unless (0..59).include? value
-    @sec = value
-  end
-
-  alias mon  month
-  alias mon= month= 
- 
-
-  def initialize(year, month, day, hour, min, sec)
-    self.year, self.month, self.day = year, month, day
-    self.hour, self.min, self.sec   = hour, min, sec
-  end
- 
-  def to_time
-    if @year >= 1970
-      Time.gm(*to_a)
-    else
-      nil
-    end
-  end
-
-  def to_date
-    Date.new(*to_a[0,3])
-  end
-
-  def to_a
-    [@year, @month, @day, @hour, @min, @sec]
-  end
-
-end
-
-
-end # module XMLRPC
-
-
-=begin
-= History
-    $Id$
-=end
diff --git a/lib/xmlrpc/httpserver.rb b/lib/xmlrpc/httpserver.rb
deleted file mode 100644
index 9afb5fd5ec..0000000000
--- a/lib/xmlrpc/httpserver.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-#
-# Implements a simple HTTP-server by using John W. Small's (jsmall@laser.net) 
-# ruby-generic-server.
-# 
-# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-#
-# $Id$
-#
-
-
-require "gserver"
-
-class HttpServer < GServer
-
-  ##
-  # handle_obj specifies the object, that receives calls to request_handler
-  # and ip_auth_handler 
-  def initialize(handle_obj, port = 8080, host = DEFAULT_HOST, maxConnections = 4, 
-                 stdlog = $stdout, audit = true, debug = true)
-    @handler = handle_obj
-    super(port, host, maxConnections, stdlog, audit, debug)
-  end
-
-private
-
-  # Constants -----------------------------------------------
-  
-  CRLF        = "\r\n"
-  HTTP_PROTO  = "HTTP/1.0"
-  SERVER_NAME = "HttpServer (Ruby #{RUBY_VERSION})"
-
-  DEFAULT_HEADER = {
-    "Server" => SERVER_NAME
-  }
-
-  ##
-  # Mapping of status code and error message
-  #
-  StatusCodeMapping = {
-    200 => "OK",
-    400 => "Bad Request",
-    403 => "Forbidden",
-    405 => "Method Not Allowed",
-    411 => "Length Required",
-    500 => "Internal Server Error"
-  }
-
-  # Classes -------------------------------------------------
-  
-  class Request
-    attr_reader :data, :header, :method, :path, :proto
-    
-    def initialize(data, method=nil, path=nil, proto=nil)
-      @header, @data = Table.new, data
-      @method, @path, @proto = method, path, proto
-    end
-    
-    def content_length
-      len = @header['Content-Length']
-      return nil if len.nil?
-      return len.to_i 
-    end
-    
-  end
-  
-  class Response
-    attr_reader   :header
-    attr_accessor :body, :status, :status_message
-    
-    def initialize(status=200)
-      @status = status
-      @status_message = nil
-      @header = Table.new
-    end
-  end
-
-
-  ##
-  # a case-insensitive Hash class for HTTP header
-  #
-  class Table
-    include Enumerable
-
-    def initialize(hash={})
-      @hash = hash 
-      update(hash)
-    end
-
-    def [](key)
-      @hash[key.to_s.capitalize]
-    end
-
-    def []=(key, value)
-      @hash[key.to_s.capitalize] = value
-    end
-
-    def update(hash)
-      hash.each {|k,v| self[k] = v}
-      self
-    end
-
-    def each
-      @hash.each {|k,v| yield k.capitalize, v }
-    end
-
-    def writeTo(port)
-      each { |k,v| port << "#{k}: #{v}" << CRLF }
-    end
-  end # class Table
-
-
-  # Helper Methods ------------------------------------------
-
-  def http_header(header=nil)
-    new_header = Table.new(DEFAULT_HEADER)
-    new_header.update(header) unless header.nil? 
-
-    new_header["Connection"] = "close"
-    new_header["Date"]       = http_date(Time.now)
-
-    new_header
-  end
-
-  def http_date( aTime )
-    aTime.gmtime.strftime( "%a, %d %b %Y %H:%M:%S GMT" )
-  end
-
-  def http_resp(status_code, status_message=nil, header=nil, body=nil)
-    status_message ||= StatusCodeMapping[status_code]
-    
-    str = ""
-    str << "#{HTTP_PROTO} #{status_code} #{status_message}" << CRLF
-    http_header(header).writeTo(str)
-    str << CRLF
-    str << body unless body.nil?
-    str
-  end
-
-  # Main Serve Loop -----------------------------------------
-  
-  def serve(io)  
-    # perform IP authentification
-    unless @handler.ip_auth_handler(io)
-      io << http_resp(403, "Forbidden")
-      return
-    end
-
-    # parse first line
-    if io.gets =~ /^(\S+)\s+(\S+)\s+(\S+)/
-      request = Request.new(io, $1, $2, $3)
-    else
-      io << http_resp(400, "Bad Request") 
-      return
-    end
-     
-    # parse HTTP headers
-    while (line=io.gets) !~ /^(\n|\r)/
-      if line =~ /^([\w-]+):\s*(.*)$/
-	request.header[$1] = $2.strip
-      end
-    end
-
-    io.binmode    
-    response = Response.new
-
-    # execute request handler
-    @handler.request_handler(request, response)
-   
-    # write response back to the client
-    io << http_resp(response.status, response.status_message,
-                    response.header, response.body) 
-
-  rescue Exception => e
-    io << http_resp(500, "Internal Server Error")
-  end
-
-end # class HttpServer
-
diff --git a/lib/xmlrpc/marshal.rb b/lib/xmlrpc/marshal.rb
deleted file mode 100644
index 26510124c2..0000000000
--- a/lib/xmlrpc/marshal.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Marshalling of XML-RPC methodCall and methodResponse
-# 
-# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-#
-# $Id$
-#
-
-require "xmlrpc/parser"
-require "xmlrpc/create"
-require "xmlrpc/config"
-require "xmlrpc/utils"
-
-module XMLRPC
-
-  class Marshal
-    include ParserWriterChooseMixin
-
-    # class methods -------------------------------
-   
-    class << self
-
-      def dump_call( methodName, *params )
-        new.dump_call( methodName, *params )
-      end
-
-      def dump_response( param )
-        new.dump_response( param )
-      end
-
-      def load_call( stringOrReadable )
-        new.load_call( stringOrReadable )
-      end
-
-      def load_response( stringOrReadable )
-        new.load_response( stringOrReadable )
-      end
-
-      alias dump dump_response
-      alias load load_response
-
-    end # class self
-
-    # instance methods ----------------------------
-
-    def initialize( parser = nil, writer = nil )
-      set_parser( parser )
-      set_writer( writer )
-    end
-
-    def dump_call( methodName, *params )
-      create.methodCall( methodName, *params )
-    end
-
-    def dump_response( param ) 
-      create.methodResponse( ! param.kind_of?( XMLRPC::FaultException ) , param )
-    end
-
-    ##
-    # returns [ methodname, params ]
-    #
-    def load_call( stringOrReadable )
-      parser.parseMethodCall( stringOrReadable )
-    end
-
-    ##
-    # returns paramOrFault
-    #
-    def load_response( stringOrReadable )
-      parser.parseMethodResponse( stringOrReadable )[1]
-    end
-
-  end # class Marshal
-
-end
-
diff --git a/lib/xmlrpc/parser.rb b/lib/xmlrpc/parser.rb
deleted file mode 100644
index cfbf78f3b3..0000000000
--- a/lib/xmlrpc/parser.rb
+++ /dev/null
@@ -1,803 +0,0 @@
-#
-# Parser for XML-RPC call and response
-# 
-# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-#
-# $Id$
-#
-
-
-require "date"
-require "xmlrpc/base64"
-require "xmlrpc/datetime"
-
-
-# add some methods to NQXML::Node
-module NQXML
-  class Node
-
-    def removeChild(node)
-      @children.delete(node)
-    end
-    def childNodes
-      @children
-    end
-    def hasChildNodes
-      not @children.empty?
-    end
-    def [] (index)
-      @children[index]
-    end
-
-    def nodeType
-      if @entity.instance_of? NQXML::Text then :TEXT
-      elsif @entity.instance_of? NQXML::Comment then :COMMENT
-      #elsif @entity.instance_of? NQXML::Element then :ELEMENT
-      elsif @entity.instance_of? NQXML::Tag then :ELEMENT
-      else :ELSE
-      end
-    end
-
-    def nodeValue
-      #TODO: error when wrong Entity-type
-      @entity.text
-    end
-    def nodeName
-      #TODO: error when wrong Entity-type
-      @entity.name
-    end
-  end # class Node
-end # module NQXML
-
-module XMLRPC
-
-  class FaultException < Exception
-    attr_reader :faultCode, :faultString
-
-    def initialize(faultCode, faultString)
-      @faultCode   = faultCode
-      @faultString = faultString
-    end
-    
-    # returns a hash
-    def to_h
-      {"faultCode" => @faultCode, "faultString" => @faultString}
-    end
-  end
-
-  module Convert
-    def self.int(str)
-      str.to_i
-    end
-
-    def self.boolean(str)
-      case str
-      when "0" then false
-      when "1" then true
-      else
-        raise "RPC-value of type boolean is wrong" 
-      end
-    end
-
-    def self.double(str)
-      str.to_f
-    end
-
-    def self.dateTime(str)
-      if str =~ /^(-?\d\d\d\d)(\d\d)(\d\d)T(\d\d):(\d\d):(\d\d)$/ then
-        # TODO: Time.gm ??? .local ??? 
-        a = [$1, $2, $3, $4, $5, $6].collect{|i| i.to_i}
-	  
-        XMLRPC::DateTime.new(*a)
-        #if a[0] >= 1970 then
-        #  Time.gm(*a)
-        #else
-        #  Date.new(*a[0,3])
-        #end
-      else
-        raise "wrong dateTime.iso8601 format"
-      end
-    end
-
-    def self.base64(str)
-      XMLRPC::Base64.decode(str)
-    end
-
-    def self.struct(hash)
-      # convert to marhalled object
-      klass = hash["___class___"]
-      if klass.nil? or Config::ENABLE_MARSHALLING == false 
-        hash
-      else
-        begin
-          mod = Module
-          klass.split("::").each {|const| mod = mod.const_get(const.strip)}
-          
-          Thread.critical = true
-          # let initialize take 0 parameters
-          mod.module_eval %{
-            begin
-              alias __initialize initialize
-            rescue NameError
-            end
-            def initialize; end
-          }
-
-          obj = mod.new
-
-          # restore old initialize
-          mod.module_eval %{
-            undef initialize
-            begin
-              alias initialize __initialize
-            rescue NameError
-            end
-          }
-          Thread.critical = false
-
-          hash.delete "___class___"
-          hash.each {|k,v| obj.__set_instance_variable(k, v) } 
-          obj
-        rescue
-          hash
-        end
-      end
-    end
-
-    def self.fault(hash)
-      if hash.kind_of? Hash and hash.size == 2 and 
-        hash.has_key? "faultCode" and hash.has_key? "faultString" and 
-        hash["faultCode"].kind_of? Integer and hash["faultString"].kind_of? String
-
-        XMLRPC::FaultException.new(hash["faultCode"], hash["faultString"]) 
-      else
-        raise "wrong fault-structure: #{hash.inspect}"
-      end
-    end
-
-  end # module Convert
-
-  module XMLParser
-
-    class AbstractTreeParser
-
-      def parseMethodResponse(str)
-	methodResponse_document(createCleanedTree(str))
-      end
-
-      def parseMethodCall(str)
-	methodCall_document(createCleanedTree(str))
-      end
-
-      private
-
-      #
-      # remove all whitespaces but in the tags i4, int, boolean....
-      # and all comments
-      #
-      def removeWhitespacesAndComments(node)
-	remove = []
-	childs = node.childNodes.to_a
-	childs.each do |nd|
-	  case _nodeType(nd)
-	  when :TEXT
-            # TODO: add nil?
-            unless %w(i4 int boolean string double dateTime.iso8601 base64).include? node.nodeName
-
-               if node.nodeName == "value" 
-                 if not node.childNodes.to_a.detect {|n| _nodeType(n) == :ELEMENT}.nil?
-                   remove << nd if nd.nodeValue.strip == "" 
-                 end
-               else
-                 remove << nd if nd.nodeValue.strip == ""
-               end
-	    end
-	  when :COMMENT
-	    remove << nd
-	  else
-	    removeWhitespacesAndComments(nd)
-	  end 
-	end
-
-	remove.each { |i| node.removeChild(i) }
-      end
-
-
-      def nodeMustBe(node, name)
-	cmp = case name
-	when Array 
-	  name.include?(node.nodeName)
-	when String
-	  name == node.nodeName
-	else
-	  raise "error"
-	end  
-
-	if not cmp then
-	  raise "wrong xml-rpc (name)"
-	end
-
-	node
-      end
-
-      #
-      # returns, when successfully the only child-node
-      #
-      def hasOnlyOneChild(node, name=nil)
-	if node.childNodes.to_a.size != 1
-	  raise "wrong xml-rpc (size)"
-	end
-	if name != nil then
-	  nodeMustBe(node.firstChild, name)
-	end
-      end
-
-
-      def assert(b)
-	if not b then
-	  raise "assert-fail" 
-	end
-      end
-
-      # the node `node` has empty string or string
-      def text_zero_one(node)
-	nodes = node.childNodes.to_a.size
-
-	if nodes == 1
-	  text(node.firstChild)
-	elsif nodes == 0
-	  ""
-	else
-	  raise "wrong xml-rpc (size)"
-	end
-      end
-     
-
-      def integer(node)
-	#TODO: check string for float because to_i returnsa
-	#      0 when wrong string
-	 nodeMustBe(node, %w(i4 int))    
-	hasOnlyOneChild(node)
-	
-	Convert.int(text(node.firstChild))
-      end
-
-      def boolean(node)
-	nodeMustBe(node, "boolean")    
-	hasOnlyOneChild(node)
-	
-        Convert.boolean(text(node.firstChild))
-      end
-
-      def v_nil(node)
-        nodeMustBe(node, "nil")
-	assert( node.childNodes.to_a.size == 0 )
-        nil
-      end
-
-      def string(node)
-	nodeMustBe(node, "string")    
-	text_zero_one(node)
-      end
-
-      def double(node)
-	#TODO: check string for float because to_f returnsa
-	#      0.0 when wrong string
-	nodeMustBe(node, "double")    
-	hasOnlyOneChild(node)
-	
-	Convert.double(text(node.firstChild))
-      end
-
-      def dateTime(node)
-	nodeMustBe(node, "dateTime.iso8601")
-	hasOnlyOneChild(node)
-	
-        Convert.dateTime( text(node.firstChild) )
-      end
-
-      def base64(node)
-	nodeMustBe(node, "base64")
-	#hasOnlyOneChild(node)
-	 
-        Convert.base64(text_zero_one(node))
-      end
-
-      def member(node)
-	nodeMustBe(node, "member")
-	assert( node.childNodes.to_a.size == 2 ) 
-
-	[ name(node[0]), value(node[1]) ]
-      end
-
-      def name(node)
-	nodeMustBe(node, "name")
-	#hasOnlyOneChild(node)
-	text_zero_one(node) 
-      end
-
-      def array(node)
-	nodeMustBe(node, "array")
-	hasOnlyOneChild(node, "data") 
-	data(node.firstChild)  
-      end
-
-      def data(node)
-	nodeMustBe(node, "data")
-
-	node.childNodes.to_a.collect do |val|
-	  value(val)
-	end 
-      end
-
-      def param(node)
-	nodeMustBe(node, "param")
-	hasOnlyOneChild(node, "value")
-	value(node.firstChild) 
-      end
- 
-      def methodResponse(node)
-	nodeMustBe(node, "methodResponse")
-	hasOnlyOneChild(node, %w(params fault))
-	child = node.firstChild
-
-	case child.nodeName
-	when "params"
-	  [ true, params(child,false) ] 
-	when "fault"
-	  [ false, fault(child) ]
-	else
-	  raise "unexpected error"
-	end
-
-      end
-
-      def methodName(node)
-	nodeMustBe(node, "methodName")
-	hasOnlyOneChild(node)
-	text(node.firstChild) 
-      end
-
-      def params(node, call=true)
-	nodeMustBe(node, "params")
-
-	if call 
-	  node.childNodes.to_a.collect do |n|
-	    param(n)
-	  end
-	else # response (only one param)
-	  hasOnlyOneChild(node)
-	  param(node.firstChild)
-	end
-      end
-
-      def fault(node)
-	nodeMustBe(node, "fault")
-	hasOnlyOneChild(node, "value")
-	f = value(node.firstChild) 
-        Convert.fault(f)
-      end
-
-
-
-      # _nodeType is defined in the subclass
-      def text(node)
-	assert( _nodeType(node) == :TEXT )
-	assert( node.hasChildNodes == false )
-	assert( node.nodeValue != nil )
-
-	node.nodeValue.to_s
-      end
-
-      def struct(node)
-	nodeMustBe(node, "struct")    
-
-	hash = {}
-	node.childNodes.to_a.each do |me|
-	  n, v = member(me)  
-	  hash[n] = v
-	end 
-
-        Convert.struct(hash)
-     end
-
-
-      def value(node)
-	nodeMustBe(node, "value")
-	nodes = node.childNodes.to_a.size
-        if nodes == 0 
-          return ""
-        elsif nodes > 1 
-	  raise "wrong xml-rpc (size)"
-        end
-
-	child = node.firstChild
-
-	case _nodeType(child)
-	when :TEXT
-          text_zero_one(node)
-	when :ELEMENT
-	  case child.nodeName
-	  when "i4", "int"        then integer(child)
-	  when "boolean"          then boolean(child)
-	  when "string"           then string(child)
-	  when "double"           then double(child)
-	  when "dateTime.iso8601" then dateTime(child)
-	  when "base64"           then base64(child)
-	  when "struct"           then struct(child)
-	  when "array"            then array(child) 
-          when "nil"              
-            if Config::ENABLE_NIL_PARSER
-              v_nil(child)
-            else
-              raise "wrong/unknown XML-RPC type 'nil'"
-            end
-	  else 
-	    raise "wrong/unknown XML-RPC type"
-	  end
-	else
-	  raise "wrong type of node"
-	end
-
-      end
-
-      def methodCall(node)
-	nodeMustBe(node, "methodCall")
-	assert( (1..2).include?( node.childNodes.to_a.size ) ) 
-	name = methodName(node[0])
-
-	if node.childNodes.to_a.size == 2 then
-	  pa = params(node[1])
-	else # no parameters given
-	  pa = []
-	end
-	[name, pa]
-      end
-
-    end # module TreeParserMixin
-
-    class AbstractStreamParser
-      def parseMethodResponse(str)
-        parser = @parser_class.new
-        parser.parse(str)
-        raise "No valid method response!" if parser.method_name != nil
-        if parser.fault != nil
-          # is a fault structure
-          [false, parser.fault] 
-        else
-          # is a normal return value
-          raise "Missing return value!" if parser.params.size == 0
-          raise "To many return values. Only one allowed!" if parser.params.size > 1
-          [true, parser.params[0]]
-        end
-      end
-
-      def parseMethodCall(str)
-        parser = @parser_class.new
-        parser.parse(str)
-        raise "No valid method call - missing method name!" if parser.method_name.nil?
-        [parser.method_name, parser.params]
-      end
-    end
-
-    module StreamParserMixin
-      attr_reader :params
-      attr_reader :method_name
-      attr_reader :fault
-
-      def initialize(*a)
-        super(*a)
-        @params = []
-        @values = []
-        @val_stack = []
-
-        @names = []
-        @name = []
-
-        @structs = []
-        @struct = {}
-
-        @method_name = nil
-        @fault = nil
-
-        @data = nil
-      end
-
-      def startElement(name, attrs=[])
-        @data = nil
-        case name
-        when "value"
-          @value = nil
-        when "nil"
-          raise "wrong/unknown XML-RPC type 'nil'" unless Config::ENABLE_NIL_PARSER
-          @value = :nil 
-        when "array"
-          @val_stack << @values
-          @values = []
-        when "struct"
-          @names << @name
-          @name = []
-
-          @structs << @struct
-          @struct = {} 
-        end
-      end
-
-      def endElement(name)
-        @data ||= ""
-        case name
-        when "string"
-          @value = @data
-        when "i4", "int"
-          @value = Convert.int(@data)
-        when "boolean"
-          @value = Convert.boolean(@data)
-        when "double"
-          @value = Convert.double(@data)
-        when "dateTime.iso8601"
-          @value = Convert.dateTime(@data)
-        when "base64"
-          @value = Convert.base64(@data)
-        when "value"
-          @value = @data if @value.nil?
-          @values << (@value == :nil ? nil : @value) 
-        when "array"
-          @value = @values
-          @values = @val_stack.pop
-        when "struct"
-          @value = Convert.struct(@struct)
-
-          @name = @names.pop
-          @struct = @structs.pop
-        when "name"
-          @name[0] = @data 
-        when "member"
-          @struct[@name[0]] = @values.pop 
-
-        when "param"
-          @params << @values[0]
-          @values = []
-
-        when "fault"
-          @fault = Convert.fault(@values[0])
-
-        when "methodName"
-          @method_name = @data 
-        end
-
-        @data = nil
-      end
-
-      def character(data)
-        if @data
-          @data << data
-        else
-          @data = data
-        end
-      end
-
-    end # module StreamParserMixin
-
-    # ---------------------------------------------------------------------------
-    class XMLStreamParser < AbstractStreamParser
-      def initialize
-        require "xmlparser"
-        eval %{
-          class XMLRPCParser < ::XMLParser
-            include StreamParserMixin
-          end
-        }
-        @parser_class = XMLRPCParser
-      end
-    end # class XMLStreamParser
-    # ---------------------------------------------------------------------------
-    class NQXMLStreamParser < AbstractStreamParser
-      def initialize
-        require "nqxml/streamingparser"
-        @parser_class = XMLRPCParser
-      end
-
-      class XMLRPCParser 
-        include StreamParserMixin
-
-        def parse(str)
-          parser = NQXML::StreamingParser.new(str)
-          parser.each do |ele|
-            case ele
-            when NQXML::Text
-              @data = ele.text
-              #character(ele.text)
-            when NQXML::Tag
-              if ele.isTagEnd
-                endElement(ele.name)
-              else
-                startElement(ele.name, ele.attrs)
-              end
-            end
-          end # do
-        end # method parse
-      end # class XMLRPCParser
-
-    end # class NQXMLStreamParser
-    # ---------------------------------------------------------------------------
-    class XMLTreeParser < AbstractTreeParser
-
-      def initialize
-        require "xmltreebuilder"
-
-        # The new XMLParser library (0.6.2+) uses a slightly different DOM implementation. 
-        # The following code removes the differences between both versions.
-        if defined? XML::DOM::Builder 
-          return if defined? XML::DOM::Node::DOCUMENT # code below has been already executed
-          klass = XML::DOM::Node
-          klass.const_set("DOCUMENT", klass::DOCUMENT_NODE)
-          klass.const_set("TEXT", klass::TEXT_NODE)
-          klass.const_set("COMMENT", klass::COMMENT_NODE)
-          klass.const_set("ELEMENT", klass::ELEMENT_NODE)
-        end
-      end
-
-      private
-
-      def _nodeType(node)
-	tp = node.nodeType
-	if tp == XML::SimpleTree::Node::TEXT then :TEXT
-	elsif tp == XML::SimpleTree::Node::COMMENT then :COMMENT 
-	elsif tp == XML::SimpleTree::Node::ELEMENT then :ELEMENT 
-	else :ELSE
-	end
-      end
-
-
-      def methodResponse_document(node)
-	assert( node.nodeType == XML::SimpleTree::Node::DOCUMENT )
-	hasOnlyOneChild(node, "methodResponse")
-	
-	methodResponse(node.firstChild)
-      end
-
-      def methodCall_document(node)
-	assert( node.nodeType == XML::SimpleTree::Node::DOCUMENT )
-	hasOnlyOneChild(node, "methodCall")
-	
-	methodCall(node.firstChild)
-      end
-
-      def createCleanedTree(str)
-	doc = XML::SimpleTreeBuilder.new.parse(str)
-	doc.documentElement.normalize
-	removeWhitespacesAndComments(doc)
-	doc
-      end
-
-    end # class XMLParser
-    # ---------------------------------------------------------------------------
-    class NQXMLTreeParser < AbstractTreeParser
-
-      def initialize
-        require "nqxml/treeparser"
-      end
-
-      private
-
-      def _nodeType(node)
-	node.nodeType
-      end
-
-      def methodResponse_document(node)
-	methodResponse(node)
-      end
-
-      def methodCall_document(node)
-	methodCall(node)
-      end
-
-      def createCleanedTree(str)
-        doc = ::NQXML::TreeParser.new(str).document.rootNode 
-	removeWhitespacesAndComments(doc)
-	doc
-      end
-
-    end # class NQXMLTreeParser
-    # ---------------------------------------------------------------------------
-    class REXMLStreamParser < AbstractStreamParser
-      def initialize
-        require "rexml/document"
-        @parser_class = StreamListener
-      end
-
-      class StreamListener 
-        include StreamParserMixin
-
-        alias :tag_start :startElement
-        alias :tag_end :endElement
-        alias :text :character
-
-        def method_missing(*a)
-          # ignore
-        end
-
-        def parse(str)
-          parser = REXML::Document.parse_stream(str, self)
-       end
-      end 
-
-    end
-    # ---------------------------------------------------------------------------
-    class XMLScanStreamParser < AbstractStreamParser
-      def initialize
-        require "xmlscan/parser"
-        @parser_class = XMLScanParser
-      end
-
-      class XMLScanParser
-        include StreamParserMixin
-
-        Entities = {
-          "lt"   => "<",
-          "gt"   => ">",
-          "amp"  => "&",
-          "quot" => '"',
-          "apos" => "'"
-        }
-
-        def parse(str)
-          parser  = XMLScan::XMLParser.new(self)
-          parser.parse(str)
-        end
-
-        alias :on_stag :startElement
- 	alias :on_etag :endElement
-
-        def on_stag_end(name); end
-
-        def on_stag_end_empty(name)
-          startElement(name)
-          endElement(name)
-        end
-       
-        def on_chardata(str)
-          character(str)
-        end
-
-        def on_entityref(ent)
-          str = Entities[ent]
-          if str
-            character(str)
-          else
-            raise "unknown entity"
-          end
-        end
-
-        def on_charref(code)
-          character(code.chr)
-        end
-
-        def on_charref_hex(code)
-          character(code.chr)
-        end
-
-        def method_missing(*a)
-        end
-
-        # TODO: call/implement?
-        # valid_name?
-        # valid_chardata?
-        # valid_char?
-        # parse_error  
-
-      end
-    end
-    # ---------------------------------------------------------------------------
-    XMLParser   = XMLTreeParser
-    NQXMLParser = NQXMLTreeParser
-
-    Classes = [XMLStreamParser, XMLTreeParser, 
-               NQXMLStreamParser, NQXMLTreeParser, 
-               REXMLStreamParser, XMLScanStreamParser]
-
-  end # module XMLParser
-
-
-end # module XMLRPC
-
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
deleted file mode 100644
index 0fabd3861e..0000000000
--- a/lib/xmlrpc/server.rb
+++ /dev/null
@@ -1,833 +0,0 @@
-=begin
-= xmlrpc/server.rb
-Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-
-Released under the same term of license as Ruby.
-
-= Classes
-* ((<XMLRPC::BasicServer>))
-* ((<XMLRPC::CGIServer>))
-* ((<XMLRPC::ModRubyServer>))
-* ((<XMLRPC::Server>))
-* ((<XMLRPC::WEBrickServlet>))
-
-= XMLRPC::BasicServer
-== Description
-Is the base class for all XML-RPC server-types (CGI, standalone).
-You can add handler and set a default handler. 
-Do not use this server, as this is/should be an abstract class.
-
-=== How the method to call is found
-The arity (number of accepted arguments) of a handler (method or (({Proc})) object) is 
-compared to the given arguments submitted by the client for a RPC ((-Remote Procedure Call-)). 
-A handler is only called if it accepts the number of arguments, otherwise the search 
-for another handler will go on. When at the end no handler was found, 
-the ((<default_handler|XMLRPC::BasicServer#set_default_handler>)) will be called.
-With this technique it is possible to do overloading by number of parameters, but
-only for (({Proc})) handler, because you cannot define two methods of the same name in
-the same class. 
-
-
-== Class Methods
---- XMLRPC::BasicServer.new( class_delim="." )
-    Creates a new (({XMLRPC::BasicServer})) instance, which should not be 
-    done, because (({XMLRPC::BasicServer})) is an abstract class. This
-    method should be called from a subclass indirectly by a (({super})) call
-    in the method (({initialize})). The paramter ((|class_delim|)) is used
-    in ((<add_handler|XMLRPC::BasicServer#add_handler>)) when an object is
-    added as handler, to delimit the object-prefix and the method-name.
-
-== Instance Methods
---- XMLRPC::BasicServer#add_handler( name, signature=nil, help=nil ) { aBlock }
-    Adds ((|aBlock|)) to the list of handlers, with ((|name|)) as the name of the method.
-    Parameters ((|signature|)) and ((|help|)) are used by the Introspection method if specified, 
-    where ((|signature|)) is either an Array containing strings each representing a type of it's 
-    signature (the first is the return value) or an Array of Arrays if the method has multiple 
-    signatures. Value type-names are "int, boolean, double, string, dateTime.iso8601, base64, array, struct".
-
-    Parameter ((|help|)) is a String with informations about how to call this method etc.
-
-    A handler method or code-block can return the types listed at
-    ((<XMLRPC::Client#call|URL:client.html#index:0>)). 
-    When a method fails, it can tell it the client by throwing an 
-    (({XMLRPC::FaultException})) like in this example:
-        s.add_handler("michael.div") do |a,b|
-          if b == 0
-            raise XMLRPC::FaultException.new(1, "division by zero")
-          else
-            a / b 
-          end
-        end 
-    The client gets in the case of (({b==0})) an object back of type
-    (({XMLRPC::FaultException})) that has a ((|faultCode|)) and ((|faultString|))
-    field.
-
---- XMLRPC::BasicServer#add_handler( prefix, obj )
-    This is the second form of ((<add_handler|XMLRPC::BasicServer#add_handler>)).
-    To add an object write:
-        server.add_handler("michael", MyHandlerClass.new)
-    All public methods of (({MyHandlerClass})) are accessible to
-    the XML-RPC clients by (('michael."name of method"')). This is 
-    where the ((|class_delim|)) in ((<new|XMLRPC::BasicServer.new>)) 
-    has it's role, a XML-RPC method-name is defined by 
-    ((|prefix|)) + ((|class_delim|)) + (('"name of method"')). 
-
---- XMLRPC::BasicServer#add_handler( interface, obj )
-    This is the third form of ((<add_handler|XMLRPC::BasicServer#add_handler>)).
-
-    Use (({XMLRPC::interface})) to generate an ServiceInterface object, which
-    represents an interface (with signature and help text) for a handler class.
-
-    Parameter ((|interface|)) must be of type (({XMLRPC::ServiceInterface})).
-    Adds all methods of ((|obj|)) which are defined in ((|interface|)) to the
-    server.
-
-    This is the recommended way of adding services to a server!
-
-
---- XMLRPC::BasicServer#get_default_handler
-    Returns the default-handler, which is called when no handler for
-    a method-name is found.
-    It is a (({Proc})) object or (({nil})).
-
---- XMLRPC::BasicServer#set_default_handler ( &handler )
-    Sets ((|handler|)) as the default-handler, which is called when 
-    no handler for a method-name is found. ((|handler|)) is a code-block.
-    The default-handler is called with the (XML-RPC) method-name as first argument, and
-    the other arguments are the parameters given by the client-call.
-  
-    If no block is specified the default of (({XMLRPC::BasicServer})) is used, which raises a
-    XMLRPC::FaultException saying "method missing".
-
-
---- XMLRPC::BasicServer#set_writer( writer )
-    Sets the XML writer to use for generating XML output.
-    Should be an instance of a class from module (({XMLRPC::XMLWriter})).
-    If this method is not called, then (({XMLRPC::Config::DEFAULT_WRITER})) is used. 
-
---- XMLRPC::BasicServer#set_parser( parser )
-    Sets the XML parser to use for parsing XML documents.
-    Should be an instance of a class from module (({XMLRPC::XMLParser})).
-    If this method is not called, then (({XMLRPC::Config::DEFAULT_PARSER})) is used.
-
---- XMLRPC::BasicServer#add_introspection
-    Adds the introspection handlers "system.listMethods", "system.methodSignature" and "system.methodHelp", 
-    where only the first one works.
-
---- XMLRPC::BasicServer#add_multicall
-    Adds the multi-call handler "system.multicall".
-
---- XMLRPC::BasicServer#get_service_hook
-    Returns the service-hook, which is called on each service request (RPC) unless it's (({nil})).
-
---- XMLRPC::BasicServer#set_service_hook ( &handler )
-    A service-hook is called for each service request (RPC).
-    You can use a service-hook for example to wrap existing methods and catch exceptions of them or
-    convert values to values recognized by XMLRPC. You can disable it by passing (({nil})) as parameter  
-    ((|handler|)) .
-
-    The service-hook is called with a (({Proc})) object and with the parameters for this (({Proc})).
-    An example:
-
-       server.set_service_hook {|obj, *args|
-         begin
-           ret = obj.call(*args)  # call the original service-method
-           # could convert the return value 
-         resuce
-           # rescue exceptions
-         end
-       }
-
-=end
-
-
-
-require "xmlrpc/parser"
-require "xmlrpc/create"
-require "xmlrpc/config"
-require "xmlrpc/httpserver"
-require "xmlrpc/utils"         # ParserWriterChooseMixin
-
-
-
-module XMLRPC
-
-
-class BasicServer
-
-  include ParserWriterChooseMixin
-  include ParseContentType
-
-  ERR_METHOD_MISSING        = 1 
-  ERR_UNCAUGHT_EXCEPTION    = 2
-  ERR_MC_WRONG_PARAM        = 3
-  ERR_MC_MISSING_PARAMS     = 4
-  ERR_MC_MISSING_METHNAME   = 5
-  ERR_MC_RECURSIVE_CALL     = 6
-  ERR_MC_WRONG_PARAM_PARAMS = 7
-  ERR_MC_EXPECTED_STRUCT    = 8
-
-
-  def initialize(class_delim=".")
-    @handler = []
-    @default_handler = nil 
-    @service_hook = nil
-
-    @class_delim = class_delim
-    @create = nil
-    @parser = nil
-
-    add_multicall     if Config::ENABLE_MULTICALL
-    add_introspection if Config::ENABLE_INTROSPECTION
-  end
-
-  def add_handler(prefix, obj_or_signature=nil, help=nil, &block)
-    if block_given?
-      # proc-handler
-      @handler << [prefix, block, obj_or_signature, help]   
-    else
-      if prefix.kind_of? String
-        # class-handler
-        raise ArgumentError, "Expected non-nil value" if obj_or_signature.nil?
-        @handler << [prefix + @class_delim, obj_or_signature]
-      elsif prefix.kind_of? XMLRPC::Service::BasicInterface
-        # class-handler with interface
-        # add all methods
-        @handler += prefix.get_methods(obj_or_signature, @class_delim)
-      else
-        raise ArgumentError, "Wrong type for parameter 'prefix'"
-      end
-    end
-    self
-  end
-
-  def get_service_hook
-    @service_hook
-  end
-
-  def set_service_hook(&handler)
-    @service_hook = handler
-    self
-  end
- 
-  def get_default_handler
-    @default_handler
-  end
-
-  def set_default_handler (&handler)
-    @default_handler = handler
-    self
-  end  
-
-  def add_multicall
-    add_handler("system.multicall", %w(array array), "Multicall Extension") do |arrStructs|
-      unless arrStructs.is_a? Array 
-        raise XMLRPC::FaultException.new(ERR_MC_WRONG_PARAM, "system.multicall expects an array")
-      end
-
-      arrStructs.collect {|call|
-        if call.is_a? Hash
-          methodName = call["methodName"]
-          params     = call["params"]  
-
-          if params.nil?
-            multicall_fault(ERR_MC_MISSING_PARAMS, "Missing params")
-          elsif methodName.nil?
-            multicall_fault(ERR_MC_MISSING_METHNAME, "Missing methodName")
-          else
-            if methodName == "system.multicall"
-              multicall_fault(ERR_MC_RECURSIVE_CALL, "Recursive system.multicall forbidden")
-            else
-              unless params.is_a? Array
-                multicall_fault(ERR_MC_WRONG_PARAM_PARAMS, "Parameter params have to be an Array")
-              else
-                ok, val = call_method(methodName, *params)
-                if ok
-                  # correct return value
-                  [val]
-                else
-                  # exception
-                  multicall_fault(val.faultCode, val.faultString) 
-                end
-              end
-            end
-          end  
-           
-        else
-          multicall_fault(ERR_MC_EXPECTED_STRUCT, "system.multicall expected struct")
-        end
-      } 
-    end # end add_handler
-    self
-  end
-
-  def add_introspection
-    add_handler("system.listMethods",%w(array), "List methods available on this XML-RPC server") do
-      methods = []
-      @handler.each do |name, obj|
-        if obj.kind_of? Proc
-          methods << name
-        else
-          obj.methods.each {|meth| methods << name + meth}
-        end
-      end
-      methods
-    end
-
-    add_handler("system.methodSignature", %w(array string), "Returns method signature") do |meth|
-      sigs = []
-      @handler.each do |name, obj, sig|
-        if obj.kind_of? Proc and sig != nil and name == meth
-          if sig[0].kind_of? Array
-            # sig contains multiple signatures, e.g. [["array"], ["array", "string"]]
-            sig.each {|s| sigs << s}
-          else
-            # sig is a single signature, e.g. ["array"]
-            sigs << sig 
-          end
-        end
-      end
-      sigs.uniq! || sigs  # remove eventually duplicated signatures
-    end
-
-    add_handler("system.methodHelp", %w(string string), "Returns help on using this method") do |meth|
-      help = nil 
-      @handler.each do |name, obj, sig, hlp|
-        if obj.kind_of? Proc and name == meth 
-          help = hlp
-          break      
-        end
-      end
-      help || ""
-    end
-
-    self
-  end
-
-
-  
-  def process(data)
-    method, params = parser().parseMethodCall(data) 
-    handle(method, *params)
-  end
- 
-  private # --------------------------------------------------------------
-
-  def multicall_fault(nr, str)
-    {"faultCode" => nr, "faultString" => str}
-  end
- 
-  #
-  # method dispatch
-  #
-  def dispatch(methodname, *args)
-    for name, obj in @handler
-      if obj.kind_of? Proc
-	next unless methodname == name
-      else
-	next unless methodname =~ /^#{name}(.+)$/
-        next unless obj.respond_to? $1
-	obj = obj.method($1)
-      end
-
-      if check_arity(obj, args.size)
-        if @service_hook.nil?
-          return obj.call(*args) 
-        else
-          return @service_hook.call(obj, *args)
-        end
-      end
-    end 
- 
-    if @default_handler.nil?
-      raise XMLRPC::FaultException.new(ERR_METHOD_MISSING, "Method #{methodname} missing or wrong number of parameters!")
-    else
-      @default_handler.call(methodname, *args) 
-    end
-  end
-
-
-  #
-  # returns true, if the arity of "obj" matches
-  #
-  def check_arity(obj, n_args)
-    ary = obj.arity
-
-    if ary >= 0
-      n_args == ary
-    else
-      n_args >= (ary+1).abs 
-    end
-  end
-
-
-
-  def call_method(methodname, *args)
-    begin
-      [true, dispatch(methodname, *args)]
-    rescue XMLRPC::FaultException => e  
-      [false, e]  
-    rescue Exception => e
-      [false, XMLRPC::FaultException.new(ERR_UNCAUGHT_EXCEPTION, "Uncaught exception #{e.message} in method #{methodname}")]
-    end
-  end
-
-  #
-  #
-  #
-  def handle(methodname, *args)
-    create().methodResponse(*call_method(methodname, *args))
-  end
-
-
-end
-
-
-=begin
-= XMLRPC::CGIServer
-== Synopsis
-    require "xmlrpc/server"
- 
-    s = XMLRPC::CGIServer.new     
-
-    s.add_handler("michael.add") do |a,b|
-      a + b
-    end
-
-    s.add_handler("michael.div") do |a,b|
-      if b == 0
-        raise XMLRPC::FaultException.new(1, "division by zero")
-      else
-        a / b 
-      end
-    end 
-
-    s.set_default_handler do |name, *args|
-      raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
-                                       " or wrong number of parameters!")
-    end
-  
-    s.serve
-
-== Description
-Implements a CGI-based XML-RPC server.
-
-== Superclass
-((<XMLRPC::BasicServer>))
-
-== Class Methods
---- XMLRPC::CGIServer.new( *a )
-    Creates a new (({XMLRPC::CGIServer})) instance. All parameters given
-    are by-passed to ((<XMLRPC::BasicServer.new>)). You can only create 
-    ((*one*)) (({XMLRPC::CGIServer})) instance, because more than one makes
-    no sense.
-
-== Instance Methods
---- XMLRPC::CGIServer#serve
-    Call this after you have added all you handlers to the server.
-    This method processes a XML-RPC methodCall and sends the answer
-    back to the client. 
-    Make sure that you don't write to standard-output in a handler, or in
-    any other part of your program, this would case a CGI-based server to fail!
-=end
-
-class CGIServer < BasicServer
-  @@obj = nil
-
-  def CGIServer.new(*a)
-    @@obj = super(*a) if @@obj.nil?
-    @@obj
-  end
-
-  def initialize(*a)
-    super(*a)
-  end
-  
-  def serve
-    catch(:exit_serve) {
-      length = ENV['CONTENT_LENGTH'].to_i
-
-      http_error(405, "Method Not Allowed") unless ENV['REQUEST_METHOD'] == "POST" 
-      http_error(400, "Bad Request")        unless ENV['CONTENT_TYPE'] == "text/xml"
-      http_error(411, "Length Required")    unless length > 0 
-
-      # TODO: do we need a call to binmode?
-      $stdin.binmode if $stdin.respond_to? :binmode
-      data = $stdin.read(length)
-
-      http_error(400, "Bad Request")        if data.nil? or data.size != length
-
-      http_write(process(data), "Content-type" => "text/xml")
-    }
-  end
-
-
-  private
-
-  def http_error(status, message)
-    err = "#{status} #{message}"
-    msg = <<-"MSGEND" 
-      <html>
-        <head>
-          <title>#{err}</title>
-        </head>
-        <body>
-          <h1>#{err}</h1>
-          <p>Unexpected error occured while processing XML-RPC request!</p>
-        </body>
-      </html>
-    MSGEND
-
-    http_write(msg, "Status" => err, "Content-type" => "text/html")
-    throw :exit_serve # exit from the #serve method
-  end
-
-  def http_write(body, header)
-    h = {}
-    header.each {|key, value| h[key.to_s.capitalize] = value}
-    h['Status']         ||= "200 OK"
-    h['Content-length'] ||= body.size.to_s 
-
-    str = ""
-    h.each {|key, value| str << "#{key}: #{value}\r\n"}
-    str << "\r\n#{body}"
-
-    print str
-  end
-
-end
-
-=begin
-= XMLRPC::ModRubyServer
-== Description
-Implements a XML-RPC server, which works with Apache mod_ruby.
-
-Use it in the same way as CGIServer!
-
-== Superclass
-((<XMLRPC::BasicServer>))
-=end 
-
-class ModRubyServer < BasicServer
-
-  def initialize(*a)
-    @ap = Apache::request
-    super(*a)
-  end
-
-  def serve
-    catch(:exit_serve) {
-      header = {}
-      @ap.headers_in.each {|key, value| header[key.capitalize] = value}
-
-      length = header['Content-length'].to_i
-
-      http_error(405, "Method Not Allowed") unless @ap.request_method  == "POST" 
-      http_error(400, "Bad Request")        unless parse_content_type(header['Content-type']).first == "text/xml"
-      http_error(411, "Length Required")    unless length > 0 
-
-      # TODO: do we need a call to binmode?
-      @ap.binmode
-      data = @ap.read(length)
-
-      http_error(400, "Bad Request")        if data.nil? or data.size != length
-
-      http_write(process(data), 200, "Content-type" => "text/xml")
-    }
-  end
-
-
-  private
-
-  def http_error(status, message)
-    err = "#{status} #{message}"
-    msg = <<-"MSGEND" 
-      <html>
-        <head>
-          <title>#{err}</title>
-        </head>
-        <body>
-          <h1>#{err}</h1>
-          <p>Unexpected error occured while processing XML-RPC request!</p>
-        </body>
-      </html>
-    MSGEND
-
-    http_write(msg, status, "Status" => err, "Content-type" => "text/html")
-    throw :exit_serve # exit from the #serve method
-  end
-
-  def http_write(body, status, header)
-    h = {}
-    header.each {|key, value| h[key.to_s.capitalize] = value}
-    h['Status']         ||= "200 OK"
-    h['Content-length'] ||= body.size.to_s 
-
-    h.each {|key, value| @ap.headers_out[key] = value }
-    @ap.content_type = h["Content-type"] 
-    @ap.status = status.to_i 
-    @ap.send_http_header 
-
-    @ap.print body
-  end
-
-end
-
-
-
-
-=begin
-= XMLRPC::Server
-== Synopsis
-    require "xmlrpc/server"
- 
-    s = XMLRPC::Server.new(8080) 
-
-    s.add_handler("michael.add") do |a,b|
-      a + b
-    end
-
-    s.add_handler("michael.div") do |a,b|
-      if b == 0
-        raise XMLRPC::FaultException.new(1, "division by zero")
-      else
-        a / b 
-      end
-    end 
-
-    s.set_default_handler do |name, *args|
-      raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
-                                       " or wrong number of parameters!")
-    end
- 
-    s.serve
-
-== Description
-Implements a standalone XML-RPC server. The method (({serve}))) is left if a SIGHUP is sent to the
-program.
-
-== Superclass
-((<XMLRPC::BasicServer>))
-
-== Class Methods
---- XMLRPC::Server.new( port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a )
-    Creates a new (({XMLRPC::Server})) instance, which is a XML-RPC server listening on
-    port ((|port|)) and accepts requests for the host ((|host|)), which is by default only the localhost. 
-    The server is not started, to start it you have to call ((<serve|XMLRPC::Server#serve>)).
-
-    The parameters ((|maxConnections|)), ((|stdlog|)), ((|audit|)) and ((|debug|)) are passed to the HTTP server and
-    specify it's behaviour more precise.
-
-    All additionally given parameters in ((|*a|)) are by-passed to ((<XMLRPC::BasicServer.new>)). 
-    
-
-== Instance Methods
---- XMLRPC::Server#serve
-    Call this after you have added all you handlers to the server.
-    This method starts the server to listen for XML-RPC requests and answer them.
-
---- XMLRPC::Server#shutdown
-    Stops and shuts the server down.
-
---- XMLRPC::Server#set_valid_ip( *ip_addr )
-    Specifies the valid IP addresses that are allowed to connect to the server.
-    Each IP is either a (({String})) or a (({Regexp})).
-
---- XMLRPC::Server#get_valid_ip
-    Return the via method ((<set_valid_ip|XMLRPC::Server#set_valid_ip>)) specified
-    valid IP addresses.
-    
-=end
-
-class Server < BasicServer
-
-  def initialize(port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a)
-    super(*a)
-    @server = ::HttpServer.new(self, port, host, maxConnections, stdlog, audit, debug)
-    @valid_ip = nil
-  end
-  
-  def serve
-    if RUBY_PLATFORM =~ /mingw|mswin32/
-      signal = 1
-    else
-      signal = "HUP"
-    end
-    trap(signal) { @server.shutdown }
-
-    @server.start.join
-  end
-  
-  def shutdown
-    @server.shutdown
-  end
-
-  def set_valid_ip(*ip_addr)
-    if ip_addr.size == 1 and ip_addr[0].nil?
-      @valid_ip = nil
-    else
-      @valid_ip = ip_addr
-    end
-  end
-
-  def get_valid_ip
-    @valid_ip
-  end
-
-  # methods that get called by HttpServer ------------------------------------------
-
-  def request_handler(request, response)
-    $stderr.puts "in request_handler" if $DEBUG
-
-    if request.method != "POST"
-      # Method not allowed
-      response.status = 405
-      return
-    end
-
-    if parse_content_type(request.header['Content-type']).first != "text/xml" 
-      # Bad request
-      response.status = 400
-      return
-    end 
-
-    length = request.content_length || 0
-    
-    unless length > 0
-      # Length required
-      response.status = 411
-      return
-    end
-
-    data = request.data.read(length)
-
-    if data.nil? or data.size != length
-      # Bad request
-      response.status = 400
-      return
-    end
-
-    resp = process(data)
-    raise if resp.nil? or resp.size <= 0  # => Internal Server Error
-
-    response.status = 200
-    response.header['Content-Length'] = resp.size
-    response.header['Content-Type']   = "text/xml"
-    response.body = resp 
-    
-   end
-
-   ##
-   # Is called before request_handler and should return true if
-   # the client is allowed to connect to the server.
-   # `io' is a Socket object.
-   def ip_auth_handler(io)
-     if @valid_ip
-       client_ip = io.peeraddr[3]
-       @valid_ip.each { |ip|
-         return true if client_ip =~ ip
-       }
-       false
-     else
-       true
-     end
-   end
-  
-end
-
-
-=begin
-= XMLRPC::WEBrickServlet
-== Synopsis
-
-    require "webrick"
-    require "xmlrpc/server"
-
-    s = XMLRPC::WEBrickServlet.new
-    s.add_handler("michael.add") do |a,b|
-      a + b
-    end
-
-    s.add_handler("michael.div") do |a,b|
-      if b == 0
-        raise XMLRPC::FaultException.new(1, "division by zero")
-      else
-        a / b 
-      end
-    end 
-
-    s.set_default_handler do |name, *args|
-      raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
-                                       " or wrong number of parameters!")
-    end
-
-    httpserver = WEBrick::HTTPServer.new(:Port => 8080)    
-    httpserver.mount("RPC2", s)
-    trap("HUP") { httpserver.shutdown }   # use 1 instead of "HUP" on Windows
-    httpserver.start
-== Description
-Implements a servlet for use with WEBrick, a pure Ruby (HTTP-) server framework.
-
-== Superclass
-((<XMLRPC::BasicServer>))
-
-=end
-
-class WEBrickServlet < BasicServer
-  def initialize(*a)
-    super
-    require "webrick/httpstatus"
-  end
-
-  # deprecated from WEBrick/1.2.2. 
-  # but does not break anything.
-  def require_path_info?
-    false 
-  end
-
-  def get_instance(config, *options)
-    # TODO: set config & options
-    self
-  end
-
-  def service(request, response)
-    if request.request_method != "POST"
-      raise HTTPStatus::MethodNotAllowed,
-            "unsupported method `#{request.request_method}'."
-    end
-
-    if parse_content_type(request['Content-type']).first != "text/xml" 
-      raise HTTPStatus::BadRequest
-    end 
-
-    length = (request['Content-length'] || 0).to_i
-
-    raise HTTPStatus::LengthRequired unless length > 0
-
-    data = request.body
-
-    if data.nil? or data.size != length
-      raise HTTPStatus::BadRequest
-    end
-
-    resp = process(data)
-    if resp.nil? or resp.size <= 0  
-      raise HTTPStatus::InternalServerError
-    end
-
-    response.status = 200
-    response['Content-Length'] = resp.size
-    response['Content-Type']   = "text/xml"
-    response.body = resp 
-  end
-end
-
-
-end # module XMLRPC
-
-
-=begin
-= History
-    $Id$    
-=end
-
diff --git a/lib/xmlrpc/utils.rb b/lib/xmlrpc/utils.rb
deleted file mode 100644
index 14dd08b21d..0000000000
--- a/lib/xmlrpc/utils.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-# Defines ParserWriterChooseMixin, which makes it possible to choose a
-# different XML writer and/or XML parser then the default one.
-# The Mixin is used in client.rb (class Client) and server.rb (class 
-# BasicServer)
-# 
-# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-#
-# $Id$ 
-#
-
-module XMLRPC
-
-  #
-  # This module enables a user-class to be marshalled
-  # by XML-RPC for Ruby into a Hash, with one additional
-  # key/value pair "___class___" => ClassName
-  # 
-  module Marshallable
-    def __get_instance_variables
-      instance_variables.collect {|var| [var[1..-1], eval(var)] }
-    end
-
-    def __set_instance_variable(key, value)
-      eval("@#$1 = value") if key =~ /^([\w_][\w_0-9]*)$/
-    end
-  end
-
-
-  module ParserWriterChooseMixin
-
-    def set_writer(writer)
-      @create = Create.new(writer)
-      self
-    end
-
-    def set_parser(parser)
-      @parser = parser
-      self
-    end
-
-    private
-
-    def create
-      # if set_writer was not already called then call it now
-      if @create.nil? then
-	set_writer(Config::DEFAULT_WRITER.new)
-      end
-      @create
-    end
-
-    def parser
-      # if set_parser was not already called then call it now
-      if @parser.nil? then
-	set_parser(Config::DEFAULT_PARSER.new)
-      end
-      @parser
-    end
-
-  end # module ParserWriterChooseMixin
-
-
-  module Service
-
-  #
-  # base class for Service Interface definitions, used
-  # by BasicServer#add_handler
-  #
-
-  class BasicInterface
-    attr_reader :prefix, :methods
-
-    def initialize(prefix)
-      @prefix = prefix
-      @methods = []
-    end
-
-    def add_method(sig, help=nil, meth_name=nil)
-      mname = nil
-      sig = [sig] if sig.kind_of? String
-
-      sig = sig.collect do |s| 
-        name, si = parse_sig(s)
-        raise "Wrong signatures!" if mname != nil and name != mname 
-        mname = name
-        si
-      end
-
-      @methods << [mname, meth_name || mname, sig, help]
-    end
-
-    private # ---------------------------------
-  
-    def parse_sig(sig)
-      # sig is a String
-      if sig =~ /^\s*(\w+)\s+([^(]+)(\(([^)]*)\))?\s*$/
-        params = [$1]
-        name   = $2.strip 
-        $4.split(",").each {|i| params << i.strip} if $4 != nil
-        return name, params
-      else
-        raise "Syntax error in signature"
-      end
-    end
-
-  end # class BasicInterface
-
-  #
-  # class which wraps a Service Interface definition, used
-  # by BasicServer#add_handler
-  #
-  class Interface < BasicInterface
-    def initialize(prefix, &p)
-      raise "No interface specified" if p.nil?
-      super(prefix)
-      instance_eval(&p)
-    end
-
-    def get_methods(obj, delim=".") 
-      prefix = @prefix + delim
-      @methods.collect { |name, meth, sig, help| 
-        [prefix + name, obj.method(meth).to_proc, sig, help] 
-      }
-    end
-
-    private # ---------------------------------
-
-    def meth(*a)
-      add_method(*a)
-    end
-
-  end # class Interface
-
-  class PublicInstanceMethodsInterface < BasicInterface
-    def initialize(prefix)
-      super(prefix)
-    end
-
-    def get_methods(obj, delim=".")
-      prefix = @prefix + delim
-      obj.class.public_instance_methods.collect { |name|
-        [prefix + name, obj.method(name).to_proc, nil, nil] 
-      }
-    end
-  end
-
-
-  end # module Service
-
-
-  # 
-  # short-form to create a Service::Interface
-  #
-  def self.interface(prefix, &p)
-    Service::Interface.new(prefix, &p)  
-  end
-
-  # short-cut for creating a PublicInstanceMethodsInterface
-  def self.iPIMethods(prefix)
-    Service::PublicInstanceMethodsInterface.new(prefix) 
-  end
-
-
-  module ParseContentType
-    def parse_content_type(str)
-      a, *b = str.split(";")
-      return a.strip, *b
-    end
-  end
-
-end # module XMLRPC
-
diff --git a/lib/xsd/charset.rb b/lib/xsd/charset.rb
deleted file mode 100644
index 88d4f99043..0000000000
--- a/lib/xsd/charset.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-=begin
-XSD4R - Charset handling library.
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module XSD
-
-
-module Charset
-  @encoding = $KCODE
-
-  class XSDError < StandardError; end
-  class CharsetError < XSDError; end
-  class UnknownCharsetError < CharsetError; end
-  class CharsetConversionError < CharsetError; end
-
-public
-
-  ###
-  ## Maps
-  #
-  EncodingConvertMap = {}
-  def Charset.init
-    begin
-      require 'xsd/iconvcharset'
-      @encoding = 'UTF8'
-      EncodingConvertMap[['UTF8', 'EUC' ]] = Proc.new { |str| IconvCharset.safe_iconv("euc-jp", "utf-8", str) }
-      EncodingConvertMap[['EUC' , 'UTF8']] = Proc.new { |str| IconvCharset.safe_iconv("utf-8", "euc-jp", str) }
-      EncodingConvertMap[['EUC' , 'SJIS']] = Proc.new { |str| IconvCharset.safe_iconv("shift-jis", "euc-jp", str) }
-      if /(mswin|bccwin|mingw|cygwin)/ =~ RUBY_PLATFORM
-	EncodingConvertMap[['UTF8', 'SJIS']] = Proc.new { |str| IconvCharset.safe_iconv("cp932", "utf-8", str) }
-       	EncodingConvertMap[['SJIS', 'UTF8']] = Proc.new { |str| IconvCharset.safe_iconv("utf-8", "cp932", str) }
-	EncodingConvertMap[['SJIS', 'EUC' ]] = Proc.new { |str| IconvCharset.safe_iconv("euc-jp", "cp932", str) }
-      else
-	EncodingConvertMap[['UTF8', 'SJIS']] = Proc.new { |str| IconvCharset.safe_iconv("shift-jis", "utf-8", str) }
-	EncodingConvertMap[['SJIS', 'UTF8']] = Proc.new { |str| IconvCharset.safe_iconv("utf-8", "shift-jis", str) }
-	EncodingConvertMap[['SJIS', 'EUC' ]] = Proc.new { |str| IconvCharset.safe_iconv("euc-jp", "shift-jis", str) }
-      end
-    rescue LoadError
-      begin
-       	require 'nkf'
-	EncodingConvertMap[['EUC' , 'SJIS']] = Proc.new { |str| NKF.nkf('-sXm0', str) }
-	EncodingConvertMap[['SJIS', 'EUC' ]] = Proc.new { |str| NKF.nkf('-eXm0', str) }
-      rescue LoadError
-      end
-  
-      begin
-	require 'uconv'
-	@encoding = 'UTF8'
-	EncodingConvertMap[['UTF8', 'EUC' ]] = Uconv.method(:u8toeuc)
-	EncodingConvertMap[['UTF8', 'SJIS']] = Uconv.method(:u8tosjis)
-	EncodingConvertMap[['EUC' , 'UTF8']] = Uconv.method(:euctou8)
-	EncodingConvertMap[['SJIS', 'UTF8']] = Uconv.method(:sjistou8)
-      rescue LoadError
-      end
-    end
-  end
-  self.init
-
-  CharsetMap = {
-    'NONE' => 'us-ascii',
-    'EUC' => 'euc-jp',
-    'SJIS' => 'shift_jis',
-    'UTF8' => 'utf-8',
-  }
-
-
-  ###
-  ## handlers
-  #
-  def Charset.encoding
-    @encoding
-  end
-
-  def Charset.encoding_label
-    charset_label(@encoding)
-  end
-
-  def Charset.encoding_to_xml(str, charset)
-    encoding_conv(str, @encoding, charset_str(charset))
-  end
-
-  def Charset.encoding_from_xml(str, charset)
-    encoding_conv(str, charset_str(charset), @encoding)
-  end
-
-  def Charset.encoding_conv(str, enc_from, enc_to)
-    if enc_from == enc_to or enc_from == 'NONE' or enc_to == 'NONE'
-      str
-    elsif converter = EncodingConvertMap[[enc_from, enc_to]]
-      converter.call(str)
-    else
-      raise CharsetConversionError.new(
-	"Converter not found: #{ enc_from } -> #{ enc_to }")
-    end
-  end
-
-  def Charset.charset_label(encoding)
-    CharsetMap[encoding.upcase]
-  end
-
-  def Charset.charset_str(label)
-    CharsetMap.index(label.downcase)
-  end
-
-  # us_ascii = '[\x00-\x7F]'
-  us_ascii = '[\x9\xa\xd\x20-\x7F]'	# XML 1.0 restricted.
-  USASCIIRegexp = Regexp.new("\\A#{ us_ascii }*\\z", nil, "NONE")
-
-  twobytes_euc = '(?:[\x8E\xA1-\xFE][\xA1-\xFE])'
-  threebytes_euc = '(?:\x8F[\xA1-\xFE][\xA1-\xFE])'
-  character_euc = "(?:#{ us_ascii }|#{ twobytes_euc }|#{ threebytes_euc })"
-  EUCRegexp = Regexp.new("\\A#{ character_euc }*\\z", nil, "NONE")
-
-  # onebyte_sjis = '[\x00-\x7F\xA1-\xDF]'
-  onebyte_sjis = '[\x9\xa\xd\x20-\x7F\xA1-\xDF]'	# XML 1.0 restricted.
-  twobytes_sjis = '(?:[\x81-\x9F\xE0-\xFC][\x40-\x7E\x80-\xFC])'
-  character_sjis = "(?:#{ onebyte_sjis }|#{ twobytes_sjis })"
-  SJISRegexp = Regexp.new("\\A#{ character_sjis }*\\z", nil, "NONE")
-
-  # 0xxxxxxx
-  # 110yyyyy 10xxxxxx
-  twobytes_utf8 = '(?:[\xC0-\xDF][\x80-\xBF])'
-  # 1110zzzz 10yyyyyy 10xxxxxx
-  threebytes_utf8 = '(?:[\xE0-\xEF][\x80-\xBF][\x80-\xBF])'
-  # 11110uuu 10uuuzzz 10yyyyyy 10xxxxxx
-  fourbytes_utf8 = '(?:[\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])'
-  character_utf8 = "(?:#{ us_ascii }|#{ twobytes_utf8 }|#{ threebytes_utf8 }|#{ fourbytes_utf8 })"
-  UTF8Regexp = Regexp.new("\\A#{ character_utf8 }*\\z", nil, "NONE")
-
-  def Charset.is_us_ascii(str)
-    USASCIIRegexp =~ str
-  end
-
-  def Charset.is_utf8(str)
-    UTF8Regexp =~ str
-  end
-
-  def Charset.is_euc(str)
-    EUCRegexp =~ str
-  end
-
-  def Charset.is_sjis(str)
-    SJISRegexp =~ str
-  end
-
-  def Charset.is_ces(str, code = $KCODE)
-    case code
-    when 'NONE'
-      is_us_ascii(str)
-    when 'UTF8'
-      is_utf8(str)
-    when 'EUC'
-      is_euc(str)
-    when 'SJIS'
-      is_sjis(str)
-    else
-      raise UnknownCharsetError.new("Unknown charset: #{ code }")
-    end
-  end
-end
-
-
-end
diff --git a/lib/xsd/datatypes.rb b/lib/xsd/datatypes.rb
deleted file mode 100644
index f6ec83be71..0000000000
--- a/lib/xsd/datatypes.rb
+++ /dev/null
@@ -1,1095 +0,0 @@
-=begin
-XSD4R - XML Schema Datatype implementation.
-Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/qname'
-require 'xsd/charset'
-require 'uri'
-
-
-###
-## XMLSchamaDatatypes general definitions.
-#
-module XSD
-
-
-Namespace = 'http://www.w3.org/2001/XMLSchema'
-InstanceNamespace = 'http://www.w3.org/2001/XMLSchema-instance'
-
-AttrType = 'type'
-NilValue = 'true'
-
-AnyTypeLiteral = 'anyType'
-AnySimpleTypeLiteral = 'anySimpleType'
-NilLiteral = 'nil'
-StringLiteral = 'string'
-BooleanLiteral = 'boolean'
-DecimalLiteral = 'decimal'
-FloatLiteral = 'float'
-DoubleLiteral = 'double'
-DurationLiteral = 'duration'
-DateTimeLiteral = 'dateTime'
-TimeLiteral = 'time'
-DateLiteral = 'date'
-GYearMonthLiteral = 'gYearMonth'
-GYearLiteral = 'gYear'
-GMonthDayLiteral = 'gMonthDay'
-GDayLiteral = 'gDay'
-GMonthLiteral = 'gMonth'
-HexBinaryLiteral = 'hexBinary'
-Base64BinaryLiteral = 'base64Binary'
-AnyURILiteral = 'anyURI'
-QNameLiteral = 'QName'
-
-NormalizedStringLiteral = 'normalizedString'
-IntegerLiteral = 'integer'
-LongLiteral = 'long'
-IntLiteral = 'int'
-ShortLiteral = 'short'
-
-AttrTypeName = QName.new(InstanceNamespace, AttrType)
-AttrNilName = QName.new(InstanceNamespace, NilLiteral)
-
-AnyTypeName = QName.new(Namespace, AnyTypeLiteral)
-AnySimpleTypeName = QName.new(Namespace, AnySimpleTypeLiteral)
-
-class Error < StandardError; end
-class ValueSpaceError < Error; end
-
-
-###
-## The base class of all datatypes with Namespace.
-#
-class NSDBase
-  @@types = []
-
-  attr_accessor :type
-
-  def self.inherited(klass)
-    @@types << klass
-  end
-
-  def self.types
-    @@types
-  end
-
-  def initialize
-    @type = nil
-  end
-end
-
-
-###
-## The base class of XSD datatypes.
-#
-class XSDAnySimpleType < NSDBase
-  include XSD
-  Type = QName.new(Namespace, AnySimpleTypeLiteral)
-
-  # @data represents canonical space (ex. Integer: 123).
-  attr_reader :data
-  # @is_nil represents this data is nil or not.
-  attr_accessor :is_nil
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    @data = nil
-    @is_nil = true
-    set(value) if value
-  end
-
-  # set accepts a string which follows lexical space (ex. String: "+123"), or
-  # an object which follows canonical space (ex. Integer: 123).
-  def set(value)
-    if value.nil?
-      @is_nil = true
-      @data = nil
-    else
-      @is_nil = false
-      _set(value)
-    end
-  end
-
-  # to_s creates a string which follows lexical space (ex. String: "123").
-  def to_s()
-    if @is_nil
-      ""
-    else
-      _to_s
-    end
-  end
-
-private
-
-  def _set(value)
-    @data = value
-  end
-
-  def _to_s
-    @data.to_s
-  end
-end
-
-class XSDNil < XSDAnySimpleType
-  Type = QName.new(Namespace, NilLiteral)
-  Value = 'true'
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value)
-  end
-
-private
-
-  def _set(value)
-    @data = value
-  end
-end
-
-
-###
-## Primitive datatypes.
-#
-class XSDString < XSDAnySimpleType
-  Type = QName.new(Namespace, StringLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    @encoding = nil
-    set(value) if value
-  end
-
-private
-
-  def _set(value)
-    unless XSD::Charset.is_ces(value, XSD::Charset.encoding)
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-    @data = value
-  end
-end
-
-class XSDBoolean < XSDAnySimpleType
-  Type = QName.new(Namespace, BooleanLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value)
-  end
-
-private
-
-  def _set(value)
-    if value.is_a?(String)
-      str = value.strip
-      if str == 'true' || str == '1'
-	@data = true
-      elsif str == 'false' || str == '0'
-	@data = false
-      else
-	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-      end
-    else
-      @data = value ? true : false
-    end
-  end
-end
-
-class XSDDecimal < XSDAnySimpleType
-  Type = QName.new(Namespace, DecimalLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    @sign = ''
-    @number = ''
-    @point = 0
-    set(value) if value
-  end
-
-  def nonzero?
-    (@number != '0')
-  end
-
-private
-
-  def _set(d)
-    if d.is_a?(String)
-      # Integer("00012") => 10 in Ruby.
-      d.sub!(/^([+\-]?)0*(?=\d)/, "\\1")
-    end
-    set_str(d)
-  end
-
-  def set_str(str)
-    /^([+\-]?)(\d*)(?:\.(\d*)?)?$/ =~ str.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-    end
-
-    @sign = $1 || '+'
-    int_part = $2
-    frac_part = $3
-
-    int_part = '0' if int_part.empty?
-    frac_part = frac_part ? frac_part.sub(/0+$/, '') : ''
-    @point = - frac_part.size
-    @number = int_part + frac_part
-
-    # normalize
-    if @sign == '+'
-      @sign = ''
-    elsif @sign == '-'
-      if @number == '0'
-	@sign = ''
-      end
-    end
-
-    @data = _to_s
-  end
-
-  # 0.0 -> 0; right?
-  def _to_s
-    str = @number.dup
-    if @point.nonzero?
-      str[@number.size + @point, 0] = '.'
-    end
-    @sign + str
-  end
-end
-
-module FloatConstants
-  NaN = 0.0/0.0
-  POSITIVE_INF = 1.0/0.0
-  NEGATIVE_INF = -1.0/0.0
-end
-
-class XSDFloat < XSDAnySimpleType
-  include FloatConstants
-  Type = QName.new(Namespace, FloatLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def _set(value)
-    # "NaN".to_f => 0 in some environment.  libc?
-    if value.is_a?(Float)
-      @data = narrow32bit(value)
-      return
-    end
-
-    str = value.to_s.strip
-    if str == 'NaN'
-      @data = NaN
-    elsif str == 'INF'
-      @data = POSITIVE_INF
-    elsif str == '-INF'
-      @data = NEGATIVE_INF
-    else
-      if /^[+\-\.\deE]+$/ !~ str
-	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-      end
-      # Float("-1.4E") might fail on some system.
-      str << '0' if /e$/i =~ str
-      begin
-  	@data = narrow32bit(Float(str))
-      rescue ArgumentError
-  	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-      end
-    end
-  end
-
-  def _to_s
-    if @data.nan?
-      'NaN'
-    elsif @data.infinite? == 1
-      'INF'
-    elsif @data.infinite? == -1
-      '-INF'
-    else
-      sign = (1 / @data > 0.0) ? '+' : '-'
-      sign + sprintf("%.10g", @data.abs).sub(/[eE]([+-])?0+/) { 'e' + $1 }
-    end
-  end
-
-  # Convert to single-precision 32-bit floating point value.
-  def narrow32bit(f)
-    if f.nan? || f.infinite?
-      f
-    else
-      packed = [f].pack("f")
-      (/\A\0*\z/ =~ packed)? 0.0 : f
-    end
-  end
-end
-
-# Ruby's Float is double-precision 64-bit floating point value.
-class XSDDouble < XSDAnySimpleType
-  include FloatConstants
-  Type = QName.new(Namespace, DoubleLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def _set(value)
-    # "NaN".to_f => 0 in some environment.  libc?
-    if value.is_a?(Float)
-      @data = value
-      return
-    end
-
-    str = value.to_s.strip
-    if str == 'NaN'
-      @data = NaN
-    elsif str == 'INF'
-      @data = POSITIVE_INF
-    elsif str == '-INF'
-      @data = NEGATIVE_INF
-    else
-      begin
-	@data = Float(str)
-      rescue ArgumentError
-	# '1.4e' cannot be parsed on some architecture.
-	if /e\z/i =~ str
-	  begin
-	    @data = Float(str + '0')
-	  rescue ArgumentError
-	    raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-	  end
-	else
-	  raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-	end
-      end
-    end
-  end
-
-  def _to_s
-    if @data.nan?
-      'NaN'
-    elsif @data.infinite? == 1
-      'INF'
-    elsif @data.infinite? == -1
-      '-INF'
-    else
-      sign = (1 / @data > 0.0) ? '+' : '-'
-      sign + sprintf("%.16g", @data.abs).sub(/[eE]([+-])?0+/) { 'e' + $1 }
-    end
-  end
-end
-
-class XSDDuration < XSDAnySimpleType
-  Type = QName.new(Namespace, DurationLiteral)
-
-  attr_accessor :sign
-  attr_accessor :year
-  attr_accessor :month
-  attr_accessor :day
-  attr_accessor :hour
-  attr_accessor :min
-  attr_accessor :sec
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    @sign = nil
-    @year = nil
-    @month = nil
-    @day = nil
-    @hour = nil
-    @min = nil
-    @sec = nil
-    set(value) if value
-  end
-
-private
-
-  def _set(value)
-    /^([+\-]?)P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/ =~ value.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-
-    if ($5 and ((!$2 and !$3 and !$4) or (!$6 and !$7 and !$8)))
-      # Should we allow 'PT5S' here?
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-
-    @sign = $1
-    @year = $2.to_i
-    @month = $3.to_i
-    @day = $4.to_i
-    @hour = $6.to_i
-    @min = $7.to_i
-    @sec = $8 ? XSDDecimal.new($8) : 0
-    @data = _to_s
-  end
-
-  def _to_s
-    str = ''
-    str << @sign if @sign
-    str << 'P'
-    l = ''
-    l << "#{ @year }Y" if @year.nonzero?
-    l << "#{ @month }M" if @month.nonzero?
-    l << "#{ @day }D" if @day.nonzero?
-    r = ''
-    r << "#{ @hour }H" if @hour.nonzero?
-    r << "#{ @min }M" if @min.nonzero?
-    r << "#{ @sec }S" if @sec.nonzero?
-    str << l
-    if l.empty?
-      str << "0D"
-    end
-    unless r.empty?
-      str << "T" << r
-    end
-    str
-  end
-end
-
-
-require 'rational'
-require 'date'
-
-module XSDDateTimeImpl
-  SecInDay = 86400	# 24 * 60 * 60
-
-  def to_time
-    begin
-      if @data.offset * SecInDay == Time.now.utc_offset
-        d = @data
-        usec = (d.sec_fraction * SecInDay * 1000000).to_f
-        Time.local(d.year, d.month, d.mday, d.hour, d.min, d.sec, usec)
-      else
-        d = @data.newof
-        usec = (d.sec_fraction * SecInDay * 1000000).to_f
-        Time.gm(d.year, d.month, d.mday, d.hour, d.min, d.sec, usec)
-      end
-    rescue ArgumentError
-      nil
-    end
-  end
-
-  def tz2of(str)
-    /^(?:Z|(?:([+\-])(\d\d):(\d\d))?)$/ =~ str
-    sign = $1
-    hour = $2.to_i
-    min = $3.to_i
-
-    of = case sign
-      when '+'
-	of = +(hour.to_r * 60 + min) / 1440	# 24 * 60
-      when '-'
-	of = -(hour.to_r * 60 + min) / 1440	# 24 * 60
-      else
-	0
-      end
-    of
-  end
-
-  def of2tz(offset)
-    diffmin = offset * 24 * 60
-    if diffmin.zero?
-      'Z'
-    else
-      ((diffmin < 0) ? '-' : '+') << format('%02d:%02d',
-    	(diffmin.abs / 60.0).to_i, (diffmin.abs % 60.0).to_i)
-    end
-  end
-
-  def _set(t)
-    if (t.is_a?(Date))
-      @data = t
-    elsif (t.is_a?(Time))
-      sec, min, hour, mday, month, year = t.to_a[0..5]
-      diffday = t.usec.to_r / 1000000 / SecInDay
-      of = t.utc_offset.to_r / SecInDay
-      @data = DateTime.civil(year, month, mday, hour, min, sec, of)
-      @data += diffday
-    else
-      set_str(t)
-    end
-  end
-
-  def add_tz(s)
-    s + of2tz(@data.offset)
-  end
-end
-
-class XSDDateTime < XSDAnySimpleType
-  include XSDDateTimeImpl
-  Type = QName.new(Namespace, DateTimeLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(t)
-    /^([+\-]?\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d(?:\.(\d*))?)(Z|(?:[+\-]\d\d:\d\d)?)?$/ =~ t.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-    if $1 == '0000'
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-
-    year = $1.to_i
-    if year < 0
-      year += 1
-    end
-    mon = $2.to_i
-    mday = $3.to_i
-    hour = $4.to_i
-    min = $5.to_i
-    sec = $6.to_i
-    secfrac = $7
-    zonestr = $8
-
-    @data = DateTime.civil(year, mon, mday, hour, min, sec, tz2of(zonestr))
-
-    if secfrac
-      diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / SecInDay
-      # jd = @data.jd
-      # day_fraction = @data.day_fraction + diffday
-      # @data = DateTime.new0(DateTime.jd_to_rjd(jd, day_fraction,
-      #   @data.offset), @data.offset)
-      #
-      # Thanks to Funaba-san, above code can be simply written as below.
-      @data += diffday
-      # FYI: new0 and jd_to_rjd are not necessary to use if you don't have
-      # exceptional reason.
-    end
-  end
-
-  def _to_s
-    year = (@data.year > 0) ? @data.year : @data.year - 1
-    s = format('%.4d-%02d-%02dT%02d:%02d:%02d',
-      year, @data.mon, @data.mday, @data.hour, @data.min, @data.sec)
-    if @data.sec_fraction.nonzero?
-      fr = @data.sec_fraction * SecInDay
-      shiftsize = fr.denominator.to_s.size + 1
-      fr_s = (fr * (10 ** shiftsize)).to_i.to_s
-      s << '.' << '0' * (shiftsize - fr_s.size) << fr_s.sub(/0+$/, '')
-    end
-    add_tz(s)
-  end
-end
-
-class XSDTime < XSDAnySimpleType
-  include XSDDateTimeImpl
-  Type = QName.new(Namespace, TimeLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(t)
-    /^(\d\d):(\d\d):(\d\d(?:\.(\d*))?)(Z|(?:([+\-])(\d\d):(\d\d))?)?$/ =~ t.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-
-    hour = $1.to_i
-    min = $2.to_i
-    sec = $3.to_i
-    secfrac = $4
-    zonestr = $5
-
-    @data = DateTime.civil(1, 1, 1, hour, min, sec, tz2of(zonestr))
-
-    if secfrac
-      @data += secfrac.to_i.to_r / (10 ** secfrac.size) / SecInDay
-    end
-  end
-
-  def _to_s
-    s = format('%02d:%02d:%02d', @data.hour, @data.min, @data.sec)
-    if @data.sec_fraction.nonzero?
-      fr = @data.sec_fraction * SecInDay
-      shiftsize = fr.denominator.to_s.size + 1
-      fr_s = (fr * (10 ** shiftsize)).to_i.to_s
-      s << '.' << '0' * (shiftsize - fr_s.size) << fr_s.sub(/0+$/, '')
-    end
-    add_tz(s)
-  end
-end
-
-class XSDDate < XSDAnySimpleType
-  include XSDDateTimeImpl
-  Type = QName.new(Namespace, DateLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(t)
-    /^([+\-]?\d{4,})-(\d\d)-(\d\d)(Z|(?:([+\-])(\d\d):(\d\d))?)?$/ =~ t.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-
-    year = $1.to_i
-    if year < 0
-      year += 1
-    end
-    mon = $2.to_i
-    mday = $3.to_i
-    zonestr = $4
-
-    @data = DateTime.civil(year, mon, mday, 0, 0, 0, tz2of(zonestr))
-  end
-
-  def _to_s
-    year = (@data.year > 0) ? @data.year : @data.year - 1
-    s = format('%.4d-%02d-%02d', year, @data.mon, @data.mday)
-    add_tz(s)
-  end
-end
-
-class XSDGYearMonth < XSDAnySimpleType
-  include XSDDateTimeImpl
-  Type = QName.new(Namespace, GYearMonthLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(t)
-    /^([+\-]?\d{4,})-(\d\d)(Z|(?:([+\-])(\d\d):(\d\d))?)?$/ =~ t.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-
-    year = $1.to_i
-    if year < 0
-      year += 1
-    end
-    mon = $2.to_i
-    zonestr = $3
-
-    @data = DateTime.civil(year, mon, 1, 0, 0, 0, tz2of(zonestr))
-  end
-
-  def _to_s
-    year = (@data.year > 0) ? @data.year : @data.year - 1
-    s = format('%.4d-%02d', year, @data.mon)
-    add_tz(s)
-  end
-end
-
-class XSDGYear < XSDAnySimpleType
-  include XSDDateTimeImpl
-  Type = QName.new(Namespace, GYearLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(t)
-    /^([+\-]?\d{4,})(Z|(?:([+\-])(\d\d):(\d\d))?)?$/ =~ t.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-
-    year = $1.to_i
-    if year < 0
-      year += 1
-    end
-    zonestr = $2
-
-    @data = DateTime.civil(year, 1, 1, 0, 0, 0, tz2of(zonestr))
-  end
-
-  def _to_s
-    year = (@data.year > 0) ? @data.year : @data.year - 1
-    s = format('%.4d', year)
-    add_tz(s)
-  end
-end
-
-class XSDGMonthDay < XSDAnySimpleType
-  include XSDDateTimeImpl
-  Type = QName.new(Namespace, GMonthDayLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(t)
-    /^(\d\d)-(\d\d)(Z|(?:[+\-]\d\d:\d\d)?)?$/ =~ t.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-
-    mon = $1.to_i
-    mday = $2.to_i
-    zonestr = $3
-
-    @data = DateTime.civil(1, mon, mday, 0, 0, 0, tz2of(zonestr))
-  end
-
-  def _to_s
-    s = format('%02d-%02d', @data.mon, @data.mday)
-    add_tz(s)
-  end
-end
-
-class XSDGDay < XSDAnySimpleType
-  include XSDDateTimeImpl
-  Type = QName.new(Namespace, GDayLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(t)
-    /^(\d\d)(Z|(?:[+\-]\d\d:\d\d)?)?$/ =~ t.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-
-    mday = $1.to_i
-    zonestr = $2
-
-    @data = DateTime.civil(1, 1, mday, 0, 0, 0, tz2of(zonestr))
-  end
-
-  def _to_s
-    s = format('%02d', @data.mday)
-    add_tz(s)
-  end
-end
-
-class XSDGMonth < XSDAnySimpleType
-  include XSDDateTimeImpl
-  Type = QName.new(Namespace, GMonthLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(t)
-    /^(\d\d)(Z|(?:[+\-]\d\d:\d\d)?)?$/ =~ t.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
-    end
-
-    mon = $1.to_i
-    zonestr = $2
-
-    @data = DateTime.civil(1, mon, 1, 0, 0, 0, tz2of(zonestr))
-  end
-
-  def _to_s
-    s = format('%02d', @data.mon)
-    add_tz(s)
-  end
-end
-
-class XSDHexBinary < XSDAnySimpleType
-  Type = QName.new(Namespace, HexBinaryLiteral)
-
-  # String in Ruby could be a binary.
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-  def set_encoded(value)
-    if /^[0-9a-fA-F]*$/ !~ value
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-    @data = String.new(value).strip
-    @is_nil = false
-  end
-
-  def string
-    [@data].pack("H*")
-  end
-
-private
-
-  def _set(value)
-    @data = value.unpack("H*")[0]
-    @data.tr!('a-f', 'A-F')
-  end
-end
-
-class XSDBase64Binary < XSDAnySimpleType
-  Type = QName.new(Namespace, Base64BinaryLiteral)
-
-  # String in Ruby could be a binary.
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-  def set_encoded(value)
-    if /^[A-Za-z0-9+\/=]*$/ !~ value
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-    @data = String.new(value).strip
-    @is_nil = false
-  end
-
-  def string
-    @data.unpack("m")[0]
-  end
-
-private
-
-  def _set(value)
-    @data = [value].pack("m").strip
-  end
-end
-
-class XSDAnyURI < XSDAnySimpleType
-  Type = QName.new(Namespace, AnyURILiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def _set(value)
-    begin
-      @data = URI.parse(value.to_s.strip)
-    rescue URI::InvalidURIError
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-  end
-end
-
-class XSDQName < XSDAnySimpleType
-  Type = QName.new(Namespace, QNameLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def _set(value)
-    /^(?:([^:]+):)?([^:]+)$/ =~ value.to_s.strip
-    unless Regexp.last_match
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-
-    @prefix = $1
-    @localpart = $2
-    @data = _to_s
-  end
-
-  def _to_s
-    if @prefix
-      "#{ @prefix }:#{ @localpart }"
-    else
-      "#{ @localpart }"
-    end
-  end
-end
-
-
-###
-## Derived types
-#
-class XSDNormalizedString < XSDString
-  Type = QName.new(Namespace, NormalizedStringLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def _set(value)
-    if /[\t\r\n]/ =~ value
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-    super
-  end
-end
-
-class XSDInteger < XSDDecimal
-  Type = QName.new(Namespace, IntegerLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(str)
-    begin
-      @data = Integer(str)
-    rescue ArgumentError
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-    end
-  end
-
-  def _to_s()
-    @data.to_s
-  end
-end
-
-class XSDLong < XSDInteger
-  Type = QName.new(Namespace, LongLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(str)
-    begin
-      @data = Integer(str)
-    rescue ArgumentError
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-    end
-    unless validate(@data)
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-    end
-  end
-
-  MaxInclusive = +9223372036854775807
-  MinInclusive = -9223372036854775808
-  def validate(v)
-    ((MinInclusive <= v) && (v <= MaxInclusive))
-  end
-end
-
-class XSDInt < XSDLong
-  Type = QName.new(Namespace, IntLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(str)
-    begin
-      @data = Integer(str)
-    rescue ArgumentError
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-    end
-    unless validate(@data)
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-    end
-  end
-
-  MaxInclusive = +2147483647
-  MinInclusive = -2147483648
-  def validate(v)
-    ((MinInclusive <= v) && (v <= MaxInclusive))
-  end
-end
-
-class XSDShort < XSDInt
-  Type = QName.new(Namespace, ShortLiteral)
-
-  def initialize(value = nil)
-    super()
-    @type = Type
-    set(value) if value
-  end
-
-private
-
-  def set_str(str)
-    begin
-      @data = Integer(str)
-    rescue ArgumentError
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-    end
-    unless validate(@data)
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
-    end
-  end
-
-  MaxInclusive = +32767
-  MinInclusive = -32768
-  def validate(v)
-    ((MinInclusive <= v) && (v <= MaxInclusive))
-  end
-end
-
-
-end
diff --git a/lib/xsd/datatypes1999.rb b/lib/xsd/datatypes1999.rb
deleted file mode 100644
index 6b6b6be20a..0000000000
--- a/lib/xsd/datatypes1999.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-=begin
-XSD4R - XML Schema Datatype 1999 support
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/datatypes'
-
-
-module XSD
-  Namespace.replace('http://www.w3.org/1999/XMLSchema')
-  InstanceNamespace.replace('http://www.w3.org/1999/XMLSchema-instance')
-  AnyTypeLiteral.replace('ur-type')
-  AnySimpleTypeLiteral.replace('ur-type')
-  NilLiteral.replace('null')
-  NilValue.replace('1')
-  DateTimeLiteral.replace('timeInstant')
-end
diff --git a/lib/xsd/iconvcharset.rb b/lib/xsd/iconvcharset.rb
deleted file mode 100644
index f607b7db45..0000000000
--- a/lib/xsd/iconvcharset.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-=begin
-XSD4R - Charset handling with iconv.
-Copyright (C) 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'iconv'
-
-
-module XSD
-
-
-class IconvCharset
-  def self.safe_iconv(to, from, str)
-    iconv = Iconv.new(to, from)
-    out = ""
-    begin
-      out << iconv.iconv(str)
-    rescue Iconv::IllegalSequence => e
-      out << e.success
-      ch, str = e.failed.split(//, 2)
-      out << '?'
-      STDERR.puts("Failed to convert #{ch}")
-      retry
-    end
-    return out
-  end
-end
-
-
-end
diff --git a/lib/xsd/namedelements.rb b/lib/xsd/namedelements.rb
deleted file mode 100644
index df749fed72..0000000000
--- a/lib/xsd/namedelements.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-=begin
-XSD4R - WSDL named element collection.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module XSD
-
-
-class NamedElements
-  include Enumerable
-
-  def initialize
-    @elements = []
-    @cache = {}
-  end
-
-  def dup
-    o = NamedElements.new
-    o.elements = @elements.dup
-    o
-  end
-
-  def size
-    @elements.size
-  end
-
-  def [](idx)
-    if idx.is_a?(Numeric)
-      @elements[idx]
-    else
-      @cache[idx] ||= @elements.find { |item| item.name == idx }
-    end
-  end
-
-  def find_name(name)
-    @elements.find { |item| item.name.name == name }
-  end
-
-  def each
-    @elements.each do |element|
-      yield(element)
-    end
-  end
-
-  def <<(rhs)
-    @elements << rhs
-    self
-  end
-  
-  def delete(rhs)
-    @elements.delete(rhs)
-  end
-
-  def +(rhs)
-    o = NamedElements.new
-    o.elements = @elements + rhs.elements
-    o
-  end
-
-  def concat(rhs)
-    @elements.concat(rhs.elements)
-    self
-  end
-
-protected
-
-  def elements=(rhs)
-    @elements = rhs
-  end
-
-  def elements
-    @elements
-  end
-end
-
-end
diff --git a/lib/xsd/ns.rb b/lib/xsd/ns.rb
deleted file mode 100644
index 0767b2c30d..0000000000
--- a/lib/xsd/ns.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-=begin
-XSD4R - XML Schema Namespace library
-Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/datatypes'
-
-
-module XSD
-
-
-class NS
-  class Assigner
-    def initialize
-      @count = 0
-    end
-
-    def assign(ns)
-      @count += 1
-      "n#{ @count }"
-    end
-  end
-
-  attr_reader :default_namespace
-
-  class FormatError < Error; end
-
-public
-
-  def initialize(tag2ns = {})
-    @tag2ns = tag2ns
-    @assigner = nil
-    @ns2tag = {}
-    @tag2ns.each do |tag, ns|
-      @ns2tag[ns] = tag
-    end
-    @default_namespace = nil
-  end
-
-  def assign(ns, tag = nil)
-    if (tag == '')
-      @default_namespace = ns
-      tag
-    else
-      @assigner ||= Assigner.new
-      tag ||= @assigner.assign(ns)
-      @ns2tag[ns] = tag
-      @tag2ns[tag] = ns
-      tag
-    end
-  end
-
-  def assigned?(ns)
-    @ns2tag.key?(ns)
-  end
-
-  def assigned_tag?(tag)
-    @tag2ns.key?(tag)
-  end
-
-  def clone_ns
-    cloned = NS.new(@tag2ns.dup)
-    cloned.assigner = @assigner
-    cloned.assign(@default_namespace, '') if @default_namespace
-    cloned
-  end
-
-  def name(name)
-    if (name.namespace == @default_namespace)
-      name.name
-    elsif @ns2tag.key?(name.namespace)
-      @ns2tag[name.namespace] + ':' << name.name
-    else
-      raise FormatError.new('Namespace: ' << name.namespace << ' not defined yet.')
-    end
-  end
-
-  def compare(ns, name, rhs)
-    if (ns == @default_namespace)
-      return true if (name == rhs)
-    end
-    @tag2ns.each do |assigned_tag, assigned_ns|
-      if assigned_ns == ns && "#{ assigned_tag }:#{ name }" == rhs
-	return true
-      end
-    end
-    false
-  end
-
-  # $1 and $2 are necessary.
-  ParseRegexp = Regexp.new('^([^:]+)(?::(.+))?$')
-
-  def parse(elem)
-    ns = nil
-    name = nil
-    ParseRegexp =~ elem
-    if $2
-      ns = @tag2ns[$1]
-      name = $2
-      if !ns
-	raise FormatError.new('Unknown namespace qualifier: ' << $1)
-      end
-    elsif $1
-      ns = @default_namespace
-      name = $1
-    end
-    if !name
-      raise FormatError.new("Illegal element format: #{ elem }")
-    end
-    XSD::QName.new(ns, name)
-  end
-
-  def each_ns
-    @ns2tag.each do |ns, tag|
-      yield(ns, tag)
-    end
-  end
-
-protected
-
-  def assigner=(assigner)
-    @assigner = assigner
-  end
-end
-
-
-end
diff --git a/lib/xsd/qname.rb b/lib/xsd/qname.rb
deleted file mode 100644
index 150a837c1d..0000000000
--- a/lib/xsd/qname.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-=begin
-XSD4R - XML QName definition.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-module XSD
-
-
-class QName
-  attr_accessor :namespace
-  attr_accessor :name
-
-  def initialize(namespace = nil, name = nil)
-    @namespace = namespace
-    @name = name
-  end
-
-  def dup_name(name)
-    self.class.new(@namespace, name)
-  end
-
-  def match(rhs)
-    unless self.class === rhs
-      return false
-    end
-    if rhs.namespace and (rhs.namespace != @namespace)
-      return false
-    end
-    if rhs.name and (rhs.name != @name)
-      return false
-    end
-    true
-  end
-
-  def ==(rhs)
-    (self.class === rhs && @namespace == rhs.namespace && @name == rhs.name)
-  end
-
-  def ===(rhs)
-    (self == rhs)
-  end
-
-  def eql?(rhs)
-    (self == rhs)
-  end
-
-  def hash
-    @namespace.hash ^ @name.hash
-  end
-  
-  def to_s
-    "{#{ namespace }}#{ name }"
-  end
-
-  NormalizedNameRegexp = /^\{([^}]*)\}(.*)$/
-  def parse(str)
-    NormalizedNameRegexp =~ str
-    self.new($1, $2)
-  end
-end
-
-
-end
diff --git a/lib/xsd/xmlparser.rb b/lib/xsd/xmlparser.rb
deleted file mode 100644
index 7d6d389261..0000000000
--- a/lib/xsd/xmlparser.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-=begin
-XSD4R - XML Instance parser library.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/xmlparser/parser'
-
-
-module XSD
-
-
-module XMLParser
-  def create_parser(host, opt)
-    XSD::XMLParser::Parser.create_parser(host, opt)
-  end
-  module_function :create_parser
-
-  # $1 is necessary.
-  NSParseRegexp = Regexp.new('^xmlns:?(.*)$')
-
-  def filter_ns(ns, attrs)
-    return attrs if attrs.nil? or attrs.empty?
-    newattrs = {}
-    attrs.each do |key, value|
-      if (NSParseRegexp =~ key)
-	# '' means 'default namespace'.
-	tag = $1 || ''
-	ns.assign(value, tag)
-      else
-	newattrs[key] = value
-      end
-    end
-    newattrs
-  end
-  module_function :filter_ns
-end
-
-
-end
-
-
-# Try to load XML processor.
-loaded = false
-[
-  'xsd/xmlparser/xmlscanner',
-  'xsd/xmlparser/xmlparser',
-  'xsd/xmlparser/rexmlparser',
-].each do |lib|
-  begin
-    require lib
-    loaded = true
-    break
-  rescue LoadError
-  end
-end
-unless loaded
-  raise RuntimeError.new("XML processor module not found.")
-end
diff --git a/lib/xsd/xmlparser/parser.rb b/lib/xsd/xmlparser/parser.rb
deleted file mode 100644
index 0c7fd48084..0000000000
--- a/lib/xsd/xmlparser/parser.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-=begin
-XSD4R - XML Instance parser library.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/qname'
-require 'xsd/ns'
-require 'xsd/charset'
-
-
-module XSD
-module XMLParser
-
-
-class Parser
-  class ParseError < Error; end
-  class FormatDecodeError < ParseError; end
-  class UnknownElementError < FormatDecodeError; end
-  class UnknownAttributeError < FormatDecodeError; end
-  class UnexpectedElementError < FormatDecodeError; end
-  class ElementConstraintError < FormatDecodeError; end
-
-  @@parser_factory = nil
-
-  def self.factory
-    @@parser_factory
-  end
-
-  def self.create_parser(host, opt = {})
-    @@parser_factory.new(host, opt)
-  end
-
-  def self.add_factory(factory)
-    if $DEBUG
-      puts "Set #{ factory } as XML processor."
-    end
-    @@parser_factory = factory
-  end
-
-public
-
-  attr_accessor :charset
-
-  def initialize(host, opt = {})
-    @host = host
-    @charset = opt[:charset] || 'us-ascii'
-  end
-
-  def parse(string_or_readable)
-    @textbuf = ''
-    prologue
-    do_parse(string_or_readable)
-    epilogue
-  end
-
-private
-
-  def do_parse(string_or_readable)
-    raise NotImplementError.new(
-      'Method do_parse must be defined in derived class.')
-  end
-
-  def start_element(name, attrs)
-    @host.start_element(name, attrs)
-  end
-
-  def characters(text)
-    @host.characters(text)
-  end
-
-  def end_element(name)
-    @host.end_element(name)
-  end
-
-  def prologue
-  end
-
-  def epilogue
-  end
-
-  def xmldecl_encoding=(charset)
-    if @charset.nil?
-      @charset = charset
-    else
-      # Definition in a stream (like HTTP) has a priority.
-      p "encoding definition: #{ charset } is ignored." if $DEBUG
-    end
-  end
-end
-
-
-end
-end
diff --git a/lib/xsd/xmlparser/rexmlparser.rb b/lib/xsd/xmlparser/rexmlparser.rb
deleted file mode 100644
index 2500d432d8..0000000000
--- a/lib/xsd/xmlparser/rexmlparser.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-=begin
-XSD4R - REXMLParser XML parser library.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/xmlparser'
-require 'rexml/streamlistener'
-require 'rexml/document'
-
-
-module XSD
-module XMLParser
-
-
-class REXMLParser < XSD::XMLParser::Parser
-  include REXML::StreamListener
-
-  def do_parse(string_or_readable)
-    source = nil
-    source = REXML::SourceFactory.create_from(string_or_readable)
-    source.encoding = charset if charset
-    # Listener passes a String in utf-8.
-    @charset = 'utf-8'
-    REXML::Document.parse_stream(source, self)
-  end
-
-  def epilogue
-  end
-
-  def tag_start(name, attrs)
-    start_element(name, attrs)
-  end
-
-  def tag_end(name)
-    end_element(name)
-  end
-
-  def text(text)
-    characters(text)
-  end
-
-  def xmldecl(version, encoding, standalone)
-    # Version should be checked.
-  end
-
-  add_factory(self)
-end
-
-
-end
-end
diff --git a/lib/xsd/xmlparser/xmlparser.rb b/lib/xsd/xmlparser/xmlparser.rb
deleted file mode 100644
index f555b99b26..0000000000
--- a/lib/xsd/xmlparser/xmlparser.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-=begin
-XSD4R - XMLParser XML parser library.
-Copyright (C) 2001, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/xmlparser'
-require 'xml/parser'
-
-
-module XSD
-module XMLParser
-
-
-class XMLParser < XSD::XMLParser::Parser
-  class Listener < XML::Parser
-    begin
-      require 'xml/encoding-ja'
-      include XML::Encoding_ja
-    rescue LoadError
-      # uconv may not be installed.
-    end
-  end
-
-  def do_parse(string_or_readable)
-    # XMLParser passes a String in utf-8.
-    @charset = 'utf-8'
-    @parser = Listener.new
-    @parser.parse(string_or_readable) do |type, name, data|
-      case type
-      when XML::Parser::START_ELEM
-	start_element(name, data)
-      when XML::Parser::END_ELEM
-	end_element(name)
-      when XML::Parser::CDATA
-	characters(data)
-      else
-	raise FormatDecodeError.new("Unexpected XML: #{ type }/#{ name }/#{ data }.")
-      end
-    end
-  end
-
-  add_factory(self)
-end
-
-
-end
-end
diff --git a/lib/xsd/xmlparser/xmlscanner.rb b/lib/xsd/xmlparser/xmlscanner.rb
deleted file mode 100644
index c10e275b9e..0000000000
--- a/lib/xsd/xmlparser/xmlscanner.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-=begin
-XSD4R - XMLScan XML parser library.
-Copyright (C) 2002, 2003  NAKAMURA, Hiroshi.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PRATICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
-=end
-
-
-require 'xsd/xmlparser'
-require 'xmlscan/scanner'
-
-
-module XSD
-module XMLParser
-
-
-class XMLScanner < XSD::XMLParser::Parser
-  include XMLScan::Visitor
-
-  def do_parse(string_or_readable)
-    @attrs = {}
-    @curattr = nil
-    @scanner = XMLScan::XMLScanner.new(self)
-    @scanner.kcode = ::XSD::Charset.charset_str(charset) if charset
-    @scanner.parse(string_or_readable)
-  end
-
-  def scanner_kcode=(charset)
-    @scanner.kcode = ::XSD::Charset.charset_str(charset) if charset
-    self.xmldecl_encoding = charset
-  end
-
-  ENTITY_REF_MAP = {
-    'lt' => '<',
-    'gt' => '>',
-    'amp' => '&',
-    'quot' => '"',
-    'apos' => '\''
-  }
-
-  def parse_error(msg)
-    raise ParseError.new(msg)
-  end
-
-  def wellformed_error(msg)
-    raise NotWellFormedError.new(msg)
-  end
-
-  def valid_error(msg)
-    raise NotValidError.new(msg)
-  end
-
-  def warning(msg)
-    p msg if $DEBUG
-  end
-
-  # def on_xmldecl; end
-
-  def on_xmldecl_version(str)
-    # 1.0 expected.
-  end
-
-  def on_xmldecl_encoding(str)
-    self.scanner_kcode = str
-  end
-
-  # def on_xmldecl_standalone(str); end
-
-  # def on_xmldecl_other(name, value); end
-
-  # def on_xmldecl_end; end
-
-  # def on_doctype(root, pubid, sysid); end
-
-  # def on_prolog_space(str); end
-
-  # def on_comment(str); end
-
-  # def on_pi(target, pi); end
-
-  def on_chardata(str)
-    characters(str)
-  end
-
-  # def on_cdata(str); end
-
-  def on_etag(name)
-    end_element(name)
-  end
-
-  def on_entityref(ref)
-    characters(ENTITY_REF_MAP[ref])
-  end
-
-  def on_charref(code)
-    characters([code].pack('U'))
-  end
-
-  def on_charref_hex(code)
-    on_charref(code)
-  end
-
-  # def on_start_document; end
-
-  # def on_end_document; end
-
-  def on_stag(name)
-    @attrs = {}
-  end
-
-  def on_attribute(name)
-    @attrs[name] = @curattr = ''
-  end
-
-  def on_attr_value(str)
-    @curattr << str
-  end
-
-  def on_attr_entityref(ref)
-    @curattr << ENTITY_REF_MAP[ref]
-  end
-
-  def on_attr_charref(code)
-    @curattr << [code].pack('U')
-  end
-
-  def on_attr_charref_hex(code)
-    on_attr_charref(code)
-  end
-
-  # def on_attribute_end(name); end
-
-  def on_stag_end_empty(name)
-    on_stag_end(name)
-    on_etag(name)
-  end
-
-  def on_stag_end(name)
-    start_element(name, @attrs)
-  end
-
-  add_factory(self)
-end
-
-
-end
-end
diff --git a/lib/yaml.rb b/lib/yaml.rb
deleted file mode 100644
index d33f2e202a..0000000000
--- a/lib/yaml.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-#												vim:sw=4:ts=4
-# $Id$
-#
-#   YAML.rb
-#
-#   Loads the parser/loader and emitter/writer.
-#
-
-module YAML
-
-    begin
-        require 'yaml/syck'
-        @@parser = YAML::Syck::Parser
-        @@loader = YAML::Syck::DefaultLoader
-        @@emitter = YAML::Syck::Emitter
-    rescue LoadError
-        require 'yaml/parser'
-        @@parser = YAML::Parser
-        @@loader = YAML::DefaultLoader
-        require 'yaml/emitter'
-        @@emitter = YAML::Emitter
-    end
-    require 'yaml/loader'
-    require 'yaml/stream'
-
-	#
-	# Load a single document from the current stream
-	#
-	def YAML.dump( obj, io = nil )
-        io ||= ""
-        io << obj.to_yaml
-        io
-	end
-
-	#
-	# Load a single document from the current stream
-	#
-	def YAML.load( io )
-		yp = @@parser.new.load( io )
-	end
-
-	#
-	# Parse a single document from the current stream
-	#
-	def YAML.parse( io )
-		yp = @@parser.new( :Model => :Generic ).load( io )
-	end
-
-	#
-	# Load all documents from the current stream
-	#
-	def YAML.each_document( io, &doc_proc )
-		yp = @@parser.new.load_documents( io, &doc_proc )
-    end
-
-	#
-	# Identical to each_document
-	#
-	def YAML.load_documents( io, &doc_proc )
-		YAML.each_document( io, &doc_proc )
-    end
-
-	#
-	# Parse all documents from the current stream
-	#
-	def YAML.each_node( io, &doc_proc )
-		yp = @@parser.new( :Model => :Generic ).load_documents( io, &doc_proc )
-    end
-
-	#
-	# Parse all documents from the current stream
-	#
-	def YAML.parse_documents( io, &doc_proc )
-		YAML.each_node( io, &doc_proc )
-    end
-
-	#
-	# Load all documents from the current stream
-	#
-	def YAML.load_stream( io )
-		yp = @@parser.new
-		d = nil
-		yp.load_documents( io ) { |doc|
-			d = YAML::Stream.new( yp.options ) if not d
-			d.add( doc ) 
-		}
-		return d
-	end
-
-	#
-	# Add a transfer method to a domain
-	#
-	def YAML.add_domain_type( domain, type_re, &transfer_proc )
-        @@loader.add_domain_type( domain, type_re, &transfer_proc )
-	end
-
-	#
-	# Add a transfer method for a builtin type
-	#
-	def YAML.add_builtin_type( type_re, &transfer_proc )
-	    @@loader.add_builtin_type( type_re, &transfer_proc )
-	end
-
-	#
-	# Add a transfer method for a builtin type
-	#
-	def YAML.add_ruby_type( type, &transfer_proc )
-        @@loader.add_ruby_type( type, &transfer_proc )
-	end
-
-	#
-	# Add a private document type
-	#
-	def YAML.add_private_type( type_re, &transfer_proc )
-	    @@loader.add_private_type( type_re, &transfer_proc )
-	end
-
-    #
-    # Detect typing of a string
-    #
-    def YAML.detect_implicit( val )
-        @@loader.detect_implicit( val )
-    end
-
-    #
-    # Apply a transfer method to a Ruby object
-    #
-    def YAML.transfer( type_id, obj )
-        @@loader.transfer( type_id, obj )
-    end
-
-	#
-	# Apply any implicit a node may qualify for
-	#
-	def YAML.try_implicit( obj )
-		YAML.transfer( YAML.detect_implicit( obj ), obj )
-	end
-
-    #
-    # Method to extract colon-seperated type and class, returning
-    # the type and the constant of the class
-    #
-    def YAML.read_type_class( type, obj_class )
-        scheme, domain, type, tclass = type.split( ':', 4 )
-        tclass.split( "::" ).each { |c| obj_class = obj_class.const_get( c ) } if tclass
-        return [ type, obj_class ]
-    end
-
-    #
-    # Allocate blank object
-    #
-    def YAML.object_maker( obj_class, val, is_attr = false )
-        if Hash === val
-            name = obj_class.name
-            ostr = sprintf( "\004\006o:%c%s\000", name.length + 5, name )
-            if is_attr
-                ostr[ -1, 1 ] = Marshal.dump( val ).sub( /^[^{]+\{/, '' )
-				p ostr
-            end
-            o = ::Marshal.load( ostr )
-            unless is_attr
-                val.each_pair { |k,v|
-                    o.instance_eval "@#{k} = v"
-                }
-            end
-            o
-        else
-            raise YAML::Error, "Invalid object explicitly tagged !ruby/Object: " + val.inspect
-        end
-    end
-
-	#
-	# Allocate an Emitter if needed
-	#
-	def YAML.quick_emit( oid, opts = {}, &e )
-		old_opt = nil
-		if opts[:Emitter].is_a? @@emitter
-			out = opts.delete( :Emitter )
-			old_opt = out.options.dup
-			out.options.update( opts )
-		else
-			out = @@emitter.new( opts )
-		end
-        aidx = out.start_object( oid )
-        if aidx
-            out.simple( "*#{ aidx }" )
-        else
-            e.call( out )
-        end
-		if old_opt.is_a? Hash
-			out.options = old_opt
-		end 
-		out.end_object
-	end
-	
-end
-
-require 'yaml/rubytypes'
-require 'yaml/types'
-
-#
-# ryan: You know how Kernel.p is a really convenient way to dump ruby
-#       structures?  The only downside is that it's not as legible as
-#       YAML.
-#
-# _why: (listening)
-#
-# ryan: I know you don't want to urinate all over your users' namespaces.
-#       But, on the other hand, convenience of dumping for debugging is,
-#       IMO, a big YAML use case.
-#
-# _why: Go nuts!  Have a pony parade!
-#
-# ryan: Either way, I certainly will have a pony parade.
-#
-module Kernel
-    def y( x )
-        puts x.to_yaml
-    end
-end
-
-
diff --git a/lib/yaml/baseemitter.rb b/lib/yaml/baseemitter.rb
deleted file mode 100644
index 007ee7be5e..0000000000
--- a/lib/yaml/baseemitter.rb
+++ /dev/null
@@ -1,241 +0,0 @@
-#
-# BaseEmitter
-#
-
-require 'yaml/constants'
-require 'yaml/encoding'
-require 'yaml/error'
-
-module YAML
-
-    module BaseEmitter
-
-        def options( opt = nil )
-            if opt
-                @options[opt] || YAML::DEFAULTS[opt]
-            else
-                @options
-            end
-        end
-
-        def options=( opt )
-            @options = opt
-        end
-
-        #
-        # Emit binary data
-        #
-        def binary_base64( value )
-            self << "!binary "
-            self.node_text( [value].pack("m"), '|' )
-        end
-
-		#
-		# Emit plain, normal flowing text
-		#
-		def node_text( value, block = '>' )
-            @seq_map = false
-			valx = value.dup
-			if options(:UseBlock)
-				block = '|'
-			elsif not options(:UseFold) and valx =~ /\n[ \t]/ and not valx =~ /#{YAML::ESCAPE_CHAR}/
-				block = '|'
-			end 
-			str = block.dup
-			if valx =~ /\n\Z\n/
-				str << "+"
-			elsif valx =~ /\Z\n/
-			else
-				str << "-"
-			end
-			if valx =~ /#{YAML::ESCAPE_CHAR}/
-				valx = YAML::escape( valx )
-			end
-			if valx =~ /\A[ \t#]/
-				str << options(:Indent).to_s
-			end
-			if block == '>'
-				valx = fold( valx ) 
-			end
-			self << str + indent_text( valx ) + "\n"
-		end
-
-		#
-		# Emit a simple, unqouted string
-		#
-		def simple( value )
-            @seq_map = false
-            self << value.to_s
-		end
-
-		#
-		# Emit double-quoted string
-		#
-		def double( value )
-			"\"#{YAML.escape( value )}\"" 
-		end
-
-		#
-		# Emit single-quoted string
-		#
-		def single( value )
-			"'#{value}'"
-		end
-
-		#
-		# Write a text block with the current indent
-		#
-		def indent_text( text )
-			return "" if text.to_s.empty?
-            spacing = " " * ( level * options(:Indent) )
-			return "\n" + text.gsub( /^([^\n])/, "#{spacing}\\1" )
-		end
-
-		#
-		# Write a current indent
-		#
-		def indent
-            #p [ self.id, @level, :INDENT ]
-			return " " * ( level * options(:Indent) )
-		end
-
-		#
-		# Add indent to the buffer
-		#
-		def indent!
-			self << indent
-		end
-
-		#
-		# Folding paragraphs within a column
-		#
-		def fold( value )
-			value.gsub!( /\A\n+/, '' )
-			folded = $&.to_s
-			width = (0..options(:BestWidth))
-			while not value.empty?
-				last = value.index( /(\n+)/ )
-				chop_s = false
-				if width.include?( last )
-					last += $1.length - 1
-				elsif width.include?( value.length )
-					last = value.length
-				else
-					last = value.rindex( /[ \t]/, options(:BestWidth) )
-					chop_s = true
-				end
-				folded += value.slice!( 0, width.include?( last ) ? last + 1 : options(:BestWidth) )
-				folded.chop! if chop_s
-				folded += "\n" unless value.empty?
-			end
-			folded
-		end
-
-        #
-        # Quick mapping
-        #
-        def map( type, &e )
-            val = Mapping.new
-            e.call( val )
-			self << "#{type} " if type.length.nonzero?
-
-			#
-			# Empty hashes
-			#
-			if val.length.zero?
-				self << "{}"
-                @seq_map = false
-			else
-                # FIXME
-                # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero? 
-			    #     @headless = 1 
-                # end
-
-                defkey = @options.delete( :DefaultKey )
-                if defkey
-                    seq_map_shortcut
-                    self << "= : "
-                    defkey.to_yaml( :Emitter => self )
-                end
-
-				#
-				# Emit the key and value
-				#
-                val.each { |v|
-                    seq_map_shortcut
-                    if v[0].is_complex_yaml?
-                        self << "? "
-                    end
-                    v[0].to_yaml( :Emitter => self )
-                    if v[0].is_complex_yaml?
-                        self << "\n"
-                        indent!
-                    end
-                    self << ": " 
-                    v[1].to_yaml( :Emitter => self )
-                }
-			end
-        end
-
-        def seq_map_shortcut
-            # FIXME: seq_map needs to work with the new anchoring system
-            # if @seq_map
-            #     @anchor_extras[@buffer.length - 1] = "\n" + indent
-            #     @seq_map = false
-            # else
-                self << "\n"
-                indent! 
-            # end
-        end
-
-        #
-        # Quick sequence
-        #
-        def seq( type, &e )
-            @seq_map = false
-            val = Sequence.new
-            e.call( val )
-			self << "#{type} " if type.length.nonzero?
-
-			#
-			# Empty arrays
-			#
-			if val.length.zero?
-				self << "[]"
-			else
-                # FIXME
-                # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero? 
-			    #     @headless = 1 
-                # end
-
-				#
-				# Emit the key and value
-				#
-                val.each { |v|
-                    self << "\n"
-                    indent!
-                    self << "- "
-                    @seq_map = true if v.class == Hash
-                    v.to_yaml( :Emitter => self )
-                }
-			end
-        end
-
-    end
-
-    #
-    # Emitter helper classes
-    #
-    class Mapping < Array
-        def add( k, v )
-            push [k, v]
-        end
-    end
-
-    class Sequence < Array
-        def add( v )
-            push v
-        end
-    end
-
-end
diff --git a/lib/yaml/basenode.rb b/lib/yaml/basenode.rb
deleted file mode 100644
index e88a76f3d2..0000000000
--- a/lib/yaml/basenode.rb
+++ /dev/null
@@ -1,216 +0,0 @@
-#
-# YAML::BaseNode class
-#
-require 'yaml/ypath'
-
-module YAML
-
-    #
-    # YAML Generic Model container
-    #
-    module BaseNode
-
-        #
-        # Search for YPath entry and return
-        # qualified nodes.
-        #
-        def select( ypath_str )
-            matches = match_path( ypath_str )
-
-            #
-            # Create a new generic view of the elements selected
-            #
-            if matches
-                result = []
-                matches.each { |m|
-                    result.push m.last
-                }
-                self.class.new( 'seq', result )
-            end
-        end
-
-        #
-        # Search for YPath entry and return
-        # transformed nodes.
-        #
-        def select!( ypath_str )
-            matches = match_path( ypath_str )
-
-            #
-            # Create a new generic view of the elements selected
-            #
-            if matches
-                result = []
-                matches.each { |m|
-                    result.push m.last.transform
-                }
-                result
-            end
-        end
-
-        #
-        # Search for YPath entry and return a list of
-        # qualified paths.
-        #
-        def search( ypath_str )
-            matches = match_path( ypath_str )
-
-            if matches
-                matches.collect { |m|
-                    path = []
-                    m.each_index { |i|
-                        path.push m[i] if ( i % 2 ).zero?
-                    }
-                    "/" + path.compact.join( "/" )
-                }
-            end
-        end
-
-        def at( seg )
-            if Hash === @value and @value.has_key?( seg )
-                @value[seg][1]
-            elsif Array === @value and seg =~ /\A\d+\Z/ and @value[seg.to_i]
-                @value[seg.to_i]
-            end
-        end
-
-        #
-        # YPath search returning a complete depth array
-        #
-        def match_path( ypath_str )
-            depth = 0
-            matches = []
-            YPath.each_path( ypath_str ) do |ypath|
-                seg = match_segment( ypath, 0 )
-                matches += seg if seg
-            end
-            matches.uniq
-        end
-
-        #
-        # Search a node for a single YPath segment
-        #
-        def match_segment( ypath, depth )
-            deep_nodes = []
-            seg = ypath.segments[ depth ]
-            if seg == "/"
-                unless String === @value
-                    idx = -1
-                    @value.collect { |v|
-                        idx += 1
-                        if Hash === @value
-                            match_init = [v[0], v[1][1]]
-                            match_deep = v[1][1].match_segment( ypath, depth )
-                        else
-                            match_init = [idx, v]
-                            match_deep = v.match_segment( ypath, depth )
-                        end
-                        if match_deep
-                            match_deep.each { |m|
-                                deep_nodes.push( match_init + m )
-                            }
-                        end
-                    }
-                end
-                depth += 1
-                seg = ypath.segments[ depth ]
-            end
-            match_nodes =
-                case seg
-                when "."
-                    [[nil, self]]
-                when ".."
-                    [["..", nil]]
-                when "*"
-                    if @value.is_a? Enumerable
-                        idx = -1
-                        @value.collect { |h|
-                            idx += 1
-                            if Hash === @value
-                                [h[0], h[1][1]]
-                            else
-                                [idx, h]
-                            end
-                        }
-                    end
-                else
-                    if seg =~ /^"(.*)"$/
-                        seg = $1
-                    elsif seg =~ /^'(.*)'$/
-                        seg = $1
-                    end
-                    if ( v = at( seg ) )
-                        [[ seg, v ]]
-                    end
-                end
-            return deep_nodes unless match_nodes
-            pred = ypath.predicates[ depth ]
-            if pred
-                case pred
-                when /^\.=/
-                    pred = $'
-                    match_nodes.reject! { |n|
-                        n.last.value != pred
-                    }
-                else
-                    match_nodes.reject! { |n|
-                        n.last.at( pred ).nil?
-                    }
-                end
-            end
-            return match_nodes + deep_nodes unless ypath.segments.length > depth + 1
-
-            #puts "DEPTH: #{depth + 1}"
-            deep_nodes = []
-            match_nodes.each { |n|
-                if n[1].is_a? BaseNode
-                    match_deep = n[1].match_segment( ypath, depth + 1 )
-                    if match_deep
-                        match_deep.each { |m|
-                            deep_nodes.push( n + m )
-                        }
-                    end
-                else
-                    deep_nodes = []
-                end
-            }
-            deep_nodes = nil if deep_nodes.length == 0
-            deep_nodes
-        end
-
-        #
-        # We want the node to act like as Hash
-        # if it is.
-        #
-        def []( *k )
-            if Hash === @value
-                v = @value.[]( *k )
-                v[1] if v
-            elsif Array === @value
-                @value.[]( *k )
-            end
-        end
-
-        def children
-            if Hash === @value
-                @value.values.collect { |c| c[1] }
-            elsif Array === @value
-                @value
-            end
-        end
-
-        def children_with_index
-            if Hash === @value
-                @value.keys.collect { |i| [self[i], i] }
-            elsif Array === @value
-                i = -1; @value.collect { |v| i += 1; [v, i] }
-            end
-        end
-
-        def emit
-            transform.to_yaml
-        end
-    end
-
-end
-
diff --git a/lib/yaml/constants.rb b/lib/yaml/constants.rb
deleted file mode 100644
index fb833d3077..0000000000
--- a/lib/yaml/constants.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Constants used throughout the library
-#
-module YAML
-
-	#
-	# Constants
-	#
-	VERSION = '0.60'
-	SUPPORTED_YAML_VERSIONS = ['1.0']
-
-	#
-	# Parser tokens
-	#
-	WORD_CHAR = 'A-Za-z0-9'
-	PRINTABLE_CHAR = '-_A-Za-z0-9!?/()$\'". ' 
-	NOT_PLAIN_CHAR = '\x7f\x0-\x1f\x80-\x9f'
-	ESCAPE_CHAR = '[\\x00-\\x09\\x0b-\\x1f]'
-	INDICATOR_CHAR = '*&!|\\\\^@%{}[]='
-	SPACE_INDICATORS = '-#:,?'
-	RESTRICTED_INDICATORS = '#:,}]'
-	DNS_COMP_RE = "\\w(?:[-\\w]*\\w)?"
-	DNS_NAME_RE = "(?:(?:#{DNS_COMP_RE}\\.)+#{DNS_COMP_RE}|#{DNS_COMP_RE})"
-	ESCAPES = %w{\x00   \x01	\x02	\x03	\x04	\x05	\x06	\a
-			     \x08	\t		\n		\v		\f		\r		\x0e	\x0f
-				 \x10	\x11	\x12	\x13	\x14	\x15	\x16	\x17
-				 \x18	\x19	\x1a	\e		\x1c	\x1d	\x1e	\x1f
-			    }
-	UNESCAPES = {
-				'a' => "\x07", 'b' => "\x08", 't' => "\x09", 
-				'n' => "\x0a", 'v' => "\x0b", 'f' => "\x0c",
-				'r' => "\x0d", 'e' => "\x1b", '\\' => '\\',
-			    }
-
-	#
-	# Default settings
-	#
-	DEFAULTS = {
-		:Indent => 2, :UseHeader => false, :UseVersion => false, :Version => '1.0',
-		:SortKeys => false, :AnchorFormat => 'id%03d', :ExplicitTypes => false,
-		:WidthType => 'absolute', :BestWidth => 80,
-		:UseBlock => false, :UseFold => false, :Encoding => :None
-	}
-
-end
diff --git a/lib/yaml/dbm.rb b/lib/yaml/dbm.rb
deleted file mode 100644
index 87d6009250..0000000000
--- a/lib/yaml/dbm.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-require 'yaml'
-require 'dbm'
-#
-# YAML + DBM = YDBM
-# - Same interface as DBM class
-#
-module YAML
-
-class DBM < ::DBM
-    VERSION = "0.1"
-    def []( key )
-        fetch( key )
-    end
-    def []=( key, val )
-        store( key, val )
-    end
-    def fetch( keystr, ifnone = nil )
-        begin
-            val = super( keystr )
-            return YAML::load( val ) if String === val
-        rescue IndexError
-        end
-        if block_given?
-            yield keystr
-        else
-            ifnone
-        end
-    end
-    def index( keystr )
-        super( keystr.to_yaml )
-    end
-    def values_at( *keys )
-        keys.collect { |k| fetch( k ) }
-    end
-    def delete( key )
-        v = super( key )
-        if String === v
-            v = YAML::load( v ) 
-        end
-        v
-    end
-    def delete_if
-        del_keys = keys.dup
-        del_keys.delete_if { |k| yield( k, fetch( k ) ) == false }
-        del_keys.each { |k| delete( k ) } 
-        self
-    end
-    def reject
-        hsh = self.to_hash
-        hsh.reject { |k,v| yield k, v }
-    end
-    def each_pair
-        keys.each { |k| yield k, fetch( k ) }
-        self
-    end
-    def each_value
-        super { |v| yield YAML::load( v ) }
-        self
-    end
-    def values
-        super.collect { |v| YAML::load( v ) }
-    end
-    def has_value?( val )
-        each_value { |v| return true if v == val }
-        return false
-    end
-    def invert
-        h = {}
-        keys.each { |k| h[ self.fetch( k ) ] = k }
-        h
-    end
-    def replace( hsh )
-        clear
-        update( hsh )
-    end
-    def shift
-        a = super
-        a[1] = YAML::load( a[1] ) if a
-        a
-    end
-    def select( *keys )
-        if block_given?
-            self.keys.collect { |k| v = self[k]; [k, v] if yield k, v }.compact
-        else
-            values_at( *keys )
-        end
-    end
-    def store( key, val )
-        super( key, val.to_yaml )
-        val
-    end
-    def update( hsh )
-        hsh.keys.each do |k|
-            self.store( k, hsh.fetch( k ) )
-        end
-        self
-    end
-    def to_a
-        a = []
-        keys.each { |k| a.push [ k, self.fetch( k ) ] }
-        a
-    end
-    def to_hash
-        h = {}
-        keys.each { |k| h[ k ] = self.fetch( k ) }
-        h
-    end
-    alias :each :each_pair
-end
-
-end
diff --git a/lib/yaml/emitter.rb b/lib/yaml/emitter.rb
deleted file mode 100644
index a6be4a6733..0000000000
--- a/lib/yaml/emitter.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Output classes and methods
-#
-
-require 'yaml/baseemitter'
-require 'yaml/encoding'
-
-module YAML
-
-	#
-	# Emit a set of values
-	#
-    
-	class Emitter
-
-        include BaseEmitter
-
-		attr_accessor :options
-
-		def initialize( opts )
-			opts = {} if opts.class != Hash
-			@options = YAML::DEFAULTS.dup.update( opts )
-            @headless = 0
-            @seq_map = false
-            @anchors = {}
-            @anchor_extras = {}
-            @active_anchors = []
-            @level = -1
-            self.clear
-		end
-
-		def clear
-			@buffer = []
-		end
-
-        def level
-            @level
-        end
-
-		#
-		# Version string
-		#
-		def version_s
-			" %YAML:#{@options[:Version]}" if @options[:UseVersion]
-		end
-
-		#
-		# Header
-		#
-		def header
-            if @headless.nonzero?
-                ""
-            else
-                "---#{version_s} "
-            end
-		end
-
-		#
-		# Concatenate to the buffer
-		#
-		def <<( str )
-            #p [ self.id, @level, str ]
-			@buffer.last << str
-		end
-
-        #
-        # Monitor objects and allow references
-        #
-        def start_object( oid )
-		    @level += 1
-            @buffer.push( "" )
-            #p [ self.id, @level, :OPEN ]
-            idx = nil
-            if oid
-                if @anchors.has_key?( oid )
-                    idx = @active_anchors.index( oid )
-                    unless idx
-                        idx = @active_anchors.length
-                        af_str = "&#{@options[:AnchorFormat]} " % [ idx + 1 ]
-                        af_str += @anchor_extras[ @anchors[ oid ] ].to_s
-                        @buffer[ @anchors[ oid ] ][0,0] = af_str
-					    @headless = 0 if @anchors[ oid ].zero?
-                    end
-                    idx += 1
-                    @active_anchors.push( oid )
-                else
-                    @anchors[ oid ] = @buffer.length - 1
-                end
-            end
-            return idx
-        end
-
-		#
-		# Output method
-		#
-		def end_object
-		    @level -= 1
-            @buffer.push( "" )
-            #p [ self.id, @level, :END ]
-			if @level < 0
-				header + @buffer.to_s[@headless..-1].to_s
-			end
-		end
-	end
-
-end
-
diff --git a/lib/yaml/encoding.rb b/lib/yaml/encoding.rb
deleted file mode 100644
index e361163ac6..0000000000
--- a/lib/yaml/encoding.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Handle Unicode-to-Internal conversion
-#
-
-module YAML
-
-	#
-	# Escape the string, condensing common escapes
-	#
-	def YAML.escape( value )
-		value.gsub( /\\/, "\\\\\\" ).gsub( /"/, "\\\"" ).gsub( /([\x00-\x1f])/ ) { |x| ESCAPES[ x.unpack("C")[0] ] }
-	end
-
-	#
-	# Unescape the condenses escapes
-	#
-	def YAML.unescape( value )
-		value.gsub( /\\(?:([nevfbart\\])|0?x([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/ ) { |x| 
-			if $3
-				["#$3".hex ].pack('U*')
-			elsif $2
-				[$2].pack( "H2" ) 
-			else
-				UNESCAPES[$1] 
-			end
-		}
-	end
-
-end
diff --git a/lib/yaml/error.rb b/lib/yaml/error.rb
deleted file mode 100644
index a9df22749b..0000000000
--- a/lib/yaml/error.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Error messages and exception class
-#
-
-module YAML
-
-	#
-	# Error messages
-	#
-
-	ERROR_NO_HEADER_NODE = "With UseHeader=false, the node Array or Hash must have elements"
-	ERROR_NEED_HEADER = "With UseHeader=false, the node must be an Array or Hash"
-	ERROR_BAD_EXPLICIT = "Unsupported explicit transfer: '%s'"
-    ERROR_MANY_EXPLICIT = "More than one explicit transfer"
-	ERROR_MANY_IMPLICIT = "More than one implicit request"
-	ERROR_NO_ANCHOR = "No anchor for alias '%s'"
-	ERROR_BAD_ANCHOR = "Invalid anchor: %s"
-	ERROR_MANY_ANCHOR = "More than one anchor"
-	ERROR_ANCHOR_ALIAS = "Can't define both an anchor and an alias"
-	ERROR_BAD_ALIAS = "Invalid alias: %s"
-	ERROR_MANY_ALIAS = "More than one alias"
-	ERROR_ZERO_INDENT = "Can't use zero as an indentation width"
-	ERROR_UNSUPPORTED_VERSION = "This release of YAML.rb does not support YAML version %s"
-	ERROR_UNSUPPORTED_ENCODING = "Attempt to use unsupported encoding: %s"
-
-	#
-	# YAML Error classes
-	#
-    
-	class Error < StandardError; end
-	class ParseError < Error; end
-
-end
diff --git a/lib/yaml/loader.rb b/lib/yaml/loader.rb
deleted file mode 100644
index eb0709e103..0000000000
--- a/lib/yaml/loader.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# YAML::Loader class
-# .. type handling ..
-#
-module YAML
-    class Loader
-        TRANSFER_DOMAINS = {
-            'yaml.org,2002' => {},
-            'ruby.yaml.org,2002' => {}
-        }
-        PRIVATE_TYPES = {}
-        IMPLICIT_TYPES = [ 'null', 'bool', 'time', 'int', 'float' ]
-    end
-end
diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb
deleted file mode 100644
index fed4370271..0000000000
--- a/lib/yaml/rubytypes.rb
+++ /dev/null
@@ -1,505 +0,0 @@
-require 'date'
-#
-# Type conversions
-#
-
-class Class
-	def to_yaml( opts = {} )
-		raise ArgumentError, "can't dump anonymous class %s" % self.class
-	end
-end
-
-class Object
-    def is_complex_yaml?
-        true
-    end
-    def to_yaml_type
-        "!ruby/object:#{self.class}"
-    end
-    def to_yaml_properties
-        instance_variables.sort
-    end
-	def to_yaml( opts = {} )
-		YAML::quick_emit( self.object_id, opts ) { |out|
-            out.map( self.to_yaml_type ) { |map|
-				to_yaml_properties.each { |m|
-                    map.add( m[1..-1], instance_eval( m ) )
-                }
-            }
-		}
-	end
-end
-
-YAML.add_ruby_type( /^object/ ) { |type, val|
-    type, obj_class = YAML.read_type_class( type, Object )
-    YAML.object_maker( obj_class, val )
-}
-
-#
-# Maps: Hash#to_yaml
-#
-class Hash
-    def is_complex_yaml?
-        true
-    end
-    def to_yaml_type
-        if self.class == Hash or self.class == YAML::SpecialHash
-            "!map"
-        else
-            "!ruby/hash:#{self.class}"
-        end
-    end
-	def to_yaml( opts = {} )
-		opts[:DocType] = self.class if Hash === opts
-		YAML::quick_emit( self.object_id, opts ) { |out|
-            hash_type = to_yaml_type
-            if not out.options(:ExplicitTypes) and hash_type == "!map"
-                hash_type = ""
-            end
-            out.map( hash_type ) { |map|
-				#
-				# Sort the hash
-				#
-                if out.options(:SortKeys)
-				    map.concat( self.sort )
-                else
-                    map.concat( self.to_a )
-                end
-            }
-		}
-	end
-end
-
-hash_proc = Proc.new { |type, val|
-	if Array === val
- 		val = Hash.[]( *val )		# Convert the map to a sequence
-	elsif Hash === val
-	    type, obj_class = YAML.read_type_class( type, Hash )
-        if obj_class != Hash
-            o = obj_class.new
-            o.update( val )
-            val = o
-        end
-    else
- 		raise YAML::Error, "Invalid map explicitly tagged !map: " + val.inspect
-	end
-	val
-}
-YAML.add_ruby_type( /^hash/, &hash_proc ) 
-
-module YAML
-
-    #
-    # Ruby-specific collection: !ruby/flexhash
-    #
-    class FlexHash < Array
-        def []( k )
-            self.assoc( k ).to_a[1]
-        end
-        def []=( k, *rest )
-            val, set = rest.reverse
-            if ( tmp = self.assoc( k ) ) and not set
-                tmp[1] = val
-            else
-                self << [ k, val ] 
-            end
-            val
-        end
-        def has_key?( k )
-            self.assoc( k ) ? true : false
-        end
-        def is_complex_yaml?
-            true
-        end
-        def to_yaml( opts = {} )
-            YAML::quick_emit( self.object_id, opts ) { |out|
-                out.seq( "!ruby/flexhash" ) { |seq|
-                    self.each { |v|
-                        if v[1]
-                            seq.add( Hash.[]( *v ) )
-                        else
-                            seq.add( v[0] )
-                        end
-                    }
-                }
-            }
-        end
-    end
-
-    YAML.add_ruby_type( 'flexhash' ) { |type, val|
-        if Array === val
-            p = FlexHash.new
-            val.each { |v|
-                if Hash === v
-                    p.concat( v.to_a )		# Convert the map to a sequence
-                else
-                    p << [ v, nil ]
-                end
-            }
-            p
-        else
-            raise YAML::Error, "Invalid !ruby/flexhash: " + val.inspect
-        end
-    }
-end
-
-#
-# Structs: export as a !map
-#
-class Struct
-    def is_complex_yaml?
-        true
-    end
-	def to_yaml( opts = {} )
-		YAML::quick_emit( self.object_id, opts ) { |out|
-			#
-			# Basic struct is passed as a YAML map
-			#
-			struct_name = self.class.name.gsub( "Struct:", "" )
-            out.map( "!ruby/struct#{struct_name}" ) { |map|
-				self.members.each { |m|
-                    map.add( m, self[m] )
-				}
-			}
-		}
-	end
-end
-
-YAML.add_ruby_type( /^struct/ ) { |type, val|
-	if Hash === val
-        struct_type = nil
-
-		#
-		# Use existing Struct if it exists
-		#
-		begin
-			struct_name, struct_type = YAML.read_type_class( type, Struct )
-		rescue NameError
-		end
-		if not struct_type
-            struct_def = [ type.split( ':', 4 ).last ]
-			struct_type = Struct.new( *struct_def.concat( val.keys.collect { |k| k.intern } ) ) 
-		end
-
-		#
-		# Set the Struct properties
-		#
-		st = struct_type.new
-		st.members.each { |m|
-			st.send( "#{m}=", val[m] )
-		}
-		st
-	else
-		raise YAML::Error, "Invalid Ruby Struct: " + val.inspect
-	end
-}
-
-#
-# Sequences: Array#to_yaml
-#
-class Array
-    def is_complex_yaml?
-        true
-    end
-    def to_yaml_type
-        if self.class == Array 
-            "!seq"
-        else
-            "!ruby/array:#{self.class}"
-        end
-    end
-	def to_yaml( opts = {} )
-		opts[:DocType] = self.class if Hash === opts
-		YAML::quick_emit( self.object_id, opts ) { |out|
-            array_type = to_yaml_type 
-            if not out.options(:ExplicitTypes) and array_type == "!seq"
-                array_type = ""
-            end
-			
-            out.seq( array_type ) { |seq|
-                seq.concat( self )
-            }
-		}
-	end
-end
-
-array_proc = Proc.new { |type, val|
-    if Array === val
-        type, obj_class = YAML.read_type_class( type, Array )
-        if obj_class != Array
-            o = obj_class.new
-            o.concat( val )
-            val = o
-        end
-        val
-    else
-        val.to_a
-    end
-}
-YAML.add_ruby_type( /^array/, &array_proc ) 
-
-#
-# Exception#to_yaml
-#
-class Exception
-    def is_complex_yaml?
-        true
-    end
-    def to_yaml_type
-        "!ruby/exception:#{self.class}"
-    end
-	def to_yaml( opts = {} )
-		YAML::quick_emit( self.object_id, opts ) { |out|
-            out.map( self.to_yaml_type ) { |map|
-                map.add( 'message', self.message )
-				to_yaml_properties.each { |m|
-                    map.add( m[1..-1], instance_eval( m ) )
-                }
-            }
-		}
-	end
-end
-
-YAML.add_ruby_type( /^exception/ ) { |type, val|
-    type, obj_class = YAML.read_type_class( type, Exception )
-    o = YAML.object_maker( obj_class, { 'mesg' => val.delete( 'message' ) }, true )
-    val.each_pair { |k,v|
-		o.instance_eval "@#{k} = v"
-	}
-	o
-}
-
-
-#
-# String#to_yaml
-#
-class String
-    def is_complex_yaml?
-        ( self =~ /\n.+/ ? true : false )
-    end
-    def is_binary_data?
-        ( self.count( "^ -~", "^\r\n" ) / self.size > 0.3 || self.count( "\x00" ) > 0 )
-    end
-	def to_yaml( opts = {} )
-        complex = false
-        if self.is_complex_yaml?
-            complex = true
-        elsif opts[:BestWidth].to_i > 0
-            if self.length > opts[:BestWidth] and opts[:UseFold]
-                complex = true
-            end
-        end
-		YAML::quick_emit( complex ? self.object_id : nil, opts ) { |out|
-            if complex
-                if self.is_binary_data?
-                    out.binary_base64( self )
-                elsif self =~ /^ |#{YAML::ESCAPE_CHAR}| $/
-                    complex = false
-                else
-                    out.node_text( self )
-                end
-            end
-            if not complex
-                ostr = 	if out.options(:KeepValue)
-                            self
-                        elsif empty?
-                            "''"
-                        elsif self =~ /^[^#{YAML::WORD_CHAR}]|#{YAML::ESCAPE_CHAR}|[#{YAML::SPACE_INDICATORS}]( |$)| $|\n|\'/
-                            "\"#{YAML.escape( self )}\"" 
-                        elsif YAML.detect_implicit( self ) != 'str'
-                            "\"#{YAML.escape( self )}\"" 
-                        else
-                            self
-                        end
-                out.simple( ostr )
-            end
-		}
-	end
-end
-
-#
-# Symbol#to_yaml
-#
-class Symbol
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) { |out|
-			out << "!ruby/sym "
-			self.id2name.to_yaml( :Emitter => out )
-		}
-	end
-end
-
-symbol_proc = Proc.new { |type, val|
-	if String === val
-		val.intern
-	else
-		raise YAML::Error, "Invalid Symbol: " + val.inspect
-	end
-}
-YAML.add_ruby_type( 'symbol', &symbol_proc ) 
-YAML.add_ruby_type( 'sym', &symbol_proc ) 
-
-#
-# Range#to_yaml
-#
-class Range
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) { |out|
-			out << "!ruby/range " 
-			self.inspect.to_yaml( :Emitter => out )
-		}
-	end
-end
-
-YAML.add_ruby_type( 'range' ) { |type, val|
-	if String === val and val =~ /^(.*[^.])(\.{2,3})([^.].*)$/
-        r1, rdots, r2 = $1, $2, $3
-		Range.new( YAML.try_implicit( r1 ), YAML.try_implicit( r2 ), rdots.length == 3 )
-	elsif Hash === val
-		Range.new( val['begin'], val['end'], val['exclude_end?'] )
-	else
-		raise YAML::Error, "Invalid Range: " + val.inspect
-	end
-}
-
-#
-# Make an RegExp
-#
-class Regexp
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) { |out|
-			out << "!ruby/regexp "
-			self.inspect.to_yaml( :Emitter => out )
-		}
-	end
-end
-
-regexp_proc = Proc.new { |type, val|
-	if String === val and val =~ /^\/(.*)\/([mix]*)$/
-		val = { 'REGEXP' => $1, 'MODIFIERS' => $2 }
-	end
-	if Hash === val
-		mods = nil
-		unless val['MODIFIERS'].to_s.empty?
-			mods = 0x00
-			if val['MODIFIERS'].include?( 'x' )
-				mods |= Regexp::EXTENDED
-			elsif val['MODIFIERS'].include?( 'i' )
-				mods |= Regexp::IGNORECASE
-			elsif val['MODIFIERS'].include?( 'm' )
-				mods |= Regexp::POSIXLINE
-			end
-		end
-		Regexp::compile( val['REGEXP'], mods )
-	else
-		raise YAML::Error, "Invalid Regular expression: " + val.inspect
-	end
-}
-YAML.add_domain_type( "perl.yaml.org,2002", /^regexp/, &regexp_proc )
-YAML.add_ruby_type( 'regexp', &regexp_proc )
-
-#
-# Emit a Time object as an ISO 8601 timestamp
-#
-class Time
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		YAML::quick_emit( nil, opts ) { |out|
-            tz = "Z"
-            # from the tidy Tobias Peters <t-peters@gmx.de> Thanks!
-            unless self.utc?
-                utc_same_instant = self.dup.utc
-                utc_same_writing = Time.utc(year,month,day,hour,min,sec,usec)
-                difference_to_utc = utc_same_writing - utc_same_instant
-                if (difference_to_utc < 0) 
-                    difference_sign = '-'
-                    absolute_difference = -difference_to_utc
-                else
-                    difference_sign = '+'
-                    absolute_difference = difference_to_utc
-                end
-                difference_minutes = (absolute_difference/60).round
-                tz = "%s%02d:%02d" % [ difference_sign, difference_minutes / 60, difference_minutes % 60]
-            end
-            ( self.strftime( "%Y-%m-%d %H:%M:%S." ) +
-                "%06d %s" % [usec, tz] ).
-                to_yaml( :Emitter => out, :KeepValue => true )
-		}
-	end
-end
-
-#
-# Emit a Date object as a simple implicit
-#
-class Date
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		opts[:KeepValue] = true
-		self.to_s.to_yaml( opts )
-	end
-end
-
-#
-# Send Integer, Booleans, NilClass to String
-#
-class Numeric
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		str = self.to_s
-		if str == "Infinity"
-			str = ".Inf"
-		elsif str == "-Infinity"
-			str = "-.Inf"
-		elsif str == "NaN"
-			str = ".NaN"
-		end
-		opts[:KeepValue] = true
-		str.to_yaml( opts )
-	end
-end
-
-class TrueClass
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		opts[:KeepValue] = true
-		"true".to_yaml( opts )
-	end
-end
-
-class FalseClass
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		opts[:KeepValue] = true
-		"false".to_yaml( opts )
-	end
-end
-
-class NilClass 
-    def is_complex_yaml?
-        false
-    end
-	def to_yaml( opts = {} )
-		opts[:KeepValue] = true
-		"".to_yaml( opts )
-	end
-end
-
diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb
deleted file mode 100644
index 2e74b27221..0000000000
--- a/lib/yaml/store.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# YAML::Store
-#
-require 'yaml'
-require 'pstore'
-
-module YAML
-
-	class Store < PStore
-		#
-		# Constructor
-		# 
-		def initialize( *o )
-			@opt = YAML::DEFAULTS.dup
-            if String === o.first
-                super(o.shift)
-            end
-            if o.last.is_a? Hash
-                @opt.update(o.pop)
-            end
-        end
-
-		#
-		# Override Pstore#transaction
-		#
-		def transaction
-			raise YAML::Error, "nested transaction" if @transaction
-			raise YAML::Error, "no filename for transaction" unless @filename
-			begin
-				@transaction = true
-				value = nil
-				backup = @filename+"~"
-				if File::exist?(@filename)
-					file = File::open(@filename, "rb+")
-					orig = true
-				else
-					@table = {}
-					file = File::open(@filename, "wb+")
-					file.write( @table.to_yaml( @opt ) )
-				end
-				file.flock(File::LOCK_EX)
-				if orig
-					File::copy @filename, backup
-					@table = YAML::load( file )
-				end
-				begin
-					catch(:pstore_abort_transaction) do
-						value = yield(self)
-					end
-				rescue Exception
-					@abort = true
-					raise
-				ensure
-					unless @abort
-						begin
-							file.rewind
-							file.write( @table.to_yaml( @opt ) )
-							file.truncate(file.pos)
-						rescue
-							File::rename backup, @filename if File::exist?(backup)
-							raise
-						end
-					end
-					@abort = false
-				end
-			ensure
-				@table = nil
-				@transaction = false
-				file.close if file
-			end
-			value
-		end
-	end
-
-end
diff --git a/lib/yaml/stream.rb b/lib/yaml/stream.rb
deleted file mode 100644
index 943c51526b..0000000000
--- a/lib/yaml/stream.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module YAML
-
-	#
-	# YAML::Stream -- for emitting many documents
-	#
-	class Stream
-
-		attr_accessor :documents, :options
-
-		def initialize( opts = {} )
-			@options = opts
-			@documents = []
-		end
-		
-        def []( i )
-            @documents[ i ]
-        end
-
-		def add( doc )
-			@documents << doc
-		end
-
-		def edit( doc_num, doc )
-			@documents[ doc_num ] = doc
-		end
-
-		def emit
-            opts = @options.dup
-			opts[:UseHeader] = true if @documents.length > 1
-			ct = 0
-            out = YAML::Syck::Emitter.new( opts )
-            @documents.each { |v|
-                if ct > 0
-                    out << "\n--- " 
-                end
-                v.to_yaml( :Emitter => out )
-                ct += 1
-            }
-            out.end_object
-		end
-
-	end
-
-end
diff --git a/lib/yaml/stringio.rb b/lib/yaml/stringio.rb
deleted file mode 100644
index 8ad949fa2b..0000000000
--- a/lib/yaml/stringio.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Limited StringIO if no core lib is available
-#
-begin
-require 'stringio'
-rescue LoadError
-    # StringIO based on code by MoonWolf
-    class StringIO
-        def initialize(string="")
-            @string=string
-            @pos=0
-            @eof=(string.size==0)
-        end
-        def pos
-            @pos
-        end    
-        def eof
-            @eof
-        end
-        alias eof? eof
-        def readline(rs=$/)
-            if @eof
-                raise EOFError
-            else
-                if p = @string[@pos..-1]=~rs
-                    line = @string[@pos,p+1]
-                else
-                    line = @string[@pos..-1]
-                end
-                @pos+=line.size
-                @eof =true if @pos==@string.size
-                $_ = line
-            end
-        end
-        def rewind
-            seek(0,0)
-        end
-        def seek(offset,whence)
-            case whence
-            when 0
-                @pos=offset
-            when 1
-                @pos+=offset
-            when 2
-                @pos=@string.size+offset
-            end
-            @eof=(@pos>=@string.size)
-            0
-        end
-    end
-
-	#
-	# Class method for creating streams
-	#
-	def YAML.make_stream( io )
-        if String === io
-            io = StringIO.new( io )
-        elsif not IO === io
-            raise YAML::Error, "YAML stream must be an IO or String object."
-        end
-        if YAML::unicode
-            def io.readline
-                YAML.utf_to_internal( readline( @ln_sep ), @utf_encoding )
-            end
-            def io.check_unicode
-                @utf_encoding = YAML.sniff_encoding( read( 4 ) )
-                @ln_sep = YAML.enc_separator( @utf_encoding )
-                seek( -4, IO::SEEK_CUR )
-            end
-		    def io.utf_encoding
-		    	@utf_encoding
-		    end
-            io.check_unicode
-        else
-            def io.utf_encoding
-                :None
-            end
-        end
-        io
-	end
-
-end
-
diff --git a/lib/yaml/syck.rb b/lib/yaml/syck.rb
deleted file mode 100644
index 267067feb5..0000000000
--- a/lib/yaml/syck.rb
+++ /dev/null